diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 47a984cd467..d84f546fb01 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -49,20 +49,30 @@ $search_pcgtype = GETPOST('search_pcgtype', 'alpha');
 $chartofaccounts = GETPOST('chartofaccounts', 'int');
 
 // Security check
-if ($user->socid > 0) accessforbidden();
-if (!$user->rights->accounting->chartofaccount) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if (!$user->rights->accounting->chartofaccount) {
+	accessforbidden();
+}
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "aa.account_number";
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "aa.account_number";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 $arrayfields = array(
 	'aa.account_number'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
@@ -74,7 +84,9 @@ $arrayfields = array(
 	'aa.active'=>array('label'=>$langs->trans("Activated"), 'checked'=>1)
 );
 
-if ($conf->global->MAIN_FEATURES_LEVEL < 2) unset($arrayfields['aa.reconcilable']);
+if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
+	unset($arrayfields['aa.reconcilable']);
+}
 
 $accounting = new AccountingAccount($db);
 
@@ -84,21 +96,27 @@ $accounting = new AccountingAccount($db);
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha')) { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha')) {
+	$massaction = '';
+}
 
 $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))
-{
-	if (!empty($cancel)) $action = '';
+if (empty($reshook)) {
+	if (!empty($cancel)) {
+		$action = '';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_account = "";
 		$search_label = "";
 		$search_labelshort = "";
@@ -107,23 +125,21 @@ if (empty($reshook))
 		$search_array_options = array();
 	}
 	if ((GETPOST('valid_change_chart', 'alpha') && GETPOST('chartofaccounts', 'int') > 0)	// explicit click on button 'Change and load' with js on
-		|| (GETPOST('chartofaccounts', 'int') > 0 && GETPOST('chartofaccounts', 'int') != $conf->global->CHARTOFACCOUNTS))	// a submit of form is done and chartofaccounts combo has been modified
-	{
-		if ($chartofaccounts > 0)
-		{
+		|| (GETPOST('chartofaccounts', 'int') > 0 && GETPOST('chartofaccounts', 'int') != $conf->global->CHARTOFACCOUNTS)) {	// a submit of form is done and chartofaccounts combo has been modified
+		if ($chartofaccounts > 0) {
 			// Get language code for this $chartofaccounts
 			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_country as c, '.MAIN_DB_PREFIX.'accounting_system as a';
 			$sql .= ' WHERE c.rowid = a.fk_country AND a.rowid = '.(int) $chartofaccounts;
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
 				$country_code = $obj->code;
-			} else dol_print_error($db);
+			} else {
+				dol_print_error($db);
+			}
 
 			// Try to load sql file
-			if ($country_code)
-			{
+			if ($country_code) {
 				$sqlfile = DOL_DOCUMENT_ROOT.'/install/mysql/data/llx_accounting_account_'.strtolower($country_code).'.sql';
 
 				$offsetforchartofaccount = 0;
@@ -131,16 +147,14 @@ if (empty($reshook))
 				// and pass CCCNNNNN + (num of company * 100 000 000) as offset to the run_sql as a new parameter to say to update sql on the fly to add offset to rowid and account_parent value.
 				// This is to be sure there is no conflict for each chart of account, whatever is country, whatever is company when multicompany is used.
 				$tmp = file_get_contents($sqlfile);
-				if (preg_match('/-- ADD (\d+) to rowid/ims', $tmp, $reg))
-				{
+				if (preg_match('/-- ADD (\d+) to rowid/ims', $tmp, $reg)) {
 					$offsetforchartofaccount += $reg[1];
 				}
 				$offsetforchartofaccount += ($conf->entity * 100000000);
 
 				$result = run_sql($sqlfile, 1, $conf->entity, 1, '', 'default', 32768, 0, $offsetforchartofaccount);
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					setEventMessages($langs->trans("ChartLoaded"), null, 'mesgs');
 				} else {
 					setEventMessages($langs->trans("ErrorDuringChartLoad"), null, 'warnings');
@@ -198,8 +212,11 @@ $sql = "SELECT aa.rowid, aa.fk_pcg_version, aa.pcg_type, aa.account_number, aa.a
 $sql .= " a2.rowid as rowid2, a2.label as label2, a2.account_number as account_number2";
 $sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as aa";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version AND aa.entity = ".$conf->entity;
-if ($db->type == 'pgsql') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = ".$conf->entity;
-else $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = ".$conf->entity;
+if ($db->type == 'pgsql') {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = ".$conf->entity;
+} else {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as a2 ON a2.rowid = aa.account_parent AND a2.entity = ".$conf->entity;
+}
 $sql .= " WHERE asy.rowid = ".$pcgver;
 //print $sql;
 if (strlen(trim($search_account))) {
@@ -224,31 +241,38 @@ if (strlen(trim($search_account))) {
 			$search_account_tmp_clean = $search_account_tmp;
 			$search_account_clean = $search_account;
 			$startchar = '%';
-			if (strpos($search_account_tmp, '^') === 0)
-			{
+			if (strpos($search_account_tmp, '^') === 0) {
 				$startchar = '';
 				$search_account_tmp_clean = preg_replace('/^\^/', '', $search_account_tmp);
 				$search_account_clean = preg_replace('/^\^/', '', $search_account);
 			}
 			$sql .= " AND (aa.account_number LIKE '".$db->escape($startchar.$search_account_tmp_clean)."'";
 			$sql .= " OR aa.account_number LIKE '".$db->escape($startchar.$search_account_clean)."%')";
-		} else $sql .= natural_search("aa.account_number", $search_account_tmp);
+		} else {
+			$sql .= natural_search("aa.account_number", $search_account_tmp);
+		}
 	}
 }
-if (strlen(trim($search_label)))			$sql .= natural_search("aa.label", $search_label);
-if (strlen(trim($search_labelshort)))       $sql .= natural_search("aa.labelshort", $search_labelshort);
-if (strlen(trim($search_accountparent)) && $search_accountparent != '-1')	$sql .= natural_search("aa.account_parent", $search_accountparent, 2);
-if (strlen(trim($search_pcgtype)))			$sql .= natural_search("aa.pcg_type", $search_pcgtype);
+if (strlen(trim($search_label))) {
+	$sql .= natural_search("aa.label", $search_label);
+}
+if (strlen(trim($search_labelshort))) {
+	$sql .= natural_search("aa.labelshort", $search_labelshort);
+}
+if (strlen(trim($search_accountparent)) && $search_accountparent != '-1') {
+	$sql .= natural_search("aa.account_parent", $search_accountparent, 2);
+}
+if (strlen(trim($search_pcgtype))) {
+	$sql .= natural_search("aa.pcg_type", $search_pcgtype);
+}
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	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;
 	}
@@ -259,22 +283,36 @@ $sql .= $db->plimit($limit + 1, $offset);
 dol_syslog('accountancy/admin/account.php:: $sql='.$sql);
 $resql = $db->query($sql);
 
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_account) $param .= '&search_account='.urlencode($search_account);
-	if ($search_label) $param .= '&search_label='.urlencode($search_label);
-	if ($search_labelshort) $param .= '&search_labelshort='.urlencode($search_labelshort);
-	if ($search_accountparent > 0 || $search_accountparent == '0') $param .= '&search_accountparent='.urlencode($search_accountparent);
-	if ($search_pcgtype) $param .= '&search_pcgtype='.urlencode($search_pcgtype);
-	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 ($search_account) {
+		$param .= '&search_account='.urlencode($search_account);
+	}
+	if ($search_label) {
+		$param .= '&search_label='.urlencode($search_label);
+	}
+	if ($search_labelshort) {
+		$param .= '&search_labelshort='.urlencode($search_labelshort);
+	}
+	if ($search_accountparent > 0 || $search_accountparent == '0') {
+		$param .= '&search_accountparent='.urlencode($search_accountparent);
+	}
+	if ($search_pcgtype) {
+		$param .= '&search_pcgtype='.urlencode($search_pcgtype);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		print '<!-- Add javascript to reload page when we click "Change plan" -->
 			<script type="text/javascript">
 			$(document).ready(function () {
@@ -288,7 +326,9 @@ if ($resql)
 	}
 
 	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">';
@@ -322,7 +362,9 @@ if ($resql)
 
 			$i++;
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 	print "</select>";
 	print ajax_combobox("chartofaccounts");
 	print '<input type="'.(empty($conf->use_javascript_ajax) ? 'submit' : 'button').'" class="button" name="change_chart" id="change_chart" value="'.dol_escape_htmltag($langs->trans("ChangeAndLoad")).'">';
@@ -341,17 +383,31 @@ if ($resql)
 
 	// Line for search fields
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat width100" name="search_account" value="'.$search_account.'"></td>';
-	if (!empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$search_label.'"></td>';
-	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat width100" name="search_labelshort" value="'.$search_labelshort.'"></td>';
+	if (!empty($arrayfields['aa.account_number']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="flat width100" name="search_account" value="'.$search_account.'"></td>';
+	}
+	if (!empty($arrayfields['aa.label']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$search_label.'"></td>';
+	}
+	if (!empty($arrayfields['aa.labelshort']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="flat width100" name="search_labelshort" value="'.$search_labelshort.'"></td>';
+	}
 	if (!empty($arrayfields['aa.account_parent']['checked'])) {
 		print '<td class="liste_titre">';
 		print $formaccounting->select_account($search_accountparent, 'search_accountparent', 2);
 		print '</td>';
 	}
-	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat width100" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['aa.reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
-	if (!empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
+	if (!empty($arrayfields['aa.pcg_type']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="flat width100" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
+	}
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		if (!empty($arrayfields['aa.reconcilable']['checked'])) {
+			print '<td class="liste_titre">&nbsp;</td>';
+		}
+	}
+	if (!empty($arrayfields['aa.active']['checked'])) {
+		print '<td class="liste_titre">&nbsp;</td>';
+	}
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
@@ -359,13 +415,29 @@ if ($resql)
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['aa.account_number']['checked']))	print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['aa.label']['checked']))			print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"], "aa.label", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['aa.labelshort']['checked']))		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['aa.account_parent']['checked']))	print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
-	if (!empty($arrayfields['aa.pcg_type']['checked']))			print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['aa.reconcilable']['checked']))	print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder); }
-	if (!empty($arrayfields['aa.active']['checked']))			print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['aa.account_number']['checked'])) {
+		print_liste_field_titre($arrayfields['aa.account_number']['label'], $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['aa.label']['checked'])) {
+		print_liste_field_titre($arrayfields['aa.label']['label'], $_SERVER["PHP_SELF"], "aa.label", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['aa.labelshort']['checked'])) {
+		print_liste_field_titre($arrayfields['aa.labelshort']['label'], $_SERVER["PHP_SELF"], "aa.labelshort", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['aa.account_parent']['checked'])) {
+		print_liste_field_titre($arrayfields['aa.account_parent']['label'], $_SERVER["PHP_SELF"], "aa.account_parent", "", $param, '', $sortfield, $sortorder, 'left ');
+	}
+	if (!empty($arrayfields['aa.pcg_type']['checked'])) {
+		print_liste_field_titre($arrayfields['aa.pcg_type']['label'], $_SERVER["PHP_SELF"], 'aa.pcg_type', '', $param, '', $sortfield, $sortorder, '', $arrayfields['aa.pcg_type']['help']);
+	}
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		if (!empty($arrayfields['aa.reconcilable']['checked'])) {
+			print_liste_field_titre($arrayfields['aa.reconcilable']['label'], $_SERVER["PHP_SELF"], 'aa.reconcilable', '', $param, '', $sortfield, $sortorder);
+		}
+	}
+	if (!empty($arrayfields['aa.active']['checked'])) {
+		print_liste_field_titre($arrayfields['aa.active']['label'], $_SERVER["PHP_SELF"], 'aa.active', '', $param, '', $sortfield, $sortorder);
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
@@ -374,8 +446,7 @@ if ($resql)
 
 	$totalarray = array();
 	$i = 0;
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$accountstatic->id = $obj->rowid;
@@ -385,39 +456,40 @@ if ($resql)
 		print '<tr class="oddeven">';
 
 		// Account number
-		if (!empty($arrayfields['aa.account_number']['checked']))
-		{
+		if (!empty($arrayfields['aa.account_number']['checked'])) {
 			print "<td>";
 			print $accountstatic->getNomUrl(1, 0, 0, '', 0, 1, 0, 'accountcard');
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Account label
-		if (!empty($arrayfields['aa.label']['checked']))
-		{
+		if (!empty($arrayfields['aa.label']['checked'])) {
 			print "<td>";
 			print $obj->label;
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Account label to show (label short)
-		if (!empty($arrayfields['aa.labelshort']['checked']))
-		{
+		if (!empty($arrayfields['aa.labelshort']['checked'])) {
 			print "<td>";
 			print $obj->labelshort;
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Account parent
-		if (!empty($arrayfields['aa.account_parent']['checked']))
-		{
+		if (!empty($arrayfields['aa.account_parent']['checked'])) {
 			// Note: obj->account_parent is a foreign key to a rowid. It is field in child table and obj->rowid2 is same, but in parent table.
 			// So for orphans, obj->account_parent is set but not obj->rowid2
-			if (!empty($obj->account_parent) && !empty($obj->rowid2))
-			{
+			if (!empty($obj->account_parent) && !empty($obj->rowid2)) {
 				print "<td>";
 				print '<!-- obj->account_parent = '.$obj->account_parent.' obj->rowid2 = '.$obj->rowid2.' -->';
 				$accountparent->id = $obj->rowid2;
@@ -425,24 +497,29 @@ if ($resql)
 				$accountparent->account_number = $obj->account_number2; // Sotre an account number for output
 				print $accountparent->getNomUrl(1);
 				print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			} else {
 				print '<td>';
 				if (!empty($obj->account_parent)) {
 					print '<!-- Bad value for obj->account_parent = '.$obj->account_parent.': is a rowid that does not exists -->';
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 		}
 
 		// Chart of accounts type
-		if (!empty($arrayfields['aa.pcg_type']['checked']))
-		{
+		if (!empty($arrayfields['aa.pcg_type']['checked'])) {
 			print "<td>";
 			print $obj->pcg_type;
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
@@ -466,8 +543,7 @@ if ($resql)
 		}
 
 		// Activated or not
-		if (!empty($arrayfields['aa.active']['checked']))
-		{
+		if (!empty($arrayfields['aa.active']['checked'])) {
 			print '<td class="center">';
 			if (empty($obj->active)) {
 				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$obj->rowid.'&action=enable&mode=0">';
@@ -479,7 +555,9 @@ if ($resql)
 				print '</a>';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Action
@@ -494,7 +572,9 @@ if ($resql)
 			print '</a>';
 		}
 		print '</td>'."\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print "</tr>\n";
 		$i++;
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 3c3489185f4..8f7d869479d 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -39,7 +39,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("errors", "admin", "companies", "resource", "holiday", "compta", "accountancy", "hrm"));
@@ -62,7 +64,9 @@ $active = 1;
 $sortfield = GETPOST("sortfield", 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $listlimit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -71,8 +75,12 @@ $search_country_id = GETPOST('search_country_id', 'int');
 
 
 // Security check
-if ($user->socid > 0) accessforbidden();
-if (!$user->rights->accounting->chartofaccount) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if (!$user->rights->accounting->chartofaccount) {
+	accessforbidden();
+}
 
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -139,14 +147,12 @@ $sourceList = array();
  * Actions
  */
 
-if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha'))
-{
+if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha')) {
 	$search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
-if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
-{
+if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 	$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
 	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
 	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
@@ -154,17 +160,21 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 
 	// Check that all fields are filled
 	$ok = 1;
-	foreach ($listfield as $f => $value)
-	{
-		if ($value == 'country_id' && in_array($tablib[$id], array('Pcg_version'))) continue; // For some pages, country is not mandatory
-		if ((!GETPOSTISSET($value)) || GETPOST($value) == '')
-		{
+	foreach ($listfield as $f => $value) {
+		if ($value == 'country_id' && in_array($tablib[$id], array('Pcg_version'))) {
+			continue; // For some pages, country is not mandatory
+		}
+		if ((!GETPOSTISSET($value)) || GETPOST($value) == '') {
 			$ok = 0;
 			$fieldnamekey = $listfield[$f];
 			// We take translate key of field
 
-			if ($fieldnamekey == 'pcg_version')  $fieldnamekey = 'Pcg_version';
-			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
+			if ($fieldnamekey == 'pcg_version') {
+				$fieldnamekey = 'Pcg_version';
+			}
+			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+				$fieldnamekey = 'Label';
+			}
 
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
 		}
@@ -174,36 +184,30 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		$ok = 0;
 		setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
 	}
-	if (GETPOSTISSET("pcg_version"))
-	{
-		if (GETPOST("pcg_version") == '0')
-		{
+	if (GETPOSTISSET("pcg_version")) {
+		if (GETPOST("pcg_version") == '0') {
 			$ok = 0;
 			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
 		}
 		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
-    	{
-	    	$ok = 0;
-	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
-	    }*/
+		{
+			$ok = 0;
+			$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
+		}*/
 	}
-	if (GETPOSTISSET("country") && (GETPOST("country") == '0') && ($id != 2))
-	{
+	if (GETPOSTISSET("country") && (GETPOST("country") == '0') && ($id != 2)) {
 		$ok = 0;
 		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
 	}
 
 	// Si verif ok et action add, on ajoute la ligne
-	if ($ok && GETPOST('actionadd', 'alpha'))
-	{
-		if ($tabrowid[$id])
-		{
+	if ($ok && GETPOST('actionadd', 'alpha')) {
+		if ($tabrowid[$id]) {
 			// Recupere id libre pour insertion
 			$newid = 0;
 			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
 			$result = $db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$obj = $db->fetch_object($result);
 				$newid = ($obj->newid + 1);
 			} else {
@@ -214,34 +218,39 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		// Add new entry
 		$sql = "INSERT INTO ".$tabname[$id]." (";
 		// List of fields
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
 			$sql .= $tabrowid[$id].",";
+		}
 		$sql .= $tabfieldinsert[$id];
 		$sql .= ",active)";
 		$sql .= " VALUES(";
 
 		// List of values
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
 			$sql .= $newid.",";
+		}
 		$i = 0;
-		foreach ($listfieldinsert as $f => $value)
-		{
+		foreach ($listfieldinsert as $f => $value) {
 			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
 			} elseif ($value == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
-			if ($i) $sql .= ",";
-			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
-			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			if ($i) {
+				$sql .= ",";
+			}
+			if ($_POST[$listfieldvalue[$i]] == '') {
+				$sql .= "null";
+			} else {
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			}
 			$i++;
 		}
 		$sql .= ",1)";
 
 		dol_syslog("actionadd", LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)	// Add is ok
-		{
+		if ($result) {	// Add is ok
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
 		} else {
@@ -254,30 +263,36 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	}
 
 	// Si verif ok et action modify, on modifie la ligne
-	if ($ok && GETPOST('actionmodify', 'alpha'))
-	{
-		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($ok && GETPOST('actionmodify', 'alpha')) {
+		if ($tabrowid[$id]) {
+			$rowidcol = $tabrowid[$id];
+		} else {
+			$rowidcol = "rowid";
+		}
 
 		// Modify entry
 		$sql = "UPDATE ".$tabname[$id]." SET ";
 		// Modifie valeur des champs
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-		{
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
 			$sql .= $tabrowid[$id]."=";
 			$sql .= "'".$db->escape($rowid)."', ";
 		}
 		$i = 0;
-		foreach ($listfieldmodify as $field)
-		{
+		foreach ($listfieldmodify as $field) {
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
 			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
-			if ($i) $sql .= ",";
+			if ($i) {
+				$sql .= ",";
+			}
 			$sql .= $field."=";
-			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
-			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			if ($_POST[$listfieldvalue[$i]] == '') {
+				$sql .= "null";
+			} else {
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			}
 			$i++;
 		}
 		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
@@ -285,31 +300,30 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		dol_syslog("actionmodify", LOG_DEBUG);
 		//print $sql;
 		$resql = $db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			setEventMessages($db->error(), null, 'errors');
 		}
 	}
 	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
-if (GETPOST('actioncancel', 'alpha'))
-{
+if (GETPOST('actioncancel', 'alpha')) {
 	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 
 	dol_syslog("delete", LOG_DEBUG);
 	$result = $db->query($sql);
-	if (!$result)
-	{
-		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-		{
+	if (!$result) {
+		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS') {
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
 		} else {
 			dol_print_error($db);
@@ -318,9 +332,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 }
 
 // activate
-if ($action == $acts[0])
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == $acts[0]) {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -329,16 +346,18 @@ if ($action == $acts[0])
 	}
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
 
 // disable
-if ($action == $acts[1])
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == $acts[1]) {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -347,16 +366,18 @@ if ($action == $acts[1])
 	}
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
 
 // favorite
-if ($action == 'activate_favorite')
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == 'activate_favorite') {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -365,16 +386,18 @@ if ($action == 'activate_favorite')
 	}
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
 
 // disable favorite
-if ($action == 'disable_favorite')
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == 'disable_favorite') {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -383,8 +406,7 @@ if ($action == 'disable_favorite')
 	}
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
@@ -406,8 +428,7 @@ print load_fiche_titre($titre, $linkback, 'title_accountancy');
 
 
 // Confirmation de la suppression de la ligne
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.urlencode($page).'&' : '').'sortfield='.urlencode($sortfield).'&sortorder='.urlencode($sortorder).'&rowid='.urlencode($rowid).'&code='.urlencode($code).'&id='.urlencode($id), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
@@ -415,20 +436,23 @@ if ($action == 'delete')
 /*
  * Show a dictionary
  */
-if ($id)
-{
+if ($id) {
 	// Complete requete recherche valeurs avec critere de tri
 	$sql = $tabsql[$id];
 
-	if ($search_country_id > 0)
-	{
-		if (preg_match('/ WHERE /', $sql)) $sql .= " AND ";
-		else $sql .= " WHERE ";
+	if ($search_country_id > 0) {
+		if (preg_match('/ WHERE /', $sql)) {
+			$sql .= " AND ";
+		} else {
+			$sql .= " WHERE ";
+		}
 		$sql .= " c.rowid = ".$search_country_id;
 	}
 
 	// If sort order is "country", we use country_code instead
-	if ($sortfield == 'country') $sortfield = 'country_code';
+	if ($sortfield == 'country') {
+		$sortfield = 'country_code';
+	}
 	$sql .= $db->order($sortfield, $sortorder);
 	$sql .= $db->plimit($listlimit + 1, $offset);
 	//print $sql;
@@ -442,30 +466,35 @@ if ($id)
 	print '<table class="noborder centpercent">';
 
 	// Form to add a new line
-	if ($tabname[$id])
-	{
+	if ($tabname[$id]) {
 		$fieldlist = explode(',', $tabfield[$id]);
 
 		// Line for title
 		print '<tr class="liste_titre">';
-		foreach ($fieldlist as $field => $value)
-		{
+		foreach ($fieldlist as $field => $value) {
 			// Determine le nom du champ par rapport aux noms possibles
 			// dans les dictionnaires de donnees
 			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 			$class = "left";
-			if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
-			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-			{
+			if ($fieldlist[$field] == 'code') {
+				$valuetoshow = $langs->trans("Code");
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
 				$valuetoshow = $langs->trans("Label");
 			}
 			if ($fieldlist[$field] == 'country') {
-				if (in_array('region_id', $fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
+				if (in_array('region_id', $fieldlist)) {
+					print '<td>&nbsp;</td>'; continue;
+				}		// For region page, we do not show the country input
 				$valuetoshow = $langs->trans("Country");
 			}
-			if ($fieldlist[$field] == 'country_id') { $valuetoshow = ''; }
-			if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
+			if ($fieldlist[$field] == 'country_id') {
+				$valuetoshow = '';
+			}
+			if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') {
+				$valuetoshow = $langs->trans("Pcg_version");
+			}
 
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
@@ -492,12 +521,11 @@ if ($id)
 
 		$obj = new stdClass();
 		// If data was already input, we define them in obj to populate input fields.
-		if (GETPOST('actionadd', 'alpha'))
-		{
-			foreach ($fieldlist as $key=>$val)
-			{
-				if (GETPOST($val))
+		if (GETPOST('actionadd', 'alpha')) {
+			foreach ($fieldlist as $key => $val) {
+				if (GETPOST($val)) {
 					$obj->$val = GETPOST($val);
+				}
 			}
 		}
 
@@ -506,8 +534,7 @@ if ($id)
 		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 		$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'add');
 		}
 
@@ -526,20 +553,24 @@ if ($id)
 	// List of available values in database
 	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
 		$param = '&id='.$id;
-		if ($search_country_id > 0) $param .= '&search_country_id='.$search_country_id;
+		if ($search_country_id > 0) {
+			$param .= '&search_country_id='.$search_country_id;
+		}
 		$paramwithsearch = $param;
-		if ($sortorder) $paramwithsearch .= '&sortorder='.$sortorder;
-		if ($sortfield) $paramwithsearch .= '&sortfield='.$sortfield;
+		if ($sortorder) {
+			$paramwithsearch .= '&sortorder='.$sortorder;
+		}
+		if ($sortfield) {
+			$paramwithsearch .= '&sortfield='.$sortfield;
+		}
 
 		// There is several pages
-		if ($num > $listlimit)
-		{
+		if ($num > $listlimit) {
 			print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
 			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
 			print '</td></tr>';
@@ -547,16 +578,15 @@ if ($id)
 
 		// Title line with search boxes
 		print '<tr class="liste_titre liste_titre_add">';
-		foreach ($fieldlist as $field => $value)
-		{
+		foreach ($fieldlist as $field => $value) {
 			$showfield = 1; // By defaut
 
-			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+				$showfield = 0;
+			}
 
-			if ($showfield)
-			{
-				if ($value == 'country')
-				{
+			if ($showfield) {
+				if ($value == 'country') {
 					print '<td class="liste_titre">';
 					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
 					print '</td>';
@@ -582,16 +612,13 @@ if ($id)
 		print getTitleFieldOfList('');
 		print '</tr>';
 
-		if ($num)
-		{
+		if ($num) {
 			// Lines with values
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				//print_r($obj);
 				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-				{
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
 					print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 					print '<input type="hidden" name="token" value="'.newToken().'">';
 					print '<input type="hidden" name="page" value="'.$page.'">';
@@ -602,39 +629,35 @@ if ($id)
 					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-					if (empty($reshook)) fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'edit');
+					if (empty($reshook)) {
+						fieldListAccountModel($fieldlist, $obj, $tabname[$id], 'edit');
+					}
 
 					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
 					print '&nbsp;<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
 				} else {
-				  	$tmpaction = 'view';
+					$tmpaction = 'view';
 					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-					if (empty($reshook))
-					{
-						foreach ($fieldlist as $field => $value)
-						{
+					if (empty($reshook)) {
+						foreach ($fieldlist as $field => $value) {
 							$showfield = 1;
 							$class = "left";
 							$valuetoshow = $obj->{$fieldlist[$field]};
-							if ($value == 'type_template')
-							{
+							if ($value == 'type_template') {
 								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
 							}
-							if ($value == 'element')
-							{
+							if ($value == 'element') {
 								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-							} elseif ($value == 'source')
-							{
+							} elseif ($value == 'source') {
 								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
 							} elseif ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
 							} elseif ($fieldlist[$field] == 'country') {
-								if (empty($obj->country_code))
-								{
+								if (empty($obj->country_code)) {
 									$valuetoshow = '-';
 								} else {
 									$key = $langs->trans("Country".strtoupper($obj->country_code));
@@ -645,9 +668,13 @@ if ($id)
 							}
 
 							$class = 'tddict';
-							if ($fieldlist[$field] == 'tracking') $class .= ' tdoverflowauto';
+							if ($fieldlist[$field] == 'tracking') {
+								$class .= ' tdoverflowauto';
+							}
 							// Show value for field
-							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+							if ($showfield) {
+								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+							}
 						}
 					}
 
@@ -655,22 +682,33 @@ if ($id)
 					$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
 
 					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
-					if ($param) $url .= '&'.$param;
+					if ($param) {
+						$url .= '&'.$param;
+					}
 					$url .= '&';
 
 					// Active
 					print '<td class="center nowrap">';
-					if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-					else print $langs->trans("AlwaysActive");
+					if ($canbedisabled) {
+						print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+					} else {
+						print $langs->trans("AlwaysActive");
+					}
 					print "</td>";
 
 					// Modify link
-					if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
-					else print '<td>&nbsp;</td>';
+					if ($canbemodified) {
+						print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 
 					// Delete link
-					if ($iserasable) print '<td class="center"><a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
-					else print '<td>&nbsp;</td>';
+					if ($iserasable) {
+						print '<td class="center"><a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 
 					print "</tr>\n";
 				}
@@ -714,12 +752,9 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 	$formcompany = new FormCompany($db);
 	$formaccounting = new FormAccounting($db);
 
-	foreach ($fieldlist as $field => $value)
-	{
-		if ($fieldlist[$field] == 'country')
-		{
-			if (in_array('region_id', $fieldlist))
-			{
+	foreach ($fieldlist as $field => $value) {
+		if ($fieldlist[$field] == 'country') {
+			if (in_array('region_id', $fieldlist)) {
 				print '<td>';
 				//print join(',',$fieldlist);
 				print '</td>';
@@ -729,18 +764,19 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 			$fieldname = 'country';
 			print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : '')), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'country_id')
-		{
-			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
-			{
+		} elseif ($fieldlist[$field] == 'country_id') {
+			if (!in_array('country', $fieldlist)) {	// If there is already a field country, we don't show country_id (avoid duplicate)
 				$country_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
 				print '<td>';
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
 				print '</td>';
 			}
 		} elseif ($fieldlist[$field] == 'type_cdr') {
-			if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
-			else print '<td>';
+			if ($fieldlist[$field] == 'type_cdr') {
+				print '<td class="center">';
+			} else {
+				print '<td>';
+			}
 			if ($fieldlist[$field] == 'type_cdr') {
 				print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			} else {
@@ -752,10 +788,18 @@ function fieldListAccountModel($fieldlist, $obj = '', $tabname = '', $context =
 		} else {
 			print '<td>';
 			$size = ''; $class = '';
-			if ($fieldlist[$field] == 'code') $size = 'size="8" ';
-			if ($fieldlist[$field] == 'position') $size = 'size="4" ';
-			if ($fieldlist[$field] == 'libelle') $size = 'centpercent';
-			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') $size = 'size="2" ';
+			if ($fieldlist[$field] == 'code') {
+				$size = 'size="8" ';
+			}
+			if ($fieldlist[$field] == 'position') {
+				$size = 'size="4" ';
+			}
+			if ($fieldlist[$field] == 'libelle') {
+				$size = 'centpercent';
+			}
+			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
+				$size = 'size="2" ';
+			}
 			print '<input type="text" '.$size.' class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 23ebde7e230..253c320bde0 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -46,8 +46,12 @@ $account_number = GETPOST('account_number', 'string');
 $label = GETPOST('label', 'alpha');
 
 // Security check
-if ($user->socid > 0) accessforbidden();
-if (!$user->rights->accounting->chartofaccount) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if (!$user->rights->accounting->chartofaccount) {
+	accessforbidden();
+}
 
 
 $object = new AccountingAccount($db);
@@ -57,22 +61,18 @@ $object = new AccountingAccount($db);
  * Action
  */
 
-if (GETPOST('cancel', 'alpha'))
-{
+if (GETPOST('cancel', 'alpha')) {
 	$urltogo = $backtopage ? $backtopage : dol_buildpath('/accountancy/admin/account.php', 1);
 	header("Location: ".$urltogo);
 	exit;
 }
 
-if ($action == 'add' && $user->rights->accounting->chartofaccount)
-{
+if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 	if (!$cancel) {
-		if (!$account_number)
-		{
+		if (!$account_number) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
 			$action = 'create';
-		} elseif (!$label)
-		{
+		} elseif (!$label) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 		} else {
@@ -130,12 +130,10 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount)
 	}
 } elseif ($action == 'edit' && $user->rights->accounting->chartofaccount) {
 	if (!$cancel) {
-		if (!$account_number)
-		{
+		if (!$account_number) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
 			$action = 'update';
-		} elseif (!$label)
-		{
+		} elseif (!$label) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'update';
 		} else {
@@ -286,8 +284,7 @@ if ($action == 'create') {
 		$head = accounting_prepare_head($object);
 
 		// Edit mode
-		if ($action == 'update')
-		{
+		if ($action == 'update') {
 			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
 
 			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index eefe62a47a4..7bb9d81607f 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -46,8 +46,7 @@ if ($cat_id == 0) {
 }
 
 // Security check
-if (empty($user->rights->accounting->chartofaccount))
-{
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
@@ -62,8 +61,9 @@ $accountingcategory = new AccountancyCategory($db);
 if (!empty($selectcpt)) {
 	$cpts = array();
 	foreach ($selectcpt as $selectedoption) {
-		if (!array_key_exists($selectedoption, $cpts))
+		if (!array_key_exists($selectedoption, $cpts)) {
 			$cpts[$selectedoption] = "'".$selectedoption."'";
+		}
 	}
 
 	$return = $accountingcategory->updateAccAcc($cat_id, $cpts);
@@ -114,8 +114,7 @@ print '<input class="button" type="submit" value="'.$langs->trans("Select").'">'
 print '</td></tr>';
 
 // Select the accounts
-if (!empty($cat_id))
-{
+if (!empty($cat_id)) {
 	$return = $accountingcategory->getAccountsWithNoCategory($cat_id);
 	if ($return < 0) {
 		setEventMessages(null, $accountingcategory->errors, 'errors');
@@ -124,8 +123,7 @@ if (!empty($cat_id))
 	print '<td>';
 
 	$arraykeyvalue = array();
-	foreach ($accountingcategory->lines_cptbk as $key => $val)
-	{
+	foreach ($accountingcategory->lines_cptbk as $key => $val) {
 		$arraykeyvalue[length_accountg($val->numero_compte)] = length_accountg($val->numero_compte).' ('.$val->label_compte.($val->doc_ref ? ' '.$val->doc_ref : '').')';
 	}
 
@@ -152,8 +150,8 @@ print '</form>';
 
 
 if ($action == 'display' || $action == 'delete') {
-    print "<table class='noborder' width='100%'>\n";
-    print '<tr class="liste_titre">';
+	print "<table class='noborder' width='100%'>\n";
+	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">'.$langs->trans("AccountAccounting")."</td>";
 	print '<td class="liste_titre" colspan="2">'.$langs->trans("Label")."</td>";
 	print "</tr>\n";
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index e3a39c5d8b1..89c8a2b3b71 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -57,7 +57,9 @@ $active = 1;
 $sortfield = GETPOST("sortfield", 'aZ09comma');
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $listlimit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -133,14 +135,12 @@ $sourceList = array();
  * Actions
  */
 
-if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha'))
-{
+if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha')) {
 	$search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
-if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
-{
+if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 	$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
 	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
 	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
@@ -148,57 +148,73 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 
 	// Check that all fields are filled
 	$ok = 1;
-	foreach ($listfield as $f => $value)
-	{
-		if ($value == 'formula' && empty($_POST['formula'])) continue;
-		if ($value == 'range_account' && empty($_POST['range_account'])) continue;
-		if ($value == 'country' || $value == 'country_id') continue;
-		if (!GETPOSTISSET($value) || GETPOST($value) == '')
-		{
+	foreach ($listfield as $f => $value) {
+		if ($value == 'formula' && empty($_POST['formula'])) {
+			continue;
+		}
+		if ($value == 'range_account' && empty($_POST['range_account'])) {
+			continue;
+		}
+		if ($value == 'country' || $value == 'country_id') {
+			continue;
+		}
+		if (!GETPOSTISSET($value) || GETPOST($value) == '') {
 			$ok = 0;
 			$fieldnamekey = $listfield[$f];
 			// We take translate key of field
-			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
-			if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-			if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-			if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
-			if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
+			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+				$fieldnamekey = 'Label';
+			}
+			if ($fieldnamekey == 'code') {
+				$fieldnamekey = 'Code';
+			}
+			if ($fieldnamekey == 'note') {
+				$fieldnamekey = 'Note';
+			}
+			if ($fieldnamekey == 'type') {
+				$fieldnamekey = 'Type';
+			}
+			if ($fieldnamekey == 'position') {
+				$fieldnamekey = 'Position';
+			}
+			if ($fieldnamekey == 'category_type') {
+				$fieldnamekey = 'Calculated';
+			}
 
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
 		}
 	}
-	if (GETPOSTISSET("code"))
-	{
-		if ($_POST["code"] == '0')
-		{
+	if (GETPOSTISSET("code")) {
+		if ($_POST["code"] == '0') {
 			$ok = 0;
 			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
 		}
 	}
-	if (!is_numeric(GETPOST('position', 'alpha')))
-	{
+	if (!is_numeric(GETPOST('position', 'alpha'))) {
 		$langs->loadLangs(array("errors"));
-   		$ok = 0;
-   		setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
+		$ok = 0;
+		setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
 	}
 
 	// Clean some parameters
-	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
-	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
-	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+	if ($_POST["accountancy_code"] <= 0) {
+		$_POST["accountancy_code"] = ''; // If empty, we force to null
+	}
+	if ($_POST["accountancy_code_sell"] <= 0) {
+		$_POST["accountancy_code_sell"] = ''; // If empty, we force to null
+	}
+	if ($_POST["accountancy_code_buy"] <= 0) {
+		$_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+	}
 
 	// Si verif ok et action add, on ajoute la ligne
-	if ($ok && GETPOST('actionadd', 'alpha'))
-	{
-		if ($tabrowid[$id])
-		{
+	if ($ok && GETPOST('actionadd', 'alpha')) {
+		if ($tabrowid[$id]) {
 			// Recupere id libre pour insertion
 			$newid = 0;
 			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
 			$result = $db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$obj = $db->fetch_object($result);
 				$newid = ($obj->newid + 1);
 			} else {
@@ -209,30 +225,37 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		// Add new entry
 		$sql = "INSERT INTO ".$tabname[$id]." (";
 		// List of fields
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $tabrowid[$id].",";
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+			$sql .= $tabrowid[$id].",";
+		}
 		$sql .= $tabfieldinsert[$id];
 		$sql .= ",active)";
 		$sql .= " VALUES(";
 
 		// List of values
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) $sql .= $newid.",";
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+			$sql .= $newid.",";
+		}
 		$i = 0;
-		foreach ($listfieldinsert as $f => $value)
-		{
+		foreach ($listfieldinsert as $f => $value) {
 			if ($value == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
-			if ($i) $sql .= ",";
-			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') $sql .= "null"; // For vat, we want/accept code = ''
-			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			if ($i) {
+				$sql .= ",";
+			}
+			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') {
+				$sql .= "null"; // For vat, we want/accept code = ''
+			} else {
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			}
 			$i++;
 		}
 		$sql .= ",1)";
 
 		dol_syslog("actionadd", LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)	// Add is ok
-		{
+		if ($result) {	// Add is ok
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
 		} else {
@@ -245,30 +268,36 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	}
 
 	// Si verif ok et action modify, on modifie la ligne
-	if ($ok && GETPOST('actionmodify', 'alpha'))
-	{
-		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($ok && GETPOST('actionmodify', 'alpha')) {
+		if ($tabrowid[$id]) {
+			$rowidcol = $tabrowid[$id];
+		} else {
+			$rowidcol = "rowid";
+		}
 
 		// Modify entry
 		$sql = "UPDATE ".$tabname[$id]." SET ";
 		// Modifie valeur des champs
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-		{
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
 			$sql .= $tabrowid[$id]."=";
 			$sql .= "'".$db->escape($rowid)."', ";
 		}
 		$i = 0;
-		foreach ($listfieldmodify as $field)
-		{
+		foreach ($listfieldmodify as $field) {
 			if ($field == 'fk_country' && $_POST['country'] > 0) {
 				$_POST[$listfieldvalue[$i]] = $_POST['country'];
 			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
-			if ($i) $sql .= ",";
+			if ($i) {
+				$sql .= ",";
+			}
 			$sql .= $field."=";
-			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'range_account') $sql .= "null"; // For range_account, we want/accept code = ''
-			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'range_account') {
+				$sql .= "null"; // For range_account, we want/accept code = ''
+			} else {
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			}
 			$i++;
 		}
 		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
@@ -276,31 +305,30 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		dol_syslog("actionmodify", LOG_DEBUG);
 		//print $sql;
 		$resql = $db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			setEventMessages($db->error(), null, 'errors');
 		}
 	}
 	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
-if (GETPOST('actioncancel', 'alpha'))
-{
+if (GETPOST('actioncancel', 'alpha')) {
 	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 
 	dol_syslog("delete", LOG_DEBUG);
 	$result = $db->query($sql);
-	if (!$result)
-	{
-		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-		{
+	if (!$result) {
+		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS') {
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
 		} else {
 			dol_print_error($db);
@@ -309,9 +337,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 }
 
 // activate
-if ($action == $acts[0])
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == $acts[0]) {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -320,16 +351,18 @@ if ($action == $acts[0])
 	}
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
 
 // disable
-if ($action == $acts[1])
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == $acts[1]) {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -338,16 +371,18 @@ if ($action == $acts[1])
 	}
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
 
 // favorite
-if ($action == 'activate_favorite')
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == 'activate_favorite') {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -356,16 +391,18 @@ if ($action == 'activate_favorite')
 	}
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
 
 // disable favorite
-if ($action == 'disable_favorite')
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == 'disable_favorite') {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -374,8 +411,7 @@ if ($action == 'disable_favorite')
 	}
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
@@ -399,8 +435,7 @@ print load_fiche_titre($titre, $linkback, $titlepicto);
 print '<span class="opacitymedium">'.$langs->trans("AccountingAccountGroupsDesc", $langs->transnoentitiesnoconv("ByPersonalizedAccountGroups")).'</span><br><br>';
 
 // Confirmation de la suppression de la ligne
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id.($search_country_id > 0 ? '&search_country_id='.$search_country_id : ''), $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
@@ -408,20 +443,23 @@ if ($action == 'delete')
 /*
  * Show a dictionary
  */
-if ($id)
-{
+if ($id) {
 	// Complete requete recherche valeurs avec critere de tri
 	$sql = $tabsql[$id];
 
-	if ($search_country_id > 0)
-	{
-		if (preg_match('/ WHERE /', $sql)) $sql .= " AND ";
-		else $sql .= " WHERE ";
+	if ($search_country_id > 0) {
+		if (preg_match('/ WHERE /', $sql)) {
+			$sql .= " AND ";
+		} else {
+			$sql .= " WHERE ";
+		}
 		$sql .= " (a.fk_country = ".$search_country_id." OR a.fk_country = 0)";
 	}
 
 	// If sort order is "country", we use country_code instead
-	if ($sortfield == 'country') $sortfield = 'country_code';
+	if ($sortfield == 'country') {
+		$sortfield = 'country_code';
+	}
 	$sql .= $db->order($sortfield, $sortorder);
 	$sql .= $db->plimit($listlimit + 1, $offset);
 	//print $sql;
@@ -436,14 +474,12 @@ if ($id)
 	print '<table class="noborder centpercent">';
 
 	// Form to add a new line
-	if ($tabname[$id])
-	{
+	if ($tabname[$id]) {
 		$fieldlist = explode(',', $tabfield[$id]);
 
 		// Line for title
 		print '<tr class="liste_titre">';
-		foreach ($fieldlist as $field => $value)
-		{
+		foreach ($fieldlist as $field => $value) {
 			// Determine le nom du champ par rapport aux noms possibles
 			// dans les dictionnaires de donnees
 			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
@@ -489,9 +525,13 @@ if ($id)
 
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
-				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-				elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-				else print $valuetoshow;
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+					print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				} elseif (!empty($tabhelp[$id][$value])) {
+					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				} else {
+					print $valuetoshow;
+				}
 				print '</td>';
 			}
 		}
@@ -509,12 +549,11 @@ if ($id)
 
 		$obj = new stdClass();
 		// If data was already input, we define them in obj to populate input fields.
-		if (GETPOST('actionadd', 'alpha'))
-		{
-			foreach ($fieldlist as $key=>$val)
-			{
-				if (GETPOST($val) != '')
+		if (GETPOST('actionadd', 'alpha')) {
+			foreach ($fieldlist as $key => $val) {
+				if (GETPOST($val) != '') {
 					$obj->$val = GETPOST($val);
+				}
 			}
 		}
 
@@ -523,18 +562,19 @@ if ($id)
 		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 		$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-		if (empty($reshook))
-		{
-	   		fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'add');
+		if (empty($reshook)) {
+			fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'add');
 		}
 
 		print '<td colspan="4" class="right">';
-	   	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
 		print '</td>';
 		print "</tr>";
 
 		$colspan = count($fieldlist) + 3;
-		if ($id == 32) $colspan++;
+		if ($id == 32) {
+			$colspan++;
+		}
 
 		print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>'; // Keep &nbsp; to have a line with enough height
 	}
@@ -542,20 +582,26 @@ if ($id)
 	// List of available record in database
 	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
 		$param = '&id='.$id;
-		if ($search_country_id > 0) $param .= '&search_country_id='.$search_country_id;
+		if ($search_country_id > 0) {
+			$param .= '&search_country_id='.$search_country_id;
+		}
 		$paramwithsearch = $param;
-		if ($sortorder) $paramwithsearch .= '&sortorder='.$sortorder;
-		if ($sortfield) $paramwithsearch .= '&sortfield='.$sortfield;
-		if (GETPOST('from', 'alpha')) $paramwithsearch .= '&from='.GETPOST('from', 'alpha');
+		if ($sortorder) {
+			$paramwithsearch .= '&sortorder='.$sortorder;
+		}
+		if ($sortfield) {
+			$paramwithsearch .= '&sortfield='.$sortfield;
+		}
+		if (GETPOST('from', 'alpha')) {
+			$paramwithsearch .= '&from='.GETPOST('from', 'alpha');
+		}
 		// There is several pages
-		if ($num > $listlimit)
-		{
+		if ($num > $listlimit) {
 			print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
 			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
 			print '</td></tr>';
@@ -564,16 +610,15 @@ if ($id)
 		// Title line with search boxes
 		print '<tr class="liste_titre liste_titre_add liste_titre_filter">';
 		$filterfound = 0;
-		foreach ($fieldlist as $field => $value)
-		{
+		foreach ($fieldlist as $field => $value) {
 			$showfield = 1; // By defaut
 
-			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+				$showfield = 0;
+			}
 
-			if ($showfield)
-			{
-				if ($value == 'country')
-				{
+			if ($showfield) {
+				if ($value == 'country') {
 					print '<td class="liste_titre">';
 					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth200 maxwidthonsmartphone');
 					print '</td>';
@@ -587,8 +632,7 @@ if ($id)
 		print '<td class="liste_titre"></td>';
 		print '<td class="liste_titre"></td>';
 		print '<td class="liste_titre center">';
-		if ($filterfound)
-		{
+		if ($filterfound) {
 			$searchpicto = $form->showFilterAndCheckAddButtons(0);
 			print $searchpicto;
 		}
@@ -597,8 +641,7 @@ if ($id)
 
 		// Title of lines
 		print '<tr class="liste_titre">';
-		foreach ($fieldlist as $field => $value)
-		{
+		foreach ($fieldlist as $field => $value) {
 			// Determine le nom du champ par rapport aux noms possibles
 			// dans les dictionnaires de donnees
 			$showfield = 1; // By defaut
@@ -677,23 +720,22 @@ if ($id)
 		print getTitleFieldOfList('');
 		print '</tr>';
 
-		if ($num)
-		{
+		if ($num) {
 			// Lines with values
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				//print_r($obj);
 				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-				{
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
 					$tmpaction = 'edit';
 					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
 					// Show fields
-					if (empty($reshook)) fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'edit');
+					if (empty($reshook)) {
+						fieldListAccountingCategories($fieldlist, $obj, $tabname[$id], 'edit');
+					}
 
 					print '<td></td>';
 					print '<td></td>';
@@ -712,21 +754,17 @@ if ($id)
 
 					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-					if (empty($reshook))
-					{
-						foreach ($fieldlist as $field => $value)
-						{
+					if (empty($reshook)) {
+						foreach ($fieldlist as $field => $value) {
 							$showfield = 1;
 							$class = "left";
 							$valuetoshow = $obj->{$fieldlist[$field]};
-							if ($value == 'category_type')
-							{
+							if ($value == 'category_type') {
 								$valuetoshow = yn($valuetoshow);
 							} elseif ($valuetoshow == 'all') {
 								$valuetoshow = $langs->trans('All');
 							} elseif ($fieldlist[$field] == 'country') {
-								if (empty($obj->country_code))
-								{
+								if (empty($obj->country_code)) {
 									$valuetoshow = '-';
 								} else {
 									$key = $langs->trans("Country".strtoupper($obj->country_code));
@@ -748,48 +786,59 @@ if ($id)
 
 							$class = 'tddict';
 							// Show value for field
-							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+							if ($showfield) {
+								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+							}
 						}
 					}
 
 					// Can an entry be erased or disabled ?
 					$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
-					if (isset($obj->code))
-					{
-						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; }
+					if (isset($obj->code)) {
+						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) {
+							$iserasable = 0; $canbedisabled = 0;
+						}
 					}
 
 					$canbemodified = $iserasable;
 
 					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
-					if ($param) $url .= '&'.$param;
+					if ($param) {
+						$url .= '&'.$param;
+					}
 					$url .= '&';
 
 					// Active
 					print '<td class="center" class="nowrap">';
-					if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-					else {
+					if ($canbedisabled) {
+						print '<a href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+					} else {
 						print $langs->trans("AlwaysActive");
 					}
 					print "</td>";
 
 					// Modify link
-					if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
-					else print '<td>&nbsp;</td>';
+					if ($canbemodified) {
+						print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit">'.img_edit().'</a></td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 
 					// Delete link
-					if ($iserasable)
-					{
+					if ($iserasable) {
 						print '<td class="center">';
-						if ($user->admin) print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+						if ($user->admin) {
+							print '<a href="'.$url.'action=delete">'.img_delete().'</a>';
+						}
 						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 						print '</td>';
-					} else print '<td>&nbsp;</td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 
 					// Link to setup the group
 					print '<td class="center">';
-					if (empty($obj->formula))
-					{
+					if (empty($obj->formula)) {
 						print '<a href="'.DOL_URL_ROOT.'/accountancy/admin/categories.php?action=display&save_lastsearch_values=1&account_category='.$obj->rowid.'">';
 						print $langs->trans("ListOfAccounts");
 						print '</a>';
@@ -836,26 +885,23 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+	if (!empty($conf->accounting->enabled)) {
+		$formaccounting = new FormAccounting($db);
+	}
 
-	foreach ($fieldlist as $field => $value)
-	{
-		if ($fieldlist[$field] == 'country')
-		{
+	foreach ($fieldlist as $field => $value) {
+		if ($fieldlist[$field] == 'country') {
 			print '<td>';
 			$fieldname = 'country';
-			if ($context == 'add')
-			{
+			if ($context == 'add') {
 				$fieldname = 'country_id';
 				print $form->select_country(GETPOST('country_id', 'int'), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			} else {
 				print $form->select_country((!empty($obj->country_code) ? $obj->country_code : (!empty($obj->country) ? $obj->country : $mysoc->country_code)), $fieldname, '', 28, 'maxwidth200 maxwidthonsmartphone');
 			}
 			print '</td>';
-		} elseif ($fieldlist[$field] == 'country_id')
-		{
-			if (!in_array('country', $fieldlist))	// If there is already a field country, we don't show country_id (avoid duplicate)
-			{
+		} elseif ($fieldlist[$field] == 'country_id') {
+			if (!in_array('country', $fieldlist)) {	// If there is already a field country, we don't show country_id (avoid duplicate)
 				$country_id = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : 0);
 				print '<td>';
 				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$country_id.'">';
@@ -870,10 +916,18 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 		} else {
 			print '<td>';
 			$size = ''; $class = '';
-			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
-			if ($fieldlist[$field] == 'position') $class = 'maxwidth50';
-			if ($fieldlist[$field] == 'libelle') $class = 'quatrevingtpercent';
-			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'category_type') $size = 'size="2" ';
+			if ($fieldlist[$field] == 'code') {
+				$class = 'maxwidth100';
+			}
+			if ($fieldlist[$field] == 'position') {
+				$class = 'maxwidth50';
+			}
+			if ($fieldlist[$field] == 'libelle') {
+				$class = 'quatrevingtpercent';
+			}
+			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'category_type') {
+				$size = 'size="2" ';
+			}
 			print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
diff --git a/htdocs/accountancy/admin/closure.php b/htdocs/accountancy/admin/closure.php
index 7e781b3fc71..a7873b72b90 100644
--- a/htdocs/accountancy/admin/closure.php
+++ b/htdocs/accountancy/admin/closure.php
@@ -62,7 +62,6 @@ if ($action == 'update') {
 
 	foreach ($list_account_main as $constname) {
 		$constvalue = GETPOST($constname, 'alpha');
-
 		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
 			$error++;
 		}
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index b9377ce4431..59aeaae06f0 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -38,8 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 $langs->loadLangs(array("compta", "bills", "admin", "accountancy", "salaries", "loan"));
 
 // Security check
-if (empty($user->rights->accounting->chartofaccount))
-{
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index ba45220c8cc..9e393beeacd 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -36,8 +36,7 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 $langs->loadLangs(array("compta", "bills", "admin", "accountancy"));
 
 // Security access
-if (empty($user->rights->accounting->chartofaccount))
-{
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 4aa1fd99ff4..ac8a8c6354d 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -32,21 +32,29 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "f.rowid"; // Set here default search field
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "f.rowid"; // Set here default search field
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "compta"));
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->fiscalyear->write)              // If we can read accounting records, we should be able to see fiscal year.
+}
+if (!$user->rights->accounting->fiscalyear->write) {              // If we can read accounting records, we should be able to see fiscal year.
 	accessforbidden();
+}
 
 $error = 0;
 
@@ -58,8 +66,9 @@ static $tmpstatut2label = array(
 $statut2label = array(
 		''
 );
-foreach ($tmpstatut2label as $key => $val)
+foreach ($tmpstatut2label as $key => $val) {
 	$statut2label[$key] = $langs->trans($val);
+}
 
 $errors = array();
 
@@ -92,12 +101,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -106,8 +113,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 
 	$i = 0;
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index c3b782de583..aef52a91236 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -31,10 +31,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 $langs->loadLangs(array("admin", "compta"));
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (empty($user->rights->accounting->fiscalyear->write))
+}
+if (empty($user->rights->accounting->fiscalyear->write)) {
 	accessforbidden();
+}
 
 $error = 0;
 
@@ -50,8 +52,9 @@ static $tmpstatut2label = array(
 $statut2label = array(
 		''
 );
-foreach ($tmpstatut2label as $key => $val)
+foreach ($tmpstatut2label as $key => $val) {
 	$statut2label[$key] = $langs->trans($val);
+}
 
 $object = new Fiscalyear($db);
 
@@ -113,10 +116,8 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
 		header("Location: ./fiscalyear.php");
 		exit();
 	}
-}
-
-// Update record
-elseif ($action == 'update') {
+} elseif ($action == 'update') {
+	// Update record
 	if (!GETPOST('cancel', 'alpha')) {
 		$result = $object->fetch($id);
 
@@ -151,8 +152,7 @@ $title = $langs->trans("Fiscalyear")." - ".$langs->trans("Card");
 $helpurl = "";
 llxHeader("", $title, $helpurl);
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewFiscalYear"));
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -298,11 +298,10 @@ if ($action == 'create')
 
 			print dol_get_fiche_end();
 
-			if (!empty($user->rights->accounting->fiscalyear->write))
-			{
+			if (!empty($user->rights->accounting->fiscalyear->write)) {
 				/*
-    			 * Barre d'actions
-    			 */
+				 * Barre d'actions
+				 */
 				print '<div class="tabsAction">';
 
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
diff --git a/htdocs/accountancy/admin/fiscalyear_info.php b/htdocs/accountancy/admin/fiscalyear_info.php
index 2971e2eb114..6fc5ac3cad8 100644
--- a/htdocs/accountancy/admin/fiscalyear_info.php
+++ b/htdocs/accountancy/admin/fiscalyear_info.php
@@ -30,10 +30,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/fiscalyear.class.php';
 $langs->loadLangs(array("admin", "compta"));
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->fiscalyear->write)
+}
+if (!$user->rights->accounting->fiscalyear->write) {
 	accessforbidden();
+}
 
 $id = GETPOST('id', 'int');
 
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index a7bf28d9091..21ee5ce20e9 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -279,6 +279,7 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ACCOUNTANCY_COMBO_FOR_AUX").'</td>';
+
 if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
 	print '<td class="right"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?token='.newToken().'&enablesubsidiarylist&value=0">';
 	print img_picto($langs->trans("Activated"), 'switch_on');
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 1d3e8bccdd7..7aecfaada49 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -22,7 +22,9 @@
  * \brief		Setup page to configure journals
  */
 
-if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
@@ -43,8 +45,7 @@ $rowid = GETPOST('rowid', 'alpha');
 $code = GETPOST('code', 'alpha');
 
 // Security access
-if (empty($user->rights->accounting->chartofaccount))
-{
+if (empty($user->rights->accounting->chartofaccount)) {
 	accessforbidden();
 }
 
@@ -60,12 +61,18 @@ $active = 1;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $listlimit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (empty($sortfield)) $sortfield = 'code';
-if (empty($sortorder)) $sortorder = 'ASC';
+if (empty($sortfield)) {
+	$sortfield = 'code';
+}
+if (empty($sortorder)) {
+	$sortorder = 'ASC';
+}
 
 $error = 0;
 
@@ -145,14 +152,12 @@ $sourceList = array(
  * Actions
  */
 
-if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha'))
-{
+if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha')) {
 	$search_country_id = '';
 }
 
 // Actions add or modify an entry into a dictionary
-if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
-{
+if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 	$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
 	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
 	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
@@ -160,48 +165,53 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 
 	// Check that all fields are filled
 	$ok = 1;
-	foreach ($listfield as $f => $value)
-	{
-		if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
-		if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-		if ($fieldnamekey == 'nature') $fieldnamekey = 'NatureOfJournal';
+	foreach ($listfield as $f => $value) {
+		if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+			$fieldnamekey = 'Label';
+		}
+		if ($fieldnamekey == 'code') {
+			$fieldnamekey = 'Code';
+		}
+		if ($fieldnamekey == 'nature') {
+			$fieldnamekey = 'NatureOfJournal';
+		}
 	}
 	// Other checks
-	if (GETPOSTISSET("code"))
-	{
-		if (GETPOST("code") == '0')
-		{
+	if (GETPOSTISSET("code")) {
+		if (GETPOST("code") == '0') {
 			$ok = 0;
 			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
 		}
 		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
-    	{
-	    	$ok = 0;
-	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
-	    }*/
+		{
+			$ok = 0;
+			$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
+		}*/
 	}
-	if (!GETPOST('label', 'alpha'))
-	{
+	if (!GETPOST('label', 'alpha')) {
 		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
 		$ok = 0;
 	}
 
 	// Clean some parameters
-	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
-	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
-	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+	if ($_POST["accountancy_code"] <= 0) {
+		$_POST["accountancy_code"] = ''; // If empty, we force to null
+	}
+	if ($_POST["accountancy_code_sell"] <= 0) {
+		$_POST["accountancy_code_sell"] = ''; // If empty, we force to null
+	}
+	if ($_POST["accountancy_code_buy"] <= 0) {
+		$_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+	}
 
 	// Si verif ok et action add, on ajoute la ligne
-	if ($ok && GETPOST('actionadd', 'alpha'))
-	{
-		if ($tabrowid[$id])
-		{
+	if ($ok && GETPOST('actionadd', 'alpha')) {
+		if ($tabrowid[$id]) {
 			// Recupere id libre pour insertion
 			$newid = 0;
 			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
 			$result = $db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$obj = $db->fetch_object($result);
 				$newid = ($obj->newid + 1);
 			} else {
@@ -212,32 +222,37 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		// Add new entry
 		$sql = "INSERT INTO ".$tabname[$id]." (";
 		// List of fields
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
 			$sql .= $tabrowid[$id].",";
+		}
 		$sql .= $tabfieldinsert[$id];
 		$sql .= ",active,entity)";
 		$sql .= " VALUES(";
 
 		// List of values
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
 			$sql .= $newid.",";
+		}
 		$i = 0;
-		foreach ($listfieldinsert as $f => $value)
-		{
+		foreach ($listfieldinsert as $f => $value) {
 			if ($value == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
-			if ($i) $sql .= ",";
-			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null"; // For vat, we want/accept code = ''
-			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			if ($i) {
+				$sql .= ",";
+			}
+			if ($_POST[$listfieldvalue[$i]] == '') {
+				$sql .= "null"; // For vat, we want/accept code = ''
+			} else {
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			}
 			$i++;
 		}
 		$sql .= ",1,".$conf->entity.")";
 
 		dol_syslog("actionadd", LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)	// Add is ok
-		{
+		if ($result) {	// Add is ok
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
 			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
 		} else {
@@ -250,30 +265,36 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 	}
 
 	// Si verif ok et action modify, on modifie la ligne
-	if ($ok && GETPOST('actionmodify', 'alpha'))
-	{
-		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($ok && GETPOST('actionmodify', 'alpha')) {
+		if ($tabrowid[$id]) {
+			$rowidcol = $tabrowid[$id];
+		} else {
+			$rowidcol = "rowid";
+		}
 
 		// Modify entry
 		$sql = "UPDATE ".$tabname[$id]." SET ";
 		// Modifie valeur des champs
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-		{
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
 			$sql .= $tabrowid[$id]."=";
 			$sql .= "'".$db->escape($rowid)."', ";
 		}
 		$i = 0;
-		foreach ($listfieldmodify as $field)
-		{
+		foreach ($listfieldmodify as $field) {
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
 				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
 			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
-			if ($i) $sql .= ",";
+			if ($i) {
+				$sql .= ",";
+			}
 			$sql .= $field."=";
-			if ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
-			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			if ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) {
+				$sql .= "null"; // For vat, we want/accept code = ''
+			} else {
+				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			}
 			$i++;
 		}
 		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
@@ -282,8 +303,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 		dol_syslog("actionmodify", LOG_DEBUG);
 		//print $sql;
 		$resql = $db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			setEventMessages($db->error(), null, 'errors');
 		}
 	}
@@ -295,19 +315,20 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 //	$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 //}
 
-if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 	$sql .= " AND entity = ".$conf->entity;
 
 	dol_syslog("delete", LOG_DEBUG);
 	$result = $db->query($sql);
-	if (!$result)
-	{
-		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-		{
+	if (!$result) {
+		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS') {
 			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
 		} else {
 			dol_print_error($db);
@@ -316,9 +337,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 }
 
 // activate
-if ($action == $acts[0])
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == $acts[0]) {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -328,16 +352,18 @@ if ($action == $acts[0])
 	$sql .= " AND entity = ".$conf->entity;
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
 
 // disable
-if ($action == $acts[1])
-{
-	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+if ($action == $acts[1]) {
+	if ($tabrowid[$id]) {
+		$rowidcol = $tabrowid[$id];
+	} else {
+		$rowidcol = "rowid";
+	}
 
 	if ($rowid) {
 		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = ".((int) $rowid);
@@ -347,8 +373,7 @@ if ($action == $acts[1])
 	$sql .= " AND entity = ".$conf->entity;
 
 	$result = $db->query($sql);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_print_error($db);
 	}
 }
@@ -365,8 +390,7 @@ llxHeader();
 
 $titre = $langs->trans("DictionarySetup");
 $linkback = '';
-if ($id)
-{
+if ($id) {
 	$titre .= ' - '.$langs->trans($tablib[$id]);
 	$titlepicto = 'title_accountancy';
 }
@@ -375,8 +399,7 @@ print load_fiche_titre($titre, $linkback, $titlepicto);
 
 
 // Confirmation de la suppression de la ligne
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
@@ -384,14 +407,15 @@ if ($action == 'delete')
 /*
  * Show a dictionary
  */
-if ($id)
-{
+if ($id) {
 	// Complete requete recherche valeurs avec critere de tri
 	$sql = $tabsql[$id];
 	$sql .= " WHERE a.entity = ".$conf->entity;
 
 	// If sort order is "country", we use country_code instead
-	if ($sortfield == 'country') $sortfield = 'country_code';
+	if ($sortfield == 'country') {
+		$sortfield = 'country_code';
+	}
 	$sql .= $db->order($sortfield, $sortorder);
 	$sql .= $db->plimit($listlimit + 1, $offset);
 
@@ -405,14 +429,12 @@ if ($id)
 	print '<table class="noborder centpercent">';
 
 	// Form to add a new line
-	if ($tabname[$id])
-	{
+	if ($tabname[$id]) {
 		$fieldlist = explode(',', $tabfield[$id]);
 
 		// Line for title
 		print '<tr class="liste_titre">';
-		foreach ($fieldlist as $field => $value)
-		{
+		foreach ($fieldlist as $field => $value) {
 			// Determine le nom du champ par rapport aux noms possibles
 			// dans les dictionnaires de donnees
 			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
@@ -430,9 +452,13 @@ if ($id)
 
 			if ($valuetoshow != '') {
 				print '<td class="'.$class.'">';
-				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-				elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-				else print $valuetoshow;
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
+					print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				} elseif (!empty($tabhelp[$id][$value])) {
+					print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				} else {
+					print $valuetoshow;
+				}
 				print '</td>';
 			}
 		}
@@ -450,12 +476,11 @@ if ($id)
 
 		$obj = new stdClass();
 		// If data was already input, we define them in obj to populate input fields.
-		if (GETPOST('actionadd', 'alpha'))
-		{
-			foreach ($fieldlist as $key=>$val)
-			{
-				if (GETPOST($val) != '')
+		if (GETPOST('actionadd', 'alpha')) {
+			foreach ($fieldlist as $key => $val) {
+				if (GETPOST($val) != '') {
 					$obj->$val = GETPOST($val);
+				}
 			}
 		}
 
@@ -464,13 +489,12 @@ if ($id)
 		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 		$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-		if (empty($reshook))
-		{
-	   		fieldListJournal($fieldlist, $obj, $tabname[$id], 'add');
+		if (empty($reshook)) {
+			fieldListJournal($fieldlist, $obj, $tabname[$id], 'add');
 		}
 
 		print '<td colspan="4" class="right">';
-	   	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
 		print '</td>';
 		print "</tr>";
 
@@ -482,21 +506,27 @@ if ($id)
 	// List of available record in database
 	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
 		$param = '&id='.$id;
-		if ($search_country_id > 0) $param .= '&search_country_id='.$search_country_id;
+		if ($search_country_id > 0) {
+			$param .= '&search_country_id='.$search_country_id;
+		}
 		$paramwithsearch = $param;
-		if ($sortorder) $paramwithsearch .= '&sortorder='.$sortorder;
-		if ($sortfield) $paramwithsearch .= '&sortfield='.$sortfield;
-		if (GETPOST('from', 'alpha')) $paramwithsearch .= '&from='.GETPOST('from', 'alpha');
+		if ($sortorder) {
+			$paramwithsearch .= '&sortorder='.$sortorder;
+		}
+		if ($sortfield) {
+			$paramwithsearch .= '&sortfield='.$sortfield;
+		}
+		if (GETPOST('from', 'alpha')) {
+			$paramwithsearch .= '&from='.GETPOST('from', 'alpha');
+		}
 
 		// There is several pages
-		if ($num > $listlimit)
-		{
+		if ($num > $listlimit) {
 			print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
 			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
 			print '</td></tr>';
@@ -519,8 +549,7 @@ if ($id)
 
 		// Title of lines
 		print '<tr class="liste_titre liste_titre_add">';
-		foreach ($fieldlist as $field => $value)
-		{
+		foreach ($fieldlist as $field => $value) {
 			// Determine le nom du champ par rapport aux noms possibles
 			// dans les dictionnaires de donnees
 			$showfield = 1; // By defaut
@@ -528,11 +557,11 @@ if ($id)
 			$sortable = 1;
 			$valuetoshow = '';
 			/*
-            $tmparray=getLabelOfField($fieldlist[$field]);
-            $showfield=$tmp['showfield'];
-            $valuetoshow=$tmp['valuetoshow'];
-            $align=$tmp['align'];
-            $sortable=$tmp['sortable'];
+			$tmparray=getLabelOfField($fieldlist[$field]);
+			$showfield=$tmp['showfield'];
+			$valuetoshow=$tmp['valuetoshow'];
+			$align=$tmp['align'];
+			$sortable=$tmp['sortable'];
 			*/
 			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
@@ -557,23 +586,22 @@ if ($id)
 		print getTitleFieldOfList('');
 		print '</tr>';
 
-		if ($num)
-		{
+		if ($num) {
 			// Lines with values
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				//print_r($obj);
 				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-				{
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
 					$tmpaction = 'edit';
 					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
 					// Show fields
-					if (empty($reshook)) fieldListJournal($fieldlist, $obj, $tabname[$id], 'edit');
+					if (empty($reshook)) {
+						fieldListJournal($fieldlist, $obj, $tabname[$id], 'edit');
+					}
 
 					print '<td class="center" colspan="4">';
 					print '<input type="hidden" name="page" value="'.$page.'">';
@@ -583,17 +611,15 @@ if ($id)
 					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
 					print '</td>';
 				} else {
-				  	$tmpaction = 'view';
+					$tmpaction = 'view';
 					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
 					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
 					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-					if (empty($reshook))
-					{
+					if (empty($reshook)) {
 						$langs->load("accountancy");
-						foreach ($fieldlist as $field => $value)
-						{
+						foreach ($fieldlist as $field => $value) {
 							$showfield = 1;
 							$class = "left";
 							$valuetoshow = $obj->{$fieldlist[$field]};
@@ -608,7 +634,9 @@ if ($id)
 
 							$class = 'tddict';
 							// Show value for field
-							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+							if ($showfield) {
+								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+							}
 						}
 					}
 
@@ -630,27 +658,38 @@ if ($id)
 					$canbemodified = $iserasable;
 
 					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
-					if ($param) $url .= '&'.$param;
+					if ($param) {
+						$url .= '&'.$param;
+					}
 					$url .= '&';
 
 					// Active
 					print '<td class="nowrap center">';
-					if ($canbedisabled) print '<a href="'.$url.'action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
-					else print $langs->trans("AlwaysActive");
+					if ($canbedisabled) {
+						print '<a href="'.$url.'action='.$acts[$obj->active].'&token='.newToken().'">'.$actl[$obj->active].'</a>';
+					} else {
+						print $langs->trans("AlwaysActive");
+					}
 					print "</td>";
 
 					// Modify link
-					if ($canbemodified) print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
-					else print '<td>&nbsp;</td>';
+					if ($canbemodified) {
+						print '<td class="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 
 					// Delete link
-					if ($iserasable)
-					{
+					if ($iserasable) {
 						print '<td class="center">';
-						if ($user->admin) print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+						if ($user->admin) {
+							print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+						}
 						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 						print '</td>';
-					} else print '<td>&nbsp;</td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 
 					print '<td></td>';
 
@@ -698,10 +737,8 @@ function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
 
-	foreach ($fieldlist as $field => $value)
-	{
-		if ($fieldlist[$field] == 'nature')
-		{
+	foreach ($fieldlist as $field => $value) {
+		if ($fieldlist[$field] == 'nature') {
 			print '<td>';
 			print $form->selectarray('nature', $sourceList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			print '</td>';
@@ -710,9 +747,15 @@ function fieldListJournal($fieldlist, $obj = '', $tabname = '', $context = '')
 		} else {
 			print '<td>';
 			$size = ''; $class = '';
-			if ($fieldlist[$field] == 'code')  $class = 'maxwidth100';
-			if ($fieldlist[$field] == 'label') $class = 'quatrevingtpercent';
-			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') $size = 'size="2" ';
+			if ($fieldlist[$field] == 'code') {
+				$class = 'maxwidth100';
+			}
+			if ($fieldlist[$field] == 'label') {
+				$class = 'quatrevingtpercent';
+			}
+			if ($fieldlist[$field] == 'sortorder' || $fieldlist[$field] == 'sens' || $fieldlist[$field] == 'category_type') {
+				$size = 'size="2" ';
+			}
 			print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		}
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index b93d82a59c0..dd55e870009 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -41,8 +41,9 @@ $langs->loadLangs(array("companies", "compta", "accountancy", "products"));
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if (!$user->rights->accounting->bind->write)
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 // search & action GETPOST
 $action = GETPOST('action', 'aZ09');
@@ -60,7 +61,9 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
 $search_current_account = GETPOST('search_current_account', 'alpha');
 $search_current_account_valid = GETPOST('search_current_account_valid', 'alpha');
-if ($search_current_account_valid == '') $search_current_account_valid = 'withoutvalidaccount';
+if ($search_current_account_valid == '') {
+	$search_current_account_valid = 'withoutvalidaccount';
+}
 $search_onsell = GETPOST('search_onsell', 'alpha');
 $search_onpurchase = GETPOST('search_onpurchase', 'alpha');
 
@@ -68,20 +71,30 @@ $accounting_product_mode = GETPOST('accounting_product_mode', 'alpha');
 $btn_changeaccount = GETPOST('changeaccount', 'alpha');
 $btn_changetype = GETPOST('changetype', 'alpha');
 
-if (empty($accounting_product_mode)) $accounting_product_mode = 'ACCOUNTANCY_SELL';
+if (empty($accounting_product_mode)) {
+	$accounting_product_mode = 'ACCOUNTANCY_SELL';
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "p.ref";
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "p.ref";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
-if (empty($action)) $action = 'list';
+if (empty($action)) {
+	$action = 'list';
+}
 
 $arrayfields = array();
 
@@ -90,16 +103,21 @@ $arrayfields = array();
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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');
+}
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 	$search_ref = '';
 	$search_label = '';
 	$search_desc = '';
@@ -142,13 +160,11 @@ if ($action == 'update') {
 			$arrayofdifferentselectedvalues = array();
 
 			$cpt = 0; $ok = 0; $ko = 0;
-			foreach ($chk_prod as $productid)
-			{
+			foreach ($chk_prod as $productid) {
 				$accounting_account_id = GETPOST('codeventil_'.$productid);
 
 				$result = 0;
-				if ($accounting_account_id > 0)
-				{
+				if ($accounting_account_id > 0) {
 					$arrayofdifferentselectedvalues[$accounting_account_id] = $accounting_account_id;
 					$result = $accounting->fetch($accounting_account_id, null, 1);
 				}
@@ -181,8 +197,7 @@ if ($action == 'update') {
 					$sql .= " WHERE rowid = ".((int) $productid);
 
 					dol_syslog("/accountancy/admin/productaccount.php sql=".$sql, LOG_DEBUG);
-					if ($db->query($sql))
-					{
+					if ($db->query($sql)) {
 						$ok++;
 						$db->commit();
 					} else {
@@ -195,8 +210,12 @@ if ($action == 'update') {
 			}
 		}
 
-		if ($ko) setEventMessages($langs->trans("XLineFailedToBeBinded", $ko), null, 'errors');
-		if ($ok) setEventMessages($langs->trans("XLineSuccessfullyBinded", $ok), null, 'mesgs');
+		if ($ko) {
+			setEventMessages($langs->trans("XLineFailedToBeBinded", $ko), null, 'errors');
+		}
+		if ($ok) {
+			setEventMessages($langs->trans("XLineSuccessfullyBinded", $ok), null, 'mesgs');
+		}
 	}
 }
 
@@ -243,7 +262,9 @@ llxHeader('', $langs->trans("ProductsBinding"));
 
 $pcgverid = $conf->global->CHARTOFACCOUNTS;
 $pcgvercode = dol_getIdFromCode($db, $pcgverid, 'accounting_system', 'rowid', 'pcg_version');
-if (empty($pcgvercode)) $pcgvercode = $pcgverid;
+if (empty($pcgvercode)) {
+	$pcgvercode = $pcgverid;
+}
 
 $sql = "SELECT p.rowid, p.ref, p.label, p.description, p.tosell, p.tobuy, p.tva_tx,";
 $sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
@@ -254,17 +275,13 @@ $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON";
 if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 	$sql .= " p.accountancy_code_buy = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
-} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA')
-{
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 	$sql .= " p.accountancy_code_buy_intra = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
-} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
-{
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 	$sql .= " p.accountancy_code_buy_export = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
-} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL')
-{
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 	$sql .= " p.accountancy_code_sell = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
-} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA')
-{
+} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
 	$sql .= " p.accountancy_code_sell_intra = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
 } else {
 	$sql .= " p.accountancy_code_sell_export = aa.account_number AND aa.fk_pcg_version = '".$db->escape($pcgvercode)."'";
@@ -295,12 +312,10 @@ if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 		$sql .= natural_search("p.accountancy_code_sell_export", $search_current_account);
 	}
 }
-if ($search_current_account_valid == 'withoutvalidaccount')
-{
+if ($search_current_account_valid == 'withoutvalidaccount') {
 	$sql .= " AND aa.account_number IS NULL";
 }
-if ($search_current_account_valid == 'withvalidaccount')
-{
+if ($search_current_account_valid == 'withvalidaccount') {
 	$sql .= " AND aa.account_number IS NOT NULL";
 }
 // Add search filter like
@@ -316,18 +331,20 @@ if (strlen(trim($search_desc))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("p.tva_tx", price2num($search_vat), 1);
 }
-if ($search_onsell != '' && $search_onsell != '-1') $sql .= natural_search('p.tosell', $search_onsell, 1);
-if ($search_onpurchase != '' && $search_onpurchase != '-1') $sql .= natural_search('p.tobuy', $search_onpurchase, 1);
+if ($search_onsell != '' && $search_onsell != '-1') {
+	$sql .= natural_search('p.tosell', $search_onsell, 1);
+}
+if ($search_onpurchase != '' && $search_onpurchase != '-1') {
+	$sql .= natural_search('p.tobuy', $search_onpurchase, 1);
+}
 
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -337,24 +354,43 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("/accountancy/admin/productaccount.php:: sql=".$sql, LOG_DEBUG);
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_ref > 0) $param .= "&search_desc=".urlencode($search_ref);
-	if ($search_label > 0) $param .= "&search_desc=".urlencode($search_label);
-	if ($search_desc > 0) $param .= "&search_desc=".urlencode($search_desc);
-	if ($search_vat > 0) $param .= '&search_vat='.urlencode($search_vat);
-	if ($search_current_account > 0) $param .= "&search_current_account=".urlencode($search_current_account);
-	if ($search_current_account_valid && $search_current_account_valid != '-1') $param .= "&search_current_account_valid=".urlencode($search_current_account_valid);
-	if ($accounting_product_mode) $param .= '&accounting_product_mode='.urlencode($accounting_product_mode);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($search_ref > 0) {
+		$param .= "&search_desc=".urlencode($search_ref);
+	}
+	if ($search_label > 0) {
+		$param .= "&search_desc=".urlencode($search_label);
+	}
+	if ($search_desc > 0) {
+		$param .= "&search_desc=".urlencode($search_desc);
+	}
+	if ($search_vat > 0) {
+		$param .= '&search_vat='.urlencode($search_vat);
+	}
+	if ($search_current_account > 0) {
+		$param .= "&search_current_account=".urlencode($search_current_account);
+	}
+	if ($search_current_account_valid && $search_current_account_valid != '-1') {
+		$param .= "&search_current_account_valid=".urlencode($search_current_account_valid);
+	}
+	if ($accounting_product_mode) {
+		$param .= '&accounting_product_mode='.urlencode($accounting_product_mode);
+	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-	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="update">';
@@ -375,8 +411,7 @@ if ($result)
 	print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL"'.($accounting_product_mode == 'ACCOUNTANCY_SELL' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSell').'</td>';
 	print '<td>'.$langs->trans('OptionModeProductSellDesc');
 	print "</td></tr>\n";
-	if ($mysoc->isInEEC())
-	{
+	if ($mysoc->isInEEC()) {
 		print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_SELL_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductSellIntra').'</td>';
 		print '<td>'.$langs->trans('OptionModeProductSellIntraDesc');
 		print "</td></tr>\n";
@@ -386,8 +421,7 @@ if ($result)
 	print "</td></tr>\n";
 	print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY"'.($accounting_product_mode == 'ACCOUNTANCY_BUY' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuy').'</td>';
 	print '<td>'.$langs->trans('OptionModeProductBuyDesc')."</td></tr>\n";
-	if ($mysoc->isInEEC())
-	{
+	if ($mysoc->isInEEC()) {
 		print '<tr class="oddeven"><td><input type="radio" name="accounting_product_mode" value="ACCOUNTANCY_BUY_INTRA"'.($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA' ? ' checked' : '').'> '.$langs->trans('OptionModeProductBuyIntra').'</td>';
 		print '<td>'.$langs->trans('OptionModeProductBuyDesc')."</td></tr>\n";
 	}
@@ -419,13 +453,14 @@ if ($result)
 	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" size="5" name="search_vat" placeholder="%" value="'.dol_escape_htmltag($search_vat).'"></td>';
 
-	if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) {
+		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
+	}
 	// On sell
 	if ($accounting_product_mode == 'ACCOUNTANCY_SELL' || $accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
 		print '<td class="liste_titre center">'.$form->selectyesno('search_onsell', $search_onsell, 1, false, 1).'</td>';
-	}
-	// On buy
-	elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY' || $accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+	} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY' || $accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
+		// On buy
 		print '<td class="liste_titre center">'.$form->selectyesno('search_onpurchase', $search_onpurchase, 1, false, 1).'</td>';
 	}
 	// Current account
@@ -444,7 +479,9 @@ if ($result)
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
-	if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) {
+		print_liste_field_titre("Description", $_SERVER["PHP_SELF"], "p.description", "", $param, '', $sortfield, $sortorder);
+	}
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "p.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
 	// On sell / On purchase
 	if ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
@@ -466,7 +503,7 @@ if ($result)
 		print_liste_field_titre("OnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
 		$fieldtosortaccount = "p.accountancy_code_buy_export";
 	}
-   	print_liste_field_titre("CurrentDedicatedAccountingAccount", $_SERVER["PHP_SELF"], $fieldtosortaccount, "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("CurrentDedicatedAccountingAccount", $_SERVER["PHP_SELF"], $fieldtosortaccount, "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("AssignDedicatedAccountingAccount");
 	$clickpitco = $form->showCheckAddButtons('checkforselect', 1);
 	print_liste_field_titre($clickpitco, '', '', '', '', '', '', '', 'center ');
@@ -475,8 +512,7 @@ if ($result)
 	$product_static = new Product($db);
 
 	$i = 0;
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($result);
 
 		// Ref produit as link
@@ -558,8 +594,7 @@ if ($result)
 
 		print '<td class="left">'.$obj->label.'</td>';
 
-		if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC))
-		{
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_PROD_DESC)) {
 			// TODO ADJUST DESCRIPTION SIZE
 			// print '<td class="left">' . $obj->description . '</td>';
 			// TODO: we should set a user defined value to adjust user square / wide screen size
@@ -572,32 +607,46 @@ if ($result)
 		print vatrate($obj->tva_tx);
 		print '</td>';
 
-		if ($accounting_product_mode == 'ACCOUNTANCY_SELL' || $accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT')
+		if ($accounting_product_mode == 'ACCOUNTANCY_SELL' || $accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_SELL_EXPORT') {
 			print '<td class="center">'.$product_static->getLibStatut(3, 0).'</td>';
+		}
 
-		if ($accounting_product_mode == 'ACCOUNTANCY_BUY' || $accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT')
+		if ($accounting_product_mode == 'ACCOUNTANCY_BUY' || $accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA' || $accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 			print '<td class="center">'.$product_static->getLibStatut(3, 1).'</td>';
+		}
 
 		// Current accounting account
 		print '<td class="left">';
 		if ($accounting_product_mode == 'ACCOUNTANCY_BUY') {
 			print length_accountg($obj->accountancy_code_buy);
-			if ($obj->accountancy_code_buy && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			if ($obj->accountancy_code_buy && empty($obj->aaid)) {
+				print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			}
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 			print length_accountg($obj->accountancy_code_buy_intra);
-			if ($obj->accountancy_code_buy_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			if ($obj->accountancy_code_buy_intra && empty($obj->aaid)) {
+				print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			}
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 			print length_accountg($obj->accountancy_code_buy_export);
-			if ($obj->accountancy_code_buy_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			if ($obj->accountancy_code_buy_export && empty($obj->aaid)) {
+				print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			}
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 			print length_accountg($obj->accountancy_code_sell);
-			if ($obj->accountancy_code_sell && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			if ($obj->accountancy_code_sell && empty($obj->aaid)) {
+				print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			}
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
 			print length_accountg($obj->accountancy_code_sell_intra);
-			if ($obj->accountancy_code_sell_intra && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			if ($obj->accountancy_code_sell_intra && empty($obj->aaid)) {
+				print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			}
 		} else {
 			print length_accountg($obj->accountancy_code_sell_export);
-			if ($obj->accountancy_code_sell_export && empty($obj->aaid)) print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			if ($obj->accountancy_code_sell_export && empty($obj->aaid)) {
+				print ' '.img_warning($langs->trans("ValueNotIntoChartOfAccount"));
+			}
 		}
 		print '</td>';
 
@@ -607,58 +656,82 @@ if ($result)
 			// Accounting account buy
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-			if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy;
+			if (empty($defaultvalue)) {
+				$defaultvalue = $compta_prodbuy;
+			}
 			$codesell = length_accountg($obj->accountancy_code_buy);
-			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			if (!empty($obj->aaid)) {
+				$defaultvalue = ''; // Do not suggest default new value is code is already valid
+			}
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_INTRA') {
 			// Accounting account buy intra (In EEC)
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-			if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy;
+			if (empty($defaultvalue)) {
+				$defaultvalue = $compta_prodbuy;
+			}
 			$codesell = length_accountg($obj->accountancy_code_buy_intra);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
-			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			if (!empty($obj->aaid)) {
+				$defaultvalue = ''; // Do not suggest default new value is code is already valid
+			}
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_BUY_EXPORT') {
 			// Accounting account buy export (Out of EEC)
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-			if (empty($defaultvalue)) $defaultvalue = $compta_prodbuy;
+			if (empty($defaultvalue)) {
+				$defaultvalue = $compta_prodbuy;
+			}
 			$codesell = length_accountg($obj->accountancy_code_buy_export);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
-			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			if (!empty($obj->aaid)) {
+				$defaultvalue = ''; // Do not suggest default new value is code is already valid
+			}
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL') {
 			// Accounting account sell
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-			if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+			if (empty($defaultvalue)) {
+				$defaultvalue = $compta_prodsell;
+			}
 			$codesell = length_accountg($obj->accountancy_code_sell);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
-			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			if (!empty($obj->aaid)) {
+				$defaultvalue = ''; // Do not suggest default new value is code is already valid
+			}
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} elseif ($accounting_product_mode == 'ACCOUNTANCY_SELL_INTRA') {
 			// Accounting account sell intra (In EEC)
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-			if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+			if (empty($defaultvalue)) {
+				$defaultvalue = $compta_prodsell;
+			}
 			$codesell = length_accountg($obj->accountancy_code_sell_intra);
 			//var_dump($defaultvalue.' - '.$codesell.' - '.$compta_prodsell);
-			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			if (!empty($obj->aaid)) {
+				$defaultvalue = ''; // Do not suggest default new value is code is already valid
+			}
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		} else {
 			// Accounting account sell export (Out of EEC)
 			print '<td class="left">';
 			//$defaultvalue=GETPOST('codeventil_' . $product_static->id,'alpha');        This is id and we need a code
-			if (empty($defaultvalue)) $defaultvalue = $compta_prodsell;
+			if (empty($defaultvalue)) {
+				$defaultvalue = $compta_prodsell;
+			}
 			$codesell = length_accountg($obj->accountancy_code_sell_export);
-			if (!empty($obj->aaid)) $defaultvalue = ''; // Do not suggest default new value is code is already valid
+			if (!empty($obj->aaid)) {
+				$defaultvalue = ''; // Do not suggest default new value is code is already valid
+			}
 			print $form->select_account($defaultvalue, 'codeventil_'.$product_static->id, 1, array(), 1, 0, 'maxwidth300 maxwidthonsmartphone productforselect');
 			print '</td>';
 		}
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index 20fe5b86355..4b7d4d029b5 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -43,20 +43,30 @@ $search_label = GETPOST('search_label', 'alpha');
 $search_type = GETPOST('search_type', 'int');
 
 // Security check
-if ($user->socid > 0) accessforbidden();
-if (!$user->rights->accounting->chartofaccount) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if (!$user->rights->accounting->chartofaccount) {
+	accessforbidden();
+}
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "label";
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "label";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 $arrayfields = array(
 	'subaccount'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
@@ -65,27 +75,35 @@ $arrayfields = array(
 	'reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1)
 );
 
-if ($conf->global->MAIN_FEATURES_LEVEL < 2) unset($arrayfields['reconcilable']);
+if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
+	unset($arrayfields['reconcilable']);
+}
 
 /*
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha')) { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha')) {
+	$massaction = '';
+}
 
 $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))
-{
-	if (!empty($cancel)) $action = '';
+if (empty($reshook)) {
+	if (!empty($cancel)) {
+		$action = '';
+	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_subaccount = "";
 		$search_label = "";
 		$search_type = "";
@@ -132,19 +150,24 @@ if (strlen(trim($search_subaccount))) {
 			$search_subaccount_tmp_clean = $search_subaccount_tmp;
 			$search_subaccount_clean = $search_subaccount;
 			$startchar = '%';
-			if (strpos($search_subaccount_tmp, '^') === 0)
-			{
+			if (strpos($search_subaccount_tmp, '^') === 0) {
 				$startchar = '';
 				$search_subaccount_tmp_clean = preg_replace('/^\^/', '', $search_subaccount_tmp);
 				$search_subaccount_clean = preg_replace('/^\^/', '', $search_subaccount);
 			}
 			$sql .= " AND (sa.code_compta LIKE '".$db->escape($startchar.$search_subaccount_tmp_clean)."'";
 			$sql .= " OR sa.code_compta LIKE '".$db->escape($startchar.$search_subaccount_clean)."%')";
-		} else $sql .= natural_search("sa.code_compta", $search_subaccount_tmp);
+		} else {
+			$sql .= natural_search("sa.code_compta", $search_subaccount_tmp);
+		}
 	}
 }
-if (strlen(trim($search_label)))				$sql .= natural_search("sa.nom", $search_label);
-if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+if (strlen(trim($search_label))) {
+	$sql .= natural_search("sa.nom", $search_label);
+}
+if (!empty($search_type) && $search_type >= 0) {
+	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+}
 
 // Supplier
 $sql .= " UNION ";
@@ -174,19 +197,24 @@ if (strlen(trim($search_subaccount))) {
 			$search_subaccount_tmp_clean = $search_subaccount_tmp;
 			$search_subaccount_clean = $search_subaccount;
 			$startchar = '%';
-			if (strpos($search_subaccount_tmp, '^') === 0)
-			{
+			if (strpos($search_subaccount_tmp, '^') === 0) {
 				$startchar = '';
 				$search_subaccount_tmp_clean = preg_replace('/^\^/', '', $search_subaccount_tmp);
 				$search_subaccount_clean = preg_replace('/^\^/', '', $search_subaccount);
 			}
 			$sql .= " AND (sa.code_compta_fournisseur LIKE '".$db->escape($startchar.$search_subaccount_tmp_clean)."'";
 			$sql .= " OR sa.code_compta_fournisseur LIKE '".$db->escape($startchar.$search_subaccount_clean)."%')";
-		} else $sql .= natural_search("sa.code_compta_fournisseur", $search_subaccount_tmp);
+		} else {
+			$sql .= natural_search("sa.code_compta_fournisseur", $search_subaccount_tmp);
+		}
 	}
 }
-if (strlen(trim($search_label)))				$sql .= natural_search("sa.nom", $search_label);
-if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+if (strlen(trim($search_label))) {
+	$sql .= natural_search("sa.nom", $search_label);
+}
+if (!empty($search_type) && $search_type >= 0) {
+	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+}
 
 // User
 $sql .= " UNION ";
@@ -216,30 +244,33 @@ if (strlen(trim($search_subaccount))) {
 			$search_subaccount_tmp_clean = $search_subaccount_tmp;
 			$search_subaccount_clean = $search_subaccount;
 			$startchar = '%';
-			if (strpos($search_subaccount_tmp, '^') === 0)
-			{
+			if (strpos($search_subaccount_tmp, '^') === 0) {
 				$startchar = '';
 				$search_subaccount_tmp_clean = preg_replace('/^\^/', '', $search_subaccount_tmp);
 				$search_subaccount_clean = preg_replace('/^\^/', '', $search_subaccount);
 			}
 			$sql .= " AND (u.accountancy_code LIKE '".$db->escape($startchar.$search_subaccount_tmp_clean)."'";
 			$sql .= " OR u.accountancy_code LIKE '".$db->escape($startchar.$search_subaccount_clean)."%')";
-		} else $sql .= natural_search("u.accountancy_code", $search_subaccount_tmp);
+		} else {
+			$sql .= natural_search("u.accountancy_code", $search_subaccount_tmp);
+		}
 	}
 }
-if (strlen(trim($search_label)))				$sql .= natural_search("u.lastname", $search_label);
-if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+if (strlen(trim($search_label))) {
+	$sql .= natural_search("u.lastname", $search_label);
+}
+if (!empty($search_type) && $search_type >= 0) {
+	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
+}
 
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	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;
 	}
@@ -250,19 +281,30 @@ $sql .= $db->plimit($limit + 1, $offset);
 dol_syslog('accountancy/admin/subaccount.php:: $sql='.$sql);
 $resql = $db->query($sql);
 
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_subaccount) $param .= '&search_subaccount='.urlencode($search_subaccount);
-	if ($search_label) $param .= '&search_label='.urlencode($search_label);
-	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 ($search_subaccount) {
+		$param .= '&search_subaccount='.urlencode($search_subaccount);
+	}
+	if ($search_label) {
+		$param .= '&search_label='.urlencode($search_label);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 
 	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">';
@@ -285,10 +327,20 @@ if ($resql)
 
 	// Line for search fields
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['subaccount']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_subaccount" value="'.$search_subaccount.'"></td>';
-	if (!empty($arrayfields['label']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="'.$search_label.'"></td>';
-	if (!empty($arrayfields['type']['checked']))		print '<td class="liste_titre center">'.$form->selectarray('search_type', array('1'=>$langs->trans('Customer'), '2'=>$langs->trans('Supplier'), '3'=>$langs->trans('Employee')), $search_type, 1).'</td>';
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
+	if (!empty($arrayfields['subaccount']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_subaccount" value="'.$search_subaccount.'"></td>';
+	}
+	if (!empty($arrayfields['label']['checked'])) {
+		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="'.$search_label.'"></td>';
+	}
+	if (!empty($arrayfields['type']['checked'])) {
+		print '<td class="liste_titre center">'.$form->selectarray('search_type', array('1'=>$langs->trans('Customer'), '2'=>$langs->trans('Supplier'), '3'=>$langs->trans('Employee')), $search_type, 1).'</td>';
+	}
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		if (!empty($arrayfields['reconcilable']['checked'])) {
+			print '<td class="liste_titre">&nbsp;</td>';
+		}
+	}
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
@@ -296,62 +348,69 @@ if ($resql)
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['subaccount']['checked']))	print_liste_field_titre($arrayfields['subaccount']['label'], $_SERVER["PHP_SELF"], "subaccount", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['label']['checked']))		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], "label", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['type']['checked']))		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'center ');
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['reconcilable']['checked']))	print_liste_field_titre($arrayfields['reconcilable']['label'], $_SERVER["PHP_SELF"], 'reconcilable', '', $param, '', $sortfield, $sortorder, 'center '); }
+	if (!empty($arrayfields['subaccount']['checked'])) {
+		print_liste_field_titre($arrayfields['subaccount']['label'], $_SERVER["PHP_SELF"], "subaccount", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['label']['checked'])) {
+		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], "label", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['type']['checked'])) {
+		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		if (!empty($arrayfields['reconcilable']['checked'])) {
+			print_liste_field_titre($arrayfields['reconcilable']['label'], $_SERVER["PHP_SELF"], 'reconcilable', '', $param, '', $sortfield, $sortorder, 'center ');
+		}
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
 	$totalarray = array();
 	$i = 0;
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
 
 		// Account number
-		if (!empty($arrayfields['subaccount']['checked']))
-		{
+		if (!empty($arrayfields['subaccount']['checked'])) {
 			print "<td>";
 			print length_accounta($obj->subaccount);
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Subaccount label
-		if (!empty($arrayfields['label']['checked']))
-		{
+		if (!empty($arrayfields['label']['checked'])) {
 			print "<td>";
 			print $obj->label;
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Type
-		if (!empty($arrayfields['type']['checked']))
-		{
+		if (!empty($arrayfields['type']['checked'])) {
 			print '<td class="center">';
 			$s = '';
 			// Customer
-			if ($obj->type == 1)
-			{
+			if ($obj->type == 1) {
 				$s .= '<a class="customer-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->rowid.'">'.$langs->trans("Customer").'</a>';
-			}
-			// Supplier
-			elseif ($obj->type == 2)
-			{
+			} elseif ($obj->type == 2) {
+				// Supplier
 				$s .= '<a class="vendor-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->rowid.'">'.$langs->trans("Supplier").'</a>';
-			}
-			// User
-			elseif ($obj->type == 3)
-			{
+			} elseif ($obj->type == 3) {
+				// User
 				$s .= '<a class="user-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->id.'">'.$langs->trans("Employee").'</a>';
 			}
 			print $s;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
@@ -376,25 +435,22 @@ if ($resql)
 
 		// Action
 		print '<td class="center">';
-			$e = '';
-			// Customer
-		if ($obj->type == 1)
-			{
+		$e = '';
+		// Customer
+		if ($obj->type == 1) {
 			$e .= '<a class="editfielda" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
-		}
+		} elseif ($obj->type == 2) {
 			// Supplier
-		elseif ($obj->type == 2)
-			{
 			$e .= '<a class="editfielda" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/societe/card.php?action=edit&socid='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
-		}
+		} elseif ($obj->type == 3) {
 			// User
-		elseif ($obj->type == 3)
-			{
 			$e .= '<a class="editfielda" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?action=edit&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"]).'">'.img_edit().'</a>';
 		}
-			print $e;
+		print $e;
 		print '</td>'."\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print '</tr>'."\n";
 		$i++;
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index de60bd09897..35473c6329e 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -48,7 +48,9 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -74,8 +76,7 @@ $formaccounting = new FormAccounting($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
-if (empty($search_date_start) && !GETPOSTISSET('formfilteraction'))
-{
+if (empty($search_date_start) && !GETPOSTISSET('formfilteraction')) {
 	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 	$sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'";
 	$sql .= $db->plimit(1);
@@ -87,11 +88,12 @@ if (empty($search_date_start) && !GETPOSTISSET('formfilteraction'))
 	} else {
 		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_start = dol_print_date(dol_now(), '%Y');
-		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+		if (dol_print_date(dol_now(), '%m') < $month_start) {
+			$year_start--; // If current month is lower that starting fiscal month, we start last year
+		}
 		$year_end = $year_start + 1;
 		$month_end = $month_start - 1;
-		if ($month_end < 1)
-		{
+		if ($month_end < 1) {
 			$month_end = 12;
 			$year_end--;
 		}
@@ -99,13 +101,21 @@ if (empty($search_date_start) && !GETPOSTISSET('formfilteraction'))
 		$search_date_end = dol_get_last_day($year_end, $month_end);
 	}
 }
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "t.numero_compte";
+if ($sortorder == "") {
+	$sortorder = "ASC";
+}
+if ($sortfield == "") {
+	$sortfield = "t.numero_compte";
+}
 
 
 $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);
+}
 
 $filter = array();
 if (!empty($search_date_start)) {
@@ -129,8 +139,7 @@ if (!empty($search_accountancy_code_end)) {
  * Action
  */
 
-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
 	$show_subgroup = '';
 	$search_date_start = '';
 	$search_date_end = '';
@@ -144,8 +153,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
  * View
  */
 
-if ($action == 'export_csv')
-{
+if ($action == 'export_csv') {
 	$sep = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 
 	$filename = 'balance';
@@ -157,8 +165,7 @@ if ($action == 'export_csv')
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	foreach ($object->lines as $line)
-	{
+	foreach ($object->lines as $line) {
 		print length_accountg($line->numero_compte).$sep;
 		print $object->get_compte_desc($line->numero_compte).$sep;
 		print price($line->debit).$sep;
@@ -176,12 +183,10 @@ $title_page = $langs->trans("AccountBalance");
 llxHeader('', $title_page);
 
 
-if ($action != 'export_csv')
-{
+if ($action != 'export_csv') {
 	// List
 	$nbtotalofrecords = '';
-	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-	{
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$nbtotalofrecords = $object->fetchAllBalance($sortorder, $sortfield, 0, 0, $filter);
 		if ($nbtotalofrecords < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -194,7 +199,9 @@ if ($action != 'export_csv')
 	}
 
 	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" id="action" value="list">';
@@ -263,7 +270,9 @@ if ($action != 'export_csv')
 
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("AccountAccounting", $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		print_liste_field_titre("OpeningBalance", $_SERVER['PHP_SELF'], "", $param, "", 'class="right"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre("Debit", $_SERVER['PHP_SELF'], "t.debit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Credit", $_SERVER['PHP_SELF'], "t.credit", "", $param, 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre("Balance", $_SERVER["PHP_SELF"], "", $param, "", 'class="right"', $sortfield, $sortorder);
@@ -298,8 +307,7 @@ if ($action != 'export_csv')
 		}
 	}
 
-	foreach ($object->lines as $line)
-	{
+	foreach ($object->lines as $line) {
 		// reset before the fetch (in case of the fetch fails)
 		$accountingaccountstatic->id = 0;
 		$accountingaccountstatic->account_number = '';
@@ -336,15 +344,16 @@ if ($action != 'export_csv')
 			//$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=create&token=' . newToken() . '&accountingaccount=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
 		}
 
-		if (!empty($show_subgroup))
-		{
+		if (!empty($show_subgroup)) {
 			// Show accounting account
 			if (empty($displayed_account) || $root_account_number != $displayed_account) {
 				// Show subtotal per accounting account
 				if ($displayed_account != "") {
 					print '<tr class="liste_total">';
 					print '<td class="right">'.$langs->trans("SubTotal").':</td>';
-					if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+					if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+						print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+					}
 					print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
 					print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
 					if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
@@ -370,7 +379,9 @@ if ($action != 'export_csv')
 
 		print '<tr class="oddeven">';
 		print '<td>'.$accounting_account.'</td>';
-		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowraponall right">'.price($opening_balance).'</td>';
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+			print '<td class="nowraponall right">'.price($opening_balance).'</td>';
+		}
 
 		$urlzoom = '';
 		if ($line->numero_compte) {
@@ -402,10 +413,11 @@ if ($action != 'export_csv')
 		$sous_total_opening_balance += $opening_balance;
 	}
 
-	if (!empty($show_subgroup))
-	{
+	if (!empty($show_subgroup)) {
 		print '<tr class="liste_total"><td class="right">'.$langs->trans("SubTotal").':</td>';
-		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+			print '<td class="nowrap right">'.price($sous_total_opening_balance).'</td>';
+		}
 		print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
 		print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
@@ -418,7 +430,9 @@ if ($action != 'export_csv')
 	}
 
 	print '<tr class="liste_total"><td class="right">'.$langs->trans("AccountBalance").':</td>';
-	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) print '<td class="nowrap right">'.price($total_opening_balance).'</td>';
+	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
+		print '<td class="nowrap right">'.price($total_opening_balance).'</td>';
+	}
 	print '<td class="nowrap right">'.price($total_debit).'</td>';
 	print '<td class="nowrap right">'.price($total_credit).'</td>';
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
diff --git a/htdocs/accountancy/bookkeeping/balancebymonth.php b/htdocs/accountancy/bookkeeping/balancebymonth.php
index f27d535f57c..20fe0c1aef4 100644
--- a/htdocs/accountancy/bookkeeping/balancebymonth.php
+++ b/htdocs/accountancy/bookkeeping/balancebymonth.php
@@ -73,8 +73,7 @@ $y = $year_current;
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td width=150>'.$langs->trans("Label").'</td>';
-for ($i = 1; $i <= 12; $i++)
-{
+for ($i = 1; $i <= 12; $i++) {
 	print '<td class="right">'.$langs->trans("MonthShort".sprintf("%02s", $i)).'</td>';
 }
 print '<td class="center"><strong>'.$langs->trans("Total").'</strong></td>';
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index e5a061d34bd..3ab9ed0a702 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -73,9 +73,13 @@ $debit = price2num(GETPOST('debit', 'alpha'));
 $credit = price2num(GETPOST('credit', 'alpha'));
 
 $save = GETPOST('save', 'alpha');
-if (!empty($save)) $action = 'add';
+if (!empty($save)) {
+	$action = 'add';
+}
 $update = GETPOST('update', 'alpha');
-if (!empty($update)) $action = 'confirm_update';
+if (!empty($update)) {
+	$action = 'confirm_update';
+}
 
 $object = new BookKeeping($db);
 
@@ -92,15 +96,13 @@ if ($action == "confirm_update") {
 		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 		$action = 'update';
 	}
-	if (empty($accountingaccount_number) || $accountingaccount_number == '-1')
-	{
+	if (empty($accountingaccount_number) || $accountingaccount_number == '-1') {
 		$error++;
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
 		$action = 'update';
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$object = new BookKeeping($db);
 
 		$result = $object->fetch($id, null, $mode);
@@ -145,14 +147,12 @@ if ($action == "confirm_update") {
 } elseif ($action == "add") {
 	$error = 0;
 
-	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0))
-	{
+	if ((floatval($debit) != 0.0) && (floatval($credit) != 0.0)) {
 		$error++;
 		setEventMessages($langs->trans('ErrorDebitCredit'), null, 'errors');
 		$action = '';
 	}
-	if (empty($accountingaccount_number) || $accountingaccount_number == '-1')
-	{
+	if (empty($accountingaccount_number) || $accountingaccount_number == '-1') {
 		$error++;
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("AccountAccountingShort")), null, 'errors');
 		$action = '';
@@ -228,15 +228,13 @@ if ($action == "confirm_update") {
 		$action = 'create';
 		$error++;
 	}
-	if (!GETPOST('doc_ref', 'alpha'))
-	{
+	if (!GETPOST('doc_ref', 'alpha')) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Piece")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$object->label_compte = '';
 		$object->debit = 0;
 		$object->credit = 0;
@@ -255,8 +253,7 @@ if ($action == "confirm_update") {
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
-			if ($mode != '_tmp')
-			{
+			if ($mode != '_tmp') {
 				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 			}
 			$action = 'update';
@@ -272,8 +269,7 @@ if ($action == 'setdate') {
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
-		if ($mode != '_tmp')
-		{
+		if ($mode != '_tmp') {
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		}
 		$action = '';
@@ -286,8 +282,7 @@ if ($action == 'setjournal') {
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
-		if ($mode != '_tmp')
-		{
+		if ($mode != '_tmp') {
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		}
 		$action = '';
@@ -300,8 +295,7 @@ if ($action == 'setdocref') {
 	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
-		if ($mode != '_tmp')
-		{
+		if ($mode != '_tmp') {
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		}
 		$action = '';
@@ -335,20 +329,20 @@ if ($action == 'delete') {
 	print $formconfirm;
 }
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("CreateMvts"));
 
 	$object = new BookKeeping($db);
 	$next_num_mvt = $object->getNextNumMvt('_tmp');
 
-	if (empty($next_num_mvt))
-	{
+	if (empty($next_num_mvt)) {
 		dol_print_error('', 'Failed to get next piece number');
 	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" name="create_mvt" method="POST">';
-	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="action" value="confirm_create">'."\n";
 	print '<input type="hidden" name="next_num_mvt" value="'.$next_num_mvt.'">'."\n";
@@ -405,8 +399,7 @@ if ($action == 'create')
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	if (!empty($object->piece_num))
-	{
+	if (!empty($object->piece_num)) {
 		$backlink = '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?restore_lastsearch_values=1">'.$langs->trans('BackToList').'</a>';
 
 		print load_fiche_titre($langs->trans("UpdateMvts"), $backlink);
@@ -439,13 +432,16 @@ if ($action == 'create')
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Docdate');
 		print '</td>';
-		if ($action != 'editdate')
-		print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
+		if ($action != 'editdate') {
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('SetDate'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editdate') {
 			print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			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="action" value="setdate">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
@@ -463,13 +459,16 @@ if ($action == 'create')
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Codejournal');
 		print '</td>';
-		if ($action != 'editjournal')
-		print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		if ($action != 'editjournal') {
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editjournal&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editjournal') {
 			print '<form name="setjournal" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			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="action" value="setjournal">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
@@ -487,13 +486,16 @@ if ($action == 'create')
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Piece');
 		print '</td>';
-		if ($action != 'editdocref')
-		print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		if ($action != 'editdocref') {
+			print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editdocref&amp;piece_num='.$object->piece_num.'&amp;mode='.$mode.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editdocref') {
 			print '<form name="setdocref" action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			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="action" value="setdocref">';
 			print '<input type="hidden" name="mode" value="'.$mode.'">';
@@ -516,8 +518,7 @@ if ($action == 'create')
 		print '<table class="border tableforfield" width="100%">';
 
 		// Doc type
-		if (!empty($object->doc_type))
-		{
+		if (!empty($object->doc_type)) {
 			print '<tr>';
 			print '<td class="titlefield">'.$langs->trans("Doctype").'</td>';
 			print '<td>'.$object->doc_type.'</td>';
@@ -589,7 +590,9 @@ if ($action == 'create')
 			print load_fiche_titre($langs->trans("ListeMvts"), '', '');
 
 			print '<form action="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'" method="post">';
-			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="doc_date" value="'.$object->doc_date.'">'."\n";
 			print '<input type="hidden" name="doc_type" value="'.$object->doc_type.'">'."\n";
@@ -664,7 +667,9 @@ if ($action == 'create')
 						print '</a> &nbsp;';
 
 						$actiontodelete = 'delete';
-						if ($mode == '_tmp' || $action != 'delmouv') $actiontodelete = 'confirm_delete';
+						if ($mode == '_tmp' || $action != 'delmouv') {
+							$actiontodelete = 'confirm_delete';
+						}
 
 						print '<a href="'.$_SERVER["PHP_SELF"].'?action='.$actiontodelete.'&id='.$line->id.'&piece_num='.urlencode($line->piece_num).'&mode='.urlencode($mode).'&token='.urlencode(newToken()).'">';
 						print img_delete();
@@ -678,8 +683,7 @@ if ($action == 'create')
 				$total_debit = price2num($total_debit, 'MT');
 				$total_credit = price2num($total_credit, 'MT');
 
-				if ($total_debit != $total_credit)
-				{
+				if ($total_debit != $total_credit) {
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
 				}
 
@@ -710,12 +714,10 @@ if ($action == 'create')
 				print '</table>';
 
 
-				if ($mode == '_tmp' && $action == '')
-				{
+				if ($mode == '_tmp' && $action == '') {
 					print '<br>';
 					print '<div class="center">';
-					if ($total_debit == $total_credit)
-					{
+					if ($total_debit == $total_credit) {
 						print '<a class="button" href="'.$_SERVER["PHP_SELF"].'?piece_num='.$object->piece_num.'&action=valid">'.$langs->trans("ValidTransaction").'</a>';
 					} else {
 						print '<input type="submit" class="button" disabled="disabled" href="#" title="'.dol_escape_htmltag($langs->trans("MvtNotCorrectlyBalanced", $debit, $credit)).'" value="'.dol_escape_htmltag($langs->trans("ValidTransaction")).'">';
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 54364cc3829..8ca4175f87f 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -94,12 +94,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) { $page = 0; }
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "t.piece_num,t.rowid";
+if ($sortorder == "") {
+	$sortorder = "ASC";
+}
+if ($sortfield == "") {
+	$sortfield = "t.piece_num,t.rowid";
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new BookKeeping($db);
@@ -108,10 +114,8 @@ $hookmanager->initHooks(array('bookkeepinglist'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export)
-{
-	if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values') && !GETPOST('search_accountancy_code_start'))
-	{
+if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !GETPOSTISSET('formfilteraction') && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export) {
+	if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values') && !GETPOST('search_accountancy_code_start')) {
 		$query = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 		$query .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."' limit 1";
 		$res = $db->query($query);
@@ -123,11 +127,12 @@ if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GE
 		} else {
 			$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 			$year_start = dol_print_date(dol_now(), '%Y');
-			if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+			if (dol_print_date(dol_now(), '%m') < $month_start) {
+				$year_start--; // If current month is lower that starting fiscal month, we start last year
+			}
 			$year_end = $year_start + 1;
 			$month_end = $month_start - 1;
-			if ($month_end < 1)
-			{
+			if ($month_end < 1) {
 				$month_end = 12;
 				$year_end--;
 			}
@@ -154,11 +159,15 @@ $arrayfields = array(
 	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
 );
 
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
+	unset($arrayfields['t.lettering_code']);
+}
 
 $listofformat = AccountancyExport::getType();
 $formatexportset = $conf->global->ACCOUNTING_EXPORT_MODELCSV;
-if (empty($listofformat[$formatexportset])) $formatexportset = 1;
+if (empty($listofformat[$formatexportset])) {
+	$formatexportset = 1;
+}
 
 $error = 0;
 
@@ -167,19 +176,23 @@ $error = 0;
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	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_mvt_num = '';
 		$search_doc_type = '';
 		$search_doc_ref = '';
@@ -348,8 +361,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$deljournal = 0;
 	}
 
-	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal))
-	{
+	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal)) {
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -381,7 +393,9 @@ if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->suppri
 }
 if ($action == 'setreexport') {
 	$setreexport = GETPOST('value', 'int');
-	if (!dolibarr_set_const($db, "ACCOUNTING_REEXPORT", $setreexport, 'yesno', 0, '', $conf->entity)) $error++;
+	if (!dolibarr_set_const($db, "ACCOUNTING_REEXPORT", $setreexport, 'yesno', 0, '', $conf->entity)) {
+		$error++;
+	}
 
 	if (!$error) {
 		if ($conf->global->ACCOUNTING_REEXPORT == 1) {
@@ -475,26 +489,22 @@ if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->ex
 	// TODO Replace the fetchAll + ->export later that consume too much memory on large export with the query($sql) and loop on each line to export them.
 	$result = $object->fetchAll($sortorder, $sortfield, 0, 0, $filter, 'AND', $conf->global->ACCOUNTING_REEXPORT);
 
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
 		// Export files
 		$accountancyexport = new AccountancyExport($db);
 		$accountancyexport->export($object->lines, $formatexportset);
 
-		if (!empty($accountancyexport->errors))
-		{
+		if (!empty($accountancyexport->errors)) {
 			setEventMessages('', $accountancyexport->errors, 'errors');
 		} else {
 			// Specify as export : update field date_export
 			$error = 0;
 			$db->begin();
 
-			if (is_array($object->lines))
-			{
-				foreach ($object->lines as $movement)
-				{
+			if (is_array($object->lines)) {
+				foreach ($object->lines as $movement) {
 					$now = dol_now();
 
 					$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
@@ -504,16 +514,14 @@ if ($action == 'export_fileconfirm' && $user->rights->accounting->mouvements->ex
 
 					dol_syslog("/accountancy/bookeeping/list.php Function export_file Specify movements as exported sql=".$sql, LOG_DEBUG);
 					$result = $db->query($sql);
-					if (!$result)
-					{
+					if (!$result) {
 						$error++;
 						break;
 					}
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 				// setEventMessages($langs->trans("AllExportedMovementsWereRecordedAsExported"), null, 'mesgs');
 			} else {
@@ -538,26 +546,22 @@ $title_page = $langs->trans("Operations").' - '.$langs->trans("Journals");
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
-{
+if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
 	$num = $nbtotalofrecords;
 } else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		exit;
 	}
@@ -636,19 +640,28 @@ if ($action == 'delbookkeepingyear') {
 }
 
 //$param='';	param started before
-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);
+}
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.urlencode($optioncss).'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.urlencode($optioncss).'">';
+}
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.urlencode($sortfield).'">';
 print '<input type="hidden" name="sortorder" value="'.urlencode($sortorder).'">';
 
-if (count($filter)) $buttonLabel = $langs->trans("ExportFilteredList");
-else $buttonLabel = $langs->trans("ExportList");
+if (count($filter)) {
+	$buttonLabel = $langs->trans("ExportFilteredList");
+} else {
+	$buttonLabel = $langs->trans("ExportList");
+}
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -661,14 +674,18 @@ if (empty($reshook)) {
 	}
 	$newcardbutton .= '<span class="valignmiddle marginrightonly">'.$langs->trans("IncludeDocsAlreadyExported").'</span>';
 
-	if (!empty($user->rights->accounting->mouvements->export)) $newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export);
+	if (!empty($user->rights->accounting->mouvements->export)) {
+		$newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export);
+	}
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
 
 	$url = './card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->rights->accounting->mouvements->creer);
 }
 
@@ -676,12 +693,17 @@ print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield,
 
 $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);
+}
 
 $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;
+}
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste centpercent">';
@@ -690,18 +712,15 @@ print '<table class="tagtable liste centpercent">';
 print '<tr class="liste_titre_filter">';
 
 // Movement number
-if (!empty($arrayfields['t.piece_num']['checked']))
-{
+if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
 }
 // Code journal
-if (!empty($arrayfields['t.code_journal']['checked']))
-{
+if (!empty($arrayfields['t.code_journal']['checked'])) {
 	print '<td class="liste_titre center"><input type="text" name="search_ledger_code" size="3" value="'.(is_array($search_ledger_code) ? join('|', $search_ledger_code) : $search_ledger_code).'"></td>';
 }
 // Date document
-if (!empty($arrayfields['t.doc_date']['checked']))
-{
+if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
 	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
@@ -712,13 +731,11 @@ if (!empty($arrayfields['t.doc_date']['checked']))
 	print '</td>';
 }
 // Ref document
-if (!empty($arrayfields['t.doc_ref']['checked']))
-{
+if (!empty($arrayfields['t.doc_ref']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_doc_ref" size="8" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
 }
 // Accountancy account
-if (!empty($arrayfields['t.numero_compte']['checked']))
-{
+if (!empty($arrayfields['t.numero_compte']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<div class="nowrap">';
 	print $langs->trans('From').' ';
@@ -731,14 +748,12 @@ if (!empty($arrayfields['t.numero_compte']['checked']))
 	print '</td>';
 }
 // Subledger account
-if (!empty($arrayfields['t.subledger_account']['checked']))
-{
+if (!empty($arrayfields['t.subledger_account']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<div class="nowrap">';
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
-	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-	{
+	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
 		print $langs->trans('From').' ';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 	} else {
@@ -748,8 +763,7 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 	print '<div class="nowrap">';
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
-	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
-	{
+	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
 		print $langs->trans('to').' ';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 	} else {
@@ -759,29 +773,25 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 	print '</td>';
 }
 // Label operation
-if (!empty($arrayfields['t.label_operation']['checked']))
-{
+if (!empty($arrayfields['t.label_operation']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" size="7" class="flat" name="search_mvt_label" value="'.$search_mvt_label.'"/>';
 	print '</td>';
 }
 // Debit
-if (!empty($arrayfields['t.debit']['checked']))
-{
+if (!empty($arrayfields['t.debit']['checked'])) {
 	print '<td class="liste_titre right">';
 	print '<input type="text" class="flat" name="search_debit" size="4" value="'.dol_escape_htmltag($search_debit).'">';
 	print '</td>';
 }
 // Credit
-if (!empty($arrayfields['t.credit']['checked']))
-{
+if (!empty($arrayfields['t.credit']['checked'])) {
 	print '<td class="liste_titre right">';
 	print '<input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'">';
 	print '</td>';
 }
 // Lettering code
-if (!empty($arrayfields['t.lettering_code']['checked']))
-{
+if (!empty($arrayfields['t.lettering_code']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
 	print '<br><span class="nowrap"><input type="checkbox" name="search_not_reconciled" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
@@ -794,8 +804,7 @@ $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // N
 print $hookmanager->resPrint;
 
 // Date creation
-if (!empty($arrayfields['t.date_creation']['checked']))
-{
+if (!empty($arrayfields['t.date_creation']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
 	print $form->selectDate($search_date_creation_start, 'date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
@@ -806,8 +815,7 @@ if (!empty($arrayfields['t.date_creation']['checked']))
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['t.tms']['checked']))
-{
+if (!empty($arrayfields['t.tms']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
 	print $form->selectDate($search_date_modification_start, 'date_modification_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
@@ -818,8 +826,7 @@ if (!empty($arrayfields['t.tms']['checked']))
 	print '</td>';
 }
 // Date export
-if (!empty($arrayfields['t.date_export']['checked']))
-{
+if (!empty($arrayfields['t.date_export']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
 	print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
@@ -837,23 +844,49 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['t.piece_num']['checked']))			print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.numero_compte']['checked']))		print_liste_field_titre($arrayfields['t.numero_compte']['label'], $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.subledger_account']['checked']))	print_liste_field_titre($arrayfields['t.subledger_account']['label'], $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.debit']['checked']))				print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.piece_num']['checked'])) {
+	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.code_journal']['checked'])) {
+	print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.doc_date']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.doc_ref']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.numero_compte']['checked'])) {
+	print_liste_field_titre($arrayfields['t.numero_compte']['label'], $_SERVER['PHP_SELF'], "t.numero_compte", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.subledger_account']['checked'])) {
+	print_liste_field_titre($arrayfields['t.subledger_account']['label'], $_SERVER['PHP_SELF'], "t.subledger_account", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.label_operation']['checked'])) {
+	print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.debit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.credit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.lettering_code']['checked'])) {
+	print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Hook fields
 $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['t.date_creation']['checked']))		print_liste_field_titre($arrayfields['t.date_creation']['label'], $_SERVER['PHP_SELF'], "t.date_creation", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.tms']['checked']))					print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER['PHP_SELF'], "t.tms", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.date_export']['checked']))          print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.date_creation']['checked'])) {
+	print_liste_field_titre($arrayfields['t.date_creation']['label'], $_SERVER['PHP_SELF'], "t.date_creation", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER['PHP_SELF'], "t.tms", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.date_export']['checked'])) {
+	print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
@@ -864,10 +897,11 @@ $line = new BookKeepingLine();
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
 	$line->id = $obj->rowid;
 	$line->doc_date = $db->jdate($obj->doc_date);
@@ -902,38 +936,39 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 
 	// Piece number
-	if (!empty($arrayfields['t.piece_num']['checked']))
-	{
+	if (!empty($arrayfields['t.piece_num']['checked'])) {
 		print '<td>';
 		$object->id = $line->id;
 		$object->piece_num = $line->piece_num;
 		print $object->getNomUrl(1, '', 0, '', 1);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Journal code
-	if (!empty($arrayfields['t.code_journal']['checked']))
-	{
+	if (!empty($arrayfields['t.code_journal']['checked'])) {
 		$accountingjournal = new AccountingJournal($db);
 		$result = $accountingjournal->fetch('', $line->code_journal);
 		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
 		print '<td class="center">'.$journaltoshow.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Document date
-	if (!empty($arrayfields['t.doc_date']['checked']))
-	{
+	if (!empty($arrayfields['t.doc_date']['checked'])) {
 		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Document ref
-	if (!empty($arrayfields['t.doc_ref']['checked']))
-	{
-		if ($line->doc_type == 'customer_invoice')
-		{
+	if (!empty($arrayfields['t.doc_ref']['checked'])) {
+		if ($line->doc_type == 'customer_invoice') {
 			$langs->loadLangs(array('bills'));
 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -945,8 +980,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'supplier_invoice')
-		{
+		} elseif ($line->doc_type == 'supplier_invoice') {
 			$langs->loadLangs(array('bills'));
 
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
@@ -958,8 +992,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-		} elseif ($line->doc_type == 'expense_report')
-		{
+		} elseif ($line->doc_type == 'expense_report') {
 			$langs->loadLangs(array('trips'));
 
 			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
@@ -971,8 +1004,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'bank')
-		{
+		} elseif ($line->doc_type == 'bank') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 			$objectstatic = new AccountLine($db);
 			$objectstatic->fetch($line->fk_doc);
@@ -986,8 +1018,7 @@ while ($i < min($num, $limit))
 		// Picto + Ref
 		print '<td class="nobordernopadding nowrap">';
 
-		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
-		{
+		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report') {
 			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 			print $documentlink;
 		} elseif ($line->doc_type == 'bank') {
@@ -1000,53 +1031,65 @@ while ($i < min($num, $limit))
 		print '</td></tr></table>';
 
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Account number
-	if (!empty($arrayfields['t.numero_compte']['checked']))
-	{
+	if (!empty($arrayfields['t.numero_compte']['checked'])) {
 		print '<td>'.length_accountg($line->numero_compte).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Subledger account
-	if (!empty($arrayfields['t.subledger_account']['checked']))
-	{
+	if (!empty($arrayfields['t.subledger_account']['checked'])) {
 		print '<td>'.length_accounta($line->subledger_account).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Label operation
-	if (!empty($arrayfields['t.label_operation']['checked']))
-	{
+	if (!empty($arrayfields['t.label_operation']['checked'])) {
 		print '<td>'.$line->label_operation.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount debit
-	if (!empty($arrayfields['t.debit']['checked']))
-	{
+	if (!empty($arrayfields['t.debit']['checked'])) {
 		print '<td class="nowrap right">'.($line->debit != 0 ? price($line->debit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		}
 		$totalarray['val']['totaldebit'] += $line->debit;
 	}
 
 	// Amount credit
-	if (!empty($arrayfields['t.credit']['checked']))
-	{
+	if (!empty($arrayfields['t.credit']['checked'])) {
 		print '<td class="nowrap right">'.($line->credit != 0 ? price($line->credit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		}
 		$totalarray['val']['totalcredit'] += $line->credit;
 	}
 
 	// Lettering code
-	if (!empty($arrayfields['t.lettering_code']['checked']))
-	{
+	if (!empty($arrayfields['t.lettering_code']['checked'])) {
 		print '<td class="center">'.$line->lettering_code.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Fields from hook
@@ -1055,24 +1098,27 @@ while ($i < min($num, $limit))
 	print $hookmanager->resPrint;
 
 	// Creation operation date
-	if (!empty($arrayfields['t.date_creation']['checked']))
-	{
+	if (!empty($arrayfields['t.date_creation']['checked'])) {
 		print '<td class="center">'.dol_print_date($line->date_creation, 'dayhour').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Modification operation date
-	if (!empty($arrayfields['t.tms']['checked']))
-	{
+	if (!empty($arrayfields['t.tms']['checked'])) {
 		print '<td class="center">'.dol_print_date($line->date_modification, 'dayhour').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Exported operation date
-	if (!empty($arrayfields['t.date_export']['checked']))
-	{
+	if (!empty($arrayfields['t.date_export']['checked'])) {
 		print '<td class="center">'.dol_print_date($line->date_export, 'dayhour').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Action column
@@ -1087,7 +1133,9 @@ while ($i < min($num, $limit))
 	}
 	print '</td>';
 
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print "</tr>\n";
 
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 9e62f9e0b79..99b644d1e0a 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -85,12 +85,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) { $page = 0; }
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if ($sortorder == "") $sortorder = "ASC";
-if ($sortfield == "") $sortfield = "t.doc_date,t.rowid";
+if ($sortorder == "") {
+	$sortorder = "ASC";
+}
+if ($sortfield == "") {
+	$sortfield = "t.doc_date,t.rowid";
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new BookKeeping($db);
@@ -113,11 +119,12 @@ if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('searc
 	} else {
 		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_start = dol_print_date(dol_now(), '%Y');
-		if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+		if (dol_print_date(dol_now(), '%m') < $month_start) {
+			$year_start--; // If current month is lower that starting fiscal month, we start last year
+		}
 		$year_end = $year_start + 1;
 		$month_end = $month_start - 1;
-		if ($month_end < 1)
-		{
+		if ($month_end < 1) {
 			$month_end = 12;
 			$year_end--;
 		}
@@ -139,7 +146,9 @@ $arrayfields = array(
 	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
 );
 
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) unset($arrayfields['t.lettering_code']);
+if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
+	unset($arrayfields['t.lettering_code']);
+}
 
 if ($search_date_start && empty($search_date_startyear)) {
 	$tmparray = dol_getdate($search_date_start);
@@ -159,19 +168,23 @@ if ($search_date_end && empty($search_date_endyear)) {
  * Action
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	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_doc_date = '';
 		$search_accountancy_code = '';
 		$search_accountancy_code_start = '';
@@ -305,8 +318,7 @@ if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouveme
 		$deljournal = 0;
 	}
 
-	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal))
-	{
+	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal)) {
 		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -418,7 +430,9 @@ if ($action == 'delbookkeepingyear') {
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
-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="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
@@ -432,18 +446,27 @@ if (empty($reshook)) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
 
-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);
+}
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $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);
+}
 
 // Reverse sort order
-if (preg_match('/^asc/i', $sortorder)) $sortorder = "asc";
-else $sortorder = "desc";
+if (preg_match('/^asc/i', $sortorder)) {
+	$sortorder = "asc";
+} else {
+	$sortorder = "desc";
+}
 
 $moreforfilter = '';
 
@@ -460,8 +483,11 @@ $moreforfilter .= '</div>';
 
 $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;
+}
 
 print '<div class="liste_titre liste_titre_bydiv centpercent">';
 print $moreforfilter;
@@ -474,8 +500,7 @@ print '<table class="tagtable liste centpercent">';
 print '<tr class="liste_titre_filter">';
 
 // Movement number
-if (!empty($arrayfields['t.piece_num']['checked']))
-{
+if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
 }
 // Code journal
@@ -512,8 +537,7 @@ if (!empty($arrayfields['t.credit']['checked'])) {
 	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
 }
 // Lettering code
-if (!empty($arrayfields['t.lettering_code']['checked']))
-{
+if (!empty($arrayfields['t.lettering_code']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
 	print '<br><span class="nowrap"><input type="checkbox" name="search_not_reconciled" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
@@ -544,15 +568,33 @@ print '</td>';
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['t.piece_num']['checked']))				print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['t.code_journal']['checked']))			print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.doc_date']['checked']))				print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.doc_ref']['checked']))				print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.label_operation']['checked']))		print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['t.debit']['checked']))					print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.credit']['checked']))				print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.lettering_code']['checked']))		print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['t.date_export']['checked']))			print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['t.piece_num']['checked'])) {
+	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.code_journal']['checked'])) {
+	print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.doc_date']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.doc_ref']['checked'])) {
+	print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.label_operation']['checked'])) {
+	print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.debit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.credit']['checked'])) {
+	print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.lettering_code']['checked'])) {
+	print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['t.date_export']['checked'])) {
+	print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Hook fields
 $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
@@ -571,8 +613,7 @@ $displayed_account_number = null; // Start with undefined to be able to distingu
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$line = $object->lines[$i];
 
 	$total_debit += $line->debit;
@@ -586,11 +627,15 @@ while ($i < min($num, $limit))
 		$colnumber = 5;
 		$colnumberend = 7;
 
-		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) $colnumber--;
-		if (empty($arrayfields['t.date_export']['checked'])) $colnumber--;
+		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+			$colnumber--;
+		}
+		if (empty($arrayfields['t.date_export']['checked'])) {
+			$colnumber--;
+		}
 
-        $colspan = $totalarray['nbfield'] - $colnumber;
-        $colspanend = $totalarray['nbfield'] - $colnumberend;
+		$colspan = $totalarray['nbfield'] - $colnumber;
+		$colspanend = $totalarray['nbfield'] - $colnumberend;
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
@@ -603,8 +648,7 @@ while ($i < min($num, $limit))
 			$balance = $sous_total_debit - $sous_total_credit;
 			print '<tr class="liste_total">';
 			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-			if ($balance > 0)
-			{
+			if ($balance > 0) {
 				print '<td class="nowraponall right">';
 				print price($sous_total_debit - $sous_total_credit);
 				print '</td>';
@@ -622,8 +666,11 @@ while ($i < min($num, $limit))
 		// Show the break account
 		print "<tr>";
 		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" style="font-weight:bold; border-bottom: 1pt solid black;">';
-		if ($line->numero_compte != "" && $line->numero_compte != '-1') print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
-		else print '<span class="error">'.$langs->trans("Unknown").'</span>';
+		if ($line->numero_compte != "" && $line->numero_compte != '-1') {
+			print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
+		} else {
+			print '<span class="error">'.$langs->trans("Unknown").'</span>';
+		}
 		print '</td>';
 		print '</tr>';
 
@@ -638,38 +685,39 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 
 	// Piece number
-	if (!empty($arrayfields['t.piece_num']['checked']))
-	{
+	if (!empty($arrayfields['t.piece_num']['checked'])) {
 		print '<td>';
 		$object->id = $line->id;
 		$object->piece_num = $line->piece_num;
 		print $object->getNomUrl(1, '', 0, '', 1);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Journal code
-	if (!empty($arrayfields['t.code_journal']['checked']))
-	{
+	if (!empty($arrayfields['t.code_journal']['checked'])) {
 		$accountingjournal = new AccountingJournal($db);
 		$result = $accountingjournal->fetch('', $line->code_journal);
 		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
 		print '<td class="center">'.$journaltoshow.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Document date
-	if (!empty($arrayfields['t.doc_date']['checked']))
-	{
+	if (!empty($arrayfields['t.doc_date']['checked'])) {
 		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Document ref
-	if (!empty($arrayfields['t.doc_ref']['checked']))
-	{
-		if ($line->doc_type == 'customer_invoice')
-		{
+	if (!empty($arrayfields['t.doc_ref']['checked'])) {
+		if ($line->doc_type == 'customer_invoice') {
 			$langs->loadLangs(array('bills'));
 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -681,8 +729,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'supplier_invoice')
-		{
+		} elseif ($line->doc_type == 'supplier_invoice') {
 			$langs->loadLangs(array('bills'));
 
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
@@ -694,8 +741,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-		} elseif ($line->doc_type == 'expense_report')
-		{
+		} elseif ($line->doc_type == 'expense_report') {
 			$langs->loadLangs(array('trips'));
 
 			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
@@ -707,8 +753,7 @@ while ($i < min($num, $limit))
 			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
 			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
 			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'bank')
-		{
+		} elseif ($line->doc_type == 'bank') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 			$objectstatic = new AccountLine($db);
 			$objectstatic->fetch($line->fk_doc);
@@ -722,8 +767,7 @@ while ($i < min($num, $limit))
 		// Picto + Ref
 		print '<td class="nobordernopadding">';
 
-		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report')
-		{
+		if ($line->doc_type == 'customer_invoice' || $line->doc_type == 'supplier_invoice' || $line->doc_type == 'expense_report') {
 			print $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
 			print $documentlink;
 		} elseif ($line->doc_type == 'bank') {
@@ -736,7 +780,9 @@ while ($i < min($num, $limit))
 		print '</td></tr></table>';
 
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Label operation
@@ -744,38 +790,49 @@ while ($i < min($num, $limit))
 		// Affiche un lien vers la facture client/fournisseur
 		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
 		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount debit
-	if (!empty($arrayfields['t.debit']['checked']))
-	{
+	if (!empty($arrayfields['t.debit']['checked'])) {
 		print '<td class="nowrap right">'.($line->debit ? price($line->debit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
+		}
 		$totalarray['val']['totaldebit'] += $line->debit;
 	}
 
 	// Amount credit
 	if (!empty($arrayfields['t.credit']['checked'])) {
 		print '<td class="nowrap right">'.($line->credit ? price($line->credit) : '').'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
+		}
 		$totalarray['val']['totalcredit'] += $line->credit;
 	}
 
 	// Lettering code
-	if (!empty($arrayfields['t.lettering_code']['checked']))
-	{
+	if (!empty($arrayfields['t.lettering_code']['checked'])) {
 		print '<td class="center">'.$line->lettering_code.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Exported operation date
-	if (!empty($arrayfields['t.date_export']['checked']))
-	{
+	if (!empty($arrayfields['t.date_export']['checked'])) {
 		print '<td class="center">'.dol_print_date($line->date_export, 'dayhour').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Fields from hook
@@ -794,7 +851,9 @@ while ($i < min($num, $limit))
 		}
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	// Comptabilise le sous-total
 	$sous_total_debit += $line->debit;
@@ -818,8 +877,7 @@ if ($num > 0) {
 	$balance = $sous_total_debit - $sous_total_credit;
 	print '<tr class="liste_total">';
 	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-	if ($balance > 0)
-	{
+	if ($balance > 0) {
 		print '<td class="nowraponall right">';
 		print price($sous_total_debit - $sous_total_credit);
 		print '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
index 01b1a0a1335..72b6574bea5 100644
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbysubaccount.php
@@ -503,8 +503,7 @@ print '<table class="tagtable liste centpercent">';
 print '<tr class="liste_titre_filter">';
 
 // Movement number
-if (!empty($arrayfields['t.piece_num']['checked']))
-{
+if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
 }
 // Code journal
@@ -631,11 +630,15 @@ while ($i < min($num, $limit)) {
 		$colnumber = 5;
 		$colnumberend = 7;
 
-		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) $colnumber--;
-		if (empty($arrayfields['t.date_export']['checked'])) $colnumber--;
+		if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING) || empty($arrayfields['t.lettering_code']['checked'])) {
+			$colnumber--;
+		}
+		if (empty($arrayfields['t.date_export']['checked'])) {
+			$colnumber--;
+		}
 
-        $colspan = $totalarray['nbfield'] - $colnumber;
-        $colspanend = $totalarray['nbfield'] - $colnumberend;
+		$colspan = $totalarray['nbfield'] - $colnumber;
+		$colspanend = $totalarray['nbfield'] - $colnumberend;
 
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
@@ -838,10 +841,11 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Exported operation date
-	if (!empty($arrayfields['t.date_export']['checked']))
-	{
+	if (!empty($arrayfields['t.date_export']['checked'])) {
 		print '<td class="center">'.dol_print_date($line->date_export, 'dayhour').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Fields from hook
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 2d90c9a7b14..bc103edbf1b 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -225,7 +225,6 @@ if ($resql) {
 
 	// Piece
 	print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
-
 	print '<td colspan="6">&nbsp;</td>';
 	print '<td class="right">';
 	$searchpicto = $form->showFilterButtons();
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index 31acb9f0191..3da345add6a 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -222,7 +222,6 @@ if ($resql) {
 
 	// Piece
 	print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
-
 	print '<td colspan="6">&nbsp;</td>';
 	print '<td class="right">';
 	$searchpicto = $form->showFilterButtons();
diff --git a/htdocs/accountancy/class/accountancycategory.class.php b/htdocs/accountancy/class/accountancycategory.class.php
index eb43348f1ea..95d88c80c87 100644
--- a/htdocs/accountancy/class/accountancycategory.class.php
+++ b/htdocs/accountancy/class/accountancycategory.class.php
@@ -153,22 +153,42 @@ class AccountancyCategory // extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->label)) $this->label = trim($this->label);
-		if (isset($this->range_account)) $this->range_account = trim($this->range_account);
-		if (isset($this->sens)) $this->sens = (int) $this->sens;
-		if (isset($this->category_type)) $this->category_type = (int) $this->category_type;
-		if (isset($this->formula)) $this->formula = trim($this->formula);
-		if (isset($this->position)) $this->position = (int) $this->position;
-		if (isset($this->fk_country)) $this->fk_country = (int) $this->fk_country;
-		if (isset($this->active)) $this->active = (int) $this->active;
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			$this->label = trim($this->label);
+		}
+		if (isset($this->range_account)) {
+			$this->range_account = trim($this->range_account);
+		}
+		if (isset($this->sens)) {
+			$this->sens = (int) $this->sens;
+		}
+		if (isset($this->category_type)) {
+			$this->category_type = (int) $this->category_type;
+		}
+		if (isset($this->formula)) {
+			$this->formula = trim($this->formula);
+		}
+		if (isset($this->position)) {
+			$this->position = (int) $this->position;
+		}
+		if (isset($this->fk_country)) {
+			$this->fk_country = (int) $this->fk_country;
+		}
+		if (isset($this->active)) {
+			$this->active = (int) $this->active;
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_accounting_category(";
-		if ($this->rowid > 0) $sql .= "rowid, ";
+		if ($this->rowid > 0) {
+			$sql .= "rowid, ";
+		}
 		$sql .= "code, ";
 		$sql .= "label, ";
 		$sql .= "range_account, ";
@@ -180,7 +200,9 @@ class AccountancyCategory // extends CommonObject
 		$sql .= "active, ";
 		$sql .= "entity";
 		$sql .= ") VALUES (";
-		if ($this->rowid > 0) $sql .= " ".$this->rowid.",";
+		if ($this->rowid > 0) {
+			$sql .= " ".$this->rowid.",";
+		}
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
 		$sql .= " ".(!isset($this->range_account) ? 'NULL' : "'".$this->db->escape($this->range_account)."'").",";
@@ -197,13 +219,13 @@ class AccountancyCategory // extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -238,19 +260,21 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " t.fk_country,";
 		$sql .= " t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as t";
-		if ($id)   $sql .= " WHERE t.rowid = ".$id;
-		else {
+		if ($id) {
+			$sql .= " WHERE t.rowid = ".$id;
+		} else {
 			$sql .= " WHERE t.entity IN (".getEntity('c_accounting_category').")"; // Dont't use entity if you use rowid
-			if ($code) $sql .= " AND t.code = '".$this->db->escape($code)."'";
-			elseif ($label) $sql .= " AND t.label = '".$this->db->escape($label)."'";
+			if ($code) {
+				$sql .= " AND t.code = '".$this->db->escape($code)."'";
+			} elseif ($label) {
+				$sql .= " AND t.label = '".$this->db->escape($label)."'";
+			}
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id            = $obj->rowid;
@@ -287,15 +311,33 @@ class AccountancyCategory // extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->label)) $this->label = trim($this->label);
-		if (isset($this->range_account)) $this->range_account = trim($this->range_account);
-		if (isset($this->sens)) $this->sens = (int) $this->sens;
-		if (isset($this->category_type)) $this->category_type = (int) $this->category_type;
-		if (isset($this->formula)) $this->formula = trim($this->formula);
-		if (isset($this->position)) $this->position = (int) $this->position;
-		if (isset($this->fk_country)) $this->fk_country = (int) $this->fk_country;
-		if (isset($this->active)) $this->active = (int) $this->active;
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			$this->label = trim($this->label);
+		}
+		if (isset($this->range_account)) {
+			$this->range_account = trim($this->range_account);
+		}
+		if (isset($this->sens)) {
+			$this->sens = (int) $this->sens;
+		}
+		if (isset($this->category_type)) {
+			$this->category_type = (int) $this->category_type;
+		}
+		if (isset($this->formula)) {
+			$this->formula = trim($this->formula);
+		}
+		if (isset($this->position)) {
+			$this->position = (int) $this->position;
+		}
+		if (isset($this->fk_country)) {
+			$this->fk_country = (int) $this->fk_country;
+		}
+		if (isset($this->active)) {
+			$this->active = (int) $this->active;
+		}
 
 
 		// Check parameters
@@ -318,13 +360,13 @@ class AccountancyCategory // extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -356,13 +398,13 @@ class AccountancyCategory // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -537,13 +579,13 @@ class AccountancyCategory // extends CommonObject
 		}
 
 		$accountincptsadded = array();
-		while ($obj = $this->db->fetch_object($resql))
-		{
+		while ($obj = $this->db->fetch_object($resql)) {
 			$account_number_formated = length_accountg($obj->account_number);
-			if (!empty($accountincptsadded[$account_number_formated])) continue;
+			if (!empty($accountincptsadded[$account_number_formated])) {
+				continue;
+			}
 
-			if (array_key_exists($account_number_formated, $cpts))
-			{
+			if (array_key_exists($account_number_formated, $cpts)) {
 				$accountincptsadded[$account_number_formated] = 1;
 				// We found an account number that is in list $cpts of account to add
 				$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_account";
@@ -687,48 +729,49 @@ class AccountancyCategory // extends CommonObject
 		$this->sdcpermonth = array();
 
 		$sql = "SELECT SUM(t.debit) as debit, SUM(t.credit) as credit";
-		if (is_array($cpt)) $sql .= ", t.numero_compte as accountancy_account";
+		if (is_array($cpt)) {
+			$sql .= ", t.numero_compte as accountancy_account";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
 		//if (in_array($this->db->type, array('mysql', 'mysqli'))) $sql.=' USE INDEX idx_accounting_bookkeeping_doc_date';
 		$sql .= " WHERE t.entity = ".$conf->entity;
-		if (is_array($cpt))
-		{
+		if (is_array($cpt)) {
 			$listofaccount = '';
-			foreach ($cpt as $cptcursor)
-			{
-				if ($listofaccount) $listofaccount .= ",";
+			foreach ($cpt as $cptcursor) {
+				if ($listofaccount) {
+					$listofaccount .= ",";
+				}
 				$listofaccount .= "'".$cptcursor."'";
 			}
 			$sql .= " AND t.numero_compte IN (".$listofaccount.")";
 		} else {
 			$sql .= " AND t.numero_compte = '".$this->db->escape($cpt)."'";
 		}
-		if (!empty($date_start) && !empty($date_end) && (empty($month) || empty($year)))	// If month/year provided, it is stronger than filter date_start/date_end
+		if (!empty($date_start) && !empty($date_end) && (empty($month) || empty($year))) {	// If month/year provided, it is stronger than filter date_start/date_end
 			$sql .= " AND (t.doc_date BETWEEN '".$this->db->idate($date_start)."' AND '".$this->db->idate($date_end)."')";
+		}
 		if (!empty($month) && !empty($year)) {
 			$sql .= " AND (t.doc_date BETWEEN '".$this->db->idate(dol_get_first_day($year, $month))."' AND '".$this->db->idate(dol_get_last_day($year, $month))."')";
 		}
-		if ($thirdparty_code != 'nofilter')
-		{
+		if ($thirdparty_code != 'nofilter') {
 			$sql .= " AND t.thirdparty_code = '".$this->db->escape($thirdparty_code)."'";
 		}
-		if (is_array($cpt)) $sql .= " GROUP BY t.numero_compte";
+		if (is_array($cpt)) {
+			$sql .= " GROUP BY t.numero_compte";
+		}
 		//print $sql;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$obj = $this->db->fetch_object($resql);
 				if ($sens == 1) {
 					$this->sdc = $obj->debit - $obj->credit;
 				} else {
 					$this->sdc = $obj->credit - $obj->debit;
 				}
-				if (is_array($cpt))
-				{
+				if (is_array($cpt)) {
 					$this->sdcperaccount[$obj->accountancy_account] = $this->sdc;
 				}
 			}
@@ -760,7 +803,9 @@ class AccountancyCategory // extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
 		$sql .= " WHERE c.active = 1";
 		$sql .= " AND c.entity = ".$conf->entity;
-		if ($categorytype >= 0) $sql .= " AND c.category_type = 1";
+		if ($categorytype >= 0) {
+			$sql .= " AND c.category_type = 1";
+		}
 		$sql .= " AND (c.fk_country = ".$mysoc->country_id." OR c.fk_country = 0)";
 		$sql .= " ORDER BY c.position ASC";
 
@@ -815,8 +860,7 @@ class AccountancyCategory // extends CommonObject
 			exit();
 		}
 
-		if (!empty($cat_id))
-		{
+		if (!empty($cat_id)) {
 			$sql = "SELECT t.rowid, t.account_number, t.label as account_label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_account as t";
 			$sql .= " WHERE t.fk_accounting_category = ".$cat_id;
@@ -838,8 +882,7 @@ class AccountancyCategory // extends CommonObject
 			$num = $this->db->num_rows($resql);
 			$data = array();
 			if ($num) {
-				while ($obj = $this->db->fetch_object($resql))
-				{
+				while ($obj = $this->db->fetch_object($resql)) {
 					$data[] = array(
 							'id' => $obj->rowid,
 							'account_number' => $obj->account_number,
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 341e99a8659..35e32bf2004 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -277,61 +277,61 @@ class AccountancyExport
 
 
 		switch ($formatexportset) {
-			case self::$EXPORT_TYPE_CONFIGURABLE :
+			case self::$EXPORT_TYPE_CONFIGURABLE:
 				$this->exportConfigurable($TData);
 				break;
-			case self::$EXPORT_TYPE_CEGID :
+			case self::$EXPORT_TYPE_CEGID:
 				$this->exportCegid($TData);
 				break;
-			case self::$EXPORT_TYPE_COALA :
+			case self::$EXPORT_TYPE_COALA:
 				$this->exportCoala($TData);
 				break;
-			case self::$EXPORT_TYPE_BOB50 :
+			case self::$EXPORT_TYPE_BOB50:
 				$this->exportBob50($TData);
 				break;
-			case self::$EXPORT_TYPE_CIEL :
+			case self::$EXPORT_TYPE_CIEL:
 				$this->exportCiel($TData);
 				break;
-			case self::$EXPORT_TYPE_QUADRATUS :
+			case self::$EXPORT_TYPE_QUADRATUS:
 				$this->exportQuadratus($TData);
 				break;
-			case self::$EXPORT_TYPE_WINFIC :
+			case self::$EXPORT_TYPE_WINFIC:
 				$this->exportWinfic($TData);
 				break;
-			case self::$EXPORT_TYPE_EBP :
+			case self::$EXPORT_TYPE_EBP:
 				$this->exportEbp($TData);
 				break;
-			case self::$EXPORT_TYPE_COGILOG :
+			case self::$EXPORT_TYPE_COGILOG:
 				$this->exportCogilog($TData);
 				break;
-			case self::$EXPORT_TYPE_AGIRIS :
+			case self::$EXPORT_TYPE_AGIRIS:
 				$this->exportAgiris($TData);
 				break;
-			case self::$EXPORT_TYPE_OPENCONCERTO :
+			case self::$EXPORT_TYPE_OPENCONCERTO:
 				$this->exportOpenConcerto($TData);
 				break;
-			case self::$EXPORT_TYPE_SAGE50_SWISS :
+			case self::$EXPORT_TYPE_SAGE50_SWISS:
 				$this->exportSAGE50SWISS($TData);
 				break;
-			case self::$EXPORT_TYPE_CHARLEMAGNE :
+			case self::$EXPORT_TYPE_CHARLEMAGNE:
 				$this->exportCharlemagne($TData);
 				break;
-			case self::$EXPORT_TYPE_LDCOMPTA :
+			case self::$EXPORT_TYPE_LDCOMPTA:
 				$this->exportLDCompta($TData);
 				break;
-			case self::$EXPORT_TYPE_LDCOMPTA10 :
+			case self::$EXPORT_TYPE_LDCOMPTA10:
 				$this->exportLDCompta10($TData);
 				break;
-			case self::$EXPORT_TYPE_GESTIMUMV3 :
+			case self::$EXPORT_TYPE_GESTIMUMV3:
 				$this->exportGestimumV3($TData);
 				break;
-			case self::$EXPORT_TYPE_GESTIMUMV5 :
+			case self::$EXPORT_TYPE_GESTIMUMV5:
 				$this->exportGestimumV5($TData);
 				break;
-			case self::$EXPORT_TYPE_FEC :
+			case self::$EXPORT_TYPE_FEC:
 				$this->exportFEC($TData);
 				break;
-			case self::$EXPORT_TYPE_FEC2 :
+			case self::$EXPORT_TYPE_FEC2:
 				$this->exportFEC2($TData);
 				break;
 			default:
@@ -481,8 +481,9 @@ class AccountancyExport
 		$date_ecriture = dol_print_date(dol_now(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be yyyymmdd
 		foreach ($TData as $data) {
 			$code_compta = $data->numero_compte;
-			if (!empty($data->subledger_account))
+			if (!empty($data->subledger_account)) {
 				$code_compta = $data->subledger_account;
+			}
 
 			$Tab = array();
 			$Tab['num_ecriture'] = str_pad($i, 5);
@@ -522,8 +523,9 @@ class AccountancyExport
 		// $date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ($TData as $data) {
 			$code_compta = $data->numero_compte;
-			if (!empty($data->subledger_account))
+			if (!empty($data->subledger_account)) {
 				$code_compta = $data->subledger_account;
+			}
 
 			$Tab = array();
 			$Tab['type_ligne'] = 'M';
@@ -539,17 +541,17 @@ class AccountancyExport
 			$Tab['libelle_ecriture'] = str_pad(self::trunc(dol_string_unaccent($data->doc_ref).' '.dol_string_unaccent($data->label_operation), 20), 20);
 
 			// Credit invoice - invert sens
-            if ($data->montant < 0) {
-                if ($data->sens == 'C') {
-                    $Tab['sens'] = 'D';
-                } else {
-                    $Tab['sens'] = 'C';
-                }
-                $Tab['signe_montant'] = '-';
-            } else {
-                $Tab['sens'] = $data->sens; // C or D
-                $Tab['signe_montant'] = '+';
-            }
+			if ($data->montant < 0) {
+				if ($data->sens == 'C') {
+					$Tab['sens'] = 'D';
+				} else {
+					$Tab['sens'] = 'C';
+				}
+				$Tab['signe_montant'] = '-';
+			} else {
+				$Tab['sens'] = $data->sens; // C or D
+				$Tab['signe_montant'] = '+';
+			}
 
 			// The amount must be in centimes without decimal points.
 			$Tab['montant'] = str_pad(abs($data->montant * 100), 12, '0', STR_PAD_LEFT);
@@ -616,8 +618,9 @@ class AccountancyExport
 		//$date_ecriture = dol_print_date(time(), $conf->global->ACCOUNTING_EXPORT_DATE); // format must be ddmmyy
 		foreach ($TData as $data) {
 			$code_compta = $data->numero_compte;
-			if (!empty($data->subledger_account))
+			if (!empty($data->subledger_account)) {
 				$code_compta = $data->subledger_account;
+			}
 
 			$Tab = array();
 			//$Tab['type_ligne'] = 'M';
@@ -849,14 +852,14 @@ class AccountancyExport
 		print $end_line;
 
 		foreach ($objectLines as $line) {
-            if ($line->debit == 0 && $line->credit == 0) {
-                unset($array[$line]);
-            } else {
-                $date_creation = dol_print_date($line->date_creation, '%Y%m%d');
-                $date_document = dol_print_date($line->doc_date, '%Y%m%d');
-                $date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
-                $date_validation = dol_print_date($line->date_validated, '%Y%m%d');
-                $date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
+			if ($line->debit == 0 && $line->credit == 0) {
+				unset($array[$line]);
+			} else {
+				$date_creation = dol_print_date($line->date_creation, '%Y%m%d');
+				$date_document = dol_print_date($line->doc_date, '%Y%m%d');
+				$date_lettering = dol_print_date($line->date_lettering, '%Y%m%d');
+				$date_validation = dol_print_date($line->date_validated, '%Y%m%d');
+				$date_limit_payment = dol_print_date($line->date_lim_reglement, '%Y%m%d');
 
 				// FEC:JournalCode
 				print $line->code_journal . $separator;
@@ -1048,21 +1051,17 @@ class AccountancyExport
 		$thisPieceNum = "";
 		$thisPieceAccountNr = "";
 		$aSize = count($objectLines);
-		foreach ($objectLines as $aIndex=>$line)
-		{
+		foreach ($objectLines as $aIndex => $line) {
 			$sammelBuchung = false;
-			if ($aIndex - 2 >= 0 && $objectLines[$aIndex - 2]->piece_num == $line->piece_num)
-			{
+			if ($aIndex - 2 >= 0 && $objectLines[$aIndex - 2]->piece_num == $line->piece_num) {
 				$sammelBuchung = true;
-			} elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num)
-			{
+			} elseif ($aIndex + 2 < $aSize && $objectLines[$aIndex + 2]->piece_num == $line->piece_num) {
 				$sammelBuchung = true;
 			} elseif ($aIndex + 1 < $aSize
 					&& $objectLines[$aIndex + 1]->piece_num == $line->piece_num
 					&& $aIndex - 1 < $aSize
 					&& $objectLines[$aIndex - 1]->piece_num == $line->piece_num
-					)
-			{
+					) {
 				$sammelBuchung = true;
 			}
 
@@ -1076,8 +1075,7 @@ class AccountancyExport
 			// Kto
 			print length_accountg($line->numero_compte).$this->separator;
 			// S/H
-			if ($line->sens == 'D')
-			{
+			if ($line->sens == 'D') {
 				print 'S'.$this->separator;
 			} else {
 				print 'H'.$this->separator;
@@ -1085,10 +1083,8 @@ class AccountancyExport
 			//Grp
 			print self::trunc($line->code_journal, 1).$this->separator;
 			// GKto
-			if (empty($line->code_tiers))
-			{
-				if ($line->piece_num == $thisPieceNum)
-				{
+			if (empty($line->code_tiers)) {
+				if ($line->piece_num == $thisPieceNum) {
 					print length_accounta($thisPieceAccountNr).$this->separator;
 				} else {
 					print "div".$this->separator;
@@ -1106,8 +1102,7 @@ class AccountancyExport
 			print "0".$this->separator;
 
 			//MTyp 1=Fibu Einzelbuchung 2=Sammebuchung
-			if ($sammelBuchung)
-			{
+			if ($sammelBuchung) {
 				print "2".$this->separator;
 			} else {
 				print "1".$this->separator;
@@ -1115,8 +1110,7 @@ class AccountancyExport
 			// Code
 			print '""'.$this->separator;
 			// Netto
-			if ($line->montant >= 0)
-			{
+			if ($line->montant >= 0) {
 				print $line->montant.$this->separator;
 			} else {
 				print ($line->montant * -1).$this->separator;
@@ -1127,18 +1121,15 @@ class AccountancyExport
 			print "0.00".$this->separator;
 			// Tx1
 			$line1 = self::toAnsi($line->label_compte, 29);
-			if ($line1 == "LIQ" || $line1 == "LIQ Beleg ok" || strlen($line1) <= 3)
-			{
+			if ($line1 == "LIQ" || $line1 == "LIQ Beleg ok" || strlen($line1) <= 3) {
 				$line1 = "";
 			}
 			$line2 = self::toAnsi($line->doc_ref, 29);
-			if (strlen($line1) == 0)
-			{
+			if (strlen($line1) == 0) {
 				$line1 = $line2;
 				$line2 = "";
 			}
-			if (strlen($line1) > 0 && strlen($line2) > 0 && (strlen($line1) + strlen($line2)) < 27)
-			{
+			if (strlen($line1) > 0 && strlen($line2) > 0 && (strlen($line1) + strlen($line2)) < 27) {
 				$line1 = $line1.' / '.$line2;
 				$line2 = "";
 			}
@@ -1156,8 +1147,7 @@ class AccountancyExport
 
 			print $this->end_line;
 
-			if ($line->piece_num !== $thisPieceNum)
-			{
+			if ($line->piece_num !== $thisPieceNum) {
 				$thisPieceNum = $line->piece_num;
 				$thisPieceAccountNr = $line->numero_compte;
 			}
@@ -1320,15 +1310,14 @@ class AccountancyExport
 				$sql .= " WHERE code_client = '".$this->db->escape($line->thirdparty_code)."'";
 				$resql = $this->db->query($sql);
 
-				if ($resql && $this->db->num_rows($resql) > 0)
-				{
+				if ($resql && $this->db->num_rows($resql) > 0) {
 					$soc = $this->db->fetch_object($resql);
 
 					$address = array('', '', '');
 					if (strpos($soc->address, "\n") !== false) {
 						$address = explode("\n", $soc->address);
 						if (is_array($address) && count($address) > 0) {
-							foreach ($address as $key=>$data) {
+							foreach ($address as $key => $data) {
 								$address[$key] = str_replace(array("\t", "\n", "\r"), "", $data);
 								$address[$key] = dol_trunc($address[$key], 40, 'right', 'UTF-8', 1);
 							}
@@ -1603,8 +1592,9 @@ class AccountancyExport
 
 			print self::trunc($line->code_journal, 6).$separator; //Journal code
 
-			if (!empty($line->subledger_account)) $account = $line->subledger_account;
-			else {
+			if (!empty($line->subledger_account)) {
+				$account = $line->subledger_account;
+			} else {
 				$account = $line->numero_compte;
 			}
 			print self::trunc($account, 15).$separator; //Account number
@@ -1785,8 +1775,7 @@ class AccountancyExport
 	public static function toAnsi($str, $size = -1)
 	{
 		$retVal = dol_string_nohtmltag($str, 1, 'Windows-1251');
-		if ($retVal >= 0 && $size >= 0)
-		{
+		if ($retVal >= 0 && $size >= 0) {
 			$retVal = mb_substr($retVal, 0, $size, 'Windows-1251');
 		}
 		return $retVal;
diff --git a/htdocs/accountancy/class/accountancysystem.class.php b/htdocs/accountancy/class/accountancysystem.class.php
index 193a03f1726..1b481027ac0 100644
--- a/htdocs/accountancy/class/accountancysystem.class.php
+++ b/htdocs/accountancy/class/accountancysystem.class.php
@@ -95,8 +95,7 @@ class AccountancySystem
 	{
 		global $conf;
 
-		if ($rowid > 0 || $ref)
-		{
+		if ($rowid > 0 || $ref) {
 			$sql  = "SELECT a.rowid, a.pcg_version, a.label, a.active";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_system as a";
 			$sql .= " WHERE";
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index af8d26bb374..d5fad9b8f60 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -236,19 +236,23 @@ class AccountingAccount extends CommonObject
 		$now = dol_now();
 
 		// Clean parameters
-		if (isset($this->fk_pcg_version))
+		if (isset($this->fk_pcg_version)) {
 			$this->fk_pcg_version = trim($this->fk_pcg_version);
-		if (isset($this->pcg_type))
+		}
+		if (isset($this->pcg_type)) {
 			$this->pcg_type = trim($this->pcg_type);
-		if (isset($this->account_number))
+		}
+		if (isset($this->account_number)) {
 			$this->account_number = trim($this->account_number);
-		if (isset($this->label))
+		}
+		if (isset($this->label)) {
 			$this->label = trim($this->label);
-		if (isset($this->labelshort))
+		}
+		if (isset($this->labelshort)) {
 			$this->labelshort = trim($this->labelshort);
+		}
 
-		if (empty($this->pcg_type) || $this->pcg_type == '-1')
-		{
+		if (empty($this->pcg_type) || $this->pcg_type == '-1') {
 			$this->pcg_type = 'XXXXXX';
 		}
 		// Check parameters
@@ -329,8 +333,7 @@ class AccountingAccount extends CommonObject
 	public function update($user)
 	{
 		// Check parameters
-		if (empty($this->pcg_type) || $this->pcg_type == '-1')
-		{
+		if (empty($this->pcg_type) || $this->pcg_type == '-1') {
 			$this->pcg_type = 'XXXXXX';
 		}
 
@@ -456,7 +459,9 @@ class AccountingAccount extends CommonObject
 		global $langs, $conf;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -474,31 +479,36 @@ class AccountingAccount extends CommonObject
 
 		// Add param to save lastsearch_values or not
 		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-		if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values = 1;
+		}
+		if ($add_save_lastsearch_values) {
+			$url .= '&save_lastsearch_values=1';
+		}
 
 		$picto = 'billr';
 		$label = '';
 
-		if (empty($this->labelshort) || $withcompletelabel == 1)
-		{
+		if (empty($this->labelshort) || $withcompletelabel == 1) {
 			$labeltoshow = $this->label;
 		} else {
 			$labeltoshow = $this->labelshort;
 		}
 
 		$label = '<u>'.$labelurl.'</u>';
-		if (!empty($this->account_number))
+		if (!empty($this->account_number)) {
 			$label .= '<br><b>'.$langs->trans('AccountAccounting').':</b> '.length_accountg($this->account_number);
-		if (!empty($labeltoshow))
+		}
+		if (!empty($labeltoshow)) {
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
-		if ($moretitle) $label .= ' - '.$moretitle;
+		}
+		if ($moretitle) {
+			$label .= ' - '.$moretitle;
+		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $labelurl;
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -510,19 +520,26 @@ class AccountingAccount extends CommonObject
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
-		if ($nourl)
-		{
+		if ($nourl) {
 			$linkstart = '';
 			$linkclose = '';
 			$linkend = '';
 		}
 
 		$label_link = length_accountg($this->account_number);
-		if ($withlabel) $label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$labeltoshow.($nourl ? '</span>' : '');
+		if ($withlabel) {
+			$label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$labeltoshow.($nourl ? '</span>' : '');
+		}
 
-		if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
-		if ($withpicto && $withpicto != 2) $result .= ' ';
-		if ($withpicto != 2) $result .= $linkstart.$label_link.$linkend;
+		if ($withpicto) {
+			$result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result .= ' ';
+		}
+		if ($withpicto != 2) {
+			$result .= $linkstart.$label_link.$linkend;
+		}
 		return $result;
 	}
 
@@ -576,8 +593,7 @@ class AccountingAccount extends CommonObject
 		$result = $this->checkUsage();
 
 		$fieldtouse = 'active';
-		if ($mode == 1)
-		{
+		if ($mode == 1) {
 			$fieldtouse = 'reconcilable';
 		}
 
@@ -664,30 +680,42 @@ class AccountingAccount extends CommonObject
 		global $langs;
 		$langs->loadLangs(array("users"));
 
-		if ($mode == 0)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		} elseif ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		} elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		} elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		} elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		} elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
+		if ($mode == 0) {
+			if ($status == 1) {
+				return $langs->trans('Enabled');
+			} elseif ($status == 0) {
+				return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 1) {
+			if ($status == 1) {
+				return $langs->trans('Enabled');
+			} elseif ($status == 0) {
+				return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 2) {
+			if ($status == 1) {
+				return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			} elseif ($status == 0) {
+				return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 3) {
+			if ($status == 1) {
+				return img_picto($langs->trans('Enabled'), 'statut4');
+			} elseif ($status == 0) {
+				return img_picto($langs->trans('Disabled'), 'statut5');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 1) {
+				return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			} elseif ($status == 0) {
+				return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 5) {
+			if ($status == 1) {
+				return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			} elseif ($status == 0) {
+				return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
+			}
 		}
 	}
 }
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 6ee8a03d8ff..95a69466658 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -102,23 +102,20 @@ class AccountingJournal extends CommonObject
 	{
 		global $conf;
 
-		if ($rowid || $journal_code)
-		{
+		if ($rowid || $journal_code) {
 			$sql = "SELECT rowid, code, label, nature, active";
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE";
 			if ($rowid) {
 				$sql .= " rowid = ".((int) $rowid);
-			} elseif ($journal_code)
-			{
+			} elseif ($journal_code) {
 				$sql .= " code = '".$this->db->escape($journal_code)."'";
 				$sql .= " AND entity  = ".$conf->entity;
 			}
 
 			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$obj = $this->db->fetch_object($result);
 
 				if ($obj) {
@@ -226,24 +223,28 @@ class AccountingJournal extends CommonObject
 	{
 		global $langs, $conf, $user;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
 		$url = DOL_URL_ROOT.'/accountancy/admin/journals_list.php?id=35';
 
 		$label = '<u>'.$langs->trans("ShowAccountingJournal").'</u>';
-		if (!empty($this->code))
+		if (!empty($this->code)) {
 			$label .= '<br><b>'.$langs->trans('Code').':</b> '.$this->code;
-		if (!empty($this->label))
+		}
+		if (!empty($this->label)) {
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$langs->transnoentities($this->label);
-		if ($moretitle) $label .= ' - '.$moretitle;
+		}
+		if ($moretitle) {
+			$label .= ' - '.$moretitle;
+		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowAccountingJournal");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -255,19 +256,24 @@ class AccountingJournal extends CommonObject
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
-		if ($nourl)
-		{
+		if ($nourl) {
 			$linkstart = '';
 			$linkclose = '';
 			$linkend = '';
 		}
 
 		$label_link = $this->code;
-		if ($withlabel) $label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$langs->transnoentities($this->label).($nourl ? '</span>' : '');
+		if ($withlabel) {
+			$label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$langs->transnoentities($this->label).($nourl ? '</span>' : '');
+		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $label_link;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $label_link;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -299,23 +305,35 @@ class AccountingJournal extends CommonObject
 
 		$langs->loadLangs(array("accountancy"));
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			$prefix = '';
-			if ($nature == 9) return $langs->trans('AccountingJournalType9');
-			elseif ($nature == 5) return $langs->trans('AccountingJournalType5');
-			elseif ($nature == 4) return $langs->trans('AccountingJournalType4');
-			elseif ($nature == 3) return $langs->trans('AccountingJournalType3');
-			elseif ($nature == 2) return $langs->trans('AccountingJournalType2');
-			elseif ($nature == 1) return $langs->trans('AccountingJournalType1');
-		} elseif ($mode == 1)
-		{
-			if ($nature == 9) return $langs->trans('AccountingJournalType9');
-			elseif ($nature == 5) return $langs->trans('AccountingJournalType5');
-			elseif ($nature == 4) return $langs->trans('AccountingJournalType4');
-			elseif ($nature == 3) return $langs->trans('AccountingJournalType3');
-			elseif ($nature == 2) return $langs->trans('AccountingJournalType2');
-			elseif ($nature == 1) return $langs->trans('AccountingJournalType1');
+			if ($nature == 9) {
+				return $langs->trans('AccountingJournalType9');
+			} elseif ($nature == 5) {
+				return $langs->trans('AccountingJournalType5');
+			} elseif ($nature == 4) {
+				return $langs->trans('AccountingJournalType4');
+			} elseif ($nature == 3) {
+				return $langs->trans('AccountingJournalType3');
+			} elseif ($nature == 2) {
+				return $langs->trans('AccountingJournalType2');
+			} elseif ($nature == 1) {
+				return $langs->trans('AccountingJournalType1');
+			}
+		} elseif ($mode == 1) {
+			if ($nature == 9) {
+				return $langs->trans('AccountingJournalType9');
+			} elseif ($nature == 5) {
+				return $langs->trans('AccountingJournalType5');
+			} elseif ($nature == 4) {
+				return $langs->trans('AccountingJournalType4');
+			} elseif ($nature == 3) {
+				return $langs->trans('AccountingJournalType3');
+			} elseif ($nature == 2) {
+				return $langs->trans('AccountingJournalType2');
+			} elseif ($nature == 1) {
+				return $langs->trans('AccountingJournalType1');
+			}
 		}
 	}
 }
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index c8a12cef083..8ef8979fad4 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -254,21 +254,22 @@ class BookKeeping extends CommonObject
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
-		if (empty($this->debit)) $this->debit = 0.0;
-		if (empty($this->credit)) $this->credit = 0.0;
+		if (empty($this->debit)) {
+			$this->debit = 0.0;
+		}
+		if (empty($this->credit)) {
+			$this->credit = 0.0;
+		}
 
 		// Check parameters
-		if (($this->numero_compte == "") || $this->numero_compte == '-1' || $this->numero_compte == 'NotDefined')
-		{
+		if (($this->numero_compte == "") || $this->numero_compte == '-1' || $this->numero_compte == 'NotDefined') {
 			$langs->loadLangs(array("errors"));
-			if (in_array($this->doc_type, array('bank', 'expense_report')))
-			{
+			if (in_array($this->doc_type, array('bank', 'expense_report'))) {
 				$this->errors[] = $langs->trans('ErrorFieldAccountNotDefinedForBankLine', $this->fk_docdet, $this->doc_type);
 			} else {
 				//$this->errors[]=$langs->trans('ErrorFieldAccountNotDefinedForInvoiceLine', $this->doc_ref,  $this->label_compte);
 				$mesg = $this->doc_ref.', '.$langs->trans("AccountAccounting").': '.$this->numero_compte;
-				if ($this->subledger_account && $this->subledger_account != $this->numero_compte)
-				{
+				if ($this->subledger_account && $this->subledger_account != $this->numero_compte) {
 					$mesg .= ', '.$langs->trans("SubledgerAccount").': '.$this->subledger_account;
 				}
 				$this->errors[] = $langs->trans('ErrorFieldAccountNotDefinedForLine', $mesg);
@@ -299,8 +300,7 @@ class BookKeeping extends CommonObject
 
 		if ($resql) {
 			$row = $this->db->fetch_object($resql);
-			if ($row->nb == 0)
-			{
+			if ($row->nb == 0) {
 				// Determine piece_num
 				$sqlnum = "SELECT piece_num";
 				$sqlnum .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
@@ -452,7 +452,9 @@ class BookKeeping extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$companylink = '';
@@ -463,33 +465,40 @@ class BookKeeping extends CommonObject
 
 		$url = DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$this->piece_num;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowTransaction");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->piece_num;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->piece_num;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -569,8 +578,12 @@ class BookKeeping extends CommonObject
 		if (isset($this->piece_num)) {
 			$this->piece_num = trim($this->piece_num);
 		}
-		if (empty($this->debit)) $this->debit = 0;
-		if (empty($this->credit)) $this->credit = 0;
+		if (empty($this->debit)) {
+			$this->debit = 0;
+		}
+		if (empty($this->credit)) {
+			$this->credit = 0;
+		}
 
 		$this->debit = price2num($this->debit, 'MT');
 		$this->credit = price2num($this->credit, 'MT');
@@ -828,14 +841,14 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
-                } elseif ($key == 't.reconciled_option') {
-                    $sqlwhere[] = 't.lettering_code IS NULL';
-                } elseif ($key == 't.code_journal' && !empty($value)) {
-                	if (is_array($value)) {
-                		$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
-                	} else {
-                    	$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
-                	}
+				} elseif ($key == 't.reconciled_option') {
+					$sqlwhere[] = 't.lettering_code IS NULL';
+				} elseif ($key == 't.code_journal' && !empty($value)) {
+					if (is_array($value)) {
+						$sqlwhere[] = natural_search("t.code_journal", join(',', $value), 3, 1);
+					} else {
+						$sqlwhere[] = natural_search("t.code_journal", $value, 3, 1);
+					}
 				} else {
 					$sqlwhere[] = natural_search($key, $value, 0, 1);
 				}
@@ -1009,8 +1022,7 @@ class BookKeeping extends CommonObject
 			$num = $this->db->num_rows($resql);
 
 			$i = 0;
-			while (($obj = $this->db->fetch_object($resql)) && (empty($limit) || $i < min($limit, $num)))
-			{
+			while (($obj = $this->db->fetch_object($resql)) && (empty($limit) || $i < min($limit, $num))) {
 				$line = new BookKeepingLine();
 
 				$line->id = $obj->rowid;
@@ -1118,13 +1130,11 @@ class BookKeeping extends CommonObject
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
 			$i = 0;
-			while (($obj = $this->db->fetch_object($resql)) && (empty($limit) || $i < min($limit, $num)))
-			{
+			while (($obj = $this->db->fetch_object($resql)) && (empty($limit) || $i < min($limit, $num))) {
 				$line = new BookKeepingLine();
 
 				$line->numero_compte = $obj->numero_compte;
@@ -1404,13 +1414,11 @@ class BookKeeping extends CommonObject
 	{
 		global $langs;
 
-		if (empty($delyear) && empty($journal))
-		{
+		if (empty($delyear) && empty($journal)) {
 			$this->error = 'ErrorOneFieldRequired';
 			return -1;
 		}
-		if (!empty($delmonth) && empty($delyear))
-		{
+		if (!empty($delmonth) && empty($delyear)) {
 			$this->error = 'YearRequiredIfMonthDefined';
 			return -2;
 		}
@@ -1422,7 +1430,9 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
 		$sql .= " WHERE 1 = 1";
 		$sql .= dolSqlDateFilter('doc_date', 0, $delmonth, $delyear);
-		if (!empty($journal)) $sql .= " AND code_journal = '".$this->db->escape($journal)."'";
+		if (!empty($journal)) {
+			$sql .= " AND code_journal = '".$this->db->escape($journal)."'";
+		}
 		$sql .= " AND entity IN (".getEntity('accountancy').")";
 
 		// TODO: In a future we must forbid deletion if record is inside a closed fiscal period.
@@ -1617,8 +1627,12 @@ class BookKeeping extends CommonObject
 
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			if ($obj) $result = $obj->max;
-			if (empty($result)) $result = 1;
+			if ($obj) {
+				$result = $obj->max;
+			}
+			if (empty($result)) {
+				$result = 1;
+			}
 			return $result;
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
@@ -1760,8 +1774,7 @@ class BookKeeping extends CommonObject
 
 		$this->db->begin();
 
-		if ($direction == 0)
-		{
+		if ($direction == 0) {
 			$next_piecenum = $this->getNextNumMvt();
 			$now = dol_now();
 
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index cfe9bf635ae..ad6f186d68f 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -67,12 +67,15 @@ class Lettering extends BookKeeping
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
 		$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."bank_url as bu ON(bk.fk_doc = bu.fk_bank AND bu.type IN ('payment', 'payment_supplier') ) ";
 		$sql .= " WHERE ( ";
-		if ($object->code_compta != "")
+		if ($object->code_compta != "") {
 			$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta)."'  ";
-		if ($object->code_compta != "" && $object->code_compta_fournisseur != "")
+		}
+		if ($object->code_compta != "" && $object->code_compta_fournisseur != "") {
 			$sql .= " OR ";
-		if ($object->code_compta_fournisseur != "")
+		}
+		if ($object->code_compta_fournisseur != "") {
 			$sql .= " bk.subledger_account = '".$this->db->escape($object->code_compta_fournisseur)."' ";
+		}
 
 		$sql .= " ) AND (bk.date_lettering ='' OR bk.date_lettering IS NULL) ";
 		$sql .= "  AND (bk.lettering_code != '' OR bk.lettering_code IS NULL) ";
@@ -89,8 +92,7 @@ class Lettering extends BookKeeping
 				$ids = array();
 				$ids_fact = array();
 
-				if ($obj->type == 'payment_supplier')
-				{
+				if ($obj->type == 'payment_supplier') {
 					$sql = 'SELECT DISTINCT bk.rowid, facf.ref, facf.ref_supplier, payf.fk_bank, facf.rowid as fact_id';
 					$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn facf ";
 					$sql .= " INNER JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as payfacf ON  payfacf.fk_facturefourn=facf.rowid";
@@ -244,8 +246,9 @@ class Lettering extends BookKeeping
 		if ($result) {
 			$obj = $this->db->fetch_object($result);
 			$lettre = (empty($obj->lettering_code) ? 'AAA' : $obj->lettering_code);
-			if (!empty($obj->lettering_code))
+			if (!empty($obj->lettering_code)) {
 				$lettre++;
+			}
 		} else {
 			$this->errors[] = 'Error'.$this->db->lasterror();
 			$error++;
@@ -269,8 +272,7 @@ class Lettering extends BookKeeping
 
 		$now = dol_now();
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping SET";
 			$sql .= " lettering_code='".$this->db->escape($lettre)."'";
 			$sql .= " , date_lettering = '".$this->db->idate($now)."'"; // todo correct date it's false
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index a8531ca0887..94e59de1812 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -39,23 +39,27 @@ $action = GETPOST('action', 'aZ09');
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->fiscalyear->write)
+}
+if (!$user->rights->accounting->fiscalyear->write) {
 	accessforbidden();
+}
 
 $object = new BookKeeping($db);
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
+if (GETPOST("year", 'int')) {
+	$year_start = GETPOST("year", 'int');
+} else {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) {
+		$year_start--; // If current month is lower that starting fiscal month, we start last year
+	}
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
-if ($month_end < 1)
-{
+if ($month_end < 1) {
 	$month_end = 12;
 	$year_end--;
 }
@@ -69,8 +73,7 @@ $year_current = $year_start;
 if ($action == 'validate_movements_confirm' && $user->rights->accounting->fiscalyear->write) {
 	$result = $object->fetchAll();
 
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	} else {
 		// Specify as export : update field date_validated on selected month/year
@@ -80,30 +83,26 @@ if ($action == 'validate_movements_confirm' && $user->rights->accounting->fiscal
 		$date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
 		$date_end = dol_mktime(23, 59, 59, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
 
-		if (is_array($object->lines))
-		{
-			foreach ($object->lines as $movement)
-			{
+		if (is_array($object->lines)) {
+			foreach ($object->lines as $movement) {
 				$now = dol_now();
 
 				$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
 				$sql .= " SET date_validated = '".$db->idate($now)."'";
 				$sql .= " WHERE rowid = ".$movement->id;
 				$sql .= " AND doc_date >= '" . dol_print_date($date_start, 'dayrfc') . "'";
-                $sql .= " AND doc_date <= '" . dol_print_date($date_end, 'dayrfc') . "'";
+				$sql .= " AND doc_date <= '" . dol_print_date($date_end, 'dayrfc') . "'";
 
 				dol_syslog("/accountancy/closure/index.php :: Function validate_movement_confirm Specify movements as validated sql=".$sql, LOG_DEBUG);
 				$result = $db->query($sql);
-				if (!$result)
-				{
+				if (!$result) {
 					$error++;
 					break;
 				}
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 			setEventMessages($langs->trans("AllMovementsWereRecordedAsValidated"), null, 'mesgs');
 		} else {
@@ -171,7 +170,9 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -179,7 +180,9 @@ print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>'
 $sql = "SELECT COUNT(b.rowid) as detail,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(b.doc_date)='.$j, '1', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= " COUNT(b.rowid) as total";
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 118e9b430a4..9807922c43f 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -38,19 +38,20 @@ $codeventil = GETPOST('codeventil', 'int');
 $id = GETPOST('id', 'int');
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
+}
 
 
 /*
  * Actions
  */
 
-if ($action == 'ventil' && $user->rights->accounting->bind->write)
-{
-	if (!$cancel)
-	{
-		if ($codeventil < 0) $codeventil = 0;
+if ($action == 'ventil' && $user->rights->accounting->bind->write) {
+	if (!$cancel) {
+		if ($codeventil < 0) {
+			$codeventil = 0;
+		}
 
 		$sql = " UPDATE ".MAIN_DB_PREFIX."facturedet";
 		$sql .= " SET fk_code_ventilation = ".$codeventil;
@@ -61,8 +62,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 			setEventMessages($db->lasterror(), null, 'errors');
 		} else {
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-			if ($backtopage)
-			{
+			if ($backtopage) {
 				header("Location: ".$backtopage);
 				exit();
 			}
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 3634fba2e79..a0da7ace065 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -39,22 +39,26 @@ $langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
+if (GETPOST("year", 'int')) {
+	$year_start = GETPOST("year", 'int');
+} else {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) {
+		$year_start--; // If current month is lower that starting fiscal month, we start last year
+	}
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
-if ($month_end < 1)
-{
+if ($month_end < 1) {
 	$month_end = 12;
 	$year_end--;
 }
@@ -72,8 +76,7 @@ $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'acco
  * Actions
  */
 
-if ($action == 'clean' || $action == 'validatehistory')
-{
+if ($action == 'clean' || $action == 'validatehistory') {
 	// Clean database
 	$db->begin();
 	$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as fd";
@@ -187,15 +190,13 @@ if ($action == 'validatehistory') {
 				$suggestedaccountingaccountfor = '';
 			}
 
-			if ($objp->aarowid_suggest > 0)
-			{
+			if ($objp->aarowid_suggest > 0) {
 				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facturedet";
 				$sqlupdate .= " SET fk_code_ventilation = ".$objp->aarowid_suggest;
 				$sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".$objp->rowid;
 
 				$resqlupdate = $db->query($sqlupdate);
-				if (!$resqlupdate)
-				{
+				if (!$resqlupdate) {
 					$error++;
 					setEventMessages($db->lasterror(), null, 'errors');
 					break;
@@ -206,8 +207,7 @@ if ($action == 'validatehistory') {
 		}
 	}
 
-	if ($error)
-	{
+	if ($error) {
 		$db->rollback();
 	} else {
 		$db->commit();
@@ -246,7 +246,9 @@ print '<tr class="liste_titre"><td width="200">'.$langs->trans("Account").'</td>
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -255,7 +257,9 @@ $sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, 'fd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
@@ -286,16 +290,18 @@ if ($resql) {
 
 	while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 		print '<td class="left">';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -324,7 +330,9 @@ print '<tr class="liste_titre"><td width="200">'.$langs->trans("Account").'</td>
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -333,7 +341,9 @@ $sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, 'fd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(fd.total_ht) as total";
@@ -364,17 +374,19 @@ if ($resql) {
 
 	while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 
 		print '<td class="left">';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/customer/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 
 		for ($i = 2; $i <= 12; $i++) {
@@ -392,8 +404,7 @@ print "</table>\n";
 print '</div>';
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report that should rely on result of this step ?
-{
+if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
 	print '<br>';
 	print '<br>';
 
@@ -405,7 +416,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("TotalVente").'</td>';
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -413,7 +426,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	$sql = "SELECT '".$db->escape($langs->trans("TotalVente"))."' AS total,";
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, 'fd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(fd.total_ht) as total";
@@ -462,7 +477,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 		print '<tr class="liste_titre"><td width="400">'.$langs->trans("TotalMarge").'</td>';
 		for ($i = 1; $i <= 12; $i++) {
 			$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-			if ($j > 12) $j -= 12;
+			if ($j > 12) {
+				$j -= 12;
+			}
 			print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 		}
 		print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -470,7 +487,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 		$sql = "SELECT '".$db->escape($langs->trans("Vide"))."' AS marge,";
 		for ($i = 1; $i <= 12; $i++) {
 			$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-			if ($j > 12) $j -= 12;
+			if ($j > 12) {
+				$j -= 12;
+			}
 			$sql .= "  SUM(".$db->ifsql('MONTH(f.datef)='.$j, '(fd.total_ht-(fd.qty * fd.buy_price_ht))', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 		}
 		$sql .= "  SUM((fd.total_ht-(fd.qty * fd.buy_price_ht))) as total";
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index a5c603c2504..983e7957583 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -64,12 +64,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) $page = 0;
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield)
+if (!$sortfield) {
 	$sortfield = "f.datef, f.ref, fd.rowid";
+}
 if (!$sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
 		$sortorder = "DESC";
@@ -77,10 +80,12 @@ if (!$sortorder) {
 }
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 $formaccounting = new FormAccounting($db);
 
@@ -90,8 +95,7 @@ $formaccounting = new FormAccounting($db);
  */
 
 // 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_societe = '';
 	$search_lineid = '';
 	$search_ref = '';
@@ -111,14 +115,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
 
-	if (!(GETPOST('account_parent', 'int') >= 0))
-	{
+	if (!(GETPOST('account_parent', 'int') >= 0)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->begin();
 
 		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as l";
@@ -231,16 +233,23 @@ $sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
-	foreach ($arrayofcode as $key => $value)
-	{
+	foreach ($arrayofcode as $key => $value) {
 		$country_code_in_EEC .= ($country_code_in_EEC ? "," : "")."'".$value."'";
-		if ($value != $mysoc->country_code) $country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		if ($value != $mysoc->country_code) {
+			$country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		}
+	}
+	if ($search_country == 'special_allnotme') {
+		$sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
+	} elseif ($search_country == 'special_eec') {
+		$sql .= " AND co.code IN (".$country_code_in_EEC.")";
+	} elseif ($search_country == 'special_eecnotme') {
+		$sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
+	} elseif ($search_country == 'special_noteec') {
+		$sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
+	} else {
+		$sql .= natural_search("co.code", $search_country);
 	}
-	if ($search_country == 'special_allnotme')     $sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
-	elseif ($search_country == 'special_eec')      $sql .= " AND co.code IN (".$country_code_in_EEC.")";
-	elseif ($search_country == 'special_eecnotme') $sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
-	elseif ($search_country == 'special_noteec')   $sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
-	else $sql .= natural_search("co.code", $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tvaintra);
@@ -250,12 +259,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -270,24 +277,54 @@ if ($result) {
 	$i = 0;
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_societe)	$param .= "&search_societe=".urlencode($search_societe);
-	if ($search_invoice)	$param .= "&search_invoice=".urlencode($search_invoice);
-	if ($search_ref)		$param .= "&search_ref=".urlencode($search_ref);
-	if ($search_label)		$param .= "&search_label=".urlencode($search_label);
-	if ($search_desc)		$param .= "&search_desc=".urlencode($search_desc);
-	if ($search_account)	$param .= "&search_account=".urlencode($search_account);
-	if ($search_vat)		$param .= "&search_vat=".urlencode($search_vat);
-	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
-	if ($search_country)  	$param .= "&search_country=".urlencode($search_country);
-	if ($search_tvaintra)	$param .= "&search_tvaintra=".urlencode($search_tvaintra);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($search_societe) {
+		$param .= "&search_societe=".urlencode($search_societe);
+	}
+	if ($search_invoice) {
+		$param .= "&search_invoice=".urlencode($search_invoice);
+	}
+	if ($search_ref) {
+		$param .= "&search_ref=".urlencode($search_ref);
+	}
+	if ($search_label) {
+		$param .= "&search_label=".urlencode($search_label);
+	}
+	if ($search_desc) {
+		$param .= "&search_desc=".urlencode($search_desc);
+	}
+	if ($search_account) {
+		$param .= "&search_account=".urlencode($search_account);
+	}
+	if ($search_vat) {
+		$param .= "&search_vat=".urlencode($search_vat);
+	}
+	if ($search_day) {
+		$param .= '&search_day='.urlencode($search_day);
+	}
+	if ($search_month) {
+		$param .= '&search_month='.urlencode($search_month);
+	}
+	if ($search_year) {
+		$param .= '&search_year='.urlencode($search_year);
+	}
+	if ($search_country) {
+		$param .= "&search_country=".urlencode($search_country);
+	}
+	if ($search_tvaintra) {
+		$param .= "&search_tvaintra=".urlencode($search_tvaintra);
+	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
-	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.'">';
@@ -313,8 +350,8 @@ if ($result) {
 	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
 		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
 	}
-   	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
-   	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
+	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
@@ -402,9 +439,15 @@ if ($result) {
 
 		// Ref Product
 		print '<td class="tdoverflowmax100">';
-		if ($productstatic->id > 0) print $productstatic->getNomUrl(1);
-		if ($productstatic->id > 0 && $objp->product_label) print '<br>';
-		if ($objp->product_label) print '<span class="opacitymedium">'.$objp->product_label.'</span>';
+		if ($productstatic->id > 0) {
+			print $productstatic->getNomUrl(1);
+		}
+		if ($productstatic->id > 0 && $objp->product_label) {
+			print '<br>';
+		}
+		if ($objp->product_label) {
+			print '<span class="opacitymedium">'.$objp->product_label.'</span>';
+		}
 		print '</td>';
 
 		print '<td class="tdoverflowonsmartphone">';
@@ -422,8 +465,7 @@ if ($result) {
 
 		// Country
 		print '<td>';
-		if ($objp->country_code)
-		{
+		if ($objp->country_code) {
 			print $langs->trans("Country".$objp->country_code).' ('.$objp->country_code.')';
 		}
 		print '</td>';
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index defe8bfd3b9..8d5c2788425 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -72,12 +72,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) { $page = 0; }
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield)
+if (!$sortfield) {
 	$sortfield = "f.datef, f.ref, l.rowid";
+}
 if (!$sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
 		$sortorder = "DESC";
@@ -85,10 +88,12 @@ if (!$sortorder) {
 }
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('accountancycustomerlist'));
@@ -102,18 +107,22 @@ $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'acco
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_societe = '';
 		$search_lineid = '';
 		$search_ref = '';
@@ -155,8 +164,7 @@ if ($massaction == 'ventil') {
 			$monId = $maLigneCourante[0];
 			$monCompte = GETPOST('codeventil'.$monId);
 
-			if ($monCompte <= 0)
-			{
+			if ($monCompte <= 0) {
 				$msg .= '<div><span style="color:red">'.$langs->trans("Lineofinvoice", $monId).' - '.$langs->trans("NoAccountSelected").'</span></div>';
 				$ko++;
 			} else {
@@ -195,8 +203,7 @@ $formother = new FormOther($db);
 
 llxHeader('', $langs->trans("Ventilation"));
 
-if (empty($chartaccountcode))
-{
+if (empty($chartaccountcode)) {
 	print $langs->trans("ErrorChartOfAccountSystemNotSelected");
 	// End of page
 	llxFooter();
@@ -264,16 +271,23 @@ $sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
-	foreach ($arrayofcode as $key => $value)
-	{
+	foreach ($arrayofcode as $key => $value) {
 		$country_code_in_EEC .= ($country_code_in_EEC ? "," : "")."'".$value."'";
-		if ($value != $mysoc->country_code) $country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		if ($value != $mysoc->country_code) {
+			$country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		}
+	}
+	if ($search_country == 'special_allnotme') {
+		$sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
+	} elseif ($search_country == 'special_eec') {
+		$sql .= " AND co.code IN (".$country_code_in_EEC.")";
+	} elseif ($search_country == 'special_eecnotme') {
+		$sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
+	} elseif ($search_country == 'special_noteec') {
+		$sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
+	} else {
+		$sql .= natural_search("co.code", $search_country);
 	}
-	if ($search_country == 'special_allnotme')     $sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
-	elseif ($search_country == 'special_eec')      $sql .= " AND co.code IN (".$country_code_in_EEC.")";
-	elseif ($search_country == 'special_eecnotme') $sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
-	elseif ($search_country == 'special_noteec')   $sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
-	else $sql .= natural_search("co.code", $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tvaintra);
@@ -294,12 +308,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -321,20 +333,48 @@ if ($result) {
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_societe)     $param .= '&search_societe='.urlencode($search_societe);
-	if ($search_lineid)      $param .= '&search_lineid='.urlencode($search_lineid);
-	if ($search_day)         $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)       $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)        $param .= '&search_year='.urlencode($search_year);
-	if ($search_invoice)     $param .= '&search_invoice='.urlencode($search_invoice);
-	if ($search_ref)         $param .= '&search_ref='.urlencode($search_ref);
-	if ($search_desc)        $param .= '&search_desc='.urlencode($search_desc);
-	if ($search_amount)      $param .= '&search_amount='.urlencode($search_amount);
-	if ($search_vat)         $param .= '&search_vat='.urlencode($search_vat);
-	if ($search_country)  	 $param .= "&search_country=".urlencode($search_country);
-	if ($search_tvaintra)	 $param .= "&search_tvaintra=".urlencode($search_tvaintra);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($search_societe) {
+		$param .= '&search_societe='.urlencode($search_societe);
+	}
+	if ($search_lineid) {
+		$param .= '&search_lineid='.urlencode($search_lineid);
+	}
+	if ($search_day) {
+		$param .= '&search_day='.urlencode($search_day);
+	}
+	if ($search_month) {
+		$param .= '&search_month='.urlencode($search_month);
+	}
+	if ($search_year) {
+		$param .= '&search_year='.urlencode($search_year);
+	}
+	if ($search_invoice) {
+		$param .= '&search_invoice='.urlencode($search_invoice);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_desc) {
+		$param .= '&search_desc='.urlencode($search_desc);
+	}
+	if ($search_amount) {
+		$param .= '&search_amount='.urlencode($search_amount);
+	}
+	if ($search_vat) {
+		$param .= '&search_vat='.urlencode($search_vat);
+	}
+	if ($search_country) {
+		$param .= "&search_country=".urlencode($search_country);
+	}
+	if ($search_tvaintra) {
+		$param .= "&search_tvaintra=".urlencode($search_tvaintra);
+	}
 
 	$arrayofmassactions = array(
 		'ventil'=>$langs->trans("Ventilate")
@@ -347,7 +387,9 @@ if ($result) {
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
-	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.'">';
@@ -358,7 +400,9 @@ if ($result) {
 
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoCustomer").'</span></br><br>';
 
-	if ($msg) print $msg.'<br>';
+	if ($msg) {
+		print $msg.'<br>';
+	}
 
 	$moreforfilter = '';
 
@@ -370,11 +414,11 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="'.dol_escape_htmltag($search_lineid).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
 	print '<td class="liste_titre center nowraponall minwidth100imp">';
-   	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
 		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
 	}
-   	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
+	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="' . dol_escape_htmltag($search_label) . '"></td>';
@@ -410,7 +454,9 @@ if ($result) {
 	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
 	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
 	$checkpicto = '';
-	if ($massactionbutton) $checkpicto = $form->showCheckAddButtons('checkforselect', 1);
+	if ($massactionbutton) {
+		$checkpicto = $form->showCheckAddButtons('checkforselect', 1);
+	}
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
@@ -503,7 +549,9 @@ if ($result) {
 				}
 			}
 		}
-		if ($objp->code_sell_l == -1) $objp->code_sell_l = '';
+		if ($objp->code_sell_l == -1) {
+			$objp->code_sell_l = '';
+		}
 
 		// Level 2: Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
 		$suggestedaccountingaccountfor = '';
@@ -553,8 +601,12 @@ if ($result) {
 		} else {
 			$code_sell_p_notset = 'color:orange';
 		}
-		if (empty($objp->code_sell_l) && empty($objp->code_sell_p)) $code_sell_p_notset = 'color:red';
-		if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber' && empty($code_sell_p_notset)) $code_sell_p_notset = 'color:orange';
+		if (empty($objp->code_sell_l) && empty($objp->code_sell_p)) {
+			$code_sell_p_notset = 'color:red';
+		}
+		if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber' && empty($code_sell_p_notset)) {
+			$code_sell_p_notset = 'color:orange';
+		}
 
 		// $objp->code_sell_l is now default code of product/service
 		// $objp->code_sell_p is now code of product/service
@@ -575,7 +627,9 @@ if ($result) {
 		if ($product_static->id > 0) {
 			print $product_static->getNomUrl(1);
 		}
-		if ($objp->product_label) print '<br><span class="opacitymedium small">'.$objp->product_label.'</span>';
+		if ($objp->product_label) {
+			print '<br><span class="opacitymedium small">'.$objp->product_label.'</span>';
+		}
 		print '</td>';
 
 		print '<td class="tdoverflowonsmartphone small">';
@@ -589,8 +643,9 @@ if ($result) {
 		print '</td>';
 
 		// Vat rate
-		if ($objp->vat_tx_l != $objp->vat_tx_p)
+		if ($objp->vat_tx_l != $objp->vat_tx_p) {
 			$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
+		}
 		print '<td style="'.$code_vat_differ.'" class="right">';
 		print vatrate($objp->tva_tx_line.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : ''));
 		print '</td>';
@@ -610,22 +665,27 @@ if ($result) {
 		print '<td>';
 		$s = '<span class="small">1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
 		$shelp = '';
-		if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp .= $langs->trans("SaleEEC");
-		elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp .= $langs->trans("SaleExport");
+		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
+			$shelp .= $langs->trans("SaleEEC");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
+			$shelp .= $langs->trans("SaleExport");
+		}
 		$s .= ($objp->code_sell_l > 0 ? length_accountg($objp->code_sell_l) : '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>');
 		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
-		if ($objp->product_id > 0)
-		{
+		if ($objp->product_id > 0) {
 			print '<br>';
 			$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
 			$shelp = ''; $ttype = 'help';
-			if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
-			elseif ($suggestedaccountingaccountfor == 'eecwithvat') $shelp = $langs->trans("SaleEECWithVAT");
-			elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
+			if ($suggestedaccountingaccountfor == 'eec') {
+				$shelp = $langs->trans("SaleEEC");
+			} elseif ($suggestedaccountingaccountfor == 'eecwithvat') {
+				$shelp = $langs->trans("SaleEECWithVAT");
+			} elseif ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
 				$shelp = $langs->trans("SaleEECWithoutVATNumber");
 				$ttype = 'warning';
+			} elseif ($suggestedaccountingaccountfor == 'export') {
+				$shelp = $langs->trans("SaleExport");
 			}
-			elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
 			$s .= (empty($objp->code_sell_p) ? '<span style="'.$code_sell_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_sell_p));
 			print $form->textwithpicto($s, $shelp, 1, $ttype, '', 0, 2, '', 1);
 		} else {
@@ -649,10 +709,8 @@ if ($result) {
 		// Suggested accounting account
 		print '<td>';
 		$suggestedid = $objp->aarowid_suggest;
-		if (empty($suggestedid) && empty($objp->code_sell_p) && !empty($objp->code_sell_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC))
-		{
-			if (empty($accountingaccount_codetotid_cache[$objp->code_sell_l]))
-			{
+		if (empty($suggestedid) && empty($objp->code_sell_p) && !empty($objp->code_sell_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) {
+			if (empty($accountingaccount_codetotid_cache[$objp->code_sell_l])) {
 				$tmpaccount = new AccountingAccount($db);
 				$tmpaccount->fetch(0, $objp->code_sell_l, 1);
 				if ($tmpaccount->id > 0) {
@@ -669,7 +727,9 @@ if ($result) {
 		// Column with checkbox
 		print '<td class="center">';
 		$ischecked = $objp->aarowid_suggest;
-		if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') $ischecked = 0;
+		if ($suggestedaccountingaccountfor == 'eecwithoutvatnumber') {
+			$ischecked = 0;
+		}
 		print '<input type="checkbox" class="flat checkforselect checkforselect'.$objp->rowid.'" name="toselect[]" value="'.$objp->rowid."_".$i.'"'.($ischecked ? "checked" : "").'/>';
 		print '</td>';
 
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 3cf680adfbf..d68326ad68e 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -42,19 +42,20 @@ $codeventil = GETPOST('codeventil', 'int');
 $id = GETPOST('id', 'int');
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
+}
 
 
 /*
  * Actions
  */
 
-if ($action == 'ventil' && $user->rights->accounting->bind->write)
-{
-	if (!$cancel)
-	{
-		if ($codeventil < 0) $codeventil = 0;
+if ($action == 'ventil' && $user->rights->accounting->bind->write) {
+	if (!$cancel) {
+		if ($codeventil < 0) {
+			$codeventil = 0;
+		}
 
 		$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport_det";
 		$sql .= " SET fk_code_ventilation = ".$codeventil;
@@ -65,8 +66,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 			setEventMessages($db->lasterror(), null, 'errors');
 		} else {
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-			if ($backtopage)
-			{
+			if ($backtopage) {
 				header("Location: ".$backtopage);
 				exit();
 			}
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 6edb8d86a07..ffa0bfcc07d 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -36,21 +36,25 @@ $langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
+if (GETPOST("year", 'int')) {
+	$year_start = GETPOST("year", 'int');
+} else {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) {
+		$year_start--; // If current month is lower that starting fiscal month, we start last year
+	}
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
-if ($month_end < 1)
-{
+if ($month_end < 1) {
 	$month_end = 12;
 	$year_end--;
 }
@@ -67,8 +71,7 @@ $action = GETPOST('action', 'aZ09');
  * Actions
  */
 
-if ($action == 'clean' || $action == 'validatehistory')
-{
+if ($action == 'clean' || $action == 'validatehistory') {
 	// Clean database
 	$db->begin();
 	$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -156,7 +159,9 @@ print '<tr class="liste_titre"><td width="200">'.$langs->trans("Account").'</td>
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -165,7 +170,9 @@ $sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(er.date_debut)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= " SUM(erd.total_ht) as total";
@@ -190,16 +197,18 @@ if ($resql) {
 
 	while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 		print '<td class="left">';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -229,7 +238,9 @@ print '<tr class="liste_titre"><td width="200">'.$langs->trans("Account").'</td>
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -238,7 +249,9 @@ $sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(er.date_debut)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= " ROUND(SUM(erd.total_ht),2) as total";
@@ -263,17 +276,19 @@ if ($resql) {
 
 	while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 
 		print '<td class="left">';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/expensereport/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -291,8 +306,7 @@ print '</div>';
 
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report where results depends on next step (so not yet available) ?
-{
+if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report where results depends on next step (so not yet available) ?
 	print '<br>';
 	print '<br>';
 
@@ -304,7 +318,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("Total").'</td>';
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -312,7 +328,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	$sql = "SELECT '".$db->escape($langs->trans("TotalExpenseReport"))."' AS label,";
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		$sql .= " SUM(".$db->ifsql('MONTH(er.date_create)='.$j, 'erd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 	}
 	$sql .= " SUM(erd.total_ht) as total";
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 02a6ce64df2..3c4760b3730 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -58,12 +58,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) $page = 0;
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 $offset = $limit * $page;
-if (!$sortfield)
+if (!$sortfield) {
 	$sortfield = "erd.date, erd.rowid";
+}
 if (!$sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
 		$sortorder = "DESC";
@@ -71,10 +74,12 @@ if (!$sortorder) {
 }
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 $formaccounting = new FormAccounting($db);
 
@@ -84,8 +89,7 @@ $formaccounting = new FormAccounting($db);
  */
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 	$search_login = '';
 	$search_expensereport = '';
 	$search_label = '';
@@ -101,14 +105,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
 
-	if (!(GETPOST('account_parent', 'int') >= 0))
-	{
+	if (!(GETPOST('account_parent', 'int') >= 0)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->begin();
 
 		$sql1 = "UPDATE ".MAIN_DB_PREFIX."expensereport_det as erd";
@@ -205,12 +207,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -226,21 +226,45 @@ if ($result) {
 	$i = 0;
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_login)       $param .= '&search_login='.urlencode($search_login);
-	if ($search_expensereport) $param .= "&search_expensereport=".urlencode($search_expensereport);
-	if ($search_label)		$param .= "&search_label=".urlencode($search_label);
-	if ($search_desc)		$param .= "&search_desc=".urlencode($search_desc);
-	if ($search_account)	$param .= "&search_account=".urlencode($search_account);
-	if ($search_vat)		$param .= "&search_vat=".urlencode($search_vat);
-	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($search_login) {
+		$param .= '&search_login='.urlencode($search_login);
+	}
+	if ($search_expensereport) {
+		$param .= "&search_expensereport=".urlencode($search_expensereport);
+	}
+	if ($search_label) {
+		$param .= "&search_label=".urlencode($search_label);
+	}
+	if ($search_desc) {
+		$param .= "&search_desc=".urlencode($search_desc);
+	}
+	if ($search_account) {
+		$param .= "&search_account=".urlencode($search_account);
+	}
+	if ($search_vat) {
+		$param .= "&search_vat=".urlencode($search_vat);
+	}
+	if ($search_day) {
+		$param .= '&search_day='.urlencode($search_day);
+	}
+	if ($search_month) {
+		$param .= '&search_month='.urlencode($search_month);
+	}
+	if ($search_year) {
+		$param .= '&search_year='.urlencode($search_year);
+	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
-	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.'">';
@@ -268,9 +292,11 @@ if ($result) {
 		print '<td class="liste_titre"></td>';
 	}
 	print '<td class="liste_titre center">';
-   	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
+	}
+	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
+	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 500c11d3cce..05476756531 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -68,12 +68,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) { $page = 0; }
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield)
+if (!$sortfield) {
 	$sortfield = "erd.date, erd.rowid";
+}
 if (!$sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
 		$sortorder = "DESC";
@@ -81,10 +84,12 @@ if (!$sortorder) {
 }
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 $formaccounting = new FormAccounting($db);
 $accounting = new AccountingAccount($db);
@@ -96,12 +101,15 @@ $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'acco
  * Action
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 	$search_login = '';
 	$search_expensereport = '';
 	$search_label = '';
@@ -137,8 +145,7 @@ if ($massaction == 'ventil') {
 			$monId = $maLigneCourante[0];
 			$monCompte = GETPOST('codeventil'.$monId);
 
-			if ($monCompte <= 0)
-			{
+			if ($monCompte <= 0) {
 				$msg .= '<div><span style="color:red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</span></div>';
 				$ko++;
 			} else {
@@ -177,8 +184,7 @@ $formother = new FormOther($db);
 
 llxHeader('', $langs->trans("ExpenseReportsVentilation"));
 
-if (empty($chartaccountcode))
-{
+if (empty($chartaccountcode)) {
 	print $langs->trans("ErrorChartOfAccountSystemNotSelected");
 	// End of page
 	llxFooter();
@@ -231,12 +237,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -253,18 +257,42 @@ if ($result) {
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_login)       $param .= '&search_login='.urlencode($search_login);
-	if ($search_lineid)      $param .= '&search_lineid='.urlencode($search_lineid);
-	if ($search_day)         $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)       $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)        $param .= '&search_year='.urlencode($search_year);
-	if ($search_expensereport) $param .= '&search_expensereport='.urlencode($search_expensereport);
-	if ($search_label)       $param .= '&search_label='.urlencode($search_label);
-	if ($search_desc)        $param .= '&search_desc='.urlencode($search_desc);
-	if ($search_amount)      $param .= '&search_amount='.urlencode($search_amount);
-	if ($search_vat)         $param .= '&search_vat='.urlencode($search_vat);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($search_login) {
+		$param .= '&search_login='.urlencode($search_login);
+	}
+	if ($search_lineid) {
+		$param .= '&search_lineid='.urlencode($search_lineid);
+	}
+	if ($search_day) {
+		$param .= '&search_day='.urlencode($search_day);
+	}
+	if ($search_month) {
+		$param .= '&search_month='.urlencode($search_month);
+	}
+	if ($search_year) {
+		$param .= '&search_year='.urlencode($search_year);
+	}
+	if ($search_expensereport) {
+		$param .= '&search_expensereport='.urlencode($search_expensereport);
+	}
+	if ($search_label) {
+		$param .= '&search_label='.urlencode($search_label);
+	}
+	if ($search_desc) {
+		$param .= '&search_desc='.urlencode($search_desc);
+	}
+	if ($search_amount) {
+		$param .= '&search_amount='.urlencode($search_amount);
+	}
+	if ($search_vat) {
+		$param .= '&search_vat='.urlencode($search_vat);
+	}
 
 	$arrayofmassactions = array(
 		'ventil' => $langs->trans("Ventilate")
@@ -274,7 +302,9 @@ if ($result) {
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
-	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.'">';
@@ -285,7 +315,9 @@ if ($result) {
 
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoExpenseReport").'</span></br><br>';
 
-	if ($msg) print $msg.'<br>';
+	if ($msg) {
+		print $msg.'<br>';
+	}
 
 	$moreforfilter = '';
 
@@ -301,9 +333,11 @@ if ($result) {
 		print '<td class="liste_titre"></td>';
 	}
 	print '<td class="liste_titre center nowraponall minwidth100imp">';
-   	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
+	}
+	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
+	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
@@ -332,7 +366,9 @@ if ($result) {
 	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
 	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', '');
 	$checkpicto = '';
-	if ($massactionbutton) $checkpicto = $form->showCheckAddButtons('checkforselect', 1);
+	if ($massactionbutton) {
+		$checkpicto = $form->showCheckAddButtons('checkforselect', 1);
+	}
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 834af1ff06a..32f3dfef3d5 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -32,8 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->loadLangs(array("compta", "bills", "other", "accountancy", "loans", "banks", "admin", "dict"));
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
+}
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
 $hookmanager->initHooks(array('accountancyindex'));
@@ -43,8 +44,8 @@ $hookmanager->initHooks(array('accountancyindex'));
  * Actions
  */
 
-if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
-{
+if (GETPOST('addbox')) {
+	// Add box (when submit is done from a form when ajax disabled)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 	$zone = GETPOST('areacode', 'aZ09');
 	$userid = GETPOST('userid', 'int');
@@ -52,7 +53,9 @@ if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax dis
 	$boxorder .= GETPOST('boxcombo', 'aZ09');
 
 	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
-	if ($result > 0) setEventMessages($langs->trans("BoxAdded"), null);
+	if ($result > 0) {
+		setEventMessages($langs->trans("BoxAdded"), null);
+	}
 }
 
 
@@ -62,8 +65,7 @@ if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax dis
 
 llxHeader('', $langs->trans("AccountancyArea"));
 
-if ($conf->accounting->enabled)
-{
+if ($conf->accounting->enabled) {
 	$step = 0;
 
 	$resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
@@ -71,8 +73,7 @@ if ($conf->accounting->enabled)
 	$helpisexpanded = empty($resultboxes['boxactivated']) || (empty($resultboxes['boxlista']) && empty($resultboxes['boxlistb'])); // If there is no widget, the tooltip help is expanded by default.
 	$showtutorial = '';
 
-	if (!$helpisexpanded)
-	{
+	if (!$helpisexpanded) {
 		$showtutorial  = '<div align="right"><a href="#" id="show_hide">';
 		$showtutorial .= img_picto('', 'chevron-down');
 		$showtutorial .= ' '.$langs->trans("ShowTutorial");
@@ -141,8 +142,7 @@ if ($conf->accounting->enabled)
 	$s = str_replace('{s}', $textlink, $s);
 	print $s;
 	print "<br>\n";
-	if (!empty($conf->tax->enabled))
-	{
+	if (!empty($conf->tax->enabled)) {
 		$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong></a>';
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, '{s}');
@@ -150,8 +150,7 @@ if ($conf->accounting->enabled)
 		print $s;
 		print "<br>\n";
 	}
-	if (!empty($conf->expensereport->enabled))  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
-	{
+	if (!empty($conf->expensereport->enabled)) {  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '{s}');
 		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>', $s);
@@ -190,8 +189,7 @@ if ($conf->accounting->enabled)
 	print $s;
 	print "<br>\n";
 
-	if (!empty($conf->expensereport->enabled) || !empty($conf->deplacement->enabled))
-	{
+	if (!empty($conf->expensereport->enabled) || !empty($conf->deplacement->enabled)) {
 		$step++;
 		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescBind", chr(64 + $step), $langs->transnoentitiesnoconv("ExpenseReports"), '{s}')."\n";
 		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/index.php"><strong>'.$langs->transnoentitiesnoconv("TransferInAccounting").' - '.$langs->transnoentitiesnoconv("ExpenseReportsVentilation").'</strong></a>', $s);
@@ -218,8 +216,8 @@ if ($conf->accounting->enabled)
 	print '<div class="fichecenter fichecenterbis">';
 
 	/*
-     * Show boxes
-     */
+	 * Show boxes
+	 */
 	$boxlist .= '<div class="twocolumns">';
 
 	$boxlist .= '<div class="firstcolumn fichehalfleft boxhalfleft" id="boxhalfleft">';
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 70ec097cd27..9010261dbe0 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -51,13 +51,16 @@ $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
 $in_bookkeeping = GETPOST('in_bookkeeping');
-if ($in_bookkeeping == '') $in_bookkeeping = 'notyet';
+if ($in_bookkeeping == '') {
+	$in_bookkeeping = 'notyet';
+}
 
 $now = dol_now();
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
+}
 
 /*
  * Actions
@@ -73,8 +76,7 @@ $journal_label = $accountingjournalstatic->label;
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (empty($date_startmonth) || empty($date_endmonth))
-{
+if (empty($date_startmonth) || empty($date_endmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
@@ -83,8 +85,7 @@ if (empty($date_startmonth) || empty($date_endmonth))
 	$pastmonth = $dates['pastmonth'];
 }
 
-if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
-{
+if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) { // We define date_start and date_end, only if we did not submit the form
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
@@ -101,19 +102,18 @@ $sql .= " JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = er.fk_user_author";
 $sql .= " WHERE er.fk_statut > 0";
 $sql .= " AND erd.fk_code_ventilation > 0";
 $sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
-if ($date_start && $date_end)
+if ($date_start && $date_end) {
 	$sql .= " AND er.date_debut >= '".$db->idate($date_start)."' AND er.date_debut <= '".$db->idate($date_end)."'";
+}
 // Define begin binding date
 if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 	$sql .= " AND er.date_debut >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
 }
 // Already in bookkeeping or not
-if ($in_bookkeeping == 'already')
-{
+if ($in_bookkeeping == 'already') {
 	$sql .= " AND er.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 }
-if ($in_bookkeeping == 'notyet')
-{
+if ($in_bookkeeping == 'notyet') {
 	$sql .= " AND er.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab  WHERE ab.doc_type='expense_report')";
 }
 $sql .= " ORDER BY er.date_debut";
@@ -150,8 +150,7 @@ if ($result) {
 		$compta_localtax2 = (!empty($vatdata['accountancy_code_buy']) ? $vatdata['accountancy_code_buy'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code))
-		{
+		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code)) {
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
@@ -161,11 +160,21 @@ if ($result) {
 		$taber[$obj->rowid]["fk_expensereportdet"] = $obj->erdid;
 
 		// Avoid warnings
-		if (!isset($tabttc[$obj->rowid][$compta_user])) $tabttc[$obj->rowid][$compta_user] = 0;
-		if (!isset($tabht[$obj->rowid][$compta_fees])) $tabht[$obj->rowid][$compta_fees] = 0;
-		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		if (!isset($tabttc[$obj->rowid][$compta_user])) {
+			$tabttc[$obj->rowid][$compta_user] = 0;
+		}
+		if (!isset($tabht[$obj->rowid][$compta_fees])) {
+			$tabht[$obj->rowid][$compta_fees] = 0;
+		}
+		if (!isset($tabtva[$obj->rowid][$compta_tva])) {
+			$tabtva[$obj->rowid][$compta_tva] = 0;
+		}
+		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) {
+			$tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		}
+		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) {
+			$tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		}
 
 		$tabttc[$obj->rowid][$compta_user] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_fees] += $obj->total_ht;
@@ -189,8 +198,7 @@ if ($action == 'writebookkeeping') {
 	$now = dol_now();
 	$error = 0;
 
-	foreach ($taber as $key => $val)		// Loop on each expense report
-	{
+	foreach ($taber as $key => $val) {		// Loop on each expense report
 		$errorforline = 0;
 
 		$totalcredit = 0;
@@ -199,8 +207,7 @@ if ($action == 'writebookkeeping') {
 		$db->begin();
 
 		// Thirdparty
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			foreach ($tabttc[$key] as $k => $mt) {
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
@@ -232,8 +239,7 @@ if ($action == 'writebookkeeping') {
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 							$error++;
 							$errorforline++;
 							//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -248,8 +254,7 @@ if ($action == 'writebookkeeping') {
 		}
 
 		// Fees
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			foreach ($tabht[$key] as $k => $mt) {
 				if ($mt) {
 					// get compte id and label
@@ -280,8 +285,7 @@ if ($action == 'writebookkeeping') {
 
 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -297,14 +301,16 @@ if ($action == 'writebookkeeping') {
 		}
 
 		// VAT
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			$listoftax = array(0, 1, 2);
-			foreach ($listoftax as $numtax)
-			{
+			foreach ($listoftax as $numtax) {
 				$arrayofvat = $tabtva;
-				if ($numtax == 1) $arrayofvat = $tablocaltax1;
-				if ($numtax == 2) $arrayofvat = $tablocaltax2;
+				if ($numtax == 1) {
+					$arrayofvat = $tablocaltax1;
+				}
+				if ($numtax == 2) {
+					$arrayofvat = $tablocaltax2;
+				}
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
@@ -338,8 +344,7 @@ if ($action == 'writebookkeeping') {
 
 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
 								//setEventMessages('Transaction for ('.$bookkeeping->doc_type.', '.$bookkeeping->fk_doc.', '.$bookkeeping->fk_docdet.') were already recorded', null, 'warnings');
@@ -355,21 +360,18 @@ if ($action == 'writebookkeeping') {
 		}
 
 		// Protection against a bug on line before
-		if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT'))
-		{
+		if (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')) {
 			$error++;
 			$errorforline++;
 			setEventMessages('Try to insert a non balanced transaction in book for '.$val["ref"].'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			$db->commit();
 		} else {
 			$db->rollback();
 
-			if ($error >= 10)
-			{
+			if ($error >= 10) {
 				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
 				break; // Break in the foreach
 			}
@@ -380,8 +382,7 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	} elseif (count($tabpay) == $error)
-	{
+	} elseif (count($tabpay) == $error) {
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
@@ -390,8 +391,7 @@ if ($action == 'writebookkeeping') {
 	$action = '';
 
 	// Must reload data, so we make a redirect
-	if (count($tabpay) != $error)
-	{
+	if (count($tabpay) != $error) {
 		$param = 'id_journal='.$id_journal;
 		$param .= '&date_startday='.$date_startday;
 		$param .= '&date_startmonth='.$date_startmonth;
@@ -503,12 +503,17 @@ if (empty($action) || $action == 'view') {
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
 
-	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
+		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	}
 	if (empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	} else {
-		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
-		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		if ($in_bookkeeping == 'notyet') {
+			print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+		} else {
+			print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		}
 	}
 	print '</div>';
 
@@ -573,10 +578,11 @@ if (empty($action) || $action == 'view') {
 				// Account
 				print "<td>";
 				$accountoshow = length_accountg($k);
-				if (($accountoshow == "") || $accountoshow == 'NotDefined')
-				{
+				if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 					print '<span class="error">'.$langs->trans("FeeAccountNotDefined").'</span>';
-				} else print $accountoshow;
+				} else {
+					print $accountoshow;
+				}
 				print '</td>';
 				// Subledger account
 				print "<td>";
@@ -602,18 +608,20 @@ if (empty($action) || $action == 'view') {
 			// Account
 			print "<td>";
 			$accountoshow = length_accounta($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined')
-			{
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("MainAccountForUsersNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print "</td>";
 			// Subledger account
 			print "<td>";
 			$accountoshow = length_accounta($k);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined')
-			{
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("UserAccountNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print '</td>';
 			print "<td>".$userstatic->getNomUrl(0, 'user', 16).' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
@@ -625,8 +633,12 @@ if (empty($action) || $action == 'view') {
 		$listoftax = array(0, 1, 2);
 		foreach ($listoftax as $numtax) {
 			$arrayofvat = $tabtva;
-			if ($numtax == 1) $arrayofvat = $tablocaltax1;
-			if ($numtax == 2) $arrayofvat = $tablocaltax2;
+			if ($numtax == 1) {
+				$arrayofvat = $tablocaltax1;
+			}
+			if ($numtax == 2) {
+				$arrayofvat = $tablocaltax2;
+			}
 
 			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
@@ -637,10 +649,11 @@ if (empty($action) || $action == 'view') {
 					// Account
 					print "<td>";
 					$accountoshow = length_accountg($k);
-					if (($accountoshow == "") || $accountoshow == 'NotDefined')
-					{
+					if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").'</span>';
-					} else print $accountoshow;
+					} else {
+						print $accountoshow;
+					}
 					print "</td>";
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 611dde36af5..46363fb3a09 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -51,13 +51,16 @@ $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
 $in_bookkeeping = GETPOST('in_bookkeeping');
-if ($in_bookkeeping == '') $in_bookkeeping = 'notyet';
+if ($in_bookkeeping == '') {
+	$in_bookkeeping = 'notyet';
+}
 
 $now = dol_now();
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
+}
 
 $hookmanager->initHooks(array('purchasesjournal'));
 $parameters = array();
@@ -78,8 +81,7 @@ $journal_label = $accountingjournalstatic->label;
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (empty($date_startmonth) || empty($date_endmonth))
-{
+if (empty($date_startmonth) || empty($date_endmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
@@ -88,8 +90,7 @@ if (empty($date_startmonth) || empty($date_endmonth))
 	$pastmonth = $dates['pastmonth'];
 }
 
-if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
-{
+if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) { // We define date_start and date_end, only if we did not submit the form
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
@@ -111,19 +112,18 @@ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 } else {
 	$sql .= " AND f.type IN (".FactureFournisseur::TYPE_STANDARD.",".FactureFournisseur::TYPE_REPLACEMENT.",".FactureFournisseur::TYPE_CREDIT_NOTE.",".FactureFournisseur::TYPE_DEPOSIT.",".FactureFournisseur::TYPE_SITUATION.")";
 }
-if ($date_start && $date_end)
+if ($date_start && $date_end) {
 	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+}
 // Define begin binding date
 if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
 }
 // Already in bookkeeping or not
-if ($in_bookkeeping == 'already')
-{
+if ($in_bookkeeping == 'already') {
 	$sql .= " AND f.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='supplier_invoice')";
 }
-if ($in_bookkeeping == 'notyet')
-{
+if ($in_bookkeeping == 'notyet') {
 	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='supplier_invoice')";
 }
 $sql .= " ORDER BY f.datef";
@@ -156,9 +156,9 @@ if ($result) {
 
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
-			if ($obj->product_type == 0)
+			if ($obj->product_type == 0) {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : 'NotDefined';
-			else {
+			} else {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : 'NotDefined';
 			}
 		}
@@ -170,8 +170,7 @@ if ($result) {
 		$compta_counterpart_tva_npr = (!empty($conf->global->ACCOUNTING_COUNTERPART_VAT_NPR)) ? $conf->global->ACCOUNTING_COUNTERPART_VAT_NPR : 'NotDefined';
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code))
-		{
+		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code)) {
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
@@ -189,17 +188,26 @@ if ($result) {
 		//$tabfac[$obj->rowid]["fk_facturefourndet"] = $obj->fdid;
 
 		// Avoid warnings
-		if (!isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-		if (!isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		if (!isset($tabttc[$obj->rowid][$compta_soc])) {
+			$tabttc[$obj->rowid][$compta_soc] = 0;
+		}
+		if (!isset($tabht[$obj->rowid][$compta_prod])) {
+			$tabht[$obj->rowid][$compta_prod] = 0;
+		}
+		if (!isset($tabtva[$obj->rowid][$compta_tva])) {
+			$tabtva[$obj->rowid][$compta_tva] = 0;
+		}
+		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) {
+			$tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		}
+		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) {
+			$tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		}
 
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
 		$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
-		if (!empty($line->tva_npr))	// Add an entry for counterpart
-		{
+		if (!empty($line->tva_npr)) {	// Add an entry for counterpart
 			$tabother[$obj->rowid][$compta_counterpart_tva_npr] += $obj->total_tva;
 		}
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
@@ -226,14 +234,14 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 	$sql .= " WHERE fd.product_type <= 2 AND fd.fk_code_ventilation <= 0";
 	$sql .= " AND fd.total_ttc <> 0 AND fk_facture_fourn = ".$key;
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj->nb > 0)
-		{
+		if ($obj->nb > 0) {
 			$errorforinvoice[$key] = 'somelinesarenotbound';
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 }
 //var_dump($errorforinvoice);exit;
 
@@ -274,31 +282,29 @@ if ($action == 'writebookkeeping') {
 
 		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
 		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED)
-		{
+		if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED) {
 			$replacedinvoice = 1;
 			$alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
+			if ($alreadydispatched) {
+				$replacedinvoice = 2;
+			}
 		}
 
 		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
-		if ($replacedinvoice == 1)
-		{
+		if ($replacedinvoice == 1) {
 			$db->rollback();
 			continue;
 		}
 
 		// Error if some lines are not binded/ready to be journalized
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
+		if ($errorforinvoice[$key] == 'somelinesarenotbound') {
 			$error++;
 			$errorforline++;
 			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
 		}
 
 		// Thirdparty
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			foreach ($tabttc[$key] as $k => $mt) {
 				$bookkeeping = new BookKeeping($db);
 				$bookkeeping->doc_date = $val["date"];
@@ -331,8 +337,7 @@ if ($action == 'writebookkeeping') {
 
 				$result = $bookkeeping->create($user);
 				if ($result < 0) {
-					if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-					{
+					if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'alreadyjournalized';
@@ -348,8 +353,7 @@ if ($action == 'writebookkeeping') {
 		}
 
 		// Product / Service
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			foreach ($tabht[$key] as $k => $mt) {
 				// get compte id and label
 				if ($accountingaccount->fetch(null, $k, true)) {
@@ -381,8 +385,7 @@ if ($action == 'writebookkeeping') {
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
@@ -400,14 +403,16 @@ if ($action == 'writebookkeeping') {
 
 		// VAT
 		// var_dump($tabtva);
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			$listoftax = array(0, 1, 2);
-			foreach ($listoftax as $numtax)
-			{
+			foreach ($listoftax as $numtax) {
 				$arrayofvat = $tabtva;
-				if ($numtax == 1) $arrayofvat = $tablocaltax1;
-				if ($numtax == 2) $arrayofvat = $tablocaltax2;
+				if ($numtax == 1) {
+					$arrayofvat = $tablocaltax1;
+				}
+				if ($numtax == 2) {
+					$arrayofvat = $tablocaltax2;
+				}
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
@@ -442,8 +447,7 @@ if ($action == 'writebookkeeping') {
 
 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
-							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'alreadyjournalized';
@@ -462,8 +466,7 @@ if ($action == 'writebookkeeping') {
 
 		// Counterpart of VAT for VAT NPR
 		// var_dump($tabother);
-		if (!$errorforline && is_array($tabother[$key]))
-		{
+		if (!$errorforline && is_array($tabother[$key])) {
 			foreach ($tabother[$key] as $k => $mt) {
 				if ($mt) {
 					$bookkeeping = new BookKeeping($db);
@@ -493,8 +496,7 @@ if ($action == 'writebookkeeping') {
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
@@ -511,22 +513,19 @@ if ($action == 'writebookkeeping') {
 		}
 
 		// Protection against a bug on lines before
-		if (!$errorforline && (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')))
-		{
+		if (!$errorforline && (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT'))) {
 			$error++;
 			$errorforline++;
 			$errorforinvoice[$key] = 'amountsnotbalanced';
 			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			$db->commit();
 		} else {
 			$db->rollback();
 
-			if ($error >= 10)
-			{
+			if ($error >= 10) {
 				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
 				break; // Break in the foreach
 			}
@@ -537,8 +536,7 @@ if ($action == 'writebookkeeping') {
 
 	if (empty($error) && count($tabpay) > 0) {
 		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
-	} elseif (count($tabpay) == $error)
-	{
+	} elseif (count($tabpay) == $error) {
 		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
 	} else {
 		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
@@ -547,8 +545,7 @@ if ($action == 'writebookkeeping') {
 	$action = '';
 
 	// Must reload data, so we make a redirect
-	if (count($tabpay) != $error)
-	{
+	if (count($tabpay) != $error) {
 		$param = 'id_journal='.$id_journal;
 		$param .= '&date_startday='.$date_startday;
 		$param .= '&date_startmonth='.$date_startmonth;
@@ -579,8 +576,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	$companystatic = new Fournisseur($db);
 	$invoicestatic = new FactureFournisseur($db);
 
-	foreach ($tabfac as $key => $val)
-	{
+	foreach ($tabfac as $key => $val) {
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
@@ -600,16 +596,16 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 
 		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
 		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED)
-		{
+		if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED) {
 			$replacedinvoice = 1;
 			$alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
+			if ($alreadydispatched) {
+				$replacedinvoice = 2;
+			}
 		}
 
 		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
-		if ($replacedinvoice == 1)
-		{
+		if ($replacedinvoice == 1) {
 			continue;
 		}
 
@@ -657,8 +653,12 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 		$listoftax = array(0, 1, 2);
 		foreach ($listoftax as $numtax) {
 			$arrayofvat = $tabtva;
-			if ($numtax == 1) $arrayofvat = $tablocaltax1;
-			if ($numtax == 2) $arrayofvat = $tablocaltax2;
+			if ($numtax == 1) {
+				$arrayofvat = $tablocaltax1;
+			}
+			if ($numtax == 2) {
+				$arrayofvat = $tablocaltax2;
+			}
 
 			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
@@ -679,8 +679,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 			}
 
 			// VAT counterpart for NPR
-			if (is_array($tabother[$key]))
-			{
+			if (is_array($tabother[$key])) {
 				foreach ($tabother[$key] as $k => $mt) {
 					if ($mt) {
 						print '"'.$key.'"'.$sep;
@@ -733,12 +732,17 @@ if (empty($action) || $action == 'view') {
 		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
-	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
+		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	}
 	if (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "") || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	} else {
-		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
-		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		if ($in_bookkeeping == 'notyet') {
+			print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+		} else {
+			print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		}
 	}
 	print '</div>';
 
@@ -781,8 +785,7 @@ if (empty($action) || $action == 'view') {
 	$invoicestatic = new FactureFournisseur($db);
 	$companystatic = new Fournisseur($db);
 
-	foreach ($tabfac as $key => $val)
-	{
+	foreach ($tabfac as $key => $val) {
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
@@ -802,16 +805,16 @@ if (empty($action) || $action == 'view') {
 
 		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
 		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED)
-		{
+		if ($invoicestatic->close_code == FactureFournisseur::CLOSECODE_REPLACED) {
 			$replacedinvoice = 1;
 			$alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
+			if ($alreadydispatched) {
+				$replacedinvoice = 2;
+			}
 		}
 
 		// If not already into bookkeeping, we won't add it, if yes, add the counterpart ???.
-		if ($replacedinvoice == 1)
-		{
+		if ($replacedinvoice == 1) {
 			print '<tr class="oddeven">';
 			print "<!-- Replaced invoice -->";
 			print "<td>".$date."</td>";
@@ -831,8 +834,7 @@ if (empty($action) || $action == 'view') {
 
 			continue;
 		}
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
+		if ($errorforinvoice[$key] == 'somelinesarenotbound') {
 			print '<tr class="oddeven">';
 			print "<!-- Some lines are not bound -->";
 			print "<td>".$date."</td>";
@@ -860,18 +862,20 @@ if (empty($action) || $action == 'view') {
 			// Account
 			print "<td>";
 			$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined')
-			{
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("MainAccountForSuppliersNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print '</td>';
 			// Subledger account
 			print "<td>";
 			$accountoshow = length_accounta($k);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined')
-			{
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'supplier', 16).' - '.$invoicestatic->ref_supplier.' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt < 0 ? price(-$mt) : '')."</td>";
@@ -891,10 +895,11 @@ if (empty($action) || $action == 'view') {
 			// Account
 			print "<td>";
 			$accountoshow = length_accountg($k);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined')
-			{
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("ProductAccountNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -911,8 +916,12 @@ if (empty($action) || $action == 'view') {
 		$listoftax = array(0, 1, 2);
 		foreach ($listoftax as $numtax) {
 			$arrayofvat = $tabtva;
-			if ($numtax == 1) $arrayofvat = $tablocaltax1;
-			if ($numtax == 2) $arrayofvat = $tablocaltax2;
+			if ($numtax == 1) {
+				$arrayofvat = $tablocaltax1;
+			}
+			if ($numtax == 2) {
+				$arrayofvat = $tablocaltax2;
+			}
 
 			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
@@ -923,10 +932,11 @@ if (empty($action) || $action == 'view') {
 					// Account
 					print "<td>";
 					$accountoshow = length_accountg($k);
-					if (($accountoshow == "") || $accountoshow == 'NotDefined')
-					{
+					if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").')</span>';
-					} else print $accountoshow;
+					} else {
+						print $accountoshow;
+					}
 					print "</td>";
 					// Subledger account
 					print "<td>";
@@ -942,8 +952,7 @@ if (empty($action) || $action == 'view') {
 		}
 
 		// VAT counterpart for NPR
-		if (is_array($tabother[$key]))
-		{
+		if (is_array($tabother[$key])) {
 			foreach ($tabother[$key] as $k => $mt) {
 				if ($mt) {
 					print '<tr class="oddeven">';
@@ -953,10 +962,11 @@ if (empty($action) || $action == 'view') {
 					// Account
 					print '<td>';
 					$accountoshow = length_accountg($k);
-					if ($accountoshow == '' || $accountoshow == 'NotDefined')
-					{
+					if ($accountoshow == '' || $accountoshow == 'NotDefined') {
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("NPR counterpart").'). Set ACCOUNTING_COUNTERPART_VAT_NPR to the subvention account</span>';
-					} else print $accountoshow;
+					} else {
+						print $accountoshow;
+					}
 					print '</td>';
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index 62d2238a116..16209e1a241 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -53,13 +53,16 @@ $date_endmonth = GETPOST('date_endmonth');
 $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
 $in_bookkeeping = GETPOST('in_bookkeeping');
-if ($in_bookkeeping == '') $in_bookkeeping = 'notyet';
+if ($in_bookkeeping == '') {
+	$in_bookkeeping = 'notyet';
+}
 
 $now = dol_now();
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
+}
 
 $hookmanager->initHooks(array('sellsjournal'));
 $parameters = array();
@@ -81,8 +84,7 @@ $journal_label = $accountingjournalstatic->label;
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (empty($date_startmonth) || empty($date_endmonth))
-{
+if (empty($date_startmonth) || empty($date_endmonth)) {
 	// Period by default on transfer
 	$dates = getDefaultDatesForTransfer();
 	$date_start = $dates['date_start'];
@@ -91,8 +93,7 @@ if (empty($date_startmonth) || empty($date_endmonth))
 	$pastmonth = $dates['pastmonth'];
 }
 
-if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) // We define date_start and date_end, only if we did not submit the form
-{
+if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) { // We define date_start and date_end, only if we did not submit the form
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
@@ -115,20 +116,19 @@ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {	// Non common s
 	$sql .= " AND f.type IN (".Facture::TYPE_STANDARD.",".Facture::TYPE_REPLACEMENT.",".Facture::TYPE_CREDIT_NOTE.",".Facture::TYPE_DEPOSIT.",".Facture::TYPE_SITUATION.")";
 }
 $sql .= " AND fd.product_type IN (0,1)";
-if ($date_start && $date_end)
+if ($date_start && $date_end) {
 	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+}
 // Define begin binding date
 if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 	$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
 }
 // Already in bookkeeping or not
-if ($in_bookkeeping == 'already')
-{
+if ($in_bookkeeping == 'already') {
 	$sql .= " AND f.rowid IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";
 	//	$sql .= " AND fd.rowid IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";		// Useless, we save one line for all products with same account
 }
-if ($in_bookkeeping == 'notyet')
-{
+if ($in_bookkeeping == 'notyet') {
 	$sql .= " AND f.rowid NOT IN (SELECT fk_doc FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";
 	// $sql .= " AND fd.rowid NOT IN (SELECT fk_docdet FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='customer_invoice')";		// Useless, we save one line for all products with same account
 }
@@ -162,9 +162,9 @@ if ($result) {
 
 		$compta_prod = $obj->compte;
 		if (empty($compta_prod)) {
-			if ($obj->product_type == 0)
+			if ($obj->product_type == 0) {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : 'NotDefined';
-			else {
+			} else {
 				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT)) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : 'NotDefined';
 			}
 		}
@@ -175,8 +175,7 @@ if ($result) {
 		$compta_localtax2 = (!empty($vatdata['accountancy_code_sell']) ? $vatdata['accountancy_code_sell'] : $cpttva);
 
 		// Define array to display all VAT rates that use this accounting account $compta_tva
-		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code))
-		{
+		if (price2num($obj->tva_tx) || !empty($obj->vat_src_code)) {
 			$def_tva[$obj->rowid][$compta_tva][vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : '')] = (vatrate($obj->tva_tx).($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''));
 		}
 
@@ -207,15 +206,27 @@ if ($result) {
 		//$tabfac[$obj->rowid]["fk_facturedet"] = $obj->fdid;
 
 		// Avoid warnings
-		if (!isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-		if (!isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		if (!isset($tabttc[$obj->rowid][$compta_soc])) {
+			$tabttc[$obj->rowid][$compta_soc] = 0;
+		}
+		if (!isset($tabht[$obj->rowid][$compta_prod])) {
+			$tabht[$obj->rowid][$compta_prod] = 0;
+		}
+		if (!isset($tabtva[$obj->rowid][$compta_tva])) {
+			$tabtva[$obj->rowid][$compta_tva] = 0;
+		}
+		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) {
+			$tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		}
+		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) {
+			$tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		}
 
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-		if (empty($line->tva_npr)) $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio; // We ignore line if VAT is a NPR
+		if (empty($line->tva_npr)) {
+			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio; // We ignore line if VAT is a NPR
+		}
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1 * $situation_ratio;
 		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2 * $situation_ratio;
 		$tabcompany[$obj->rowid] = array(
@@ -240,14 +251,14 @@ foreach ($tabfac as $key => $val) {		// Loop on each invoice
 	$sql .= " WHERE fd.product_type <= 2 AND fd.fk_code_ventilation <= 0";
 	$sql .= " AND fd.total_ttc <> 0 AND fk_facture = ".$key;
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj->nb > 0)
-		{
+		if ($obj->nb > 0) {
 			$errorforinvoice[$key] = 'somelinesarenotbound';
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 }
 //var_dump($errorforinvoice);exit;
 
@@ -285,31 +296,29 @@ if ($action == 'writebookkeeping') {
 
 		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
 		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED)
-		{
+		if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED) {
 			$replacedinvoice = 1;
 			$alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
+			if ($alreadydispatched) {
+				$replacedinvoice = 2;
+			}
 		}
 
 		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
-		if ($replacedinvoice == 1)
-		{
+		if ($replacedinvoice == 1) {
 			$db->rollback();
 			continue;
 		}
 
 		// Error if some lines are not binded/ready to be journalized
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
+		if ($errorforinvoice[$key] == 'somelinesarenotbound') {
 			$error++;
 			$errorforline++;
 			setEventMessages($langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $val['ref']), null, 'errors');
 		}
 
 		// Thirdparty
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			foreach ($tabttc[$key] as $k => $mt) {
 				$bookkeeping = new BookKeeping($db);
 				$bookkeeping->doc_date = $val["date"];
@@ -342,8 +351,7 @@ if ($action == 'writebookkeeping') {
 
 				$result = $bookkeeping->create($user);
 				if ($result < 0) {
-					if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-					{
+					if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 						$error++;
 						$errorforline++;
 						$errorforinvoice[$key] = 'alreadyjournalized';
@@ -359,8 +367,7 @@ if ($action == 'writebookkeeping') {
 		}
 
 		// Product / Service
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			foreach ($tabht[$key] as $k => $mt) {
 				// get compte id and label
 				if ($accountingaccount->fetch(null, $k, true)) {
@@ -392,8 +399,7 @@ if ($action == 'writebookkeeping') {
 
 					$result = $bookkeeping->create($user);
 					if ($result < 0) {
-						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-						{
+						if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 							$error++;
 							$errorforline++;
 							$errorforinvoice[$key] = 'alreadyjournalized';
@@ -410,14 +416,16 @@ if ($action == 'writebookkeeping') {
 		}
 
 		// VAT
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			$listoftax = array(0, 1, 2);
-			foreach ($listoftax as $numtax)
-			{
+			foreach ($listoftax as $numtax) {
 				$arrayofvat = $tabtva;
-				if ($numtax == 1) $arrayofvat = $tablocaltax1;
-				if ($numtax == 2) $arrayofvat = $tablocaltax2;
+				if ($numtax == 1) {
+					$arrayofvat = $tablocaltax1;
+				}
+				if ($numtax == 2) {
+					$arrayofvat = $tablocaltax2;
+				}
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
@@ -452,8 +460,7 @@ if ($action == 'writebookkeeping') {
 
 						$result = $bookkeeping->create($user);
 						if ($result < 0) {
-			   				if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists')	// Already exists
-							{
+							if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {	// Already exists
 								$error++;
 								$errorforline++;
 								$errorforinvoice[$key] = 'alreadyjournalized';
@@ -471,22 +478,19 @@ if ($action == 'writebookkeeping') {
 		}
 
 		// Protection against a bug on lines before
-		if (!$errorforline && (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT')))
-		{
+		if (!$errorforline && (price2num($totaldebit, 'MT') != price2num($totalcredit, 'MT'))) {
 			$error++;
 			$errorforline++;
 			$errorforinvoice[$key] = 'amountsnotbalanced';
 			setEventMessages('Try to insert a non balanced transaction in book for '.$invoicestatic->ref.'. Canceled. Surely a bug.', null, 'errors');
 		}
 
-		if (!$errorforline)
-		{
+		if (!$errorforline) {
 			$db->commit();
 		} else {
 			$db->rollback();
 
-			if ($error >= 10)
-			{
+			if ($error >= 10) {
 				setEventMessages($langs->trans("ErrorTooManyErrorsProcessStopped"), null, 'errors');
 				break; // Break in the foreach
 			}
@@ -506,8 +510,7 @@ if ($action == 'writebookkeeping') {
 	$action = '';
 
 	// Must reload data, so we make a redirect
-	if (count($tabpay) != $error)
-	{
+	if (count($tabpay) != $error) {
 		$param = 'id_journal='.$id_journal;
 		$param .= '&date_startday='.$date_startday;
 		$param .= '&date_startmonth='.$date_startmonth;
@@ -540,8 +543,7 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 	$companystatic = new Client($db);
 	$invoicestatic = new Facture($db);
 
-	foreach ($tabfac as $key => $val)
-	{
+	foreach ($tabfac as $key => $val) {
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
@@ -559,16 +561,16 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 
 		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
 		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED)
-		{
+		if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED) {
 			$replacedinvoice = 1;
 			$alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
+			if ($alreadydispatched) {
+				$replacedinvoice = 2;
+			}
 		}
 
 		// If not already into bookkeeping, we won't add it. If yes, do nothing (should not happen because creating replacement not possible if invoice is accounted)
-		if ($replacedinvoice == 1)
-		{
+		if ($replacedinvoice == 1) {
 			continue;
 		}
 
@@ -616,8 +618,12 @@ if ($action == 'exportcsv') {		// ISO and not UTF8 !
 		$listoftax = array(0, 1, 2);
 		foreach ($listoftax as $numtax) {
 			$arrayofvat = $tabtva;
-			if ($numtax == 1) $arrayofvat = $tablocaltax1;
-			if ($numtax == 2) $arrayofvat = $tablocaltax2;
+			if ($numtax == 1) {
+				$arrayofvat = $tablocaltax1;
+			}
+			if ($numtax == 2) {
+				$arrayofvat = $tablocaltax2;
+			}
 
 			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
@@ -651,9 +657,9 @@ if (empty($action) || $action == 'view') {
 	$exportlink = '';
 	$builddate = dol_now();
 	$description .= $langs->trans("DescJournalOnlyBindedVisible").'<br>';
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 		$description .= $langs->trans("DepositsAreNotIncluded");
-	else {
+	} else {
 		$description .= $langs->trans("DepositsAreIncluded");
 	}
 
@@ -672,12 +678,17 @@ if (empty($action) || $action == 'view') {
 		print ' : '.$langs->trans("AccountancyAreaDescMisc", 4, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("MenuDefaultAccounts").'</strong>');
 	}
 	print '<div class="tabsAction tabsActionNoBottom">';
-	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
+		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
+	}
 	if (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "") || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1') {
 		print '<input type="button" class="butActionRefused classfortooltip" title="'.dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")).'" value="'.$langs->trans("WriteBookKeeping").'" />';
 	} else {
-		if ($in_bookkeeping == 'notyet') print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
-		else print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		if ($in_bookkeeping == 'notyet') {
+			print '<input type="button" class="butAction" name="writebookkeeping" value="'.$langs->trans("WriteBookKeeping").'" onclick="writebookkeeping();" />';
+		} else {
+			print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">'.$langs->trans("WriteBookKeeping").'</a>';
+		}
 	}
 	print '</div>';
 
@@ -720,8 +731,7 @@ if (empty($action) || $action == 'view') {
 	$companystatic = new Client($db);
 	$invoicestatic = new Facture($db);
 
-	foreach ($tabfac as $key => $val)
-	{
+	foreach ($tabfac as $key => $val) {
 		$companystatic->id = $tabcompany[$key]['id'];
 		$companystatic->name = $tabcompany[$key]['name'];
 		$companystatic->code_compta = $tabcompany[$key]['code_compta'];
@@ -739,16 +749,16 @@ if (empty($action) || $action == 'view') {
 
 		// Is it a replaced invoice ? 0=not a replaced invoice, 1=replaced invoice not yet dispatched, 2=replaced invoice dispatched
 		$replacedinvoice = 0;
-		if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED)
-		{
+		if ($invoicestatic->close_code == Facture::CLOSECODE_REPLACED) {
 			$replacedinvoice = 1;
 			$alreadydispatched = $invoicestatic->getVentilExportCompta(); // Test if replaced invoice already into bookkeeping.
-			if ($alreadydispatched) $replacedinvoice = 2;
+			if ($alreadydispatched) {
+				$replacedinvoice = 2;
+			}
 		}
 
 		// If not already into bookkeeping, we won't add it, if yes, add the counterpart ???.
-		if ($replacedinvoice == 1)
-		{
+		if ($replacedinvoice == 1) {
 			print '<tr class="oddeven">';
 			print "<!-- Replaced invoice -->";
 			print "<td>".$date."</td>";
@@ -768,8 +778,7 @@ if (empty($action) || $action == 'view') {
 
 			continue;
 		}
-		if ($errorforinvoice[$key] == 'somelinesarenotbound')
-		{
+		if ($errorforinvoice[$key] == 'somelinesarenotbound') {
 			print '<tr class="oddeven">';
 			print "<!-- Some lines are not bound -->";
 			print "<td>".$date."</td>";
@@ -789,8 +798,7 @@ if (empty($action) || $action == 'view') {
 		}
 
 		// Third party
-		foreach ($tabttc[$key] as $k => $mt)
-		{
+		foreach ($tabttc[$key] as $k => $mt) {
 			print '<tr class="oddeven">';
 			print "<!-- Thirdparty -->";
 			print "<td>".$date."</td>";
@@ -798,18 +806,20 @@ if (empty($action) || $action == 'view') {
 			// Account
 			print "<td>";
 			$accountoshow = length_accounta($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined')
-			{
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("MainAccountForCustomersNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print '</td>';
 			// Subledger account
 			print "<td>";
 			$accountoshow = length_accounta($k);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined')
-			{
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print '</td>';
 			print "<td>".$companystatic->getNomUrl(0, 'customer', 16).' - '.$invoicestatic->ref.' - '.$langs->trans("SubledgerAccount")."</td>";
 			print '<td class="right nowraponall">'.($mt >= 0 ? price($mt) : '')."</td>";
@@ -818,8 +828,7 @@ if (empty($action) || $action == 'view') {
 		}
 
 		// Product / Service
-		foreach ($tabht[$key] as $k => $mt)
-		{
+		foreach ($tabht[$key] as $k => $mt) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch(null, $k, true);
 
@@ -830,10 +839,11 @@ if (empty($action) || $action == 'view') {
 			// Account
 			print "<td>";
 			$accountoshow = length_accountg($k);
-			if (($accountoshow == "") || $accountoshow == 'NotDefined')
-			{
+			if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 				print '<span class="error">'.$langs->trans("ProductNotDefined").'</span>';
-			} else print $accountoshow;
+			} else {
+				print $accountoshow;
+			}
 			print "</td>";
 			// Subledger account
 			print "<td>";
@@ -848,11 +858,14 @@ if (empty($action) || $action == 'view') {
 
 		// VAT
 		$listoftax = array(0, 1, 2);
-		foreach ($listoftax as $numtax)
-		{
+		foreach ($listoftax as $numtax) {
 			$arrayofvat = $tabtva;
-			if ($numtax == 1) $arrayofvat = $tablocaltax1;
-			if ($numtax == 2) $arrayofvat = $tablocaltax2;
+			if ($numtax == 1) {
+				$arrayofvat = $tablocaltax1;
+			}
+			if ($numtax == 2) {
+				$arrayofvat = $tablocaltax2;
+			}
 
 			foreach ($arrayofvat[$key] as $k => $mt) {
 				if ($mt) {
@@ -863,10 +876,11 @@ if (empty($action) || $action == 'view') {
 					// Account
 					print "<td>";
 					$accountoshow = length_accountg($k);
-					if (($accountoshow == "") || $accountoshow == 'NotDefined')
-					{
+					if (($accountoshow == "") || $accountoshow == 'NotDefined') {
 						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").')</span>';
-					} else print $accountoshow;
+					} else {
+						print $accountoshow;
+					}
 					print "</td>";
 					// Subledger account
 					print "<td>";
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index f958004b813..25a3fc04ca4 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -42,19 +42,20 @@ $codeventil = GETPOST('codeventil', 'int');
 $id = GETPOST('id', 'int');
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
+}
 
 
 /*
  * Actions
  */
 
-if ($action == 'ventil' && $user->rights->accounting->bind->write)
-{
-	if (!$cancel)
-	{
-		if ($codeventil < 0) $codeventil = 0;
+if ($action == 'ventil' && $user->rights->accounting->bind->write) {
+	if (!$cancel) {
+		if ($codeventil < 0) {
+			$codeventil = 0;
+		}
 
 		$sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
 		$sql .= " SET fk_code_ventilation = ".$codeventil;
@@ -65,8 +66,7 @@ if ($action == 'ventil' && $user->rights->accounting->bind->write)
 			setEventMessages($db->lasterror(), null, 'errors');
 		} else {
 			setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-			if ($backtopage)
-			{
+			if ($backtopage) {
 				header("Location: ".$backtopage);
 				exit();
 			}
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 9dd097f3d0c..937173fc1e6 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -37,22 +37,26 @@ $langs->loadLangs(array("compta", "bills", "other", "main", "accountancy"));
 if (empty($conf->accounting->enabled)) {
 	accessforbidden();
 }
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 
 $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-if (GETPOST("year", 'int')) $year_start = GETPOST("year", 'int');
-else {
+if (GETPOST("year", 'int')) {
+	$year_start = GETPOST("year", 'int');
+} else {
 	$year_start = dol_print_date(dol_now(), '%Y');
-	if (dol_print_date(dol_now(), '%m') < $month_start) $year_start--; // If current month is lower that starting fiscal month, we start last year
+	if (dol_print_date(dol_now(), '%m') < $month_start) {
+		$year_start--; // If current month is lower that starting fiscal month, we start last year
+	}
 }
 $year_end = $year_start + 1;
 $month_end = $month_start - 1;
-if ($month_end < 1)
-{
+if ($month_end < 1) {
 	$month_end = 12;
 	$year_end--;
 }
@@ -70,8 +74,7 @@ $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'acco
  * Actions
  */
 
-if ($action == 'clean' || $action == 'validatehistory')
-{
+if ($action == 'clean' || $action == 'validatehistory') {
 	// Clean database
 	$db->begin();
 	$sql1 = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det as fd";
@@ -177,15 +180,13 @@ if ($action == 'validatehistory') {
 				$suggestedaccountingaccountfor = '';
 			}
 
-			if ($objp->aarowid_suggest > 0)
-			{
+			if ($objp->aarowid_suggest > 0) {
 				$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
 				$sqlupdate .= " SET fk_code_ventilation = ".$objp->aarowid_suggest;
 				$sqlupdate .= " WHERE fk_code_ventilation <= 0 AND product_type <= 2 AND rowid = ".$objp->rowid;
 
 				$resqlupdate = $db->query($sqlupdate);
-				if (!$resqlupdate)
-				{
+				if (!$resqlupdate) {
 					$error++;
 					setEventMessages($db->lasterror(), null, 'errors');
 					break;
@@ -196,8 +197,7 @@ if ($action == 'validatehistory') {
 		}
 	}
 
-	if ($error)
-	{
+	if ($error) {
 		$db->rollback();
 	} else {
 		$db->commit();
@@ -235,7 +235,9 @@ print '<tr class="liste_titre"><td width="200">'.$langs->trans("Account").'</td>
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -244,7 +246,9 @@ $sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
@@ -270,16 +274,18 @@ if ($resql) {
 
 	while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 		print '<td class="left">';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -308,7 +314,9 @@ print '<tr class="liste_titre"><td width="200">'.$langs->trans("Account").'</td>
 print '<td width="200" class="left">'.$langs->trans("Label").'</td>';
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -317,7 +325,9 @@ $sql = "SELECT ".$db->ifsql('aa.account_number IS NULL', "'tobind'", 'aa.account
 $sql .= "  ".$db->ifsql('aa.label IS NULL', "'tobind'", 'aa.label')." AS intitule,";
 for ($i = 1; $i <= 12; $i++) {
 	$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-	if ($j > 12) $j -= 12;
+	if ($j > 12) {
+		$j -= 12;
+	}
 	$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 }
 $sql .= "  SUM(ffd.total_ht) as total";
@@ -343,16 +353,18 @@ if ($resql) {
 
 	while ($row = $db->fetch_row($resql)) {
 		print '<tr class="oddeven"><td>';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("Unknown");
-		} else print length_accountg($row[0]);
+		} else {
+			print length_accountg($row[0]);
+		}
 		print '</td>';
 		print '<td class="left">';
-		if ($row[0] == 'tobind')
-		{
+		if ($row[0] == 'tobind') {
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.$y, $langs->transnoentitiesnoconv("ToBind"));
-		} else print $row[1];
+		} else {
+			print $row[1];
+		}
 		print '</td>';
 		for ($i = 2; $i <= 12; $i++) {
 			print '<td class="nowrap right">'.price($row[$i]).'</td>';
@@ -370,8 +382,7 @@ print '</div>';
 
 
 
-if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange. Why showing a report that should rely on result of this step ?
-{
+if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
 	print '<br>';
 	print '<br>';
 
@@ -383,7 +394,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	print '<tr class="liste_titre"><td width="400" class="left">'.$langs->trans("Total").'</td>';
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 	}
 	print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
@@ -391,7 +404,9 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
 	$sql = "SELECT '".$db->escape($langs->trans("CAHTF"))."' AS label,";
 	for ($i = 1; $i <= 12; $i++) {
 		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		$sql .= "  SUM(".$db->ifsql('MONTH(ff.datef)='.$j, 'ffd.total_ht', '0').") AS month".str_pad($j, 2, '0', STR_PAD_LEFT).",";
 	}
 	$sql .= "  SUM(ffd.total_ht) as total";
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index 70d6d89216f..6bdc714ec4c 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -65,12 +65,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) $page = 0;
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield)
+if (!$sortfield) {
 	$sortfield = "f.datef, f.ref, l.rowid";
+}
 if (!$sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_DONE > 0) {
 		$sortorder = "DESC";
@@ -78,10 +81,12 @@ if (!$sortorder) {
 }
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 $formaccounting = new FormAccounting($db);
 
@@ -91,8 +96,7 @@ $formaccounting = new FormAccounting($db);
  */
 
 // 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_societe = '';
 	$search_lineid = '';
 	$search_ref = '';
@@ -112,15 +116,13 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 if (is_array($changeaccount) && count($changeaccount) > 0) {
 	$error = 0;
 
-	if (!(GETPOST('account_parent', 'int') >= 0))
-	{
+	if (!(GETPOST('account_parent', 'int') >= 0)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Account")), null, 'errors');
 	}
 
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->begin();
 
 		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det as l";
@@ -224,16 +226,23 @@ $sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
-	foreach ($arrayofcode as $key => $value)
-	{
+	foreach ($arrayofcode as $key => $value) {
 		$country_code_in_EEC .= ($country_code_in_EEC ? "," : "")."'".$value."'";
-		if ($value != $mysoc->country_code) $country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		if ($value != $mysoc->country_code) {
+			$country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		}
+	}
+	if ($search_country == 'special_allnotme') {
+		$sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
+	} elseif ($search_country == 'special_eec') {
+		$sql .= " AND co.code IN (".$country_code_in_EEC.")";
+	} elseif ($search_country == 'special_eecnotme') {
+		$sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
+	} elseif ($search_country == 'special_noteec') {
+		$sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
+	} else {
+		$sql .= natural_search("co.code", $search_country);
 	}
-	if ($search_country == 'special_allnotme')     $sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
-	elseif ($search_country == 'special_eec')      $sql .= " AND co.code IN (".$country_code_in_EEC.")";
-	elseif ($search_country == 'special_eecnotme') $sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
-	elseif ($search_country == 'special_noteec')   $sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
-	else $sql .= natural_search("co.code", $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tvaintra);
@@ -249,12 +258,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -269,24 +276,54 @@ if ($result) {
 	$i = 0;
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_societe)	$param .= "&search_societe=".urlencode($search_societe);
-	if ($search_invoice)	$param .= "&search_invoice=".urlencode($search_invoice);
-	if ($search_ref)		$param .= "&search_ref=".urlencode($search_ref);
-	if ($search_label)		$param .= "&search_label=".urlencode($search_label);
-	if ($search_desc)		$param .= "&search_desc=".urlencode($search_desc);
-	if ($search_account)	$param .= "&search_account=".urlencode($search_account);
-	if ($search_vat)		$param .= "&search_vat=".urlencode($search_vat);
-	if ($search_day)        $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)      $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)       $param .= '&search_year='.urlencode($search_year);
-	if ($search_country) 	$param .= "&search_country=".urlencode($search_country);
-	if ($search_tvaintra)	$param .= "&search_tvaintra=".urlencode($search_tvaintra);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($search_societe) {
+		$param .= "&search_societe=".urlencode($search_societe);
+	}
+	if ($search_invoice) {
+		$param .= "&search_invoice=".urlencode($search_invoice);
+	}
+	if ($search_ref) {
+		$param .= "&search_ref=".urlencode($search_ref);
+	}
+	if ($search_label) {
+		$param .= "&search_label=".urlencode($search_label);
+	}
+	if ($search_desc) {
+		$param .= "&search_desc=".urlencode($search_desc);
+	}
+	if ($search_account) {
+		$param .= "&search_account=".urlencode($search_account);
+	}
+	if ($search_vat) {
+		$param .= "&search_vat=".urlencode($search_vat);
+	}
+	if ($search_day) {
+		$param .= '&search_day='.urlencode($search_day);
+	}
+	if ($search_month) {
+		$param .= '&search_month='.urlencode($search_month);
+	}
+	if ($search_year) {
+		$param .= '&search_year='.urlencode($search_year);
+	}
+	if ($search_country) {
+		$param .= "&search_country=".urlencode($search_country);
+	}
+	if ($search_tvaintra) {
+		$param .= "&search_tvaintra=".urlencode($search_tvaintra);
+	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
-	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.'">';
@@ -311,9 +348,11 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre center nowraponall">';
-   	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
+	}
+	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
+	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
@@ -355,8 +394,7 @@ if ($result) {
 	$accountingaccountstatic = new AccountingAccount($db);
 
 	$i = 0;
-	while ($i < min($num_lines, $limit))
-	{
+	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
 		$facturefournisseur_static->ref = $objp->ref;
@@ -405,9 +443,15 @@ if ($result) {
 
 		// Ref Product
 		print '<td class="tdoverflowmax100">';
-		if ($productstatic->id > 0) print $productstatic->getNomUrl(1);
-		if ($productstatic->id > 0 && $objp->product_label) print '<br>';
-		if ($objp->product_label) print '<span class="opacitymedium">'.$objp->product_label.'</span>';
+		if ($productstatic->id > 0) {
+			print $productstatic->getNomUrl(1);
+		}
+		if ($productstatic->id > 0 && $objp->product_label) {
+			print '<br>';
+		}
+		if ($objp->product_label) {
+			print '<span class="opacitymedium">'.$objp->product_label.'</span>';
+		}
 		print '</td>';
 
 		print '<td class="tdoverflowonsmartphone">';
@@ -425,8 +469,7 @@ if ($result) {
 
 		// Country
 		print '<td>';
-		if ($objp->country_code)
-		{
+		if ($objp->country_code) {
 			print $langs->trans("Country".$objp->country_code).' ('.$objp->country_code.')';
 		}
 		print '</td>';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 37f596c05c1..d49effd791d 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -73,12 +73,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) { $page = 0; }
+if (empty($page) || $page < 0) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield)
+if (!$sortfield) {
 	$sortfield = "f.datef, f.ref, l.rowid";
+}
 if (!$sortorder) {
 	if ($conf->global->ACCOUNTING_LIST_SORT_VENTILATION_TODO > 0) {
 		$sortorder = "DESC";
@@ -86,10 +89,12 @@ if (!$sortorder) {
 }
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->bind->write)
+}
+if (!$user->rights->accounting->bind->write) {
 	accessforbidden();
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('accountancysupplierlist'));
@@ -107,18 +112,22 @@ $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'acco
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_societe = '';
 		$search_lineid = '';
 		$search_ref = '';
@@ -160,8 +169,7 @@ if ($massaction == 'ventil') {
 			$monId = $maLigneCourante[0];
 			$monCompte = GETPOST('codeventil'.$monId);
 
-			if ($monCompte <= 0)
-			{
+			if ($monCompte <= 0) {
 				$msg .= '<div><span style="color:red">'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'</span></div>';
 				$ko++;
 			} else {
@@ -200,8 +208,7 @@ $formother = new FormOther($db);
 
 llxHeader('', $langs->trans("SuppliersVentilation"));
 
-if (empty($chartaccountcode))
-{
+if (empty($chartaccountcode)) {
 	print $langs->trans("ErrorChartOfAccountSystemNotSelected");
 	// End of page
 	llxFooter();
@@ -269,16 +276,23 @@ $sql .= dolSqlDateFilter('f.datef', $search_day, $search_month, $search_year);
 if (strlen(trim($search_country))) {
 	$arrayofcode = getCountriesInEEC();
 	$country_code_in_EEC = $country_code_in_EEC_without_me = '';
-	foreach ($arrayofcode as $key => $value)
-	{
+	foreach ($arrayofcode as $key => $value) {
 		$country_code_in_EEC .= ($country_code_in_EEC ? "," : "")."'".$value."'";
-		if ($value != $mysoc->country_code) $country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		if ($value != $mysoc->country_code) {
+			$country_code_in_EEC_without_me .= ($country_code_in_EEC_without_me ? "," : "")."'".$value."'";
+		}
+	}
+	if ($search_country == 'special_allnotme') {
+		$sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
+	} elseif ($search_country == 'special_eec') {
+		$sql .= " AND co.code IN (".$country_code_in_EEC.")";
+	} elseif ($search_country == 'special_eecnotme') {
+		$sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
+	} elseif ($search_country == 'special_noteec') {
+		$sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
+	} else {
+		$sql .= natural_search("co.code", $search_country);
 	}
-	if ($search_country == 'special_allnotme')     $sql .= " AND co.code <> '".$db->escape($mysoc->country_code)."'";
-	elseif ($search_country == 'special_eec')      $sql .= " AND co.code IN (".$country_code_in_EEC.")";
-	elseif ($search_country == 'special_eecnotme') $sql .= " AND co.code IN (".$country_code_in_EEC_without_me.")";
-	elseif ($search_country == 'special_noteec')   $sql .= " AND co.code NOT IN (".$country_code_in_EEC.")";
-	else $sql .= natural_search("co.code", $search_country);
 }
 if (strlen(trim($search_tvaintra))) {
 	$sql .= natural_search("s.tva_intra", $search_tvaintra);
@@ -299,12 +313,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -322,21 +334,51 @@ if ($result) {
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_societe)     $param .= '&search_societe='.urlencode($search_societe);
-	if ($search_lineid)      $param .= '&search_lineid='.urlencode($search_lineid);
-	if ($search_day)         $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)       $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)        $param .= '&search_year='.urlencode($search_year);
-	if ($search_invoice)     $param .= '&search_invoice='.urlencode($search_invoice);
-	if ($search_ref)         $param .= '&search_ref='.urlencode($search_ref);
-	if ($search_label)       $param .= '&search_label='.urlencode($search_label);
-	if ($search_desc)        $param .= '&search_desc='.urlencode($search_desc);
-	if ($search_amount)      $param .= '&search_amount='.urlencode($search_amount);
-	if ($search_vat)         $param .= '&search_vat='.urlencode($search_vat);
-	if ($search_country) 	 $param .= "&search_country=".urlencode($search_country);
-	if ($search_tvaintra)	 $param .= "&search_tvaintra=".urlencode($search_tvaintra);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($search_societe) {
+		$param .= '&search_societe='.urlencode($search_societe);
+	}
+	if ($search_lineid) {
+		$param .= '&search_lineid='.urlencode($search_lineid);
+	}
+	if ($search_day) {
+		$param .= '&search_day='.urlencode($search_day);
+	}
+	if ($search_month) {
+		$param .= '&search_month='.urlencode($search_month);
+	}
+	if ($search_year) {
+		$param .= '&search_year='.urlencode($search_year);
+	}
+	if ($search_invoice) {
+		$param .= '&search_invoice='.urlencode($search_invoice);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_label) {
+		$param .= '&search_label='.urlencode($search_label);
+	}
+	if ($search_desc) {
+		$param .= '&search_desc='.urlencode($search_desc);
+	}
+	if ($search_amount) {
+		$param .= '&search_amount='.urlencode($search_amount);
+	}
+	if ($search_vat) {
+		$param .= '&search_vat='.urlencode($search_vat);
+	}
+	if ($search_country) {
+		$param .= "&search_country=".urlencode($search_country);
+	}
+	if ($search_tvaintra) {
+		$param .= "&search_tvaintra=".urlencode($search_tvaintra);
+	}
 
 	$arrayofmassactions = array(
 		'ventil'=>$langs->trans("Ventilate")
@@ -349,7 +391,9 @@ if ($result) {
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
-	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.'">';
@@ -360,7 +404,9 @@ if ($result) {
 
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoCustomer").'</span></br><br>';
 
-	if ($msg) print $msg.'<br>';
+	if ($msg) {
+		print $msg.'<br>';
+	}
 
 	$moreforfilter = '';
 
@@ -373,9 +419,11 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
 	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre center nowraponall minwidth100imp">';
-   	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-   	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-   	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
+	}
+	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
+	$formother->select_year($search_year, 'search_year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
@@ -411,7 +459,9 @@ if ($result) {
 	print_liste_field_titre("AccountAccountingSuggest", '', '', '', '', '', '', '', 'nowraponall ');
 	print_liste_field_titre("IntoAccount", '', '', '', '', '', '', '', 'center ');
 	$checkpicto = '';
-	if ($massactionbutton) $checkpicto = $form->showCheckAddButtons('checkforselect', 1);
+	if ($massactionbutton) {
+		$checkpicto = $form->showCheckAddButtons('checkforselect', 1);
+	}
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
 
@@ -496,7 +546,9 @@ if ($result) {
 				}
 			}
 		}
-		if ($objp->code_sell_l == -1) $objp->code_sell_l = '';
+		if ($objp->code_sell_l == -1) {
+			$objp->code_sell_l = '';
+		}
 
 		// Level 2: Search suggested account for product/service (similar code exists in page index.php to make automatic binding)
 		$suggestedaccountingaccountfor = '';
@@ -528,7 +580,9 @@ if ($result) {
 		} else {
 			$code_buy_p_notset = 'color:orange';
 		}
-		if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) $code_buy_p_notset = 'color:red';
+		if (empty($objp->code_buy_l) && empty($objp->code_buy_p)) {
+			$code_buy_p_notset = 'color:red';
+		}
 
 		// $objp->code_buy_l is now default code of product/service
 		// $objp->code_buy_p is now code of product/service
@@ -551,9 +605,12 @@ if ($result) {
 
 		// Ref Product
 		print '<td class="tdoverflowmax150">';
-		if ($product_static->id > 0)
+		if ($product_static->id > 0) {
 			print $product_static->getNomUrl(1);
-		if ($objp->product_label) print '<br><span class="opacitymedium small">'.$objp->product_label.'</span>';
+		}
+		if ($objp->product_label) {
+			print '<br><span class="opacitymedium small">'.$objp->product_label.'</span>';
+		}
 		print '</td>';
 
 		// Description
@@ -568,8 +625,9 @@ if ($result) {
 		print '</td>';
 
 		// Vat rate
-		if ($objp->vat_tx_l != $objp->vat_tx_p)
+		if ($objp->vat_tx_l != $objp->vat_tx_p) {
 			$code_vat_differ = 'font-weight:bold; text-decoration:blink; color:red';
+		}
 		print '<td style="'.$code_vat_differ.'" class="right">';
 		print vatrate($objp->tva_tx_line.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : ''));
 		print '</td>';
@@ -590,17 +648,22 @@ if ($result) {
 		print '<td>';
 		$s = '<span class="small">1. '.(($objp->type_l == 1) ? $langs->trans("DefaultForService") : $langs->trans("DefaultForProduct")).': </span>';
 		$shelp = '';
-		if ($suggestedaccountingaccountbydefaultfor == 'eec') $shelp .= $langs->trans("SaleEEC");
-		elseif ($suggestedaccountingaccountbydefaultfor == 'export') $shelp .= $langs->trans("SaleExport");
+		if ($suggestedaccountingaccountbydefaultfor == 'eec') {
+			$shelp .= $langs->trans("SaleEEC");
+		} elseif ($suggestedaccountingaccountbydefaultfor == 'export') {
+			$shelp .= $langs->trans("SaleExport");
+		}
 		$s .= ($objp->code_buy_l > 0 ? length_accountg($objp->code_buy_l) : '<span style="'.$code_buy_p_notset.'">'.$langs->trans("NotDefined").'</span>');
 		print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
-		if ($objp->product_id > 0)
-		{
+		if ($objp->product_id > 0) {
 			print '<br>';
 			$s = '<span class="small">2. '.(($objp->type_l == 1) ? $langs->trans("ThisService") : $langs->trans("ThisProduct")).': </span>';
 			$shelp = '';
-			if ($suggestedaccountingaccountfor == 'eec') $shelp = $langs->trans("SaleEEC");
-			elseif ($suggestedaccountingaccountfor == 'export') $shelp = $langs->trans("SaleExport");
+			if ($suggestedaccountingaccountfor == 'eec') {
+				$shelp = $langs->trans("SaleEEC");
+			} elseif ($suggestedaccountingaccountfor == 'export') {
+				$shelp = $langs->trans("SaleExport");
+			}
 			$s .= (empty($objp->code_buy_p) ? '<span style="'.$code_buy_p_notset.'">'.$langs->trans("NotDefined").'</span>' : length_accountg($objp->code_buy_p));
 			print $form->textwithpicto($s, $shelp, 1, 'help', '', 0, 2, '', 1);
 		} else {
@@ -620,10 +683,8 @@ if ($result) {
 		// Suggested accounting account
 		print '<td>';
 		$suggestedid = $objp->aarowid_suggest;
-		if (empty($suggestedid) && empty($objp->code_buy_p) && !empty($objp->code_buy_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC))
-		{
-			if (empty($accountingaccount_codetotid_cache[$objp->code_buy_l]))
-			{
+		if (empty($suggestedid) && empty($objp->code_buy_p) && !empty($objp->code_buy_l) && empty($conf->global->ACCOUNTANCY_DO_NOT_AUTOFILL_ACCOUNT_WITH_GENERIC)) {
+			if (empty($accountingaccount_codetotid_cache[$objp->code_buy_l])) {
 				$tmpaccount = new AccountingAccount($db);
 				$tmpaccount->fetch(0, $objp->code_buy_l, 1);
 				if ($tmpaccount->id > 0) {
diff --git a/htdocs/accountancy/tpl/export_journal.tpl.php b/htdocs/accountancy/tpl/export_journal.tpl.php
index 44e103059d7..1700d391f54 100644
--- a/htdocs/accountancy/tpl/export_journal.tpl.php
+++ b/htdocs/accountancy/tpl/export_journal.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -37,11 +36,9 @@ header('Content-Type: text/csv');
 include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 $accountancyexport = new AccountancyExport($db);
 
-if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$EXPORT_TYPE_FEC && $type_export == "general_ledger") // Specific filename for FEC model export into the general ledger
-{
+if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$EXPORT_TYPE_FEC && $type_export == "general_ledger") { // Specific filename for FEC model export into the general ledger
 	// FEC format is defined here: https://www.legifrance.gouv.fr/affichCodeArticle.do?idArticle=LEGIARTI000027804775&cidTexte=LEGITEXT000006069583&dateTexte=20130802&oldAction=rechCodeArticle
-	if (empty($search_date_end))
-	{
+	if (empty($search_date_end)) {
 		// TODO Get the max date into bookeeping table
 		$search_date_end = dol_now();
 	}
@@ -49,8 +46,9 @@ if ($accountancyexport->getFormatCode($formatexportset) == $accountancyexport::$
 	$tmparray = dol_getdate($datetouseforfilename);
 	$fiscalmonth = empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START;
 	// Define end of month to use
-	if ($tmparray['mon'] <= $fiscalmonth) $tmparray['mon'] = $fiscalmonth;
-	else {
+	if ($tmparray['mon'] <= $fiscalmonth) {
+		$tmparray['mon'] = $fiscalmonth;
+	} else {
 		$tmparray['mon'] = $fiscalmonth;
 		$tmparray['year']++;
 	}
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index e3acf3c4d99..56d6ec996e4 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -133,6 +133,7 @@ if ($conf->use_javascript_ajax) {
 
 print '<span class="opacitymedium">'.$langs->trans("BlankSubscriptionFormDesc").'</span><br><br>';
 
+$param = '';
 
 $enabledisablehtml = $langs->trans("EnablePublicSubscriptionForm").' ';
 if (empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index 98d72bf9f00..c0b4055ba5b 100755
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -17,7 +17,7 @@
  */
 
 /**
- * \file    workstation/admin/setup.php
+ * \file    htdocs/admin/workstation.php
  * \ingroup workstation
  * \brief   Workstation setup page.
  */
@@ -31,10 +31,12 @@ require_once DOL_DOCUMENT_ROOT . '/workstation/lib/workstation.lib.php';
 //require_once "../class/myclass.class.php";
 
 // Translations
-$langs->loadLangs(array("admin", "workstation@workstation"));
+$langs->loadLangs(array("admin", "workstation"));
 
 // Access control
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -55,28 +57,28 @@ $setupnotempty = 0;
  * Actions
  */
 
-if ((float) DOL_VERSION >= 6)
-{
+if ((float) DOL_VERSION >= 6) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 }
 
-if ($action == 'updateMask')
-{
+if ($action == 'updateMask') {
 	$maskconstorder = GETPOST('maskconstWorkstation', 'alpha');
 	$maskorder = GETPOST('maskWorkstation', 'alpha');
 
-	if ($maskconstorder) $res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	if ($maskconstorder) {
+		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	}
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
-} elseif ($action == 'specimen')
-{
+} elseif ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
 	$tmpobjectkey = GETPOST('object');
 
@@ -86,25 +88,21 @@ if ($action == 'updateMask')
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
+	foreach ($dirmodels as $reldir) {
 		$file = dol_buildpath($reldir."core/modules/workstation/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
-		if (file_exists($file))
-		{
+		if (file_exists($file)) {
 			$filefound = 1;
 			$classname = "pdf_".$modele;
 			break;
 		}
 	}
 
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$module = new $classname($db);
 
-		if ($module->write_file($tmpobject, $langs) > 0)
-		{
+		if ($module->write_file($tmpobject, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
 			return;
 		} else {
@@ -115,31 +113,24 @@ if ($action == 'updateMask')
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-// Activate a model
-elseif ($action == 'set')
-{
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$tmpobjectkey = GETPOST('object');
 
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+		if ($conf->global->$constforval == "$value") {
+			dolibarr_del_const($db, $constforval, $conf->entity);
+		}
 	}
-}
-
-// Set default model
-elseif ($action == 'setdoc')
-{
+} elseif ($action == 'setdoc') {
+	// Set default model
 	$tmpobjectkey = GETPOST('object');
 	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
-	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity))
-	{
+	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
 		// The constant that was read before the new set
 		// We therefore requires a variable to have a coherent view
 		$conf->global->$constforval = $value;
@@ -147,12 +138,10 @@ elseif ($action == 'setdoc')
 
 	// On active le modele
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-} elseif ($action == 'setmod')
-{
+} elseif ($action == 'setmod') {
 	// TODO Check if numbering module chosen can be activated
 	// by calling method canBeActivated
 	$tmpobjectkey = GETPOST('object');
@@ -186,8 +175,7 @@ print dol_get_fiche_head($head, 'settings', '', -1, "workstation@workstation");
 //echo '<span class="opacitymedium">'.$langs->trans("WorkstationSetupPage").'</span><br><br>';
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -195,8 +183,7 @@ if ($action == 'edit')
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($arrayofparameters as $key => $val)
-	{
+	foreach ($arrayofparameters as $key => $val) {
 		print '<tr class="oddeven"><td>';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
@@ -211,13 +198,11 @@ if ($action == 'edit')
 	print '</form>';
 	print '<br>';
 } else {
-	if (!empty($arrayofparameters))
-	{
+	if (!empty($arrayofparameters)) {
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-		foreach ($arrayofparameters as $key => $val)
-		{
+		foreach ($arrayofparameters as $key => $val) {
 			$setupnotempty++;
 
 			print '<tr class="oddeven"><td>';
@@ -243,7 +228,9 @@ $myTmpObjects['workstation'] = array('includerefgeneration'=>1, 'includedocgener
 
 
 foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-	if ($myTmpObjectKey == 'MyObject') continue;
+	if ($myTmpObjectKey == 'MyObject') {
+		continue;
+	}
 	if ($myTmpObjectArray['includerefgeneration']) {
 		/*
 		 * Orders Numbering model
@@ -263,19 +250,14 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 		clearstatcache();
 
-		foreach ($dirmodels as $reldir)
-		{
+		foreach ($dirmodels as $reldir) {
 			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
 
-			if (is_dir($dir))
-			{
+			if (is_dir($dir)) {
 				$handle = opendir($dir);
-				if (is_resource($handle))
-				{
-					while (($file = readdir($handle)) !== false)
-					{
-						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php')
-						{
+				if (is_resource($handle)) {
+					while (($file = readdir($handle)) !== false) {
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
 							$file = substr($file, 0, dol_strlen($file) - 4);
 
 							require_once $dir.'/'.$file.'.php';
@@ -283,11 +265,14 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 							$module = new $file($db);
 
 							// Show modules according to features level
-							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								continue;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								continue;
+							}
 
-							if ($module->isEnabled())
-							{
+							if ($module->isEnabled()) {
 								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
 
 								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
@@ -300,14 +285,16 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								if (preg_match('/^Error/', $tmp)) {
 									$langs->load("errors");
 									print '<div class="error">'.$langs->trans($tmp).'</div>';
-								} elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
-								else print $tmp;
+								} elseif ($tmp == 'NotConfigured') {
+									print $langs->trans($tmp);
+								} else {
+									print $tmp;
+								}
 								print '</td>'."\n";
 
 								print '<td class="center">';
 								$constforvar = 'WORKSTATION_'.strtoupper($myTmpObjectKey).'_ADDON';
-								if ($conf->global->$constforvar == $file)
-								{
+								if ($conf->global->$constforvar == $file) {
 									print img_picto($langs->trans("Activated"), 'switch_on');
 								} else {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
@@ -327,8 +314,9 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
 									$htmltooltip .= ''.$langs->trans("NextValue").': ';
 									if ($nextval) {
-										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
 											$nextval = $langs->trans($nextval);
+										}
 											$htmltooltip .= $nextval.'<br>';
 									} else {
 										$htmltooltip .= $langs->trans($module->error).'<br>';
@@ -366,12 +354,10 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 		$sql .= " WHERE type = '".$db->escape($type)."'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num_rows = $db->num_rows($resql);
-			while ($i < $num_rows)
-			{
+			while ($i < $num_rows) {
 				$array = $db->fetch_array($resql);
 				array_push($def, $array[0]);
 				$i++;
@@ -392,31 +378,23 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 		clearstatcache();
 
-		foreach ($dirmodels as $reldir)
-		{
-			foreach (array('', '/doc') as $valdir)
-			{
+		foreach ($dirmodels as $reldir) {
+			foreach (array('', '/doc') as $valdir) {
 				$realpath = $reldir."core/modules/".$moduledir.$valdir;
 				$dir = dol_buildpath($realpath);
 
-				if (is_dir($dir))
-				{
+				if (is_dir($dir)) {
 					$handle = opendir($dir);
-					if (is_resource($handle))
-					{
-						while (($file = readdir($handle)) !== false)
-						{
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
 							$filelist[] = $file;
 						}
 						closedir($handle);
 						arsort($filelist);
 
-						foreach ($filelist as $file)
-						{
-							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file))
-							{
-								if (file_exists($dir.'/'.$file))
-								{
+						foreach ($filelist as $file) {
+							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+								if (file_exists($dir.'/'.$file)) {
 									$name = substr($file, 4, dol_strlen($file) - 16);
 									$classname = substr($file, 0, dol_strlen($file) - 12);
 
@@ -424,21 +402,26 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 									$module = new $classname($db);
 
 									$modulequalified = 1;
-									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
-									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+										$modulequalified = 0;
+									}
+									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+										$modulequalified = 0;
+									}
 
-									if ($modulequalified)
-									{
+									if ($modulequalified) {
 										print '<tr class="oddeven"><td width="100">';
 										print (empty($module->name) ? $name : $module->name);
 										print "</td><td>\n";
-										if (method_exists($module, 'info')) print $module->info($langs);
-										else print $module->description;
+										if (method_exists($module, 'info')) {
+											print $module->info($langs);
+										} else {
+											print $module->description;
+										}
 										print '</td>';
 
 										// Active
-										if (in_array($name, $def))
-										{
+										if (in_array($name, $def)) {
 											print '<td class="center">'."\n";
 											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&amp;token='.newToken().'&amp;value='.$name.'">';
 											print img_picto($langs->trans("Enabled"), 'switch_on');
@@ -453,8 +436,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'WORKSTATION_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if ($conf->global->$constforvar == $name)
-										{
+										if ($conf->global->$constforvar == $name) {
 											print img_picto($langs->trans("Default"), 'on');
 										} else {
 											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
@@ -464,8 +446,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Info
 										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
 										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-										if ($module->type == 'pdf')
-										{
+										if ($module->type == 'pdf') {
 											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 										}
 										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
@@ -480,8 +461,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 										// Preview
 										print '<td class="center">';
-										if ($module->type == 'pdf')
-										{
+										if ($module->type == 'pdf') {
 											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'generic').'</a>';
 										} else {
 											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php
index 3334610b927..9a68f99fe06 100644
--- a/htdocs/asset/admin/assets_extrafields.php
+++ b/htdocs/asset/admin/assets_extrafields.php
@@ -35,13 +35,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'don'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -74,8 +78,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -88,8 +91,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -101,8 +103,7 @@ if ($action == 'create')
 /* Edit optional field                                                        */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/asset/admin/assets_type_extrafields.php b/htdocs/asset/admin/assets_type_extrafields.php
index e17d421437d..6d2799e0228 100644
--- a/htdocs/asset/admin/assets_type_extrafields.php
+++ b/htdocs/asset/admin/assets_type_extrafields.php
@@ -34,13 +34,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'adherent_type'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -72,8 +76,7 @@ require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 print dol_get_fiche_end();
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -86,8 +89,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -99,8 +101,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index 42a5888c537..c6cd45a0cc5 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -32,7 +32,9 @@ global $langs, $user;
 $langs->loadLangs(array("admin", "assets"));
 
 // Access control
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -63,8 +65,7 @@ $head = asset_admin_prepare_head();
 print dol_get_fiche_head($head, 'settings', $langs->trans("Assets"), -1, 'generic');
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -72,8 +73,7 @@ if ($action == 'edit')
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($arrayofparameters as $key => $val)
-	{
+	foreach ($arrayofparameters as $key => $val) {
 		print '<tr class="oddeven"><td>';
 		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
 		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
@@ -91,8 +91,7 @@ if ($action == 'edit')
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($arrayofparameters as $key => $val)
-	{
+	foreach ($arrayofparameters as $key => $val) {
 		print '<tr class="oddeven"><td>';
 		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
 		print '</td><td>'.$conf->global->$key.'</td></tr>';
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 96cb7baff73..cb57581a6be 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -55,18 +55,23 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 }
 
-if (empty($action) && empty($id) && empty($ref)) $action = 'view';
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 // Security check
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'asset', $id);
 
 $permissiontoread = $user->rights->asset->read;
@@ -83,10 +88,11 @@ $upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object-
 
 $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))
-{
+if (empty($reshook)) {
 	$error = 0;
 
 	$backurlforlist = dol_buildpath('/asset/list.php', 1);
@@ -109,12 +115,10 @@ if (empty($reshook))
 	// Action to build doc
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
-	if ($action == 'set_thirdparty' && $permissiontoadd)
-	{
+	if ($action == 'set_thirdparty' && $permissiontoadd) {
 		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MYOBJECT_MODIFY');
 	}
-	if ($action == 'classin' && $permissiontoadd)
-	{
+	if ($action == 'classin' && $permissiontoadd) {
 		$object->setProject(GETPOST('projectid', 'int'));
 	}
 
@@ -138,15 +142,18 @@ $help_url = '';
 llxHeader('', $title, $help_url);
 
 // Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewAsset"), '', 'accountancy');
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head(array(), '');
 
@@ -174,8 +181,7 @@ if ($action == 'create')
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("Assets"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -183,8 +189,12 @@ if (($id || $ref) && $action == 'edit')
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head();
 
@@ -208,8 +218,7 @@ if (($id || $ref) && $action == 'edit')
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$res = $object->fetch_optionals();
 
 	$head = asset_prepare_head($object);
@@ -218,16 +227,18 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$formconfirm = '';
 
 	// Confirmation to delete
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteAssets'), $langs->trans('ConfirmDeleteAsset'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -274,24 +285,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	/*
 	 * Buttons
 	 */
-	if ($user->socid == 0)
-	{
+	if ($user->socid == 0) {
 		print '<div class="tabsAction">';
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
-		if (empty($reshook))
-		{
-			if ($user->rights->asset->write)
-			{
+		if (empty($reshook)) {
+			if ($user->rights->asset->write) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
 			}
 
-			if ($user->rights->asset->delete)
-			{
+			if ($user->rights->asset->delete) {
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
@@ -300,8 +307,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print "</div>";
 	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index f4823ae9b6f..984dde7389b 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -170,8 +170,12 @@ class Asset extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled)) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 	}
 
 	/**
@@ -304,7 +308,9 @@ class Asset extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$companylink = '';
@@ -315,33 +321,40 @@ class Asset extends CommonObject
 
 		$url = dol_buildpath('/asset/card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowAssets");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -381,7 +394,9 @@ class Asset extends CommonObject
 		$labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
 
 		$statusType = 'status0';
-		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_VALIDATED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -399,28 +414,23 @@ class Asset extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
index 5af5f3d7591..d0fa0a9c585 100644
--- a/htdocs/asset/class/asset_type.class.php
+++ b/htdocs/asset/class/asset_type.class.php
@@ -131,27 +131,25 @@ class AssetType extends CommonObject
 
 		dol_syslog("Asset_type::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."asset_type");
 
 			$result = $this->update($user, 1);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				return -3;
 			}
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('ASSET_TYPE_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -193,30 +191,27 @@ class AssetType extends CommonObject
 		$sql .= " WHERE rowid =".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('ASSET_TYPE_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -246,11 +241,12 @@ class AssetType extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('ASSET_TYPE_DELETE', $user);
-			if ($result < 0) { $error++; $this->db->rollback(); return -2; }
+			if ($result < 0) {
+				$error++; $this->db->rollback(); return -2;
+			}
 			// End call triggers
 
 			$this->db->commit();
@@ -277,10 +273,8 @@ class AssetType extends CommonObject
 		dol_syslog("Asset_type::fetch", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -317,15 +311,12 @@ class AssetType extends CommonObject
 		$sql .= " WHERE entity IN (".getEntity('asset_type').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
 
-			if ($nump)
-			{
+			if ($nump) {
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 
 					$assettypes[$obj->rowid] = $langs->trans($obj->label);
@@ -357,18 +348,16 @@ class AssetType extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."asset as a";
 		$sql .= " WHERE a.entity IN (".getEntity('asset').")";
 		$sql .= " AND a.fk_asset_type = ".$this->id;
-		if (!empty($excludefilter)) $sql .= ' AND ('.$excludefilter.')';
+		if (!empty($excludefilter)) {
+			$sql .= ' AND ('.$excludefilter.')';
+		}
 
 		dol_syslog(get_class($this)."::listAssetsForGroup", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if (!array_key_exists($obj->rowid, $ret))
-				{
-					if ($mode < 2)
-					{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (!array_key_exists($obj->rowid, $ret)) {
+					if ($mode < 2) {
 						$assetstatic = new Asset($this->db);
 						if ($mode == 1) {
 							$assetstatic->fetch($obj->rowid, '', '', '', false, false);
@@ -376,7 +365,9 @@ class AssetType extends CommonObject
 							$assetstatic->fetch($obj->rowid);
 						}
 						$ret[$obj->rowid] = $assetstatic;
-					} else $ret[$obj->rowid] = $obj->rowid;
+					} else {
+						$ret[$obj->rowid] = $obj->rowid;
+					}
 				}
 			}
 
@@ -410,8 +401,12 @@ class AssetType extends CommonObject
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->label, $maxlen) : $this->label);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= ($maxlen ?dol_trunc($this->label, $maxlen) : $this->label);
+		}
 		$result .= $linkend;
 
 		return $result;
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 32a4163dd12..e5db1465fb6 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -41,8 +41,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid)
-{
+if ($user->socid) {
 	$socid = $user->socid;
 }
 $result=restrictedArea($user, 'asset', $id, '');
@@ -52,16 +51,21 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new Asset($db);
-if ($object->fetch($id))
-{
+if ($object->fetch($id)) {
 	$upload_dir = $conf->asset->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
@@ -85,10 +89,8 @@ $form = new Form($db);
 
 
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref) > 0)
-	{
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref) > 0) {
 		$upload_dir = $conf->asset->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
 
 		$head = asset_prepare_head($object);
@@ -97,8 +99,7 @@ if ($id > 0 || !empty($ref))
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		$totalsize = 0;
-		foreach ($filearray as $key => $file)
-		{
+		foreach ($filearray as $key => $file) {
 			$totalsize += $file['size'];
 		}
 
diff --git a/htdocs/asset/info.php b/htdocs/asset/info.php
index d211cf0dbad..f6d34454ad4 100644
--- a/htdocs/asset/info.php
+++ b/htdocs/asset/info.php
@@ -29,12 +29,14 @@ require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("asset"));
 
-$id = GETPOST('id', 'int');
+$id = GETPOSTINT('id');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'asset', $id);
 
 $object = new Asset($db);
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index cffcc8a962d..9cd00f181c1 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -50,7 +50,9 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -68,14 +70,20 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Security check
 $socid = 0;
-if ($user->socid) $socid = $user->socid;
-if ($user->socid > 0)	// Protection if external user
-{
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if ($user->socid > 0) {
+	// Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
@@ -86,30 +94,31 @@ $result = restrictedArea($user, 'asset', $id);
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach ($object->fields as $key => $val)
-{
-	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+foreach ($object->fields as $key => $val) {
+	if ($val['searchall']) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
 }
 
 // Definition of fields for list
 $arrayfields = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
-	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+	if (!empty($val['visible'])) {
+		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-{
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)
-	{
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
 			$arrayfields["ef.".$key] = array(
 				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
@@ -132,31 +141,33 @@ $permissiontodelete = $user->rights->asset->delete;
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// 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
-	{
-		foreach ($object->fields as $key => $val)
-		{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 		}
 		$toselect = '';
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -185,13 +196,14 @@ $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Assets"));
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$sql .= 't.'.$key.', ';
 }
 // 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();
@@ -199,20 +211,32 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
-else $sql .= " WHERE 1 = 1";
-foreach ($search as $key => $val)
-{
-	if ($key == 'status' && $search[$key] == -1) continue;
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+if ($object->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
+foreach ($search as $key => $val) {
+	if ($key == 'status' && $search[$key] == -1) {
+		continue;
+	}
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') $search[$key] = '';
+		if ($search[$key] == '-1') {
+			$search[$key] = '';
+		}
 		$mode_search = 2;
 	}
-	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	if ($search[$key] != '') {
+		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	}
+}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -225,7 +249,7 @@ $sql .= $hookmanager->resPrint;
 $sql.= " GROUP BY "
 foreach($object->fields as $key => $val)
 {
-    $sql.='t.'.$key.', ';
+	$sql.='t.'.$key.', ';
 }
 // Add fields from extrafields
 if (! empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -242,26 +266,24 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
-{
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$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)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		exit;
 	}
@@ -270,8 +292,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 }
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/asset/card.php?id='.$id);
@@ -302,14 +323,24 @@ jQuery(document).ready(function() {
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-foreach ($search as $key => $val)
-{
-	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
-	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			$param .= '&search_'.$key.'[]='.urlencode($skey);
+		}
+	} else {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
+	}
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
 }
-if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -318,12 +349,18 @@ $arrayofmassactions = array(
 	//'presend'=>$langs->trans("SendByMail"),
 	//'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -342,9 +379,10 @@ $objecttmp = new Asset($db);
 $trackid = 'asset'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($sall) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -355,11 +393,13 @@ $moreforfilter.= '</div>';*/
 
 $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))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -376,20 +416,26 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		elseif (strpos($val['type'], 'integer:') === 0) {
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		}
 		print '</td>';
 	}
 }
@@ -411,15 +457,18 @@ print '</tr>'."\n";
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
 }
@@ -436,11 +485,11 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
-{
-	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 (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+	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
+		}
 	}
 }
 
@@ -449,37 +498,50 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num))
-{
+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);
 
 	// Show here line of result
 	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val)
-	{
+	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
 
-		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
 
-		if (!empty($arrayfields['t.'.$key]['checked']))
-		{
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') print $object->getLibStatut(5);
-			else print $object->showOutputField($val, $key, $object->$key, '');
+			if ($key == 'status') {
+				print $object->getLibStatut(5);
+			} else {
+				print $object->showOutputField($val, $key, $object->$key, '');
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!empty($val['isameasure']))
-			{
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!empty($val['isameasure'])) {
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
@@ -492,14 +554,17 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		if (in_array($object->id, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>'."\n";
 
@@ -510,10 +575,13 @@ while ($i < ($limit ? min($num, $limit) : $num))
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 // If no record found
-if ($num == 0)
-{
+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>';
 }
 
@@ -529,10 +597,11 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
-{
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index 514e05bff72..752591ade9e 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -52,10 +52,14 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id;
+}
 
 // Security check
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'asset', $id);
 
 $permissionnote = 1;
@@ -79,8 +83,7 @@ $form = new Form($db);
 $help_url = '';
 llxHeader('', $langs->trans('Assets'), $help_url);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = asset_prepare_head($object);
@@ -101,35 +104,35 @@ if ($id > 0 || !empty($ref))
 	// Project
 	if (! empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->asset->creer)
-	    {
-	        if ($action != 'classify')
-	            //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            $morehtmlref.=' : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		if ($user->rights->asset->creer)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref.=' : ';
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref.='<input type="hidden" name="action" value="classin">';
+					$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref.='</form>';
+				} else {
+					$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+		} else {
+			if (! empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+				$morehtmlref.=$proj->ref;
+				$morehtmlref.='</a>';
+			} else {
+				$morehtmlref.='';
+			}
+		}
 	}*/
 	$morehtmlref .= '</div>';
 
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 38969d65182..5955548b5e2 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -26,9 +26,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
 
 // Load translation files required by the page
 $langs->load("assets");
@@ -44,12 +50,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) {  $sortorder = "DESC"; }
-if (!$sortfield) {  $sortfield = "a.label"; }
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "a.label";
+}
 
 $label = GETPOST("label", "alpha");
 $accountancy_code_asset = GETPOST('accountancy_code_asset', 'string');
@@ -67,8 +79,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-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
 	$type = "";
 	$sall = "";
 }
@@ -86,15 +97,13 @@ $permissiontoadd = $user->rights->asset->setup_advance;
 if ($cancel) {
 	$action = '';
 
-	if (!empty($backtopage))
-	{
+	if (!empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	}
 }
 
-if ($action == 'add' && $user->rights->asset->write)
-{
+if ($action == 'add' && $user->rights->asset->write) {
 	$object->label = trim($label);
 	$object->accountancy_code_asset = trim($accountancy_code_asset);
 	$object->accountancy_code_depreciation_asset = trim($accountancy_code_depreciation_asset);
@@ -103,7 +112,9 @@ if ($action == 'add' && $user->rights->asset->write)
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
-	if ($ret < 0) $error++;
+	if ($ret < 0) {
+		$error++;
+	}
 
 	if (empty($object->label)) {
 		$error++;
@@ -121,11 +132,9 @@ if ($action == 'add' && $user->rights->asset->write)
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$id = $object->create($user);
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
 		} else {
@@ -137,8 +146,7 @@ if ($action == 'add' && $user->rights->asset->write)
 	}
 }
 
-if ($action == 'update' && $user->rights->asset->write)
-{
+if ($action == 'update' && $user->rights->asset->write) {
 	$object->fetch($rowid);
 
 	$object->oldcopy = clone $object;
@@ -151,12 +159,13 @@ if ($action == 'update' && $user->rights->asset->write)
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
-	if ($ret < 0) $error++;
+	if ($ret < 0) {
+		$error++;
+	}
 
 	$ret = $object->update($user);
 
-	if ($ret >= 0 && !count($object->errors))
-	{
+	if ($ret >= 0 && !count($object->errors)) {
 		setEventMessages($langs->trans("AssetTypeModified"), null, 'mesgs');
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -166,13 +175,11 @@ if ($action == 'update' && $user->rights->asset->write)
 	exit;
 }
 
-if ($action == 'confirm_delete' && $user->rights->asset->write)
-{
+if ($action == 'confirm_delete' && $user->rights->asset->write) {
 	$object->fetch($rowid);
 	$res = $object->delete();
 
-	if ($res > 0)
-	{
+	if ($res > 0) {
 		setEventMessages($langs->trans("AssetsTypeDeleted"), null, 'mesgs');
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
@@ -194,8 +201,7 @@ llxHeader('', $langs->trans("AssetsTypeSetup"), $helpurl);
 
 
 // List of asset type
-if (!$rowid && $action != 'create' && $action != 'edit')
-{
+if (!$rowid && $action != 'create' && $action != 'edit') {
 	//print dol_get_fiche_head('');
 
 	$sql = "SELECT d.rowid, d.label as label, d.accountancy_code_asset, d.accountancy_code_depreciation_asset, d.accountancy_code_depreciation_expense, d.note";
@@ -203,8 +209,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 	$sql .= " WHERE d.entity IN (".getEntity('asset_type').")";
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$nbtotalofrecords = $num;
 
@@ -213,7 +218,9 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 		$param = '';
 
 		print '<form method="POST" 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">';
@@ -241,8 +248,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 
 		$assettype = new AssetType($db);
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$objp = $db->fetch_object($result);
 
 			$assettype->id = $objp->rowid;
@@ -257,8 +263,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
 
 			print '<td class="center">';
-			if (!empty($conf->accounting->enabled))
-			{
+			if (!empty($conf->accounting->enabled)) {
 				$accountingaccount = new AccountingAccount($db);
 				$accountingaccount->fetch('', $objp->accountancy_code_asset, 1);
 
@@ -269,8 +274,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 			print '</td>';
 
 			print '<td class="center">';
-			if (!empty($conf->accounting->enabled))
-			{
+			if (!empty($conf->accounting->enabled)) {
 				$accountingaccount2 = new AccountingAccount($db);
 				$accountingaccount2->fetch('', $objp->accountancy_code_depreciation_asset, 1);
 
@@ -281,8 +285,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 			print '</td>';
 
 			print '<td class="center">';
-			if (!empty($conf->accounting->enabled))
-			{
+			if (!empty($conf->accounting->enabled)) {
 				$accountingaccount3 = new AccountingAccount($db);
 				$accountingaccount3->fetch('', $objp->accountancy_code_depreciation_expense, 1);
 
@@ -292,9 +295,11 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 			}
 			print '</td>';
 
-			if ($user->rights->asset->write)
+			if ($user->rights->asset->write) {
 				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			else print '<td class="right">&nbsp;</td>';
+			} else {
+				print '<td class="right">&nbsp;</td>';
+			}
 			print "</tr>";
 			$i++;
 		}
@@ -313,10 +318,11 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 /* Creation mode                                                              */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$object = new AssetType($db);
-	if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+	if (!empty($conf->accounting->enabled)) {
+		$formaccounting = new FormAccounting($db);
+	}
 
 	print load_fiche_titre($langs->trans("NewAssetType"));
 
@@ -331,8 +337,7 @@ if ($action == 'create')
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40"></td></tr>';
 
-	if (!empty($conf->accounting->enabled))
-	{
+	if (!empty($conf->accounting->enabled)) {
 		// Accountancy_code_asset
 		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
 		print '<td>';
@@ -375,8 +380,7 @@ if ($action == 'create')
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 	print '<tbody>';
@@ -398,10 +402,8 @@ if ($action == 'create')
 /* View mode                                                                  */
 /*                                                                            */
 /* ************************************************************************** */
-if ($rowid > 0)
-{
-	if ($action != 'edit')
-	{
+if ($rowid > 0) {
+	if ($action != 'edit') {
 		$object = new AssetType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
@@ -409,8 +411,7 @@ if ($rowid > 0)
 		/*
 		 * Confirmation suppression
 		 */
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id, $langs->trans("DeleteAnAssetType"), $langs->trans("ConfirmDeleteAssetType", $object->label), "confirm_delete", '', 0, 1);
 		}
 
@@ -437,8 +438,7 @@ if ($rowid > 0)
 		print '<td class="nowrap">';
 		print $langs->trans("AccountancyCodeAsset");
 		print '</td><td>';
-		if (!empty($conf->accounting->enabled))
-		{
+		if (!empty($conf->accounting->enabled)) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch('', $object->accountancy_code_asset, 1);
 
@@ -453,8 +453,7 @@ if ($rowid > 0)
 		print '<td class="nowrap">';
 		print $langs->trans("AccountancyCodeDepreciationAsset");
 		print '</td><td>';
-		if (!empty($conf->accounting->enabled))
-		{
+		if (!empty($conf->accounting->enabled)) {
 			$accountingaccount2 = new AccountingAccount($db);
 			$accountingaccount2->fetch('', $object->accountancy_code_depreciation_asset, 1);
 
@@ -469,8 +468,7 @@ if ($rowid > 0)
 		print '<td class="nowrap">';
 		print $langs->trans("AccountancyCodeDepreciationExpense");
 		print '</td><td>';
-		if (!empty($conf->accounting->enabled))
-		{
+		if (!empty($conf->accounting->enabled)) {
 			$accountingaccount3 = new AccountingAccount($db);
 			$accountingaccount3->fetch('', $object->accountancy_code_depreciation_expense, 1);
 
@@ -499,14 +497,12 @@ if ($rowid > 0)
 		print '<div class="tabsAction">';
 
 		// Edit
-		if ($user->rights->asset->write)
-		{
+		if ($user->rights->asset->write) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 		}
 
 		// Delete
-		if ($user->rights->asset->write)
-		{
+		if ($user->rights->asset->write) {
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';
 		}
 
@@ -519,12 +515,13 @@ if ($rowid > 0)
 	/*                                                                            */
 	/* ************************************************************************** */
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		$object = new AssetType($db);
 		$object->fetch($rowid);
 		$object->fetch_optionals();
-		if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+		if (!empty($conf->accounting->enabled)) {
+			$formaccounting = new FormAccounting($db);
+		}
 
 		$head = asset_type_prepare_head($object);
 
@@ -541,8 +538,7 @@ if ($rowid > 0)
 
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
 
-		if (!empty($conf->accounting->enabled))
-		{
+		if (!empty($conf->accounting->enabled)) {
 			// Accountancy_code_asset
 			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
 			print '<td>';
@@ -585,8 +581,7 @@ if ($rowid > 0)
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/asterisk/cidlookup.php
index 7a3660e350e..716057198f8 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/asterisk/cidlookup.php
@@ -33,15 +33,13 @@ $phone = GETPOST('phone');
 $notfound = $langs->trans("Unknown");
 
 // Security check
-if (empty($conf->clicktodial->enabled))
-{
+if (empty($conf->clicktodial->enabled)) {
 	print "Error: Module Click to dial is not enabled.\n";
 	exit;
 }
 
 // Check parameters
-if (empty($phone))
-{
+if (empty($phone)) {
 	print "Error: Url must be called with parameter phone=phone to search\n";
 	exit;
 }
@@ -57,11 +55,9 @@ $sql .= $db->plimit(1);
 
 dol_syslog('cidlookup search information with phone '.$phone, LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$obj = $db->fetch_object($resql);
-	if ($obj)
-	{
+	if ($obj) {
 		$found = $obj->name;
 	} else {
 		$found = $notfound;
diff --git a/htdocs/asterisk/wrapper.php b/htdocs/asterisk/wrapper.php
index 0a9ac82ce23..77a00aed302 100644
--- a/htdocs/asterisk/wrapper.php
+++ b/htdocs/asterisk/wrapper.php
@@ -28,13 +28,27 @@
  * 				write = system,call,log,verbose,command,agent,user
  */
 
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 /**
  * Empty header
@@ -67,23 +81,40 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 
 // Security check
-if (empty($conf->clicktodial->enabled))
-{
+if (empty($conf->clicktodial->enabled)) {
 	accessforbidden();
 	exit;
 }
 
 
 // Define Asterisk setup
-if (!isset($conf->global->ASTERISK_HOST))      $conf->global->ASTERISK_HOST = "127.0.0.1";
-if (!isset($conf->global->ASTERISK_TYPE))      $conf->global->ASTERISK_TYPE = "SIP/";
-if (!isset($conf->global->ASTERISK_INDICATIF)) $conf->global->ASTERISK_INDICATIF = "0";
-if (!isset($conf->global->ASTERISK_PORT))      $conf->global->ASTERISK_PORT = 5038;
-if ($conf->global->ASTERISK_INDICATIF == 'NONE')  $conf->global->ASTERISK_INDICATIF = '';
-if (!isset($conf->global->ASTERISK_CONTEXT))   $conf->global->ASTERISK_CONTEXT = "from-internal";
-if (!isset($conf->global->ASTERISK_WAIT_TIME)) $conf->global->ASTERISK_WAIT_TIME = "30";
-if (!isset($conf->global->ASTERISK_PRIORITY))  $conf->global->ASTERISK_PRIORITY = "1";
-if (!isset($conf->global->ASTERISK_MAX_RETRY)) $conf->global->ASTERISK_MAX_RETRY = "2";
+if (!isset($conf->global->ASTERISK_HOST)) {
+	$conf->global->ASTERISK_HOST = "127.0.0.1";
+}
+if (!isset($conf->global->ASTERISK_TYPE)) {
+	$conf->global->ASTERISK_TYPE = "SIP/";
+}
+if (!isset($conf->global->ASTERISK_INDICATIF)) {
+	$conf->global->ASTERISK_INDICATIF = "0";
+}
+if (!isset($conf->global->ASTERISK_PORT)) {
+	$conf->global->ASTERISK_PORT = 5038;
+}
+if ($conf->global->ASTERISK_INDICATIF == 'NONE') {
+	$conf->global->ASTERISK_INDICATIF = '';
+}
+if (!isset($conf->global->ASTERISK_CONTEXT)) {
+	$conf->global->ASTERISK_CONTEXT = "from-internal";
+}
+if (!isset($conf->global->ASTERISK_WAIT_TIME)) {
+	$conf->global->ASTERISK_WAIT_TIME = "30";
+}
+if (!isset($conf->global->ASTERISK_PRIORITY)) {
+	$conf->global->ASTERISK_PRIORITY = "1";
+}
+if (!isset($conf->global->ASTERISK_MAX_RETRY)) {
+	$conf->global->ASTERISK_MAX_RETRY = "2";
+}
 
 
 $login = GETPOST('login');
@@ -127,11 +158,9 @@ $sql .= $db->plimit(1);
 
 dol_syslog('click to dial search information with phone '.$called, LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$obj = $db->fetch_object($resql);
-	if ($obj)
-	{
+	if ($obj) {
 		$found = $obj->name;
 	} else {
 		$found = $notfound;
@@ -144,16 +173,13 @@ if ($resql)
 
 $number = strtolower($called);
 $pos = strpos($number, "local");
-if (!empty($number))
-{
-	if ($pos === false)
-	{
+if (!empty($number)) {
+	if ($pos === false) {
 		$errno = 0;
 		$errstr = 0;
 		$strCallerId = "Dolibarr call $found <".strtolower($number).">";
 		$oSocket = @fsockopen($strHost, $port, $errno, $errstr, 10);
-		if (!$oSocket)
-		{
+		if (!$oSocket) {
 			print '<body>'."\n";
 			$txt = "Failed to execute fsockopen($strHost, $port, \$errno, \$errstr, 10)<br>\n";
 			print $txt;
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 52a11e78bdd..f35547523c9 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -52,27 +52,21 @@ $maxperinit = 1000;
  */
 
 // Define barcode template for products
-if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
-{
+if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
 	$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
 
-	foreach ($dirbarcodenum as $dirroot)
-	{
+	foreach ($dirbarcodenum as $dirroot) {
 		$dir = dol_buildpath($dirroot, 0);
 
 		$handle = @opendir($dir);
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (preg_match('/^mod_barcode_product_.*php$/', $file))
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match('/^mod_barcode_product_.*php$/', $file)) {
 					$file = substr($file, 0, dol_strlen($file) - 4);
 
 					try {
 						dol_include_once($dirroot.$file.'.php');
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
 
@@ -85,28 +79,23 @@ if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
 	}
 }
 
-if ($action == 'initbarcodeproducts')
-{
-	if (!is_object($modBarCodeProduct))
-	{
+if ($action == 'initbarcodeproducts') {
+	if (!is_object($modBarCodeProduct)) {
 		$error++;
 		setEventMessages($langs->trans("NoBarcodeNumberingTemplateDefined"), null, 'errors');
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$productstatic = new Product($db);
 
 		$db->begin();
 
 		$nbok = 0;
-		if (!empty($eraseallbarcode))
-		{
+		if (!empty($eraseallbarcode)) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product";
 			$sql .= " SET barcode = NULL";
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				setEventMessages($langs->trans("AllBarcodeReset"), null, 'mesgs');
 			} else {
 				$error++;
@@ -121,16 +110,13 @@ if ($action == 'initbarcodeproducts')
 
 			dol_syslog("codeinit", LOG_DEBUG);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $db->num_rows($resql);
 
 				$i = 0; $nbok = $nbtry = 0;
-				while ($i < min($num, $maxperinit))
-				{
+				while ($i < min($num, $maxperinit)) {
 					$obj = $db->fetch_object($resql);
-					if ($obj)
-					{
+					if ($obj) {
 						$productstatic->id = $obj->rowid;
 						$productstatic->ref = $obj->ref;
 						$productstatic->type = $obj->fk_product_type;
@@ -140,7 +126,9 @@ if ($action == 'initbarcodeproducts')
 						$result = $productstatic->setValueFrom('barcode', $nextvalue, '', '', 'text', '', $user, 'PRODUCT_MODIFY');
 
 						$nbtry++;
-						if ($result > 0) $nbok++;
+						if ($result > 0) {
+							$nbok++;
+						}
 					}
 
 					$i++;
@@ -150,14 +138,12 @@ if ($action == 'initbarcodeproducts')
 				dol_print_error($db);
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			//$db->rollback();
 			$db->commit();
 		} else {
@@ -174,8 +160,12 @@ if ($action == 'initbarcodeproducts')
  * View
  */
 
-if (!$user->admin) accessforbidden();
-if (empty($conf->barcode->enabled)) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
+if (empty($conf->barcode->enabled)) {
+	accessforbidden();
+}
 
 $form = new Form($db);
 
@@ -198,8 +188,7 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<br>';
 
 // For thirdparty
-if ($conf->societe->enabled)
-{
+if ($conf->societe->enabled) {
 	$nbno = $nbtotal = 0;
 
 	print load_fiche_titre($langs->trans("BarcodeInitForThirdparties"), '', 'company');
@@ -207,19 +196,21 @@ if ($conf->societe->enabled)
 	print '<br>'."\n";
 	$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe where barcode IS NULL or barcode = ''";
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$nbno = $obj->nb;
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 
 	$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."societe";
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$nbtotal = $obj->nb;
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 
 	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ThirdParties")).'<br>'."\n";
 
@@ -231,8 +222,7 @@ if ($conf->societe->enabled)
 
 
 // For products
-if ($conf->product->enabled || $conf->product->service)
-{
+if ($conf->product->enabled || $conf->product->service) {
 	// Example 1 : Adding jquery code
 	print '<script type="text/javascript" language="javascript">
 	function confirm_erase() {
@@ -251,32 +241,32 @@ if ($conf->product->enabled || $conf->product->service)
 	$sql .= " GROUP BY fk_product_type, datec";
 	$sql .= " ORDER BY datec";
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			$nbno += $obj->nb;
 
 			$i++;
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 
 	$sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product";
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$nbtotal = $obj->nb;
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 
 	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ProductsOrServices")).'<br>'."\n";
 
-	if (is_object($modBarCodeProduct))
-	{
+	if (is_object($modBarCodeProduct)) {
 		print $langs->trans("BarCodeNumberManager").": ";
 		$objproduct = new Product($db);
 		print '<b>'.(isset($modBarCodeProduct->name) ? $modBarCodeProduct->name : $modBarCodeProduct->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
@@ -286,8 +276,7 @@ if ($conf->product->enabled || $conf->product->service)
 		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
 		print '<font class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</font> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
 	}
-	if (empty($nbno))
-	{
+	if (empty($nbno)) {
 		$disabled1 = 1;
 	}
 
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 2a3a13cca69..a8033cf1c7a 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -24,7 +24,9 @@
  */
 
 if (!empty($_POST['mode']) && $_POST['mode'] === 'label') {	// Page is called to build a PDF and output, we must ne renew the token.
-	if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+	if (!defined('NOTOKENRENEWAL')) {
+		define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+	}
 }
 
 require '../main.inc.php';
@@ -59,8 +61,7 @@ $thirdpartytmp = new Societe($db);
  * Actions
  */
 
-if (GETPOST('submitproduct') && GETPOST('submitproduct'))
-{
+if (GETPOST('submitproduct') && GETPOST('submitproduct')) {
 	$action = ''; // We reset because we don't want to build doc
 	if (GETPOST('productid', 'int') > 0) {
 		$result = $producttmp->fetch(GETPOST('productid', 'int'));
@@ -70,62 +71,56 @@ if (GETPOST('submitproduct') && GETPOST('submitproduct'))
 		$forbarcode = $producttmp->barcode;
 		$fk_barcode_type = $producttmp->barcode_type;
 
-		if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
+			$fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+		}
 
-		if (empty($forbarcode) || empty($fk_barcode_type))
-		{
+		if (empty($forbarcode) || empty($fk_barcode_type)) {
 			setEventMessages($langs->trans("DefinitionOfBarCodeForProductNotComplete", $producttmp->getNomUrl()), null, 'warnings');
 		}
 	}
 }
-if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty'))
-{
+if (GETPOST('submitthirdparty') && GETPOST('submitthirdparty')) {
 	$action = ''; // We reset because we don't want to build doc
-	if (GETPOST('socid', 'int') > 0)
-	{
+	if (GETPOST('socid', 'int') > 0) {
 		$thirdpartytmp->fetch(GETPOST('socid', 'int'));
 		$forbarcode = $thirdpartytmp->barcode;
 		$fk_barcode_type = $thirdpartytmp->barcode_type_code;
 
-		if (empty($fk_barcode_type) && !empty($conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY)) $fk_barcode_type = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+		if (empty($fk_barcode_type) && !empty($conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY)) {
+			$fk_barcode_type = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+		}
 
-		if (empty($forbarcode) || empty($fk_barcode_type))
-		{
+		if (empty($forbarcode) || empty($fk_barcode_type)) {
 			setEventMessages($langs->trans("DefinitionOfBarCodeForThirdpartyNotComplete", $thirdpartytmp->getNomUrl()), null, 'warnings');
 		}
 	}
 }
 
-if ($action == 'builddoc')
-{
+if ($action == 'builddoc') {
 	$result = 0; $error = 0;
 
-	if (empty($forbarcode))			// barcode value
-	{
+	if (empty($forbarcode)) {			// barcode value
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BarcodeValue")), null, 'errors');
 		$error++;
 	}
-	if (empty($fk_barcode_type))		// barcode type = barcode encoding
-	{
+	if (empty($fk_barcode_type)) {		// barcode type = barcode encoding
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BarcodeType")), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		// Get encoder (barcode_type_coder) from barcode type id (barcode_type)
 		$stdobject = new GenericObject($db);
 		$stdobject->barcode_type = $fk_barcode_type;
 		$result = $stdobject->fetch_barcode();
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			$error++;
 			setEventMessages('Failed to get bar code type information '.$stdobject->error, $stdobject->errors, 'errors');
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$code = $forbarcode;
 		$generator = $stdobject->barcode_type_coder; // coder (loaded by fetch_barcode). Engine.
 		$encoding = strtoupper($stdobject->barcode_type_code); // code (loaded by fetch_barcode). Example 'ean', 'isbn', ...
@@ -136,34 +131,34 @@ if ($action == 'builddoc')
 		// Generate barcode
 		$dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_parts['barcode']);
 
-		foreach ($dirbarcode as $reldir)
-		{
+		foreach ($dirbarcode as $reldir) {
 			$dir = dol_buildpath($reldir, 0);
 			$newdir = dol_osencode($dir);
 
 			// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
-			if (!is_dir($newdir)) continue;
+			if (!is_dir($newdir)) {
+				continue;
+			}
 
 			$result = @include_once $newdir.$generator.'.modules.php';
-			if ($result) break;
+			if ($result) {
+				break;
+			}
 		}
 
 		// Load barcode class for generating barcode image
 		$classname = "mod".ucfirst($generator);
 		$module = new $classname($db);
-		if ($generator != 'tcpdfbarcode')
-		{
+		if ($generator != 'tcpdfbarcode') {
 			// May be phpbarcode
 			$template = 'standardlabel';
 			$is2d = false;
-			if ($module->encodingIsSupported($encoding))
-			{
+			if ($module->encodingIsSupported($encoding)) {
 				$barcodeimage = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 				dol_delete_file($barcodeimage);
 				// File is created with full name $barcodeimage = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 				$result = $module->writeBarCode($code, $encoding, 'Y', 4, 1);
-				if ($result <= 0 || !dol_is_file($barcodeimage))
-				{
+				if ($result <= 0 || !dol_is_file($barcodeimage)) {
 					$error++;
 					setEventMessages('Failed to generate image file of barcode for code='.$code.' encoding='.$encoding.' file='.basename($barcodeimage), null, 'errors');
 					setEventMessages($module->error, null, 'errors');
@@ -179,8 +174,7 @@ if ($action == 'builddoc')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		// List of values to scan for a replacement
 		$substitutionarray = array(
 			'%LOGIN%' => $user->login,
@@ -200,8 +194,7 @@ if ($action == 'builddoc')
 		complete_substitutions_array($substitutionarray, $langs);
 
 		// For labels
-		if ($mode == 'label')
-		{
+		if ($mode == 'label') {
 			$txtforsticker = "%PHOTO%"; // Photo will be barcode image, %BARCODE% posible when using TCPDF generator
 			$textleft = make_substitutions((empty($conf->global->BARCODE_LABEL_LEFT_TEXT) ? $txtforsticker : $conf->global->BARCODE_LABEL_LEFT_TEXT), $substitutionarray);
 			$textheader = make_substitutions((empty($conf->global->BARCODE_LABEL_HEADER_TEXT) ? '' : $conf->global->BARCODE_LABEL_HEADER_TEXT), $substitutionarray);
@@ -210,8 +203,7 @@ if ($action == 'builddoc')
 			$forceimgscalewidth = (empty($conf->global->BARCODE_FORCEIMGSCALEWIDTH) ? 1 : $conf->global->BARCODE_FORCEIMGSCALEWIDTH);
 			$forceimgscaleheight = (empty($conf->global->BARCODE_FORCEIMGSCALEHEIGHT) ? 1 : $conf->global->BARCODE_FORCEIMGSCALEHEIGHT);
 
-			for ($i = 0; $i < $numberofsticker; $i++)
-			{
+			for ($i = 0; $i < $numberofsticker; $i++) {
 				$arrayofrecords[] = array(
 					'textleft'=>$textleft,
 					'textheader'=>$textheader,
@@ -229,14 +221,11 @@ if ($action == 'builddoc')
 		$mesg = '';
 
 		// Build and output PDF
-		if ($mode == 'label')
-		{
-			if (!count($arrayofrecords))
-			{
+		if ($mode == 'label') {
+			if (!count($arrayofrecords)) {
 				$mesg = $langs->trans("ErrorRecordNotFound");
 			}
-			if (empty($modellabel) || $modellabel == '-1')
-			{
+			if (empty($modellabel) || $modellabel == '-1') {
 				$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DescADHERENT_ETIQUETTE_TYPE"));
 			}
 
@@ -269,7 +258,9 @@ if ($action == 'builddoc')
  * View
  */
 
-if (empty($conf->barcode->enabled)) accessforbidden();
+if (empty($conf->barcode->enabled)) {
+	accessforbidden();
+}
 
 $form = new Form($db);
 
@@ -300,8 +291,7 @@ print $langs->trans("DescADHERENT_ETIQUETTE_TYPE").' &nbsp; ';
 print '</div><div class="tagtd maxwidthonsmartphone" style="overflow: hidden; white-space: nowrap;">';
 // List of possible labels (defined into $_Avery_Labels variable set into core/lib/format_cards.lib.php)
 $arrayoflabels = array();
-foreach (array_keys($_Avery_Labels) as $codecards)
-{
+foreach (array_keys($_Avery_Labels) as $codecards) {
 	$labeltoshow = $_Avery_Labels[$codecards]['name'];
 	//$labeltoshow.=' ('.$_Avery_Labels[$row['code']]['paper-size'].')';
 	$arrayoflabels[$codecards] = $labeltoshow;
@@ -387,8 +377,7 @@ jQuery(document).ready(function() {
 print '<input id="fillmanually" type="radio" '.((!GETPOST("selectorforbarcode") || GETPOST("selectorforbarcode") == 'fillmanually') ? 'checked ' : '').'name="selectorforbarcode" value="fillmanually" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueManually").' &nbsp; ';
 print '<br>';
 
-if (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire))
-{
+if (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)) {
 	print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromproduct') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' &nbsp; ';
 	print '<br>';
 	print '<div class="showforproductselector">';
@@ -397,8 +386,7 @@ if (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)
 	print '</div>';
 }
 
-if (!empty($user->rights->societe->lire))
-{
+if (!empty($user->rights->societe->lire)) {
 	print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromthirdparty') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' &nbsp; ';
 	print '<br>';
 	print '<div class="showforthirdpartyselector">';
@@ -409,12 +397,10 @@ if (!empty($user->rights->societe->lire))
 
 print '<br>';
 
-if ($producttmp->id > 0)
-{
+if ($producttmp->id > 0) {
 	print $langs->trans("BarCodeDataForProduct", '').' '.$producttmp->getNomUrl(1).'<br>';
 }
-if ($thirdpartytmp->id > 0)
-{
+if ($thirdpartytmp->id > 0) {
 	print $langs->trans("BarCodeDataForThirdparty", '').' '.$thirdpartytmp->getNomUrl(1).'<br>';
 }
 
diff --git a/htdocs/categories/admin/categorie.php b/htdocs/categories/admin/categorie.php
index 693a3e53a2a..bddeb9a771a 100644
--- a/htdocs/categories/admin/categorie.php
+++ b/htdocs/categories/admin/categorie.php
@@ -27,8 +27,9 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
 
 
-if (!$user->admin)
-accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("categories", "admin"));
@@ -40,11 +41,9 @@ $action = GETPOST('action', 'aZ09');
  */
 
 $reg = array();
-if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
-{
+if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
-	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-	{
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -52,11 +51,9 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	}
 }
 
-if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
-{
+if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
-	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-	{
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -100,12 +97,10 @@ print '<td>'.$langs->trans("CategorieRecursiv").'</td>';
 print '<td align="center" width="20">'.$form->textwithpicto('', $langs->trans("CategorieRecursivHelp"), 1, 'help').'</td>';
 
 print '<td align="center" width="100">';
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('CATEGORIE_RECURSIV_ADD');
 } else {
-	if (empty($conf->global->CATEGORIE_RECURSIV_ADD))
-	{
+	if (empty($conf->global->CATEGORIE_RECURSIV_ADD)) {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	} else {
 		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_CATEGORIE_RECURSIV_ADD">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index ff6a4ca7881..0d691995c29 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -37,13 +37,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'categorie'; //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -76,8 +80,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -90,8 +93,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -103,8 +105,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 74e16f9082d..5b54666b674 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -37,14 +37,16 @@ $langs->load("categories");
 
 // Security check
 $socid = (int) GETPOST('socid', 'int');
-if (!$user->rights->categorie->lire) accessforbidden();
+if (!$user->rights->categorie->lire) {
+	accessforbidden();
+}
 
-$action		= GETPOST('action', 'alpha');
+$action = GETPOST('action', 'alpha');
 $cancel		= GETPOST('cancel', 'alpha');
 $origin		= GETPOST('origin', 'alpha');
 $catorigin  = (int) GETPOST('catorigin', 'int');
-$type       = GETPOST('type', 'aZ09');
-$urlfrom	= GETPOST('urlfrom', 'alpha');
+$type = GETPOST('type', 'aZ09');
+$urlfrom = GETPOST('urlfrom', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $label = (string) GETPOST('label', 'alphanohtml');
@@ -54,15 +56,29 @@ $visible = (int) GETPOST('visible', 'int');
 $parent = (int) GETPOST('parent', 'int');
 
 if ($origin) {
-	if ($type == Categorie::TYPE_PRODUCT)     $idProdOrigin     = $origin;
-	if ($type == Categorie::TYPE_SUPPLIER)    $idSupplierOrigin = $origin;
-	if ($type == Categorie::TYPE_CUSTOMER)    $idCompanyOrigin  = $origin;
-	if ($type == Categorie::TYPE_MEMBER)      $idMemberOrigin   = $origin;
-	if ($type == Categorie::TYPE_CONTACT)     $idContactOrigin  = $origin;
-	if ($type == Categorie::TYPE_PROJECT)     $idProjectOrigin  = $origin;
+	if ($type == Categorie::TYPE_PRODUCT) {
+		$idProdOrigin     = $origin;
+	}
+	if ($type == Categorie::TYPE_SUPPLIER) {
+		$idSupplierOrigin = $origin;
+	}
+	if ($type == Categorie::TYPE_CUSTOMER) {
+		$idCompanyOrigin  = $origin;
+	}
+	if ($type == Categorie::TYPE_MEMBER) {
+		$idMemberOrigin   = $origin;
+	}
+	if ($type == Categorie::TYPE_CONTACT) {
+		$idContactOrigin  = $origin;
+	}
+	if ($type == Categorie::TYPE_PROJECT) {
+		$idProjectOrigin  = $origin;
+	}
 }
 
-if ($catorigin && $type == Categorie::TYPE_PRODUCT) $idCatOrigin = $catorigin;
+if ($catorigin && $type == Categorie::TYPE_PRODUCT) {
+	$idCatOrigin = $catorigin;
+}
 
 $object = new Categorie($db);
 
@@ -80,13 +96,10 @@ $error = 0;
  */
 
 // Add action
-if ($action == 'add' && $user->rights->categorie->creer)
-{
+if ($action == 'add' && $user->rights->categorie->creer) {
 	// Action ajout d'une categorie
-	if ($cancel)
-	{
-		if ($urlfrom)
-		{
+	if ($cancel) {
+		if ($urlfrom) {
 			header("Location: ".$urlfrom);
 			exit;
 		} elseif ($backtopage) {
@@ -125,24 +138,25 @@ if ($action == 'add' && $user->rights->categorie->creer)
 	$object->visible = $visible;
 	$object->type = $type;
 
-	if ($parent != "-1") $object->fk_parent = $parent;
+	if ($parent != "-1") {
+		$object->fk_parent = $parent;
+	}
 
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
-	if ($ret < 0) $error++;
+	if ($ret < 0) {
+		$error++;
+	}
 
-	if (!$object->label)
-	{
+	if (!$object->label) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 		$action = 'create';
 	}
 
 	// Create category in database
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $object->create($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$action = 'confirmed';
 			$_POST["addcat"] = '';
 		} else {
@@ -152,41 +166,31 @@ if ($action == 'add' && $user->rights->categorie->creer)
 }
 
 // Confirm action
-if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->creer)
-{
+if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->creer) {
 	// Action confirmation de creation categorie
-	if ($action == 'confirmed')
-	{
-		if ($urlfrom)
-		{
+	if ($action == 'confirmed') {
+		if ($urlfrom) {
 			header("Location: ".$urlfrom);
 			exit;
-		} elseif ($backtopage)
-		{
+		} elseif ($backtopage) {
 			header("Location: ".$backtopage);
 			exit;
-		} elseif ($idProdOrigin)
-		{
+		} elseif ($idProdOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProdOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		} elseif ($idCompanyOrigin)
-		{
+		} elseif ($idCompanyOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idCompanyOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		} elseif ($idSupplierOrigin)
-		{
+		} elseif ($idSupplierOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idSupplierOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		} elseif ($idMemberOrigin)
-		{
+		} elseif ($idMemberOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idMemberOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		} elseif ($idContactOrigin)
-		{
+		} elseif ($idContactOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idContactOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
-		} elseif ($idProjectOrigin)
-		{
+		} elseif ($idProjectOrigin) {
 			header("Location: ".DOL_URL_ROOT.'/categories/viewcat.php?id='.$idProjectOrigin.'&type='.$type.'&mesg='.urlencode($langs->trans("CatCreated")));
 			exit;
 		}
@@ -207,11 +211,9 @@ $formother = new FormOther($db);
 $helpurl = '';
 llxHeader("", $langs->trans("Categories"), $helpurl);
 
-if ($user->rights->categorie->creer)
-{
+if ($user->rights->categorie->creer) {
 	// Create or add
-	if ($action == 'create' || GETPOST("addcat") == 'addcat')
-	{
+	if ($action == 'create' || GETPOST("addcat") == 'addcat') {
 		dol_set_focus('#label');
 
 		print '<form action="'.$_SERVER['PHP_SELF'].'?type='.$type.'" method="POST">';
@@ -222,8 +224,12 @@ if ($user->rights->categorie->creer)
 		print '<input type="hidden" name="id" value="'.GETPOST('origin', 'alpha').'">';
 		print '<input type="hidden" name="type" value="'.$type.'">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-		if ($origin) print '<input type="hidden" name="origin" value="'.$origin.'">';
-		if ($catorigin)	print '<input type="hidden" name="catorigin" value="'.$catorigin.'">';
+		if ($origin) {
+			print '<input type="hidden" name="origin" value="'.$origin.'">';
+		}
+		if ($catorigin) {
+			print '<input type="hidden" name="catorigin" value="'.$catorigin.'">';
+		}
 
 		print load_fiche_titre($langs->trans("CreateCat"));
 
@@ -257,8 +263,7 @@ if ($user->rights->categorie->creer)
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 03610100c9c..65483a561af 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -140,15 +140,12 @@ class Categories extends DolibarrApi
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as t";
 		$sql .= ' WHERE t.entity IN ('.getEntity('category').')';
-		if (!empty($type))
-		{
+		if (!empty($type)) {
 			$sql .= ' AND t.type='.array_search($type, Categories::$TYPES);
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -157,8 +154,7 @@ class Categories extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -167,13 +163,11 @@ class Categories extends DolibarrApi
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$i = 0;
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$category_static = new Categorie($this->db);
 				if ($category_static->fetch($obj->rowid)) {
@@ -181,8 +175,7 @@ class Categories extends DolibarrApi
 				}
 				$i++;
 			}
-		}
-		else {
+		} else {
 			throw new RestException(503, 'Error when retrieve category list : '.$this->db->lasterror());
 		}
 		if (!count($obj_ret)) {
@@ -238,7 +231,9 @@ class Categories extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->category->$field = $value;
 		}
 
@@ -721,8 +716,9 @@ class Categories extends DolibarrApi
 	{
 		$category = array();
 		foreach (Categories::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$category[$field] = $data[$field];
 		}
 		return $category;
@@ -747,8 +743,7 @@ class Categories extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		if (empty($type))
-		{
+		if (empty($type)) {
 			throw new RestException(500, 'The "type" parameter is required.');
 		}
 
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index a050c21c249..d83bc794baa 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -98,7 +98,7 @@ class Categorie extends CommonObject
 		8 => 'bank_line',
 		9 => 'warehouse',
 		10 => 'actioncomm',
-        11 => 'website_page'
+		11 => 'website_page'
 	);
 
 	/**
@@ -197,7 +197,7 @@ class Categorie extends CommonObject
 	/**
 	 * @var string Category label
 	 */
-   	public $label;
+	public $label;
 
 	/**
 	 * @var string description
@@ -231,9 +231,9 @@ class Categorie extends CommonObject
 	 * @see Categorie::TYPE_PROJECT
 	 * @see Categorie::TYPE_ACCOUNT
 	 * @see Categorie::TYPE_BANK_LINE
-     * @see Categorie::TYPE_WAREHOUSE
-     * @see Categorie::TYPE_ACTIONCOMM
-     * @see Categorie::TYPE_WEBSITE_PAGE
+	 * @see Categorie::TYPE_WAREHOUSE
+	 * @see Categorie::TYPE_ACTIONCOMM
+	 * @see Categorie::TYPE_WEBSITE_PAGE
 	 */
 	public $type;
 
@@ -266,9 +266,9 @@ class Categorie extends CommonObject
 				$mapList = $hookmanager->resArray;
 				$mapId   = $mapList['id'];
 				$mapCode = $mapList['code'];
-				self::$MAP_ID_TO_CODE[$mapId]  = $mapCode;
-				$this->MAP_ID[$mapCode]        = $mapId;
-				$this->MAP_CAT_FK[$mapCode]    = $mapList['cat_fk'];
+				self::$MAP_ID_TO_CODE[$mapId] = $mapCode;
+				$this->MAP_ID[$mapCode] = $mapId;
+				$this->MAP_CAT_FK[$mapCode] = $mapList['cat_fk'];
 				$this->MAP_CAT_TABLE[$mapCode] = $mapList['cat_table'];
 				$this->MAP_OBJ_CLASS[$mapCode] = $mapList['obj_class'];
 				$this->MAP_OBJ_TABLE[$mapCode] = $mapList['obj_table'];
@@ -313,8 +313,12 @@ class Categorie extends CommonObject
 		global $conf;
 
 		// Check parameters
-		if (empty($id) && empty($label) && empty($ref_ext)) return -1;
-		if (!is_null($type) && !is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (empty($id) && empty($label) && empty($ref_ext)) {
+			return -1;
+		}
+		if (!is_null($type) && !is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 
 		$sql = "SELECT rowid, fk_parent, entity, label, description, color, fk_soc, visible, type, ref_ext";
 		$sql .= ", date_creation, tms, fk_user_creat, fk_user_modif";
@@ -325,7 +329,9 @@ class Categorie extends CommonObject
 			$sql .= " WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."'";
 		} else {
 			$sql .= " WHERE label = '".$this->db->escape($label)."' AND entity IN (".getEntity('category').")";
-			if (!is_null($type)) $sql .= " AND type = ".((int) $type);
+			if (!is_null($type)) {
+				$sql .= " AND type = ".((int) $type);
+			}
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -357,7 +363,9 @@ class Categorie extends CommonObject
 				$this->db->free($resql);
 
 				// multilangs
-				if (!empty($conf->global->MAIN_MULTILANGS)) $this->getMultiLangs();
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
+					$this->getMultiLangs();
+				}
 
 				return 1;
 			} else {
@@ -387,7 +395,9 @@ class Categorie extends CommonObject
 
 		$type = $this->type;
 
-		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (!is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 
 		$error = 0;
 
@@ -399,7 +409,9 @@ class Categorie extends CommonObject
 		$this->color = trim($this->color);
 		$this->import_key = trim($this->import_key);
 		$this->ref_ext = trim($this->ref_ext);
-		if (empty($this->visible)) $this->visible = 0;
+		if (empty($this->visible)) {
+			$this->visible = 0;
+		}
 		$this->fk_parent = ($this->fk_parent != "" ? intval($this->fk_parent) : 0);
 
 		if ($this->already_exists()) {
@@ -463,7 +475,9 @@ class Categorie extends CommonObject
 				if (!$error) {
 					// Call trigger
 					$result = $this->call_trigger('CATEGORY_CREATE', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
@@ -542,7 +556,9 @@ class Categorie extends CommonObject
 			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('CATEGORY_MODIFY', $user);
-				if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+				if ($result < 0) {
+					$error++; $this->db->rollback(); return -1;
+				}
 				// End call triggers
 			}
 
@@ -579,7 +595,9 @@ class Categorie extends CommonObject
 		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('CATEGORY_DELETE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -649,9 +667,13 @@ class Categorie extends CommonObject
 
 		$error = 0;
 
-		if ($this->id == -1) return -2;
+		if ($this->id == -1) {
+			return -2;
+		}
 
-		if (empty($type)) $type = $obj->element;
+		if (empty($type)) {
+			$type = $obj->element;
+		}
 
 		$this->db->begin();
 
@@ -699,7 +721,9 @@ class Categorie extends CommonObject
 			// Call trigger
 			$this->context = array('linkto'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_LINK', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 
 			if (!$error) {
@@ -757,7 +781,9 @@ class Categorie extends CommonObject
 			// Call trigger
 			$this->context = array('unlinkoff'=>$obj); // Save object we want to link category to into category instance to provide information to trigger
 			$result = $this->call_trigger('CATEGORY_UNLINK', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 
 			if (!$error) {
@@ -805,7 +831,9 @@ class Categorie extends CommonObject
 		if (($type == 'customer' || $type == 'supplier') && $user->socid > 0) {
 			$sql .= " AND o.rowid = ".$user->socid;
 		}
-		if ($limit > 0 || $offset > 0)  $sql .= $this->db->plimit($limit + 1, $offset);
+		if ($limit > 0 || $offset > 0) {
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 
 		dol_syslog(get_class($this)."::getObjectsInCateg", LOG_DEBUG);
@@ -1037,7 +1065,9 @@ class Categorie extends CommonObject
 		// phpcs:enable
 		global $conf, $langs;
 
-		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (!is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 		if (is_null($type)) {
 			$this->error = 'BadValueForParameterType';
 			return -1;
@@ -1063,9 +1093,13 @@ class Categorie extends CommonObject
 
 		// Init $this->cats array
 		$sql = "SELECT DISTINCT c.rowid, c.label, c.ref_ext, c.description, c.color, c.fk_parent, c.visible"; // Distinct reduce pb with old tables with duplicates
-		if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= ", t.label as label_trans, t.description as description_trans";
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$sql .= ", t.label as label_trans, t.description as description_trans";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c";
-		if (!empty($conf->global->MAIN_MULTILANGS)) $sql .= " LEFT  JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$this->db->escape($current_lang)."'";
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$sql .= " LEFT  JOIN ".MAIN_DB_PREFIX."categorie_lang as t ON t.fk_category=c.rowid AND t.lang='".$this->db->escape($current_lang)."'";
+		}
 		$sql .= " WHERE c.entity IN (".getEntity('category').")";
 		$sql .= " AND c.type = ".(int) $type;
 
@@ -1204,14 +1238,18 @@ class Categorie extends CommonObject
 	public function get_all_categories($type = null, $parent = false)
 	{
 		// phpcs:enable
-		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (!is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."categorie";
 		$sql .= " WHERE entity IN (".getEntity('category').")";
-		if (!is_null($type))
+		if (!is_null($type)) {
 			$sql .= " AND type = ".(int) $type;
-		if ($parent)
+		}
+		if ($parent) {
 			$sql .= " AND fk_parent = 0";
+		}
 
 		$res = $this->db->query($sql);
 		if ($res) {
@@ -1252,7 +1290,9 @@ class Categorie extends CommonObject
 		// phpcs:enable
 		$type = $this->type;
 
-		if (!is_numeric($type)) $type = $this->MAP_ID[$type];
+		if (!is_numeric($type)) {
+			$type = $this->MAP_ID[$type];
+		}
 
 		/* We have to select any rowid from llx_categorie which category's mother and label
 		 * are equals to those of the calling category
@@ -1318,7 +1358,9 @@ class Categorie extends CommonObject
 						// Check contrast with background and correct text color
 						$forced_color = 'categtextwhite';
 						if ($cat->color) {
-							if (colorIsLight($cat->color)) $forced_color = 'categtextblack';
+							if (colorIsLight($cat->color)) {
+								$forced_color = 'categtextblack';
+							}
 						}
 					}
 				}
@@ -1399,8 +1441,9 @@ class Categorie extends CommonObject
 			}
 		}
 
-		if (count($ways) == 0)
+		if (count($ways) == 0) {
 			$ways[0][0] = $this;
+		}
 
 		return $ways;
 	}
@@ -1419,7 +1462,9 @@ class Categorie extends CommonObject
 	{
 		$cats = array();
 
-		if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type];
+		if (is_numeric($type)) {
+			$type = Categorie::$MAP_ID_TO_CODE[$type];
+		}
 
 		if ($type === Categorie::TYPE_BANK_LINE) {   // TODO Remove this with standard category code after migration of llx_bank_categ into llx_categorie
 			// Load bank categories
@@ -1509,11 +1554,14 @@ class Categorie extends CommonObject
 		$sql .= " WHERE type = ".$this->MAP_ID[$type];
 		$sql .= " AND entity IN (".getEntity('category').")";
 		if ($nom) {
-			if (!$exact)
+			if (!$exact) {
 				$nom = '%'.str_replace('*', '%', $nom).'%';
-			if (!$case)
+			}
+			if (!$case) {
 				$sql .= " AND label LIKE '".$this->db->escape($nom)."'";
-			else $sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
+			} else {
+				$sql .= " AND label LIKE BINARY '".$this->db->escape($nom)."'";
+			}
 		}
 		if ($id) {
 			$sql .= " AND rowid = '".$id."'";
@@ -1554,7 +1602,9 @@ class Categorie extends CommonObject
 		// Check contrast with background and correct text color
 		$forced_color = 'categtextwhite';
 		if ($this->color) {
-			if (colorIsLight($this->color)) $forced_color = 'categtextblack';
+			if (colorIsLight($this->color)) {
+				$forced_color = 'categtextblack';
+			}
 		}
 
 		$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$this->id.'&type='.$this->type.$moreparam.'&backtopage='.urlencode($_SERVER['PHP_SELF'].($moreparam ? '?'.$moreparam : '')).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip '.$forced_color.'">';
@@ -1563,9 +1613,15 @@ class Categorie extends CommonObject
 		$picto = 'category';
 
 
-		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result .= ' ';
-		if ($withpicto != 2) $result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;
+		if ($withpicto) {
+			$result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result .= ' ';
+		}
+		if ($withpicto != 2) {
+			$result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;
+		}
 		return $result;
 	}
 
@@ -1653,13 +1709,18 @@ class Categorie extends CommonObject
 						// Objet
 						$obj = array();
 						$obj['photo'] = $photo;
-						if ($photo_vignette && is_file($dirthumb.$photo_vignette)) $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
-						else $obj['photo_vignette'] = "";
+						if ($photo_vignette && is_file($dirthumb.$photo_vignette)) {
+							$obj['photo_vignette'] = 'thumbs/'.$photo_vignette;
+						} else {
+							$obj['photo_vignette'] = "";
+						}
 
 						$tabobj[$nbphoto - 1] = $obj;
 
 						// On continue ou on arrete de boucler
-						if ($nbmax && $nbphoto >= $nbmax) break;
+						if ($nbmax && $nbphoto >= $nbmax) {
+							break;
+						}
 					}
 				}
 
@@ -1764,8 +1825,9 @@ class Categorie extends CommonObject
 				}
 
 				// on ne sauvegarde pas des champs vides
-				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"])
+				if ($this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"]) {
 					dol_syslog(get_class($this).'::setMultiLangs', LOG_DEBUG);
+				}
 				if (!$this->db->query($sql2)) {
 					$this->error = $this->db->lasterror();
 					return -1;
@@ -1876,7 +1938,9 @@ class Categorie extends CommonObject
 	 */
 	public static function getFilterJoinQuery($type, $rowIdName)
 	{
-		if ($type == 'bank_account') $type = 'account';
+		if ($type == 'bank_account') {
+			$type = 'account';
+		}
 
 		return " LEFT JOIN ".MAIN_DB_PREFIX."categorie_".$type." as cp ON ".$rowIdName." = cp.fk_".$type;
 	}
@@ -1891,7 +1955,9 @@ class Categorie extends CommonObject
 	 */
 	public static function getFilterSelectQuery($type, $rowIdName, $searchList)
 	{
-		if ($type == 'bank_account') $type = 'account';
+		if ($type == 'bank_account') {
+			$type = 'account';
+		}
 
 		if (empty($searchList) && !is_array($searchList)) {
 			return "";
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index a5578032a3d..176b39ca008 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -62,7 +62,9 @@ if ($result <= 0) {
 }
 
 $type = $object->type;
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) {
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+}
 
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -90,7 +92,7 @@ if ($cancel) {
 // Action mise a jour d'une categorie
 if ($action == 'update' && $user->rights->categorie->creer) {
 	$object->oldcopy = dol_clone($object);
-	$object->label          = $label;
+	$object->label = $label;
 	$object->description    = dol_htmlcleanlastbr($description);
 	$object->color          = $color;
 	$object->socid          = ($socid > 0 ? $socid : 0);
@@ -105,10 +107,11 @@ if ($action == 'update' && $user->rights->categorie->creer) {
 	}
 	if (!$error && empty($object->error)) {
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error && $object->update($user) > 0)
-		{
+		if (!$error && $object->update($user) > 0) {
 			if ($backtopage) {
 				header("Location: ".$backtopage);
 				exit;
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index ff897db86a7..aa2dc20e2b2 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -34,7 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 // Load translation files required by the page
 $langs->load("categories");
 
-if (!$user->rights->categorie->lire) accessforbidden();
+if (!$user->rights->categorie->lire) {
+	accessforbidden();
+}
 
 $id = GETPOST('id', 'int');
 $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
@@ -42,7 +44,9 @@ $catname = GETPOST('catname', 'alpha');
 $nosearch = GETPOST('nosearch', 'int');
 
 $categstatic = new Categorie($db);
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) {
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+}
 
 
 /*
@@ -54,11 +58,15 @@ $form = new Form($db);
 $moreparam = ($nosearch ? '&nosearch=1' : '');
 
 $typetext = $type;
-if ($type == Categorie::TYPE_ACCOUNT) 			$title = $langs->trans('AccountsCategoriesArea');
-elseif ($type == Categorie::TYPE_WAREHOUSE) 	$title = $langs->trans('StocksCategoriesArea');
-elseif ($type == Categorie::TYPE_ACTIONCOMM)	$title = $langs->trans('ActionCommCategoriesArea');
-elseif ($type == Categorie::TYPE_WEBSITE_PAGE)	$title = $langs->trans('WebsitePagesCategoriesArea');
-else {
+if ($type == Categorie::TYPE_ACCOUNT) {
+	$title = $langs->trans('AccountsCategoriesArea');
+} elseif ($type == Categorie::TYPE_WAREHOUSE) {
+	$title = $langs->trans('StocksCategoriesArea');
+} elseif ($type == Categorie::TYPE_ACTIONCOMM) {
+	$title = $langs->trans('ActionCommCategoriesArea');
+} elseif ($type == Categorie::TYPE_WEBSITE_PAGE) {
+	$title = $langs->trans('WebsitePagesCategoriesArea');
+} else {
 	$title = $langs->trans(ucfirst($type).'sCategoriesArea');
 }
 
@@ -100,15 +108,13 @@ if (empty($nosearch)) {
 	/*
 	 * Categories found
 	 */
-	if ($catname || $id > 0)
-	{
+	if ($catname || $id > 0) {
 		$cats = $categstatic->rechercher($id, $catname, $typetext);
 
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("FoundCats").'</td></tr>';
 
-		foreach ($cats as $cat)
-		{
+		foreach ($cats as $cat) {
 			$color = $categstatic->color ? ' style="background: #'.sprintf("%06s", $categstatic->color).';"' : ' style="background: #bbb"';
 
 			print "\t".'<tr class="oddeven">'."\n";
@@ -128,7 +134,9 @@ if (empty($nosearch)) {
 			print "\t</tr>\n";
 		}
 		print "</table>";
-	} else print '&nbsp;';
+	} else {
+		print '&nbsp;';
+	}
 
 	print '</div></div>';
 }
@@ -143,19 +151,25 @@ $cate_arbo = $categstatic->get_full_arbo($typetext);
 $fulltree = $cate_arbo;
 
 // Load possible missing includes
-if ($conf->global->CATEGORY_SHOW_COUNTS)
-{
-	if ($type == Categorie::TYPE_MEMBER)	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-	if ($type == Categorie::TYPE_ACCOUNT)	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-	if ($type == Categorie::TYPE_PROJECT)	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-	if ($type == Categorie::TYPE_USER)		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+if ($conf->global->CATEGORY_SHOW_COUNTS) {
+	if ($type == Categorie::TYPE_MEMBER) {
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+	}
+	if ($type == Categorie::TYPE_ACCOUNT) {
+		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+	}
+	if ($type == Categorie::TYPE_PROJECT) {
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	}
+	if ($type == Categorie::TYPE_USER) {
+		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+	}
 }
 
 // Define data (format for treeview)
 $data = array();
 $data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
-foreach ($fulltree as $key => $val)
-{
+foreach ($fulltree as $key => $val) {
 	$categstatic->id = $val['id'];
 	$categstatic->ref = $val['label'];
 	$categstatic->color = $val['color'];
@@ -163,8 +177,7 @@ foreach ($fulltree as $key => $val)
 	$desc = dol_htmlcleanlastbr($val['description']);
 
 	$counter = '';
-	if ($conf->global->CATEGORY_SHOW_COUNTS)
-	{
+	if ($conf->global->CATEGORY_SHOW_COUNTS) {
 		// we need only a count of the elements, so it is enough to consume only the id's from the database
 		$elements = $type == Categorie::TYPE_ACCOUNT
 			? $categstatic->getObjectsInCateg("account", 1)			// Categorie::TYPE_ACCOUNT is "bank_account" instead of "account"
@@ -206,15 +219,13 @@ foreach ($fulltree as $key => $val)
 
 print '<table class="liste nohover" width="100%">';
 print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td></td><td class="right">';
-if (!empty($conf->use_javascript_ajax))
-{
+if (!empty($conf->use_javascript_ajax)) {
 	print '<div id="iddivjstreecontrol"><a class="notasortlink" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a> | <a class="notasortlink" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a></div>';
 }
 print '</td></tr>';
 
 $nbofentries = (count($data) - 1);
-if ($nbofentries > 0)
-{
+if ($nbofentries > 0) {
 	print '<tr class="pair"><td colspan="3">';
 	tree_recur($data, $data[0], 0);
 	print '</td></tr>';
diff --git a/htdocs/categories/info.php b/htdocs/categories/info.php
index 536b0c20a2c..5666664b848 100644
--- a/htdocs/categories/info.php
+++ b/htdocs/categories/info.php
@@ -20,7 +20,7 @@
 /**
  *      \file       htdocs/categories/info.php
  *      \ingroup    categories
- *		\brief      Category info page
+ *      \brief      Category info page
  */
 
 require '../main.inc.php';
@@ -40,7 +40,9 @@ $id = GETPOST('id', 'int');
 $label = GETPOST('label', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
@@ -50,7 +52,9 @@ if ($result <= 0) {
 }
 
 $type = $object->type;
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) {
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+}
 
 /*
  * View
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index 6bb5d79980c..cfc722df83f 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -38,11 +38,10 @@ $langs->loadlangs(array('categories', 'bills'));
 
 $id      = GETPOST('id', 'int');
 $label   = GETPOST('label', 'alpha');
-$action  = GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 
-if ($id == '' && $label == '')
-{
+if ($id == '' && $label == '') {
 	dol_print_error('', 'Missing parameter id');
 	exit();
 }
@@ -57,7 +56,9 @@ if ($result <= 0) {
 }
 
 $type = $object->type;
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) {
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+}
 
 $upload_dir = $conf->categorie->multidir_output[$object->entity];
 
@@ -65,16 +66,12 @@ $upload_dir = $conf->categorie->multidir_output[$object->entity];
  * Actions
  */
 
-if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && $_POST["sendit"] && !empty($conf->global->MAIN_UPLOAD_DOC))
-{
+if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && $_POST["sendit"] && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 	if ($object->id) {
 		$file = $_FILES['userfile'];
-		if (is_array($file['name']) && count($file['name']) > 0)
-		{
-			foreach ($file['name'] as $i => $name)
-			{
-				if (empty($file['tmp_name'][$i]) || intval($conf->global->MAIN_UPLOAD_DOC) * 1000 <= filesize($file['tmp_name'][$i]))
-				{
+		if (is_array($file['name']) && count($file['name']) > 0) {
+			foreach ($file['name'] as $i => $name) {
+				if (empty($file['tmp_name'][$i]) || intval($conf->global->MAIN_UPLOAD_DOC) * 1000 <= filesize($file['tmp_name'][$i])) {
 					setEventMessage($file['name'][$i].' : '.$langs->trans(empty($file['tmp_name'][$i]) ? 'ErrorFailedToSaveFile' : 'MaxSizeForUploadedFiles'));
 					unset($file['name'][$i], $file['type'][$i], $file['tmp_name'][$i], $file['error'][$i], $file['size'][$i]);
 				}
@@ -87,13 +84,11 @@ if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && $_POST["sen
 	}
 }
 
-if ($action == 'confirm_delete' && $_GET["file"] && $confirm == 'yes' && $user->rights->categorie->creer)
-{
+if ($action == 'confirm_delete' && $_GET["file"] && $confirm == 'yes' && $user->rights->categorie->creer) {
 	$object->delete_photo($upload_dir."/".$_GET["file"]);
 }
 
-if ($action == 'addthumb' && $_GET["file"])
-{
+if ($action == 'addthumb' && $_GET["file"]) {
 	$object->addThumbs($upload_dir."/".$_GET["file"]);
 }
 
@@ -107,8 +102,7 @@ llxHeader("", "", $langs->trans("Categories"));
 $form = new Form($db);
 $formother = new FormOther($db);
 
-if ($object->id)
-{
+if ($object->id) {
 	$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
 
 	$head = categories_prepare_head($object, $type);
@@ -119,8 +113,7 @@ if ($object->id)
 	$object->ref = $object->label;
 	$morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 	$ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
-	foreach ($ways as $way)
-	{
+	foreach ($ways as $way) {
 		$morehtmlref .= $way."<br>\n";
 	}
 	$morehtmlref .= '</div>';
@@ -130,8 +123,7 @@ if ($object->id)
 	/*
 	 * Confirmation de la suppression de photo
 	*/
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
 	}
 
@@ -168,10 +160,8 @@ if ($object->id)
 
 	print '<div class="tabsAction">'."\n";
 
-	if ($action != 'ajout_photo' && $user->rights->categorie->creer)
-	{
-		if (!empty($conf->global->MAIN_UPLOAD_DOC))
-		{
+	if ($action != 'ajout_photo' && $user->rights->categorie->creer) {
+		if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
 			print '<a class="butAction hideonsmartphone" href="'.$_SERVER['PHP_SELF'].'?action=ajout_photo&amp;id='.$object->id.'&amp;type='.$type.'">';
 			print $langs->trans("AddPhoto").'</a>';
 		} else {
@@ -185,16 +175,14 @@ if ($object->id)
 	/*
 	 * Ajouter une photo
 	*/
-	if ($action == 'ajout_photo' && $user->rights->categorie->creer && !empty($conf->global->MAIN_UPLOAD_DOC))
-	{
+	if ($action == 'ajout_photo' && $user->rights->categorie->creer && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 		// Affiche formulaire upload
 		$formfile = new FormFile($db);
 		$formfile->form_attach_new_file($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;type='.$type, $langs->trans("AddPhoto"), 1, '', $user->rights->categorie->creer, 50, $object, '', false, '', 0);
 	}
 
 	// Affiche photos
-	if ($action != 'ajout_photo')
-	{
+	if ($action != 'ajout_photo') {
 		$nbphoto = 0;
 		$nbbyrow = 5;
 
@@ -206,23 +194,24 @@ if ($object->id)
 
 		$listofphoto = $object->liste_photos($dir);
 
-		if (is_array($listofphoto) && count($listofphoto))
-		{
+		if (is_array($listofphoto) && count($listofphoto)) {
 			print '<br>';
 			print '<table width="100%" valign="top" align="center">';
 
-			foreach ($listofphoto as $key => $obj)
-			{
+			foreach ($listofphoto as $key => $obj) {
 				$nbphoto++;
 
-				if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
-				if ($nbbyrow) print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) {
+					print '<tr align=center valign=middle border=1>';
+				}
+				if ($nbbyrow) {
+					print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
+				}
 
 				print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Taille origine" target="_blank">';
 
 				// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
-				if ($obj['photo_vignette'])
-				{
+				if ($obj['photo_vignette']) {
 					$filename = $obj['photo_vignette'];
 				} else {
 					$filename = $obj['photo'];
@@ -243,22 +232,23 @@ if ($object->id)
 				print '<br>';
 
 				// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
-				if (!$obj['photo_vignette'] && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $obj['photo']) && ($object->imgWidth > $maxWidth || $object->imgHeight > $maxHeight))
-				{
+				if (!$obj['photo_vignette'] && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $obj['photo']) && ($object->imgWidth > $maxWidth || $object->imgHeight > $maxHeight)) {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addthumb&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
 				}
-				if ($user->rights->categorie->creer)
-				{
+				if ($user->rights->categorie->creer) {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">';
 					print img_delete().'</a>';
 				}
-				if ($nbbyrow) print '</td>';
-				if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) print '</tr>';
+				if ($nbbyrow) {
+					print '</td>';
+				}
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) {
+					print '</tr>';
+				}
 			}
 
 			// Ferme tableau
-			while ($nbphoto % $nbbyrow)
-			{
+			while ($nbphoto % $nbbyrow) {
 				print '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
 				$nbphoto++;
 			}
@@ -266,8 +256,7 @@ if ($object->id)
 			print '</table>';
 		}
 
-		if ($nbphoto < 1)
-		{
+		if ($nbphoto < 1) {
 			print '<div class="opacitymedium">'.$langs->trans("NoPhotoYet")."</div>";
 		}
 	}
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 898484d0d51..9f2ed6936ef 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -35,13 +35,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('categories', 'languages'));
 
-$id     = GETPOST('id', 'int');
-$label  = GETPOST('label', 'alpha');
+$id = GETPOST('id', 'int');
+$label = GETPOST('label', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 
-if ($id == '' && $label == '')
-{
+if ($id == '' && $label == '') {
 	dol_print_error('', 'Missing parameter id');
 	exit();
 }
@@ -56,7 +55,9 @@ if ($result <= 0) {
 }
 
 $type = $object->type;
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) {
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+}
 
 /*
  * Actions
@@ -64,8 +65,7 @@ if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backwar
 $error = 0;
 
 // retour a l'affichage des traduction si annulation
-if ($cancel == $langs->trans("Cancel"))
-{
+if ($cancel == $langs->trans("Cancel")) {
 	$action = '';
 }
 
@@ -73,8 +73,7 @@ if ($cancel == $langs->trans("Cancel"))
 // Validation de l'ajout
 if ($action == 'vadd' &&
 $cancel != $langs->trans("Cancel") &&
-($user->rights->categorie->creer))
-{
+($user->rights->categorie->creer)) {
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
@@ -106,7 +105,9 @@ $cancel != $langs->trans("Cancel") &&
 
 			// sauvegarde en base
 			$res = $object->setMultiLangs($user);
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 	}
 
@@ -121,13 +122,11 @@ $cancel != $langs->trans("Cancel") &&
 // Validation de l'edition
 if ($action == 'vedit' &&
 $cancel != $langs->trans("Cancel") &&
-($user->rights->categorie->creer))
-{
+($user->rights->categorie->creer)) {
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
-	foreach ($object->multilangs as $key => $value) // enregistrement des nouvelles valeurs dans l'objet
-	{
+	foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet
 		$libelle = GETPOST('libelle-'.$key, 'alpha');
 		$desc = GETPOST('desc-'.$key);
 
@@ -147,7 +146,9 @@ $cancel != $langs->trans("Cancel") &&
 
 	if (!$error) {
 		$res = $object->setMultiLangs($user);
-		if ($res < 0)   $error++;
+		if ($res < 0) {
+			$error++;
+		}
 	}
 
 	if ($error) {
@@ -175,10 +176,8 @@ $head = categories_prepare_head($object, $type);
 
 // Calculate $cnt_trans
 $cnt_trans = 0;
-if (!empty($object->multilangs))
-{
-	foreach ($object->multilangs as $key => $value)
-	{
+if (!empty($object->multilangs)) {
+	foreach ($object->multilangs as $key => $value) {
 		$cnt_trans++;
 	}
 }
@@ -232,12 +231,12 @@ print dol_get_fiche_end();
 
 print "\n<div class=\"tabsAction\">\n";
 
-if ($action == '')
-{
-	if ($user->rights->produit->creer || $user->rights->service->creer)
-	{
+if ($action == '') {
+	if ($user->rights->produit->creer || $user->rights->service->creer) {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
-		if ($cnt_trans > 0) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
+		if ($cnt_trans > 0) {
+			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
+		}
 	}
 }
 
@@ -245,8 +244,7 @@ print "\n</div>\n";
 
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -256,10 +254,8 @@ if ($action == 'edit')
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	print '<input type="hidden" name="type" value="'.$type.'">';
 
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			print "<br><b><u>".$langs->trans('Language_'.$key)." :</u></b><br>";
 			print '<table class="border centpercent">';
 
@@ -287,27 +283,27 @@ if ($action == 'edit')
 	print '</div>';
 
 	print '</form>';
-} elseif ($action != 'add')
-{
-	if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
+} elseif ($action != 'add') {
+	if ($cnt_trans) {
+		print '<div class="underbanner clearboth"></div>';
+	}
 
-	if (!empty($object->multilangs))
-	{
-		foreach ($object->multilangs as $key => $value)
-		{
+	if (!empty($object->multilangs)) {
+		foreach ($object->multilangs as $key => $value) {
 			$s = picto_from_langcode($key);
 			print '<table class="border centpercent">';
 			print '<tr class="liste_titre"><td colspan="2">'.($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'&type='.$type.'">'.img_delete('', '').'</a></td></tr>';
 			print '<tr><td class="titlefield">'.$langs->trans('Label').'</td><td>'.$object->multilangs[$key]["label"].'</td></tr>';
 			print '<tr><td>'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
-			if (!empty($conf->global->CATEGORY_USE_OTHER_FIELD_IN_TRANSLATION))
-			{
+			if (!empty($conf->global->CATEGORY_USE_OTHER_FIELD_IN_TRANSLATION)) {
 				print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
 		}
 	}
-	if (!$cnt_trans && $action != 'add') print '<div class="opacitymedium">'.$langs->trans('NoTranslation').'</div>';
+	if (!$cnt_trans && $action != 'add') {
+		print '<div class="opacitymedium">'.$langs->trans('NoTranslation').'</div>';
+	}
 }
 
 
@@ -315,8 +311,7 @@ if ($action == 'edit')
  * Form to add a new translation
  */
 
-if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer))
-{
+if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service->creer)) {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 187691293e4..7f19194a3c3 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -49,7 +49,7 @@ $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'categorylist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 
 // Load variable for pagination
@@ -57,13 +57,14 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if ($id == "" && $label == "")
-{
+if ($id == "" && $label == "") {
 	dol_print_error('', 'Missing parameter id');
 	exit();
 }
@@ -78,7 +79,9 @@ if ($result <= 0) {
 }
 
 $type = $object->type;
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+if (is_numeric($type)) {
+	$type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
+}
 
 $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -90,8 +93,7 @@ $hookmanager->initHooks(array('categorycard', 'globalcard'));
  *	Actions
  */
 
-if ($confirm == 'no')
-{
+if ($confirm == 'no') {
 	if ($backtopage) {
 		header("Location: ".$backtopage);
 		exit;
@@ -101,26 +103,21 @@ if ($confirm == 'no')
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 // Remove element from category
-if ($id > 0 && $removeelem > 0)
-{
-	if ($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer))
-	{
+if ($id > 0 && $removeelem > 0) {
+	if ($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$tmpobject = new Product($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'product';
-	} elseif ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
-	{
+	} elseif ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer) {
 		$tmpobject = new Societe($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'supplier';
-	} elseif ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer)
-	{
+	} elseif ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer) {
 		$tmpobject = new Societe($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'customer';
-	} elseif ($type == Categorie::TYPE_MEMBER && $user->rights->adherent->creer)
-	{
+	} elseif ($type == Categorie::TYPE_MEMBER && $user->rights->adherent->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 		$tmpobject = new Adherent($db);
 		$result = $tmpobject->fetch($removeelem);
@@ -130,20 +127,17 @@ if ($id > 0 && $removeelem > 0)
 		$tmpobject = new Contact($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'contact';
-	} elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer)
-	{
+	} elseif ($type == Categorie::TYPE_ACCOUNT && $user->rights->banque->configurer) {
 		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		$tmpobject = new Account($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'account';
-	} elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer)
-	{
+	} elseif ($type == Categorie::TYPE_PROJECT && $user->rights->projet->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 		$tmpobject = new Project($db);
 		$result = $tmpobject->fetch($removeelem);
 		$elementtype = 'project';
-	} elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer)
-	{
+	} elseif ($type == Categorie::TYPE_USER && $user->rights->user->user->creer) {
 		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 		$tmpobject = new User($db);
 		$result = $tmpobject->fetch($removeelem);
@@ -151,13 +145,13 @@ if ($id > 0 && $removeelem > 0)
 	}
 
 	$result = $object->del_type($tmpobject, $elementtype);
-	if ($result < 0) dol_print_error('', $object->error);
+	if ($result < 0) {
+		dol_print_error('', $object->error);
+	}
 }
 
-if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confirm == 'yes')
-{
-	if ($object->delete($user) >= 0)
-	{
+if ($user->rights->categorie->supprimer && $action == 'confirm_delete' && $confirm == 'yes') {
+	if ($object->delete($user) >= 0) {
 		if ($backtopage) {
 			header("Location: ".$backtopage);
 			exit;
@@ -174,20 +168,16 @@ if ($elemid && $action == 'addintocategory' &&
 	(($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer)) ||
 	 ($type == Categorie::TYPE_CUSTOMER && $user->rights->societe->creer) ||
 	 ($type == Categorie::TYPE_SUPPLIER && $user->rights->societe->creer)
-   ))
-{
-	if ($type == Categorie::TYPE_PRODUCT)
-	{
+   )) {
+	if ($type == Categorie::TYPE_PRODUCT) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$newobject = new Product($db);
 		$elementtype = 'product';
-	} elseif ($type == Categorie::TYPE_CUSTOMER)
-	{
+	} elseif ($type == Categorie::TYPE_CUSTOMER) {
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$newobject = new Societe($db);
 		$elementtype = 'customer';
-	} elseif ($type == Categorie::TYPE_SUPPLIER)
-	{
+	} elseif ($type == Categorie::TYPE_SUPPLIER) {
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 		$newobject = new Societe($db);
 		$elementtype = 'supplier';
@@ -196,12 +186,10 @@ if ($elemid && $action == 'addintocategory' &&
 
 	// TODO Add into categ
 	$result = $object->add_type($newobject, $elementtype);
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		setEventMessages($langs->trans("WasAddedSuccessfully", $newobject->ref), null, 'mesgs');
 	} else {
-		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($cat->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			setEventMessages($langs->trans("ObjectAlreadyLinkedToCategory"), null, 'warnings');
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -233,8 +221,7 @@ $object->next_prev_filter = ' type = '.$object->type;
 $object->ref = $object->label;
 $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
-foreach ($ways as $way)
-{
+foreach ($ways as $way) {
 	$morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
@@ -246,8 +233,7 @@ dol_banner_tab($object, 'label', $linkback, ($user->socid ? 0 : 1), 'label', 'la
  * Confirmation suppression
  */
 
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	if ($backtopage) {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&backtopage='.urlencode($backtopage), $langs->trans('DeleteCategory'), $langs->trans('ConfirmDeleteCategory'), 'confirm_delete', '', '', 2);
 	} else {
@@ -288,16 +274,16 @@ print dol_get_fiche_end();
 
 print "<div class='tabsAction'>\n";
 $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $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)) {
-	if ($user->rights->categorie->creer)
-	{
+	if ($user->rights->categorie->creer) {
 		$socid = ($object->socid ? "&socid=".$object->socid : "");
 		print '<a class="butAction" href="edit.php?id='.$object->id.$socid.'&type='.$type.'">'.$langs->trans("Modify").'</a>';
 	}
 
-	if ($user->rights->categorie->supprimer)
-	{
+	if ($user->rights->categorie->supprimer) {
 		print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'&type='.$type.'&backtolist='.urlencode($backtolist).'">'.$langs->trans("Delete").'</a>';
 	}
 }
@@ -305,8 +291,7 @@ if (empty($reshook)) {
 print "</div>";
 
 $newcardbutton = '';
-if (!empty($user->rights->categorie->creer))
-{
+if (!empty($user->rights->categorie->creer)) {
 	$link = DOL_URL_ROOT.'/categories/card.php';
 	$link .= '?action=create';
 	$link .= '&type='.$type;
@@ -335,8 +320,7 @@ print '<td>'.$langs->trans("SubCats").'</td>';
 print '<td></td>';
 print '<td class="right">';
 
-if (!empty($conf->use_javascript_ajax))
-{
+if (!empty($conf->use_javascript_ajax)) {
 	print '<div id="iddivjstreecontrol">';
 	print '<a class="notasortlink" href="#">'.img_picto('', 'folder').' '.$langs->trans("UndoExpandAll").'</a>';
 	print " | ";
@@ -348,11 +332,9 @@ print '</td>';
 print '</tr>';
 
 $cats = $object->get_filles();
-if ($cats < 0)
-{
+if ($cats < 0) {
 	dol_print_error($db, $object->error, $object->errors);
-} elseif (count($cats) < 1)
-{
+} elseif (count($cats) < 1) {
 	print '<tr class="oddeven">';
 	print '<td colspan="3" class="opacitymedium">'.$langs->trans("NoSubCat").'</td>';
 	print '</tr>';
@@ -362,19 +344,25 @@ if ($cats < 0)
 	$fulltree = $categstatic->get_full_arbo($type, $object->id, 1);
 
 	// Load possible missing includes
-	if ($conf->global->CATEGORY_SHOW_COUNTS)
-	{
-		if ($type == Categorie::TYPE_MEMBER)	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-		if ($type == Categorie::TYPE_ACCOUNT)	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-		if ($type == Categorie::TYPE_PROJECT)	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-		if ($type == Categorie::TYPE_USER)		require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+	if ($conf->global->CATEGORY_SHOW_COUNTS) {
+		if ($type == Categorie::TYPE_MEMBER) {
+			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+		}
+		if ($type == Categorie::TYPE_ACCOUNT) {
+			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		}
+		if ($type == Categorie::TYPE_PROJECT) {
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+		}
+		if ($type == Categorie::TYPE_USER) {
+			require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+		}
 	}
 
 	// Define data (format for treeview)
 	$data = array();
 	$data[] = array('rowid'=>0, 'fk_menu'=>-1, 'title'=>"racine", 'mainmenu'=>'', 'leftmenu'=>'', 'fk_mainmenu'=>'', 'fk_leftmenu'=>'');
-	foreach ($fulltree as $key => $val)
-	{
+	foreach ($fulltree as $key => $val) {
 		$categstatic->id = $val['id'];
 		$categstatic->ref = $val['label'];
 		$categstatic->color = $val['color'];
@@ -382,8 +370,7 @@ if ($cats < 0)
 		$desc = dol_htmlcleanlastbr($val['description']);
 
 		$counter = '';
-		if ($conf->global->CATEGORY_SHOW_COUNTS)
-		{
+		if ($conf->global->CATEGORY_SHOW_COUNTS) {
 			// we need only a count of the elements, so it is enough to consume only the id's from the database
 			$elements = $type == Categorie::TYPE_ACCOUNT
 				? $categstatic->getObjectsInCateg("account", 1)			// Categorie::TYPE_ACCOUNT is "bank_account" instead of "account"
@@ -421,8 +408,7 @@ if ($cats < 0)
 	}
 
 	$nbofentries = (count($data) - 1);
-	if ($nbofentries > 0)
-	{
+	if ($nbofentries > 0) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
 		print '<tr class="pair">';
 		print '<td colspan="3">';
@@ -465,19 +451,16 @@ $typeid = $type;
 
 
 // List of products or services (type is type of category)
-if ($type == Categorie::TYPE_PRODUCT)
-{
+if ($type == Categorie::TYPE_PRODUCT) {
 	$permission = ($user->rights->produit->creer || $user->rights->service->creer);
 
 	$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($prods < 0)
-	{
+	if ($prods < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		// Form to add record into a category
 		$showclassifyform = 1;
-		if ($showclassifyform)
-		{
+		if ($showclassifyform) {
 			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -510,13 +493,13 @@ if ($type == Categorie::TYPE_PRODUCT)
 		print '<table class="noborder centpercent">'."\n";
 		print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		if (count($prods) > 0)
-		{
+		if (count($prods) > 0) {
 			$i = 0;
-			foreach ($prods as $prod)
-			{
+			foreach ($prods as $prod) {
 				$i++;
-				if ($i > $limit) break;
+				if ($i > $limit) {
+					break;
+				}
 
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
@@ -525,8 +508,7 @@ if ($type == Categorie::TYPE_PRODUCT)
 				print '<td class="tdtop">'.$prod->label."</td>\n";
 				// Link to delete from category
 				print '<td class="right">';
-				if ($permission)
-				{
+				if ($permission) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$prod->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
@@ -544,19 +526,16 @@ if ($type == Categorie::TYPE_PRODUCT)
 	}
 }
 
-if ($type == Categorie::TYPE_CUSTOMER)
-{
+if ($type == Categorie::TYPE_CUSTOMER) {
 	$permission = $user->rights->societe->creer;
 
 	$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($socs < 0)
-	{
+	if ($socs < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		// Form to add record into a category
 		$showclassifyform = 1;
-		if ($showclassifyform)
-		{
+		if ($showclassifyform) {
 			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -588,13 +567,13 @@ if ($type == Categorie::TYPE_CUSTOMER)
 		print '<table class="noborder centpercent">'."\n";
 		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Name").'</td></tr>'."\n";
 
-		if (count($socs) > 0)
-		{
+		if (count($socs) > 0) {
 			$i = 0;
-			foreach ($socs as $key => $soc)
-			{
+			foreach ($socs as $key => $soc) {
 				$i++;
-				if ($i > $limit) break;
+				if ($i > $limit) {
+					break;
+				}
 
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
@@ -602,8 +581,7 @@ if ($type == Categorie::TYPE_CUSTOMER)
 				print "</td>\n";
 				// Link to delete from category
 				print '<td class="right">';
-				if ($permission)
-				{
+				if ($permission) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
@@ -622,19 +600,16 @@ if ($type == Categorie::TYPE_CUSTOMER)
 }
 
 
-if ($type == Categorie::TYPE_SUPPLIER)
-{
+if ($type == Categorie::TYPE_SUPPLIER) {
 	$permission = $user->rights->societe->creer;
 
 	$socs = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($socs < 0)
-	{
+	if ($socs < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		// Form to add record into a category
 		$showclassifyform = 1;
-		if ($showclassifyform)
-		{
+		if ($showclassifyform) {
 			print '<br>';
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -666,13 +641,13 @@ if ($type == Categorie::TYPE_SUPPLIER)
 		print '<table class="noborder centpercent">'."\n";
 		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Name")."</td></tr>\n";
 
-		if (count($socs) > 0)
-		{
+		if (count($socs) > 0) {
 			$i = 0;
-			foreach ($socs as $soc)
-			{
+			foreach ($socs as $soc) {
 				$i++;
-				if ($i > $limit) break;
+				if ($i > $limit) {
+					break;
+				}
 
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
@@ -680,8 +655,7 @@ if ($type == Categorie::TYPE_SUPPLIER)
 				print "</td>\n";
 				// Link to delete from category
 				print '<td class="right">';
-				if ($permission)
-				{
+				if ($permission) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
@@ -701,15 +675,13 @@ if ($type == Categorie::TYPE_SUPPLIER)
 }
 
 // List of members
-if ($type == Categorie::TYPE_MEMBER)
-{
+if ($type == Categorie::TYPE_MEMBER) {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
 	$permission = $user->rights->adherent->creer;
 
 	$prods = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($prods < 0)
-	{
+	if ($prods < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -726,13 +698,13 @@ if ($type == Categorie::TYPE_MEMBER)
 		print "<table class='noborder' width='100%'>\n";
 		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Name").'</td></tr>'."\n";
 
-		if (count($prods) > 0)
-		{
+		if (count($prods) > 0) {
 			$i = 0;
-			foreach ($prods as $key => $member)
-			{
+			foreach ($prods as $key => $member) {
 				$i++;
-				if ($i > $limit) break;
+				if ($i > $limit) {
+					break;
+				}
 
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
@@ -743,8 +715,7 @@ if ($type == Categorie::TYPE_MEMBER)
 				print '<td class="tdtop">'.$member->firstname."</td>\n";
 				// Link to delete from category
 				print '<td class="right">';
-				if ($permission)
-				{
+				if ($permission) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$member->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
@@ -762,13 +733,11 @@ if ($type == Categorie::TYPE_MEMBER)
 }
 
 // Categorie contact
-if ($type == Categorie::TYPE_CONTACT)
-{
+if ($type == Categorie::TYPE_CONTACT) {
 	$permission = $user->rights->societe->creer;
 
 	$contacts = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($contacts < 0)
-	{
+	if ($contacts < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -788,13 +757,13 @@ if ($type == Categorie::TYPE_CONTACT)
 		print '<table class="noborder centpercent">'."\n";
 		print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		if (count($contacts) > 0)
-		{
+		if (count($contacts) > 0) {
 			$i = 0;
-			foreach ($contacts as $key => $contact)
-			{
+			foreach ($contacts as $key => $contact) {
 				$i++;
-				if ($i > $limit) break;
+				if ($i > $limit) {
+					break;
+				}
 
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
@@ -802,8 +771,7 @@ if ($type == Categorie::TYPE_CONTACT)
 				print "</td>\n";
 				// Link to delete from category
 				print '<td class="right">';
-				if ($permission)
-				{
+				if ($permission) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$contact->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
@@ -822,15 +790,13 @@ if ($type == Categorie::TYPE_CONTACT)
 }
 
 // List of bank accounts
-if ($type == Categorie::TYPE_ACCOUNT)
-{
+if ($type == Categorie::TYPE_ACCOUNT) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 	$permission = $user->rights->banque->creer;
 
 	$accounts = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($accounts < 0)
-	{
+	if ($accounts < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -847,13 +813,13 @@ if ($type == Categorie::TYPE_ACCOUNT)
 		print "<table class='noborder' width='100%'>\n";
 		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		if (count($accounts) > 0)
-		{
+		if (count($accounts) > 0) {
 			$i = 0;
-			foreach ($accounts as $key => $account)
-			{
+			foreach ($accounts as $key => $account) {
 				$i++;
-				if ($i > $limit) break;
+				if ($i > $limit) {
+					break;
+				}
 
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
@@ -863,8 +829,7 @@ if ($type == Categorie::TYPE_ACCOUNT)
 				print '<td class="tdtop">'.$account->number."</td>\n";
 				// Link to delete from category
 				print '<td class="right">';
-				if ($permission)
-				{
+				if ($permission) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$account->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
@@ -882,15 +847,13 @@ if ($type == Categorie::TYPE_ACCOUNT)
 }
 
 // List of Project
-if ($type == Categorie::TYPE_PROJECT)
-{
+if ($type == Categorie::TYPE_PROJECT) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 	$permission = $user->rights->projet->creer;
 
 	$objects = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($objects < 0)
-	{
+	if ($objects < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -908,13 +871,13 @@ if ($type == Categorie::TYPE_PROJECT)
 		print "<table class='noborder' width='100%'>\n";
 		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		if (count($objects) > 0)
-		{
+		if (count($objects) > 0) {
 			$i = 0;
-			foreach ($objects as $key => $project)
-			{
+			foreach ($objects as $key => $project) {
 				$i++;
-				if ($i > $limit) break;
+				if ($i > $limit) {
+					break;
+				}
 
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
@@ -924,8 +887,7 @@ if ($type == Categorie::TYPE_PROJECT)
 				print '<td class="tdtop">'.$project->title."</td>\n";
 				// Link to delete from category
 				print '<td class="right">';
-				if ($permission)
-				{
+				if ($permission) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$project->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
@@ -943,13 +905,11 @@ if ($type == Categorie::TYPE_PROJECT)
 }
 
 // List of users
-if ($type == Categorie::TYPE_USER)
-{
+if ($type == Categorie::TYPE_USER) {
 	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 	$users = $object->getObjectsInCateg($type);
-	if ($users < 0)
-	{
+	if ($users < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -969,11 +929,9 @@ if ($type == Categorie::TYPE_USER)
 		print "<table class='noborder' width='100%'>\n";
 		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Users").' <span class="badge">'.$num.'</span></td></tr>'."\n";
 
-		if (count($users) > 0)
-		{
+		if (count($users) > 0) {
 			// Use "$userentry" here, because "$user" is the current user
-			foreach ($users as $key => $userentry)
-			{
+			foreach ($users as $key => $userentry) {
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
 				print $userentry->getNomUrl(1);
@@ -982,8 +940,7 @@ if ($type == Categorie::TYPE_USER)
 
 				// Link to delete from category
 				print '<td class="right">';
-				if ($user->rights->user->user->creer)
-				{
+				if ($user->rights->user->user->creer) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$type."&amp;removeelem=".$userentry->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
@@ -1002,15 +959,13 @@ if ($type == Categorie::TYPE_USER)
 
 
 // List of warehouses
-if ($type == Categorie::TYPE_WAREHOUSE)
-{
+if ($type == Categorie::TYPE_WAREHOUSE) {
 	$permission = $user->rights->stock->creer;
 
 	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 
 	$objects = $object->getObjectsInCateg($type, 0, $limit, $offset);
-	if ($objects < 0)
-	{
+	if ($objects < 0) {
 		dol_print_error($db, $object->error, $object->errors);
 	} else {
 		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -1028,13 +983,13 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 		print "<table class='noborder' width='100%'>\n";
 		print '<tr class="liste_titre"><td colspan="4">'.$langs->trans("Ref").'</td></tr>'."\n";
 
-		if (count($objects) > 0)
-		{
+		if (count($objects) > 0) {
 			$i = 0;
-			foreach ($objects as $key => $project)
-			{
+			foreach ($objects as $key => $project) {
 				$i++;
-				if ($i > $limit) break;
+				if ($i > $limit) {
+					break;
+				}
 
 				print "\t".'<tr class="oddeven">'."\n";
 				print '<td class="nowrap" valign="top">';
@@ -1044,8 +999,7 @@ if ($type == Categorie::TYPE_WAREHOUSE)
 				print '<td class="tdtop">'.$project->title."</td>\n";
 				// Link to delete from category
 				print '<td class="right">';
-				if ($permission)
-				{
+				if ($permission) {
 					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$project->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
diff --git a/htdocs/collab/index.php b/htdocs/collab/index.php
index e5fe22c9168..296e0f3852f 100644
--- a/htdocs/collab/index.php
+++ b/htdocs/collab/index.php
@@ -31,7 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "website"));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $conf->dol_hide_leftmenu = 1; // Force hide of left menu.
 
@@ -41,17 +43,37 @@ $page = GETPOST('page', 'alpha');
 $pageid = GETPOST('pageid', 'int');
 $action = GETPOST('action', 'aZ09');
 
-if (GETPOST('delete')) { $action = 'delete'; }
-if (GETPOST('preview')) $action = 'preview';
-if (GETPOST('create')) { $action = 'create'; }
-if (GETPOST('editmedia')) { $action = 'editmedia'; }
-if (GETPOST('editcss')) { $action = 'editcss'; }
-if (GETPOST('editmenu')) { $action = 'editmenu'; }
-if (GETPOST('setashome')) { $action = 'setashome'; }
-if (GETPOST('editmeta')) { $action = 'editmeta'; }
-if (GETPOST('editcontent')) { $action = 'editcontent'; }
+if (GETPOST('delete')) {
+	$action = 'delete';
+}
+if (GETPOST('preview')) {
+	$action = 'preview';
+}
+if (GETPOST('create')) {
+	$action = 'create';
+}
+if (GETPOST('editmedia')) {
+	$action = 'editmedia';
+}
+if (GETPOST('editcss')) {
+	$action = 'editcss';
+}
+if (GETPOST('editmenu')) {
+	$action = 'editmenu';
+}
+if (GETPOST('setashome')) {
+	$action = 'setashome';
+}
+if (GETPOST('editmeta')) {
+	$action = 'editmeta';
+}
+if (GETPOST('editcontent')) {
+	$action = 'editcontent';
+}
 
-if (empty($action)) $action = 'preview';
+if (empty($action)) {
+	$action = 'preview';
+}
 
 
 
@@ -60,13 +82,16 @@ if (empty($action)) $action = 'preview';
  * Actions
  */
 
-if (GETPOST('refreshsite')) $pageid = 0; // If we change the site, we reset the pageid.
-if (GETPOST('refreshpage')) $action = 'preview';
+if (GETPOST('refreshsite')) {
+	$pageid = 0; // If we change the site, we reset the pageid.
+}
+if (GETPOST('refreshpage')) {
+	$action = 'preview';
+}
 
 
 // Add a collab page
-if ($action == 'add')
-{
+if ($action == 'add') {
 	$db->begin();
 
 	$objectpage->title = GETPOST('WEBSITE_TITLE');
@@ -74,23 +99,19 @@ if ($action == 'add')
 	$objectpage->description = GETPOST('WEBSITE_DESCRIPTION');
 	$objectpage->keywords = GETPOST('WEBSITE_KEYWORD');
 
-	if (empty($objectpage->title))
-	{
+	if (empty($objectpage->title)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_PAGENAME")), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$res = $objectpage->create($user);
-		if ($res <= 0)
-		{
+		if ($res <= 0) {
 			$error++;
 			setEventMessages($objectpage->error, $objectpage->errors, 'errors');
 		}
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action = '';
@@ -103,25 +124,21 @@ if ($action == 'add')
 }
 
 // Update page
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	$db->begin();
 
 	$res = $object->fetch(0, $website);
 
 	$res = $objectpage->fetch($pageid, $object->fk_website);
 
-	if ($res > 0)
-	{
+	if ($res > 0) {
 		$res = $objectpage->delete($user);
-		if (!($res > 0))
-		{
+		if (!($res > 0)) {
 			$error++;
 			setEventMessages($objectpage->error, $objectpage->errors, 'errors');
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 			setEventMessages($langs->trans("PageDeleted", $objectpage->pageurl, $website), null, 'mesgs');
 
@@ -149,15 +166,16 @@ llxHeader('', $langs->trans("WebsiteSetup"), $help_url, '', 0, '', '', '', '', '
 
 print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST"><div>';
 print '<input type="hidden" name="token" value="'.newToken().'">';
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<input type="hidden" name="action" value="add">';
 }
 
 
 // Add a margin under toolbar ?
 $style = '';
-if ($action != 'preview' && $action != 'editcontent') $style = ' margin-bottom: 5px;';
+if ($action != 'preview' && $action != 'editcontent') {
+	$style = ' margin-bottom: 5px;';
+}
 
 //var_dump($objectpage);exit;
 print '<div class="centpercent websitebar">';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index fba2cf10cbc..3b539895348 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -77,9 +77,13 @@ $datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2mi
 // Security check
 $socid = GETPOST('socid', 'int');
 $id = GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
-if ($user->socid && $socid) $result = restrictedArea($user, 'societe', $socid);
+if ($user->socid && $socid) {
+	$result = restrictedArea($user, 'societe', $socid);
+}
 
 $error = GETPOST("error");
 $donotclearsession = GETPOST('donotclearsession') ?GETPOST('donotclearsession') : 0;
@@ -114,11 +118,17 @@ $hookmanager->initHooks(array('actioncard', 'globalcard'));
 
 $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');
+}
 
 $TRemindTypes = array();
-if (!empty($conf->global->AGENDA_REMINDER_BROWSER)) $TRemindTypes['browser'] = array('label'=>$langs->trans('BrowserPush'), 'disabled'=>(empty($conf->global->AGENDA_REMINDER_BROWSER) ? 1 : 0));
-if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) $TRemindTypes['email'] = array('label'=>$langs->trans('EMail'), 'disabled'=>(empty($conf->global->AGENDA_REMINDER_EMAIL) ? 1 : 0));
+if (!empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+	$TRemindTypes['browser'] = array('label'=>$langs->trans('BrowserPush'), 'disabled'=>(empty($conf->global->AGENDA_REMINDER_BROWSER) ? 1 : 0));
+}
+if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) {
+	$TRemindTypes['email'] = array('label'=>$langs->trans('EMail'), 'disabled'=>(empty($conf->global->AGENDA_REMINDER_EMAIL) ? 1 : 0));
+}
 
 $TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month'), 'w'=>$langs->trans('Weeks'), 'd'=>$langs->trans('Days'), 'h'=>$langs->trans('Hours'), 'i'=>$langs->trans('Minutes'));
 
@@ -129,60 +139,65 @@ $TDurationTypes = array('y'=>$langs->trans('Years'), 'm'=>$langs->trans('Month')
 
 $listUserAssignedUpdated = false;
 // Remove user to assigned list
-if (empty($reshook) && (GETPOST('removedassigned') || GETPOST('removedassigned') == '0'))
-{
+if (empty($reshook) && (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')) {
 	$idtoremove = GETPOST('removedassigned');
 
-	if (!empty($_SESSION['assignedtouser'])) $tmpassigneduserids = json_decode($_SESSION['assignedtouser'], 1);
-	else $tmpassigneduserids = array();
+	if (!empty($_SESSION['assignedtouser'])) {
+		$tmpassigneduserids = json_decode($_SESSION['assignedtouser'], 1);
+	} else {
+		$tmpassigneduserids = array();
+	}
 
-	foreach ($tmpassigneduserids as $key => $val)
-	{
-		if ($val['id'] == $idtoremove || $val['id'] == -1) unset($tmpassigneduserids[$key]);
+	foreach ($tmpassigneduserids as $key => $val) {
+		if ($val['id'] == $idtoremove || $val['id'] == -1) {
+			unset($tmpassigneduserids[$key]);
+		}
 	}
 
 	$_SESSION['assignedtouser'] = json_encode($tmpassigneduserids);
 	$donotclearsession = 1;
-	if ($action == 'add') $action = 'create';
-	if ($action == 'update') $action = 'edit';
+	if ($action == 'add') {
+		$action = 'create';
+	}
+	if ($action == 'update') {
+		$action = 'edit';
+	}
 
 	$listUserAssignedUpdated = true;
 }
 
 // Add user to assigned list
-if (empty($reshook) && (GETPOST('addassignedtouser') || GETPOST('updateassignedtouser')))
-{
+if (empty($reshook) && (GETPOST('addassignedtouser') || GETPOST('updateassignedtouser'))) {
 	// Add a new user
-	if (GETPOST('assignedtouser') > 0)
-	{
+	if (GETPOST('assignedtouser') > 0) {
 		$assignedtouser = array();
-		if (!empty($_SESSION['assignedtouser']))
-		{
+		if (!empty($_SESSION['assignedtouser'])) {
 			$assignedtouser = json_decode($_SESSION['assignedtouser'], true);
 		}
 		$assignedtouser[GETPOST('assignedtouser')] = array('id'=>GETPOST('assignedtouser'), 'transparency'=>GETPOST('transparency'), 'mandatory'=>1);
 		$_SESSION['assignedtouser'] = json_encode($assignedtouser);
 	}
 	$donotclearsession = 1;
-	if ($action == 'add') $action = 'create';
-	if ($action == 'update') $action = 'edit';
+	if ($action == 'add') {
+		$action = 'create';
+	}
+	if ($action == 'update') {
+		$action = 'edit';
+	}
 
 	$listUserAssignedUpdated = true;
 }
 
 // Link to a project
 if (empty($reshook) && $action == 'classin' && ($user->rights->agenda->allactions->create ||
-	(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)))
-{
+	(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))) {
 	//$object->fetch($id);
 	$object->setProject(GETPOST('projectid', 'int'));
 }
 
 // Action clone object
-if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes')
-{
-	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
-	{
+if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes') {
+	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	} else {
 		if ($id > 0) {
@@ -204,23 +219,22 @@ if (empty($reshook) && $action == 'confirm_clone' && $confirm == 'yes')
 }
 
 // Add event
-if (empty($reshook) && $action == 'add')
-{
+if (empty($reshook) && $action == 'add') {
 	$error = 0;
 
-	if (empty($backtopage))
-	{
-		if ($socid > 0) $backtopage = DOL_URL_ROOT.'/societe/agenda.php?socid='.$socid;
-		else $backtopage = DOL_URL_ROOT.'/comm/action/index.php';
+	if (empty($backtopage)) {
+		if ($socid > 0) {
+			$backtopage = DOL_URL_ROOT.'/societe/agenda.php?socid='.$socid;
+		} else {
+			$backtopage = DOL_URL_ROOT.'/comm/action/index.php';
+		}
 	}
 
-	if (!empty($socpeopleassigned[0]))
-	{
+	if (!empty($socpeopleassigned[0])) {
 		$result = $contact->fetch($socpeopleassigned[0]);
 	}
 
-	if ($cancel)
-	{
+	if ($cancel) {
 		header("Location: ".$backtopage);
 		exit;
 	}
@@ -232,23 +246,20 @@ if (empty($reshook) && $action == 'add')
 	$datef = dol_mktime($fulldayevent ? '23' : GETPOST("p2hour", 'int'), $fulldayevent ? '59' : GETPOST("p2min", 'int'), $fulldayevent ? '59' : GETPOST("apsec", 'int'), GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuser');
 
 	// Check parameters
-	if (!$datef && $percentage == 100)
-	{
+	if (!$datef && $percentage == 100) {
 		$error++; $donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 	}
 
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && !GETPOST('label'))
-	{
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE) && !GETPOST('label')) {
 		$error++; $donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
 	}
 
 	// Initialisation objet cactioncomm
-	if (GETPOSTISSET('actioncode') && !GETPOST('actioncode', 'aZ09'))	// actioncode is '0'
-	{
+	if (GETPOSTISSET('actioncode') && !GETPOST('actioncode', 'aZ09')) {	// actioncode is '0'
 		$error++; $donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
@@ -256,8 +267,7 @@ if (empty($reshook) && $action == 'add')
 		$object->type_code = GETPOST('actioncode', 'aZ09');
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		// Initialisation objet actioncomm
 		$object->priority = GETPOSTISSET("priority") ? GETPOST("priority", "int") : 0;
 		$object->fulldayevent = (!empty($fulldayevent) ? 1 : 0);
@@ -265,14 +275,11 @@ if (empty($reshook) && $action == 'add')
 		$object->label = GETPOST('label', 'alphanohtml');
 		$object->fk_element = GETPOST("fk_element", 'int');
 		$object->elementtype = GETPOST("elementtype", 'alpha');
-		if (!GETPOST('label'))
-		{
-			if (GETPOST('actioncode', 'aZ09') == 'AC_RDV' && $contact->getFullName($langs))
-			{
+		if (!GETPOST('label')) {
+			if (GETPOST('actioncode', 'aZ09') == 'AC_RDV' && $contact->getFullName($langs)) {
 				$object->label = $langs->transnoentitiesnoconv("TaskRDVWith", $contact->getFullName($langs));
 			} else {
-				if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
-				{
+				if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code) {
 					$object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
 				} else {
 					$cactioncomm->fetch($object->type_code);
@@ -301,13 +308,15 @@ if (empty($reshook) && $action == 'add')
 		$transparency = (GETPOST("transparency") == 'on' ? 1 : 0);
 
 		$listofuserid = array();
-		if (!empty($_SESSION['assignedtouser'])) $listofuserid = json_decode($_SESSION['assignedtouser'], true);
+		if (!empty($_SESSION['assignedtouser'])) {
+			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
+		}
 		$i = 0;
-		foreach ($listofuserid as $key => $value)
-		{
-			if ($i == 0)	// First entry
-			{
-				if ($value['id'] > 0) $object->userownerid = $value['id'];
+		foreach ($listofuserid as $key => $value) {
+			if ($i == 0) {	// First entry
+				if ($value['id'] > 0) {
+					$object->userownerid = $value['id'];
+				}
 				$object->transparency = $transparency;
 			}
 
@@ -317,17 +326,19 @@ if (empty($reshook) && $action == 'add')
 		}
 	}
 
-	if (!$error && !empty($conf->global->AGENDA_ENABLE_DONEBY))
-	{
-		if (GETPOST("doneby") > 0) $object->userdoneid = GETPOST("doneby", "int");
+	if (!$error && !empty($conf->global->AGENDA_ENABLE_DONEBY)) {
+		if (GETPOST("doneby") > 0) {
+			$object->userdoneid = GETPOST("doneby", "int");
+		}
 	}
 
 	$object->note_private = trim(GETPOST("note", "restricthtml"));
 
-	if (GETPOSTISSET("contactid")) $object->contact = $contact;
+	if (GETPOSTISSET("contactid")) {
+		$object->contact = $contact;
+	}
 
-	if (GETPOST('socid', 'int') > 0)
-	{
+	if (GETPOST('socid', 'int') > 0) {
 		$object->socid = GETPOST('socid', 'int');
 		$object->fetch_thirdparty();
 
@@ -335,51 +346,45 @@ if (empty($reshook) && $action == 'add')
 	}
 
 	// Check parameters
-	if (empty($object->userownerid) && empty($_SESSION['assignedtouser']))
-	{
+	if (empty($object->userownerid) && empty($_SESSION['assignedtouser'])) {
 		$error++; $donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ActionsOwnedBy")), null, 'errors');
 	}
-	if ($object->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent))))
-	{
+	if ($object->type_code == 'AC_RDV' && ($datep == '' || ($datef == '' && empty($fulldayevent)))) {
 		$error++; $donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 	}
 
-	if (!GETPOST('apyear') && !GETPOST('adyear'))
-	{
+	if (!GETPOST('apyear') && !GETPOST('adyear')) {
 		$error++; $donotclearsession = 1;
 		$action = 'create';
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 	}
 
-	foreach ($socpeopleassigned as $cid)
-	{
+	foreach ($socpeopleassigned as $cid) {
 		$object->socpeopleassigned[$cid] = array('id' => $cid);
 	}
-	if (!empty($object->socpeopleassigned))
-	{
+	if (!empty($object->socpeopleassigned)) {
 		reset($object->socpeopleassigned);
 		$object->contact_id = key($object->socpeopleassigned);
 	}
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
-	if ($ret < 0) $error++;
+	if ($ret < 0) {
+		$error++;
+	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->begin();
 
 		// Creation of action/event
 		$idaction = $object->create($user);
 
-		if ($idaction > 0)
-		{
-			if (!$object->error)
-			{
+		if ($idaction > 0) {
+			if (!$object->error) {
 				// Category association
 				$categories = GETPOST('categories', 'array');
 				$object->setCategories($categories);
@@ -387,7 +392,9 @@ if (empty($reshook) && $action == 'add')
 				unset($_SESSION['assignedtouser']);
 
 				$moreparam = '';
-				if ($user->id != $object->userownerid) $moreparam = "filtert=-1"; // We force to remove filter so created record is visible when going back to per user view.
+				if ($user->id != $object->userownerid) {
+					$moreparam = "filtert=-1"; // We force to remove filter so created record is visible when going back to per user view.
+				}
 
 				// Create reminders
 				if ($addreminder == 'on') {
@@ -401,11 +408,12 @@ if (empty($reshook) && $action == 'add')
 					$actionCommReminder->offsetvalue = $offsetvalue;
 					$actionCommReminder->status = $actionCommReminder::STATUS_TODO;
 					$actionCommReminder->fk_actioncomm = $object->id;
-					if ($remindertype == 'email') $actionCommReminder->fk_email_template = $modelmail;
+					if ($remindertype == 'email') {
+						$actionCommReminder->fk_email_template = $modelmail;
+					}
 
 					// the notification must be created for every user assigned to the event
-					foreach ($object->userassigned as $userassigned)
-					{
+					foreach ($object->userassigned as $userassigned) {
 						$actionCommReminder->fk_user = $userassigned['id'];
 						$res = $actionCommReminder->create($user);
 
@@ -427,12 +435,10 @@ if (empty($reshook) && $action == 'add')
 					$db->commit();
 				}
 
-				if (!empty($backtopage))
-				{
+				if (!empty($backtopage)) {
 					dol_syslog("Back to ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
 					header("Location: ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
-				} elseif ($idaction)
-				{
+				} elseif ($idaction) {
 					header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.($moreparam ? '&'.$moreparam : ''));
 				} else {
 					header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam ? '?'.$moreparam : ''));
@@ -457,10 +463,8 @@ if (empty($reshook) && $action == 'add')
 /*
  * Action update event
  */
-if (empty($reshook) && $action == 'update')
-{
-	if (empty($cancel))
-	{
+if (empty($reshook) && $action == 'update') {
+	if (empty($cancel)) {
 		$fulldayevent = GETPOST('fullday');
 		$aphour = GETPOST('aphour', 'int');
 		$apmin = GETPOST('apmin', 'int');
@@ -469,10 +473,18 @@ if (empty($reshook) && $action == 'update')
 		$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
 		// Clean parameters
-		if ($aphour == -1) $aphour = '0';
-		if ($apmin == -1) $apmin = '0';
-		if ($p2hour == -1) $p2hour = '0';
-		if ($p2min == -1) $p2min = '0';
+		if ($aphour == -1) {
+			$aphour = '0';
+		}
+		if ($apmin == -1) {
+			$apmin = '0';
+		}
+		if ($p2hour == -1) {
+			$p2hour = '0';
+		}
+		if ($p2min == -1) {
+			$p2min = '0';
+		}
 
 		$object->fetch($id);
 		$object->fetch_optionals();
@@ -493,7 +505,9 @@ if (empty($reshook) && $action == 'update')
 		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
 		$object->socpeopleassigned = array();
-		foreach ($socpeopleassigned as $cid) $object->socpeopleassigned[$cid] = array('id' => $cid);
+		foreach ($socpeopleassigned as $cid) {
+			$object->socpeopleassigned[$cid] = array('id' => $cid);
+		}
 		$object->contact_id = GETPOST("contactid", 'int');
 		if (empty($object->contact_id) && !empty($object->socpeopleassigned)) {
 			reset($object->socpeopleassigned);
@@ -503,8 +517,7 @@ if (empty($reshook) && $action == 'update')
 		$object->note_private = trim(GETPOST("note", "restricthtml"));
 		$object->fk_element	 = GETPOST("fk_element", "int");
 		$object->elementtype = GETPOST("elementtype", "alphanohtml");
-		if (!$datef && $percentage == 100)
-		{
+		if (!$datef && $percentage == 100) {
 			$error++; $donotclearsession = 1;
 			setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), $object->errors, 'errors');
 			$action = 'edit';
@@ -514,23 +527,26 @@ if (empty($reshook) && $action == 'update')
 
 		// Users
 		$listofuserid = array();
-		if (!empty($_SESSION['assignedtouser']))	// Now concat assigned users
-		{
+		if (!empty($_SESSION['assignedtouser'])) {	// Now concat assigned users
 			// Restore array with key with same value than param 'id'
 			$tmplist1 = json_decode($_SESSION['assignedtouser'], true);
-			foreach ($tmplist1 as $key => $val)
-			{
-				if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']] = $val;
+			foreach ($tmplist1 as $key => $val) {
+				if ($val['id'] > 0 && $val['id'] != $assignedtouser) {
+					$listofuserid[$val['id']] = $val;
+				}
 			}
 		} else {
 			$assignedtouser = (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : 0);
-			if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>($user->id == $assignedtouser ? $transparency : '')); // Owner first
+			if ($assignedtouser) {
+				$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>($user->id == $assignedtouser ? $transparency : '')); // Owner first
+			}
 		}
 		$object->userassigned = array(); $object->userownerid = 0; // Clear old content
 		$i = 0;
-		foreach ($listofuserid as $key => $val)
-		{
-			if ($i == 0) $object->userownerid = $val['id'];
+		foreach ($listofuserid as $key => $val) {
+			if ($i == 0) {
+				$object->userownerid = $val['id'];
+			}
 			$object->userassigned[$val['id']] = array('id'=>$val['id'], 'mandatory'=>0, 'transparency'=>($user->id == $val['id'] ? $transparency : ''));
 			$i++;
 		}
@@ -538,22 +554,21 @@ if (empty($reshook) && $action == 'update')
 		$object->transparency = $transparency; // We set transparency on event (even if we can also store it on each user, standard says this property is for event)
 		// TODO store also transparency on owner user
 
-		if (!empty($conf->global->AGENDA_ENABLE_DONEBY))
-		{
-			if (GETPOST("doneby")) $object->userdoneid = GETPOST("doneby", "int");
+		if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) {
+			if (GETPOST("doneby")) {
+				$object->userdoneid = GETPOST("doneby", "int");
+			}
 		}
 
 		// Check parameters
-		if (GETPOSTISSET('actioncode') && !GETPOST('actioncode', 'aZ09'))	// actioncode is '0'
-		{
+		if (GETPOSTISSET('actioncode') && !GETPOST('actioncode', 'aZ09')) {	// actioncode is '0'
 			$error++; $donotclearsession = 1;
 			$action = 'edit';
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 		} else {
 			$result = $cactioncomm->fetch(GETPOST('actioncode', 'aZ09'));
 		}
-		if (empty($object->userownerid))
-		{
+		if (empty($object->userownerid)) {
 			$error++; $donotclearsession = 1;
 			$action = 'edit';
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ActionsOwnedBy")), null, 'errors');
@@ -561,7 +576,9 @@ if (empty($reshook) && $action == 'update')
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
 		if (!$error) {
 			// check if an event resource is already in use
@@ -622,23 +639,19 @@ if (empty($reshook) && $action == 'update')
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			$result = $object->update($user);
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Category association
 				$categories = GETPOST('categories', 'array');
 				$object->setCategories($categories);
 
 				$object->loadReminders();
-				if (!empty($object->reminders) && $object->datep > dol_now())
-				{
-					foreach ($object->reminders as $reminder)
-					{
+				if (!empty($object->reminders) && $object->datep > dol_now()) {
+					foreach ($object->reminders as $reminder) {
 						$reminder->delete($user);
 					}
 					$object->reminders = array();
@@ -656,11 +669,12 @@ if (empty($reshook) && $action == 'update')
 					$actionCommReminder->offsetvalue = $offsetvalue;
 					$actionCommReminder->status = $actionCommReminder::STATUS_TODO;
 					$actionCommReminder->fk_actioncomm = $object->id;
-					if ($remindertype == 'email') $actionCommReminder->fk_email_template = $modelmail;
+					if ($remindertype == 'email') {
+						$actionCommReminder->fk_email_template = $modelmail;
+					}
 
 					// the notification must be created for every user assigned to the event
-					foreach ($object->userassigned as $userassigned)
-					{
+					foreach ($object->userassigned as $userassigned) {
 						$actionCommReminder->fk_user = $userassigned['id'];
 						$res = $actionCommReminder->create($user);
 
@@ -677,8 +691,11 @@ if (empty($reshook) && $action == 'update')
 
 				unset($_SESSION['assignedtouser']);
 
-				if (!$error) $db->commit();
-				else $db->rollback();
+				if (!$error) {
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$db->rollback();
@@ -686,10 +703,8 @@ if (empty($reshook) && $action == 'update')
 		}
 	}
 
-	if (!$error)
-	{
-		if (!empty($backtopage))
-		{
+	if (!$error) {
+		if (!empty($backtopage)) {
 			unset($_SESSION['assignedtouser']);
 			header("Location: ".$backtopage);
 			exit;
@@ -700,20 +715,17 @@ if (empty($reshook) && $action == 'update')
 /*
  * delete event
  */
-if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes')
-{
+if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes') {
 	$object->fetch($id);
 	$object->fetch_optionals();
 	$object->fetch_userassigned();
 	$object->oldcopy = clone $object;
 
 	if ($user->rights->agenda->myactions->delete
-		|| $user->rights->agenda->allactions->delete)
-	{
+		|| $user->rights->agenda->allactions->delete) {
 		$result = $object->delete();
 
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			header("Location: index.php");
 			exit;
 		} else {
@@ -726,16 +738,14 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes
  * Action move update, used when user move an event in calendar by drag'n drop
  * TODO Move this into page comm/action/index that trigger this call by the drag and drop of event.
  */
-if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate')
-{
+if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
 	$error = 0;
 
 	$shour = dol_print_date($object->datep, "%H", 'tzuserrel');		// We take the date visible by user $newdate is also date visible by user.
 	$smin = dol_print_date($object->datep, "%M", 'tzuserrel');
 
 	$newdate = GETPOST('newdate', 'alpha');
-	if (empty($newdate) || strpos($newdate, 'dayevent_') != 0)
-	{
+	if (empty($newdate) || strpos($newdate, 'dayevent_') != 0) {
 		header("Location: ".$backtopage);
 		exit;
 	}
@@ -743,10 +753,8 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate')
 	$datep = dol_mktime($shour, $smin, 0, substr($newdate, 13, 2), substr($newdate, 15, 2), substr($newdate, 9, 4), 'tzuserrel');
 	//print dol_print_date($datep, 'dayhour');exit;
 
-	if ($datep != $object->datep)
-	{
-		if (!empty($object->datef))
-		{
+	if ($datep != $object->datep) {
+		if (!empty($object->datef)) {
 			$object->datef += $datep - $object->datep;
 		}
 		$object->datep = $datep;
@@ -822,8 +830,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate')
 			}
 		}
 	}
-	if (!empty($backtopage))
-	{
+	if (!empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	} else {
@@ -857,21 +864,20 @@ $arrayrecurrulefreq = array(
 $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('', $langs->trans("Agenda"), $help_url);
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$contact = new Contact($db);
 
 	$socpeopleassigned = GETPOST("socpeopleassigned", 'array');
-	if (!empty($socpeopleassigned[0]))
-	{
+	if (!empty($socpeopleassigned[0])) {
 		$result = $contact->fetch($socpeopleassigned[0]);
-		if ($result < 0) dol_print_error($db, $contact->error);
+		if ($result < 0) {
+			dol_print_error($db, $contact->error);
+		}
 	}
 
 	dol_set_focus("#label");
 
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		print "\n".'<script type="text/javascript">';
 		print '$(document).ready(function () {
         			function setdatefields()
@@ -930,19 +936,25 @@ if ($action == 'create')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="donotclearsession" value="1">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">';
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">';
+	}
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+		print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';
+	}
 
-	if (GETPOST("actioncode", 'aZ09') == 'AC_RDV') print load_fiche_titre($langs->trans("AddActionRendezVous"), '', 'title_agenda');
-	else print load_fiche_titre($langs->trans("AddAnAction"), '', 'title_agenda');
+	if (GETPOST("actioncode", 'aZ09') == 'AC_RDV') {
+		print load_fiche_titre($langs->trans("AddActionRendezVous"), '', 'title_agenda');
+	} else {
+		print load_fiche_titre($langs->trans("AddAnAction"), '', 'title_agenda');
+	}
 
 	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">';
 
 	// Type of event
-	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	{
+	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 		print '<tr><td class="titlefieldcreate"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
 		$default = (empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT) ? 'AC_RDV' : $conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT);
 		$formactions->select_type_actions(GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default), "actioncode", "systemauto", 0, -1);
@@ -956,11 +968,14 @@ if ($action == 'create')
 	print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
 
 	$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
-	if (GETPOST('datep', 'int', 1)) $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
+	if (GETPOST('datep', 'int', 1)) {
+		$datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
+	}
 	$datef = ($datef ? $datef : $object->datef);
-	if (GETPOST('datef', 'int', 1)) $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
-	if (empty($datef) && !empty($datep))
-	{
+	if (GETPOST('datef', 'int', 1)) {
+		$datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
+	}
+	if (empty($datef) && !empty($datep)) {
 		if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)) {
 			$datef = dol_time_plus_duree($datep, (empty($conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS) ? 1 : $conf->global->AGENDA_AUTOSET_END_DATE_WITH_DELTA_HOURS), 'h');
 		}
@@ -992,25 +1007,30 @@ if ($action == 'create')
 	print '</td>';
 	print '<td>';
 	if (GETPOST("afaire") == 1) {
-        print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend');
-    } else {
-        print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend');
-    }
+		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend');
+	} else {
+		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend');
+	}
 	print '</td></tr>';*/
 
 	// Dev in progress
 	$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
-	if ($userepeatevent)
-	{
+	if ($userepeatevent) {
 		// Repeat
 		print '<tr><td></td><td colspan="3">';
 		print '<input type="hidden" name="recurid" value="'.$object->recurid.'">';
 		$selectedrecurrulefreq = 'no';
 		$selectedrecurrulebymonthday = '';
 		$selectedrecurrulebyday = '';
-		if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) $selectedrecurrulefreq = $reg[1];
-		if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i', $object->recurrule, $reg)) $selectedrecurrulebymonthday = $reg[1];
-		if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) $selectedrecurrulebyday = $reg[1];
+		if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) {
+			$selectedrecurrulefreq = $reg[1];
+		}
+		if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i', $object->recurrule, $reg)) {
+			$selectedrecurrulebymonthday = $reg[1];
+		}
+		if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) {
+			$selectedrecurrulebyday = $reg[1];
+		}
 		print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly');
 		// If recurrulefreq is MONTHLY
 		print '<div class="hidden marginrightonly inline-block repeateventBYMONTHDAY">';
@@ -1053,18 +1073,22 @@ if ($action == 'create')
 	print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
 	print '<td>';
 	$percent = -1;
-	if (GETPOSTISSET('status')) $percent = GETPOST('status');
-	elseif (GETPOSTISSET('percentage')) $percent = GETPOST('percentage');
-	else {
-		if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) $percent = '0';
-		elseif (GETPOST('complete') == 100 || GETPOST("afaire") == 2) $percent = 100;
+	if (GETPOSTISSET('status')) {
+		$percent = GETPOST('status');
+	} elseif (GETPOSTISSET('percentage')) {
+		$percent = GETPOST('percentage');
+	} else {
+		if (GETPOST('complete') == '0' || GETPOST("afaire") == 1) {
+			$percent = '0';
+		} elseif (GETPOST('complete') == 100 || GETPOST("afaire") == 2) {
+			$percent = 100;
+		}
 	}
 	$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
 	print '</td></tr>';
 
 	// Location
-	if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-	{
+	if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
 		print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
 	}
 
@@ -1074,20 +1098,22 @@ if ($action == 'create')
 	$listofcontactid = array();
 	$listofotherid = array();
 
-	if (empty($donotclearsession))
-	{
+	if (empty($donotclearsession)) {
 		$assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
-		if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
+		if ($assignedtouser) {
+			$listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
+		}
 		//$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init
 		$listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
 	} else {
-		if (!empty($_SESSION['assignedtouser']))
-		{
+		if (!empty($_SESSION['assignedtouser'])) {
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
 		}
 		$firstelem = reset($listofuserid);
-		if (isset($listofuserid[$firstelem['id']])) $listofuserid[$firstelem['id']]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 0); // 0 by default when refreshing
+		if (isset($listofuserid[$firstelem['id']])) {
+			$listofuserid[$firstelem['id']]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 0); // 0 by default when refreshing
+		}
 	}
 	print '<div class="assignedtouser">';
 	print $form->select_dolusers_forevent(($action == 'create' ? 'add' : 'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0', 1, $listofuserid, $listofcontactid, $listofotherid);
@@ -1095,8 +1121,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Done by
-	if (!empty($conf->global->AGENDA_ENABLE_DONEBY))
-	{
+	if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) {
 		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
 		print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOST("doneby", 'int') : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
 		print '</td></tr>';
@@ -1118,8 +1143,7 @@ if ($action == 'create')
 
 	print '<table class="border centpercent">';
 
-	if ($conf->societe->enabled)
-	{
+	if ($conf->societe->enabled) {
 		// Related company
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ActionOnCompany").'</td><td>';
 		if (GETPOST('socid', 'int') > 0) {
@@ -1142,15 +1166,16 @@ if ($action == 'create')
 		// Related contact
 		print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
 		$preselectedids = GETPOST('socpeopleassigned', 'array');
-		if (GETPOST('contactid', 'int')) $preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
+		if (GETPOST('contactid', 'int')) {
+			$preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
+		}
 		print img_picto('', 'contact', 'class="paddingrightonly"');
 		print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
 		print '</td></tr>';
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 
 		$projectid = GETPOST('projectid', 'int');
@@ -1182,15 +1207,16 @@ if ($action == 'create')
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Task").'</td><td id="project-task-input-container" >';
 		print img_picto('', 'projecttask', 'class="paddingrightonly"');
 		$projectsListId = false;
-		if (!empty($projectid)) { $projectsListId = $projectid; }
+		if (!empty($projectid)) {
+			$projectsListId = $projectid;
+		}
 		$tid = GETPOST("projecttaskid") ? GETPOST("projecttaskid") : '';
 		$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $tid, 'taskid', 24, 0, '1', 1, 0, 0, 'maxwidth500', $projectsListId);
 		print '</td></tr>';
 	}
 
 	// Object linked
-	if (!empty($origin) && !empty($originid))
-	{
+	if (!empty($origin) && !empty($originid)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("LinkedObject").'</td>';
 		print '<td colspan="3">'.dolGetElementUrl($originid, $origin, 1).'</td></tr>';
@@ -1201,8 +1227,7 @@ if ($action == 'create')
 	}
 
 	$reg = array();
-	if (GETPOST("datep") && preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/', GETPOST("datep"), $reg))
-	{
+	if (GETPOST("datep") && preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])$/', GETPOST("datep"), $reg)) {
 		$object->datep = dol_mktime(0, 0, 0, $reg[2], $reg[3], $reg[1]);
 	}
 
@@ -1224,16 +1249,14 @@ if ($action == 'create')
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	print '</table>';
 
 
-	if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
-	{
+	if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER) {
 		//checkbox create reminder
 		print '<hr>';
 		print '<br>';
@@ -1304,11 +1327,9 @@ if ($action == 'create')
 }
 
 // View or edit
-if ($id > 0)
-{
+if ($id > 0) {
 	$result1 = $object->fetch($id);
-	if ($result1 <= 0)
-	{
+	if ($result1 <= 0) {
 		$langs->load("errors");
 		print $langs->trans("ErrorRecordNotFound");
 
@@ -1322,8 +1343,7 @@ if ($id > 0)
 	$result4 = $object->fetch_userassigned();
 	$result5 = $object->fetch_optionals();
 
-	if ($listUserAssignedUpdated || $donotclearsession)
-	{
+	if ($listUserAssignedUpdated || $donotclearsession) {
 		$percentage = in_array(GETPOST('status'), array(-1, 100)) ?GETPOST('status') : (in_array(GETPOST('complete'), array(-1, 100)) ?GETPOST('complete') : GETPOST("percentage")); // If status is -1 or 100, percentage is not defined and we must use status
 
 		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
@@ -1339,21 +1359,26 @@ if ($id > 0)
 		$object->location    = GETPOST('location', "alpanohtml");
 		$object->socid       = GETPOST("socid", "int");
 		$socpeopleassigned   = GETPOST("socpeopleassigned", 'array');
-		foreach ($socpeopleassigned as $tmpid) $object->socpeopleassigned[$id] = array('id' => $tmpid);
+		foreach ($socpeopleassigned as $tmpid) {
+			$object->socpeopleassigned[$id] = array('id' => $tmpid);
+		}
 		$object->contact_id   = GETPOST("contactid", 'int');
 		$object->fk_project  = GETPOST("projectid", 'int');
 
 		$object->note_private = GETPOST("note", 'restricthtml');
 	}
 
-	if ($result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
-	{
+	if ($result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0) {
 		dol_print_error($db, $object->error);
 		exit;
 	}
 
-	if ($object->authorid > 0) { $tmpuser = new User($db); $res = $tmpuser->fetch($object->authorid); $object->author = $tmpuser; }
-	if ($object->usermodid > 0) { $tmpuser = new User($db); $res = $tmpuser->fetch($object->usermodid); $object->usermod = $tmpuser; }
+	if ($object->authorid > 0) {
+		$tmpuser = new User($db); $res = $tmpuser->fetch($object->authorid); $object->author = $tmpuser;
+	}
+	if ($object->usermodid > 0) {
+		$tmpuser = new User($db); $res = $tmpuser->fetch($object->usermodid); $object->usermod = $tmpuser;
+	}
 
 
 	/*
@@ -1367,15 +1392,12 @@ if ($id > 0)
 
 
 	// Confirmation suppression action
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		print $form->formconfirm("card.php?id=".$id, $langs->trans("DeleteAction"), $langs->trans("ConfirmDeleteAction"), "confirm_delete", '', '', 1);
 	}
 
-	if ($action == 'edit')
-	{
-		if (!empty($conf->use_javascript_ajax))
-		{
+	if ($action == 'edit') {
+		if (!empty($conf->use_javascript_ajax)) {
 			print "\n".'<script type="text/javascript">';
 			print '$(document).ready(function () {
 	            		function setdatefields()
@@ -1405,8 +1427,12 @@ if ($id > 0)
 		print '<input type="hidden" name="action" value="update">';
 		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="ref_ext" value="'.$object->ref_ext.'">';
-		if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">';
-		if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
+		if ($backtopage) {
+			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : htmlentities($_SERVER["HTTP_REFERER"])).'">';
+		}
+		if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+			print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
+		}
 
 		print dol_get_fiche_head($head, 'card', $langs->trans("Action"), 0, 'action');
 
@@ -1416,11 +1442,9 @@ if ($id > 0)
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td colspan="3">'.$object->id.'</td></tr>';
 
 		// Type of event
-		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
+		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 			print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
-			if ($object->type_code != 'AC_OTH_AUTO')
-			{
+			if ($object->type_code != 'AC_OTH_AUTO') {
 				print $formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ? GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto", 0, 0, 0, 1);
 			} else {
 				print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
@@ -1457,17 +1481,22 @@ if ($id > 0)
 
 		// Dev in progress
 		$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
-		if ($userepeatevent)
-		{
+		if ($userepeatevent) {
 			// Repeat
 			print '<tr><td></td><td colspan="3">';
 			print '<input type="hidden" name="recurid" value="'.$object->recurid.'">';
 			$selectedrecurrulefreq = 'no';
 			$selectedrecurrulebymonthday = '';
 			$selectedrecurrulebyday = '';
-			if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) $selectedrecurrulefreq = $reg[1];
-			if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i', $object->recurrule, $reg)) $selectedrecurrulebymonthday = $reg[1];
-			if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) $selectedrecurrulebyday = $reg[1];
+			if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) {
+				$selectedrecurrulefreq = $reg[1];
+			}
+			if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i', $object->recurrule, $reg)) {
+				$selectedrecurrulebymonthday = $reg[1];
+			}
+			if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) {
+				$selectedrecurrulebyday = $reg[1];
+			}
 			print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly');
 			// If recurrulefreq is MONTHLY
 			print '<div class="hidden marginrightonly inline-block repeateventBYMONTHDAY">';
@@ -1513,17 +1542,14 @@ if ($id > 0)
 		print '</td></tr>';
 
 		// Location
-		if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-		{
+		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
 			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="width500" value="'.$object->location.'"></td></tr>';
 		}
 
 		// Assigned to
 		$listofuserid = array(); // User assigned
-		if (empty($donotclearsession))
-		{
-			if ($object->userownerid > 0)
-			{
+		if (empty($donotclearsession)) {
+			if ($object->userownerid > 0) {
 				$listofuserid[$object->userownerid] = array(
 					'id'=>$object->userownerid,
 					'type'=>'user',
@@ -1533,22 +1559,18 @@ if ($id > 0)
 					'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
 				);
 			}
-			if (!empty($object->userassigned))	// Now concat assigned users
-			{
+			if (!empty($object->userassigned)) {	// Now concat assigned users
 				// Restore array with key with same value than param 'id'
 				$tmplist1 = $object->userassigned;
-				foreach ($tmplist1 as $key => $val)
-				{
-					if ($val['id'] && $val['id'] != $object->userownerid)
-					{
+				foreach ($tmplist1 as $key => $val) {
+					if ($val['id'] && $val['id'] != $object->userownerid) {
 						$listofuserid[$val['id']] = $val;
 					}
 				}
 			}
 			$_SESSION['assignedtouser'] = json_encode($listofuserid);
 		} else {
-			if (!empty($_SESSION['assignedtouser']))
-			{
+			if (!empty($_SESSION['assignedtouser'])) {
 				$listofuserid = json_decode($_SESSION['assignedtouser'], true);
 			}
 		}
@@ -1568,8 +1590,7 @@ if ($id > 0)
 		print '</td></tr>';
 
 		// Realised by
-		if (!empty($conf->global->AGENDA_ENABLE_DONEBY))
-		{
+		if (!empty($conf->global->AGENDA_ENABLE_DONEBY)) {
 			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td colspan="3">';
 			print $form->select_dolusers($object->userdoneid > 0 ? $object->userdoneid : -1, 'doneby', 1);
 			print '</td></tr>';
@@ -1596,8 +1617,7 @@ if ($id > 0)
 
 		print '<table class="border tableforfield centpercent">';
 
-		if ($conf->societe->enabled)
-		{
+		if ($conf->societe->enabled) {
 			// Related company
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("ActionOnCompany").'</td>';
 			print '<td>';
@@ -1620,15 +1640,13 @@ if ($id > 0)
 		}
 
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td>';
 			print img_picto('', 'project', 'class="paddingrightonly"');
 			$numprojet = $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $object->fk_project, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500');
-			if ($numprojet == 0)
-			{
+			if ($numprojet == 0) {
 				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$object->socid.'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 			}
 			print '</td></tr>';
@@ -1642,14 +1660,12 @@ if ($id > 0)
 		}
 
 		// Object linked
-		if (!empty($object->fk_element) && !empty($object->elementtype))
-		{
+		if (!empty($object->fk_element) && !empty($object->elementtype)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			print '<tr>';
 			print '<td>'.$langs->trans("LinkedObject").'</td>';
 
-			if ($object->elementtype == 'task' && !empty($conf->projet->enabled))
-			{
+			if ($object->elementtype == 'task' && !empty($conf->projet->enabled)) {
 				print '<td id="project-task-input-container" >';
 
 				$urloption = '?action=create&donotclearsession=1'; // we use create not edit for more flexibility
@@ -1695,18 +1711,18 @@ if ($id > 0)
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
 		print '</table>';
 
 		// Reminders
-		if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
-		{
+		if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER) {
 			$filteruserid = $user->id;
-			if ($user->rights->agenda->allactions->read) $filteruserid = 0;
+			if ($user->rights->agenda->allactions->read) {
+				$filteruserid = 0;
+			}
 			$object->loadReminders('', $filteruserid, false);
 
 			print '<hr>';
@@ -1745,7 +1761,9 @@ if ($id > 0)
 			print '</td></tr>';
 
 			$hide = '';
-			if ($actionCommReminder->typeremind == 'browser') $hide = 'style="display:none;"';
+			if ($actionCommReminder->typeremind == 'browser') {
+				$hide = 'style="display:none;"';
+			}
 
 			// Mail Model
 			print '<tr '.$hide.'><td class="titlefieldcreate nowrap">'.$langs->trans("EMailTemplates").'</td><td colspan="3">';
@@ -1792,8 +1810,7 @@ if ($id > 0)
 		print dol_get_fiche_head($head, 'card', $langs->trans("Action"), -1, 'action');
 
 		// Clone event
-		if ($action == 'clone')
-		{
+		if ($action == 'clone') {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.GETPOST('id'), $langs->trans('ToClone'), $langs->trans('ConfirmCloneEvent', $object->label), 'confirm_clone', $formquestion, 'yes', 1);
 
 			print $formconfirm;
@@ -1826,14 +1843,12 @@ if ($id > 0)
 		// Thirdparty
 		//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 			$morehtmlref .= $langs->trans('Project').' ';
 			if ($user->rights->agenda->allactions->create ||
-		   		(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
-			{
+				(($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
@@ -1855,7 +1870,9 @@ if ($id > 0)
 					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
 					$morehtmlref .= $proj->ref;
 					$morehtmlref .= '</a>';
-					if ($proj->title) $morehtmlref .= ' - '.$proj->title;
+					if ($proj->title) {
+						$morehtmlref .= ' - '.$proj->title;
+					}
 				} else {
 					$morehtmlref .= '';
 				}
@@ -1875,8 +1892,7 @@ if ($id > 0)
 		print '<table class="border tableforfield" width="100%">';
 
 		// Type
-		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
+		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 			print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td>';
 			print $object->getTypePicto();
 			print $langs->trans($object->type).'</td></tr>';
@@ -1886,36 +1902,45 @@ if ($id > 0)
 		print '<tr><td class="titlefield">'.$langs->trans("EventOnFullDay").'</td><td>'.yn($object->fulldayevent, 3).'</td></tr>';
 
 		$rowspan = 4;
-		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) $rowspan++;
+		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
+			$rowspan++;
+		}
 
 		// Date start
 		print '<tr><td>'.$langs->trans("DateActionStart").'</td><td>';
-		if (!$object->fulldayevent) print dol_print_date($object->datep, 'dayhour', 'tzuser');
-		else print dol_print_date($object->datep, 'day', 'tzuser');
-		if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
+		if (!$object->fulldayevent) {
+			print dol_print_date($object->datep, 'dayhour', 'tzuser');
+		} else {
+			print dol_print_date($object->datep, 'day', 'tzuser');
+		}
+		if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) {
+			print img_warning($langs->trans("Late"));
+		}
 		print '</td>';
 		print '</tr>';
 
 		// Date end
 		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td>';
-		if (!$object->fulldayevent) print dol_print_date($object->datef, 'dayhour', 'tzuser');
-		else print dol_print_date($object->datef, 'day', 'tzuser');
-		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
+		if (!$object->fulldayevent) {
+			print dol_print_date($object->datef, 'dayhour', 'tzuser');
+		} else {
+			print dol_print_date($object->datef, 'day', 'tzuser');
+		}
+		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now - $delay_warning)) {
+			print img_warning($langs->trans("Late"));
+		}
 		print '</td></tr>';
 
 		// Location
-		if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-		{
+		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
 			print '<tr><td>'.$langs->trans("Location").'</td><td>'.$object->location.'</td></tr>';
 		}
 
 		// Assigned to
 		print '<tr><td class="nowrap">'.$langs->trans("ActionAssignedTo").'</td><td>';
 		$listofuserid = array();
-		if (empty($donotclearsession))
-		{
-			if ($object->userownerid > 0)
-			{
+		if (empty($donotclearsession)) {
+			if ($object->userownerid > 0) {
 				$listofuserid[$object->userownerid] = array(
 					'id'=>$object->userownerid,
 					'transparency'=>$object->transparency, // Force transparency on onwer from preoperty of event
@@ -1923,19 +1948,18 @@ if ($id > 0)
 					'mandatory'=>$object->userassigned[$object->userownerid]['mandatory']
 				);
 			}
-			if (!empty($object->userassigned))	// Now concat assigned users
-			{
+			if (!empty($object->userassigned)) {	// Now concat assigned users
 				// Restore array with key with same value than param 'id'
 				$tmplist1 = $object->userassigned;
-				foreach ($tmplist1 as $key => $val)
-				{
-					if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']] = $val;
+				foreach ($tmplist1 as $key => $val) {
+					if ($val['id'] && $val['id'] != $object->userownerid) {
+						$listofuserid[$val['id']] = $val;
+					}
 				}
 			}
 			$_SESSION['assignedtouser'] = json_encode($listofuserid);
 		} else {
-			if (!empty($_SESSION['assignedtouser']))
-			{
+			if (!empty($_SESSION['assignedtouser'])) {
 				$listofuserid = json_decode($_SESSION['assignedtouser'], true);
 			}
 		}
@@ -1956,11 +1980,9 @@ if ($id > 0)
 		print '	</td></tr>';
 
 		// Done by
-		if ($conf->global->AGENDA_ENABLE_DONEBY)
-		{
+		if ($conf->global->AGENDA_ENABLE_DONEBY) {
 			print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
-			if ($object->userdoneid > 0)
-			{
+			if ($object->userdoneid > 0) {
 				$tmpuser = new User($db);
 				$tmpuser->fetch($object->userdoneid);
 				print $tmpuser->getNomUrl(1);
@@ -1984,14 +2006,11 @@ if ($id > 0)
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield centpercent">';
 
-		if ($conf->societe->enabled)
-		{
+		if ($conf->societe->enabled) {
 			// Related company
 			print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id ? $object->thirdparty->getNomUrl(1) : ('<span class="opacitymedium">'.$langs->trans("None").'</span>'));
-			if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL')
-			{
-				if ($object->thirdparty->fetch($object->thirdparty->id))
-				{
+			if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL') {
+				if ($object->thirdparty->fetch($object->thirdparty->id)) {
 					print "<br>".dol_print_phone($object->thirdparty->phone);
 				}
 			}
@@ -2001,21 +2020,21 @@ if ($id > 0)
 			print '<tr><td>'.$langs->trans("ActionOnContact").'</td>';
 			print '<td>';
 
-			if (!empty($object->socpeopleassigned))
-			{
-				foreach ($object->socpeopleassigned as $cid => $Tab)
-				{
+			if (!empty($object->socpeopleassigned)) {
+				foreach ($object->socpeopleassigned as $cid => $Tab) {
 					$contact = new Contact($db);
 					$result = $contact->fetch($cid);
 
-					if ($result < 0) dol_print_error($db, $contact->error);
+					if ($result < 0) {
+						dol_print_error($db, $contact->error);
+					}
 
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						print $contact->getNomUrl(1);
-						if ($object->type_code == 'AC_TEL')
-						{
-							if (!empty($contact->phone_pro)) print '('.dol_print_phone($contact->phone_pro).')';
+						if ($object->type_code == 'AC_TEL') {
+							if (!empty($contact->phone_pro)) {
+								print '('.dol_print_phone($contact->phone_pro).')';
+							}
 						}
 						print '<div class="paddingright"></div>';
 					}
@@ -2033,14 +2052,16 @@ if ($id > 0)
 
 		// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
 		// for such objects because there is already a dedicated field into table llx_actioncomm.
-		if (!empty($object->fk_element) && !empty($object->elementtype) && !in_array($object->elementtype, array('societe', 'contact', 'project')))
-		{
+		if (!empty($object->fk_element) && !empty($object->elementtype) && !in_array($object->elementtype, array('societe', 'contact', 'project'))) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			print '<tr><td>'.$langs->trans("LinkedObject").'</td>';
 			$link = dolGetElementUrl($object->fk_element, $object->elementtype, 1);
 			print '<td>';
-			if (empty($link)) print '<span class="opacitymedium">'.$langs->trans("ObjectDeleted").'</span>';
-			else print $link;
+			if (empty($link)) {
+				print '<span class="opacitymedium">'.$langs->trans("ObjectDeleted").'</span>';
+			} else {
+				print $link;
+			}
 			print '</td></tr>';
 		}
 
@@ -2053,10 +2074,11 @@ if ($id > 0)
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		// Reminders
-		if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER)
-		{
+		if ($conf->global->AGENDA_REMINDER_EMAIL || $conf->global->AGENDA_REMINDER_BROWSER) {
 			$filtreuserid = $user->id;
-			if ($user->rights->agenda->allactions->read) $filtreuserid = 0;
+			if ($user->rights->agenda->allactions->read) {
+				$filtreuserid = 0;
+			}
 			$object->loadReminders('', $filteruserid, false);
 
 			print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("Reminders").'</td><td>';
@@ -2105,29 +2127,24 @@ if ($id > 0)
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook))
-	{
-		if ($action != 'edit')
-		{
+	if (empty($reshook)) {
+		if ($action != 'edit') {
 			if ($user->rights->agenda->allactions->create ||
-			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
-			{
+			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=edit&id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';
 			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Modify").'</a></div>';
 			}
 
 			if ($user->rights->agenda->allactions->create ||
-			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create))
-			{
+			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="card.php?action=clone&object='.$object->element.'&id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';
 			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("ToClone").'</a></div>';
 			}
 
 			if ($user->rights->agenda->allactions->delete ||
-			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->delete))
-			{
+			   (($object->authorid == $user->id || $object->userownerid == $user->id) && $user->rights->agenda->myactions->delete)) {
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';
 			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Delete").'</a></div>';
@@ -2137,16 +2154,14 @@ if ($id > 0)
 
 	print '</div>';
 
-	if ($action != 'edit')
-	{
-		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC))
-		{
+	if ($action != 'edit') {
+		if (empty($conf->global->AGENDA_DISABLE_BUILDDOC)) {
 			print '<div style="clear:both;"></div><div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 
 			/*
-             * Documents generes
-             */
+			 * Documents generes
+			 */
 
 			$filedir = $conf->agenda->multidir_output[$conf->entity].'/'.$object->id;
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 0aff54a93e3..f381351f818 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -390,8 +390,7 @@ class ActionComm extends CommonObject
 		$now = dol_now();
 
 		// Check parameters
-		if (!isset($this->userownerid) || $this->userownerid === '')	// $this->userownerid may be 0 (anonymous event) of > 0
-		{
+		if (!isset($this->userownerid) || $this->userownerid === '') {	// $this->userownerid may be 0 (anonymous event) of > 0
 			dol_syslog("You tried to create an event but mandatory property ownerid was not defined", LOG_WARNING);
 			$this->errors[] = 'ErrorPropertyUserowneridNotDefined';
 			return -1;
@@ -401,24 +400,45 @@ class ActionComm extends CommonObject
 		$this->label = dol_trunc(trim($this->label), 128);
 		$this->location = dol_trunc(trim($this->location), 128);
 		$this->note_private = dol_htmlcleanlastbr(trim(empty($this->note_private) ? $this->note : $this->note_private));
-		if (empty($this->percentage))   $this->percentage = 0;
-		if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
-		if (empty($this->fulldayevent)) $this->fulldayevent = 0;
-		if (empty($this->transparency)) $this->transparency = 0;
-		if ($this->percentage > 100) $this->percentage = 100;
+		if (empty($this->percentage)) {
+			$this->percentage = 0;
+		}
+		if (empty($this->priority) || !is_numeric($this->priority)) {
+			$this->priority = 0;
+		}
+		if (empty($this->fulldayevent)) {
+			$this->fulldayevent = 0;
+		}
+		if (empty($this->transparency)) {
+			$this->transparency = 0;
+		}
+		if ($this->percentage > 100) {
+			$this->percentage = 100;
+		}
 		//if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-		if (!empty($this->datep) && !empty($this->datef))   $this->durationp = ($this->datef - $this->datep); // deprecated
+		if (!empty($this->datep) && !empty($this->datef)) {
+			$this->durationp = ($this->datef - $this->datep); // deprecated
+		}
 		//if (! empty($this->date)  && ! empty($this->dateend)) $this->durationa=($this->dateend - $this->date);
-		if (!empty($this->datep) && !empty($this->datef) && $this->datep > $this->datef) $this->datef = $this->datep;
+		if (!empty($this->datep) && !empty($this->datef) && $this->datep > $this->datef) {
+			$this->datef = $this->datep;
+		}
 		//if (! empty($this->date)  && ! empty($this->dateend) && $this->date > $this->dateend) $this->dateend=$this->date;
-		if (!isset($this->fk_project) || $this->fk_project < 0) $this->fk_project = 0;
+		if (!isset($this->fk_project) || $this->fk_project < 0) {
+			$this->fk_project = 0;
+		}
 		// For backward compatibility
-		if ($this->elementtype == 'facture')  $this->elementtype = 'invoice';
-		if ($this->elementtype == 'commande') $this->elementtype = 'order';
-		if ($this->elementtype == 'contrat')  $this->elementtype = 'contract';
+		if ($this->elementtype == 'facture') {
+			$this->elementtype = 'invoice';
+		}
+		if ($this->elementtype == 'commande') {
+			$this->elementtype = 'order';
+		}
+		if ($this->elementtype == 'contrat') {
+			$this->elementtype = 'contract';
+		}
 
-		if (!is_array($this->userassigned) && !empty($this->userassigned))	// For backward compatibility when userassigned was an int instead fo array
-		{
+		if (!is_array($this->userassigned) && !empty($this->userassigned)) {	// For backward compatibility when userassigned was an int instead fo array
 			$tmpid = $this->userassigned;
 			$this->userassigned = array();
 			$this->userassigned[$tmpid] = array('id'=>$tmpid, 'transparency'=>$this->transparency);
@@ -428,23 +448,21 @@ class ActionComm extends CommonObject
 		$userdoneid = $this->userdoneid;
 
 		// Be sure assigned user is defined as an array of array('id'=>,'mandatory'=>,...).
-		if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned))
+		if (empty($this->userassigned) || count($this->userassigned) == 0 || !is_array($this->userassigned)) {
 			$this->userassigned = array($userownerid=>array('id'=>$userownerid, 'transparency'=>$this->transparency));
+		}
 
-		if (!$this->type_id || !$this->type_code)
-		{
+		if (!$this->type_id || !$this->type_code) {
 			$key = empty($this->type_id) ? $this->type_code : $this->type_id;
 
 			// Get id from code
 			$cactioncomm = new CActionComm($this->db);
 			$result = $cactioncomm->fetch($key);
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->type_id = $cactioncomm->id;
 				$this->type_code = $cactioncomm->code;
-			} elseif ($result == 0)
-			{
+			} elseif ($result == 0) {
 				$this->error = 'Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"';
 				return -1;
 			} else {
@@ -455,8 +473,7 @@ class ActionComm extends CommonObject
 		$code = empty($this->code) ? $this->type_code : $this->code;
 
 		// Check parameters
-		if (!$this->type_id)
-		{
+		if (!$this->type_id) {
 			$this->error = "ErrorWrongParameters";
 			return -1;
 		}
@@ -470,7 +487,7 @@ class ActionComm extends CommonObject
 		$sql .= "durationp,"; // deprecated
 		$sql .= "fk_action,";
 		$sql .= "code,";
-	 	$sql .= "ref_ext,";
+		$sql .= "ref_ext,";
 		$sql .= "fk_soc,";
 		$sql .= "fk_project,";
 		$sql .= "note,";
@@ -527,50 +544,40 @@ class ActionComm extends CommonObject
 
 		dol_syslog(get_class($this)."::add", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->ref = $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."actioncomm", "id");
 
 			// Now insert assigned users
-			if (!$error)
-			{
+			if (!$error) {
 				//dol_syslog(var_export($this->userassigned, true));
-				foreach ($this->userassigned as $key => $val)
-				{
-					if (!is_array($val))	// For backward compatibility when val=id
-					{
+				foreach ($this->userassigned as $key => $val) {
+					if (!is_array($val)) {	// For backward compatibility when val=id
 						$val = array('id'=>$val);
 					}
 
-					if ($val['id'] > 0)
-					{
+					if ($val['id'] > 0) {
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 						$sql .= " VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory']) ? '0' : $val['mandatory']).", ".(empty($val['transparency']) ? '0' : $val['transparency']).", ".(empty($val['answer_status']) ? '0' : $val['answer_status']).")";
 
 						$resql = $this->db->query($sql);
-						if (!$resql)
-						{
+						if (!$resql) {
 							$error++;
 							dol_syslog('Error to process userassigned: '.$this->db->lasterror(), LOG_ERR);
-					   		$this->errors[] = $this->db->lasterror();
+							$this->errors[] = $this->db->lasterror();
 						}
 						//var_dump($sql);exit;
 					}
 				}
 			}
 
-			if (!$error)
-			{
-				if (!empty($this->socpeopleassigned))
-				{
-					foreach ($this->socpeopleassigned as $id => $val)
-					{
+			if (!$error) {
+				if (!empty($this->socpeopleassigned)) {
+					foreach ($this->socpeopleassigned as $id => $val) {
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 						$sql .= " VALUES(".$this->id.", 'socpeople', ".$id.", 0, 0, 0)";
 
 						$resql = $this->db->query($sql);
-						if (!$resql)
-						{
+						if (!$resql) {
 							$error++;
 							dol_syslog('Error to process socpeopleassigned: '.$this->db->lasterror(), LOG_ERR);
 							$this->errors[] = $this->db->lasterror();
@@ -579,26 +586,24 @@ class ActionComm extends CommonObject
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Actions on extra fields
-		   		$result = $this->insertExtraFields();
-		   		if ($result < 0)
-		   		{
-		   			$error++;
-		   		}
+				$result = $this->insertExtraFields();
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('ACTION_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -643,30 +648,33 @@ class ActionComm extends CommonObject
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($fuser);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Hook of thirdparty module
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('objFrom'=>$objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 
 			// Call trigger
 			$result = $this->call_trigger('ACTION_CLONE', $fuser);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
 		unset($this->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -714,18 +722,21 @@ class ActionComm extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on u.rowid = a.fk_user_author";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on s.rowid = a.fk_soc";
 		$sql .= " WHERE ";
-		if ($ref) $sql .= " a.id = ".((int) $ref); // No field ref, we use id
-		elseif ($ref_ext) $sql .= " a.ref_ext = '".$this->db->escape($ref_ext)."'";
-		elseif ($email_msgid) $sql .= " a.email_msgid = '".$this->db->escape($email_msgid)."'";
-		else $sql .= " a.id = ".((int) $id);
+		if ($ref) {
+			$sql .= " a.id = ".((int) $ref); // No field ref, we use id
+		} elseif ($ref_ext) {
+			$sql .= " a.ref_ext = '".$this->db->escape($ref_ext)."'";
+		} elseif ($email_msgid) {
+			$sql .= " a.email_msgid = '".$this->db->escape($email_msgid)."'";
+		} else {
+			$sql .= " a.id = ".((int) $id);
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id         = $obj->id;
@@ -758,11 +769,15 @@ class ActionComm extends CommonObject
 				$this->authorid = $obj->fk_user_author;
 				$this->usermodid = $obj->fk_user_mod;
 
-				if (!is_object($this->author)) $this->author = new stdClass(); // To avoid warning
+				if (!is_object($this->author)) {
+					$this->author = new stdClass(); // To avoid warning
+				}
 				$this->author->id = $obj->fk_user_author; // deprecated
 				$this->author->firstname = $obj->firstname; // deprecated
 				$this->author->lastname = $obj->lastname; // deprecated
-				if (!is_object($this->usermod)) $this->usermod = new stdClass(); // To avoid warning
+				if (!is_object($this->usermod)) {
+					$this->usermod = new stdClass(); // To avoid warning
+				}
 				$this->usermod->id = $obj->fk_user_mod; // deprecated
 
 				$this->userownerid = $obj->fk_user_action;
@@ -809,19 +824,20 @@ class ActionComm extends CommonObject
 		$sql .= ' WHERE fk_actioncomm = '.$this->id;
 		$sql .= " AND element_type IN ('user', 'socpeople')";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// If owner is known, we must but id first into list
-			if ($this->userownerid > 0) $this->userassigned[$this->userownerid] = array('id'=>$this->userownerid); // Set first so will be first into list.
+			if ($this->userownerid > 0) {
+				$this->userassigned[$this->userownerid] = array('id'=>$this->userownerid); // Set first so will be first into list.
+			}
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if ($obj->fk_element > 0)
-				{
+			while ($obj = $this->db->fetch_object($resql)) {
+				if ($obj->fk_element > 0) {
 					switch ($obj->element_type) {
 						case 'user':
 							$this->userassigned[$obj->fk_element] = array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency);
-							if (empty($this->userownerid)) $this->userownerid = $obj->fk_element; // If not defined (should not happened, we fix this)
+							if (empty($this->userownerid)) {
+								$this->userownerid = $obj->fk_element; // If not defined (should not happened, we fix this)
+							}
 							break;
 						case 'socpeople':
 							$this->socpeopleassigned[$obj->fk_element] = array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency);
@@ -852,32 +868,26 @@ class ActionComm extends CommonObject
 		$sql .= " WHERE element_type = 'user' AND fk_actioncomm = ".$this->id;
 
 		$resql2 = $this->db->query($sql);
-		if ($resql2)
-		{
+		if ($resql2) {
 			$this->userassigned = array();
 
 			// If owner is known, we must but id first into list
-			if ($this->userownerid > 0)
-			{
+			if ($this->userownerid > 0) {
 				// Set first so will be first into list.
 				$this->userassigned[$this->userownerid] = array('id'=>$this->userownerid);
 			}
 
-			while ($obj = $this->db->fetch_object($resql2))
-			{
-				if ($obj->fk_element > 0)
-				{
+			while ($obj = $this->db->fetch_object($resql2)) {
+				if ($obj->fk_element > 0) {
 					$this->userassigned[$obj->fk_element] = array('id'=>$obj->fk_element,
 																  'mandatory'=>$obj->mandatory,
 																  'answer_status'=>$obj->answer_status,
 																  'transparency'=>$obj->transparency);
 				}
 
-				if ($override === true)
-				{
+				if ($override === true) {
 					// If not defined (should not happened, we fix this)
-					if (empty($this->userownerid))
-					{
+					if (empty($this->userownerid)) {
 						$this->userownerid = $obj->fk_element;
 					}
 				}
@@ -930,8 +940,7 @@ class ActionComm extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_reminder";
 			$sql .= " WHERE fk_actioncomm = ".$this->id;
 
@@ -945,11 +954,10 @@ class ActionComm extends CommonObject
 		// Removed extrafields
 		if (!$error) {
 			  $result = $this->deleteExtraFields();
-		  	if ($result < 0)
-		   	{
-		   		$error++;
-		   		dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
-		   	}
+			if ($result < 0) {
+				$error++;
+				dol_syslog(get_class($this)."::delete error -3 ".$this->error, LOG_ERR);
+			}
 		}
 
 		// remove actioncomm
@@ -964,18 +972,17 @@ class ActionComm extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('ACTION_DELETE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1006,21 +1013,36 @@ class ActionComm extends CommonObject
 		// Clean parameters
 		$this->label = trim($this->label);
 		$this->note_private = dol_htmlcleanlastbr(trim(!isset($this->note_private) ? $this->note : $this->note_private));
-		if (empty($this->percentage))    $this->percentage = 0;
-		if (empty($this->priority) || !is_numeric($this->priority)) $this->priority = 0;
-		if (empty($this->transparency))  $this->transparency = 0;
-		if (empty($this->fulldayevent))  $this->fulldayevent = 0;
-		if ($this->percentage > 100) $this->percentage = 100;
+		if (empty($this->percentage)) {
+			$this->percentage = 0;
+		}
+		if (empty($this->priority) || !is_numeric($this->priority)) {
+			$this->priority = 0;
+		}
+		if (empty($this->transparency)) {
+			$this->transparency = 0;
+		}
+		if (empty($this->fulldayevent)) {
+			$this->fulldayevent = 0;
+		}
+		if ($this->percentage > 100) {
+			$this->percentage = 100;
+		}
 		//if ($this->percentage == 100 && ! $this->dateend) $this->dateend = $this->date;
-		if ($this->datep && $this->datef)   $this->durationp = ($this->datef - $this->datep); // deprecated
+		if ($this->datep && $this->datef) {
+			$this->durationp = ($this->datef - $this->datep); // deprecated
+		}
 		//if ($this->date  && $this->dateend) $this->durationa=($this->dateend - $this->date);
-		if ($this->datep && $this->datef && $this->datep > $this->datef) $this->datef = $this->datep;
+		if ($this->datep && $this->datef && $this->datep > $this->datef) {
+			$this->datef = $this->datep;
+		}
 		//if ($this->date  && $this->dateend && $this->date > $this->dateend) $this->dateend=$this->date;
-		if ($this->fk_project < 0) $this->fk_project = 0;
+		if ($this->fk_project < 0) {
+			$this->fk_project = 0;
+		}
 
 		// Check parameters
-		if ($this->percentage == 0 && $this->userdoneid > 0)
-		{
+		if ($this->percentage == 0 && $this->userdoneid > 0) {
 			$this->error = "ErrorCantSaveADoneUserWithZeroPercentage";
 			return -1;
 		}
@@ -1034,7 +1056,9 @@ class ActionComm extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
 		$sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
-		if ($this->type_id > 0) $sql .= ", fk_action = '".$this->db->escape($this->type_id)."'";
+		if ($this->type_id > 0) {
+			$sql .= ", fk_action = '".$this->db->escape($this->type_id)."'";
+		}
 		$sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
 		$sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
 		$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
@@ -1050,65 +1074,58 @@ class ActionComm extends CommonObject
 		$sql .= ", fk_user_mod = ".$user->id;
 		$sql .= ", fk_user_action = ".($userownerid > 0 ? "'".$this->db->escape($userownerid)."'" : "null");
 		$sql .= ", fk_user_done = ".($userdoneid > 0 ? "'".$this->db->escape($userdoneid)."'" : "null");
-		if (!empty($this->fk_element)) $sql .= ", fk_element=".($this->fk_element ? $this->db->escape($this->fk_element) : "null");
-		if (!empty($this->elementtype)) $sql .= ", elementtype=".($this->elementtype ? "'".$this->db->escape($this->elementtype)."'" : "null");
+		if (!empty($this->fk_element)) {
+			$sql .= ", fk_element=".($this->fk_element ? $this->db->escape($this->fk_element) : "null");
+		}
+		if (!empty($this->elementtype)) {
+			$sql .= ", elementtype=".($this->elementtype ? "'".$this->db->escape($this->elementtype)."'" : "null");
+		}
 		$sql .= " WHERE id=".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$action = 'update';
 
 			// Actions on extra fields
-	   		if (!$error)
-	   		{
-	   			$result = $this->insertExtraFields();
-	   			if ($result < 0)
-	   			{
-	   				$error++;
-	   			}
+			if (!$error) {
+				$result = $this->insertExtraFields();
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			// Now insert assignedusers
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources where fk_actioncomm = ".$this->id." AND element_type = 'user'";
 				$resql = $this->db->query($sql);
 
-				foreach ($this->userassigned as $key => $val)
-				{
-					if (!is_array($val))	// For backward compatibility when val=id
-					{
+				foreach ($this->userassigned as $key => $val) {
+					if (!is_array($val)) {	// For backward compatibility when val=id
 						$val = array('id'=>$val);
 					}
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 					$sql .= " VALUES(".$this->id.", 'user', ".$val['id'].", ".(empty($val['mandatory']) ? '0' : $val['mandatory']).", ".(empty($val['transparency']) ? '0' : $val['transparency']).", ".(empty($val['answer_status']) ? '0' : $val['answer_status']).")";
 
 					$resql = $this->db->query($sql);
-					if (!$resql)
-					{
+					if (!$resql) {
 						$error++;
-				   		$this->errors[] = $this->db->lasterror();
+						$this->errors[] = $this->db->lasterror();
 					}
 					//var_dump($sql);exit;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."actioncomm_resources where fk_actioncomm = ".$this->id." AND element_type = 'socpeople'";
 				$resql = $this->db->query($sql);
 
-				if (!empty($this->socpeopleassigned))
-				{
-					foreach (array_keys($this->socpeopleassigned) as $id)
-					{
+				if (!empty($this->socpeopleassigned)) {
+					foreach (array_keys($this->socpeopleassigned) as $id) {
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 						$sql .= " VALUES(".$this->id.", 'socpeople', ".$id.", 0, 0, 0)";
 
 						$resql = $this->db->query($sql);
-						if (!$resql)
-						{
+						if (!$resql) {
 							$error++;
 							$this->errors[] = $this->db->lasterror();
 						}
@@ -1116,16 +1133,16 @@ class ActionComm extends CommonObject
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('ACTION_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1165,34 +1182,34 @@ class ActionComm extends CommonObject
 		$sql = "SELECT a.id";
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
-		if (!empty($socid)) $sql .= " AND a.fk_soc = ".$socid;
-		if (!empty($elementtype))
-		{
+		if (!empty($socid)) {
+			$sql .= " AND a.fk_soc = ".$socid;
+		}
+		if (!empty($elementtype)) {
 			if ($elementtype == 'project') {
 				$sql .= ' AND a.fk_project = '.$fk_element;
-			}
-			elseif ($elementtype == 'contact') {
+			} elseif ($elementtype == 'contact') {
 				$sql .= ' AND a.id IN';
 				$sql .= " (SELECT fk_actioncomm FROM ".MAIN_DB_PREFIX."actioncomm_resources WHERE";
 				$sql .= " element_type = 'socpeople' AND fk_element = ".$fk_element.')';
-			}
-			else {
+			} else {
 				$sql .= " AND a.fk_element = ".(int) $fk_element." AND a.elementtype = '".$db->escape($elementtype)."'";
 			}
 		}
-		if (!empty($filter)) $sql .= $filter;
-		if ($sortorder && $sortfield) $sql .= $db->order($sortfield, $sortorder);
+		if (!empty($filter)) {
+			$sql .= $filter;
+		}
+		if ($sortorder && $sortfield) {
+			$sql .= $db->order($sortfield, $sortorder);
+		}
 		$sql .= $db->plimit($limit, 0);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 
-			if ($num)
-			{
-				for ($i = 0; $i < $num; $i++)
-				{
+			if ($num) {
+				for ($i = 0; $i < $num; $i++) {
 					$obj = $db->fetch_object($resql);
 					$actioncommstatic = new ActionComm($db);
 					$actioncommstatic->fetch($obj->id);
@@ -1226,25 +1243,32 @@ class ActionComm extends CommonObject
 			$sql = "SELECT count(a.id) as nb";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
-    	if (!$user->rights->agenda->allactions->read) {
-    	    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_resources AS ar ON a.id = ar.fk_actioncomm AND ar.element_type ='user' AND ar.fk_element = ".$user->id;
-    	}
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+		}
+		if (!$user->rights->agenda->allactions->read) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_resources AS ar ON a.id = ar.fk_actioncomm AND ar.element_type ='user' AND ar.fk_element = ".$user->id;
+		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 		$sql .= " WHERE 1 = 1";
-		if (empty($load_state_board)) $sql .= " AND a.percent >= 0 AND a.percent < 100";
+		if (empty($load_state_board)) {
+			$sql .= " AND a.percent >= 0 AND a.percent < 100";
+		}
 		$sql .= " AND a.entity IN (".getEntity('agenda').")";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
-		if ($user->socid) $sql .= " AND a.fk_soc = ".$user->socid;
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+		}
+		if ($user->socid) {
+			$sql .= " AND a.fk_soc = ".$user->socid;
+		}
 		if (!$user->rights->agenda->allactions->read) {
-    	    $sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id;
-    	    $sql .= " OR ar.fk_element = ".$user->id; // Added by PV
-    	    $sql .= ")";
+			$sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id;
+			$sql .= " OR ar.fk_element = ".$user->id; // Added by PV
+			$sql .= ")";
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			if (empty($load_state_board)) {
 				$agenda_static = new ActionComm($this->db);
 				$response = new WorkboardResponse();
@@ -1252,7 +1276,9 @@ class ActionComm extends CommonObject
 				$response->label = $langs->trans("ActionsToDo");
 				$response->labelShort = $langs->trans("ActionsToDoShort");
 				$response->url = DOL_URL_ROOT.'/comm/action/list.php?action=show_list&actioncode=0&status=todo&mainmenu=agenda';
-				if ($user->rights->agenda->allactions->read) $response->url .= '&filtert=-1';
+				if ($user->rights->agenda->allactions->read) {
+					$response->url .= '&filtert=-1';
+				}
 				$response->img = img_object('', "action", 'class="inline-block valigntextmiddle"');
 			}
 			// This assignment in condition is not a bug. It allows walking the results.
@@ -1260,15 +1286,20 @@ class ActionComm extends CommonObject
 				if (empty($load_state_board)) {
 					$response->nbtodo++;
 					$agenda_static->datep = $this->db->jdate($obj->dp);
-					if ($agenda_static->hasDelay()) $response->nbtodolate++;
+					if ($agenda_static->hasDelay()) {
+						$response->nbtodolate++;
+					}
 				} else {
 					$this->nb["actionscomm"] = $obj->nb;
 				}
 			}
 
 			$this->db->free($resql);
-			if (empty($load_state_board)) return $response;
-			else return 1;
+			if (empty($load_state_board)) {
+				return $response;
+			} else {
+				return 1;
+			}
 		} else {
 			dol_print_error($this->db);
 			$this->error = $this->db->error();
@@ -1296,27 +1327,25 @@ class ActionComm extends CommonObject
 
 		dol_syslog(get_class($this)."::info", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->id;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_mod)
-				{
+				if ($obj->fk_user_mod) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_mod);
 					$this->user_modification = $muser;
 				}
 
 				$this->date_creation = $this->db->jdate($obj->datec);
-				if (!empty($obj->fk_user_mod)) $this->date_modification = $this->db->jdate($obj->datem);
+				if (!empty($obj->fk_user_mod)) {
+					$this->date_modification = $this->db->jdate($obj->datem);
+				}
 			}
 			$this->db->free($result);
 		} else {
@@ -1353,22 +1382,40 @@ class ActionComm extends CommonObject
 		global $langs;
 
 		$labelStatus = $langs->trans('StatusNotApplicable');
-	   	if ($percent == -1 && !$hidenastatus) $labelStatus = $langs->trans('StatusNotApplicable');
-	   	elseif ($percent == 0) $labelStatus = $langs->trans('StatusActionToDo').' (0%)';
-	   	elseif ($percent > 0 && $percent < 100) $labelStatus = $langs->trans('StatusActionInProcess').' ('.$percent.'%)';
-	   	elseif ($percent >= 100) $labelStatus = $langs->trans('StatusActionDone').' (100%)';
+		if ($percent == -1 && !$hidenastatus) {
+			$labelStatus = $langs->trans('StatusNotApplicable');
+		} elseif ($percent == 0) {
+			$labelStatus = $langs->trans('StatusActionToDo').' (0%)';
+		} elseif ($percent > 0 && $percent < 100) {
+			$labelStatus = $langs->trans('StatusActionInProcess').' ('.$percent.'%)';
+		} elseif ($percent >= 100) {
+			$labelStatus = $langs->trans('StatusActionDone').' (100%)';
+		}
 
 		$labelStatusShort = $langs->trans('StatusNotApplicable');
-		if ($percent == -1 && !$hidenastatus) $labelStatusShort = $langs->trans('NA');
-		elseif ($percent == 0) $labelStatusShort = '0%';
-		elseif ($percent > 0 && $percent < 100) $labelStatusShort = $percent.'%';
-		elseif ($percent >= 100) $labelStatusShort = '100%';
+		if ($percent == -1 && !$hidenastatus) {
+			$labelStatusShort = $langs->trans('NA');
+		} elseif ($percent == 0) {
+			$labelStatusShort = '0%';
+		} elseif ($percent > 0 && $percent < 100) {
+			$labelStatusShort = $percent.'%';
+		} elseif ($percent >= 100) {
+			$labelStatusShort = '100%';
+		}
 
 		$statusType = 'status9';
-		if ($percent == -1 && !$hidenastatus) $statusType = 'status9';
-		if ($percent == 0) $statusType = 'status1';
-		if ($percent > 0 && $percent < 100) $statusType = 'status3';
-		if ($percent >= 100) $statusType = 'status6';
+		if ($percent == -1 && !$hidenastatus) {
+			$statusType = 'status9';
+		}
+		if ($percent == 0) {
+			$statusType = 'status1';
+		}
+		if ($percent > 0 && $percent < 100) {
+			$statusType = 'status3';
+		}
+		if ($percent >= 100) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
@@ -1390,54 +1437,67 @@ class ActionComm extends CommonObject
 	{
 		global $conf, $langs, $user, $hookmanager, $action;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$canread = 0;
-		if ($user->rights->agenda->myactions->read && $this->authorid == $user->id) $canread = 1; // Can read my event
-		if ($user->rights->agenda->myactions->read && array_key_exists($user->id, $this->userassigned)) $canread = 1; // Can read my event i am assigned
-		if ($user->rights->agenda->allactions->read) $canread = 1; // Can read all event of other
-		if (!$canread)
-		{
+		if ($user->rights->agenda->myactions->read && $this->authorid == $user->id) {
+			$canread = 1; // Can read my event
+		}
+		if ($user->rights->agenda->myactions->read && array_key_exists($user->id, $this->userassigned)) {
+			$canread = 1; // Can read my event i am assigned
+		}
+		if ($user->rights->agenda->allactions->read) {
+			$canread = 1; // Can read all event of other
+		}
+		if (!$canread) {
 			$option = 'nolink';
 		}
 
 		$label = $this->label;
-		if (empty($label)) $label = $this->libelle; // For backward compatibility
+		if (empty($label)) {
+			$label = $this->libelle; // For backward compatibility
+		}
 
 		$result = '';
 
 		// Set label of type
 		$labeltype = '';
-		if ($this->type_code)
-		{
+		if ($this->type_code) {
 			$labeltype = ($langs->transnoentities("Action".$this->type_code) != "Action".$this->type_code) ? $langs->transnoentities("Action".$this->type_code) : $this->type_label;
 		}
-		if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
-			if ($this->type_code != 'AC_OTH_AUTO') $labeltype = $langs->trans('ActionAC_MANUAL');
+		if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+			if ($this->type_code != 'AC_OTH_AUTO') {
+				$labeltype = $langs->trans('ActionAC_MANUAL');
+			}
 		}
 
 		$tooltip = img_picto('', $this->picto).' <u>'.$langs->trans('Action').'</u>';
-		if (!empty($this->ref))
+		if (!empty($this->ref)) {
 			$tooltip .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($label))
+		}
+		if (!empty($label)) {
 			$tooltip .= '<br><b>'.$langs->trans('Title').':</b> '.$label;
-		if (!empty($labeltype))
+		}
+		if (!empty($labeltype)) {
 			$tooltip .= '<br><b>'.$langs->trans('Type').':</b> '.$labeltype;
-		if (!empty($this->location))
+		}
+		if (!empty($this->location)) {
 			$tooltip .= '<br><b>'.$langs->trans('Location').':</b> '.$this->location;
-		if (isset($this->transparency))
+		}
+		if (isset($this->transparency)) {
 			$tooltip .= '<br><b>'.$langs->trans('Busy').':</b> '.yn($this->transparency);
-		if (!empty($this->note_private))
+		}
+		if (!empty($this->note_private)) {
 			$tooltip .= '<br><b>'.$langs->trans('Note').':</b> '.(dol_textishtml($this->note_private) ? str_replace(array("\r", "\n"), "", $this->note_private) : str_replace(array("\r", "\n"), '<br>', $this->note_private));
+		}
 		$linkclose = '';
 		//if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color)
 		//	$linkclose = ' style="background-color:#'.$this->type_color.'"';
 
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowAction");
 				$linkclose .= ' alt="'.dol_escape_htmltag($tooltip, 1).'"';
 			}
@@ -1445,26 +1505,33 @@ class ActionComm extends CommonObject
 			$linkclose .= ' class="'.$classname.' classfortooltip"';
 
 			/*
-		    $hookmanager->initHooks(array('actiondao'));
-		    $parameters=array('id'=>$this->id);
-		    $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		    $linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
-		    */
-		} else $linkclose .= ' class="'.$classname.'"';
+			$hookmanager->initHooks(array('actiondao'));
+			$parameters=array('id'=>$this->id);
+			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			$linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
+			*/
+		} else {
+			$linkclose .= ' class="'.$classname.'"';
+		}
 
 		$url = '';
-		if ($option == 'birthday')
+		if ($option == 'birthday') {
 			$url = DOL_URL_ROOT.'/contact/perso.php?id='.$this->id;
-		elseif ($option == 'holiday')
+		} elseif ($option == 'holiday') {
 			$url = DOL_URL_ROOT.'/holiday/card.php?id='.$this->id;
-		else $url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/comm/action/card.php?id='.$this->id;
+		}
 
-		if ($option !== 'nolink')
-		{
+		if ($option !== 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkstart = '<a href="'.$url.'"';
@@ -1476,31 +1543,36 @@ class ActionComm extends CommonObject
 			$linkend = '';
 		}
 
-		if ($withpicto == 2)
-		{
+		if ($withpicto == 2) {
 			$libelle = $label;
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $libelle = $labeltype;
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+				$libelle = $labeltype;
+			}
 			$libelleshort = '';
 		} else {
 			$libelle = (empty($this->libelle) ? $label : $this->libelle.(($label && $label != $this->libelle) ? ' '.$label : ''));
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) $libelle = $labeltype;
-			if ($maxlength < 0) $libelleshort = $this->ref;
-			else $libelleshort = dol_trunc($libelle, $maxlength);
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && empty($libelle)) {
+				$libelle = $labeltype;
+			}
+			if ($maxlength < 0) {
+				$libelleshort = $this->ref;
+			} else {
+				$libelleshort = dol_trunc($libelle, $maxlength);
+			}
 		}
 
-		if ($withpicto)
-		{
-			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))	// Add code into ()
-			{
-				if ($labeltype)
-				{
+		if ($withpicto) {
+			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {	// Add code into ()
+				if ($labeltype) {
 					$libelle .= (preg_match('/'.preg_quote($labeltype, '/').'/', $libelle) ? '' : ' ('.$langs->transnoentities("Action".$this->type_code).')');
 				}
 			}
 		}
 
 		$result .= $linkstart;
-		if ($withpicto)	$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$libelle), ($overwritepicto ? $overwritepicto : 'action'), (($this->type_color && $overwritepicto) ? 'style="color: #'.$this->type_color.' !important;" ' : '').($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $langs->trans("ShowAction").': '.$libelle), ($overwritepicto ? $overwritepicto : 'action'), (($this->type_color && $overwritepicto) ? 'style="color: #'.$this->type_color.' !important;" ' : '').($notooltip ? 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'"' : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
 		$result .= $libelleshort;
 		$result .= $linkend;
 
@@ -1508,8 +1580,11 @@ class ActionComm extends CommonObject
 		$hookmanager->initHooks(array('actiondao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -1524,8 +1599,7 @@ class ActionComm extends CommonObject
 		global $conf;
 
 		$imgpicto = '';
-		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-		{
+		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 			$color = '';
 			if ($this->type_color) {
 				$color = 'style="color: #'.$this->type_color.' !important;"';
@@ -1533,19 +1607,31 @@ class ActionComm extends CommonObject
 			if ($this->type_picto) {
 				$imgpicto = img_picto('', $this->type_picto, 'class="paddingright"');
 			} else {
-				if ($this->type_code == 'AC_RDV')         $imgpicto = img_picto('', 'meeting', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_TEL')     $imgpicto = img_picto('', 'object_phoning', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_FAX')     $imgpicto = img_picto('', 'object_phoning_fax', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_EMAIL' || $this->type_code == 'AC_EMAIL_IN')   $imgpicto = img_picto('', 'object_email', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_INT')     $imgpicto = img_picto('', 'object_intervention', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type_code == 'AC_OTH' && $this->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', $color, false, 0, 0, '', 'paddingright');
-				elseif ($this->type != 'systemauto') $imgpicto = img_picto('', 'user-cog', $color, false, 0, 0, '', 'paddingright');
-				else $imgpicto = img_picto('', 'cog', $color, false, 0, 0, '', 'paddingright');
+				if ($this->type_code == 'AC_RDV') {
+					$imgpicto = img_picto('', 'meeting', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_TEL') {
+					$imgpicto = img_picto('', 'object_phoning', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_FAX') {
+					$imgpicto = img_picto('', 'object_phoning_fax', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_EMAIL' || $this->type_code == 'AC_EMAIL_IN') {
+					$imgpicto = img_picto('', 'object_email', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_INT') {
+					$imgpicto = img_picto('', 'object_intervention', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type_code == 'AC_OTH' && $this->code == 'TICKET_MSG') {
+					$imgpicto = img_picto('', 'object_conversation', $color, false, 0, 0, '', 'paddingright');
+				} elseif ($this->type != 'systemauto') {
+					$imgpicto = img_picto('', 'user-cog', $color, false, 0, 0, '', 'paddingright');
+				} else {
+					$imgpicto = img_picto('', 'cog', $color, false, 0, 0, '', 'paddingright');
+				}
 			}
 		} else {
 			// 2 picto: 1 for auto, 1 for manual
-			if ($this->type != 'systemauto') $imgpicto = img_picto('', 'user-cog', '', false, 0, 0, '', 'paddingright');
-			else $imgpicto = img_picto('', 'cog', '', false, 0, 0, '', 'paddingright');
+			if ($this->type != 'systemauto') {
+				$imgpicto = img_picto('', 'user-cog', '', false, 0, 0, '', 'paddingright');
+			} else {
+				$imgpicto = img_picto('', 'cog', '', false, 0, 0, '', 'paddingright');
+			}
 		}
 		return $imgpicto;
 	}
@@ -1622,13 +1708,16 @@ class ActionComm extends CommonObject
 		dol_syslog(get_class($this)."::build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
 
 		// Check parameters
-		if (empty($format)) return -1;
+		if (empty($format)) {
+			return -1;
+		}
 
 		// Clean parameters
-		if (!$filename)
-		{
+		if (!$filename) {
 			$extension = 'vcs';
-			if ($format == 'ical') $extension = 'ics';
+			if ($format == 'ical') {
+				$extension = 'ics';
+			}
 			$filename = $format.'.'.$extension;
 		}
 
@@ -1643,19 +1732,16 @@ class ActionComm extends CommonObject
 
 		$now = dol_now();
 
-		if ($cachedelay)
-		{
+		if ($cachedelay) {
 			$nowgmt = dol_now();
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
-			{
+			if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) {
 				dol_syslog(get_class($this)."::build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
 				$buildfile = false;
 			}
 		}
 
-		if ($buildfile)
-		{
+		if ($buildfile) {
 			// Build event array
 			$eventarray = array();
 
@@ -1683,48 +1769,69 @@ class ActionComm extends CommonObject
 			$sql .= $hookmanager->resPrint;
 
 			// We must filter on assignement table
-			if ($filters['logint']) $sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+			if ($filters['logint']) {
+				$sql .= ", ".MAIN_DB_PREFIX."actioncomm_resources as ar";
+			}
 			$sql .= " WHERE a.fk_action=c.id";
 			$sql .= " AND a.entity IN (".getEntity('agenda').")";
-			foreach ($filters as $key => $value)
-			{
-				if ($key == 'notolderthan' && $value != '') $sql .= " AND a.datep >= '".$this->db->idate($now - ($value * 24 * 60 * 60))."'";
-				if ($key == 'year')         $sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value, 1))."' AND '".$this->db->idate(dol_get_last_day($value, 12))."'";
-				if ($key == 'id')           $sql .= " AND a.id=".(is_numeric($value) ? $value : 0);
-				if ($key == 'idfrom')       $sql .= " AND a.id >= ".(is_numeric($value) ? $value : 0);
-				if ($key == 'idto')         $sql .= " AND a.id <= ".(is_numeric($value) ? $value : 0);
-				if ($key == 'project')      $sql .= " AND a.fk_project=".(is_numeric($value) ? $value : 0);
-				if ($key == 'actiontype')    $sql .= " AND c.type = '".$this->db->escape($value)."'";
-				if ($key == 'notactiontype') $sql .= " AND c.type <> '".$this->db->escape($value)."'";
+			foreach ($filters as $key => $value) {
+				if ($key == 'notolderthan' && $value != '') {
+					$sql .= " AND a.datep >= '".$this->db->idate($now - ($value * 24 * 60 * 60))."'";
+				}
+				if ($key == 'year') {
+					$sql .= " AND a.datep BETWEEN '".$this->db->idate(dol_get_first_day($value, 1))."' AND '".$this->db->idate(dol_get_last_day($value, 12))."'";
+				}
+				if ($key == 'id') {
+					$sql .= " AND a.id=".(is_numeric($value) ? $value : 0);
+				}
+				if ($key == 'idfrom') {
+					$sql .= " AND a.id >= ".(is_numeric($value) ? $value : 0);
+				}
+				if ($key == 'idto') {
+					$sql .= " AND a.id <= ".(is_numeric($value) ? $value : 0);
+				}
+				if ($key == 'project') {
+					$sql .= " AND a.fk_project=".(is_numeric($value) ? $value : 0);
+				}
+				if ($key == 'actiontype') {
+					$sql .= " AND c.type = '".$this->db->escape($value)."'";
+				}
+				if ($key == 'notactiontype') {
+					$sql .= " AND c.type <> '".$this->db->escape($value)."'";
+				}
 				// We must filter on assignement table
-				if ($key == 'logint')       $sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
-				if ($key == 'logina')
-				{
+				if ($key == 'logint') {
+					$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+				}
+				if ($key == 'logina') {
 					$logina = $value;
 					$condition = '=';
-					if (preg_match('/^!/', $logina))
-					{
+					if (preg_match('/^!/', $logina)) {
 						$logina = preg_replace('/^!/', '', $logina);
 						$condition = '<>';
 					}
 					$userforfilter = new User($this->db);
 					$result = $userforfilter->fetch('', $logina);
-					if ($result > 0) $sql .= " AND a.fk_user_author ".$condition." ".$userforfilter->id;
-					elseif ($result < 0 || $condition == '=') $sql .= " AND a.fk_user_author = 0";
+					if ($result > 0) {
+						$sql .= " AND a.fk_user_author ".$condition." ".$userforfilter->id;
+					} elseif ($result < 0 || $condition == '=') {
+						$sql .= " AND a.fk_user_author = 0";
+					}
 				}
-				if ($key == 'logint')
-				{
+				if ($key == 'logint') {
 					$logint = $value;
 					$condition = '=';
-					if (preg_match('/^!/', $logint))
-					{
+					if (preg_match('/^!/', $logint)) {
 						$logint = preg_replace('/^!/', '', $logint);
 						$condition = '<>';
 					}
 					$userforfilter = new User($this->db);
 					$result = $userforfilter->fetch('', $logint);
-					if ($result > 0) $sql .= " AND ar.fk_element = ".$userforfilter->id;
-					elseif ($result < 0 || $condition == '=') $sql .= " AND ar.fk_element = 0";
+					if ($result > 0) {
+						$sql .= " AND ar.fk_element = ".$userforfilter->id;
+					} elseif ($result < 0 || $condition == '=') {
+						$sql .= " AND ar.fk_element = 0";
+					}
 				}
 			}
 
@@ -1739,13 +1846,11 @@ class ActionComm extends CommonObject
 
 			dol_syslog(get_class($this)."::build_exportfile select events", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				// Note: Output of sql request is encoded in $conf->file->character_set_client
 				// This assignment in condition is not a bug. It allows walking the results.
 				$diff = 0;
-				while ($obj = $this->db->fetch_object($resql))
-				{
+				while ($obj = $this->db->fetch_object($resql)) {
 					$qualified = true;
 
 					// 'eid','startdate','duration','enddate','title','summary','category','email','url','desc','author'
@@ -1755,8 +1860,7 @@ class ActionComm extends CommonObject
 					$datestart = $this->db->jdate($obj->datep) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
 
 					// fix for -> Warning: A non-numeric value encountered
-					if (is_numeric($this->db->jdate($obj->datep2)))
-					{
+					if (is_numeric($this->db->jdate($obj->datep2))) {
 						$dateend = $this->db->jdate($obj->datep2)
 								 - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
 					} else {
@@ -1792,8 +1896,7 @@ class ActionComm extends CommonObject
 
 					$assignedUserArray = array();
 
-					foreach ($this->userassigned as $key => $value)
-					{
+					foreach ($this->userassigned as $key => $value) {
 						$assignedUser = new User($this->db);
 						$assignedUser->fetch($value['id']);
 
@@ -1802,8 +1905,7 @@ class ActionComm extends CommonObject
 
 					$event['assignedUsers'] = $assignedUserArray;
 
-					if ($qualified && $datestart)
-					{
+					if ($qualified && $datestart) {
 						$eventarray[] = $event;
 					}
 					$diff++;
@@ -1811,8 +1913,7 @@ class ActionComm extends CommonObject
 
 				$parameters = array('filters' => $filters, 'eventarray' => &$eventarray);
 				$reshook = $hookmanager->executeHooks('addMoreEventsExport', $parameters); // Note that $action and $object may have been modified by hook
-				if ($reshook > 0)
-				{
+				if ($reshook > 0) {
 					$eventarray = $hookmanager->resArray;
 				}
 			} else {
@@ -1820,8 +1921,7 @@ class ActionComm extends CommonObject
 				return -1;
 			}
 
-			if ($exportholiday == 1)
-			{
+			if ($exportholiday == 1) {
 				$langs->load("holidays");
 				$title = $langs->trans("Holidays");
 
@@ -1832,24 +1932,20 @@ class ActionComm extends CommonObject
 				$sql .= " AND (x.statut = '2' OR x.statut = '3')"; // Show only public leaves (2 = leave wait for approval, 3 = leave approved)
 
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i   = 0;
 
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj   = $this->db->fetch_object($resql);
 						$event = array();
 
-						if ($obj->halfday == -1)
-						{
+						if ($obj->halfday == -1) {
 							$event['fulldayevent'] = false;
 
 							$timestampStart = dol_stringtotime($obj->date_start." 00:00:00", 0);
 							$timestampEnd   = dol_stringtotime($obj->date_end." 12:00:00", 0);
-						} elseif ($obj->halfday == 1)
-						{
+						} elseif ($obj->halfday == 1) {
 							$event['fulldayevent'] = false;
 
 							$timestampStart = dol_stringtotime($obj->date_start." 12:00:00", 0);
@@ -1861,8 +1957,7 @@ class ActionComm extends CommonObject
 							$timestampEnd   = dol_stringtotime($obj->date_end." 23:59:59", 0);
 						}
 
-						if (!empty($conf->global->AGENDA_EXPORT_FIX_TZ))
-						{
+						if (!empty($conf->global->AGENDA_EXPORT_FIX_TZ)) {
 							$timestampStart = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
 							$timestampEnd   = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
 						}
@@ -1884,8 +1979,7 @@ class ActionComm extends CommonObject
 						$event['duration']     = $timestampEnd - $timestampStart;
 						$event['url']          = $url;
 
-						if ($obj->status == 2)
-						{
+						if ($obj->status == 2) {
 							// 2 = leave wait for approval
 							$event['summary'] = $title." - ".$obj->lastname." (wait for approval)";
 						} else {
@@ -1904,12 +1998,19 @@ class ActionComm extends CommonObject
 
 			// Define title and desc
 			$more = '';
-			if ($login)  $more = $langs->transnoentities("User").' '.$login;
-			if ($logina) $more = $langs->transnoentities("ActionsAskedBy").' '.$logina;
-			if ($logint) $more = $langs->transnoentities("ActionsToDoBy").' '.$logint;
-			if ($logind) $more = $langs->transnoentities("ActionsDoneBy").' '.$logind;
-			if ($more)
-			{
+			if ($login) {
+				$more = $langs->transnoentities("User").' '.$login;
+			}
+			if ($logina) {
+				$more = $langs->transnoentities("ActionsAskedBy").' '.$logina;
+			}
+			if ($logint) {
+				$more = $langs->transnoentities("ActionsToDoBy").' '.$logint;
+			}
+			if ($logind) {
+				$more = $langs->transnoentities("ActionsDoneBy").' '.$logind;
+			}
+			if ($more) {
 				$title = 'Dolibarr actions '.$mysoc->name.' - '.$more;
 				$desc = $more;
 				$desc .= ' ('.$mysoc->name.' - built by Dolibarr)';
@@ -1924,14 +2025,18 @@ class ActionComm extends CommonObject
 			@chmod($outputfiletmp, octdec($conf->global->MAIN_UMASK));
 
 			// Write file
-			if ($format == 'vcal') $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-			elseif ($format == 'ical') $result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-			elseif ($format == 'rss')  $result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			if ($format == 'vcal') {
+				$result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			} elseif ($format == 'ical') {
+				$result = build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			} elseif ($format == 'rss') {
+				$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
+			}
 
-			if ($result >= 0)
-			{
-				if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
-				else {
+			if ($result >= 0) {
+				if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+					$result = 1;
+				} else {
 					$this->error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 					dol_syslog(get_class($this)."::build_exportfile ".$this->error, LOG_ERR);
 					dol_delete_file($outputfiletmp, 0, 1);
@@ -2046,8 +2151,12 @@ class ActionComm extends CommonObject
 		if ($fk_user > 0) {
 			$sql .= " AND fk_user = ".((int) $fk_user);
 		}
-		if (empty($conf->global->AGENDA_REMINDER_EMAIL)) $sql .= " AND typeremind != 'email'";
-		if (empty($conf->global->AGENDA_REMINDER_BROWSER)) $sql .= " AND typeremind != 'browser'";
+		if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
+			$sql .= " AND typeremind != 'email'";
+		}
+		if (empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+			$sql .= " AND typeremind != 'browser'";
+		}
 
 		$sql .= $this->db->order("dateremind", "ASC");
 		$resql = $this->db->query($sql);
@@ -2090,14 +2199,12 @@ class ActionComm extends CommonObject
 		$nbMailSend = 0;
 		$errorsMsg = array();
 
-		if (empty($conf->agenda->enabled))	// Should not happen. If module disabled, cron job should not be visible.
-		{
+		if (empty($conf->agenda->enabled)) {	// Should not happen. If module disabled, cron job should not be visible.
 			$langs->load("agenda");
 			$this->output = $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
 			return 0;
 		}
-		if (empty($conf->global->AGENDA_REMINDER_EMAIL))
-		{
+		if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
 			$langs->load("agenda");
 			$this->output = $langs->trans('EventRemindersByEmailNotEnabled', $langs->transnoentitiesnoconv("Agenda"));
 			return 0;
@@ -2257,8 +2364,7 @@ class ActionComm extends CommonObject
 		$sql .= " SET percent = ".(int) $percent;
 		$sql .= " WHERE id=".$id;
 
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->db->commit();
 			return 1;
 		} else {
diff --git a/htdocs/comm/action/class/actioncommreminder.class.php b/htdocs/comm/action/class/actioncommreminder.class.php
index 0f43dae13f8..e675c93d472 100644
--- a/htdocs/comm/action/class/actioncommreminder.class.php
+++ b/htdocs/comm/action/class/actioncommreminder.class.php
@@ -146,8 +146,12 @@ class ActionCommReminder extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled)) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 	}
 
 	/**
@@ -225,16 +229,25 @@ class ActionCommReminder extends CommonObject
 		global $langs;
 
 		$labelStatus = $langs->trans('ToDo');
-		if ($status == 1) $labelStatus = $langs->trans('Done');
-		elseif ($status == -1) $labelStatus = $langs->trans('Error');
+		if ($status == 1) {
+			$labelStatus = $langs->trans('Done');
+		} elseif ($status == -1) {
+			$labelStatus = $langs->trans('Error');
+		}
 
 		$labelStatusShort = $langs->trans('ToDo');
-		if ($status == 1) $labelStatus = $langs->trans('Done');
-		elseif ($status == -1) $labelStatus = $langs->trans('Error');
+		if ($status == 1) {
+			$labelStatus = $langs->trans('Done');
+		} elseif ($status == -1) {
+			$labelStatus = $langs->trans('Error');
+		}
 
 		$statusType = 'status5';
-		if ($status == 1) $statusType = 'status4';
-		elseif ($status == -1) $statusType = 'status8';
+		if ($status == 1) {
+			$statusType = 'status4';
+		} elseif ($status == -1) {
+			$statusType = 'status8';
+		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index ca551c51e50..a2961b97974 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -114,34 +114,50 @@ class AgendaEvents extends DolibarrApi
 
 		// case of external user
 		$socid = 0;
-		if (!empty(DolibarrApiAccess::$user->socid)) $socid = DolibarrApiAccess::$user->socid;
+		if (!empty(DolibarrApiAccess::$user->socid)) {
+			$socid = DolibarrApiAccess::$user->socid;
+		}
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
-		if (empty($conf->societe->enabled)) $search_sale = 0; // If module thirdparty not enabled, sale representative is something that does not exists
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
+		if (empty($conf->societe->enabled)) {
+			$search_sale = 0; // If module thirdparty not enabled, sale representative is something that does not exists
+		}
 
 		$sql = "SELECT t.id as rowid";
-		if (!empty($conf->societe->enabled))
-			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if (!empty($conf->societe->enabled)) {
+			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+				$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+			}
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as t";
-		if (!empty($conf->societe->enabled))
-			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if (!empty($conf->societe->enabled)) {
+			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+			}
+		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('agenda').')';
-		if (!empty($conf->societe->enabled))
-			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($user_ids) $sql .= " AND t.fk_user_action IN (".$user_ids.")";
-		if ($socid > 0) $sql .= " AND t.fk_soc = ".$socid;
+		if (!empty($conf->societe->enabled)) {
+			if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+				$sql .= " AND t.fk_soc = sc.fk_soc";
+			}
+		}
+		if ($user_ids) {
+			$sql .= " AND t.fk_user_action IN (".$user_ids.")";
+		}
+		if ($socid > 0) {
+			$sql .= " AND t.fk_soc = ".$socid;
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -150,8 +166,7 @@ class AgendaEvents extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -161,13 +176,11 @@ class AgendaEvents extends DolibarrApi
 
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$i = 0;
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$actioncomm_static = new ActionComm($this->db);
 				if ($actioncomm_static->fetch($obj->rowid)) {
@@ -206,12 +219,12 @@ class AgendaEvents extends DolibarrApi
 			$this->actioncomm->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
-          $lines = array();
-          foreach ($request_data["lines"] as $line) {
-            array_push($lines, (object) $line);
-          }
-          $this->expensereport->lines = $lines;
-        }*/
+		  $lines = array();
+		  foreach ($request_data["lines"] as $line) {
+			array_push($lines, (object) $line);
+		  }
+		  $this->expensereport->lines = $lines;
+		}*/
 		if ($this->actioncomm->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating event", array_merge(array($this->actioncomm->error), $this->actioncomm->errors));
 		}
@@ -251,12 +264,15 @@ class AgendaEvents extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->actioncomm->$field = $value;
 		}
 
-		if ($this->actioncomm->update(DolibarrApiAccess::$user, 1) > 0)
+		if ($this->actioncomm->update(DolibarrApiAccess::$user, 1) > 0) {
 			return $this->get($id);
+		}
 
 		return false;
 	}
@@ -316,8 +332,9 @@ class AgendaEvents extends DolibarrApi
 	{
 		$event = array();
 		foreach (AgendaEvents::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$event[$field] = $data[$field];
 		}
 		return $event;
diff --git a/htdocs/comm/action/class/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 6b02c026575..3b759db4098 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -106,15 +106,16 @@ class CActionComm
 	{
 		$sql = "SELECT id, code, type, libelle as label, color, active, picto";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm";
-		if (is_numeric($id)) $sql .= " WHERE id=".(int) $id;
-		else $sql .= " WHERE code='".$this->db->escape($id)."'";
+		if (is_numeric($id)) {
+			$sql .= " WHERE id=".(int) $id;
+		} else {
+			$sql .= " WHERE code='".$this->db->escape($id)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id      = $obj->id;
@@ -165,62 +166,76 @@ class CActionComm
 		if ($active != '') {
 			$sql .= " AND active=".(int) $active;
 		}
-		if (!empty($excludetype)) $sql .= " AND type <> '".$this->db->escape($excludetype)."'";
-		if ($morefilter) $sql .= " AND ".$morefilter;
+		if (!empty($excludetype)) {
+			$sql .= " AND type <> '".$this->db->escape($excludetype)."'";
+		}
+		if ($morefilter) {
+			$sql .= " AND ".$morefilter;
+		}
 		$sql .= " ORDER BY type, position, module";
 
 		dol_syslog(get_class($this)."::liste_array", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nump = $this->db->num_rows($resql);
-			if ($nump)
-			{
+			if ($nump) {
 				$idforallfornewmodule = 97;
 				$i = 0;
-				while ($i < $nump)
-				{
+				while ($i < $nump) {
 					$obj = $this->db->fetch_object($resql);
 
 					$qualified = 1;
 
 					// $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
-					if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) $qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
-
-					if ($qualified && $obj->module)
-					{
-						if ($obj->module == 'invoice' && !$conf->facture->enabled)	$qualified = 0;
-						if ($obj->module == 'order' && !$conf->commande->enabled) $qualified = 0;
-						if ($obj->module == 'propal' && !$conf->propal->enabled)	  $qualified = 0;
-						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_invoice->enabled))	$qualified = 0;
-						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_order->enabled))	$qualified = 0;
-						if ($obj->module == 'shipping' && !$conf->expedition->enabled)	 $qualified = 0;
+					if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) {
+						$qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
 					}
 
-					if ($qualified)
-					{
+					if ($qualified && $obj->module) {
+						if ($obj->module == 'invoice' && !$conf->facture->enabled) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'order' && !$conf->commande->enabled) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'propal' && !$conf->propal->enabled) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_invoice->enabled)) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !$conf->supplier_order->enabled)) {
+							$qualified = 0;
+						}
+						if ($obj->module == 'shipping' && !$conf->expedition->enabled) {
+							$qualified = 0;
+						}
+					}
+
+					if ($qualified) {
 						$keyfortrans = '';
 						$transcode = '';
 						$code = $obj->code;
 						$typecalendar = $obj->type;
 
-						if ($onlyautoornot > 0 && $typecalendar == 'system') $code = 'AC_MANUAL';
-						elseif ($onlyautoornot > 0 && $typecalendar == 'systemauto') $code = 'AC_AUTO';
-						elseif ($onlyautoornot > 0) $code = 'AC_'.strtoupper($obj->module);
+						if ($onlyautoornot > 0 && $typecalendar == 'system') {
+							$code = 'AC_MANUAL';
+						} elseif ($onlyautoornot > 0 && $typecalendar == 'systemauto') {
+							$code = 'AC_AUTO';
+						} elseif ($onlyautoornot > 0) {
+							$code = 'AC_'.strtoupper($obj->module);
+						}
 
-						if ($shortlabel)
-						{
+						if ($shortlabel) {
 							$keyfortrans = "Action".$code.'Short';
 							$transcode = $langs->trans($keyfortrans);
 						}
-						if (empty($keyfortrans) || $keyfortrans == $transcode)
-						{
+						if (empty($keyfortrans) || $keyfortrans == $transcode) {
 							$keyfortrans = "Action".$code;
 							$transcode = $langs->trans($keyfortrans);
 						}
 						$label = (($transcode != $keyfortrans) ? $transcode : $langs->trans($obj->label));
-						if ($onlyautoornot == -1 && !empty($conf->global->AGENDA_USE_EVENT_TYPE))
-						{
+						if ($onlyautoornot == -1 && !empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 							if ($typecalendar == 'system') {
 								$label = '&nbsp;&nbsp; '.$label;
 								$repid[-99] = $langs->trans("ActionAC_MANUAL");
@@ -252,9 +267,13 @@ class CActionComm
 				}
 			}
 
-			if ($idorcode == 'id') $this->liste_array = $repid;
-			elseif ($idorcode == 'code') $this->liste_array = $repcode;
-			else $this->liste_array = $repall;
+			if ($idorcode == 'id') {
+				$this->liste_array = $repid;
+			} elseif ($idorcode == 'code') {
+				$this->liste_array = $repcode;
+			} else {
+				$this->liste_array = $repall;
+			}
 
 			return $this->liste_array;
 		} else {
@@ -276,6 +295,8 @@ class CActionComm
 
 		// Check if translation available
 		$transcode = $langs->trans("Action".$this->code);
-		if ($transcode != "Action".$this->code) return $transcode;
+		if ($transcode != "Action".$this->code) {
+			return $transcode;
+		}
 	}
 }
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 4789e49f44a..5449975e777 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -62,8 +62,7 @@ class ICal
 		$file_text = '';
 
 		$tmparray = file($file);
-		if (is_array($tmparray))
-		{
+		if (is_array($tmparray)) {
 			$file_text = join("", $tmparray); //load file
 			$file_text = preg_replace("/[\r\n]{1,} /", "", $file_text);
 		}
@@ -112,21 +111,20 @@ class ICal
 		$this->file_text = preg_split("[\n]", $this->file_text);
 
 		// is this text vcalendar standard text ? on line 1 is BEGIN:VCALENDAR
-		if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) return 'error not VCALENDAR';
+		if (!stristr($this->file_text[0], 'BEGIN:VCALENDAR')) {
+			return 'error not VCALENDAR';
+		}
 
 		$insidealarm = 0;
 		$tmpkey = ''; $tmpvalue = ''; $type = '';
-		foreach ($this->file_text as $text)
-		{
+		foreach ($this->file_text as $text) {
 			$text = trim($text); // trim one line
-			if (!empty($text))
-			{
+			if (!empty($text)) {
 				// get Key and Value VCALENDAR:Begin -> Key = VCALENDAR, Value = begin
 				list($key, $value) = $this->retun_key_value($text);
 				//var_dump($text.' -> '.$key.' - '.$value);
 
-				switch ($text) // search special string
-				{
+				switch ($text) { // search special string
 					case "BEGIN:VTODO":
 						$this->todo_count = $this->todo_count + 1; // new to do begin
 						$type = "VTODO";
@@ -152,7 +150,6 @@ class ICal
 					case "END:VTODO": // end special text - goto VCALENDAR key
 					case "END:VEVENT":
 					case "END:VFREEBUSY":
-
 					case "END:VCALENDAR":
 					case "END:DAYLIGHT":
 					case "END:VTIMEZONE":
@@ -169,27 +166,25 @@ class ICal
 						break;
 
 					default: // no special string (SUMMARY, DESCRIPTION, ...)
-						if ($tmpvalue)
-						{
+						if ($tmpvalue) {
 							$tmpvalue .= $text;
-							if (!preg_match('/=$/', $text))	// No more lines
-							{
+							if (!preg_match('/=$/', $text)) {	// No more lines
 								$key = $tmpkey;
 								$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue));
 								$tmpkey = '';
 								$tmpvalue = '';
 							}
-						} elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value))
-						{
-							if (preg_match('/=$/', $value))
-							{
+						} elseif (preg_match('/^ENCODING=QUOTED-PRINTABLE:/i', $value)) {
+							if (preg_match('/=$/', $value)) {
 								$tmpkey = $key;
 								$tmpvalue = $tmpvalue.preg_replace('/=$/', "", $value); // We must wait to have next line to have complete message
 							} else {
 								$value = quotedPrintDecode(preg_replace('/^ENCODING=QUOTED-PRINTABLE:/i', '', $tmpvalue.$value));
 							}
 						}                    	//$value=quotedPrintDecode($tmpvalue.$value);
-						if (!$insidealarm && !$tmpkey) $this->add_to_array($type, $key, $value); // add to array
+						if (!$insidealarm && !$tmpkey) {
+							$this->add_to_array($type, $key, $value); // add to array
+						}
 						break;
 				}
 			}
@@ -214,32 +209,35 @@ class ICal
 
 		//print 'type='.$type.' key='.$key.' value='.$value.'<br>'."\n";
 
-		if (empty($key))
-		{
+		if (empty($key)) {
 			$key = $this->last_key;
-			switch ($type)
-			{
-				case 'VEVENT': $value = $this->cal[$type][$this->event_count][$key].$value; break;
-				case 'VFREEBUSY': $value = $this->cal[$type][$this->freebusy_count][$key].$value; break;
-				case 'VTODO': $value = $this->cal[$type][$this->todo_count][$key].$value; break;
+			switch ($type) {
+				case 'VEVENT':
+					$value = $this->cal[$type][$this->event_count][$key].$value;
+					break;
+				case 'VFREEBUSY':
+					$value = $this->cal[$type][$this->freebusy_count][$key].$value;
+					break;
+				case 'VTODO':
+					$value = $this->cal[$type][$this->todo_count][$key].$value;
+					break;
 			}
 		}
 
-		if (($key == "DTSTAMP") || ($key == "LAST-MODIFIED") || ($key == "CREATED")) $value = $this->ical_date_to_unix($value);
+		if (($key == "DTSTAMP") || ($key == "LAST-MODIFIED") || ($key == "CREATED")) {
+			$value = $this->ical_date_to_unix($value);
+		}
 		//if ($key == "RRULE" ) $value = $this->ical_rrule($value);
 
-		if (stristr($key, "DTSTART") || stristr($key, "DTEND") || stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
-		{
-			if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE"))
-			{
+		if (stristr($key, "DTSTART") || stristr($key, "DTEND") || stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE")) {
+			if (stristr($key, "DTSTART;VALUE=DATE") || stristr($key, "DTEND;VALUE=DATE")) {
 				list($key, $value) = array($key, $value);
 			} else {
 				list($key, $value) = $this->ical_dt_date($key, $value);
 			}
 		}
 
-		switch ($type)
-		{
+		switch ($type) {
 			case "VTODO":
 				$this->cal[$type][$this->todo_count][$key] = $value;
 				break;
@@ -270,17 +268,17 @@ class ICal
 	{
 		// phpcs:enable
 		/*
-        preg_match("/([^:]+)[:]([\w\W]+)/", $text, $matches);
+		preg_match("/([^:]+)[:]([\w\W]+)/", $text, $matches);
 
-        if (empty($matches))
-        {
-            return array(false,$text);
-        }
-        else
-        {
-            $matches = array_splice($matches, 1, 2);
-            return $matches;
-        }*/
+		if (empty($matches))
+		{
+			return array(false,$text);
+		}
+		else
+		{
+			$matches = array_splice($matches, 1, 2);
+			return $matches;
+		}*/
 		return explode(':', $text, 2);
 	}
 
@@ -296,8 +294,7 @@ class ICal
 		// phpcs:enable
 		$result = array();
 		$rrule = explode(';', $value);
-		foreach ($rrule as $line)
-		{
+		foreach ($rrule as $line) {
 			$rcontent = explode('=', $line);
 			$result[$rcontent[0]] = $rcontent[1];
 		}
@@ -319,8 +316,9 @@ class ICal
 
 		$ntime = 0;
 		// TIME LIMITED EVENT
-		if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})([0-9]{0,2})/', $ical_date, $date))
+		if (preg_match('/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{0,2})([0-9]{0,2})([0-9]{0,2})/', $ical_date, $date)) {
 			$ntime = dol_mktime($date[4], $date[5], $date[6], $date[2], $date[3], $date[1], true);
+		}
 
 		//if (empty($date[4])) print 'Error bad date: '.$ical_date.' - date1='.$date[1];
 		//print dol_print_date($ntime,'dayhour');exit;
@@ -344,8 +342,7 @@ class ICal
 		// Analyse TZID
 		$temp = explode(";", $key);
 
-		if (empty($temp[1])) // not TZID
-		{
+		if (empty($temp[1])) { // not TZID
 			$value = str_replace('T', '', $value);
 			return array($key, $value);
 		}
@@ -368,8 +365,7 @@ class ICal
 	{
 		// phpcs:enable
 		$temp = $this->get_event_list();
-		if (!empty($temp))
-		{
+		if (!empty($temp)) {
 			usort($temp, array(&$this, "ical_dtstart_compare"));
 			return $temp;
 		} else {
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 2d0c1dc8133..6739d277192 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -34,7 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'commercial', 'other', 'bills'));
@@ -45,9 +47,10 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
-if ($user->socid > 0)
-{
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if ($user->socid > 0) {
 	unset($_GET["action"]);
 	$action = '';
 }
@@ -55,8 +58,7 @@ $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|
 
 $object = new ActionComm($db);
 
-if ($id > 0)
-{
+if ($id > 0) {
 	$ret = $object->fetch($id);
 	$object->fetch_thirdparty();
 }
@@ -66,12 +68,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $upload_dir = $conf->agenda->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'actions';
@@ -93,22 +101,24 @@ $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('', $langs->trans("Agenda"), $help_url);
 
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$result1 = $object->fetch($id);
 	$result2 = $object->fetch_thirdparty();
 	$result3 = $object->fetch_contact();
 	$result4 = $object->fetch_userassigned();
 	$result5 = $object->fetch_optionals();
 
-	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
-	{
+	if ($result1 < 0 || $result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0) {
 		dol_print_error($db, $object->error);
 		exit;
 	}
 
-	if ($object->authorid > 0) { $tmpuser = new User($db); $res = $tmpuser->fetch($object->authorid); $object->author = $tmpuser; }
-	if ($object->usermodid > 0) { $tmpuser = new User($db); $res = $tmpuser->fetch($object->usermodid); $object->usermod = $tmpuser; }
+	if ($object->authorid > 0) {
+		$tmpuser = new User($db); $res = $tmpuser->fetch($object->authorid); $object->author = $tmpuser;
+	}
+	if ($object->usermodid > 0) {
+		$tmpuser = new User($db); $res = $tmpuser->fetch($object->usermodid); $object->usermod = $tmpuser;
+	}
 
 	$author = new User($db);
 	$author->fetch($object->author->id);
@@ -142,8 +152,7 @@ if ($object->id > 0)
 	// Thirdparty
 	//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		$morehtmlref .= $langs->trans('Project').': ';
@@ -153,7 +162,9 @@ if ($object->id > 0)
 			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
 			$morehtmlref .= $proj->ref;
 			$morehtmlref .= '</a>';
-			if ($proj->title) $morehtmlref .= ' - '.$proj->title;
+			if ($proj->title) {
+				$morehtmlref .= ' - '.$proj->title;
+			}
 		} else {
 			$morehtmlref .= '';
 		}
@@ -170,8 +181,7 @@ if ($object->id > 0)
 	print '<table class="border tableforfield centpercent">';
 
 	// Type
-	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	{
+	if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 		print '<tr><td class="titlefield">'.$langs->trans("Type").'</td><td colspan="3">'.$object->type.'</td></tr>';
 	}
 
@@ -180,44 +190,53 @@ if ($object->id > 0)
 
 	// Date start
 	print '<tr><td>'.$langs->trans("DateActionStart").'</td><td colspan="3">';
-	if (!$object->fulldayevent) print dol_print_date($object->datep, 'dayhour');
-	else print dol_print_date($object->datep, 'day');
-	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
+	if (!$object->fulldayevent) {
+		print dol_print_date($object->datep, 'dayhour');
+	} else {
+		print dol_print_date($object->datep, 'day');
+	}
+	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) {
+		print img_warning($langs->trans("Late"));
+	}
 	print '</td>';
 	print '</tr>';
 
 	// Date end
 	print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td colspan="3">';
-	if (!$object->fulldayevent) print dol_print_date($object->datef, 'dayhour');
-	else print dol_print_date($object->datef, 'day');
-	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now - $delay_warning)) print img_warning($langs->trans("Late"));
+	if (!$object->fulldayevent) {
+		print dol_print_date($object->datef, 'dayhour');
+	} else {
+		print dol_print_date($object->datef, 'day');
+	}
+	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now - $delay_warning)) {
+		print img_warning($langs->trans("Late"));
+	}
 	print '</td></tr>';
 
 	// Location
-	if (empty($conf->global->AGENDA_DISABLE_LOCATION))
-	{
+	if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
 		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3">'.$object->location.'</td></tr>';
 	}
 
 	// Assigned to
 	print '<tr><td class="nowrap">'.$langs->trans("ActionAffectedTo").'</td><td colspan="3">';
 	$listofuserid = array();
-	if (empty($donotclearsession))
-	{
-		if ($object->userownerid > 0) $listofuserid[$object->userownerid] = array('id'=>$object->userownerid, 'transparency'=>$object->transparency); // Owner first
-		if (!empty($object->userassigned))	// Now concat assigned users
-		{
+	if (empty($donotclearsession)) {
+		if ($object->userownerid > 0) {
+			$listofuserid[$object->userownerid] = array('id'=>$object->userownerid, 'transparency'=>$object->transparency); // Owner first
+		}
+		if (!empty($object->userassigned)) {	// Now concat assigned users
 			// Restore array with key with same value than param 'id'
 			$tmplist1 = $object->userassigned;
-			foreach ($tmplist1 as $key => $val)
-			{
-				if ($val['id'] && $val['id'] != $object->userownerid) $listofuserid[$val['id']] = $val;
+			foreach ($tmplist1 as $key => $val) {
+				if ($val['id'] && $val['id'] != $object->userownerid) {
+					$listofuserid[$val['id']] = $val;
+				}
 			}
 		}
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
 	} else {
-		if (!empty($_SESSION['assignedtouser']))
-		{
+		if (!empty($_SESSION['assignedtouser'])) {
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
 		}
 	}
@@ -241,8 +260,7 @@ if ($object->id > 0)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index f9274189109..a125dc466f8 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -40,9 +40,13 @@ if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
-if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
+	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+}
 
-if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB = 5;
+if (empty($conf->global->AGENDA_EXT_NB)) {
+	$conf->global->AGENDA_EXT_NB = 5;
+}
 $MAXAGENDA = $conf->global->AGENDA_EXT_NB;
 
 $filter = GETPOST("search_filter", 'alpha', 3) ?GETPOST("search_filter", 'alpha', 3) : GETPOST("filter", 'alpha', 3);
@@ -51,31 +55,43 @@ $usergroup = GETPOST("search_usergroup", "int", 3) ?GETPOST("search_usergroup",
 $showbirthday = empty($conf->use_javascript_ajax) ?GETPOST("showbirthday", "int") : 1;
 
 // If not choice done on calendar owner (like on left menu link "Agenda"), we filter on user.
-if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
-{
+if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 	$filtert = $user->id;
 }
 
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "a.datec";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "a.datec";
+}
 
 // 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;
 }
 
@@ -92,28 +108,34 @@ $maxprint = (isset($_GET["maxprint"]) ?GETPOST("maxprint") : $conf->global->AGEN
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
-if ($dateselect > 0)
-{
+if ($dateselect > 0) {
 	$day = GETPOST('dateselectday', 'int');
 	$month = GETPOST('dateselectmonth', 'int');
 	$year = GETPOST('dateselectyear', 'int');
 }
 
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('search_actioncode', 'array'))
-{
+if (GETPOST('search_actioncode', 'array')) {
 	$actioncode = GETPOST('search_actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	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);
+}
 
-if ($status == '' && !GETPOSTISSET('search_status')) $status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if ($status == '' && !GETPOSTISSET('search_status')) {
+	$status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+}
 
 $defaultview = (empty($conf->global->AGENDA_DEFAULT_VIEW) ? 'show_month' : $conf->global->AGENDA_DEFAULT_VIEW);
 $defaultview = (empty($user->conf->AGENDA_DEFAULT_VIEW) ? $defaultview : $user->conf->AGENDA_DEFAULT_VIEW);
-if (empty($action) && !GETPOSTISSET('action')) $action = $defaultview;
+if (empty($action) && !GETPOSTISSET('action')) {
+	$action = $defaultview;
+}
 if ($action == 'default') {	// When action is default, we want a calendar view and not the list
 	$action = (($defaultview != 'show_list') ? $defaultview : 'show_month');
 }
@@ -138,31 +160,31 @@ $hookmanager->initHooks(array('agenda'));
  * Actions
  */
 
-if (GETPOST("viewlist", 'alpha') || $action == 'show_list')
-{
+if (GETPOST("viewlist", 'alpha') || $action == 'show_list') {
 	$param = '';
-	if (is_array($_POST))
-	{
-		foreach ($_POST as $key => $val)
-		{
-			if ($key == 'token') continue;
+	if (is_array($_POST)) {
+		foreach ($_POST as $key => $val) {
+			if ($key == 'token') {
+				continue;
+			}
 			$param .= '&'.$key.'='.urlencode($val);
 		}
 	}
-	if (!preg_match('/action=/', $param)) $param .= ($param ? '&' : '').'action=show_list';
+	if (!preg_match('/action=/', $param)) {
+		$param .= ($param ? '&' : '').'action=show_list';
+	}
 	//print $param;
 	header("Location: ".DOL_URL_ROOT.'/comm/action/list.php?'.$param);
 	exit;
 }
 
-if (GETPOST("viewperuser", 'alpha') || $action == 'show_peruser')
-{
+if (GETPOST("viewperuser", 'alpha') || $action == 'show_peruser') {
 	$param = '';
-	if (is_array($_POST))
-	{
-		foreach ($_POST as $key => $val)
-		{
-			if ($key == 'token') continue;
+	if (is_array($_POST)) {
+		foreach ($_POST as $key => $val) {
+			if ($key == 'token') {
+				continue;
+			}
 			$param .= '&'.$key.'='.urlencode($val);
 		}
 	}
@@ -171,8 +193,7 @@ if (GETPOST("viewperuser", 'alpha') || $action == 'show_peruser')
 	exit;
 }
 
-if ($action == 'delete_action')
-{
+if ($action == 'delete_action') {
 	$event = new ActionComm($db);
 	$event->fetch($actionid);
 	$event->fetch_optionals();
@@ -205,7 +226,9 @@ $parameters = array(
 	'usergroup' => $usergroup,
 );
 $reshook = $hookmanager->executeHooks('beforeAgenda', $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');
+}
 
 $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&oacute;dulo_Agenda';
 llxHeader('', $langs->trans("Agenda"), $help_url);
@@ -224,30 +247,25 @@ $nowday = $nowarray['mday'];
 $listofextcals = array();
 
 // Define list of external calendars (global admin setup)
-if (empty($conf->global->AGENDA_DISABLE_EXT))
-{
+if (empty($conf->global->AGENDA_DISABLE_EXT)) {
 	$i = 0;
-	while ($i < $MAXAGENDA)
-	{
+	while ($i < $MAXAGENDA) {
 		$i++;
 		$source = 'AGENDA_EXT_SRC'.$i;
 		$name = 'AGENDA_EXT_NAME'.$i;
 		$offsettz = 'AGENDA_EXT_OFFSETTZ'.$i;
 		$color = 'AGENDA_EXT_COLOR'.$i;
 		$buggedfile = 'AGENDA_EXT_BUGGEDFILE'.$i;
-		if (!empty($conf->global->$source) && !empty($conf->global->$name))
-		{
+		if (!empty($conf->global->$source) && !empty($conf->global->$name)) {
 			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
 			$listofextcals[] = array('src'=>$conf->global->$source, 'name'=>$conf->global->$name, 'offsettz'=>$conf->global->$offsettz, 'color'=>$conf->global->$color, 'buggedfile'=>(isset($conf->global->buggedfile) ? $conf->global->buggedfile : 0));
 		}
 	}
 }
 // Define list of external calendars (user setup)
-if (empty($user->conf->AGENDA_DISABLE_EXT))
-{
+if (empty($user->conf->AGENDA_DISABLE_EXT)) {
 	$i = 0;
-	while ($i < $MAXAGENDA)
-	{
+	while ($i < $MAXAGENDA) {
 		$i++;
 		$source = 'AGENDA_EXT_SRC_'.$user->id.'_'.$i;
 		$name = 'AGENDA_EXT_NAME_'.$user->id.'_'.$i;
@@ -255,16 +273,14 @@ if (empty($user->conf->AGENDA_DISABLE_EXT))
 		$color = 'AGENDA_EXT_COLOR_'.$user->id.'_'.$i;
 		$enabled = 'AGENDA_EXT_ENABLED_'.$user->id.'_'.$i;
 		$buggedfile = 'AGENDA_EXT_BUGGEDFILE_'.$user->id.'_'.$i;
-		if (!empty($user->conf->$source) && !empty($user->conf->$name))
-		{
+		if (!empty($user->conf->$source) && !empty($user->conf->$name)) {
 			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
 			$listofextcals[] = array('src'=>$user->conf->$source, 'name'=>$user->conf->$name, 'offsettz'=>$user->conf->$offsettz, 'color'=>$user->conf->$color, 'buggedfile'=>(isset($user->conf->buggedfile) ? $user->conf->buggedfile : 0));
 		}
 	}
 }
 
-if (empty($action) || $action == 'show_month')
-{
+if (empty($action) || $action == 'show_month') {
 	$prev = dol_get_prev_month($month, $year);
 	$prev_year  = $prev['year'];
 	$prev_month = $prev['month'];
@@ -277,15 +293,18 @@ if (empty($action) || $action == 'show_month')
 	// tmpday is a negative or null cursor to know how many days before the 1st to show on month view (if tmpday=0, 1st is monday)
 	$tmpday = -date("w", dol_mktime(12, 0, 0, $month, 1, $year, 'gmt')) + 2; // date('w') is 0 fo sunday
 	$tmpday += ((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1) - 1);
-	if ($tmpday >= 1) $tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
+	if ($tmpday >= 1) {
+		$tmpday -= 7; // If tmpday is 0 we start with sunday, if -6, we start with monday of previous week.
+	}
 	// Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
 	$firstdaytoshow = dol_mktime(0, 0, 0, $prev_month, $max_day_in_prev_month + $tmpday, $prev_year, 'tzuserrel');
 	$next_day = 7 - ($max_day_in_month + 1 - $tmpday) % 7;
-	if ($next_day < 6) $next_day += 7;
+	if ($next_day < 6) {
+		$next_day += 7;
+	}
 	$lastdaytoshow = dol_mktime(0, 0, 0, $next_month, $next_day, $next_year, 'tzuserrel');
 }
-if ($action == 'show_week')
-{
+if ($action == 'show_week') {
 	$prev = dol_get_first_day_week($day, $month, $year);
 	$prev_year  = $prev['prev_year'];
 	$prev_month = $prev['prev_month'];
@@ -310,8 +329,7 @@ if ($action == 'show_week')
 
 	$tmpday = $first_day;
 }
-if ($action == 'show_day')
-{
+if ($action == 'show_day') {
 	$prev = dol_get_prev_day($day, $month, $year);
 	$prev_year  = $prev['year'];
 	$prev_month = $prev['month'];
@@ -338,24 +356,47 @@ if ($status == 'todo') $title = $langs->trans("ToDoActions");
 $param = '';
 if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	if (is_array($actioncode)) {
-		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
-	} else $param .= "&search_actioncode=".urlencode($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 ($status || GETPOSTISSET('status')) {
+	$param .= "&search_status=".urlencode($status);
+}
+if ($filter) {
+	$param .= "&search_filter=".urlencode($filter);
+}
+if ($filtert) {
+	$param .= "&search_filtert=".urlencode($filtert);
+}
+if ($usergroup > 0) {
+	$param .= "&search_usergroup=".urlencode($usergroup);
+}
+if ($socid > 0) {
+	$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 ($action == 'show_day' || $action == 'show_week' || $action == 'show_month') {
+	$param .= '&action='.urlencode($action);
 }
-if ($resourceid > 0)  $param .= "&search_resourceid=".urlencode($resourceid);
-if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status);
-if ($filter)       $param .= "&search_filter=".urlencode($filter);
-if ($filtert)      $param .= "&search_filtert=".urlencode($filtert);
-if ($usergroup > 0) $param .= "&search_usergroup=".urlencode($usergroup);
-if ($socid > 0)     $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 ($action == 'show_day' || $action == 'show_week' || $action == 'show_month') $param .= '&action='.urlencode($action);
 $param .= "&maxprint=".urlencode($maxprint);
 
 // Show navigation bar
-if (empty($action) || $action == 'show_month')
-{
+if (empty($action) || $action == 'show_month') {
 	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month.$param."\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");
 	$nav .= " </span>\n";
@@ -365,8 +406,7 @@ if (empty($action) || $action == 'show_month')
 	}
 	$picto = 'calendar';
 }
-if ($action == 'show_week')
-{
+if ($action == 'show_week') {
 	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."\"><i class=\"fa fa-chevron-left\" title=\"".dol_escape_htmltag($langs->trans("Previous"))."\"></i></a> &nbsp;\n";
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
 	$nav .= " </span>\n";
@@ -376,8 +416,7 @@ if ($action == 'show_week')
 	}
 	$picto = 'calendarweek';
 }
-if ($action == 'show_day')
-{
+if ($action == 'show_day') {
 	$nav = "<a href=\"?year=".$prev_year."&month=".$prev_month."&day=".$prev_day.$param."aaa\"><i class=\"fa fa-chevron-left\"></i></a> &nbsp;\n";
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");
 	$nav .= " </span>\n";
@@ -415,7 +454,9 @@ $paramnoactionodate = preg_replace('/action=[a-z_]+/', '', $paramnodate);
 $head = calendars_prepare_head($paramnoaction);
 
 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 dol_get_fiche_head($head, $tabactive, $langs->trans('Agenda'), 0, 'action');
@@ -466,8 +507,7 @@ if (empty($reshook)) {
 
 
 $newcardbutton = '';
-if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
-{
+if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
 
 	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
@@ -482,15 +522,13 @@ $s = ''; $link = '';
 
 $showextcals = $listofextcals;
 
-if (!empty($conf->use_javascript_ajax))	// If javascript on
-{
+if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	$s .= "\n".'<!-- Div to calendars selectors -->'."\n";
 	$s .= '<script type="text/javascript">'."\n";
 	$s .= 'jQuery(document).ready(function () {'."\n";
 	$s .= 'jQuery(".check_birthday").click(function() { console.log("Toggle birthdays"); jQuery(".family_birthday").toggle(); });'."\n";
 	$s .= 'jQuery(".check_holiday").click(function() { console.log("Toggle holidays"); jQuery(".family_holiday").toggle(); });'."\n";
-	if ($action == "show_week" || $action == "show_month" || empty($action))
-	{
+	if ($action == "show_week" || $action == "show_month" || empty($action)) {
 		// Code to enable drag and drop
 		$s .= 'jQuery( "div.sortable" ).sortable({connectWith: ".sortable", placeholder: "ui-state-highlight", items: "div.movable", receive: function( event, ui ) {'."\n";
 		// Code to submit form
@@ -514,8 +552,7 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
 	$s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_holiday" name="check_holiday" class="check_holiday"><label for="check_holiday"> <span class="check_holiday_text">'.$langs->trans("Holidays").'</span></label> &nbsp; </div>';
 
 	// External calendars
-	if (is_array($showextcals) && count($showextcals) > 0)
-	{
+	if (is_array($showextcals) && count($showextcals) > 0) {
 		$s .= '<script type="text/javascript">'."\n";
 		$s .= 'jQuery(document).ready(function () {
 				jQuery("div input[name^=\"check_ext\"]").click(function() {
@@ -525,8 +562,7 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
 			});' . "\n";
 		$s .= '</script>'."\n";
 
-		foreach ($showextcals as $val)
-		{
+		foreach ($showextcals as $val) {
 			$htmlname = md5($val['name']);
 			$s .= '<div class="nowrap inline-block"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" checked> <label for="check_ext'.$htmlname.'">'.$val['name'].'</label> &nbsp; </div>';
 		}
@@ -538,11 +574,9 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
 	// Calendars from hooks
 	$parameters = array(); $object = null;
 	$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		$s .= $hookmanager->resPrint;
-	} elseif ($reshook > 1)
-	{
+	} elseif ($reshook > 1) {
 		$s = $hookmanager->resPrint;
 	}
 
@@ -551,12 +585,17 @@ if (!empty($conf->use_javascript_ajax))	// If javascript on
 {
 	$newparam = $param; // newparam is for birthday links
 	$newparam = preg_replace('/showbirthday=[0-1]/i', 'showbirthday='.(empty($showbirthday) ? 1 : 0), $newparam);
-	if (!preg_match('/showbirthday=/i', $newparam)) $newparam .= '&showbirthday=1';
+	if (!preg_match('/showbirthday=/i', $newparam)) {
+		$newparam .= '&showbirthday=1';
+	}
 	$link = '<a href="'.dol_escape_htmltag($_SERVER['PHP_SELF']);
 	$link .= '?'.dol_escape_htmltag($newparam);
 	$link .= '">';
-	if (empty($showbirthday)) $link .= $langs->trans("AgendaShowBirthdayEvents");
-	else $link .= $langs->trans("AgendaHideBirthdayEvents");
+	if (empty($showbirthday)) {
+		$link .= $langs->trans("AgendaShowBirthdayEvents");
+	} else {
+		$link .= $langs->trans("AgendaHideBirthdayEvents");
+	}
 	$link .= '</a>';
 }
 
@@ -567,7 +606,9 @@ $eventarray = array();
 
 // DEFAULT CALENDAR + AUTOEVENT CALENDAR + CONFERENCEBOOTH CALENDAR
 $sql = 'SELECT ';
-if ($usergroup > 0) $sql .= " DISTINCT";
+if ($usergroup > 0) {
+	$sql .= " DISTINCT";
+}
 $sql .= ' a.id, a.label,';
 $sql .= ' a.datep,';
 $sql .= ' a.datep2,';
@@ -578,31 +619,44 @@ $sql .= ' a.fk_soc, a.fk_contact, a.fk_project,';
 $sql .= ' a.fk_element, a.elementtype,';
 $sql .= ' ca.code as type_code, ca.libelle as type_label, ca.color as type_color, ca.type as type_type, ca.picto as type_picto';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-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";
+}
 // 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 a.fk_action = ca.id';
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
-if (!empty($actioncode))
-{
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	{
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
-			if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
-			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
+if (!empty($actioncode)) {
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
+			if ($actioncode == 'AC_OTH') {
+				$sql .= " AND ca.type != 'systemauto'";
+			}
+			if ($actioncode == 'AC_OTH_AUTO') {
+				$sql .= " AND ca.type = 'systemauto'";
+			}
 		}
 	} else {
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
-			if (is_array($actioncode))
-			{
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
+			if (is_array($actioncode)) {
 				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
 			} else {
 				$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
@@ -610,15 +664,24 @@ if (!empty($actioncode))
 		}
 	}
 }
-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 a.fk_soc = '.$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 a.fk_soc = '.$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 ($filtert > 0 || $usergroup > 0) {
+	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
 //var_dump($day.' '.$month.' '.$year);
-if ($action == 'show_day')
-{
+if ($action == 'show_day') {
 	$sql .= " AND (";
 	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
 	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
@@ -642,18 +705,33 @@ if ($action == 'show_day')
 	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, $month, 28, $year) + (60 * 60 * 24 * 10))."')";
 	$sql .= ')';
 }
-if ($type) $sql .= " AND ca.id = ".$type;
-if ($status == '0') { $sql .= " AND a.percent = 0"; }
-if ($status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
-if ($status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
-if ($status == 'done' || $status == '100') { $sql .= " AND (a.percent = 100)"; }
-if ($status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
+if ($type) {
+	$sql .= " AND ca.id = ".$type;
+}
+if ($status == '0') {
+	$sql .= " AND a.percent = 0";
+}
+if ($status == '-1') {
+	$sql .= " AND a.percent = -1";
+}	// Not applicable
+if ($status == '50') {
+	$sql .= " AND (a.percent > 0 AND a.percent < 100)";
+}	// Running already started
+if ($status == 'done' || $status == '100') {
+	$sql .= " AND (a.percent = 100)";
+}
+if ($status == 'todo') {
+	$sql .= " AND (a.percent >= 0 AND a.percent < 100)";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0)
-{
+if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND (";
-	if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
-	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	if ($filtert > 0) {
+		$sql .= "ar.fk_element = ".$filtert;
+	}
+	if ($usergroup > 0) {
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	}
 	$sql .= ")";
 }
 // Sort on date
@@ -663,19 +741,16 @@ $sql .= ' ORDER BY datep';
 
 dol_syslog("comm/action/index.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$MAXONSAMEPAGE = 10000; // Useless to have more. Protection to avoid memory overload when high number of event (for example after a mass import)
 	$i = 0;
-	while ($i < $num && $i < $MAXONSAMEPAGE)
-	{
+	while ($i < $num && $i < $MAXONSAMEPAGE) {
 		$obj = $db->fetch_object($resql);
 
 		// Discard auto action if option is on
-		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO')
-		{
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO') {
 			$i++;
 			continue;
 		}
@@ -720,11 +795,13 @@ if ($resql)
 		// Defined date_start_in_calendar and date_end_in_calendar property
 		// They are date start and end of action but modified to not be outside calendar view.
 		$event->date_start_in_calendar = $event->datep;
-		if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar = $event->datef;
-		else $event->date_end_in_calendar = $event->datep;
+		if ($event->datef != '' && $event->datef >= $event->datep) {
+			$event->date_end_in_calendar = $event->datef;
+		} else {
+			$event->date_end_in_calendar = $event->datep;
+		}
 		// Define ponctual property
-		if ($event->date_start_in_calendar == $event->date_end_in_calendar)
-		{
+		if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
 			$event->ponctuel = 1;
 		}
 
@@ -732,8 +809,12 @@ if ($resql)
 		if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow)	{
 			// This record is out of visible range
 		} else {
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-			if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+			if ($event->date_start_in_calendar < $firstdaytoshow) {
+				$event->date_start_in_calendar = $firstdaytoshow;
+			}
+			if ($event->date_end_in_calendar >= $lastdaytoshow) {
+				$event->date_end_in_calendar = ($lastdaytoshow - 1);
+			}
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
@@ -753,7 +834,9 @@ if ($resql)
 				$j++;
 
 				$daykey += 60 * 60 * 24;
-				if ($daykey > $event->date_end_in_calendar) $loop = false;
+				if ($daykey > $event->date_end_in_calendar) {
+					$loop = false;
+				}
 			} while ($loop);
 
 			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
@@ -767,15 +850,13 @@ if ($resql)
 
 // BIRTHDATES CALENDAR
 // Complete $eventarray with birthdates
-if ($showbirthday)
-{
+if ($showbirthday) {
 	// Add events in array
 	$sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
 	$sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.$user->id.'))';
 	$sql .= " AND sp.entity IN (".getEntity('socpeople').")";
-	if ($action == 'show_day')
-	{
+	if ($action == 'show_day') {
 		$sql .= ' AND MONTH(birthday) = '.$month;
 		$sql .= ' AND DAY(birthday) = '.$day;
 	} else {
@@ -785,12 +866,10 @@ if ($showbirthday)
 
 	dol_syslog("comm/action/index.php", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			$event = new ActionComm($db);
@@ -859,13 +938,11 @@ if ($action == 'show_day') {
 }
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i   = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		$event = new ActionComm($db);
@@ -885,21 +962,17 @@ if ($resql)
 		$event->date_start_in_calendar  = $event->datep;
 		$event->date_end_in_calendar    = $event->datef;
 
-		if ($obj->status == 3)
-		{
+		if ($obj->status == 3) {
 			// Show no symbol for leave with state "leave approved"
 			$event->percentage = -1;
-		} elseif ($obj->status == 2)
-		{
+		} elseif ($obj->status == 2) {
 			// Show TO-DO symbol for leave with state "leave wait for approval"
 			$event->percentage = 0;
 		}
 
-		if ($obj->halfday == 1)
-		{
+		if ($obj->halfday == 1) {
 			$event->label = $obj->lastname.' ('.$langs->trans("Morning").')';
-		} elseif ($obj->halfday == -1)
-		{
+		} elseif ($obj->halfday == -1) {
 			$event->label = $obj->lastname.' ('.$langs->trans("Afternoon").')';
 		} else {
 			$event->label = $obj->lastname;
@@ -923,11 +996,9 @@ if ($resql)
 
 // EXTERNAL CALENDAR
 // Complete $eventarray with external import Ical
-if (count($listofextcals))
-{
+if (count($listofextcals)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/ical.class.php';
-	foreach ($listofextcals as $extcal)
-	{
+	foreach ($listofextcals as $extcal) {
 		$url = $extcal['src']; // Example: https://www.google.com/calendar/ical/eldy10%40gmail.com/private-cde92aa7d7e0ef6110010a821a2aaeb/basic.ics
 		$namecal = $extcal['name'];
 		$offsettz = $extcal['offsettz'];
@@ -940,29 +1011,27 @@ if (count($listofextcals))
 		// After this $ical->cal['VEVENT'] contains array of events, $ical->cal['DAYLIGHT'] contains daylight info, $ical->cal['STANDARD'] contains non daylight info, ...
 		//var_dump($ical->cal); exit;
 		$icalevents = array();
-		if (is_array($ical->get_event_list())) $icalevents = array_merge($icalevents, $ical->get_event_list()); // Add $ical->cal['VEVENT']
-		if (is_array($ical->get_freebusy_list())) $icalevents = array_merge($icalevents, $ical->get_freebusy_list()); // Add $ical->cal['VFREEBUSY']
+		if (is_array($ical->get_event_list())) {
+			$icalevents = array_merge($icalevents, $ical->get_event_list()); // Add $ical->cal['VEVENT']
+		}
+		if (is_array($ical->get_freebusy_list())) {
+			$icalevents = array_merge($icalevents, $ical->get_freebusy_list()); // Add $ical->cal['VFREEBUSY']
+		}
 
-		if (count($icalevents) > 0)
-		{
+		if (count($icalevents) > 0) {
 			// Duplicate all repeatable events into new entries
 			$moreicalevents = array();
-			foreach ($icalevents as $icalevent)
-			{
-				if (isset($icalevent['RRULE']) && is_array($icalevent['RRULE'])) //repeatable event
-				{
+			foreach ($icalevents as $icalevent) {
+				if (isset($icalevent['RRULE']) && is_array($icalevent['RRULE'])) { //repeatable event
 					//if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar=$firstdaytoshow;
 					//if ($event->date_end_in_calendar > $lastdaytoshow) $event->date_end_in_calendar=($lastdaytoshow-1);
-					if ($icalevent['DTSTART;VALUE=DATE']) //fullday event
-					{
+					if ($icalevent['DTSTART;VALUE=DATE']) { //fullday event
 						$datecurstart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
 						$datecurend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
-					} elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime']))
-					{
+					} elseif (is_array($icalevent['DTSTART']) && !empty($icalevent['DTSTART']['unixtime'])) {
 						$datecurstart = $icalevent['DTSTART']['unixtime'];
 						$datecurend = $icalevent['DTEND']['unixtime'];
-						if (!empty($ical->cal['DAYLIGHT']['DTSTART']) && $datecurstart)
-						{
+						if (!empty($ical->cal['DAYLIGHT']['DTSTART']) && $datecurstart) {
 							//var_dump($ical->cal);
 							$tmpcurstart = $datecurstart;
 							$tmpcurend = $datecurend;
@@ -970,10 +1039,16 @@ if (count($listofextcals))
 							$tmpdaylightend = dol_mktime(0, 0, 0, 1, 1, 1970, 1) + (int) $ical->cal['STANDARD']['DTSTART'];
 							//var_dump($tmpcurstart);var_dump($tmpcurend); var_dump($ical->cal['DAYLIGHT']['DTSTART']);var_dump($ical->cal['STANDARD']['DTSTART']);
 							// Edit datecurstart and datecurend
-							if ($tmpcurstart >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) $datecurstart -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
-							else $datecurstart -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
-							if ($tmpcurend >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) $datecurend -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
-							else $datecurend -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
+							if ($tmpcurstart >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) {
+								$datecurstart -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
+							} else {
+								$datecurstart -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
+							}
+							if ($tmpcurend >= $tmpdaylightstart && $tmpcurstart < $tmpdaylightend) {
+								$datecurend -= ((int) $ical->cal['DAYLIGHT']['TZOFFSETTO']) * 36;
+							} else {
+								$datecurend -= ((int) $ical->cal['STANDARD']['TZOFFSETTO']) * 36;
+							}
 						}
 						// datecurstart and datecurend are now GMT date
 						//var_dump($datecurstart); var_dump($datecurend); exit;
@@ -987,18 +1062,19 @@ if (count($listofextcals))
 					$interval = (empty($icalevent['RRULE']['INTERVAL']) ? 1 : $icalevent['RRULE']['INTERVAL']);
 					$until = empty($icalevent['RRULE']['UNTIL']) ? 0 : dol_stringtotime($icalevent['RRULE']['UNTIL'], 1);
 					$maxrepeat = empty($icalevent['RRULE']['COUNT']) ? 0 : $icalevent['RRULE']['COUNT'];
-					if ($until && ($until + ($datecurend - $datecurstart)) < $firstdaytoshow) continue; // We discard repeatable event that end before start date to show
-					if ($datecurstart >= $lastdaytoshow) continue; // We discard repeatable event that start after end date to show
+					if ($until && ($until + ($datecurend - $datecurstart)) < $firstdaytoshow) {
+						continue; // We discard repeatable event that end before start date to show
+					}
+					if ($datecurstart >= $lastdaytoshow) {
+						continue; // We discard repeatable event that start after end date to show
+					}
 
 					$numofevent = 0;
-					while (($datecurstart < $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat)))
-					{
-						if ($datecurend >= $firstdaytoshow)    // We add event
-						{
+					while (($datecurstart < $lastdaytoshow) && (empty($maxrepeat) || ($numofevent < $maxrepeat))) {
+						if ($datecurend >= $firstdaytoshow) {    // We add event
 							$newevent = $icalevent;
 							unset($newevent['RRULE']);
-							if ($icalevent['DTSTART;VALUE=DATE'])
-							{
+							if ($icalevent['DTSTART;VALUE=DATE']) {
 								$newevent['DTSTART;VALUE=DATE'] = dol_print_date($datecurstart, '%Y%m%d');
 								$newevent['DTEND;VALUE=DATE'] = dol_print_date($datecurend + 1, '%Y%m%d');
 							} else {
@@ -1010,27 +1086,22 @@ if (count($listofextcals))
 						// Jump on next occurence
 						$numofevent++;
 						$savdatecurstart = $datecurstart;
-						if ($icalevent['RRULE']['FREQ'] == 'DAILY')
-						{
+						if ($icalevent['RRULE']['FREQ'] == 'DAILY') {
 							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'd');
 							$datecurend = dol_time_plus_duree($datecurend, $interval, 'd');
 						}
-						if ($icalevent['RRULE']['FREQ'] == 'WEEKLY')
-						{
+						if ($icalevent['RRULE']['FREQ'] == 'WEEKLY') {
 							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'w');
 							$datecurend = dol_time_plus_duree($datecurend, $interval, 'w');
-						} elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY')
-						{
+						} elseif ($icalevent['RRULE']['FREQ'] == 'MONTHLY') {
 							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'm');
 							$datecurend = dol_time_plus_duree($datecurend, $interval, 'm');
-						} elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY')
-						{
+						} elseif ($icalevent['RRULE']['FREQ'] == 'YEARLY') {
 							$datecurstart = dol_time_plus_duree($datecurstart, $interval, 'y');
 							$datecurend = dol_time_plus_duree($datecurend, $interval, 'y');
 						}
 						// Test to avoid infinite loop ($datecurstart must increase)
-						if ($savdatecurstart >= $datecurstart)
-						{
+						if ($savdatecurstart >= $datecurstart) {
 							dol_syslog("Found a rule freq ".$icalevent['RRULE']['FREQ']." not managed by dolibarr code. Assume 1 week frequency.", LOG_ERR);
 							$datecurstart += 3600 * 24 * 7;
 							$datecurend += 3600 * 24 * 7;
@@ -1041,18 +1112,18 @@ if (count($listofextcals))
 			$icalevents = array_merge($icalevents, $moreicalevents);
 
 			// Loop on each entry into cal file to know if entry is qualified and add an ActionComm into $eventarray
-			foreach ($icalevents as $icalevent)
-			{
+			foreach ($icalevents as $icalevent) {
 				//var_dump($icalevent);
 
 				//print $icalevent['SUMMARY'].'->'.var_dump($icalevent).'<br>';exit;
-				if (!empty($icalevent['RRULE'])) continue; // We found a repeatable event. It was already split into unitary events, so we discard general rule.
+				if (!empty($icalevent['RRULE'])) {
+					continue; // We found a repeatable event. It was already split into unitary events, so we discard general rule.
+				}
 
 				// Create a new object action
 				$event = new ActionComm($db);
 				$addevent = false;
-				if (isset($icalevent['DTSTART;VALUE=DATE'])) // fullday event
-				{
+				if (isset($icalevent['DTSTART;VALUE=DATE'])) { // fullday event
 					// For full day events, date are also GMT but they wont but converted using tz during output
 					$datestart = dol_stringtotime($icalevent['DTSTART;VALUE=DATE'], 1);
 					$dateend = dol_stringtotime($icalevent['DTEND;VALUE=DATE'], 1) - 1; // We remove one second to get last second of day
@@ -1060,8 +1131,7 @@ if (count($listofextcals))
 					//print dol_print_date($dateend,'dayhour','gmt');
 					$event->fulldayevent = 1;
 					$addevent = true;
-				} elseif (!is_array($icalevent['DTSTART'])) // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
-				{
+				} elseif (!is_array($icalevent['DTSTART'])) { // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
 					$datestart = $icalevent['DTSTART'];
 					$dateend = $icalevent['DTEND'];
 
@@ -1071,8 +1141,7 @@ if (count($listofextcals))
 					$addevent = true;
 					//var_dump($offsettz);
 					//var_dump(dol_print_date($datestart, 'dayhour', 'gmt'));
-				} elseif (isset($icalevent['DTSTART']['unixtime']))	// File contains a local timezone + a TZ (for example when using bluemind)
-				{
+				} elseif (isset($icalevent['DTSTART']['unixtime'])) {	// File contains a local timezone + a TZ (for example when using bluemind)
 					$datestart = $icalevent['DTSTART']['unixtime'];
 					$dateend = $icalevent['DTEND']['unixtime'];
 
@@ -1080,13 +1149,11 @@ if (count($listofextcals))
 					$dateend += +($offsettz * 3600);
 
 					// $buggedfile is set to uselocalandtznodaylight if conf->global->AGENDA_EXT_BUGGEDFILEx = 'uselocalandtznodaylight'
-					if ($buggedfile === 'uselocalandtznodaylight')	// unixtime is a local date that does not take daylight into account, TZID is +1 for example for 'Europe/Paris' in summer instead of 2
-					{
+					if ($buggedfile === 'uselocalandtznodaylight') {	// unixtime is a local date that does not take daylight into account, TZID is +1 for example for 'Europe/Paris' in summer instead of 2
 						// TODO
 					}
 					// $buggedfile is set to uselocalandtzdaylight if conf->global->AGENDA_EXT_BUGGEDFILEx = 'uselocalandtzdaylight' (for example with bluemind)
-					if ($buggedfile === 'uselocalandtzdaylight')	// unixtime is a local date that does take daylight into account, TZID is +2 for example for 'Europe/Paris' in summer
-					{
+					if ($buggedfile === 'uselocalandtzdaylight') {	// unixtime is a local date that does take daylight into account, TZID is +2 for example for 'Europe/Paris' in summer
 						$localtzs = new DateTimeZone(preg_replace('/"/', '', $icalevent['DTSTART']['TZID']));
 						$localtze = new DateTimeZone(preg_replace('/"/', '', $icalevent['DTEND']['TZID']));
 						$localdts = new DateTime(dol_print_date($datestart, 'dayrfc', 'gmt'), $localtzs);
@@ -1100,13 +1167,11 @@ if (count($listofextcals))
 					$addevent = true;
 				}
 
-				if ($addevent)
-				{
+				if ($addevent) {
 					$event->id = $icalevent['UID'];
 					$event->ref = $event->id;
 					$userId = $userstatic->findUserIdByEmail($namecal);
-					if (!empty($userId) && $userId > 0)
-					{
+					if (!empty($userId) && $userId > 0) {
 						$event->userassigned[$userId] = $userId;
 						$event->percentage = -1;
 					}
@@ -1123,21 +1188,30 @@ if (count($listofextcals))
 					$event->datep = $datestart + $usertime;
 					$event->datef = $dateend + $usertime;
 
-					if ($icalevent['SUMMARY']) $event->label = $icalevent['SUMMARY'];
-					elseif ($icalevent['DESCRIPTION']) $event->label = dol_nl2br($icalevent['DESCRIPTION'], 1);
-					else $event->label = $langs->trans("ExtSiteNoLabel");
+					if ($icalevent['SUMMARY']) {
+						$event->label = $icalevent['SUMMARY'];
+					} elseif ($icalevent['DESCRIPTION']) {
+						$event->label = dol_nl2br($icalevent['DESCRIPTION'], 1);
+					} else {
+						$event->label = $langs->trans("ExtSiteNoLabel");
+					}
 
 					// Priority (see https://www.kanzaki.com/docs/ical/priority.html)
 					// LOW      = 0 to 4
 					// MEDIUM   = 5
 					// HIGH     = 6 to 9
-					if ($icalevent['PRIORITY']) $event->priority = $icalevent['PRIORITY'];
+					if ($icalevent['PRIORITY']) {
+						$event->priority = $icalevent['PRIORITY'];
+					}
 
 					// Transparency (see https://www.kanzaki.com/docs/ical/transp.html)
-					if ($icalevent['TRANSP'])
-					{
-						if ($icalevent['TRANSP'] == "TRANSPARENT") $event->transparency = 0; // 0 = available / free
-						if ($icalevent['TRANSP'] == "OPAQUE") $event->transparency = 1; // 1 = busy
+					if ($icalevent['TRANSP']) {
+						if ($icalevent['TRANSP'] == "TRANSPARENT") {
+							$event->transparency = 0; // 0 = available / free
+						}
+						if ($icalevent['TRANSP'] == "OPAQUE") {
+							$event->transparency = 1; // 1 = busy
+						}
 
 						// TODO: MS outlook states
 						// X-MICROSOFT-CDO-BUSYSTATUS:FREE      + TRANSP:TRANSPARENT => Available / Free
@@ -1147,30 +1221,37 @@ if (count($listofextcals))
 						// X-MICROSOFT-CDO-BUSYSTATUS:OOF       + TRANSP:OPAQUE      => Away from the office / off-site
 					}
 
-					if ($icalevent['LOCATION']) $event->location = $icalevent['LOCATION'];
+					if ($icalevent['LOCATION']) {
+						$event->location = $icalevent['LOCATION'];
+					}
 
 					$event->date_start_in_calendar = $event->datep;
 
-					if ($event->datef != '' && $event->datef >= $event->datep) $event->date_end_in_calendar = $event->datef;
-					else $event->date_end_in_calendar = $event->datep;
+					if ($event->datef != '' && $event->datef >= $event->datep) {
+						$event->date_end_in_calendar = $event->datef;
+					} else {
+						$event->date_end_in_calendar = $event->datep;
+					}
 
 					// Define ponctual property
-					if ($event->date_start_in_calendar == $event->date_end_in_calendar)
-					{
+					if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
 						$event->ponctuel = 1;
 						//print 'x'.$datestart.'-'.$dateend;exit;
 					}
 
 					// Add event into $eventarray if date range are ok.
-					if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow)
-					{
+					if ($event->date_end_in_calendar < $firstdaytoshow || $event->date_start_in_calendar >= $lastdaytoshow) {
 						//print 'x'.$datestart.'-'.$dateend;exit;
 						//print 'x'.$datestart.'-'.$dateend;exit;
 						//print 'x'.$datestart.'-'.$dateend;exit;
 						// This record is out of visible range
 					} else {
-						if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-						if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+						if ($event->date_start_in_calendar < $firstdaytoshow) {
+							$event->date_start_in_calendar = $firstdaytoshow;
+						}
+						if ($event->date_end_in_calendar >= $lastdaytoshow) {
+							$event->date_end_in_calendar = ($lastdaytoshow - 1);
+						}
 
 						// Add an entry in actionarray for each day
 						$daycursor = $event->date_start_in_calendar;
@@ -1187,7 +1268,9 @@ if (count($listofextcals))
 							//if ($event->fulldayevent) print dol_print_date($daykeygmt,'dayhour','gmt').'-'.dol_print_date($daykey,'dayhour','gmt').'-'.dol_print_date($event->date_end_in_calendar,'dayhour','gmt').' ';
 							$eventarray[$daykey][] = $event;
 							$daykey += 60 * 60 * 24; $daykeygmt += 60 * 60 * 24; // Add one day
-							if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) $loop = false;
+							if (($event->fulldayevent ? $daykeygmt : $daykey) > $event->date_end_in_calendar) {
+								$loop = false;
+							}
 						} while ($loop);
 					}
 				}
@@ -1211,8 +1294,7 @@ if (!empty($hookmanager->resArray['eventarray'])) {
 }
 
 // Sort events
-foreach ($eventarray as $keyDate => &$dateeventarray)
-{
+foreach ($eventarray as $keyDate => &$dateeventarray) {
 	usort($dateeventarray, 'sort_events_by_date');
 }
 
@@ -1224,11 +1306,12 @@ $cacheusers = array();
 
 // Define theme_datacolor array
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
-if (is_readable($color_file))
-{
+if (is_readable($color_file)) {
 	include_once $color_file;
 }
-if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+if (!is_array($theme_datacolor)) {
+	$theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+}
 
 $massactionbutton ='';
 
@@ -1238,8 +1321,7 @@ print_barre_liste($langs->trans("Agenda"), $page, $_SERVER["PHP_SELF"], $param,
 print $s;
 
 
-if (empty($action) || $action == 'show_month')      // View by month
-{
+if (empty($action) || $action == 'show_month') {      // View by month
 	$newparam = $param; // newparam is for birthday links
 	$newparam = preg_replace('/showbirthday=/i', 'showbirthday_=', $newparam); // To avoid replacement when replace day= is done
 	$newparam = preg_replace('/action=show_month&?/i', '', $newparam);
@@ -1261,15 +1343,15 @@ if (empty($action) || $action == 'show_month')      // View by month
 	// Column title of weeks numbers
 	echo '  <td class="center">#</td>';
 	$i = 0;
-	while ($i < 7)
-	{
+	while ($i < 7) {
 		print '  <td class="center bold uppercase tdfordaytitle'.($i == 0 ? ' borderleft' : '').'">';
 		$numdayinweek = (($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7);
-		if (!empty($conf->dol_optimize_smallscreen))
-		{
+		if (!empty($conf->dol_optimize_smallscreen)) {
 			$labelshort = array(0=>'SundayMin', 1=>'MondayMin', 2=>'TuesdayMin', 3=>'WednesdayMin', 4=>'ThursdayMin', 5=>'FridayMin', 6=>'SaturdayMin');
 			print $langs->trans($labelshort[$numdayinweek]);
-		} else print $langs->trans("Day".$numdayinweek);
+		} else {
+			print $langs->trans("Day".$numdayinweek);
+		}
 		print '  </td>'."\n";
 		$i++;
 	}
@@ -1283,15 +1365,11 @@ if (empty($action) || $action == 'show_month')      // View by month
 	for ($iter_week = 0; $iter_week < 6; $iter_week++) {
 		echo " <tr>\n";
 		// Get date of the current day, format 'yyyy-mm-dd'
-		if ($tmpday <= 0) // If number of the current day is in previous month
-		{
+		if ($tmpday <= 0) { // If number of the current day is in previous month
 			$currdate0 = sprintf("%04d", $prev_year).sprintf("%02d", $prev_month).sprintf("%02d", $max_day_in_prev_month + $tmpday);
-		}
-		elseif ($tmpday <= $max_day_in_month) // If number of the current day is in current month
-		{
+		} elseif ($tmpday <= $max_day_in_month) { // If number of the current day is in current month
 			$currdate0 = sprintf("%04d", $year).sprintf("%02d", $month).sprintf("%02d", $tmpday);
-		}
-		else // If number of the current day is in next month
+		} else // If number of the current day is in next month
 		{
 			$currdate0 = sprintf("%04d", $next_year).sprintf("%02d", $next_month).sprintf("%02d", $tmpday - $max_day_in_month);
 		}
@@ -1304,7 +1382,9 @@ if (empty($action) || $action == 'show_month')      // View by month
 			if ($tmpday <= 0) {
 				/* Show days before the beginning of the current month (previous month)  */
 				$style = 'cal_other_month cal_past';
-				if ($iter_day == 6) $style .= ' cal_other_month_right';
+				if ($iter_day == 6) {
+					$style .= ' cal_other_month_right';
+				}
 				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
 				show_day_events($db, $max_day_in_prev_month + $tmpday, $prev_month, $prev_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
 				echo "  </td>\n";
@@ -1312,11 +1392,19 @@ if (empty($action) || $action == 'show_month')      // View by month
 				/* Show days of the current month */
 				$curtime = dol_mktime(0, 0, 0, $month, $tmpday, $year);
 				$style = 'cal_current_month';
-				if ($iter_day == 6) $style .= ' cal_current_month_right';
+				if ($iter_day == 6) {
+					$style .= ' cal_current_month_right';
+				}
 				$today = 0;
-				if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $month && $todayarray['year'] == $year) $today = 1;
-				if ($today) $style = 'cal_today';
-				if ($curtime < $todaytms) $style .= ' cal_past';
+				if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $month && $todayarray['year'] == $year) {
+					$today = 1;
+				}
+				if ($today) {
+					$style = 'cal_today';
+				}
+				if ($curtime < $todaytms) {
+					$style .= ' cal_past';
+				}
 				//var_dump($todayarray['mday']."==".$tmpday." && ".$todayarray['mon']."==".$month." && ".$todayarray['year']."==".$year.' -> '.$style);
 				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
 				show_day_events($db, $tmpday, $month, $year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
@@ -1324,7 +1412,9 @@ if (empty($action) || $action == 'show_month')      // View by month
 			} else {
 				/* Show days after the current month (next month) */
 				$style = 'cal_other_month';
-				if ($iter_day == 6) $style .= ' cal_other_month_right';
+				if ($iter_day == 6) {
+					$style .= ' cal_other_month_right';
+				}
 				echo '  <td class="'.$style.' nowrap tdtop" width="14%">';
 				show_day_events($db, $tmpday - $max_day_in_month, $next_month, $next_year, $month, $style, $eventarray, $maxprint, $maxnbofchar, $newparam);
 				echo "</td>\n";
@@ -1376,12 +1466,18 @@ if (empty($action) || $action == 'show_month')      // View by month
 		$tmpyear = dol_print_date($curtime, '%Y', 'tzuserrel');
 
 		$style = 'cal_current_month';
-		if ($iter_day == 6) $style .= ' cal_other_month_right';
+		if ($iter_day == 6) {
+			$style .= ' cal_other_month_right';
+		}
 
 		$today = 0;
 		$todayarray = dol_getdate($now, 'fast');
-		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
-		if ($today) $style = 'cal_today';
+		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) {
+			$today = 1;
+		}
+		if ($today) {
+			$style = 'cal_today';
+		}
 
 		echo '  <td class="'.$style.'" width="14%" valign="top">';
 		show_day_events($db, $tmpday, $tmpmonth, $tmpyear, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300);
@@ -1406,7 +1502,9 @@ if (empty($action) || $action == 'show_month')      // View by month
 	$style = 'cal_current_month cal_current_month_oneday';
 	$today = 0;
 	$todayarray = dol_getdate($now, 'fast');
-	if ($todayarray['mday'] == $day && $todayarray['mon'] == $month && $todayarray['year'] == $year) $today = 1;
+	if ($todayarray['mday'] == $day && $todayarray['mon'] == $month && $todayarray['year'] == $year) {
+		$today = 1;
+	}
 	//if ($today) $style='cal_today';
 
 	$timestamp = dol_mktime(12, 0, 0, $month, $day, $year);
@@ -1424,12 +1522,12 @@ if (empty($action) || $action == 'show_month')      // View by month
 	echo " </td>\n";
 
 	/*
-    echo ' <div class="tagtr">';
-    echo '  <div class="tagtd width100"></div>';
-    echo '  <div class="tagtd center">';
-    echo show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, -1);
-    echo '  </div>'."\n";
-    echo " </div>\n";
+	echo ' <div class="tagtr">';
+	echo '  <div class="tagtd width100"></div>';
+	echo '  <div class="tagtd center">';
+	echo show_day_events($db, $day, $month, $year, $month, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, -1);
+	echo '  </div>'."\n";
+	echo " </div>\n";
 	*/
 
 	echo '</table>';
@@ -1437,8 +1535,7 @@ if (empty($action) || $action == 'show_month')      // View by month
 
 	/* WIP View per hour */
 	$useviewhour = 0;
-	if ($useviewhour)
-	{
+	if ($useviewhour) {
 		print '<div class="div-table-responsive-no-min borderbottom">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 
 		$maxheightwin = (isset($_SESSION["dol_screenheight"]) && $_SESSION["dol_screenheight"] > 500) ? ($_SESSION["dol_screenheight"] - 200) : 660; // Also into index.php file
@@ -1451,14 +1548,19 @@ if (empty($action) || $action == 'show_month')      // View by month
 		$tmp = explode('-', $conf->global->MAIN_DEFAULT_WORKING_HOURS);
 		$minhour = round($tmp[0], 0);
 		$maxhour = round($tmp[1], 0);
-		if ($minhour > 23) $minhour = 23;
-		if ($maxhour < 1)  $maxhour = 1;
-		if ($maxhour <= $minhour) { $maxhour = $minhour + 1; }
+		if ($minhour > 23) {
+			$minhour = 23;
+		}
+		if ($maxhour < 1) {
+			$maxhour = 1;
+		}
+		if ($maxhour <= $minhour) {
+			$maxhour = $minhour + 1;
+		}
 
 		$i = 0;
 		$j = 0;
-		while ($i < 24)
-		{
+		while ($i < 24) {
 			echo ' <div class="tagtr calendarviewcontainertr">'."\n";
 			echo '  <div class="tagtd width100 tdtop">'.dol_print_date($i * 3600, 'hour', 'gmt').'</div>';
 			echo '  <div class="tagtd '.$style.' tdtop"></div>'."\n";
@@ -1524,8 +1626,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 	$curtime = dol_mktime(0, 0, 0, $month, $day, $year);
 	$urltoshow = DOL_URL_ROOT.'/comm/action/index.php?action=show_day&day='.str_pad($day, 2, "0", STR_PAD_LEFT).'&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year.$newparam;
 	$urltocreate = '';
-	if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
-	{
+	if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
 		$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$year;
 		$hourminsec = '100000';
 		$urltocreate = DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $year, $month, $day).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : ''));
@@ -1534,16 +1635,17 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 	// Line with title of day
 	print '<div id="dayevent_'.$dateint.'" class="dayevent tagtable centpercent nobordernopadding">'."\n";
 
-	if ($nonew <= 0)
-	{
+	if ($nonew <= 0) {
 		print '<div class="tagtr cursorpointer" onclick="window.location=\''.$urltocreate.'\';"><div class="nowrap tagtd"><div class="left inline-block">';
 		print '<a class="dayevent-aday" style="color: #666" href="'.$urltoshow.'">';
-		if ($showinfo) print dol_print_date($curtime, 'daytextshort');
-		else print dol_print_date($curtime, '%d');
+		if ($showinfo) {
+			print dol_print_date($curtime, 'daytextshort');
+		} else {
+			print dol_print_date($curtime, '%d');
+		}
 		print '</a>';
 		print '</div><div class="nowrap floatright inline-block marginrightonly">';
-		if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
-		{
+		if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
 			print '<a class="cursoradd" href="'.$urltocreate.'">'; // Explicit link, usefull for nojs interfaces
 			print img_picto($langs->trans("NewAction"), 'edit_add.png');
 			print '</a>';
@@ -1551,8 +1653,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 		print '</div></div></div>'."\n";
 	}
 
-	if ($nonew < 0)
-	{
+	if ($nonew < 0) {
 		print '</div>';
 		return;
 	}
@@ -1572,29 +1673,23 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 	include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 	$tmpholiday = new Holiday($db);
 
-	foreach ($eventarray as $daykey => $notused)
-	{
+	foreach ($eventarray as $daykey => $notused) {
 		$annee = dol_print_date($daykey, '%Y');
 		$mois =  dol_print_date($daykey, '%m');
 		$jour =  dol_print_date($daykey, '%d');
 
-		if ($day == $jour && $month == $mois && $year == $annee)
-		{
-			foreach ($eventarray[$daykey] as $index => $event)
-			{
-				if ($i < $maxprint || $maxprint == 0 || !empty($conf->global->MAIN_JS_SWITCH_AGENDA))
-				{
+		if ($day == $jour && $month == $mois && $year == $annee) {
+			foreach ($eventarray[$daykey] as $index => $event) {
+				if ($i < $maxprint || $maxprint == 0 || !empty($conf->global->MAIN_JS_SWITCH_AGENDA)) {
 					$keysofuserassigned = array_keys($event->userassigned);
 					$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
 					// Define $color (Hex string like '0088FF') and $cssclass of event
 					$color = -1; $cssclass = ''; $colorindex = -1;
-					if (in_array($user->id, $keysofuserassigned))
-					{
+					if (in_array($user->id, $keysofuserassigned)) {
 						$cssclass = 'family_mytasks';
 
-						if (empty($cacheusers[$event->userownerid]))
-						{
+						if (empty($cacheusers[$event->userownerid])) {
 							$newuser = new User($db);
 							$newuser->fetch($event->userownerid);
 							$cacheusers[$event->userownerid] = $newuser;
@@ -1602,9 +1697,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						//var_dump($cacheusers[$event->userownerid]->color);
 
 						// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-						if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
-					} elseif ($event->type_code == 'ICALEVENT')      // Event come from external ical file
-					{
+						if (!empty($cacheusers[$event->userownerid]->color)) {
+							$color = $cacheusers[$event->userownerid]->color;
+						}
+					} elseif ($event->type_code == 'ICALEVENT') {      // Event come from external ical file
 						$numical++;
 						if (!empty($event->icalname)) {
 							if (!isset($numicals[dol_string_nospecial($event->icalname)])) {
@@ -1615,37 +1711,37 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 
 						$color = ($event->icalcolor ? $event->icalcolor : -1);
 						$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
-					} elseif ($event->type_code == 'BIRTHDAY')
-					{
+					} elseif ($event->type_code == 'BIRTHDAY') {
 						$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday '; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 					} else {
 						$numother++;
 						$color = ($event->icalcolor ? $event->icalcolor : -1);
 						$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
 
-						if (empty($cacheusers[$event->userownerid]))
-						{
+						if (empty($cacheusers[$event->userownerid])) {
 							$newuser = new User($db);
 							$newuser->fetch($event->userownerid);
 							$cacheusers[$event->userownerid] = $newuser;
 						}
 						//var_dump($cacheusers[$event->userownerid]->color);
 
-					   	// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					   	if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
+						// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
+						if (!empty($cacheusers[$event->userownerid]->color)) {
+							$color = $cacheusers[$event->userownerid]->color;
+						}
 					}
 
-					if ($color < 0)	// Color was not set on user card. Set color according to color index.
-					{
+					if ($color < 0) {	// Color was not set on user card. Set color according to color index.
 						// Define color index if not yet defined
 						$idusertouse = ($event->userownerid ? $event->userownerid : 0);
-						if (isset($colorindexused[$idusertouse]))
-						{
+						if (isset($colorindexused[$idusertouse])) {
 							$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
 						} else {
-				   			$colorindex = $nextindextouse;
-				   			$colorindexused[$idusertouse] = $colorindex;
-							if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
+							$colorindex = $nextindextouse;
+							$colorindexused[$idusertouse] = $colorindex;
+							if (!empty($theme_datacolor[$nextindextouse + 1])) {
+								$nextindextouse++; // Prepare to use next color
+							}
 						}
 						//print '|'.($color).'='.($idusertouse?$idusertouse:0).'='.$colorindex.'<br>';
 						// Define color
@@ -1666,14 +1762,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						$tmpyearend    = date('Y', $event->date_end_in_calendar);
 						$tmpmonthend   = date('m', $event->date_end_in_calendar);
 						$tmpdayend     = date('d', $event->date_end_in_calendar);
-						if ($tmpyearend != $annee || $tmpmonthend != $mois || $tmpdayend != $jour)
-						{
+						if ($tmpyearend != $annee || $tmpmonthend != $mois || $tmpdayend != $jour) {
 							$cssclass .= " unmovable";
 						}
 					} else {
 						if ($user->rights->agenda->allactions->create ||
-							(($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create))
-						{
+							(($event->authorid == $user->id || $event->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
 							$cssclass .= " movable cursormove";
 						} else {
 							$cssclass .= " unmovable";
@@ -1681,8 +1775,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					}
 
 					$h = ''; $nowrapontd = 1;
-					if ($action == 'show_day') { $h = 'height: 100%; '; $nowrapontd = 0; }
-					if ($action == 'show_week') { $h = 'height: 100%; '; $nowrapontd = 0; }
+					if ($action == 'show_day') {
+						$h = 'height: 100%; '; $nowrapontd = 0;
+					}
+					if ($action == 'show_week') {
+						$h = 'height: 100%; '; $nowrapontd = 0;
+					}
 
 					// Show event box
 					print "\n";
@@ -1720,8 +1818,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					print '" style="'.$h;
 					$colortouse = $color;
 					// If colortouse is similar than background, we force to change it.
-					if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY))
-					{
+					if (empty($event->transparency) && empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
 						print 'background: #f0f0f0;';
 						print 'border-left: 5px solid #'.$colortouse.';';
 					} else {
@@ -1729,8 +1826,8 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						print 'border-left: 5px solid #'.dol_color_minus($colortouse, -3).';';
 						//print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($colortouse, -3).'), to(#'.dol_color_minus($colortouse, -1).'));';
 					}
-				   	//print 'background: #'.$colortouse.';';
-				   	//print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';
+					//print 'background: #'.$colortouse.';';
+					//print 'background: -webkit-gradient(linear, left top, left bottom, from(#'.dol_color_minus($color, -3).'), to(#'.dol_color_minus($color, -1).'));';
 					//if (! empty($event->transparency)) print 'background: #'.$color.'; background: -webkit-gradient(linear, left top, left bottom, from(#'.$color.'), to(#'.dol_color_minus($color,1).'));';
 					//else print 'background-color: transparent !important; background: none; border: 1px solid #bbb;';
 					//print ' -moz-border-radius:4px;"';
@@ -1759,14 +1856,12 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						print $listofusertoshow;
 					} else {										// Other calendar
 						// Picto
-						if (empty($event->fulldayevent))
-						{
+						if (empty($event->fulldayevent)) {
 							//print $event->getNomUrl(2).' ';
 						}
 
 						// Date
-						if (empty($event->fulldayevent))
-						{
+						if (empty($event->fulldayevent)) {
 							// Show hours (start ... end)
 							$tmpyearstart  = dol_print_date($event->date_start_in_calendar, '%Y', 'tzuserrel');
 							$tmpmonthstart = dol_print_date($event->date_start_in_calendar, '%m', 'tzuserrel');
@@ -1776,29 +1871,26 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 							$tmpdayend     = dol_print_date($event->date_end_in_calendar, '%d', 'tzuserrel');
 
 							// Hour start
-							if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour)
-							{
+							if ($tmpyearstart == $annee && $tmpmonthstart == $mois && $tmpdaystart == $jour) {
 								$daterange .= dol_print_date($event->date_start_in_calendar, 'hour', 'tzuserrel');
-								if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
-								{
-									if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend)
-									$daterange .= '-';
+								if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
+									if ($tmpyearstart == $tmpyearend && $tmpmonthstart == $tmpmonthend && $tmpdaystart == $tmpdayend) {
+										$daterange .= '-';
+									}
 									//else
 									//print '...';
 								}
 							}
-							if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
-							{
-								if ($tmpyearstart != $tmpyearend || $tmpmonthstart != $tmpmonthend || $tmpdaystart != $tmpdayend)
-								{
+							if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
+								if ($tmpyearstart != $tmpyearend || $tmpmonthstart != $tmpmonthend || $tmpdaystart != $tmpdayend) {
 									$daterange .= '...';
 								}
 							}
 							// Hour end
-							if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar)
-							{
-								if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour)
-								$daterange .= dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+							if ($event->date_end_in_calendar && $event->date_start_in_calendar != $event->date_end_in_calendar) {
+								if ($tmpyearend == $annee && $tmpmonthend == $mois && $tmpdayend == $jour) {
+									$daterange .= dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								}
 							}
 						} else {
 							if ($showinfo) {
@@ -1824,9 +1916,10 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						// Loop on each assigned user
 						$listofusertoshow = '';
 						$posuserassigned = 0;
-						foreach ($event->userassigned as $tmpid => $tmpdata)
-						{
-							if (!$posuserassigned && $titletoshow) $listofusertoshow .= '<br>';
+						foreach ($event->userassigned as $tmpid => $tmpdata) {
+							if (!$posuserassigned && $titletoshow) {
+								$listofusertoshow .= '<br>';
+							}
 							$posuserassigned++;
 							if (empty($cacheusers[$tmpid])) {
 								$newuser = new User($db);
@@ -1840,48 +1933,57 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						print $titletoshow;
 						print $listofusertoshow;
 
-						if ($event->type_code == 'ICALEVENT') print '<br>('.dol_trunc($event->icalname, $maxnbofchar).')';
+						if ($event->type_code == 'ICALEVENT') {
+							print '<br>('.dol_trunc($event->icalname, $maxnbofchar).')';
+						}
 
 						$thirdparty_id = ($event->thirdparty_id > 0 ? $event->thirdparty_id : ((is_object($event->societe) && $event->societe->id > 0) ? $event->societe->id : 0));
 						$contact_id = ($event->contact_id > 0 ? $event->contact_id : ((is_object($event->contact) && $event->contact->id > 0) ? $event->contact->id : 0));
 
 						// If action related to company / contact
 						$linerelatedto = '';
-						if ($thirdparty_id > 0)
-						{
-							if (!isset($cachethirdparties[$thirdparty_id]) || !is_object($cachethirdparties[$thirdparty_id]))
-							{
+						if ($thirdparty_id > 0) {
+							if (!isset($cachethirdparties[$thirdparty_id]) || !is_object($cachethirdparties[$thirdparty_id])) {
 								$thirdparty = new Societe($db);
 								$thirdparty->fetch($thirdparty_id);
 								$cachethirdparties[$thirdparty_id] = $thirdparty;
-							} else $thirdparty = $cachethirdparties[$thirdparty_id];
-							if (!empty($thirdparty->id)) $linerelatedto .= $thirdparty->getNomUrl(1, '', 0);
+							} else {
+								$thirdparty = $cachethirdparties[$thirdparty_id];
+							}
+							if (!empty($thirdparty->id)) {
+								$linerelatedto .= $thirdparty->getNomUrl(1, '', 0);
+							}
 						}
-						if (!empty($contact_id) && $contact_id > 0)
-						{
-							if (!is_object($cachecontacts[$contact_id]))
-							{
+						if (!empty($contact_id) && $contact_id > 0) {
+							if (!is_object($cachecontacts[$contact_id])) {
 								$contact = new Contact($db);
 								$contact->fetch($contact_id);
 								$cachecontacts[$contact_id] = $contact;
-							} else $contact = $cachecontacts[$contact_id];
-							if ($linerelatedto) $linerelatedto .= '&nbsp;';
-							if (!empty($contact->id)) $linerelatedto .= $contact->getNomUrl(1, '', 0);
+							} else {
+								$contact = $cachecontacts[$contact_id];
+							}
+							if ($linerelatedto) {
+								$linerelatedto .= '&nbsp;';
+							}
+							if (!empty($contact->id)) {
+								$linerelatedto .= $contact->getNomUrl(1, '', 0);
+							}
 						}
-						if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && !empty($conf->global->AGENDA_SHOW_LINKED_OBJECT))
-						{
+						if (!empty($event->fk_element) && $event->fk_element > 0 && !empty($event->elementtype) && !empty($conf->global->AGENDA_SHOW_LINKED_OBJECT)) {
 							include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-							if ($linerelatedto) $linerelatedto .= '<br>';
+							if ($linerelatedto) {
+								$linerelatedto .= '<br>';
+							}
 							$linerelatedto .= dolGetElementUrl($event->fk_element, $event->elementtype, 1);
 						}
-						if ($linerelatedto) print '<br>'.$linerelatedto;
+						if ($linerelatedto) {
+							print '<br>'.$linerelatedto;
+						}
 					}
 
 					// Show location
-					if ($showinfo)
-					{
-						if ($event->location)
-						{
+					if ($showinfo) {
+						if ($event->location) {
 							print '<br>';
 							print $langs->trans("Location").': '.$event->location;
 						}
@@ -1890,14 +1992,18 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 					print '</td>';
 					// Status - Percent
 					$withstatus = 0;
-					if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT')
-					{
+					if ($event->type_code != 'BIRTHDAY' && $event->type_code != 'ICALEVENT') {
 						$withstatus = 1;
-						if ($event->percentage >= 0) $withstatus = 2;
+						if ($event->percentage >= 0) {
+							$withstatus = 2;
+						}
 					}
 					print '<td class="nobottom right nowrap cal_event_right'.($withstatus >= 2 ? ' cal_event_right_status' : '').'">';
-					if ($withstatus) print $event->getLibStatut(3, 1);
-					else print '&nbsp;';
+					if ($withstatus) {
+						print $event->getLibStatut(3, 1);
+					} else {
+						print '&nbsp;';
+					}
 					print '</td></tr></table>';
 					print '</div><!-- end event '.$i.' -->'."\n";
 
@@ -1923,8 +2029,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 		print '&nbsp;';
 	}
 
-	if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $itoshow > $ireallyshown && $maxprint)
-	{
+	if (!empty($conf->global->MAIN_JS_SWITCH_AGENDA) && $itoshow > $ireallyshown && $maxprint) {
 		print '<div class="center cursorpointer" id="more_'.$ymd.'">'.img_picto("All", "angle-double-down", 'class="warning"').' +'.($itoshow - $ireallyshown).'</div>';
 		//print ' +'.(count($eventarray[$daykey])-$maxprint);
 
@@ -1963,8 +2068,7 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 function dol_color_minus($color, $minus, $minusunit = 16)
 {
 	$newcolor = $color;
-	if ($minusunit == 16)
-	{
+	if ($minusunit == 16) {
 		$newcolor[0] = dechex(max(min(hexdec($newcolor[0]) - $minus, 15), 0));
 		$newcolor[2] = dechex(max(min(hexdec($newcolor[2]) - $minus, 15), 0));
 		$newcolor[4] = dechex(max(min(hexdec($newcolor[4]) - $minus, 15), 0));
@@ -1984,12 +2088,10 @@ function dol_color_minus($color, $minus, $minusunit = 16)
 function sort_events_by_date($a, $b)
 {
 	// Sort holidays at first
-	if ($a->type_code === 'HOLIDAY')
-	{
+	if ($a->type_code === 'HOLIDAY') {
 		return -1;
 	}
-	if ($b->type_code === 'HOLIDAY')
-	{
+	if ($b->type_code === 'HOLIDAY') {
 		return 1;
 	}
 
@@ -1997,20 +2099,17 @@ function sort_events_by_date($a, $b)
 	// datef => Event end time
 
 	// Events have different start time
-	if ($a->datep !== $b->datep)
-	{
+	if ($a->datep !== $b->datep) {
 		return $a->datep - $b->datep;
 	}
 
 	// Events have same start time and no end time
-	if ((!is_numeric($b->datef)) || (!is_numeric($a->datef)))
-	{
+	if ((!is_numeric($b->datef)) || (!is_numeric($a->datef))) {
 		return sort_events_by_percentage($a, $b);
 	}
 
 	// Events have the same start time and same end time
-	if ($b->datef === $a->datef)
-	{
+	if ($b->datef === $a->datef) {
 		return sort_events_by_percentage($a, $b);
 	}
 
@@ -2030,13 +2129,11 @@ function sort_events_by_percentage($a, $b)
 	// Sort events with no percentage before each other
 	// (usefull to sort holidays, sick days or similar on the top)
 
-	if ($a->percentage < 0)
-	{
+	if ($a->percentage < 0) {
 		return -1;
 	}
 
-	if ($b->percentage < 0)
-	{
+	if ($b->percentage < 0) {
 		return 1;
 	}
 
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 40787abb8c3..2360f2925d9 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -39,8 +39,7 @@ $langs->load("commercial");
 $id = GETPOST('id', 'int');
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -84,8 +83,7 @@ $morehtmlref = '<div class="refidno">';
 // Thirdparty
 //$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 	$morehtmlref .= $langs->trans('Project').': ';
@@ -95,7 +93,9 @@ if (!empty($conf->projet->enabled))
 		$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
 		$morehtmlref .= $proj->ref;
 		$morehtmlref .= '</a>';
-		if ($proj->title) $morehtmlref .= ' - '.$proj->title;
+		if ($proj->title) {
+			$morehtmlref .= ' - '.$proj->title;
+		}
 	} else {
 		$morehtmlref .= '';
 	}
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 68925c57bfa..64ed79d87ca 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -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';
@@ -55,14 +57,17 @@ $toselect = GETPOST('toselect', 'array');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('search_actioncode', 'array'))
-{
+if (GETPOST('search_actioncode', 'array')) {
 	$actioncode = GETPOST('search_actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	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 +75,12 @@ $search_note = GETPOST('search_note', 'alpha');
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'), 'tzuserrel');
 $datestart = dol_mktime(0, 0, 0, GETPOST('datestartmonth', 'int'), GETPOST('datestartday', 'int'), GETPOST('datestartyear', 'int'), 'tzuserrel');
 $dateend = dol_mktime(0, 0, 0, GETPOST('dateendmonth', 'int'), GETPOST('dateendday', 'int'), GETPOST('dateendyear', 'int'), 'tzuserrel');
-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);
@@ -89,8 +98,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 // If not choice done on calendar owner, we filter on user.
-if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
-{
+if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 	$filtert = $user->id;
 }
 
@@ -98,30 +106,41 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if ($page == -1 || $page == null) { $page = 0; }
-$offset = $limit * $page;
-if (!$sortorder)
-{
-	$sortorder = "DESC,DESC";
-	if ($search_status == 'todo') $sortorder = "DESC,DESC";
+if ($page == -1 || $page == null) {
+	$page = 0;
 }
-if (!$sortfield)
-{
+$offset = $limit * $page;
+if (!$sortorder) {
+	$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;
 }
 
@@ -152,18 +171,14 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  *	Actions
  */
 
-if (GETPOST('cancel', 'alpha'))
-{
+if (GETPOST('cancel', 'alpha')) {
 	$action = 'list'; $massaction = '';
 }
 
-if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday"))
-{
+if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday")) {
 	$param = '';
-	if (is_array($_POST))
-	{
-		foreach ($_POST as $key => $val)
-		{
+	if (is_array($_POST)) {
+		foreach ($_POST as $key => $val) {
 			$param .= '&'.$key.'='.urlencode($val);
 		}
 	}
@@ -174,13 +189,14 @@ if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday"))
 
 $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 = '';
@@ -192,12 +208,10 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_array_options = array();
 }
 
-if (empty($reshook) && !empty($massaction))
-{
+if (empty($reshook) && !empty($massaction)) {
 	unset($percent);
 
-	switch ($massaction)
-	{
+	switch ($massaction) {
 		case 'set_all_events_to_todo':
 			$percent = ActionComm::EVENT_TODO;
 			break;
@@ -211,13 +225,10 @@ if (empty($reshook) && !empty($massaction))
 			break;
 	}
 
-	if (isset($percent))
-	{
-		foreach ($toselect as $toselectid)
-		{
+	if (isset($percent)) {
+		foreach ($toselect as $toselectid) {
 			$result = $object->updatePercent($toselectid, $percent);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				dol_print_error($db);
 				break;
 			}
@@ -226,8 +237,7 @@ if (empty($reshook) && !empty($massaction))
 }
 
 // As mass deletion happens with a confirm step, $massaction is not use for the final step (deletion).
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$objectclass = 'ActionComm';
 	$objectlabel = 'Events';
 	$uploaddir = true;
@@ -258,32 +268,78 @@ llxHeader('', $langs->trans("Agenda"), $help_url);
 $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);
+		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 ($usergroup > 0) {
+	$param .= "&search_usergroup=".urlencode($usergroup);
+}
+if ($socid > 0) {
+	$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 ($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);
 }
-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 ($usergroup > 0) $param .= "&search_usergroup=".urlencode($usergroup);
-if ($socid > 0) $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 ($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';
 
@@ -295,16 +351,21 @@ $arrayofmassactions = array(
 	'set_all_events_to_in_progress' => $langs->trans("SetAllEventsToInProgress"),
 	'set_all_events_to_finished' => $langs->trans("SetAllEventsToFinished"),
 );
-if ($user->rights->agenda->allactions->delete)
-{
+if ($user->rights->agenda->allactions->delete) {
 	$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,';
@@ -315,7 +376,9 @@ $sql .= " sp.lastname, sp.firstname, sp.email, sp.phone, sp.address, sp.phone as
 
 // 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
@@ -325,34 +388,47 @@ $sql .= $hookmanager->resPrint;
 
 $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
-if (!empty($actioncode))
-{
-	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 (!empty($actioncode)) {
+	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'";
+			}
 		}
 	} 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))
-			{
+		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)."')";
 			} else {
 				$sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
@@ -360,35 +436,74 @@ if (!empty($actioncode))
 		}
 	}
 }
-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 ($search_status == '0') { $sql .= " AND a.percent = 0"; }
-if ($search_status == 'na') { $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 ($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 == 'na') {
+	$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);
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0)
-{
+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';
@@ -401,12 +516,10 @@ $sql .= $hookmanager->resPrint;
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -417,8 +530,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("comm/action/list.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$actionstatic = new ActionComm($db);
 	$societestatic = new Societe($db);
 
@@ -438,7 +550,9 @@ if ($resql)
 
 	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.'">';
@@ -446,8 +560,12 @@ if ($resql)
 	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');
@@ -457,19 +575,19 @@ if ($resql)
 	// Add link to show birthdays
 	$link = '';
 	/*
-    if (empty($conf->use_javascript_ajax))
-    {
-        $newparam=$param;   // newparam is for birthday links
-        $newparam=preg_replace('/showbirthday=[0-1]/i','showbirthday='.(empty($showbirthday)?1:0),$newparam);
-        if (! preg_match('/showbirthday=/i',$newparam)) $newparam.='&showbirthday=1';
-        $link='<a href="'.$_SERVER['PHP_SELF'];
-        $link.='?'.$newparam;
-        $link.='">';
-        if (empty($showbirthday)) $link.=$langs->trans("AgendaShowBirthdayEvents");
-        else $link.=$langs->trans("AgendaHideBirthdayEvents");
-        $link.='</a>';
-    }
-    */
+	if (empty($conf->use_javascript_ajax))
+	{
+		$newparam=$param;   // newparam is for birthday links
+		$newparam=preg_replace('/showbirthday=[0-1]/i','showbirthday='.(empty($showbirthday)?1:0),$newparam);
+		if (! preg_match('/showbirthday=/i',$newparam)) $newparam.='&showbirthday=1';
+		$link='<a href="'.$_SERVER['PHP_SELF'];
+		$link.='?'.$newparam;
+		$link.='">';
+		if (empty($showbirthday)) $link.=$langs->trans("AgendaShowBirthdayEvents");
+		else $link.=$langs->trans("AgendaHideBirthdayEvents");
+		$link.='</a>';
+	}
+	*/
 
 	$s = $newtitle;
 
@@ -550,7 +668,9 @@ if ($resql)
 
 	$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">';
@@ -561,11 +681,21 @@ if ($resql)
 	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, 0, '', '', '', '', 1, '', '', 'tzuserrel');
@@ -579,8 +709,12 @@ if ($resql)
 	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';
@@ -590,8 +724,12 @@ if ($resql)
 	$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');
@@ -606,17 +744,37 @@ if ($resql)
 	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';
@@ -626,10 +784,16 @@ if ($resql)
 	$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";
 
@@ -642,13 +806,11 @@ if ($resql)
 	$arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
 	$contactListCache = array();
 
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		// Discard auto action if option is on
-		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO')
-		{
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO') {
 			$i++;
 			continue;
 		}
@@ -676,29 +838,34 @@ if ($resql)
 		}
 
 		// User owner
-		if (!empty($arrayfields['owner']['checked']))
-		{
+		if (!empty($arrayfields['owner']['checked'])) {
 			print '<td class="tdoverflowmax150">'; // With edge and chrome the td overflow is not supported correctly when content is not full text.
-			if ($obj->fk_user_action > 0)
-			{
+			if ($obj->fk_user_action > 0) {
 				$userstatic->fetch($obj->fk_user_action);
 				print $userstatic->getNomUrl(-1);
-			} else print '&nbsp;';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td>';
 		}
 
 		// Type
-		if (!empty($arrayfields['c.libelle']['checked']))
-		{
+		if (!empty($arrayfields['c.libelle']['checked'])) {
 			print '<td class="nowraponall">';
 			print $actionstatic->getTypePicto();
 			$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 ($actionstatic->type_code == 'AC_OTH' && $actionstatic->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>';
@@ -726,11 +893,21 @@ if ($resql)
 			print '<td class="center nowraponall">';
 			print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser');
 			$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>';
 		}
 
@@ -744,15 +921,16 @@ if ($resql)
 		// Third party
 		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax150">';
-			if ($obj->socid > 0)
-			{
+			if ($obj->socid > 0) {
 				$societestatic->id = $obj->socid;
 				$societestatic->client = $obj->client;
 				$societestatic->name = $obj->societe;
 				$societestatic->email = $obj->socemail;
 
 				print $societestatic->getNomUrl(1, '', 28);
-			} else print '&nbsp;';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td>';
 		}
 
@@ -760,17 +938,13 @@ if ($resql)
 		if (!empty($arrayfields['a.fk_contact']['checked'])) {
 			print '<td class="tdoverflowmax100">';
 
-			if (!empty($actionstatic->socpeopleassigned))
-			{
+			if (!empty($actionstatic->socpeopleassigned)) {
 				$contactList = array();
-				foreach ($actionstatic->socpeopleassigned as $socpeopleassigned)
-				{
-					if (!isset($contactListCache[$socpeopleassigned['id']]))
-					{
+				foreach ($actionstatic->socpeopleassigned as $socpeopleassigned) {
+					if (!isset($contactListCache[$socpeopleassigned['id']])) {
 						// if no cache found we fetch it
 						$contact = new Contact($db);
-						if ($contact->fetch($socpeopleassigned['id']) > 0)
-						{
+						if ($contact->fetch($socpeopleassigned['id']) > 0) {
 							$contactListCache[$socpeopleassigned['id']] = $contact->getNomUrl(1, '', 0);
 							$contactList[] = $contact->getNomUrl(1, '', 0);
 						}
@@ -782,8 +956,7 @@ if ($resql)
 				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;
@@ -835,10 +1008,11 @@ if ($resql)
 		}
 		// 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>';
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 613ffee7be7..dc70fb30743 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -39,7 +39,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
-if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
+	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+}
 
 $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);
@@ -49,31 +51,43 @@ $usergroup = GETPOST("search_usergroup", "int", 3) ? GETPOST("search_usergroup",
 $showbirthday = 0;
 
 // If not choice done on calendar owner, we filter on user.
-if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))
-{
+if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS)) {
 	$filtert = $user->id;
 }
 
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "a.datec";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "a.datec";
+}
 
 // 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;
 }
 
@@ -90,18 +104,20 @@ $type = GETPOST("search_type", 'alpha') ?GETPOST("search_type", 'alpha') : GETPO
 $maxprint = ((GETPOST("maxprint", 'int') != '') ?GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('search_actioncode', 'array'))
-{
+if (GETPOST('search_actioncode', 'array')) {
 	$actioncode = GETPOST('search_actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '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);
+}
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
-if ($dateselect > 0)
-{
+if ($dateselect > 0) {
 	$day = GETPOST('dateselectday', 'int');
 	$month = GETPOST('dateselectmonth', 'int');
 	$year = GETPOST('dateselectyear', 'int');
@@ -112,9 +128,15 @@ $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
 $begin_h = GETPOST('begin_h', 'int') != '' ?GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
 $end_h   = GETPOST('end_h', 'int') ?GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
-if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
-if ($end_h < 1 || $end_h > 24) $end_h = 18;
-if ($end_h <= $begin_h) $end_h = $begin_h + 1;
+if ($begin_h < 0 || $begin_h > 23) {
+	$begin_h = 9;
+}
+if ($end_h < 1 || $end_h > 24) {
+	$end_h = 18;
+}
+if ($end_h <= $begin_h) {
+	$end_h = $begin_h + 1;
+}
 
 $tmp = empty($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
@@ -122,8 +144,12 @@ $tmparray = explode('-', $tmp);
 $begin_d = 1;
 $end_d = 53;
 
-if ($status == '' && !GETPOSTISSET('status')) $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 ($status == '' && !GETPOSTISSET('status')) {
+	$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 (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
 	$action = 'show_month'; $day = '';
@@ -149,8 +175,7 @@ $hookmanager->initHooks(array('agenda'));
  * Actions
  */
 
-if ($action == 'delete_action')
-{
+if ($action == 'delete_action') {
 	$event = new ActionComm($db);
 	$event->fetch($actionid);
 	$event->fetch_optionals();
@@ -185,7 +210,9 @@ $parameters = array(
 	'usergroup' => $usergroup,
 );
 $reshook = $hookmanager->executeHooks('beforeAgendaPerType', $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');
+}
 
 $form = new Form($db);
 $companystatic = new Societe($db);
@@ -223,29 +250,65 @@ $tmpday = $first_day;
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
 
 $title = $langs->trans("DoneAndToDoActions");
-if ($status == 'done') $title = $langs->trans("DoneActions");
-if ($status == 'todo') $title = $langs->trans("ToDoActions");
+if ($status == 'done') {
+	$title = $langs->trans("DoneActions");
+}
+if ($status == 'todo') {
+	$title = $langs->trans("ToDoActions");
+}
 
 $param = '';
 if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	if (is_array($actioncode)) {
-		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
-	} else $param .= "&search_actioncode=".urlencode($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 ($status || GETPOSTISSET('status')) {
+	$param .= "&search_status=".urlencode($status);
+}
+if ($filter) {
+	$param .= "&search_filter=".urlencode($filter);
+}
+if ($filtert) {
+	$param .= "&search_filtert=".urlencode($filtert);
+}
+if ($usergroup > 0) {
+	$param .= "&search_usergroup=".urlencode($usergroup);
+}
+if ($socid > 0) {
+	$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 ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') {
+	$param .= '&action='.urlencode($action);
+}
+if ($begin_h != '') {
+	$param .= '&begin_h='.urlencode($begin_h);
+}
+if ($end_h != '') {
+	$param .= '&end_h='.urlencode($end_h);
+}
+if ($begin_d != '') {
+	$param .= '&begin_d='.urlencode($begin_d);
+}
+if ($end_d != '') {
+	$param .= '&end_d='.urlencode($end_d);
 }
-if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
-if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status);
-if ($filter)        $param .= "&search_filter=".urlencode($filter);
-if ($filtert)       $param .= "&search_filtert=".urlencode($filtert);
-if ($usergroup > 0) $param .= "&search_usergroup=".urlencode($usergroup);
-if ($socid > 0)     $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 ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') $param .= '&action='.urlencode($action);
-if ($begin_h != '') $param .= '&begin_h='.urlencode($begin_h);
-if ($end_h != '')   $param .= '&end_h='.urlencode($end_h);
-if ($begin_d != '') $param .= '&begin_d='.urlencode($begin_d);
-if ($end_d != '')   $param .= '&end_d='.urlencode($end_d);
 $param .= "&maxprint=".urlencode($maxprint);
 
 $paramnoactionodate = $param;
@@ -301,28 +364,23 @@ print '<form method="POST" id="searchFormList" class="listactionsfilter" action=
 
 $showextcals = $listofextcals;
 // Legend
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	$s = '';
 	$s .= '<script type="text/javascript">'."\n";
 	$s .= 'jQuery(document).ready(function () {'."\n";
 	$s .= 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });'."\n";
 	$s .= 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });'."\n";
 	$s .= 'jQuery(".family_birthday").toggle();'."\n";
-	if ($action == "show_week" || $action == "show_month" || empty($action))
-	{
+	if ($action == "show_week" || $action == "show_month" || empty($action)) {
 		$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
 		$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
-  	$s .= '});'."\n";
+	$s .= '});'."\n";
 	$s .= '</script>'."\n";
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		$s .= '<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
-		if (is_array($showextcals) && count($showextcals) > 0)
-		{
-			foreach ($showextcals as $val)
-			{
+		if (is_array($showextcals) && count($showextcals) > 0) {
+			foreach ($showextcals as $val) {
 				$htmlname = md5($val['name']);
 				$s .= '<script type="text/javascript">'."\n";
 				$s .= 'jQuery(document).ready(function () {'."\n";
@@ -341,11 +399,9 @@ if ($conf->use_javascript_ajax)
 		// Calendars from hooks
 		$parameters = array(); $object = null;
 		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			$s .= $hookmanager->resPrint;
-		} elseif ($reshook > 1)
-		{
+		} elseif ($reshook > 1) {
 			$s = $hookmanager->resPrint;
 		}
 	}
@@ -397,8 +453,7 @@ if (empty($reshook)) {
 
 
 $newcardbutton = '';
-if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
-{
+if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
 
 	$newparam .= '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
@@ -435,7 +490,9 @@ $eventarray = array();
 
 // DEFAULT CALENDAR + AUTOEVENT CALENDAR + CONFERENCEBOOTH CALENDAR
 $sql = 'SELECT';
-if ($usergroup > 0) $sql .= " DISTINCT";
+if ($usergroup > 0) {
+	$sql .= " DISTINCT";
+}
 $sql .= ' a.id, a.label,';
 $sql .= ' a.datep,';
 $sql .= ' a.datep2,';
@@ -445,31 +502,44 @@ $sql .= ' a.transparency, a.priority, a.fulldayevent, a.location,';
 $sql .= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
 $sql .= ' ca.code, ca.libelle as type_label, ca.color, ca.type as type_type, ca.picto as type_picto';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-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";
+}
 // 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 a.fk_action = ca.id';
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
-if (!empty($actioncode))
-{
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	{
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
-			if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
-			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
+if (!empty($actioncode)) {
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
+			if ($actioncode == 'AC_OTH') {
+				$sql .= " AND ca.type != 'systemauto'";
+			}
+			if ($actioncode == 'AC_OTH_AUTO') {
+				$sql .= " AND ca.type = 'systemauto'";
+			}
 		}
 	} else {
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
-			if (is_array($actioncode))
-			{
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
+			if (is_array($actioncode)) {
 				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
 			} else {
 				$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
@@ -477,14 +547,23 @@ if (!empty($actioncode))
 		}
 	}
 }
-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 a.fk_soc = '.$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 a.fk_soc = '.$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 ($action == 'show_day')
-{
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
+if ($action == 'show_day') {
 	$sql .= " AND (";
 	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
 	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year))."')";
@@ -508,18 +587,33 @@ if ($action == 'show_day')
 	$sql .= " AND a.datep2 > '".$db->idate(dol_mktime(23, 59, 59, 12, 31, $year) + (60 * 60 * 24 * 7))."')";
 	$sql .= ')';
 }
-if ($type) $sql .= " AND ca.id = ".$type;
-if ($status == '0') { $sql .= " AND a.percent = 0"; }
-if ($status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
-if ($status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
-if ($status == 'done' || $status == '100') { $sql .= " AND (a.percent = 100)"; }
-if ($status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
+if ($type) {
+	$sql .= " AND ca.id = ".$type;
+}
+if ($status == '0') {
+	$sql .= " AND a.percent = 0";
+}
+if ($status == '-1') {
+	$sql .= " AND a.percent = -1";
+}	// Not applicable
+if ($status == '50') {
+	$sql .= " AND (a.percent > 0 AND a.percent < 100)";
+}	// Running already started
+if ($status == 'done' || $status == '100') {
+	$sql .= " AND (a.percent = 100)";
+}
+if ($status == 'todo') {
+	$sql .= " AND (a.percent >= 0 AND a.percent < 100)";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0)
-{
+if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND (";
-	if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
-	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	if ($filtert > 0) {
+		$sql .= "ar.fk_element = ".$filtert;
+	}
+	if ($usergroup > 0) {
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	}
 	$sql .= ")";
 }
 // Sort on date
@@ -528,17 +622,14 @@ $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
 
 dol_syslog("comm/action/pertype.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		// Discard auto action if option is on
-		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
-		{
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') {
 			$i++;
 			continue;
 		}
@@ -572,34 +663,41 @@ if ($resql)
 
 		// Defined date_start_in_calendar and date_end_in_calendar property
 		// They are date start and end of action but modified to not be outside calendar view.
-		if ($event->percentage <= 0)
-		{
+		if ($event->percentage <= 0) {
 			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-			else $event->date_end_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) {
+				$event->date_end_in_calendar = $datep2;
+			} else {
+				$event->date_end_in_calendar = $datep;
+			}
 		} else {
 			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-			else $event->date_end_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) {
+				$event->date_end_in_calendar = $datep2;
+			} else {
+				$event->date_end_in_calendar = $datep;
+			}
 		}
 		// Define ponctual property
-		if ($event->date_start_in_calendar == $event->date_end_in_calendar)
-		{
+		if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
 			$event->ponctuel = 1;
 		}
 
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow ||
-		$event->date_start_in_calendar >= $lastdaytoshow)
-		{
+		$event->date_start_in_calendar >= $lastdaytoshow) {
 			// This record is out of visible range
 			unset($event);
 		} else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-			if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+			if ($event->date_start_in_calendar < $firstdaytoshow) {
+				$event->date_start_in_calendar = $firstdaytoshow;
+			}
+			if ($event->date_end_in_calendar >= $lastdaytoshow) {
+				$event->date_end_in_calendar = ($lastdaytoshow - 1);
+			}
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
@@ -617,7 +715,9 @@ if ($resql)
 				$j++;
 
 				$daykey += 60 * 60 * 24;
-				if ($daykey > $event->date_end_in_calendar) $loop = false;
+				if ($daykey > $event->date_end_in_calendar) {
+					$loop = false;
+				}
 			} while ($loop);
 
 			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
@@ -637,11 +737,12 @@ $cacheusers = array();
 
 // Define theme_datacolor array
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
-if (is_readable($color_file))
-{
+if (is_readable($color_file)) {
 	include_once $color_file;
 }
-if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+if (!is_array($theme_datacolor)) {
+	$theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+}
 
 
 $newparam = $param; // newparam is for birthday links
@@ -681,8 +782,7 @@ echo "</tr>\n";
 echo '<tr class="liste_titre">';
 echo '<td></td>';
 $i = 0;
-for ($h = $begin_d; $h < $end_d; $h++)
-{
+for ($h = $begin_d; $h < $end_d; $h++) {
 	echo '<td class="center">';
 	print '<small style="font-family: courier">'.sprintf("%02d", $h).'</small>';
 	print "</td>";
@@ -698,8 +798,7 @@ $colorsbytype = array();
 $labelbytype = array();
 $sql = "SELECT code, color, libelle as label FROM ".MAIN_DB_PREFIX."c_actioncomm ORDER BY position";
 $resql = $db->query($sql);
-while ($obj = $db->fetch_object($resql))
-{
+while ($obj = $db->fetch_object($resql)) {
 	$typeofevents[$obj->code] = $obj->code;
 	$colorsbytype[$obj->code] = $obj->color;
 	$labelbytype[$obj->code] = $obj->label;
@@ -710,8 +809,7 @@ $todayarray = dol_getdate($now, 'fast');
 $sav = $tmpday;
 $showheader = true;
 $var = false;
-foreach ($typeofevents as $typeofevent)
-{
+foreach ($typeofevents as $typeofevent) {
 	$var = !$var;
 	echo "<tr>";
 	echo '<td class="cal_current_month cal_peruserviewname'.($var ? ' cal_impair' : '').'">'.$typeofevent.'</td>';
@@ -719,10 +817,8 @@ foreach ($typeofevents as $typeofevent)
 
 	// Lopp on each day of week
 	$i = 0;
-	for ($iter_day = 0; $iter_day < 8; $iter_day++)
-	{
-		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
-		{
+	for ($iter_day = 0; $iter_day < 8; $iter_day++) {
+		if (($i + 1) < $begin_d || ($i + 1) > $end_d) {
 			$i++;
 			continue;
 		}
@@ -735,10 +831,16 @@ foreach ($typeofevents as $typeofevent)
 		$tmpyear = $tmparray['year'];
 
 		$style = 'cal_current_month';
-		if ($iter_day == 6) $style .= ' cal_other_month';
+		if ($iter_day == 6) {
+			$style .= ' cal_other_month';
+		}
 		$today = 0;
-		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
-		if ($today) $style = 'cal_today_peruser';
+		if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) {
+			$today = 1;
+		}
+		if ($today) {
+			$style = 'cal_today_peruser';
+		}
 
 		show_day_events_pertype($typeofevent, $tmpday, $tmpmonth, $tmpyear, 0, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
@@ -751,14 +853,11 @@ foreach ($typeofevents as $typeofevent)
 echo "</table>\n";
 echo "<br>";
 
-if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
-{
+if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 	$langs->load("commercial");
 	print '<br>'.$langs->trans("Legend").': <br>';
-	foreach ($colorsbytype as $code => $color)
-	{
-		if ($color)
-		{
+	foreach ($colorsbytype as $code => $color) {
+		if ($color) {
 			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color ? 'background: #'.$color.';' : '').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
 			print $langs->trans("Action".$code) != "Action".$code ? $langs->trans("Action".$code) : $labelbytype[$code];
 			//print $code;
@@ -860,41 +959,41 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 	//if ($username->id && $day==1) var_dump($eventarray);
 
 	// We are in a particular day for $username, now we scan all events
-	foreach ($eventarray as $daykey => $notused)
-	{
+	foreach ($eventarray as $daykey => $notused) {
 		$annee = dol_print_date($daykey, '%Y');
 		$mois =  dol_print_date($daykey, '%m');
 		$jour =  dol_print_date($daykey, '%d');
 
-		if ($day == $jour && $month == $mois && $year == $annee)	// Is it the day we are looking for when calling function ?
-		{
+		if ($day == $jour && $month == $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
 			// Scan all event for this date
-			foreach ($eventarray[$daykey] as $index => $event)
-			{
+			foreach ($eventarray[$daykey] as $index => $event) {
 				//print $daykey.' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
-				if (!in_array($username->id, $keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show
+				if (!in_array($username->id, $keysofuserassigned)) {
+					continue; // We discard record if event is from another user than user we want to show
+				}
 				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formatEvent', $parameters, $event, $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');
+				}
 
 				$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
 				// Define $color (Hex string like '0088FF') and $cssclass of event
 				$color = -1; $cssclass = ''; $colorindex = -1;
-				if (in_array($user->id, $keysofuserassigned))
-				{
+				if (in_array($user->id, $keysofuserassigned)) {
 					$nummytasks++; $cssclass = 'family_mytasks';
-					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
-				} elseif ($event->type_code == 'ICALEVENT')
-				{
+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+						$color = $event->type_color;
+					}
+				} elseif ($event->type_code == 'ICALEVENT') {
 					$numical++;
-					if (!empty($event->icalname))
-					{
+					if (!empty($event->icalname)) {
 						if (!isset($numicals[dol_string_nospecial($event->icalname)])) {
 							$numicals[dol_string_nospecial($event->icalname)] = 0;
 						}
@@ -903,25 +1002,26 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 
 					$color = $event->icalcolor;
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
-				} elseif ($event->type_code == 'BIRTHDAY')
-				{
+				} elseif ($event->type_code == 'BIRTHDAY') {
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				} else {
 					$numother++; $cssclass = 'family_other';
-					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color = $event->type_color;
+					if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+						$color = $event->type_color;
+					}
 				}
 
-				if ($color < 0)	// Color was not set on user card. Set color according to color index.
-				{
+				if ($color < 0) {	// Color was not set on user card. Set color according to color index.
 					// Define color index if not yet defined
 					$idusertouse = ($event->userownerid ? $event->userownerid : 0);
-					if (isset($colorindexused[$idusertouse]))
-					{
+					if (isset($colorindexused[$idusertouse])) {
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
 					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
-						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
+						if (!empty($theme_datacolor[$nextindextouse + 1])) {
+							$nextindextouse++; // Prepare to use next color
+						}
 					}
 					// Define color
 					$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
@@ -929,60 +1029,57 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 				//$cssclass=$cssclass.' '.$cssclass.'_day_'.$ymd;
 
 				// Define all rects with event (cases1 is first half hour, cases2 is second half hour)
-				for ($h = $begin_h; $h < $end_h; $h++)
-				{
+				for ($h = $begin_h; $h < $end_h; $h++) {
 					//if ($username->id == 1 && $day==1) print 'h='.$h;
 					$newcolor = ''; //init
-					if (empty($event->fulldayevent))
-					{
+					if (empty($event->fulldayevent)) {
 						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, 'tzuserrel', 0);
 						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, 'tzuserrel', 0);
 						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'tzuserrel', 0);
 
 						$dateendtouse = $event->date_end_in_calendar;
-						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
+						if ($dateendtouse == $event->date_start_in_calendar) {
+							$dateendtouse++;
+						}
 
 						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
 
-						if ($event->date_start_in_calendar < $b && $dateendtouse > $a)
-						{
+						if ($event->date_start_in_calendar < $b && $dateendtouse > $a) {
 							$busy = $event->transparency;
 							$cases1[$h][$event->id]['busy'] = $busy;
 							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel');
-							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-							{
+							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar) {
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
-								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+									$cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								} else {
+									$cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								}
+							}
+							if ($event->label) {
+								$cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
-							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases1[$h][$event->id]['typecode'] = $event->type_code;
 							$cases1[$h][$event->id]['color'] = $color;
-							if ($event->fk_project > 0)
-							{
-								if (empty($cacheprojects[$event->fk_project]))
-								{
+							if ($event->fk_project > 0) {
+								if (empty($cacheprojects[$event->fk_project])) {
 									$tmpproj = new Project($db);
 									$tmpproj->fetch($event->fk_project);
 									$cacheprojects[$event->fk_project] = $tmpproj;
 								}
 								$cases1[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 							}
-							if ($event->socid > 0)
-							{
-								if (empty($cachethirdparties[$event->socid]))
-								{
+							if ($event->socid > 0) {
+								if (empty($cachethirdparties[$event->socid])) {
 									$tmpthirdparty = new Societe($db);
 									$tmpthirdparty->fetch($event->socid);
 									$cachethirdparties[$event->socid] = $tmpthirdparty;
 								}
 								$cases1[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
-							if ($event->contact_id > 0)
-							{
-								if (empty($cachecontacts[$event->contact_id]))
-								{
+							if ($event->contact_id > 0) {
+								if (empty($cachecontacts[$event->contact_id])) {
 									$tmpcontact = new Contact($db);
 									$tmpcontact->fetch($event->contact_id);
 									$cachecontacts[$event->contact_id] = $tmpcontact;
@@ -990,45 +1087,42 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 								$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
-						if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
-						{
+						if ($event->date_start_in_calendar < $c && $dateendtouse > $b) {
 							$busy = $event->transparency;
 							$cases2[$h][$event->id]['busy'] = $busy;
 							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel');
-							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-							{
+							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar) {
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
-								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+									$cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								} else {
+									$cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								}
+							}
+							if ($event->label) {
+								$cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
-							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
 							$cases2[$h][$event->id]['color'] = $color;
-							if ($event->fk_project > 0)
-							{
-								if (empty($cacheprojects[$event->fk_project]))
-								{
+							if ($event->fk_project > 0) {
+								if (empty($cacheprojects[$event->fk_project])) {
 									$tmpproj = new Project($db);
 									$tmpproj->fetch($event->fk_project);
 									$cacheprojects[$event->fk_project] = $tmpproj;
 								}
 								$cases2[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 							}
-							if ($event->socid > 0)
-							{
-								if (empty($cachethirdparties[$event->socid]))
-								{
+							if ($event->socid > 0) {
+								if (empty($cachethirdparties[$event->socid])) {
 									$tmpthirdparty = new Societe($db);
 									$tmpthirdparty->fetch($event->socid);
 									$cachethirdparties[$event->socid] = $tmpthirdparty;
 								}
 								$cases2[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
-							if ($event->contact_id > 0)
-							{
-								if (empty($cachecontacts[$event->contact_id]))
-								{
+							if ($event->contact_id > 0) {
+								if (empty($cachecontacts[$event->contact_id])) {
 									$tmpcontact = new Contact($db);
 									$tmpcontact->fetch($event->contact_id);
 									$cachecontacts[$event->contact_id] = $tmpcontact;
@@ -1056,63 +1150,83 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 	}
 
 	// Now output $casesX
-	for ($h = $begin_h; $h < $end_h; $h++)
-	{
+	for ($h = $begin_h; $h < $end_h; $h++) {
 		$color1 = ''; $color2 = '';
 		$style1 = ''; $style2 = '';
 		$string1 = '&nbsp;'; $string2 = '&nbsp;';
 		$title1 = ''; $title2 = '';
-		if (isset($cases1[$h]) && $cases1[$h] != '')
-		{
+		if (isset($cases1[$h]) && $cases1[$h] != '') {
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			if (count($cases1[$h]) > 1) {
+				$title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			}
 			$string1 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1 = 'peruser_notbusy';
-			else $style1 = 'peruser_busy';
-			foreach ($cases1[$h] as $id => $ev)
-			{
-				if ($ev['busy']) $style1 = 'peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+				$style1 = 'peruser_notbusy';
+			} else {
+				$style1 = 'peruser_busy';
+			}
+			foreach ($cases1[$h] as $id => $ev) {
+				if ($ev['busy']) {
+					$style1 = 'peruser_busy';
+				}
 			}
 		}
-		if (isset($cases2[$h]) && $cases2[$h] != '')
-		{
+		if (isset($cases2[$h]) && $cases2[$h] != '') {
 			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			if (count($cases2[$h]) > 1) {
+				$title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			}
 			$string2 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2 = 'peruser_notbusy';
-			else $style2 = 'peruser_busy';
-			foreach ($cases2[$h] as $id => $ev)
-			{
-				if ($ev['busy']) $style2 = 'peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+				$style2 = 'peruser_notbusy';
+			} else {
+				$style2 = 'peruser_busy';
+			}
+			foreach ($cases2[$h] as $id => $ev) {
+				if ($ev['busy']) {
+					$style2 = 'peruser_busy';
+				}
 			}
 		}
 
 		$ids1 = ''; $ids2 = '';
-		if (count($cases1[$h]) && array_keys($cases1[$h])) $ids1 = join(',', array_keys($cases1[$h]));
-		if (count($cases2[$h]) && array_keys($cases2[$h])) $ids2 = join(',', array_keys($cases2[$h]));
+		if (count($cases1[$h]) && array_keys($cases1[$h])) {
+			$ids1 = join(',', array_keys($cases1[$h]));
+		}
+		if (count($cases2[$h]) && array_keys($cases2[$h])) {
+			$ids2 = join(',', array_keys($cases2[$h]));
+		}
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
-		if (count($cases1[$h]) == 1)	// only 1 event
-		{
+		if ($h == $begin_h) {
+			echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		} else {
+			echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		}
+		if (count($cases1[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases1[$h], 0, 1);
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
-			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
-			if ($output[0]['color']) $color1 = $output[0]['color'];
-		} elseif (count($cases1[$h]) > 1)
-		{
+			if ($output[0]['string']) {
+				$title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+				$color1 = $output[0]['color'];
+			}
+		} elseif (count($cases1[$h]) > 1) {
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
 		}
 
-		if (count($cases2[$h]) == 1)	// only 1 event
-		{
+		if (count($cases2[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases2[$h], 0, 1);
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
-			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
-			if ($output[0]['color']) $color2 = $output[0]['color'];
-		} elseif (count($cases2[$h]) > 1)
-		{
+			if ($output[0]['string']) {
+				$title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+				$color2 = $output[0]['color'];
+			}
+		} elseif (count($cases2[$h]) > 1) {
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
 		}
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 34a4cc232b6..388363f63fc 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -39,7 +39,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
-if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
+	$conf->global->AGENDA_MAX_EVENTS_DAY_VIEW = 3;
+}
 
 $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);
@@ -57,23 +59,36 @@ $showbirthday = 0;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "a.datec";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "a.datec";
+}
 
 // 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;
 }
 
@@ -90,18 +105,20 @@ $type = GETPOST("search_type", 'alpha') ?GETPOST("search_type", 'alpha') : GETPO
 $maxprint = ((GETPOST("maxprint", 'int') != '') ?GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('search_actioncode', 'array'))
-{
+if (GETPOST('search_actioncode', 'array')) {
 	$actioncode = GETPOST('search_actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
 	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '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);
+}
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
-if ($dateselect > 0)
-{
+if ($dateselect > 0) {
 	$day = GETPOST('dateselectday', 'int');
 	$month = GETPOST('dateselectmonth', 'int');
 	$year = GETPOST('dateselectyear', 'int');
@@ -112,21 +129,37 @@ $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
 $begin_h = GETPOST('begin_h', 'int') != '' ? GETPOST('begin_h', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 9);
 $end_h   = GETPOST('end_h', 'int') ? GETPOST('end_h', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 18);
-if ($begin_h < 0 || $begin_h > 23) $begin_h = 9;
-if ($end_h < 1 || $end_h > 24) $end_h = 18;
-if ($end_h <= $begin_h) $end_h = $begin_h + 1;
+if ($begin_h < 0 || $begin_h > 23) {
+	$begin_h = 9;
+}
+if ($end_h < 1 || $end_h > 24) {
+	$end_h = 18;
+}
+if ($end_h <= $begin_h) {
+	$end_h = $begin_h + 1;
+}
 
 $tmp = empty($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? '1-5' : $conf->global->MAIN_DEFAULT_WORKING_DAYS;
 $tmp = str_replace(' ', '', $tmp); // FIX 7533
 $tmparray = explode('-', $tmp);
 $begin_d = GETPOST('begin_d', 'int') ?GETPOST('begin_d', 'int') : ($tmparray[0] != '' ? $tmparray[0] : 1);
 $end_d   = GETPOST('end_d', 'int') ?GETPOST('end_d', 'int') : ($tmparray[1] != '' ? $tmparray[1] : 5);
-if ($begin_d < 1 || $begin_d > 7) $begin_d = 1;
-if ($end_d < 1 || $end_d > 7) $end_d = 7;
-if ($end_d < $begin_d) $end_d = $begin_d + 1;
+if ($begin_d < 1 || $begin_d > 7) {
+	$begin_d = 1;
+}
+if ($end_d < 1 || $end_d > 7) {
+	$end_d = 7;
+}
+if ($end_d < $begin_d) {
+	$end_d = $begin_d + 1;
+}
 
-if ($status == '' && !GETPOSTISSET('status')) $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 ($status == '' && !GETPOSTISSET('status')) {
+	$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 (GETPOST('viewcal', 'alpha') && $action != 'show_day' && $action != 'show_week' && $action != 'show_peruser') {
 	$action = 'show_month'; $day = '';
@@ -149,8 +182,7 @@ $hookmanager->initHooks(array('agenda'));
  * Actions
  */
 
-if ($action == 'delete_action')
-{
+if ($action == 'delete_action') {
 	$event = new ActionComm($db);
 	$event->fetch($actionid);
 	$event->fetch_optionals();
@@ -185,7 +217,9 @@ $parameters = array(
 	'usergroup' => $usergroup,
 );
 $reshook = $hookmanager->executeHooks('beforeAgendaPerUser', $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');
+}
 
 $form = new Form($db);
 $companystatic = new Societe($db);
@@ -223,29 +257,65 @@ $tmpday = $first_day;
 //print 'xx'.$next_year.'-'.$next_month.'-'.$next_day;
 
 $title = $langs->trans("DoneAndToDoActions");
-if ($status == 'done') $title = $langs->trans("DoneActions");
-if ($status == 'todo') $title = $langs->trans("ToDoActions");
+if ($status == 'done') {
+	$title = $langs->trans("DoneActions");
+}
+if ($status == 'todo') {
+	$title = $langs->trans("ToDoActions");
+}
 
 $param = '';
 if ($actioncode || GETPOSTISSET('search_actioncode')) {
 	if (is_array($actioncode)) {
-		foreach ($actioncode as $str_action) $param .= "&search_actioncode[]=".urlencode($str_action);
-	} else $param .= "&search_actioncode=".urlencode($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 ($status || GETPOSTISSET('status')) {
+	$param .= "&search_status=".urlencode($status);
+}
+if ($filter) {
+	$param .= "&search_filter=".urlencode($filter);
+}
+if ($filtert) {
+	$param .= "&search_filtert=".urlencode($filtert);
+}
+if ($usergroup > 0) {
+	$param .= "&search_usergroup=".urlencode($usergroup);
+}
+if ($socid > 0) {
+	$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 ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') {
+	$param .= '&action='.urlencode($action);
+}
+if ($begin_h != '') {
+	$param .= '&begin_h='.urlencode($begin_h);
+}
+if ($end_h != '') {
+	$param .= '&end_h='.urlencode($end_h);
+}
+if ($begin_d != '') {
+	$param .= '&begin_d='.urlencode($begin_d);
+}
+if ($end_d != '') {
+	$param .= '&end_d='.urlencode($end_d);
 }
-if ($resourceid > 0) $param .= "&search_resourceid=".urlencode($resourceid);
-if ($status || GETPOSTISSET('status')) $param .= "&search_status=".urlencode($status);
-if ($filter)        $param .= "&search_filter=".urlencode($filter);
-if ($filtert)       $param .= "&search_filtert=".urlencode($filtert);
-if ($usergroup > 0) $param .= "&search_usergroup=".urlencode($usergroup);
-if ($socid > 0)     $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 ($action == 'show_day' || $action == 'show_week' || $action == 'show_month' || $action != 'show_peruser') $param .= '&action='.urlencode($action);
-if ($begin_h != '') $param .= '&begin_h='.urlencode($begin_h);
-if ($end_h != '')   $param .= '&end_h='.urlencode($end_h);
-if ($begin_d != '') $param .= '&begin_d='.urlencode($begin_d);
-if ($end_d != '')   $param .= '&end_d='.urlencode($end_d);
 $param .= "&maxprint=".urlencode($maxprint);
 
 $paramnoactionodate = $param;
@@ -305,28 +375,23 @@ print '<form method="POST" id="searchFormList" class="listactionsfilter" action=
 
 $showextcals = $listofextcals;
 // Legend
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	$s = '';
 	$s .= '<script type="text/javascript">'."\n";
 	$s .= 'jQuery(document).ready(function () {'."\n";
 	$s .= 'jQuery("#check_mytasks").click(function() { jQuery(".family_mytasks").toggle(); jQuery(".family_other").toggle(); });'."\n";
 	$s .= 'jQuery("#check_birthday").click(function() { jQuery(".family_birthday").toggle(); });'."\n";
 	$s .= 'jQuery(".family_birthday").toggle();'."\n";
-	if ($action == "show_week" || $action == "show_month" || empty($action))
-	{
+	if ($action == "show_week" || $action == "show_month" || empty($action)) {
 		$s .= 'jQuery( "td.sortable" ).sortable({connectWith: ".sortable",placeholder: "ui-state-highlight",items: "div:not(.unsortable)", receive: function( event, ui ) {';
 		$s .= 'var frm=jQuery("#move_event");frm.attr("action",ui.item.find("a.cal_event").attr("href")).children("#newdate").val(jQuery(event.target).closest("div").attr("id"));frm.submit();}});'."\n";
 	}
-  	$s .= '});'."\n";
+	$s .= '});'."\n";
 	$s .= '</script>'."\n";
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		$s .= '<div class="nowrap clear float"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
-		if (is_array($showextcals) && count($showextcals) > 0)
-		{
-			foreach ($showextcals as $val)
-			{
+		if (is_array($showextcals) && count($showextcals) > 0) {
+			foreach ($showextcals as $val) {
 				$htmlname = md5($val['name']);
 				$s .= '<script type="text/javascript">'."\n";
 				$s .= 'jQuery(document).ready(function () {'."\n";
@@ -345,11 +410,9 @@ if ($conf->use_javascript_ajax)
 		// Calendars from hooks
 		$parameters = array(); $object = null;
 		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			$s .= $hookmanager->resPrint;
-		} elseif ($reshook > 1)
-		{
+		} elseif ($reshook > 1) {
 			$s = $hookmanager->resPrint;
 		}
 	}
@@ -401,15 +464,22 @@ if (empty($reshook)) {
 
 
 $newcardbutton = '';
-if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create)
-{
+if ($user->rights->agenda->myactions->create || $user->rights->agenda->allactions->create) {
 	$tmpforcreatebutton = dol_getdate(dol_now(), true);
 
 	$newparam .= '&month='.urlencode(str_pad($month, 2, "0", STR_PAD_LEFT)).'&year='.urlencode($tmpforcreatebutton['year']);
-	if ($begin_h !== '') $newparam .= '&begin_h='.urlencode($begin_h);
-	if ($end_h !== '') $newparam .= '&end_h='.urlencode($end_h);
-	if ($begin_d !== '') $newparam .= '&begin_d='.urlencode($begin_d);
-	if ($end_d !== '') $newparam .= '&end_d='.urlencode($end_d);
+	if ($begin_h !== '') {
+		$newparam .= '&begin_h='.urlencode($begin_h);
+	}
+	if ($end_h !== '') {
+		$newparam .= '&end_h='.urlencode($end_h);
+	}
+	if ($begin_d !== '') {
+		$newparam .= '&begin_d='.urlencode($begin_d);
+	}
+	if ($end_d !== '') {
+		$newparam .= '&end_d='.urlencode($end_d);
+	}
 
 	//$param='month='.$monthshown.'&year='.$year;
 	$hourminsec = '100000';
@@ -442,7 +512,9 @@ $eventarray = array();
 
 // DEFAULT CALENDAR + AUTOEVENT CALENDAR + CONFERENCEBOOTH CALENDAR
 $sql = 'SELECT';
-if ($usergroup > 0) $sql .= " DISTINCT";
+if ($usergroup > 0) {
+	$sql .= " DISTINCT";
+}
 $sql .= ' a.id, a.label,';
 $sql .= ' a.datep,';
 $sql .= ' a.datep2,';
@@ -452,46 +524,68 @@ $sql .= ' a.transparency, a.priority, a.fulldayevent, a.location,';
 $sql .= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype, a.fk_project,';
 $sql .= ' ca.code, ca.libelle as type_label, ca.color, ca.type as type_type, ca.picto as type_picto';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
-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";
+}
 // 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 a.fk_action = ca.id';
 $sql .= ' AND a.entity IN ('.getEntity('agenda').')';
 // Condition on actioncode
-if (!empty($actioncode))
-{
-	if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	{
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
-			if ($actioncode == 'AC_OTH') $sql .= " AND ca.type != 'systemauto'";
-			if ($actioncode == 'AC_OTH_AUTO') $sql .= " AND ca.type = 'systemauto'";
+if (!empty($actioncode)) {
+	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
+			if ($actioncode == 'AC_OTH') {
+				$sql .= " AND ca.type != 'systemauto'";
+			}
+			if ($actioncode == 'AC_OTH_AUTO') {
+				$sql .= " AND ca.type = 'systemauto'";
+			}
 		}
 	} else {
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " AND ca.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND ca.type = 'systemauto'";
-		else {
-			if (is_array($actioncode))
-			{
-  				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " AND ca.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " AND ca.type = 'systemauto'";
+		} else {
+			if (is_array($actioncode)) {
+				$sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
 			} else {
-  				$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+				$sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
 			}
 		}
 	}
 }
-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 a.fk_soc = '.$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 a.fk_soc = '.$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 ($action == 'show_day')
-{
+if ($filtert > 0 || $usergroup > 0) {
+	$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
+}
+if ($action == 'show_day') {
 	$sql .= " AND (";
 	$sql .= " (a.datep BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month, $day, $year, 'tzuserrel'))."'";
 	$sql .= " AND '".$db->idate(dol_mktime(23, 59, 59, $month, $day, $year, 'tzuserrel'))."')";
@@ -515,18 +609,33 @@ if ($action == 'show_day')
 	$sql .= " AND a.datep2 > '".$db->idate($lastdaytoshow + (60 * 60 * 24 * 2))."')";
 	$sql .= ')';
 }
-if ($type) $sql .= " AND ca.id = ".$type;
-if ($status == '0') { $sql .= " AND a.percent = 0"; }
-if ($status == '-1') { $sql .= " AND a.percent = -1"; }	// Not applicable
-if ($status == '50') { $sql .= " AND (a.percent > 0 AND a.percent < 100)"; }	// Running already started
-if ($status == 'done' || $status == '100') { $sql .= " AND (a.percent = 100)"; }
-if ($status == 'todo') { $sql .= " AND (a.percent >= 0 AND a.percent < 100)"; }
+if ($type) {
+	$sql .= " AND ca.id = ".$type;
+}
+if ($status == '0') {
+	$sql .= " AND a.percent = 0";
+}
+if ($status == '-1') {
+	$sql .= " AND a.percent = -1";
+}	// Not applicable
+if ($status == '50') {
+	$sql .= " AND (a.percent > 0 AND a.percent < 100)";
+}	// Running already started
+if ($status == 'done' || $status == '100') {
+	$sql .= " AND (a.percent = 100)";
+}
+if ($status == 'todo') {
+	$sql .= " AND (a.percent >= 0 AND a.percent < 100)";
+}
 // We must filter on assignement table
-if ($filtert > 0 || $usergroup > 0)
-{
+if ($filtert > 0 || $usergroup > 0) {
 	$sql .= " AND (";
-	if ($filtert > 0) $sql .= "ar.fk_element = ".$filtert;
-	if ($usergroup > 0) $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	if ($filtert > 0) {
+		$sql .= "ar.fk_element = ".$filtert;
+	}
+	if ($usergroup > 0) {
+		$sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+	}
 	$sql .= ")";
 }
 // Sort on date
@@ -535,18 +644,15 @@ $sql .= ' ORDER BY fk_user_action, datep'; //fk_user_action
 
 dol_syslog("comm/action/peruser.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		// Discard auto action if option is on
-		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO')
-		{
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->code == 'AC_OTH_AUTO') {
 			$i++;
 			continue;
 		}
@@ -580,34 +686,41 @@ if ($resql)
 
 		// Defined date_start_in_calendar and date_end_in_calendar property
 		// They are date start and end of action but modified to not be outside calendar view.
-		if ($event->percentage <= 0)
-		{
+		if ($event->percentage <= 0) {
 			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-			else $event->date_end_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) {
+				$event->date_end_in_calendar = $datep2;
+			} else {
+				$event->date_end_in_calendar = $datep;
+			}
 		} else {
 			$event->date_start_in_calendar = $datep;
-			if ($datep2 != '' && $datep2 >= $datep) $event->date_end_in_calendar = $datep2;
-			else $event->date_end_in_calendar = $datep;
+			if ($datep2 != '' && $datep2 >= $datep) {
+				$event->date_end_in_calendar = $datep2;
+			} else {
+				$event->date_end_in_calendar = $datep;
+			}
 		}
 		// Define ponctual property
-		if ($event->date_start_in_calendar == $event->date_end_in_calendar)
-		{
+		if ($event->date_start_in_calendar == $event->date_end_in_calendar) {
 			$event->ponctuel = 1;
 		}
 
 		// Check values
 		if ($event->date_end_in_calendar < $firstdaytoshow ||
-		$event->date_start_in_calendar >= $lastdaytoshow)
-		{
+		$event->date_start_in_calendar >= $lastdaytoshow) {
 			// This record is out of visible range
 			unset($event);
 		} else {
 			//print $i.' - '.dol_print_date($this->date_start_in_calendar, 'dayhour').' - '.dol_print_date($this->date_end_in_calendar, 'dayhour').'<br>'."\n";
 			$event->fetch_userassigned(); // This load $event->userassigned
 
-			if ($event->date_start_in_calendar < $firstdaytoshow) $event->date_start_in_calendar = $firstdaytoshow;
-			if ($event->date_end_in_calendar >= $lastdaytoshow) $event->date_end_in_calendar = ($lastdaytoshow - 1);
+			if ($event->date_start_in_calendar < $firstdaytoshow) {
+				$event->date_start_in_calendar = $firstdaytoshow;
+			}
+			if ($event->date_end_in_calendar >= $lastdaytoshow) {
+				$event->date_end_in_calendar = ($lastdaytoshow - 1);
+			}
 
 			// Add an entry in actionarray for each day
 			$daycursor = $event->date_start_in_calendar;
@@ -626,7 +739,9 @@ if ($resql)
 				$j++;
 
 				$daykey += 60 * 60 * 24;
-				if ($daykey > $event->date_end_in_calendar) $loop = false;
+				if ($daykey > $event->date_end_in_calendar) {
+					$loop = false;
+				}
 			} while ($loop);
 
 			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
@@ -646,11 +761,12 @@ $cacheusers = array();
 
 // Define theme_datacolor array
 $color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
-if (is_readable($color_file))
-{
+if (is_readable($color_file)) {
 	include_once $color_file;
 }
-if (!is_array($theme_datacolor)) $theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+if (!is_array($theme_datacolor)) {
+	$theme_datacolor = array(array(120, 130, 150), array(200, 160, 180), array(190, 190, 220));
+}
 
 
 $newparam = $param; // newparam is for birthday links
@@ -682,17 +798,21 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	echo '<tr class="liste_titre">';
 	echo '<td class="nopaddingtopimp nopaddingbottomimp nowraponsmartphone">';
 
-	if ($canedit && $action == 'show_peruser')
-	{
+	if ($canedit && $action == 'show_peruser') {
 		// Filter on hours
 		print img_picto('', 'clock', 'class="fawidth30 inline-block paddingleft"');
 		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleTimeRange").'">'.$langs->trans("Hours").'</span>';
 		print "\n".'<div class="ui-grid-a inline-block"><div class="ui-block-a nowraponall">';
 		print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
+		if (empty($conf->dol_use_jmobile)) {
+			print ' - ';
+		} else {
+			print '</div><div class="ui-block-b">';
+		}
 		print '<input type="number" class="short" name="end_h" value="'.$end_h.'" min="1" max="24">';
-		if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H");
+		if (empty($conf->dol_use_jmobile)) {
+			print ' '.$langs->trans("H");
+		}
 		print '</div></div>';
 
 		print '<br>';
@@ -702,26 +822,30 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		print '<span class="hideonsmartphone" title="'.$langs->trans("VisibleDaysRange").'">'.$langs->trans("DaysOfWeek").'</span>';
 		print "\n".'<div class="ui-grid-a  inline-block"><div class="ui-block-a">';
 		print '<input type="number" class="short" name="begin_d" value="'.$begin_d.'" min="1" max="7">';
-		if (empty($conf->dol_use_jmobile)) print ' - ';
-		else print '</div><div class="ui-block-b">';
+		if (empty($conf->dol_use_jmobile)) {
+			print ' - ';
+		} else {
+			print '</div><div class="ui-block-b">';
+		}
 		print '<input type="number" class="short" name="end_d" value="'.$end_d.'" min="1" max="7">';
 		print '</div></div>';
 	}
 
 	print '</td>';
 	$i = 0; // 0 = sunday,
-	while ($i < 7)
-	{
-		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
-		{
+	while ($i < 7) {
+		if (($i + 1) < $begin_d || ($i + 1) > $end_d) {
 			$i++;
 			continue;
 		}
 		echo '<td align="center" colspan="'.($end_h - $begin_h).'">';
 		echo '<span class="bold spandayofweek">'.$langs->trans("Day".(($i + (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1)) % 7)).'</span>';
 		print "<br>";
-		if ($i) print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day');
-		else print dol_print_date($currentdaytoshow, 'day');
+		if ($i) {
+			print dol_print_date(dol_time_plus_duree($currentdaytoshow, $i, 'd'), 'day');
+		} else {
+			print dol_print_date($currentdaytoshow, 'day');
+		}
 		echo "</td>\n";
 		$i++;
 	}
@@ -730,15 +854,12 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	echo '<tr class="liste_titre">';
 	echo '<td></td>';
 	$i = 0;
-	while ($i < 7)
-	{
-		if (($i + 1) < $begin_d || ($i + 1) > $end_d)
-		{
+	while ($i < 7) {
+		if (($i + 1) < $begin_d || ($i + 1) > $end_d) {
 			$i++;
 			continue;
 		}
-		for ($h = $begin_h; $h < $end_h; $h++)
-		{
+		for ($h = $begin_h; $h < $end_h; $h++) {
 			echo '<td class="center">';
 			print '<small style="font-family: courier">'.sprintf("%02d", $h).'</small>';
 			print "</td>";
@@ -753,17 +874,16 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	$usernames = array(); //init
 	$usernamesid = array();
 	/* Use this to have list of users only if users have events */
-	if (!empty($conf->global->AGENDA_SHOWOWNERONLY_ONPERUSERVIEW))
-	{
-		foreach ($eventarray as $daykey => $notused)
-		{
+	if (!empty($conf->global->AGENDA_SHOWOWNERONLY_ONPERUSERVIEW)) {
+		foreach ($eventarray as $daykey => $notused) {
 			// Get all assigned users for each event
-			foreach ($eventarray[$daykey] as $index => $event)
-			{
+			foreach ($eventarray[$daykey] as $index => $event) {
 				$event->fetch_userassigned();
 				$listofuserid = $event->userassigned;
 				foreach ($listofuserid as $userid => $tmp) {
-				   	if (!in_array($userid, $usernamesid)) $usernamesid[$userid] = $userid;
+					if (!in_array($userid, $usernamesid)) {
+						$usernamesid[$userid] = $userid;
+					}
 				}
 			}
 		}
@@ -771,28 +891,31 @@ while ($currentdaytoshow < $lastdaytoshow) {
 		/* Use this list to have for all users */
 		$sql = "SELECT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-		if ($usergroup > 0)	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
+		if ($usergroup > 0) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug ON u.rowid = ug.fk_user";
+		}
 		$sql .= " WHERE u.statut = 1 AND u.entity IN (".getEntity('user').")";
-		if ($usergroup > 0)	$sql .= " AND ug.fk_usergroup = ".$usergroup;
+		if ($usergroup > 0) {
+			$sql .= " AND ug.fk_usergroup = ".$usergroup;
+		}
 		//print $sql;
 		$resql = $db->query($sql);
 		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
 					$usernamesid[$obj->rowid] = $obj->rowid;
 					$i++;
 				}
 			}
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 	}
 	//var_dump($usernamesid);
-	foreach ($usernamesid as $id)
-	{
+	foreach ($usernamesid as $id) {
 		$tmpuser = new User($db);
 		$result = $tmpuser->fetch($id);
 		$usernames[] = $tmpuser;
@@ -823,8 +946,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	$labelbytype = array();
 	$sql = "SELECT code, color, libelle as label FROM ".MAIN_DB_PREFIX."c_actioncomm ORDER BY position";
 	$resql = $db->query($sql);
-	while ($obj = $db->fetch_object($resql))
-	{
+	while ($obj = $db->fetch_object($resql)) {
 		$colorsbytype[$obj->code] = $obj->color;
 		$labelbytype[$obj->code] = $obj->label;
 	}
@@ -834,8 +956,7 @@ while ($currentdaytoshow < $lastdaytoshow) {
 	$sav = $tmpday;
 	$showheader = true;
 	$var = false;
-	foreach ($usernames as $username)
-	{
+	foreach ($usernames as $username) {
 		$var = !$var;
 		echo "<tr>";
 		echo '<td class="tdoverflowmax100 cal_current_month cal_peruserviewname'.($var ? ' cal_impair' : '').'">';
@@ -845,10 +966,8 @@ while ($currentdaytoshow < $lastdaytoshow) {
 
 		// Lopp on each day of week
 		$i = 0;
-		for ($iter_day = 0; $iter_day < 8; $iter_day++)
-		{
-			if (($i + 1) < $begin_d || ($i + 1) > $end_d)
-			{
+		for ($iter_day = 0; $iter_day < 8; $iter_day++) {
+			if (($i + 1) < $begin_d || ($i + 1) > $end_d) {
 				$i++;
 				continue;
 			}
@@ -862,10 +981,16 @@ while ($currentdaytoshow < $lastdaytoshow) {
 			//var_dump($curtime.' '.$tmpday.' '.$tmpmonth.' '.$tmpyear);
 
 			$style = 'cal_current_month';
-			if ($iter_day == 6) $style .= ' cal_other_month';
+			if ($iter_day == 6) {
+				$style .= ' cal_other_month';
+			}
 			$today = 0;
-			if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) $today = 1;
-			if ($today) $style = 'cal_today_peruser';
+			if ($todayarray['mday'] == $tmpday && $todayarray['mon'] == $tmpmonth && $todayarray['year'] == $tmpyear) {
+				$today = 1;
+			}
+			if ($today) {
+				$style = 'cal_today_peruser';
+			}
 
 			show_day_events2($username, $tmpday, $tmpmonth, $tmpyear, 0, $style, $eventarray, 0, $maxnbofchar, $newparam, 1, 300, $showheader, $colorsbytype, $var);
 
@@ -883,14 +1008,11 @@ while ($currentdaytoshow < $lastdaytoshow) {
 
 echo '</div>';
 
-if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && !empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE))
-{
+if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && !empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
 	$langs->load("commercial");
 	print '<br>'.$langs->trans("Legend").': <br>';
-	foreach ($colorsbytype as $code => $color)
-	{
-		if ($color)
-		{
+	foreach ($colorsbytype as $code => $color) {
+		if ($color) {
 			print '<div style="float: left; padding: 2px; margin-right: 6px;"><div style="'.($color ? 'background: #'.$color.';' : '').'width:16px; float: left; margin-right: 4px;">&nbsp;</div>';
 			print $langs->trans("Action".$code) != "Action".$code ? $langs->trans("Action".$code) : $labelbytype[$code];
 			//print $code;
@@ -993,38 +1115,37 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 	//if ($username->id && $day==1) var_dump($eventarray);
 
 	// We are in a particular day for $username, now we scan all events
-	foreach ($eventarray as $daykey => $notused)
-	{
+	foreach ($eventarray as $daykey => $notused) {
 		$annee = dol_print_date($daykey, '%Y');
 		$mois =  dol_print_date($daykey, '%m');
 		$jour =  dol_print_date($daykey, '%d');
 
-		if ($day == $jour && $month == $mois && $year == $annee)	// Is it the day we are looking for when calling function ?
-		{
+		if ($day == $jour && $month == $mois && $year == $annee) {	// Is it the day we are looking for when calling function ?
 			// Scan all event for this date
-			foreach ($eventarray[$daykey] as $index => $event)
-			{
+			foreach ($eventarray[$daykey] as $index => $event) {
 				//print $daykey.' '.dol_print_date($daykey, 'dayhour', 'gmt').' '.$year.'-'.$month.'-'.$day.' -> '.$event->id.' '.$index.' '.$annee.'-'.$mois.'-'.$jour."<br>\n";
 				//var_dump($event);
 
 				$keysofuserassigned = array_keys($event->userassigned);
 				$ponct = ($event->date_start_in_calendar == $event->date_end_in_calendar);
 
-				if (!in_array($username->id, $keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show
+				if (!in_array($username->id, $keysofuserassigned)) {
+					continue; // We discard record if event is from another user than user we want to show
+				}
 				//if ($username->id != $event->userownerid) continue;	// We discard record if event is from another user than user we want to show
 
 				$parameters = array();
 				$reshook = $hookmanager->executeHooks('formatEvent', $parameters, $event, $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');
+				}
 
 				// Define $color (Hex string like '0088FF') and $cssclass of event
 				$color = -1; $cssclass = ''; $colorindex = -1;
-				if (in_array($user->id, $keysofuserassigned))
-				{
+				if (in_array($user->id, $keysofuserassigned)) {
 					$cssclass = 'family_mytasks';
 
-					if (empty($cacheusers[$event->userownerid]))
-					{
+					if (empty($cacheusers[$event->userownerid])) {
 						$newuser = new User($db);
 						$newuser->fetch($event->userownerid);
 						$cacheusers[$event->userownerid] = $newuser;
@@ -1032,14 +1153,16 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					//var_dump($cacheusers[$event->userownerid]->color);
 
 					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
+					if (!empty($cacheusers[$event->userownerid]->color)) {
+						$color = $cacheusers[$event->userownerid]->color;
+					}
 
-					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color;
-				} elseif ($event->type_code == 'ICALEVENT')
-				{
+					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
+						$color = $event->type_color;
+					}
+				} elseif ($event->type_code == 'ICALEVENT') {
 					$numical++;
-					if (!empty($event->icalname))
-					{
+					if (!empty($event->icalname)) {
 						if (!isset($numicals[dol_string_nospecial($event->icalname)])) {
 							$numicals[dol_string_nospecial($event->icalname)] = 0;
 						}
@@ -1048,16 +1171,14 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 
 					$color = $event->icalcolor;
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other unsortable');
-				} elseif ($event->type_code == 'BIRTHDAY')
-				{
+				} elseif ($event->type_code == 'BIRTHDAY') {
 					$numbirthday++; $colorindex = 2; $cssclass = 'family_birthday unsortable'; $color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				} else {
 					$numother++;
 					$color = ($event->icalcolor ? $event->icalcolor : -1);
 					$cssclass = (!empty($event->icalname) ? 'family_ext'.md5($event->icalname) : 'family_other');
 
-					if (empty($cacheusers[$event->userownerid]))
-					{
+					if (empty($cacheusers[$event->userownerid])) {
 						$newuser = new User($db);
 						$newuser->fetch($event->userownerid);
 						$cacheusers[$event->userownerid] = $newuser;
@@ -1065,82 +1186,83 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 					//var_dump($cacheusers[$event->userownerid]->color);
 
 					// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
-					if (!empty($cacheusers[$event->userownerid]->color)) $color = $cacheusers[$event->userownerid]->color;
+					if (!empty($cacheusers[$event->userownerid]->color)) {
+						$color = $cacheusers[$event->userownerid]->color;
+					}
 
-					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) $color = $event->type_color;
+					if (!empty($conf->global->AGENDA_USE_COLOR_PER_EVENT_TYPE)) {
+						$color = $event->type_color;
+					}
 				}
 
-				if ($color < 0)	// Color was not set on user card. Set color according to color index.
-				{
+				if ($color < 0) {	// Color was not set on user card. Set color according to color index.
 					// Define color index if not yet defined
 					$idusertouse = ($event->userownerid ? $event->userownerid : 0);
-					if (isset($colorindexused[$idusertouse]))
-					{
+					if (isset($colorindexused[$idusertouse])) {
 						$colorindex = $colorindexused[$idusertouse]; // Color already assigned to this user
 					} else {
 						$colorindex = $nextindextouse;
 						$colorindexused[$idusertouse] = $colorindex;
-						if (!empty($theme_datacolor[$nextindextouse + 1])) $nextindextouse++; // Prepare to use next color
+						if (!empty($theme_datacolor[$nextindextouse + 1])) {
+							$nextindextouse++; // Prepare to use next color
+						}
 					}
 					// Define color
 					$color = sprintf("%02x%02x%02x", $theme_datacolor[$colorindex][0], $theme_datacolor[$colorindex][1], $theme_datacolor[$colorindex][2]);
 				}
 
 				// Define all rects with event (cases1 is first half hour, cases2 is second half hour)
-				for ($h = $begin_h; $h < $end_h; $h++)
-				{
+				for ($h = $begin_h; $h < $end_h; $h++) {
 					//if ($username->id == 1 && $day==1) print 'h='.$h;
 					$newcolor = ''; //init
-					if (empty($event->fulldayevent))
-					{
+					if (empty($event->fulldayevent)) {
 						$a = dol_mktime((int) $h, 0, 0, $month, $day, $year, 'tzuserrel', 0);
 						$b = dol_mktime((int) $h, 30, 0, $month, $day, $year, 'tzuserrel', 0);
 						$c = dol_mktime((int) $h + 1, 0, 0, $month, $day, $year, 'tzuserrel', 0);
 
 						$dateendtouse = $event->date_end_in_calendar;
-						if ($dateendtouse == $event->date_start_in_calendar) $dateendtouse++;
+						if ($dateendtouse == $event->date_start_in_calendar) {
+							$dateendtouse++;
+						}
 
 						//print dol_print_date($event->date_start_in_calendar,'dayhour').'-'.dol_print_date($a,'dayhour').'-'.dol_print_date($b,'dayhour').'<br>';
 
-						if ($event->date_start_in_calendar < $b && $dateendtouse > $a)
-						{
+						if ($event->date_start_in_calendar < $b && $dateendtouse > $a) {
 							$busy = $event->transparency;
 							$cases1[$h][$event->id]['busy'] = $busy;
 							$cases1[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel');
-							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-							{
+							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar) {
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
-								else $cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+									$cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								} else {
+									$cases1[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								}
+							}
+							if ($event->label) {
+								$cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
-							if ($event->label) $cases1[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases1[$h][$event->id]['typecode'] = $event->type_code;
 							$cases1[$h][$event->id]['color'] = $color;
-							if ($event->fk_project > 0)
-							{
-								if (empty($cacheprojects[$event->fk_project]))
-								{
+							if ($event->fk_project > 0) {
+								if (empty($cacheprojects[$event->fk_project])) {
 									$tmpproj = new Project($db);
 									$tmpproj->fetch($event->fk_project);
 									$cacheprojects[$event->fk_project] = $tmpproj;
 								}
 								$cases1[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 							}
-							if ($event->socid > 0)
-							{
-								if (empty($cachethirdparties[$event->socid]))
-								{
+							if ($event->socid > 0) {
+								if (empty($cachethirdparties[$event->socid])) {
 									$tmpthirdparty = new Societe($db);
 									$tmpthirdparty->fetch($event->socid);
 									$cachethirdparties[$event->socid] = $tmpthirdparty;
 								}
 								$cases1[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
-							if ($event->contact_id > 0)
-							{
-								if (empty($cachecontacts[$event->contact_id]))
-								{
+							if ($event->contact_id > 0) {
+								if (empty($cachecontacts[$event->contact_id])) {
 									$tmpcontact = new Contact($db);
 									$tmpcontact->fetch($event->contact_id);
 									$cachecontacts[$event->contact_id] = $tmpcontact;
@@ -1148,45 +1270,42 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 								$cases1[$h][$event->id]['string'] .= ', '.$cachecontacts[$event->contact_id]->getFullName($langs);
 							}
 						}
-						if ($event->date_start_in_calendar < $c && $dateendtouse > $b)
-						{
+						if ($event->date_start_in_calendar < $c && $dateendtouse > $b) {
 							$busy = $event->transparency;
 							$cases2[$h][$event->id]['busy'] = $busy;
 							$cases2[$h][$event->id]['string'] = dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel');
-							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar)
-							{
+							if ($event->date_end_in_calendar && $event->date_end_in_calendar != $event->date_start_in_calendar) {
 								$tmpa = dol_getdate($event->date_start_in_calendar, true);
 								$tmpb = dol_getdate($event->date_end_in_calendar, true);
-								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
-								else $cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+									$cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'hour', 'tzuserrel');
+								} else {
+									$cases2[$h][$event->id]['string'] .= '-'.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel');
+								}
+							}
+							if ($event->label) {
+								$cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							}
-							if ($event->label) $cases2[$h][$event->id]['string'] .= ' - '.$event->label;
 							$cases2[$h][$event->id]['typecode'] = $event->type_code;
 							$cases2[$h][$event->id]['color'] = $color;
-							if ($event->fk_project > 0)
-							{
-								if (empty($cacheprojects[$event->fk_project]))
-								{
+							if ($event->fk_project > 0) {
+								if (empty($cacheprojects[$event->fk_project])) {
 									$tmpproj = new Project($db);
 									$tmpproj->fetch($event->fk_project);
 									$cacheprojects[$event->fk_project] = $tmpproj;
 								}
 								$cases2[$h][$event->id]['string'] .= ', '.$langs->trans("Project").': '.$cacheprojects[$event->fk_project]->ref.' - '.$cacheprojects[$event->fk_project]->title;
 							}
-							if ($event->socid > 0)
-							{
-								if (empty($cachethirdparties[$event->socid]))
-								{
+							if ($event->socid > 0) {
+								if (empty($cachethirdparties[$event->socid])) {
 									$tmpthirdparty = new Societe($db);
 									$tmpthirdparty->fetch($event->socid);
 									$cachethirdparties[$event->socid] = $tmpthirdparty;
 								}
 								$cases2[$h][$event->id]['string'] .= ', '.$cachethirdparties[$event->socid]->name;
 							}
-							if ($event->contact_id > 0)
-							{
-								if (empty($cachecontacts[$event->contact_id]))
-								{
+							if ($event->contact_id > 0) {
+								if (empty($cachecontacts[$event->contact_id])) {
 									$tmpcontact = new Contact($db);
 									$tmpcontact->fetch($event->contact_id);
 									$cachecontacts[$event->contact_id] = $tmpcontact;
@@ -1214,72 +1333,92 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 	}
 
 	// Now output $casesX
-	for ($h = $begin_h; $h < $end_h; $h++)
-	{
+	for ($h = $begin_h; $h < $end_h; $h++) {
 		$color1 = ''; $color2 = '';
 		$style1 = ''; $style2 = '';
 		$string1 = '&nbsp;'; $string2 = '&nbsp;';
 		$title1 = ''; $title2 = '';
-		if (isset($cases1[$h]) && $cases1[$h] != '')
-		{
+		if (isset($cases1[$h]) && $cases1[$h] != '') {
 			//$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases1[$h]) > 1) $title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			if (count($cases1[$h]) > 1) {
+				$title1 .= count($cases1[$h]).' '.(count($cases1[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			}
 			$string1 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style1 = 'peruser_notbusy';
-			else $style1 = 'peruser_busy';
-			foreach ($cases1[$h] as $id => $ev)
-			{
-				if ($ev['busy']) $style1 = 'peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+				$style1 = 'peruser_notbusy';
+			} else {
+				$style1 = 'peruser_busy';
+			}
+			foreach ($cases1[$h] as $id => $ev) {
+				if ($ev['busy']) {
+					$style1 = 'peruser_busy';
+				}
 			}
 		}
-		if (isset($cases2[$h]) && $cases2[$h] != '')
-		{
+		if (isset($cases2[$h]) && $cases2[$h] != '') {
 			//$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
-			if (count($cases2[$h]) > 1) $title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			if (count($cases2[$h]) > 1) {
+				$title2 .= count($cases2[$h]).' '.(count($cases2[$h]) == 1 ? $langs->trans("Event") : $langs->trans("Events"));
+			}
 			$string2 = '&nbsp;';
-			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) $style2 = 'peruser_notbusy';
-			else $style2 = 'peruser_busy';
-			foreach ($cases2[$h] as $id => $ev)
-			{
-				if ($ev['busy']) $style2 = 'peruser_busy';
+			if (empty($conf->global->AGENDA_NO_TRANSPARENT_ON_NOT_BUSY)) {
+				$style2 = 'peruser_notbusy';
+			} else {
+				$style2 = 'peruser_busy';
+			}
+			foreach ($cases2[$h] as $id => $ev) {
+				if ($ev['busy']) {
+					$style2 = 'peruser_busy';
+				}
 			}
 		}
 
 		$ids1 = '';
 		$ids2 = '';
-		if (is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) $ids1 = join(',', array_keys($cases1[$h]));
-		if (is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) $ids2 = join(',', array_keys($cases2[$h]));
+		if (is_array($cases1[$h]) && count($cases1[$h]) && array_keys($cases1[$h])) {
+			$ids1 = join(',', array_keys($cases1[$h]));
+		}
+		if (is_array($cases2[$h]) && count($cases2[$h]) && array_keys($cases2[$h])) {
+			$ids2 = join(',', array_keys($cases2[$h]));
+		}
 
-		if ($h == $begin_h) echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
-		else echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
-		if (is_array($cases1[$h]) && count($cases1[$h]) == 1)	// only 1 event
-		{
+		if ($h == $begin_h) {
+			echo '<td class="'.$style.'_peruserleft cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		} else {
+			echo '<td class="'.$style.' cal_peruser'.($var ? ' cal_impair '.$style.'_impair' : '').'">';
+		}
+		if (is_array($cases1[$h]) && count($cases1[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases1[$h], 0, 1);
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
-			if ($output[0]['string']) $title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
-			if ($output[0]['color']) $color1 = $output[0]['color'];
-		} elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1)
-		{
+			if ($output[0]['string']) {
+				$title1 .= ($title1 ? ' - ' : '').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+				$color1 = $output[0]['color'];
+			}
+		} elseif (is_array($cases1[$h]) && count($cases1[$h]) > 1) {
 			$title1 = $langs->trans("Ref").' '.$ids1.($title1 ? ' - '.$title1 : '');
 			$color1 = '222222';
 		}
 
-		if (is_array($cases2[$h]) && count($cases2[$h]) == 1)	// only 1 event
-		{
+		if (is_array($cases2[$h]) && count($cases2[$h]) == 1) {	// only 1 event
 			$output = array_slice($cases2[$h], 0, 1);
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
-			if ($output[0]['string']) $title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
-			if ($output[0]['color']) $color2 = $output[0]['color'];
-		} elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1)
-		{
+			if ($output[0]['string']) {
+				$title2 .= ($title2 ? ' - ' : '').$output[0]['string'];
+			}
+			if ($output[0]['color']) {
+				$color2 = $output[0]['color'];
+			}
+		} elseif (is_array($cases2[$h]) && count($cases2[$h]) > 1) {
 			$title2 = $langs->trans("Ref").' '.$ids2.($title2 ? ' - '.$title2 : '');
 			$color2 = '222222';
 		}
 		print '<table class="nobordernopadding" width="100%">';
 		print '<tr><td ';
-		if ($style1 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color1 ? $color1 : "888").' !important" ';
-		elseif ($color1)
-		{
+		if ($style1 == 'peruser_notbusy') {
+			print 'style="border: 1px solid #'.($color1 ? $color1 : "888").' !important" ';
+		} elseif ($color1) {
 			print ($color1 ? 'style="background: #'.$color1.';"' : '');
 		}
 		print 'class="';
@@ -1287,9 +1426,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 		print 'onclickopenref'.($title2 ? ' classfortooltip' : '').($title1 ? ' cursorpointer' : '').'" ref="ref_'.$username->id.'_'.sprintf("%04d", $year).'_'.sprintf("%02d", $month).'_'.sprintf("%02d", $day).'_'.sprintf("%02d", $h).'_00_'.($ids1 ? $ids1 : 'none').'"'.($title1 ? ' title="'.$title1.'"' : '').'>';
 		print $string1;
 		print '</td><td ';
-		if ($style2 == 'peruser_notbusy') print 'style="border: 1px solid #'.($color2 ? $color2 : "888").' !important" ';
-		elseif ($color2)
-		{
+		if ($style2 == 'peruser_notbusy') {
+			print 'style="border: 1px solid #'.($color2 ? $color2 : "888").' !important" ';
+		} elseif ($color2) {
 			print ($color2 ? 'style="background: #'.$color2.';"' : '');
 		}
 		print 'class="';
diff --git a/htdocs/comm/action/rapport/index.php b/htdocs/comm/action/rapport/index.php
index 3534d3d8996..44bd8547e8a 100644
--- a/htdocs/comm/action/rapport/index.php
+++ b/htdocs/comm/action/rapport/index.php
@@ -42,14 +42,22 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if ($page == -1 || $page == null) { $page = 0; }
+if ($page == -1 || $page == null) {
+	$page = 0;
+}
 $offset = $limit * $page;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "a.datep";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "a.datep";
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'agenda', $socid, '', 'myactions');
 
 
@@ -57,12 +65,10 @@ $result = restrictedArea($user, 'agenda', $socid, '', 'myactions');
  * Actions
  */
 
-if ($action == 'builddoc')
-{
+if ($action == 'builddoc') {
 	$cat = new CommActionRapport($db, $month, $year);
 	$result = $cat->write_file(GETPOST('id', 'int'));
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		setEventMessages($cat->error, $cat->errors, 'errors');
 	}
 }
@@ -89,12 +95,10 @@ $sql .= " GROUP BY year, month, df";
 $sql .= " ORDER BY year DESC, month DESC, df DESC";
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -105,15 +109,18 @@ $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
 dol_syslog("select", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$param = '';
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.$limit;
+	}
 
 	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">';
@@ -137,12 +144,10 @@ if ($resql)
 	print '<td class="center">'.$langs->trans("Size").'</td>';
 	print "</tr>\n";
 
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
-		if ($obj)
-		{
+		if ($obj) {
 			print '<tr class="oddeven">';
 
 			// Date
@@ -161,10 +166,11 @@ if ($resql)
 			$file = $conf->agenda->dir_temp."/".$name;
 			$modulepart = 'actionsreport';
 			$documenturl = DOL_URL_ROOT.'/document.php';
-			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper
+			if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) {
+				$documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper
+			}
 
-			if (file_exists($file))
-			{
+			if (file_exists($file)) {
 				print '<td class="tdoverflowmax300">';
 				//print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?page='.$page.'&amp;file='.urlencode($relativepath).'&amp;modulepart=actionsreport">'.img_pdf().'</a>';
 
@@ -174,7 +180,9 @@ if ($resql)
 				// Show file name with link to download
 				$out .= '<a href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';
 				$mime = dol_mimetype($relativepath, '', 0);
-				if (preg_match('/text/', $mime)) $out .= ' target="_blank"';
+				if (preg_match('/text/', $mime)) {
+					$out .= ' target="_blank"';
+				}
 				$out .= ' target="_blank">';
 				$out .= img_mime($filearray["name"], $langs->trans("File").': '.$filearray["name"]);
 				$out .= $filearray["name"];
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index 84af27bb7b9..e314d0b3e66 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -37,13 +37,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'propal'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -76,8 +80,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -90,8 +93,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -103,8 +105,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index fa12fe9b555..4cbe35b31c5 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -32,8 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadlangs(array('admin', 'other', 'propal'));
@@ -44,14 +45,18 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 
 $elementtype = 'propaldet'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -83,8 +88,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -97,8 +101,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -110,8 +113,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 0858d412b94..fcd6471604a 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -144,7 +144,6 @@ if ($id > 0 && empty($object->id)) {
 }
 
 
-
 /*
  * Actions
  */
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 9c4e1437ced..b1e8b3c3768 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -32,9 +32,15 @@ $langs->load("companies");
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "p.name";
-if ($page < 0) { $page = 0; }
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "p.name";
+}
+if ($page < 0) {
+	$page = 0;
+}
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
@@ -47,7 +53,9 @@ $begin = GETPOST('begin', 'alpha');
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $socid, '');
 
 
@@ -57,13 +65,11 @@ $result = restrictedArea($user, 'societe', $socid, '');
 
 llxHeader('', $langs->trans("Contacts"));
 
-if ($type == "c" || $type == "p")
-{
+if ($type == "c" || $type == "p") {
 	$label = $langs->trans("Customers");
 	$urlfiche = "card.php";
 }
-if ($type == "f")
-{
+if ($type == "f") {
 	$label = $langs->trans("Suppliers");
 	$urlfiche = "card.php";
 }
@@ -75,39 +81,46 @@ if ($type == "f")
 $sql = "SELECT s.rowid, s.nom as name, st.libelle as stcomm";
 $sql .= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
+}
 $sql .= " ".MAIN_DB_PREFIX."socpeople as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 $sql .= " WHERE s.fk_stcomm = st.id";
 $sql .= " AND p.entity IN (".getEntity('socpeople').")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($type == "c") $sql .= " AND s.client IN (1, 3)";
-if ($type == "p") $sql .= " AND s.client IN (2, 3)";
-if ($type == "f") $sql .= " AND s.fournisseur = 1";
-if ($socid) $sql .= " AND s.rowid = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($type == "c") {
+	$sql .= " AND s.client IN (1, 3)";
+}
+if ($type == "p") {
+	$sql .= " AND s.client IN (2, 3)";
+}
+if ($type == "f") {
+	$sql .= " AND s.fournisseur = 1";
+}
+if ($socid) {
+	$sql .= " AND s.rowid = ".$socid;
+}
 
-if (dol_strlen($stcomm))
-{
+if (dol_strlen($stcomm)) {
 	$sql .= " AND s.fk_stcomm=".$db->escape($stcomm);
 }
 
-if (!empty($search_lastname))
-{
+if (!empty($search_lastname)) {
 	$sql .= " AND p.name LIKE '%".$db->escape($search_lastname)."%'";
 }
 
-if (!empty($search_firstname))
-{
+if (!empty($search_firstname)) {
 	$sql .= " AND p.firstname LIKE '%".$db->escape($search_firstname)."%'";
 }
 
-if (!empty($search_company))
-{
+if (!empty($search_company)) {
 	$sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 }
 
-if (!empty($contactname)) // acces a partir du module de recherche
-{
+if (!empty($contactname)) { // acces a partir du module de recherche
 	$sql .= " AND (p.name LIKE '%".$db->escape($contactname)."%' OR lower(p.firstname) LIKE '%".$db->escape($contactname)."%') ";
 	$sortfield = "p.name";
 	$sortorder = "ASC";
@@ -117,8 +130,7 @@ $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$param = "&type=".$type;
@@ -146,8 +158,7 @@ if ($resql)
 	print "</tr>\n";
 
 	$i = 0;
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 899c9275d31..d9fce1551e3 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -687,8 +687,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 				$obj = $companystatic;
 				$s = '';
-				/*if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
-				{
+				/*if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 					$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
 				}
 				if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index eb6d29d12a5..8d57a9ee6a0 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -22,7 +22,9 @@
  *       \brief      Page to define emailing targets
  */
 
-if (!defined('NOSTYLECHECK')) define('NOSTYLECHECK', '1');
+if (!defined('NOSTYLECHECK')) {
+	define('NOSTYLECHECK', '1');
+}
 
 require '../../main.inc.php';
 
@@ -41,22 +43,27 @@ if (!empty($conf->categorie->enabled)) {
 }
 
 // Security check
-if (!$user->rights->mailing->lire || $user->socid > 0)
+if (!$user->rights->mailing->lire || $user->socid > 0) {
 	accessforbidden();
+}
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder)
+if (!$sortorder) {
 	$sortorder = "ASC";
-if (!$sortfield)
+}
+if (!$sortfield) {
 	$sortfield = "email";
+}
 
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
@@ -84,8 +91,7 @@ if (empty($template_id)) {
 	$result = $advTarget->fetch($template_id);
 }
 
-if ($result < 0)
-{
+if ($result < 0) {
 	setEventMessages($advTarget->error, $advTarget->errors, 'errors');
 } else {
 	if (!empty($advTarget->id)) {
@@ -397,16 +403,12 @@ if ($_POST["button_removefilter"]) {
 	$search_email = '';
 }
 
-
 /*
  * View
  */
 
-
 llxHeader('', $langs->trans("MailAdvTargetRecipients"));
 
-
-
 $form = new Form($db);
 $formadvtargetemaling = new FormAdvTargetEmailing($db);
 $formcompany = new FormCompany($db);
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index e045401bef4..bd427115a57 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -131,7 +131,7 @@ if (empty($reshook)) {
 			$subject  = $object->sujet;
 			$message  = $object->body;
 			$from     = $object->email_from;
-			$replyto  = $object->email_replyto;
+			$replyto = $object->email_replyto;
 			$errorsto = $object->email_errorsto;
 			// Is the message in html
 			$msgishtml = -1; // Unknown by default
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index a2a06c2a038..a9095609ab7 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -36,7 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 $langs->load("mails");
 
 // Security check
-if (!$user->rights->mailing->lire || $user->socid > 0) accessforbidden();
+if (!$user->rights->mailing->lire || $user->socid > 0) {
+	accessforbidden();
+}
 
 
 // Load variable for pagination
@@ -44,12 +46,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "mc.statut,email";
-if (!$sortorder) $sortorder = "DESC,ASC";
+if (!$sortfield) {
+	$sortfield = "mc.statut,email";
+}
+if (!$sortorder) {
+	$sortorder = "DESC,ASC";
+}
 
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'int');
@@ -71,13 +79,11 @@ $result = $object->fetch($id);
  * Actions
  */
 
-if ($action == 'add')
-{
+if ($action == 'add') {
 	$module = GETPOST("module", 'alpha');
 	$result = -1;
 
-	foreach ($modulesdir as $dir)
-	{
+	foreach ($modulesdir as $dir) {
 		// Load modules attributes in arrays (name, numero, orders) from dir directory
 		//print $dir."\n<br>";
 		dol_syslog("Scan directory ".$dir." for modules");
@@ -86,8 +92,7 @@ if ($action == 'add')
 		$file = $dir."/".$module.".modules.php";
 		$classname = "mailing_".$module;
 
-		if (file_exists($file))
-		{
+		if (file_exists($file)) {
 			require_once $file;
 
 			// Add targets into database
@@ -96,25 +101,21 @@ if ($action == 'add')
 			$result = $obj->add_to_target($id);
 		}
 	}
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		setEventMessages($langs->trans("XTargetsAdded", $result), null, 'mesgs');
 
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	}
-	if ($result == 0)
-	{
+	if ($result == 0) {
 		setEventMessages($langs->trans("WarningNoEMailsAdded"), null, 'warnings');
 	}
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		setEventMessages($langs->trans("Error").($obj->error ? ' '.$obj->error : ''), null, 'errors');
 	}
 }
 
-if (GETPOST('clearlist', 'int'))
-{
+if (GETPOST('clearlist', 'int')) {
 	// Loading Class
 	$obj = new MailingTargets($db);
 	$obj->clear_target($id);
@@ -124,8 +125,7 @@ if (GETPOST('clearlist', 'int'))
 	*/
 }
 
-if (GETPOST('exportcsv', 'int'))
-{
+if (GETPOST('exportcsv', 'int')) {
 	$completefilename = 'targets_emailing'.$object->id.'_'.dol_print_date(dol_now(), 'dayhourlog').'.csv';
 	header('Content-Type: text/csv');
 	header('Content-Disposition: attachment;filename='.$completefilename);
@@ -138,13 +138,11 @@ if (GETPOST('exportcsv', 'int'))
 	$sql .= $db->order($sortfield, $sortorder);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$sep = ',';
 
-		while ($obj = $db->fetch_object($resql))
-		{
+		while ($obj = $db->fetch_object($resql)) {
 			print $obj->rowid.$sep;
 			print '"'.$obj->lastname.'"'.$sep;
 			print '"'.$obj->firstname.'"'.$sep;
@@ -166,15 +164,12 @@ if (GETPOST('exportcsv', 'int'))
 	exit;
 }
 
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	// Ici, rowid indique le destinataire et id le mailing
 	$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE rowid=".$rowid;
 	$resql = $db->query($sql);
-	if ($resql)
-	{
-		if (!empty($id))
-		{
+	if ($resql) {
+		if (!empty($id)) {
 			$obj = new MailingTargets($db);
 			$obj->update_nb($id);
 
@@ -189,8 +184,7 @@ if ($action == 'delete')
 }
 
 // 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_lastname = '';
 	$search_firstname = '';
 	$search_email = '';
@@ -209,8 +203,7 @@ llxHeader('', $langs->trans("Mailing"), 'EN:Module_EMailing|FR:Module_Mailing|ES
 $form = new Form($db);
 $formmailing = new FormMailing($db);
 
-if ($object->fetch($id) >= 0)
-{
+if ($object->fetch($id) >= 0) {
 	$head = emailing_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'targets', $langs->trans("Mailing"), -1, 'email');
@@ -219,14 +212,15 @@ if ($object->fetch($id) >= 0)
 
 	$morehtmlright = '';
 	$nbtry = $nbok = 0;
-	if ($object->statut == 2 || $object->statut == 3)
-	{
+	if ($object->statut == 2 || $object->statut == 3) {
 		$nbtry = $object->countNbOfTargets('alreadysent');
 		$nbko  = $object->countNbOfTargets('alreadysentko');
 		$nbok = ($nbtry - $nbko);
 
 		$morehtmlright .= ' ('.$nbtry.'/'.$object->nbemail;
-		if ($nbko) $morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+		if ($nbko) {
+			$morehtmlright .= ' - '.$nbko.' '.$langs->trans("Error");
+		}
 		$morehtmlright .= ') &nbsp; ';
 	}
 
@@ -279,21 +273,19 @@ if ($object->fetch($id) >= 0)
 	print $langs->trans("TotalNbOfDistinctRecipients");
 	print '</td><td colspan="3">';
 	$nbemail = ($object->nbemail ? $object->nbemail : 0);
-	if (is_numeric($nbemail))
-	{
+	if (is_numeric($nbemail)) {
 		$text = '';
-		if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail)))
-		{
-			if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0)
-			{
+		if ((!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail) && ($object->statut == 1 || ($object->statut == 2 && $nbtry < $nbemail))) {
+			if ($conf->global->MAILING_LIMIT_SENDBYWEB > 0) {
 				$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
 			} else {
 				$text .= $langs->trans('SendingFromWebInterfaceIsNotAllowed');
 			}
 		}
-		if (empty($nbemail)) $nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
-		if ($text)
-		{
+		if (empty($nbemail)) {
+			$nbemail .= ' '.img_warning('').' <font class="warning">'.$langs->trans("NoTargetYet").'</font>';
+		}
+		if ($text) {
 			print $form->textwithpicto($nbemail, $text, 1, 'warning');
 		} else {
 			print $nbemail;
@@ -313,8 +305,7 @@ if ($object->fetch($id) >= 0)
 	$allowaddtarget = ($object->statut == 0);
 
 	// Show email selectors
-	if ($allowaddtarget && $user->rights->mailing->creer)
-	{
+	if ($allowaddtarget && $user->rights->mailing->creer) {
 		print load_fiche_titre($langs->trans("ToAddRecipientsChooseHere"), ($user->admin ?info_admin($langs->trans("YouCanAddYourOwnPredefindedListHere"), 1) : ''), 'generic');
 
 		//print '<table class="noborder centpercent">';
@@ -335,23 +326,20 @@ if ($object->fetch($id) >= 0)
 
 		clearstatcache();
 
-		foreach ($modulesdir as $dir)
-		{
+		foreach ($modulesdir as $dir) {
 			$modulenames = array();
 
 			// Load modules attributes in arrays (name, numero, orders) from dir directory
 			//print $dir."\n<br>";
 			dol_syslog("Scan directory ".$dir." for modules");
 			$handle = @opendir($dir);
-			if (is_resource($handle))
-			{
-				while (($file = readdir($handle)) !== false)
-				{
-					if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-					{
-						if (preg_match("/(.*)\.modules\.php$/i", $file, $reg))
-						{
-							if ($reg[1] == 'example') continue;
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
+					if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') {
+						if (preg_match("/(.*)\.modules\.php$/i", $file, $reg)) {
+							if ($reg[1] == 'example') {
+								continue;
+							}
 							$modulenames[] = $reg[1];
 						}
 					}
@@ -365,8 +353,7 @@ if ($object->fetch($id) >= 0)
 			$var = true;
 
 			// Loop on each submodule
-			foreach ($modulenames as $modulename)
-			{
+			foreach ($modulenames as $modulename) {
 				// Loading Class
 				$file = $dir.$modulename.".modules.php";
 				$classname = "mailing_".$modulename;
@@ -376,10 +363,8 @@ if ($object->fetch($id) >= 0)
 
 				// Check dependencies
 				$qualified = (isset($obj->enabled) ? $obj->enabled : 1);
-				foreach ($obj->require_module as $key)
-				{
-					if (!$conf->$key->enabled || (!$user->admin && $obj->require_admin))
-					{
+				foreach ($obj->require_module as $key) {
+					if (!$conf->$key->enabled || (!$user->admin && $obj->require_admin)) {
 						$qualified = 0;
 						//print "Les prerequis d'activation du module mailing ne sont pas respectes. Il ne sera pas actif";
 						break;
@@ -387,12 +372,10 @@ if ($object->fetch($id) >= 0)
 				}
 
 				// Si le module mailing est qualifie
-				if ($qualified)
-				{
+				if ($qualified) {
 					$var = !$var;
 
-					if ($allowaddtarget)
-					{
+					if ($allowaddtarget) {
 						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.newToken().'">';
 					} else {
@@ -400,7 +383,9 @@ if ($object->fetch($id) >= 0)
 					}
 
 					print '<div class="tagtd">';
-					if (empty($obj->picto)) $obj->picto = 'generic';
+					if (empty($obj->picto)) {
+						$obj->picto = 'generic';
+					}
 					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle pictomodule"');
 					print ' ';
 					print $obj->getDesc();
@@ -408,14 +393,12 @@ if ($object->fetch($id) >= 0)
 
 					try {
 						$nbofrecipient = $obj->getNbOfRecipients('');
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						dol_syslog($e->getMessage(), LOG_ERR);
 					}
 
 					print '<div class="tagtd center">';
-					if ($nbofrecipient >= 0)
-					{
+					if ($nbofrecipient >= 0) {
 						print $nbofrecipient;
 					} else {
 						print $langs->trans("Error").' '.img_error($obj->error);
@@ -423,22 +406,22 @@ if ($object->fetch($id) >= 0)
 					print '</div>';
 
 					print '<div class="tagtd left">';
-					if ($allowaddtarget)
-					{
+					if ($allowaddtarget) {
 						try {
 							$filter = $obj->formFilter();
-						} catch (Exception $e)
-						{
+						} catch (Exception $e) {
 							dol_syslog($e->getMessage(), LOG_ERR);
 						}
-						if ($filter) print $filter;
-						else print $langs->trans("None");
+						if ($filter) {
+							print $filter;
+						} else {
+							print $langs->trans("None");
+						}
 					}
 					print '</div>';
 
 					print '<div class="tagtd right">';
-					if ($allowaddtarget)
-					{
+					if ($allowaddtarget) {
 						print '<input type="submit" class="button" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 					} else {
 						print '<input type="submit" class="button disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
@@ -447,8 +430,11 @@ if ($object->fetch($id) >= 0)
 					}
 					print '</div>';
 
-					if ($allowaddtarget) print '</form>';
-					else print '</div>';
+					if ($allowaddtarget) {
+						print '</form>';
+					} else {
+						print '</div>';
+					}
 				}
 			}
 		}	// End foreach dir
@@ -464,7 +450,7 @@ if ($object->fetch($id) >= 0)
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql .= " WHERE mc.fk_mailing=".$object->id;
 	$asearchcriteriahasbeenset = 0;
-	if ($search_lastname)  {
+	if ($search_lastname) {
 		$sql .= natural_search("mc.lastname", $search_lastname);
 		$asearchcriteriahasbeenset++;
 	}
@@ -472,11 +458,11 @@ if ($object->fetch($id) >= 0)
 		$sql .= natural_search("mc.firstname", $search_firstname);
 		$asearchcriteriahasbeenset++;
 	}
-	if ($search_email)     {
+	if ($search_email) {
 		$sql .= natural_search("mc.email", $search_email);
 		$asearchcriteriahasbeenset++;
 	}
-	if ($search_other)     {
+	if ($search_other) {
 		$sql .= natural_search("mc.other", $search_other);
 		$asearchcriteriahasbeenset++;
 	}
@@ -488,43 +474,51 @@ if ($object->fetch($id) >= 0)
 
 	// Count total nb of records
 	$nbtotalofrecords = '';
-	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-	{
-	    $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
-	    	$page = 0;
-	    	$offset = 0;
-	    }
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+		$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
+			$page = 0;
+			$offset = 0;
+		}
 
-	    // Fix/update nbemail on emailing record if it differs (may happen if user edit lines from database directly)
-	    if (empty($asearchcriteriahasbeenset)) {
-	    	if ($nbtotalofrecords != $object->nbemail) {
-	    		dol_syslog("We found a difference in nb of record in target table and the property ->nbemail, we fix ->nbemail");
-	    		//print "nbemail=".$object->nbemail." nbtotalofrecords=".$nbtotalofrecords;
-	    		$resultrefresh = $object->refreshNbOfTargets();
-	    		if ($resultrefresh < 0) {
-	    			dol_print_error($db, $object->error, $object->errors);
-	    		}
-	    	}
-	    }
+		// Fix/update nbemail on emailing record if it differs (may happen if user edit lines from database directly)
+		if (empty($asearchcriteriahasbeenset)) {
+			if ($nbtotalofrecords != $object->nbemail) {
+				dol_syslog("We found a difference in nb of record in target table and the property ->nbemail, we fix ->nbemail");
+				//print "nbemail=".$object->nbemail." nbtotalofrecords=".$nbtotalofrecords;
+				$resultrefresh = $object->refreshNbOfTargets();
+				if ($resultrefresh < 0) {
+					dol_print_error($db, $object->error, $object->errors);
+				}
+			}
+		}
 	}
 
 	//$nbtotalofrecords=$object->nbemail;     // nbemail is a denormalized field storing nb of targets
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		$param = "&id=".$object->id;
 		//if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
-		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-		if ($search_lastname)  $param .= "&search_lastname=".urlencode($search_lastname);
-		if ($search_firstname) $param .= "&search_firstname=".urlencode($search_firstname);
-		if ($search_email)     $param .= "&search_email=".urlencode($search_email);
-		if ($search_other)     $param .= "&search_other=".urlencode($search_other);
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
+		if ($search_lastname) {
+			$param .= "&search_lastname=".urlencode($search_lastname);
+		}
+		if ($search_firstname) {
+			$param .= "&search_firstname=".urlencode($search_firstname);
+		}
+		if ($search_email) {
+			$param .= "&search_email=".urlencode($search_email);
+		}
+		if ($search_other) {
+			$param .= "&search_other=".urlencode($search_other);
+		}
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -599,7 +593,9 @@ if ($object->fetch($id) >= 0)
 		print '</td>';
 		print '</tr>';
 
-		if ($page) $param .= "&page=".urlencode($page);
+		if ($page) {
+			$param .= "&page=".urlencode($page);
+		}
 
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "mc.email", $param, "", "", $sortfield, $sortorder);
@@ -617,8 +613,7 @@ if ($object->fetch($id) >= 0)
 
 		$i = 0;
 
-		if ($num)
-		{
+		if ($num) {
 			include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -628,8 +623,7 @@ if ($object->fetch($id) >= 0)
 			$objectstaticcompany = new Societe($db);
 			$objectstaticcontact = new Contact($db);
 
-			while ($i < min($num, $limit))
-			{
+			while ($i < min($num, $limit)) {
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
@@ -638,24 +632,19 @@ if ($object->fetch($id) >= 0)
 				print '<td>'.$obj->firstname.'</td>';
 				print '<td>'.$obj->other.'</td>';
 				print '<td class="center">';
-				if (empty($obj->source_id) || empty($obj->source_type))
-				{
+				if (empty($obj->source_id) || empty($obj->source_type)) {
 					print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
 				} else {
-					if ($obj->source_type == 'member')
-					{
+					if ($obj->source_type == 'member') {
 						$objectstaticmember->fetch($obj->source_id);
 						print $objectstaticmember->getNomUrl(1);
-					} elseif ($obj->source_type == 'user')
-					{
+					} elseif ($obj->source_type == 'user') {
 						$objectstaticuser->fetch($obj->source_id);
 						print $objectstaticuser->getNomUrl(1);
-					} elseif ($obj->source_type == 'thirdparty')
-					{
+					} elseif ($obj->source_type == 'thirdparty') {
 						$objectstaticcompany->fetch($obj->source_id);
 						print $objectstaticcompany->getNomUrl(1);
-					} elseif ($obj->source_type == 'contact')
-					{
+					} elseif ($obj->source_type == 'contact') {
 						$objectstaticcontact->fetch($obj->source_id);
 						print $objectstaticcontact->getNomUrl(1);
 					} else {
@@ -670,8 +659,7 @@ if ($object->fetch($id) >= 0)
 				print '</td>';
 
 				// Status of recipient sending email (Warning != status of emailing)
-				if ($obj->statut == 0)
-				{
+				if ($obj->statut == 0) {
 					// Date sent
 					print '<td align="center">&nbsp;</td>';
 
@@ -689,8 +677,7 @@ if ($object->fetch($id) >= 0)
 
 				// Search Icon
 				print '<td class="right">';
-				if ($obj->statut == 0)	// Not sent yet
-				{
+				if ($obj->statut == 0) {	// Not sent yet
 					if ($user->rights->mailing->creer && $allowaddtarget) {
 						print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.$obj->rowid.$param.'">'.img_delete($langs->trans("RemoveRecipient")).'</a>';
 					}
@@ -705,8 +692,7 @@ if ($object->fetch($id) >= 0)
 				$i++;
 			}
 		} else {
-			if ($object->statut < 2)
-			{
+			if ($object->statut < 2) {
 				print '<tr><td colspan="9" class="opacitymedium">';
 				print $langs->trans("NoTargetYet");
 				print '</td></tr>';
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index b7f20319229..719ec5b6c49 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -131,7 +131,7 @@ class AdvanceTargetingMailing extends CommonObject
 	/**
 	 *  Create object into database
 	 *
-	 *  @param	User	$user        User that creates
+	 *  @param	User    $user        User that creates
 	 *  @param  int		$notrigger   0=launch triggers after, 1=disable triggers
 	 *  @return int      		   	 <0 if KO, Id of created object if OK
 	 */
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index 9d230404cba..2c47edd4289 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -74,8 +74,9 @@ class FormAdvTargetEmailing extends Form
 				$obj = $this->db->fetch_object($resql);
 
 				$level = $langs->trans($obj->code);
-				if ($level == $obj->code)
+				if ($level == $obj->code) {
 					$level = $langs->trans($obj->label);
+				}
 				$options_array[$obj->code] = $level;
 
 				$i++;
@@ -89,9 +90,9 @@ class FormAdvTargetEmailing extends Form
 	/**
 	 * Return combo list of activated countries, into language of user
 	 *
-	 * @param string $htmlname of html select object
-	 * @param array $selected_array or Code or Label of preselected country
-	 * @return string HTML string with select
+	 * @param string    $htmlname of html select object
+	 * @param array     $selected_array or Code or Label of preselected country
+	 * @return string   HTML string with select
 	 */
 	public function multiselectCountry($htmlname = 'country_id', $selected_array = array())
 	{
@@ -131,8 +132,9 @@ class FormAdvTargetEmailing extends Form
 
 				foreach ($countryArray as $row) {
 					$label = dol_trunc($row['label'], $maxlength, 'middle');
-					if ($row['code_iso'])
+					if ($row['code_iso']) {
 						$label .= ' ('.$row['code_iso'].')';
+					}
 
 					$options_array[$row['rowid']] = $label;
 				}
@@ -165,8 +167,9 @@ class FormAdvTargetEmailing extends Form
 		$sql_usr .= " WHERE u2.entity IN (0,".$conf->entity.")";
 		$sql_usr .= " AND u2.rowid = sc.fk_user ";
 
-		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX))
+		if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX)) {
 			$sql_usr .= " AND u2.statut<>0 ";
+		}
 		$sql_usr .= " ORDER BY name ASC";
 		// print $sql_usr;exit;
 
@@ -201,8 +204,7 @@ class FormAdvTargetEmailing extends Form
 
 		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12);
 
-		foreach ($langs_available as $key => $value)
-		{
+		foreach ($langs_available as $key => $value) {
 			$label = $value;
 			$options_array[$key] = $label;
 		}
@@ -223,8 +225,7 @@ class FormAdvTargetEmailing extends Form
 	{
 		$options_array = array();
 
-		if (is_array($sqlqueryparam))
-		{
+		if (is_array($sqlqueryparam)) {
 			$param_list = array_keys($sqlqueryparam);
 			$InfoFieldList = explode(":", $param_list [0]);
 
@@ -297,14 +298,11 @@ class FormAdvTargetEmailing extends Form
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
 					$label = ($langs->trans("Civility".$obj->code) != "Civility".$obj->code ? $langs->trans("Civility".$obj->code) : ($obj->civilite != '-' ? $obj->civilite : ''));
@@ -364,8 +362,9 @@ class FormAdvTargetEmailing extends Form
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
-			if ($showempty)
+			if ($showempty) {
 				$out .= '<option value=""></option>';
+			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num) {
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 56670da17cd..251550bdded 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -252,7 +252,7 @@ class Mailing extends CommonObject
 	/**
 	 *  Update emailing record
 	 *
-	 *  @param	User	$user 		Object of user making change
+	 *  @param  User	$user 		Object of user making change
 	 *  @return int				    < 0 if KO, > 0 if OK
 	 */
 	public function update($user)
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index 8c1e392ed68..a5052786679 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -80,16 +80,14 @@ print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("TargetsStatistic
 $dir = DOL_DOCUMENT_ROOT."/core/modules/mailings";
 $handle = opendir($dir);
 
-if (is_resource($handle))
-{
-	while (($file = readdir($handle)) !== false)
-	{
-		if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-		{
-			if (preg_match("/(.*)\.(.*)\.(.*)/i", $file, $reg))
-			{
+if (is_resource($handle)) {
+	while (($file = readdir($handle)) !== false) {
+		if (substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') {
+			if (preg_match("/(.*)\.(.*)\.(.*)/i", $file, $reg)) {
 				$modulename = $reg[1];
-	   			if ($modulename == 'example') continue;
+				if ($modulename == 'example') {
+					continue;
+				}
 
 				// Loading Class
 				$file = $dir."/".$modulename.".modules.php";
@@ -98,10 +96,8 @@ if (is_resource($handle))
 				$mailmodule = new $classname($db);
 
 				$qualified = 1;
-				foreach ($mailmodule->require_module as $key)
-				{
-					if (!$conf->$key->enabled || (!$user->admin && $mailmodule->require_admin))
-					{
+				foreach ($mailmodule->require_module as $key) {
+					if (!$conf->$key->enabled || (!$user->admin && $mailmodule->require_admin)) {
 						$qualified = 0;
 						//print "Les pr�requis d'activation du module mailing ne sont pas respect�s. Il ne sera pas actif";
 						break;
@@ -109,10 +105,8 @@ if (is_resource($handle))
 				}
 
 				// Si le module mailing est qualifi�
-				if ($qualified)
-				{
-					foreach ($mailmodule->getSqlArrayForStats() as $sql)
-					{
+				if ($qualified) {
+					foreach ($mailmodule->getSqlArrayForStats() as $sql) {
 						print '<tr class="oddeven">';
 
 						$result = $db->query($sql);
@@ -121,8 +115,7 @@ if (is_resource($handle))
 
 							$i = 0;
 
-							while ($i < $num)
-							{
+							while ($i < $num) {
 								$obj = $db->fetch_object($result);
 								print '<td>'.img_object('', $mailmodule->picto).' '.$obj->label.'</td><td class="right">'.$obj->nb.'<td>';
 								$i++;
@@ -169,12 +162,10 @@ if ($result) {
 	print '<td class="right"><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php">'.$langs->trans("AllEMailings").'</a></td></tr>';
 
 	$num = $db->num_rows($result);
-	if ($num > 0)
-	{
+	if ($num > 0) {
 		$i = 0;
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 			$mailstatic = new Mailing($db);
 			$mailstatic->id = $obj->rowid;
diff --git a/htdocs/comm/mailing/info.php b/htdocs/comm/mailing/info.php
index 4bd39309701..f6aa8c2e509 100644
--- a/htdocs/comm/mailing/info.php
+++ b/htdocs/comm/mailing/info.php
@@ -77,7 +77,6 @@ if ($object->fetch($id) >= 0) {
 	dol_print_object_info($object, 0);
 	//print '</td></tr></table>';
 
-
 	print dol_get_fiche_end();
 }
 
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index 8a005d2dc82..4f851eeee28 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -36,12 +36,18 @@ $sortorder = GETPOST("sortorder", 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $optioncss = GETPOST('optioncss', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "m.date_creat";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "m.date_creat";
+}
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_ref = GETPOST("search_ref", "alpha") ? GETPOST("search_ref", "alpha") : GETPOST("sref", "alpha");
@@ -70,21 +76,25 @@ $fieldstosearchall = array(
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// 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
 		/*foreach($object->fields as $key => $val)
 		{
 			$search[$key]='';
@@ -95,8 +105,7 @@ if (empty($reshook))
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -125,29 +134,43 @@ if ($filteremail) {
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc";
 	$sql .= " WHERE m.rowid = mc.fk_mailing AND m.entity = ".$conf->entity;
 	$sql .= " AND mc.email = '".$db->escape($filteremail)."'";
-	if ($search_ref) $sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (!$sortorder) $sortorder = "ASC";
-	if (!$sortfield) $sortfield = "m.rowid";
+	if ($search_ref) {
+		$sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
+	}
+	if ($search_all) {
+		$sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+	}
+	if (!$sortorder) {
+		$sortorder = "ASC";
+	}
+	if (!$sortfield) {
+		$sortfield = "m.rowid";
+	}
 } else {
 	$sql = "SELECT m.rowid, m.titre as title, m.nbemail, m.statut, m.date_creat as datec, m.date_envoi as date_envoi";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing as m";
 	$sql .= " WHERE m.entity = ".$conf->entity;
-	if ($search_ref) $sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
-	if ($search_all) $sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
-	if (!$sortorder) $sortorder = "ASC";
-	if (!$sortfield) $sortfield = "m.rowid";
+	if ($search_ref) {
+		$sql .= " AND m.rowid = '".$db->escape($search_ref)."'";
+	}
+	if ($search_all) {
+		$sql .= " AND (m.titre like '%".$db->escape($search_all)."%' OR m.sujet like '%".$db->escape($search_all)."%' OR m.body like '%".$db->escape($search_all)."%')";
+	}
+	if (!$sortorder) {
+		$sortorder = "ASC";
+	}
+	if (!$sortfield) {
+		$sortfield = "m.rowid";
+	}
 }
 
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	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;
 	}
@@ -158,28 +181,36 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("comm/mailing/list.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$title = $langs->trans("ListOfEMailings");
-	if ($filteremail) $title .= ' ('.$langs->trans("SentTo", $filteremail).')';
+	if ($filteremail) {
+		$title .= ' ('.$langs->trans("SentTo", $filteremail).')';
+	}
 
 	$newcardbutton = '';
-	if ($user->rights->mailing->creer)
-	{
+	if ($user->rights->mailing->creer) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('NewMailing'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/mailing/card.php?action=create');
 	}
 
 	$i = 0;
 
 	$param = "&search_all=".urlencode($search_all);
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($filteremail) $param .= '&filteremail='.urlencode($filteremail);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($filteremail) {
+		$param .= '&filteremail='.urlencode($filteremail);
+	}
 
 	print '<form method="POST" 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="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -201,7 +232,9 @@ if ($resql)
 	print '<input type="text" class="flat maxwidth100 maxwidth50onsmartphone" name="search_all" value="'.dol_escape_htmltag($search_all).'">';
 	print '</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
-	if (!$filteremail) print '<td class="liste_titre">&nbsp;</td>';
+	if (!$filteremail) {
+		print '<td class="liste_titre">&nbsp;</td>';
+	}
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
@@ -214,9 +247,14 @@ if ($resql)
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "m.rowid", $param, "", "", $sortfield, $sortorder);
 	print_liste_field_titre("Title", $_SERVER["PHP_SELF"], "m.titre", $param, "", "", $sortfield, $sortorder);
 	print_liste_field_titre("DateCreation", $_SERVER["PHP_SELF"], "m.date_creat", $param, "", 'align="center"', $sortfield, $sortorder);
-	if (!$filteremail) print_liste_field_titre("NbOfEMails", $_SERVER["PHP_SELF"], "m.nbemail", $param, "", 'align="center"', $sortfield, $sortorder);
-	if (!$filteremail) print_liste_field_titre("DateLastSend", $_SERVER["PHP_SELF"], "m.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
-	else print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
+	if (!$filteremail) {
+		print_liste_field_titre("NbOfEMails", $_SERVER["PHP_SELF"], "m.nbemail", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
+	if (!$filteremail) {
+		print_liste_field_titre("DateLastSend", $_SERVER["PHP_SELF"], "m.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
+	} else {
+		print_liste_field_titre("DateSending", $_SERVER["PHP_SELF"], "mc.date_envoi", $param, "", 'align="center"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], ($filteremail ? "mc.statut" : "m.statut"), $param, "", 'class="right"', $sortfield, $sortorder);
 	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', 'class="right"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
@@ -224,8 +262,7 @@ if ($resql)
 
 	$email = new Mailing($db);
 
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$email->id = $obj->rowid;
@@ -246,8 +283,7 @@ if ($resql)
 		print '</td>';
 
 		// Nb of email
-		if (!$filteremail)
-		{
+		if (!$filteremail) {
 			print '<td class="center">';
 			$nbemail = $obj->nbemail;
 			/*if ($obj->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
@@ -269,8 +305,7 @@ if ($resql)
 
 		// Status
 		print '<td class="nowrap right">';
-		if ($filteremail)
-		{
+		if ($filteremail) {
 			print $email::libStatutDest($obj->sendstatut, 2);
 		} else {
 			print $email->LibStatut($obj->statut, 5);
@@ -284,7 +319,9 @@ if ($resql)
 	}
 	if (empty($num)) {
 		$colspan = 6;
-		if (!$filteremail) $colspan++;
+		if (!$filteremail) {
+			$colspan++;
+		}
 		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 	}
 
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index c8a674773a2..2f5e146843b 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -33,8 +33,7 @@ $langs->loadLangs(array('orders', 'companies'));
 $id = GETPOST('id', 'int');
 $_socid = GETPOST("id", 'int');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$_socid = $user->socid;
 }
 
@@ -43,8 +42,7 @@ if ($user->socid > 0)
  * Actions
  */
 
-if ($_POST["action"] == 'setpricelevel')
-{
+if ($_POST["action"] == 'setpricelevel') {
 	$soc = new Societe($db);
 	$soc->fetch($id);
 	$soc->set_price_level($_POST["price_level"], $user);
@@ -62,8 +60,7 @@ llxHeader();
 
 $userstatic = new User($db);
 
-if ($_socid > 0)
-{
+if ($_socid > 0) {
 	// We load data of thirdparty
 	$objsoc = new Societe($db);
 	$objsoc->id = $_socid;
@@ -73,8 +70,12 @@ if ($_socid > 0)
 	$head = societe_prepare_head($objsoc);
 
 	$tabchoice = '';
-	if ($objsoc->client == 1) $tabchoice = 'customer';
-	if ($objsoc->client == 2) $tabchoice = 'prospect';
+	if ($objsoc->client == 1) {
+		$tabchoice = 'customer';
+	}
+	if ($objsoc->client == 2) {
+		$tabchoice = 'prospect';
+	}
 
 	print '<form method="POST" action="multiprix.php?id='.$objsoc->id.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -90,14 +91,16 @@ if ($_socid > 0)
 	print '<tr><td>';
 	print $langs->trans("NewValue").'</td><td>';
 	print '<select name="price_level" class="flat">';
-	for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++)
-	{
+	for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 		print '<option value="'.$i.'"';
-		if ($i == $objsoc->price_level)
-		print 'selected';
+		if ($i == $objsoc->price_level) {
+			print 'selected';
+		}
 		print '>'.$i;
 		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
-		if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+		if (!empty($conf->global->$keyforlabel)) {
+			print ' - '.$langs->trans($conf->global->$keyforlabel);
+		}
 		print '</option>';
 	}
 	print '</select>';
@@ -125,8 +128,7 @@ if ($_socid > 0)
 	$sql .= " ORDER BY rc.datec DESC";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		print '<table class="noborder centpercent">';
 		$tag = !$tag;
 		print '<tr class="liste_titre">';
@@ -137,8 +139,7 @@ if ($_socid > 0)
 		$i = 0;
 		$num = $db->num_rows($resql);
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index da97b627858..2834edb3427 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -60,9 +60,12 @@ if (!empty($conf->variants->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'sendings', 'other'));
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
-if (!empty($conf->margin->enabled))
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load('incoterm');
+}
+if (!empty($conf->margin->enabled)) {
 	$langs->load('margins');
+}
 
 $error = 0;
 
@@ -87,7 +90,9 @@ $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($con
 $NBLINES = 4;
 
 // Security check
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'propal', $id);
 
 $object = new Propal($db);
@@ -99,10 +104,10 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref);
-	if ($ret > 0)
+	if ($ret > 0) {
 		$ret = $object->fetch_thirdparty();
-	if ($ret <= 0)
-	{
+	}
+	if ($ret <= 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = '';
 	}
@@ -135,14 +140,13 @@ $permissiontoedit = $usercancreate; // Used by the include of actions_lineupdown
 
 $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))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -156,39 +160,44 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate)
-	{
-		if (!GETPOST('socid', 3))
-		{
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) {
+		if (!GETPOST('socid', 3)) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
 			if ($object->id > 0) {
 				if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY)) {
 					//Get difference between old and new delivery date and change lines according to difference
-					$date_delivery = dol_mktime(12, 0, 0,
+					$date_delivery = dol_mktime(
+						12,
+						0,
+						0,
 						GETPOST('date_deliverymonth', 'int'),
 						GETPOST('date_deliveryday', 'int'),
 						GETPOST('date_deliveryyear', 'int')
 					);
 					$date_delivery_old = (empty($object->delivery_date) ? $object->date_livraison : $object->delivery_date);
-					if (!empty($date_delivery_old) && !empty($date_delivery))
-					{
+					if (!empty($date_delivery_old) && !empty($date_delivery)) {
 						//Attempt to get the date without possible hour rounding errors
-						$old_date_delivery = dol_mktime(12, 0, 0,
+						$old_date_delivery = dol_mktime(
+							12,
+							0,
+							0,
 							dol_print_date($date_delivery_old, '%m'),
 							dol_print_date($date_delivery_old, '%d'),
 							dol_print_date($date_delivery_old, '%Y')
 						);
 						//Calculate the difference and apply if necessary
 						$difference = $date_delivery - $old_date_delivery;
-						if ($difference != 0)
-						{
+						if ($difference != 0) {
 							$object->date_livraison = $date_delivery;
 							$object->delivery_date = $date_delivery;
-							foreach ($object->lines as $line)
-							{
-								if (isset($line->date_start)) $line->date_start = $line->date_start + $difference;
-								if (isset($line->date_end)) $line->date_end = $line->date_end + $difference;
+							foreach ($object->lines as $line) {
+								if (isset($line->date_start)) {
+									$line->date_start = $line->date_start + $difference;
+								}
+								if (isset($line->date_end)) {
+									$line->date_end = $line->date_end + $difference;
+								}
 							}
 						}
 					}
@@ -199,14 +208,15 @@ if (empty($reshook))
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
 				} else {
-					if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
+					if (count($object->errors) > 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
 					$action = '';
 				}
 			}
 		}
 	} // Delete proposal
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
-	{
+	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) {
 		$result = $object->delete($user);
 		if ($result > 0) {
 			header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1');
@@ -216,12 +226,12 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} // Remove line
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
-	{
+	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) {
 		$result = $object->deleteline($lineid);
 		// reorder lines
-		if ($result)
+		if ($result) {
 			$object->line_order(true);
+		}
 
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			// Define output language
@@ -232,25 +242,28 @@ if (empty($reshook))
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret = $object->fetch($id); // Reload to get new records
-			if ($ret > 0) $object->fetch_thirdparty();
+			if ($ret > 0) {
+				$object->fetch_thirdparty();
+			}
 			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit();
 	} // Validation
-	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
-	{
+	elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate) {
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 		$result = $object->valid($user);
-		if ($result >= 0)
-		{
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+		if ($result >= 0) {
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -265,11 +278,13 @@ if (empty($reshook))
 			}
 		} else {
 			$langs->load("errors");
-			if (count($object->errors) > 0) setEventMessages($object->error, $object->errors, 'errors');
-			else setEventMessages($langs->trans($object->error), null, 'errors');
+			if (count($object->errors) > 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans($object->error), null, 'errors');
+			}
 		}
-	} elseif ($action == 'setdate' && $usercancreate)
-	{
+	} elseif ($action == 'setdate' && $usercancreate) {
 		$datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
 
 		if (empty($datep)) {
@@ -279,34 +294,31 @@ if (empty($reshook))
 
 		if (!$error) {
 			$result = $object->set_date($user, $datep);
-			if ($result < 0)
+			if ($result < 0) {
 				dol_print_error($db, $object->error);
+			}
 		}
-	} elseif ($action == 'setecheance' && $usercancreate)
-	{
+	} elseif ($action == 'setecheance' && $usercancreate) {
 		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
-		if ($result < 0)
+		if ($result < 0) {
 			dol_print_error($db, $object->error);
-	} elseif ($action == 'setdate_livraison' && $usercancreate)
-	{
+		}
+	} elseif ($action == 'setdate_livraison' && $usercancreate) {
 		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
-		if ($result < 0)
+		if ($result < 0) {
 			dol_print_error($db, $object->error);
+		}
 	} // Positionne ref client
-	elseif ($action == 'setref_client' && $usercancreate)
-	{
+	elseif ($action == 'setref_client' && $usercancreate) {
 		$result = $object->set_ref_client($user, GETPOST('ref_client'));
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} // Set incoterm
-	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $usercancreate)
-	{
+	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $usercancreate) {
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	} // Create proposal
-	elseif ($action == 'add' && $usercancreate)
-	{
+	elseif ($action == 'add' && $usercancreate) {
 		$object->socid = $socid;
 		$object->fetch_thirdparty();
 
@@ -332,13 +344,11 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// If we select proposal to clone during creation (when option PROPAL_CLONE_ON_CREATE_PAGE is on)
-			if (GETPOST('createmode') == 'copy' && GETPOST('copie_propal'))
-			{
+			if (GETPOST('createmode') == 'copy' && GETPOST('copie_propal')) {
 				if ($object->fetch(GETPOST('copie_propal', 'int')) > 0) {
 					$object->ref = GETPOST('ref');
 					$object->datep = $datep;
@@ -399,8 +409,7 @@ if (empty($reshook))
 				$object->origin_id = GETPOST('originid');
 
 				// Multicurrency
-				if (!empty($conf->multicurrency->enabled))
-				{
+				if (!empty($conf->multicurrency->enabled)) {
 					$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				}
 
@@ -412,10 +421,8 @@ if (empty($reshook))
 				}
 			}
 
-			if (!$error)
-			{
-				if ($origin && $originid)
-				{
+			if (!$error) {
+				if ($origin && $originid) {
 					// Parse element/subelement (ex: project_task)
 					$element = $subelement = $origin;
 					if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
@@ -451,8 +458,7 @@ if (empty($reshook))
 					}
 
 					$id = $object->create($user);
-					if ($id > 0)
-					{
+					if ($id > 0) {
 						dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 						$classname = ucfirst($subelement);
@@ -461,19 +467,16 @@ if (empty($reshook))
 						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 						$result = $srcobject->fetch($object->origin_id);
 
-						if ($result > 0)
-						{
+						if ($result > 0) {
 							$lines = $srcobject->lines;
-							if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
-							{
+							if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {
 								$srcobject->fetch_lines();
 								$lines = $srcobject->lines;
 							}
 
 							$fk_parent_line = 0;
 							$num = count($lines);
-							for ($i = 0; $i < $num; $i++)
-							{
+							for ($i = 0; $i < $num; $i++) {
 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
 								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->libelle);
 
@@ -482,21 +485,27 @@ if (empty($reshook))
 
 								// Date start
 								$date_start = false;
-								if ($lines[$i]->date_debut_prevue)
+								if ($lines[$i]->date_debut_prevue) {
 									$date_start = $lines[$i]->date_debut_prevue;
-								if ($lines[$i]->date_debut_reel)
+								}
+								if ($lines[$i]->date_debut_reel) {
 									$date_start = $lines[$i]->date_debut_reel;
-								if ($lines[$i]->date_start)
+								}
+								if ($lines[$i]->date_start) {
 									$date_start = $lines[$i]->date_start;
+								}
 
 								// Date end
 								$date_end = false;
-								if ($lines[$i]->date_fin_prevue)
+								if ($lines[$i]->date_fin_prevue) {
 									$date_end = $lines[$i]->date_fin_prevue;
-								if ($lines[$i]->date_fin_reel)
+								}
+								if ($lines[$i]->date_fin_reel) {
 									$date_end = $lines[$i]->date_fin_reel;
-								if ($lines[$i]->date_end)
+								}
+								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) {
@@ -510,7 +519,9 @@ if (empty($reshook))
 								}
 
 								$tva_tx = $lines[$i]->tva_tx;
-								if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+								if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
+									$tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+								}
 
 								$result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product, $lines[$i]->remise_percent, 'HT', 0, $lines[$i]->info_bits, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $date_start, $date_end, $array_options, $lines[$i]->fk_unit);
 
@@ -532,8 +543,9 @@ if (empty($reshook))
 							$parameters = array('objFrom' => $srcobject);
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 																											   // modified by hook
-							if ($reshook < 0)
+							if ($reshook < 0) {
 								$error++;
+							}
 						} else {
 							setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 							$error++;
@@ -547,39 +559,37 @@ if (empty($reshook))
 					$id = $object->create($user);
 				}
 
-				if ($id > 0)
-				{
+				if ($id > 0) {
 					// Insert default contacts if defined
 					if (GETPOST('contactid') > 0) {
 						$result = $object->add_contact(GETPOST('contactid'), 'CUSTOMER', 'external');
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							setEventMessages($langs->trans("ErrorFailedToAddContact"), null, 'errors');
 						}
 					}
 
-					if (!empty($conf->global->PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT))
-					{
+					if (!empty($conf->global->PROPOSAL_AUTO_ADD_AUTHOR_AS_CONTACT)) {
 						$result = $object->add_contact($user->id, 'SALESREPFOLL', 'internal');
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							setEventMessages($langs->trans("ErrorFailedToAddUserAsContact"), null, 'errors');
 						}
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						$db->commit();
 
 						// Define output language
-						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-						{
+						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 							$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 = $object->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 = $object->thirdparty->default_lang;
+							}
 							if (!empty($newlang)) {
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
@@ -588,7 +598,9 @@ if (empty($reshook))
 
 							$ret = $object->fetch($id); // Reload to get new records
 							$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-							if ($result < 0) dol_print_error($db, $result);
+							if ($result < 0) {
+								dol_print_error($db, $result);
+							}
 						}
 
 						header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
@@ -605,19 +617,16 @@ if (empty($reshook))
 			}
 		}
 	} // Classify billed
-	elseif ($action == 'classifybilled' && $usercanclose)
-	{
+	elseif ($action == 'classifybilled' && $usercanclose) {
 		$db->begin();
 
 		$result = $object->cloture($user, $object::STATUS_BILLED, '');
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -629,19 +638,16 @@ if (empty($reshook))
 			$action = 'closeas';
 		} else {
 			// prevent browser refresh from closing proposal several times
-			if ($object->statut == $object::STATUS_VALIDATED)
-			{
+			if ($object->statut == $object::STATUS_VALIDATED) {
 				$db->begin();
 
 				$result = $object->cloture($user, GETPOST('statut', 'int'), GETPOST('note_private', 'restricthtml'));
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$db->commit();
 				} else {
 					$db->rollback();
@@ -651,19 +657,16 @@ if (empty($reshook))
 	} // Reopen proposal
 	elseif ($action == 'confirm_reopen' && $usercanclose && !GETPOST('cancel', 'alpha')) {
 		// prevent browser refresh from reopening proposal several times
-		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED)
-		{
+		if ($object->statut == Propal::STATUS_SIGNED || $object->statut == Propal::STATUS_NOTSIGNED || $object->statut == Propal::STATUS_BILLED) {
 			$db->begin();
 
 			$result = $object->reopen($user, 1);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 			} else {
 				$db->rollback();
@@ -673,32 +676,26 @@ if (empty($reshook))
 	elseif ($action == 'import_lines_from_object'
 		&& $user->rights->propal->creer
 		&& $object->statut == Propal::STATUS_DRAFT
-		)
-	{
+		) {
 		$fromElement = GETPOST('fromelement');
 		$fromElementid = GETPOST('fromelementid');
 		$importLines = GETPOST('line_checkbox');
 
-		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
-		{
-			if ($fromElement == 'commande')
-			{
+		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid)) {
+			if ($fromElement == 'commande') {
 				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 				$lineClassName = 'OrderLine';
-			} elseif ($fromElement == 'propal')
-			{
+			} elseif ($fromElement == 'propal') {
 				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 				$lineClassName = 'PropaleLigne';
 			}
 			$nextRang = count($object->lines) + 1;
 			$importCount = 0;
 			$error = 0;
-			foreach ($importLines as $lineId)
-			{
+			foreach ($importLines as $lineId) {
 				$lineId = intval($lineId);
 				$originLine = new $lineClassName($db);
-				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
-				{
+				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0) {
 					$originLine->fetch_optionals();
 					$desc = $originLine->desc;
 					$pu_ht = $originLine->subprice;
@@ -742,8 +739,7 @@ if (empty($reshook))
 				}
 			}
 
-			if ($error)
-			{
+			if ($error) {
 				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
 			}
 		}
@@ -760,12 +756,10 @@ if (empty($reshook))
 
 
 	// Go back to draft
-	if ($action == 'modif' && $usercancreate)
-	{
+	if ($action == 'modif' && $usercancreate) {
 		$object->setDraft($user);
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		{
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			// Define output language
 			$outputlangs = $langs;
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
@@ -774,7 +768,9 @@ if (empty($reshook))
 				$outputlangs->setDefaultLang($newlang);
 			}
 			$ret = $object->fetch($id); // Reload to get new records
-			if ($ret > 0) $object->fetch_thirdparty();
+			if ($ret > 0) {
+				$object->fetch_thirdparty();
+			}
 			$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 		}
 	} elseif ($action == "setabsolutediscount" && $usercancreate) {
@@ -802,8 +798,7 @@ if (empty($reshook))
 		$price_ht = price2num(GETPOST('price_ht'));
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
 		$prod_entry_mode = GETPOST('prod_entry_mode');
-		if ($prod_entry_mode == 'free')
-		{
+		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
@@ -813,7 +808,9 @@ if (empty($reshook))
 
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
 		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
-		if (empty($remise_percent)) $remise_percent = 0;
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -831,8 +828,7 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht === '' && $price_ht_devise === '') 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
-		{
+		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht === '' && $price_ht_devise === '') { 	// Unit price can be 0 but not ''. Also price can be negative for proposal.
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error++;
 		}
@@ -878,7 +874,9 @@ if (empty($reshook))
 				// Update if prices fields are defined
 				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-				if (empty($tva_tx)) $tva_npr = 0;
+				if (empty($tva_tx)) {
+					$tva_npr = 0;
+				}
 
 				// Price unique per product
 				$pu_ht = $prod->price;
@@ -887,20 +885,21 @@ if (empty($reshook))
 				$price_base_type = $prod->price_base_type;
 
 				// If price per segment
-				if (!empty($conf->global->PRODUIT_MULTIPRICES) && $object->thirdparty->price_level)
-				{
+				if (!empty($conf->global->PRODUIT_MULTIPRICES) && $object->thirdparty->price_level) {
 					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
 					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
-					{
-						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
-						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
+							$tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+						}
+						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) {
+							$tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+						}
 					}
 				} // If price per customer
-				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-				{
+				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 					$prodcustprice = new Productcustomerprice($db);
@@ -916,26 +915,28 @@ if (empty($reshook))
 							$price_min =  price($prodcustprice->lines[0]->price_min);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
-							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+								$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							}
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
-							if (empty($tva_tx)) $tva_npr = 0;
+							if (empty($tva_tx)) {
+								$tva_npr = 0;
+							}
 						}
 					}
 				} // If price per quantity
-				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
-				{
-					if ($prod->prices_by_qty[0])	// yes, this product has some prices per quantity
-					{
+				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+					if ($prod->prices_by_qty[0]) {	// yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
 						$pqp = GETPOST('pbq', 'int');
 
 						// Search price into product_price_by_qty from $prod->id
-						foreach ($prod->prices_by_qty_list[0] as $priceforthequantityarray)
-						{
-							if ($priceforthequantityarray['rowid'] != $pqp) continue;
+						foreach ($prod->prices_by_qty_list[0] as $priceforthequantityarray) {
+							if ($priceforthequantityarray['rowid'] != $pqp) {
+								continue;
+							}
 							// We found the price
-							if ($priceforthequantityarray['price_base_type'] == 'HT')
-							{
+							if ($priceforthequantityarray['price_base_type'] == 'HT') {
 								$pu_ht = $priceforthequantityarray['unitprice'];
 							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
@@ -945,20 +946,18 @@ if (empty($reshook))
 						}
 					}
 				} // If price per quantity and customer
-				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-				{
-					if ($prod->prices_by_qty[$object->thirdparty->price_level]) // yes, this product has some prices per quantity
-					{
+				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+					if ($prod->prices_by_qty[$object->thirdparty->price_level]) { // yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
 						$pqp = GETPOST('pbq', 'int');
 
 						// Search price into product_price_by_qty from $prod->id
-						foreach ($prod->prices_by_qty_list[$object->thirdparty->price_level] as $priceforthequantityarray)
-						{
-							if ($priceforthequantityarray['rowid'] != $pqp) continue;
+						foreach ($prod->prices_by_qty_list[$object->thirdparty->price_level] as $priceforthequantityarray) {
+							if ($priceforthequantityarray['rowid'] != $pqp) {
+								continue;
+							}
 							// We found the price
-							if ($priceforthequantityarray['price_base_type'] == 'HT')
-							{
+							if ($priceforthequantityarray['price_base_type'] == 'HT') {
 								$pu_ht = $priceforthequantityarray['unitprice'];
 							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
@@ -992,10 +991,12 @@ if (empty($reshook))
 				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09'))
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
-					if (empty($newlang))
+					}
+					if (empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1011,8 +1012,11 @@ if (empty($reshook))
 					$product_desc='';
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
-				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+					$desc = $product_desc;
+				} else {
+					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				}
 
 				// Add dimensions into product description
 				/*if (empty($conf->global->MAIN_PRODUCT_DISABLE_AUTOADD_DIM))
@@ -1027,35 +1031,42 @@ if (empty($reshook))
 				}*/
 
 				// Add custom code and origin country into description
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code)))
-				{
+				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
 					$tmptxt = '(';
 					// Define output language
 					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 						$outputlangs = $langs;
 						$newlang = '';
-						if (empty($newlang) && GETPOST('lang_id', 'alpha'))
+						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
 							$newlang = GETPOST('lang_id', 'alpha');
-						if (empty($newlang))
+						}
+						if (empty($newlang)) {
 							$newlang = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
 							$outputlangs->load('products');
 						}
-						if (!empty($prod->customcode))
+						if (!empty($prod->customcode)) {
 							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-						if (!empty($prod->customcode) && !empty($prod->country_code))
+						}
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
-						if (!empty($prod->country_code))
+						}
+						if (!empty($prod->country_code)) {
 							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $outputlangs, 0);
+						}
 					} else {
-						if (!empty($prod->customcode))
+						if (!empty($prod->customcode)) {
 							$tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-						if (!empty($prod->customcode) && !empty($prod->country_code))
+						}
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
-						if (!empty($prod->country_code))
+						}
+						if (!empty($prod->country_code)) {
 							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $langs, 0);
+						}
 					}
 					$tmptxt .= ')';
 					$desc = dol_concatdesc($desc, $tmptxt);
@@ -1088,8 +1099,9 @@ if (empty($reshook))
 			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $tva_npr);
 
 			$info_bits = 0;
-			if ($tva_npr)
+			if ($tva_npr) {
 				$info_bits |= 0x01;
+			}
 
 			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
@@ -1156,12 +1168,12 @@ if (empty($reshook))
 			}
 		}
 	} // Update a line within proposal
-	elseif ($action == 'updateline' && $usercancreate && GETPOST('save'))
-	{
+	elseif ($action == 'updateline' && $usercancreate && GETPOST('save')) {
 		// Define info_bits
 		$info_bits = 0;
-		if (preg_match('/\*/', GETPOST('tva_tx')))
+		if (preg_match('/\*/', GETPOST('tva_tx'))) {
 			$info_bits |= 0x01;
+		}
 
 			// Clean parameters
 		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml'));
@@ -1195,7 +1207,9 @@ if (empty($reshook))
 
 		// Define special_code for special lines
 		$special_code = GETPOST('special_code');
-		if (!GETPOST('qty')) $special_code = 3;
+		if (!GETPOST('qty')) {
+			$special_code = 3;
+		}
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');
@@ -1206,8 +1220,9 @@ if (empty($reshook))
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level))
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min [$object->thirdparty->price_level];
+			}
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && ($price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent'), 2) / 100) < price2num($price_min)))) {
@@ -1228,12 +1243,9 @@ if (empty($reshook))
 		if (!$error) {
 			$db->begin();
 
-			if (empty($user->rights->margins->creer))
-			{
-				foreach ($object->lines as &$line)
-				{
-					if ($line->id == GETPOST('lineid'))
-					{
+			if (empty($user->rights->margins->creer)) {
+				foreach ($object->lines as &$line) {
+					if ($line->id == GETPOST('lineid')) {
 						$fournprice = $line->fk_fournprice;
 						$buyingprice = $line->pa_ht;
 						break;
@@ -1257,7 +1269,9 @@ if (empty($reshook))
 						$outputlangs->setDefaultLang($newlang);
 					}
 					$ret = $object->fetch($id); // Reload to get new records
-					if ($ret > 0) $object->fetch_thirdparty();
+					if ($ret > 0) {
+						$object->fetch_thirdparty();
+					}
 					$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 				}
 
@@ -1335,23 +1349,23 @@ if (empty($reshook))
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
-		if (!$error)
-		{
+		if ($ret < 0) {
+			$error++;
+		}
+		if (!$error) {
 			$result = $object->updateExtraField(GETPOST('attribute', 'restricthtml'), 'PROPAL_MODIFY', $user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 		}
-		if ($error) $action = 'edit_extras';
+		if ($error) {
+			$action = 'edit_extras';
+		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate)
-	{
-		if ($action == 'addcontact')
-		{
+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
+		if ($action == 'addcontact') {
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
@@ -1407,7 +1421,9 @@ $formfile = new FormFile($db);
 $formpropal = new FormPropal($db);
 $formmargin = new FormMargin($db);
 $companystatic = new Societe($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
 llxHeader('', $langs->trans('Proposal'), $help_url);
@@ -1415,19 +1431,18 @@ llxHeader('', $langs->trans('Proposal'), $help_url);
 $now = dol_now();
 
 // Add new proposal
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$currency_code = $conf->currency;
 
 	print load_fiche_titre($langs->trans("NewProp"), '', 'propal');
 
 	$soc = new Societe($db);
-	if ($socid > 0)
+	if ($socid > 0) {
 		$res = $soc->fetch($socid);
+	}
 
 	// Load objectsrc
-	if (!empty($origin) && !empty($originid))
-	{
+	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
 		$regs = array();
@@ -1459,8 +1474,7 @@ if ($action == 'create')
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
 			$objectsrc->fetch($originid);
-			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
-			{
+			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 				$objectsrc->fetch_lines();
 			}
 			$objectsrc->fetch_thirdparty();
@@ -1481,22 +1495,32 @@ if ($action == 'create')
 			$objectsrc->fetch_optionals();
 			$object->array_options = $objectsrc->array_options;
 
-			if (!empty($conf->multicurrency->enabled))
-			{
-				if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
-				if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
+			if (!empty($conf->multicurrency->enabled)) {
+				if (!empty($objectsrc->multicurrency_code)) {
+					$currency_code = $objectsrc->multicurrency_code;
+				}
+				if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
+					$currency_tx = $objectsrc->multicurrency_tx;
+				}
 			}
 		}
 	} else {
-		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+			$currency_code = $soc->multicurrency_code;
+		}
 	}
 
 	//Warehouse default if null
-	if ($soc->fk_warehouse > 0) $warehouse_id = $soc->fk_warehouse;
-	if (!empty($conf->stock->enabled) && empty($warehouse_id) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER))
-	{
-		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
-		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $warehouse_id = $user->fk_warehouse;
+	if ($soc->fk_warehouse > 0) {
+		$warehouse_id = $soc->fk_warehouse;
+	}
+	if (!empty($conf->stock->enabled) && empty($warehouse_id) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
+			$warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+		}
+		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+			$warehouse_id = $user->fk_warehouse;
+		}
 	}
 
 	$object = new Propal($db);
@@ -1539,8 +1563,7 @@ if ($action == 'create')
 		print '<td>';
 		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500');
 		// reload page to retrieve customer informations
-		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
-		{
+		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
@@ -1654,8 +1677,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
@@ -1666,8 +1688,7 @@ if ($action == 'create')
 	}
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled))
-	{
+	if (!empty($conf->incoterm->enabled)) {
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->label_incoterms, 1).'</label></td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -1686,8 +1707,7 @@ if ($action == 'create')
 	print "</td></tr>";
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
+	if (!empty($conf->multicurrency->enabled)) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -1704,8 +1724,7 @@ if ($action == 'create')
 	print $doleditor->Create(1);
 
 	// Private note
-	if (empty($user->socid))
-	{
+	if (empty($user->socid)) {
 		print '<tr>';
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 		print '<td valign="top">';
@@ -1720,8 +1739,7 @@ if ($action == 'create')
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 	// Lines from source
-	if (!empty($origin) && !empty($originid) && is_object($objectsrc))
-	{
+	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
 		// TODO for compatibility
 		if ($origin == 'contrat') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
@@ -1739,31 +1757,29 @@ if ($action == 'create')
 		print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 
 		$newclassname = $classname;
-		if ($newclassname == 'Propal')
+		if ($newclassname == 'Propal') {
 			$newclassname = 'CommercialProposal';
-		elseif ($newclassname == 'Commande')
+		} elseif ($newclassname == 'Commande') {
 			$newclassname = 'Order';
-		elseif ($newclassname == 'Expedition')
+		} elseif ($newclassname == 'Expedition') {
 			$newclassname = 'Sending';
-		elseif ($newclassname == 'Fichinter')
+		} elseif ($newclassname == 'Fichinter') {
 			$newclassname = 'Intervention';
+		}
 
 		print '<tr><td>'.$langs->trans($newclassname).'</td><td>'.$objectsrc->getNomUrl(1).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht, 0, $langs, 1, -1, -1, $conf->currency).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva, 0, $langs, 1, -1, -1, $conf->currency)."</td></tr>";
-		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1
-		{
+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) { 		// Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency)."</td></tr>";
 		}
 
-		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2
-		{
+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) { 		// Localtax2
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency)."</td></tr>";
 		}
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc, 0, $langs, 1, -1, -1, $conf->currency)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -1775,12 +1791,13 @@ if ($action == 'create')
 
 	/*
 	 * Combobox for copy function
- 	 */
+	  */
 
-	if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) print '<input type="hidden" name="createmode" value="empty">';
+	if (empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
+		print '<input type="hidden" name="createmode" value="empty">';
+	}
 
-	if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE))
-	{
+	if (!empty($conf->global->PROPAL_CLONE_ON_CREATE_PAGE)) {
 		print '<br><table>';
 
 		// For backward compatibility
@@ -1874,16 +1891,14 @@ if ($action == 'create')
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmClonePropal', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	if ($action == 'closeas')
-	{
+	if ($action == 'closeas') {
 		//Form to close proposal (signed or not)
 		$formquestion = array(
 			array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED))),
 			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
 		);
 
-		if (!empty($conf->notification->enabled))
-		{
+		if (!empty($conf->notification->enabled)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 			$notify = new Notify($db);
 			$formquestion = array_merge($formquestion, array(
@@ -1925,15 +1940,19 @@ if ($action == 'create')
 			$text .= $notify->confirmMessage('PROPAL_VALIDATE', $object->socid, $object);
 		}
 
-		if (!$error)
+		if (!$error) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateProp'), $text, 'confirm_validate', '', 0, 1);
+		}
 	}
 
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -1949,16 +1968,17 @@ if ($action == 'create')
 	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
+	}
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($usercancreate)
-		{
-			if ($action != 'classify')
+		if ($usercancreate) {
+			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -2023,8 +2043,9 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('Date');
 	print '</td>';
-	if ($action != 'editdate' && $object->statut == Propal::STATUS_DRAFT && $usercancreate)
+	if ($action != 'editdate' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editdate' && $usercancreate) {
@@ -2049,8 +2070,9 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateEndPropal');
 	print '</td>';
-	if ($action != 'editecheance' && $object->statut == Propal::STATUS_DRAFT && $usercancreate)
+	if ($action != 'editecheance' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editecheance&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editecheance' && $usercancreate) {
@@ -2063,8 +2085,9 @@ if ($action == 'create')
 	} else {
 		if (!empty($object->fin_validite)) {
 			print dol_print_date($object->fin_validite, 'day');
-			if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay))
+			if ($object->statut == Propal::STATUS_VALIDATED && $object->fin_validite < ($now - $conf->propal->cloture->warning_delay)) {
 				print img_warning($langs->trans("Late"));
+			}
 		} else {
 			print '&nbsp;';
 		}
@@ -2077,8 +2100,9 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($action != 'editconditions' && $object->statut == Propal::STATUS_DRAFT && $usercancreate)
+	if ($action != 'editconditions' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editconditions' && $usercancreate) {
@@ -2102,11 +2126,13 @@ if ($action == 'create')
 	print '<tr class="fielddeliverydelay"><td>';
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('AvailabilityPeriod');
-	if (!empty($conf->commande->enabled))
+	if (!empty($conf->commande->enabled)) {
 		print ' ('.$langs->trans('AfterOrder').')';
+	}
 	print '</td>';
-	if ($action != 'editavailability' && $object->statut == Propal::STATUS_DRAFT && $usercancreate)
+	if ($action != 'editavailability' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetAvailability'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editavailability' && $usercancreate) {
@@ -2124,8 +2150,9 @@ if ($action == 'create')
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('SendingMethod');
 		print '</td>';
-		if ($action != 'editshippingmethod' && $usercancreate)
+		if ($action != 'editshippingmethod' && $usercancreate) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editshippingmethod' && $usercancreate) {
@@ -2160,8 +2187,9 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('Source');
 	print '</td>';
-	if ($action != 'editdemandreason' && $object->statut == Propal::STATUS_DRAFT && $usercancreate)
+	if ($action != 'editdemandreason' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetDemandReason'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editdemandreason' && $usercancreate) {
@@ -2178,8 +2206,9 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && $object->statut == Propal::STATUS_DRAFT && $usercancreate)
+	if ($action != 'editmode' && $object->statut == Propal::STATUS_DRAFT && $usercancreate) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editmode' && $usercancreate) {
@@ -2190,16 +2219,16 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
+	if (!empty($conf->multicurrency->enabled)) {
 		// Multicurrency code
 		print '<tr>';
 		print '<td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
-		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT && $usercancreate)
+		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT && $usercancreate) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($object->statut == $object::STATUS_DRAFT && $action == 'editmulticurrencycode' && $usercancreate) {
@@ -2210,16 +2239,16 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Multicurrency rate
-		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
-		{
+		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 			print '<tr>';
 			print '<td>';
 			print '<table class="nobordernopadding" width="100%"><tr>';
 			print '<td>';
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
-			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $usercancreate)
+			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $usercancreate) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td>';
 			if ($object->statut == $object::STATUS_DRAFT && ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') && $usercancreate) {
@@ -2239,8 +2268,7 @@ if ($action == 'create')
 		}
 	}
 
-	if ($soc->outstanding_limit)
-	{
+	if ($soc->outstanding_limit) {
 		// Outstanding Bill
 		print '<tr><td>';
 		print $langs->trans('OutstandingBill');
@@ -2252,15 +2280,15 @@ if ($action == 'create')
 		print '</tr>';
 	}
 
-	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled))
-	{
+	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled)) {
 		// Bank Account
 		print '<tr><td>';
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('BankAccount');
 		print '</td>';
-		if ($action != 'editbankaccount' && $usercancreate)
+		if ($action != 'editbankaccount' && $usercancreate) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editbankaccount') {
@@ -2289,19 +2317,20 @@ if ($action == 'create')
 	}
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled))
-	{
+	if (!empty($conf->incoterm->enabled)) {
 		print '<tr><td>';
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($usercancreate) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		else print '&nbsp;';
+		if ($usercancreate) {
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td></tr></table>';
 		print '</td>';
 		print '<td>';
-		if ($action != 'editincoterm')
-		{
+		if ($action != 'editincoterm') {
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 		} else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -2321,8 +2350,7 @@ if ($action == 'create')
 
 	print '<table class="border tableforfield centpercent">';
 
-	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
-	{
+	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
 		print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -2350,14 +2378,12 @@ if ($action == 'create')
 	print '</tr>';
 
 	// Amount Local Taxes
-	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 	// Localtax1
-	{
+	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { 	// Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td class="nowrap">'.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 		print '</tr>';
 	}
-	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 	// Localtax2
-	{
+	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { 	// Localtax2
 		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td class="nowrap">'.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 		print '</tr>';
@@ -2374,8 +2400,7 @@ if ($action == 'create')
 	print '</table>';
 
 	// Margin Infos
-	if (!empty($conf->margin->enabled))
-	{
+	if (!empty($conf->margin->enabled)) {
 		$formmargin->displayMarginInfos($object);
 	}
 
@@ -2416,19 +2441,16 @@ if ($action == 'create')
 	}
 
 	print '<div class="div-table-responsive-no-min">';
-	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline'))
-	{
+	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline')) {
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 	}
 
-	if (!empty($object->lines))
-	{
+	if (!empty($object->lines)) {
 		$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
 	}
 
 	// Form to add new line
-	if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines')
-	{
+	if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines') {
 		if ($action != 'editline') {
 			// Add products/services form
 			$object->formAddObjectLine(1, $mysoc, $soc);
@@ -2441,8 +2463,7 @@ if ($action == 'create')
 		}
 	}
 
-	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline'))
-	{
+	if (!empty($object->lines) || ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines' && $action != 'editline')) {
 		print '</table>';
 	}
 	print '</div>';
@@ -2462,18 +2483,16 @@ if ($action == 'create')
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 																									   // modified by hook
-		if (empty($reshook))
-		{
-			if ($action != 'editline')
-			{
+		if (empty($reshook)) {
+			if ($action != 'editline') {
 				// Validate
 				if (($object->statut == Propal::STATUS_DRAFT && $object->total_ttc >= 0 && count($object->lines) > 0)
-					|| ($object->statut == Propal::STATUS_DRAFT && !empty($conf->global->PROPAL_ENABLE_NEGATIVE) && count($object->lines) > 0))
-				{
-					if ($usercanvalidate)
-					{
+					|| ($object->statut == Propal::STATUS_DRAFT && !empty($conf->global->PROPAL_ENABLE_NEGATIVE) && count($object->lines) > 0)) {
+					if ($usercanvalidate) {
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
-					} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
+					} else {
+						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
+					}
 				}
 				// Create event
 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -2496,7 +2515,9 @@ if ($action == 'create')
 					if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED || !empty($conf->global->PROPOSAL_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
+						} else {
+							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('SendMail').'</a>';
+						}
 					}
 				}
 
@@ -2508,8 +2529,7 @@ if ($action == 'create')
 				}
 
 				// Create a purchase order
-				if (!empty($conf->global->WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL))
-				{
+				if (!empty($conf->global->WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL)) {
 					if (!empty($conf->fournisseur->enabled) && $object->statut == Propal::STATUS_SIGNED) {
 						if ($usercancreatepurchaseorder) {
 							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddPurchaseOrder").'</a>';
@@ -2535,18 +2555,14 @@ if ($action == 'create')
 				}
 
 				// Create an invoice and classify billed
-				if ($object->statut == Propal::STATUS_SIGNED)
-				{
-					if (!empty($conf->facture->enabled) && $usercancreateinvoice)
-					{
+				if ($object->statut == Propal::STATUS_SIGNED) {
+					if (!empty($conf->facture->enabled) && $usercancreateinvoice) {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a>';
 					}
 
 					$arrayofinvoiceforpropal = $object->getInvoiceArrayList();
-					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED))
-					{
-						if ($usercanclose)
-						{
+					if ((is_array($arrayofinvoiceforpropal) && count($arrayofinvoiceforpropal) > 0) || empty($conf->global->WORKFLOW_PROPAL_NEED_INVOICE_TO_BE_CLASSIFIED_BILLED)) {
+						if ($usercanclose) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled&amp;socid='.$object->socid.'">'.$langs->trans("ClassifyBilled").'</a>';
 						} else {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("ClassifyBilled").'</a>';
@@ -2577,10 +2593,11 @@ if ($action == 'create')
 	}
 
 	//Select mail models is same action as presend
-	if (GETPOST('modelselected')) $action = 'presend';
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 		/*
@@ -2598,8 +2615,7 @@ if ($action == 'create')
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('propal'));
 
 		$compatibleImportElementsList = false;
-		if ($user->rights->propal->creer && $object->statut == Propal::STATUS_DRAFT)
-		{
+		if ($user->rights->propal->creer && $object->statut == Propal::STATUS_DRAFT) {
 			$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
 		}
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
@@ -2607,16 +2623,14 @@ if ($action == 'create')
 		// Show online signature link
 		$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
 
-		if ($object->statut != Propal::STATUS_DRAFT && $useonlinesignature)
-		{
+		if ($object->statut != Propal::STATUS_DRAFT && $useonlinesignature) {
 			print '<br><!-- Link to sign -->';
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 			print showOnlineSignatureUrl('proposal', $object->ref).'<br>';
 		}
 
 		// Show direct download link
-		if ($object->statut != Propal::STATUS_DRAFT && !empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD))
-		{
+		if ($object->statut != Propal::STATUS_DRAFT && !empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
 			print '<br><!-- Link to download main doc -->'."\n";
 			print showDirectDownloadLink($object).'<br>';
 		}
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index fd2cb3d371c..84d7cf23385 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -162,28 +162,37 @@ class Proposals extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."propal as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('propal').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -192,8 +201,7 @@ class Proposals extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -204,13 +212,11 @@ class Proposals extends DolibarrApi
 		dol_syslog("API Rest request");
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$proposal_static = new Propal($this->db);
 				if ($proposal_static->fetch($obj->rowid)) {
@@ -247,12 +253,12 @@ class Proposals extends DolibarrApi
 			$this->propal->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
-          $lines = array();
-          foreach ($request_data["lines"] as $line) {
-            array_push($lines, (object) $line);
-          }
-          $this->propal->lines = $lines;
-        }*/
+		  $lines = array();
+		  foreach ($request_data["lines"] as $line) {
+			array_push($lines, (object) $line);
+		  }
+		  $this->propal->lines = $lines;
+		}*/
 		if ($this->propal->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating order", array_merge(array($this->propal->error), $this->propal->errors));
 		}
@@ -304,7 +310,7 @@ class Proposals extends DolibarrApi
 	public function postLine($id, $request_data = null)
 	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
-		  	throw new RestException(401);
+			throw new RestException(401);
 		}
 
 		$result = $this->propal->fetch($id);
@@ -319,32 +325,32 @@ class Proposals extends DolibarrApi
 		$request_data = (object) $request_data;
 
 		$updateRes = $this->propal->addline(
-						$request_data->desc,
-						$request_data->subprice,
-						$request_data->qty,
-						$request_data->tva_tx,
-						$request_data->localtax1_tx,
-						$request_data->localtax2_tx,
-						$request_data->fk_product,
-						$request_data->remise_percent,
-						'HT',
-						0,
-						$request_data->info_bits,
-						$request_data->product_type,
-						$request_data->rang,
-						$request_data->special_code,
-	  					$request_data->fk_parent_line,
-						$request_data->fk_fournprice,
-						$request_data->pa_ht,
-						$request_data->label,
-						$request_data->date_start,
-						$request_data->date_end,
-						$request_data->array_options,
-						$request_data->fk_unit,
-						$request_data->origin,
-						$request_data->origin_id,
-						$request_data->multicurrency_subprice,
-						$request_data->fk_remise_except
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->fk_product,
+			$request_data->remise_percent,
+			'HT',
+			0,
+			$request_data->info_bits,
+			$request_data->product_type,
+			$request_data->rang,
+			$request_data->special_code,
+			$request_data->fk_parent_line,
+			$request_data->fk_fournprice,
+			$request_data->pa_ht,
+			$request_data->label,
+			$request_data->date_start,
+			$request_data->date_end,
+			$request_data->array_options,
+			$request_data->fk_unit,
+			$request_data->origin,
+			$request_data->origin_id,
+			$request_data->multicurrency_subprice,
+			$request_data->fk_remise_except
 		);
 
 		if ($updateRes > 0) {
@@ -378,15 +384,15 @@ class Proposals extends DolibarrApi
 
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-	  	}
+		}
 
-	  	$request_data = (object) $request_data;
+		$request_data = (object) $request_data;
 
-	  	$propalline = new PropaleLigne($this->db);
-	  	$result = $propalline->fetch($lineid);
-	  	if ($result <= 0) {
-	  		throw new RestException(404, 'Proposal line not found');
-	  	}
+		$propalline = new PropaleLigne($this->db);
+		$result = $propalline->fetch($lineid);
+		if ($result <= 0) {
+			throw new RestException(404, 'Proposal line not found');
+		}
 
 		$updateRes = $this->propal->updateline(
 			$lineid,
@@ -572,25 +578,23 @@ class Proposals extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->propal->$field = $value;
 		}
 
 		// update end of validity date
-		if (empty($this->propal->fin_validite) && !empty($this->propal->duree_validite) && !empty($this->propal->date_creation))
-		{
+		if (empty($this->propal->fin_validite) && !empty($this->propal->duree_validite) && !empty($this->propal->date_creation)) {
 			$this->propal->fin_validite = $this->propal->date_creation + ($this->propal->duree_validite * 24 * 3600);
 		}
-		if (!empty($this->propal->fin_validite))
-		{
-			if ($this->propal->set_echeance(DolibarrApiAccess::$user, $this->propal->fin_validite) < 0)
-			{
+		if (!empty($this->propal->fin_validite)) {
+			if ($this->propal->set_echeance(DolibarrApiAccess::$user, $this->propal->fin_validite) < 0) {
 				throw new RestException(500, $this->propal->error);
 			}
 		}
 
-		if ($this->propal->update(DolibarrApiAccess::$user) > 0)
-		{
+		if ($this->propal->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->propal->error);
@@ -834,8 +838,9 @@ class Proposals extends DolibarrApi
 	{
 		$propal = array();
 		foreach (Proposals::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$propal[$field] = $data[$field];
 		}
 		return $propal;
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index b3da95919e8..553362687b6 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2013      Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2020 Frédéric France          <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021 Frédéric France          <frederic.france@netlogic.fr>
  * Copyright (C) 2018      Ferran Marcet         	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -376,11 +376,12 @@ class Propal extends CommonObject
 		// phpcs:enable
 		global $conf, $mysoc;
 
-		if (!$qty) $qty = 1;
+		if (!$qty) {
+			$qty = 1;
+		}
 
 		dol_syslog(get_class($this)."::add_product $idproduct, $qty, $remise_percent");
-		if ($idproduct > 0)
-		{
+		if ($idproduct > 0) {
 			$prod = new Product($this->db);
 			$prod->fetch($idproduct);
 
@@ -388,15 +389,16 @@ class Propal extends CommonObject
 
 			$tva_tx = get_default_tva($mysoc, $this->thirdparty, $prod->id);
 			$tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
-			if (empty($tva_tx)) $tva_npr = 0;
+			if (empty($tva_tx)) {
+				$tva_npr = 0;
+			}
 			$vat_src_code = ''; // May be defined into tva_tx
 
 			$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $this->thirdparty, $tva_npr);
 			$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $this->thirdparty, $tva_npr);
 
 			// multiprices
-			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level)
-			{
+			if ($conf->global->PRODUIT_MULTIPRICES && $this->thirdparty->price_level) {
 				$price = $prod->multiprices[$this->thirdparty->price_level];
 			} else {
 				$price = $prod->price;
@@ -412,7 +414,9 @@ class Propal extends CommonObject
 			$line->vat_src_code = $vat_src_code;
 			$line->tva_tx = $tva_tx;
 			$line->fk_unit = $prod->fk_unit;
-			if ($tva_npr) $line->info_bits = 1;
+			if ($tva_npr) {
+				$line->info_bits = 1;
+			}
 
 			$this->lines[] = $line;
 		}
@@ -438,10 +442,8 @@ class Propal extends CommonObject
 		$remise = new DiscountAbsolute($this->db);
 		$result = $remise->fetch($idremise);
 
-		if ($result > 0)
-		{
-			if ($remise->fk_facture)	// Protection against multiple submission
-			{
+		if ($result > 0) {
+			if ($remise->fk_facture) {	// Protection against multiple submission
 				$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
 				$this->db->rollback();
 				return -5;
@@ -472,11 +474,9 @@ class Propal extends CommonObject
 			$line->total_ttc = -$remise->amount_ttc;
 
 			$result = $line->insert();
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result = $this->update_price(1);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -537,16 +537,25 @@ class Propal extends CommonObject
 
 		dol_syslog(get_class($this)."::addline propalid=$this->id, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, fk_product=$fk_product, remise_except=$remise_percent, price_base_type=$price_base_type, pu_ttc=$pu_ttc, info_bits=$info_bits, type=$type, fk_remise_except=".$fk_remise_except);
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
-			if (empty($remise_percent)) $remise_percent = 0;
-			if (empty($qty)) $qty = 0;
-			if (empty($info_bits)) $info_bits = 0;
-			if (empty($rang)) $rang = 0;
-			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
+			if (empty($rang)) {
+				$rang = 0;
+			}
+			if (empty($fk_parent_line) || $fk_parent_line < 0) {
+				$fk_parent_line = 0;
+			}
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
@@ -559,15 +568,16 @@ class Propal extends CommonObject
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 			$pa_ht = price2num($pa_ht);
-			if ($price_base_type == 'HT')
-			{
+			if ($price_base_type == 'HT') {
 				$pu = $pu_ht;
 			} else {
 				$pu = $pu_ttc;
 			}
 
 			// Check parameters
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
@@ -578,8 +588,7 @@ class Propal extends CommonObject
 			$this->db->begin();
 
 			$product_type = $type;
-			if (!empty($fk_product))
-			{
+			if (!empty($fk_product)) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
@@ -603,8 +612,7 @@ class Propal extends CommonObject
 			$reg = array();
 			$vat_src_code = '';
 			$reg = array();
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -628,8 +636,7 @@ class Propal extends CommonObject
 
 			// Rang to use
 			$ranktouse = $rang;
-			if ($ranktouse == -1)
-			{
+			if ($ranktouse == -1) {
 				$rangmax = $this->line_max($fk_parent_line);
 				$ranktouse = $rangmax + 1;
 			}
@@ -638,8 +645,7 @@ class Propal extends CommonObject
 			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
 			$price = $pu;
 			$remise = 0;
-			if ($remise_percent > 0)
-			{
+			if ($remise_percent > 0) {
 				$remise = round(($pu * $remise_percent / 100), 2);
 				$price = $pu - $remise;
 			}
@@ -694,7 +700,9 @@ class Propal extends CommonObject
 			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
 			// Mise en option de la ligne
-			if (empty($qty) && empty($special_code)) $this->line->special_code = 3;
+			if (empty($qty) && empty($special_code)) {
+				$this->line->special_code = 3;
+			}
 
 			// TODO deprecated
 			$this->line->price = $price;
@@ -705,10 +713,11 @@ class Propal extends CommonObject
 			}
 
 			$result = $this->line->insert();
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour informations denormalisees au niveau de la propale meme
 				$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
@@ -781,9 +790,15 @@ class Propal extends CommonObject
 		$txlocaltax1 = price2num($txlocaltax1);
 		$txlocaltax2 = price2num($txlocaltax2);
 		$pa_ht = price2num($pa_ht);
-		if (empty($qty) && empty($special_code)) $special_code = 3; // Set option tag
-		if (!empty($qty) && $special_code == 3) $special_code = 0; // Remove option tag
-		if (empty($type)) $type = 0;
+		if (empty($qty) && empty($special_code)) {
+			$special_code = 3; // Set option tag
+		}
+		if (!empty($qty) && $special_code == 3) {
+			$special_code = 0; // Remove option tag
+		}
+		if (empty($type)) {
+			$type = 0;
+		}
 
 		if ($date_start && $date_end && $date_start > $date_end) {
 			$langs->load("errors");
@@ -791,8 +806,7 @@ class Propal extends CommonObject
 			return -1;
 		}
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			$this->db->begin();
 
 			// Calcul du total TTC et de la TVA pour la ligne a partir de
@@ -805,8 +819,7 @@ class Propal extends CommonObject
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -830,8 +843,7 @@ class Propal extends CommonObject
 			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
 			$price = $pu;
 			$remise = 0;
-			if ($remise_percent > 0)
-			{
+			if ($remise_percent > 0) {
 				$remise = round(($pu * $remise_percent / 100), 2);
 				$price = $pu - $remise;
 			}
@@ -847,8 +859,7 @@ class Propal extends CommonObject
 			$this->line->context = $this->context;
 
 			// Reorder if fk_parent_line change
-			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
-			{
+			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) {
 				$rangmax = $this->line_max($fk_parent_line);
 				$this->line->rang = $rangmax + 1;
 			}
@@ -902,10 +913,11 @@ class Propal extends CommonObject
 			$this->line->multicurrency_total_ttc 	= $multicurrency_total_ttc;
 
 			$result = $this->line->update($notrigger);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				$this->update_price(1);
 
@@ -937,8 +949,7 @@ class Propal extends CommonObject
 	{
 		global $user;
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			$this->db->begin();
 
 			$line = new PropaleLigne($this->db);
@@ -946,8 +957,7 @@ class Propal extends CommonObject
 			// For triggers
 			$line->fetch($lineid);
 
-			if ($line->delete($user) > 0)
-			{
+			if ($line->delete($user) > 0) {
 				$this->update_price(1);
 
 				$this->db->commit();
@@ -979,16 +989,24 @@ class Propal extends CommonObject
 		$now = dol_now();
 
 		// Clean parameters
-		if (empty($this->date)) $this->date = $this->datep;
+		if (empty($this->date)) {
+			$this->date = $this->datep;
+		}
 		$this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
-		if (empty($this->availability_id)) $this->availability_id = 0;
-		if (empty($this->demand_reason_id)) $this->demand_reason_id = 0;
+		if (empty($this->availability_id)) {
+			$this->availability_id = 0;
+		}
+		if (empty($this->demand_reason_id)) {
+			$this->demand_reason_id = 0;
+		}
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = $conf->currency;
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
@@ -1001,19 +1019,16 @@ class Propal extends CommonObject
 
 		// Check parameters
 		$result = $this->fetch_thirdparty();
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = "Failed to fetch company";
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -3;
 		}
 
 		// Check parameters
-		if (!empty($this->ref))	// We check that ref is not already used
-		{
+		if (!empty($this->ref)) {	// We check that ref is not already used
 			$result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->error = 'ErrorRefAlreadyExists';
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
@@ -1021,8 +1036,7 @@ class Propal extends CommonObject
 			}
 		}
 
-		if (empty($this->date))
-		{
+		if (empty($this->date)) {
 			$this->error = "Date of proposal is required";
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -4;
@@ -1101,36 +1115,30 @@ class Propal extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."propal");
 
-			if ($this->id)
-			{
+			if ($this->id) {
 				$this->ref = '(PROV'.$this->id.')';
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."propal SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".((int) $this->id);
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if (!$resql) $error++;
+				if (!$resql) {
+					$error++;
+				}
 
-				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-				{
+				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {	// To use new linkedObjectsIds instead of old linked_objects
 					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 				}
 
 				// Add object linked
-				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
-				{
-					foreach ($this->linked_objects as $origin => $tmp_origin_id)
-					{
-						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-						{
-							foreach ($tmp_origin_id as $origin_id)
-							{
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) {
+					foreach ($this->linked_objects as $origin => $tmp_origin_id) {
+						if (is_array($tmp_origin_id)) {       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+							foreach ($tmp_origin_id as $origin_id) {
 								$ret = $this->add_object_linked($origin, $origin_id);
-								if (!$ret)
-								{
+								if (!$ret) {
 									$this->error = $this->db->lasterror();
 									$error++;
 								}
@@ -1139,8 +1147,7 @@ class Propal extends CommonObject
 						{
 							$origin_id = $tmp_origin_id;
 							$ret = $this->add_object_linked($origin, $origin_id);
-							if (!$ret)
-							{
+							if (!$ret) {
 								$this->error = $this->db->lasterror();
 								$error++;
 							}
@@ -1149,18 +1156,16 @@ class Propal extends CommonObject
 				}
 
 				/*
-                 *  Insertion du detail des produits dans la base
-                 *  Insert products detail in database
-                 */
-				if (!$error)
-				{
+				 *  Insertion du detail des produits dans la base
+				 *  Insert products detail in database
+				 */
+				if (!$error) {
 					$fk_parent_line = 0;
 					$num = count($this->lines);
 
-					for ($i = 0; $i < $num; $i++)
-					{
-						if (!is_object($this->lines[$i]))	// If this->lines is not array of objects, coming from REST API
-						{   // Convert into object this->lines[$i].
+					for ($i = 0; $i < $num; $i++) {
+						if (!is_object($this->lines[$i])) {	// If this->lines is not array of objects, coming from REST API
+							// Convert into object this->lines[$i].
 							$line = (object) $this->lines[$i];
 						} else {
 							$line = $this->lines[$i];
@@ -1171,7 +1176,9 @@ class Propal extends CommonObject
 						}
 						// Complete vat rate with code
 						$vatrate = $line->tva_tx;
-						if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
+						if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) {
+							$vatrate .= ' ('.$line->vat_src_code.')';
+						}
 
 						if (!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
 							$originid = $line->origin_id;
@@ -1208,8 +1215,7 @@ class Propal extends CommonObject
 							$originid
 						);
 
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							$this->error = $this->db->error;
 							dol_print_error($this->db);
@@ -1233,29 +1239,26 @@ class Propal extends CommonObject
 					$result=$this->db->query($sql);
 				}*/
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Mise a jour infos denormalisees
 					$resql = $this->update_price(1);
-					if ($resql)
-					{
+					if ($resql) {
 						$action = 'update';
 
 						// Actions on extra fields
-						if (!$error)
-						{
+						if (!$error) {
 							$result = $this->insertExtraFields();
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$error++;
 							}
 						}
 
-						if (!$error && !$notrigger)
-						{
+						if (!$error && !$notrigger) {
 							// Call trigger
 							$result = $this->call_trigger('PROPAL_CREATE', $user);
-							if ($result < 0) { $error++; }
+							if ($result < 0) {
+								$error++;
+							}
 							// End call triggers
 						}
 					} else {
@@ -1268,8 +1271,7 @@ class Propal extends CommonObject
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				dol_syslog(get_class($this)."::create done id=".$this->id);
 				return $this->id;
@@ -1313,25 +1315,23 @@ class Propal extends CommonObject
 		$objsoc = new Societe($this->db);
 
 		// Change socid if needed
-		if (!empty($socid) && $socid != $object->socid)
-		{
-			if ($objsoc->fetch($socid) > 0)
-			{
+		if (!empty($socid) && $socid != $object->socid) {
+			if ($objsoc->fetch($socid) > 0) {
 				$object->socid = $objsoc->id;
 				$object->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
 				$object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
 				$object->fk_delivery_address = '';
 
 				/*if (!empty($conf->projet->enabled))
-                {
-                    $project = new Project($db);
-    				if ($this->fk_project > 0 && $project->fetch($this->fk_project)) {
-    					if ($project->socid <= 0) $clonedObj->fk_project = $this->fk_project;
-    					else $clonedObj->fk_project = '';
-    				} else {
-    					$clonedObj->fk_project = '';
-    				}
-                }*/
+				{
+					$project = new Project($db);
+					if ($this->fk_project > 0 && $project->fetch($this->fk_project)) {
+						if ($project->socid <= 0) $clonedObj->fk_project = $this->fk_project;
+						else $clonedObj->fk_project = '';
+					} else {
+						$clonedObj->fk_project = '';
+					}
+				}*/
 				$object->fk_project = ''; // A cloned proposal is set by default to no project.
 			}
 
@@ -1354,58 +1354,54 @@ class Propal extends CommonObject
 		$object->date = $now;
 		$object->datep = $now; // deprecated
 		$object->fin_validite = $object->date + ($object->duree_validite * 24 * 3600);
-		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $object->ref_client = '';
-		if ($conf->global->MAIN_DONT_KEEP_NOTE_ON_CLONING == 1)
-		{
+		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) {
+			$object->ref_client = '';
+		}
+		if ($conf->global->MAIN_DONT_KEEP_NOTE_ON_CLONING == 1) {
 			$object->note_private = '';
 			$object->note_public = '';
 		}
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
 		$result = $object->create($user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $object->error;
 			$this->errors = array_merge($this->errors, $object->errors);
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// copy internal contacts
-			if ($object->copy_linked_contact($this, 'internal') < 0)
-			{
+			if ($object->copy_linked_contact($this, 'internal') < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// copy external contacts if same company
-			if ($this->socid == $object->socid)
-			{
-				if ($object->copy_linked_contact($this, 'external') < 0)
+			if ($this->socid == $object->socid) {
+				if ($object->copy_linked_contact($this, 'external') < 0) {
 					$error++;
+				}
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Hook of thirdparty module
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('objFrom'=>$this, 'clonedObj'=>$object);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 		}
 
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
@@ -1463,14 +1459,14 @@ class Propal extends CommonObject
 		if ($ref) {
 			$sql .= " WHERE p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
 			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
-		} else $sql .= " WHERE p.rowid=".$rowid;
+		} else {
+			$sql .= " WHERE p.rowid=".$rowid;
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id                   = $obj->rowid;
@@ -1481,12 +1477,12 @@ class Propal extends CommonObject
 				$this->remise               = $obj->remise;
 				$this->remise_percent       = $obj->remise_percent;
 				$this->remise_absolue       = $obj->remise_absolue;
-				$this->total                = $obj->total; // TODO deprecated
+				$this->total                = $obj->total_ttc; // TODO deprecated
+				$this->total_ttc            = $obj->total_ttc;
 				$this->total_ht             = $obj->total_ht;
 				$this->total_tva            = $obj->total_tva;
 				$this->total_localtax1		= $obj->localtax1;
 				$this->total_localtax2		= $obj->localtax2;
-				$this->total_ttc            = $obj->total;
 
 				$this->socid = $obj->fk_soc;
 				$this->thirdparty = null; // Clear if another value was already set by fetch_thirdparty
@@ -1537,8 +1533,8 @@ class Propal extends CommonObject
 				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
 				$this->user_author_id = $obj->fk_user_author;
-				$this->user_valid_id  = $obj->fk_user_valid;
-				$this->user_close_id  = $obj->fk_user_cloture;
+				$this->user_valid_id = $obj->fk_user_valid;
+				$this->user_close_id = $obj->fk_user_cloture;
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -1550,11 +1546,10 @@ class Propal extends CommonObject
 				$this->multicurrency_code = $obj->multicurrency_code;
 				$this->multicurrency_tx 		= $obj->multicurrency_tx;
 				$this->multicurrency_total_ht = $obj->multicurrency_total_ht;
-				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
-				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
+				$this->multicurrency_total_tva = $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc = $obj->multicurrency_total_ttc;
 
-				if ($obj->fk_statut == self::STATUS_DRAFT)
-				{
+				if ($obj->fk_statut == self::STATUS_DRAFT) {
 					$this->brouillon = 1;
 				}
 
@@ -1568,8 +1563,7 @@ class Propal extends CommonObject
 
 				// Lines
 				$result = $this->fetch_lines();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					return -3;
 				}
 
@@ -1598,13 +1592,27 @@ class Propal extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->ref)) $this->ref = trim($this->ref);
-		if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
-		if (isset($this->note) || isset($this->note_private)) $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
-		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
-		if (!empty($this->duree_validite) && is_numeric($this->duree_validite)) $this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
+		if (isset($this->ref)) {
+			$this->ref = trim($this->ref);
+		}
+		if (isset($this->ref_client)) {
+			$this->ref_client = trim($this->ref_client);
+		}
+		if (isset($this->note) || isset($this->note_private)) {
+			$this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->model_pdf)) {
+			$this->model_pdf = trim($this->model_pdf);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key = trim($this->import_key);
+		}
+		if (!empty($this->duree_validite) && is_numeric($this->duree_validite)) {
+			$this->fin_validite = $this->date + ($this->duree_validite * 24 * 3600);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -1616,7 +1624,9 @@ class Propal extends CommonObject
 		$sql .= " ref_ext=".(isset($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null").",";
 		$sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
 		$sql .= " datep=".(strval($this->date) != '' ? "'".$this->db->idate($this->date)."'" : 'null').",";
-		if (!empty($this->fin_validite)) $sql .= " fin_validite=".(strval($this->fin_validite) != '' ? "'".$this->db->idate($this->fin_validite)."'" : 'null').",";
+		if (!empty($this->fin_validite)) {
+			$sql .= " fin_validite=".(strval($this->fin_validite) != '' ? "'".$this->db->idate($this->fin_validite)."'" : 'null').",";
+		}
 		$sql .= " date_valid=".(strval($this->date_validation) != '' ? "'".$this->db->idate($this->date_validation)."'" : 'null').",";
 		$sql .= " total_tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
 		$sql .= " localtax1=".(isset($this->total_localtax1) ? $this->total_localtax1 : "null").",";
@@ -1644,28 +1654,25 @@ class Propal extends CommonObject
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PROPAL_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -1703,20 +1710,20 @@ class Propal extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'propaldet as d';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (d.fk_product = p.rowid)';
 		$sql .= ' WHERE d.fk_propal = '.$this->id;
-		if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+		if ($only_product) {
+			$sql .= ' AND p.fk_product_type = 0';
+		}
 		$sql .= ' ORDER by d.rang';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 			$num = $this->db->num_rows($result);
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp                   = $this->db->fetch_object($result);
 
 				$line                   = new PropaleLigne($this->db);
@@ -1824,15 +1831,13 @@ class Propal extends CommonObject
 		$error = 0;
 
 		// Protection
-		if ($this->statut == self::STATUS_VALIDATED)
-		{
+		if ($this->statut == self::STATUS_VALIDATED) {
 			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
 			return 0;
 		}
 
 		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->creer))
-	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->validate))))
-		{
+		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->validate)))) {
 			$this->error = 'ErrorPermissionDenied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -1847,8 +1852,7 @@ class Propal extends CommonObject
 		$soc->fetch($this->socid);
 
 		// Define new ref
-		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-		{
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
 			$num = $this->getNextNumRef($soc);
 		} else {
 			$num = $this->ref;
@@ -1862,49 +1866,46 @@ class Propal extends CommonObject
 
 		dol_syslog(get_class($this)."::valid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			dol_print_error($this->db);
 			$error++;
 		}
 
 		// Trigger calls
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PROPAL_VALIDATE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->oldref = $this->ref;
 
 			// Rename directory if dir was a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref))
-			{
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 				// Now we rename also files into index
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'propale/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'propale/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
-				if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 				$oldref = dol_sanitizeFileName($this->ref);
 				$newref = dol_sanitizeFileName($num);
 				$dirsource = $conf->propal->multidir_output[$this->entity].'/'.$oldref;
 				$dirdest = $conf->propal->multidir_output[$this->entity].'/'.$newref;
-				if (!$error && file_exists($dirsource))
-				{
+				if (!$error && file_exists($dirsource)) {
 					dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
-					if (@rename($dirsource, $dirdest))
-					{
+					if (@rename($dirsource, $dirdest)) {
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
 						$listoffiles = dol_dir_list($dirdest, 'files', 1, '^'.preg_quote($oldref, '/'));
-						foreach ($listoffiles as $fileentry)
-						{
+						foreach ($listoffiles as $fileentry) {
 							$dirsource = $fileentry['name'];
 							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 							$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -1942,15 +1943,13 @@ class Propal extends CommonObject
 	public function set_date($user, $date, $notrigger = 0)
 	{
 		// phpcs:enable
-		if (empty($date))
-		{
+		if (empty($date)) {
 			$this->error = 'ErrorBadParameter';
 			dol_syslog(get_class($this)."::set_date ".$this->error, LOG_ERR);
 			return -1;
 		}
 
-		if (!empty($user->rights->propal->creer))
-		{
+		if (!empty($user->rights->propal->creer)) {
 			$error = 0;
 
 			$this->db->begin();
@@ -1960,34 +1959,31 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->date = $date;
 				$this->datep = $date; // deprecated
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2009,8 +2005,7 @@ class Propal extends CommonObject
 	public function set_echeance($user, $date_fin_validite, $notrigger = 0)
 	{
 		// phpcs:enable
-		if (!empty($user->rights->propal->creer))
-		{
+		if (!empty($user->rights->propal->creer)) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2020,34 +2015,31 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->fin_validite = $date_fin_validite;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2083,8 +2075,7 @@ class Propal extends CommonObject
 	 */
 	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
-		if (!empty($user->rights->propal->creer))
-		{
+		if (!empty($user->rights->propal->creer)) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2095,34 +2086,31 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->date_livraison = $delivery_date;
 				$this->delivery_date = $delivery_date;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2144,8 +2132,7 @@ class Propal extends CommonObject
 	public function set_availability($user, $id, $notrigger = 0)
 	{
 		// phpcs:enable
-		if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
-		{
+		if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2156,34 +2143,31 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__.' availability('.$id.')', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->fk_availability = $id;
 				$this->availability_id = $id;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2211,8 +2195,7 @@ class Propal extends CommonObject
 	public function set_demand_reason($user, $id, $notrigger = 0)
 	{
 		// phpcs:enable
-		if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT)
-		{
+		if (!empty($user->rights->propal->creer) && $this->statut >= self::STATUS_DRAFT) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2223,36 +2206,33 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->fk_input_reason = $id;
 				$this->demand_reason_id = $id;
 			}
 
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2280,8 +2260,7 @@ class Propal extends CommonObject
 	public function set_ref_client($user, $ref_client, $notrigger = 0)
 	{
 		// phpcs:enable
-		if (!empty($user->rights->propal->creer))
-		{
+		if (!empty($user->rights->propal->creer)) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2291,33 +2270,30 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__.' $this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->ref_client = $ref_client;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2343,8 +2319,7 @@ class Propal extends CommonObject
 		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
-		if (!empty($user->rights->propal->creer))
-		{
+		if (!empty($user->rights->propal->creer)) {
 			$remise = price2num($remise);
 
 			$error = 0;
@@ -2356,34 +2331,31 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->remise_percent = $remise;
 				$this->update_price(1);
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2408,8 +2380,7 @@ class Propal extends CommonObject
 		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
-		if (!empty($user->rights->propal->creer))
-		{
+		if (!empty($user->rights->propal->creer)) {
 			$remise = price2num($remise);
 
 			$error = 0;
@@ -2422,34 +2393,31 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->remise_absolue = $remise;
 				$this->update_price(1);
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2478,7 +2446,9 @@ class Propal extends CommonObject
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
 		$sql .= " SET fk_statut = ".$this->statut.",";
-		if (!empty($note)) $sql .= " note_private = '".$this->db->escape($note)."',";
+		if (!empty($note)) {
+			$sql .= " note_private = '".$this->db->escape($note)."',";
+		}
 		$sql .= " date_cloture=NULL, fk_user_cloture=NULL";
 		$sql .= " WHERE rowid = ".$this->id;
 
@@ -2489,24 +2459,21 @@ class Propal extends CommonObject
 		if (!$resql) {
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
 		}
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_REOPEN', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			if (!empty($this->errors))
-			{
-				foreach ($this->errors as $errmsg)
-				{
+		if ($error) {
+			if (!empty($this->errors)) {
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2545,13 +2512,11 @@ class Propal extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED ? $conf->global->PROPALE_ADDON_PDF_ODT_CLOSED : $this->model_pdf;
 			$triggerName = 'PROPAL_CLOSE_REFUSED';
 
-			if ($status == self::STATUS_SIGNED)
-			{
+			if ($status == self::STATUS_SIGNED) {
 				$triggerName = 'PROPAL_CLOSE_SIGNED';
 				$modelpdf = $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL ? $conf->global->PROPALE_ADDON_PDF_ODT_TOBILL : $this->model_pdf;
 
@@ -2560,24 +2525,20 @@ class Propal extends CommonObject
 				$soc->id = $this->socid;
 				$result = $soc->set_as_client();
 
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -2;
 				}
 			}
-			if ($status == self::STATUS_BILLED)	// ->cloture() can also be called when we set it to billed, after setting it to signed
-			{
+			if ($status == self::STATUS_BILLED) {	// ->cloture() can also be called when we set it to billed, after setting it to signed
 				$triggerName = 'PROPAL_CLASSIFY_BILLED';
 			}
 
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				// Define output language
 				$outputlangs = $langs;
-				if (!empty($conf->global->MAIN_MULTILANGS))
-				{
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
 					$outputlangs = new Translate("", $conf);
 					$newlang = (GETPOST('lang_id', 'aZ09') ? GETPOST('lang_id', 'aZ09') : $this->thirdparty->default_lang);
 					$outputlangs->setDefaultLang($newlang);
@@ -2586,24 +2547,23 @@ class Propal extends CommonObject
 				$this->generateDocument($modelpdf, $outputlangs);
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->statut = $status;
 				$this->date_cloture = $now;
 				$this->note_private = $newprivatenote;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger($triggerName, $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2639,33 +2599,30 @@ class Propal extends CommonObject
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->errors[] = $this->db->error();
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->oldcopy = clone $this;
 			$this->statut = self::STATUS_BILLED;
 		}
 
-		if (!$notrigger && empty($error))
-		{
+		if (!$notrigger && empty($error)) {
 			// Call trigger
 			$result = $this->call_trigger('PROPAL_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -2688,8 +2645,7 @@ class Propal extends CommonObject
 		$error = 0;
 
 		// Protection
-		if ($this->statut <= self::STATUS_DRAFT)
-		{
+		if ($this->statut <= self::STATUS_DRAFT) {
 			return 0;
 		}
 
@@ -2702,35 +2658,32 @@ class Propal extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->errors[] = $this->db->error();
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->oldcopy = clone $this;
 		}
 
-		if (!$notrigger && empty($error))
-		{
+		if (!$notrigger && empty($error)) {
 			// Call trigger
 			$result = $this->call_trigger('PROPAL_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->statut = self::STATUS_DRAFT;
 			$this->brouillon = 1;
 
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -2764,38 +2717,42 @@ class Propal extends CommonObject
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " p.rowid as propalid, p.fk_statut, p.total_ht, p.ref, p.remise, ";
 		$sql .= " p.datep as dp, p.fin_validite as datelimite";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", sc.fk_soc, sc.fk_user";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE p.entity IN (".getEntity('propal').")";
 		$sql .= " AND p.fk_soc = s.rowid";
 		$sql .= " AND p.fk_statut = c.id";
-		if (!$user->rights->societe->client->voir && !$socid) //restriction
-		{
+		if (!$user->rights->societe->client->voir && !$socid) { //restriction
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
-		if ($socid) $sql .= " AND s.rowid = ".$socid;
-		if ($draft)	$sql .= " AND p.fk_statut = ".self::STATUS_DRAFT;
-		if ($notcurrentuser > 0) $sql .= " AND p.fk_user_author <> ".$user->id;
+		if ($socid) {
+			$sql .= " AND s.rowid = ".$socid;
+		}
+		if ($draft) {
+			$sql .= " AND p.fk_statut = ".self::STATUS_DRAFT;
+		}
+		if ($notcurrentuser > 0) {
+			$sql .= " AND p.fk_user_author <> ".$user->id;
+		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		$sql .= $this->db->plimit($limit, $offset);
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
-			if ($num)
-			{
+			if ($num) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
 
-					if ($shortlist == 1)
-					{
+					if ($shortlist == 1) {
 						$ga[$obj->propalid] = $obj->ref;
-					} elseif ($shortlist == 2)
-					{
+					} elseif ($shortlist == 2) {
 						$ga[$obj->propalid] = $obj->ref.' ('.$obj->name.')';
 					} else {
 						$ga[$i]['id'] = $obj->propalid;
@@ -2837,25 +2794,19 @@ class Propal extends CommonObject
 		$linkedInvoices = array();
 
 		$this->fetchObjectLinked($id, $this->element);
-		foreach ($this->linkedObjectsIds as $objecttype => $objectid)
-		{
+		foreach ($this->linkedObjectsIds as $objecttype => $objectid) {
 			// Nouveau système du comon object renvoi des rowid et non un id linéaire de 1 à n
 			// On parcourt donc une liste d'objets en tant qu'objet unique
-			foreach ($objectid as $key => $object)
-			{
+			foreach ($objectid as $key => $object) {
 				// Cas des factures liees directement
-				if ($objecttype == 'facture')
-				{
+				if ($objecttype == 'facture') {
 					$linkedInvoices[] = $object;
-				} // Cas des factures liees par un autre objet (ex: commande)
-				else {
+				} else {
+					// Cas des factures liees par un autre objet (ex: commande)
 					$this->fetchObjectLinked($object, $objecttype);
-					foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid)
-					{
-						foreach ($subobjectid as $subkey => $subobject)
-						{
-							if ($subobjecttype == 'facture')
-							{
+					foreach ($this->linkedObjectsIds as $subobjecttype => $subobjectid) {
+						foreach ($subobjectid as $subkey => $subobject) {
+							if ($subobjecttype == 'facture') {
 								$linkedInvoices[] = $subobject;
 							}
 						}
@@ -2864,8 +2815,7 @@ class Propal extends CommonObject
 			}
 		}
 
-		if (count($linkedInvoices) > 0)
-		{
+		if (count($linkedInvoices) > 0) {
 			$sql = "SELECT rowid as facid, ref, total, datef as df, fk_user_author, fk_statut, paye";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture";
 			$sql .= " WHERE rowid IN (".implode(',', $linkedInvoices).")";
@@ -2873,12 +2823,10 @@ class Propal extends CommonObject
 			dol_syslog(get_class($this)."::InvoiceArrayList", LOG_DEBUG);
 			$resql = $this->db->query($sql);
 
-			if ($resql)
-			{
+			if ($resql) {
 				$tab_sqlobj = array();
 				$nump = $this->db->num_rows($resql);
-				for ($i = 0; $i < $nump; $i++)
-				{
+				for ($i = 0; $i < $nump; $i++) {
 					$sqlobj = $this->db->fetch_object($resql);
 					$tab_sqlobj[] = $sqlobj;
 				}
@@ -2886,11 +2834,9 @@ class Propal extends CommonObject
 
 				$nump = count($tab_sqlobj);
 
-				if ($nump)
-				{
+				if ($nump) {
 					$i = 0;
-					while ($i < $nump)
-					{
+					while ($i < $nump) {
 						$obj = array_shift($tab_sqlobj);
 
 						$ga[$i] = $obj;
@@ -2902,7 +2848,9 @@ class Propal extends CommonObject
 			} else {
 				return -1;
 			}
-		} else return $ga;
+		} else {
+			return $ga;
+		}
 	}
 
 	/**
@@ -2924,7 +2872,9 @@ class Propal extends CommonObject
 		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PROPAL_DELETE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -2944,13 +2894,17 @@ class Propal extends CommonObject
 		if (!$error) {
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		if (!$error) {
 			// Delete linked contacts
 			$res = $this->delete_linked_contact();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		// Removed extrafields of object
@@ -3032,8 +2986,7 @@ class Propal extends CommonObject
 	{
 		global $user;
 
-		if ($this->statut >= self::STATUS_DRAFT)
-		{
+		if ($this->statut >= self::STATUS_DRAFT) {
 			$error = 0;
 
 			$this->db->begin();
@@ -3044,33 +2997,30 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__.' availability('.$availability_id.')', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->availability_id = $availability_id;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -3100,8 +3050,7 @@ class Propal extends CommonObject
 		// phpcs:enable
 		global $user;
 
-		if ($this->statut >= self::STATUS_DRAFT)
-		{
+		if ($this->statut >= self::STATUS_DRAFT) {
 			$error = 0;
 
 			$this->db->begin();
@@ -3112,33 +3061,30 @@ class Propal extends CommonObject
 
 			dol_syslog(__METHOD__.' demand_reason('.$demand_reason_id.')', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->demand_reason_id = $demand_reason_id;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('PROPAL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -3171,10 +3117,8 @@ class Propal extends CommonObject
 
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id                = $obj->rowid;
@@ -3187,15 +3131,13 @@ class Propal extends CommonObject
 				$cuser->fetch($obj->fk_user_author);
 				$this->user_creation = $cuser;
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
@@ -3233,8 +3175,7 @@ class Propal extends CommonObject
 		global $conf;
 
 		// Init/load array of translation of status
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			$langs->load("propal");
 			$this->labelStatus[0] = $langs->transnoentitiesnoconv("PropalStatusDraft");
@@ -3250,11 +3191,17 @@ class Propal extends CommonObject
 		}
 
 		$statusType = '';
-		if ($status == self::STATUS_DRAFT) $statusType = 'status0';
-		elseif ($status == self::STATUS_VALIDATED) $statusType = 'status1';
-		elseif ($status == self::STATUS_SIGNED) $statusType = 'status4';
-		elseif ($status == self::STATUS_NOTSIGNED) $statusType = 'status9';
-		elseif ($status == self::STATUS_BILLED) $statusType = 'status6';
+		if ($status == self::STATUS_DRAFT) {
+			$statusType = 'status0';
+		} elseif ($status == self::STATUS_VALIDATED) {
+			$statusType = 'status1';
+		} elseif ($status == self::STATUS_SIGNED) {
+			$statusType = 'status4';
+		} elseif ($status == self::STATUS_NOTSIGNED) {
+			$statusType = 'status9';
+		} elseif ($status == self::STATUS_BILLED) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -3277,20 +3224,24 @@ class Propal extends CommonObject
 
 		$sql = "SELECT p.rowid, p.ref, p.datec as datec, p.fin_validite as datefin, p.total_ht";
 		$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = " AND";
 		}
 		$sql .= $clause." p.entity IN (".getEntity('propal').")";
-		if ($mode == 'opened') $sql .= " AND p.fk_statut = ".self::STATUS_VALIDATED;
-		if ($mode == 'signed') $sql .= " AND p.fk_statut = ".self::STATUS_SIGNED;
-		if ($user->socid) $sql .= " AND p.fk_soc = ".$user->socid;
+		if ($mode == 'opened') {
+			$sql .= " AND p.fk_statut = ".self::STATUS_VALIDATED;
+		}
+		if ($mode == 'signed') {
+			$sql .= " AND p.fk_statut = ".self::STATUS_SIGNED;
+		}
+		if ($user->socid) {
+			$sql .= " AND p.fk_soc = ".$user->socid;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$langs->load("propal");
 			$now = dol_now();
 
@@ -3319,16 +3270,13 @@ class Propal extends CommonObject
 			$response->img = img_object('', "propal");
 
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 				$response->total += $obj->total_ht;
 
-				if ($mode == 'opened')
-				{
+				if ($mode == 'opened') {
 					$datelimit = $this->db->jdate($obj->datefin);
-					if ($datelimit < ($now - $delay_warning))
-					{
+					if ($datelimit < ($now - $delay_warning)) {
 						$response->nbtodolate++;
 					}
 				}
@@ -3364,12 +3312,10 @@ class Propal extends CommonObject
 		$sql .= $this->db->plimit(100);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_prods = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_prods)
-			{
+			while ($i < $num_prods) {
 				$i++;
 				$row = $this->db->fetch_row($resql);
 				$prodids[$i] = $row[0];
@@ -3401,8 +3347,7 @@ class Propal extends CommonObject
 		// Lines
 		$nbp = 5;
 		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
+		while ($xnbp < $nbp) {
 			$line = new PropaleLigne($this->db);
 			$line->desc = $langs->trans("Description")." ".$xnbp;
 			$line->qty = 1;
@@ -3411,8 +3356,7 @@ class Propal extends CommonObject
 			$line->tva_tx = 20;
 			$line->localtax1_tx = 0;
 			$line->localtax2_tx = 0;
-			if ($xnbp == 2)
-			{
+			if ($xnbp == 2) {
 				$line->total_ht = 50;
 				$line->total_ttc = 60;
 				$line->total_tva = 10;
@@ -3424,8 +3368,7 @@ class Propal extends CommonObject
 				$line->remise_percent = 00;
 			}
 
-			if ($num_prods > 0)
-			{
+			if ($num_prods > 0) {
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product = $prodids[$prodid];
 				$line->product_ref = 'SPECIMEN';
@@ -3458,8 +3401,7 @@ class Propal extends CommonObject
 		$sql = "SELECT count(p.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
@@ -3467,11 +3409,9 @@ class Propal extends CommonObject
 		$sql .= " ".$clause." p.entity IN (".getEntity('propal').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// This assignment in condition is not a bug. It allows walking the results.
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["proposals"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -3498,8 +3438,7 @@ class Propal extends CommonObject
 
 		$classname = $conf->global->PROPALE_ADDON;
 
-		if (!empty($classname))
-		{
+		if (!empty($classname)) {
 			$mybool = false;
 
 			$file = $classname.".php";
@@ -3513,8 +3452,7 @@ class Propal extends CommonObject
 				$mybool |= @include_once $dir.$file;
 			}
 
-			if (!$mybool)
-			{
+			if (!$mybool) {
 				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
@@ -3523,8 +3461,7 @@ class Propal extends CommonObject
 			$numref = "";
 			$numref = $obj->getNextValue($soc, $this);
 
-			if ($numref != "")
-			{
+			if ($numref != "") {
 				return $numref;
 			} else {
 				$this->error = $obj->error;
@@ -3553,14 +3490,15 @@ class Propal extends CommonObject
 	{
 		global $langs, $conf, $user;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$label = '';
 		$url = '';
 
-		if ($user->rights->propal->lire)
-		{
+		if ($user->rights->propal->lire) {
 			$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Proposal").'</u>';
 			if (isset($this->statut)) {
 				$label .= ' '.$this->getLibStatut(5);
@@ -3594,20 +3532,21 @@ class Propal extends CommonObject
 				$url = DOL_URL_ROOT.'/comm/propal/document.php?id='.$this->id.$get_params;
 			}
 
-			if ($option != 'nolink')
-			{
+			if ($option != 'nolink') {
 				// Add param to save lastsearch_values or not
 				$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-				if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-				if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+				if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+					$add_save_lastsearch_values = 1;
+				}
+				if ($add_save_lastsearch_values) {
+					$url .= '&save_lastsearch_values=1';
+				}
 			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip) && $user->rights->propal->lire)
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip) && $user->rights->propal->lire) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("Proposal");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -3620,8 +3559,12 @@ class Propal extends CommonObject
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		if ($addlinktonotes >= 0) {
@@ -3649,7 +3592,9 @@ class Propal extends CommonObject
 						$txttoshow .= dol_string_nohtmltag($this->note_public, 1);
 					}
 					if (!empty($this->note_private)) {
-						if (!empty($txttoshow)) $txttoshow .= '<br><br>';
+						if (!empty($txttoshow)) {
+							$txttoshow .= '<br><br>';
+						}
 						$txttoshow .= dol_string_nohtmltag($this->note_private, 1);
 					}
 				}
@@ -3898,12 +3843,10 @@ class PropaleLigne extends CommonObjectLine
 		$sql .= ' WHERE pd.rowid = '.$rowid;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$objp = $this->db->fetch_object($result);
 
-			if ($objp)
-			{
+			if ($objp) {
 				$this->id = $objp->rowid;
 				$this->rowid			= $objp->rowid; // deprecated
 				$this->fk_propal = $objp->fk_propal;
@@ -3984,32 +3927,70 @@ class PropaleLigne extends CommonObjectLine
 		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
 		// Clean parameters
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->rang)) $this->rang = 0;
-		if (empty($this->remise)) $this->remise = 0;
-		if (empty($this->remise_percent) || !is_numeric($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
-		if (!is_numeric($this->qty)) $this->qty = 0;
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
-		if (empty($this->multicurrency_subprice))  $this->multicurrency_subprice = 0;
-		if (empty($this->multicurrency_total_ht))  $this->multicurrency_total_ht = 0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->rang)) {
+			$this->rang = 0;
+		}
+		if (empty($this->remise)) {
+			$this->remise = 0;
+		}
+		if (empty($this->remise_percent) || !is_numeric($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (empty($this->fk_fournprice)) {
+			$this->fk_fournprice = 0;
+		}
+		if (!is_numeric($this->qty)) {
+			$this->qty = 0;
+		}
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
+		if (empty($this->multicurrency_subprice)) {
+			$this->multicurrency_subprice = 0;
+		}
+		if (empty($this->multicurrency_total_ht)) {
+			$this->multicurrency_total_ht = 0;
+		}
+		if (empty($this->multicurrency_total_tva)) {
+			$this->multicurrency_total_tva = 0;
+		}
+		if (empty($this->multicurrency_total_ttc)) {
+			$this->multicurrency_total_ttc = 0;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
-		{
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-			{
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -4017,7 +3998,9 @@ class PropaleLigne extends CommonObjectLine
 		}
 
 		// Check parameters
-		if ($this->product_type < 0) return -1;
+		if ($this->product_type < 0) {
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -4070,26 +4053,21 @@ class PropaleLigne extends CommonObjectLine
 
 		dol_syslog(get_class($this).'::insert', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->rowid = $this->db->last_insert_id(MAIN_DB_PREFIX.'propaldet');
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->id = $this->rowid;
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEPROPAL_INSERT', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
 				}
@@ -4121,26 +4099,21 @@ class PropaleLigne extends CommonObjectLine
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".$this->rowid;
 		dol_syslog("PropaleLigne::delete", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			// Remove extrafields
-			if (!$error)
-			{
+			if (!$error) {
 				$this->id = $this->rowid;
 				$result = $this->deleteExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEPROPAL_DELETE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
 				}
@@ -4171,33 +4144,69 @@ class PropaleLigne extends CommonObjectLine
 
 		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
-		if (empty($this->id) && !empty($this->rowid)) $this->id = $this->rowid;
+		if (empty($this->id) && !empty($this->rowid)) {
+			$this->id = $this->rowid;
+		}
 
 		// Clean parameters
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->marque_tx)) $this->marque_tx = 0;
-		if (empty($this->marge_tx)) $this->marge_tx = 0;
-		if (empty($this->price)) $this->price = 0; // TODO A virer
-		if (empty($this->remise)) $this->remise = 0; // TODO A virer
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (empty($this->fk_fournprice)) $this->fk_fournprice = 0;
-		if (empty($this->subprice)) $this->subprice = 0;
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->marque_tx)) {
+			$this->marque_tx = 0;
+		}
+		if (empty($this->marge_tx)) {
+			$this->marge_tx = 0;
+		}
+		if (empty($this->price)) {
+			$this->price = 0; // TODO A virer
+		}
+		if (empty($this->remise)) {
+			$this->remise = 0; // TODO A virer
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (empty($this->fk_fournprice)) {
+			$this->fk_fournprice = 0;
+		}
+		if (empty($this->subprice)) {
+			$this->subprice = 0;
+		}
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
-		{
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-			{
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -4223,8 +4232,7 @@ class PropaleLigne extends CommonObjectLine
 		$sql .= ", price=".price2num($this->price).""; // TODO A virer
 		$sql .= ", remise=".price2num($this->remise).""; // TODO A virer
 		$sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
-		if (empty($this->skip_update_total))
-		{
+		if (empty($this->skip_update_total)) {
 			$sql .= ", total_ht=".price2num($this->total_ht)."";
 			$sql .= ", total_tva=".price2num($this->total_tva)."";
 			$sql .= ", total_ttc=".price2num($this->total_ttc)."";
@@ -4233,9 +4241,13 @@ class PropaleLigne extends CommonObjectLine
 		}
 		$sql .= ", fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
 		$sql .= ", buy_price_ht=".price2num($this->pa_ht);
-		if (strlen($this->special_code)) $sql .= ", special_code=".$this->special_code;
+		if (strlen($this->special_code)) {
+			$sql .= ", special_code=".$this->special_code;
+		}
 		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
-		if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+		if (!empty($this->rang)) {
+			$sql .= ", rang=".$this->rang;
+		}
 		$sql .= ", date_start=".(!empty($this->date_start) ? "'".$this->db->idate($this->date_start)."'" : "null");
 		$sql .= ", date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
 		$sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
@@ -4250,23 +4262,18 @@ class PropaleLigne extends CommonObjectLine
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$error)
-			{
+		if ($resql) {
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEPROPAL_UPDATE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
 				}
@@ -4304,8 +4311,7 @@ class PropaleLigne extends CommonObjectLine
 		dol_syslog("PropaleLigne::update_total", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->db->commit();
 			return 1;
 		} else {
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index ca95be53fc1..f64bc31c6ac 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -69,8 +69,7 @@ class PropaleStats extends Stats
 		$this->userid = $userid;
 		$this->join = '';
 
-		if ($mode == 'customer')
-		{
+		if ($mode == 'customer') {
 			$object = new Propal($this->db);
 
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
@@ -81,8 +80,7 @@ class PropaleStats extends Stats
 
 			//$this->where .= " p.fk_statut > 0";
 		}
-		if ($mode == 'supplier')
-		{
+		if ($mode == 'supplier') {
 			$object = new SupplierProposal($this->db);
 
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as p";
@@ -95,21 +93,22 @@ class PropaleStats extends Stats
 		}
 		//$this->where.= " AND p.fk_soc = s.rowid AND p.entity = ".$conf->entity;
 		$this->where .= ($this->where ? ' AND ' : '')."p.entity IN (".getEntity('propal').")";
-		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-		if ($this->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($this->socid) {
 			$this->where .= " AND p.fk_soc = ".$this->socid;
 		}
-		if ($this->userid > 0) $this->where .= ' AND fk_user_author = '.$this->userid;
+		if ($this->userid > 0) {
+			$this->where .= ' AND fk_user_author = '.$this->userid;
+		}
 
-		if ($typentid)
-		{
+		if ($typentid) {
 			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
 			$this->where .= ' AND s.fk_typent = '.$typentid;
 		}
 
-		if ($categid)
-		{
+		if ($categid) {
 			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = p.fk_soc';
 			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
 			$this->where .= ' AND c.rowid = '.$categid;
@@ -130,7 +129,9 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		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 .= $this->join;
 		$sql .= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
@@ -153,7 +154,9 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -175,7 +178,9 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, SUM(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
@@ -198,7 +203,9 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%m') as dm, AVG(p.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->field_date." BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
@@ -219,7 +226,9 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT date_format(".$this->field_date.",'%Y') as year, COUNT(*) as nb, SUM(".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
@@ -243,7 +252,9 @@ class PropaleStats extends Stats
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-		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 .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND p.rowid = tl.fk_propal AND tl.fk_product = product.rowid";
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index af3679de945..60d3836cfcb 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('facture', 'orders', 'sendings', 'companies'));
+$langs->loadLangs(array('facture', 'propal', 'orders', 'sendings', 'companies'));
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -41,28 +41,26 @@ $lineid = GETPOST('lineid', 'int');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'propal', $id);
 
 $object = new Propal($db);
 
 // Load object
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref);
-	if ($ret == 0)
-	{
+	if ($ret == 0) {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
 		$error++;
-	} elseif ($ret < 0)
-	{
+	} elseif ($ret < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$error++;
 	}
 }
-if (!$error)
-{
+if (!$error) {
 	$object->fetch_thirdparty();
 } else {
 	header('Location: '.DOL_URL_ROOT.'/comm/propal/list.php');
@@ -74,42 +72,34 @@ if (!$error)
  * Add a new contact
  */
 
-if ($action == 'addcontact' && $user->rights->propale->creer)
-{
-	if ($object->id > 0)
-	{
+if ($action == 'addcontact' && $user->rights->propale->creer) {
+	if ($object->id > 0) {
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-} // Toggle the status of a contact
-elseif ($action == 'swapstatut' && $user->rights->propale->creer)
-{
-	if ($object->id > 0)
-	{
+} elseif ($action == 'swapstatut' && $user->rights->propale->creer) {
+	// Toggle the status of a contact
+	if ($object->id > 0) {
 		$result = $object->swapContactStatus(GETPOST('ligne'));
 	}
-} // Deletes a contact
-elseif ($action == 'deletecontact' && $user->rights->propale->creer)
-{
+} elseif ($action == 'deletecontact' && $user->rights->propale->creer) {
+	// Deletes a contact
 	$result = $object->delete_contact($lineid);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -134,8 +124,7 @@ $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$head = propal_prepare_head($object);
 	print dol_get_fiche_head($head, 'contact', $langs->trans("Proposal"), -1, 'propal');
 
@@ -152,12 +141,10 @@ if ($object->id > 0)
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->propal->creer)
-		{
+		if ($user->rights->propal->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 				$morehtmlref .= ' : ';
@@ -194,10 +181,11 @@ if ($object->id > 0)
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-	foreach ($dirtpls as $reldir)
-	{
+	foreach ($dirtpls as $reldir) {
 		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) break;
+		if ($res) {
+			break;
+		}
 	}
 }
 
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 530f7392f54..4c408adcb28 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -39,15 +39,14 @@ if (!empty($conf->projet->enabled)) {
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'other', 'companies'));
 
-$action		= GETPOST('action', 'alpha');
-$confirm	= GETPOST('confirm', 'alpha');
-$id			= GETPOST('id', 'int');
-$ref		= GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 
 // Security check
 $socid = '';
-if (!empty($user->socid))
-{
+if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'propal', $id);
@@ -57,16 +56,26 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) { $sortfield = $conf->global->MAIN_DOC_SORT_FIELD; }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) { $sortorder = $conf->global->MAIN_DOC_SORT_ORDER; }
+if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
+	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+}
+if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
+	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+}
 
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new Propal($db);
 $object->fetch($id, $ref);
@@ -76,8 +85,7 @@ $object->fetch($id, $ref);
  * Actions
  */
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
 	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
@@ -92,8 +100,7 @@ llxHeader('', $langs->trans('Proposal'), 'EN:Commercial_Proposals|FR:Proposition
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$upload_dir = $conf->propal->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
 
 	$head = propal_prepare_head($object);
@@ -102,8 +109,7 @@ if ($object->id > 0)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
@@ -120,12 +126,10 @@ if ($object->id > 0)
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->propal->creer)
-		{
+		if ($user->rights->propal->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 				$morehtmlref .= ' : ';
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index b02ac911bad..812561a63b1 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -20,7 +20,7 @@
  */
 
 /**
- *	\file		htdocs/comm/propal/index.php
+ *  \file		htdocs/comm/propal/index.php
  *	\ingroup	propal
  *	\brief	Home page of proposal area
  */
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index cf63d919f62..847b42edbc5 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -19,9 +19,9 @@
  */
 
 /**
- *      \file       htdocs/comm/propal/info.php
- *      \ingroup    propal
- *      \brief      Page d'affichage des infos d'une proposition commerciale
+ *	\file       htdocs/comm/propal/info.php
+ *	\ingroup    propal
+ *	\brief      Page d'affichage des infos d'une proposition commerciale
  */
 
 require '../../main.inc.php';
@@ -40,12 +40,13 @@ $ref = GETPOST('ref', 'alpha');
 $socid = GETPOST('socid', 'int');
 
 // Security check
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'propal', $id);
 
 $object = new Propal($db);
-if (!$object->fetch($id, $ref) > 0)
-{
+if (!$object->fetch($id, $ref) > 0) {
 	dol_print_error($db);
 	exit;
 }
@@ -80,12 +81,10 @@ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_cl
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	if ($user->rights->propal->creer)
-	{
+	if ($user->rights->propal->creer) {
 		if ($action != 'classify') {
 			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 			$morehtmlref .= ' : ';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index ef78cd32c9d..a1cae674f68 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -47,7 +47,9 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'propal', 'compta', 'bills', 'orders', 'products', 'deliveries', 'categories'));
-if (!empty($conf->expedition->enabled)) $langs->loadLangs(array('sendings'));
+if (!empty($conf->expedition->enabled)) {
+	$langs->loadLangs(array('sendings'));
+}
 
 $socid = GETPOST('socid', 'int');
 
@@ -109,12 +111,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'p.ref';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 'p.ref';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
 $permissiontoread = $user->rights->propal->lire;
 $permissiontoadd = $user->rights->propal->write;
@@ -125,9 +133,10 @@ $permissiontoclose = $user->rights->propal->cloturer;
 $module = 'propal';
 $dbtable = '';
 $objectid = '';
-if (!empty($user->socid))	$socid = $user->socid;
-if (!empty($socid))
-{
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
+if (!empty($socid)) {
 	$objectid = $socid;
 	$module = 'societe';
 	$dbtable = '&societe';
@@ -157,7 +166,9 @@ $fieldstosearchall = array(
 	's.town'=>"Town",
 	'p.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["p.note_private"] = "NotePrivate";
+if (empty($user->socid)) {
+	$fieldstosearchall["p.note_private"] = "NotePrivate";
+}
 
 
 $checkedtypetiers = 0;
@@ -210,18 +221,23 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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');
+}
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Do we click on 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_categ = '';
 	$search_user = '';
 	$search_sale = '';
@@ -263,11 +279,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_fk_shipping_method = '';
 	$search_fk_mode_reglement = '';
 }
-if ($object_statut != '') $search_status = $object_statut;
+if ($object_statut != '') {
+	$search_status = $object_statut;
+}
 
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$objectclass = 'Propal';
 	$objectlabel = 'Proposals';
 	$uploaddir = $conf->propal->multidir_output[$conf->entity];
@@ -386,7 +403,9 @@ $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos'
 //llxHeader('',$langs->trans('Proposal'),$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0 || $search_user > 0) {
+	$sql = 'SELECT DISTINCT';
+}
 $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client, ';
 $sql .= " typent.code as typent_code,";
 $sql .= " ava.rowid as availability,";
@@ -398,11 +417,17 @@ $sql .= ' p.note_public, p.note_private,';
 $sql .= ' p.fk_cond_reglement,p.fk_mode_reglement,p.fk_shipping_method,';
 $sql .= " pr.rowid as project_id, pr.ref as project_ref, pr.title as project_label,";
 $sql .= ' u.login';
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
-if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", sc.fk_soc, sc.fk_user";
+}
+if ($search_categ_cus) {
+	$sql .= ", cc.fk_categorie, cc.fk_soc";
+}
 // 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();
@@ -413,74 +438,150 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if (!empty($search_categ_cus)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+if (!empty($search_categ_cus)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+}
 $sql .= ', '.MAIN_DB_PREFIX.'propal as p';
-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 (p.rowid = ef.fk_object)";
-if ($sall || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal';
-if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+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 (p.rowid = ef.fk_object)";
+}
+if ($sall || $search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet as pd ON p.rowid=pd.fk_propal';
+}
+if ($search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+}
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON p.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr ON pr.rowid = p.fk_projet";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_availability as ava on (ava.rowid = p.fk_availability)";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-if ($search_user > 0)
-{
+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as c";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql .= ' WHERE p.fk_soc = s.rowid';
 $sql .= ' AND p.entity IN ('.getEntity('propal').')';
-if (!$user->rights->societe->client->voir && !$socid) //restriction
-{
+if (!$user->rights->societe->client->voir && !$socid) { //restriction
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
 
-if ($search_town)					$sql .= natural_search('s.town', $search_town);
-if ($search_zip)					$sql .= natural_search("s.zip", $search_zip);
-if ($search_state)					$sql .= natural_search("state.nom", $search_state);
-if ($search_country)				$sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
-if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)		$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
-if ($search_ref)					$sql .= natural_search('p.ref', $search_ref);
-if ($search_refcustomer)			$sql .= natural_search('p.ref_client', $search_refcustomer);
-if ($search_refproject)				$sql .= natural_search('pr.ref', $search_refproject);
-if ($search_project)				$sql .= natural_search('pr.title', $search_project);
-if ($search_availability)			$sql .= " AND p.fk_availability IN (".$db->sanitize($db->escape($search_availability)).')';
-if ($search_societe)				$sql .= natural_search('s.nom', $search_societe);
-if ($search_societe_alias)			$sql .= natural_search('s.name_alias', $search_societe_alias);
-if ($search_login)					$sql .= natural_search("u.login", $search_login);
-if ($search_montant_ht != '')		$sql .= natural_search("p.total_ht", $search_montant_ht, 1);
-if ($search_montant_vat != '')		$sql .= natural_search("p.total_tva", $search_montant_vat, 1);
-if ($search_montant_ttc != '')		$sql .= natural_search("p.total_ttc", $search_montant_ttc, 1);
-if ($search_multicurrency_code != '')        $sql .= ' AND p.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
-if ($search_multicurrency_tx != '')          $sql .= natural_search('p.multicurrency_tx', $search_multicurrency_tx, 1);
-if ($search_multicurrency_montant_ht != '')  $sql .= natural_search('p.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
-if ($search_multicurrency_montant_vat != '') $sql .= natural_search('p.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
-if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('p.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+if ($search_town) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+	$sql .= natural_search("s.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_country) {
+	$sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
+}
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
+	$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
+}
+if ($search_ref) {
+	$sql .= natural_search('p.ref', $search_ref);
+}
+if ($search_refcustomer) {
+	$sql .= natural_search('p.ref_client', $search_refcustomer);
+}
+if ($search_refproject) {
+	$sql .= natural_search('pr.ref', $search_refproject);
+}
+if ($search_project) {
+	$sql .= natural_search('pr.title', $search_project);
+}
+if ($search_availability) {
+	$sql .= " AND p.fk_availability IN (".$db->sanitize($db->escape($search_availability)).')';
+}
+if ($search_societe) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if ($search_societe_alias) {
+	$sql .= natural_search('s.name_alias', $search_societe_alias);
+}
+if ($search_login) {
+	$sql .= natural_search("u.login", $search_login);
+}
+if ($search_montant_ht != '') {
+	$sql .= natural_search("p.total_ht", $search_montant_ht, 1);
+}
+if ($search_montant_vat != '') {
+	$sql .= natural_search("p.total_tva", $search_montant_vat, 1);
+}
+if ($search_montant_ttc != '') {
+	$sql .= natural_search("p.total_ttc", $search_montant_ttc, 1);
+}
+if ($search_multicurrency_code != '') {
+	$sql .= ' AND p.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+}
+if ($search_multicurrency_tx != '') {
+	$sql .= natural_search('p.multicurrency_tx', $search_multicurrency_tx, 1);
+}
+if ($search_multicurrency_montant_ht != '') {
+	$sql .= natural_search('p.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
+}
+if ($search_multicurrency_montant_vat != '') {
+	$sql .= natural_search('p.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
+}
+if ($search_multicurrency_montant_ttc != '') {
+	$sql .= natural_search('p.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+}
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
-if ($search_categ_cus > 0)			$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
-if ($search_categ_cus == -2)		$sql .= " AND cc.fk_categorie IS NULL";
+if ($search_categ_cus > 0) {
+	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+}
+if ($search_categ_cus == -2) {
+	$sql .= " AND cc.fk_categorie IS NULL";
+}
 
-if ($search_fk_cond_reglement > 0) $sql .= " AND p.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
-if ($search_fk_shipping_method > 0) $sql .= " AND p.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
-if ($search_fk_mode_reglement > 0) $sql .= " AND p.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
+if ($search_fk_cond_reglement > 0) {
+	$sql .= " AND p.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
+}
+if ($search_fk_shipping_method > 0) {
+	$sql .= " AND p.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
+}
+if ($search_fk_mode_reglement > 0) {
+	$sql .= " AND p.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
+}
 
-if ($search_product_category > 0)	$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
-if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
-if ($search_status != '' && $search_status != '-1')
-{
+if ($search_product_category > 0) {
+	$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
+}
+if ($socid > 0) {
+	$sql .= ' AND s.rowid = '.$socid;
+}
+if ($search_status != '' && $search_status != '-1') {
 	$sql .= ' AND p.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
 }
-if ($search_date_start)             $sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";
-if ($search_date_end)               $sql .= " AND p.datep <= '".$db->idate($search_date_end)."'";
-if ($search_dateend_start)      	$sql .= " AND p.fin_validite >= '".$db->idate($search_dateend_start)."'";
-if ($search_dateend_end)            $sql .= " AND p.fin_validite <= '".$db->idate($search_dateend_end)."'";
-if ($search_datedelivery_start)     $sql .= " AND p.date_livraison >= '".$db->idate($search_datedelivery_start)."'";
-if ($search_datedelivery_end)       $sql .= " AND p.date_livraison <= '".$db->idate($search_datedelivery_end)."'";
-if ($search_sale > 0)				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
-if ($search_user > 0)
-{
+if ($search_date_start) {
+	$sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND p.datep <= '".$db->idate($search_date_end)."'";
+}
+if ($search_dateend_start) {
+	$sql .= " AND p.fin_validite >= '".$db->idate($search_dateend_start)."'";
+}
+if ($search_dateend_end) {
+	$sql .= " AND p.fin_validite <= '".$db->idate($search_dateend_end)."'";
+}
+if ($search_datedelivery_start) {
+	$sql .= " AND p.date_livraison >= '".$db->idate($search_datedelivery_start)."'";
+}
+if ($search_datedelivery_end) {
+	$sql .= " AND p.date_livraison <= '".$db->idate($search_datedelivery_end)."'";
+}
+if ($search_sale > 0) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
+}
+if ($search_user > 0) {
 	$sql .= " AND c.fk_c_type_contact = tc.rowid AND tc.element='propal' AND tc.source='internal' AND c.element_id = p.rowid AND c.fk_socpeople = ".$db->escape($search_user);
 }
 // Add where from extra fields
@@ -496,13 +597,11 @@ $sql .= ', p.ref DESC';
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -512,17 +611,17 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
 
-if ($resql)
-{
+if ($resql) {
 	$objectstatic = new Propal($db);
 	$userstatic = new User($db);
 
-	if ($socid > 0)
-	{
+	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfProposals').' - '.$soc->name;
-		if (empty($search_societe)) $search_societe = $soc->name;
+		if (empty($search_societe)) {
+			$search_societe = $soc->name;
+		}
 	} else {
 		$title = $langs->trans('ListOfProposals');
 	}
@@ -531,8 +630,7 @@ if ($resql)
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-	{
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 		$obj = $db->fetch_object($resql);
 
 		$id = $obj->rowid;
@@ -544,44 +642,120 @@ if ($resql)
 	llxHeader('', $langs->trans('Proposal'), $help_url);
 
 	$param = '&search_status='.urlencode($search_status);
-	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_date_start)				$param .= '&search_date_start='.urlencode($search_date_start);
-	if ($search_date_end)				$param .= '&search_date_end='.urlencode($search_date_end);
-	if ($search_dateend_start)			$param .= '&search_dateend_start='.urlencode($search_dateend_start);
-	if ($search_dateend_end)			$param .= '&search_dateend_end='.urlencode($search_dateend_end);
-	if ($search_datedelivery_start)		$param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
-	if ($search_datedelivery_end)		$param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);
-	if ($search_ref)         			$param .= '&search_ref='.urlencode($search_ref);
-	if ($search_refcustomer) 			$param .= '&search_refcustomer='.urlencode($search_refcustomer);
-	if ($search_refproject)  			$param .= '&search_refproject='.urlencode($search_refproject);
-	if ($search_societe)     			$param .= '&search_societe='.urlencode($search_societe);
-	if ($search_societe_alias)     		$param .= '&search_societe_alias='.urlencode($search_societe_alias);
-	if ($search_user > 0)    			$param .= '&search_user='.urlencode($search_user);
-	if ($search_sale > 0)    			$param .= '&search_sale='.urlencode($search_sale);
-	if ($search_montant_ht)  			$param .= '&search_montant_ht='.urlencode($search_montant_ht);
-	if ($search_multicurrency_code != '')  $param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
-	if ($search_multicurrency_tx != '')  $param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
-	if ($search_multicurrency_montant_ht != '')  $param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
-	if ($search_multicurrency_montant_vat != '')  $param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
-	if ($search_multicurrency_montant_ttc != '') $param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
-	if ($search_login)  	 			$param .= '&search_login='.urlencode($search_login);
-	if ($search_town)		 			$param .= '&search_town='.urlencode($search_town);
-	if ($search_zip)		 			$param .= '&search_zip='.urlencode($search_zip);
-	if ($socid > 0)          			$param .= '&socid='.urlencode($socid);
-	if ($optioncss != '')    			$param .= '&optioncss='.urlencode($optioncss);
-	if ($search_categ_cus > 0)          $param .= '&search_categ_cus='.urlencode($search_categ_cus);
-	if ($search_product_category != '') $param .= '&search_product_category='.$search_product_category;
-	if ($search_fk_cond_reglement > 0) $param .= '&search_fk_cond_reglement='.$search_fk_cond_reglement;
-	if ($search_fk_shipping_method > 0) $param .= '&search_fk_shipping_method='.$search_fk_shipping_method;
-	if ($search_fk_mode_reglement > 0) $param .= '&search_fk_mode_reglement='.$search_fk_mode_reglement;
-	if ($search_type_thirdparty > 0) $param .= '&search_type_thirdparty='.$search_type_thirdparty;
-	if ($search_town)					$param .= '&search_town='.$search_town;
-	if ($search_zip)					$param .= '&search_zip='.$search_zip;
-	if ($search_state)					$param .= '&search_state='.$search_state;
-	if ($search_town)					$param .= '&search_town='.$search_town;
-	if ($search_country)					$param .= '&search_country='.$search_country;
+	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_date_start) {
+		$param .= '&search_date_start='.urlencode($search_date_start);
+	}
+	if ($search_date_end) {
+		$param .= '&search_date_end='.urlencode($search_date_end);
+	}
+	if ($search_dateend_start) {
+		$param .= '&search_dateend_start='.urlencode($search_dateend_start);
+	}
+	if ($search_dateend_end) {
+		$param .= '&search_dateend_end='.urlencode($search_dateend_end);
+	}
+	if ($search_datedelivery_start) {
+		$param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
+	}
+	if ($search_datedelivery_end) {
+		$param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_refcustomer) {
+		$param .= '&search_refcustomer='.urlencode($search_refcustomer);
+	}
+	if ($search_refproject) {
+		$param .= '&search_refproject='.urlencode($search_refproject);
+	}
+	if ($search_societe) {
+		$param .= '&search_societe='.urlencode($search_societe);
+	}
+	if ($search_societe_alias) {
+		$param .= '&search_societe_alias='.urlencode($search_societe_alias);
+	}
+	if ($search_user > 0) {
+		$param .= '&search_user='.urlencode($search_user);
+	}
+	if ($search_sale > 0) {
+		$param .= '&search_sale='.urlencode($search_sale);
+	}
+	if ($search_montant_ht) {
+		$param .= '&search_montant_ht='.urlencode($search_montant_ht);
+	}
+	if ($search_multicurrency_code != '') {
+		$param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
+	}
+	if ($search_multicurrency_tx != '') {
+		$param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
+	}
+	if ($search_multicurrency_montant_ht != '') {
+		$param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
+	}
+	if ($search_multicurrency_montant_vat != '') {
+		$param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
+	}
+	if ($search_multicurrency_montant_ttc != '') {
+		$param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
+	}
+	if ($search_login) {
+		$param .= '&search_login='.urlencode($search_login);
+	}
+	if ($search_town) {
+		$param .= '&search_town='.urlencode($search_town);
+	}
+	if ($search_zip) {
+		$param .= '&search_zip='.urlencode($search_zip);
+	}
+	if ($socid > 0) {
+		$param .= '&socid='.urlencode($socid);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
+	if ($search_categ_cus > 0) {
+		$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	}
+	if ($search_product_category != '') {
+		$param .= '&search_product_category='.$search_product_category;
+	}
+	if ($search_fk_cond_reglement > 0) {
+		$param .= '&search_fk_cond_reglement='.$search_fk_cond_reglement;
+	}
+	if ($search_fk_shipping_method > 0) {
+		$param .= '&search_fk_shipping_method='.$search_fk_shipping_method;
+	}
+	if ($search_fk_mode_reglement > 0) {
+		$param .= '&search_fk_mode_reglement='.$search_fk_mode_reglement;
+	}
+	if ($search_type_thirdparty > 0) {
+		$param .= '&search_type_thirdparty='.$search_type_thirdparty;
+	}
+	if ($search_town) {
+		$param .= '&search_town='.$search_town;
+	}
+	if ($search_zip) {
+		$param .= '&search_zip='.$search_zip;
+	}
+	if ($search_state) {
+		$param .= '&search_state='.$search_state;
+	}
+	if ($search_town) {
+		$param .= '&search_town='.$search_town;
+	}
+	if ($search_country) {
+		$param .= '&search_country='.$search_country;
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -595,18 +769,28 @@ if ($resql)
 		'presign'=>$langs->trans("Sign"),
 		'nopresign'=>$langs->trans("NoSign"),
 	);
-	if ($user->rights->propal->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if ($user->rights->propal->cloturer) $arrayofmassactions['closed'] = $langs->trans("Close");
-	if (in_array($massaction, array('presend', 'predelete', 'closed'))) $arrayofmassactions = array();
+	if ($user->rights->propal->supprimer) {
+		$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	}
+	if ($user->rights->propal->cloturer) {
+		$arrayofmassactions['closed'] = $langs->trans("Close");
+	}
+	if (in_array($massaction, array('presend', 'predelete', 'closed'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$url = DOL_URL_ROOT.'/comm/propal/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewPropal'), '', 'fa fa-plus-circle', $url, '', $user->rights->propal->creer);
 
 	// Fields title search
 	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">';
@@ -622,24 +806,22 @@ if ($resql)
 	$trackid = 'pro'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($massaction == 'prevalidate')
-	{
+	if ($massaction == 'prevalidate') {
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassValidation"), $langs->trans("ConfirmMassValidationQuestion"), "validate", null, '', 0, 200, 500, 1);
 	}
 
-	if ($massaction == 'presign')
-	{
+	if ($massaction == 'presign') {
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassSignature"), $langs->trans("ConfirmMassSignatureQuestion"), "sign", null, '', 0, 200, 500, 1);
 	}
 
-	if ($massaction == 'nopresign')
-	{
+	if ($massaction == 'nopresign') {
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassNoSignature"), $langs->trans("ConfirmMassNoSignatureQuestion"), "nosign", null, '', 0, 200, 500, 1);
 	}
 
-	if ($sall)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
@@ -648,8 +830,7 @@ if ($resql)
 	$moreforfilter = '';
 
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid)
-	{
+	if ($user->rights->societe->client->voir || $socid) {
 		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
@@ -657,16 +838,14 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid)
-	{
+	if ($user->rights->societe->client->voir || $socid) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
 		$moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
@@ -674,8 +853,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
@@ -684,11 +862,13 @@ if ($resql)
 	}
 	$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))
-	{
+	if (!empty($moreforfilter)) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
@@ -702,69 +882,63 @@ if ($resql)
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['p.ref']['checked']))
-	{
+	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.ref_client']['checked']))
-	{
+	if (!empty($arrayfields['p.ref_client']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['pr.ref']['checked']))
-	{
+	if (!empty($arrayfields['pr.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_refproject" value="'.dol_escape_htmltag($search_refproject).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['pr.title']['checked']))
-	{
+	if (!empty($arrayfields['pr.title']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_project" value="'.dol_escape_htmltag($search_project).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat maxwidth100" type="text" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['s.name_alias']['checked']))
-	{
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat maxwidth100" type="text" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
+	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 		print '</td>';
 	}
 	// Company type
-	if (!empty($arrayfields['typent.code']['checked']))
-	{
+	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidth100onsmartphone" align="center">';
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print ajax_combobox('search_type_thirdparty');
 		print '</td>';
 	}
 	// Date
-	if (!empty($arrayfields['p.date']['checked']))
-	{
+	if (!empty($arrayfields['p.date']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -775,8 +949,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date end
-	if (!empty($arrayfields['p.fin_validite']['checked']))
-	{
+	if (!empty($arrayfields['p.fin_validite']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -787,8 +960,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date delivery
-	if (!empty($arrayfields['p.date_livraison']['checked']))
-	{
+	if (!empty($arrayfields['p.date_livraison']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -799,123 +971,105 @@ if ($resql)
 		print '</td>';
 	}
 	// Availability
-	if (!empty($arrayfields['ava.rowid']['checked']))
-	{
+	if (!empty($arrayfields['ava.rowid']['checked'])) {
 		print '<td class="liste_titre maxwidth100onsmartphone center">';
 		$form->selectAvailabilityDelay($search_availability, 'search_availability', '', 1);
 		print ajax_combobox('search_availability');
 		print '</td>';
 	}
 	// Shipping Method
-	if (!empty($arrayfields['p.fk_shipping_method']['checked']))
-	{
+	if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
 		print '</td>';
 	}
 	// Payment term
-	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
-	{
+	if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1, 1);
 		print '</td>';
 	}
 	// Payment mode
-	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
-	{
+	if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.total_ht']['checked']))
-	{
+	if (!empty($arrayfields['p.total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.total_tva']['checked']))
-	{
+	if (!empty($arrayfields['p.total_tva']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['p.total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.total_ht_invoiced']['checked']))
-	{
+	if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
 		// Amount invoiced
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.total_invoiced']['checked']))
-	{
+	if (!empty($arrayfields['p.total_invoiced']['checked'])) {
 		// Amount invoiced
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.multicurrency_code']['checked']))
-	{
+	if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
 		// Currency
 		print '<td class="liste_titre">';
 		print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.multicurrency_tx']['checked']))
-	{
+	if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
 		// Currency rate
 		print '<td class="liste_titre">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_tx" value="'.dol_escape_htmltag($search_multicurrency_tx).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.multicurrency_total_ht']['checked']))
-	{
+	if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ht" value="'.dol_escape_htmltag($search_multicurrency_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.multicurrency_total_tva']['checked']))
-	{
+	if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_vat" value="'.dol_escape_htmltag($search_multicurrency_montant_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.multicurrency_total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked']))
-	{
+	if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
 		// Amount invoiced
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked']))
-	{
+	if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
 		// Amount invoiced
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['u.login']['checked']))
-	{
+	if (!empty($arrayfields['u.login']['checked'])) {
 		// Author
 		print '<td class="liste_titre" align="center">';
 		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['sale_representative']['checked']))
-	{
+	if (!empty($arrayfields['sale_representative']['checked'])) {
 		print '<td class="liste_titre"></td>';
 	}
 	// Extra fields
@@ -926,38 +1080,32 @@ if ($resql)
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['p.datec']['checked']))
-	{
+	if (!empty($arrayfields['p.datec']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['p.tms']['checked']))
-	{
+	if (!empty($arrayfields['p.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date cloture
-	if (!empty($arrayfields['p.date_cloture']['checked']))
-	{
+	if (!empty($arrayfields['p.date_cloture']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.note_public']['checked']))
-	{
+	if (!empty($arrayfields['p.note_public']['checked'])) {
 		// Note public
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['p.note_private']['checked']))
-	{
+	if (!empty($arrayfields['p.note_private']['checked'])) {
 		// Note private
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['p.fk_statut']['checked']))
-	{
+	if (!empty($arrayfields['p.fk_statut']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone right">';
 		$formpropal->selectProposalStatus($search_status, 1, 0, 1, 'customer', 'search_statut');
 		print '</td>';
@@ -973,50 +1121,126 @@ if ($resql)
 
 	// Fields title
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['p.ref']['checked']))            	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.ref_client']['checked']))     	print_liste_field_titre($arrayfields['p.ref_client']['label'], $_SERVER["PHP_SELF"], 'p.ref_client', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['pr.ref']['checked']))				print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['pr.title']['checked']))         	print_liste_field_titre($arrayfields['pr.title']['label'], $_SERVER["PHP_SELF"], 'pr.title', '', $param, '', $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['s.name_alias']['checked']))        print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.town']['checked']))           	print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.zip']['checked']))            	print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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['typent.code']['checked']))      	print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.date']['checked']))           	print_liste_field_titre($arrayfields['p.date']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.fin_validite']['checked']))		print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.date_livraison']['checked']))	print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'ddelivery', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['ava.rowid']['checked']))			print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.fk_cond_reglement']['checked']))		print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.fk_mode_reglement']['checked']))		print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.total_ht']['checked']))			print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.total_tva']['checked']))			print_liste_field_titre($arrayfields['p.total_tva']['label'], $_SERVER["PHP_SELF"], 'p.total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.total_ttc']['checked']))			print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.total_invoiced']['checked']))	print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.multicurrency_code']['checked']))      print_liste_field_titre($arrayfields['p.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_code', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.multicurrency_tx']['checked']))        print_liste_field_titre($arrayfields['p.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.multicurrency_total_ht']['checked']))  print_liste_field_titre($arrayfields['p.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) print_liste_field_titre($arrayfields['p.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) print_liste_field_titre($arrayfields['p.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) print_liste_field_titre($arrayfields['p.multicurrency_total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked']))	print_liste_field_titre($arrayfields['p.multicurrency_total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['u.login']['checked']))				print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['sale_representative']['checked']))	print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.ref_client']['checked'])) {
+		print_liste_field_titre($arrayfields['p.ref_client']['label'], $_SERVER["PHP_SELF"], 'p.ref_client', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['pr.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], 'pr.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['pr.title']['checked'])) {
+		print_liste_field_titre($arrayfields['pr.title']['label'], $_SERVER["PHP_SELF"], 'pr.title', '', $param, '', $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['s.name_alias']['checked'])) {
+		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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['typent.code']['checked'])) {
+		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.date']['checked'])) {
+		print_liste_field_titre($arrayfields['p.date']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.fin_validite']['checked'])) {
+		print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.date_livraison']['checked'])) {
+		print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'ddelivery', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['ava.rowid']['checked'])) {
+		print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
+		print_liste_field_titre($arrayfields['p.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "p.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['p.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['p.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "p.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['p.total_ht']['label'], $_SERVER["PHP_SELF"], 'p.total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.total_tva']['checked'])) {
+		print_liste_field_titre($arrayfields['p.total_tva']['label'], $_SERVER["PHP_SELF"], 'p.total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['p.total_ttc']['label'], $_SERVER["PHP_SELF"], 'p.total', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
+		print_liste_field_titre($arrayfields['p.total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.total_invoiced']['checked'])) {
+		print_liste_field_titre($arrayfields['p.total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
+		print_liste_field_titre($arrayfields['p.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
+		print_liste_field_titre($arrayfields['p.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['p.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
+		print_liste_field_titre($arrayfields['p.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['p.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'p.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
+		print_liste_field_titre($arrayfields['p.multicurrency_total_ht_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
+		print_liste_field_titre($arrayfields['p.multicurrency_total_invoiced']['label'], $_SERVER["PHP_SELF"], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['u.login']['checked'])) {
+		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['sale_representative']['checked'])) {
+		print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER["PHP_SELF"], "", "", "$param", '', $sortfield, $sortorder);
+	}
 	// 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); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (!empty($arrayfields['p.datec']['checked']))     		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.tms']['checked']))       		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.date_cloture']['checked']))		print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.note_public']['checked']))       print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['p.note_private']['checked']))      print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['p.fk_statut']['checked']))			print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['p.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['p.tms']['label'], $_SERVER["PHP_SELF"], "p.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.date_cloture']['checked'])) {
+		print_liste_field_titre($arrayfields['p.date_cloture']['label'], $_SERVER["PHP_SELF"], "p.date_cloture", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.note_public']['checked'])) {
+		print_liste_field_titre($arrayfields['p.note_public']['label'], $_SERVER["PHP_SELF"], "p.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['p.note_private']['checked'])) {
+		print_liste_field_titre($arrayfields['p.note_private']['label'], $_SERVER["PHP_SELF"], "p.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['p.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print '</tr>'."\n";
 
@@ -1025,8 +1249,7 @@ if ($resql)
 	$totalarray = array();
 	$typenArray = null;
 
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->rowid;
@@ -1054,14 +1277,14 @@ if ($resql)
 
 		$TInvoiceData = $objectstatic->InvoiceArrayList($obj->rowid);
 
-		if (!empty($TInvoiceData))
-		{
-			foreach ($TInvoiceData as $invoiceData)
-			{
+		if (!empty($TInvoiceData)) {
+			foreach ($TInvoiceData as $invoiceData) {
 				$invoice = new Facture($db);
 				$invoice->fetch($invoiceData->facid);
 
-				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $invoice->type == Facture::TYPE_DEPOSIT) continue;
+				if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS) && $invoice->type == Facture::TYPE_DEPOSIT) {
+					continue;
+				}
 
 				$totalInvoicedHT += $invoice->total_ht;
 				$totalInvoicedTTC += $invoice->total_ttc;
@@ -1072,8 +1295,7 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 
-		if (!empty($arrayfields['p.ref']['checked']))
-		{
+		if (!empty($arrayfields['p.ref']['checked'])) {
 			print '<td class="nowraponall">';
 
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
@@ -1083,9 +1305,10 @@ if ($resql)
 			print '</td>';
 			// Warning
 			$warnornote = '';
-			if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) $warnornote .= img_warning($langs->trans("Late"));
-			if ($warnornote)
-			{
+			if ($obj->status == Propal::STATUS_VALIDATED && $db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
+				$warnornote .= img_warning($langs->trans("Late"));
+			}
+			if ($warnornote) {
 				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
 				print $warnornote;
 				print '</td>';
@@ -1099,271 +1322,315 @@ if ($resql)
 			print '</td></tr></table>';
 
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
-		if (!empty($arrayfields['p.ref_client']['checked']))
-		{
+		if (!empty($arrayfields['p.ref_client']['checked'])) {
 			// Customer ref
 			print '<td class="nowrap tdoverflowmax200">';
 			print $obj->ref_client;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
-		if (!empty($arrayfields['pr.ref']['checked']))
-		{
+		if (!empty($arrayfields['pr.ref']['checked'])) {
 			// Project ref
 			print '<td class="nowrap">';
 			if ($obj->project_id > 0) {
 				print $projectstatic->getNomUrl(1);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
-		if (!empty($arrayfields['pr.title']['checked']))
-		{
+		if (!empty($arrayfields['pr.title']['checked'])) {
 			// Project label
 			print '<td class="nowrap">';
 			if ($obj->project_id > 0) {
 				print $projectstatic->title;
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Thirdparty
-		if (!empty($arrayfields['s.nom']['checked']))
-		{
+		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax200">';
 			print $companystatic->getNomUrl(1, 'customer');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Alias
-		if (!empty($arrayfields['s.name_alias']['checked']))
-		{
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
 			print '<td class="tdoverflowmax200">';
 			print $obj->alias;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Town
-		if (!empty($arrayfields['s.town']['checked']))
-		{
+		if (!empty($arrayfields['s.town']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->town;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Zip
-		if (!empty($arrayfields['s.zip']['checked']))
-		{
+		if (!empty($arrayfields['s.zip']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->zip;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// State
-		if (!empty($arrayfields['state.nom']['checked']))
-		{
+		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']))
-		{
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
 			$tmparray = getCountry($obj->fk_pays, 'all');
 			print $tmparray['label'];
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Type ent
-		if (!empty($arrayfields['typent.code']['checked']))
-		{
-			if (!is_array($typenArray) || empty($typenArray)) $typenArray = $formcompany->typent_array(1);
+		if (!empty($arrayfields['typent.code']['checked'])) {
+			if (!is_array($typenArray) || empty($typenArray)) {
+				$typenArray = $formcompany->typent_array(1);
+			}
 
 			print '<td class="center">';
 			print $typenArray[$obj->typent_code];
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Date proposal
-		if (!empty($arrayfields['p.date']['checked']))
-		{
+		if (!empty($arrayfields['p.date']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->dp), 'day');
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Date end validity
-		if (!empty($arrayfields['p.fin_validite']['checked']))
-		{
-			if ($obj->dfv)
-			{
+		if (!empty($arrayfields['p.fin_validite']['checked'])) {
+			if ($obj->dfv) {
 				print '<td class="center">'.dol_print_date($db->jdate($obj->dfv), 'day');
 				print '</td>';
 			} else {
 				print '<td>&nbsp;</td>';
 			}
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date delivery
-		if (!empty($arrayfields['p.date_livraison']['checked']))
-		{
-			if ($obj->ddelivery)
-			{
+		if (!empty($arrayfields['p.date_livraison']['checked'])) {
+			if ($obj->ddelivery) {
 				print '<td class="center">'.dol_print_date($db->jdate($obj->ddelivery), 'day');
 				print '</td>';
 			} else {
 				print '<td>&nbsp;</td>';
 			}
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Availability
-		if (!empty($arrayfields['ava.rowid']['checked']))
-		{
+		if (!empty($arrayfields['ava.rowid']['checked'])) {
 			print '<td class="center">';
 			$form->form_availability('', $obj->availability, 'none', 1);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		//Shipping Method
-		if (!empty($arrayfields['p.fk_shipping_method']['checked']))
-		{
+		if (!empty($arrayfields['p.fk_shipping_method']['checked'])) {
 			print '<td>';
 			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Payment terms
-		if (!empty($arrayfields['p.fk_cond_reglement']['checked']))
-		{
+		if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
 			print '<td>';
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Payment mode
-		if (!empty($arrayfields['p.fk_mode_reglement']['checked']))
-		{
+		if (!empty($arrayfields['p.fk_mode_reglement']['checked'])) {
 			print '<td>';
 			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount HT
-		if (!empty($arrayfields['p.total_ht']['checked']))
-		{
+		if (!empty($arrayfields['p.total_ht']['checked'])) {
 			print '<td class="nowrap right">'.price($obj->total_ht)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht';
+			}
 			$totalarray['val']['p.total_ht'] += $obj->total_ht;
 		}
 		// Amount VAT
-		if (!empty($arrayfields['p.total_tva']['checked']))
-		{
+		if (!empty($arrayfields['p.total_tva']['checked'])) {
 			print '<td class="nowrap right">'.price($obj->total_tva)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_tva';
+			}
 			$totalarray['val']['p.total_tva'] += $obj->total_tva;
 		}
 		// Amount TTC
-		if (!empty($arrayfields['p.total_ttc']['checked']))
-		{
+		if (!empty($arrayfields['p.total_ttc']['checked'])) {
 			print '<td class="nowrap right">'.price($obj->total_ttc)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ttc';
+			}
 			$totalarray['val']['p.total_ttc'] += $obj->total_ttc;
 		}
 		// Amount invoiced
-		if (!empty($arrayfields['p.total_ht_invoiced']['checked']))
-		{
+		if (!empty($arrayfields['p.total_ht_invoiced']['checked'])) {
 			print '<td class="nowrap right">'.price($totalInvoicedHT)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_ht_invoiced';
+			}
 			$totalarray['val']['p.total_ht_invoiced'] += $totalInvoicedHT;
 		}
 		// Amount invoiced
-		if (!empty($arrayfields['p.total_invoiced']['checked']))
-		{
+		if (!empty($arrayfields['p.total_invoiced']['checked'])) {
 			print '<td class="nowrap right">'.price($totalInvoicedTTC)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'p.total_invoiced';
+			}
 			$totalarray['val']['p.total_invoiced'] += $totalInvoicedTTC;
 		}
 		// Currency
-		if (!empty($arrayfields['p.multicurrency_code']['checked']))
-		{
+		if (!empty($arrayfields['p.multicurrency_code']['checked'])) {
 			print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Currency rate
-		if (!empty($arrayfields['p.multicurrency_tx']['checked']))
-		{
+		if (!empty($arrayfields['p.multicurrency_tx']['checked'])) {
 			print '<td class="nowrap">';
 			$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount HT
-		if (!empty($arrayfields['p.multicurrency_total_ht']['checked']))
-		{
+		if (!empty($arrayfields['p.multicurrency_total_ht']['checked'])) {
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount VAT
-		if (!empty($arrayfields['p.multicurrency_total_tva']['checked']))
-		{
+		if (!empty($arrayfields['p.multicurrency_total_tva']['checked'])) {
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_tva)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount TTC
-		if (!empty($arrayfields['p.multicurrency_total_ttc']['checked']))
-		{
+		if (!empty($arrayfields['p.multicurrency_total_ttc']['checked'])) {
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount invoiced
-		if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked']))
-		{
+		if (!empty($arrayfields['p.multicurrency_total_ht_invoiced']['checked'])) {
 			print '<td class="nowrap right">'.price($multicurrency_totalInvoicedHT)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount invoiced
-		if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked']))
-		{
+		if (!empty($arrayfields['p.multicurrency_total_invoiced']['checked'])) {
 			print '<td class="nowrap right">'.price($multicurrency_totalInvoicedTTC)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		$userstatic->id = $obj->fk_user_author;
 		$userstatic->login = $obj->login;
 
 		// Author
-		if (!empty($arrayfields['u.login']['checked']))
-		{
+		if (!empty($arrayfields['u.login']['checked'])) {
 			print '<td class="center nowraponall">';
-			if ($userstatic->id) print $userstatic->getLoginUrl(1);
+			if ($userstatic->id) {
+				print $userstatic->getLoginUrl(1);
+			}
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
-		if (!empty($arrayfields['sale_representative']['checked']))
-		{
+		if (!empty($arrayfields['sale_representative']['checked'])) {
 			// Sales representatives
 			print '<td>';
-			if ($obj->socid > 0)
-			{
+			if ($obj->socid > 0) {
 				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
-				if ($listsalesrepresentatives < 0) dol_print_error($db);
+				if ($listsalesrepresentatives < 0) {
+					dol_print_error($db);
+				}
 				$nbofsalesrepresentative = count($listsalesrepresentatives);
 				if ($nbofsalesrepresentative > 6) {
 					// We print only number
@@ -1397,7 +1664,9 @@ if ($resql)
 				print '&nbsp;';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Extra fields
@@ -1407,61 +1676,70 @@ if ($resql)
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
-		if (!empty($arrayfields['p.datec']['checked']))
-		{
+		if (!empty($arrayfields['p.datec']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			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['p.tms']['checked']))
-		{
+		if (!empty($arrayfields['p.tms']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date cloture
-		if (!empty($arrayfields['p.date_cloture']['checked']))
-		{
+		if (!empty($arrayfields['p.date_cloture']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Note public
-		if (!empty($arrayfields['p.note_public']['checked']))
-		{
+		if (!empty($arrayfields['p.note_public']['checked'])) {
 			print '<td class="center">';
 			print dol_escape_htmltag($obj->note_public);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Note private
-		if (!empty($arrayfields['p.note_private']['checked']))
-		{
+		if (!empty($arrayfields['p.note_private']['checked'])) {
 			print '<td class="center">';
 			print dol_escape_htmltag($obj->note_private);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Status
-		if (!empty($arrayfields['p.fk_statut']['checked']))
-		{
+		if (!empty($arrayfields['p.fk_statut']['checked'])) {
 			print '<td class="nowrap right">'.$objectstatic->getLibStatut(5).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Action column
 		print '<td class="nowrap" align="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->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";
 
@@ -1483,7 +1761,9 @@ if ($resql)
 	print '</form>'."\n";
 
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	// Show list of available documents
 	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 8937e562227..8c1e16dc6e8 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -41,7 +41,9 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'propale', $id, 'propal');
 
 $object = new Propal($db);
@@ -67,16 +69,15 @@ llxHeader('', $langs->trans('Proposal'), $help_url);
 
 $form = new Form($db);
 
-if ($id > 0 || !empty($ref))
-{
-	if ($mesg) print $mesg;
+if ($id > 0 || !empty($ref)) {
+	if ($mesg) {
+		print $mesg;
+	}
 
 	$now = dol_now();
 
-	if ($object->fetch($id, $ref) > 0)
-	{
-		if ($object->fetch_thirdparty() > 0)
-		{
+	if ($object->fetch($id, $ref) > 0) {
+		if ($object->fetch_thirdparty() > 0) {
 			$head = propal_prepare_head($object);
 			print dol_get_fiche_head($head, 'note', $langs->trans('Proposal'), -1, 'propal');
 
@@ -97,12 +98,10 @@ if ($id > 0 || !empty($ref))
 			// Thirdparty
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->projet->enabled))
-			{
+			if (!empty($conf->projet->enabled)) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-				if ($user->rights->propal->creer)
-				{
+				if ($user->rights->propal->creer) {
 					if ($action != 'classify') {
 						//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
 						$morehtmlref .= ' : ';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index c28da3ed048..326299448f7 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -38,8 +38,12 @@ $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 $mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
-if ($mode == 'customer' && !$user->rights->propale->lire) accessforbidden();
-if ($mode == 'supplier' && !$user->rights->supplier_proposal->lire) accessforbidden();
+if ($mode == 'customer' && !$user->rights->propale->lire) {
+	accessforbidden();
+}
+if ($mode == 'supplier' && !$user->rights->supplier_proposal->lire) {
+	accessforbidden();
+}
 
 $object_status = GETPOST('object_status', 'intcomma');
 $typent_id = GETPOST('typent_id', 'int');
@@ -48,8 +52,7 @@ $categ_id = GETPOST('categ_id', 'categ_id');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -75,16 +78,14 @@ $formother = new FormOther($db);
 
 $langs->loadLangs(array('propal', 'other', 'companies'));
 
-if ($mode == 'customer')
-{
+if ($mode == 'customer') {
 	$picto = 'propal';
 	$title = $langs->trans("ProposalsStatistics");
 	$dir = $conf->propale->dir_temp;
 	$cat_type = Categorie::TYPE_CUSTOMER;
 	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
 }
-if ($mode == 'supplier')
-{
+if ($mode == 'supplier') {
 	$picto = 'supplier_proposal';
 	$title = $langs->trans("ProposalsStatisticsSuppliers");
 	$dir = $conf->supplier_proposal->dir_temp;
@@ -101,15 +102,16 @@ dol_mkdir($dir);
 
 
 $stats = new PropaleStats($db, $socid, ($userid > 0 ? $userid : 0), $mode, ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
-if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND p.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+if ($object_status != '' && $object_status >= 0) {
+	$stats->where .= ' AND p.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+}
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filenamenb = $dir.'/proposalsnbinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -119,12 +121,10 @@ if (!$user->rights->societe->client->voir || $user->socid)
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -146,8 +146,7 @@ if (!$mesg)
 $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, 0);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filenameamount = $dir.'/proposalsamountinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&file=proposalsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -157,12 +156,10 @@ if (!$user->rights->societe->client->voir || $user->socid)
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px2->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -183,25 +180,30 @@ if (!$mesg)
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 $fileurl_avg = '';
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
 } else {
 	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	}
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px3->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -228,7 +230,9 @@ foreach ($data as $val) {
 		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 
 $h = 0;
@@ -264,7 +268,9 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
 	$sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 	print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
-	if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+if ($user->admin) {
+	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+}
 	print '</td></tr>';
 	// Category
 	print '<tr><td>'.$cat_label.'</td><td>';
@@ -280,8 +286,12 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '</td></tr>';
 	// Year
 	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
-	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 	arsort($arrayyears);
 	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';
@@ -304,11 +314,9 @@ print '<td class="right">%</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	$year = $val['year'];
-	while (!empty($year) && $oldyear > $year + 1)
-	{	// If we have empty year
+	while (!empty($year) && $oldyear > $year + 1) {	// If we have empty year
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
@@ -341,7 +349,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index 300b35cc868..23c1a459c74 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -44,16 +44,16 @@ $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1)
 
 $total = 0;
 $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
 	print '<td class="linkedcol-element" >'.$langs->trans("Proposal");
-	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)
-	{
+	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
 		$url = DOL_URL_ROOT.'/comm/propal/card.php?id='.$objectlink->id;
 		print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
 	}
@@ -71,8 +71,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
 	print "</tr>\n";
 }
-if (count($linkedObjectBlock) > 1)
-{
+if (count($linkedObjectBlock) > 1) {
 	print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
 	print '<td>'.$langs->trans("Total").'</td>';
 	print '<td></td>';
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index a9681f199da..ea44682b4a3 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -36,7 +36,6 @@ if ($user->socid > 0) {
 }
 
 
-
 /*
  *	View
  */
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index 1acf2cbf218..655dda87d0d 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -28,32 +28,31 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'other'));
-if (!empty($conf->facture->enabled)) $langs->load("bills");
+if (!empty($conf->facture->enabled)) {
+	$langs->load("bills");
+}
 
 // Security check
 $socid = $_GET["socid"];
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
 
 
-
 /*
  *	View
  */
 
 llxHeader();
 
-if ($socid > 0)
-{
+if ($socid > 0) {
 	$societe = new Societe($db);
 	$societe->fetch($socid);
 
 	/*
-     * Affichage onglets
-     */
+	 * Affichage onglets
+	 */
 	$head = societe_prepare_head($societe);
 
 	print dol_get_fiche_head($head, 'prospect', $langs->trans("ThirdParty"), 0, 'company');
@@ -68,8 +67,7 @@ if ($socid > 0)
 	print '<tr><td width="20%">'.$langs->trans("Thirdpary").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
 	// Prefix
-	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
 		print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
 		print '</td></tr>';
@@ -84,7 +82,7 @@ if ($socid > 0)
 
 	print $langs->trans("FeatureNotYetAvailable");
 } else {
-  	dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index 254305a9443..6e82cc16c19 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -28,12 +28,13 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 // Load translation files required by the page
 $langs->load("companies");
-if (!empty($conf->facture->enabled)) $langs->load("bills");
+if (!empty($conf->facture->enabled)) {
+	$langs->load("bills");
+}
 
 // Security check
 $socid = $_GET["socid"];
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -46,14 +47,13 @@ if ($user->socid > 0)
 
 llxHeader();
 
-if ($socid > 0)
-{
+if ($socid > 0) {
 	$societe = new Societe($db);
 	$societe->fetch($socid);
 
 	/*
-     * Affichage onglets
-     */
+	 * Affichage onglets
+	 */
 	$head = societe_prepare_head($societe);
 
 	print dol_get_fiche_head($head, 'customer', $langs->trans("ThirdParty"), 0, 'company');
@@ -68,8 +68,7 @@ if ($socid > 0)
 	print '<tr><td width="20%">'.$langs->trans("ThirdParty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
 
 	// Prefix
-	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td>'.$langs->trans("Prefix").'</td><td colspan="3">';
 		print ($societe->prefix_comm ? $societe->prefix_comm : '&nbsp;');
 		print '</td></tr>';
@@ -84,7 +83,7 @@ if ($socid > 0)
 
 	print $langs->trans("FeatureNotYetAvailable");
 } else {
-  	dol_print_error($db);
+	dol_print_error($db);
 }
 
 // End of page
diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php
index e93944d4fbe..541983775a7 100644
--- a/htdocs/comm/remise.php
+++ b/htdocs/comm/remise.php
@@ -33,8 +33,7 @@ $id = GETPOST("id", 'int');
 
 $socid = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
@@ -45,14 +44,12 @@ $backtopage = GETPOST('backtopage', 'alpha');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-{
+if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 	 header("Location: ".$backtopage);
 	 exit;
 }
 
-if (GETPOST('action', 'aZ09') == 'setremise')
-{
+if (GETPOST('action', 'aZ09') == 'setremise') {
 	$object = new Societe($db);
 	$object->fetch($id);
 
@@ -64,10 +61,8 @@ if (GETPOST('action', 'aZ09') == 'setremise')
 		$result = $object->set_remise_client(price2num(GETPOST("remise")), GETPOST("note", "alphanohtml"), $user);
 	}
 
-	if ($result > 0)
-	{
-		if (!empty($backtopage))
-		{
+	if ($result > 0) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		} else {
@@ -94,8 +89,7 @@ llxHeader();
  * Mode fiche
  *
  *********************************************************************************/
-if ($socid > 0)
-{
+if ($socid > 0) {
 	// On recupere les donnees societes par l'objet
 	$object = new Societe($db);
 	$object->fetch($socid);
@@ -154,18 +148,17 @@ if ($socid > 0)
 
 	/*if (! ($isCustomer && $isSupplier))
 	{
-	    if ($isCustomer && ! $isSupplier) {
-	        print '<input type="hidden" name="discount_type" value="0" />';
-	    }
-	    if (! $isCustomer && $isSupplier) {
-	        print '<input type="hidden" name="discount_type" value="1" />';
-	    }
+		if ($isCustomer && ! $isSupplier) {
+			print '<input type="hidden" name="discount_type" value="0" />';
+		}
+		if (! $isCustomer && $isSupplier) {
+			print '<input type="hidden" name="discount_type" value="1" />';
+		}
 	}*/
 
 	print '<table class="border centpercent">';
 
-	if ($isCustomer || $isSupplier)
-	{
+	if ($isCustomer || $isSupplier) {
 		// Discount type
 		print '<tr><td class="titlefield fieldrequired">'.$langs->trans('DiscountType').'</td><td>';
 		if ($isCustomer) {
@@ -193,8 +186,7 @@ if ($socid > 0)
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-	if (!empty($backtopage))
-	{
+	if (!empty($backtopage)) {
 		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	}
@@ -223,8 +215,7 @@ if ($socid > 0)
 		$sql .= " ORDER BY rc.datec DESC";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			print '<table class="noborder centpercent">';
 			$tag = !$tag;
 			print '<tr class="liste_titre">';
@@ -234,11 +225,9 @@ if ($socid > 0)
 			print '<td class="center">'.$langs->trans("User").'</td>';
 			print '</tr>';
 			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
 					print '<tr class="oddeven">';
 					print '<td>'.dol_print_date($db->jdate($obj->dc), "dayhour").'</td>';
@@ -278,8 +267,7 @@ if ($socid > 0)
 		$sql .= " ORDER BY rc.datec DESC";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			print '<table class="noborder centpercent">';
 			$tag = !$tag;
 			print '<tr class="liste_titre">';
@@ -289,11 +277,9 @@ if ($socid > 0)
 			print '<td class="center">'.$langs->trans("User").'</td>';
 			print '</tr>';
 			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
 					print '<tr class="oddeven">';
 					print '<td>'.dol_print_date($db->jdate($obj->dc), "dayhour").'</td>';
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index e2900858c84..98ada17e54f 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -40,8 +40,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 // Security check
 $socid = GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
@@ -50,14 +49,12 @@ if ($user->socid > 0)
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-{
+if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 	 header("Location: ".$backtopage);
 	 exit;
 }
 
-if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
-{
+if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes') {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
 
@@ -70,23 +67,19 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 	$remid = (GETPOST("remid", 'int') ? GETPOST("remid", 'int') : 0);
 	$discount = new DiscountAbsolute($db);
 	$res = $discount->fetch($remid);
-	if (!($res > 0))
-	{
+	if (!($res > 0)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFailedToLoadDiscount"), null, 'errors');
 	}
-	if (!$error && price2num($amount_ttc_1 + $amount_ttc_2) != $discount->amount_ttc)
-	{
+	if (!$error && price2num($amount_ttc_1 + $amount_ttc_2) != $discount->amount_ttc) {
 		$error++;
 		setEventMessages($langs->trans("TotalOfTwoDiscountMustEqualsOriginal"), null, 'errors');
 	}
-	if (!$error && $discount->fk_facture_line)
-	{
+	if (!$error && $discount->fk_facture_line) {
 		$error++;
 		setEventMessages($langs->trans("ErrorCantSplitAUsedDiscount"), null, 'errors');
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$newdiscount1 = new DiscountAbsolute($db);
 		$newdiscount2 = new DiscountAbsolute($db);
 		$newdiscount1->fk_facture_source = $discount->fk_facture_source;
@@ -101,8 +94,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 		$newdiscount2->fk_invoice_supplier = $discount->fk_invoice_supplier;
 		$newdiscount1->fk_invoice_supplier_line = $discount->fk_invoice_supplier_line;
 		$newdiscount2->fk_invoice_supplier_line = $discount->fk_invoice_supplier_line;
-		if ($discount->description == '(CREDIT_NOTE)' || $discount->description == '(DEPOSIT)')
-		{
+		if ($discount->description == '(CREDIT_NOTE)' || $discount->description == '(DEPOSIT)') {
 			$newdiscount1->description = $discount->description;
 			$newdiscount2->description = $discount->description;
 		} else {
@@ -143,8 +135,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 		$res = $discount->delete($user);
 		$newid1 = $newdiscount1->create($user);
 		$newid2 = $newdiscount2->create($user);
-		if ($res > 0 && $newid1 > 0 && $newid2 > 0)
-		{
+		if ($res > 0 && $newid1 > 0 && $newid2 > 0) {
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id.($backtopage ? '&backtopage='.urlencode($backtopage) : '')); // To avoid pb whith back
 			exit;
@@ -154,8 +145,7 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 	}
 }
 
-if ($action == 'setremise' && $user->rights->societe->creer)
-{
+if ($action == 'setremise' && $user->rights->societe->creer) {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
 
@@ -164,25 +154,20 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 	$tva_tx = GETPOST('tva_tx', 'alpha');
 	$discount_type = !empty($_POST['discount_type']) ?GETPOST('discount_type', 'alpha') : 0;
 
-	if ($amount_ht > 0)
-	{
+	if ($amount_ht > 0) {
 		$error = 0;
-		if (empty($desc))
-		{
+		if (empty($desc)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ReasonDiscount")), null, 'errors');
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$soc = new Societe($db);
 			$soc->fetch($id);
 			$discountid = $soc->set_remise_except($amount_ht, $user, $desc, $tva_tx, $discount_type);
 
-			if ($discountid > 0)
-			{
-				if (!empty($backtopage))
-				{
+			if ($discountid > 0) {
+				if (!empty($backtopage)) {
 					header("Location: ".$backtopage.'&discountid='.$discountid);
 					exit;
 				} else {
@@ -199,8 +184,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 	}
 }
 
-if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes')
-{
+if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes') {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
 
@@ -209,8 +193,7 @@ if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes'
 	$discount = new DiscountAbsolute($db);
 	$result = $discount->fetch(GETPOST("remid"));
 	$result = $discount->delete($user);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->commit();
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id); // To avoid pb whith back
 		exit;
@@ -231,8 +214,7 @@ $facturefournstatic = new FactureFournisseur($db);
 
 llxHeader('', $langs->trans("GlobalDiscount"));
 
-if ($socid > 0)
-{
+if ($socid > 0) {
 	// On recupere les donnees societes par l'objet
 	$object = new Societe($db);
 	$object->fetch($socid);
@@ -283,11 +265,12 @@ if ($socid > 0)
 		$sql .= " AND (fk_facture_line IS NULL AND fk_facture IS NULL)";
 		$sql .= " GROUP BY rc.fk_user";
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			$remise_all += $obj->amount;
-			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
+			if ($obj->fk_user == $user->id) {
+				$remise_user += $obj->amount;
+			}
 		} else {
 			dol_print_error($db);
 		}
@@ -295,8 +278,7 @@ if ($socid > 0)
 		print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';
 		print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 
-		if (!empty($user->fk_soc))    // No need to show this for external users
-		{
+		if (!empty($user->fk_soc)) {    // No need to show this for external users
 			print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
 			print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 		}
@@ -313,11 +295,12 @@ if ($socid > 0)
 		$sql .= " AND (fk_invoice_supplier_line IS NULL AND fk_invoice_supplier IS NULL)";
 		$sql .= " GROUP BY rc.fk_user";
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			$remise_all += $obj->amount;
-			if ($obj->fk_user == $user->id) $remise_user += $obj->amount;
+			if ($obj->fk_user == $user->id) {
+				$remise_user += $obj->amount;
+			}
 		} else {
 			dol_print_error($db);
 		}
@@ -325,8 +308,7 @@ if ($socid > 0)
 		print '<tr><td class="titlefield">'.$langs->trans("SupplierAbsoluteDiscountAllUsers").'</td>';
 		print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 
-		if (!empty($user->fk_soc))    // No need to show this for external users
-		{
+		if (!empty($user->fk_soc)) {    // No need to show this for external users
 			print '<tr><td>'.$langs->trans("SupplierAbsoluteDiscountMy").'</td>';
 			print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
 		}
@@ -339,8 +321,7 @@ if ($socid > 0)
 	print dol_get_fiche_end();
 
 
-	if ($user->rights->societe->creer)
-	{
+	if ($user->rights->societe->creer) {
 		print '<br>';
 
 		print load_fiche_titre($langs->trans("NewGlobalDiscount"), '', '');
@@ -378,12 +359,10 @@ if ($socid > 0)
 		print dol_get_fiche_end();
 	}
 
-	if ($user->rights->societe->creer)
-	{
+	if ($user->rights->societe->creer) {
 		print '<div class="center">';
 		print '<input type="submit" class="button" name="submit" value="'.$langs->trans("AddGlobalDiscount").'">';
-		if (!empty($backtopage))
-		{
+		if (!empty($backtopage)) {
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		}
@@ -395,8 +374,7 @@ if ($socid > 0)
 
 	print '<br>';
 
-	if ($_GET['action'] == 'remove')
-	{
+	if ($_GET['action'] == 'remove') {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.GETPOST('remid'), $langs->trans('RemoveDiscount'), $langs->trans('ConfirmRemoveDiscount'), 'confirm_remove', '', 0, 1);
 	}
 
@@ -430,8 +408,7 @@ if ($socid > 0)
 		$sql .= " ORDER BY rc.datec DESC";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			print '<div class="div-table-responsive-no-min">';
 			print '<table width="100%" class="noborder">';
 			print '<tr class="liste_titre">';
@@ -439,14 +416,12 @@ if ($socid > 0)
 			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
@@ -457,32 +432,27 @@ if ($socid > 0)
 
 			$i = 0;
 			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
-				while ($i < $num)
-				{
+			if ($num > 0) {
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
 
 					print '<tr class="oddeven">';
 					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
-					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
-					{
+					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturestatic->id = $obj->fk_facture_source;
 						$facturestatic->ref = $obj->ref;
 						$facturestatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
 						print '</td>';
-					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
-					{
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturestatic->id = $obj->fk_facture_source;
 						$facturestatic->ref = $obj->ref;
 						$facturestatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
 						print '</td>';
-					} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
-					{
+					} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturestatic->id = $obj->fk_facture_source;
 						$facturestatic->ref = $obj->ref;
@@ -496,30 +466,28 @@ if ($socid > 0)
 					}
 					print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
-					if (!empty($conf->multicurrency->enabled))
-					{
+					if (!empty($conf->multicurrency->enabled)) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
-					if (!empty($conf->multicurrency->enabled))
-					{
+					if (!empty($conf->multicurrency->enabled)) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
 					print '</td>';
-					if ($user->rights->societe->creer || $user->rights->facture->creer)
-					{
+					if ($user->rights->societe->creer || $user->rights->facture->creer) {
 						print '<td class="center nowrap">';
 						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
 						print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
 						print '</td>';
-					} else print '<td>&nbsp;</td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 					print '</tr>';
 
-					if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
-					{
+					if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid) {
 						$showconfirminfo['rowid'] = $obj->rowid;
 						$showconfirminfo['amount_ttc'] = $obj->amount_ttc;
 					}
@@ -527,15 +495,16 @@ if ($socid > 0)
 				}
 			} else {
 				$colspan = 8;
-				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
+				if (!empty($conf->multicurrency->enabled)) {
+					$colspan += 2;
+				}
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
 			print '</div>';
 
-			if (count($showconfirminfo))
-			{
+			if (count($showconfirminfo)) {
 				$amount1 = price2num($showconfirminfo['amount_ttc'] / 2, 'MT');
 				$amount2 = ($showconfirminfo['amount_ttc'] - $amount1);
 				$formquestion = array(
@@ -578,8 +547,7 @@ if ($socid > 0)
 		$sql .= " ORDER BY rc.datec DESC";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			print '<div class="div-table-responsive-no-min">';
 			print '<table width="100%" class="noborder">';
 			print '<tr class="liste_titre">';
@@ -587,14 +555,12 @@ if ($socid > 0)
 			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
@@ -605,32 +571,27 @@ if ($socid > 0)
 
 			$i = 0;
 			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
-				while ($i < $num)
-				{
+			if ($num > 0) {
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
 
 					print '<tr class="oddeven">';
 					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
-					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
-					{
+					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
 						$facturefournstatic->ref = $obj->ref;
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
-					{
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
 						$facturefournstatic->ref = $obj->ref;
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
-					{
+					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
 						$facturefournstatic->ref = $obj->ref;
@@ -644,30 +605,28 @@ if ($socid > 0)
 					}
 					print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
-					if (!empty($conf->multicurrency->enabled))
-					{
+					if (!empty($conf->multicurrency->enabled)) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
-					if (!empty($conf->multicurrency->enabled))
-					{
+					if (!empty($conf->multicurrency->enabled)) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
 					print '</td>';
-					if ($user->rights->societe->creer || $user->rights->facture->creer)
-					{
+					if ($user->rights->societe->creer || $user->rights->facture->creer) {
 						print '<td class="center nowrap">';
 						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=split&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_split($langs->trans("SplitDiscount")).'</a>';
 						print '<a class="reposition marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&remid='.$obj->rowid.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.img_delete($langs->trans("RemoveDiscount")).'</a>';
 						print '</td>';
-					} else print '<td>&nbsp;</td>';
+					} else {
+						print '<td>&nbsp;</td>';
+					}
 					print '</tr>';
 
-					if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid)
-					{
+					if ($_GET["action"] == 'split' && GETPOST('remid') == $obj->rowid) {
 						$showconfirminfo['rowid'] = $obj->rowid;
 						$showconfirminfo['amount_ttc'] = $obj->amount_ttc;
 					}
@@ -675,15 +634,16 @@ if ($socid > 0)
 				}
 			} else {
 				$colspan = 8;
-				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
+				if (!empty($conf->multicurrency->enabled)) {
+					$colspan += 2;
+				}
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 			$db->free($resql);
 			print "</table>";
 			print '</div>';
 
-			if (count($showconfirminfo))
-			{
+			if (count($showconfirminfo)) {
 				$amount1 = price2num($showconfirminfo['amount_ttc'] / 2, 'MT');
 				$amount2 = ($showconfirminfo['amount_ttc'] - $amount1);
 				$formquestion = array(
@@ -758,9 +718,10 @@ if ($socid > 0)
 
 		$resql = $db->query($sql);
 		$resql2 = null;
-		if ($resql) $resql2 = $db->query($sql2);
-		if ($resql2)
-		{
+		if ($resql) {
+			$resql2 = $db->query($sql2);
+		}
+		if ($resql2) {
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
@@ -768,14 +729,12 @@ if ($socid > 0)
 			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
@@ -785,10 +744,8 @@ if ($socid > 0)
 			$tab_sqlobj = array();
 			$tab_sqlobjOrder = array();
 			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
-				for ($i = 0; $i < $num; $i++)
-				{
+			if ($num > 0) {
+				for ($i = 0; $i < $num; $i++) {
 					$sqlobj = $db->fetch_object($resql);
 					$tab_sqlobj[] = $sqlobj;
 					$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
@@ -797,8 +754,7 @@ if ($socid > 0)
 			$db->free($resql);
 
 			$num = $db->num_rows($resql2);
-			for ($i = 0; $i < $num; $i++)
-			{
+			for ($i = 0; $i < $num; $i++) {
 				$sqlobj = $db->fetch_object($resql2);
 				$tab_sqlobj[] = $sqlobj;
 				$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
@@ -807,32 +763,27 @@ if ($socid > 0)
 			array_multisort($tab_sqlobjOrder, SORT_DESC, $tab_sqlobj);
 
 			$num = count($tab_sqlobj);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = array_shift($tab_sqlobj);
 					print '<tr class="oddeven">';
 					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
-					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
-					{
+					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturestatic->id = $obj->fk_facture_source;
 						$facturestatic->ref = $obj->invoice_source_ref;
 						$facturestatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturestatic->getNomURl(1);
 						print '</td>';
-					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
-					{
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturestatic->id = $obj->fk_facture_source;
 						$facturestatic->ref = $obj->invoice_source_ref;
 						$facturestatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturestatic->getNomURl(1);
 						print '</td>';
-					} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description))
-					{
+					} elseif (preg_match('/\(EXCESS RECEIVED\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturestatic->id = $obj->fk_facture_source;
 						$facturestatic->ref = $obj->invoice_source_ref;
@@ -845,20 +796,17 @@ if ($socid > 0)
 						print '</td>';
 					}
 					print '<td class="left nowrap">';
-					if ($obj->invoiceid)
-					{
+					if ($obj->invoiceid) {
 						print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->invoiceid.'">'.img_object($langs->trans("ShowBill"), 'bill').' '.$obj->ref.'</a>';
 					}
 					print '</td>';
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
-					if (!empty($conf->multicurrency->enabled))
-					{
+					if (!empty($conf->multicurrency->enabled)) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
-					if (!empty($conf->multicurrency->enabled))
-					{
+					if (!empty($conf->multicurrency->enabled)) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
@@ -870,7 +818,9 @@ if ($socid > 0)
 				}
 			} else {
 				$colspan = 8;
-				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
+				if (!empty($conf->multicurrency->enabled)) {
+					$colspan += 2;
+				}
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 
@@ -928,9 +878,10 @@ if ($socid > 0)
 
 		$resql = $db->query($sql);
 		$resql2 = null;
-		if ($resql) $resql2 = $db->query($sql2);
-		if ($resql2)
-		{
+		if ($resql) {
+			$resql2 = $db->query($sql2);
+		}
+		if ($resql2) {
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
@@ -938,14 +889,12 @@ if ($socid > 0)
 			print '<td>'.$langs->trans("ReasonDiscount").'</td>';
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
@@ -955,10 +904,8 @@ if ($socid > 0)
 			$tab_sqlobj = array();
 			$tab_sqlobjOrder = array();
 			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
-				for ($i = 0; $i < $num; $i++)
-				{
+			if ($num > 0) {
+				for ($i = 0; $i < $num; $i++) {
 					$sqlobj = $db->fetch_object($resql);
 					$tab_sqlobj[] = $sqlobj;
 					$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
@@ -967,8 +914,7 @@ if ($socid > 0)
 			$db->free($resql);
 
 			$num = $db->num_rows($resql2);
-			for ($i = 0; $i < $num; $i++)
-			{
+			for ($i = 0; $i < $num; $i++) {
 				$sqlobj = $db->fetch_object($resql2);
 				$tab_sqlobj[] = $sqlobj;
 				$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
@@ -977,32 +923,27 @@ if ($socid > 0)
 			array_multisort($tab_sqlobjOrder, SORT_DESC, $tab_sqlobj);
 
 			$num = count($tab_sqlobj);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = array_shift($tab_sqlobj);
 					print '<tr class="oddeven">';
 					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
-					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description))
-					{
+					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
 						$facturefournstatic->ref = $obj->invoice_source_ref;
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description))
-					{
+					} elseif (preg_match('/\(DEPOSIT\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
 						$facturefournstatic->ref = $obj->invoice_source_ref;
 						$facturefournstatic->type = $obj->type;
 						print preg_replace('/\(DEPOSIT\)/', $langs->trans("InvoiceDeposit"), $obj->description).' '.$facturefournstatic->getNomURl(1);
 						print '</td>';
-					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description))
-					{
+					} elseif (preg_match('/\(EXCESS PAID\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
 						$facturefournstatic->ref = $obj->invoice_source_ref;
@@ -1020,14 +961,12 @@ if ($socid > 0)
 					}
 					print '</td>';
 					print '<td class="right">'.price($obj->amount_ht).'</td>';
-					if (!empty($conf->multicurrency->enabled))
-					{
+					if (!empty($conf->multicurrency->enabled)) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
-					if (!empty($conf->multicurrency->enabled))
-					{
+					if (!empty($conf->multicurrency->enabled)) {
 						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
@@ -1039,7 +978,9 @@ if ($socid > 0)
 				}
 			} else {
 				$colspan = 8;
-				if (!empty($conf->multicurrency->enabled)) $colspan += 2;
+				if (!empty($conf->multicurrency->enabled)) {
+					$colspan += 2;
+				}
 				print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index f0c05ec7986..889eb036ab4 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -60,9 +60,15 @@ if (!empty($conf->variants->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'companies', 'bills', 'propal', 'deliveries', 'products', 'other'));
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
-if (!empty($conf->margin->enabled)) $langs->load('margins');
-if (!empty($conf->productbatch->enabled)) $langs->load("productbatch");
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load('incoterm');
+}
+if (!empty($conf->margin->enabled)) {
+	$langs->load('margins');
+}
+if (!empty($conf->productbatch->enabled)) {
+	$langs->load("productbatch");
+}
 
 $id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('orderid', 'int'));
 $ref = GETPOST('ref', 'alpha');
@@ -82,8 +88,9 @@ $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($
 $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
 // Security check
-if (!empty($user->socid))
+if (!empty($user->socid)) {
 	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'commande', $id);
 
 $object = new Commande($db);
@@ -125,14 +132,13 @@ $date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'
 $parameters = array('socid' => $socid);
 // Note that $action and $object may be modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
-if (empty($reshook))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -146,20 +152,16 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate)
-	{
-		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
-		{
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) {
+		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
-			if ($object->id > 0)
-			{
+			if ($object->id > 0) {
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
 				$orig = clone $object;
 
 				$result = $object->createFromClone($user, $socid);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
 				} else {
@@ -169,49 +171,38 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	// Reopen a closed order
-	elseif ($action == 'reopen' && $usercancreate)
-	{
-		if ($object->statut == Commande::STATUS_CANCELED || $object->statut == Commande::STATUS_CLOSED)
-		{
+	} elseif ($action == 'reopen' && $usercancreate) {
+		// Reopen a closed order
+		if ($object->statut == Commande::STATUS_CANCELED || $object->statut == Commande::STATUS_CLOSED) {
 			$result = $object->set_reopen($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				setEventMessages($langs->trans('OrderReopened', $object->ref), null);
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Remove order
-	elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
-	{
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) {
+		// Remove order
 		$result = $object->delete($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header('Location: list.php?restore_lastsearch_values=1');
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Remove a product line
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
-	{
+	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) {
+		// Remove a product line
 		$result = $object->deleteline($user, $lineid);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 				$newlang = GETPOST('lang_id', 'aZ09');
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			}
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 				$newlang = $object->thirdparty->default_lang;
+			}
 			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -226,17 +217,11 @@ if (empty($reshook))
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Link to a project
-	elseif ($action == 'classin' && $usercancreate)
-	{
+	} elseif ($action == 'classin' && $usercancreate) {
+		// Link to a project
 		$object->setProject(GETPOST('projectid', 'int'));
-	}
-
-	// Add order
-	elseif ($action == 'add' && $usercancreate)
-	{
+	} elseif ($action == 'add' && $usercancreate) {
+		// Add order
 		$datecommande = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
 		$date_delivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 		$selectedLines = GETPOST('toselect', 'array');
@@ -282,15 +267,15 @@ if (empty($reshook))
 			$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 			$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
 			// Fill array 'array_options' with data from add form
-			if (!$error)
-			{
+			if (!$error) {
 				$ret = $extrafields->setOptionalsFromPost(null, $object);
-				if ($ret < 0) $error++;
+				if ($ret < 0) {
+					$error++;
+				}
 			}
 
 			// If creation from another object of another module (Example: origin=propal, originid=1)
-			if (!empty($origin) && !empty($originid))
-			{
+			if (!empty($origin) && !empty($originid)) {
 				// Parse element/subelement (ex: project_task)
 				$element = $subelement = $origin;
 				if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
@@ -320,12 +305,10 @@ if (empty($reshook))
 					$object->linked_objects = array_merge($object->linked_objects, $other_linked_objects);
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$object_id = $object->create($user);
 
-					if ($object_id > 0)
-					{
+					if ($object_id > 0) {
 						dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 						$classname = ucfirst($subelement);
@@ -333,11 +316,9 @@ if (empty($reshook))
 
 						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 						$result = $srcobject->fetch($object->origin_id);
-						if ($result > 0)
-						{
+						if ($result > 0) {
 							$lines = $srcobject->lines;
-							if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
-							{
+							if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {
 								$srcobject->fetch_lines();
 								$lines = $srcobject->lines;
 							}
@@ -345,9 +326,10 @@ if (empty($reshook))
 							$fk_parent_line = 0;
 							$num = count($lines);
 
-							for ($i = 0; $i < $num; $i++)
-							{
-								if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
+							for ($i = 0; $i < $num; $i++) {
+								if (!in_array($lines[$i]->id, $selectedLines)) {
+									continue; // Skip unselected lines
+								}
 
 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
 								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : '');
@@ -356,15 +338,19 @@ if (empty($reshook))
 								// Dates
 								// TODO mutualiser
 								$date_start = $lines[$i]->date_debut_prevue;
-								if ($lines[$i]->date_debut_reel)
+								if ($lines[$i]->date_debut_reel) {
 									$date_start = $lines[$i]->date_debut_reel;
-								if ($lines[$i]->date_start)
+								}
+								if ($lines[$i]->date_start) {
 									$date_start = $lines[$i]->date_start;
+								}
 								$date_end = $lines[$i]->date_fin_prevue;
-								if ($lines[$i]->date_fin_reel)
+								if ($lines[$i]->date_fin_reel) {
 									$date_end = $lines[$i]->date_fin_reel;
-								if ($lines[$i]->date_end)
+								}
+								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) {
@@ -372,20 +358,42 @@ if (empty($reshook))
 								}
 
 								// Extrafields
-								if (method_exists($lines[$i], 'fetch_optionals')) // For avoid conflicts if trigger used
-								{
+								if (method_exists($lines[$i], 'fetch_optionals')) { // For avoid conflicts if trigger used
 									$lines[$i]->fetch_optionals();
 									$array_options = $lines[$i]->array_options;
 								}
 
 								$tva_tx = $lines[$i]->tva_tx;
-								if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+								if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
+									$tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+								}
 
 								$result = $object->addline(
-									$desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->fk_product,
-									$lines[$i]->remise_percent, $lines[$i]->info_bits, $lines[$i]->fk_remise_except, 'HT', 0, $date_start, $date_end, $product_type,
-									$lines[$i]->rang, $lines[$i]->special_code, $fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options,
-									$lines[$i]->fk_unit, $object->origin, $lines[$i]->rowid
+									$desc,
+									$lines[$i]->subprice,
+									$lines[$i]->qty,
+									$tva_tx,
+									$lines[$i]->localtax1_tx,
+									$lines[$i]->localtax2_tx,
+									$lines[$i]->fk_product,
+									$lines[$i]->remise_percent,
+									$lines[$i]->info_bits,
+									$lines[$i]->fk_remise_except,
+									'HT',
+									0,
+									$date_start,
+									$date_end,
+									$product_type,
+									$lines[$i]->rang,
+									$lines[$i]->special_code,
+									$fk_parent_line,
+									$lines[$i]->fk_fournprice,
+									$lines[$i]->pa_ht,
+									$label,
+									$array_options,
+									$lines[$i]->fk_unit,
+									$object->origin,
+									$lines[$i]->rowid
 								);
 
 								if ($result < 0) {
@@ -407,26 +415,26 @@ if (empty($reshook))
 						/* Useless, already into the create
 						if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
 						{
-						    $originforcontact = $object->origin;
-						    $originidforcontact = $object->origin_id;
-						    if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
-						    {
-						        $originforcontact=$srcobject->origin;
-						        $originidforcontact=$srcobject->origin_id;
-						    }
-						    $sqlcontact = "SELECT code, fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-						    $sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$db->escape($originforcontact)."'";
+							$originforcontact = $object->origin;
+							$originidforcontact = $object->origin_id;
+							if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+							{
+								$originforcontact=$srcobject->origin;
+								$originidforcontact=$srcobject->origin_id;
+							}
+							$sqlcontact = "SELECT code, fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+							$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$db->escape($originforcontact)."'";
 
-						    $resqlcontact = $db->query($sqlcontact);
-						    if ($resqlcontact)
-						    {
-						        while($objcontact = $db->fetch_object($resqlcontact))
-						        {
-						            //print $objcontact->code.'-'.$objcontact->fk_socpeople."\n";
-						            $object->add_contact($objcontact->fk_socpeople, $objcontact->code);
-						        }
-						    }
-						    else dol_print_error($resqlcontact);
+							$resqlcontact = $db->query($sqlcontact);
+							if ($resqlcontact)
+							{
+								while($objcontact = $db->fetch_object($resqlcontact))
+								{
+									//print $objcontact->code.'-'.$objcontact->fk_socpeople."\n";
+									$object->add_contact($objcontact->fk_socpeople, $objcontact->code);
+								}
+							}
+							else dol_print_error($resqlcontact);
 						}*/
 
 						// Hooks
@@ -445,15 +453,13 @@ if (empty($reshook))
 					$action = 'create';
 				}
 			} else {
-				if (!$error)
-				{
+				if (!$error) {
 					$object_id = $object->create($user);
 				}
 			}
 
 			// Insert default contacts if defined
-			if ($object_id > 0)
-			{
+			if ($object_id > 0) {
 				if (GETPOST('contactid', 'int')) {
 					$result = $object->add_contact(GETPOST('contactid', 'int'), 'CUSTOMER', 'external');
 					if ($result < 0) {
@@ -467,8 +473,7 @@ if (empty($reshook))
 			}
 
 			// End of object creation, we show it
-			if ($object_id > 0 && !$error)
-			{
+			if ($object_id > 0 && !$error) {
 				$db->commit();
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object_id);
 				exit();
@@ -478,32 +483,26 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	} elseif ($action == 'classifybilled' && $usercancreate)
-	{
+	} elseif ($action == 'classifybilled' && $usercancreate) {
 		$ret = $object->classifyBilled($user);
 
 		if ($ret < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	} elseif ($action == 'classifyunbilled' && $usercancreate)
-	{
+	} elseif ($action == 'classifyunbilled' && $usercancreate) {
 		$ret = $object->classifyUnBilled();
 		if ($ret < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Positionne ref commande client
-	elseif ($action == 'setref_client' && $usercancreate) {
+	} elseif ($action == 'setref_client' && $usercancreate) {
+		// Positionne ref commande client
 		$result = $object->set_ref_client($user, GETPOST('ref_client'));
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setremise' && $usercancreate) {
 		$result = $object->setDiscount($user, GETPOST('remise'));
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setabsolutediscount' && $usercancreate) {
@@ -533,26 +532,25 @@ if (empty($reshook))
 		}
 	} elseif ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-		if ($result < 0)
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+		}
+	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+		// Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+		// Multicurrency rate
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
 	} elseif ($action == 'setavailability' && $usercancreate) {
 		$result = $object->availability(GETPOST('availability_id'));
-		if ($result < 0)
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} elseif ($action == 'setdemandreason' && $usercancreate) {
 		$result = $object->demand_reason(GETPOST('demand_reason_id'));
-		if ($result < 0)
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} elseif ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 		if ($result < 0) {
@@ -562,8 +560,9 @@ if (empty($reshook))
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = GETPOST('lang_id', 'alpha');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 					$newlang = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -573,35 +572,26 @@ if (empty($reshook))
 				$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
-	}
-
-	// Set incoterm
-	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-	{
+	} elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {
+		// Set incoterm
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// bank account
-	elseif ($action == 'setbankaccount' && $usercancreate) {
+	} elseif ($action == 'setbankaccount' && $usercancreate) {
+		// bank account
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// shipping method
-	elseif ($action == 'setshippingmethod' && $usercancreate) {
+	} elseif ($action == 'setshippingmethod' && $usercancreate) {
+		// shipping method
 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// warehouse
-	elseif ($action == 'setwarehouse' && $usercancreate) {
+	} elseif ($action == 'setwarehouse' && $usercancreate) {
+		// warehouse
 		$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -619,8 +609,7 @@ if (empty($reshook))
 		foreach ($object->lines as $line) {
 			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->date_start, $line->date_end, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
 		}
-	} elseif ($action == 'addline' && $usercancreate)		// Add a new line
-	{
+	} elseif ($action == 'addline' && $usercancreate) {		// Add a new line
 		$langs->load('errors');
 		$error = 0;
 
@@ -630,8 +619,7 @@ if (empty($reshook))
 		$price_ht = price2num(GETPOST('price_ht'), 'MU');
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU');
 		$prod_entry_mode = GETPOST('prod_entry_mode');
-		if ($prod_entry_mode == 'free')
-		{
+		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
@@ -665,8 +653,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht == '' && $price_ht_devise == '') 	// Unit price can be 0 but not ''. Also price can be negative for order.
-		{
+		if ($prod_entry_mode == 'free' && empty($idprod) && $price_ht == '' && $price_ht_devise == '') { 	// Unit price can be 0 but not ''. Also price can be negative for order.
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error++;
 		}
@@ -712,7 +699,9 @@ if (empty($reshook))
 				// Update if prices fields are defined
 				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-				if (empty($tva_tx)) $tva_npr = 0;
+				if (empty($tva_tx)) {
+					$tva_npr = 0;
+				}
 
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
@@ -720,21 +709,21 @@ if (empty($reshook))
 				$price_base_type = $prod->price_base_type;
 
 				// If price per segment
-				if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level))
-				{
+				if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
 					$pu_ht = $prod->multiprices[$object->thirdparty->price_level];
 					$pu_ttc = $prod->multiprices_ttc[$object->thirdparty->price_level];
 					$price_min = $prod->multiprices_min[$object->thirdparty->price_level];
 					$price_base_type = $prod->multiprices_base_type[$object->thirdparty->price_level];
-					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
-					{
-						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) $tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
-						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) $tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+					if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {  // using this option is a bug. kept for backward compatibility
+						if (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
+							$tva_tx = $prod->multiprices_tva_tx[$object->thirdparty->price_level];
+						}
+						if (isset($prod->multiprices_recuperableonly[$object->thirdparty->price_level])) {
+							$tva_npr = $prod->multiprices_recuperableonly[$object->thirdparty->price_level];
+						}
 					}
-				}
-				// If price per customer
-				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-				{
+				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+					// If price per customer
 					require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 
 					$prodcustprice = new Productcustomerprice($db);
@@ -742,38 +731,37 @@ if (empty($reshook))
 					$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $object->thirdparty->id);
 
 					$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-					if ($result >= 0)
-					{
-						if (count($prodcustprice->lines) > 0)
-						{
+					if ($result >= 0) {
+						if (count($prodcustprice->lines) > 0) {
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 							$price_min =  price($prodcustprice->lines[0]->price_min);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							$tva_tx = $prodcustprice->lines[0]->tva_tx;
-							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) $tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+								$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+							}
 							$tva_npr = $prodcustprice->lines[0]->recuperableonly;
-							if (empty($tva_tx)) $tva_npr = 0;
+							if (empty($tva_tx)) {
+								$tva_npr = 0;
+							}
 						}
 					} else {
 						setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
 					}
-				}
-				// If price per quantity
-				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
-				{
-					if ($prod->prices_by_qty[0])	// yes, this product has some prices per quantity
-					{
+				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
+					// If price per quantity
+					if ($prod->prices_by_qty[0]) {	// yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
 						$pqp = GETPOST('pbq', 'int');
 
 						// Search price into product_price_by_qty from $prod->id
-						foreach ($prod->prices_by_qty_list[0] as $priceforthequantityarray)
-						{
-							if ($priceforthequantityarray['rowid'] != $pqp) continue;
+						foreach ($prod->prices_by_qty_list[0] as $priceforthequantityarray) {
+							if ($priceforthequantityarray['rowid'] != $pqp) {
+								continue;
+							}
 							// We found the price
-							if ($priceforthequantityarray['price_base_type'] == 'HT')
-							{
+							if ($priceforthequantityarray['price_base_type'] == 'HT') {
 								$pu_ht = $priceforthequantityarray['unitprice'];
 							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
@@ -782,21 +770,18 @@ if (empty($reshook))
 							break;
 						}
 					}
-				}
-				// If price per quantity and customer
-				elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-				{
-					if ($prod->prices_by_qty[$object->thirdparty->price_level])	// yes, this product has some prices per quantity
-					{
+				} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+					// If price per quantity and customer
+					if ($prod->prices_by_qty[$object->thirdparty->price_level]) {	// yes, this product has some prices per quantity
 						// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
 						$pqp = GETPOST('pbq', 'int');
 						// Search price into product_price_by_qty from $prod->id
-						foreach ($prod->prices_by_qty_list[$object->thirdparty->price_level] as $priceforthequantityarray)
-						{
-							if ($priceforthequantityarray['rowid'] != $pqp) continue;
+						foreach ($prod->prices_by_qty_list[$object->thirdparty->price_level] as $priceforthequantityarray) {
+							if ($priceforthequantityarray['rowid'] != $pqp) {
+								continue;
+							}
 							// We found the price
-							if ($priceforthequantityarray['price_base_type'] == 'HT')
-							{
+							if ($priceforthequantityarray['price_base_type'] == 'HT') {
 								$pu_ht = $priceforthequantityarray['unitprice'];
 							} else {
 								$pu_ttc = $priceforthequantityarray['unitprice'];
@@ -814,10 +799,9 @@ if (empty($reshook))
 				if (!empty($price_ht) || $price_ht === '0') {
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				}
-				// On reevalue prix selon taux tva car taux tva transaction peut etre different
-				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-				elseif ($tmpvat != $tmpprodvat) {
+				} elseif ($tmpvat != $tmpprodvat) {
+					// On reevalue prix selon taux tva car taux tva transaction peut etre different
+					// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
 					if ($price_base_type != 'HT') {
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
 					} else {
@@ -831,16 +815,18 @@ if (empty($reshook))
 				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09'))
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
-					if (empty($newlang))
+					}
+					if (empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
 
-					$desc = (!empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
+					$desc = (!empty($prod->multilangs[$outputlangs->defaultlang]["description"])) ? $prod->multilangs[$outputlangs->defaultlang]["description"] : $prod->description;
 				} else {
 					$desc = $prod->description;
 				}
@@ -850,8 +836,11 @@ if (empty($reshook))
 					$product_desc='';
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
-				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+					$desc = $product_desc;
+				} else {
+					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				}
 
 				// Add custom code and origin country into description
 				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
@@ -860,28 +849,36 @@ if (empty($reshook))
 					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 						$outputlangs = $langs;
 						$newlang = '';
-						if (empty($newlang) && GETPOST('lang_id', 'alpha'))
+						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
 							$newlang = GETPOST('lang_id', 'alpha');
-						if (empty($newlang))
+						}
+						if (empty($newlang)) {
 							$newlang = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
 							$outputlangs->load('products');
 						}
-						if (!empty($prod->customcode))
+						if (!empty($prod->customcode)) {
 							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-						if (!empty($prod->customcode) && !empty($prod->country_code))
+						}
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
-						if (!empty($prod->country_code))
+						}
+						if (!empty($prod->country_code)) {
 							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $outputlangs, 0);
+						}
 					} else {
-						if (!empty($prod->customcode))
+						if (!empty($prod->customcode)) {
 							$tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-						if (!empty($prod->customcode) && !empty($prod->country_code))
+						}
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
-						if (!empty($prod->country_code))
+						}
+						if (!empty($prod->country_code)) {
 							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $langs, 0);
+						}
 					}
 					$tmptxt .= ')';
 					$desc = dol_concatdesc($desc, $tmptxt);
@@ -912,8 +909,9 @@ if (empty($reshook))
 			$desc = dol_htmlcleanlastbr($desc);
 
 			$info_bits = 0;
-			if ($tva_npr)
+			if ($tva_npr) {
 				$info_bits |= 0x01;
+			}
 
 			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
@@ -930,8 +928,9 @@ if (empty($reshook))
 						// Define output language
 						$outputlangs = $langs;
 						$newlang = GETPOST('lang_id', 'alpha');
-						if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
+						if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 							$newlang = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
@@ -977,13 +976,8 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	/*
-	 *  Update a line
-	 */
-	elseif ($action == 'updateline' && $usercancreate && GETPOST('save'))
-	{
+	} elseif ($action == 'updateline' && $usercancreate && GETPOST('save')) {
+		// Update a line
 		// Clean parameters
 		$date_start = '';
 		$date_end = '';
@@ -996,8 +990,9 @@ if (empty($reshook))
 
 		// Define info_bits
 		$info_bits = 0;
-		if (preg_match('/\*/', $vat_rate))
+		if (preg_match('/\*/', $vat_rate)) {
 			$info_bits |= 0x01;
+		}
 
 		// Define vat_rate
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -1020,7 +1015,9 @@ if (empty($reshook))
 
 		// Define special_code for special lines
 		$special_code = GETPOST('special_code');
-		if (!GETPOST('qty')) $special_code = 3;
+		if (!GETPOST('qty')) {
+			$special_code = 3;
+		}
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');
@@ -1031,8 +1028,9 @@ if (empty($reshook))
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($object->thirdparty->price_level))
+			if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
+			}
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
@@ -1052,12 +1050,9 @@ if (empty($reshook))
 		}
 
 		if (!$error) {
-			if (empty($user->rights->margins->creer))
-			{
-				foreach ($object->lines as &$line)
-				{
-					if ($line->id == GETPOST('lineid'))
-					{
+			if (empty($user->rights->margins->creer)) {
+				foreach ($object->lines as &$line) {
+					if ($line->id == GETPOST('lineid')) {
 						$fournprice = $line->fk_fournprice;
 						$buyingprice = $line->pa_ht;
 						break;
@@ -1071,10 +1066,12 @@ if (empty($reshook))
 					// Define output language
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+					}
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1117,23 +1114,19 @@ if (empty($reshook))
 	} elseif ($action == 'updateline' && $usercancreate && GETPOST('cancel', 'alpha') == $langs->trans("Cancel")) {
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id); // Pour reaffichage de la fiche en cours d'edition
 		exit();
-	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate)
-	{
+	} elseif ($action == 'confirm_validate' && $confirm == 'yes' && $usercanvalidate) {
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-		{
-		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
-		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
+			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		// Check parameters
-		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-		{
-			if (!$idwarehouse || $idwarehouse == -1)
-			{
+		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
+			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 				$action = '';
@@ -1142,15 +1135,17 @@ if (empty($reshook))
 
 		if (!$error) {
 			$result = $object->valid($user, $idwarehouse);
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				{
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1164,25 +1159,20 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Go back to draft status
-	elseif ($action == 'confirm_modif' && $usercancreate) {
+	} elseif ($action == 'confirm_modif' && $usercancreate) {
+		// Go back to draft status
 		$idwarehouse = GETPOST('idwarehouse');
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-		{
-		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
-		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
+			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		// Check parameters
-		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-		{
-			if (!$idwarehouse || $idwarehouse == -1)
-			{
+		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
+			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 				$action = '';
@@ -1191,15 +1181,17 @@ if (empty($reshook))
 
 		if (!$error) {
 			$result = $object->setDraft($user, $idwarehouse);
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				{
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1216,23 +1208,19 @@ if (empty($reshook))
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate)
-	{
+	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanvalidate) {
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-		{
-		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
-		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
+			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		// Check parameters
-		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-		{
-			if (!$idwarehouse || $idwarehouse == -1)
-			{
+		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
+			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 				$action = '';
@@ -1248,58 +1236,53 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update_extras')
-	{
+	if ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Actions on extra fields
 			$result = $object->insertExtraFields('ORDER_MODIFY');
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 		}
 
-		if ($error) $action = 'edit_extras';
+		if ($error) {
+			$action = 'edit_extras';
+		}
 	}
 
 	// add lines from objectlinked
 	if ($action == 'import_lines_from_object'
 		&& $usercancreate
 		&& $object->statut == Commande::STATUS_DRAFT
-	  )
-	{
+	  ) {
 		$fromElement = GETPOST('fromelement');
 		$fromElementid = GETPOST('fromelementid');
 		$importLines = GETPOST('line_checkbox');
 
-		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
-		{
-			if ($fromElement == 'commande')
-			{
+		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid)) {
+			if ($fromElement == 'commande') {
 				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 				$lineClassName = 'OrderLine';
-			} elseif ($fromElement == 'propal')
-			{
+			} elseif ($fromElement == 'propal') {
 				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 				$lineClassName = 'PropaleLigne';
 			}
 			$nextRang = count($object->lines) + 1;
 			$importCount = 0;
 			$error = 0;
-			foreach ($importLines as $lineId)
-			{
+			foreach ($importLines as $lineId) {
 				$lineId = intval($lineId);
 				$originLine = new $lineClassName($db);
-				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
-				{
+				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0) {
 					$originLine->fetch_optionals();
 					$desc = $originLine->desc;
 					$pu_ht = $originLine->subprice;
@@ -1343,8 +1326,7 @@ if (empty($reshook))
 				}
 			}
 
-			if ($error)
-			{
+			if ($error) {
 				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
 			}
 		}
@@ -1366,10 +1348,8 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
-	if (!$error && !empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate)
-	{
-		if ($action == 'addcontact')
-		{
+	if (!$error && !empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
+		if ($action == 'addcontact') {
 			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
@@ -1387,21 +1367,15 @@ if (empty($reshook))
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-		}
-
-		// bascule du statut d'un contact
-		elseif ($action == 'swapstatut')
-		{
+		} elseif ($action == 'swapstatut') {
+			// bascule du statut d'un contact
 			if ($object->id > 0) {
 				$result = $object->swapContactStatus(GETPOST('ligne'));
 			} else {
 				dol_print_error($db);
 			}
-		}
-
-		// Efface un contact
-		elseif ($action == 'deletecontact')
-		{
+		} elseif ($action == 'deletecontact') {
+			// Efface un contact
 			$result = $object->delete_contact($lineid);
 
 			if ($result >= 0) {
@@ -1425,16 +1399,18 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formorder = new FormOrder($db);
 $formmargin = new FormMargin($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 // Mode creation
-if ($action == 'create' && $usercancreate)
-{
+if ($action == 'create' && $usercancreate) {
 	print load_fiche_titre($langs->trans('CreateOrder'), '', 'order');
 
 	$soc = new Societe($db);
-	if ($socid > 0)
+	if ($socid > 0) {
 		$res = $soc->fetch($socid);
+	}
 
 	$remise_absolue = 0;
 
@@ -1481,8 +1457,9 @@ if ($action == 'create' && $usercancreate)
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
 			$objectsrc->fetch($originid);
-			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
+			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 				$objectsrc->fetch_lines();
+			}
 			$objectsrc->fetch_thirdparty();
 
 			// Replicate extrafields
@@ -1505,12 +1482,17 @@ if ($action == 'create' && $usercancreate)
 			$dateorder = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER) ?-1 : '';
 
 			$date_delivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : '');
-			if (empty($date_delivery)) $date_delivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
+			if (empty($date_delivery)) {
+				$date_delivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : '');
+			}
 
-			if (!empty($conf->multicurrency->enabled))
-			{
-				if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
-				if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
+			if (!empty($conf->multicurrency->enabled)) {
+				if (!empty($objectsrc->multicurrency_code)) {
+					$currency_code = $objectsrc->multicurrency_code;
+				}
+				if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
+					$currency_tx = $objectsrc->multicurrency_tx;
+				}
 			}
 
 			$note_private = $object->getDefaultCreateValueFor('note_private', (!empty($objectsrc->note_private) ? $objectsrc->note_private : null));
@@ -1531,18 +1513,25 @@ if ($action == 'create' && $usercancreate)
 		$remise_absolue     = 0;
 		$dateorder          = empty($conf->global->MAIN_AUTOFILL_DATE_ORDER) ?-1 : '';
 
-		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+			$currency_code = $soc->multicurrency_code;
+		}
 
 		$note_private = $object->getDefaultCreateValueFor('note_private');
 		$note_public = $object->getDefaultCreateValueFor('note_public');
 	}
 
 	//Warehouse default if null
-	if ($soc->fk_warehouse > 0) $warehouse_id = $soc->fk_warehouse;
-	if (!empty($conf->stock->enabled) && empty($warehouse_id) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER))
-	{
-		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) $warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
-		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) $warehouse_id = $user->fk_warehouse;
+	if ($soc->fk_warehouse > 0) {
+		$warehouse_id = $soc->fk_warehouse;
+	}
+	if (!empty($conf->stock->enabled) && empty($warehouse_id) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
+		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE)) {
+			$warehouse_id = $conf->global->MAIN_DEFAULT_WAREHOUSE;
+		}
+		if (empty($object->warehouse_id) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
+			$warehouse_id = $user->fk_warehouse;
+		}
 	}
 
 	print '<form name="crea_commande" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -1552,7 +1541,9 @@ if ($action == 'create' && $usercancreate)
 	print '<input type="hidden" name="remise_percent" value="'.$soc->remise_percent.'">';
 	print '<input type="hidden" name="origin" value="'.$origin.'">';
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
-	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
+	if (!empty($currency_tx)) {
+		print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
+	}
 
 	print dol_get_fiche_head('');
 
@@ -1563,9 +1554,11 @@ if ($action == 'create' && $usercancreate)
 
 	// Reference client
 	print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';
-	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && !empty($origin) && !empty($originid))
+	if (!empty($conf->global->MAIN_USE_PROPAL_REFCLIENT_FOR_ORDER) && !empty($origin) && !empty($originid)) {
 		print '<input type="text" name="ref_client" value="'.$ref_client.'"></td>';
-	else print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
+	} else {
+		print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
+	}
 	print '</tr>';
 
 	// Thirdparty
@@ -1580,8 +1573,7 @@ if ($action == 'create' && $usercancreate)
 		print '<td>';
 		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth175 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
-		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
-		{
+		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
@@ -1682,8 +1674,7 @@ if ($action == 'create' && $usercancreate)
 	// TODO How record was recorded OrderMode (llx_c_input_method)
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
@@ -1695,15 +1686,13 @@ if ($action == 'create' && $usercancreate)
 	}
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled))
-	{
+	if (!empty($conf->incoterm->enabled)) {
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).'</label></td>';
 		print '<td class="maxwidthonsmartphone">';
 		$incoterm_id = GETPOST('incoterm_id');
 		$incoterm_location = GETPOST('location_incoterms');
-		if (empty($incoterm_id))
-		{
+		if (empty($incoterm_id)) {
 			$incoterm_id = (!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : $soc->fk_incoterms);
 			$incoterm_location = (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : $soc->location_incoterms);
 		}
@@ -1740,8 +1729,7 @@ if ($action == 'create' && $usercancreate)
 	print "</td></tr>";
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
+	if (!empty($conf->multicurrency->enabled)) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey("Currency", 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -1771,8 +1759,7 @@ if ($action == 'create' && $usercancreate)
 		print '</td></tr>';
 	}
 
-	if (!empty($origin) && !empty($originid) && is_object($objectsrc))
-	{
+	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
 		// TODO for compatibility
 		if ($origin == 'contrat') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
@@ -1811,20 +1798,17 @@ if ($action == 'create' && $usercancreate)
 		// Amount
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
-		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
-		{
+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) { 		// Localtax1 RE
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax1)."</td></tr>";
 		}
 
-		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
-		{
+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) { 		// Localtax2 IRPF
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax2)."</td></tr>";
 		}
 
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -1882,8 +1866,7 @@ if ($action == 'create' && $usercancreate)
 		}
 
 		// Confirmation of validation
-		if ($action == 'validate')
-		{
+		if ($action == 'validate') {
 			// We check that object has a temporary ref
 			$ref = substr($object->ref, 1, 4);
 			if ($ref == 'PROV') {
@@ -1893,8 +1876,7 @@ if ($action == 'create' && $usercancreate)
 			}
 
 			$text = $langs->trans('ConfirmValidateOrder', $numref);
-			if (!empty($conf->notification->enabled))
-			{
+			if (!empty($conf->notification->enabled)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 				$notify = new Notify($db);
 				$text .= '<br>';
@@ -1902,21 +1884,21 @@ if ($action == 'create' && $usercancreate)
 			}
 
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-			{
-			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
-			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
+				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
 			$formquestion = array();
-			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-			{
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
 				$forcecombo = 0;
-				if ($conf->browser->name == 'ie') $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				if ($conf->browser->name == 'ie') {
+					$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				}
 				$formquestion = array(
 					// 'text' => $langs->trans("ConfirmClone"),
 					// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
@@ -1929,25 +1911,24 @@ if ($action == 'create' && $usercancreate)
 		}
 
 		// Confirm back to draft status
-		if ($action == 'modif')
-		{
+		if ($action == 'modif') {
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-			{
-			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
-			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
+				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
 			$text = $langs->trans('ConfirmUnvalidateOrder', $object->ref);
 			$formquestion = array();
-			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-			{
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
 				$forcecombo = 0;
-				if ($conf->browser->name == 'ie') $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				if ($conf->browser->name == 'ie') {
+					$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				}
 				$formquestion = array(
 					// 'text' => $langs->trans("ConfirmClone"),
 					// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
@@ -1969,25 +1950,24 @@ if ($action == 'create' && $usercancreate)
 		/*
 		 * Confirmation de l'annulation
 		 */
-		if ($action == 'cancel')
-		{
+		if ($action == 'cancel') {
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-			{
-			   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
-			   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
+				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
 			$text = $langs->trans('ConfirmCancelOrder', $object->ref);
 			$formquestion = array();
-			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change)
-			{
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
 				$forcecombo = 0;
-				if ($conf->browser->name == 'ie') $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				if ($conf->browser->name == 'ie') {
+					$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				}
 				$formquestion = array(
 					// 'text' => $langs->trans("ConfirmClone"),
 					// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
@@ -2000,8 +1980,7 @@ if ($action == 'create' && $usercancreate)
 		}
 
 		// Confirmation to delete line
-		if ($action == 'ask_deleteline')
-		{
+		if ($action == 'ask_deleteline') {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
 		}
 
@@ -2018,8 +1997,11 @@ if ($action == 'create' && $usercancreate)
 		$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 		// Note that $action and $object may be modified by hook
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
-		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+		if (empty($reshook)) {
+			$formconfirm .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm = $hookmanager->resPrint;
+		}
 
 		// Print form confirm
 		print $formconfirm;
@@ -2035,16 +2017,17 @@ if ($action == 'create' && $usercancreate)
 		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
+		}
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($usercancreate)
-			{
-				if ($action != 'classify')
+			if ($usercancreate) {
+				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				}
 				if ($action == 'classify') {
 					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -2080,8 +2063,7 @@ if ($action == 'create' && $usercancreate)
 
 		print '<table class="border tableforfield centpercent">';
 
-		if ($soc->outstanding_limit)
-		{
+		if ($soc->outstanding_limit) {
 			// Outstanding Bill
 			print '<tr><td class="titlefield">';
 			print $langs->trans('OutstandingBill');
@@ -2222,8 +2204,7 @@ if ($action == 'create' && $usercancreate)
 		print '</td></tr>';
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			// Multicurrency code
 			print '<tr>';
 			print '<td>';
@@ -2238,8 +2219,7 @@ if ($action == 'create' && $usercancreate)
 			print '</td></tr>';
 
 			// Multicurrency rate
-			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
-			{
+			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 				print '<tr>';
 				print '<td>';
 				$editenable = $usercancreate && $object->multicurrency_code && $object->multicurrency_code != $conf->currency && $object->statut == $object::STATUS_DRAFT;
@@ -2325,8 +2305,7 @@ if ($action == 'create' && $usercancreate)
 			print $form->editfieldkey("IncotermLabel", 'incoterm', '', $object, $editenable);
 			print '</td>';
 			print '<td>';
-			if ($action != 'editincoterm')
-			{
+			if ($action != 'editincoterm') {
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -2361,8 +2340,7 @@ if ($action == 'create' && $usercancreate)
 
 		print '<table class="border tableforfield centpercent">';
 
-		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
-		{
+		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount HT
 			print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
 			print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -2391,13 +2369,11 @@ if ($action == 'create' && $usercancreate)
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
 		// Amount Local Taxes
-		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
-		{
+		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { 		// Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 			print '<td>'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
-		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
-		{
+		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { 		// Localtax2 IRPF
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 			print '<td>'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
@@ -2453,18 +2429,17 @@ if ($action == 'create' && $usercancreate)
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
 		// Show object lines
-		if (!empty($object->lines))
+		if (!empty($object->lines)) {
 			$ret = $object->printObjectLines($action, $mysoc, $soc, $lineid, 1);
+		}
 
 		$numlines = count($object->lines);
 
 		/*
 		 * Form to add new line
 		 */
-		if ($object->statut == Commande::STATUS_DRAFT && $usercancreate && $action != 'selectlines')
-		{
-			if ($action != 'editline')
-			{
+		if ($object->statut == Commande::STATUS_DRAFT && $usercancreate && $action != 'selectlines') {
+			if ($action != 'editline') {
 				// Add free products/services
 				$object->formAddObjectLine(1, $mysoc, $soc);
 
@@ -2500,13 +2475,14 @@ if ($action == 'create' && $usercancreate)
 					if ($object->statut > Commande::STATUS_DRAFT || !empty($conf->global->COMMANDE_SENDBYEMAIL_FOR_ALL_STATUS)) {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						} else {
+							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						}
 					}
 				}
 
 				// Valid
-				if ($object->statut == Commande::STATUS_DRAFT && ($object->total_ttc >= 0 || !empty($conf->global->ORDER_ENABLE_NEGATIVE)) && $numlines > 0 && $usercanvalidate)
-				{
+				if ($object->statut == Commande::STATUS_DRAFT && ($object->total_ttc >= 0 || !empty($conf->global->ORDER_ENABLE_NEGATIVE)) && $numlines > 0 && $usercanvalidate) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
 				}
 				// Edit
@@ -2523,8 +2499,7 @@ if ($action == 'create' && $usercancreate)
 				}*/
 
 				// Create a purchase order
-				if (!empty($conf->global->WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_ORDER))
-				{
+				if (!empty($conf->global->WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_ORDER)) {
 					if (!empty($conf->fournisseur->enabled) && $object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0) {
 						if ($usercancreatepurchaseorder) {
 							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddPurchaseOrder").'</a>';
@@ -2598,8 +2573,7 @@ if ($action == 'create' && $usercancreate)
 				}
 
 				// Cancel order
-				if ($object->statut == Commande::STATUS_VALIDATED && (!empty($usercanclose) || !empty($usercancancel)))
-				{
+				if ($object->statut == Commande::STATUS_VALIDATED && (!empty($usercanclose) || !empty($usercancancel))) {
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a></div>';
 				}
 
@@ -2620,8 +2594,7 @@ if ($action == 'create' && $usercancreate)
 			$action = 'presend';
 		}
 
-		if ($action != 'presend')
-		{
+		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 			print '<a name="builddoc"></a>'; // ancre
 			// Documents
@@ -2639,25 +2612,24 @@ if ($action == 'create' && $usercancreate)
 
 			$compatibleImportElementsList = false;
 			if ($usercancreate
-				&& $object->statut == Commande::STATUS_DRAFT)
-			{
+				&& $object->statut == Commande::STATUS_DRAFT) {
 				$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
 			}
 			$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
 
 			// Show online payment link
 			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
-			if (!empty($conf->global->ORDER_HIDE_ONLINE_PAYMENT_ON_ORDER)) $useonlinepayment = 0;
-			if ($object->statut != Commande::STATUS_DRAFT && $useonlinepayment)
-			{
+			if (!empty($conf->global->ORDER_HIDE_ONLINE_PAYMENT_ON_ORDER)) {
+				$useonlinepayment = 0;
+			}
+			if ($object->statut != Commande::STATUS_DRAFT && $useonlinepayment) {
 				print '<br><!-- Link to pay -->';
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 				print showOnlinePaymentUrl('order', $object->ref).'<br>';
 			}
 
 			// Show direct download link
-			if ($object->statut != Commande::STATUS_DRAFT && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD))
-			{
+			if ($object->statut != Commande::STATUS_DRAFT && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
 				print '<br><!-- Link to download main doc -->'."\n";
 				print showDirectDownloadLink($object).'<br>';
 			}
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 71a26eea698..768e6a78c70 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -165,28 +165,37 @@ class Orders extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('commande').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -195,8 +204,7 @@ class Orders extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -207,13 +215,11 @@ class Orders extends DolibarrApi
 		dol_syslog("API Rest request");
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$commande_static = new Commande($this->db);
 				if ($commande_static->fetch($obj->rowid)) {
@@ -252,12 +258,12 @@ class Orders extends DolibarrApi
 			$this->commande->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
-          $lines = array();
-          foreach ($request_data["lines"] as $line) {
-            array_push($lines, (object) $line);
-          }
-          $this->commande->lines = $lines;
-        }*/
+		  $lines = array();
+		  foreach ($request_data["lines"] as $line) {
+			array_push($lines, (object) $line);
+		  }
+		  $this->commande->lines = $lines;
+		}*/
 
 		if ($this->commande->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating order", array_merge(array($this->commande->error), $this->commande->errors));
@@ -323,33 +329,33 @@ class Orders extends DolibarrApi
 		}
 		$request_data = (object) $request_data;
 		$updateRes = $this->commande->addline(
-						$request_data->desc,
-						$request_data->subprice,
-						$request_data->qty,
-						$request_data->tva_tx,
-						$request_data->localtax1_tx,
-						$request_data->localtax2_tx,
-						$request_data->fk_product,
-						$request_data->remise_percent,
-						$request_data->info_bits,
-						$request_data->fk_remise_except,
-						'HT',
-						0,
-						$request_data->date_start,
-						$request_data->date_end,
-						$request_data->product_type,
-						$request_data->rang,
-						$request_data->special_code,
-						$request_data->fk_parent_line,
-						$request_data->fk_fournprice,
-						$request_data->pa_ht,
-						$request_data->label,
-						$request_data->array_options,
-						$request_data->fk_unit,
-						$request_data->origin,
-						$request_data->origin_id,
-						$request_data->multicurrency_subprice,
-						$request_data->ref_ext
+			$request_data->desc,
+			$request_data->subprice,
+			$request_data->qty,
+			$request_data->tva_tx,
+			$request_data->localtax1_tx,
+			$request_data->localtax2_tx,
+			$request_data->fk_product,
+			$request_data->remise_percent,
+			$request_data->info_bits,
+			$request_data->fk_remise_except,
+			'HT',
+			0,
+			$request_data->date_start,
+			$request_data->date_end,
+			$request_data->product_type,
+			$request_data->rang,
+			$request_data->special_code,
+			$request_data->fk_parent_line,
+			$request_data->fk_fournprice,
+			$request_data->pa_ht,
+			$request_data->label,
+			$request_data->array_options,
+			$request_data->fk_unit,
+			$request_data->origin,
+			$request_data->origin_id,
+			$request_data->multicurrency_subprice,
+			$request_data->ref_ext
 		);
 
 		if ($updateRes > 0) {
@@ -407,9 +413,9 @@ class Orders extends DolibarrApi
 			$request_data->special_code,
 			$request_data->array_options,
 			$request_data->fk_unit,
-	  		$request_data->multicurrency_subprice,
+			$request_data->multicurrency_subprice,
 			0,
-	  		$request_data->ref_ext
+			$request_data->ref_ext
 		);
 
 		if ($updateRes > 0) {
@@ -613,18 +619,20 @@ class Orders extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->commande->$field = $value;
 		}
 
 		// Update availability
 		if (!empty($this->commande->availability_id)) {
-			if ($this->commande->availability($this->commande->availability_id) < 0)
-			throw new RestException(400, 'Error while updating availability');
+			if ($this->commande->availability($this->commande->availability_id) < 0) {
+				throw new RestException(400, 'Error while updating availability');
+			}
 		}
 
-		if ($this->commande->update(DolibarrApiAccess::$user) > 0)
-		{
+		if ($this->commande->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->commande->error);
@@ -979,8 +987,9 @@ class Orders extends DolibarrApi
 	{
 		$commande = array();
 		foreach (Orders::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, $field." field missing");
+			}
 			$commande[$field] = $data[$field];
 		}
 		return $commande;
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index cb16e419ee8..aac06dc4775 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -403,8 +403,7 @@ class Commande extends CommonOrder
 		global $langs, $conf;
 		$langs->load("order");
 
-		if (!empty($conf->global->COMMANDE_ADDON))
-		{
+		if (!empty($conf->global->COMMANDE_ADDON)) {
 			$mybool = false;
 
 			$file = $conf->global->COMMANDE_ADDON.".php";
@@ -412,16 +411,14 @@ class Commande extends CommonOrder
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-			foreach ($dirmodels as $reldir)
-			{
+			foreach ($dirmodels as $reldir) {
 				$dir = dol_buildpath($reldir."core/modules/commande/");
 
 				// Load file with numbering class (if found)
 				$mybool |= @include_once $dir.$file;
 			}
 
-			if ($mybool === false)
-			{
+			if ($mybool === false) {
 				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
@@ -429,8 +426,7 @@ class Commande extends CommonOrder
 			$obj = new $classname();
 			$numref = $obj->getNextValue($soc, $this);
 
-			if ($numref != "")
-			{
+			if ($numref != "") {
 				return $numref;
 			} else {
 				$this->error = $obj->error;
@@ -461,15 +457,13 @@ class Commande extends CommonOrder
 		$error = 0;
 
 		// Protection
-		if ($this->statut == self::STATUS_VALIDATED)
-		{
+		if ($this->statut == self::STATUS_VALIDATED) {
 			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
 			return 0;
 		}
 
 		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->creer))
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->validate))))
-		{
+			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->validate)))) {
 			$this->error = 'NotEnoughPermissions';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -487,8 +481,7 @@ class Commande extends CommonOrder
 		$result = $soc->set_as_client();
 
 		// Define new ref
-		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-		{
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
 			$num = $this->getNextNumRef($soc);
 		} else {
 			$num = $this->ref;
@@ -505,8 +498,7 @@ class Commande extends CommonOrder
 
 		dol_syslog(get_class($this)."::valid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			dol_print_error($this->db);
 			$this->error = $this->db->lasterror();
 			$error++;
@@ -531,7 +523,9 @@ class Commande extends CommonOrder
 							$this->error = $mouvP->error;
 						}
 					}
-					if ($error) break;
+					if ($error) {
+						break;
+					}
 				}
 			}
 		}
@@ -539,7 +533,9 @@ class Commande extends CommonOrder
 		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('ORDER_VALIDATE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -547,30 +543,28 @@ class Commande extends CommonOrder
 			$this->oldref = $this->ref;
 
 			// Rename directory if dir was a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref))
-			{
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 				// Now we rename also files into index
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'commande/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'commande/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
-				if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 				$oldref = dol_sanitizeFileName($this->ref);
 				$newref = dol_sanitizeFileName($num);
 				$dirsource = $conf->commande->multidir_output[$this->entity].'/'.$oldref;
 				$dirdest = $conf->commande->multidir_output[$this->entity].'/'.$newref;
-				if (!$error && file_exists($dirsource))
-				{
+				if (!$error && file_exists($dirsource)) {
 					dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
 
-					if (@rename($dirsource, $dirdest))
-					{
+					if (@rename($dirsource, $dirdest)) {
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
 						$listoffiles = dol_dir_list($conf->commande->multidir_output[$this->entity].'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-						foreach ($listoffiles as $fileentry)
-						{
+						foreach ($listoffiles as $fileentry) {
 							$dirsource = $fileentry['name'];
 							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 							$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -583,15 +577,13 @@ class Commande extends CommonOrder
 		}
 
 		// Set new ref and current status
-		if (!$error)
-		{
+		if (!$error) {
 			$this->ref = $num;
 			$this->statut = self::STATUS_VALIDATED;
 			$this->brouillon = 0;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -616,14 +608,12 @@ class Commande extends CommonOrder
 		$error = 0;
 
 		// Protection
-		if ($this->statut <= self::STATUS_DRAFT)
-		{
+		if ($this->statut <= self::STATUS_DRAFT) {
 			return 0;
 		}
 
 		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->creer))
-			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->validate))))
-		{
+			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->validate)))) {
 			$this->error = 'Permission denied';
 			return -1;
 		}
@@ -636,31 +626,28 @@ class Commande extends CommonOrder
 		$sql .= " SET fk_statut = ".self::STATUS_DRAFT;
 		$sql .= " WHERE rowid = ".$this->id;
 
-		if ($this->db->query($sql))
-		{
-			if (!$error)
-			{
+		if ($this->db->query($sql)) {
+			if (!$error) {
 				$this->oldcopy = clone $this;
 			}
 
 			// If stock is decremented on validate order, we must reincrement it
-			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
-			{
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1) {
 				$result = 0;
 
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
 				$num = count($this->lines);
-				for ($i = 0; $i < $num; $i++)
-				{
-					if ($this->lines[$i]->fk_product > 0)
-					{
+				for ($i = 0; $i < $num; $i++) {
+					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We increment stock of product (and sub-products)
 						$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderBackToDraftInDolibarr", $this->ref));
-						if ($result < 0) { $error++; $this->error = $mouvP->error; break; }
+						if ($result < 0) {
+							$error++; $this->error = $mouvP->error; break;
+						}
 					}
 				}
 			}
@@ -668,7 +655,9 @@ class Commande extends CommonOrder
 			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_UNVALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (!$error) {
@@ -700,8 +689,7 @@ class Commande extends CommonOrder
 		// phpcs:enable
 		$error = 0;
 
-		if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED)
-		{
+		if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED) {
 			dol_syslog(get_class($this)."::set_reopen order has not status closed", LOG_WARNING);
 			return 0;
 		}
@@ -714,11 +702,12 @@ class Commande extends CommonOrder
 
 		dol_syslog(get_class($this)."::set_reopen", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('ORDER_REOPEN', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		} else {
 			$error++;
@@ -726,16 +715,14 @@ class Commande extends CommonOrder
 			dol_print_error($this->db);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->billed = 0;
 
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::set_reopen ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -760,10 +747,8 @@ class Commande extends CommonOrder
 		$usercanclose = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->creer))
 			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->close)));
 
-		if ($usercanclose)
-		{
-			if ($this->statut == self::STATUS_CLOSED)
-			{
+		if ($usercanclose) {
+			if ($this->statut == self::STATUS_CLOSED) {
 				return 0;
 			}
 			$this->db->begin();
@@ -776,18 +761,17 @@ class Commande extends CommonOrder
 			$sql .= " date_cloture = '".$this->db->idate($now)."'";
 			$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
-			if ($this->db->query($sql))
-			{
-				if (!$notrigger)
-				{
+			if ($this->db->query($sql)) {
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('ORDER_CLOSE', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$this->statut = self::STATUS_CLOSED;
 
 					$this->db->commit();
@@ -827,24 +811,19 @@ class Commande extends CommonOrder
 		$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
 		dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			// If stock is decremented on validate order, we must reincrement it
-			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1)
-			{
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER) && $conf->global->STOCK_CALCULATE_ON_VALIDATE_ORDER == 1) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
 				$num = count($this->lines);
-				for ($i = 0; $i < $num; $i++)
-				{
-					if ($this->lines[$i]->fk_product > 0)
-					{
+				for ($i = 0; $i < $num; $i++) {
+					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						// We increment stock of product (and sub-products)
 						$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("OrderCanceledInDolibarr", $this->ref)); // price is 0, we don't want WAP to be changed
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							$this->error = $mouvP->error;
 							break;
@@ -853,22 +832,21 @@ class Commande extends CommonOrder
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_CANCEL', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->statut = self::STATUS_CANCELED;
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(get_class($this)."::cancel ".$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -903,10 +881,12 @@ class Commande extends CommonOrder
 		$delivery_date = empty($this->delivery_date) ? $this->date_livraison : $this->delivery_date;
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = $conf->currency;
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
@@ -915,11 +895,9 @@ class Commande extends CommonOrder
 		dol_syslog(get_class($this)."::create user=".$user->id);
 
 		// Check parameters
-		if (!empty($this->ref))	// We check that ref is not already used
-		{
+		if (!empty($this->ref)) {	// We check that ref is not already used
 			$result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->error = 'ErrorRefAlreadyExists';
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
@@ -929,14 +907,12 @@ class Commande extends CommonOrder
 
 		$soc = new Societe($this->db);
 		$result = $soc->fetch($this->socid);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = "Failed to fetch company";
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -2;
 		}
-		if (!empty($conf->global->ORDER_REQUIRE_SOURCE) && $this->source < 0)
-		{
+		if (!empty($conf->global->ORDER_REQUIRE_SOURCE) && $this->source < 0) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Source"));
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
@@ -991,25 +967,24 @@ class Commande extends CommonOrder
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'commande');
 
-			if ($this->id)
-			{
+			if ($this->id) {
 				$fk_parent_line = 0;
 				$num = count($this->lines);
 
 				/*
 				 *  Insert products details into db
 				 */
-				for ($i = 0; $i < $num; $i++)
-				{
+				for ($i = 0; $i < $num; $i++) {
 					$line = $this->lines[$i];
 
 					// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 					//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-					if (!is_object($line)) $line = (object) $line;
+					if (!is_object($line)) {
+						$line = (object) $line;
+					}
 
 					// Reset fk_parent_line for no child products and special product
 					if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
@@ -1018,7 +993,9 @@ class Commande extends CommonOrder
 
 					// Complete vat rate with code
 					$vatrate = $line->tva_tx;
-					if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
+					if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) {
+						$vatrate .= ' ('.$line->vat_src_code.')';
+					}
 
 					if (!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
 						$originid = $line->origin_id;
@@ -1062,10 +1039,8 @@ class Commande extends CommonOrder
 						0,
 						$line->ref_ext
 					);
-					if ($result < 0)
-					{
-						if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER)
-						{
+					if ($result < 0) {
+						if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER) {
 							$this->error = $this->db->lasterror();
 							$this->errors[] = $this->error;
 							dol_print_error($this->db);
@@ -1081,30 +1056,25 @@ class Commande extends CommonOrder
 
 				// update ref
 				$initialref = '(PROV'.$this->id.')';
-				if (!empty($this->ref)) $initialref = $this->ref;
+				if (!empty($this->ref)) {
+					$initialref = $this->ref;
+				}
 
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."commande SET ref='".$this->db->escape($initialref)."' WHERE rowid=".$this->id;
-				if ($this->db->query($sql))
-				{
+				if ($this->db->query($sql)) {
 					$this->ref = $initialref;
 
-					if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-					{
+					if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {	// To use new linkedObjectsIds instead of old linked_objects
 						$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 					}
 
 					// Add object linked
-					if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
-					{
-						foreach ($this->linked_objects as $origin => $tmp_origin_id)
-						{
-							if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-							{
-								foreach ($tmp_origin_id as $origin_id)
-								{
+					if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) {
+						foreach ($this->linked_objects as $origin => $tmp_origin_id) {
+							if (is_array($tmp_origin_id)) {       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+								foreach ($tmp_origin_id as $origin_id) {
 									$ret = $this->add_object_linked($origin, $origin_id);
-									if (!$ret)
-									{
+									if (!$ret) {
 										$this->error = $this->db->lasterror();
 										$error++;
 									}
@@ -1113,8 +1083,7 @@ class Commande extends CommonOrder
 							{
 								$origin_id = $tmp_origin_id;
 								$ret = $this->add_object_linked($origin, $origin_id);
-								if (!$ret)
-								{
+								if (!$ret) {
 									$this->error = $this->db->lasterror();
 									$error++;
 								}
@@ -1122,23 +1091,22 @@ class Commande extends CommonOrder
 						}
 					}
 
-					if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
-					{
+					if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id)) {   // Get contact from origin object
 						$originforcontact = $this->origin;
 						$originidforcontact = $this->origin_id;
-						if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
-						{
+						if ($originforcontact == 'shipping') {     // shipment and order share the same contacts. If creating from shipment we take data of order
 							require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 							$exp = new Expedition($this->db);
 							$exp->fetch($this->origin_id);
 							$exp->fetchObjectLinked();
-							if (count($exp->linkedObjectsIds['commande']) > 0)
-							{
-								foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-								{
+							if (count($exp->linkedObjectsIds['commande']) > 0) {
+								foreach ($exp->linkedObjectsIds['commande'] as $key => $value) {
 									$originforcontact = 'commande';
-									if (is_object($value)) $originidforcontact = $value->id;
-									else $originidforcontact = $value;
+									if (is_object($value)) {
+										$originidforcontact = $value->id;
+									} else {
+										$originidforcontact = $value;
+									}
 									break; // We take first one
 								}
 							}
@@ -1148,32 +1116,33 @@ class Commande extends CommonOrder
 						$sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$this->db->escape($originforcontact)."'";
 
 						$resqlcontact = $this->db->query($sqlcontact);
-						if ($resqlcontact)
-						{
-							while ($objcontact = $this->db->fetch_object($resqlcontact))
-							{
+						if ($resqlcontact) {
+							while ($objcontact = $this->db->fetch_object($resqlcontact)) {
 								//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
 								$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
 							}
-						} else dol_print_error($resqlcontact);
+						} else {
+							dol_print_error($resqlcontact);
+						}
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						$result = $this->insertExtraFields();
-						if ($result < 0) $error++;
+						if ($result < 0) {
+							$error++;
+						}
 					}
 
-					if (!$error && !$notrigger)
-					{
+					if (!$error && !$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('ORDER_CREATE', $user);
-						if ($result < 0) $error++;
+						if ($result < 0) {
+							$error++;
+						}
 						// End call triggers
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						$this->db->commit();
 						return $this->id;
 					} else {
@@ -1210,19 +1179,18 @@ class Commande extends CommonOrder
 		$this->db->begin();
 
 		// get lines so they will be clone
-		foreach ($this->lines as $line)
+		foreach ($this->lines as $line) {
 			$line->fetch_optionals();
+		}
 
 		// Load source object
 		$objFrom = clone $this;
 
 		// Change socid if needed
-		if (!empty($socid) && $socid != $this->socid)
-		{
+		if (!empty($socid) && $socid != $this->socid) {
 			$objsoc = new Societe($this->db);
 
-			if ($objsoc->fetch($socid) > 0)
-			{
+			if ($objsoc->fetch($socid) > 0) {
 				$this->socid = $objsoc->id;
 				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
 				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
@@ -1244,56 +1212,55 @@ class Commande extends CommonOrder
 		$this->date_commande = dol_now();
 		$this->date_creation      = '';
 		$this->date_validation    = '';
-		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) $this->ref_client = '';
+		if (empty($conf->global->MAIN_KEEP_REF_CUSTOMER_ON_CLONING)) {
+			$this->ref_client = '';
+		}
 
 		// Do not clone ref_ext
 		$num = count($this->lines);
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			$this->lines[$i]->ref_ext = '';
 		}
 
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// copy internal contacts
-			if ($this->copy_linked_contact($objFrom, 'internal') < 0)
-			{
+			if ($this->copy_linked_contact($objFrom, 'internal') < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// copy external contacts if same company
-			if ($this->socid == $objFrom->socid)
-			{
-				if ($this->copy_linked_contact($objFrom, 'external') < 0)
+			if ($this->socid == $objFrom->socid) {
+				if ($this->copy_linked_contact($objFrom, 'external') < 0) {
 					$error++;
+				}
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Hook of thirdparty module
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('objFrom'=>$objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 		}
 
 		unset($this->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -1323,8 +1290,7 @@ class Commande extends CommonOrder
 		$this->source = 0;
 
 		$num = count($object->lines);
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			$line = new OrderLine($this->db);
 
 			$line->libelle           = $object->lines[$i]->libelle;
@@ -1358,8 +1324,9 @@ class Commande extends CommonOrder
 
 			// get extrafields from original line
 			$object->lines[$i]->fetch_optionals();
-			foreach ($object->lines[$i]->array_options as $options_key => $value)
+			foreach ($object->lines[$i]->array_options as $options_key => $value) {
 				$line->array_options[$options_key] = $value;
+			}
 
 				$this->lines[$i] = $line;
 		}
@@ -1380,8 +1347,7 @@ class Commande extends CommonOrder
 		$this->contact_id = $object->contact_id;
 		$this->ref_client           = $object->ref_client;
 
-		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN))
-		{
+		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN)) {
 			$this->note_private         = $object->note_private;
 			$this->note_public          = $object->note_public;
 		}
@@ -1402,34 +1368,36 @@ class Commande extends CommonOrder
 		}
 		// Possibility to add external linked objects with hooks
 		$this->linked_objects[$this->origin] = $this->origin_id;
-		if (is_array($object->other_linked_objects) && !empty($object->other_linked_objects))
-		{
+		if (is_array($object->other_linked_objects) && !empty($object->other_linked_objects)) {
 			$this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
 		}
 
 		$ret = $this->create($user);
 
-		if ($ret > 0)
-		{
+		if ($ret > 0) {
 			// Actions hooked (by external module)
 			$hookmanager->initHooks(array('orderdao'));
 
 			$parameters = array('objFrom'=>$object);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
+			if ($reshook < 0) {
+				$error++;
+			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Validate immediatly the order
-				if (!empty($conf->global->ORDER_VALID_AFTER_CLOSE_PROPAL))
-				{
+				if (!empty($conf->global->ORDER_VALID_AFTER_CLOSE_PROPAL)) {
 					$this->fetch($ret);
 					$this->valid($user);
 				}
 				return $ret;
-			} else return -1;
-		} else return -1;
+			} else {
+				return -1;
+			}
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -1481,22 +1449,41 @@ class Commande extends CommonOrder
 		$logtext .= ", date_end=$date_end, type=$type special_code=$special_code, fk_unit=$fk_unit, origin=$origin, origin_id=$origin_id, pu_ht_devise=$pu_ht_devise, ref_ext=$ref_ext";
 		dol_syslog(get_class($this).$logtext, LOG_DEBUG);
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
 
-			if (empty($remise_percent)) $remise_percent = 0;
-			if (empty($qty)) $qty = 0;
-			if (empty($info_bits)) $info_bits = 0;
-			if (empty($rang)) $rang = 0;
-			if (empty($txtva)) $txtva = 0;
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
-			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
-			if (empty($this->fk_multicurrency)) $this->fk_multicurrency = 0;
-			if (empty($ref_ext)) $ref_ext = '';
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
+			if (empty($rang)) {
+				$rang = 0;
+			}
+			if (empty($txtva)) {
+				$txtva = 0;
+			}
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
+			if (empty($fk_parent_line) || $fk_parent_line < 0) {
+				$fk_parent_line = 0;
+			}
+			if (empty($this->fk_multicurrency)) {
+				$this->fk_multicurrency = 0;
+			}
+			if (empty($ref_ext)) {
+				$ref_ext = '';
+			}
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
@@ -1509,8 +1496,7 @@ class Commande extends CommonOrder
 			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
-			if ($price_base_type == 'HT')
-			{
+			if ($price_base_type == 'HT') {
 				$pu = $pu_ht;
 			} else {
 				$pu = $pu_ttc;
@@ -1519,7 +1505,9 @@ class Commande extends CommonOrder
 			$desc = trim($desc);
 
 			// Check parameters
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
@@ -1530,14 +1518,12 @@ class Commande extends CommonOrder
 			$this->db->begin();
 
 			$product_type = $type;
-			if (!empty($fk_product))
-			{
+			if (!empty($fk_product)) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
 
-				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
-				{
+				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty) {
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
 					$this->errors[] = $this->error;
@@ -1556,8 +1542,7 @@ class Commande extends CommonOrder
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -1587,8 +1572,7 @@ class Commande extends CommonOrder
 
 			// Rang to use
 			$ranktouse = $rang;
-			if ($ranktouse == -1)
-			{
+			if ($ranktouse == -1) {
 				$rangmax = $this->line_max($fk_parent_line);
 				$ranktouse = $rangmax + 1;
 			}
@@ -1597,8 +1581,7 @@ class Commande extends CommonOrder
 			// Anciens indicateurs: $price, $remise (a ne plus utiliser)
 			$price = $pu;
 			$remise = 0;
-			if ($remise_percent > 0)
-			{
+			if ($remise_percent > 0) {
 				$remise = round(($pu * $remise_percent / 100), 2);
 				$price = $pu - $remise;
 			}
@@ -1661,15 +1644,15 @@ class Commande extends CommonOrder
 			}
 
 			$result = $this->line->insert($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour informations denormalisees au niveau de la commande meme
 				$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$this->db->commit();
 					return $this->line->id;
 				} else {
@@ -1708,16 +1691,19 @@ class Commande extends CommonOrder
 		// phpcs:enable
 		global $conf, $mysoc;
 
-		if (!$qty) $qty = 1;
+		if (!$qty) {
+			$qty = 1;
+		}
 
-		if ($idproduct > 0)
-		{
+		if ($idproduct > 0) {
 			$prod = new Product($this->db);
 			$prod->fetch($idproduct);
 
 			$tva_tx = get_default_tva($mysoc, $this->thirdparty, $prod->id);
 			$tva_npr = get_default_npr($mysoc, $this->thirdparty, $prod->id);
-			if (empty($tva_tx)) $tva_npr = 0;
+			if (empty($tva_tx)) {
+				$tva_npr = 0;
+			}
 			$vat_src_code = ''; // May be defined into tva_tx
 
 			$localtax1_tx = get_localtax($tva_tx, 1, $this->thirdparty, $mysoc, $tva_npr);
@@ -1749,8 +1735,12 @@ class Commande extends CommonOrder
 			$line->fk_unit = $prod->fk_unit;
 
 			// Save the start and end date of the line in the object
-			if ($date_start) { $line->date_start = $date_start; }
-			if ($date_end) { $line->date_end = $date_end; }
+			if ($date_start) {
+				$line->date_start = $date_start;
+			}
+			if ($date_end) {
+				$line->date_end = $date_end;
+			}
 
 			$this->lines[] = $line;
 
@@ -1767,7 +1757,7 @@ class Commande extends CommonOrder
 				 {
 					 // print "id : ".$value[1].' :qty: '.$value[0].'<br>';
 					 if not in lines {
-					 	$this->add_product($value[1], $value[0]);
+						$this->add_product($value[1], $value[0]);
 					 }
 				 }
 			 }
@@ -1788,7 +1778,9 @@ class Commande extends CommonOrder
 	public function fetch($id, $ref = '', $ref_ext = '', $notused = '')
 	{
 		// Check parameters
-		if (empty($id) && empty($ref) && empty($ref_ext)) return -1;
+		if (empty($id) && empty($ref) && empty($ref_ext)) {
+			return -1;
+		}
 
 		$sql = 'SELECT c.rowid, c.entity, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_statut';
 		$sql .= ', c.amount_ht, c.total_ht, c.total_ttc, c.total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
@@ -1814,20 +1806,27 @@ class Commande extends CommonOrder
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON c.fk_input_reason = dr.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
 
-		if ($id) $sql .= " WHERE c.rowid=".$id;
-		else $sql .= " WHERE c.entity IN (".getEntity('commande').")"; // Dont't use entity if you use rowid
+		if ($id) {
+			$sql .= " WHERE c.rowid=".$id;
+		} else {
+			$sql .= " WHERE c.entity IN (".getEntity('commande').")"; // Dont't use entity if you use rowid
+		}
 
-		if ($ref)     $sql .= " AND c.ref='".$this->db->escape($ref)."'";
-		if ($ref_ext) $sql .= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
-		if ($notused) $sql .= " AND c.ref_int='".$this->db->escape($notused)."'";
+		if ($ref) {
+			$sql .= " AND c.ref='".$this->db->escape($ref)."'";
+		}
+		if ($ref_ext) {
+			$sql .= " AND c.ref_ext='".$this->db->escape($ref_ext)."'";
+		}
+		if ($notused) {
+			$sql .= " AND c.ref_int='".$this->db->escape($notused)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->id = $obj->rowid;
 				$this->entity = $obj->entity;
 
@@ -1907,7 +1906,9 @@ class Commande extends CommonOrder
 
 				$this->lines = array();
 
-				if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
@@ -1917,8 +1918,7 @@ class Commande extends CommonOrder
 
 				// Lines
 				$result = $this->fetch_lines();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					return -3;
 				}
 				return 1;
@@ -1953,10 +1953,8 @@ class Commande extends CommonOrder
 		$remise = new DiscountAbsolute($this->db);
 		$result = $remise->fetch($idremise);
 
-		if ($result > 0)
-		{
-			if ($remise->fk_facture)	// Protection against multiple submission
-			{
+		if ($result > 0) {
+			if ($remise->fk_facture) {	// Protection against multiple submission
 				$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
 				$this->db->rollback();
 				return -5;
@@ -1983,11 +1981,9 @@ class Commande extends CommonOrder
 			$line->total_ttc = -$remise->amount_ttc;
 
 			$result = $line->insert();
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result = $this->update_price(1);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -2031,18 +2027,18 @@ class Commande extends CommonOrder
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON (p.rowid = l.fk_product)';
 		$sql .= ' WHERE l.fk_commande = '.$this->id;
-		if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+		if ($only_product) {
+			$sql .= ' AND p.fk_product_type = 0';
+		}
 		$sql .= ' ORDER BY l.rang, l.rowid';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($result);
 
 				$line = new OrderLine($this->db);
@@ -2146,9 +2142,10 @@ class Commande extends CommonOrder
 	public function getNbOfProductsLines()
 	{
 		$nb = 0;
-		foreach ($this->lines as $line)
-		{
-			if ($line->product_type == 0) $nb++;
+		foreach ($this->lines as $line) {
+			if ($line->product_type == 0) {
+				$nb++;
+			}
 		}
 		return $nb;
 	}
@@ -2161,9 +2158,10 @@ class Commande extends CommonOrder
 	public function getNbOfServicesLines()
 	{
 		$nb = 0;
-		foreach ($this->lines as $line)
-		{
-			if ($line->product_type == 1) $nb++;
+		foreach ($this->lines as $line) {
+			if ($line->product_type == 1) {
+				$nb++;
+			}
 		}
 		return $nb;
 	}
@@ -2187,10 +2185,11 @@ class Commande extends CommonOrder
 
 		dol_syslog(get_class($this)."::getNbOfShipments", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $nb = $obj->nb;
+			if ($obj) {
+				$nb = $obj->nb;
+			}
 
 			$this->db->free($resql);
 			return $nb;
@@ -2214,25 +2213,31 @@ class Commande extends CommonOrder
 		$sql = 'SELECT cd.rowid, cd.fk_product,';
 		$sql .= ' sum(ed.qty) as qty';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'expeditiondet as ed,';
-		if ($filtre_statut >= 0) $sql .= ' '.MAIN_DB_PREFIX.'expedition as e,';
+		if ($filtre_statut >= 0) {
+			$sql .= ' '.MAIN_DB_PREFIX.'expedition as e,';
+		}
 		$sql .= ' '.MAIN_DB_PREFIX.'commandedet as cd';
 		$sql .= ' WHERE';
-		if ($filtre_statut >= 0) $sql .= ' ed.fk_expedition = e.rowid AND';
+		if ($filtre_statut >= 0) {
+			$sql .= ' ed.fk_expedition = e.rowid AND';
+		}
 		$sql .= ' ed.fk_origin_line = cd.rowid';
 		$sql .= ' AND cd.fk_commande ='.$this->id;
-		if ($this->fk_product > 0) $sql .= ' AND cd.fk_product = '.$this->fk_product;
-		if ($filtre_statut >= 0) $sql .= ' AND e.fk_statut >= '.$filtre_statut;
+		if ($this->fk_product > 0) {
+			$sql .= ' AND cd.fk_product = '.$this->fk_product;
+		}
+		if ($filtre_statut >= 0) {
+			$sql .= ' AND e.fk_statut >= '.$filtre_statut;
+		}
 		$sql .= ' GROUP BY cd.rowid, cd.fk_product';
 		//print $sql;
 
 		dol_syslog(get_class($this)."::loadExpeditions", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$this->expeditions[$obj->rowid] = $obj->qty;
 				$i++;
@@ -2264,11 +2269,12 @@ class Commande extends CommonOrder
 		$sql .= " AND el.targettype = 'shipping'";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2290,19 +2296,16 @@ class Commande extends CommonOrder
 
 		// Recherche total en stock pour chaque produit
 		// TODO $array_of_product est défini vide juste au dessus !!
-		if (count($array_of_product))
-		{
+		if (count($array_of_product)) {
 			$sql = "SELECT fk_product, sum(ps.reel) as total";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
 			$sql .= " WHERE ps.fk_product IN (".join(',', $array_of_product).")";
 			$sql .= ' GROUP BY fk_product ';
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$this->stocks[$obj->fk_product] = $obj->total;
 					$i++;
@@ -2322,8 +2325,7 @@ class Commande extends CommonOrder
 	 */
 	public function deleteline($user = null, $lineid = 0)
 	{
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			$this->db->begin();
 
 			$sql = "SELECT fk_product, qty";
@@ -2331,12 +2333,10 @@ class Commande extends CommonOrder
 			$sql .= " WHERE rowid = ".$lineid;
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$obj = $this->db->fetch_object($result);
 
-				if ($obj)
-				{
+				if ($obj) {
 					$product = new Product($this->db);
 					$product->id = $obj->fk_product;
 
@@ -2346,12 +2346,10 @@ class Commande extends CommonOrder
 					// For triggers
 					$line->fetch($lineid);
 
-					if ($line->delete($user) > 0)
-					{
+					if ($line->delete($user) > 0) {
 						$result = $this->update_price(1);
 
-						if ($result > 0)
-						{
+						if ($result > 0) {
 							$this->db->commit();
 							return 1;
 						} else {
@@ -2409,8 +2407,7 @@ class Commande extends CommonOrder
 	{
 		$remise = trim($remise) ?trim($remise) : 0;
 
-		if ($user->rights->commande->creer)
-		{
+		if ($user->rights->commande->creer) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2423,34 +2420,31 @@ class Commande extends CommonOrder
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->remise_percent = $remise;
 				$this->update_price(1);
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2475,8 +2469,7 @@ class Commande extends CommonOrder
 		// phpcs:enable
 		$remise = trim($remise) ?trim($remise) : 0;
 
-		if ($user->rights->commande->creer)
-		{
+		if ($user->rights->commande->creer) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2489,34 +2482,31 @@ class Commande extends CommonOrder
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->remise_absolue = $remise;
 				$this->update_price(1);
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2539,8 +2529,7 @@ class Commande extends CommonOrder
 	public function set_date($user, $date, $notrigger = 0)
 	{
 		// phpcs:enable
-		if ($user->rights->commande->creer)
-		{
+		if ($user->rights->commande->creer) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2551,33 +2540,30 @@ class Commande extends CommonOrder
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->date = $date;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2615,8 +2601,7 @@ class Commande extends CommonOrder
 	 */
 	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
-		if ($user->rights->commande->creer)
-		{
+		if ($user->rights->commande->creer) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2627,34 +2612,31 @@ class Commande extends CommonOrder
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->date_livraison = $delivery_date;
 				$this->delivery_date = $delivery_date;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2689,37 +2671,41 @@ class Commande extends CommonOrder
 
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " c.rowid as cid, c.ref";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", sc.fk_soc, sc.fk_user";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE c.entity IN (".getEntity('commande').")";
 		$sql .= " AND c.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$socid) //restriction
-		{
+		if (!$user->rights->societe->client->voir && !$socid) { //restriction
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
-		if ($socid) $sql .= " AND s.rowid = ".$socid;
-		if ($draft) $sql .= " AND c.fk_statut = ".self::STATUS_DRAFT;
-		if (is_object($excluser)) $sql .= " AND c.fk_user_author <> ".$excluser->id;
+		if ($socid) {
+			$sql .= " AND s.rowid = ".$socid;
+		}
+		if ($draft) {
+			$sql .= " AND c.fk_statut = ".self::STATUS_DRAFT;
+		}
+		if (is_object($excluser)) {
+			$sql .= " AND c.fk_user_author <> ".$excluser->id;
+		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		$sql .= $this->db->plimit($limit, $offset);
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$numc = $this->db->num_rows($result);
-			if ($numc)
-			{
+			if ($numc) {
 				$i = 0;
-				while ($i < $numc)
-				{
+				while ($i < $numc) {
 					$obj = $this->db->fetch_object($result);
 
-					if ($shortlist == 1)
-					{
+					if ($shortlist == 1) {
 						$ga[$obj->cid] = $obj->ref;
-					} elseif ($shortlist == 2)
-					{
+					} elseif ($shortlist == 2) {
 						$ga[$obj->cid] = $obj->ref.' ('.$obj->name.')';
 					} else {
 						$ga[$i]['id'] = $obj->cid;
@@ -2748,8 +2734,7 @@ class Commande extends CommonOrder
 		global $user;
 
 		dol_syslog('Commande::availability('.$availability_id.')');
-		if ($this->statut >= self::STATUS_DRAFT)
-		{
+		if ($this->statut >= self::STATUS_DRAFT) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2760,33 +2745,30 @@ class Commande extends CommonOrder
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->availability_id = $availability_id;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2816,8 +2798,7 @@ class Commande extends CommonOrder
 		global $user;
 
 		dol_syslog('Commande::demand_reason('.$demand_reason_id.')');
-		if ($this->statut >= self::STATUS_DRAFT)
-		{
+		if ($this->statut >= self::STATUS_DRAFT) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2828,33 +2809,30 @@ class Commande extends CommonOrder
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->demand_reason_id = $demand_reason_id;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2882,8 +2860,7 @@ class Commande extends CommonOrder
 	public function set_ref_client($user, $ref_client, $notrigger = 0)
 	{
 		// phpcs:enable
-		if ($user->rights->commande->creer)
-		{
+		if ($user->rights->commande->creer) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2894,32 +2871,29 @@ class Commande extends CommonOrder
 
 			dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->ref_client = $ref_client;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2942,8 +2916,7 @@ class Commande extends CommonOrder
 	{
 		$error = 0;
 
-		if ($this->billed)
-		{
+		if ($this->billed) {
 			return 0;
 		}
 
@@ -2953,29 +2926,26 @@ class Commande extends CommonOrder
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
 		dol_syslog(get_class($this)."::classifyBilled", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			if (!$error)
-			{
+		if ($this->db->query($sql)) {
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->billed = 1;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_CLASSIFY_BILLED', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(get_class($this)."::classifyBilled ".$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -3005,28 +2975,26 @@ class Commande extends CommonOrder
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
 		dol_syslog(get_class($this)."::classifyUnBilled", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			if (!$error)
-			{
+		if ($this->db->query($sql)) {
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->billed = 1;
 			}
 
 			// Call trigger
 			$result = $this->call_trigger('ORDER_CLASSIFY_UNBILLED', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->billed = 0;
 
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(get_class($this)."::classifyUnBilled ".$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -3077,17 +3045,32 @@ class Commande extends CommonOrder
 		dol_syslog(get_class($this)."::updateline id=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, date_start=$date_start, date_end=$date_end, type=$type, fk_parent_line=$fk_parent_line, pa_ht=$pa_ht, special_code=$special_code, ref_ext=$ref_ext");
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($this->statut == Commande::STATUS_DRAFT)
-		{
+		if ($this->statut == Commande::STATUS_DRAFT) {
 			// Clean parameters
-			if (empty($qty)) $qty = 0;
-			if (empty($info_bits)) $info_bits = 0;
-			if (empty($txtva)) $txtva = 0;
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
-			if (empty($remise_percent)) $remise_percent = 0;
-			if (empty($special_code) || $special_code == 3) $special_code = 0;
-			if (empty($ref_ext)) $ref_ext = '';
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
+			if (empty($txtva)) {
+				$txtva = 0;
+			}
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
+			if (empty($special_code) || $special_code == 3) {
+				$special_code = 0;
+			}
+			if (empty($ref_ext)) {
+				$ref_ext = '';
+			}
 
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
@@ -3118,8 +3101,7 @@ class Commande extends CommonOrder
 			// Clean vat code
 			$vat_src_code = '';
 			$reg = array();
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -3143,15 +3125,13 @@ class Commande extends CommonOrder
 
 			// Anciens indicateurs: $price, $subprice (a ne plus utiliser)
 			$price = $pu_ht;
-			if ($price_base_type == 'TTC')
-			{
+			if ($price_base_type == 'TTC') {
 				$subprice = $pu_ttc;
 			} else {
 				$subprice = $pu_ht;
 			}
 			$remise = 0;
-			if ($remise_percent > 0)
-			{
+			if ($remise_percent > 0) {
 				$remise = round(($pu * $remise_percent / 100), 2);
 				$price = ($pu - $remise);
 			}
@@ -3161,14 +3141,12 @@ class Commande extends CommonOrder
 			$line->fetch($rowid);
 			$line->fetch_optionals();
 
-			if (!empty($line->fk_product))
-			{
+			if (!empty($line->fk_product)) {
 				$product = new Product($this->db);
 				$result = $product->fetch($line->fk_product);
 				$product_type = $product->type;
 
-				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty)
-				{
+				if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_ORDER) && $product_type == 0 && $product->stock_reel < $qty) {
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnOrder', $product->ref);
 					$this->errors[] = $this->error;
@@ -3185,8 +3163,7 @@ class Commande extends CommonOrder
 			$this->line->context = $this->context;
 
 			// Reorder if fk_parent_line change
-			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
-			{
+			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) {
 				$rangmax = $this->line_max($fk_parent_line);
 				$this->line->rang = $rangmax + 1;
 			}
@@ -3240,10 +3217,11 @@ class Commande extends CommonOrder
 			}
 
 			$result = $this->line->update($user, $notrigger);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour info denormalisees
 				$this->update_price(1);
@@ -3277,12 +3255,24 @@ class Commande extends CommonOrder
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->ref)) $this->ref = trim($this->ref);
-		if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
-		if (isset($this->note) || isset($this->note_private)) $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
-		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
+		if (isset($this->ref)) {
+			$this->ref = trim($this->ref);
+		}
+		if (isset($this->ref_client)) {
+			$this->ref_client = trim($this->ref_client);
+		}
+		if (isset($this->note) || isset($this->note_private)) {
+			$this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->model_pdf)) {
+			$this->model_pdf = trim($this->model_pdf);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key = trim($this->import_key);
+		}
 		$delivery_date = empty($this->delivery_date) ? $this->date_livraison : $this->delivery_date;
 
 		// Check parameters
@@ -3327,28 +3317,25 @@ class Commande extends CommonOrder
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('ORDER_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -3381,13 +3368,14 @@ class Commande extends CommonOrder
 		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('ORDER_DELETE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
 		// Test we can delete
-		if ($this->nb_expedition() != 0)
-		{
+		if ($this->nb_expedition() != 0) {
 			$this->errors[] = $langs->trans('SomeShipmentExists');
 			$error++;
 		}
@@ -3408,13 +3396,17 @@ class Commande extends CommonOrder
 		if (!$error) {
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		if (!$error) {
 			// Delete linked contacts
 			$res = $this->delete_linked_contact();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		// Removed extrafields of object
@@ -3501,8 +3493,7 @@ class Commande extends CommonOrder
 
 		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.date_livraison as delivery_date, c.fk_statut, c.total_ht";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = " AND";
@@ -3510,11 +3501,12 @@ class Commande extends CommonOrder
 		$sql .= $clause." c.entity IN (".getEntity('commande').")";
 		//$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
 		$sql .= " AND ((c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.")) OR (c.fk_statut = ".self::STATUS_CLOSED." AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
-		if ($user->socid) $sql .= " AND c.fk_soc = ".$user->socid;
+		if ($user->socid) {
+			$sql .= " AND c.fk_soc = ".$user->socid;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$response = new WorkboardResponse();
 			$response->warning_delay = $conf->commande->client->warning_delay / 60 / 60 / 24;
 			$response->label = $langs->trans("OrdersToProcess");
@@ -3524,8 +3516,7 @@ class Commande extends CommonOrder
 
 			$generic_commande = new Commande($this->db);
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 				$response->total += $obj->total_ht;
 
@@ -3558,7 +3549,9 @@ class Commande extends CommonOrder
 
 		$label = $langs->trans('OrderSource'.$this->source);
 
-		if ($label == 'OrderSource') return '';
+		if ($label == 'OrderSource') {
+			return '';
+		}
 		return $label;
 	}
 
@@ -3589,7 +3582,9 @@ class Commande extends CommonOrder
 		global $langs, $conf;
 
 		$billedtext = '';
-		if (empty($donotshowbilled)) $billedtext .= ($billed ? ' - '.$langs->transnoentitiesnoconv("Billed") : '');
+		if (empty($donotshowbilled)) {
+			$billedtext .= ($billed ? ' - '.$langs->transnoentitiesnoconv("Billed") : '');
+		}
 
 		$labelTooltip = '';
 
@@ -3649,25 +3644,36 @@ class Commande extends CommonOrder
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
-		if (!empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) $url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
-		else $url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
-
-		if (!$user->rights->commande->lire)
-			$option = 'nolink';
-
-		if ($option !== 'nolink')
-		{
-			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		if (!empty($conf->expedition->enabled) && ($option == '1' || $option == '2')) {
+			$url = DOL_URL_ROOT.'/expedition/shipment.php?id='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/commande/card.php?id='.$this->id;
 		}
 
-		if ($short) return $url;
+		if (!$user->rights->commande->lire) {
+			$option = 'nolink';
+		}
+
+		if ($option !== 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		if ($short) {
+			return $url;
+		}
 
 		$label = '';
 
@@ -3696,10 +3702,8 @@ class Commande extends CommonOrder
 		}
 
 		$linkclose = '';
-		if (empty($notooltip) && $user->rights->commande->lire)
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip) && $user->rights->commande->lire) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("Order");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -3717,15 +3721,17 @@ class Commande extends CommonOrder
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
-		if ($addlinktonotes)
-		{
+		if ($addlinktonotes) {
 			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-			if ($txttoshow)
-			{
+			if ($txttoshow) {
 				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
 				$result .= ' <span class="note inline-block">';
 				$result .= '<a href="'.DOL_URL_ROOT.'/commande/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
@@ -3756,28 +3762,23 @@ class Commande extends CommonOrder
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande as c';
 		$sql .= ' WHERE c.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
@@ -3818,12 +3819,10 @@ class Commande extends CommonOrder
 		$sql .= $this->db->plimit(100);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_prods = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_prods)
-			{
+			while ($i < $num_prods) {
 				$i++;
 				$row = $this->db->fetch_row($resql);
 				$prodids[$i] = $row[0];
@@ -3851,8 +3850,7 @@ class Commande extends CommonOrder
 		// Lines
 		$nbp = 5;
 		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
+		while ($xnbp < $nbp) {
 			$line = new OrderLine($this->db);
 
 			$line->desc = $langs->trans("Description")." ".$xnbp;
@@ -3860,8 +3858,7 @@ class Commande extends CommonOrder
 			$line->subprice = 100;
 			$line->price = 100;
 			$line->tva_tx = 20;
-			if ($xnbp == 2)
-			{
+			if ($xnbp == 2) {
 				$line->total_ht = 50;
 				$line->total_ttc = 60;
 				$line->total_tva = 10;
@@ -3872,8 +3869,7 @@ class Commande extends CommonOrder
 				$line->total_tva = 20;
 				$line->remise_percent = 0;
 			}
-			if ($num_prods > 0)
-			{
+			if ($num_prods > 0) {
 				$prodid = mt_rand(1, $num_prods);
 				$line->fk_product = $prodids[$prodid];
 				$line->product_ref = 'SPECIMEN';
@@ -3907,8 +3903,7 @@ class Commande extends CommonOrder
 		$sql = "SELECT count(co.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande as co";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
@@ -3916,10 +3911,8 @@ class Commande extends CommonOrder
 		$sql .= " ".$clause." co.entity IN (".getEntity('commande').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["orders"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -4021,8 +4014,11 @@ class Commande extends CommonOrder
 	{
 		global $conf, $langs;
 
-		if (empty($this->date_livraison)) $text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
-		else $text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
+		if (empty($this->date_livraison)) {
+			$text = $langs->trans("OrderDate").' '.dol_print_date($this->date_commande, 'day');
+		} else {
+			$text = $text = $langs->trans("DeliveryDate").' '.dol_print_date($this->date_livraison, 'day');
+		}
 		$text .= ' '.($conf->commande->client->warning_delay > 0 ? '+' : '-').' '.round(abs($conf->commande->client->warning_delay) / 3600 / 24, 1).' '.$langs->trans("days").' < '.$langs->trans("Today");
 
 		return $text;
@@ -4128,8 +4124,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
 		$sql .= ' WHERE cd.rowid = '.$rowid;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$objp = $this->db->fetch_object($result);
 			$this->rowid            = $objp->rowid;
 			$this->id = $objp->rowid;
@@ -4238,25 +4233,23 @@ class OrderLine extends CommonOrderLine
 
 		dol_syslog("OrderLine::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Remove extrafields
-			if (!$error)
-			{
+			if (!$error) {
 				$this->id = $this->rowid;
 				$result = $this->deleteExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEORDER_DELETE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -4265,8 +4258,7 @@ class OrderLine extends CommonOrderLine
 				return 1;
 			}
 
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -4296,27 +4288,55 @@ class OrderLine extends CommonOrderLine
 		dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
 		// Clean parameters
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->rang)) $this->rang = 0;
-		if (empty($this->remise)) $this->remise = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
-		if (empty($this->ref_ext)) $this->ref_ext = '';
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->rang)) {
+			$this->rang = 0;
+		}
+		if (empty($this->remise)) {
+			$this->remise = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
+		if (empty($this->ref_ext)) {
+			$this->ref_ext = '';
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
-		{
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-			{
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -4324,7 +4344,9 @@ class OrderLine extends CommonOrderLine
 		}
 
 		// Check parameters
-		if ($this->product_type < 0) return -1;
+		if ($this->product_type < 0) {
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -4380,25 +4402,23 @@ class OrderLine extends CommonOrderLine
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'commandedet');
 			$this->rowid = $this->id;
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEORDER_INSERT', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -4407,8 +4427,7 @@ class OrderLine extends CommonOrderLine
 				return 1;
 			}
 
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::insert ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -4437,30 +4456,64 @@ class OrderLine extends CommonOrderLine
 		$pa_ht_isemptystring = (empty($this->pa_ht) && $this->pa_ht == ''); // If true, we can use a default value. If this->pa_ht = '0', we must use '0'.
 
 		// Clean parameters
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->qty)) $this->qty = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->marque_tx)) $this->marque_tx = 0;
-		if (empty($this->marge_tx)) $this->marge_tx = 0;
-		if (empty($this->remise)) $this->remise = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->product_type)) $this->product_type = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
-		if (empty($this->ref_ext)) $this->ref_ext = '';
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->qty)) {
+			$this->qty = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->marque_tx)) {
+			$this->marque_tx = 0;
+		}
+		if (empty($this->marge_tx)) {
+			$this->marge_tx = 0;
+		}
+		if (empty($this->remise)) {
+			$this->remise = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->product_type)) {
+			$this->product_type = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
+		if (empty($this->ref_ext)) {
+			$this->ref_ext = '';
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
-		{
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-			{
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -4485,8 +4538,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= " , remise_percent=".price2num($this->remise_percent)."";
 		$sql .= " , price=".price2num($this->price).""; // TODO A virer
 		$sql .= " , remise=".price2num($this->remise).""; // TODO A virer
-		if (empty($this->skip_update_total))
-		{
+		if (empty($this->skip_update_total)) {
 			$sql .= " , total_ht=".price2num($this->total_ht)."";
 			$sql .= " , total_tva=".price2num($this->total_tva)."";
 			$sql .= " , total_ttc=".price2num($this->total_ttc)."";
@@ -4501,7 +4553,9 @@ class OrderLine extends CommonOrderLine
 		$sql .= " , date_end=".(!empty($this->date_end) ? "'".$this->db->idate($this->date_end)."'" : "null");
 		$sql .= " , product_type=".$this->product_type;
 		$sql .= " , fk_parent_line=".(!empty($this->fk_parent_line) ? $this->fk_parent_line : "null");
-		if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+		if (!empty($this->rang)) {
+			$sql .= ", rang=".$this->rang;
+		}
 		$sql .= " , fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 
 		// Multicurrency
@@ -4514,23 +4568,21 @@ class OrderLine extends CommonOrderLine
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$error)
-			{
+		if ($resql) {
+			if (!$error) {
 				$this->id = $this->rowid;
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEORDER_UPDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -4539,8 +4591,7 @@ class OrderLine extends CommonOrderLine
 				return 1;
 			}
 
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -4566,8 +4617,12 @@ class OrderLine extends CommonOrderLine
 		$this->db->begin();
 
 		// Clean parameters
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."commandedet SET";
@@ -4581,8 +4636,7 @@ class OrderLine extends CommonOrderLine
 		dol_syslog("OrderLine::update_total", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->db->commit();
 			return 1;
 		} else {
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 57f8147cd57..a266dc0c4cf 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -20,9 +20,9 @@
  */
 
 /**
- *       \file       htdocs/commande/class/commandestats.class.php
- *       \ingroup    commandes
- *       \brief      File of class to manage order statistics
+ *  \file       htdocs/commande/class/commandestats.class.php
+ *  \ingroup    commandes
+ *  \brief      File of class to manage order statistics
  */
 include_once DOL_DOCUMENT_ROOT.'/core/class/stats.class.php';
 include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
@@ -70,16 +70,14 @@ class CommandeStats extends Stats
 		$this->cachefilesuffix = $mode;
 		$this->join = '';
 
-		if ($mode == 'customer')
-		{
+		if ($mode == 'customer') {
 			$object = new Commande($this->db);
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
 			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
 			//$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
-		} elseif ($mode == 'supplier')
-		{
+		} elseif ($mode == 'supplier') {
 			$object = new CommandeFournisseur($this->db);
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
 			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
@@ -90,21 +88,22 @@ class CommandeStats extends Stats
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= ($this->where ? ' AND ' : '').'c.entity IN ('.getEntity('commande').')';
 
-		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-		if ($this->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($this->socid) {
 			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+		if ($this->userid > 0) {
+			$this->where .= ' AND c.fk_user_author = '.$this->userid;
+		}
 
-		if ($typentid)
-		{
+		if ($typentid) {
 			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = c.fk_soc';
 			$this->where .= ' AND s.fk_typent = '.$typentid;
 		}
 
-		if ($categid)
-		{
+		if ($categid) {
 			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cats ON cats.fk_soc = c.fk_soc';
 			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cat.rowid = cats.fk_categorie';
 			$this->where .= ' AND cat.rowid = '.$categid;
@@ -124,7 +123,9 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
@@ -147,7 +148,9 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -169,7 +172,9 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
@@ -192,7 +197,9 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%m') as dm, AVG(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE c.date_commande BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
@@ -213,7 +220,9 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT date_format(c.date_commande,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
@@ -235,7 +244,9 @@ class CommandeStats extends Stats
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-		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 .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND c.rowid = tl.fk_commande AND tl.fk_product = product.rowid";
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index add4244d7dc..0a576707e73 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -41,7 +41,9 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'commande', $id, '');
 
 $object = new Commande($db);
@@ -50,51 +52,39 @@ $object = new Commande($db);
  * Ajout d'un nouveau contact
  */
 
-if ($action == 'addcontact' && $user->rights->commande->creer)
-{
+if ($action == 'addcontact' && $user->rights->commande->creer) {
 	$result = $object->fetch($id);
 
-	if ($result > 0 && $id > 0)
-	{
+	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-
-// bascule du statut d'un contact
-elseif ($action == 'swapstatut' && $user->rights->commande->creer)
-{
-	if ($object->fetch($id))
-	{
+} elseif ($action == 'swapstatut' && $user->rights->commande->creer) {
+	// bascule du statut d'un contact
+	if ($object->fetch($id)) {
 		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
-}
-
-// Efface un contact
-elseif ($action == 'deletecontact' && $user->rights->commande->creer)
-{
+} elseif ($action == 'deletecontact' && $user->rights->commande->creer) {
+	// Efface un contact
 	$object->fetch($id);
 	$result = $object->delete_contact($_GET["lineid"]);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -147,12 +137,10 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->commande->creer)
-			{
+			if ($user->rights->commande->creer) {
 				if ($action != 'classify') {
 					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
@@ -190,10 +178,11 @@ if ($id > 0 || !empty($ref)) {
 
 		// Contacts lines (modules that overwrite templates must declare this into descriptor)
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-		foreach ($dirtpls as $reldir)
-		{
+		foreach ($dirtpls as $reldir) {
 			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	} else {
 		// Contact not found
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index f2f806cc7af..4f75ca3d4c5 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -33,14 +33,14 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 $action = GETPOST('action', 'aZ09');
 
 // Secrutiy check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
 
-if (!$user->rights->facture->creer)
-accessforbidden();
+if (!$user->rights->facture->creer) {
+	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "orders"));
@@ -49,12 +49,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "nom";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "nom";
+}
 
 
 /*
@@ -71,25 +77,34 @@ $thirdpartystatic = new Societe($db);
 
 $sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
 $sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", sc.fk_soc, sc.fk_user ";
+}
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE s.fk_stcomm = st.id AND c.fk_soc = s.rowid";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if (dol_strlen($stcomm))
-{
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if (dol_strlen($stcomm)) {
 	$sql .= " AND s.fk_stcomm=".$stcomm;
 }
-if (GETPOST("search_nom"))  $sql .= natural_search("s.nom", GETPOST("search_nom"));
-if (GETPOST("search_compta")) $sql .= natural_search("s.code_compta", GETPOST("search_compta"));
-if (GETPOST("search_code_client")) $sql .= natural_search("s.code_client", GETPOST("search_code_client"));
-if (dol_strlen($begin))
-{
+if (GETPOST("search_nom")) {
+	$sql .= natural_search("s.nom", GETPOST("search_nom"));
+}
+if (GETPOST("search_compta")) {
+	$sql .= natural_search("s.code_compta", GETPOST("search_compta"));
+}
+if (GETPOST("search_code_client")) {
+	$sql .= natural_search("s.code_client", GETPOST("search_code_client"));
+}
+if (dol_strlen($begin)) {
 	$sql .= " AND s.nom like '".$db->escape($begin)."'";
 }
-if ($socid > 0)
-{
+if ($socid > 0) {
 	$sql .= " AND s.rowid = ".$socid;
 }
 $sql .= " AND c.fk_statut in (1, 2) AND c.facture = 0";
@@ -98,13 +113,11 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -114,8 +127,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -155,8 +167,7 @@ if ($resql)
 
 	print "</tr>\n";
 
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index f51d8635787..37fd7a38928 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -45,8 +45,7 @@ $id			= GETPOST('id', 'int');
 $ref		= GETPOST('ref');
 
 // Security check
-if ($user->socid)
-{
+if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'commande', $id, '');
@@ -56,16 +55,26 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) { $sortfield = $conf->global->MAIN_DOC_SORT_FIELD; }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) { $sortorder = $conf->global->MAIN_DOC_SORT_ORDER; }
+if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
+	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+}
+if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
+	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+}
 
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new Commande($db);
 
@@ -74,8 +83,7 @@ $object = new Commande($db);
  * Actions
  */
 
-if ($object->fetch($id))
-{
+if ($object->fetch($id)) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->commande->multidir_output[$object->entity]."/".dol_sanitizeFileName($object->ref);
 }
@@ -91,10 +99,8 @@ llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|
 
 $form = new Form($db);
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref))
-	{
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref)) {
 		$object->fetch_thirdparty();
 
 		$upload_dir = $conf->commande->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
@@ -105,8 +111,7 @@ if ($id > 0 || !empty($ref))
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		$totalsize = 0;
-		foreach ($filearray as $key => $file)
-		{
+		foreach ($filearray as $key => $file) {
 			$totalsize += $file['size'];
 		}
 
@@ -122,12 +127,10 @@ if ($id > 0 || !empty($ref))
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->commande->creer)
-			{
+			if ($user->rights->commande->creer) {
 				if ($action != 'classify') {
 					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 4a18f96ddde..4b6fcc7d8aa 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -31,7 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
-if (!$user->rights->commande->lire) accessforbidden();
+if (!$user->rights->commande->lire) {
+	accessforbidden();
+}
 
 $hookmanager = new HookManager($db);
 
@@ -43,8 +45,7 @@ $langs->loadLangs(array('orders', 'bills'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -69,8 +70,7 @@ print load_fiche_titre($langs->trans("OrdersArea"), '', 'order');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	// Search customer orders
 	print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -90,16 +90,21 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
 $sql = "SELECT count(c.rowid) as nb, c.fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."commande as c";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity IN (".getEntity('societe').")";
-if ($user->socid) $sql .= ' AND c.fk_soc = '.$user->socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($user->socid) {
+	$sql .= ' AND c.fk_soc = '.$user->socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 $sql .= " GROUP BY c.fk_statut";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -109,14 +114,14 @@ if ($resql)
 	$colorseries = array();
 	$vals = array();
 	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
-		if ($row)
-		{
+		if ($row) {
 			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
 			{
-				if (!isset($vals[$row[1]])) $vals[$row[1]] = 0;
+			if (!isset($vals[$row[1]])) {
+				$vals[$row[1]] = 0;
+			}
 				$vals[$row[1]] += $row[0];
 				$totalinprocess += $row[0];
 			}
@@ -132,18 +137,28 @@ if ($resql)
 	print '<table class="noborder nohover centpercent">';
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";
 	$listofstatus = array(0, 1, 2, 3, -1);
-	foreach ($listofstatus as $status)
-	{
+	foreach ($listofstatus as $status) {
 		$dataseries[] = array($commandestatic->LibStatut($status, 0, 1, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-		if ($status == Commande::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-		if ($status == Commande::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-		if ($status == Commande::STATUS_SHIPMENTONPROCESS) $colorseries[$status] = $badgeStatus4;
-		if ($status == Commande::STATUS_CLOSED && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) $colorseries[$status] = $badgeStatus6;
-		if ($status == Commande::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) $colorseries[$status] = $badgeStatus6;
-		if ($status == Commande::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
+		if ($status == Commande::STATUS_DRAFT) {
+			$colorseries[$status] = '-'.$badgeStatus0;
+		}
+		if ($status == Commande::STATUS_VALIDATED) {
+			$colorseries[$status] = $badgeStatus1;
+		}
+		if ($status == Commande::STATUS_SHIPMENTONPROCESS) {
+			$colorseries[$status] = $badgeStatus4;
+		}
+		if ($status == Commande::STATUS_CLOSED && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
+			$colorseries[$status] = $badgeStatus6;
+		}
+		if ($status == Commande::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
+			$colorseries[$status] = $badgeStatus6;
+		}
+		if ($status == Commande::STATUS_CANCELED) {
+			$colorseries[$status] = $badgeStatus9;
+		}
 
-		if (empty($conf->use_javascript_ajax))
-		{
+		if (empty($conf->use_javascript_ajax)) {
 			print '<tr class="oddeven">';
 			print '<td>'.$commandestatic->LibStatut($status, 0, 0, 1).'</td>';
 			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';
@@ -152,8 +167,7 @@ if ($resql)
 			print "</tr>\n";
 		}
 	}
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		print '<tr class="impair"><td align="center" colspan="2">';
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -181,35 +195,37 @@ if ($resql)
 /*
  * Draft orders
  */
-if (!empty($conf->commande->enabled))
-{
+if (!empty($conf->commande->enabled)) {
 	$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
 	$sql .= ", s.client";
 	$sql .= ", s.code_client";
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity IN (".getEntity('commande').")";
 	$sql .= " AND c.fk_statut = 0";
-	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND c.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("DraftOrders").'</th></tr>';
 		$langs->load("orders");
 		$num = $db->num_rows($resql);
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				$commandestatic->id = $obj->rowid;
@@ -254,29 +270,32 @@ $sql .= ", s.code_client";
 $sql .= ", s.canvas";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity IN (".getEntity('commande').")";
 //$sql.= " AND c.fk_statut > 2";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid) {
+	$sql .= " AND c.fk_soc = ".$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 $sql .= " ORDER BY c.tms DESC";
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastModifiedOrders", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -319,32 +338,38 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 $max = 10;
 
 /*
  * Orders to process
  */
-if (!empty($conf->commande->enabled))
-{
+if (!empty($conf->commande->enabled)) {
 	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
 	$sql .= ", s.client";
 	$sql .= ", s.code_client";
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity IN (".getEntity('commande').")";
 	$sql .= " AND c.fk_statut = ".Commande::STATUS_VALIDATED;
-	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND c.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " ORDER BY c.rowid DESC";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
@@ -352,11 +377,9 @@ if (!empty($conf->commande->enabled))
 		print '<tr class="liste_titre">';
 		print '<th colspan="4">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_VALIDATED.'"><span class="badge">'.$num.'</span></a></th></tr>';
 
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
-			while ($i < $num && $i < $max)
-			{
+			while ($i < $num && $i < $max) {
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
 				print '<td class="nowrap" width="20%">';
@@ -405,31 +428,37 @@ if (!empty($conf->commande->enabled))
 		}
 
 		print "</table></div><br>";
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 /*
  * Orders that are in process
  */
-if (!empty($conf->commande->enabled))
-{
+if (!empty($conf->commande->enabled)) {
 	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
 	$sql .= ", s.client";
 	$sql .= ", s.code_client";
 	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity IN (".getEntity('commande').")";
 	$sql .= " AND c.fk_statut = ".Commande::STATUS_ACCEPTED;
-	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND c.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " ORDER BY c.rowid DESC";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
@@ -437,11 +466,9 @@ if (!empty($conf->commande->enabled))
 		print '<tr class="liste_titre">';
 		print '<th colspan="4">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?search_status='.Commande::STATUS_ACCEPTED.'"><span class="badge">'.$num.'</span></a></th></tr>';
 
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
-			while ($i < $num && $i < $max)
-			{
+			while ($i < $num && $i < $max) {
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
 				print '<td width="20%" class="nowrap">';
@@ -489,7 +516,9 @@ if (!empty($conf->commande->enabled))
 			}
 		}
 		print "</table></div><br>";
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 117afab2398..5dd9a64a8a6 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -31,7 +31,9 @@ if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
-if (!$user->rights->commande->lire)	accessforbidden();
+if (!$user->rights->commande->lire) {
+	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('orders', 'sendings', 'bills'));
@@ -42,12 +44,13 @@ $id = GETPOST("id", 'int');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'commande', $comid, '');
 
 $object = new Commande($db);
-if (!$object->fetch($id, $ref) > 0)
-{
+if (!$object->fetch($id, $ref) > 0) {
 	dol_print_error($db);
 	exit;
 }
@@ -78,12 +81,10 @@ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_cl
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	if ($user->rights->commande->creer)
-	{
+	if ($user->rights->commande->creer) {
 		if ($action != 'classify') {
 			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index a5f548d6e6a..73ac91c7098 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -56,9 +56,13 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'orderlist';
 
 $search_datecloture_start = GETPOST('search_datecloture_start', 'int');
-if (empty($search_datecloture_start)) $search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));
+if (empty($search_datecloture_start)) {
+	$search_datecloture_start = dol_mktime(0, 0, 0, GETPOST('search_datecloture_startmonth', 'int'), GETPOST('search_datecloture_startday', 'int'), GETPOST('search_datecloture_startyear', 'int'));
+}
 $search_datecloture_end = GETPOST('search_datecloture_end', 'int');
-if (empty($search_datecloture_end)) $search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
+if (empty($search_datecloture_end)) {
+	$search_datecloture_end = dol_mktime(23, 59, 59, GETPOST('search_datecloture_endmonth', 'int'), GETPOST('search_datecloture_endday', 'int'), GETPOST('search_datecloture_endyear', 'int'));
+}
 $search_dateorder_start = dol_mktime(0, 0, 0, GETPOST('search_dateorder_start_month', 'int'), GETPOST('search_dateorder_start_day', 'int'), GETPOST('search_dateorder_start_year', 'int'));
 $search_dateorder_end = dol_mktime(23, 59, 59, GETPOST('search_dateorder_end_month', 'int'), GETPOST('search_dateorder_end_day', 'int'), GETPOST('search_dateorder_end_year', 'int'));
 $search_datedelivery_start = dol_mktime(0, 0, 0, GETPOST('search_datedelivery_start_month', 'int'), GETPOST('search_datedelivery_start_day', 'int'), GETPOST('search_datedelivery_start_year', 'int'));
@@ -102,7 +106,9 @@ $search_fk_mode_reglement = GETPOST("search_fk_mode_reglement", 'int');
 
 // Security check
 $id = (GETPOST('orderid') ?GETPOST('orderid', 'int') : GETPOST('id', 'int'));
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'commande', $id, '');
 
 $diroutputmassaction = $conf->commande->multidir_output[$conf->entity].'/temp/massgeneration/'.$user->id;
@@ -112,12 +118,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'c.ref';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 'c.ref';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
 $show_shippable_command = GETPOST('show_shippable_command', 'aZ09');
 
@@ -141,7 +153,9 @@ $fieldstosearchall = array(
 	's.town'=>"Town",
 	'c.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["c.note_private"] = "NotePrivate";
+if (empty($user->socid)) {
+	$fieldstosearchall["c.note_private"] = "NotePrivate";
+}
 
 $checkedtypetiers = 0;
 $arrayfields = array(
@@ -191,21 +205,25 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// 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
 		$search_categ = '';
 		$search_user = '';
 		$search_sale = '';
@@ -248,8 +266,7 @@ if (empty($reshook))
 		$search_fk_mode_reglement = '';
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-	 || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+	 || GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -282,7 +299,9 @@ $help_url = "EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_P
 // llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0 || $search_user > 0) {
+	$sql = 'SELECT DISTINCT';
+}
 $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as name_alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -293,10 +312,15 @@ $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture
 $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 $sql .= " u.login,";
 $sql .= ' c.fk_cond_reglement,c.fk_mode_reglement,c.fk_shipping_method';
-if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+if ($search_categ_cus) {
+	$sql .= ", cc.fk_categorie, cc.fk_soc";
+}
 // 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 : '');
+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
@@ -305,86 +329,171 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if (!empty($search_categ_cus)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+if (!empty($search_categ_cus)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+}
 $sql .= ', '.MAIN_DB_PREFIX.'commande as c';
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
-if ($sall || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
-if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_extrafields as ef on (c.rowid = ef.fk_object)";
+}
+if ($sall || $search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON c.rowid=pd.fk_commande';
+}
+if ($search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = c.fk_projet";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as u ON c.fk_user_author = u.rowid';
 
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-if ($search_user > 0)
-{
+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql .= ' WHERE c.fk_soc = s.rowid';
 $sql .= ' AND c.entity IN ('.getEntity('commande').')';
-if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
-if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($search_ref) $sql .= natural_search('c.ref', $search_ref);
-if ($search_ref_customer) $sql .= natural_search('c.ref_client', $search_ref_customer);
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_billed != '' && $search_billed >= 0) $sql .= ' AND c.facture = '.$search_billed;
-if ($search_status <> '')
-{
-	if ($search_status < 4 && $search_status > -3)
-	{
-		if ($search_status == 1 && empty($conf->expedition->enabled)) $sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
-		else $sql .= ' AND c.fk_statut = '.$search_status; // brouillon, validee, en cours, annulee
+if ($search_product_category > 0) {
+	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+}
+if ($socid > 0) {
+	$sql .= ' AND s.rowid = '.$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($search_ref) {
+	$sql .= natural_search('c.ref', $search_ref);
+}
+if ($search_ref_customer) {
+	$sql .= natural_search('c.ref_client', $search_ref_customer);
+}
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if ($search_billed != '' && $search_billed >= 0) {
+	$sql .= ' AND c.facture = '.$search_billed;
+}
+if ($search_status <> '') {
+	if ($search_status < 4 && $search_status > -3) {
+		if ($search_status == 1 && empty($conf->expedition->enabled)) {
+			$sql .= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated'
+		} else {
+			$sql .= ' AND c.fk_statut = '.$search_status; // brouillon, validee, en cours, annulee
+		}
 	}
-	if ($search_status == 4)
-	{
+	if ($search_status == 4) {
 		$sql .= ' AND c.facture = 1'; // invoice created
 	}
-	if ($search_status == -2)	// To process
-	{
+	if ($search_status == -2) {	// To process
 		//$sql.= ' AND c.fk_statut IN (1,2,3) AND c.facture = 0';
 		$sql .= " AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))"; // If status is 2 and facture=1, it must be selected
 	}
-	if ($search_status == -3)	// To bill
-	{
+	if ($search_status == -3) {	// To bill
 		//$sql.= ' AND c.fk_statut in (1,2,3)';
 		//$sql.= ' AND c.facture = 0'; // invoice not created
 		$sql .= ' AND ((c.fk_statut IN (1,2)) OR (c.fk_statut = 3 AND c.facture = 0))'; // validated, in process or closed but not billed
 	}
 }
 
-if ($search_datecloture_start)               $sql .= " AND c.date_cloture >= '".$db->idate($search_datecloture_start)."'";
-if ($search_datecloture_end)                 $sql .= " AND c.date_cloture <= '".$db->idate($search_datecloture_end)."'";
-if ($search_dateorder_start)                 $sql .= " AND c.date_commande >= '".$db->idate($search_dateorder_start)."'";
-if ($search_dateorder_end)                   $sql .= " AND c.date_commande <= '".$db->idate($search_dateorder_end)."'";
-if ($search_datedelivery_start)              $sql .= " AND c.date_livraison >= '".$db->idate($search_datedelivery_start)."'";
-if ($search_datedelivery_end)                $sql .= " AND c.date_livraison <= '".$db->idate($search_datedelivery_end)."'";
-if ($search_town)                            $sql .= natural_search('s.town', $search_town);
-if ($search_zip)                             $sql .= natural_search("s.zip", $search_zip);
-if ($search_state)                           $sql .= natural_search("state.nom", $search_state);
-if ($search_country)                         $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty)                 $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-if ($search_company)                         $sql .= natural_search('s.nom', $search_company);
-if ($search_company_alias)                   $sql .= natural_search('s.name_alias', $search_company_alias);
-if ($search_sale > 0)                        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
-if ($search_user > 0)                        $sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
-if ($search_total_ht != '')                  $sql .= natural_search('c.total_ht', $search_total_ht, 1);
-if ($search_total_vat != '')                 $sql .= natural_search('c.total_tva', $search_total_vat, 1);
-if ($search_total_ttc != '')                 $sql .= natural_search('c.total_ttc', $search_total_ttc, 1);
-if ($search_warehouse != '' && $search_warehouse != '-1') $sql .= natural_search('c.fk_warehouse', $search_warehouse, 1);
-if ($search_multicurrency_code != '')        $sql .= ' AND c.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
-if ($search_multicurrency_tx != '')          $sql .= natural_search('c.multicurrency_tx', $search_multicurrency_tx, 1);
-if ($search_multicurrency_montant_ht != '')  $sql .= natural_search('c.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
-if ($search_multicurrency_montant_vat != '') $sql .= natural_search('c.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
-if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('c.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
-if ($search_login)                           $sql .= natural_search("u.login", $search_login);
-if ($search_project_ref != '')               $sql .= natural_search("p.ref", $search_project_ref);
-if ($search_project != '')                   $sql .= natural_search("p.title", $search_project);
-if ($search_categ_cus > 0)                   $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
-if ($search_categ_cus == -2)                 $sql .= " AND cc.fk_categorie IS NULL";
-if ($search_fk_cond_reglement > 0) $sql .= " AND c.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
-if ($search_fk_shipping_method > 0) $sql .= " AND c.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
-if ($search_fk_mode_reglement > 0) $sql .= " AND c.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
+if ($search_datecloture_start) {
+	$sql .= " AND c.date_cloture >= '".$db->idate($search_datecloture_start)."'";
+}
+if ($search_datecloture_end) {
+	$sql .= " AND c.date_cloture <= '".$db->idate($search_datecloture_end)."'";
+}
+if ($search_dateorder_start) {
+	$sql .= " AND c.date_commande >= '".$db->idate($search_dateorder_start)."'";
+}
+if ($search_dateorder_end) {
+	$sql .= " AND c.date_commande <= '".$db->idate($search_dateorder_end)."'";
+}
+if ($search_datedelivery_start) {
+	$sql .= " AND c.date_livraison >= '".$db->idate($search_datedelivery_start)."'";
+}
+if ($search_datedelivery_end) {
+	$sql .= " AND c.date_livraison <= '".$db->idate($search_datedelivery_end)."'";
+}
+if ($search_town) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+	$sql .= natural_search("s.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_country) {
+	$sql .= " AND s.fk_pays IN (".$search_country.')';
+}
+if ($search_type_thirdparty) {
+	$sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+}
+if ($search_company) {
+	$sql .= natural_search('s.nom', $search_company);
+}
+if ($search_company_alias) {
+	$sql .= natural_search('s.name_alias', $search_company_alias);
+}
+if ($search_sale > 0) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
+}
+if ($search_user > 0) {
+	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = c.rowid AND ec.fk_socpeople = ".$search_user;
+}
+if ($search_total_ht != '') {
+	$sql .= natural_search('c.total_ht', $search_total_ht, 1);
+}
+if ($search_total_vat != '') {
+	$sql .= natural_search('c.total_tva', $search_total_vat, 1);
+}
+if ($search_total_ttc != '') {
+	$sql .= natural_search('c.total_ttc', $search_total_ttc, 1);
+}
+if ($search_warehouse != '' && $search_warehouse != '-1') {
+	$sql .= natural_search('c.fk_warehouse', $search_warehouse, 1);
+}
+if ($search_multicurrency_code != '') {
+	$sql .= ' AND c.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+}
+if ($search_multicurrency_tx != '') {
+	$sql .= natural_search('c.multicurrency_tx', $search_multicurrency_tx, 1);
+}
+if ($search_multicurrency_montant_ht != '') {
+	$sql .= natural_search('c.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
+}
+if ($search_multicurrency_montant_vat != '') {
+	$sql .= natural_search('c.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
+}
+if ($search_multicurrency_montant_ttc != '') {
+	$sql .= natural_search('c.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+}
+if ($search_login) {
+	$sql .= natural_search("u.login", $search_login);
+}
+if ($search_project_ref != '') {
+	$sql .= natural_search("p.ref", $search_project_ref);
+}
+if ($search_project != '') {
+	$sql .= natural_search("p.title", $search_project);
+}
+if ($search_categ_cus > 0) {
+	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+}
+if ($search_categ_cus == -2) {
+	$sql .= " AND cc.fk_categorie IS NULL";
+}
+if ($search_fk_cond_reglement > 0) {
+	$sql .= " AND c.fk_cond_reglement = ".$db->escape($search_fk_cond_reglement);
+}
+if ($search_fk_shipping_method > 0) {
+	$sql .= " AND c.fk_shipping_method = ".$db->escape($search_fk_shipping_method);
+}
+if ($search_fk_mode_reglement > 0) {
+	$sql .= " AND c.fk_mode_reglement = ".$db->escape($search_fk_mode_reglement);
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -397,13 +506,11 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -413,40 +520,47 @@ $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
 
 $resql = $db->query($sql);
-if ($resql)
-{
-	if ($socid > 0)
-	{
+if ($resql) {
+	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		$title = $langs->trans('ListOfOrders').' - '.$soc->name;
-		if (empty($search_company)) $search_company = $soc->name;
+		if (empty($search_company)) {
+			$search_company = $soc->name;
+		}
 	} else {
 		$title = $langs->trans('ListOfOrders');
 	}
-	if (strval($search_status) == '0')
-	$title .= ' - '.$langs->trans('StatusOrderDraftShort');
-	if ($search_status == 1)
-	$title .= ' - '.$langs->trans('StatusOrderValidatedShort');
-	if ($search_status == 2)
-	$title .= ' - '.$langs->trans('StatusOrderSentShort');
-	if ($search_status == 3)
-	$title .= ' - '.$langs->trans('StatusOrderToBillShort');
-	if ($search_status == 4)
-	$title .= ' - '.$langs->trans('StatusOrderProcessedShort');
-	if ($search_status == -1)
-	$title .= ' - '.$langs->trans('StatusOrderCanceledShort');
-	if ($search_status == -2)
-	$title .= ' - '.$langs->trans('StatusOrderToProcessShort');
-	if ($search_status == -3)
-	$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled) ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
+	if (strval($search_status) == '0') {
+		$title .= ' - '.$langs->trans('StatusOrderDraftShort');
+	}
+	if ($search_status == 1) {
+		$title .= ' - '.$langs->trans('StatusOrderValidatedShort');
+	}
+	if ($search_status == 2) {
+		$title .= ' - '.$langs->trans('StatusOrderSentShort');
+	}
+	if ($search_status == 3) {
+		$title .= ' - '.$langs->trans('StatusOrderToBillShort');
+	}
+	if ($search_status == 4) {
+		$title .= ' - '.$langs->trans('StatusOrderProcessedShort');
+	}
+	if ($search_status == -1) {
+		$title .= ' - '.$langs->trans('StatusOrderCanceledShort');
+	}
+	if ($search_status == -2) {
+		$title .= ' - '.$langs->trans('StatusOrderToProcessShort');
+	}
+	if ($search_status == -3) {
+		$title .= ' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled) ? '' : $langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill');
+	}
 
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-	{
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 		$obj = $db->fetch_object($resql);
 		$id = $obj->rowid;
 		header("Location: ".DOL_URL_ROOT.'/commande/card.php?id='.$id);
@@ -457,47 +571,129 @@ if ($resql)
 
 	$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_datecloture_start)  $param .= '&search_datecloture_start='.urlencode($search_datecloture_start);
-	if ($search_datecloture_end)    $param .= '&search_datecloture_end='.urlencode($search_datecloture_end);
-	if ($search_dateorder_start) 	$param .= '&search_dateorder_start_day='.dol_print_date($search_dateorder_start, '%d').'&search_dateorder_start_month='.dol_print_date($search_dateorder_start, '%m').'&search_dateorder_start_year='.dol_print_date($search_dateorder_start, '%Y');
-	if ($search_dateorder_end) 		$param .= '&search_dateorder_end_day='.dol_print_date($search_dateorder_end, '%d').'&search_dateorder_end_month='.dol_print_date($search_dateorder_end, '%m').'&search_dateorder_end_year='.dol_print_date($search_dateorder_end, '%Y');
-	if ($search_datedelivery_start) $param .= '&search_datedelivery_start_day='.dol_print_date($search_datedelivery_start, '%d').'&search_datedelivery_start_month='.dol_print_date($search_datedelivery_start, '%m').'&search_datedelivery_start_year='.dol_print_date($search_datedelivery_start, '%Y');
-	if ($search_datedelivery_end) 	$param .= '&search_datedelivery_end_day='.dol_print_date($search_datedelivery_end, '%d').'&search_datedelivery_end_month='.dol_print_date($search_datedelivery_end, '%m').'&search_datedelivery_end_year='.dol_print_date($search_datedelivery_end, '%Y');
-	if ($search_ref)      			$param .= '&search_ref='.urlencode($search_ref);
-	if ($search_company)  			$param .= '&search_company='.urlencode($search_company);
-	if ($search_company_alias)  	$param .= '&search_company_alias='.urlencode($search_company_alias);
-	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_warehouse != '')	$param .= '&search_warehouse='.urlencode($search_warehouse);
-	if ($search_login)				$param .= '&search_login='.urlencode($search_login);
-	if ($search_multicurrency_code != '')  $param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
-	if ($search_multicurrency_tx != '')  $param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
-	if ($search_multicurrency_montant_ht != '')  $param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
-	if ($search_multicurrency_montant_vat != '')  $param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
-	if ($search_multicurrency_montant_ttc != '') $param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
-	if ($search_project_ref >= 0) 	$param .= "&search_project_ref=".urlencode($search_project_ref);
-	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_type_thirdparty != '' && $search_type_thirdparty > 0)  $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
-	if ($search_product_category != '') $param .= '&search_product_category='.urlencode($search_product_category);
-	if ($search_categ_cus > 0)      $param .= '&search_categ_cus='.urlencode($search_categ_cus);
-	if ($show_files)            	$param .= '&show_files='.urlencode($show_files);
-	if ($optioncss != '')       	$param .= '&optioncss='.urlencode($optioncss);
-	if ($search_billed != '')		$param .= '&search_billed='.urlencode($search_billed);
-	if ($search_fk_cond_reglement > 0) $param .= '&search_fk_cond_reglement='.$search_fk_cond_reglement;
-	if ($search_fk_shipping_method > 0) $param .= '&search_fk_shipping_method='.$search_fk_shipping_method;
-	if ($search_fk_mode_reglement > 0) $param .= '&search_fk_mode_reglement='.$search_fk_mode_reglement;
+	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_datecloture_start) {
+		$param .= '&search_datecloture_start='.urlencode($search_datecloture_start);
+	}
+	if ($search_datecloture_end) {
+		$param .= '&search_datecloture_end='.urlencode($search_datecloture_end);
+	}
+	if ($search_dateorder_start) {
+		$param .= '&search_dateorder_start_day='.dol_print_date($search_dateorder_start, '%d').'&search_dateorder_start_month='.dol_print_date($search_dateorder_start, '%m').'&search_dateorder_start_year='.dol_print_date($search_dateorder_start, '%Y');
+	}
+	if ($search_dateorder_end) {
+		$param .= '&search_dateorder_end_day='.dol_print_date($search_dateorder_end, '%d').'&search_dateorder_end_month='.dol_print_date($search_dateorder_end, '%m').'&search_dateorder_end_year='.dol_print_date($search_dateorder_end, '%Y');
+	}
+	if ($search_datedelivery_start) {
+		$param .= '&search_datedelivery_start_day='.dol_print_date($search_datedelivery_start, '%d').'&search_datedelivery_start_month='.dol_print_date($search_datedelivery_start, '%m').'&search_datedelivery_start_year='.dol_print_date($search_datedelivery_start, '%Y');
+	}
+	if ($search_datedelivery_end) {
+		$param .= '&search_datedelivery_end_day='.dol_print_date($search_datedelivery_end, '%d').'&search_datedelivery_end_month='.dol_print_date($search_datedelivery_end, '%m').'&search_datedelivery_end_year='.dol_print_date($search_datedelivery_end, '%Y');
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_company) {
+		$param .= '&search_company='.urlencode($search_company);
+	}
+	if ($search_company_alias) {
+		$param .= '&search_company_alias='.urlencode($search_company_alias);
+	}
+	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_warehouse != '') {
+		$param .= '&search_warehouse='.urlencode($search_warehouse);
+	}
+	if ($search_login) {
+		$param .= '&search_login='.urlencode($search_login);
+	}
+	if ($search_multicurrency_code != '') {
+		$param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
+	}
+	if ($search_multicurrency_tx != '') {
+		$param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
+	}
+	if ($search_multicurrency_montant_ht != '') {
+		$param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
+	}
+	if ($search_multicurrency_montant_vat != '') {
+		$param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
+	}
+	if ($search_multicurrency_montant_ttc != '') {
+		$param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
+	}
+	if ($search_project_ref >= 0) {
+		$param .= "&search_project_ref=".urlencode($search_project_ref);
+	}
+	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_type_thirdparty != '' && $search_type_thirdparty > 0) {
+		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	}
+	if ($search_product_category != '') {
+		$param .= '&search_product_category='.urlencode($search_product_category);
+	}
+	if ($search_categ_cus > 0) {
+		$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	}
+	if ($show_files) {
+		$param .= '&show_files='.urlencode($show_files);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
+	if ($search_billed != '') {
+		$param .= '&search_billed='.urlencode($search_billed);
+	}
+	if ($search_fk_cond_reglement > 0) {
+		$param .= '&search_fk_cond_reglement='.$search_fk_cond_reglement;
+	}
+	if ($search_fk_shipping_method > 0) {
+		$param .= '&search_fk_shipping_method='.$search_fk_shipping_method;
+	}
+	if ($search_fk_mode_reglement > 0) {
+		$param .= '&search_fk_mode_reglement='.$search_fk_mode_reglement;
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -509,18 +705,28 @@ if ($resql)
 		'cancelorders'=>$langs->trans("Cancel"),
 		'presend'=>$langs->trans("SendByMail"),
 	);
-	if ($user->rights->facture->creer) $arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisCustomer");
-	if ($user->rights->commande->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
+	if ($user->rights->facture->creer) {
+		$arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisCustomer");
+	}
+	if ($user->rights->commande->supprimer) {
+		$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$url = DOL_URL_ROOT.'/commande/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $contextpage == 'orderlist' && $user->rights->commande->creer);
 
 	// Lines of title fields
 	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">';
@@ -538,8 +744,7 @@ if ($resql)
 	$trackid = 'ord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($massaction == 'createbills')
-	{
+	if ($massaction == 'createbills') {
 		//var_dump($_REQUEST);
 		print '<input type="hidden" name="massaction" value="confirm_createbills">';
 
@@ -565,15 +770,17 @@ if ($resql)
 		print $langs->trans('ValidateInvoices');
 		print '</td>';
 		print '<td>';
-		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
-		{
+		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 			print $form->selectyesno('validate_invoices', 0, 1, 1);
 			print ' ('.$langs->trans("AutoValidationNotPossibleWhenStockIsDecreasedOnInvoiceValidation").')';
 		} else {
 			print $form->selectyesno('validate_invoices', 0, 1);
 		}
-		if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
-		else print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("OptionToSetOrderBilledNotEnabled").'</span>';
+		if (!empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER)) {
+			print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("IfValidateInvoiceIsNoOrderStayUnbilled").'</span>';
+		} else {
+			print ' &nbsp; &nbsp; <span class="opacitymedium">'.$langs->trans("OptionToSetOrderBilledNotEnabled").'</span>';
+		}
 		print '</td>';
 		print '</tr>';
 		print '</table>';
@@ -586,34 +793,32 @@ if ($resql)
 		print '<br>';
 	}
 
-	if ($sall)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
 	$moreforfilter = '';
 
- 	// If the user can view prospects other than his'
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
- 		$langs->load("commercial");
+	// If the user can view prospects other than his'
+	if ($user->rights->societe->client->voir || $socid) {
+		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
- 		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
+		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
 		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
-	 	$moreforfilter .= '</div>';
- 	}
+		$moreforfilter .= '</div>';
+	}
 	// If the user can view other users
-	if ($user->rights->user->user->lire)
-	{
+	if ($user->rights->user->user->lire) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
 		$moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
@@ -621,29 +826,30 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
-	 	$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
+		$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
 		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1);
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 	if (!empty($conf->expedition->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$moreforfilter .= '<div class="divsearchfield">';
-	 	$moreforfilter .= $langs->trans('Warehouse').': ';
+		$moreforfilter .= $langs->trans('Warehouse').': ';
 		$moreforfilter .= $formproduct->selectWarehouses($search_warehouse, 'search_warehouse', '', 1);
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 	$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))
-	{
+	if (!empty($moreforfilter)) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
@@ -668,71 +874,65 @@ if ($resql)
 
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (!empty($arrayfields['c.ref']['checked']))
-	{
+	if (!empty($arrayfields['c.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	// Ref customer
-	if (!empty($arrayfields['c.ref_client']['checked']))
-	{
+	if (!empty($arrayfields['c.ref_client']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" type="text" size="6" name="search_ref_customer" value="'.dol_escape_htmltag($search_ref_customer).'">';
 		print '</td>';
 	}
 	// Project ref
-	if (!empty($arrayfields['p.ref']['checked']))
-	{
+	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.dol_escape_htmltag($search_project_ref).'"></td>';
 	}
 	// Project title
-	if (!empty($arrayfields['p.title']['checked']))
-	{
+	if (!empty($arrayfields['p.title']['checked'])) {
 		print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project" value="'.dol_escape_htmltag($search_project).'"></td>';
 	}
 	// Thirpdarty
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat maxwidth100" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
 		print '</td>';
 	}
 	// Alias
-	if (!empty($arrayfields['s.name_alias']['checked']))
-	{
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat maxwidth100" type="text" name="search_company_alias" value="'.dol_escape_htmltag($search_company_alias).'">';
 		print '</td>';
 	}
 	// Town
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+	}
 	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 		print '</td>';
 	}
 	// Company type
-	if (!empty($arrayfields['typent.code']['checked']))
-	{
+	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date order
-	if (!empty($arrayfields['c.date_commande']['checked']))
-	{
+	if (!empty($arrayfields['c.date_commande']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $form->selectDate($search_dateorder_start ? $search_dateorder_start : -1, 'search_dateorder_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -742,8 +942,7 @@ if ($resql)
 		print '</div>';
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.date_delivery']['checked']))
-	{
+	if (!empty($arrayfields['c.date_delivery']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $form->selectDate($search_datedelivery_start ? $search_datedelivery_start : -1, 'search_datedelivery_start_', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -754,84 +953,72 @@ if ($resql)
 		print '</td>';
 	}
 	// Shipping Method
-	if (!empty($arrayfields['c.fk_shipping_method']['checked']))
-	{
+	if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->selectShippingMethod($search_fk_shipping_method, 'search_fk_shipping_method', '', 1, '', 1);
 		print '</td>';
 	}
 	// Payment term
-	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
-	{
+	if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1, 1);
 		print '</td>';
 	}
 	// Payment mode
-	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
-	{
+	if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->select_types_paiements($search_fk_mode_reglement, 'search_fk_mode_reglement', '', 0, 1, 1, 0, -1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.total_ht']['checked']))
-	{
+	if (!empty($arrayfields['c.total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_total_ht" value="'.dol_escape_htmltag($search_total_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.total_vat']['checked']))
-	{
+	if (!empty($arrayfields['c.total_vat']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_total_vat" value="'.dol_escape_htmltag($search_total_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['c.total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_total_ttc" value="'.$search_total_ttc.'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.multicurrency_code']['checked']))
-	{
+	if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
 		// Currency
 		print '<td class="liste_titre">';
 		print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.multicurrency_tx']['checked']))
-	{
+	if (!empty($arrayfields['c.multicurrency_tx']['checked'])) {
 		// Currency rate
 		print '<td class="liste_titre">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_tx" value="'.dol_escape_htmltag($search_multicurrency_tx).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.multicurrency_total_ht']['checked']))
-	{
+	if (!empty($arrayfields['c.multicurrency_total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ht" value="'.dol_escape_htmltag($search_multicurrency_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.multicurrency_total_vat']['checked']))
-	{
+	if (!empty($arrayfields['c.multicurrency_total_vat']['checked'])) {
 		// Amount VAT
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_vat" value="'.dol_escape_htmltag($search_multicurrency_montant_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.multicurrency_total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['c.multicurrency_total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['u.login']['checked']))
-	{
+	if (!empty($arrayfields['u.login']['checked'])) {
 		// Author
 		print '<td class="liste_titre" align="center">';
 		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
@@ -844,20 +1031,17 @@ if ($resql)
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['c.datec']['checked']))
-	{
+	if (!empty($arrayfields['c.datec']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['c.tms']['checked']))
-	{
+	if (!empty($arrayfields['c.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date cloture
-	if (!empty($arrayfields['c.date_cloture']['checked']))
-	{
+	if (!empty($arrayfields['c.date_cloture']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $form->selectDate($search_datecloture_start ? $search_datecloture_start : -1, 'search_datecloture_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -868,20 +1052,17 @@ if ($resql)
 		print '</td>';
 	}
 	// Note public
-	if (!empty($arrayfields['c.note_public']['checked']))
-	{
+	if (!empty($arrayfields['c.note_public']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Note private
-	if (!empty($arrayfields['c.note_private']['checked']))
-	{
+	if (!empty($arrayfields['c.note_private']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Shippable
-	if (!empty($arrayfields['shippable']['checked']))
-	{
+	if (!empty($arrayfields['shippable']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 		//print $form->selectyesno('search_shippable', $search_shippable, 1, 0, 1, 1);
 		if (!empty($conf->global->ORDER_SHIPABLE_STATUS_DISABLED_BY_DEFAULT)) {
@@ -893,15 +1074,13 @@ if ($resql)
 		print '</td>';
 	}
 	// Status billed
-	if (!empty($arrayfields['c.facture']['checked']))
-	{
+	if (!empty($arrayfields['c.facture']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['c.fk_statut']['checked']))
-	{
+	if (!empty($arrayfields['c.fk_statut']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
 		$liststatus = array(
 			Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraftShort"),
@@ -924,31 +1103,81 @@ if ($resql)
 
 	// Fields title
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['c.ref']['checked']))            print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.ref_client']['checked']))     print_liste_field_titre($arrayfields['c.ref_client']['label'], $_SERVER["PHP_SELF"], 'c.ref_client', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.ref']['checked'])) 	         print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.title']['checked'])) 	     print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $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['s.name_alias']['checked']))     print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['c.date_commande']['checked']))  print_liste_field_titre($arrayfields['c.date_commande']['label'], $_SERVER["PHP_SELF"], 'c.date_commande', '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['c.date_delivery']['checked']))  print_liste_field_titre($arrayfields['c.date_delivery']['label'], $_SERVER["PHP_SELF"], 'c.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['c.fk_shipping_method']['checked']))	print_liste_field_titre($arrayfields['c.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "c.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.fk_cond_reglement']['checked']))		print_liste_field_titre($arrayfields['c.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.fk_mode_reglement']['checked']))		print_liste_field_titre($arrayfields['c.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.total_ht']['checked']))       print_liste_field_titre($arrayfields['c.total_ht']['label'], $_SERVER["PHP_SELF"], 'c.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['c.total_vat']['checked']))      print_liste_field_titre($arrayfields['c.total_vat']['label'], $_SERVER["PHP_SELF"], 'c.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['c.total_ttc']['checked']))      print_liste_field_titre($arrayfields['c.total_ttc']['label'], $_SERVER["PHP_SELF"], 'c.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['c.multicurrency_code']['checked']))          print_liste_field_titre($arrayfields['c.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_code', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.multicurrency_tx']['checked']))            print_liste_field_titre($arrayfields['c.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.multicurrency_total_ht']['checked']))      print_liste_field_titre($arrayfields['c.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.multicurrency_total_vat']['checked']))     print_liste_field_titre($arrayfields['c.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.multicurrency_total_ttc']['checked']))     print_liste_field_titre($arrayfields['c.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['u.login']['checked']))       	  print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['c.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.ref_client']['checked'])) {
+		print_liste_field_titre($arrayfields['c.ref_client']['label'], $_SERVER["PHP_SELF"], 'c.ref_client', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.title']['checked'])) {
+		print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, '', $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['s.name_alias']['checked'])) {
+		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['typent.code']['checked'])) {
+		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.date_commande']['checked'])) {
+		print_liste_field_titre($arrayfields['c.date_commande']['label'], $_SERVER["PHP_SELF"], 'c.date_commande', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.date_delivery']['checked'])) {
+		print_liste_field_titre($arrayfields['c.date_delivery']['label'], $_SERVER["PHP_SELF"], 'c.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_shipping_method']['label'], $_SERVER["PHP_SELF"], "c.fk_shipping_method", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "c.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['c.total_ht']['label'], $_SERVER["PHP_SELF"], 'c.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['c.total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['c.total_vat']['label'], $_SERVER["PHP_SELF"], 'c.total_tva', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['c.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['c.total_ttc']['label'], $_SERVER["PHP_SELF"], 'c.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.multicurrency_tx']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.multicurrency_total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.multicurrency_total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.multicurrency_total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['c.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'c.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['u.login']['checked'])) {
+		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -956,14 +1185,30 @@ if ($resql)
 	$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['c.datec']['checked']))     print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['c.tms']['checked']))       print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['c.date_cloture']['checked']))       print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['c.note_public']['checked'])) print_liste_field_titre($arrayfields['c.note_public']['label'], $_SERVER["PHP_SELF"], "c.note_public", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['c.note_private']['checked'])) print_liste_field_titre($arrayfields['c.note_private']['label'], $_SERVER["PHP_SELF"], "c.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['shippable']['checked']))   print_liste_field_titre($arrayfields['shippable']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['c.facture']['checked']))   print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['c.fk_statut']['checked'])) print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['c.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER["PHP_SELF"], "c.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['c.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER["PHP_SELF"], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['c.date_cloture']['checked'])) {
+		print_liste_field_titre($arrayfields['c.date_cloture']['label'], $_SERVER["PHP_SELF"], "c.date_cloture", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['c.note_public']['checked'])) {
+		print_liste_field_titre($arrayfields['c.note_public']['label'], $_SERVER["PHP_SELF"], "c.note_public", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['c.note_private']['checked'])) {
+		print_liste_field_titre($arrayfields['c.note_private']['label'], $_SERVER["PHP_SELF"], "c.note_private", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['shippable']['checked'])) {
+		print_liste_field_titre($arrayfields['shippable']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.facture']['checked'])) {
+		print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['c.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['c.fk_statut']['label'], $_SERVER["PHP_SELF"], "c.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
 	print '</tr>'."\n";
 
@@ -978,8 +1223,7 @@ if ($resql)
 	$userstatic = new User($db);
 	$i = 0;
 	$totalarray = array();
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$notshippable = 0;
@@ -1018,8 +1262,7 @@ if ($resql)
 		print '<tr class="oddeven">';
 
 		// Ref
-		if (!empty($arrayfields['c.ref']['checked']))
-		{
+		if (!empty($arrayfields['c.ref']['checked'])) {
 			print '<td class="nowraponall">';
 			print $generic_commande->getNomUrl(1, ($search_status != 2 ? 0 : $obj->fk_statut), 0, 0, 0, 1, 1);
 
@@ -1034,220 +1277,252 @@ if ($resql)
 			print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
 
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Ref customer
-		if (!empty($arrayfields['c.ref_client']['checked']))
-		{
+		if (!empty($arrayfields['c.ref_client']['checked'])) {
 			print '<td class="nowrap tdoverflowmax200">'.$obj->ref_client.'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Project ref
-		if (!empty($arrayfields['p.ref']['checked']))
-		{
+		if (!empty($arrayfields['p.ref']['checked'])) {
 			print '<td class="nowrap">';
-			if ($obj->project_id > 0)
-			{
+			if ($obj->project_id > 0) {
 				print $projectstatic->getNomUrl(1);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Project label
-		if (!empty($arrayfields['p.title']['checked']))
-		{
+		if (!empty($arrayfields['p.title']['checked'])) {
 			print '<td class="nowrap">';
-			if ($obj->project_id > 0)
-			{
+			if ($obj->project_id > 0) {
 				print $projectstatic->title;
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Third party
-		if (!empty($arrayfields['s.nom']['checked']))
-		{
+		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax200">';
 			print $getNomUrl_cache[$obj->socid];
 
 			// If module invoices enabled and user with invoice creation permissions
-			if (!empty($conf->facture->enabled) && !empty($conf->global->ORDER_BILLING_ALL_CUSTOMER))
-			{
-				if ($user->rights->facture->creer)
-				{
-					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0))
-					{
+			if (!empty($conf->facture->enabled) && !empty($conf->global->ORDER_BILLING_ALL_CUSTOMER)) {
+				if ($user->rights->facture->creer) {
+					if (($obj->fk_statut > 0 && $obj->fk_statut < 3) || ($obj->fk_statut == 3 && $obj->billed == 0)) {
 						print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$companystatic->id.'&search_billed=0&autoselectall=1">';
 						print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').'</a>';
 					}
 				}
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Town
-		if (!empty($arrayfields['s.name_alias']['checked']))
-		{
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->alias;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Town
-		if (!empty($arrayfields['s.town']['checked']))
-		{
+		if (!empty($arrayfields['s.town']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->town;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Zip
-		if (!empty($arrayfields['s.zip']['checked']))
-		{
+		if (!empty($arrayfields['s.zip']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->zip;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// State
-		if (!empty($arrayfields['state.nom']['checked']))
-		{
+		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']))
-		{
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
 			$tmparray = getCountry($obj->fk_pays, 'all');
 			print $tmparray['label'];
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Type ent
-		if (!empty($arrayfields['typent.code']['checked']))
-		{
+		if (!empty($arrayfields['typent.code']['checked'])) {
 			print '<td class="center">';
-			if (empty($typenArray)) $typenArray = $formcompany->typent_array(1);
+			if (empty($typenArray)) {
+				$typenArray = $formcompany->typent_array(1);
+			}
 			print $typenArray[$obj->typent_code];
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Order date
-		if (!empty($arrayfields['c.date_commande']['checked']))
-		{
+		if (!empty($arrayfields['c.date_commande']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_commande), 'day');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Plannned date of delivery
-		if (!empty($arrayfields['c.date_delivery']['checked']))
-		{
+		if (!empty($arrayfields['c.date_delivery']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_delivery), 'dayhour');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		//Shipping Method
-		if (!empty($arrayfields['c.fk_shipping_method']['checked']))
-		{
+		if (!empty($arrayfields['c.fk_shipping_method']['checked'])) {
 			print '<td>';
 			$form->formSelectShippingMethod('', $obj->fk_shipping_method, 'none', 1);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Payment terms
-		if (!empty($arrayfields['c.fk_cond_reglement']['checked']))
-		{
+		if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
 			print '<td>';
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Payment mode
-		if (!empty($arrayfields['c.fk_mode_reglement']['checked']))
-		{
+		if (!empty($arrayfields['c.fk_mode_reglement']['checked'])) {
 			print '<td>';
 			$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount HT
-		if (!empty($arrayfields['c.total_ht']['checked']))
-		{
+		if (!empty($arrayfields['c.total_ht']['checked'])) {
 			  print '<td class="nowrap right">'.price($obj->total_ht)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
-			  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.total_ht';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_ht';
+			}
 			  $totalarray['val']['c.total_ht'] += $obj->total_ht;
 		}
 		// Amount VAT
-		if (!empty($arrayfields['c.total_vat']['checked']))
-		{
+		if (!empty($arrayfields['c.total_vat']['checked'])) {
 			print '<td class="nowrap right">'.price($obj->total_tva)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.total_tva';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_tva';
+			}
 			$totalarray['val']['c.total_tva'] += $obj->total_tva;
 		}
 		// Amount TTC
-		if (!empty($arrayfields['c.total_ttc']['checked']))
-		{
+		if (!empty($arrayfields['c.total_ttc']['checked'])) {
 			print '<td class="nowrap right">'.price($obj->total_ttc)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'c.total_ttc';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'c.total_ttc';
+			}
 			$totalarray['val']['c.total_ttc'] += $obj->total_ttc;
 		}
 
 		// Currency
-		if (!empty($arrayfields['c.multicurrency_code']['checked']))
-		{
+		if (!empty($arrayfields['c.multicurrency_code']['checked'])) {
 			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Currency rate
-		if (!empty($arrayfields['c.multicurrency_tx']['checked']))
-		{
+		if (!empty($arrayfields['c.multicurrency_tx']['checked'])) {
 			  print '<td class="nowrap">';
 			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
 			  print "</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount HT
-		if (!empty($arrayfields['c.multicurrency_total_ht']['checked']))
-		{
+		if (!empty($arrayfields['c.multicurrency_total_ht']['checked'])) {
 			  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount VAT
-		if (!empty($arrayfields['c.multicurrency_total_vat']['checked']))
-		{
+		if (!empty($arrayfields['c.multicurrency_total_vat']['checked'])) {
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount TTC
-		if (!empty($arrayfields['c.multicurrency_total_ttc']['checked']))
-		{
+		if (!empty($arrayfields['c.multicurrency_total_ttc']['checked'])) {
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		$userstatic->id = $obj->fk_user_author;
 		$userstatic->login = $obj->login;
 
 		// Author
-		if (!empty($arrayfields['u.login']['checked']))
-		{
+		if (!empty($arrayfields['u.login']['checked'])) {
 			print '<td align="center">';
-			if ($userstatic->id) print $userstatic->getLoginUrl(1);
-			else print '&nbsp;';
+			if ($userstatic->id) {
+				print $userstatic->getLoginUrl(1);
+			} else {
+				print '&nbsp;';
+			}
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Extra fields
@@ -1258,53 +1533,57 @@ if ($resql)
 		print $hookmanager->resPrint;
 
 		// Date creation
-		if (!empty($arrayfields['c.datec']['checked']))
-		{
+		if (!empty($arrayfields['c.datec']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			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['c.tms']['checked']))
-		{
+		if (!empty($arrayfields['c.tms']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Date cloture
-		if (!empty($arrayfields['c.date_cloture']['checked']))
-		{
+		if (!empty($arrayfields['c.date_cloture']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			print dol_print_date($db->jdate($obj->date_cloture), 'dayhour', 'tzuser');
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Note public
-		if (!empty($arrayfields['c.note_public']['checked']))
-		{
+		if (!empty($arrayfields['c.note_public']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			print dol_escape_htmltag($obj->note_public);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Note private
-		if (!empty($arrayfields['c.note_private']['checked']))
-		{
+		if (!empty($arrayfields['c.note_private']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			print dol_escape_htmltag($obj->note_private);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Show shippable Icon (this creates subloops, so may be slow)
-		if (!empty($arrayfields['shippable']['checked']))
-		{
+		if (!empty($arrayfields['shippable']['checked'])) {
 			print '<td class="center">';
 			if (!empty($show_shippable_command) && !empty($conf->stock->enabled)) {
 				if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {
@@ -1312,8 +1591,7 @@ if ($resql)
 
 					$numlines = count($generic_commande->lines); // Loop on each line of order
 					for ($lig = 0; $lig < $numlines; $lig++) {
-						if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0)  // If line is a product and not a service
-						{
+						if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0) {  // If line is a product and not a service
 							$nbprod++; // order contains real products
 							$generic_product->id = $generic_commande->lines[$lig]->fk_product;
 
@@ -1327,8 +1605,7 @@ if ($resql)
 								$generic_product->stock_theorique = $productstat_cachevirtual[$generic_commande->lines[$lig]->fk_product]['stock_reel'] = $generic_product->stock_theorique;
 							}
 
-							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST))  // Default code. Default should be this case.
-							{
+							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST)) {  // Default code. Default should be this case.
 								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
 								$text_info .= ' - '.$langs->trans("Stock").': <span class="'.($generic_product->stock_reel > 0 ? 'ok' : 'error').'">'.$generic_product->stock_reel.'</span>';
 								$text_info .= ' - '.$langs->trans("VirtualStock").': <span class="'.($generic_product->stock_theorique > 0 ? 'ok' : 'error').'">'.$generic_product->stock_theorique.'</span>';
@@ -1344,8 +1621,7 @@ if ($resql)
 								// stock order and stock order_supplier
 								$stock_order = 0;
 								$stock_order_supplier = 0;
-								if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))    // What about other options ?
-								{
+								if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {    // What about other options ?
 									if (!empty($conf->commande->enabled)) {
 										if (empty($productstat_cache[$generic_commande->lines[$lig]->fk_product]['stats_order_customer'])) {
 											$generic_product->load_stats_commande(0, '1,2');
@@ -1405,28 +1681,33 @@ if ($resql)
 		}
 
 		// Billed
-		if (!empty($arrayfields['c.facture']['checked']))
-		{
+		if (!empty($arrayfields['c.facture']['checked'])) {
 			print '<td class="center">'.yn($obj->billed).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Status
-		if (!empty($arrayfields['c.fk_statut']['checked']))
-		{
+		if (!empty($arrayfields['c.fk_statut']['checked'])) {
 			print '<td class="nowrap center">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</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($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";
 
@@ -1450,7 +1731,9 @@ if ($resql)
 	print '</form>'."\n";
 
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	// Show list of available documents
 	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 0cf0da709da..0805bb8d1d9 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -42,13 +42,14 @@ $action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = 0;
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'commande', $id, '');
 
 
 $object = new Commande($db);
-if (!$object->fetch($id, $ref) > 0)
-{
+if (!$object->fetch($id, $ref) > 0) {
 	dol_print_error($db);
 	exit;
 }
@@ -71,8 +72,7 @@ llxHeader('', $langs->trans('Order'), 'EN:Customers_Orders|FR:Commandes_Clients|
 
 $form = new Form($db);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = commande_prepare_head($object);
@@ -91,12 +91,10 @@ if ($id > 0 || !empty($ref))
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->commande->creer)
-		{
+		if ($user->rights->commande->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 43980135140..0c9b80c3883 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -39,8 +39,12 @@ $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 $mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
-if ($mode == 'customer' && !$user->rights->commande->lire) accessforbidden();
-if ($mode == 'supplier' && !$user->rights->fournisseur->commande->lire) accessforbidden();
+if ($mode == 'customer' && !$user->rights->commande->lire) {
+	accessforbidden();
+}
+if ($mode == 'supplier' && !$user->rights->fournisseur->commande->lire) {
+	accessforbidden();
+}
 
 $object_status = GETPOST('object_status', 'intcomma');
 $typent_id = GETPOST('typent_id', 'int');
@@ -49,8 +53,7 @@ $categ_id = GETPOST('categ_id', 'categ_id');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -78,8 +81,7 @@ $picto = 'order';
 $title = $langs->trans("OrdersStatistics");
 $dir = $conf->commande->dir_temp;
 
-if ($mode == 'supplier')
-{
+if ($mode == 'supplier') {
 	$picto = 'supplier_order';
 	$title = $langs->trans("OrdersStatisticsSuppliers");
 	$dir = $conf->fournisseur->commande->dir_temp;
@@ -92,13 +94,15 @@ print load_fiche_titre($title, '', $picto);
 dol_mkdir($dir);
 
 $stats = new CommandeStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
-if ($mode == 'customer')
-{
-	if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+if ($mode == 'customer') {
+	if ($object_status != '' && $object_status >= -1) {
+		$stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+	}
 }
-if ($mode == 'supplier')
-{
-	if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+if ($mode == 'supplier') {
+	if ($object_status != '' && $object_status >= 0) {
+		$stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+	}
 }
 
 
@@ -109,25 +113,30 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filenamenb = $dir.'/ordersnbinyear-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$user->id.'-'.$year.'.png';
+	}
 } else {
 	$filenamenb = $dir.'/ordersnbinyear-'.$year.'.png';
-	if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
-	if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersnbinyear-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersnbinyear-'.$year.'.png';
+	}
 }
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -150,25 +159,30 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 //var_dump($data);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filenameamount = $dir.'/ordersamountinyear-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$user->id.'-'.$year.'.png';
+	}
 } else {
 	$filenameamount = $dir.'/ordersamountinyear-'.$year.'.png';
-	if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
-	if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersamountinyear-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersamountinyear-'.$year.'.png';
+	}
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px2->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -189,25 +203,30 @@ if (!$mesg)
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
 } else {
 	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	}
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px3->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -235,7 +254,9 @@ foreach ($data as $val) {
 		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 $h = 0;
 $head = array();
@@ -244,8 +265,12 @@ $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
 
-if ($mode == 'customer') $type = 'order_stats';
-if ($mode == 'supplier') $type = 'supplier_order_stats';
+if ($mode == 'customer') {
+	$type = 'order_stats';
+}
+if ($mode == 'supplier') {
+	$type = 'supplier_order_stats';
+}
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
@@ -264,26 +289,30 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // Company
 print '<tr><td class="left">'.$langs->trans("ThirdParty").'</td><td class="left">';
-if ($mode == 'customer') $filter = 's.client IN (1,2,3)';
-if ($mode == 'supplier') $filter = 's.fournisseur = 1';
+if ($mode == 'customer') {
+	$filter = 's.client IN (1,2,3)';
+}
+if ($mode == 'supplier') {
+	$filter = 's.fournisseur = 1';
+}
 print $form->select_company($socid, 'socid', $filter, 1, 0, 0, array(), 0, '', 'style="width: 95%"');
 print '</td></tr>';
 // ThirdParty Type
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
 $sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
-if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+if ($user->admin) {
+	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+}
 print '</td></tr>';
 // Category
-if ($mode == 'customer')
-{
+if ($mode == 'customer') {
 	$cat_type = Categorie::TYPE_CUSTOMER;
 	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
 }
-if ($mode == 'supplier')
-{
+if ($mode == 'supplier') {
 	$cat_type = Categorie::TYPE_SUPPLIER;
-    $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
+	$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
 }
 print '<tr><td>'.$cat_label.'</td><td>';
 print $formother->select_categories($cat_type, $categ_id, 'categ_id', true);
@@ -293,8 +322,7 @@ print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">
 print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
-if ($mode == 'customer')
-{
+if ($mode == 'customer') {
 	$liststatus = array(
 		Commande::STATUS_DRAFT=>$langs->trans("StatusOrderDraft"),
 		Commande::STATUS_VALIDATED=>$langs->trans("StatusOrderValidated"),
@@ -304,15 +332,18 @@ if ($mode == 'customer')
 	);
 	print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'intcomma'), -4);
 }
-if ($mode == 'supplier')
-{
+if ($mode == 'supplier') {
 	$formorder->selectSupplierOrderStatus((strstr($object_status, ',') ? -1 : $object_status), 0, 'object_status');
 }
 print '</td></tr>';
 // Year
 print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
-if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
@@ -335,11 +366,9 @@ print '<td class="right">%</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	$year = $val['year'];
-	while (!empty($year) && $oldyear > $year + 1)
-	{ // If we have empty year
+	while (!empty($year) && $oldyear > $year + 1) { // If we have empty year
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
@@ -375,7 +404,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index a9c01386bf7..428589aa844 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -38,12 +38,13 @@ $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1)
 
 $total = 0;
 $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	echo '<tr class="'.$trclass.'" >';
 	echo '<td class="linkedcol-element" >'.$langs->trans("CustomerOrder");
 	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 02098e986ba..67faa375d04 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -25,7 +25,9 @@
   */
 
 if ((array_key_exists('action', $_GET) && $_GET['action'] == 'dl') || (array_key_exists('action', $_POST) && $_POST['action'] == 'dl')) {	// To not replace token when downloading file
-	if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+	if (!defined('NOTOKENRENEWAL')) {
+		define('NOTOKENRENEWAL', '1');
+	}
 }
 
 require '../main.inc.php';
@@ -70,12 +72,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "date,item"; // Set here default search field
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) {
+	$sortfield = "date,item"; // Set here default search field
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
 
 
 $arrayfields = array(
@@ -111,7 +119,9 @@ if (!empty($conf->multicompany->enabled) && is_object($mc)) {
 		$entity = '0,'.join(',', array_keys($arrayofentities));
 	}
 }
-if (empty($entity)) $entity = $conf->entity;
+if (empty($entity)) {
+	$entity = $conf->entity;
+}
 
 $error = 0;
 
@@ -129,26 +139,25 @@ $error = 0;
 $filesarray = array();
 $result = false;
 if (($action == 'searchfiles' || $action == 'dl')) {
-	if (empty($date_start))
-	{
+	if (empty($date_start)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateStart")), null, 'errors');
 		$error++;
 	}
-	if (empty($date_stop))
-	{
+	if (empty($date_stop)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateEnd")), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$sql = '';
 
 		$wheretail = " '".$db->idate($date_start)."' AND '".$db->idate($date_stop)."'";
 
 		// Customer invoices
 		if (GETPOST('selectinvoices')) {
-			if (!empty($sql)) $sql .= " UNION ALL";
+			if (!empty($sql)) {
+				$sql .= " UNION ALL";
+			}
 			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
 			$sql .= " WHERE datef between ".$wheretail;
@@ -157,7 +166,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		}
 		// Vendor invoices
 		if (GETPOST('selectsupplierinvoices')) {
-			if (!empty($sql)) $sql .= " UNION ALL";
+			if (!empty($sql)) {
+				$sql .= " UNION ALL";
+			}
 			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
 			$sql .= " WHERE datef between ".$wheretail;
@@ -166,7 +177,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		}
 		// Expense reports
 		if (GETPOST('selectexpensereports')) {
-			if (!empty($sql)) $sql .= " UNION ALL";
+			if (!empty($sql)) {
+				$sql .= " UNION ALL";
+			}
 			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 			$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
 			$sql .= " WHERE date_fin between  ".$wheretail;
@@ -175,7 +188,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		}
 		// Donations
 		if (GETPOST('selectdonations')) {
-			if (!empty($sql)) $sql .= " UNION ALL";
+			if (!empty($sql)) {
+				$sql .= " UNION ALL";
+			}
 			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
 			$sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
 			$sql .= " WHERE datedon between ".$wheretail;
@@ -184,7 +199,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		}
 		// Payments of salaries
 		if (GETPOST('selectpaymentsofsalaries')) {
-			if (!empty($sql)) $sql .= " UNION ALL";
+			if (!empty($sql)) {
+				$sql .= " UNION ALL";
+			}
 			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 			$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
 			$sql .= " WHERE datep between ".$wheretail;
@@ -193,7 +210,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		}
 		// Social contributions
 		if (GETPOST('selectsocialcontributions')) {
-			if (!empty($sql)) $sql .= " UNION ALL";
+			if (!empty($sql)) {
+				$sql .= " UNION ALL";
+			}
 			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 			$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
 			$sql .= " WHERE t.date_ech between ".$wheretail;
@@ -202,7 +221,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		}
 		// Various payments
 		if (GETPOST('selectvariouspayment')) {
-			if (!empty($sql)) $sql .= " UNION ALL";
+			if (!empty($sql)) {
+				$sql .= " UNION ALL";
+			}
 			$sql .= " SELECT t.rowid as id, t.entity, t.ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
 			$sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
 			$sql .= " WHERE datep between ".$wheretail;
@@ -210,7 +231,9 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		}
 		// Loan payments
 		if (GETPOST('selectloanspayment')) {
-			if (!empty($sql)) $sql .= " UNION ALL";
+			if (!empty($sql)) {
+				$sql .= " UNION ALL";
+			}
 			$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 			$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
 			$sql .= " WHERE datep between ".$wheretail;
@@ -225,8 +248,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 			$files = array();
 			$link = '';
 
-			if ($resd)
-			{
+			if ($resd) {
 				$numd = $db->num_rows($resd);
 
 				$tmpinvoice = new Facture($db);
@@ -235,12 +257,10 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 
 				$upload_dir = '';
 				$i = 0;
-				while ($i < $numd)
-				{
+				while ($i < $numd) {
 					$objd = $db->fetch_object($resd);
 
-					switch ($objd->item)
-					{
+					switch ($objd->item) {
 						case "Invoice":
 							$subdir = '';
 							$subdir .= ($subdir ? '/' : '').dol_sanitizeFileName($objd->ref);
@@ -306,15 +326,13 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 							break;
 					}
 
-					if (!empty($upload_dir))
-					{
+					if (!empty($upload_dir)) {
 						$result = true;
 
 						$files = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
 						//var_dump($upload_dir);
 						//var_dump($files);
-						if (count($files) < 1)
-						{
+						if (count($files) < 1) {
 							$nofile = array();
 							$nofile['id'] = $objd->id;
 							$nofile['entity'] = $objd->entity;
@@ -335,8 +353,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 
 							$filesarray[$nofile['item'].'_'.$nofile['id']] = $nofile;
 						} else {
-							foreach ($files as $key => $file)
-							{
+							foreach ($files as $key => $file) {
 								$file['id'] = $objd->id;
 								$file['entity'] = $objd->entity;
 								$file['date'] = $db->idate($objd->date);
@@ -399,17 +416,14 @@ if (($action == 'searchfiles' || $action == 'dl')) {
  */
 
 $dirfortmpfile = ($conf->accounting->dir_temp ? $conf->accounting->dir_temp : $conf->comptabilite->dir_temp);
-if (empty($dirfortmpfile))
-{
+if (empty($dirfortmpfile)) {
 	setEventMessages($langs->trans("ErrorNoAccountingModuleEnabled"), null, 'errors');
 	$error++;
 }
 
 
-if ($result && $action == "dl" && !$error)
-{
-	if (!extension_loaded('zip'))
-	{
+if ($result && $action == "dl" && !$error) {
+	if (!extension_loaded('zip')) {
 		setEventMessages('PHPZIPExtentionNotLoaded', null, 'errors');
 		exit;
 	}
@@ -417,8 +431,7 @@ if ($result && $action == "dl" && !$error)
 	dol_mkdir($dirfortmpfile);
 
 	$log = $langs->transnoentitiesnoconv("Type");
-	if (!empty($conf->multicompany->enabled) && is_object($mc))
-	{
+	if (!empty($conf->multicompany->enabled) && is_object($mc)) {
 		$log .= ','.$langs->transnoentitiesnoconv("Entity");
 	}
 	$log .= ','.$langs->transnoentitiesnoconv("Date");
@@ -441,10 +454,8 @@ if ($result && $action == "dl" && !$error)
 
 	$zip = new ZipArchive;
 	$res = $zip->open($zipname, ZipArchive::OVERWRITE | ZipArchive::CREATE);
-	if ($res)
-	{
-		foreach ($filesarray as $key => $file)
-		{
+	if ($res) {
+		foreach ($filesarray as $key => $file) {
 			if (!empty($file['files'])) {
 				foreach ($file['files'] as $filecursor) {
 					if (file_exists($filecursor["fullname"])) {
@@ -454,8 +465,7 @@ if ($result && $action == "dl" && !$error)
 			}
 
 			$log .= '"'.$langs->trans($file['item']).'"';
-			if (!empty($conf->multicompany->enabled) && is_object($mc))
-			{
+			if (!empty($conf->multicompany->enabled) && is_object($mc)) {
 				$log .= ',"'.(empty($arrayofentities[$file['entity']]) ? $file['entity'] : $arrayofentities[$file['entity']]).'"';
 			}
 			$log .= ','.dol_print_date($file['date'], 'dayrfc');
@@ -532,8 +542,7 @@ print $langs->trans("ReportPeriod").': '.$form->selectDate($date_start, 'date_st
 print ' - '.$form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0)."\n";
 
 // Export is for current company only
-if (!empty($conf->multicompany->enabled) && is_object($mc))
-{
+if (!empty($conf->multicompany->enabled) && is_object($mc)) {
 	$mc->getInfo($conf->entity);
 	print '<span class="marginleftonly marginrightonly'.(empty($conf->global->MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES) ? ' opacitymedium' : '').'">('.$langs->trans("Entity").' : ';
 	print "<td>";
@@ -559,7 +568,9 @@ $listofchoices = array(
 	'selectloanspayment'=>array('label'=>'PaymentLoan', 'enabled' => !empty($conf->loan->enabled)),
 );
 foreach ($listofchoices as $choice => $val) {
-	if (empty($val['enabled'])) continue;		// list not qualified
+	if (empty($val['enabled'])) {
+		continue;		// list not qualified
+	}
 	$checked = (((!GETPOSTISSET('search') && $action != 'searchfiles') || GETPOST($choice)) ? ' checked="checked"' : '');
 	print '<div class="paddingleft inline-block marginrightonly"><input type="checkbox" id="'.$choice.'" name="'.$choice.'" value="1"'.$checked.'> <label for="'.$choice.'">'.$langs->trans($val['label']).'</label></div>';
 }
@@ -570,8 +581,7 @@ print '</form>'."\n";
 
 print dol_get_fiche_end();
 
-if (!empty($date_start) && !empty($date_stop))
-{
+if (!empty($date_start) && !empty($date_stop)) {
 	$param = 'action=searchfiles';
 	$param .= '&date_startday='.GETPOST('date_startday', 'int');
 	$param .= '&date_startmonth='.GETPOST('date_startmonth', 'int');
@@ -614,14 +624,14 @@ if (!empty($date_start) && !empty($date_stop))
 	print '<td class="center">'.$langs->trans("Code").'</td>';
 	print '<td class="center">'.$langs->trans("Country").'</td>';
 	print '<td class="center">'.$langs->trans("VATIntra").'</td>';
-	if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$langs->trans("Currency").'</td>';
+	if (!empty($conf->multicurrency->enabled)) {
+		print '<td class="center">'.$langs->trans("Currency").'</td>';
+	}
 	print '</tr>';
-	if ($result)
-	{
+	if ($result) {
 		$TData = dol_sort_array($filesarray, $sortfield, $sortorder);
 
-		if (empty($TData))
-		{
+		if (empty($TData)) {
 			print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td>';
 			if (!empty($conf->multicurrency->enabled)) {
 				print '<td></td>';
@@ -638,8 +648,7 @@ if (!empty($date_start) && !empty($date_stop))
 			$totalVAT_credit = 0;
 
 			// Display array
-			foreach ($TData as $data)
-			{
+			foreach ($TData as $data) {
 				$html_class = '';
 				//if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
 				//elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
@@ -708,9 +717,8 @@ if (!empty($date_start) && !empty($date_stop))
 
 				// File link
 				print '<td>';
-				if (!empty($data['files']))
-				{
-					foreach ($data['files'] as $id=>$filecursor) {
+				if (!empty($data['files'])) {
+					foreach ($data['files'] as $id => $filecursor) {
 						print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank">'.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'</a>&nbsp;'.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'<br>';
 					}
 				}
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index 0129d1e5f43..d22e1a0182a 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -20,11 +20,21 @@
  *       \brief      File to return Ajax response on payment breakdown process
  */
 
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
 
 require '../main.inc.php';
 
@@ -46,18 +56,20 @@ $currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invoi
 $amountPayment = $amountPayment != '' ? (is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '') : ''; // keep void if not a valid entry
 
 // Clean checkamounts
-foreach ($amounts as $key => $value)
-{
+foreach ($amounts as $key => $value) {
 	$value = price2num($value);
 	$amounts[$key] = $value;
-	if (empty($value)) unset($amounts[$key]);
+	if (empty($value)) {
+		unset($amounts[$key]);
+	}
 }
 // Clean remains
-foreach ($remains as $key => $value)
-{
+foreach ($remains as $key => $value) {
 	$value = price2num($value);
 	$remains[$key] = (($invoice_type) == 2 ?-1 : 1) * $value;
-	if (empty($value)) unset($remains[$key]);
+	if (empty($value)) {
+		unset($remains[$key]);
+	}
 }
 
 // Treatment
@@ -65,19 +77,16 @@ $result = ($amountPayment != '') ? ($amountPayment - array_sum($amounts)) : arra
 $toJsonArray = array();
 $totalRemaining = price2num(array_sum($remains));
 $toJsonArray['label'] = $amountPayment == '' ? '' : $langs->transnoentities('RemainingAmountPayment');
-if ($currentInvId)																	// Here to breakdown
-{
+if ($currentInvId) {																	// Here to breakdown
 	// Get the current amount (from form) and the corresponding remainToPay (from invoice)
 	$currentAmount = $amounts['amount_'.$currentInvId];
 	$currentRemain = $remains['remain_'.$currentInvId];
 
 	// If amountPayment isn't filled, breakdown invoice amount, else breakdown from amountPayment
-	if ($amountPayment == '')
-	{
+	if ($amountPayment == '') {
 		// Check if current amount exists in amounts
 		$amountExists = array_key_exists('amount_'.$currentInvId, $amounts);
-		if ($amountExists)
-		{
+		if ($amountExists) {
 			$remainAmount = $currentRemain - $currentAmount; // To keep value between curRemain and curAmount
 			$result += $remainAmount; // result must be deduced by
 			$currentAmount += $remainAmount; // curAmount put to curRemain
@@ -90,8 +99,7 @@ if ($currentInvId)																	// Here to breakdown
 		$result += price2num($currentAmount);
 		$currentAmount = 0;
 
-		if ($result >= 0)			// then we need to calculate the amount to breakdown
-		{
+		if ($result >= 0) {			// then we need to calculate the amount to breakdown
 			$amountToBreakdown = ($result - $currentRemain >= 0 ?
 										$currentRemain : // Remain can be fully paid
 										$currentRemain + ($result - $currentRemain)); // Remain can only partially be paid
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index b1c5c937f76..929a7a483bb 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -47,26 +47,30 @@ if ($user->socid) {
 	$action = '';
 	$socid = $user->socid;
 }
-if ($user->socid)
+if ($user->socid) {
 	$socid = $user->socid;
+}
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }
+if (empty($page) || $page == -1) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder)
+if (!$sortorder) {
 	$sortorder = "ASC";
-if (!$sortfield)
+}
+if (!$sortfield) {
 	$sortfield = "name";
+}
 
 $object = new Account($db);
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);
 	$account = $object->id; // Force the search field on id of account
 }
@@ -75,8 +79,7 @@ $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', '');
 
 // Define number of receipt to show (current, previous or next one ?)
 $found = false;
-if ($_GET["rel"] == 'prev')
-{
+if ($_GET["rel"] == 'prev') {
 	// Recherche valeur pour num = numero releve precedent
 	$sql = "SELECT DISTINCT(b.num_releve) as num";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -86,18 +89,15 @@ if ($_GET["rel"] == 'prev')
 
 	dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$numrows = $db->num_rows($resql);
-		if ($numrows > 0)
-		{
+		if ($numrows > 0) {
 			$obj = $db->fetch_object($resql);
 			$numref = $obj->num;
 			$found = true;
 		}
 	}
-} elseif ($_GET["rel"] == 'next')
-{
+} elseif ($_GET["rel"] == 'next') {
 	// Recherche valeur pour num = numero releve precedent
 	$sql = "SELECT DISTINCT(b.num_releve) as num";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -107,11 +107,9 @@ if ($_GET["rel"] == 'prev')
 
 	dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$numrows = $db->num_rows($resql);
-		if ($numrows > 0)
-		{
+		if ($numrows > 0) {
 			$obj = $db->fetch_object($resql);
 			$numref = $obj->num;
 			$found = true;
@@ -127,8 +125,7 @@ if ($_GET["rel"] == 'prev')
  * Actions
  */
 
-if (!empty($numref))
-{
+if (!empty($numref)) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->bank->dir_output."/".$id."/statement/".dol_sanitizeFileName($numref);
 }
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index a0650e9ffa4..45ae92480a0 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -41,13 +41,14 @@ $ref = GETPOST('ref');
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
 
 $year_start = GETPOST('year_start');
 $year_current = strftime("%Y", time());
-if (!$year_start)
-{
+if (!$year_start) {
 	$year_start = $year_current - 2;
 	$year_end = $year_current;
 } else {
@@ -68,13 +69,11 @@ $form = new Form($db);
 
 // Get account informations
 $object = new Account($db);
-if ($id > 0 && !preg_match('/,/', $id))	// if for a particular account and not a list
-{
+if ($id > 0 && !preg_match('/,/', $id)) {	// if for a particular account and not a list
 	$result = $object->fetch($id);
 	$id = $object->id;
 }
-if (!empty($ref))
-{
+if (!empty($ref)) {
 	$result = $object->fetch(0, $ref);
 	$id = $object->id;
 }
@@ -90,17 +89,16 @@ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql .= " WHERE b.fk_account = ba.rowid";
 $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql .= " AND b.amount >= 0";
-if (!empty($id))
+if (!empty($id)) {
 	$sql .= " AND b.fk_account IN (".$db->sanitize($db->escape($id)).")";
+}
 $sql .= " GROUP BY dm";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
 		$encaiss[$row[1]] = $row[0];
 		$i++;
@@ -116,17 +114,16 @@ $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql .= " WHERE b.fk_account = ba.rowid";
 $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 $sql .= " AND b.amount <= 0";
-if (!empty($id))
+if (!empty($id)) {
 	$sql .= " AND b.fk_account IN (".$db->sanitize($db->escape($id)).")";
+}
 $sql .= " GROUP BY dm";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
 		$decaiss[$row[1]] = -$row[0];
 		$i++;
@@ -146,20 +143,19 @@ $link = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?account=".$object->id.
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 
-if (!empty($id))
-{
-	if (!preg_match('/,/', $id))
-	{
+if (!empty($id)) {
+	if (!preg_match('/,/', $id)) {
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 	} else {
 		$bankaccount = new Account($db);
 		$listid = explode(',', $id);
-		foreach ($listid as $key => $aId)
-		{
+		foreach ($listid as $key => $aId) {
 			$bankaccount->fetch($aId);
 			$bankaccount->label = $bankaccount->ref;
 			print $bankaccount->getNomUrl(1);
-			if ($key < (count($listid) - 1)) print ', ';
+			if ($key < (count($listid) - 1)) {
+				print ', ';
+			}
 		}
 	}
 } else {
@@ -176,39 +172,33 @@ print '<div class="div-table-responsive">'; // You can use div-table-responsive-
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	print '<td align="center" width="20%" colspan="2" class="liste_titre borderrightlight">'.$annee.'</td>';
 }
 print '</tr>';
 
 print '<tr class="liste_titre">';
 print '<td class="liste_titre">&nbsp;</td>';
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	print '<td class="liste_titre" align="center">'.$langs->trans("Debit").'</td><td class="liste_titre" align="center">'.$langs->trans("Credit").'</td>';
 }
 print '</tr>';
 
-for ($mois = 1; $mois < 13; $mois++)
-{
+for ($mois = 1; $mois < 13; $mois++) {
 	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(1, 1, 1, $mois, 1, 2000), "%B")."</td>";
-	for ($annee = $year_start; $annee <= $year_end; $annee++)
-	{
+	for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		$case = sprintf("%04s-%02s", $annee, $mois);
 
 		print '<td class="right" width="10%">&nbsp;';
-		if ($decaiss[$case] > 0)
-		{
+		if ($decaiss[$case] > 0) {
 			print price($decaiss[$case]);
 			$totsorties[$annee] += $decaiss[$case];
 		}
 		print "</td>";
 
 		print '<td class="right borderrightlight" width="10%">&nbsp;';
-		if ($encaiss[$case] > 0)
-		{
+		if ($encaiss[$case] > 0) {
 			print price($encaiss[$case]);
 			$totentrees[$annee] += $encaiss[$case];
 		}
@@ -219,8 +209,7 @@ for ($mois = 1; $mois < 13; $mois++)
 
 // Total debit-credit
 print '<tr class="liste_total"><td><b>'.$langs->trans("Total")."</b></td>";
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	print '<td class="right nowraponall"><b>'.price($totsorties[$annee]).'</b></td><td class="right nowraponall"><b>'.price($totentrees[$annee]).'</b></td>';
 }
 print "</tr>\n";
@@ -239,14 +228,16 @@ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 $sql .= " WHERE b.fk_account = ba.rowid";
 $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-if (!empty($id))
+if (!empty($id)) {
 	$sql .= " AND b.fk_account IN (".$db->sanitize($db->escape($id)).")";
+}
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$obj = $db->fetch_object($resql);
-	if ($obj) $balance = $obj->total;
+	if ($obj) {
+		$balance = $obj->total;
+	}
 } else {
 	dol_print_error($db);
 }
@@ -264,8 +255,7 @@ print "</table>";
 $year = $year_end;
 
 $result = dol_mkdir($conf->bank->dir_temp);
-if ($result < 0)
-{
+if ($result < 0) {
 	$langs->load("errors");
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
@@ -276,11 +266,12 @@ if ($result < 0)
 	$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql .= " WHERE b.fk_account = ba.rowid";
 	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-	if ($id && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$id.")";
+	if ($id && $_GET["option"] != 'all') {
+		$sql .= " AND b.fk_account IN (".$id.")";
+	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$obj = $db->fetch_object($resql);
 		$min = $db->jdate($obj->min);
@@ -297,8 +288,7 @@ if ($result < 0)
 	$tblyear[1] = array();
 	$tblyear[2] = array();
 
-	for ($annee = 0; $annee < 3; $annee++)
-	{
+	for ($annee = 0; $annee < 3; $annee++) {
 		$sql = "SELECT date_format(b.datev,'%m')";
 		$sql .= ", SUM(b.amount)";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -308,16 +298,16 @@ if ($result < 0)
 		$sql .= " AND b.datev >= '".($year - $annee)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".($year - $annee)."-12-31 23:59:59'";
 		$sql .= " AND b.amount > 0";
-		if ($id && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$id.")";
+		if ($id && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$id.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%m');";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				$tblyear[$annee][$row[0]] = $row[1];
 				$i++;
@@ -333,8 +323,7 @@ if ($result < 0)
 	$data_year_1 = array();
 	$data_year_2 = array();
 
-	for ($i = 0; $i < 12; $i++)
-	{
+	for ($i = 0; $i < 12; $i++) {
 		$data_year_0[$i] = isset($tblyear[0][substr("0".($i + 1), -2)]) ? $tblyear[0][substr("0".($i + 1), -2)] : 0;
 		$data_year_1[$i] = isset($tblyear[1][substr("0".($i + 1), -2)]) ? $tblyear[1][substr("0".($i + 1), -2)] : 0;
 		$data_year_2[$i] = isset($tblyear[2][substr("0".($i + 1), -2)]) ? $tblyear[2][substr("0".($i + 1), -2)] : 0;
@@ -347,8 +336,7 @@ if ($result < 0)
 	$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/credmovement".$id."-".$year.".png";
 	$title = $langs->transnoentities("Credit").' - '.$langs->transnoentities("Year").': '.($year - 2).' - '.($year - 1)." - ".$year;
 	$graph_datas = array();
-	for ($i = 0; $i < 12; $i++)
-	{
+	for ($i = 0; $i < 12; $i++) {
 		$graph_datas[$i] = array($labels[$i], $data_year_0[$i], $data_year_1[$i], $data_year_2[$i]);
 	}
 
@@ -382,8 +370,7 @@ if ($result < 0)
 	$tblyear[1] = array();
 	$tblyear[2] = array();
 
-	for ($annee = 0; $annee < 3; $annee++)
-	{
+	for ($annee = 0; $annee < 3; $annee++) {
 		$sql = "SELECT date_format(b.datev,'%m')";
 		$sql .= ", SUM(b.amount)";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -393,16 +380,16 @@ if ($result < 0)
 		$sql .= " AND b.datev >= '".($year - $annee)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".($year - $annee)."-12-31 23:59:59'";
 		$sql .= " AND b.amount < 0";
-		if ($id && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$id.")";
+		if ($id && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$id.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%m');";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				$tblyear[$annee][$row[0]] = abs($row[1]);
 				$i++;
@@ -418,8 +405,7 @@ if ($result < 0)
 	$data_year_1 = array();
 	$data_year_2 = array();
 
-	for ($i = 0; $i < 12; $i++)
-	{
+	for ($i = 0; $i < 12; $i++) {
 		$data_year_0[$i] = isset($tblyear[0][substr("0".($i + 1), -2)]) ? $tblyear[0][substr("0".($i + 1), -2)] : 0;
 		$data_year_1[$i] = isset($tblyear[1][substr("0".($i + 1), -2)]) ? $tblyear[1][substr("0".($i + 1), -2)] : 0;
 		$data_year_2[$i] = isset($tblyear[2][substr("0".($i + 1), -2)]) ? $tblyear[2][substr("0".($i + 1), -2)] : 0;
@@ -431,8 +417,7 @@ if ($result < 0)
 	$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/debmovement".$id."-".$year.".png";
 	$title = $langs->transnoentities("Debit").' - '.$langs->transnoentities("Year").': '.($year - 2).' - '.($year - 1)." - ".$year;
 	$graph_datas = array();
-	for ($i = 0; $i < 12; $i++)
-	{
+	for ($i = 0; $i < 12; $i++) {
 		$graph_datas[$i] = array($labels[$i], $data_year_0[$i], $data_year_1[$i], $data_year_2[$i]);
 	}
 
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 3f29ab4d022..390972912c1 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -69,12 +69,15 @@ $contextpage = 'banktransactionlist'.(empty($object->ref) ? '' : '-'.$object->id
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-if ($fielvalue)
-{
-	if ($user->socid) $socid = $user->socid;
+if ($fielvalue) {
+	if ($user->socid) {
+		$socid = $user->socid;
+	}
 	$result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account&bank_account', '', '', $fieldtype);
 } else {
-	if ($user->socid) $socid = $user->socid;
+	if ($user->socid) {
+		$socid = $user->socid;
+	}
 	$result = restrictedArea($user, 'banque');
 }
 
@@ -96,29 +99,37 @@ $search_req_nb = GETPOST("req_nb", 'alpha');
 $search_num_releve = GETPOST("search_num_releve", 'alpha');
 $search_conciliated = GETPOST("search_conciliated", 'int');
 $num_releve = GETPOST("num_releve", "alpha");
-if (empty($dateop)) $dateop = -1;
+if (empty($dateop)) {
+	$dateop = -1;
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $pageplusone = GETPOST("pageplusone", 'int');
-if ($pageplusone) $page = $pageplusone - 1;
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if ($pageplusone) {
+	$page = $pageplusone - 1;
+}
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = 'desc,desc,desc';
-if (!$sortfield) $sortfield = 'b.datev,b.dateo,b.rowid';
+if (!$sortorder) {
+	$sortorder = 'desc,desc,desc';
+}
+if (!$sortfield) {
+	$sortfield = 'b.datev,b.dateo,b.rowid';
+}
 
 $object = new Account($db);
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);
 	$search_account = $object->id; // Force the search field on id of account
 
-	if (!($object->id > 0))
-	{
+	if (!($object->id > 0)) {
 		$langs->load("errors");
 		print($langs->trans('ErrorRecordNotFound'));
 		exit;
@@ -127,10 +138,11 @@ if ($id > 0 || !empty($ref))
 
 $mode_balance_ok = false;
 //if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid'))    // TODO Manage balance when account not selected
-if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid'))
-{
+if (($sortfield == 'b.datev' || $sortfield == 'b.datev,b.dateo,b.rowid')) {
 	$sortfield = 'b.datev,b.dateo,b.rowid';
-	if ($id > 0 || !empty($ref) || $search_account > 0) $mode_balance_ok = true;
+	if ($id > 0 || !empty($ref) || $search_account > 0) {
+		$mode_balance_ok = true;
+	}
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -142,16 +154,16 @@ $extrafields->fetch_name_optionals_label('banktransaction');
 $search_array_options = $extrafields->getOptionalsFromPost('banktransaction', '', 'search_');
 
 $arrayfields = array(
-    'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
-    'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
-    'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1),
-    'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-    'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1),
-    'bu.label'=>array('label'=>$langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked'=>1, 'position'=>500),
-    'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>1000),
-    'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
-    'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
+	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
+	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
+	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1),
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1),
+	'bu.label'=>array('label'=>$langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked'=>1, 'position'=>500),
+	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>1000),
+	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
+	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
 	'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>1000),
 	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1001),
 	'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>1010),
@@ -169,17 +181,22 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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');
+}
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-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_dt_start = '';
 	$search_dt_end = '';
 	$search_dv_start = '';
@@ -197,11 +214,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$thirdparty = '';
 
 	$search_account = "";
-	if ($id > 0 || !empty($ref)) $search_account = $object->id;
+	if ($id > 0 || !empty($ref)) {
+		$search_account = $object->id;
+	}
 }
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$objectclass = 'Account';
 	$objectlabel = 'BankTransaction';
 	$permissiontoread = $user->rights->banque->lire;
@@ -212,15 +230,13 @@ if (empty($reshook))
 
 // Conciliation
 if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate
-	&& (!GETPOSTISSET('pageplusone') || (GETPOST('pageplusone') == GETPOST('pageplusoneold'))))
-{
+	&& (!GETPOSTISSET('pageplusone') || (GETPOST('pageplusone') == GETPOST('pageplusoneold')))) {
 	$error = 0;
 
 	// Definition, nettoyage parametres
 	$num_releve = GETPOST("num_releve", "alpha");
 
-	if ($num_releve)
-	{
+	if ($num_releve) {
 		$bankline = new AccountLine($db);
 
 		$rowids = GETPOST('rowid', 'array');
@@ -249,22 +265,45 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
 		setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$param = 'action=reconcile&contextpage=banktransactionlist&id='.$id.'&search_account='.$id;
 		$param .= '&search_conciliated='.urlencode($search_conciliated);
-		if ($page) $param .= '&page='.urlencode($page);
-		if ($offset) $param .= '&offset='.urlencode($offset);
-		if ($search_thirdparty_user) $param .= '&search_thirdparty='.urlencode($search_thirdparty_user);
-		if ($search_num_releve) $param .= '&search_num_releve='.urlencode($search_num_releve);
-		if ($search_description) $param .= '&search_description='.urlencode($search_description);
-		if ($search_start_dt) $param .= '&search_start_dt='.urlencode($search_start_dt);
-		if ($search_end_dt) $param .= '&search_end_dt='.urlencode($search_end_dt);
-		if ($search_start_dv) $param .= '&search_start_dv='.urlencode($search_start_dv);
-		if ($search_end_dv) $param .= '&search_end_dv='.urlencode($search_end_dv);
-		if ($search_type) $param .= '&search_type='.urlencode($search_type);
-		if ($search_debit) $param .= '&search_debit='.urlencode($search_debit);
-		if ($search_credit) $param .= '&search_credit='.urlencode($search_credit);
+		if ($page) {
+			$param .= '&page='.urlencode($page);
+		}
+		if ($offset) {
+			$param .= '&offset='.urlencode($offset);
+		}
+		if ($search_thirdparty_user) {
+			$param .= '&search_thirdparty='.urlencode($search_thirdparty_user);
+		}
+		if ($search_num_releve) {
+			$param .= '&search_num_releve='.urlencode($search_num_releve);
+		}
+		if ($search_description) {
+			$param .= '&search_description='.urlencode($search_description);
+		}
+		if ($search_start_dt) {
+			$param .= '&search_start_dt='.urlencode($search_start_dt);
+		}
+		if ($search_end_dt) {
+			$param .= '&search_end_dt='.urlencode($search_end_dt);
+		}
+		if ($search_start_dv) {
+			$param .= '&search_start_dv='.urlencode($search_start_dv);
+		}
+		if ($search_end_dv) {
+			$param .= '&search_end_dv='.urlencode($search_end_dv);
+		}
+		if ($search_type) {
+			$param .= '&search_type='.urlencode($search_type);
+		}
+		if ($search_debit) {
+			$param .= '&search_debit='.urlencode($search_debit);
+		}
+		if ($search_credit) {
+			$param .= '&search_credit='.urlencode($search_credit);
+		}
 		$param .= '&sortfield='.urlencode($sortfield).'&sortorder='.urlencode($sortorder);
 		header('Location: '.$_SERVER["PHP_SELF"].'?'.$param); // To avoid to submit twice and allow the back button
 		exit;
@@ -272,12 +311,10 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
 }
 
 
-if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
-{
+if (GETPOST('save') && !$cancel && $user->rights->banque->modifier) {
 	$error = 0;
 
-	if (price2num(GETPOST("addcredit")) > 0)
-	{
+	if (price2num(GETPOST("addcredit")) > 0) {
 		$amount = price2num(GETPOST("addcredit"));
 	} else {
 		$amount = - price2num(GETPOST("adddebit"));
@@ -313,17 +350,16 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 	}
 	/*if (! empty($conf->accounting->enabled) && (empty($search_accountancy_code) || $search_accountancy_code == '-1'))
-    {
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
-    	$error++;
-    }*/
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
+		$error++;
+	}*/
 
 	if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
 		$objecttmp = new Account($db);
 		$objecttmp->fetch($bankaccountid);
 		$insertid = $objecttmp->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $search_accountancy_code);
-		if ($insertid > 0)
-		{
+		if ($insertid > 0) {
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
 			exit;
@@ -335,8 +371,7 @@ if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->modifier)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->modifier) {
 	$accline = new AccountLine($db);
 	$result = $accline->fetch(GETPOST("rowid", "int"));
 	$result = $accline->delete($user);
@@ -384,28 +419,72 @@ $now = dol_now();
 
 // Must be before button action
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($id > 0) $param .= '&id='.urlencode($id);
-if (!empty($ref)) $param .= '&ref='.urlencode($ref);
-if (!empty($search_ref)) $param .= '&search_ref='.urlencode($search_ref);
-if (!empty($search_description)) $param .= '&search_description='.urlencode($search_description);
-if (!empty($search_type)) $param .= '&type='.urlencode($search_type);
-if (!empty($search_thirdparty_user)) $param .= '&search_thirdparty='.urlencode($search_thirdparty_user);
-if (!empty($search_debit)) $param .= '&search_debit='.urlencode($search_debit);
-if (!empty($search_credit)) $param .= '&search_credit='.urlencode($search_credit);
-if (!empty($search_account)) $param .= '&search_account='.urlencode($search_account);
-if (!empty($search_num_releve)) $param .= '&search_num_releve='.urlencode($search_num_releve);
-if ($search_conciliated != '' && $search_conciliated != '-1')  $param .= '&search_conciliated='.urlencode($search_conciliated);
-if ($search_bid > 0)  $param .= '&search_bid='.urlencode($search_bid);
-if (dol_strlen($search_dt_start) > 0) $param .= '&search_start_dtmonth='.GETPOST('search_start_dtmonth', 'int').'&search_start_dtday='.GETPOST('search_start_dtday', 'int').'&search_start_dtyear='.GETPOST('search_start_dtyear', 'int');
-if (dol_strlen($search_dt_end) > 0)   $param .= '&search_end_dtmonth='.GETPOST('search_end_dtmonth', 'int').'&search_end_dtday='.GETPOST('search_end_dtday', 'int').'&search_end_dtyear='.GETPOST('search_end_dtyear', 'int');
-if (dol_strlen($search_dv_start) > 0) $param .= '&search_start_dvmonth='.GETPOST('search_start_dvmonth', 'int').'&search_start_dvday='.GETPOST('search_start_dvday', 'int').'&search_start_dvyear='.GETPOST('search_start_dvyear', 'int');
-if (dol_strlen($search_dv_end) > 0)   $param .= '&search_end_dvmonth='.GETPOST('search_end_dvmonth', 'int').'&search_end_dvday='.GETPOST('search_end_dvday', 'int').'&search_end_dvyear='.GETPOST('search_end_dvyear', 'int');
-if ($search_req_nb) $param .= '&req_nb='.urlencode($search_req_nb);
-if (GETPOST("search_thirdparty", 'int')) $param .= '&thirdparty='.urlencode(GETPOST("search_thirdparty", 'int'));
-if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
-if ($action == 'reconcile') $param .= '&action=reconcile';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($id > 0) {
+	$param .= '&id='.urlencode($id);
+}
+if (!empty($ref)) {
+	$param .= '&ref='.urlencode($ref);
+}
+if (!empty($search_ref)) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if (!empty($search_description)) {
+	$param .= '&search_description='.urlencode($search_description);
+}
+if (!empty($search_type)) {
+	$param .= '&type='.urlencode($search_type);
+}
+if (!empty($search_thirdparty_user)) {
+	$param .= '&search_thirdparty='.urlencode($search_thirdparty_user);
+}
+if (!empty($search_debit)) {
+	$param .= '&search_debit='.urlencode($search_debit);
+}
+if (!empty($search_credit)) {
+	$param .= '&search_credit='.urlencode($search_credit);
+}
+if (!empty($search_account)) {
+	$param .= '&search_account='.urlencode($search_account);
+}
+if (!empty($search_num_releve)) {
+	$param .= '&search_num_releve='.urlencode($search_num_releve);
+}
+if ($search_conciliated != '' && $search_conciliated != '-1') {
+	$param .= '&search_conciliated='.urlencode($search_conciliated);
+}
+if ($search_bid > 0) {
+	$param .= '&search_bid='.urlencode($search_bid);
+}
+if (dol_strlen($search_dt_start) > 0) {
+	$param .= '&search_start_dtmonth='.GETPOST('search_start_dtmonth', 'int').'&search_start_dtday='.GETPOST('search_start_dtday', 'int').'&search_start_dtyear='.GETPOST('search_start_dtyear', 'int');
+}
+if (dol_strlen($search_dt_end) > 0) {
+	$param .= '&search_end_dtmonth='.GETPOST('search_end_dtmonth', 'int').'&search_end_dtday='.GETPOST('search_end_dtday', 'int').'&search_end_dtyear='.GETPOST('search_end_dtyear', 'int');
+}
+if (dol_strlen($search_dv_start) > 0) {
+	$param .= '&search_start_dvmonth='.GETPOST('search_start_dvmonth', 'int').'&search_start_dvday='.GETPOST('search_start_dvday', 'int').'&search_start_dvyear='.GETPOST('search_start_dvyear', 'int');
+}
+if (dol_strlen($search_dv_end) > 0) {
+	$param .= '&search_end_dvmonth='.GETPOST('search_end_dvmonth', 'int').'&search_end_dvday='.GETPOST('search_end_dvday', 'int').'&search_end_dvyear='.GETPOST('search_end_dvyear', 'int');
+}
+if ($search_req_nb) {
+	$param .= '&req_nb='.urlencode($search_req_nb);
+}
+if (GETPOST("search_thirdparty", 'int')) {
+	$param .= '&thirdparty='.urlencode(GETPOST("search_thirdparty", 'int'));
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($action == 'reconcile') {
+	$param .= '&action=reconcile';
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -414,8 +493,7 @@ $options = array();
 $buttonreconcile = '';
 $morehtmlref = '';
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Transactions");
 	$helpurl = "";
 	llxHeader('', $title, $helpurl);
@@ -440,13 +518,11 @@ if ($id > 0 || !empty($ref))
 
 
 	/*
-     * Buttons actions
-     */
+	 * Buttons actions
+	 */
 
-	if ($action != 'reconcile')
-	{
-		if ($object->canBeConciliated() > 0)
-		{
+	if ($action != 'reconcile') {
+		if ($object->canBeConciliated() > 0) {
 			$allowautomaticconciliation = false; // TODO
 			$titletoconciliatemanual = $langs->trans("Conciliate");
 			$titletoconciliateauto = $langs->trans("Conciliate");
@@ -485,30 +561,54 @@ $sql .= " b.fk_account, b.fk_type,";
 $sql .= " ba.rowid as bankid, ba.ref as bankref";
 // 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
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ";
-if ($search_bid > 0) $sql .= MAIN_DB_PREFIX."bank_class as l,";
+if ($search_bid > 0) {
+	$sql .= MAIN_DB_PREFIX."bank_class as l,";
+}
 $sql .= " ".MAIN_DB_PREFIX."bank_account as ba,";
 $sql .= " ".MAIN_DB_PREFIX."bank as b";
-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 (b.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 (b.rowid = ef.fk_object)";
+}
 $sql .= " WHERE b.fk_account = ba.rowid";
 $sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-if ($search_account > 0) $sql .= " AND b.fk_account = ".$search_account;
+if ($search_account > 0) {
+	$sql .= " AND b.fk_account = ".$search_account;
+}
 // Search period criteria
-if (dol_strlen($search_dt_start) > 0) $sql .= " AND b.dateo >= '".$db->idate($search_dt_start)."'";
-if (dol_strlen($search_dt_end) > 0) $sql .= " AND b.dateo <= '".$db->idate($search_dt_end)."'";
+if (dol_strlen($search_dt_start) > 0) {
+	$sql .= " AND b.dateo >= '".$db->idate($search_dt_start)."'";
+}
+if (dol_strlen($search_dt_end) > 0) {
+	$sql .= " AND b.dateo <= '".$db->idate($search_dt_end)."'";
+}
 // Search period criteria
-if (dol_strlen($search_dv_start) > 0) $sql .= " AND b.datev >= '".$db->idate($search_dv_start)."'";
-if (dol_strlen($search_dv_end) > 0) $sql .= " AND b.datev <= '".$db->idate($search_dv_end)."'";
-if ($search_ref) $sql .= natural_search("b.rowid", $search_ref, 1);
-if ($search_req_nb) $sql .= natural_search("b.num_chq", $search_req_nb);
-if ($search_num_releve) $sql .= natural_search("b.num_releve", $search_num_releve);
-if ($search_conciliated != '' && $search_conciliated != '-1') $sql .= " AND b.rappro = ".urlencode($search_conciliated);
+if (dol_strlen($search_dv_start) > 0) {
+	$sql .= " AND b.datev >= '".$db->idate($search_dv_start)."'";
+}
+if (dol_strlen($search_dv_end) > 0) {
+	$sql .= " AND b.datev <= '".$db->idate($search_dv_end)."'";
+}
+if ($search_ref) {
+	$sql .= natural_search("b.rowid", $search_ref, 1);
+}
+if ($search_req_nb) {
+	$sql .= natural_search("b.num_chq", $search_req_nb);
+}
+if ($search_num_releve) {
+	$sql .= natural_search("b.num_releve", $search_num_releve);
+}
+if ($search_conciliated != '' && $search_conciliated != '-1') {
+	$sql .= " AND b.rappro = ".urlencode($search_conciliated);
+}
 if ($search_thirdparty_user) {
 	$sql.= " AND (b.rowid IN ";
 	$sql.= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
@@ -523,8 +623,7 @@ if ($search_thirdparty_user) {
 	$sql.= "	  WHERE ". natural_search(array("subSoc.nom"), $search_thirdparty_user, '', 1);
 	$sql.= ")";
 }
-if ($search_description)
-{
+if ($search_description) {
 	$search_description_to_use = $search_description;
 	$arrayoffixedlabels = array(
 		'payment_salary',
@@ -536,23 +635,29 @@ if ($search_description)
 		'SubscriptionPayment',
 		'WithdrawalPayment'
 	);
-	foreach ($arrayoffixedlabels as $keyforlabel)
-	{
+	foreach ($arrayoffixedlabels as $keyforlabel) {
 		$translatedlabel = $langs->transnoentitiesnoconv($keyforlabel);
-		if (preg_match('/'.$search_description.'/i', $translatedlabel))
-		{
+		if (preg_match('/'.$search_description.'/i', $translatedlabel)) {
 			$search_description_to_use .= "|".$keyforlabel;
 		}
 	}
 	$sql .= natural_search("b.label", $search_description_to_use); // Warning some text are just translation keys, not translated strings
 }
-if ($search_bid > 0) $sql .= " AND b.rowid=l.lineid AND l.fk_categ=".$search_bid;
-if (!empty($search_type)) $sql .= " AND b.fk_type = '".$db->escape($search_type)."' ";
+if ($search_bid > 0) {
+	$sql .= " AND b.rowid=l.lineid AND l.fk_categ=".$search_bid;
+}
+if (!empty($search_type)) {
+	$sql .= " AND b.fk_type = '".$db->escape($search_type)."' ";
+}
 // Search criteria amount
 $search_debit = price2num(str_replace('-', '', $search_debit));
 $search_credit = price2num(str_replace('-', '', $search_credit));
-if ($search_debit) $sql .= natural_search('- b.amount', $search_debit, 1);
-if ($search_credit) $sql .= natural_search('b.amount', $search_credit, 1);
+if ($search_debit) {
+	$sql .= natural_search('- b.amount', $search_debit, 1);
+}
+if ($search_credit) {
+	$sql .= natural_search('b.amount', $search_credit, 1);
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
@@ -565,48 +670,66 @@ $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 $nbtotalofpages = 0;
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
 	$nbtotalofpages = ceil($nbtotalofrecords / $limit);
 }
 
-if (($id > 0 || !empty($ref)) && ((string) $page == ''))
-{
+if (($id > 0 || !empty($ref)) && ((string) $page == '')) {
 	// We open a list of transaction of a dedicated account and no page was set by defaut
 	// We force on last page.
 	$page = ($nbtotalofpages - 1);
 	$offset = $limit * $page;
-	if ($page < 0) $page = 0;
+	if ($page < 0) {
+		$page = 0;
+	}
 }
-if ($page >= $nbtotalofpages)
-{
+if ($page >= $nbtotalofpages) {
 	// If we made a search and result has low page than the page number we were on
 	$page = ($nbtotalofpages - 1);
 	$offset = $limit * $page;
-	if ($page < 0) $page = 0;
+	if ($page < 0) {
+		$page = 0;
+	}
 }
 
 
 // If not account defined $mode_balance_ok=false
-if (empty($search_account)) $mode_balance_ok = false;
+if (empty($search_account)) {
+	$mode_balance_ok = false;
+}
 // If a search is done $mode_balance_ok=false
-if (!empty($search_ref)) $mode_balance_ok = false;
-if (!empty($search_description)) $mode_balance_ok = false;
-if (!empty($search_type)) $mode_balance_ok = false;
-if (!empty($search_debit)) $mode_balance_ok = false;
-if (!empty($search_credit)) $mode_balance_ok = false;
-if (!empty($search_thirdparty_user)) $mode_balance_ok = false;
-if ($search_conciliated != '' && $search_conciliated != '-1') $mode_balance_ok = false;
-if (!empty($search_num_releve)) $mode_balance_ok = false;
+if (!empty($search_ref)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_description)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_type)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_debit)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_credit)) {
+	$mode_balance_ok = false;
+}
+if (!empty($search_thirdparty_user)) {
+	$mode_balance_ok = false;
+}
+if ($search_conciliated != '' && $search_conciliated != '-1') {
+	$mode_balance_ok = false;
+}
+if (!empty($search_num_releve)) {
+	$mode_balance_ok = false;
+}
 
 $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
 dol_syslog('compta/bank/bankentries_list.php', LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
@@ -617,19 +740,22 @@ if ($resql)
 		//'builddoc'=>$langs->trans("PDFMerge"),
 	);
 	//if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	if (in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	// Confirmation delete
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$text = $langs->trans('ConfirmDeleteTransaction');
 		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
 	}
 
 	// Lines of title fields
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="'.($action ? $action : 'search').'">';
@@ -639,17 +765,17 @@ if ($resql)
 	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
-	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
+	if (GETPOST('bid')) {
+		print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
+	}
 
 	// Form to reconcile
-	if ($user->rights->banque->consolidate && $action == 'reconcile')
-	{
+	if ($user->rights->banque->consolidate && $action == 'reconcile') {
 		print '<div class="valignmiddle inline-block" style="padding-right: 20px;">';
 		print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
 		print '<input class="flat" id="num_releve" name="num_releve" type="text" value="'.(GETPOST('num_releve') ?GETPOST('num_releve') : '').'" size="10">'; // The only default value is value we just entered
 		print '</div>';
-		if (is_array($options) && count($options))
-		{
+		if (is_array($options) && count($options)) {
 			print $langs->trans("EventualyAddCategory").': ';
 			print Form::selectarray('cat', $options, GETPOST('cat'), 1);
 		}
@@ -671,13 +797,11 @@ if ($resql)
 		print '<br>';
 		print $langs->trans("LastAccountStatements").' : ';
 		$resqlr = $db->query($sql);
-		if ($resqlr)
-		{
+		if ($resqlr) {
 			$numr = $db->num_rows($resqlr);
 			$i = 0;
 			$last_ok = 0;
-			while (($i < $numr) && ($i < $nbmax))
-			{
+			while (($i < $numr) && ($i < $nbmax)) {
 				$objr = $db->fetch_object($resqlr);
 				if (!$last_ok) {
 					$last_releve = $objr->num_releve;
@@ -686,16 +810,19 @@ if ($resql)
 				$i++;
 				$liste = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$id.'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
 			}
-			if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
+			if ($numr >= $nbmax) {
+				$liste = "... &nbsp; ".$liste;
+			}
 			print $liste;
-			if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
+			if ($numr <= 0) {
+				print '<b>'.$langs->trans("None").'</b>';
+			}
 		} else {
 			dol_print_error($db);
 		}
 
 		// Using BANK_REPORT_LAST_NUM_RELEVE to automatically report last num (or not)
-		if (!empty($conf->global->BANK_REPORT_LAST_NUM_RELEVE))
-		{
+		if (!empty($conf->global->BANK_REPORT_LAST_NUM_RELEVE)) {
 			print '
 			    <script type="text/javascript">
 			    	$("#num_releve").val("' . $last_releve.'");
@@ -706,8 +833,7 @@ if ($resql)
 	}
 
 	// Form to add a transaction with no invoice
-	if ($user->rights->banque->modifier && $action == 'addline' && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
-	{
+	if ($user->rights->banque->modifier && $action == 'addline' && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
 		print load_fiche_titre($langs->trans("AddBankRecordLong"), '', '');
 
 		print '<table class="noborder centpercent">';
@@ -733,8 +859,7 @@ if ($resql)
 		print '<tr>';
 		print '<td>';
 		print '<input name="label" class="flat minwidth200" type="text" value="'.GETPOST("label", "alpha").'">';
-		if (is_array($options) && count($options))
-		{
+		if (is_array($options) && count($options)) {
 			print '<br>'.$langs->trans("Rubrique").': ';
 			print Form::selectarray('cat1', $options, GETPOST('cat1'), 1);
 		}
@@ -798,12 +923,9 @@ if ($resql)
 	$bankcateg = new BankCateg($db);
 
 	$newcardbutton = '';
-	if ($action != 'addline' && $action != 'reconcile')
-	{
-		if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT))
-		{
-			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))	// Default is to record miscellaneous direct entries using miscellaneous payments
-			{
+	if ($action != 'addline' && $action != 'reconcile') {
+		if (empty($conf->global->BANK_DISABLE_DIRECT_INPUT)) {
+			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {	// Default is to record miscellaneous direct entries using miscellaneous payments
 				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
 			} else // If direct entries is not done using miscellaneous payments
 			{
@@ -821,20 +943,23 @@ if ($resql)
 	$morehtml .= '</div>';
 	*/
 
-	if ($action != 'addline' && $action != 'reconcile')
-	{
+	if ($action != 'addline' && $action != 'reconcile') {
 		$morehtml .= $buttonreconcile;
 	}
 
 	$morehtml .= '<!-- Add New button -->'.$newcardbutton;
 
 	$picto = 'bank_account';
-	if ($id > 0 || !empty($ref)) $picto = '';
+	if ($id > 0 || !empty($ref)) {
+		$picto = '';
+	}
 
 	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit, 0, 0, 1);
 
 	// We can add page now to param
-	if ($page != '') $param .= '&page='.urlencode($page);
+	if ($page != '') {
+		$param .= '&page='.urlencode($page);
+	}
 
 	$moreforfilter = '';
 
@@ -856,11 +981,9 @@ if ($resql)
 	$moreforfilter .= '<div class="nowrap inline-block">'.$form->selectDate($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')).'</div>';
 	$moreforfilter .= '</div>';
 
-	if (!empty($conf->categorie->enabled))
-	{
+	if (!empty($conf->categorie->enabled)) {
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			$langs->load('categories');
 
 			// Bank line
@@ -874,11 +997,13 @@ if ($resql)
 
 	$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 ($moreforfilter)
-	{
+	if ($moreforfilter) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>'."\n";
@@ -896,81 +1021,67 @@ if ($resql)
 
 
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['b.rowid']['checked']))
-	{
+	if (!empty($arrayfields['b.rowid']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input type="text" class="flat" name="search_ref" size="2" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['b.label']['checked']))
-	{
+	if (!empty($arrayfields['b.label']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input type="text" class="flat maxwidth100" name="search_description" value="'.dol_escape_htmltag($search_description).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['b.dateo']['checked']))
-	{
+	if (!empty($arrayfields['b.dateo']['checked'])) {
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
-	if (!empty($arrayfields['b.datev']['checked']))
-	{
+	if (!empty($arrayfields['b.datev']['checked'])) {
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
-	if (!empty($arrayfields['type']['checked']))
-	{
+	if (!empty($arrayfields['type']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		$form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100');
 		print '</td>';
 	}
-	if (!empty($arrayfields['b.num_chq']['checked']))
-	{
+	if (!empty($arrayfields['b.num_chq']['checked'])) {
 		// Numero
 		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="req_nb" value="'.dol_escape_htmltag($search_req_nb).'" size="2"></td>';
 	}
-	if (!empty($arrayfields['bu.label']['checked']))
-	{
+	if (!empty($arrayfields['bu.label']['checked'])) {
 		print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
 	}
-	if (!empty($arrayfields['ba.ref']['checked']))
-	{
+	if (!empty($arrayfields['ba.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->select_comptes($search_account, 'search_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''), 0, 'maxwidth100');
 		print '</td>';
 	}
-	if (!empty($arrayfields['b.debit']['checked']))
-	{
+	if (!empty($arrayfields['b.debit']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '<input type="text" class="flat width50" name="search_debit" value="'.dol_escape_htmltag($search_debit).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['b.credit']['checked']))
-	{
+	if (!empty($arrayfields['b.credit']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '<input type="text" class="flat width50" name="search_credit" value="'.dol_escape_htmltag($search_credit).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['balancebefore']['checked']))
-	{
+	if (!empty($arrayfields['balancebefore']['checked'])) {
 		print '<td class="liste_titre right">';
 		$htmltext = $langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue"));
 		print $form->textwithpicto('', $htmltext, 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['balance']['checked']))
-	{
+	if (!empty($arrayfields['balance']['checked'])) {
 		print '<td class="liste_titre right">';
 		$htmltext = $langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue"));
 		print $form->textwithpicto('', $htmltext, 1);
 		print '</td>';
 	}
 	// Numero statement
-	if (!empty($arrayfields['b.num_releve']['checked']))
-	{
+	if (!empty($arrayfields['b.num_releve']['checked'])) {
 		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_num_releve" value="'.dol_escape_htmltag($search_num_releve).'" size="3"></td>';
 	}
 	// Conciliated
-	if (!empty($arrayfields['b.conciliated']['checked']))
-	{
+	if (!empty($arrayfields['b.conciliated']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1);
 		print '</td>';
@@ -985,20 +1096,48 @@ if ($resql)
 
 	// Fields title
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['b.rowid']['checked']))            print_liste_field_titre($arrayfields['b.rowid']['label'], $_SERVER['PHP_SELF'], 'b.rowid', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['b.label']['checked']))            print_liste_field_titre($arrayfields['b.label']['label'], $_SERVER['PHP_SELF'], 'b.label', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['b.dateo']['checked']))            print_liste_field_titre($arrayfields['b.dateo']['label'], $_SERVER['PHP_SELF'], 'b.dateo', '', $param, '', $sortfield, $sortorder, "center ");
-	if (!empty($arrayfields['b.datev']['checked']))            print_liste_field_titre($arrayfields['b.datev']['label'], $_SERVER['PHP_SELF'], 'b.datev,b.dateo,b.rowid', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['type']['checked']))               print_liste_field_titre($arrayfields['type']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['b.num_chq']['checked']))          print_liste_field_titre($arrayfields['b.num_chq']['label'], $_SERVER['PHP_SELF'], 'b.num_chq', '', $param, '', $sortfield, $sortorder, "center ");
-	if (!empty($arrayfields['bu.label']['checked']))           print_liste_field_titre($arrayfields['bu.label']['label'], $_SERVER['PHP_SELF'], 'bu.label', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['ba.ref']['checked']))             print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['b.debit']['checked']))            print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
-	if (!empty($arrayfields['b.credit']['checked']))           print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
-	if (!empty($arrayfields['balancebefore']['checked']))      print_liste_field_titre($arrayfields['balancebefore']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
-	if (!empty($arrayfields['balance']['checked']))            print_liste_field_titre($arrayfields['balance']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
-	if (!empty($arrayfields['b.num_releve']['checked']))       print_liste_field_titre($arrayfields['b.num_releve']['label'], $_SERVER['PHP_SELF'], 'b.num_releve', '', $param, '', $sortfield, $sortorder, "center ");
-	if (!empty($arrayfields['b.conciliated']['checked']))      print_liste_field_titre($arrayfields['b.conciliated']['label'], $_SERVER['PHP_SELF'], 'b.rappro', '', $param, '', $sortfield, $sortorder, "center ");
+	if (!empty($arrayfields['b.rowid']['checked'])) {
+		print_liste_field_titre($arrayfields['b.rowid']['label'], $_SERVER['PHP_SELF'], 'b.rowid', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['b.label']['checked'])) {
+		print_liste_field_titre($arrayfields['b.label']['label'], $_SERVER['PHP_SELF'], 'b.label', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['b.dateo']['checked'])) {
+		print_liste_field_titre($arrayfields['b.dateo']['label'], $_SERVER['PHP_SELF'], 'b.dateo', '', $param, '', $sortfield, $sortorder, "center ");
+	}
+	if (!empty($arrayfields['b.datev']['checked'])) {
+		print_liste_field_titre($arrayfields['b.datev']['label'], $_SERVER['PHP_SELF'], 'b.datev,b.dateo,b.rowid', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['type']['checked'])) {
+		print_liste_field_titre($arrayfields['type']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['b.num_chq']['checked'])) {
+		print_liste_field_titre($arrayfields['b.num_chq']['label'], $_SERVER['PHP_SELF'], 'b.num_chq', '', $param, '', $sortfield, $sortorder, "center ");
+	}
+	if (!empty($arrayfields['bu.label']['checked'])) {
+		print_liste_field_titre($arrayfields['bu.label']['label'], $_SERVER['PHP_SELF'], 'bu.label', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['ba.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['ba.ref']['label'], $_SERVER['PHP_SELF'], 'ba.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['b.debit']['checked'])) {
+		print_liste_field_titre($arrayfields['b.debit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
+	}
+	if (!empty($arrayfields['b.credit']['checked'])) {
+		print_liste_field_titre($arrayfields['b.credit']['label'], $_SERVER['PHP_SELF'], 'b.amount', '', $param, '', $sortfield, $sortorder, "right ");
+	}
+	if (!empty($arrayfields['balancebefore']['checked'])) {
+		print_liste_field_titre($arrayfields['balancebefore']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
+	}
+	if (!empty($arrayfields['balance']['checked'])) {
+		print_liste_field_titre($arrayfields['balance']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, "right ");
+	}
+	if (!empty($arrayfields['b.num_releve']['checked'])) {
+		print_liste_field_titre($arrayfields['b.num_releve']['label'], $_SERVER['PHP_SELF'], 'b.num_releve', '', $param, '', $sortfield, $sortorder, "center ");
+	}
+	if (!empty($arrayfields['b.conciliated']['checked'])) {
+		print_liste_field_titre($arrayfields['b.conciliated']['label'], $_SERVER['PHP_SELF'], 'b.rappro', '', $param, '', $sortfield, $sortorder, "center ");
+	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
@@ -1019,16 +1158,13 @@ if ($resql)
 	$sign = 1;
 
 	$totalarray = array();
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$objp = $db->fetch_object($resql);
 		$links = $bankaccountstatic->get_url($objp->rowid);
 
 		// If we are in a situation where we need/can show balance, we calculate the start of balance
-		if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && ($mode_balance_ok || $search_conciliated === '0'))
-		{
-			if (!$search_account)
-			{
+		if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && ($mode_balance_ok || $search_conciliated === '0')) {
+			if (!$search_account) {
 				dol_print_error('', 'account is not defined but $mode_balance_ok is true');
 				exit;
 			}
@@ -1050,80 +1186,75 @@ if ($resql)
 				$objforbalance = $db->fetch_object($resqlforbalance);
 				if ($objforbalance) {
 					// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
-					if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
-					{
+					if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc') {
 						$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
 					} // If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
 					else {
 						$balance = $objforbalance->previoustotal;
 					}
 				}
-			} else dol_print_error($db);
+			} else {
+				dol_print_error($db);
+			}
 
 			$balancecalculated = true;
 
 			// Output a line with start balance
-			if ($user->rights->banque->consolidate && $action == 'reconcile')
-			{
+			if ($user->rights->banque->consolidate && $action == 'reconcile') {
 				$tmpnbfieldbeforebalance = 0;
 				$tmpnbfieldafterbalance = 0;
 				$balancefieldfound = 0;
-				foreach ($arrayfields as $key => $val)
-				{
-					if ($key == 'balancebefore' || $key == 'balance')
-					{
+				foreach ($arrayfields as $key => $val) {
+					if ($key == 'balancebefore' || $key == 'balance') {
 						$balancefieldfound++;
 						continue;
 					}
-		   			if (!empty($arrayfields[$key]['checked']))
-		   			{
-		   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-		   				else $tmpnbfieldafterbalance++;
-		   			}
+					if (!empty($arrayfields[$key]['checked'])) {
+						if (!$balancefieldfound) {
+							$tmpnbfieldbeforebalance++;
+						} else {
+							$tmpnbfieldafterbalance++;
+						}
+					}
 				}
 				// Extra fields
 				$element = 'banktransaction';
-				if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label']))
-				{
-					foreach ($extrafields->attributes[$element]['label'] as $key => $val)
-					{
-						if (!empty($arrayfields["ef.".$key]['checked']))
-						{
-				   			if (!empty($arrayfields[$key]['checked']))
-				   			{
-				   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-				   				else $tmpnbfieldafterbalance++;
-				   			}
+				if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label'])) {
+					foreach ($extrafields->attributes[$element]['label'] as $key => $val) {
+						if (!empty($arrayfields["ef.".$key]['checked'])) {
+							if (!empty($arrayfields[$key]['checked'])) {
+								if (!$balancefieldfound) {
+									$tmpnbfieldbeforebalance++;
+								} else {
+									$tmpnbfieldafterbalance++;
+								}
+							}
 						}
 					}
 				}
 
 				print '<tr class="oddeven trforbreak">';
-				if ($tmpnbfieldbeforebalance)
-				{
+				if ($tmpnbfieldbeforebalance) {
 					print '<td colspan="'.$tmpnbfieldbeforebalance.'">';
 					print '&nbsp;';
 					print '</td>';
 				}
 
-				if (!empty($arrayfields['balancebefore']['checked']))
-				{
+				if (!empty($arrayfields['balancebefore']['checked'])) {
 					print '<td class="right">';
 					if ($search_conciliated !== '0') {
 						print price(price2num($balance, 'MT'), 1, $langs);
 					}
 					print '</td>';
 				}
-				if (!empty($arrayfields['balance']['checked']))
-				{
+				if (!empty($arrayfields['balance']['checked'])) {
 					print '<td class="right">';
 					if ($search_conciliated !== '0') {
 						print price(price2num($balance, 'MT'), 1, $langs);
 					}
 					print '</td>';
 				}
-				if (!empty($arrayfields['b.num_releve']['checked']))
-				{
+				if (!empty($arrayfields['b.num_releve']['checked'])) {
 					print '<td class="center">';
 					print '<input type="checkbox" id="selectAll" title="'.dol_escape_htmltag($langs->trans("SelectAll")).'" />';
 					print ' <script type="text/javascript">
@@ -1141,8 +1272,7 @@ if ($resql)
 		}
 
 
-		if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
-		{
+		if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc') {
 			$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
 			$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
 		} else {
@@ -1150,8 +1280,7 @@ if ($resql)
 			$balance = price2num($balance + ($sign * $objp->amount), 'MT');
 		}
 
-		if (empty($cachebankaccount[$objp->bankid]))
-		{
+		if (empty($cachebankaccount[$objp->bankid])) {
 			$bankaccounttmp = new Account($db);
 			$bankaccounttmp->fetch($objp->bankid);
 			$cachebankaccount[$objp->bankid] = $bankaccounttmp;
@@ -1163,8 +1292,7 @@ if ($resql)
 		if (empty($conf->global->BANK_COLORIZE_MOVEMENT)) {
 			$backgroundcolor = "class='oddeven'";
 		} else {
-			if ($objp->amount < 0)
-			{
+			if ($objp->amount < 0) {
 				if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR1)) {
 					$color = '#fca955';
 				} else {
@@ -1187,24 +1315,25 @@ if ($resql)
 		print '<tr class="oddeven" '.$backgroundcolor.'>';
 
 		// Ref
-		if (!empty($arrayfields['b.rowid']['checked']))
-		{
+		if (!empty($arrayfields['b.rowid']['checked'])) {
 				print '<td class="nowrap left">';
 				print $banklinestatic->getNomUrl(1);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Description
-		if (!empty($arrayfields['b.label']['checked']))
-		{
+		if (!empty($arrayfields['b.label']['checked'])) {
 			print "<td>";
 
 			//print "<a href=\"line.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
 			$reg = array();
 			preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
-			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) print $langs->trans($reg[1]);
-			else {
+			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) {
+				print $langs->trans($reg[1]);
+			} else {
 				if ($objp->label == '(payment_salary)') {
 					print dol_trunc($langs->trans("SalaryPayment", 40));
 				} else {
@@ -1215,67 +1344,53 @@ if ($resql)
 
 			// Add links after description
 			$cachebankaccount = array();
-			foreach ($links as $key=>$val)
-			{
+			foreach ($links as $key => $val) {
 				print '<!-- '.$links[$key]['type'].' -->';
-				if ($links[$key]['type'] == 'withdraw')
-				{
+				if ($links[$key]['type'] == 'withdraw') {
 					$banktransferstatic->id = $links[$key]['url_id'];
 					$banktransferstatic->ref = $links[$key]['label'];
 					print ' '.$banktransferstatic->getNomUrl(0);
-				} elseif ($links[$key]['type'] == 'payment')
-				{
+				} elseif ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
 					$paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
 					print ' '.$paymentstatic->getNomUrl(2);
-				} elseif ($links[$key]['type'] == 'payment_supplier')
-				{
+				} elseif ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
 					print ' '.$paymentsupplierstatic->getNomUrl(2);
-				} elseif ($links[$key]['type'] == 'payment_sc')
-				{
+				} elseif ($links[$key]['type'] == 'payment_sc') {
 					$paymentscstatic->id = $links[$key]['url_id'];
 					$paymentscstatic->ref = $links[$key]['url_id'];
 					$paymentscstatic->label = $links[$key]['label'];
 					print ' '.$paymentscstatic->getNomUrl(2);
-				} elseif ($links[$key]['type'] == 'payment_vat')
-				{
+				} elseif ($links[$key]['type'] == 'payment_vat') {
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					print ' '.$paymentvatstatic->getNomUrl(2);
-    	        }
-    	        elseif ($links[$key]['type'] == 'payment_salary')
-				{
+				} elseif ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
 					$paymentsalstatic->label = $links[$key]['label'];
 					print ' '.$paymentsalstatic->getNomUrl(2);
-				} elseif ($links[$key]['type'] == 'payment_loan')
-				{
+				} elseif ($links[$key]['type'] == 'payment_loan') {
 					print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
 					print '</a>';
-				} elseif ($links[$key]['type'] == 'payment_donation')
-				{
+				} elseif ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonationstatic->id = $links[$key]['url_id'];
 					$paymentdonationstatic->ref = $links[$key]['url_id'];
 					print ' '.$paymentdonationstatic->getNomUrl(2);
-				} elseif ($links[$key]['type'] == 'payment_expensereport')
-				{
+				} elseif ($links[$key]['type'] == 'payment_expensereport') {
 					$paymentexpensereportstatic->id = $links[$key]['url_id'];
 					$paymentexpensereportstatic->ref = $links[$key]['url_id'];
 					print ' '.$paymentexpensereportstatic->getNomUrl(2);
-				} elseif ($links[$key]['type'] == 'payment_various')
-				{
+				} elseif ($links[$key]['type'] == 'payment_various') {
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $links[$key]['url_id'];
 					print ' '.$paymentvariousstatic->getNomUrl(2);
-				} elseif ($links[$key]['type'] == 'banktransfert')
-				{
+				} elseif ($links[$key]['type'] == 'banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
-					if ($objp->amount > 0)
-					{
+					if ($objp->amount > 0) {
 						$banklinestatic->fetch($links[$key]['url_id']);
 						$bankstatic->id = $banklinestatic->fk_account;
 						$bankstatic->label = $banklinestatic->bank_account_ref;
@@ -1299,25 +1414,22 @@ if ($resql)
 						print ')';
 					}
 					//var_dump($links);
-				} elseif ($links[$key]['type'] == 'company')
-				{
-				} elseif ($links[$key]['type'] == 'user')
-				{
-				} elseif ($links[$key]['type'] == 'member')
-				{
-				} elseif ($links[$key]['type'] == 'sc')
-				{
-				}
-                elseif ($links[$key]['type'] == 'vat')
-                {
-                } else {
+				} elseif ($links[$key]['type'] == 'company') {
+				} elseif ($links[$key]['type'] == 'user') {
+				} elseif ($links[$key]['type'] == 'member') {
+				} elseif ($links[$key]['type'] == 'sc') {
+				} elseif ($links[$key]['type'] == 'vat') {
+				} else {
 					// Show link with label $links[$key]['label']
-					if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
+					if (!empty($objp->label) && !empty($links[$key]['label'])) {
+						print ' - ';
+					}
 					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
-					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg))
-					{
+					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg)) {
 						// Label generique car entre parentheses. On l'affiche en le traduisant
-						if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+						if ($reg[1] == 'paiement') {
+							$reg[1] = 'Payment';
+						}
 						print ' '.$langs->trans($reg[1]);
 					} else {
 						print ' '.$links[$key]['label'];
@@ -1326,12 +1438,13 @@ if ($resql)
 				}
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Date ope
-		if (!empty($arrayfields['b.dateo']['checked']))
-		{
+		if (!empty($arrayfields['b.dateo']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
 			print '&nbsp;';
@@ -1342,12 +1455,13 @@ if ($resql)
 			print img_edit_add()."</a>";
 			print '</span>';
 			print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Date value
-		if (!empty($arrayfields['b.datev']['checked']))
-		{
+		if (!empty($arrayfields['b.datev']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv), "day")."</span>";
 			print '&nbsp;';
@@ -1358,39 +1472,49 @@ if ($resql)
 			print img_edit_add()."</a>";
 			print '</span>';
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Payment type
-		if (!empty($arrayfields['type']['checked']))
-		{
+		if (!empty($arrayfields['type']['checked'])) {
 			print '<td align="center" class="nowrap">';
 			$labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
-			if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
-			else print $labeltype;
+			if ($labeltype == 'SOLD') {
+				print '&nbsp;'; //$langs->trans("InitialBankBalance");
+			} else {
+				print $labeltype;
+			}
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Num cheque
-		if (!empty($arrayfields['b.num_chq']['checked']))
-		{
+		if (!empty($arrayfields['b.num_chq']['checked'])) {
 			print '<td class="nowrap" align="center">'.($objp->num_chq ? $objp->num_chq : "")."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Third party
-    	if (!empty($arrayfields['bu.label']['checked']))
-    	{
+		if (!empty($arrayfields['bu.label']['checked'])) {
 			print '<td class="tdoverflowmax150">';
 
 			$companylinked_id = 0;
 				$userlinked_id = 0;
 
 				//payment line type to define user display and user or company linked
-			foreach ($links as $key=>$value){
-				if ($links[$key]['type'] == 'payment_sc') $type_link = 'payment_sc';
-				if ($links[$key]['type'] == 'payment_salary') $type_link = 'payment_salary';
+			foreach ($links as $key => $value) {
+				if ($links[$key]['type'] == 'payment_sc') {
+					$type_link = 'payment_sc';
+				}
+				if ($links[$key]['type'] == 'payment_salary') {
+					$type_link = 'payment_salary';
+				}
 
 				if ($links[$key]['type'] == 'company') {
 					$companylinked_id = $links[$key]['url_id'];
@@ -1406,7 +1530,7 @@ if ($resql)
 				print $companystatic->getNomUrl(1);
 			} elseif ($userlinked_id &&
 					(($type_link == 'payment_salary' && !empty($user->rights->salaries->read))
-						|| ($type_link == 'payment_sc' && !empty($user->rights->tax->charges->lire)))){
+						|| ($type_link == 'payment_sc' && !empty($user->rights->tax->charges->lire)))) {
 				// TODO Add a cache of loaded users here
 				$userstatic->fetch($userlinked_id);
 				print $userstatic->getNomUrl(1);
@@ -1415,53 +1539,57 @@ if ($resql)
 			}
 
 			print '</td>';
-           	if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Bank account
-		if (!empty($arrayfields['ba.ref']['checked']))
-		{
+		if (!empty($arrayfields['ba.ref']['checked'])) {
 			print '<td class="nowrap">';
 			print $bankaccount->getNomUrl(1);
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Debit
-		if (!empty($arrayfields['b.debit']['checked']))
-		{
+		if (!empty($arrayfields['b.debit']['checked'])) {
 			print '<td class="nowrap right">';
-			if ($objp->amount < 0)
-			{
+			if ($objp->amount < 0) {
 				print price($objp->amount * -1);
 				$totalarray['totaldeb'] += $objp->amount;
 			}
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['totaldebfield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['totaldebfield'] = $totalarray['nbfield'];
+			}
 		}
 
 		// Credit
-		if (!empty($arrayfields['b.credit']['checked']))
-		{
+		if (!empty($arrayfields['b.credit']['checked'])) {
 			print '<td class="nowrap right">';
-			if ($objp->amount > 0)
-			{
+			if ($objp->amount > 0) {
 				print price($objp->amount);
 				$totalarray['totalcred'] += $objp->amount;
 			}
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['totalcredfield'] = $totalarray['nbfield'];
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['totalcredfield'] = $totalarray['nbfield'];
+			}
 		}
 
 		// Balance before
-		if (!empty($arrayfields['balancebefore']['checked']))
-		{
-			if ($mode_balance_ok)
-			{
-				if ($balancebefore >= 0)
-				{
+		if (!empty($arrayfields['balancebefore']['checked'])) {
+			if ($mode_balance_ok) {
+				if ($balancebefore >= 0) {
 					print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
 				} else {
 					print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
@@ -1469,15 +1597,14 @@ if ($resql)
 			} else {
 				print '<td class="right">-</td>';
 			}
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Balance
-		if (!empty($arrayfields['balance']['checked']))
-		{
-			if ($mode_balance_ok)
-			{
-				if ($balance >= 0)
-				{
+		if (!empty($arrayfields['balance']['checked'])) {
+			if ($mode_balance_ok) {
+				if ($balance >= 0) {
 					print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
 				} else {
 					print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
@@ -1485,52 +1612,50 @@ if ($resql)
 			} else {
 				print '<td class="right">-</td>';
 			}
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
-		if (!empty($arrayfields['b.num_releve']['checked']))
-		{
+		if (!empty($arrayfields['b.num_releve']['checked'])) {
 			print '<td class="nowraponall" align="center">';
 			// Transaction reconciliated or edit link
-			if ($bankaccount->canBeConciliated() > 0)
-			{
-				if ($objp->num_releve)
-				{
+			if ($bankaccount->canBeConciliated() > 0) {
+				if ($objp->num_releve) {
 					print '<a href="releve.php?num='.$objp->num_releve.'&account='.$objp->bankid.'&save_lastsearch_values=1">'.$objp->num_releve.'</a>';
 				}
-				if (!$objp->conciliated && $action == 'reconcile')
-				{
-					if ($objp->num_releve) print '&nbsp;';
+				if (!$objp->conciliated && $action == 'reconcile') {
+					if ($objp->num_releve) {
+						print '&nbsp;';
+					}
 					print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(!empty($_POST['rowid'][$objp->rowid]) ? ' checked' : '').'>';
 				}
 			}
 			print '</td>';
-			if (!$i)
-			{
+			if (!$i) {
 				$totalarray['nbfield']++;
 				$posconciliatecol = $totalarray['nbfield'];
 			}
 		}
 
-		if (!empty($arrayfields['b.conciliated']['checked']))
-		{
+		if (!empty($arrayfields['b.conciliated']['checked'])) {
 			print '<td class="nowraponall" align="center">';
 			print $objp->conciliated ? $langs->trans("Yes") : $langs->trans("No");
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Action edit/delete
 		print '<td class="nowraponall" align="center">';
 		// Transaction reconciliated or edit link
-		if ($objp->conciliated && $bankaccount->canBeConciliated() > 0)  // If line not conciliated and account can be conciliated
-		{
+		if ($objp->conciliated && $bankaccount->canBeConciliated() > 0) {  // If line not conciliated and account can be conciliated
 			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
 			print img_edit();
 			print '</a>';
 		} else {
-			if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-			{
+			if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
 				print img_edit();
 				print '</a>';
@@ -1539,33 +1664,35 @@ if ($resql)
 				print img_view();
 				print '</a>';
 			}
-			if ($bankaccount->canBeConciliated() > 0 && empty($objp->conciliated))
-			{
-				if ($db->jdate($objp->dv) < ($now - $conf->bank->rappro->warning_delay))
-				{
+			if ($bankaccount->canBeConciliated() > 0 && empty($objp->conciliated)) {
+				if ($db->jdate($objp->dv) < ($now - $conf->bank->rappro->warning_delay)) {
 					print ' '.img_warning($langs->trans("ReconciliationLate"));
 				}
 			}
-			if ($user->rights->banque->modifier)
-			{
+			if ($user->rights->banque->modifier) {
 				print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;rowid='.$objp->rowid.'&amp;id='.$objp->bankid.'&amp;page='.$page.'">';
 				print img_delete('', 'class="marginleftonly"');
 				print '</a>';
 			}
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		// Action column
 		print '<td class="nowrap" align="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->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>";
 
@@ -1573,34 +1700,42 @@ if ($resql)
 	}
 
 	// Show total line
-	if (isset($totalarray['totaldebfield']) || isset($totalarray['totalcredfield']))
-	{
+	if (isset($totalarray['totaldebfield']) || isset($totalarray['totalcredfield'])) {
 		print '<tr class="liste_total">';
 		$i = 0;
-		while ($i < $totalarray['nbfield'])
-		{
+		while ($i < $totalarray['nbfield']) {
 			$i++;
-			if ($i == 1)
-			{
-				if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
-				else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
-			} elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
-			elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
-			elseif ($i == $posconciliatecol)
-			{
+			if ($i == 1) {
+				if ($num < $limit && empty($offset)) {
+					print '<td class="left">'.$langs->trans("Total").'</td>';
+				} else {
+					print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
+				}
+			} elseif ($totalarray['totaldebfield'] == $i) {
+				print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
+			} elseif ($totalarray['totalcredfield'] == $i) {
+				print '<td class="right">'.price($totalarray['totalcred']).'</td>';
+			} elseif ($i == $posconciliatecol) {
 				print '<td class="center">';
-				if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+				if ($user->rights->banque->consolidate && $action == 'reconcile') {
+					print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+				}
 				print '</td>';
-			} else print '<td></td>';
+			} else {
+				print '<td></td>';
+			}
 		}
 		print '</tr>';
 	}
 
 	// If no record found
-	if ($num == 0)
-	{
+	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 + 1).'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 	}
 
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index d728ac2a71b..309d848a3c2 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -28,8 +28,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories'));
 
-if (!$user->rights->banque->lire)
-  accessforbidden();
+if (!$user->rights->banque->lire) {
+	accessforbidden();
+}
 
 
 /**
@@ -45,8 +46,7 @@ function valeur($sql)
 	$valeur = 0;
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$valeur = $obj->amount;
 		$db->free($resql);
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 8559096477d..5a36e88fa0e 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -31,7 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array('banks', 'categories'));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque');
 
 
@@ -65,13 +67,11 @@ $sql .= " GROUP BY c.label, c.rowid";
 $sql .= " ORDER BY c.label";
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0; $total = 0; $totalnb = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index af4fb6e571c..74791c14898 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -35,10 +35,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbank.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->categorie->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("banks", "bills", "categories", "companies", "compta"));
@@ -65,10 +73,11 @@ $hookmanager->initHooks(array('bankcard', 'globalcard'));
  * Actions
  */
 
-if ($cancel) $action = '';
+if ($cancel) {
+	$action = '';
+}
 
-if ($action == 'add')
-{
+if ($action == 'add') {
 	$error = 0;
 
 	$db->begin();
@@ -99,14 +108,17 @@ if ($action == 'add')
 	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
 	$account_number = GETPOST('account_number', 'alphanohtml');
-	if (empty($account_number) || $account_number == '-1')
-	{
+	if (empty($account_number) || $account_number == '-1') {
 		$object->account_number = '';
 	} else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
-	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
+	if ($fk_accountancy_journal <= 0) {
+		$object->fk_accountancy_journal = '';
+	} else {
+		$object->fk_accountancy_journal = $fk_accountancy_journal;
+	}
 
 	$object->solde           = $_POST["solde"];
 	$object->date_solde      = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST('reday', 'int'), GETPOST("reyear", 'int'));
@@ -122,20 +134,17 @@ if ($action == 'add')
 
 	$object->fk_user_author  = $user->id;
 
-	if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
-	{
+	if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number)) {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
 		$action = 'create'; // Force chargement page en mode creation
 		$error++;
 	}
-	if (empty($object->ref))
-	{
+	if (empty($object->ref)) {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
 		$action = 'create'; // Force chargement page en mode creation
 		$error++;
 	}
-	if (empty($object->label))
-	{
+	if (empty($object->label)) {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
 		$action = 'create'; // Force chargement page en mode creation
 		$error++;
@@ -144,11 +153,9 @@ if ($action == 'add')
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
 
-	if (!$error)
-	{
+	if (!$error) {
 		$id = $object->create($user);
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			// Category association
 			$categories = GETPOST('categories', 'array');
 			$object->setCategories($categories);
@@ -164,16 +171,14 @@ if ($action == 'add')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 	} else {
 		$db->rollback();
 	}
 }
 
-if ($action == 'update')
-{
+if ($action == 'update') {
 	$error = 0;
 
 	// Update account
@@ -203,14 +208,17 @@ if ($action == 'update')
 	$object->ics_transfer    = trim(GETPOST("ics_transfer", 'alpha'));
 
 	$account_number = GETPOST('account_number', 'alpha');
-	if (empty($account_number) || $account_number == '-1')
-	{
+	if (empty($account_number) || $account_number == '-1') {
 		$object->account_number = '';
 	} else {
 		$object->account_number = $account_number;
 	}
 	$fk_accountancy_journal  = GETPOST('fk_accountancy_journal', 'int');
-	if ($fk_accountancy_journal <= 0) { $object->fk_accountancy_journal = ''; } else { $object->fk_accountancy_journal = $fk_accountancy_journal; }
+	if ($fk_accountancy_journal <= 0) {
+		$object->fk_accountancy_journal = '';
+	} else {
+		$object->fk_accountancy_journal = $fk_accountancy_journal;
+	}
 
 	$object->currency_code   = trim($_POST["account_currency_code"]);
 
@@ -221,20 +229,17 @@ if ($action == 'update')
 	$object->min_desired     = GETPOST("account_min_desired", 'int');
 	$object->comment         = trim(GETPOST("account_comment", 'restricthtml'));
 
-	if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number))
-	{
+	if ($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED && empty($object->account_number)) {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountancyCode")), null, 'errors');
 		$action = 'edit'; // Force chargement page en mode creation
 		$error++;
 	}
-	if (empty($object->ref))
-	{
+	if (empty($object->ref)) {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
 		$action = 'edit'; // Force chargement page en mode creation
 		$error++;
 	}
-	if (empty($object->label))
-	{
+	if (empty($object->label)) {
 		setEventMessages($langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("LabelBankCashAccount")), null, 'errors');
 		$action = 'edit'; // Force chargement page en mode creation
 		$error++;
@@ -242,17 +247,14 @@ if ($action == 'update')
 
 	$db->begin();
 
-	if (!$error)
-	{
+	if (!$error) {
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $object->update($user);
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			// Category association
 			$categories = GETPOST('categories', 'array');
 			$object->setCategories($categories);
@@ -265,23 +267,20 @@ if ($action == 'update')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 	} else {
 		$db->rollback();
 	}
 }
 
-if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer)
-{
+if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->banque->configurer) {
 	// Delete
 	$object = new Account($db);
 	$object->fetch(GETPOST("id", "int"));
 	$result = $object->delete($user);
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
 		header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
 		exit;
@@ -299,7 +298,9 @@ if ($action == 'confirm_delete' && $_POST["confirm"] == "yes" && $user->rights->
 $form = new Form($db);
 $formbank = new FormBank($db);
 $formcompany = new FormCompany($db);
-if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+if (!empty($conf->accounting->enabled)) {
+	$formaccounting = new FormAccounting($db);
+}
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
@@ -310,14 +311,12 @@ llxHeader("", $title, $helpurl);
 
 // Creation
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$object = new Account($db);
 
 	print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'bank_account');
 
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		print "\n".'<script type="text/javascript" language="javascript">';
 		print 'jQuery(document).ready(function () {
                     jQuery("#selecttype").change(function() {
@@ -359,7 +358,9 @@ if ($action == 'create')
 	print '<tr><td class="fieldrequired">'.$langs->trans("Currency").'</td>';
 	print '<td>';
 	$selectedcode = $object->currency_code;
-	if (!$selectedcode) $selectedcode = $conf->currency;
+	if (!$selectedcode) {
+		$selectedcode = $conf->currency;
+	}
 	print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code');
 	//print $langs->trans("Currency".$conf->currency);
 	//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
@@ -375,19 +376,22 @@ if ($action == 'create')
 	$selectedcode = '';
 	if (GETPOSTISSET("account_country_id")) {
 		$selectedcode = GETPOST("account_country_id") ? GETPOST("account_country_id") : $object->country_code;
-	} elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+	} elseif (empty($selectedcode)) {
+		$selectedcode = $mysoc->country_code;
+	}
 	$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("BankAccountCountry").'</td>';
 	print '<td>';
 	print $form->select_country($selectedcode, 'account_country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	if ($user->admin) {
+		print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+	}
 	print '</td></tr>';
 
 	// State
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
-	if ($selectedcode)
-	{
+	if ($selectedcode) {
 		$formcompany->select_departement(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : '', $selectedcode, 'account_state_id');
 	} else {
 		print $countrynotdefined;
@@ -399,16 +403,14 @@ if ($action == 'create')
 	print '<td><input class="minwidth300" type="text" class="flat" name="url" value="'.GETPOST("url").'"></td></tr>';
 
 	// Tags-Categories
-	if ($conf->categorie->enabled)
-	{
+	if ($conf->categorie->enabled) {
 		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
 
 		$arrayselected = array();
 		$c = new Categorie($db);
 		$cats = $c->containing($object->id, Categorie::TYPE_ACCOUNT);
-		if (is_array($cats))
-		{
+		if (is_array($cats)) {
 			foreach ($cats as $cat) {
 				$arrayselected[] = $cat->id;
 			}
@@ -430,8 +432,7 @@ if ($action == 'create')
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
@@ -459,8 +460,7 @@ if ($action == 'create')
 	print '</table>';
 	print '<br>';
 
-	if ($_POST["type"] == Account::TYPE_SAVINGS || $_POST["type"] == Account::TYPE_CURRENT)
-	{
+	if ($_POST["type"] == Account::TYPE_SAVINGS || $_POST["type"] == Account::TYPE_CURRENT) {
 		print '<table class="border centpercent">';
 
 		// If bank account
@@ -495,7 +495,9 @@ if ($action == 'create')
 		}
 		$ibankey = FormBank::getIBANLabel($object);
 		$bickey = "BICNumber";
-		if ($object->getCountryCode() == 'IN') $bickey = "SWIFT";
+		if ($object->getCountryCode() == 'IN') {
+			$bickey = "SWIFT";
+		}
 
 		// IBAN
 		print '<tr><td>'.$langs->trans($ibankey).'</td>';
@@ -525,10 +527,11 @@ if ($action == 'create')
 	print '<table class="border centpercent">';
 	// Accountancy code
 	$fieldrequired = '';
-	if (!empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) $fieldrequired = 'fieldrequired ';
+	if (!empty($conf->global->MAIN_BANK_ACCOUNTANCY_CODE_ALWAYS_REQUIRED)) {
+		$fieldrequired = 'fieldrequired ';
+	}
 
-	if (!empty($conf->accounting->enabled))
-	{
+	if (!empty($conf->accounting->enabled)) {
 		print '<tr><td class="'.$fieldrequired.'titlefieldcreate">'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
@@ -539,8 +542,7 @@ if ($action == 'create')
 	}
 
 	// Accountancy journal
-	if (!empty($conf->accounting->enabled))
-	{
+	if (!empty($conf->accounting->enabled)) {
 		print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 		print '<td>';
 		print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);
@@ -567,12 +569,10 @@ if ($action == 'create')
 
 	if (($_GET["id"] || $_GET["ref"]) && $action != 'edit') {
 		$object = new Account($db);
-		if ($_GET["id"])
-		{
+		if ($_GET["id"]) {
 			$object->fetch($_GET["id"]);
 		}
-		if ($_GET["ref"])
-		{
+		if ($_GET["ref"]) {
 			$object->fetch(0, $_GET["ref"]);
 			$_GET["id"] = $object->id;
 		}
@@ -584,8 +584,7 @@ if ($action == 'create')
 		$formconfirm = '';
 
 		// Confirmation to delete
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("DeleteAccount"), $langs->trans("ConfirmDeleteAccount"), "confirm_delete");
 		}
 
@@ -612,7 +611,9 @@ if ($action == 'create')
 		print '<tr><td>'.$langs->trans("Currency").'</td>';
 		print '<td>';
 		$selectedcode = $object->currency_code;
-		if (!$selectedcode) $selectedcode = $conf->currency;
+		if (!$selectedcode) {
+			$selectedcode = $conf->currency;
+		}
 		print $langs->trans("Currency".$selectedcode);
 		print '</td></tr>';
 
@@ -620,9 +621,13 @@ if ($action == 'create')
 		print '<tr><td>'.$langs->trans("Conciliable").'</td>';
 		print '<td>';
 		$conciliate = $object->canBeConciliated();
-		if ($conciliate == -2) print $langs->trans("No").' <span class="opacitymedium">('.$langs->trans("CashAccount").')</span>';
-		elseif ($conciliate == -3) print $langs->trans("No").' <span class="opacitymedium">('.$langs->trans("Closed").')</span>';
-		else print ($object->rappro == 1 ? $langs->trans("Yes") : ($langs->trans("No").' <span class="opacitymedium">('.$langs->trans("ConciliationDisabled").')</span>'));
+		if ($conciliate == -2) {
+			print $langs->trans("No").' <span class="opacitymedium">('.$langs->trans("CashAccount").')</span>';
+		} elseif ($conciliate == -3) {
+			print $langs->trans("No").' <span class="opacitymedium">('.$langs->trans("Closed").')</span>';
+		} else {
+			print ($object->rappro == 1 ? $langs->trans("Yes") : ($langs->trans("No").' <span class="opacitymedium">('.$langs->trans("ConciliationDisabled").')</span>'));
+		}
 		print '</td></tr>';
 
 		print '<tr><td>'.$langs->trans("BalanceMinimalAllowed").'</td>';
@@ -645,8 +650,7 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Accountancy journal
-		if (!empty($conf->accounting->enabled))
-		{
+		if (!empty($conf->accounting->enabled)) {
 			print '<tr><td>'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
 
@@ -684,8 +688,7 @@ if ($action == 'create')
 
 		print '</table>';
 
-		if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT)
-		{
+		if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT) {
 			print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border tableforfield centpercent">';
@@ -712,7 +715,9 @@ if ($action == 'create')
 
 			$ibankey = FormBank::getIBANLabel($object);
 			$bickey = "BICNumber";
-			if ($object->getCountryCode() == 'IN') $bickey = "SWIFT";
+			if ($object->getCountryCode() == 'IN') {
+				$bickey = "SWIFT";
+			}
 
 			print '<tr><td>'.$langs->trans($ibankey).'</td>';
 			print '<td>'.$object->iban.'&nbsp;';
@@ -736,13 +741,13 @@ if ($action == 'create')
 			}
 			print '</td></tr>';
 
-			if ($conf->prelevement->enabled){
+			if ($conf->prelevement->enabled) {
 				print '<tr><td>'.$langs->trans("ICS").'</td>';
 				print '<td>'.$object->ics.'</td>';
 				print '</tr>';
 			}
 
-			if ($conf->paymentbybanktransfer->enabled){
+			if ($conf->paymentbybanktransfer->enabled) {
 				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
 				print '<td>'.$object->ics_transfer.'</td>';
 				print '</tr>';
@@ -776,14 +781,12 @@ if ($action == 'create')
 		 */
 		print '<div class="tabsAction">';
 
-		if ($user->rights->banque->configurer)
-		{
+		if ($user->rights->banque->configurer) {
 			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
 		}
 
 		$canbedeleted = $object->can_be_deleted(); // Renvoi vrai si compte sans mouvements
-		if ($user->rights->banque->configurer && $canbedeleted)
-		{
+		if ($user->rights->banque->configurer && $canbedeleted) {
 			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
 		}
 
@@ -796,15 +799,13 @@ if ($action == 'create')
 	/*                                                                            */
 	/* ************************************************************************** */
 
-	if (GETPOST('id', 'int') && $action == 'edit' && $user->rights->banque->configurer)
-	{
+	if (GETPOST('id', 'int') && $action == 'edit' && $user->rights->banque->configurer) {
 		$object = new Account($db);
 		$object->fetch(GETPOST('id', 'int'));
 
 		print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'bank_account');
 
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
                         jQuery("#selecttype").change(function() {
@@ -853,7 +854,9 @@ if ($action == 'create')
 		print '</td>';
 		print '<td class="maxwidth200onsmartphone">';
 		$selectedcode = $object->currency_code;
-		if (!$selectedcode) $selectedcode = $conf->currency;
+		if (!$selectedcode) {
+			$selectedcode = $conf->currency;
+		}
 		print $form->selectCurrency((GETPOSTISSET("account_currency_code") ? GETPOST("account_currency_code") : $selectedcode), 'account_currency_code');
 		//print $langs->trans("Currency".$conf->currency);
 		//print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">';
@@ -868,20 +871,24 @@ if ($action == 'create')
 		// Country
 		$object->country_id = $object->country_id ? $object->country_id : $mysoc->country_id;
 		$selectedcode = $object->country_code;
-		if (GETPOSTISSET("account_country_id")) $selectedcode = GETPOST("account_country_id");
-		elseif (empty($selectedcode)) $selectedcode = $mysoc->country_code;
+		if (GETPOSTISSET("account_country_id")) {
+			$selectedcode = GETPOST("account_country_id");
+		} elseif (empty($selectedcode)) {
+			$selectedcode = $mysoc->country_code;
+		}
 		$object->country_code = getCountry($selectedcode, 2); // Force country code on account to have following field on bank fields matching country rules
 
 		print '<tr><td class="fieldrequired">'.$langs->trans("Country").'</td>';
 		print '<td class="maxwidth200onsmartphone">';
 		print $form->select_country($selectedcode, 'account_country_id');
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 		print '</td></tr>';
 
 		// State
 		print '<tr><td>'.$langs->trans('State').'</td><td class="maxwidth200onsmartphone">';
-		if ($selectedcode)
-		{
+		if ($selectedcode) {
 			print $formcompany->select_state(GETPOSTISSET("account_state_id") ? GETPOST("account_state_id") : $object->state_id, $selectedcode, 'account_state_id');
 		} else {
 			print $countrynotdefined;
@@ -892,9 +899,13 @@ if ($action == 'create')
 		print '<tr><td>'.$langs->trans("Conciliable").'</td>';
 		print '<td>';
 		$conciliate = $object->canBeConciliated();
-		if ($conciliate == -2) print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
-		elseif ($conciliate == -3) print $langs->trans("No").' ('.$langs->trans("Closed").')';
-		else print '<input type="checkbox" class="flat" name="norappro"'.(($conciliate > 0) ? '' : ' checked="checked"').'"> '.$langs->trans("DisableConciliation");
+		if ($conciliate == -2) {
+			print $langs->trans("No").' ('.$langs->trans("CashAccount").')';
+		} elseif ($conciliate == -3) {
+			print $langs->trans("No").' ('.$langs->trans("Closed").')';
+		} else {
+			print '<input type="checkbox" class="flat" name="norappro"'.(($conciliate > 0) ? '' : ' checked="checked"').'"> '.$langs->trans("DisableConciliation");
+		}
 		print '</td></tr>';
 
 		// Balance
@@ -910,14 +921,12 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Tags-Categories
-		if ($conf->categorie->enabled)
-		{
+		if ($conf->categorie->enabled) {
 			print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
 			$cats = $c->containing($object->id, Categorie::TYPE_ACCOUNT);
-			if (is_array($cats))
-			{
+			if (is_array($cats)) {
 				foreach ($cats as $cat) {
 					$arrayselected[] = $cat->id;
 				}
@@ -939,8 +948,7 @@ if ($action == 'create')
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			print $object->showOptionals($extrafields, 'edit', $parameters);
 		}
 
@@ -969,8 +977,7 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Accountancy journal
-		if (!empty($conf->accounting->enabled))
-		{
+		if (!empty($conf->accounting->enabled)) {
 			print '<tr><td class="fieldrequired">'.$langs->trans("AccountancyJournal").'</td>';
 			print '<td>';
 			print $formaccounting->select_journal($object->fk_accountancy_journal, 'fk_accountancy_journal', 4, 1, 0, 0);
@@ -979,8 +986,7 @@ if ($action == 'create')
 
 		print '</table>';
 
-		if ($_POST["type"] == Account::TYPE_SAVINGS || $_POST["type"] == Account::TYPE_CURRENT)
-		{
+		if ($_POST["type"] == Account::TYPE_SAVINGS || $_POST["type"] == Account::TYPE_CURRENT) {
 			print '<br>';
 
 			//print '<div class="underbanner clearboth"></div>';
@@ -1019,7 +1025,9 @@ if ($action == 'create')
 
 			$ibankey = FormBank::getIBANLabel($object);
 			$bickey = "BICNumber";
-			if ($object->getCountryCode() == 'IN') $bickey = "SWIFT";
+			if ($object->getCountryCode() == 'IN') {
+				$bickey = "SWIFT";
+			}
 
 			// IBAN
 			print '<tr><td>'.$langs->trans($ibankey).'</td>';
@@ -1028,12 +1036,12 @@ if ($action == 'create')
 			print '<tr><td>'.$langs->trans($bickey).'</td>';
 			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.$object->bic.'"></td></tr>';
 
-			if ($conf->prelevement->enabled){
+			if ($conf->prelevement->enabled) {
 				print '<tr><td>'.$langs->trans("ICS").'</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.$object->ics.'"></td></tr>';
 			}
 
-			if ($conf->paymentbybanktransfer->enabled){
+			if ($conf->paymentbybanktransfer->enabled) {
 				print '<tr><td>'.$langs->trans("ICSTransfer").'</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.$object->ics_transfer.'"></td></tr>';
 			}
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index fd286266a21..5d8f15d9210 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -36,8 +36,9 @@ $langs->loadLangs(array('banks', 'categories'));
 $action = GETPOST('action', 'aZ09');
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
-if (!$user->rights->banque->configurer)
-  accessforbidden();
+if (!$user->rights->banque->configurer) {
+	accessforbidden();
+}
 
 $bankcateg = new BankCateg($db);
 $categid = GETPOST('categid');
@@ -49,8 +50,7 @@ $label = GETPOST("label");
  * Actions
  */
 
-if (GETPOST('add'))
-{
+if (GETPOST('add')) {
 	if ($label) {
 		$bankcateg = new BankCateg($db);
 		$bankcateg->label = GETPOST('label');
@@ -85,7 +85,9 @@ llxHeader();
 print load_fiche_titre($langs->trans("RubriquesTransactions"), '', 'object_category');
 
 print '<form method="POST" 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">';
@@ -104,8 +106,7 @@ print '<td></td>';
 print "</tr>\n";
 
 // Line to add category
-if ($action != 'edit')
-{
+if ($action != 'edit') {
 	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td><td><input name="label" type="text" class="maxwidth100"></td>';
 	print '<td></td>';
@@ -120,19 +121,16 @@ $sql .= " WHERE entity = ".$conf->entity;
 $sql .= " ORDER BY rowid";
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0; $total = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 
 		print '<tr class="oddeven">';
 		print '<td>'.$objp->rowid.'</td>';
-		if (GETPOST('action', 'aZ09') == 'edit' && GETPOST("categid") == $objp->rowid)
-		{
+		if (GETPOST('action', 'aZ09') == 'edit' && GETPOST("categid") == $objp->rowid) {
 			print '<td colspan="3">';
 			print '<input type="hidden" name="categid" value="'.$objp->rowid.'">';
 			print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 363ce28c57f..7cabbc98500 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -376,9 +376,15 @@ class Account extends CommonObject
 	{
 		global $conf;
 
-		if (empty($this->rappro)) return -1;
-		if ($this->courant == Account::TYPE_CASH && empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) return -2;
-		if ($this->clos) return -3;
+		if (empty($this->rappro)) {
+			return -1;
+		}
+		if ($this->courant == Account::TYPE_CASH && empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) {
+			return -2;
+		}
+		if ($this->clos) {
+			return -3;
+		}
 		return 1;
 	}
 
@@ -412,8 +418,7 @@ class Account extends CommonObject
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::add_url_line", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$rowid = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_url");
 			return $rowid;
 		} else {
@@ -438,8 +443,7 @@ class Account extends CommonObject
 		$lines = array();
 
 		// Check parameters
-		if (!empty($fk_bank) && (!empty($url_id) || !empty($type)))
-		{
+		if (!empty($fk_bank) && (!empty($url_id) || !empty($type))) {
 			$this->error = "ErrorBadParameter";
 			return -1;
 		}
@@ -448,18 +452,17 @@ class Account extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_url";
 		if ($fk_bank > 0) {
 			$sql .= " WHERE fk_bank = ".$fk_bank;
-		} else { $sql .= " WHERE url_id = ".$url_id." AND type = '".$this->db->escape($type)."'";
+		} else {
+			$sql .= " WHERE url_id = ".$url_id." AND type = '".$this->db->escape($type)."'";
 		}
 		$sql .= " ORDER BY type, label";
 
 		dol_syslog(get_class($this)."::get_url", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$i = 0;
 			$num = $this->db->num_rows($result);
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				// Anciens liens (pour compatibilite)
 				$lines[$i][0] = $obj->url;
@@ -474,7 +477,9 @@ class Account extends CommonObject
 				$lines[$i]['fk_bank'] = $obj->fk_bank;
 				$i++;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return $lines;
 	}
@@ -493,7 +498,7 @@ class Account extends CommonObject
 	 *  @param	string		$banque			Bank of cheque writer
 	 *  @param	string		$accountancycode	When we record a free bank entry, we must provide accounting account if accountancy module is on.
 	 *  @param	int			$datev			Date value
-     *  @param  string      $num_releve     Label of bank receipt for reconciliation
+	 *  @param  string      $num_releve     Label of bank receipt for reconciliation
 	 *  @return	int							Rowid of added entry, <0 if KO
 	 */
 	public function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null, $num_releve = '')
@@ -509,14 +514,12 @@ class Account extends CommonObject
 
 		$now = dol_now();
 
-		if (is_numeric($oper))    // Clean operation to have a code instead of a rowid
-		{
+		if (is_numeric($oper)) {    // Clean operation to have a code instead of a rowid
 			$sql = "SELECT code FROM ".MAIN_DB_PREFIX."c_paiement";
 			$sql .= " WHERE id=".$oper;
 			$sql .= " AND entity IN (".getEntity('c_paiement').")";
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
 				$oper = $obj->code;
 			} else {
@@ -526,25 +529,24 @@ class Account extends CommonObject
 		}
 
 		// Check parameters
-		if (!$oper)
-		{
+		if (!$oper) {
 			$this->error = "oper not defined";
 			return -1;
 		}
-		if (!$this->rowid)
-		{
+		if (!$this->rowid) {
 			$this->error = "this->rowid not defined";
 			return -2;
 		}
-		if ($this->courant == Account::TYPE_CASH && $oper != 'LIQ')
-		{
+		if ($this->courant == Account::TYPE_CASH && $oper != 'LIQ') {
 			$this->error = "ErrorCashAccountAcceptsOnlyCashMoney";
 			return -3;
 		}
 
 		$this->db->begin();
 
-		if (is_null($datev) || empty($datev)) $datev = $date;
+		if (is_null($datev) || empty($datev)) {
+			$datev = $date;
+		}
 
 		$accline = new AccountLine($this->db);
 		$accline->datec = $now;
@@ -613,24 +615,25 @@ class Account extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (!$this->min_allowed) $this->min_allowed = 0;
-		if (!$this->min_desired) $this->min_desired = 0;
+		if (!$this->min_allowed) {
+			$this->min_allowed = 0;
+		}
+		if (!$this->min_desired) {
+			$this->min_desired = 0;
+		}
 
 		// Check parameters
-		if (empty($this->country_id))
-		{
+		if (empty($this->country_id)) {
 			$this->error = $langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"));
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
 		}
-		if (empty($this->ref))
-		{
+		if (empty($this->ref)) {
 			$this->error = $langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref"));
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
 		}
-		if (empty($this->date_solde))
-		{
+		if (empty($this->date_solde)) {
 			$this->error = $langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("DateInitialBalance"));
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
@@ -699,13 +702,11 @@ class Account extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."bank_account");
 
 			$result = $this->update($user, 1);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$accline = new AccountLine($this->db);
 				$accline->datec = $this->db->idate($now);
 				$accline->label = '('.$langs->trans("InitialBankBalance").')';
@@ -722,25 +723,26 @@ class Account extends CommonObject
 					$this->errors = $accline->errors;
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $this->insertExtraFields();
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 				}
 
-				if (!$error && !$notrigger)
-				{
+				if (!$error && !$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('BANKACCOUNT_CREATE', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 			} else {
 				$error++;
 			}
 		} else {
-			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$this->error = $langs->trans("ErrorBankLabelAlreadyExists");
 				$error++;
 			} else {
@@ -749,8 +751,7 @@ class Account extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -775,19 +776,19 @@ class Account extends CommonObject
 		$this->db->begin();
 
 		// Check parameters
-		if (empty($this->country_id))
-		{
+		if (empty($this->country_id)) {
 			$this->error = $langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Country"));
 			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			return -1;
 		}
-		if (empty($this->ref))
-		{
+		if (empty($this->ref)) {
 			$this->error = $langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref"));
 			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			return -1;
 		}
-		if (!$this->label) $this->label = "???";
+		if (!$this->label) {
+			$this->label = "???";
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank_account SET ";
 
@@ -826,20 +827,21 @@ class Account extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			// Actions on extra fields (by external module or standard code)
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('BANKACCOUNT_UPDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		} else {
@@ -848,8 +850,7 @@ class Account extends CommonObject
 			dol_print_error($this->db);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -877,8 +878,7 @@ class Account extends CommonObject
 		dol_syslog(get_class($this)."::update_bban $this->code_banque,$this->code_guichet,$this->number,$this->cle_rib,$this->iban");
 
 		// Check parameters
-		if (!$this->ref)
-		{
+		if (!$this->ref) {
 			$this->error = $langs->transnoentitiesnoconv("ErrorFieldRequired", $langs->trans("Ref"));
 			return -2;
 		}
@@ -902,8 +902,7 @@ class Account extends CommonObject
 		dol_syslog(get_class($this)."::update_bban", LOG_DEBUG);
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -924,8 +923,7 @@ class Account extends CommonObject
 	{
 		global $conf;
 
-		if (empty($id) && empty($ref))
-		{
+		if (empty($id) && empty($ref)) {
 			$this->error = "ErrorBadParameters";
 			return -1;
 		}
@@ -944,15 +942,17 @@ class Account extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON ba.state_id = d.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=ba.fk_accountancy_journal';
 		$sql .= " WHERE ba.entity IN (".getEntity($this->element).")";
-		if ($id)  $sql .= " AND ba.rowid  = ".$id;
-		if ($ref) $sql .= " AND ba.ref = '".$this->db->escape($ref)."'";
+		if ($id) {
+			$sql .= " AND ba.rowid  = ".$id;
+		}
+		if ($ref) {
+			$sql .= " AND ba.ref = '".$this->db->escape($ref)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id            = $obj->rowid;
@@ -1046,34 +1046,28 @@ class Account extends CommonObject
 		$this->db->begin();
 
 		// Delete link between tag and bank account
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
 			$sql .= " WHERE fk_account = ".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->error = "Error ".$this->db->lasterror();
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_account";
 			$sql .= " WHERE rowid = ".$this->rowid;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				// Remove extrafields
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $this->deleteExtraFields();
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 					}
@@ -1084,8 +1078,7 @@ class Account extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -1152,7 +1145,9 @@ class Account extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj->nb <= 1) $can_be_deleted = true; // Juste le solde
+			if ($obj->nb <= 1) {
+				$can_be_deleted = true; // Juste le solde
+			}
 		} else {
 			dol_print_error($this->db);
 		}
@@ -1183,13 +1178,13 @@ class Account extends CommonObject
 		$sql = "SELECT sum(amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank";
 		$sql .= " WHERE fk_account = ".$this->id;
-		if ($option == 1) $sql .= " AND dateo <= '".$this->db->idate(dol_now())."'";
+		if ($option == 1) {
+			$sql .= " AND dateo <= '".$this->db->idate(dol_now())."'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 				$solde = $obj->amount;
 			}
@@ -1215,7 +1210,9 @@ class Account extends CommonObject
 		// phpcs:enable
 		global $conf, $langs;
 
-		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+		if ($user->socid) {
+			return -1; // protection pour eviter appel par utilisateur externe
+		}
 
 		$sql = "SELECT b.rowid, b.datev as datefin";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b,";
@@ -1225,11 +1222,12 @@ class Account extends CommonObject
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable
 		$sql .= " AND clos = 0";
-		if ($filteraccountid) $sql .= " AND ba.rowid = ".$filteraccountid;
+		if ($filteraccountid) {
+			$sql .= " AND ba.rowid = ".$filteraccountid;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$langs->load("banks");
 			$now = dol_now();
 
@@ -1242,8 +1240,7 @@ class Account extends CommonObject
 			$response->url = DOL_URL_ROOT.'/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank';
 			$response->img = img_object('', "payment");
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 				if ($this->db->jdate($obj->datefin) < ($now - $conf->bank->rappro->warning_delay)) {
 					$response->nbtodolate++;
@@ -1269,7 +1266,9 @@ class Account extends CommonObject
 		// phpcs:enable
 		global $user;
 
-		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+		if ($user->socid) {
+			return -1; // protection pour eviter appel par utilisateur externe
+		}
 
 		$sql = "SELECT count(b.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b,";
@@ -1278,13 +1277,13 @@ class Account extends CommonObject
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND (ba.rappro = 1 AND ba.courant != 2)"; // Compte rapprochable
 		$sql .= " AND clos = 0";
-		if ($filteraccountid) $sql .= " AND ba.rowid = ".$filteraccountid;
+		if ($filteraccountid) {
+			$sql .= " AND ba.rowid = ".$filteraccountid;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["banklines"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -1316,13 +1315,16 @@ class Account extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE ba.rappro > 0 and ba.clos = 0";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		if (empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) $sql .= " AND ba.courant != 2";
+		if (empty($conf->global->BANK_CAN_RECONCILIATE_CASHACCOUNT)) {
+			$sql .= " AND ba.courant != 2";
+		}
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return $nb;
 	}
@@ -1352,13 +1354,11 @@ class Account extends CommonObject
 		$label .= '<br><b>'.$langs->trans('BIC').':</b> '.$this->bic;
 		$label .= '<br><b>'.$langs->trans("AccountCurrency").':</b> '.$this->currency_code;
 
-		if (empty($user->rights->banque->lire) || !empty($user->socid))
-		{
+		if (empty($user->rights->banque->lire) || !empty($user->socid)) {
 			$option = 'nolink';
 		}
 
-		if (!empty($conf->accounting->enabled))
-		{
+		if (!empty($conf->accounting->enabled)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
 			$langs->load("accountancy");
 			$label .= '<br><b>'.$langs->trans('AccountAccounting').':</b> '.length_accountg($this->account_number);
@@ -1368,20 +1368,21 @@ class Account extends CommonObject
 		$linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 
 		$url = DOL_URL_ROOT.'/compta/bank/card.php?id='.$this->id;
-		if ($mode == 'transactions')
-		{
+		if ($mode == 'transactions') {
 			$url = DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$this->id;
-		} elseif ($mode == 'receipts')
-		{
+		} elseif ($mode == 'receipts') {
 			$url = DOL_URL_ROOT.'/compta/bank/releve.php?account='.$this->id;
 		}
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkstart = '<a href="'.$url.$linkclose;
@@ -1393,8 +1394,12 @@ class Account extends CommonObject
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref.($option == 'reflabel' && $this->label ? ' - '.$this->label : '');
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref.($option == 'reflabel' && $this->label ? ' - '.$this->label : '');
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -1417,19 +1422,17 @@ class Account extends CommonObject
 
 		// Call function to check BAN
 
-		if (!checkIbanForAccount($this) || !checkSwiftForAccount($this))
-		{
+		if (!checkIbanForAccount($this) || !checkSwiftForAccount($this)) {
 			$this->error_number = 12;
 			$this->error_message = 'IBANSWIFTControlError';
 		}
 		/*if (! checkBanForAccount($this))
-        {
-            $this->error_number = 12;
-            $this->error_message = 'BANControlError';
-        }*/
-
-		if ($this->error_number == 0)
 		{
+			$this->error_number = 12;
+			$this->error_message = 'BANControlError';
+		}*/
+
+		if ($this->error_number == 0) {
 			return 1;
 		} else {
 			return 0;
@@ -1446,27 +1449,33 @@ class Account extends CommonObject
 		global $mysoc;
 
 		// We return country code of bank account
-		if (!empty($this->country_code)) return $this->country_code;
+		if (!empty($this->country_code)) {
+			return $this->country_code;
+		}
 
 		// For backward compatibility, we try to guess country from other information
-		if (!empty($this->iban))
-		{
+		if (!empty($this->iban)) {
 			// If IBAN defined, we can know country of account from it
 			$reg = array();
-			if (preg_match("/^([a-zA-Z][a-zA-Z])/i", $this->iban, $reg)) return $reg[1];
+			if (preg_match("/^([a-zA-Z][a-zA-Z])/i", $this->iban, $reg)) {
+				return $reg[1];
+			}
 		}
 
 		// If this class is linked to a third party
-		if (!empty($this->socid))
-		{
+		if (!empty($this->socid)) {
 			require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 			$company = new Societe($this->db);
 			$result = $company->fetch($this->socid);
-			if (!empty($company->country_code)) return $company->country_code;
+			if (!empty($company->country_code)) {
+				return $company->country_code;
+			}
 		}
 
 		// We return country code of managed company
-		if (!empty($mysoc->country_code)) return $mysoc->country_code;
+		if (!empty($mysoc->country_code)) {
+			return $mysoc->country_code;
+		}
 
 		return '';
 	}
@@ -1483,8 +1492,12 @@ class Account extends CommonObject
 	{
 		$country_code = $this->getCountryCode();
 
-		if (in_array($country_code, array('FR', 'ES', 'GA', 'IT', 'NC'))) return 1; // France, Spain, Gabon, ... - Not valid for CH
-		if (in_array($country_code, array('AU', 'BE', 'CA', 'DE', 'DK', 'GR', 'GB', 'ID', 'IE', 'IR', 'KR', 'NL', 'NZ', 'UK', 'US'))) return 2; // Australia, England...
+		if (in_array($country_code, array('FR', 'ES', 'GA', 'IT', 'NC'))) {
+			return 1; // France, Spain, Gabon, ... - Not valid for CH
+		}
+		if (in_array($country_code, array('AU', 'BE', 'CA', 'DE', 'DK', 'GR', 'GB', 'ID', 'IE', 'IR', 'KR', 'NL', 'NZ', 'UK', 'US'))) {
+			return 2; // Australia, England...
+		}
 		return 0;
 	}
 
@@ -1533,7 +1546,9 @@ class Account extends CommonObject
 				//'CH',	// Switzerland - No. Swizerland in not in EEC
 		);
 
-		if (in_array($country_code, $country_code_in_EEC)) return 1; // France, Spain, ...
+		if (in_array($country_code, $country_code_in_EEC)) {
+			return 1; // France, Spain, ...
+		}
 		return 0;
 	}
 
@@ -1580,8 +1595,7 @@ class Account extends CommonObject
 		}
 
 		//if ($this->needIBAN()) {    // return always IBAN and BIC (this was old behaviour)
-		if ($includeibanbic)
-		{
+		if ($includeibanbic) {
 			$fieldarray[] = 'IBAN';
 			$fieldarray[] = 'BIC';
 		}
@@ -1809,7 +1823,9 @@ class AccountLine extends CommonObject
 		global $conf;
 
 		// Check parameters
-		if (empty($rowid) && empty($ref) && empty($num)) return -1;
+		if (empty($rowid) && empty($ref) && empty($num)) {
+			return -1;
+		}
 
 		$sql = "SELECT b.rowid, b.datec, b.datev, b.dateo, b.amount, b.label as label, b.fk_account,";
 		$sql .= " b.fk_user_author, b.fk_user_rappro,";
@@ -1821,19 +1837,21 @@ class AccountLine extends CommonObject
 		$sql .= " ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		if ($num) $sql .= " AND b.num_chq='".$this->db->escape($num)."'";
-		elseif ($ref) $sql .= " AND b.rowid='".$this->db->escape($ref)."'";
-		else $sql .= " AND b.rowid = ".((int) $rowid);
+		if ($num) {
+			$sql .= " AND b.num_chq='".$this->db->escape($num)."'";
+		} elseif ($ref) {
+			$sql .= " AND b.rowid='".$this->db->escape($ref)."'";
+		} else {
+			$sql .= " AND b.rowid = ".((int) $rowid);
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$ret = 0;
 
 			$obj = $this->db->fetch_object($result);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->id = $obj->rowid;
 				$this->rowid			= $obj->rowid;
 				$this->ref = $obj->rowid;
@@ -1932,8 +1950,7 @@ class AccountLine extends CommonObject
 
 		$nbko = 0;
 
-		if ($this->rappro)
-		{
+		if ($this->rappro) {
 			// Protection to avoid any delete of consolidated lines
 			$this->error = "ErrorDeleteNotPossibleLineIsConsolidated";
 			return -1;
@@ -1942,8 +1959,7 @@ class AccountLine extends CommonObject
 		$this->db->begin();
 
 		// Protection to avoid any delete of accounted lines. Protection on by default
-		if (empty($conf->global->BANK_ALLOW_TRANSACTION_DELETION_EVEN_IF_IN_ACCOUNTING))
-		{
+		if (empty($conf->global->BANK_ALLOW_TRANSACTION_DELETION_EVEN_IF_IN_ACCOUNTING)) {
 			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'bank' AND fk_doc = ".$this->id;
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -1962,23 +1978,25 @@ class AccountLine extends CommonObject
 
 		// Delete urls
 		$result = $this->delete_urls($user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$nbko++;
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid=".(int) $this->rowid;
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if (!$result) $nbko++;
+		if (!$result) {
+			$nbko++;
+		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank WHERE rowid=".(int) $this->rowid;
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if (!$result) $nbko++;
+		if (!$result) {
+			$nbko++;
+		}
 
-		if (!$nbko)
-		{
+		if (!$nbko) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -2000,8 +2018,7 @@ class AccountLine extends CommonObject
 		// phpcs:enable
 		$nbko = 0;
 
-		if ($this->rappro)
-		{
+		if ($this->rappro) {
 			// Protection to avoid any delete of consolidated lines
 			$this->error = "ErrorDeleteNotPossibleLineIsConsolidated";
 			return -1;
@@ -2012,10 +2029,11 @@ class AccountLine extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url WHERE fk_bank=".(int) $this->rowid;
 		dol_syslog(get_class($this)."::delete_urls", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if (!$result) $nbko++;
+		if (!$result) {
+			$nbko++;
+		}
 
-		if (!$nbko)
-		{
+		if (!$nbko) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -2044,8 +2062,7 @@ class AccountLine extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -2073,10 +2090,8 @@ class AccountLine extends CommonObject
 		$this->db->begin();
 
 		// Check statement field
-		if (!empty($conf->global->BANK_STATEMENT_REGEX_RULE))
-		{
-			if (!preg_match('/'.$conf->global->BANK_STATEMENT_REGEX_RULE.'/', $this->num_releve))
-			{
+		if (!empty($conf->global->BANK_STATEMENT_REGEX_RULE)) {
+			if (!preg_match('/'.$conf->global->BANK_STATEMENT_REGEX_RULE.'/', $this->num_releve)) {
 				$this->errors[] = $langs->trans("ErrorBankStatementNameMustFollowRegex", $conf->global->BANK_STATEMENT_REGEX_RULE);
 				return -1;
 			}
@@ -2085,15 +2100,15 @@ class AccountLine extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank SET";
 		$sql .= " rappro = ".$conciliated;
 		$sql .= ", num_releve = '".$this->db->escape($this->num_releve)."'";
-		if ($conciliated) $sql .= ", fk_user_rappro = ".$user->id;
+		if ($conciliated) {
+			$sql .= ", fk_user_rappro = ".$user->id;
+		}
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_conciliation", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!empty($cat))
-			{
+		if ($resql) {
+			if (!empty($cat)) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (";
 				$sql .= "lineid";
 				$sql .= ", fk_categ";
@@ -2132,8 +2147,7 @@ class AccountLine extends CommonObject
 		// phpcs:enable
 		$sql = "SELECT datev FROM ".MAIN_DB_PREFIX."bank WHERE rowid = ".$rowid;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$newdate = $this->db->jdate($obj->datev) + (3600 * 24 * $sign);
 
@@ -2142,17 +2156,17 @@ class AccountLine extends CommonObject
 			$sql .= " WHERE rowid = ".$rowid;
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
-				if ($this->db->affected_rows($result))
-				{
+			if ($result) {
+				if ($this->db->affected_rows($result)) {
 					return 1;
 				}
 			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 		return 0;
 	}
 
@@ -2196,8 +2210,7 @@ class AccountLine extends CommonObject
 		// phpcs:enable
 		$sql = "SELECT dateo FROM ".MAIN_DB_PREFIX."bank WHERE rowid = ".$rowid;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$newdate = $this->db->jdate($obj->dateo) + (3600 * 24 * $sign);
 
@@ -2206,17 +2219,17 @@ class AccountLine extends CommonObject
 			$sql .= " WHERE rowid = ".$rowid;
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
-				if ($this->db->affected_rows($result))
-				{
+			if ($result) {
+				if ($this->db->affected_rows($result)) {
 					return 1;
 				}
 			} else {
 				dol_print_error($this->db);
 				return 0;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 		return 0;
 	}
 
@@ -2261,21 +2274,17 @@ class AccountLine extends CommonObject
 		$sql .= ' WHERE b.rowid = '.$id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
 
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_rappro)
-				{
+				if ($obj->fk_user_rappro) {
 					$ruser = new User($this->db);
 					$ruser->fetch($obj->fk_user_rappro);
 					$this->user_rappro = $ruser;
@@ -2314,13 +2323,18 @@ class AccountLine extends CommonObject
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'account'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($this->ref ? $this->ref : $this->id);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'account'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= ($this->ref ? $this->ref : $this->id);
+		}
 		$result .= $linkend;
 
-		if ($option == 'showall' || $option == 'showconciliated' || $option == 'showconciliatedandaccounted') $result .= ' <span class="opacitymedium">(';
-		if ($option == 'showall')
-		{
+		if ($option == 'showall' || $option == 'showconciliated' || $option == 'showconciliatedandaccounted') {
+			$result .= ' <span class="opacitymedium">(';
+		}
+		if ($option == 'showall') {
 			$result .= $langs->trans("BankAccount").': ';
 			$accountstatic = new Account($this->db);
 			$accountstatic->id = $this->fk_account;
@@ -2328,13 +2342,11 @@ class AccountLine extends CommonObject
 			$accountstatic->label = $this->bank_account_label;
 			$result .= $accountstatic->getNomUrl(0).', ';
 		}
-		if ($option == 'showall' || $option == 'showconciliated' || $option == 'showconciliatedandaccounted')
-		{
+		if ($option == 'showall' || $option == 'showconciliated' || $option == 'showconciliatedandaccounted') {
 			$result .= $langs->trans("BankLineConciliated").': ';
 			$result .= yn($this->rappro);
 		}
-		if ($option == 'showall' || $option == 'showconciliatedandaccounted')
-		{
+		if ($option == 'showall' || $option == 'showconciliatedandaccounted') {
 			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE doc_type = 'bank' AND fk_doc = ".$this->id;
 			$resql = $this->db->query($sql);
 			if ($resql) {
@@ -2346,7 +2358,9 @@ class AccountLine extends CommonObject
 				}
 			}
 		}
-		if ($option == 'showall' || $option == 'showconciliated' || $option == 'showconciliatedandaccounted') $result .= ')</span>';
+		if ($option == 'showall' || $option == 'showconciliated' || $option == 'showconciliatedandaccounted') {
+			$result .= ')</span>';
+		}
 
 		return $result;
 	}
@@ -2377,36 +2391,36 @@ class AccountLine extends CommonObject
 		global $langs;
 		//$langs->load('companies');
 		/*
-        if ($mode == 0)
-        {
-            if ($status==0) return $langs->trans("ActivityCeased");
-            if ($status==1) return $langs->trans("InActivity");
-        }
-        if ($mode == 1)
-        {
-            if ($status==0) return $langs->trans("ActivityCeased");
-            if ($status==1) return $langs->trans("InActivity");
-        }
-        if ($mode == 2)
-        {
-            if ($status==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-            if ($status==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-        }
-        if ($mode == 3)
-        {
-            if ($status==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-            if ($status==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-        }
-        if ($mode == 4)
-        {
-            if ($status==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
-            if ($status==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
-        }
-        if ($mode == 5)
-        {
-            if ($status==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
-            if ($status==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
-        }*/
+		if ($mode == 0)
+		{
+			if ($status==0) return $langs->trans("ActivityCeased");
+			if ($status==1) return $langs->trans("InActivity");
+		}
+		if ($mode == 1)
+		{
+			if ($status==0) return $langs->trans("ActivityCeased");
+			if ($status==1) return $langs->trans("InActivity");
+		}
+		if ($mode == 2)
+		{
+			if ($status==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			if ($status==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+		}
+		if ($mode == 3)
+		{
+			if ($status==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			if ($status==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+		}
+		if ($mode == 4)
+		{
+			if ($status==0) return img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"').' '.$langs->trans("ActivityCeased");
+			if ($status==1) return img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"').' '.$langs->trans("InActivity");
+		}
+		if ($mode == 5)
+		{
+			if ($status==0) return $langs->trans("ActivityCeased").' '.img_picto($langs->trans("ActivityCeased"),'statut5', 'class="pictostatus"');
+			if ($status==1) return $langs->trans("InActivity").' '.img_picto($langs->trans("InActivity"),'statut4', 'class="pictostatus"');
+		}*/
 	}
 
 
@@ -2423,11 +2437,9 @@ class AccountLine extends CommonObject
 
 		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$alreadydispatched = $obj->nb;
 			}
 		} else {
@@ -2435,8 +2447,7 @@ class AccountLine extends CommonObject
 			return -1;
 		}
 
-		if ($alreadydispatched)
-		{
+		if ($alreadydispatched) {
 			return 1;
 		}
 		return 0;
diff --git a/htdocs/compta/bank/class/bankcateg.class.php b/htdocs/compta/bank/class/bankcateg.class.php
index 99a941b074d..be023fe630c 100644
--- a/htdocs/compta/bank/class/bankcateg.class.php
+++ b/htdocs/compta/bank/class/bankcateg.class.php
@@ -211,42 +211,36 @@ class BankCateg // extends CommonObject
 		$this->db->begin();
 
 		// Delete link between tag and bank account
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_account";
 			$sql .= " WHERE fk_categorie = ".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
 		// Delete link between tag and bank lines
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class";
 			$sql .= " WHERE fk_categ = ".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
 		// Delete bank categ
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_categ";
 			$sql .= " WHERE rowid=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->errors[] = "Error ".$this->db->lasterror();
 			}
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index d05e2d339a6..7919f3c60df 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -195,7 +195,9 @@ class PaymentVarious extends CommonObject
 
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."payment_various SET";
-		if ($this->tms) $sql .= " tms='".$this->db->idate($this->tms)."',";
+		if ($this->tms) {
+			$sql .= " tms='".$this->db->idate($this->tms)."',";
+		}
 		$sql .= " datep='".$this->db->idate($this->datep)."',";
 		$sql .= " datev='".$this->db->idate($this->datev)."',";
 		$sql .= " sens=".(int) $this->sens.",";
@@ -222,7 +224,9 @@ class PaymentVarious extends CommonObject
 		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PAYMENT_VARIOUS_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -272,10 +276,8 @@ class PaymentVarious extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id                   = $obj->rowid;
@@ -323,7 +325,9 @@ class PaymentVarious extends CommonObject
 
 		// Call trigger
 		$result = $this->call_trigger('PAYMENT_VARIOUS_DELETE', $user);
-		if ($result < 0) return -1;
+		if ($result < 0) {
+			return -1;
+		}
 		// End call triggers
 
 
@@ -409,23 +413,19 @@ class PaymentVarious extends CommonObject
 		}
 
 		// Check parameters
-		if (!$this->label)
-		{
+		if (!$this->label) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-		if ($this->amount < 0 || $this->amount == '')
-		{
+		if ($this->amount < 0 || $this->amount == '') {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -5;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->fk_account) || $this->fk_account <= 0))
-		{
+		if (!empty($conf->banque->enabled) && (empty($this->fk_account) || $this->fk_account <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("BankAccount"));
 			return -6;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
-		{
+		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -7;
 		}
@@ -440,7 +440,9 @@ class PaymentVarious extends CommonObject
 		$sql .= ", amount";
 		$sql .= ", fk_typepayment";
 		$sql .= ", num_payment";
-		if ($this->note) $sql .= ", note";
+		if ($this->note) {
+			$sql .= ", note";
+		}
 		$sql .= ", label";
 		$sql .= ", accountancy_code";
 		$sql .= ", subledger_account";
@@ -457,7 +459,9 @@ class PaymentVarious extends CommonObject
 		$sql .= ", ".price2num($this->amount);
 		$sql .= ", '".$this->db->escape($this->type_payment)."'";
 		$sql .= ", '".$this->db->escape($this->num_payment)."'";
-		if ($this->note) $sql .= ", '".$this->db->escape($this->note)."'";
+		if ($this->note) {
+			$sql .= ", '".$this->db->escape($this->note)."'";
+		}
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", '".$this->db->escape($this->accountancy_code)."'";
 		$sql .= ", '".$this->db->escape($this->subledger_account)."'";
@@ -470,26 +474,27 @@ class PaymentVarious extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_various");
 			$this->ref = $this->id;
 
-			if ($this->id > 0)
-			{
-				if (!empty($conf->banque->enabled) && !empty($this->amount))
-				{
+			if ($this->id > 0) {
+				if (!empty($conf->banque->enabled) && !empty($this->amount)) {
 					// Insert into llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 					$acc = new Account($this->db);
 					$result = $acc->fetch($this->fk_account);
-					if ($result <= 0) dol_print_error($this->db);
+					if ($result <= 0) {
+						dol_print_error($this->db);
+					}
 
 					// Insert payment into llx_bank
 					// Add link 'payment_various' in bank_url between payment and bank transaction
 					$sign = 1;
-					if ($this->sens == '0') $sign = -1;
+					if ($this->sens == '0') {
+						$sign = -1;
+					}
 
 					$bank_line_id = $acc->addline(
 						$this->datep,
@@ -514,21 +519,18 @@ class PaymentVarious extends CommonObject
 						$error++;
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						// Add link 'payment_various' in bank_url between payment and bank transaction
 						$url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id=';
 
 						$result = $acc->add_url_line($bank_line_id, $this->id, $url, "(VariousPayment)", "payment_various");
-						if ($result <= 0)
-						{
+						if ($result <= 0) {
 							$this->error = $acc->error;
 							$error++;
 						}
 					}
 
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$this->error = $acc->error;
 						$error++;
 					}
@@ -536,12 +538,15 @@ class PaymentVarious extends CommonObject
 
 				// Call trigger
 				$result = $this->call_trigger('PAYMENT_VARIOUS_CREATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
-			} else $error++;
+			} else {
+				$error++;
+			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -568,8 +573,7 @@ class PaymentVarious extends CommonObject
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'payment_various SET fk_bank = '.$id_bank;
 		$sql .= ' WHERE rowid = '.$this->id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -607,21 +611,37 @@ class PaymentVarious extends CommonObject
 		} elseif ($mode == 1) {
 			return $langs->trans($this->statuts_short[$status]);
 		} elseif ($mode == 2) {
-			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
+			}
 		} elseif ($mode == 3) {
-			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+			if ($status == 0 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+			}
 		} elseif ($mode == 4) {
-			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
+			if ($status == 0 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
+			}
 		} elseif ($mode == 5) {
-			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			elseif ($status == 2 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+			if ($status == 0 && !empty($this->statuts_short[$status])) {
+				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
+				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
+				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+			}
 		}
 	}
 
@@ -641,7 +661,9 @@ class PaymentVarious extends CommonObject
 		global $db, $conf, $langs, $hookmanager;
 		global $langs;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -651,19 +673,20 @@ class PaymentVarious extends CommonObject
 
 		$url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -676,15 +699,21 @@ class PaymentVarious extends CommonObject
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -692,8 +721,11 @@ class PaymentVarious extends CommonObject
 		$hookmanager->initHooks(array('variouspayment'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -713,21 +745,17 @@ class PaymentVarious extends CommonObject
 		dol_syslog(get_class($this).'::info', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 				$this->date_creation = $this->db->jdate($obj->datec);
-				if ($obj->fk_user_modif)
-				{
+				if ($obj->fk_user_modif) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modif);
 					$this->user_modif = $muser;
@@ -755,11 +783,9 @@ class PaymentVarious extends CommonObject
 
 		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$banklineid;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$alreadydispatched = $obj->nb;
 			}
 		} else {
@@ -767,8 +793,7 @@ class PaymentVarious extends CommonObject
 			return -1;
 		}
 
-		if ($alreadydispatched)
-		{
+		if ($alreadydispatched) {
 			return 1;
 		}
 		return 0;
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index cb2e4915323..0add6bf77fd 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -44,25 +44,32 @@ if ($user->socid) {
 	$action = '';
 	$socid = $user->socid;
 }
-if ($user->socid)
+if ($user->socid) {
 	$socid = $user->socid;
+}
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }
+if (empty($page) || $page == -1) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder)
+if (!$sortorder) {
 	$sortorder = "ASC";
-if (!$sortfield)
+}
+if (!$sortfield) {
 	$sortfield = "name";
+}
 
 $object = new Account($db);
-if ($id > 0 || !empty($ref)) $object->fetch($id, $ref);
+if ($id > 0 || !empty($ref)) {
+	$object->fetch($id, $ref);
+}
 
 $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', '');
 
@@ -71,8 +78,7 @@ $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', '');
  * Actions
  */
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->bank->dir_output."/".dol_sanitizeFileName($object->ref);
 }
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index f4fa779fd7d..c2dd1c316a6 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -35,17 +35,20 @@ $WIDTH = DolGraph::getDefaultGraphSizeForStats('width', 768);
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height', 200);
 
 // Security check
-if (isset($_GET["account"]) || isset($_GET["ref"]))
-{
+if (isset($_GET["account"]) || isset($_GET["ref"])) {
 	$id = isset($_GET["account"]) ? $_GET["account"] : (isset($_GET["ref"]) ? $_GET["ref"] : '');
 }
 $fieldid = isset($_GET["ref"]) ? 'ref' : 'rowid';
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', '', $fieldid);
 
 $account = GETPOST("account");
 $mode = 'standard';
-if (GETPOST("mode") == 'showalltime') $mode = 'showalltime';
+if (GETPOST("mode") == 'showalltime') {
+	$mode = 'showalltime';
+}
 $error = 0;
 
 
@@ -63,24 +66,25 @@ $datetime = dol_now();
 $year = dol_print_date($datetime, "%Y");
 $month = dol_print_date($datetime, "%m");
 $day = dol_print_date($datetime, "%d");
-if (GETPOST("year"))  $year = sprintf("%04d", GETPOST("year"));
-if (GETPOST("month")) $month = sprintf("%02d", GETPOST("month"));
+if (GETPOST("year")) {
+	$year = sprintf("%04d", GETPOST("year"));
+}
+if (GETPOST("month")) {
+	$month = sprintf("%02d", GETPOST("month"));
+}
 
 
 $object = new Account($db);
-if ($_GET["account"] && !preg_match('/,/', $_GET["account"]))	// if for a particular account and not a list
-{
+if ($_GET["account"] && !preg_match('/,/', $_GET["account"])) {	// if for a particular account and not a list
 	$result = $object->fetch(GETPOST("account", "int"));
 }
-if ($_GET["ref"])
-{
+if ($_GET["ref"]) {
 	$result = $object->fetch(0, GETPOST("ref"));
 	$account = $object->id;
 }
 
 $result = dol_mkdir($conf->bank->dir_temp);
-if ($result < 0)
-{
+if ($result < 0) {
 	$langs->load("errors");
 	$error++;
 	setEventMessages($langs->trans("ErrorFailedToCreateDir"), null, 'errors');
@@ -91,11 +95,12 @@ if ($result < 0)
 	$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql .= " WHERE b.fk_account = ba.rowid";
 	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-	if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+	if ($account && $_GET["option"] != 'all') {
+		$sql .= " AND b.fk_account IN (".$account.")";
+	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$obj = $db->fetch_object($resql);
 		$min = $db->jdate($obj->min);
@@ -103,7 +108,9 @@ if ($result < 0)
 	} else {
 		dol_print_error($db);
 	}
-	if (empty($min)) $min = dol_now() - 3600 * 24;
+	if (empty($min)) {
+		$min = dol_now() - 3600 * 24;
+	}
 
 	$log = "graph.php: min=".$min." max=".$max;
 	dol_syslog($log);
@@ -111,15 +118,13 @@ if ($result < 0)
 
 	// Tableau 1
 
-	if ($mode == 'standard')
-	{
+	if ($mode == 'standard') {
 		// Loading table $amounts
 		$amounts = array();
 
 		$monthnext = $month + 1;
 		$yearnext = $year;
-		if ($monthnext > 12)
-		{
+		if ($monthnext > 12) {
 			$monthnext = 1;
 			$yearnext++;
 		}
@@ -132,16 +137,16 @@ if ($result < 0)
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
 		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				$amounts[$row[0]] = $row[1];
 				$i++;
@@ -160,11 +165,12 @@ if ($result < 0)
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev < '".$db->escape($year)."-".sprintf("%02s", $month)."-01'";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
 			$solde = $row[0];
 			$db->free($resql);
@@ -185,11 +191,9 @@ if ($result < 0)
 		$xmonth = substr($textdate, 4, 2);
 
 		$i = 0;
-		while ($xmonth == $month)
-		{
+		while ($xmonth == $month) {
 			$subtotal = $subtotal + (isset($amounts[$textdate]) ? $amounts[$textdate] : 0);
-			if ($day > time())
-			{
+			if ($day > time()) {
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
 			} else {
 				$datas[$i] = $solde + $subtotal;
@@ -219,18 +223,25 @@ if ($result < 0)
 		$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/balance".$account."-".$year.$month.".png";
 		$title = $langs->transnoentities("Balance").' - '.$langs->transnoentities("Month").': '.$month.' '.$langs->transnoentities("Year").': '.$year;
 		$graph_datas = array();
-		foreach ($datas as $i => $val)
-		{
+		foreach ($datas as $i => $val) {
 			$graph_datas[$i] = array(isset($labels[$i]) ? $labels[$i] : '', $datas[$i]);
-			if ($object->min_desired) array_push($graph_datas[$i], $datamin[$i]);
-			if ($object->min_allowed) array_push($graph_datas[$i], $dataall[$i]);
+			if ($object->min_desired) {
+				array_push($graph_datas[$i], $datamin[$i]);
+			}
+			if ($object->min_allowed) {
+				array_push($graph_datas[$i], $dataall[$i]);
+			}
 		}
 
 		$px1 = new DolGraph();
 		$px1->SetData($graph_datas);
 		$arraylegends = array($langs->transnoentities("Balance"));
-		if ($object->min_desired) array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
-		if ($object->min_allowed) array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		if ($object->min_desired) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
+		}
+		if ($object->min_allowed) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		}
 		$px1->SetLegend($arraylegends);
 		$px1->SetLegendWidthMin(180);
 		$px1->SetMaxValue($px1->GetCeilMaxValue() < 0 ? 0 : $px1->GetCeilMaxValue());
@@ -257,8 +268,7 @@ if ($result < 0)
 
 	// Graph Balance for the year
 
-	if ($mode == 'standard')
-	{
+	if ($mode == 'standard') {
 		// Loading table $amounts
 		$amounts = array();
 		$sql = "SELECT date_format(b.datev,'%Y%m%d')";
@@ -269,16 +279,16 @@ if ($result < 0)
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				$amounts[$row[0]] = $row[1];
 				$i++;
@@ -297,11 +307,12 @@ if ($result < 0)
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev < '".$db->escape($year)."-01-01'";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
 			$solde = $row[0];
 			$db->free($resql);
@@ -323,11 +334,9 @@ if ($result < 0)
 		$xday = substr($textdate, 6, 2);
 
 		$i = 0;
-		while ($xyear == $year && $day <= $datetime)
-		{
+		while ($xyear == $year && $day <= $datetime) {
 			$subtotal = $subtotal + (isset($amounts[$textdate]) ? $amounts[$textdate] : 0);
-			if ($day > $now)
-			{
+			if ($day > $now) {
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
 			} else {
 				$datas[$i] = $solde + $subtotal;
@@ -351,17 +360,24 @@ if ($result < 0)
 		$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/balance".$account."-".$year.".png";
 		$title = $langs->transnoentities("Balance").' - '.$langs->transnoentities("Year").': '.$year;
 		$graph_datas = array();
-		foreach ($datas as $i => $val)
-		{
+		foreach ($datas as $i => $val) {
 			$graph_datas[$i] = array(isset($labels[$i]) ? $labels[$i] : '', $datas[$i]);
-			if ($object->min_desired) array_push($graph_datas[$i], $datamin[$i]);
-			if ($object->min_allowed) array_push($graph_datas[$i], $dataall[$i]);
+			if ($object->min_desired) {
+				array_push($graph_datas[$i], $datamin[$i]);
+			}
+			if ($object->min_allowed) {
+				array_push($graph_datas[$i], $dataall[$i]);
+			}
 		}
 		$px2 = new DolGraph();
 		$px2->SetData($graph_datas);
 		$arraylegends = array($langs->transnoentities("Balance"));
-		if ($object->min_desired) array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
-		if ($object->min_allowed) array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		if ($object->min_desired) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
+		}
+		if ($object->min_allowed) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		}
 		$px2->SetLegend($arraylegends);
 		$px2->SetLegendWidthMin(180);
 		$px2->SetMaxValue($px2->GetCeilMaxValue() < 0 ? 0 : $px2->GetCeilMaxValue());
@@ -389,8 +405,7 @@ if ($result < 0)
 
 	// Graph 3 - Balance for all time line
 
-	if ($mode == 'showalltime')
-	{
+	if ($mode == 'showalltime') {
 		// Loading table $amounts
 		$amounts = array();
 
@@ -400,17 +415,17 @@ if ($result < 0)
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				$amounts[$row[0]] = $row[1];
 				$i++;
@@ -434,12 +449,10 @@ if ($result < 0)
 		$textdate = strftime("%Y%m%d", $day);
 		//print "x".$textdate;
 		$i = 0;
-		while ($day <= ($max + 86400))	// On va au dela du dernier jour
-		{
+		while ($day <= ($max + 86400)) {	// On va au dela du dernier jour
 			$subtotal = $subtotal + (isset($amounts[$textdate]) ? $amounts[$textdate] : 0);
 			//print strftime ("%e %d %m %y",$day)." ".$subtotal."\n<br>";
-			if ($day > ($max + 86400))
-			{
+			if ($day > ($max + 86400)) {
 				$datas[$i] = ''; // Valeur speciale permettant de ne pas tracer le graph
 			} else {
 				$datas[$i] = 0 + $solde + $subtotal;
@@ -462,18 +475,25 @@ if ($result < 0)
 		$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/balance".$account.".png";
 		$title = $langs->transnoentities("Balance")." - ".$langs->transnoentities("AllTime");
 		$graph_datas = array();
-		foreach ($datas as $i => $val)
-		{
+		foreach ($datas as $i => $val) {
 			$graph_datas[$i] = array(isset($labels[$i]) ? $labels[$i] : '', $datas[$i]);
-			if ($object->min_desired) array_push($graph_datas[$i], $datamin[$i]);
-			if ($object->min_allowed) array_push($graph_datas[$i], $dataall[$i]);
+			if ($object->min_desired) {
+				array_push($graph_datas[$i], $datamin[$i]);
+			}
+			if ($object->min_allowed) {
+				array_push($graph_datas[$i], $dataall[$i]);
+			}
 		}
 
 		$px3 = new DolGraph();
 		$px3->SetData($graph_datas);
 		$arraylegends = array($langs->transnoentities("Balance"));
-		if ($object->min_desired) array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
-		if ($object->min_allowed) array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		if ($object->min_desired) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalDesired"));
+		}
+		if ($object->min_allowed) {
+			array_push($arraylegends, $langs->transnoentities("BalanceMinimalAllowed"));
+		}
 		$px3->SetLegend($arraylegends);
 		$px3->SetLegendWidthMin(180);
 		$px3->SetMaxValue($px3->GetCeilMaxValue() < 0 ? 0 : $px3->GetCeilMaxValue());
@@ -499,16 +519,14 @@ if ($result < 0)
 
 	// Tableau 4a - Credit/Debit
 
-	if ($mode == 'standard')
-	{
+	if ($mode == 'standard') {
 		// Chargement du tableau $credits, $debits
 		$credits = array();
 		$debits = array();
 
 		$monthnext = $month + 1;
 		$yearnext = $year;
-		if ($monthnext > 12)
-		{
+		if ($monthnext > 12) {
 			$monthnext = 1;
 			$yearnext++;
 		}
@@ -522,16 +540,16 @@ if ($result < 0)
 		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
 		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
 		$sql .= " AND b.amount > 0";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%d')";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				$credits[$row[0]] = $row[1];
 				$i++;
@@ -543,8 +561,7 @@ if ($result < 0)
 
 		$monthnext = $month + 1;
 		$yearnext = $year;
-		if ($monthnext > 12)
-		{
+		if ($monthnext > 12) {
 			$monthnext = 1;
 			$yearnext++;
 		}
@@ -558,14 +575,14 @@ if ($result < 0)
 		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
 		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
 		$sql .= " AND b.amount < 0";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%d')";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			while ($row = $db->fetch_row($resql))
-			{
+		if ($resql) {
+			while ($row = $db->fetch_row($resql)) {
 				$debits[$row[0]] = abs($row[1]);
 			}
 			$db->free($resql);
@@ -578,8 +595,7 @@ if ($result < 0)
 		$labels = array();
 		$data_credit = array();
 		$data_debit = array();
-		for ($i = 0; $i < 31; $i++)
-		{
+		for ($i = 0; $i < 31; $i++) {
 			$data_credit[$i] = isset($credits[substr("0".($i + 1), -2)]) ? $credits[substr("0".($i + 1), -2)] : 0;
 			$data_debit[$i] = isset($debits[substr("0".($i + 1), -2)]) ? $debits[substr("0".($i + 1), -2)] : 0;
 			$labels[$i] = sprintf("%02d", $i + 1);
@@ -591,8 +607,7 @@ if ($result < 0)
 		$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/movement".$account."-".$year.$month.".png";
 		$title = $langs->transnoentities("BankMovements").' - '.$langs->transnoentities("Month").': '.$month.' '.$langs->transnoentities("Year").': '.$year;
 		$graph_datas = array();
-		foreach ($data_credit as $i => $val)
-		{
+		foreach ($data_credit as $i => $val) {
 			$graph_datas[$i] = array($labels[$i], $data_credit[$i], $data_debit[$i]);
 		}
 		$px4 = new DolGraph();
@@ -621,8 +636,7 @@ if ($result < 0)
 
 	// Tableau 4b - Credit/Debit
 
-	if ($mode == 'standard')
-	{
+	if ($mode == 'standard') {
 		// Chargement du tableau $credits, $debits
 		$credits = array();
 		$debits = array();
@@ -635,16 +649,16 @@ if ($result < 0)
 		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
 		$sql .= " AND b.amount > 0";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%m');";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_row($resql);
 				$credits[$row[0]] = $row[1];
 				$i++;
@@ -662,14 +676,14 @@ if ($result < 0)
 		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
 		$sql .= " AND b.amount < 0";
-		if ($account && $_GET["option"] != 'all') $sql .= " AND b.fk_account IN (".$account.")";
+		if ($account && $_GET["option"] != 'all') {
+			$sql .= " AND b.fk_account IN (".$account.")";
+		}
 		$sql .= " GROUP BY date_format(b.datev,'%m')";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			while ($row = $db->fetch_row($resql))
-			{
+		if ($resql) {
+			while ($row = $db->fetch_row($resql)) {
 				$debits[$row[0]] = abs($row[1]);
 			}
 			$db->free($resql);
@@ -682,8 +696,7 @@ if ($result < 0)
 		$labels = array();
 		$data_credit = array();
 		$data_debit = array();
-		for ($i = 0; $i < 12; $i++)
-		{
+		for ($i = 0; $i < 12; $i++) {
 			$data_credit[$i] = isset($credits[substr("0".($i + 1), -2)]) ? $credits[substr("0".($i + 1), -2)] : 0;
 			$data_debit[$i] = isset($debits[substr("0".($i + 1), -2)]) ? $debits[substr("0".($i + 1), -2)] : 0;
 			$labels[$i] = dol_print_date(dol_mktime(12, 0, 0, $i + 1, 1, 2000), "%b");
@@ -695,8 +708,7 @@ if ($result < 0)
 		$fileurl = DOL_URL_ROOT.'/viewimage.php?modulepart=banque_temp&file='."/movement".$account."-".$year.".png";
 		$title = $langs->transnoentities("BankMovements").' - '.$langs->transnoentities("Year").': '.$year;
 		$graph_datas = array();
-		foreach ($data_credit as $i => $val)
-		{
+		foreach ($data_credit as $i => $val) {
 			$graph_datas[$i] = array($labels[$i], $data_credit[$i], $data_debit[$i]);
 		}
 		$px5 = new DolGraph();
@@ -732,14 +744,11 @@ print dol_get_fiche_head($head, 'graph', $langs->trans("FinancialAccount"), 0, '
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-if ($account)
-{
-	if (!preg_match('/,/', $account))
-	{
+if ($account) {
+	if (!preg_match('/,/', $account)) {
 		$moreparam = '&month='.$month.'&year='.$year.($mode == 'showalltime' ? '&mode=showalltime' : '');
 
-		if ($_GET["option"] != 'all')
-		{
+		if ($_GET["option"] != 'all') {
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'&option=all'.$moreparam.'">'.$langs->trans("ShowAllAccounts").'</a>';
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
 		} else {
@@ -750,12 +759,13 @@ if ($account)
 	} else {
 		$bankaccount = new Account($db);
 		$listid = explode(',', $account);
-		foreach ($listid as $key => $id)
-		{
+		foreach ($listid as $key => $id) {
 			$bankaccount->fetch($id);
 			$bankaccount->label = $bankaccount->ref;
 			print $bankaccount->getNomUrl(1);
-			if ($key < (count($listid) - 1)) print ', ';
+			if ($key < (count($listid) - 1)) {
+				print ', ';
+			}
 		}
 	}
 } else {
@@ -769,8 +779,7 @@ print '<table class="notopnoleftnoright" width="100%">';
 
 // Navigation links
 print '<tr><td class="right">'.$morehtml.' &nbsp; &nbsp; ';
-if ($mode == 'showalltime')
-{
+if ($mode == 'showalltime') {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.(GETPOST("option") != 'all' ? '' : '&option=all').'">';
 	print $langs->trans("GoBack");
 	print '</a>';
@@ -785,12 +794,15 @@ print '</table>';
 
 
 // Graphs
-if ($mode == 'standard')
-{
+if ($mode == 'standard') {
 	$prevyear = $year; $nextyear = $year;
 	$prevmonth = $month - 1; $nextmonth = $month + 1;
-	if ($prevmonth < 1) { $prevmonth = 12; $prevyear--; }
-	if ($nextmonth > 12) { $nextmonth = 1; $nextyear++; }
+	if ($prevmonth < 1) {
+		$prevmonth = 12; $prevyear--;
+	}
+	if ($nextmonth > 12) {
+		$nextmonth = 1; $nextyear++;
+	}
 
 	// For month
 	$link = "<a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".$prevyear."&month=".$prevmonth."'>".img_previous('', 'class="valignbottom"')."</a> ".$langs->trans("Month")." <a href='".$_SERVER["PHP_SELF"]."?account=".$account.(GETPOST("option") != 'all' ? '' : '&option=all')."&year=".$nextyear."&month=".$nextmonth."'>".img_next('', 'class="valignbottom"')."</a>";
@@ -820,8 +832,7 @@ if ($mode == 'standard')
 	print '</div>';
 }
 
-if ($mode == 'showalltime')
-{
+if ($mode == 'showalltime') {
 	print '<div class="center clearboth margintoponly">';
 	print $show3;
 	print '</div>';
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index abcc260d9d8..1f22b67ac7c 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -37,10 +37,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'compta', 'bills', 'other'));
-if (!empty($conf->adherent->enabled)) $langs->load("members");
-if (!empty($conf->don->enabled)) $langs->load("donations");
-if (!empty($conf->loan->enabled)) $langs->load("loan");
-if (!empty($conf->salaries->enabled)) $langs->load("salaries");
+if (!empty($conf->adherent->enabled)) {
+	$langs->load("members");
+}
+if (!empty($conf->don->enabled)) {
+	$langs->load("donations");
+}
+if (!empty($conf->loan->enabled)) {
+	$langs->load("loan");
+}
+if (!empty($conf->salaries->enabled)) {
+	$langs->load("salaries");
+}
 
 
 $id = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
@@ -55,9 +63,13 @@ $cancel = GETPOST('cancel', 'alpha');
 // Security check
 $fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
 $fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', $fieldvalue, 'bank_account', '', '', $fieldtype);
-if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) accessforbidden();
+if (!$user->rights->banque->lire && !$user->rights->banque->consolidate) {
+	accessforbidden();
+}
 
 $hookmanager->initHooks(array('bankline'));
 
@@ -67,42 +79,36 @@ $hookmanager->initHooks(array('bankline'));
  */
 $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 ($cancel)
-{
-	if ($backtopage)
-	{
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if ($cancel) {
+	if ($backtopage) {
 		header("Location: ".$backtopage);
 		exit;
 	}
 }
 
 
-if ($user->rights->banque->consolidate && $action == 'donext')
-{
+if ($user->rights->banque->consolidate && $action == 'donext') {
 	$al = new AccountLine($db);
 	$al->dateo_next($_GET["rowid"]);
-} elseif ($user->rights->banque->consolidate && $action == 'doprev')
-{
+} elseif ($user->rights->banque->consolidate && $action == 'doprev') {
 	$al = new AccountLine($db);
 	$al->dateo_previous($_GET["rowid"]);
-} elseif ($user->rights->banque->consolidate && $action == 'dvnext')
-{
+} elseif ($user->rights->banque->consolidate && $action == 'dvnext') {
 	$al = new AccountLine($db);
 	$al->datev_next($_GET["rowid"]);
-} elseif ($user->rights->banque->consolidate && $action == 'dvprev')
-{
+} elseif ($user->rights->banque->consolidate && $action == 'dvprev') {
 	$al = new AccountLine($db);
 	$al->datev_previous($_GET["rowid"]);
 }
 
-if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->banque->modifier)
-{
+if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->banque->modifier) {
 	$cat1 = GETPOST("cat1", 'int');
 	if (!empty($rowid) && !empty($cat1)) {
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid." AND fk_categ = ".$cat1;
-		if (!$db->query($sql))
-		{
+		if (!$db->query($sql)) {
 			dol_print_error($db);
 		}
 	} else {
@@ -110,8 +116,7 @@ if ($action == 'confirm_delete_categ' && $confirm == "yes" && $user->rights->ban
 	}
 }
 
-if ($user->rights->banque->modifier && $action == "update")
-{
+if ($user->rights->banque->modifier && $action == "update") {
 	$error = 0;
 
 	$acline = new AccountLine($db);
@@ -121,21 +126,18 @@ if ($user->rights->banque->modifier && $action == "update")
 	$acsource->fetch($id);
 
 	$actarget = new Account($db);
-	if (GETPOST('accountid', 'int') > 0 && !$acline->rappro && !$acline->getVentilExportCompta())	// We ask to change bank account
-	{
+	if (GETPOST('accountid', 'int') > 0 && !$acline->rappro && !$acline->getVentilExportCompta()) {	// We ask to change bank account
 		$actarget->fetch(GETPOST('accountid', 'int'));
 	} else {
 		$actarget->fetch($id);
 	}
 
-	if ($actarget->courant == Account::TYPE_CASH && GETPOST('value', 'alpha') != 'LIQ')
-	{
+	if ($actarget->courant == Account::TYPE_CASH && GETPOST('value', 'alpha') != 'LIQ') {
 		setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->begin();
 
 		$amount = price2num($_POST['amount']);
@@ -144,43 +146,52 @@ if ($user->rights->banque->modifier && $action == "update")
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 		$sql .= " SET ";
 		// Always opened
-		if (GETPOSTISSET('value'))      $sql .= " fk_type='".$db->escape(GETPOST('value'))."',";
-		if (GETPOSTISSET('num_chq'))    $sql .= " num_chq='".$db->escape(GETPOST("num_chq"))."',";
-		if (GETPOSTISSET('banque'))     $sql .= " banque='".$db->escape(GETPOST("banque"))."',";
-		if (GETPOSTISSET('emetteur'))   $sql .= " emetteur='".$db->escape(GETPOST("emetteur"))."',";
+		if (GETPOSTISSET('value')) {
+			$sql .= " fk_type='".$db->escape(GETPOST('value'))."',";
+		}
+		if (GETPOSTISSET('num_chq')) {
+			$sql .= " num_chq='".$db->escape(GETPOST("num_chq"))."',";
+		}
+		if (GETPOSTISSET('banque')) {
+			$sql .= " banque='".$db->escape(GETPOST("banque"))."',";
+		}
+		if (GETPOSTISSET('emetteur')) {
+			$sql .= " emetteur='".$db->escape(GETPOST("emetteur"))."',";
+		}
 		// Blocked when conciliated
-		if (!$acline->rappro)
-		{
-			if (GETPOSTISSET('label'))      $sql .= " label = '".$db->escape(GETPOST("label"))."',";
-			if (GETPOSTISSET('amount'))     $sql .= " amount= '".$db->escape($amount)."',";
-			if (GETPOSTISSET('dateomonth')) $sql .= " dateo = '".$db->idate($dateop)."',";
-			if (GETPOSTISSET('datevmonth')) $sql .= " datev = '".$db->idate($dateval)."',";
+		if (!$acline->rappro) {
+			if (GETPOSTISSET('label')) {
+				$sql .= " label = '".$db->escape(GETPOST("label"))."',";
+			}
+			if (GETPOSTISSET('amount')) {
+				$sql .= " amount= '".$db->escape($amount)."',";
+			}
+			if (GETPOSTISSET('dateomonth')) {
+				$sql .= " dateo = '".$db->idate($dateop)."',";
+			}
+			if (GETPOSTISSET('datevmonth')) {
+				$sql .= " datev = '".$db->idate($dateval)."',";
+			}
 		}
 		$sql .= " fk_account = ".$actarget->id;
 		$sql .= " WHERE rowid = ".$acline->id;
 
 		$result = $db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$arrayofcategs = GETPOST('custcats', 'array');
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_class WHERE lineid = ".$rowid;
-			if (!$db->query($sql))
-			{
+			if (!$db->query($sql)) {
 				$error++;
 				dol_print_error($db);
 			}
-			if (count($arrayofcategs))
-			{
-				foreach ($arrayofcategs as $val)
-				{
+			if (count($arrayofcategs)) {
+				foreach ($arrayofcategs as $val) {
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."bank_class (lineid, fk_categ) VALUES (".$rowid.", ".$val.")";
-					if (!$db->query($sql))
-					{
+					if (!$db->query($sql)) {
 						$error++;
 						dol_print_error($db);
 					}
@@ -189,8 +200,7 @@ if ($user->rights->banque->modifier && $action == "update")
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$db->commit();
 		} else {
@@ -201,32 +211,31 @@ if ($user->rights->banque->modifier && $action == "update")
 }
 
 // Reconcile
-if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action == 'setreconcile'))
-{
+if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action == 'setreconcile')) {
 	$num_rel = trim($_POST["num_rel"]);
 	$rappro = $_POST['reconciled'] ? 1 : 0;
 
 	// Check parameters
-	if ($rappro && empty($num_rel))
-	{
+	if ($rappro && empty($num_rel)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountStatement")), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 		$sql .= " SET num_releve=".($num_rel ? "'".$db->escape($num_rel)."'" : "null");
-		if (empty($num_rel)) $sql .= ", rappro = 0";
-		else $sql .= ", rappro = ".$rappro;
+		if (empty($num_rel)) {
+			$sql .= ", rappro = 0";
+		} else {
+			$sql .= ", rappro = ".$rappro;
+		}
 		$sql .= " WHERE rowid = ".$rowid;
 
 		dol_syslog("line.php", LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$db->commit();
 		} else {
@@ -262,11 +271,9 @@ $sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 $sql .= " WHERE rowid=".$rowid;
 $sql .= " ORDER BY dateo ASC";
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$i = 0; $total = 0;
-	if ($db->num_rows($result))
-	{
+	if ($db->num_rows($result)) {
 		$objp = $db->fetch_object($result);
 
 		$total = $total + $objp->amount;
@@ -282,8 +289,7 @@ if ($result)
 		$bankline->load_previous_next_ref('', 'rowid');
 
 		// Confirmations
-		if ($action == 'delete_categ')
-		{
+		if ($action == 'delete_categ') {
 			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$rowid."&cat1=".GETPOST("fk_categ")."&orig_account=".$orig_account, $langs->trans("RemoveFromRubrique"), $langs->trans("RemoveFromRubriqueConfirm"), "confirm_delete_categ", '', 'yes', 1);
 		}
 
@@ -310,8 +316,7 @@ if ($result)
 		// Bank account
 		print '<tr><td class="titlefield">'.$langs->trans("Account").'</td>';
 		print '<td>';
-		if (!$objp->rappro && !$bankline->getVentilExportCompta())
-		{
+		if (!$objp->rappro && !$bankline->getVentilExportCompta()) {
 			$form->select_comptes($acct->id, 'accountid', 0, '', 0);
 		} else {
 			print $acct->getNomUrl(1, 'transactions', 'reflabel');
@@ -320,22 +325,22 @@ if ($result)
 		print '</tr>';
 
 		// Show links of bank transactions
-		if (count($links))
-		{
+		if (count($links)) {
 			print '<tr><td class="tdtop">'.$langs->trans("Links").'</td>';
 			print '<td>';
-			foreach ($links as $key=>$val)
-			{
-				if ($key) print '<br>';
+			foreach ($links as $key => $val) {
+				if ($key) {
+					print '<br>';
+				}
 				if ($links[$key]['type'] == 'payment') {
 					require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 					$paymenttmp = new Paiement($db);
 					$paymenttmp->fetch($links[$key]['url_id']);
 					$paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
 					/*print '<a href="'.DOL_URL_ROOT.'/compta/paiement/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Payment'),'payment').' ';
-                    print $langs->trans("Payment");
-                    print '</a>';*/
+					print img_object($langs->trans('Payment'),'payment').' ';
+					print $langs->trans("Payment");
+					print '</a>';*/
 					print $paymenttmp->getNomUrl(1);
 				} elseif ($links[$key]['type'] == 'payment_supplier') {
 					require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
@@ -343,9 +348,9 @@ if ($result)
 					$paymenttmp->fetch($links[$key]['url_id']);
 					$paymenttmp->ref = $langs->trans("Payment").' '.$paymenttmp->ref;
 					/*print '<a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('Payment'),'payment').' ';
-                    print $langs->trans("Payment");
-                    print '</a>';*/
+					print img_object($langs->trans('Payment'),'payment').' ';
+					print $langs->trans("Payment");
+					print '</a>';*/
 					print $paymenttmp->getNomUrl(1);
 				} elseif ($links[$key]['type'] == 'company') {
 					$societe = new Societe($db);
@@ -356,22 +361,19 @@ if ($result)
 					print img_object($langs->trans('SocialContribution'), 'bill').' ';
 					print $langs->trans("SocialContribution").($links[$key]['label'] ? ' - '.$links[$key]['label'] : '');
 					print '</a>';
-				}
-				elseif ($links[$key]['type'] == 'vat') {
+				} elseif ($links[$key]['type'] == 'vat') {
 					print '<a href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('VATDeclaration'), 'bill').' ';
 					print $langs->trans("VATDeclaration").($links[$key]['label'] ? '&nbsp;'.$links[$key]['label'] : '');
 					print '</a>';
-				}
-                elseif ($links[$key]['type'] == 'payment_sc') {
+				} elseif ($links[$key]['type'] == 'payment_sc') {
 					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
 					print img_object($langs->trans('Payment'), 'payment').' ';
 					print $langs->trans("SocialContributionPayment");
 					print '</a>';
-                }
-                elseif ($links[$key]['type'] == 'payment_vat') {
-                    print '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$links[$key]['url_id'].'">';
-                    print img_object($langs->trans('VATPayment'), 'payment').' ';
+				} elseif ($links[$key]['type'] == 'payment_vat') {
+					print '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$links[$key]['url_id'].'">';
+					print img_object($langs->trans('VATPayment'), 'payment').' ';
 					print $langs->trans("VATPayment");
 					print '</a>';
 				} elseif ($links[$key]['type'] == 'payment_salary') {
@@ -431,13 +433,11 @@ if ($result)
 		print "<tr><td>".$langs->trans("Type")." / ".$langs->trans("Numero");
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print "</td>";
-		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-		{
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 			print '<td>';
 			$form->select_types_paiements($objp->fk_type, "value", '', 2);
 			print '<input type="text" class="flat" name="num_chq" value="'.(empty($objp->num_chq) ? '' : $objp->num_chq).'">';
-			if ($objp->receiptid)
-			{
+			if ($objp->receiptid) {
 				include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 				$receipt = new RemiseCheque($db);
 				$receipt->fetch($objp->receiptid);
@@ -453,8 +453,7 @@ if ($result)
 		print "<tr><td>".$langs->trans("CheckTransmitter");
 		print ' <em>('.$langs->trans("ChequeMaker").')</em>';
 		print "</td>";
-		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-		{
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 			print '<td>';
 			print '<input type="text" class="flat minwidth200" name="emetteur" value="'.(empty($objp->emetteur) ? '' : stripslashes($objp->emetteur)).'">';
 			print '</td>';
@@ -467,8 +466,7 @@ if ($result)
 		print "<tr><td>".$langs->trans("Bank");
 		print ' <em>('.$langs->trans("ChequeBank").')</em>';
 		print "</td>";
-		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-		{
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 			print '<td>';
 			print '<input type="text" class="flat minwidth200" name="banque" value="'.(empty($objp->banque) ? '' : $objp->banque).'">';
 			print '</td>';
@@ -479,12 +477,10 @@ if ($result)
 
 		// Date ope
 		print '<tr><td>'.$langs->trans("DateOperation").'</td>';
-		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-		{
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 			print '<td>';
 			print $form->selectDate($db->jdate($objp->do), 'dateo', '', '', '', 'update', 1, 0, $objp->rappro);
-			if (!$objp->rappro)
-			{
+			if (!$objp->rappro) {
 				print ' &nbsp; ';
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
 				print img_edit_remove()."</a> ";
@@ -501,12 +497,10 @@ if ($result)
 
 		// Value date
 		print "<tr><td>".$langs->trans("DateValue")."</td>";
-		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-		{
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 			print '<td>';
 			print $form->selectDate($db->jdate($objp->dv), 'datev', '', '', '', 'update', 1, 0, $objp->rappro);
-			if (!$objp->rappro)
-			{
+			if (!$objp->rappro) {
 				print ' &nbsp; ';
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;id='.$id.'&amp;rowid='.$objp->rowid.'">';
 				print img_edit_remove()."</a> ";
@@ -523,12 +517,10 @@ if ($result)
 
 		// Description
 		print "<tr><td>".$langs->trans("Label")."</td>";
-		if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-		{
+		if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 			print '<td>';
 			print '<input name="label" class="flat minwidth300" '.($objp->rappro ? ' disabled' : '').' value="';
-			if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
-			{
+			if (preg_match('/^\((.*)\)$/i', $objp->label, $reg)) {
 				// Label generique car entre parentheses. On l'affiche en le traduisant
 				print $langs->trans($reg[1]);
 			} else {
@@ -538,8 +530,7 @@ if ($result)
 			print '</td>';
 		} else {
 			print '<td>';
-			if (preg_match('/^\((.*)\)$/i', $objp->label, $reg))
-			{
+			if (preg_match('/^\((.*)\)$/i', $objp->label, $reg)) {
 				// Label generique car entre parentheses. On l'affiche en le traduisant
 				print $langs->trans($reg[1]);
 			} else {
@@ -551,8 +542,7 @@ if ($result)
 
 		// Amount
 		print "<tr><td>".$langs->trans("Amount")."</td>";
-		if ($user->rights->banque->modifier)
-		{
+		if ($user->rights->banque->modifier) {
 			print '<td>';
 			print '<input name="amount" class="flat maxwidth100" '.($objp->rappro ? ' disabled' : '').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$acct->currency_code);
 			print '</td>';
@@ -564,8 +554,7 @@ if ($result)
 		print "</tr>";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-		{
+		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			$langs->load('categories');
 
 			// Bank line
@@ -589,8 +578,7 @@ if ($result)
 
 
 		// Releve rappro
-		if ($acct->canBeConciliated() > 0)  // Si compte rapprochable
-		{
+		if ($acct->canBeConciliated() > 0) {  // Si compte rapprochable
 			print load_fiche_titre($langs->trans("Reconciliation"), '', 'bank_account');
 			print '<hr>'."\n";
 
@@ -605,17 +593,17 @@ if ($result)
 			print '<table class="border centpercent">';
 
 			print '<tr><td class="titlefield">'.$langs->trans("Conciliation")."</td>";
-			if ($user->rights->banque->consolidate)
-			{
+			if ($user->rights->banque->consolidate) {
 				print '<td>';
-				if ($objp->rappro)
-				{
+				if ($objp->rappro) {
 					print $langs->trans("AccountStatement").' <input name="num_rel_bis" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
 					print '<input name="num_rel" type="hidden" value="'.$objp->num_releve.'">';
 				} else {
 					print $langs->trans("AccountStatement").' <input name="num_rel" class="flat" value="'.$objp->num_releve.'"'.($objp->rappro ? ' disabled' : '').'>';
 				}
-				if ($objp->num_releve) print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
+				if ($objp->num_releve) {
+					print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?num='.$objp->num_releve.'&account='.$acct->id.'">'.$langs->trans("AccountStatement").' '.$objp->num_releve.')</a>';
+				}
 				print '</td>';
 			} else {
 				print '<td>'.$objp->num_releve.'&nbsp;</td>';
@@ -623,8 +611,7 @@ if ($result)
 			print '</tr>';
 
 			print "<tr><td>".$langs->trans("BankLineConciliated")."</td>";
-			if ($user->rights->banque->consolidate)
-			{
+			if ($user->rights->banque->consolidate) {
 				print '<td>';
 				print '<input type="checkbox" name="reconciled" class="flat" '.(GETPOSTISSET("reconciled") ? (GETPOST("reconciled") ? ' checked="checked"' : '') : ($objp->rappro ? ' checked="checked"' : '')).'">';
 				print '</td>';
@@ -639,8 +626,7 @@ if ($result)
 			print '<div class="center">';
 
 			print '<input type="submit" class="button" value="'.$langs->trans("Update").'">';
-			if ($backtopage)
-			{
+			if ($backtopage) {
 				print ' &nbsp; ';
 				print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 			}
@@ -651,7 +637,9 @@ if ($result)
 	}
 
 	$db->free($result);
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 45d8c535f2d..6c2e595e3d1 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -32,9 +32,15 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcategory.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-if (!empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
+if (!empty($conf->categorie->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('banks', 'categories', 'accountancy', 'compta'));
@@ -52,15 +58,20 @@ $search_number = GETPOST('search_number', 'alpha');
 $search_status = GETPOST('search_status') ?GETPOST('search_status', 'alpha') : 'opened'; // 'all' or ''='opened'
 $optioncss = GETPOST('optioncss', 'alpha');
 
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	$search_category_list = GETPOST("search_category_".Categorie::TYPE_ACCOUNT."_list", "array");
 }
 
 // Security check
-if ($user->socid) $socid = $user->socid;
-if (!empty($user->rights->accounting->chartofaccount)) $allowed = 1; // Dictionary with list of banks accounting account allowed to manager of chart account
-if (!$allowed) $result = restrictedArea($user, 'banque');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+if (!empty($user->rights->accounting->chartofaccount)) {
+	$allowed = 1; // Dictionary with list of banks accounting account allowed to manager of chart account
+}
+if (!$allowed) {
+	$result = restrictedArea($user, 'banque');
+}
 
 $diroutputmassaction = $conf->bank->dir_output.'/temp/massgeneration/'.$user->id;
 
@@ -68,12 +79,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'b.label';
-if (!$sortorder) $sortorder = 'ASC';
+if (!$sortfield) {
+	$sortfield = 'b.label';
+}
+if (!$sortorder) {
+	$sortorder = 'ASC';
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Account($db);
@@ -116,19 +133,24 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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)) {
 	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_ref = '';
 		$search_label = '';
 		$search_number = '';
@@ -157,32 +179,44 @@ $accounts = array();
 $sql = "SELECT b.rowid, b.label, b.courant, b.rappro, b.account_number, b.fk_accountancy_journal, b.currency_code, b.datec as date_creation, b.tms as date_update";
 // 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
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."bank_account as b";
-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 (b.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 (b.rowid = ef.fk_object)";
+}
 
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterJoinQuery(Categorie::TYPE_ACCOUNT, "b.rowid");
 }
 
 $sql .= " WHERE b.entity IN (".getEntity('bank_account').")";
-if ($search_status == 'opened')  $sql .= " AND clos = 0";
-if ($search_status == 'closed')  $sql .= " AND clos = 1";
+if ($search_status == 'opened') {
+	$sql .= " AND clos = 0";
+}
+if ($search_status == 'closed') {
+	$sql .= " AND clos = 1";
+}
 
-if (!empty($conf->categorie->enabled))
-{
+if (!empty($conf->categorie->enabled)) {
 	$sql .= Categorie::getFilterSelectQuery(Categorie::TYPE_ACCOUNT, "b.rowid", $search_category_list);
 }
 
-if ($search_ref != '')    $sql .= natural_search('b.ref', $search_ref);
-if ($search_label != '')  $sql .= natural_search('b.label', $search_label);
-if ($search_number != '') $sql .= natural_search('b.number', $search_number);
+if ($search_ref != '') {
+	$sql .= natural_search('b.ref', $search_ref);
+}
+if ($search_label != '') {
+	$sql .= natural_search('b.label', $search_label);
+}
+if ($search_number != '') {
+	$sql .= natural_search('b.number', $search_number);
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -194,8 +228,7 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
 }
@@ -203,18 +236,18 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($resql);
 		$accounts[$objp->rowid] = $objp->courant;
 		$i++;
 	}
 	$db->free($resql);
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 
 
@@ -226,14 +259,30 @@ llxHeader('', $title, $help_url);
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_ref != '')      $param .= '&search_ref='.urlencode($search_ref);
-if ($search_label != '')    $param .= '&search_label='.urlencode($search_label);
-if ($search_number != '')   $param .= '&search_number='.urlencode($search_number);
-if ($search_status != '')   $param .= '&search_status='.urlencode($search_status);
-if ($show_files)            $param .= '&show_files='.urlencode($show_files);
-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 ($search_ref != '') {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_label != '') {
+	$param .= '&search_label='.urlencode($search_label);
+}
+if ($search_number != '') {
+	$param .= '&search_number='.urlencode($search_number);
+}
+if ($search_status != '') {
+	$param .= '&search_status='.urlencode($search_status);
+}
+if ($show_files) {
+	$param .= '&show_files='.urlencode($show_files);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -242,16 +291,24 @@ $arrayofmassactions = array(
 //    'presend'=>$langs->trans("SendByMail"),
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
-if ($user->rights->banque->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if ($user->rights->banque->modifier) $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->banque->supprimer) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if ($user->rights->banque->modifier) {
+	$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 = dolGetButtonTitle($langs->trans('NewFinancialAccount'), '', 'fa fa-plus-circle', 'card.php?action=create', '', $user->rights->banque->configurer);
 
 // Lines of title fields
 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">';
@@ -268,27 +325,29 @@ $objecttmp = new Account($db);
 $trackid = 'bank'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($sall) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
 $moreforfilter = '';
 
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-{
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	$moreforfilter .= $form->getFilterBox(Categorie::TYPE_ACCOUNT, $search_category_list);
 }
 
 // Bank accounts
 $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))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -303,53 +362,45 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 print '<tr class="liste_titre_filter">';
 
 // Ref
-if (!empty($arrayfields['b.ref']['checked']))
-{
+if (!empty($arrayfields['b.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 	print '</td>';
 }
 // Label
-if (!empty($arrayfields['b.label']['checked']))
-{
+if (!empty($arrayfields['b.label']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="6" type="text" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
 	print '</td>';
 }
 // Account type
-if (!empty($arrayfields['accountype']['checked']))
-{
+if (!empty($arrayfields['accountype']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Bank number
-if (!empty($arrayfields['b.number']['checked']))
-{
+if (!empty($arrayfields['b.number']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="6" type="text" name="search_number" value="'.dol_escape_htmltag($search_number).'">';
 	print '</td>';
 }
 // Account number
-if (!empty($arrayfields['b.account_number']['checked']))
-{
+if (!empty($arrayfields['b.account_number']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Accountancy journal
-if (!empty($arrayfields['b.fk_accountancy_journal']['checked']))
-{
+if (!empty($arrayfields['b.fk_accountancy_journal']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Transactions to reconcile
-if (!empty($arrayfields['toreconcile']['checked']))
-{
+if (!empty($arrayfields['toreconcile']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Currency
-if (!empty($arrayfields['b.currency_code']['checked']))
-{
+if (!empty($arrayfields['b.currency_code']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
@@ -361,20 +412,17 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (!empty($arrayfields['b.datec']['checked']))
-{
+if (!empty($arrayfields['b.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['b.tms']['checked']))
-{
+if (!empty($arrayfields['b.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Status
-if (!empty($arrayfields['b.clos']['checked']))
-{
+if (!empty($arrayfields['b.clos']['checked'])) {
 	print '<td class="liste_titre center">';
 	$array = array(
 		'opened'=>$langs->trans("Opened"),
@@ -384,8 +432,7 @@ if (!empty($arrayfields['b.clos']['checked']))
 	print '</td>';
 }
 // Balance
-if (!empty($arrayfields['balance']['checked']))
-{
+if (!empty($arrayfields['balance']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
 // Action column
@@ -397,33 +444,58 @@ print '</tr>';
 
 // Fields title
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['b.ref']['checked']))            print_liste_field_titre($arrayfields['b.ref']['label'], $_SERVER["PHP_SELF"], 'b.ref', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['b.label']['checked']))          print_liste_field_titre($arrayfields['b.label']['label'], $_SERVER["PHP_SELF"], 'b.label', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['accountype']['checked']))       print_liste_field_titre($arrayfields['accountype']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['b.number']['checked']))         print_liste_field_titre($arrayfields['b.number']['label'], $_SERVER["PHP_SELF"], 'b.number', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['b.account_number']['checked'])) print_liste_field_titre($arrayfields['b.account_number']['label'], $_SERVER["PHP_SELF"], 'b.account_number', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['b.fk_accountancy_journal']['checked'])) print_liste_field_titre($arrayfields['b.fk_accountancy_journal']['label'], $_SERVER["PHP_SELF"], 'b.fk_accountancy_journal', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['b.currency_code']['checked']))  print_liste_field_titre($arrayfields['b.currency_code']['label'], $_SERVER["PHP_SELF"], 'b.currency_code', '', $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['toreconcile']['checked']))      print_liste_field_titre($arrayfields['toreconcile']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['b.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['b.ref']['label'], $_SERVER["PHP_SELF"], 'b.ref', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['b.label']['checked'])) {
+	print_liste_field_titre($arrayfields['b.label']['label'], $_SERVER["PHP_SELF"], 'b.label', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['accountype']['checked'])) {
+	print_liste_field_titre($arrayfields['accountype']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['b.number']['checked'])) {
+	print_liste_field_titre($arrayfields['b.number']['label'], $_SERVER["PHP_SELF"], 'b.number', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['b.account_number']['checked'])) {
+	print_liste_field_titre($arrayfields['b.account_number']['label'], $_SERVER["PHP_SELF"], 'b.account_number', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['b.fk_accountancy_journal']['checked'])) {
+	print_liste_field_titre($arrayfields['b.fk_accountancy_journal']['label'], $_SERVER["PHP_SELF"], 'b.fk_accountancy_journal', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['b.currency_code']['checked'])) {
+	print_liste_field_titre($arrayfields['b.currency_code']['label'], $_SERVER["PHP_SELF"], 'b.currency_code', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['toreconcile']['checked'])) {
+	print_liste_field_titre($arrayfields['toreconcile']['label'], $_SERVER["PHP_SELF"], '', '', $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); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-if (!empty($arrayfields['b.datec']['checked']))          print_liste_field_titre($arrayfields['b.datec']['label'], $_SERVER["PHP_SELF"], "b.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (!empty($arrayfields['b.tms']['checked']))            print_liste_field_titre($arrayfields['b.tms']['label'], $_SERVER["PHP_SELF"], "b.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-if (!empty($arrayfields['b.clos']['checked']))           print_liste_field_titre($arrayfields['b.clos']['label'], $_SERVER["PHP_SELF"], 'b.clos', '', $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['balance']['checked']))          print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['b.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['b.datec']['label'], $_SERVER["PHP_SELF"], "b.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['b.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['b.tms']['label'], $_SERVER["PHP_SELF"], "b.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['b.clos']['checked'])) {
+	print_liste_field_titre($arrayfields['b.clos']['label'], $_SERVER["PHP_SELF"], 'b.clos', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['balance']['checked'])) {
+	print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
 
 $totalarray = array(); $found = 0; $i = 0; $lastcurrencycode = '';
 
-foreach ($accounts as $key=>$type)
-{
-	if ($i >= $limit) break;
+foreach ($accounts as $key => $type) {
+	if ($i >= $limit) {
+		break;
+	}
 
 	$found++;
 
@@ -431,53 +503,53 @@ foreach ($accounts as $key=>$type)
 
 	$solde = $objecttmp->solde(1);
 
-	if (!empty($lastcurrencycode) && $lastcurrencycode != $objecttmp->currency_code)
-	{
+	if (!empty($lastcurrencycode) && $lastcurrencycode != $objecttmp->currency_code) {
 		$lastcurrencycode = 'various'; // We found several different currencies
 	}
-	if ($lastcurrencycode != 'various')
-	{
+	if ($lastcurrencycode != 'various') {
 		$lastcurrencycode = $objecttmp->currency_code;
 	}
 
 	print '<tr class="oddeven">';
 
 	// Ref
-	if (!empty($arrayfields['b.ref']['checked']))
-	{
+	if (!empty($arrayfields['b.ref']['checked'])) {
 		print '<td class="nowrap">'.$objecttmp->getNomUrl(1).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Label
-	if (!empty($arrayfields['b.label']['checked']))
-	{
+	if (!empty($arrayfields['b.label']['checked'])) {
 		print '<td>'.$objecttmp->label.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Account type
-	if (!empty($arrayfields['accountype']['checked']))
-	{
+	if (!empty($arrayfields['accountype']['checked'])) {
 		print '<td>';
 		print $objecttmp->type_lib[$objecttmp->type];
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Number
-	if (!empty($arrayfields['b.number']['checked']))
-	{
+	if (!empty($arrayfields['b.number']['checked'])) {
 		print '<td>'.$objecttmp->number.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Account number
-	if (!empty($arrayfields['b.account_number']['checked']))
-	{
+	if (!empty($arrayfields['b.account_number']['checked'])) {
 		print '<td>';
-		if (!empty($conf->accounting->enabled) && !empty($objecttmp->account_number))
-		{
+		if (!empty($conf->accounting->enabled) && !empty($objecttmp->account_number)) {
 			$accountingaccount = new AccountingAccount($db);
 			$accountingaccount->fetch('', $objecttmp->account_number, 1);
 			print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
@@ -485,15 +557,15 @@ foreach ($accounts as $key=>$type)
 			print $objecttmp->account_number;
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Accountancy journal
-	if (!empty($arrayfields['b.fk_accountancy_journal']['checked']))
-	{
+	if (!empty($arrayfields['b.fk_accountancy_journal']['checked'])) {
 		print '<td>';
-		if (!empty($conf->accounting->enabled) && !empty($objecttmp->fk_accountancy_journal))
-		{
+		if (!empty($conf->accounting->enabled) && !empty($objecttmp->fk_accountancy_journal)) {
 			$accountingjournal = new AccountingJournal($db);
 			$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
 			print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
@@ -501,27 +573,31 @@ foreach ($accounts as $key=>$type)
 			print '';
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Currency
-	if (!empty($arrayfields['b.currency_code']['checked']))
-	{
+	if (!empty($arrayfields['b.currency_code']['checked'])) {
 		print '<td class="center">';
-   		print $objecttmp->currency_code;
+		print $objecttmp->currency_code;
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Transactions to reconcile
-	if (!empty($arrayfields['toreconcile']['checked']))
-	{
+	if (!empty($arrayfields['toreconcile']['checked'])) {
 		print '<td class="center">';
 
 		$conciliate = $objecttmp->canBeConciliated();
-		if ($conciliate == -2) print '<span class="opacitymedium">'.$langs->trans("CashAccount").'</span>';
-		elseif ($conciliate == -3) print '<span class="opacitymedium">'.$langs->trans("Closed").'</span>';
-		elseif (empty($objecttmp->rappro)) {
+		if ($conciliate == -2) {
+			print '<span class="opacitymedium">'.$langs->trans("CashAccount").'</span>';
+		} elseif ($conciliate == -3) {
+			print '<span class="opacitymedium">'.$langs->trans("Closed").'</span>';
+		} elseif (empty($objecttmp->rappro)) {
 			print '<span class="opacitymedium">'.$langs->trans("ConciliationDisabled").'</span>';
 		} else {
 			$result = $objecttmp->load_board($user, $objecttmp->id);
@@ -542,7 +618,9 @@ foreach ($accounts as $key=>$type)
 		}
 
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Extra fields
@@ -558,50 +636,59 @@ foreach ($accounts as $key=>$type)
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objecttmp); // Note that $action and $objecttmpect may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['b.datec']['checked']))
-	{
+	if (!empty($arrayfields['b.datec']['checked'])) {
 		print '<td class="center">';
 		print dol_print_date($objecttmp->date_creation, 'dayhour');
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Date modification
-	if (!empty($arrayfields['b.tms']['checked']))
-	{
+	if (!empty($arrayfields['b.tms']['checked'])) {
 		print '<td class="center">';
 		print dol_print_date($objecttmp->date_update, 'dayhour');
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Status
-	if (!empty($arrayfields['b.clos']['checked']))
-	{
+	if (!empty($arrayfields['b.clos']['checked'])) {
 		print '<td class="center">'.$objecttmp->getLibStatut(5).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Balance
-	if (!empty($arrayfields['balance']['checked']))
-	{
+	if (!empty($arrayfields['balance']['checked'])) {
 		print '<td class="nowraponall right">';
 		print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?id='.$objecttmp->id.'">'.price($solde, 0, $langs, 1, -1, -1, $objecttmp->currency_code).'</a>';
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'balance';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'balance';
+		}
 		$totalarray['val']['balance'] += $solde;
 	}
 
 	// 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($objecttmp->id, $arrayofselected)) $selected = 1;
+		if (in_array($objecttmp->id, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>';
 
@@ -611,16 +698,18 @@ foreach ($accounts as $key=>$type)
 }
 
 // If no record found
-if (!$found)
-{
+if (!$found) {
 	$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>';
 }
 
 // Show total line
-if ($lastcurrencycode != 'various')	// If there is several currency, $lastcurrencycode is set to 'various' before
-{
+if ($lastcurrencycode != 'various') {	// If there is several currency, $lastcurrencycode is set to 'various' before
 	// Show total line
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 }
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 5f095363e12..53d43583a9c 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -61,17 +61,17 @@ $newbankreceipt = GETPOST('newbankreceipt', 'alpha');
 // Security check
 $fieldid = (!empty($ref) ? $ref : $id);
 $fieldname = isset($ref) ? 'ref' : 'rowid';
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', $fieldid, 'bank_account', '', '', $fieldname);
 
-if ($user->rights->banque->consolidate && $action == 'dvnext' && !empty($dvid))
-{
+if ($user->rights->banque->consolidate && $action == 'dvnext' && !empty($dvid)) {
 	$al = new AccountLine($db);
 	$al->datev_next($dvid);
 }
 
-if ($user->rights->banque->consolidate && $action == 'dvprev' && !empty($dvid))
-{
+if ($user->rights->banque->consolidate && $action == 'dvprev' && !empty($dvid)) {
 	$al = new AccountLine($db);
 	$al->datev_previous($dvid);
 }
@@ -82,17 +82,24 @@ $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $pageplusone = GETPOST("pageplusone", 'int');
-if ($pageplusone) $page = $pageplusone - 1;
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if ($pageplusone) {
+	$page = $pageplusone - 1;
+}
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "s.nom";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "s.nom";
+}
 
 $object = new Account($db);
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$result = $object->fetch($id, $ref);
 	$account = $object->id; // Force the search field on id of account
 }
@@ -104,8 +111,7 @@ $contextpage = 'banktransactionlist'.(empty($object->ref) ? '' : '-'.$object->id
 
 // Define number of receipt to show (current, previous or next one ?)
 $found = false;
-if ($_GET["rel"] == 'prev')
-{
+if ($_GET["rel"] == 'prev') {
 	// Recherche valeur pour num = numero releve precedent
 	$sql = "SELECT DISTINCT(b.num_releve) as num";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -115,18 +121,15 @@ if ($_GET["rel"] == 'prev')
 
 	dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$numrows = $db->num_rows($resql);
-		if ($numrows > 0)
-		{
+		if ($numrows > 0) {
 			$obj = $db->fetch_object($resql);
 			$numref = $obj->num;
 			$found = true;
 		}
 	}
-} elseif ($_GET["rel"] == 'next')
-{
+} elseif ($_GET["rel"] == 'next') {
 	// Recherche valeur pour num = numero releve precedent
 	$sql = "SELECT DISTINCT(b.num_releve) as num";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -136,11 +139,9 @@ if ($_GET["rel"] == 'prev')
 
 	dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$numrows = $db->num_rows($resql);
-		if ($numrows > 0)
-		{
+		if ($numrows > 0) {
 			$obj = $db->fetch_object($resql);
 			$numref = $obj->num;
 			$found = true;
@@ -161,7 +162,9 @@ $sql .= " FROM ".MAIN_DB_PREFIX."bank_account as ba";
 $sql .= ", ".MAIN_DB_PREFIX."bank as b";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bordereau_cheque as bc ON bc.rowid=b.fk_bordereau';
 $sql .= " WHERE b.num_releve='".$db->escape($numref)."'";
-if (empty($numref))	$sql .= " OR b.num_releve is null";
+if (empty($numref)) {
+	$sql .= " OR b.num_releve is null";
+}
 $sql .= " AND b.fk_account = ".$object->id;
 $sql .= " AND b.fk_account = ba.rowid";
 $sql .= $db->order("b.datev, b.datec", "ASC"); // We add date of creation to have correct order when everything is done the same day
@@ -174,12 +177,13 @@ $sqlrequestforbankline = $sql;
  * Actions
  */
 
-if ($action == 'confirm_editbankreceipt' && !empty($oldbankreceipt) && !empty($newbankreceipt))
-{
+if ($action == 'confirm_editbankreceipt' && !empty($oldbankreceipt) && !empty($newbankreceipt)) {
 	// TODO Add a test to check newbankreceipt does not exists yet
 	$sqlupdate = 'UPDATE '.MAIN_DB_PREFIX.'bank SET num_releve = "'.$db->escape($newbankreceipt).'" WHERE num_releve = "'.$db->escape($oldbankreceipt).'" AND fk_account = '.$id;
 	$result = $db->query($sqlupdate);
-	if ($result < 0) dol_print_error($db);
+	if ($result < 0) {
+		dol_print_error($db);
+	}
 
 	$action = 'view';
 }
@@ -209,13 +213,18 @@ $paymentvariousstatic = new PaymentVarious($db);
 
 // Must be before button action
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($id > 0) $param .= '&id='.urlencode($id);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.$limit;
+}
+if ($id > 0) {
+	$param .= '&id='.urlencode($id);
+}
 
 
-if (empty($numref))
-{
+if (empty($numref)) {
 	$sortfield = 'numr';
 	$sortorder = 'DESC';
 
@@ -227,8 +236,7 @@ if (empty($numref))
 
 	// Count total nb of records
 	$nbtotalofrecords = '';
-	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-	{
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$result = $db->query($sql);
 		$nbtotalofrecords = $db->num_rows($result);
 	}
@@ -236,8 +244,7 @@ if (empty($numref))
 	$sql .= $db->plimit($conf->liste_limit + 1, $offset);
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$numrows = $db->num_rows($result);
 		$i = 0;
 
@@ -310,18 +317,15 @@ if (empty($numref))
 		$balancestart = array();
 		$content = array();
 
-		while ($i < min($numrows, $conf->liste_limit))
-		{
+		while ($i < min($numrows, $conf->liste_limit)) {
 			$objp = $db->fetch_object($result);
 
-			if (!isset($objp->numr))
-			{
+			if (!isset($objp->numr)) {
 				//
 			} else {
 				print '<tr class="oddeven">';
 				print '<td>';
-				if ($action != 'editbankreceipt' || $objp->numr != $brref)
-				{
+				if ($action != 'editbankreceipt' || $objp->numr != $brref) {
 					print '<a href="releve.php?num='.$objp->numr.'&account='.$object->id.'">'.$objp->numr.'</a>';
 				} else {
 					print '<input type="hidden" name="oldbankreceipt" value="'.$objp->numr.'">';
@@ -337,8 +341,7 @@ if (empty($numref))
 				$sql .= " WHERE b.num_releve < '".$db->escape($objp->numr)."'";
 				$sql .= " AND b.fk_account = ".$object->id;
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $db->fetch_object($resql);
 					$balancestart[$objp->numr] = $obj->amount;
 					$db->free($resql);
@@ -351,8 +354,7 @@ if (empty($numref))
 				$sql .= " WHERE b.num_releve = '".$db->escape($objp->numr)."'";
 				$sql .= " AND b.fk_account = ".$object->id;
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $db->fetch_object($resql);
 					$content[$objp->numr] = $obj->amount;
 					$db->free($resql);
@@ -421,8 +423,7 @@ if (empty($numref))
 	$sql .= " AND b.fk_account = ".$object->id;
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$total = $obj->amount;
 		$db->free($resql);
@@ -432,8 +433,7 @@ if (empty($numref))
 	$sql = $sqlrequestforbankline;
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$numrows = $db->num_rows($result);
 		$i = 0;
 
@@ -443,8 +443,7 @@ if (empty($numref))
 		print '<td class="right"><b>'.price($total).'</b></td><td>&nbsp;</td>';
 		print "</tr>\n";
 
-		while ($i < $numrows)
-		{
+		while ($i < $numrows) {
 			$objp = $db->fetch_object($result);
 			$total = $total + $objp->amount;
 
@@ -481,8 +480,11 @@ if (empty($numref))
 			print '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$objp->rowid.'&amp;account='.$object->id.'">';
 			$reg = array();
 			preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthese on tente recherche de traduction
-			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) print $langs->trans($reg[1]);
-			else print $objp->label;
+			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) {
+				print $langs->trans($reg[1]);
+			} else {
+				print $objp->label;
+			}
 			print '</a>';
 
 			/*
@@ -490,63 +492,56 @@ if (empty($numref))
 			 */
 			$newline = 1;
 			$links = $object->get_url($objp->rowid);
-			foreach ($links as $key=>$val)
-			{
-				if (!$newline) print ' - ';
-				else print '<br>';
-				if ($links[$key]['type'] == 'payment')
-				{
+			foreach ($links as $key => $val) {
+				if (!$newline) {
+					print ' - ';
+				} else {
+					print '<br>';
+				}
+				if ($links[$key]['type'] == 'payment') {
 					$paymentstatic->id = $links[$key]['url_id'];
 					$paymentstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentstatic->getNomUrl(1);
 					$newline = 0;
-				} elseif ($links[$key]['type'] == 'payment_supplier')
-				{
+				} elseif ($links[$key]['type'] == 'payment_supplier') {
 					$paymentsupplierstatic->id = $links[$key]['url_id'];
 					$paymentsupplierstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentsupplierstatic->getNomUrl(1);
 					$newline = 0;
-				} elseif ($links[$key]['type'] == 'payment_sc')
-				{
+				} elseif ($links[$key]['type'] == 'payment_sc') {
 					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
 					print $langs->trans("SocialContributionPayment");
 					print '</a>';
 					$newline = 0;
-				} elseif ($links[$key]['type'] == 'payment_vat')
-				{
+				} elseif ($links[$key]['type'] == 'payment_vat') {
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentvatstatic->getNomUrl(1);
-				} elseif ($links[$key]['type'] == 'payment_salary')
-				{
+				} elseif ($links[$key]['type'] == 'payment_salary') {
 					print '<a href="'.DOL_URL_ROOT.'/salaries/card.php?id='.$links[$key]['url_id'].'">';
 					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
 					print $langs->trans("Payment");
 					print '</a>';
 					$newline = 0;
-				} elseif ($links[$key]['type'] == 'payment_donation')
-				{
+				} elseif ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonationstatic->id = $links[$key]['url_id'];
 					$paymentdonationstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentdonationstatic->getNomUrl(1);
 					$newline = 0;
-				} elseif ($links[$key]['type'] == 'payment_loan')
-				{
+				} elseif ($links[$key]['type'] == 'payment_loan') {
 					$paymentloanstatic->id = $links[$key]['url_id'];
 					$paymentloanstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentloanstatic->getNomUrl(1);
 					$newline = 0;
-				} elseif ($links[$key]['type'] == 'payment_various')
-				{
+				} elseif ($links[$key]['type'] == 'payment_various') {
 					$paymentvariousstatic->id = $links[$key]['url_id'];
 					$paymentvariousstatic->ref = $langs->trans("Payment");
 					print ' '.$paymentvariousstatic->getNomUrl(1);
 					$newline = 0;
 				} elseif ($links[$key]['type'] == 'banktransfert') {
 					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
-					if ($objp->amount > 0)
-					{
+					if ($objp->amount > 0) {
 						$banklinestatic->fetch($links[$key]['url_id']);
 						$bankstatic->id = $banklinestatic->fk_account;
 						$bankstatic->label = $banklinestatic->bank_account_label;
@@ -601,8 +596,7 @@ if (empty($numref))
 			}
 
 			// Categories
-			if ($ve)
-			{
+			if ($ve) {
 				$sql = "SELECT label";
 				$sql .= " FROM ".MAIN_DB_PREFIX."bank_categ as ct";
 				$sql .= ", ".MAIN_DB_PREFIX."bank_class as cl";
@@ -611,13 +605,13 @@ if (empty($numref))
 				$sql .= " AND cl.lineid = ".$objp->rowid;
 
 				$resc = $db->query($sql);
-				if ($resc)
-				{
+				if ($resc) {
 					$numc = $db->num_rows($resc);
 					$ii = 0;
-					if ($numc && !$newline) print '<br>';
-					while ($ii < $numc)
-					{
+					if ($numc && !$newline) {
+						print '<br>';
+					}
+					while ($ii < $numc) {
 						$objc = $db->fetch_object($resc);
 						print "<br>-&nbsp;<i>".$objc->label."</i>";
 						$ii++;
@@ -629,8 +623,7 @@ if (empty($numref))
 
 			print "</td>";
 
-			if ($objp->amount < 0)
-			{
+			if ($objp->amount < 0) {
 				$totald = $totald + abs($objp->amount);
 				print '<td class="nowrap right">'.price($objp->amount * -1)."</td><td>&nbsp;</td>\n";
 			} else {
@@ -640,8 +633,7 @@ if (empty($numref))
 
 			print '<td class="nowrap right">'.price(price2num($total, 'MT'))."</td>\n";
 
-			if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-			{
+			if ($user->rights->banque->modifier || $user->rights->banque->consolidate) {
 				print '<td class="center"><a class="editfielda reposition" href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$objp->rowid.'&account='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?account='.$object->id.'&num='.$numref).'">';
 				print img_edit();
 				print "</a></td>";
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index c100dfd0091..985a09fb841 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -34,8 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("banks", "categories", "multicurrency"));
 
-if (!$user->rights->banque->transfer)
-  accessforbidden();
+if (!$user->rights->banque->transfer) {
+	accessforbidden();
+}
 
 $action = GETPOST('action', 'aZ09');
 $error = 0;
@@ -47,9 +48,10 @@ $hookmanager->initHooks(array('banktransfer'));
  */
 $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 ($action == 'add')
-{
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if ($action == 'add') {
 	$langs->load("errors");
 
 	$dateo = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
@@ -57,28 +59,23 @@ if ($action == 'add')
 	$amount = price2num(GETPOST('amount', 'alpha'), 'MT');
 	$amountto = price2num(GETPOST('amountto', 'alpha'), 'MT');
 
-	if (!$label)
-	{
+	if (!$label) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Description")), null, 'errors');
 	}
-	if (!$amount)
-	{
+	if (!$amount) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 	}
-	if (!GETPOST('account_from', 'int'))
-	{
+	if (!GETPOST('account_from', 'int')) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TransferFrom")), null, 'errors');
 	}
-	if (!GETPOST('account_to', 'int'))
-	{
+	if (!GETPOST('account_to', 'int')) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TransferTo")), null, 'errors');
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 		$accountfrom = new Account($db);
@@ -87,19 +84,16 @@ if ($action == 'add')
 		$accountto = new Account($db);
 		$accountto->fetch(GETPOST('account_to', 'int'));
 
-		if ($accountto->currency_code == $accountfrom->currency_code)
-		{
+		if ($accountto->currency_code == $accountfrom->currency_code) {
 			$amountto = $amount;
 		} else {
-			if (!$amountto)
-			{
+			if (!$amountto) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AmountTo")), null, 'errors');
 			}
 		}
 
-		if (($accountto->id != $accountfrom->id) && empty($error))
-		{
+		if (($accountto->id != $accountfrom->id) && empty($error)) {
 			$db->begin();
 
 			$bank_line_id_from = 0;
@@ -109,25 +103,39 @@ if ($action == 'add')
 			// By default, electronic transfert from bank to bank
 			$typefrom = 'PRE';
 			$typeto = 'VIR';
-			if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH)
-			{
+			if ($accountto->courant == Account::TYPE_CASH || $accountfrom->courant == Account::TYPE_CASH) {
 				// This is transfer of change
 				$typefrom = 'LIQ';
 				$typeto = 'LIQ';
 			}
 
-			if (!$error) $bank_line_id_from = $accountfrom->addline($dateo, $typefrom, $label, price2num(-1 * $amount), '', '', $user);
-			if (!($bank_line_id_from > 0)) $error++;
-			if (!$error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, $amountto, '', '', $user);
-			if (!($bank_line_id_to > 0)) $error++;
+			if (!$error) {
+				$bank_line_id_from = $accountfrom->addline($dateo, $typefrom, $label, price2num(-1 * $amount), '', '', $user);
+			}
+			if (!($bank_line_id_from > 0)) {
+				$error++;
+			}
+			if (!$error) {
+				$bank_line_id_to = $accountto->addline($dateo, $typeto, $label, $amountto, '', '', $user);
+			}
+			if (!($bank_line_id_to > 0)) {
+				$error++;
+			}
 
-			if (!$error) $result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
-			if (!($result > 0)) $error++;
-			if (!$error) $result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
-			if (!($result > 0)) $error++;
+			if (!$error) {
+				$result = $accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
+			}
+			if (!($result > 0)) {
+				$error++;
+			}
+			if (!$error) {
+				$result = $accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
+			}
+			if (!($result > 0)) {
+				$error++;
+			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$mesgs = $langs->trans("TransferFromToDone", '{s1}', '{s2}', $amount, $langs->transnoentitiesnoconv("Currency".$conf->currency));
 				$mesgs = str_replace('{s1}', '<a href="bankentries_list.php?id='.$accountfrom->id.'&sortfield=b.datev,b.dateo,b.rowid&sortorder=desc">'.$accountfrom->label.'</a>', $mesgs);
 				$mesgs = str_replace('{s2}', '<a href="bankentries_list.php?id='.$accountto->id.'">'.$accountto->label.'</a>', $mesgs);
@@ -220,8 +228,7 @@ $account_to = '';
 $label = '';
 $amount = '';
 
-if ($error)
-{
+if ($error) {
 	$account_from = GETPOST('account_from', 'int');
 	$account_to = GETPOST('account_to', 'int');
 	$label = GETPOST('label', 'alpha');
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 6d811233b7a..b1dac2858b0 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -37,12 +37,13 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array('banks', 'categories', 'bills', 'companies'));
 
 // Security check
-if (isset($_GET["account"]) || isset($_GET["ref"]))
-{
+if (isset($_GET["account"]) || isset($_GET["ref"])) {
 	$id = isset($_GET["account"]) ? $_GET["account"] : (isset($_GET["ref"]) ? $_GET["ref"] : '');
 }
 $fieldid = isset($_GET["ref"]) ? 'ref' : 'rowid';
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', '', $fieldid);
 
 
@@ -67,22 +68,18 @@ $socialcontribstatic = new ChargeSociales($db);
 
 $form = new Form($db);
 
-if ($_REQUEST["account"] || $_REQUEST["ref"])
-{
-	if ($vline)
-	{
+if ($_REQUEST["account"] || $_REQUEST["ref"]) {
+	if ($vline) {
 		$viewline = $vline;
 	} else {
 		$viewline = 20;
 	}
 
 	$object = new Account($db);
-	if ($_GET["account"])
-	{
+	if ($_GET["account"]) {
 		$result = $object->fetch($_GET["account"]);
 	}
-	if ($_GET["ref"])
-	{
+	if ($_GET["ref"]) {
 		$result = $object->fetch(0, $_GET["ref"]);
 		$_GET["account"] = $object->id;
 	}
@@ -101,8 +98,11 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	print '<br>';
 
 	$solde = $object->solde(0);
-	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)$colspan = 6;
-	else $colspan = 5;
+	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
+		$colspan = 6;
+	} else {
+		$colspan = 5;
+	}
 
 	// Show next coming entries
 	print '<div class="div-table-responsive">';
@@ -112,7 +112,9 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("DateDue").'</td>';
 	print '<td>'.$langs->trans("Description").'</td>';
-	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)print '<td>'.$langs->trans("Entity").'</td>';
+	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
+		print '<td>'.$langs->trans("Entity").'</td>';
+	}
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
 	print '<td class="right">'.$langs->trans("Debit").'</td>';
 	print '<td class="right">'.$langs->trans("Credit").'</td>';
@@ -193,37 +195,33 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 	}
 
 	// Sort array
-	if (!$error)
-	{
+	if (!$error) {
 		array_multisort($tab_sqlobjOrder, $tab_sqlobj);
 
 		// Apply distinct filter
-		foreach ($tab_sqlobj as $key=>$value) {
+		foreach ($tab_sqlobj as $key => $value) {
 			$tab_sqlobj[$key] = "'".serialize($value)."'";
 		}
 		$tab_sqlobj = array_unique($tab_sqlobj);
-		foreach ($tab_sqlobj as $key=>$value) {
+		foreach ($tab_sqlobj as $key => $value) {
 			$tab_sqlobj[$key] = unserialize(trim($value, "'"));
 		}
 
 		$num = count($tab_sqlobj);
 
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$ref = '';
 			$refcomp = '';
 			$totalpayment = '';
 
 			$obj = array_shift($tab_sqlobj);
 
-			if ($obj->family == 'invoice_supplier')
-			{
+			if ($obj->family == 'invoice_supplier') {
 				$showline = 1;
 				// Uncomment this line to avoid to count suppliers credit note (ff.type = 2)
 				//$showline=(($obj->total_ttc < 0 && $obj->type != 2) || ($obj->total_ttc > 0 && $obj->type == 2))
-				if ($showline)
-				{
+				if ($showline) {
 					$ref = $obj->ref;
 					$facturefournstatic->ref = $ref;
 					$facturefournstatic->id = $obj->objid;
@@ -237,8 +235,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 					$totalpayment = -1 * $facturefournstatic->getSommePaiement(); // Payment already done
 				}
 			}
-			if ($obj->family == 'invoice')
-			{
+			if ($obj->family == 'invoice') {
 				$facturestatic->ref = $obj->ref;
 				$facturestatic->id = $obj->objid;
 				$facturestatic->type = $obj->type;
@@ -252,8 +249,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 				$totalpayment += $facturestatic->getSumDepositsUsed();
 				$totalpayment += $facturestatic->getSumCreditNotesUsed();
 			}
-			if ($obj->family == 'social_contribution')
-			{
+			if ($obj->family == 'social_contribution') {
 				$socialcontribstatic->ref = $obj->ref;
 				$socialcontribstatic->id = $obj->objid;
 				$socialcontribstatic->label = $obj->type;
@@ -271,17 +267,21 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 			}
 
 			$total_ttc = $obj->total_ttc;
-			if ($totalpayment) $total_ttc = $obj->total_ttc - $totalpayment;
+			if ($totalpayment) {
+				$total_ttc = $obj->total_ttc - $totalpayment;
+			}
 			$solde += $total_ttc;
 
 			// We discard lines with a remainder to pay to 0
-			if (price2num($total_ttc) != 0)
-			{
+			if (price2num($total_ttc) != 0) {
 				// Show line
 				print '<tr class="oddeven">';
 				print '<td>';
-				if ($obj->dlr) print dol_print_date($db->jdate($obj->dlr), "day");
-				else print $langs->trans("NotDefined");
+				if ($obj->dlr) {
+					print dol_print_date($db->jdate($obj->dlr), "day");
+				} else {
+					print $langs->trans("NotDefined");
+				}
 				print "</td>";
 				print "<td>".$ref."</td>";
 				if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
@@ -293,8 +293,12 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
 					}
 				}
 				print "<td>".$refcomp."</td>";
-				if ($obj->total_ttc < 0) { print '<td class="nowrap right">'.price(abs($total_ttc))."</td><td>&nbsp;</td>"; };
-				if ($obj->total_ttc >= 0) { print '<td>&nbsp;</td><td class="nowrap right">'.price($total_ttc)."</td>"; };
+				if ($obj->total_ttc < 0) {
+					print '<td class="nowrap right">'.price(abs($total_ttc))."</td><td>&nbsp;</td>";
+				};
+				if ($obj->total_ttc >= 0) {
+					print '<td>&nbsp;</td><td class="nowrap right">'.price($total_ttc)."</td>";
+				};
 				print '<td class="nowrap right">'.price($solde).'</td>';
 				print "</tr>";
 			}
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 0c2db362e75..19b56169f8d 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -60,7 +60,9 @@ if (!empty($conf->accounting->enabled) && !empty($conf->global->ACCOUNTANCY_COMB
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', '', '', '');
 
 $object = new PaymentVarious($db);
@@ -75,36 +77,37 @@ $hookmanager->initHooks(array('variouscard', 'globalcard'));
 
 $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))
-{
+if (empty($reshook)) {
 	// Link to a project
-	if ($action == 'classin' && $user->rights->banque->modifier)
-	{
+	if ($action == 'classin' && $user->rights->banque->modifier) {
 		$object->fetch($id);
 		$object->setProject(GETPOST('projectid'));
 	}
 
-	if ($cancel)
-	{
-		if ($action != 'addlink')
-		{
+	if ($cancel) {
+		if ($action != 'addlink') {
 			$urltogo = $backtopage ? $backtopage : dol_buildpath('/compta/bank/various_payment/list.php', 1);
 			header("Location: ".$urltogo);
 			exit;
 		}
-		if ($id > 0 || !empty($ref)) $ret = $object->fetch($id, $ref);
+		if ($id > 0 || !empty($ref)) {
+			$ret = $object->fetch($id, $ref);
+		}
 		$action = '';
 	}
 
-	if ($action == 'add')
-	{
+	if ($action == 'add') {
 		$error = 0;
 
 		$datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
 		$datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
-		if (empty($datev)) $datev = $datep;
+		if (empty($datev)) {
+			$datev = $datep;
+		}
 
 		$object->ref = ''; // TODO
 		$object->accountid = GETPOST("accountid", 'int') > 0 ? GETPOST("accountid", "int") : 0;
@@ -124,50 +127,42 @@ if (empty($reshook))
 		$object->sens = GETPOSTINT('sens');
 		$object->fk_project = GETPOSTINT('fk_project');
 
-		if (empty($datep) || empty($datev))
-		{
+		if (empty($datep) || empty($datev)) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 			$error++;
 		}
-		if (empty($object->amount))
-		{
+		if (empty($object->amount)) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 			$error++;
 		}
-		if (!empty($conf->banque->enabled) && !$object->accountid > 0)
-		{
+		if (!empty($conf->banque->enabled) && !$object->accountid > 0) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 			$error++;
 		}
-		if (empty($object->type_payment) || $object->type_payment < 0)
-		{
+		if (empty($object->type_payment) || $object->type_payment < 0) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
 			$error++;
 		}
-		if (!empty($conf->accounting->enabled) && !$object->accountancy_code)
-		{
+		if (!empty($conf->accounting->enabled) && !$object->accountancy_code) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
 			$error++;
 		}
-		if ($object->sens < 0)
-		{
+		if ($object->sens < 0) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Sens")), null, 'errors');
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			$ret = $object->create($user);
-			if ($ret > 0)
-			{
+			if ($ret > 0) {
 				$db->commit();
 				$urltogo = ($backtopage ? $backtopage : DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
 				header("Location: ".$urltogo);
@@ -182,26 +177,23 @@ if (empty($reshook))
 		$action = 'create';
 	}
 
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$result = $object->fetch($id);
 
-		if ($object->rappro == 0)
-		{
+		if ($object->rappro == 0) {
 			$db->begin();
 
 			$ret = $object->delete($user);
-			if ($ret > 0)
-			{
-				if ($object->fk_bank)
-				{
+			if ($ret > 0) {
+				if ($object->fk_bank) {
 					$accountline = new AccountLine($db);
 					$result = $accountline->fetch($object->fk_bank);
-					if ($result > 0) $result = $accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+					if ($result > 0) {
+						$result = $accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+					}
 				}
 
-				if ($result >= 0)
-				{
+				if ($result >= 0) {
 					$db->commit();
 					header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/list.php');
 					exit;
@@ -237,18 +229,18 @@ if (empty($reshook))
 }
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
+if ($action == 'confirm_clone' && $confirm != 'yes') {
+	$action = '';
+}
 
-if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->modifier))
-{
+if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->modifier)) {
 	$db->begin();
 
 	$originalId = $id;
 
 	$object->fetch($id);
 
-	if ($object->id > 0)
-	{
+	if ($object->id > 0) {
 		$object->id = $object->ref = null;
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
@@ -259,30 +251,30 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->m
 
 		$newdatepayment = dol_mktime(0, 0, 0, GETPOST('clone_date_paymentmonth', 'int'), GETPOST('clone_date_paymentday', 'int'), GETPOST('clone_date_paymentyear', 'int'));
 		$newdatevalue = dol_mktime(0, 0, 0, GETPOST('clone_date_valuemonth', 'int'), GETPOST('clone_date_valueday', 'int'), GETPOST('clone_date_valueyear', 'int'));
-		if ($newdatepayment) $object->datep = $newdatepayment;
+		if ($newdatepayment) {
+			$object->datep = $newdatepayment;
+		}
 		if (!empty($newdatevalue)) {
 			$object->datev = $newdatevalue;
 		} else {
 			$object->datev = $newdatepayment;
 		}
 
-        if (GETPOSTISSET("clone_sens")) {
-            $object->sens = GETPOST("clone_sens", 'int');
-        } else {
-            $object->sens = $object->sens;
-        }
+		if (GETPOSTISSET("clone_sens")) {
+			$object->sens = GETPOST("clone_sens", 'int');
+		} else {
+			$object->sens = $object->sens;
+		}
 
-        if (GETPOST("clone_amount", "alpha")) {
-            $object->amount = price2num(GETPOST("clone_amount", "alpha"));
-        } else {
-            $object->amount = price2num($object->amount);
-        }
+		if (GETPOST("clone_amount", "alpha")) {
+			$object->amount = price2num(GETPOST("clone_amount", "alpha"));
+		} else {
+			$object->amount = price2num($object->amount);
+		}
 
-		if ($object->check())
-		{
+		if ($object->check()) {
 			$id = $object->create($user);
-			if ($id > 0)
-			{
+			if ($id > 0) {
 				$db->commit();
 				$db->close();
 
@@ -314,15 +306,17 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->m
 llxHeader("", $langs->trans("VariousPayment"));
 
 $form = new Form($db);
-if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
-if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+if (!empty($conf->accounting->enabled)) {
+	$formaccounting = new FormAccounting($db);
+}
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
-if ($id)
-{
+if ($id) {
 	$object = new PaymentVarious($db);
 	$result = $object->fetch($id);
-	if ($result <= 0)
-	{
+	if ($result <= 0) {
 		dol_print_error($db);
 		exit;
 	}
@@ -343,8 +337,7 @@ foreach ($bankcateg->fetchAll() as $bankcategory) {
 /* Create mode                                                                */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
@@ -381,8 +374,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Bank
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<tr><td>';
 		print $form->editfieldkey('BankAccount', 'selectaccountid', '', $object, 0, 'string', '', 1).'</td><td>';
 		$form->select_comptes($accountid, "accountid", 0, '', 2); // Affiche liste des comptes courant
@@ -396,8 +388,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Number
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		// Number
 		print '<tr><td><label for="num_payment">'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
@@ -443,8 +434,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$formproject = new FormProjets($db);
 
 		// Associated project
@@ -489,26 +479,24 @@ if ($action == 'create')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($id)
-{
+if ($id) {
 	$alreadyaccounted = $object->getVentilExportCompta();
 
 	$head = various_payment_prepare_head($object);
 
 	// Clone confirmation
-	if ($action === 'clone')
-	{
-        $set_value_help = $form->textwithpicto('', $langs->trans($langs->trans("AccountingDirectionHelp")));
-        $sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
+	if ($action === 'clone') {
+		$set_value_help = $form->textwithpicto('', $langs->trans($langs->trans("AccountingDirectionHelp")));
+		$sensarray = array('0' => $langs->trans("Debit"), '1' => $langs->trans("Credit"));
 
 		$formquestion = array(
 			array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
-            array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1),
-		    array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1),
-		    array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'clone_accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($object->fk_account, "accountid", 0, '', 1, '', 0, 'minwidth200', 1)),
-		    array('type' => 'text', 'name' => 'clone_amount', 'label' => $langs->trans("Amount"), 'value' => price($object->amount)),
-            array('type' => 'select', 'name' => 'clone_sens', 'label' => $langs->trans("Sens") . ' ' . $set_value_help, 'values' => $sensarray, 'default' => $object->sens),
-        );
+			array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1),
+			array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1),
+			array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'clone_accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($object->fk_account, "accountid", 0, '', 1, '', 0, 'minwidth200', 1)),
+			array('type' => 'text', 'name' => 'clone_amount', 'label' => $langs->trans("Amount"), 'value' => price($object->amount)),
+			array('type' => 'select', 'name' => 'clone_sens', 'label' => $langs->trans("Sens") . ' ' . $set_value_help, 'values' => $sensarray, 'default' => $object->sens),
+		);
 
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 350);
 	}
@@ -517,12 +505,10 @@ if ($id)
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
-		if ($user->rights->banque->modifier)
-		{
+		if ($user->rights->banque->modifier) {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 			}
@@ -572,7 +558,11 @@ if ($id)
 	print '</td></tr>';
 
 	// Debit / Credit
-	if ($object->sens == '1') $sens = $langs->trans("Credit"); else $sens = $langs->trans("Debit");
+	if ($object->sens == '1') {
+		$sens = $langs->trans("Credit");
+	} else {
+		$sens = $langs->trans("Debit");
+	}
 	print '<tr><td>'.$langs->trans("Sens").'</td><td>'.$sens.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
@@ -581,8 +571,7 @@ if ($id)
 	print '<tr><td class="nowrap">';
 	print $langs->trans("AccountAccounting");
 	print '</td><td>';
-	if (!empty($conf->accounting->enabled))
-	{
+	if (!empty($conf->accounting->enabled)) {
 		$accountingaccount = new AccountingAccount($db);
 		$accountingaccount->fetch('', $object->accountancy_code, 1);
 
@@ -599,10 +588,8 @@ if ($id)
 	print $form->editfieldval('SubledgerAccount', 'subledger_account', $object->subledger_account, $object, (!$alreadyaccounted && $user->rights->banque->modifier), 'string', '', 0);
 	print '</td></tr>';
 
-	if (!empty($conf->banque->enabled))
-	{
-		if ($object->fk_account > 0)
-		{
+	if (!empty($conf->banque->enabled)) {
+		if ($object->fk_account > 0) {
 			$bankline = new AccountLine($db);
 			$bankline->fetch($object->fk_bank);
 
@@ -637,16 +624,13 @@ if ($id)
 	// Add button modify
 
 	// Clone
-	if ($user->rights->banque->modifier)
-	{
+	if ($user->rights->banque->modifier) {
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/bank/various_payment/card.php", 1).'?id='.$object->id.'&amp;action=clone">'.$langs->trans("ToClone")."</a></div>";
 	}
 
 	// Delete
-	if (empty($object->rappro))
-	{
-		if (!empty($user->rights->banque->modifier))
-		{
+	if (empty($object->rappro)) {
+		if (!empty($user->rights->banque->modifier)) {
 			if ($alreadyaccounted) {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("Accounted").'">'.$langs->trans("Delete").'</a></div>';
 			} else {
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index 1cd8d285eeb..98486b67287 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -39,7 +39,9 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', '', '', '');
 
 // Get parameters
@@ -47,12 +49,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 $object = new PaymentVarious($db);
@@ -79,20 +87,17 @@ $title = $langs->trans("VariousPayment").' - '.$langs->trans("Documents");
 $help_url = '';
 llxHeader("", $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	$head = various_payment_prepare_head($object);
 
 	print dol_get_fiche_head($head, 'documents', $langs->trans("VariousPayment"), -1, $object->picto);
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' : ';
-		if ($user->rights->banque->modifier && 0)
-		{
+		if ($user->rights->banque->modifier && 0) {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 			}
@@ -128,8 +133,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index 5d401ede3c1..b173426e179 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -35,7 +35,9 @@ $action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', '', '', '');
 
 /*
@@ -55,12 +57,10 @@ print dol_get_fiche_head($head, 'info', $langs->trans("VariousPayment"), -1, $ob
 
 $morehtmlref = '<div class="refidno">';
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= $langs->trans('Project').' : ';
-	if ($user->rights->banque->modifier && 0)
-	{
+	if ($user->rights->banque->modifier && 0) {
 		if ($action != 'classify') {
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 		}
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 3990c968806..39cbb91fde1 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -37,7 +37,9 @@ $langs->loadLangs(array("compta", "banks", "bills", "accountancy"));
 
 // Security check
 $socid = GETPOST("socid", "int");
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', '', '', '');
 
 $optioncss = GETPOST('optioncss', 'alpha');
@@ -55,41 +57,58 @@ $search_amount_cred = GETPOST('search_amount_cred', 'alpha');
 $search_bank_account = GETPOST('search_account', 'int');
 $search_bank_entry = GETPOST('search_bank_entry', 'int');
 $search_accountancy_account = GETPOST("search_accountancy_account");
-if ($search_accountancy_account == - 1) $search_accountancy_account = '';
+if ($search_accountancy_account == - 1) {
+	$search_accountancy_account = '';
+}
 $search_accountancy_subledger = GETPOST("search_accountancy_subledger");
-if ($search_accountancy_subledger == - 1) $search_accountancy_subledger = '';
-if (empty($search_datep_start))  $search_datep_start = GETPOST("search_datep_start", 'int');
-if (empty($search_datep_end)) $search_datep_end = GETPOST("search_datep_end", 'int');
-if (empty($search_datev_start)) $search_datev_start = GETPOST("search_datev_start", 'int');
-if (empty($search_datev_end)) $search_datev_end = GETPOST("search_datev_end", 'int');
+if ($search_accountancy_subledger == - 1) {
+	$search_accountancy_subledger = '';
+}
+if (empty($search_datep_start)) {
+	$search_datep_start = GETPOST("search_datep_start", 'int');
+}
+if (empty($search_datep_end)) {
+	$search_datep_end = GETPOST("search_datep_end", 'int');
+}
+if (empty($search_datev_start)) {
+	$search_datev_start = GETPOST("search_datev_start", 'int');
+}
+if (empty($search_datev_end)) {
+	$search_datev_end = GETPOST("search_datev_end", 'int');
+}
 
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }	 // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}	 // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "v.datep,v.rowid";
-if (!$sortorder) $sortorder = "DESC,DESC";
+if (!$sortfield) {
+	$sortfield = "v.datep,v.rowid";
+}
+if (!$sortorder) {
+	$sortorder = "DESC,DESC";
+}
 
 $filtre = GETPOST("filtre", 'alpha');
 
-if (!GETPOST('typeid'))
-{
+if (!GETPOST('typeid')) {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
-	foreach ($filterarray as $val)
-	{
+	foreach ($filterarray as $val) {
 		$part = explode(':', $val);
-		if ($part[0] == 'v.fk_typepayment') $typeid = $part[1];
+		if ($part[0] == 'v.fk_typepayment') {
+			$typeid = $part[1];
+		}
 	}
 } else {
 	$typeid = GETPOST('typeid');
 }
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 	$search_ref = '';
 	$search_label = '';
 	$search_datep_start = '';
@@ -160,7 +179,9 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $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)) {
 	// Selection of new fields
@@ -172,13 +193,27 @@ if (empty($reshook)) {
  */
 
 $form = new Form($db);
-if ($arrayfields['account']['checked'] || $arrayfields['subledger']['checked'])	$formaccounting = new FormAccounting($db);
-if ($arrayfields['bank']['checked'] && !empty($conf->accounting->enabled))		$accountingjournal = new AccountingJournal($db);
-if ($arrayfields['ref']['checked'])		$variousstatic		= new PaymentVarious($db);
-if ($arrayfields['bank']['checked'])	$accountstatic		= new Account($db);
-if ($arrayfields['project']['checked'])	$proj = new Project($db);
-if ($arrayfields['entry']['checked'])	$bankline = new AccountLine($db);
-if ($arrayfields['account']['checked']) $accountingaccount = new AccountingAccount($db);
+if ($arrayfields['account']['checked'] || $arrayfields['subledger']['checked']) {
+	$formaccounting = new FormAccounting($db);
+}
+if ($arrayfields['bank']['checked'] && !empty($conf->accounting->enabled)) {
+	$accountingjournal = new AccountingJournal($db);
+}
+if ($arrayfields['ref']['checked']) {
+	$variousstatic		= new PaymentVarious($db);
+}
+if ($arrayfields['bank']['checked']) {
+	$accountstatic		= new Account($db);
+}
+if ($arrayfields['project']['checked']) {
+	$proj = new Project($db);
+}
+if ($arrayfields['entry']['checked']) {
+	$bankline = new AccountLine($db);
+}
+if ($arrayfields['account']['checked']) {
+	$accountingaccount = new AccountingAccount($db);
+}
 
 $sql = "SELECT v.rowid, v.sens, v.amount, v.label, v.datep as datep, v.datev as datev, v.fk_typepayment as type, v.num_payment, v.fk_bank, v.accountancy_code, v.subledger_account, v.fk_projet as fk_project,";
 $sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number as bank_account_number, ba.fk_accountancy_journal as accountancy_journal, ba.label as blabel,";
@@ -190,43 +225,68 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.ro
 $sql .= " WHERE v.entity IN (".getEntity('payment_various').")";
 
 // Search criteria
-if ($search_ref)						$sql .= " AND v.rowid=".$db->escape($search_ref);
-if ($search_label)						$sql .= natural_search(array('v.label'), $search_label);
-if ($search_datep_start)				$sql .= " AND v.datep >= '".$db->idate($search_datep_start)."'";
-if ($search_datep_end)					$sql .= " AND v.datep <= '".$db->idate($search_datep_end)."'";
-if ($search_datev_start)				$sql .= " AND v.datev >= '".$db->idate($search_datev_start)."'";
-if ($search_datev_end)					$sql .= " AND v.datev <= '".$db->idate($search_datev_end)."'";
-if ($search_amount_deb)					$sql .= natural_search("v.amount", $search_amount_deb, 1);
-if ($search_amount_cred)				$sql .= natural_search("v.amount", $search_amount_cred, 1);
-if ($search_bank_account > 0)			$sql .= " AND b.fk_account=".$db->escape($search_bank_account);
-if ($search_bank_entry > 0)				$sql .= " AND b.fk_account=".$db->escape($search_bank_account);
-if ($search_accountancy_account > 0)	$sql .= " AND v.accountancy_code=".$db->escape($search_accountancy_account);
-if ($search_accountancy_subledger > 0)	$sql .= " AND v.subledger_account=".$db->escape($search_accountancy_subledger);
-if ($typeid > 0)						$sql .= " AND v.fk_typepayment=".$typeid;
+if ($search_ref) {
+	$sql .= " AND v.rowid=".$db->escape($search_ref);
+}
+if ($search_label) {
+	$sql .= natural_search(array('v.label'), $search_label);
+}
+if ($search_datep_start) {
+	$sql .= " AND v.datep >= '".$db->idate($search_datep_start)."'";
+}
+if ($search_datep_end) {
+	$sql .= " AND v.datep <= '".$db->idate($search_datep_end)."'";
+}
+if ($search_datev_start) {
+	$sql .= " AND v.datev >= '".$db->idate($search_datev_start)."'";
+}
+if ($search_datev_end) {
+	$sql .= " AND v.datev <= '".$db->idate($search_datev_end)."'";
+}
+if ($search_amount_deb) {
+	$sql .= natural_search("v.amount", $search_amount_deb, 1);
+}
+if ($search_amount_cred) {
+	$sql .= natural_search("v.amount", $search_amount_cred, 1);
+}
+if ($search_bank_account > 0) {
+	$sql .= " AND b.fk_account=".$db->escape($search_bank_account);
+}
+if ($search_bank_entry > 0) {
+	$sql .= " AND b.fk_account=".$db->escape($search_bank_account);
+}
+if ($search_accountancy_account > 0) {
+	$sql .= " AND v.accountancy_code=".$db->escape($search_accountancy_account);
+}
+if ($search_accountancy_subledger > 0) {
+	$sql .= " AND v.subledger_account=".$db->escape($search_accountancy_subledger);
+}
+if ($typeid > 0) {
+	$sql .= " AND v.fk_typepayment=".$typeid;
+}
 if ($filtre) {
 	$filtre = str_replace(":", "=", $filtre);
 	$sql .= " AND ".$filtre;
 }
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
 
 $sql .= $db->order($sortfield, $sortorder);
 
 $totalnboflines = 0;
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$totalnboflines = $db->num_rows($result);
 }
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 
 	// Direct jump if only one record found
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
-	{
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
 		$obj = $db->fetch_object($result);
 		$id = $obj->rowid;
 		header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$id);
@@ -240,30 +300,64 @@ if ($result)
 	$total = 0;
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_ref)						$param .= '&search_ref='.urlencode($search_ref);
-	if ($search_label)						$param .= '&search_label='.urlencode($search_label);
-	if ($search_datep_start)				$param .= '&search_datep_start='.urlencode($search_datep_start);
-	if ($search_datep_end)					$param .= '&search_datep_end='.urlencode($search_datep_end);
-	if ($search_datev_start)				$param .= '&search_datev_start='.urlencode($search_datev_start);
-	if ($search_datev_end)					$param .= '&search_datev_end='.urlencode($search_datev_end);
-	if ($typeid > 0)						$param .= '&typeid='.urlencode($typeid);
-	if ($search_amount_deb)					$param .= '&search_amount_deb='.urlencode($search_amount_deb);
-	if ($search_amount_cred)				$param .= '&search_amount_cred='.urlencode($search_amount_cred);
-	if ($search_bank_account > 0)			$param .= '&search_account='.urlencode($search_bank_account);
-	if ($search_accountancy_account > 0)	$param .= '&search_accountancy_account='.urlencode($search_accountancy_account);
-	if ($search_accountancy_subledger > 0)	$param .= '&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_label) {
+		$param .= '&search_label='.urlencode($search_label);
+	}
+	if ($search_datep_start) {
+		$param .= '&search_datep_start='.urlencode($search_datep_start);
+	}
+	if ($search_datep_end) {
+		$param .= '&search_datep_end='.urlencode($search_datep_end);
+	}
+	if ($search_datev_start) {
+		$param .= '&search_datev_start='.urlencode($search_datev_start);
+	}
+	if ($search_datev_end) {
+		$param .= '&search_datev_end='.urlencode($search_datev_end);
+	}
+	if ($typeid > 0) {
+		$param .= '&typeid='.urlencode($typeid);
+	}
+	if ($search_amount_deb) {
+		$param .= '&search_amount_deb='.urlencode($search_amount_deb);
+	}
+	if ($search_amount_cred) {
+		$param .= '&search_amount_cred='.urlencode($search_amount_cred);
+	}
+	if ($search_bank_account > 0) {
+		$param .= '&search_account='.urlencode($search_bank_account);
+	}
+	if ($search_accountancy_account > 0) {
+		$param .= '&search_accountancy_account='.urlencode($search_accountancy_account);
+	}
+	if ($search_accountancy_subledger > 0) {
+		$param .= '&search_accountancy_subledger='.urlencode($search_accountancy_subledger);
+	}
 
-	if ($optioncss != '') $param .= '&amp;optioncss='.urlencode($optioncss);
+	if ($optioncss != '') {
+		$param .= '&amp;optioncss='.urlencode($optioncss);
+	}
 
 	$url = DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('MenuNewVariousPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->modifier);
 
 	print '<form method="POST" 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">';
@@ -273,9 +367,10 @@ if ($result)
 
 	print_barre_liste($langs->trans("MenuVariousPayment"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-	if ($search_all)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($search_all) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 	}
 
@@ -399,20 +494,46 @@ if ($result)
 
 	print '<tr class="liste_titre">';
 
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+	}
 
-	if ($arrayfields['ref']['checked'])			print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], 'v.rowid', '', $param, '', $sortfield, $sortorder);
-	if ($arrayfields['label']['checked'])		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder, 'left ');
-	if ($arrayfields['datep']['checked'])		print_liste_field_titre($arrayfields['datep']['label'], $_SERVER["PHP_SELF"], 'v.datep,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
-	if ($arrayfields['datev']['checked'])		print_liste_field_titre($arrayfields['datev']['label'], $_SERVER["PHP_SELF"], 'v.datev,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
-	if ($arrayfields['type']['checked'])		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'left ');
-	if ($arrayfields['project']['checked'])		print_liste_field_titre($arrayfields['project']['label'], $_SERVER["PHP_SELF"], 'fk_project', '', $param, '', $sortfield, $sortorder);
-	if ($arrayfields['bank']['checked'])		print_liste_field_titre($arrayfields['bank']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
-	if ($arrayfields['entry']['checked'])		print_liste_field_titre($arrayfields['entry']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
-	if ($arrayfields['account']['checked'])		print_liste_field_titre($arrayfields['account']['label'], $_SERVER["PHP_SELF"], 'v.accountancy_code', '', $param, '', $sortfield, $sortorder, 'left ');
-	if ($arrayfields['subledger']['checked'])	print_liste_field_titre($arrayfields['subledger']['label'], $_SERVER["PHP_SELF"], 'v.subledger_account', '', $param, '', $sortfield, $sortorder, 'left ');
-	if ($arrayfields['debit']['checked'])		print_liste_field_titre($arrayfields['debit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
-	if ($arrayfields['credit']['checked'])		print_liste_field_titre($arrayfields['credit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+	if ($arrayfields['ref']['checked']) {
+		print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], 'v.rowid', '', $param, '', $sortfield, $sortorder);
+	}
+	if ($arrayfields['label']['checked']) {
+		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], 'v.label', '', $param, '', $sortfield, $sortorder, 'left ');
+	}
+	if ($arrayfields['datep']['checked']) {
+		print_liste_field_titre($arrayfields['datep']['label'], $_SERVER["PHP_SELF"], 'v.datep,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if ($arrayfields['datev']['checked']) {
+		print_liste_field_titre($arrayfields['datev']['label'], $_SERVER["PHP_SELF"], 'v.datev,v.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if ($arrayfields['type']['checked']) {
+		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], 'type', '', $param, '', $sortfield, $sortorder, 'left ');
+	}
+	if ($arrayfields['project']['checked']) {
+		print_liste_field_titre($arrayfields['project']['label'], $_SERVER["PHP_SELF"], 'fk_project', '', $param, '', $sortfield, $sortorder);
+	}
+	if ($arrayfields['bank']['checked']) {
+		print_liste_field_titre($arrayfields['bank']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+	}
+	if ($arrayfields['entry']['checked']) {
+		print_liste_field_titre($arrayfields['entry']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+	}
+	if ($arrayfields['account']['checked']) {
+		print_liste_field_titre($arrayfields['account']['label'], $_SERVER["PHP_SELF"], 'v.accountancy_code', '', $param, '', $sortfield, $sortorder, 'left ');
+	}
+	if ($arrayfields['subledger']['checked']) {
+		print_liste_field_titre($arrayfields['subledger']['label'], $_SERVER["PHP_SELF"], 'v.subledger_account', '', $param, '', $sortfield, $sortorder, 'left ');
+	}
+	if ($arrayfields['debit']['checked']) {
+		print_liste_field_titre($arrayfields['debit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if ($arrayfields['credit']['checked']) {
+		print_liste_field_titre($arrayfields['credit']['label'], $_SERVER["PHP_SELF"], 'v.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
 
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -424,8 +545,7 @@ if ($result)
 
 
 	$totalarray = array();
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($result);
 
 		$variousstatic->id = $obj->rowid;
@@ -442,26 +562,34 @@ if ($result)
 		// Ref
 		if ($arrayfields['ref']['checked']) {
 			print '<td>'.$variousstatic->getNomUrl(1)."</td>";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Label payment
 		if ($arrayfields['label']['checked']) {
 			print '<td class="tdoverflowmax150" title="'.$variousstatic->label.'">'.$variousstatic->label."</td>";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Date payment
 		if ($arrayfields['datep']['checked']) {
 			print '<td class="center">'.dol_print_date($obj->datep, 'day')."</td>";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 
 		// Date value
 		if ($arrayfields['datev']['checked']) {
 			print '<td class="center">'.dol_print_date($obj->datev, 'day')."</td>";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Type
@@ -473,7 +601,9 @@ if ($result)
 			}
 			print $obj->num_payment;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Project
@@ -484,14 +614,15 @@ if ($result)
 				print $proj->getNomUrl(1);
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Bank account
 		if ($arrayfields['bank']['checked']) {
 			print '<td class="nowraponall">';
-			if ($obj->bid > 0)
-			{
+			if ($obj->bid > 0) {
 				$accountstatic->id = $obj->bid;
 				$accountstatic->ref = $obj->bref;
 				$accountstatic->number = $obj->bnumber;
@@ -508,14 +639,18 @@ if ($result)
 				print '&nbsp;';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Bank entry
 		if ($arrayfields['entry']['checked']) {
 			$bankline->fetch($obj->fk_bank);
 			print '<td>'.$bankline->getNomUrl(1).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Accounting account
@@ -523,44 +658,56 @@ if ($result)
 			$accountingaccount->fetch('', $obj->accountancy_code, 1);
 
 			print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Accounting subledger account
 		if ($arrayfields['subledger']['checked']) {
 			print '<td>'.length_accounta($obj->subledger_account).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Debit
 		if ($arrayfields['debit']['checked']) {
 			print '<td class="nowrap right">';
-			if ($obj->sens == 0)
-			{
+			if ($obj->sens == 0) {
 				print price($obj->amount);
 				$totalarray['val']['total_deb'] += $obj->amount;
 			}
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_deb';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_deb';
+			}
 			print '</td>';
 		}
 
 		// Credit
 		if ($arrayfields['credit']['checked']) {
 			print '<td class="nowrap right">';
-			if ($obj->sens == 1)
-			{
+			if ($obj->sens == 1) {
 				print price($obj->amount);
 				$totalarray['val']['total_cred'] += $obj->amount;
 			}
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_cred';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_cred';
+			}
 			print '</td>';
 		}
 
 		print '<td></td>';
 
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		print "</tr>";
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index ad88e928b6b..ce730df9ee6 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -49,30 +49,38 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'rowid';
-if (!$sortorder) $sortorder = 'ASC';
+if (!$sortfield) {
+	$sortfield = 'rowid';
+}
+if (!$sortorder) {
+	$sortorder = 'ASC';
+}
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartylist';
 
-if ($contextpage == 'takepos')
-{
+if ($contextpage == 'takepos') {
 	$_GET['optioncss'] = 'print';
 }
 
 // Security check
-if (!$user->rights->cashdesk->run && !$user->rights->takepos->run)
-{
+if (!$user->rights->cashdesk->run && !$user->rights->takepos->run) {
 	accessforbidden();
 }
 
 $arrayofpaymentmode = array('cash'=>'Cash', 'cheque'=>'Cheque', 'card'=>'CreditCard');
 
 $arrayofposavailable = array();
-if (!empty($conf->cashdesk->enabled)) $arrayofposavailable['cashdesk'] = $langs->trans('CashDesk').' (cashdesk)';
-if (!empty($conf->takepos->enabled))  $arrayofposavailable['takepos'] = $langs->trans('TakePOS').' (takepos)';
+if (!empty($conf->cashdesk->enabled)) {
+	$arrayofposavailable['cashdesk'] = $langs->trans('CashDesk').' (cashdesk)';
+}
+if (!empty($conf->takepos->enabled)) {
+	$arrayofposavailable['takepos'] = $langs->trans('TakePOS').' (takepos)';
+}
 // TODO Add hook here to allow other POS to add themself
 
 $object = new CashControl($db);
@@ -94,18 +102,18 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 $permissiontoadd = ($user->rights->cashdesk->run || $user->rights->takepos->run);
 $permissiontodelete = ($user->rights->cashdesk->run || $user->rights->takepos->run) || ($permissiontoadd && $object->status == 0);
-if (empty($backtopage)) $backtopage = dol_buildpath('/compta/cashcontrol/cashcontrol_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+if (empty($backtopage)) {
+	$backtopage = dol_buildpath('/compta/cashcontrol/cashcontrol_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+}
 $backurlforlist = dol_buildpath('/compta/cashcontrol/cashcontrol_list.php', 1);
 $triggermodname = 'CACHCONTROL_MODIFY'; // Name of trigger action code to execute when we modify record
 
-if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH1))
-{
+if (empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) && empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH1)) {
 	setEventMessages($langs->trans("CashDesk")." - ".$langs->trans("NotConfigured"), null, 'errors');
 }
 
 
-if (GETPOST('cancel', 'alpha'))
-{
+if (GETPOST('cancel', 'alpha')) {
 	if ($action == 'valid') {
 		$action = 'view';
 	} else {
@@ -113,8 +121,7 @@ if (GETPOST('cancel', 'alpha'))
 	}
 }
 
-if ($action == "reopen")
-{
+if ($action == "reopen") {
 	$result = $object->setStatut($object::STATUS_DRAFT, null, '', 'CASHFENCE_REOPEN');
 	if ($result < 0) {
 		dol_print_error($db, $object->error, $object->error);
@@ -123,43 +130,35 @@ if ($action == "reopen")
 	$action = 'view';
 }
 
-if ($action == "start")
-{
+if ($action == "start") {
 	$error = 0;
-	if (!GETPOST('posmodule', 'alpha') || GETPOST('posmodule', 'alpha') == '-1')
-	{
+	if (!GETPOST('posmodule', 'alpha') || GETPOST('posmodule', 'alpha') == '-1') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Module")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (GETPOST('posnumber', 'alpha') == '')
-	{
+	if (GETPOST('posnumber', 'alpha') == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CashDesk")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!GETPOST('closeyear', 'alpha') || GETPOST('closeyear', 'alpha') == '-1')
-	{
+	if (!GETPOST('closeyear', 'alpha') || GETPOST('closeyear', 'alpha') == '-1') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Year")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-} elseif ($action == "add")
-{
-	if (GETPOST('opening', 'alpha') == '')
-	{
+} elseif ($action == "add") {
+	if (GETPOST('opening', 'alpha') == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InitialBankBalance")), null, 'errors');
 		$action = 'start';
 		$error++;
 	}
 	$error = 0;
-	foreach ($arrayofpaymentmode as $key=>$val)
-	{
+	foreach ($arrayofpaymentmode as $key => $val) {
 		$object->$key = price2num(GETPOST($key.'_amount', 'alpha'));
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$object->day_close = GETPOST('closeday', 'int');
 		$object->month_close = GETPOST('closemonth', 'int');
 		$object->year_close = GETPOST('closeyear', 'int');
@@ -172,8 +171,7 @@ if ($action == "start")
 
 		$id = $object->create($user);
 
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			$db->commit();
 			$action = "view";
 		} else {
@@ -190,8 +188,7 @@ if ($action == "start")
 	}
 }
 
-if ($action == "valid")	// validate = close
-{
+if ($action == "valid") {	// validate = close
 	$object->fetch($id);
 
 	$db->begin();
@@ -210,8 +207,7 @@ if ($action == "valid")	// validate = close
 
 	$result = $object->valid($user);
 
-	if ($result <= 0)
-	{
+	if ($result <= 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$db->rollback();
 	} else {
@@ -230,27 +226,27 @@ if ($action == "valid")	// validate = close
 }
 
 // Action to delete
-if ($action == 'confirm_delete' && !empty($permissiontodelete))
-{
+if ($action == 'confirm_delete' && !empty($permissiontodelete)) {
 	$object->fetch($id);
 
-	if (!($object->id > 0))
-	{
+	if (!($object->id > 0)) {
 		dol_print_error('', 'Error, object must be fetched before being deleted');
 		exit;
 	}
 
 	$result = $object->delete($user);
 	//var_dump($result);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		// Delete OK
 		setEventMessages("RecordDeleted", null, 'mesgs');
 		header("Location: ".$backurlforlist);
 		exit;
 	} else {
-		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-		else setEventMessages($object->error, null, 'errors');
+		if (!empty($object->errors)) {
+			setEventMessages(null, $object->errors, 'errors');
+		} else {
+			setEventMessages($object->error, null, 'errors');
+		}
 	}
 }
 
@@ -265,8 +261,7 @@ $initialbalanceforterminal = array();
 $theoricalamountforterminal = array();
 $theoricalnbofinvoiceforterminal = array();
 
-if ($action == "create" || $action == "start" || $action == 'close')
-{
+if ($action == "create" || $action == "start" || $action == 'close') {
 	if ($action == 'close') {
 		$posmodule = $object->posmodule;
 		$terminalid = $object->posnumber;
@@ -275,13 +270,14 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		$syear = $object->year_close;
 		$smonth = $object->month_close;
 		$sday = $object->day_close;
-	} elseif (GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '-1')
-	{
+	} elseif (GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '' && GETPOST('posnumber', 'alpha') != '-1') {
 		$posmodule = GETPOST('posmodule', 'alpha');
 		$terminalid = GETPOST('posnumber', 'alpha');
 		$terminaltouse = $terminalid;
 
-		if ($terminaltouse == '1' && $posmodule == 'cashdesk') $terminaltouse = '';
+		if ($terminaltouse == '1' && $posmodule == 'cashdesk') {
+			$terminaltouse = '';
+		}
 
 		if ($posmodule == 'cashdesk' && $terminaltouse != '' && $terminaltouse != '1') {
 			$terminaltouse = '';
@@ -290,13 +286,10 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		}
 	}
 
-	if ($terminalid != '')
-	{
+	if ($terminalid != '') {
 		// Calculate $initialbalanceforterminal for terminal 0
-		foreach ($arrayofpaymentmode as $key => $val)
-		{
-			if ($key != 'cash')
-			{
+		foreach ($arrayofpaymentmode as $key => $val) {
+			if ($key != 'cash') {
 				$initialbalanceforterminal[$terminalid][$key] = 0;
 				continue;
 			}
@@ -305,21 +298,28 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			$vartouse = 'CASHDESK_ID_BANKACCOUNT_CASH'.$terminaltouse;
 			$bankid = $conf->global->$vartouse;
 
-			if ($bankid > 0)
-			{
+			if ($bankid > 0) {
 				$sql = "SELECT SUM(amount) as total FROM ".MAIN_DB_PREFIX."bank";
 				$sql .= " WHERE fk_account = ".$bankid;
-				if ($syear && !$smonth)              $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, 1))."'";
-				elseif ($syear && $smonth && !$sday) $sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, $smonth))."'";
-				elseif ($syear && $smonth && $sday)  $sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
-				else dol_print_error('', 'Year not defined');
+				if ($syear && !$smonth) {
+					$sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, 1))."'";
+				} elseif ($syear && $smonth && !$sday) {
+					$sql .= " AND dateo < '".$db->idate(dol_get_first_day($syear, $smonth))."'";
+				} elseif ($syear && $smonth && $sday) {
+					$sql .= " AND dateo < '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."'";
+				} else {
+					dol_print_error('', 'Year not defined');
+				}
 
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $db->fetch_object($resql);
-					if ($obj) $initialbalanceforterminal[$terminalid][$key] = $obj->total;
-				} else dol_print_error($db);
+					if ($obj) {
+						$initialbalanceforterminal[$terminalid][$key] = $obj->total;
+					}
+				} else {
+					dol_print_error($db);
+				}
 			} else {
 				setEventMessages($langs->trans("SetupOfTerminalNotComplete", $terminaltouse), null, 'errors');
 				$error++;
@@ -327,8 +327,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		}
 
 		// Calculate $theoricalamountforterminal
-		foreach ($arrayofpaymentmode as $key => $val)
-		{
+		foreach ($arrayofpaymentmode as $key => $val) {
 			$sql = "SELECT SUM(pf.amount) as total, COUNT(*) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."paiement as p, ".MAIN_DB_PREFIX."c_paiement as cp";
 			$sql .= " WHERE pf.fk_facture = f.rowid AND p.rowid = pf.fk_paiement AND cp.id = p.fk_paiement";
@@ -336,30 +335,38 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			$sql .= " AND f.pos_source = '".$db->escape($terminalid)."'";
 			$sql .= " AND f.paye = 1";
 			$sql .= " AND p.entity IN (".getEntity('facture').")";
-			if ($key == 'cash')       $sql .= " AND cp.code = 'LIQ'";
-			elseif ($key == 'cheque') $sql .= " AND cp.code = 'CHQ'";
-			elseif ($key == 'card')   $sql .= " AND cp.code = 'CB'";
-			else {
+			if ($key == 'cash') {
+				$sql .= " AND cp.code = 'LIQ'";
+			} elseif ($key == 'cheque') {
+				$sql .= " AND cp.code = 'CHQ'";
+			} elseif ($key == 'card') {
+				$sql .= " AND cp.code = 'CB'";
+			} else {
 				dol_print_error('Value for key = '.$key.' not supported');
 				exit;
 			}
-			if ($syear && !$smonth)              $sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, 1))."' AND '".$db->idate(dol_get_last_day($syear, 12))."'";
-			elseif ($syear && $smonth && !$sday) $sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, $smonth))."' AND '".$db->idate(dol_get_last_day($syear, $smonth))."'";
-			elseif ($syear && $smonth && $sday)  $sql .= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
-			else dol_print_error('', 'Year not defined');
+			if ($syear && !$smonth) {
+				$sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, 1))."' AND '".$db->idate(dol_get_last_day($syear, 12))."'";
+			} elseif ($syear && $smonth && !$sday) {
+				$sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, $smonth))."' AND '".$db->idate(dol_get_last_day($syear, $smonth))."'";
+			} elseif ($syear && $smonth && $sday) {
+				$sql .= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
+			} else {
+				dol_print_error('', 'Year not defined');
+			}
 
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$theoricalamountforterminal[$terminalid][$key] = $initialbalanceforterminal[$terminalid][$key];
 
 				$obj = $db->fetch_object($resql);
-				if ($obj)
-				{
+				if ($obj) {
 					$theoricalamountforterminal[$terminalid][$key] = price2num($theoricalamountforterminal[$terminalid][$key] + $obj->total);
 					$theoricalnbofinvoiceforterminal[$terminalid][$key] = $obj->nb;
 				}
-			} else dol_print_error($db);
+			} else {
+				dol_print_error($db);
+			}
 		}
 	}
 
@@ -371,12 +378,12 @@ if ($action == "create" || $action == "start" || $action == 'close')
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		if ($contextpage == 'takepos') print '<input type="hidden" name="contextpage" value="takepos">';
-		if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
-		{
+		if ($contextpage == 'takepos') {
+			print '<input type="hidden" name="contextpage" value="takepos">';
+		}
+		if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1') {
 			print '<input type="hidden" name="action" value="add">';
-		} elseif ($action == 'close')
-		{
+		} elseif ($action == 'close') {
 			print '<input type="hidden" name="action" value="valid">';
 			print '<input type="hidden" name="id" value="'.$id.'">';
 		} else {
@@ -407,8 +414,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			$array[$i] = $i;
 		}
 		$selectedposnumber = 0; $showempty = 1;
-		if ($conf->global->TAKEPOS_NUM_TERMINALS == '1')
-		{
+		if ($conf->global->TAKEPOS_NUM_TERMINALS == '1') {
 			$selectedposnumber = 1; $showempty = 0;
 		}
 		print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ?GETPOST('posnumber', 'int') : $selectedposnumber, $showempty);
@@ -417,8 +423,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		// Year
 		print '<td>';
 		$retstring = '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
-		for ($year = $syear - 10; $year < $syear + 10; $year++)
-		{
+		for ($year = $syear - 10; $year < $syear + 10; $year++) {
 			$retstring .= '<option value="'.$year.'"'.($year == $syear ? ' selected' : '').'>'.$year.'</option>';
 		}
 		$retstring .= "</select>\n";
@@ -428,8 +433,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		print '<td>';
 		$retstring = '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'month" name="'.$prefix.'month">';
 		$retstring .= '<option value="0"></option>';
-		for ($month = 1; $month <= 12; $month++)
-		{
+		for ($month = 1; $month <= 12; $month++) {
 			$retstring .= '<option value="'.$month.'"'.($month == $smonth ? ' selected' : '').'>';
 			$retstring .= dol_print_date(mktime(12, 0, 0, $month, 1, 2000), "%b");
 			$retstring .= "</option>";
@@ -441,8 +445,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		print '<td>';
 		$retstring = '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
 		$retstring .= '<option value="0" selected>&nbsp;</option>';
-		for ($day = 1; $day <= 31; $day++)
-		{
+		for ($day = 1; $day <= 31; $day++) {
 			$retstring .= '<option value="'.$day.'"'.($day == $sday ? ' selected' : '').'>'.$day.'</option>';
 		}
 		$retstring .= "</select>";
@@ -450,8 +453,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		print '</td>';
 		// Button Start
 		print '<td>';
-		if ($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1')
-		{
+		if ($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1') {
 			print '';
 		} else {
 			print '<input type="submit" name="add" class="button" value="'.$langs->trans("Start").'">';
@@ -461,8 +463,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		print '</div>';
 
 		// Table to see/enter balance
-		if (($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1') || $action == 'close')
-		{
+		if (($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1') || $action == 'close') {
 			$posmodule = GETPOST('posmodule', 'alpha');
 			$terminalid = GETPOST('posnumber', 'alpha');
 
@@ -511,10 +512,10 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			$i = 0;
 			foreach ($arrayofpaymentmode as $key => $val)
 			{
-			    print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
-			    print $theoricalnbofinvoiceforterminal[$terminalid][$key];
-			    print '</td>';
-			    $i++;
+				print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
+				print $theoricalnbofinvoiceforterminal[$terminalid][$key];
+				print '</td>';
+				$i++;
 			}
 			// Save
 			print '<td align="center"></td>';
@@ -545,13 +546,16 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			// Initial amount
 			print '<td class="center">';
 			print '<input ';
-			if ($action == 'close') print 'disabled '; // To close cash user can't set opening cash
+			if ($action == 'close') {
+				print 'disabled '; // To close cash user can't set opening cash
+			}
 			print 'name="opening" type="text" class="maxwidth100 center" value="';
-			if ($action == 'close')
-			{
+			if ($action == 'close') {
 				$object->fetch($id);
 				print $object->opening;
-			} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+			} else {
+				print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+			}
 			print '">';
 			print '</td>';
 			// Amount per payment type
@@ -568,8 +572,11 @@ if ($action == "create" || $action == "start" || $action == 'close')
 			// Save
 			print '<td class="center">';
 			print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
-			if ($action == 'start') print '<input type="submit" name="add" class="button button-save" value="'.$langs->trans("Save").'">';
-			elseif ($action == 'close') print '<input type="submit" name="valid" class="button" value="'.$langs->trans("Validate").'">';
+			if ($action == 'start') {
+				print '<input type="submit" name="add" class="button button-save" value="'.$langs->trans("Save").'">';
+			} elseif ($action == 'close') {
+				print '<input type="submit" name="valid" class="button" value="'.$langs->trans("Validate").'">';
+			}
 			print '</td>';
 			print '</tr>';
 
@@ -581,8 +588,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 	}
 }
 
-if (empty($action) || $action == "view" || $action == "close")
-{
+if (empty($action) || $action == "view" || $action == "close") {
 	$result = $object->fetch($id);
 
 	llxHeader('', $langs->trans("CashControl"));
@@ -648,8 +654,7 @@ if (empty($action) || $action == "view" || $action == "close")
 		print '<tr><td valign="middle">'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td><td>';
 		print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency);
 		print "</td></tr>";
-		foreach ($arrayofpaymentmode as $key => $val)
-		{
+		foreach ($arrayofpaymentmode as $key => $val) {
 			print '<tr><td valign="middle">'.$langs->trans($val).'</td><td>';
 			print price($object->$key, 0, $langs, 1, -1, -1, $conf->currency);
 			print "</td></tr>";
@@ -667,8 +672,7 @@ if (empty($action) || $action == "view" || $action == "close")
 
 			print '<div class="inline-block divButAction"><a target="_blank" class="butAction" href="report.php?id='.$id.'">'.$langs->trans('PrintTicket').'</a></div>';
 
-			if ($object->status == CashControl::STATUS_DRAFT)
-			{
+			if ($object->status == CashControl::STATUS_DRAFT) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=close&amp;contextpage='.$contextpage.'">'.$langs->trans('Close').'</a></div>';
 
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&amp;action=confirm_delete">'.$langs->trans('Delete').'</a></div>';
@@ -678,16 +682,18 @@ if (empty($action) || $action == "view" || $action == "close")
 
 			print '</div>';
 
-			if ($contextpage != 'takepos') print '<center><iframe src="report.php?id='.$id.'" width="60%" height="800"></iframe></center>';
+			if ($contextpage != 'takepos') {
+				print '<center><iframe src="report.php?id='.$id.'" width="60%" height="800"></iframe></center>';
+			}
 		} else {
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formclose">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			if ($contextpage == 'takepos') print '<input type="hidden" name="contextpage" value="takepos">';
-			if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
-			{
+			if ($contextpage == 'takepos') {
+				print '<input type="hidden" name="contextpage" value="takepos">';
+			}
+			if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1') {
 				print '<input type="hidden" name="action" value="add">';
-			} elseif ($action == 'close')
-			{
+			} elseif ($action == 'close') {
 				print '<input type="hidden" name="action" value="valid">';
 				print '<input type="hidden" name="id" value="'.$id.'">';
 			} else {
@@ -695,59 +701,58 @@ if (empty($action) || $action == "view" || $action == "close")
 			}
 
 			/*
-	    	print '<div class="div-table-responsive-no-min">';
-	    	print '<table class="noborder centpercent">';
-	    	print '<tr class="liste_titre">';
-	    	print '<td>'.$langs->trans("Module").'</td>';
-	    	print '<td>'.$langs->trans("Terminal").'</td>';
-	    	print '<td>'.$langs->trans("Year").'</td>';
-	    	print '<td>'.$langs->trans("Month").'</td>';
-	    	print '<td>'.$langs->trans("Day").'</td>';
-	    	print '<td></td>';
-	    	print "</tr>\n";
+			print '<div class="div-table-responsive-no-min">';
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("Module").'</td>';
+			print '<td>'.$langs->trans("Terminal").'</td>';
+			print '<td>'.$langs->trans("Year").'</td>';
+			print '<td>'.$langs->trans("Month").'</td>';
+			print '<td>'.$langs->trans("Day").'</td>';
+			print '<td></td>';
+			print "</tr>\n";
 
-	    	$disabled = 1;
-	    	$prefix = 'close';
+			$disabled = 1;
+			$prefix = 'close';
 
-	    	print '<tr class="oddeven">';
-	    	print '<td>'.$form->selectarray('posmodulebis', $arrayofposavailable, $object->posmodule, (count($arrayofposavailable) > 1 ? 1 : 0), 0, 0, '', 0, 0, $disabled).'</td>';
-	    	print '<input type="hidden" name="posmodule" value="'.$object->posmodule.'">';
-	    	print '<td>';
+			print '<tr class="oddeven">';
+			print '<td>'.$form->selectarray('posmodulebis', $arrayofposavailable, $object->posmodule, (count($arrayofposavailable) > 1 ? 1 : 0), 0, 0, '', 0, 0, $disabled).'</td>';
+			print '<input type="hidden" name="posmodule" value="'.$object->posmodule.'">';
+			print '<td>';
 
-	    	$array = array();
-	    	$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
-	    	for($i = 1; $i <= $numterminals; $i++) {
-	    		$array[$i] = $i;
-	    	}
-	    	$selectedposnumber = $object->posnumber; $showempty = 1;
-	    	//print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ?GETPOST('posnumber', 'int') : $selectedposnumber, $showempty, 0, 0, '', 0, 0, $disabled);
-	    	print '<input name="posnumberbis" disabled="disabled" type="text" class="maxwidth50" value="'.$object->posnumber.'">';
-	    	print '<input type="hidden" name="posnumber" value="'.$object->posmodule.'">';
-	    	print '</td>';
-	    	// Year
-	    	print '<td>';
-	    	print '<input name="yearbis" disabled="disabled" type="text" class="maxwidth50" value="'.$object->year_close.'">';
-	    	print '<input type="hidden" name="year_close" value="'.$object->year_close.'">';
-	    	print '</td>';
-	    	// Month
-	    	print '<td>';
-	    	print '<input name="monthbis" disabled="disabled" type="text" class="maxwidth50" value="'.$object->month_close.'">';
-	    	print '<input type="hidden" name="month_close" value="'.$object->month_close.'">';
-	    	print '</td>';
-	    	// Day
-	    	print '<td>';
-	    	print '<input name="daybis" disabled="disabled" type="text" class="maxwidth50" value="'.$object->date_close.'">';
-	    	print '<input type="hidden" name="day_close" value="'.$object->date_close.'">';
-	    	print '</td>';
+			$array = array();
+			$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
+			for($i = 1; $i <= $numterminals; $i++) {
+				$array[$i] = $i;
+			}
+			$selectedposnumber = $object->posnumber; $showempty = 1;
+			//print $form->selectarray('posnumber', $array, GETPOSTISSET('posnumber') ?GETPOST('posnumber', 'int') : $selectedposnumber, $showempty, 0, 0, '', 0, 0, $disabled);
+			print '<input name="posnumberbis" disabled="disabled" type="text" class="maxwidth50" value="'.$object->posnumber.'">';
+			print '<input type="hidden" name="posnumber" value="'.$object->posmodule.'">';
+			print '</td>';
+			// Year
+			print '<td>';
+			print '<input name="yearbis" disabled="disabled" type="text" class="maxwidth50" value="'.$object->year_close.'">';
+			print '<input type="hidden" name="year_close" value="'.$object->year_close.'">';
+			print '</td>';
+			// Month
+			print '<td>';
+			print '<input name="monthbis" disabled="disabled" type="text" class="maxwidth50" value="'.$object->month_close.'">';
+			print '<input type="hidden" name="month_close" value="'.$object->month_close.'">';
+			print '</td>';
+			// Day
+			print '<td>';
+			print '<input name="daybis" disabled="disabled" type="text" class="maxwidth50" value="'.$object->date_close.'">';
+			print '<input type="hidden" name="day_close" value="'.$object->date_close.'">';
+			print '</td>';
 
 			print '<td></td>';
-	    	print '</table>';
-	    	print '</div>';
-	    	*/
+			print '</table>';
+			print '</div>';
+			*/
 
 			// Table to see/enter balance
-			if (($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1') || $action == 'close')
-			{
+			if (($action == 'start' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '' && GETPOST('posnumber') != '-1') || $action == 'close') {
 				$posmodule = $object->posmodule;
 				$terminalid = $object->posnumber;
 
@@ -774,8 +779,7 @@ if (empty($action) || $action == "view" || $action == "close")
 				//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
 				print '</td>';
 				$i = 0;
-				foreach ($arrayofpaymentmode as $key => $val)
-				{
+				foreach ($arrayofpaymentmode as $key => $val) {
 					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>'.$langs->trans($val);
 					//print '<br>'.$langs->trans("TheoricalAmount").'<br>'.$langs->trans("RealAmount");
 					print '</td>';
@@ -791,8 +795,7 @@ if (empty($action) || $action == "view" || $action == "close")
 				print '</td>';
 				// Amount per payment type
 				$i = 0;
-				foreach ($arrayofpaymentmode as $key => $val)
-				{
+				foreach ($arrayofpaymentmode as $key => $val) {
 					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
 					print $theoricalnbofinvoiceforterminal[$terminalid][$key];
 					print '</td>';
@@ -810,8 +813,7 @@ if (empty($action) || $action == "view" || $action == "close")
 				print '</td>';
 				// Amount per payment type
 				$i = 0;
-				foreach ($arrayofpaymentmode as $key => $val)
-				{
+				foreach ($arrayofpaymentmode as $key => $val) {
 					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
 					if ($key == 'cash') {
 						$deltaforcash = ($object->opening - $initialbalanceforterminal[$terminalid]['cash']);
@@ -831,22 +833,26 @@ if (empty($action) || $action == "view" || $action == "close")
 				// Initial amount
 				print '<td class="center">';
 				print '<input ';
-				if ($action == 'close') print 'disabled '; // To close cash user can't set opening cash
+				if ($action == 'close') {
+					print 'disabled '; // To close cash user can't set opening cash
+				}
 				print 'name="opening" type="text" class="maxwidth100 center" value="';
-				if ($action == 'close')
-				{
+				if ($action == 'close') {
 					$object->fetch($id);
 					print $object->opening;
-				} else print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+				} else {
+					print (GETPOSTISSET('opening') ?price2num(GETPOST('opening', 'alpha')) : price($initialbalanceforterminal[$terminalid]['cash']));
+				}
 				print '">';
 				print '</td>';
 				// Amount per payment type
 				$i = 0;
-				foreach ($arrayofpaymentmode as $key => $val)
-				{
+				foreach ($arrayofpaymentmode as $key => $val) {
 					print '<td align="center"'.($i == 0 ? ' class="hide0"' : '').'>';
 					print '<input ';
-					if ($action == 'start') print 'disabled '; // To start cash user only can set opening cash
+					if ($action == 'start') {
+						print 'disabled '; // To start cash user only can set opening cash
+					}
 					print 'name="'.$key.'_amount" type="text"'.($key == 'cash' ? ' autofocus' : '').' class="maxwidth100 center" value="'.GETPOST($key.'_amount', 'alpha').'">';
 					print '</td>';
 					$i++;
@@ -854,8 +860,11 @@ if (empty($action) || $action == "view" || $action == "close")
 				// Save
 				print '<td class="center">';
 				print '<input type="submit" name="cancel" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
-				if ($action == 'start') print '<input type="submit" name="add" class="button button-save" value="'.$langs->trans("Save").'">';
-				elseif ($action == 'close') print '<input type="submit" name="valid" class="button" value="'.$langs->trans("Close").'">';
+				if ($action == 'start') {
+					print '<input type="submit" name="add" class="button button-save" value="'.$langs->trans("Save").'">';
+				} elseif ($action == 'close') {
+					print '<input type="submit" name="valid" class="button" value="'.$langs->trans("Close").'">';
+				}
 				print '</td>';
 				print '</tr>';
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index c6431143a98..a301caff80f 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -66,7 +66,9 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -85,13 +87,16 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Security check
 $socid = 0;
-if ($user->socid > 0)	// Protection if external user
-{
+if ($user->socid > 0) {	// Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
@@ -100,24 +105,27 @@ if ($user->socid > 0)	// Protection if external user
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 }
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach ($object->fields as $key => $val)
-{
-	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+foreach ($object->fields as $key => $val) {
+	if ($val['searchall']) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
 }
 
 // Definition of fields for list
 $arrayfields = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
-	if (!empty($val['visible'])) $arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	if (!empty($val['visible'])) {
+		$arrayfields['t.'.$key] = array('label'=>$val['label'], 'checked'=>(($val['visible'] < 0) ? 0 : 1), 'enabled'=>$val['enabled'], 'position'=>$val['position']);
+	}
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -131,31 +139,33 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// 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
-	{
-		foreach ($object->fields as $key => $val)
-		{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 		}
 		$toselect = '';
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -187,14 +197,14 @@ $title = $langs->trans('CashControl');
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$sql .= 't.'.$key.', ';
 }
 // 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.', ' : '');
+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();
@@ -202,16 +212,26 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/, $/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
-if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
-else $sql .= " WHERE 1 = 1";
-foreach ($search as $key => $val)
-{
-	if ($key == 'status' && $search[$key] == -1) continue;
-	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+if ($object->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
+foreach ($search as $key => $val) {
+	if ($key == 'status' && $search[$key] == -1) {
+		continue;
+	}
+	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+	if ($search[$key] != '') {
+		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	}
+}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -239,26 +259,22 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
-{
+if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
 	$num = $nbtotalofrecords;
 } else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		exit;
 	}
@@ -267,8 +283,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
 }
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/compta/cashcontrol/cashcontrol_card.php', 1).'?id='.$id);
@@ -299,13 +314,18 @@ jQuery(document).ready(function() {
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-foreach ($search as $key => $val)
-{
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
 	$param .= '&search_'.$key.'='.urlencode($search[$key]);
 }
-if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -315,11 +335,15 @@ $arrayofmassactions = array(
 //'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if ($user->rights->monmodule->delete) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-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">';
@@ -340,9 +364,10 @@ $objecttmp = new CashControl($db);
 $trackid = 'cashfence'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($sall) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -353,11 +378,13 @@ $moreforfilter = '';
 
 $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))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -374,18 +401,24 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		else print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} else {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		}
 		print '</td>';
 	}
 }
@@ -407,15 +440,18 @@ print '</tr>'."\n";
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
 }
@@ -431,11 +467,11 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
-{
-	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 (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+	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
+		}
 	}
 }
 
@@ -444,42 +480,57 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
 	// Store properties in $object
 	$object->id = $obj->rowid;
-	foreach ($object->fields as $key => $val)
-	{
-		if (property_exists($obj, $key)) $object->$key = $obj->$key;
+	foreach ($object->fields as $key => $val) {
+		if (property_exists($obj, $key)) {
+			$object->$key = $obj->$key;
+		}
 	}
 
 	// Show here line of result
 	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val)
-	{
+	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
 
-		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
 
-		if (!empty($arrayfields['t.'.$key]['checked']))
-		{
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') print $object->getLibStatut(5);
-			elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
-			else print $object->showOutputField($val, $key, $obj->$key, '');
+			if ($key == 'status') {
+				print $object->getLibStatut(5);
+			} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+				print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+			} else {
+				print $object->showOutputField($val, $key, $obj->$key, '');
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!empty($val['isameasure']))
-			{
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!empty($val['isameasure'])) {
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $obj->$key;
 			}
 		}
@@ -492,14 +543,17 @@ while ($i < min($num, $limit))
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap" align="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->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>';
 
@@ -511,10 +565,13 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 
 // If no record found
-if ($num == 0)
-{
+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>';
 }
 
@@ -529,10 +586,11 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
-{
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 842322f7f20..fd6d7d9fa25 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -136,9 +136,15 @@ class CashControl extends CommonObject
 		$error = 0;
 
 		// Clean data
-		if (empty($this->cash)) $this->cash = 0;
-		if (empty($this->cheque)) $this->cheque = 0;
-		if (empty($this->card)) $this->card = 0;
+		if (empty($this->cash)) {
+			$this->cash = 0;
+		}
+		if (empty($this->cheque)) {
+			$this->cheque = 0;
+		}
+		if (empty($this->card)) {
+			$this->card = 0;
+		}
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."pos_cash_fence (";
@@ -216,8 +222,7 @@ class CashControl extends CommonObject
 		$error = 0;
 
 		// Protection
-		if ($this->status == self::STATUS_VALIDATED)
-		{
+		if ($this->status == self::STATUS_VALIDATED) {
 			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
 			return 0;
 		}
@@ -256,11 +261,12 @@ class CashControl extends CommonObject
 			$this->fk_user_valid = $user->id;
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('CASHCONTROL_VALIDATE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -340,8 +346,7 @@ class CashControl extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[0] = $langs->trans('Draft');
@@ -351,7 +356,9 @@ class CashControl extends CommonObject
 		}
 
 		$statusType = 'status0';
-		if ($status == self::STATUS_VALIDATED) $statusType = 'status6';
+		if ($status == self::STATUS_VALIDATED) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -370,7 +377,9 @@ class CashControl extends CommonObject
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -382,19 +391,20 @@ class CashControl extends CommonObject
 
 		$url = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -402,20 +412,26 @@ class CashControl extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-		     $hookmanager->initHooks(array('myobjectdao'));
-		     $parameters=array('id'=>$this->id);
-		     $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-		     if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-		     */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+			 $hookmanager->initHooks(array('myobjectdao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 32a7e9bede5..8f85f5779a0 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -29,8 +29,12 @@
  *	\brief      List of bank transactions
  */
 
-if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1'); // Disable browser notification
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1'); // Disable browser notification
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
@@ -120,10 +124,15 @@ else
 	dol_print_error('Value for key = '.$key.' not supported');
 	exit;
 }*/
-if ($syear && !$smonth)              $sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, 1))."' AND '".$db->idate(dol_get_last_day($syear, 12))."'";
-elseif ($syear && $smonth && !$sday) $sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, $smonth))."' AND '".$db->idate(dol_get_last_day($syear, $smonth))."'";
-elseif ($syear && $smonth && $sday)   $sql .= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
-else dol_print_error('', 'Year not defined');
+if ($syear && !$smonth) {
+	$sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, 1))."' AND '".$db->idate(dol_get_last_day($syear, 12))."'";
+} elseif ($syear && $smonth && !$sday) {
+	$sql .= " AND datef BETWEEN '".$db->idate(dol_get_first_day($syear, $smonth))."' AND '".$db->idate(dol_get_last_day($syear, $smonth))."'";
+} elseif ($syear && $smonth && $sday) {
+	$sql .= " AND datef BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $smonth, $sday, $syear))."' AND '".$db->idate(dol_mktime(23, 59, 59, $smonth, $sday, $syear))."'";
+} else {
+	dol_print_error('', 'Year not defined');
+}
 
 $resql = $db->query($sql);
 if ($resql) {
@@ -132,8 +141,11 @@ if ($resql) {
 
 	print "<!-- title of cash fence -->\n";
 	print "<center><h2>";
-	if ($cashcontrol->status != $cashcontrol::STATUS_DRAFT) print $langs->trans("CashControl")." ".$cashcontrol->id;
-	else print $langs->trans("CashControl")." - ".$langs->trans("Draft");
+	if ($cashcontrol->status != $cashcontrol::STATUS_DRAFT) {
+		print $langs->trans("CashControl")." ".$cashcontrol->id;
+	} else {
+		print $langs->trans("CashControl")." - ".$langs->trans("Draft");
+	}
 	print "<br>".$langs->trans("DateCreationShort").": ".dol_print_date($cashcontrol->date_creation, 'dayhour');
 	print "</h2></center>";
 
@@ -194,13 +206,17 @@ if ($resql) {
 		print '<td class="nowrap left">';
 		print $invoicetmp->getNomUrl(1);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		// Date ope
 		print '<td class="nowrap left">';
 		print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		// Bank account
 		print '<td class="nowrap right">';
@@ -215,20 +231,30 @@ if ($resql) {
 		} elseif ($objp->code == 'CB') {
 			$bank += $objp->amount;
 		} else {
-			if ($conf->global->$var1 == $bankaccount->id) $cash += $objp->amount;
+			if ($conf->global->$var1 == $bankaccount->id) {
+				$cash += $objp->amount;
+			}
 			//elseif ($conf->global->$var2 == $bankaccount->id) $bank+=$objp->amount;
 			//elseif ($conf->global->$var3 == $bankaccount->id) $cheque+=$objp->amount;
-			else $other += $objp->amount;
+			else {
+				$other += $objp->amount;
+			}
 		}
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		// Type
 		print '<td class="right">';
-	   	print $objp->code;
-	   	if (empty($amountpertype[$objp->code])) $amountpertype[$objp->code] = 0;
+		print $objp->code;
+		if (empty($amountpertype[$objp->code])) {
+			$amountpertype[$objp->code] = 0;
+		}
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 
 		// Debit
 		print '<td class="right">';
@@ -238,8 +264,12 @@ if ($resql) {
 			$amountpertype[$objp->code] += $objp->amount;
 		}
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totaldebfield';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totaldebfield';
+		}
 
 		// Credit
 		print '<td class="right">';
@@ -249,8 +279,12 @@ if ($resql) {
 			$amountpertype[$objp->code] -= $objp->amount;
 		}
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalcredfield';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totalcredfield';
+		}
 
 		print "</tr>";
 
@@ -297,7 +331,7 @@ if ($resql) {
 	$sql = "UPDATE ".MAIN_DB_PREFIX."pos_cash_fence ";
 	$sql .= "SET";
 	$sql .= " cash='".$db->escape($cash)."'";
-    $sql .= ", card='".$db->escape($bank)."'";
+	$sql .= ", card='".$db->escape($bank)."'";
 	$sql .= " where rowid=".$id;
 	$db->query($sql);
 	*/
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 3588dced3f4..4963a24d43d 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -45,13 +45,17 @@ $hookmanager->initHooks(array('specialexpensesindex'));
 $langs->loadLangs(array('compta', 'bills'));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 
 $mode = GETPOST("mode", 'alpha');
 $year = GETPOST("year", 'int');
 $filtre = GETPOST("filtre", 'alpha');
-if (!$year) { $year = date("Y", time()); }
+if (!$year) {
+	$year = date("Y", time());
+}
 
 $search_account = GETPOST('search_account', 'int');
 
@@ -59,12 +63,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "cs.date_ech";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) {
+	$sortfield = "cs.date_ech";
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
 
 
 /*
@@ -82,16 +92,26 @@ llxHeader('', $langs->trans("SpecialExpensesArea"));
 $title = $langs->trans("SpecialExpensesArea");
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($sortfield) $param .= '&sortfield='.$sortfield;
-if ($sortorder) $param .= '&sortorder='.$sortorder;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.$limit;
+}
+if ($sortfield) {
+	$param .= '&sortfield='.$sortfield;
+}
+if ($sortorder) {
+	$param .= '&sortorder='.$sortorder;
+}
 
 $totalnboflines = 0;
 $num = 0;
 
 print '<form method="POST" 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="sortfield" value="'.$sortfield.'">';
@@ -102,13 +122,14 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 $nav = ($year ? '<a href="index.php?year='.($year - 1).$param.'">'.img_previous($langs->trans("Previous"), 'class="valignbottom"')."</a> ".$langs->trans("Year").' '.$year.' <a href="index.php?year='.($year + 1).$param.'">'.img_next($langs->trans("Next"), 'class="valignbottom"')."</a>" : "");
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'object_payment', 0, $nav, '', $limit, 1);
 
-if ($year) $param .= '&year='.$year;
+if ($year) {
+	$param .= '&year='.$year;
+}
 
 print '<span class="opacitymedium">'.$langs->trans("DescTaxAndDividendsArea").'</span><br>';
 print "<br>";
 
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
-{
+if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 	// Social contributions only
 	print load_fiche_titre($langs->trans("SocialContributionsPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
 
@@ -121,7 +142,9 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-	if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+	if (!empty($conf->banque->enabled)) {
+		print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+	}
 	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 	print "</tr>\n";
 
@@ -138,8 +161,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 	$sql .= " WHERE cs.fk_type = c.id";
 	$sql .= " AND cs.entity IN (".getEntity("tax").")";
-	if ($year > 0)
-	{
+	if ($year > 0) {
 		$sql .= " AND (";
 		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
 		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
@@ -147,27 +169,29 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		$sql .= " OR (cs.periode IS NULL AND cs.date_ech between '".$db->idate(dol_get_first_day($year))."' AND '".$db->idate(dol_get_last_day($year))."')";
 		$sql .= ")";
 	}
-	if (preg_match('/^cs\./', $sortfield) || preg_match('/^c\./', $sortfield) || preg_match('/^pc\./', $sortfield) || preg_match('/^pct\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+	if (preg_match('/^cs\./', $sortfield) || preg_match('/^c\./', $sortfield) || preg_match('/^pc\./', $sortfield) || preg_match('/^pct\./', $sortfield)) {
+		$sql .= $db->order($sortfield, $sortorder);
+	}
 	//$sql.= $db->plimit($limit+1,$offset);
 	//print $sql;
 
 	dol_syslog("compta/charges/index.php: select payment", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 		$total = 0;
 		$totalnb = 0;
 		$totalpaye = 0;
 
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 			print '<tr class="oddeven">';
 			// Date
 			$date = $obj->periode;
-			if (empty($date)) $date = $obj->date_ech;
+			if (empty($date)) {
+				$date = $obj->date_ech;
+			}
 			print '<td>'.dol_print_date($date, 'day').'</td>';
 			// Label
 			print '<td>';
@@ -188,14 +212,14 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
 			// Type payment
 			print '<td>';
-			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			if ($obj->payment_code) {
+				print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			}
 			print $obj->num_payment.'</td>';
 			// Account
-			if (!empty($conf->banque->enabled))
-			{
+			if (!empty($conf->banque->enabled)) {
 				print '<td>';
-				if ($obj->fk_bank > 0)
-				{
+				if ($obj->fk_bank > 0) {
 					//$accountstatic->fetch($obj->fk_bank);
 					$accountstatic->id = $obj->bid;
 					$accountstatic->ref = $obj->bref;
@@ -204,12 +228,16 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 					$accountstatic->accountancy_journal = $obj->accountancy_journal;
 					$accountstatic->label = $obj->blabel;
 					print $accountstatic->getNomUrl(1);
-				} else print '&nbsp;';
+				} else {
+					print '&nbsp;';
+				}
 				print '</td>';
 			}
 			// Paid
 			print '<td class="right">';
-			if ($obj->totalpaye) print price($obj->totalpaye);
+			if ($obj->totalpaye) {
+				print price($obj->totalpaye);
+			}
 			print '</td>';
 			print '</tr>';
 
@@ -223,7 +251,9 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		print '<td align="center" class="liste_total">&nbsp;</td>';
 		print '<td align="center" class="liste_total">&nbsp;</td>';
 		print '<td align="center" class="liste_total">&nbsp;</td>';
-		if (!empty($conf->banque->enabled)) print '<td></td>';
+		if (!empty($conf->banque->enabled)) {
+			print '<td></td>';
+		}
 		print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
 	} else {
@@ -233,8 +263,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 }
 
 // VAT
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
-{
+if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 	print "<br>";
 
 	$tva = new Tva($db);
@@ -249,17 +278,17 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pv.fk_typepayment = pct.id";
 	$sql .= " WHERE pv.entity IN (".getEntity("tax").")";
-	if ($year > 0)
-	{
+	if ($year > 0) {
 		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
 		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
 		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
 	}
-	if (preg_match('/^pv\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+	if (preg_match('/^pv\./', $sortfield)) {
+		$sql .= $db->order($sortfield, $sortorder);
+	}
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
 		$total = 0;
@@ -271,12 +300,13 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pv.rowid", "", $param, '', $sortfield, $sortorder);
 		print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'align="center"', $sortfield, $sortorder);
 		print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-		if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+		if (!empty($conf->banque->enabled)) {
+			print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+		}
 		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 		print "</tr>\n";
 		$var = 1;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
 			$total = $total + $obj->amount;
@@ -299,15 +329,15 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 
 			// Type payment
 			print '<td>';
-			if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			if ($obj->payment_code) {
+				print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			}
 			print $obj->num_payment.'</td>';
 
 			// Account
-			if (!empty($conf->banque->enabled))
-			{
+			if (!empty($conf->banque->enabled)) {
 				print '<td>';
-				if ($obj->fk_bank > 0)
-				{
+				if ($obj->fk_bank > 0) {
 					//$accountstatic->fetch($obj->fk_bank);
 					$accountstatic->id = $obj->bid;
 					$accountstatic->ref = $obj->bref;
@@ -316,7 +346,9 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 					$accountstatic->accountancy_journal = $obj->accountancy_journal;
 					$accountstatic->label = $obj->blabel;
 					print $accountstatic->getNomUrl(1);
-				} else print '&nbsp;';
+				} else {
+					print '&nbsp;';
+				}
 				print '</td>';
 			}
 
@@ -343,16 +375,13 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 }
 
 // Localtax
-if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
-{
+if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1") {
 	$j = 1;
 	$numlt = 3;
-} elseif ($mysoc->localtax1_assuj == "1")
-{
+} elseif ($mysoc->localtax1_assuj == "1") {
 	$j = 1;
 	$numlt = 2;
-} elseif ($mysoc->localtax2_assuj == "1")
-{
+} elseif ($mysoc->localtax2_assuj == "1") {
 	$j = 2;
 	$numlt = 3;
 } else {
@@ -360,8 +389,7 @@ if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
 	$numlt = 0;
 }
 
-while ($j < $numlt)
-{
+while ($j < $numlt) {
 	print "<br>";
 
 	$tva = new Tva($db);
@@ -372,17 +400,17 @@ while ($j < $numlt)
 	$sql = "SELECT pv.rowid, pv.amount, pv.label, pv.datev as dm, pv.datep as dp";
 	$sql .= " FROM ".MAIN_DB_PREFIX."localtax as pv";
 	$sql .= " WHERE pv.entity = ".$conf->entity." AND localtaxtype = ".$j;
-	if ($year > 0)
-	{
+	if ($year > 0) {
 		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
 		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
 		$sql .= " AND pv.datev between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
 	}
-	if (preg_match('/^pv/', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+	if (preg_match('/^pv/', $sortfield)) {
+		$sql .= $db->order($sortfield, $sortorder);
+	}
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
 		$total = 0;
@@ -396,8 +424,7 @@ while ($j < $numlt)
 		print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 		print "</tr>\n";
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
 			$total = $total + $obj->amount;
@@ -441,107 +468,107 @@ while ($j < $numlt)
 /*
 if (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read))
 {
-        $sal = new PaymentSalary($db);
+		$sal = new PaymentSalary($db);
 
-        print "<br>";
+		print "<br>";
 
-        print load_fiche_titre($langs->trans("SalariesPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
+		print load_fiche_titre($langs->trans("SalariesPayments").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
 
-        $sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, s.fk_bank, u.salary as current_salary,";
+		$sql = "SELECT s.rowid, s.amount, s.label, s.datep as datep, s.datev as datev, s.datesp, s.dateep, s.salary, s.fk_bank, u.salary as current_salary,";
 		$sql .= " pct.code as payment_code,";
 		$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
-        $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
+		$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as s";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON s.fk_typepayment = pct.id";
 		$sql .= " , ".MAIN_DB_PREFIX."user as u";
-        $sql .= " WHERE s.entity IN (".getEntity('user').")";
-        $sql .= " AND u.rowid = s.fk_user";
-        if ($year > 0)
-        {
-            $sql .= " AND (s.datesp between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
-            $sql .= " OR s.dateep between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."')";
-        }
-        if (preg_match('/^s\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+		$sql .= " WHERE s.entity IN (".getEntity('user').")";
+		$sql .= " AND u.rowid = s.fk_user";
+		if ($year > 0)
+		{
+			$sql .= " AND (s.datesp between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."'";
+			$sql .= " OR s.dateep between '".$db->idate(dol_get_first_day($year, 1, false))."' AND '".$db->idate(dol_get_last_day($year, 12, false))."')";
+		}
+		if (preg_match('/^s\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
 
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $num = $db->num_rows($result);
-            $i = 0;
-            $total = 0;
-            print '<table class="noborder centpercent">';
-            print '<tr class="liste_titre">';
-            print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "s.dateep", "", $param, 'width="140px"', $sortfield, $sortorder);
-            print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, '', $sortfield, $sortorder);
-            print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "s.rowid", "", $param, '', $sortfield, $sortorder);
-            print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep", "", $param, 'align="center"', $sortfield, $sortorder);
+		$result = $db->query($sql);
+		if ($result)
+		{
+			$num = $db->num_rows($result);
+			$i = 0;
+			$total = 0;
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre">';
+			print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "s.dateep", "", $param, 'width="140px"', $sortfield, $sortorder);
+			print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "s.label", "", $param, '', $sortfield, $sortorder);
+			print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "s.rowid", "", $param, '', $sortfield, $sortorder);
+			print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "s.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 			print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
 			if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-            print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-            print "</tr>\n";
+			print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "s.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+			print "</tr>\n";
 
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($result);
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($result);
 
-                $total = $total + $obj->amount;
+				$total = $total + $obj->amount;
 
 
-                print '<tr class="oddeven">';
+				print '<tr class="oddeven">';
 
-                print '<td class="left">'.dol_print_date($db->jdate($obj->dateep), 'day').'</td>'."\n";
+				print '<td class="left">'.dol_print_date($db->jdate($obj->dateep), 'day').'</td>'."\n";
 
-                print "<td>".$obj->label."</td>\n";
+				print "<td>".$obj->label."</td>\n";
 
-                // Ref payment
-                $sal_static->id = $obj->rowid;
-                $sal_static->ref = $obj->rowid;
-                print '<td class="left">'.$sal_static->getNomUrl(1)."</td>\n";
+				// Ref payment
+				$sal_static->id = $obj->rowid;
+				$sal_static->ref = $obj->rowid;
+				print '<td class="left">'.$sal_static->getNomUrl(1)."</td>\n";
 
-                // Date
-                print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
+				// Date
+				print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
 
-            	// Type payment
-	    	    print '<td>';
-	    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
-	    	    print $obj->num_payment.'</td>';
+				// Type payment
+				print '<td>';
+				if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+				print $obj->num_payment.'</td>';
 
-		    	// Account
-		    	if (!empty($conf->banque->enabled))
-			    {
-			        print '<td>';
-			        if ($obj->fk_bank > 0)
-			        {
-			        	//$accountstatic->fetch($obj->fk_bank);
-			            $accountstatic->id = $obj->bid;
-			            $accountstatic->ref = $obj->bref;
-			            $accountstatic->number = $obj->bnumber;
-			            $accountstatic->accountancy_number = $obj->account_number;
-			            $accountstatic->accountancy_journal = $obj->accountancy_journal;
-			            $accountstatic->label = $obj->blabel;
-			            print $accountstatic->getNomUrl(1);
-			        } else print '&nbsp;';
-			        print '</td>';
-			    }
+				// Account
+				if (!empty($conf->banque->enabled))
+				{
+					print '<td>';
+					if ($obj->fk_bank > 0)
+					{
+						//$accountstatic->fetch($obj->fk_bank);
+						$accountstatic->id = $obj->bid;
+						$accountstatic->ref = $obj->bref;
+						$accountstatic->number = $obj->bnumber;
+						$accountstatic->accountancy_number = $obj->account_number;
+						$accountstatic->accountancy_journal = $obj->accountancy_journal;
+						$accountstatic->label = $obj->blabel;
+						print $accountstatic->getNomUrl(1);
+					} else print '&nbsp;';
+					print '</td>';
+				}
 
-                // Paid
-                print '<td class="right">'.price($obj->amount)."</td>";
-                print "</tr>\n";
+				// Paid
+				print '<td class="right">'.price($obj->amount)."</td>";
+				print "</tr>\n";
 
-                $i++;
-            }
-            print '<tr class="liste_total"><td colspan="6">'.$langs->trans("Total").'</td>';
-            print '<td class="right">'.price($total)."</td>";
-            print "</tr>";
+				$i++;
+			}
+			print '<tr class="liste_total"><td colspan="6">'.$langs->trans("Total").'</td>';
+			print '<td class="right">'.price($total)."</td>";
+			print "</tr>";
 
-            print "</table>";
-            $db->free($result);
+			print "</table>";
+			$db->free($result);
 
-            print "<br>";
-        } else {
-            dol_print_error($db);
-        }
+			print "<br>";
+		} else {
+			dol_print_error($db);
+		}
 }
 */
 
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index 1b4e86bbb4c..191038ed28a 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -30,14 +30,14 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 $action = GETPOST('action', 'aZ09');
 
 // Secrutiy check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
 
-if (!$user->rights->facture->lire)
-accessforbidden();
+if (!$user->rights->facture->lire) {
+	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->load("companies");
@@ -48,12 +48,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "nom";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "nom";
+}
 
 
 /*
@@ -64,14 +70,12 @@ llxHeader();
 
 $thirdpartystatic = new Societe($db);
 
-if ($action == 'note')
-{
+if ($action == 'note') {
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET note='".$db->escape($note)."' WHERE rowid=".$socid;
 	$result = $db->query($sql);
 }
 
-if ($mode == 'search')
-{
+if ($mode == 'search') {
 	$resql = $db->query($sql);
 	if ($resql) {
 		if ($db->num_rows($resql) == 1) {
@@ -90,40 +94,39 @@ if ($mode == 'search')
 
 $sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
 $sql .= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", sc.fk_soc, sc.fk_user ";
+}
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE s.fk_stcomm = st.id AND s.client in (1, 3)";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if (dol_strlen($stcomm))
-{
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if (dol_strlen($stcomm)) {
 	$sql .= " AND s.fk_stcomm=".$stcomm;
 }
-if ($socname)
-{
+if ($socname) {
 	$sql .= natural_search("s.nom", $socname);
 	$sortfield = "s.nom";
 	$sortorder = "ASC";
 }
-if ($_GET["search_nom"])
-{
+if ($_GET["search_nom"]) {
 	$sql .= natural_search("s.nom", GETPOST("search_nom"));
 }
-if ($_GET["search_compta"])
-{
+if ($_GET["search_compta"]) {
 	$sql .= natural_search("s.code_compta", GETPOST("search_compta"));
 }
-if ($_GET["search_code_client"])
-{
+if ($_GET["search_code_client"]) {
 	$sql .= natural_search("s.code_client", GETPOST("search_code_client"));
 }
-if (dol_strlen($begin))
-{
+if (dol_strlen($begin)) {
 	$sql .= natural_search("s.nom", $begin);
 }
-if ($socid)
-{
+if ($socid) {
 	$sql .= " AND s.rowid = ".$socid;
 }
 $sql .= " ORDER BY $sortfield $sortorder ";
@@ -131,8 +134,7 @@ $sql .= $db->plimit($conf->liste_limit + 1, $offset);
 //print $sql;
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -173,8 +175,7 @@ if ($resql)
 	print '</td>';
 	print "</tr>\n";
 
-	while ($i < min($num, $conf->liste_limit))
-	{
+	while ($i < min($num, $conf->liste_limit)) {
 		$obj = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index f1e34e99985..7ca8a2d591e 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -29,8 +29,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -40,7 +39,9 @@ $langs->load("trips");
 
 // Security check
 $id = GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'deplacement', $id, '');
 
 $action = GETPOST('action', 'aZ09');
@@ -60,48 +61,38 @@ $permissionnote = $user->rights->deplacement->creer; // Used by the include of a
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
-if ($action == 'validate' && $user->rights->deplacement->creer)
-{
+if ($action == 'validate' && $user->rights->deplacement->creer) {
 	$object->fetch($id);
-	if ($object->statut == Deplacement::STATUS_DRAFT)
-	{
+	if ($object->statut == Deplacement::STATUS_DRAFT) {
 		$result = $object->setStatut(1);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-} elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
-{
+} elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer) {
 	$object->fetch($id);
-	if ($object->statut == Deplacement::STATUS_VALIDATED)
-	{
+	if ($object->statut == Deplacement::STATUS_VALIDATED) {
 		$result = $object->setStatut(Deplacement::STATUS_REFUNDED);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-} elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
-{
+} elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer) {
 	$result = $object->delete($id);
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: index.php");
 		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
-} elseif ($action == 'add' && $user->rights->deplacement->creer)
-{
-	if (!GETPOST('cancel', 'alpha'))
-	{
+} elseif ($action == 'add' && $user->rights->deplacement->creer) {
+	if (!GETPOST('cancel', 'alpha')) {
 		$error = 0;
 
 		$object->date = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
@@ -113,28 +104,23 @@ if ($action == 'validate' && $user->rights->deplacement->creer)
 		$object->note_public = GETPOST('note_public', 'alpha');
 		$object->statut = Deplacement::STATUS_DRAFT;
 
-		if (!$object->date)
-		{
+		if (!$object->date) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 			$error++;
 		}
-		if ($object->type == '-1')
-		{
+		if ($object->type == '-1') {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$error++;
 		}
-		if (!($object->fk_user > 0))
-		{
+		if (!($object->fk_user > 0)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Person")), null, 'errors');
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$id = $object->create($user);
 
-			if ($id > 0)
-			{
+			if ($id > 0) {
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
 			} else {
@@ -149,10 +135,8 @@ if ($action == 'validate' && $user->rights->deplacement->creer)
 		exit;
 	}
 } // Update record
-elseif ($action == 'update' && $user->rights->deplacement->creer)
-{
-	if (!GETPOST('cancel', 'alpha'))
-	{
+elseif ($action == 'update' && $user->rights->deplacement->creer) {
+	if (!GETPOST('cancel', 'alpha')) {
 		$result = $object->fetch($id);
 
 		$object->date			= dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
@@ -165,8 +149,7 @@ elseif ($action == 'update' && $user->rights->deplacement->creer)
 
 		$result = $object->update($user);
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
 		} else {
@@ -177,23 +160,26 @@ elseif ($action == 'update' && $user->rights->deplacement->creer)
 		exit;
 	}
 } // Set into a project
-elseif ($action == 'classin' && $user->rights->deplacement->creer)
-{
+elseif ($action == 'classin' && $user->rights->deplacement->creer) {
 	$object->fetch($id);
 	$result = $object->setProject(GETPOST('projectid', 'int'));
-	if ($result < 0) dol_print_error($db, $object->error);
+	if ($result < 0) {
+		dol_print_error($db, $object->error);
+	}
 } // Set fields
-elseif ($action == 'setdated' && $user->rights->deplacement->creer)
-{
+elseif ($action == 'setdated' && $user->rights->deplacement->creer) {
 	$dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
 	$object->fetch($id);
 	$result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
-	if ($result < 0) dol_print_error($db, $object->error);
-} elseif ($action == 'setkm' && $user->rights->deplacement->creer)
-{
+	if ($result < 0) {
+		dol_print_error($db, $object->error);
+	}
+} elseif ($action == 'setkm' && $user->rights->deplacement->creer) {
 	$object->fetch($id);
 	$result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
-	if ($result < 0) dol_print_error($db, $object->error);
+	if ($result < 0) {
+		dol_print_error($db, $object->error);
+	}
 }
 
 
@@ -208,8 +194,7 @@ $form = new Form($db);
 /*
  * Action create
 */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	//WYSIWYG Editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
@@ -258,8 +243,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Private note
-	if (empty($user->socid))
-	{
+	if (empty($user->socid)) {
 		print '<tr>';
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 		print '<td>';
@@ -284,23 +268,19 @@ if ($action == 'create')
 	print '</div>';
 
 	print '</form>';
-} elseif ($id)
-{
+} elseif ($id) {
 	$result = $object->fetch($id);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$head = trip_prepare_head($object);
 
 		print dol_get_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
 
-		if ($action == 'edit' && $user->rights->deplacement->creer)
-		{
+		if ($action == 'edit' && $user->rights->deplacement->creer) {
 			//WYSIWYG Editor
 			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
 			$soc = new Societe($db);
-			if ($object->socid)
-			{
+			if ($object->socid) {
 				$soc->fetch($object->socid);
 			}
 
@@ -355,8 +335,7 @@ if ($action == 'create')
 			print "</td></tr>";
 
 			// Private note
-			if (empty($user->socid))
-			{
+			if (empty($user->socid)) {
 				print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
 				print '<td>';
 
@@ -384,15 +363,16 @@ if ($action == 'create')
 			print '</div>';
 		} else {
 			/*
-             * Confirm delete trip
-             */
-			if ($action == 'delete')
-			{
+			 * Confirm delete trip
+			 */
+			if ($action == 'delete') {
 				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
 			}
 
 			$soc = new Societe($db);
-			if ($object->socid) $soc->fetch($object->socid);
+			if ($object->socid) {
+				$soc->fetch($object->socid);
+			}
 
 			print '<table class="border centpercent">';
 
@@ -436,12 +416,13 @@ if ($action == 'create')
 			// Where
 			print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
 			print '<td>';
-			if ($soc->id) print $soc->getNomUrl(1);
+			if ($soc->id) {
+				print $soc->getNomUrl(1);
+			}
 			print '</td></tr>';
 
 			// Project
-			if (!empty($conf->projet->enabled))
-			{
+			if (!empty($conf->projet->enabled)) {
 				$langs->load('projects');
 				print '<tr>';
 				print '<td>';
@@ -449,16 +430,14 @@ if ($action == 'create')
 				print '<table class="nobordernopadding" width="100%"><tr><td>';
 				print $langs->trans('Project');
 				print '</td>';
-				if ($action != 'classify' && $user->rights->deplacement->creer)
-				{
+				if ($action != 'classify' && $user->rights->deplacement->creer) {
 					print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
 					print img_edit($langs->trans('SetProject'), 1);
 					print '</a></td>';
 				}
 				print '</tr></table>';
 				print '</td><td colspan="3">';
-				if ($action == 'classify')
-				{
+				if ($action == 'classify') {
 					$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
 				} else {
 					$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
@@ -484,43 +463,36 @@ if ($action == 'create')
 			print '</div>';
 
 			/*
-             * Barre d'actions
-             */
+			 * Barre d'actions
+			 */
 
 			print '<div class="tabsAction">';
 
-			if ($object->statut < Deplacement::STATUS_REFUNDED) 	// if not refunded
-			{
-				if ($user->rights->deplacement->creer)
-				{
+			if ($object->statut < Deplacement::STATUS_REFUNDED) { 	// if not refunded
+				if ($user->rights->deplacement->creer) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
 				}
 			}
 
-			if ($object->statut == Deplacement::STATUS_DRAFT) 	// if draft
-			{
-				if ($user->rights->deplacement->creer)
-				{
+			if ($object->statut == Deplacement::STATUS_DRAFT) { 	// if draft
+				if ($user->rights->deplacement->creer) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
 				}
 			}
 
-			if ($object->statut == Deplacement::STATUS_VALIDATED) 	// if validated
-			{
-				if ($user->rights->deplacement->creer)
-				{
+			if ($object->statut == Deplacement::STATUS_VALIDATED) { 	// if validated
+				if ($user->rights->deplacement->creer) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
 				}
 			}
 
-			if ($user->rights->deplacement->supprimer)
-			{
+			if ($user->rights->deplacement->supprimer) {
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 75d2f71284c..1c7a4e75552 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -141,13 +141,11 @@ class Deplacement extends CommonObject
 		global $conf;
 
 		// Check parameters
-		if (empty($this->type) || $this->type < 0)
-		{
+		if (empty($this->type) || $this->type < 0) {
 			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
-		if (empty($this->fk_user) || $this->fk_user < 0)
-		{
+		if (empty($this->fk_user) || $this->fk_user < 0) {
 			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
@@ -181,22 +179,19 @@ class Deplacement extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."deplacement");
 
 			// Call trigger
 			$result = $this->call_trigger('DEPLACEMENT_CREATE', $user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				return -2;
 			}
 			// End call triggers
 
 			$result = $this->update($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -225,19 +220,18 @@ class Deplacement extends CommonObject
 		$this->km = price2num($this->km);
 
 		// Check parameters
-		if (!is_numeric($this->km)) $this->km = 0;
-		if (empty($this->date))
-		{
+		if (!is_numeric($this->km)) {
+			$this->km = 0;
+		}
+		if (empty($this->date)) {
 			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
-		if (empty($this->type) || $this->type < 0)
-		{
+		if (empty($this->type) || $this->type < 0) {
 			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
-		if (empty($this->fk_user) || $this->fk_user < 0)
-		{
+		if (empty($this->fk_user) || $this->fk_user < 0) {
 			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
@@ -259,8 +253,7 @@ class Deplacement extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -282,13 +275,15 @@ class Deplacement extends CommonObject
 		$sql = "SELECT rowid, fk_user, type, fk_statut, km, fk_soc, dated, note_private, note_public, fk_projet as fk_project, extraparams";
 		$sql .= " FROM ".MAIN_DB_PREFIX."deplacement";
 		$sql .= " WHERE entity IN (".getEntity('deplacement').")";
-		if ($ref) $sql .= " AND ref ='".$this->db->escape($ref)."'";
-		else $sql .= " AND rowid = ".$id;
+		if ($ref) {
+			$sql .= " AND ref ='".$this->db->escape($ref)."'";
+		} else {
+			$sql .= " AND rowid = ".$id;
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$obj = $this->db->fetch_object($result);
 
 			$this->id = $obj->rowid;
@@ -326,8 +321,7 @@ class Deplacement extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -362,32 +356,42 @@ class Deplacement extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 2)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 3)
-		{
-			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-		} elseif ($mode == 4)
-		{
-			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 2 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-		} elseif ($mode == 5)
-		{
-			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			elseif ($status == 2 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+		} elseif ($mode == 2) {
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
+			}
+		} elseif ($mode == 3) {
+			if ($status == 0 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 0 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
+			}
+		} elseif ($mode == 5) {
+			if ($status == 0 && !empty($this->statuts_short[$status])) {
+				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
+			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
+				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
+				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+			}
 		}
 	}
 
@@ -410,9 +414,15 @@ class Deplacement extends CommonObject
 		$picto = 'trip';
 
 
-		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result .= ' ';
-		if ($withpicto != 2) $result .= $link.$this->ref.$linkend;
+		if ($withpicto) {
+			$result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result .= ' ';
+		}
+		if ($withpicto != 2) {
+			$result .= $link.$this->ref.$linkend;
+		}
 		return $result;
 	}
 
@@ -435,12 +445,10 @@ class Deplacement extends CommonObject
 
 		dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$ret[$obj->code] = (($langs->trans($obj->code) != $obj->code) ? $langs->trans($obj->code) : $obj->label);
 				$i++;
@@ -468,20 +476,16 @@ class Deplacement extends CommonObject
 		dol_syslog(get_class($this).'::info', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_modif)
-				{
+				if ($obj->fk_user_modif) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modif);
 					$this->user_modification = $muser;
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
index d6ad82a4cbe..bb99b477584 100644
--- a/htdocs/compta/deplacement/class/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/class/deplacementstats.class.php
@@ -64,12 +64,14 @@ class DeplacementStats extends Stats
 
 		$this->where = " fk_statut > 0";
 		$this->where .= " AND entity = ".$conf->entity;
-		if ($this->socid)
-		{
+		if ($this->socid) {
 			$this->where .= " AND fk_soc = ".$this->socid;
 		}
-		if (is_array($this->userid) && count($this->userid) > 0) $this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
-		elseif ($this->userid > 0) $this->where .= ' AND fk_user = '.$this->userid;
+		if (is_array($this->userid) && count($this->userid) > 0) {
+			$this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
+		} elseif ($this->userid > 0) {
+			$this->where .= ' AND fk_user = '.$this->userid;
+		}
 	}
 
 
diff --git a/htdocs/compta/deplacement/document.php b/htdocs/compta/deplacement/document.php
index c1e432f4b1a..dd87a0c67f9 100644
--- a/htdocs/compta/deplacement/document.php
+++ b/htdocs/compta/deplacement/document.php
@@ -43,7 +43,9 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'deplacement', $id, '');
 
 
@@ -52,12 +54,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 $object = new Deplacement($db);
@@ -83,8 +91,7 @@ $form = new Form($db);
 llxHeader("", "", $langs->trans("TripCard"));
 
 
-if ($object->id)
-{
+if ($object->id) {
 	$object->fetch_thirdparty();
 
 	$head = trip_prepare_head($object);
@@ -95,8 +102,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index bcebeb128d0..780835b0c5e 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -32,19 +32,27 @@ $langs->loadLangs(array('companies', 'users', 'trips'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'deplacement', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "d.dated";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "d.dated";
+}
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 
 
@@ -67,17 +75,17 @@ $totalnb = 0;
 $sql = "SELECT count(d.rowid) as nb, sum(d.km) as km, d.type";
 $sql .= " FROM ".MAIN_DB_PREFIX."deplacement as d";
 $sql .= " WHERE d.entity = ".$conf->entity;
-if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
+if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
+	$sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
+}
 $sql .= " GROUP BY d.type";
 $sql .= " ORDER BY d.type";
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 
 		$somme[$objp->type] = $objp->km;
@@ -104,13 +112,11 @@ print '<td colspan="4">'.$langs->trans("Statistics").'</td>';
 print "</tr>\n";
 
 $listoftype = $tripandexpense_static->listOfTypes();
-foreach ($listoftype as $code => $label)
-{
+foreach ($listoftype as $code => $label) {
 	$dataseries[] = array($label, (isset($nb[$code]) ? (int) $nb[$code] : 0));
 }
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print '<tr><td align="center" colspan="4">';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -144,18 +150,25 @@ $langs->load("boxes");
 
 $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, d.rowid, d.dated as date, d.tms as dm, d.km, d.fk_statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."deplacement as d, ".MAIN_DB_PREFIX."user as u";
-if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$user->socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE u.rowid = d.fk_user";
 $sql .= " AND d.entity = ".$conf->entity;
-if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
-if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid) $sql .= " AND d.fk_soc = ".$socid;
+if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
+	$sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
+}
+if (!$user->rights->societe->client->voir && !$user->socid) {
+	$sql .= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($socid) {
+	$sql .= " AND d.fk_soc = ".$socid;
+}
 $sql .= $db->order("d.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$var = false;
 	$num = $db->num_rows($result);
 
@@ -168,14 +181,12 @@ if ($result)
 	print '<td class="right">'.$langs->trans("DateModificationShort").'</td>';
 	print '<td width="16">&nbsp;</td>';
 	print '</tr>';
-	if ($num)
-	{
+	if ($num) {
 		$total_ttc = $totalam = $total = 0;
 
 		$deplacementstatic = new Deplacement($db);
 		$userstatic = new User($db);
-		while ($i < $num && $i < $max)
-		{
+		while ($i < $num && $i < $max) {
 			$obj = $db->fetch_object($result);
 			$deplacementstatic->ref = $obj->rowid;
 			$deplacementstatic->id = $obj->rowid;
@@ -196,7 +207,9 @@ if ($result)
 		print '<tr class="oddeven"><td colspan="2" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 	}
 	print '</table><br>';
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 
 print '</div></div></div>';
diff --git a/htdocs/compta/deplacement/info.php b/htdocs/compta/deplacement/info.php
index 586eac52ee7..e180e104eb4 100644
--- a/htdocs/compta/deplacement/info.php
+++ b/htdocs/compta/deplacement/info.php
@@ -32,7 +32,9 @@ $langs->load("trips");
 
 // Security check
 $id = GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'deplacement', $id, '');
 
 
@@ -42,8 +44,7 @@ $result = restrictedArea($user, 'deplacement', $id, '');
 
 llxHeader();
 
-if ($id)
-{
+if ($id) {
 	$object = new Deplacement($db);
 	$object->fetch($id);
 	$object->info($id);
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index df18b09e2b4..46d17c30e96 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -36,7 +36,9 @@ $langs->loadLangs(array('companies', 'users', 'trips'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'deplacement', '', '');
 
 $search_ref = GETPOST('search_ref', 'int');
@@ -47,19 +49,24 @@ $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "d.dated";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "d.dated";
+}
 
 $year = GETPOST("year");
 $month = GETPOST("month");
 $day = GETPOST("day");
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 	$search_ref = "";
 	$search_name = "";
 	$search_company = "";
@@ -89,20 +96,28 @@ $sql .= " u.lastname, u.firstname"; // Qui
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 $sql .= ", ".MAIN_DB_PREFIX."deplacement as d";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON d.fk_soc = s.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+}
 $sql .= " WHERE d.fk_user = u.rowid";
 $sql .= " AND d.entity = ".$conf->entity;
-if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id." OR d.fk_soc IS NULL) ";
-if ($socid) $sql .= " AND s.rowid = ".$socid;
+if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
+	$sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND (sc.fk_user = ".$user->id." OR d.fk_soc IS NULL) ";
+}
+if ($socid) {
+	$sql .= " AND s.rowid = ".$socid;
+}
 
-if ($search_ref)		$sql .= " AND d.rowid=".$search_ref;
-if ($search_name)
-{
+if ($search_ref) {
+	$sql .= " AND d.rowid=".$search_ref;
+}
+if ($search_name) {
 	$sql .= natural_search('u.lastname', $search_name);
 }
-if ($search_company)
-{
+if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
 $sql .= dolSqlDateFilter("d.dated", $day, $month, $year);
@@ -112,8 +127,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 //print $sql;
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	print_barre_liste($langs->trans("ListOfFees"), $page, $_SERVER["PHP_SELF"], "&socid=$socid", $sortfield, $sortorder, '', $num);
@@ -140,7 +154,9 @@ if ($resql)
 	print '&nbsp;';
 	print '</td>';
 	print '<td class="liste_titre" align="center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	}
 	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
 	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
 	print '</td>';
@@ -159,12 +175,13 @@ if ($resql)
 	print '</td>';
 	print "</tr>\n";
 
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$soc = new Societe($db);
-		if ($obj->socid) $soc->fetch($obj->socid);
+		if ($obj->socid) {
+			$soc->fetch($obj->socid);
+		}
 
 		print '<tr class="oddeven">';
 		// Id
@@ -181,8 +198,11 @@ if ($resql)
 		print $userstatic->getNomUrl(1);
 		print '</td>';
 
-		if ($obj->socid) print '<td>'.$soc->getNomUrl(1).'</td>';
-		else print '<td>&nbsp;</td>';
+		if ($obj->socid) {
+			print '<td>'.$soc->getNomUrl(1).'</td>';
+		} else {
+			print '<td>&nbsp;</td>';
+		}
 
 		print '<td class="right">'.$obj->km.'</td>';
 
diff --git a/htdocs/compta/deplacement/stats/index.php b/htdocs/compta/deplacement/stats/index.php
index 389c8d9408f..4786e2ea1b5 100644
--- a/htdocs/compta/deplacement/stats/index.php
+++ b/htdocs/compta/deplacement/stats/index.php
@@ -33,26 +33,29 @@ $langs->loadLangs(array('trips', 'companies'));
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
-$userid = GETPOST('userid', 'int'); if ($userid < 0) $userid = 0;
-$socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
+$userid = GETPOST('userid', 'int'); if ($userid < 0) {
+	$userid = 0;
+}
+$socid = GETPOST('socid', 'int'); if ($socid < 0) {
+	$socid = 0;
+}
 $id = GETPOST('id', 'int');
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'deplacement', $id, '');
 
 // Other security check
 $childids = $user->getAllChildIds();
 $childids[] = $user->id;
-if ($userid > 0)
-{
-	if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous) && !in_array($userid, $childids))
-	{
+if ($userid > 0) {
+	if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous) && !in_array($userid, $childids)) {
 		accessforbidden();
 		exit;
 	}
@@ -84,10 +87,11 @@ print load_fiche_titre($title, $mesg);
 dol_mkdir($dir);
 
 $useridtofilter = $userid; // Filter from parameters
-if (empty($useridtofilter))
-{
+if (empty($useridtofilter)) {
 	$useridtofilter = $childids;
-	if (!empty($user->rights->deplacement->readall) || !empty($user->rights->deplacement->lire_tous)) $useridtofilter = 0;
+	if (!empty($user->rights->deplacement->readall) || !empty($user->rights->deplacement->lire_tous)) {
+		$useridtofilter = 0;
+	}
 }
 
 $stats = new DeplacementStats($db, $socid, $useridtofilter);
@@ -104,12 +108,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=tripsexpensesstats&amp;file
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -136,12 +138,10 @@ $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=tripsexpensesstats&amp;
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px2->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -162,25 +162,30 @@ if (!$mesg)
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
 } else {
 	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	}
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px3->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -205,7 +210,9 @@ $arrayyears = array();
 foreach ($data as $val) {
 	$arrayyears[$val['year']] = $val['year'];
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 
 $h = 0;
@@ -238,12 +245,16 @@ print '</td></tr>';
 // User
 print '<tr><td>'.$langs->trans("User").'</td><td>';
 $include = '';
-if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $include = 'hierarchy';
+if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
+	$include = 'hierarchy';
+}
 print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'maxwidth300');
 print '</td></tr>';
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
-if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
@@ -262,11 +273,9 @@ print '<td class="center">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	$year = $val['year'];
-	while ($year && $oldyear > $year + 1)
-	{	// If we have empty year
+	while ($year && $oldyear > $year + 1) {	// If we have empty year
 		$oldyear--;
 		print '<tr height="24">';
 		print '<td align="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'&amp;mode='.$mode.'">'.$oldyear.'</a></td>';
@@ -292,7 +301,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index 0e971954d56..b3ca5f5f233 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -38,13 +38,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facture'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -77,8 +81,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -91,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
  *
  */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -104,8 +106,7 @@ if ($action == 'create')
  * Edition of an optional field
  *
  */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	$langs->load("members");
 
 	print "<br>";
diff --git a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
index dbc395e5d65..7d2d2b1df97 100644
--- a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
@@ -39,13 +39,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facture_rec'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -78,8 +82,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -92,8 +95,7 @@ if ($action != 'create' && $action != 'edit')
  *
  */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -105,8 +107,7 @@ if ($action == 'create')
  * Edition of an optional field
  *
  */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	$langs->load("members");
 
 	print "<br>";
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index c07eb3ac2aa..82520c02fac 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -39,13 +39,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facturedet'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -78,8 +82,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -92,8 +95,7 @@ if ($action != 'create' && $action != 'edit')
  *
  */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -105,8 +107,7 @@ if ($action == 'create')
  * Edition d'un champ optionnel
  *
  */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
index 772a3aa680c..5264ee5472c 100644
--- a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
@@ -39,13 +39,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'facturedet_rec'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -78,8 +82,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -92,8 +95,7 @@ if ($action != 'create' && $action != 'edit')
  *
  */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -105,8 +107,7 @@ if ($action == 'create')
  * Edition d'un champ optionnel
  *
  */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index b17cb5b6049..988dea7e45e 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -58,9 +58,13 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'inv
 $id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
 $lineid = GETPOST('lineid', 'int');
 $ref = GETPOST('ref', 'alpha');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $objecttype = 'facture_rec';
-if ($action == "create" || $action == "add") $objecttype = '';
+if ($action == "create" || $action == "add") {
+	$objecttype = '';
+}
 $result = restrictedArea($user, 'facture', $id, $objecttype);
 $projectid = GETPOST('projectid', 'int');
 
@@ -71,19 +75,23 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (!$sortorder) $sortorder = 'DESC';
-if (!$sortfield) $sortfield = 'f.titre';
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
+if (!$sortfield) {
+	$sortfield = 'f.titre';
+}
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 $object = new FactureRec($db);
-if (($id > 0 || $ref) && $action != 'create' && $action != 'add')
-{
+if (($id > 0 || $ref) && $action != 'create' && $action != 'add') {
 	$ret = $object->fetch($id, $ref);
-	if (!$ret)
-	{
+	if (!$ret) {
 		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
 	}
 }
@@ -124,16 +132,23 @@ $error = 0;
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
-	if (GETPOST('cancel', 'alpha')) $action = '';
+if (empty($reshook)) {
+	if (GETPOST('cancel', 'alpha')) {
+		$action = '';
+	}
 
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
@@ -147,17 +162,15 @@ if (empty($reshook))
 
 	// Mass actions
 	/*$objectclass='MyObject';
-    $objectlabel='MyObject';
-    $permissiontoread = $user->rights->mymodule->read;
-    $permissiontodelete = $user->rights->mymodule->delete;
-    $uploaddir = $conf->mymodule->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
+	$objectlabel='MyObject';
+	$permissiontoread = $user->rights->mymodule->read;
+	$permissiontodelete = $user->rights->mymodule->delete;
+	$uploaddir = $conf->mymodule->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
 
 	// Create predefined invoice
-	if ($action == 'add')
-	{
-		if (!GETPOST('title', 'alphanohtml'))
-		{
+	if ($action == 'add') {
+		if (!GETPOST('title', 'alphanohtml')) {
 			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Title")), null, 'errors');
 			$action = "create";
 			$error++;
@@ -172,24 +185,20 @@ if (empty($reshook))
 		$nb_gen_max = GETPOST('nb_gen_max', 'int');
 		//if (empty($nb_gen_max)) $nb_gen_max =0;
 
-		if (GETPOST('frequency', 'int'))
-		{
-			if (empty($reyear) || empty($remonth) || empty($reday))
-			{
+		if (GETPOST('frequency', 'int')) {
+			if (empty($reyear) || empty($remonth) || empty($reday)) {
 				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
 				$action = "create";
 				$error++;
 			}
-			if ($nb_gen_max === '')
-			{
+			if ($nb_gen_max === '') {
 				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("MaxPeriodNumber")), null, 'errors');
 				$action = "create";
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$object->titre = GETPOST('title', 'nohtml'); // deprecated
 			$object->title = GETPOST('title', 'nohtml');
 			$object->note_private = GETPOST('note_private', 'restricthtml');
@@ -208,15 +217,13 @@ if (empty($reshook))
 			$object->date_when = $date_next_execution;
 
 			// Get first contract linked to invoice used to generate template (facid is id of source invoice)
-			if (GETPOST('facid', 'int') > 0)
-			{
+			if (GETPOST('facid', 'int') > 0) {
 				$srcObject = new Facture($db);
 				$srcObject->fetch(GETPOST('facid', 'int'));
 
 				$srcObject->fetchObjectLinked();
 
-				if (!empty($srcObject->linkedObjectsIds['contrat']))
-				{
+				if (!empty($srcObject->linkedObjectsIds['contrat'])) {
 					$contractidid = reset($srcObject->linkedObjectsIds['contrat']);
 
 					$object->origin = 'contrat';
@@ -231,11 +238,9 @@ if (empty($reshook))
 			$oldinvoice->fetch(GETPOST('facid', 'int'));
 
 			$result = $object->create($user, $oldinvoice->id);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result = $oldinvoice->delete($user, 1);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
 					$action = "create";
@@ -246,12 +251,11 @@ if (empty($reshook))
 				$action = "create";
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 
 				header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$object->id);
-	   			exit;
+				exit;
 			} else {
 				$db->rollback();
 
@@ -263,8 +267,7 @@ if (empty($reshook))
 	}
 
 	// Delete
-	if ($action == 'confirm_deleteinvoice' && $confirm == 'yes' && $user->rights->facture->supprimer)
-	{
+	if ($action == 'confirm_deleteinvoice' && $confirm == 'yes' && $user->rights->facture->supprimer) {
 		$object->delete($user);
 
 		header("Location: ".DOL_URL_ROOT.'/compta/facture/invoicetemplate_list.php');
@@ -274,24 +277,19 @@ if (empty($reshook))
 
 	// Update field
 	// Set condition
-	if ($action == 'setconditions' && $user->rights->facture->creer)
-	{
+	if ($action == 'setconditions' && $user->rights->facture->creer) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
 	} // Set mode
-	elseif ($action == 'setmode' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'setmode' && $user->rights->facture->creer) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
 	} // Set project
-	elseif ($action == 'classin' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'classin' && $user->rights->facture->creer) {
 		$object->setProject(GETPOST('projectid', 'int'));
 	} // Set bank account
-	elseif ($action == 'setref' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'setref' && $user->rights->facture->creer) {
 		//var_dump(GETPOST('ref', 'alpha'));exit;
 		$result = $object->setValueFrom('titre', $ref, '', null, 'text', '', $user, 'BILLREC_MODIFY');
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$object->titre = $ref; // deprecated
 			$object->title = $ref;
 			$object->ref = $object->title;
@@ -305,69 +303,58 @@ if (empty($reshook))
 			}
 		}
 	} // Set bank account
-	elseif ($action == 'setbankaccount' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'setbankaccount' && $user->rights->facture->creer) {
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	} // Set frequency and unit frequency
-	elseif ($action == 'setfrequency' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'setfrequency' && $user->rights->facture->creer) {
 		$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
 	} // Set next date of execution
-	elseif ($action == 'setdate_when' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'setdate_when' && $user->rights->facture->creer) {
 		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
-		if (!empty($date)) $object->setNextDate($date);
+		if (!empty($date)) {
+			$object->setNextDate($date);
+		}
 	} // Set max period
-	elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'setnb_gen_max' && $user->rights->facture->creer) {
 		$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
 	} // Set auto validate
-	elseif ($action == 'setauto_validate' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'setauto_validate' && $user->rights->facture->creer) {
 		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
 	} // Set generate pdf
-	elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'setgenerate_pdf' && $user->rights->facture->creer) {
 		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
 	} // Set model pdf
-	elseif ($action == 'setmodelpdf' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'setmodelpdf' && $user->rights->facture->creer) {
 		$object->setModelpdf(GETPOST('modelpdf', 'alpha'));
 	} // Set status disabled
-	elseif ($action == 'disable' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'disable' && $user->rights->facture->creer) {
 		$db->begin();
 
 		$object->fetch($id);
 
 		$res = $object->setValueFrom('suspended', 1);
-		if ($res <= 0)
-		{
+		if ($res <= 0) {
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} // Set status enabled
-	elseif ($action == 'enable' && $user->rights->facture->creer)
-	{
+	elseif ($action == 'enable' && $user->rights->facture->creer) {
 		$db->begin();
 
 		$object->fetch($id);
 
 		$res = $object->setValueFrom('suspended', 0);
-		if ($res <= 0)
-		{
+		if ($res <= 0) {
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -382,8 +369,7 @@ if (empty($reshook))
 	}
 
 	// Delete line
-	if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->facture->creer)
-	{
+	if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->facture->creer) {
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
@@ -394,12 +380,10 @@ if (empty($reshook))
 		// For triggers
 		$line->id = $lineid;
 
-		if ($line->delete($user) > 0)
-		{
+		if ($line->delete($user) > 0) {
 			$result = $object->update_price(1);
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$db->commit();
 				$object->fetch($object->id); // Reload lines
 			} else {
@@ -410,19 +394,18 @@ if (empty($reshook))
 			$db->rollback();
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
-	} elseif ($action == 'update_extras')
-	{
+	} elseif ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $object->insertExtraFields('BILLREC_MODIFY');
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
@@ -430,8 +413,7 @@ if (empty($reshook))
 	}
 
 	// Add a new line
-	if ($action == 'addline' && $user->rights->facture->creer)
-	{
+	if ($action == 'addline' && $user->rights->facture->creer) {
 		$langs->load('errors');
 		$error = 0;
 
@@ -441,8 +423,7 @@ if (empty($reshook))
 		$price_ht = price2num(GETPOST('price_ht'), 'MU');
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU');
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
-		if ($prod_entry_mode == 'free')
-		{
+		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
 		} else {
@@ -457,8 +438,7 @@ if (empty($reshook))
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
 		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line, $predef);
 		// Unset extrafield
-		if (is_array($extralabelsline))
-		{
+		if (is_array($extralabelsline)) {
 			// Get extra fields
 			foreach ($extralabelsline as $key => $value) {
 				unset($_POST["options_".$key.$predef]);
@@ -473,8 +453,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && empty($idprod) && (!($price_ht >= 0) || $price_ht == '')) 	// Unit price can be 0 but not ''
-		{
+		if ($prod_entry_mode == 'free' && empty($idprod) && (!($price_ht >= 0) || $price_ht == '')) { 	// Unit price can be 0 but not ''
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
 			$error++;
 		}
@@ -492,8 +471,7 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if (!$error && ($qty >= 0) && (!empty($product_desc) || !empty($idprod)))
-		{
+		if (!$error && ($qty >= 0) && (!empty($product_desc) || !empty($idprod))) {
 			$ret = $object->fetch($id);
 			if ($ret < 0) {
 				dol_print_error($db, $object->error);
@@ -515,8 +493,7 @@ if (empty($reshook))
 			// Ecrase $tva_tx par celui du produit
 			// Ecrase $base_price_type par celui du produit
 			// Replaces $fk_unit with the product's
-			if (!empty($idprod))
-			{
+			if (!empty($idprod)) {
 				$prod = new Product($db);
 				$prod->fetch($idprod);
 
@@ -525,7 +502,9 @@ if (empty($reshook))
 				// Update if prices fields are defined
 				$tva_tx = get_default_tva($mysoc, $object->thirdparty, $prod->id);
 				$tva_npr = get_default_npr($mysoc, $object->thirdparty, $prod->id);
-				if (empty($tva_tx)) $tva_npr = 0;
+				if (empty($tva_tx)) {
+					$tva_npr = 0;
+				}
 
 				// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
 				$pqp = (GETPOST('pbq', 'int') ? GETPOST('pbq', 'int') : 0);
@@ -543,16 +522,13 @@ if (empty($reshook))
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 				// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
-				if (!empty($price_ht))
-				{
+				if (!empty($price_ht)) {
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
 				} // On reevalue prix selon taux tva car taux tva transaction peut etre different
 				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-				elseif ($tmpvat != $tmpprodvat)
-				{
-					if ($price_base_type != 'HT')
-					{
+				elseif ($tmpvat != $tmpprodvat) {
+					if ($price_base_type != 'HT') {
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
 					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
@@ -562,16 +538,16 @@ if (empty($reshook))
 				$desc = '';
 
 				// Define output language
-				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-				{
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09'))
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
-					if (empty($newlang))
+					}
+					if (empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
-					if (!empty($newlang))
-					{
+					}
+					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
@@ -584,27 +560,42 @@ if (empty($reshook))
 				$desc = dol_concatdesc($desc, $product_desc);
 
 				// Add custom code and origin country into description
-				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code)))
-				{
+				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
 					$tmptxt = '(';
 					// Define output language
 					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 						$outputlangs = $langs;
 						$newlang = '';
-						if (empty($newlang) && GETPOST('lang_id', 'alpha')) $newlang = GETPOST('lang_id', 'alpha');
-						if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
+						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
+							$newlang = GETPOST('lang_id', 'alpha');
+						}
+						if (empty($newlang)) {
+							$newlang = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
 							$outputlangs->load('products');
 						}
-						if (!empty($prod->customcode)) $tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-						if (!empty($prod->customcode) && !empty($prod->country_code)) $tmptxt .= ' - ';
-						if (!empty($prod->country_code)) $tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $outputlangs, 0);
+						if (!empty($prod->customcode)) {
+							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
+						}
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
+							$tmptxt .= ' - ';
+						}
+						if (!empty($prod->country_code)) {
+							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $outputlangs, 0);
+						}
 					} else {
-						if (!empty($prod->customcode)) $tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-						if (!empty($prod->customcode) && !empty($prod->country_code))	$tmptxt .= ' - ';
-						if (!empty($prod->country_code)) $tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $langs, 0);
+						if (!empty($prod->customcode)) {
+							$tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
+						}
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
+							$tmptxt .= ' - ';
+						}
+						if (!empty($prod->country_code)) {
+							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $langs, 0);
+						}
 					}
 					$tmptxt .= ')';
 					$desc = dol_concatdesc($desc, $tmptxt);
@@ -617,7 +608,9 @@ if (empty($reshook))
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 				$tva_tx = str_replace('*', '', $tva_tx);
-				if (empty($tva_tx)) $tva_npr = 0;
+				if (empty($tva_tx)) {
+					$tva_npr = 0;
+				}
 				$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 				$desc = $product_desc;
 				$type = GETPOST('type');
@@ -636,8 +629,9 @@ if (empty($reshook))
 			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
 
 			$info_bits = 0;
-			if ($tva_npr)
+			if ($tva_npr) {
 				$info_bits |= 0x01;
+			}
 
 			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
@@ -646,26 +640,25 @@ if (empty($reshook))
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill, $fournprice, $buyingprice);
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					// Define output language and generate document
 					/*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-	    			{
-	    			    // Define output language
-	    			    $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 = $object->thirdparty->default_lang;
-	    			    if (! empty($newlang)) {
-	    				$outputlangs = new Translate("", $conf);
-	    				$outputlangs->setDefaultLang($newlang);
-	    			    }
-	    			    $model=$object->model_pdf;
-	    			    $ret = $object->fetch($id); // Reload to get new records
+					{
+						// Define output language
+						$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 = $object->thirdparty->default_lang;
+						if (! empty($newlang)) {
+						$outputlangs = new Translate("", $conf);
+						$outputlangs->setDefaultLang($newlang);
+						}
+						$model=$object->model_pdf;
+						$ret = $object->fetch($id); // Reload to get new records
 
-	    			    $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-	    			    if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
-	    			}*/
+						$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+						if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+					}*/
 					$object->fetch($object->id); // Reload lines
 
 					unset($_POST['prod_entry_mode']);
@@ -713,9 +706,10 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
-	{
-		if (!$object->fetch($id) > 0)	dol_print_error($db);
+	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) {
+		if (!$object->fetch($id) > 0) {
+			dol_print_error($db);
+		}
 		$object->fetch_thirdparty();
 
 		// Clean parameters
@@ -731,7 +725,9 @@ if (empty($reshook))
 
 		// Define info_bits
 		$info_bits = 0;
-		if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01;
+		if (preg_match('/\*/', $vat_rate)) {
+			$info_bits |= 0x01;
+		}
 
 		// Define vat_rate
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -747,12 +743,10 @@ if (empty($reshook))
 		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);
 
 		$objectline = new FactureLigneRec($db);
-		if ($objectline->fetch(GETPOST('lineid', 'int')))
-		{
+		if ($objectline->fetch(GETPOST('lineid', 'int'))) {
 			$objectline->array_options = $array_options;
 			$result = $objectline->insertExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($langs->trans('Error').$result, null, 'errors');
 			}
 		}
@@ -760,49 +754,48 @@ if (empty($reshook))
 		$position = ($objectline->rang >= 0 ? $objectline->rang : 0);
 
 		// Unset extrafield
-		if (is_array($extralabelsline))
-		{
+		if (is_array($extralabelsline)) {
 			// Get extra fields
-			foreach ($extralabelsline as $key => $value)
-			{
+			foreach ($extralabelsline as $key => $value) {
 				 unset($_POST["options_".$key]);
 			}
 		}
 
 		// Define special_code for special lines
 		$special_code = GETPOST('special_code', 'int');
-		if (!GETPOST('qty', 'alpha')) $special_code = 3;
+		if (!GETPOST('qty', 'alpha')) {
+			$special_code = 3;
+		}
 
 		/*$line = new FactureLigne($db);
-        $line->fetch(GETPOST('lineid'));
-        $percent = $line->get_prev_progress($object->id);
+		$line->fetch(GETPOST('lineid'));
+		$percent = $line->get_prev_progress($object->id);
 
-        if (GETPOST('progress') < $percent)
-        {
-                $mesg = '<div class="warning">' . $langs->trans("CantBeLessThanMinPercent") . '</div>';
-                setEventMessages($mesg, null, 'warnings');
-                $error++;
-                $result = -1;
-        }*/
+		if (GETPOST('progress') < $percent)
+		{
+				$mesg = '<div class="warning">' . $langs->trans("CantBeLessThanMinPercent") . '</div>';
+				setEventMessages($mesg, null, 'warnings');
+				$error++;
+				$result = -1;
+		}*/
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');
-		if (!empty($productid))
-		{
+		if (!empty($productid)) {
 			$product = new Product($db);
 			$product->fetch($productid);
 
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level))
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min[$object->thirdparty->price_level];
+			}
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
 			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent', 2)) / 100) < price2num($price_min))))
-			{
+			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $price_min && (price2num($pu_ht) * (1 - price2num(GETPOST('remise_percent', 2)) / 100) < price2num($price_min)))) {
 				setEventMessages($langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency)), null, 'errors');
 				$error++;
 			}
@@ -826,8 +819,7 @@ if (empty($reshook))
 		$date_end_fill = GETPOST('date_end_fill', 'int');
 
 		// Update line
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $object->updateline(
 				GETPOST('lineid'),
 				$description,
@@ -855,24 +847,23 @@ if (empty($reshook))
 				$buyingprice
 			);
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 					/*if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-                        // Define output language
-                        $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 = $object->thirdparty->default_lang;
-                                if (! empty($newlang)) {
-                                    $outputlangs = new Translate("", $conf);
-                                    $outputlangs->setDefaultLang($newlang);
-                                }
+						// Define output language
+						$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 = $object->thirdparty->default_lang;
+								if (! empty($newlang)) {
+									$outputlangs = new Translate("", $conf);
+									$outputlangs->setDefaultLang($newlang);
+								}
 
-                                $ret = $object->fetch($id); // Reload to get new records
-                                $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-                    }*/
+								$ret = $object->fetch($id); // Reload to get new records
+								$object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+					}*/
 
 				$object->fetch($object->id); // Reload lines
 
@@ -928,7 +919,9 @@ llxHeader('', $langs->trans("RepeatableInvoices"), $help_url);
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 $companystatic = new Societe($db);
 $invoicerectmp = new FactureRec($db);
 
@@ -939,15 +932,13 @@ $nowlasthour = dol_get_last_hour($now);
 /*
  * Create mode
  */
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("CreateRepeatableInvoice"), '', 'bill');
 
 	$object = new Facture($db); // Source invoice
 	$product_static = new Product($db);
 
-	if ($object->fetch($id, $ref) > 0)
-	{
+	if ($object->fetch($id, $ref) > 0) {
 		$result = $object->getLinesArray();
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -958,8 +949,12 @@ if ($action == 'create')
 		print dol_get_fiche_head(null, '', '', 0);
 
 		$rowspan = 4;
-		if (!empty($conf->projet->enabled)) $rowspan++;
-		if ($object->fk_account > 0) $rowspan++;
+		if (!empty($conf->projet->enabled)) {
+			$rowspan++;
+		}
+		if ($object->fk_account > 0) {
+			$rowspan++;
+		}
 
 		print '<table class="border centpercent">';
 
@@ -996,8 +991,7 @@ if ($action == 'create')
 		$substitutionarray['__INVOICE_COUNTER_MAX__'] = $langs->trans("MaxPeriodNumber");
 
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-		foreach ($substitutionarray as $key => $val)
-		{
+		foreach ($substitutionarray as $key => $val) {
 			$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 		}
 		$htmltext .= '</i>';
@@ -1012,8 +1006,7 @@ if ($action == 'create')
 		print $doleditor->Create(1);
 
 		// Private note
-		if (empty($user->socid))
-		{
+		if (empty($user->socid)) {
 			print '<tr>';
 			print '<td class="tdtop">';
 			print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext, 1, 'help', '', 0, 2, 'noteprivate');
@@ -1039,8 +1032,7 @@ if ($action == 'create')
 		print "</td></tr>";
 
 		// Project
-		if (!empty($conf->projet->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0)
-		{
+		if (!empty($conf->projet->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
 			$projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project;
 			$langs->load('projects');
 			print '<tr><td>'.$langs->trans('Project').'</td><td>';
@@ -1050,8 +1042,7 @@ if ($action == 'create')
 		}
 
 		// Bank account
-		if ($object->fk_account > 0)
-		{
+		if ($object->fk_account > 0) {
 			print "<tr><td>".$langs->trans('BankAccount')."</td><td>";
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
 			print "</td></tr>";
@@ -1100,8 +1091,7 @@ if ($action == 'create')
 		print "</td></tr>";
 
 		// Auto generate document
-		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
-		{
+		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
 			print "<tr><td>".$langs->trans("StatusOfGeneratedDocuments")."</td><td>";
 			$select = array('0'=>$langs->trans('DoNotGenerateDoc'), '1'=>$langs->trans('AutoGenerateDoc'));
 			print $form->selectarray('generate_pdf', $select, GETPOST('generate_pdf'));
@@ -1116,10 +1106,11 @@ if ($action == 'create')
 
 
 		$title = $langs->trans("ProductsAndServices");
-		if (empty($conf->service->enabled))
+		if (empty($conf->service->enabled)) {
 			$title = $langs->trans("Products");
-		elseif (empty($conf->product->enabled))
+		} elseif (empty($conf->product->enabled)) {
 			$title = $langs->trans("Services");
+		}
 
 		print load_fiche_titre($title, '', '');
 
@@ -1129,8 +1120,7 @@ if ($action == 'create')
 		print '<div class="div-table-responsive-no-min">';
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 		// Show object lines
-		if (!empty($object->lines))
-		{
+		if (!empty($object->lines)) {
 			$disableedit = 1;
 			$disablemove = 1;
 			$disableremove = 1;
@@ -1142,8 +1132,7 @@ if ($action == 'create')
 
 		print '</td></tr>';
 
-		if ($flag_price_may_change)
-		{
+		if ($flag_price_may_change) {
 			print '<tr><td colspan="3" class="left">';
 			print '<select name="usenewprice" class="flat">';
 			print '<option value="0">'.$langs->trans("AlwaysUseFixedPrice").'</option>';
@@ -1165,8 +1154,7 @@ if ($action == 'create')
 	/*
 	 * View mode
 	 */
-	if ($object->id > 0)
-	{
+	if ($object->id > 0) {
 		$object->fetch_thirdparty();
 
 		// Confirmation de la suppression d'une ligne produit
@@ -1193,8 +1181,11 @@ if ($action == 'create')
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/facture/invoicetemplate_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '';
-		if ($action != 'editref') $morehtmlref .= $form->editfieldkey($object->ref, 'ref', $object->ref, $object, $user->rights->facture->creer, '', '', 0, 2);
-		else $morehtmlref .= $form->editfieldval('', 'ref', $object->ref, $object, $user->rights->facture->creer, 'string');
+		if ($action != 'editref') {
+			$morehtmlref .= $form->editfieldkey($object->ref, 'ref', $object->ref, $object, $user->rights->facture->creer, '', '', 0, 2);
+		} else {
+			$morehtmlref .= $form->editfieldval('', 'ref', $object->ref, $object, $user->rights->facture->creer, 'string');
+		}
 
 		$morehtmlref .= '<div class="refidno">';
 		// Ref customer
@@ -1203,12 +1194,10 @@ if ($action == 'create')
 		// Thirdparty
 		$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->facture->creer)
-			{
+			if ($user->rights->facture->creer) {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
@@ -1257,13 +1246,11 @@ if ($action == 'create')
 		print '</tr>';
 
 		// Amount Local Taxes
-		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
-		{
+		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) { 	// Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 			print '<td class="nowrap">'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
-		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
-		{
+		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) { 	// Localtax2
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 			print '<td class=nowrap">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
@@ -1277,14 +1264,13 @@ if ($action == 'create')
 		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('PaymentConditionsShort');
 		print '</td>';
-		if ($action != 'editconditions' && $user->rights->facture->creer)
+		if ($action != 'editconditions' && $user->rights->facture->creer) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
-		if ($object->type != Facture::TYPE_CREDIT_NOTE)
-		{
-			if ($action == 'editconditions')
-			{
+		if ($object->type != Facture::TYPE_CREDIT_NOTE) {
+			if ($action == 'editconditions') {
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 			} else {
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'none');
@@ -1299,12 +1285,12 @@ if ($action == 'create')
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('PaymentMode');
 		print '</td>';
-		if ($action != 'editmode' && $user->rights->facture->creer)
+		if ($action != 'editmode' && $user->rights->facture->creer) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
-		if ($action == 'editmode')
-		{
+		if ($action == 'editmode') {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 		} else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none');
@@ -1312,8 +1298,7 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			// Multicurrency code
 			print '<tr>';
 			print '<td>';
@@ -1330,8 +1315,7 @@ if ($action == 'create')
 			print '</td></tr>';
 
 			// Multicurrency rate
-			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
-			{
+			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 				print '<tr>';
 				print '<td>';
 				print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -1361,7 +1345,9 @@ if ($action == 'create')
 
 		// Help of substitution key
 		$dateexample = dol_now();
-		if (!empty($object->frequency) && !empty($object->date_when)) $dateexample = $object->date_when;
+		if (!empty($object->frequency) && !empty($object->date_when)) {
+			$dateexample = $object->date_when;
+		}
 
 		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
 
@@ -1381,8 +1367,7 @@ if ($action == 'create')
 		$substitutionarray['__INVOICE_COUNTER_MAX__'] = $object->nb_gen_max;
 
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-		foreach ($substitutionarray as $key => $val)
-		{
+		foreach ($substitutionarray as $key => $val) {
 			$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 		}
 		$htmltext .= '</i>';
@@ -1408,12 +1393,12 @@ if ($action == 'create')
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('BankAccount');
 		print '<td>';
-		if (($action != 'editbankaccount') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT)
+		if (($action != 'editbankaccount') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
-		if ($action == 'editbankaccount')
-		{
+		if ($action == 'editbankaccount') {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 		} else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
@@ -1426,12 +1411,12 @@ if ($action == 'create')
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('Model');
 		print '<td>';
-		if (($action != 'editmodelpdf') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT)
+		if (($action != 'editmodelpdf') && $user->rights->facture->creer && $object->statut == FactureRec::STATUS_DRAFT) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmodelpdf&amp;id='.$object->id.'">'.img_edit($langs->trans('SetModel'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
-		if ($action == 'editmodelpdf')
-		{
+		if ($action == 'editmodelpdf') {
 			include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 			$list = array();
 			$models = ModelePDFFactures::liste_modeles($db);
@@ -1473,12 +1458,12 @@ if ($action == 'create')
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Frequency');
 		print '</td>';
-		if ($action != 'editfrequency' && $user->rights->facture->creer)
+		if ($action != 'editfrequency' && $user->rights->facture->creer) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editfrequency&amp;facid='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
-		if ($action == 'editfrequency')
-		{
+		if ($action == 'editfrequency') {
 			print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'">';
 			print '<input type="hidden" name="action" value="setfrequency">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1489,8 +1474,7 @@ if ($action == 'create')
 			print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		} else {
-			if ($object->frequency > 0)
-			{
+			if ($object->frequency > 0) {
 				print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
 			} else {
 				print $langs->trans("NotARecurringInvoiceTemplate");
@@ -1500,21 +1484,20 @@ if ($action == 'create')
 
 		// Date when (next invoice generation)
 		print '<tr><td>';
-		if ($action == 'date_when' || $object->frequency > 0)
-		{
+		if ($action == 'date_when' || $object->frequency > 0) {
 			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day');
 		} else {
 			print $langs->trans("NextDateToExecution");
 		}
 		print '</td><td>';
-		if ($action == 'date_when' || $object->frequency > 0)
-		{
+		if ($action == 'date_when' || $object->frequency > 0) {
 			print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $user->rights->facture->creer, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
 		}
 		//var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
-		if (!$object->isMaxNbGenReached())
-		{
-			if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) print img_warning($langs->trans("Late"));
+		if (!$object->isMaxNbGenReached()) {
+			if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
+				print img_warning($langs->trans("Late"));
+			}
 		} else {
 			print img_info($langs->trans("MaxNumberOfGenerationReached"));
 		}
@@ -1523,15 +1506,13 @@ if ($action == 'create')
 
 		// Max period / Rest period
 		print '<tr><td>';
-		if ($action == 'nb_gen_max' || $object->frequency > 0)
-		{
+		if ($action == 'nb_gen_max' || $object->frequency > 0) {
 			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
 		} else {
 			print $langs->trans("MaxPeriodNumber");
 		}
 		print '</td><td>';
-		if ($action == 'nb_gen_max' || $object->frequency > 0)
-		{
+		if ($action == 'nb_gen_max' || $object->frequency > 0) {
 			  print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
 		} else {
 			print '';
@@ -1541,29 +1522,30 @@ if ($action == 'create')
 
 		// Status of generated invoices
 		print '<tr><td>';
-		if ($action == 'auto_validate' || $object->frequency > 0)
+		if ($action == 'auto_validate' || $object->frequency > 0) {
 			print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer);
-		else print $langs->trans("StatusOfGeneratedInvoices");
+		} else {
+			print $langs->trans("StatusOfGeneratedInvoices");
+		}
 		print '</td><td>';
 		$select = 'select;0:'.$langs->trans('BillStatusDraft').',1:'.$langs->trans('BillStatusValidated');
-		if ($action == 'auto_validate' || $object->frequency > 0)
-		{
+		if ($action == 'auto_validate' || $object->frequency > 0) {
 			print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $user->rights->facture->creer, $select);
 		}
 		print '</td>';
 		// Auto generate documents
-		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION))
-		{
+		if (!empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
 			print '<tr>';
 			print '<td>';
-			if ($action == 'generate_pdf' || $object->frequency > 0)
+			if ($action == 'generate_pdf' || $object->frequency > 0) {
 				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer);
-			else print $langs->trans("StatusOfGeneratedDocuments");
+			} else {
+				print $langs->trans("StatusOfGeneratedDocuments");
+			}
 			print '</td>';
 			print '<td>';
 			$select = 'select;0:'.$langs->trans('DoNotGenerateDoc').',1:'.$langs->trans('AutogenerateDoc');
-			if ($action == 'generate_pdf' || $object->frequency > 0)
-			{
+			if ($action == 'generate_pdf' || $object->frequency > 0) {
 				print $form->editfieldval($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $user->rights->facture->creer, $select);
 			}
 			print '</td>';
@@ -1575,12 +1557,10 @@ if ($action == 'create')
 		print '</table>';
 
 		// Frequencry/Recurring section
-		if ($object->frequency > 0)
-		{
+		if ($object->frequency > 0) {
 			print '<br>';
 
-			if (empty($conf->cron->enabled))
-			{
+			if (empty($conf->cron->enabled)) {
 				print info_admin($langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name")));
 			}
 
@@ -1629,17 +1609,14 @@ if ($action == 'create')
 		print '<div class="div-table-responsive-no-min">';
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 		// Show object lines
-		if (!empty($object->lines))
-		{
+		if (!empty($object->lines)) {
 			$canchangeproduct = 1;
 			$ret = $object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
 		}
 
 		// Form to add new line
-		if ($object->statut == $object::STATUS_DRAFT && $user->rights->facture->creer && $action != 'valid' && $action != 'editline')
-		{
-			if ($action != 'editline')
-			{
+		if ($object->statut == $object::STATUS_DRAFT && $user->rights->facture->creer && $action != 'valid' && $action != 'editline') {
+			if ($action != 'editline') {
 				// Add free products/services
 				$object->formAddObjectLine(0, $mysoc, $object->thirdparty); // No date selector for template invoice
 
@@ -1661,12 +1638,9 @@ if ($action == 'create')
 		 */
 		print '<div class="tabsAction">';
 
-		if (empty($object->suspended))
-		{
-			if ($user->rights->facture->creer)
-			{
-				if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max))
-				{
+		if (empty($object->suspended)) {
+			if ($user->rights->facture->creer) {
+				if (!empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MaxGenerationReached")).'">'.$langs->trans("CreateBill").'</a></div>';
 				} else {
 					if (empty($object->frequency) || $object->date_when <= $nowlasthour) {
@@ -1680,10 +1654,8 @@ if ($action == 'create')
 			}
 		}
 
-		if ($user->rights->facture->creer)
-		{
-			if (empty($object->suspended))
-			{
+		if ($user->rights->facture->creer) {
+			if (empty($object->suspended)) {
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=disable&id='.$object->id.'">'.$langs->trans("Disable").'</a></div>';
 			} else {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?action=enable&id='.$object->id.'">'.$langs->trans("Enable").'</a></div>';
@@ -1691,8 +1663,7 @@ if ($action == 'create')
 		}
 
 		//if ($object->statut == Facture::STATUS_DRAFT && $user->rights->facture->supprimer)
-		if ($user->rights->facture->supprimer)
-		{
+		if ($user->rights->facture->supprimer) {
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=ask_deleteinvoice&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
 		}
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 1d83bbd4b76..03a40a0f427 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -50,8 +50,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->commande->enabled))
+if (!empty($conf->commande->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
 if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -67,8 +68,12 @@ if (!empty($conf->accounting->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies', 'compta', 'products', 'banks', 'main', 'withdrawals'));
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
-if (!empty($conf->margin->enabled)) $langs->load('margins');
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load('incoterm');
+}
+if (!empty($conf->margin->enabled)) {
+	$langs->load('margins');
+}
 
 $projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0);
 
@@ -135,7 +140,9 @@ $permissiontoadd = $usercancreate; // Used by the include of actions_addupdatede
 
 // Security check
 $fieldid = (!empty($ref) ? 'ref' : 'rowid');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid, $isdraft);
 
@@ -152,14 +159,13 @@ if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
 
 $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))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -173,23 +179,22 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd)
-	{
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
 		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
 		$objectutil->socid = $socid;
 		$result = $objectutil->createFromClone($user, $id);
 		if ($result > 0) {
-	   		header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
-	   		exit();
-	   	} else {
-	   		$langs->load("errors");
-	   		setEventMessages($object->error, $object->errors, 'errors');
-	   		$action = '';
+			header("Location: ".$_SERVER['PHP_SELF'].'?facid='.$result);
+			exit();
+		} else {
+			$langs->load("errors");
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
 		}
-	} // Change status of invoice
-	elseif ($action == 'reopen' && $usercancreate) {
+	} elseif ($action == 'reopen' && $usercancreate) {
+		// Change status of invoice
 		$result = $object->fetch($id);
 
 		if ($object->statut == Facture::STATUS_CLOSED || ($object->statut == Facture::STATUS_ABANDONED && ($object->close_code != 'replaced' || $object->getIdReplacingInvoice() == 0)) || ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 1)) {    // ($object->statut == 1 && $object->paye == 1) should not happened but can be found when data are corrupted
@@ -201,8 +206,8 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	} // Delete invoice
-	elseif ($action == 'confirm_delete' && $confirm == 'yes') {
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes') {
+		// Delete invoice
 		$result = $object->fetch($id);
 		$object->fetch_thirdparty();
 
@@ -218,8 +223,7 @@ if (empty($reshook))
 		$isErasable = $object->is_erasable();
 
 		if (($usercandelete && $isErasable > 0)
-			|| ($usercancreate && $isErasable == 1))
-		{
+			|| ($usercancreate && $isErasable == 1)) {
 			$result = $object->delete($user, 0, $idwarehouse);
 			if ($result > 0) {
 				header('Location: '.DOL_URL_ROOT.'/compta/facture/list.php?restore_lastsearch_values=1');
@@ -230,8 +234,7 @@ if (empty($reshook))
 			}
 		}
 	} // Delete line
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
-	{
+	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) {
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
@@ -240,10 +243,12 @@ if (empty($reshook))
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id']))
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) {
 				$newlang = $_REQUEST['lang_id'];
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			}
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 				$newlang = $object->thirdparty->default_lang;
+			}
 			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -261,15 +266,13 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
-	} // Delete link of credit note to invoice
-	elseif ($action == 'unlinkdiscount' && $usercancreate)
-	{
+	} elseif ($action == 'unlinkdiscount' && $usercancreate) {
+		// Delete link of credit note to invoice
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
 		$discount->unlink_invoice();
-	} // Validation
-	elseif ($action == 'valid' && $usercancreate)
-	{
+	} elseif ($action == 'valid' && $usercancreate) {
+		// Validation
 		$object->fetch($id);
 
 		// On verifie signe facture
@@ -299,20 +302,22 @@ if (empty($reshook))
 			foreach ($object->lines as $line) {
 				//$vat_src_code_for_line = $line->vat_src_code;		// TODO We chek sign of total per vat without taking into account the vat code because for the moment the vat code is lost/unknown when we add a down payment.
 				$vat_src_code_for_line = '';
-				if (empty($array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line])) $array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] = 0;
-				if (empty($array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line])) $array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] = 0;
+				if (empty($array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line])) {
+					$array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] = 0;
+				}
+				if (empty($array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line])) {
+					$array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] = 0;
+				}
 				$array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] += $line->total_ht;
 				$array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] += $line->multicurrency_total_ht;
 			}
 
 			//var_dump($array_of_total_ht_per_vat_rate);exit;
-			foreach ($array_of_total_ht_per_vat_rate as $vatrate => $tmpvalue)
-			{
+			foreach ($array_of_total_ht_per_vat_rate as $vatrate => $tmpvalue) {
 				$tmp_total_ht = $array_of_total_ht_per_vat_rate[$vatrate];
 				$tmp_total_ht_devise = $array_of_total_ht_devise_per_vat_rate[$vatrate];
 
-				if (($tmp_total_ht < 0 || $tmp_total_ht_devise < 0) && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES))
-				{
+				if (($tmp_total_ht < 0 || $tmp_total_ht_devise < 0) && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) {
 					if ($object->type == $object::TYPE_DEPOSIT) {
 						$langs->load("errors");
 						// Using negative lines on deposit lead to headach and blocking problems when you want to consume them.
@@ -333,61 +338,68 @@ if (empty($reshook))
 				}
 			}
 		}
-	}
-
-	elseif ($action == 'classin' && $usercancreate)
-	{
+	} elseif ($action == 'classin' && $usercancreate) {
 		$object->fetch($id);
 		$object->setProject($_POST['projectid']);
-	} elseif ($action == 'setmode' && $usercancreate)
-	{
+	} elseif ($action == 'setmode' && $usercancreate) {
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-		if ($result < 0)
+		if ($result < 0) {
 			dol_print_error($db, $object->error);
-	} elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer)
-	{
+		}
+	} elseif ($action == 'setretainedwarrantyconditions' && $user->rights->facture->creer) {
 		$object->fetch($id);
 		$object->retained_warranty_fk_cond_reglement = 0; // To clean property
 		$result = $object->setRetainedWarrantyPaymentTerms(GETPOST('retained_warranty_fk_cond_reglement', 'int'));
-		if ($result < 0) dol_print_error($db, $object->error);
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
 
 		$old_rw_date_lim_reglement = $object->retained_warranty_date_limit;
 		$new_rw_date_lim_reglement = $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
-		if ($new_rw_date_lim_reglement > $old_rw_date_lim_reglement) $object->retained_warranty_date_limit = $new_rw_date_lim_reglement;
-		if ($object->retained_warranty_date_limit < $object->date) $object->retained_warranty_date_limit = $object->date;
+		if ($new_rw_date_lim_reglement > $old_rw_date_lim_reglement) {
+			$object->retained_warranty_date_limit = $new_rw_date_lim_reglement;
+		}
+		if ($object->retained_warranty_date_limit < $object->date) {
+			$object->retained_warranty_date_limit = $object->date;
+		}
 		$result = $object->update($user);
-		if ($result < 0) dol_print_error($db, $object->error);
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
 	} elseif ($action == 'setretainedwarranty' && $user->rights->facture->creer) {
 		$object->fetch($id);
 		$result = $object->setRetainedWarranty(GETPOST('retained_warranty', 'float'));
-		if ($result < 0)
+		if ($result < 0) {
 			dol_print_error($db, $object->error);
+		}
 	} elseif ($action == 'setretainedwarrantydatelimit' && $user->rights->facture->creer) {
 		$object->fetch($id);
 		$result = $object->setRetainedWarrantyDateLimit(GETPOST('retained_warranty_date_limit', 'float'));
-		if ($result < 0)
+		if ($result < 0) {
 			dol_print_error($db, $object->error);
-	}  // Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+		}
+	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {	 // Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	} // Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {	// Multicurrency rate
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
 	} elseif ($action == 'setinvoicedate' && $usercancreate) {
 		$object->fetch($id);
 		$old_date_lim_reglement = $object->date_lim_reglement;
 		$date = dol_mktime(12, 0, 0, $_POST['invoicedatemonth'], $_POST['invoicedateday'], $_POST['invoicedateyear']);
-		if (empty($date))
-		{
+		if (empty($date)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 			header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id.'&action=editinvoicedate');
 			exit;
 		}
 		$object->date = $date;
 		$new_date_lim_reglement = $object->calculate_date_lim_reglement();
-		if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement = $new_date_lim_reglement;
-		if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement = $object->date;
+		if ($new_date_lim_reglement > $old_date_lim_reglement) {
+			$object->date_lim_reglement = $new_date_lim_reglement;
+		}
+		if ($object->date_lim_reglement < $object->date) {
+			$object->date_lim_reglement = $object->date;
+		}
 		$result = $object->update($user);
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
@@ -400,8 +412,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	} elseif ($action == 'setconditions' && $usercancreate)
-	{
+	} elseif ($action == 'setconditions' && $usercancreate) {
 		$object->fetch($id);
 		$object->cond_reglement_code = 0; // To clean property
 		$object->cond_reglement_id = 0; // To clean property
@@ -421,8 +432,12 @@ if (empty($reshook))
 		if (!$error) {
 			$old_date_lim_reglement = $object->date_lim_reglement;
 			$new_date_lim_reglement = $object->calculate_date_lim_reglement();
-			if ($new_date_lim_reglement > $old_date_lim_reglement) $object->date_lim_reglement = $new_date_lim_reglement;
-			if ($object->date_lim_reglement < $object->date) $object->date_lim_reglement = $object->date;
+			if ($new_date_lim_reglement > $old_date_lim_reglement) {
+				$object->date_lim_reglement = $new_date_lim_reglement;
+			}
+			if ($object->date_lim_reglement < $object->date) {
+				$object->date_lim_reglement = $object->date;
+			}
 			$result = $object->update($user);
 			if ($result < 0) {
 				$error++;
@@ -435,8 +450,7 @@ if (empty($reshook))
 		} else {
 			$db->commit();
 		}
-	} elseif ($action == 'setpaymentterm' && $usercancreate)
-	{
+	} elseif ($action == 'setpaymentterm' && $usercancreate) {
 		$object->fetch($id);
 		$object->date_lim_reglement = dol_mktime(12, 0, 0, $_POST['paymenttermmonth'], $_POST['paymenttermday'], $_POST['paymenttermyear']);
 		if ($object->date_lim_reglement < $object->date) {
@@ -447,8 +461,7 @@ if (empty($reshook))
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
-	} elseif ($action == 'setrevenuestamp' && $usercancreate)
-	{
+	} elseif ($action == 'setrevenuestamp' && $usercancreate) {
 		$object->fetch($id);
 		$object->revenuestamp = GETPOST('revenuestamp');
 		$result = $object->update($user);
@@ -457,12 +470,15 @@ if (empty($reshook))
 			dol_print_error($db, $object->error);
 		} else {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -472,14 +488,14 @@ if (empty($reshook))
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+				if ($result < 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			}
 		}
-	} // Set incoterm
-	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {
+	} elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {		// Set incoterm
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	} // bank account
-	elseif ($action == 'setbankaccount' && $usercancreate) {
+	} elseif ($action == 'setbankaccount' && $usercancreate) {	// bank account
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$object->fetch($id);
@@ -500,23 +516,20 @@ if (empty($reshook))
 			}
 		}
 		// We use the credit to reduce remain to pay
-		if (GETPOST("remise_id_for_payment", 'int') > 0)
-		{
+		if (GETPOST("remise_id_for_payment", 'int') > 0) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch(GETPOST("remise_id_for_payment", 'int'));
 
 			//var_dump($object->getRemainToPay(0));
 			//var_dump($discount->amount_ttc);exit;
-			if (price2num($discount->amount_ttc) > price2num($object->getRemainToPay(0)))
-			{
+			if (price2num($discount->amount_ttc) > price2num($object->getRemainToPay(0))) {
 				// TODO Split the discount in 2 automatically
 				$error++;
 				setEventMessages($langs->trans("ErrorDiscountLargerThanRemainToPaySplitItBefore"), null, 'errors');
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $discount->link_to_invoice(0, $id);
 				if ($result < 0) {
 					setEventMessages($discount->error, $discount->errors, 'errors');
@@ -524,12 +537,15 @@ if (empty($reshook))
 			}
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		{
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			$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 = $object->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 = $object->thirdparty->default_lang;
+			}
 			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -537,19 +553,18 @@ if (empty($reshook))
 			$ret = $object->fetch($id); // Reload to get new records
 
 			$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		}
-	} elseif ($action == 'setref' && $usercancreate)
-	{
+	} elseif ($action == 'setref' && $usercancreate) {
 		$object->fetch($id);
 		$object->setValueFrom('ref', GETPOST('ref'), '', null, '', '', $user, 'BILL_MODIFY');
-	} elseif ($action == 'setref_client' && $usercancreate)
-	{
+	} elseif ($action == 'setref_client' && $usercancreate) {
 		$object->fetch($id);
 		$object->set_ref_client(GETPOST('ref_client'));
 	} // Classify to validated
-	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate)
-	{
+	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) {
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
 		$object->fetch($id);
@@ -559,22 +574,17 @@ if (empty($reshook))
 
 		// Check for mandatory fields in thirdparty (defined into setup)
 		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL');
-		foreach ($array_to_check as $key)
-		{
+		foreach ($array_to_check as $key) {
 			$keymin = strtolower($key);
 			$i = (int) preg_replace('/[^0-9]/', '', $key);
 			$vallabel = $object->thirdparty->$keymin;
 
-			if ($i > 0)
-			{
-				if ($object->thirdparty->isACompany())
-				{
+			if ($i > 0) {
+				if ($object->thirdparty->isACompany()) {
 					// Check for mandatory prof id (but only if country is other than ours)
-					if ($mysoc->country_id > 0 && $object->thirdparty->country_id == $mysoc->country_id)
-					{
+					if ($mysoc->country_id > 0 && $object->thirdparty->country_id == $mysoc->country_id) {
 						$idprof_mandatory = 'SOCIETE_'.$key.'_INVOICE_MANDATORY';
-						if (!$vallabel && !empty($conf->global->$idprof_mandatory))
-						{
+						if (!$vallabel && !empty($conf->global->$idprof_mandatory)) {
 							$langs->load("errors");
 							$error++;
 							setEventMessages($langs->trans('ErrorProdIdIsMandatory', $langs->transcountry('ProfId'.$i, $object->thirdparty->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')', null, 'errors');
@@ -583,11 +593,9 @@ if (empty($reshook))
 				}
 			} else {
 				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
-				if ($key == 'EMAIL')
-				{
+				if ($key == 'EMAIL') {
 					// Check for mandatory
-					if (!empty($conf->global->SOCIETE_EMAIL_INVOICE_MANDATORY) && !isValidEMail($object->thirdparty->email))
-					{
+					if (!empty($conf->global->SOCIETE_EMAIL_INVOICE_MANDATORY) && !isValidEMail($object->thirdparty->email)) {
 						$langs->load("errors");
 						$error++;
 						setEventMessages($langs->trans("ErrorBadEMail", $object->thirdparty->email).' ('.$langs->trans("ForbiddenBySetupRules").')', null, 'errors');
@@ -598,15 +606,13 @@ if (empty($reshook))
 
 		// Check for mandatory fields in invoice
 		$array_to_check = array('REF_CUSTOMER'=>'RefCustomer');
-		foreach ($array_to_check as $key => $val)
-		{
+		foreach ($array_to_check as $key => $val) {
 			$keymin = strtolower($key);
 			$vallabel = $object->$keymin;
 
 			// Check for mandatory
 			$keymandatory = 'INVOICE_'.$key.'_MANDATORY_FOR_VALIDATION';
-			if (!$vallabel && !empty($conf->global->$keymandatory))
-			{
+			if (!$vallabel && !empty($conf->global->$keymandatory)) {
 				$langs->load("errors");
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val)), null, 'errors');
@@ -614,8 +620,7 @@ if (empty($reshook))
 		}
 
 		// Check for warehouse
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
-		{
+		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 			$qualified_for_stock_change = 0;
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
@@ -623,8 +628,7 @@ if (empty($reshook))
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
-			if ($qualified_for_stock_change)
-			{
+			if ($qualified_for_stock_change) {
 				if (!$idwarehouse || $idwarehouse == - 1) {
 					$error++;
 					setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
@@ -633,18 +637,19 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $object->validate($user, '', $idwarehouse);
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				{
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -655,24 +660,27 @@ if (empty($reshook))
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-					if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
 				}
 			} else {
-				if (count($object->errors)) setEventMessages(null, $object->errors, 'errors');
-				else setEventMessages($object->error, $object->errors, 'errors');
+				if (count($object->errors)) {
+					setEventMessages(null, $object->errors, 'errors');
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			}
 		}
-	} // Go back to draft status (unvalidate)
-	elseif ($action == 'confirm_modif' && $usercanunvalidate)
-	{
+	} elseif ($action == 'confirm_modif' && $usercanunvalidate) {
+		// Go back to draft status (unvalidate)
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
 		// Check parameters
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
-		{
+		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 			$qualified_for_stock_change = 0;
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
@@ -680,8 +688,7 @@ if (empty($reshook))
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
-			if ($qualified_for_stock_change)
-			{
+			if ($qualified_for_stock_change) {
 				if (!$idwarehouse || $idwarehouse == - 1) {
 					$error++;
 					setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
@@ -716,20 +723,23 @@ if (empty($reshook))
 			$ventilExportCompta = $object->getVentilExportCompta();
 
 			// On verifie si aucun paiement n'a ete effectue
-			if ($ventilExportCompta == 0)
-			{
-				if (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED) || ($resteapayer == $object->total_ttc && empty($object->paye)))
-				{
+			if ($ventilExportCompta == 0) {
+				if (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED) || ($resteapayer == $object->total_ttc && empty($object->paye))) {
 					$result = $object->setDraft($user, $idwarehouse);
-					if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
 
 					// Define output language
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-					{
+					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						$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 = $object->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 = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
@@ -743,38 +753,41 @@ if (empty($reshook))
 				}
 			}
 		}
-	} // Classify "paid"
-	elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercanissuepayment)
-	{
+	} elseif ($action == 'confirm_paid' && $confirm == 'yes' && $usercanissuepayment) {
+		// Classify "paid"
 		$object->fetch($id);
 		$result = $object->setPaid($user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
-	} // Classif "paid partialy"
-	elseif ($action == 'confirm_paid_partially' && $confirm == 'yes' && $usercanissuepayment)
-	{
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} elseif ($action == 'confirm_paid_partially' && $confirm == 'yes' && $usercanissuepayment) {
+		// Classif "paid partialy"
 		$object->fetch($id);
 		$close_code = GETPOST("close_code", 'restricthtml');
 		$close_note = GETPOST("close_note", 'restricthtml');
 		if ($close_code) {
 			$result = $object->setPaid($user, $close_code, $close_note);
-			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
 		}
-	} // Classify "abandoned"
-	elseif ($action == 'confirm_canceled' && $confirm == 'yes') {
+	} elseif ($action == 'confirm_canceled' && $confirm == 'yes') {
+		// Classify "abandoned"
 		$object->fetch($id);
 		$close_code = GETPOST("close_code", 'restricthtml');
 		$close_note = GETPOST("close_note", 'restricthtml');
 		if ($close_code) {
 			$result = $object->setCanceled($user, $close_code, $close_note);
-			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		} else {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Reason")), null, 'errors');
 		}
-	} // Convertir en reduc
-	elseif ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $usercancreate)
-	{
+	} elseif ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $usercancreate) {
+		// Convertir en reduc
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 		//$object->fetch_lines();	// Already done into fetch
@@ -784,10 +797,14 @@ if (empty($reshook))
 		$result = $discountcheck->fetch(0, $object->id);
 
 		$canconvert = 0;
-		if ($object->type == Facture::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
-		if (($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_SITUATION) && $object->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
-		if ($canconvert)
-		{
+		if ($object->type == Facture::TYPE_DEPOSIT && empty($discountcheck->id)) {
+			$canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
+		}
+		if (($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_SITUATION) && $object->paye == 0 && empty($discountcheck->id)) {
+			$canconvert = 1; // we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
+		}
+
+		if ($canconvert) {
 			$db->begin();
 
 			$amount_ht = $amount_tva = $amount_ttc = array();
@@ -795,10 +812,8 @@ if (empty($reshook))
 
 			// Loop on each vat rate
 			$i = 0;
-			foreach ($object->lines as $line)
-			{
-				if ($line->product_type < 9 && $line->total_ht != 0) // Remove lines with product_type greater than or equal to 9 and no need to create discount if amount is null
-				{
+			foreach ($object->lines as $line) {
+				if ($line->product_type < 9 && $line->total_ht != 0) { // Remove lines with product_type greater than or equal to 9 and no need to create discount if amount is null
 					$keyforvatrate = $line->tva_tx.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : '');
 
 					$amount_ht[$keyforvatrate] += $line->total_ht;
@@ -830,13 +845,13 @@ if (empty($reshook))
 
 			// Insert one discount by VAT rate category
 			$discount = new DiscountAbsolute($db);
-			if ($object->type == Facture::TYPE_CREDIT_NOTE)
+			if ($object->type == Facture::TYPE_CREDIT_NOTE) {
 				$discount->description = '(CREDIT_NOTE)';
-			elseif ($object->type == Facture::TYPE_DEPOSIT)
+			} elseif ($object->type == Facture::TYPE_DEPOSIT) {
 				$discount->description = '(DEPOSIT)';
-			elseif ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION)
+			} elseif ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION) {
 				$discount->description = '(EXCESS RECEIVED)';
-			else {
+			} else {
 				setEventMessages($langs->trans('CantConvertToReducAnInvoiceOfThisType'), null, 'errors');
 			}
 			$discount->fk_soc = $object->socid;
@@ -844,8 +859,7 @@ if (empty($reshook))
 
 			$error = 0;
 
-			if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION)
-			{
+			if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_SITUATION) {
 				// If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
 
 				// Total payments
@@ -856,7 +870,9 @@ if (empty($reshook))
 				$sql .= ' AND pf.fk_paiement = p.rowid';
 				$sql .= ' AND p.entity IN ('.getEntity('invoice').')';
 				$resql = $db->query($sql);
-				if (!$resql) dol_print_error($db);
+				if (!$resql) {
+					dol_print_error($db);
+				}
 
 				$res = $db->fetch_object($resql);
 				$total_paiements = $res->total_paiements;
@@ -872,7 +888,9 @@ if (empty($reshook))
 					while ($obj = $db->fetch_object($resql)) {
 						$total_creditnote_and_deposit += $obj->amount_ttc;
 					}
-				} else dol_print_error($db);
+				} else {
+					dol_print_error($db);
+				}
 
 				$discount->amount_ht = $discount->amount_ttc = $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
 				$discount->amount_tva = 0;
@@ -880,15 +898,12 @@ if (empty($reshook))
 				$discount->vat_src_code = '';
 
 				$result = $discount->create($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
-			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT)
-			{
-				foreach ($amount_ht as $tva_tx => $xxx)
-				{
+			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
+				foreach ($amount_ht as $tva_tx => $xxx) {
 					$discount->amount_ht = abs($amount_ht[$tva_tx]);
 					$discount->amount_tva = abs($amount_tva[$tva_tx]);
 					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
@@ -899,8 +914,7 @@ if (empty($reshook))
 					// Clean vat code
 					$reg = array();
 					$vat_src_code = '';
-					if (preg_match('/\((.*)\)/', $tva_tx, $reg))
-					{
+					if (preg_match('/\((.*)\)/', $tva_tx, $reg)) {
 						$vat_src_code = $reg[1];
 						$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx); // Remove code into vatrate.
 					}
@@ -909,21 +923,18 @@ if (empty($reshook))
 					$discount->vat_src_code = $vat_src_code;
 
 					$result = $discount->create($user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						break;
 					}
 				}
 			}
 
-			if (empty($error))
-			{
+			if (empty($error)) {
 				if ($object->type != Facture::TYPE_DEPOSIT) {
 					// Classe facture
 					$result = $object->setPaid($user);
-					if ($result >= 0)
-					{
+					if ($result >= 0) {
 						$db->commit();
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -937,12 +948,10 @@ if (empty($reshook))
 				$db->rollback();
 			}
 		}
-	} // Delete payment
-	elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate)
-	{
+	} elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate) {
+		// Delete payment
 		$object->fetch($id);
-		if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0)
-		{
+		if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0) {
 			$paiement = new Paiement($db);
 			$result = $paiement->fetch(GETPOST('paiement_id'));
 			if ($result > 0) {
@@ -953,12 +962,11 @@ if (empty($reshook))
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 			}
 		}
-	} /*
-	 * Insert new invoice in database
-	 */
-	elseif ($action == 'add' && $usercancreate)
-	{
-		if ($socid > 0) $object->socid = GETPOST('socid', 'int');
+	} elseif ($action == 'add' && $usercancreate) {
+		// Insert new invoice in database
+		if ($socid > 0) {
+			$object->socid = GETPOST('socid', 'int');
+		}
 		$selectedLines = GETPOST('toselect', 'array');
 
 		$db->begin();
@@ -967,11 +975,12 @@ if (empty($reshook))
 		$originentity = GETPOST('originentity');
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
 		// Replacement invoice
-		if (GETPOST('type') == Facture::TYPE_REPLACEMENT)
-		{
+		if (GETPOST('type') == Facture::TYPE_REPLACEMENT) {
 			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice)) {
 				$error++;
@@ -983,7 +992,7 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			if (!($_POST['fac_replacement'] > 0)) {
+			if (!(GETPOST('fac_replacement', 'int') > 0)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ReplaceInvoice")), null, 'errors');
 				$action = 'create';
@@ -1014,7 +1023,7 @@ if (empty($reshook))
 				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
 
 				// Proprietes particulieres a facture de remplacement
-				$object->fk_facture_source = $_POST['fac_replacement'];
+				$object->fk_facture_source = GETPOST('fac_replacement', 'int');
 				$object->type = Facture::TYPE_REPLACEMENT;
 
 				$id = $object->createFromCurrent($user);
@@ -1025,11 +1034,9 @@ if (empty($reshook))
 		}
 
 		// Credit note invoice
-		if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE)
-		{
+		if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) {
 			$sourceinvoice = GETPOST('fac_avoir', 'int');
-			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE))
-			{
+			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CorrectInvoice")), null, 'errors');
 				$action = 'create';
@@ -1048,8 +1055,7 @@ if (empty($reshook))
 
 			$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
 
-			if (!$error)
-			{
+			if (!$error) {
 				if (!empty($originentity)) {
 					$object->entity = $originentity;
 				}
@@ -1077,10 +1083,8 @@ if (empty($reshook))
 				$object->type = Facture::TYPE_CREDIT_NOTE;
 
 				$facture_source = new Facture($db); // fetch origin object
-				if ($facture_source->fetch($object->fk_facture_source) > 0)
-				{
-					if ($facture_source->type == Facture::TYPE_SITUATION)
-					{
+				if ($facture_source->fetch($object->fk_facture_source) > 0) {
+					if ($facture_source->type == Facture::TYPE_SITUATION) {
 						$object->situation_counter = $facture_source->situation_counter;
 						$object->situation_cycle_ref = $facture_source->situation_cycle_ref;
 						$facture_source->fetchPreviousNextSituationInvoice();
@@ -1093,14 +1097,11 @@ if (empty($reshook))
 				// NOTE: fields total on credit note are stored as delta both on total of lines and on invoice total (good)
 				// NOTE: fields situation_percent on situation invoice are stored as cumulative values on lines (bad)
 				// NOTE: fields situation_percent on credit note are stored as delta on lines (good)
-				if (GETPOST('invoiceAvoirWithLines', 'int') == 1 && $id > 0)
-				{
-					if (!empty($facture_source->lines))
-					{
+				if (GETPOST('invoiceAvoirWithLines', 'int') == 1 && $id > 0) {
+					if (!empty($facture_source->lines)) {
 						$fk_parent_line = 0;
 
-						foreach ($facture_source->lines as $line)
-						{
+						foreach ($facture_source->lines as $line) {
 							// Extrafields
 							if (method_exists($line, 'fetch_optionals')) {
 								// load extrafields
@@ -1113,22 +1114,18 @@ if (empty($reshook))
 							}
 
 
-							if ($facture_source->type == Facture::TYPE_SITUATION)
-							{
+							if ($facture_source->type == Facture::TYPE_SITUATION) {
 								$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
 								$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
 
-								if (!empty($facture_source->tab_previous_situation_invoice))
-								{
+								if (!empty($facture_source->tab_previous_situation_invoice)) {
 									// search the last standard invoice in cycle and the possible credit note between this last and facture_source
 									// TODO Move this out of loop of $facture_source->lines
 									$tab_jumped_credit_notes = array();
 									$lineIndex = count($facture_source->tab_previous_situation_invoice) - 1;
 									$searchPreviousInvoice = true;
-									while ($searchPreviousInvoice)
-									{
-										if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
-										{
+									while ($searchPreviousInvoice) {
+										if ($facture_source->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1) {
 											$searchPreviousInvoice = false; // find, exit;
 											break;
 										} else {
@@ -1140,10 +1137,8 @@ if (empty($reshook))
 									}
 
 									$maxPrevSituationPercent = 0;
-									foreach ($facture_source->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
-									{
-										if ($prevLine->id == $source_fk_prev_id)
-										{
+									foreach ($facture_source->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine) {
+										if ($prevLine->id == $source_fk_prev_id) {
 											$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
 
 											//$line->subprice  = $line->subprice - $prevLine->subprice;
@@ -1168,10 +1163,8 @@ if (empty($reshook))
 									// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
 									$maxPrevSituationPercent = 0;
 									foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
-										foreach ($facture_source->tab_previous_situation_invoice[$index]->lines as $prevLine)
-										{
-											if ($prevLine->fk_prev_id == $source_fk_prev_id)
-											{
+										foreach ($facture_source->tab_previous_situation_invoice[$index]->lines as $prevLine) {
+											if ($prevLine->fk_prev_id == $source_fk_prev_id) {
 												$maxPrevSituationPercent = $prevLine->situation_percent;
 
 												$line->total_ht  -= $prevLine->total_ht;
@@ -1225,10 +1218,8 @@ if (empty($reshook))
 					}
 				}
 
-				if (GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') == 1 && $id > 0)
-				{
-					if ($facture_source->fetch($object->fk_facture_source) > 0)
-					{
+				if (GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') == 1 && $id > 0) {
+					if ($facture_source->fetch($object->fk_facture_source) > 0) {
 						$totalpaye = $facture_source->getSommePaiement();
 						$totalcreditnotes = $facture_source->getSumCreditNotesUsed();
 						$totaldeposits = $facture_source->getSumDepositsUsed();
@@ -1253,8 +1244,7 @@ if (empty($reshook))
 		}
 
 		// Standard invoice or Deposit invoice, created from a Predefined template invoice
-		if ((GETPOST('type') == Facture::TYPE_STANDARD || GETPOST('type') == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0)
-		{
+		if ((GETPOST('type') == Facture::TYPE_STANDARD || GETPOST('type') == Facture::TYPE_DEPOSIT) && GETPOST('fac_rec', 'int') > 0) {
 			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice)) {
 				$error++;
@@ -1268,8 +1258,7 @@ if (empty($reshook))
 
 			$date_pointoftax = dol_mktime(12, 0, 0, $_POST['date_pointoftaxmonth'], $_POST['date_pointoftaxday'], $_POST['date_pointoftaxyear']);
 
-			if (!$error)
-			{
+			if (!$error) {
 				$object->socid = GETPOST('socid', 'int');
 				$object->type            = GETPOST('type');
 				$object->ref             = GETPOST('ref');
@@ -1298,17 +1287,20 @@ if (empty($reshook))
 			}
 		}
 
-		// Standard or deposit or proforma invoice, not from a Predefined template invoice
-		if ((GETPOST('type') == Facture::TYPE_STANDARD || GETPOST('type') == Facture::TYPE_DEPOSIT || GETPOST('type') == Facture::TYPE_PROFORMA || (GETPOST('type') == Facture::TYPE_SITUATION && !GETPOST('situations'))) && GETPOST('fac_rec') <= 0)
-		{
-			if (GETPOST('socid', 'int') < 1)
-			{
+		// Standard or deposit invoice, not from a Predefined template invoice
+		if ((GETPOST('type') == Facture::TYPE_STANDARD || GETPOST('type') == Facture::TYPE_DEPOSIT || GETPOST('type') == Facture::TYPE_PROFORMA || (GETPOST('type') == Facture::TYPE_SITUATION && !GETPOST('situations'))) && GETPOST('fac_rec') <= 0) {
+			$typeamount = GETPOST('typedeposit', 'aZ09');
+			$valuestandardinvoice = price2num(str_replace('%', '', GETPOST('valuestandardinvoice', 'alpha')), 'MU');
+			$valuedeposit = price2num(str_replace('%', '', GETPOST('valuedeposit', 'alpha')), 'MU');
+			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+			$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
+
+			if (GETPOST('socid', 'int') < 1) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Customer")), null, 'errors');
 				$action = 'create';
 			}
 
-			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
@@ -1319,10 +1311,34 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
 
-			if (!$error)
-			{
+			if (GETPOST('type') == Facture::TYPE_STANDARD) {
+				if ($valuestandardinvoice < 0 || $valuestandardinvoice > 100) {
+					setEventMessages($langs->trans("ErrorAPercentIsRequired"), null, 'errors');
+					$error++;
+					$action = 'create';
+				}
+			} elseif (GETPOST('type') == Facture::TYPE_DEPOSIT) {
+				if ($typeamount && !empty($origin) && !empty($originid)) {
+					if ($typeamount == 'amount' && $valuedeposit <= 0) {
+						setEventMessages($langs->trans("ErrorAnAmountWithoutTaxIsRequired"), null, 'errors');
+						$error++;
+						$action = 'create';
+					}
+					if ($typeamount == 'variable' && $valuedeposit <= 0) {
+						setEventMessages($langs->trans("ErrorAPercentIsRequired"), null, 'errors');
+						$error++;
+						$action = 'create';
+					}
+					if ($typeamount == 'variablealllines' && $valuedeposit <= 0) {
+						setEventMessages($langs->trans("ErrorAPercentIsRequired"), null, 'errors');
+						$error++;
+						$action = 'create';
+					}
+				}
+			}
+
+			if (!$error) {
 				// Si facture standard
 				$object->socid = GETPOST('socid', 'int');
 				$object->type				= GETPOST('type');
@@ -1345,8 +1361,7 @@ if (empty($reshook))
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
 
-				if (GETPOST('type') == Facture::TYPE_SITUATION)
-				{
+				if (GETPOST('type') == Facture::TYPE_SITUATION) {
 					$object->situation_counter = 1;
 					$object->situation_final = 0;
 					$object->situation_cycle_ref = $object->newCycle();
@@ -1361,21 +1376,21 @@ if (empty($reshook))
 				}
 
 				$retained_warranty_date_limit = GETPOST('retained_warranty_date_limit');
-				if (!empty($retained_warranty_date_limit) && $db->jdate($retained_warranty_date_limit)) {
-					$object->retained_warranty_date_limit = $db->jdate($retained_warranty_date_limit);
+				if (!empty($retained_warranty_date_limit) && dol_stringtotime($retained_warranty_date_limit)) {
+					$object->retained_warranty_date_limit = dol_stringtotime($retained_warranty_date_limit);
 				}
 				$object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
 
 				$object->fetch_thirdparty();
 
 				// If creation from another object of another module (Example: origin=propal, originid=1)
-				if (!empty($origin) && !empty($originid))
-				{
+				if (!empty($origin) && !empty($originid)) {
+					$regs = array();
 					// Parse element/subelement (ex: project_task)
 					$element = $subelement = $origin;
 					if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
-						$element = $regs [1];
-						$subelement = $regs [2];
+						$element = $regs[1];
+						$subelement = $regs[2];
 					}
 
 					// For compatibility
@@ -1402,8 +1417,7 @@ if (empty($reshook))
 					// Possibility to add external linked objects with hooks
 					$object->linked_objects[$object->origin] = $object->origin_id;
 					// link with order if it is a shipping invoice
-					if ($object->origin == 'shipping')
-					{
+					if ($object->origin == 'shipping') {
 						require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 						$exp = new Expedition($db);
 						$exp->fetch($object->origin_id);
@@ -1415,15 +1429,13 @@ if (empty($reshook))
 						}
 					}
 
-					if (is_array($_POST['other_linked_objects']) && !empty($_POST['other_linked_objects']))
-					{
+					if (is_array($_POST['other_linked_objects']) && !empty($_POST['other_linked_objects'])) {
 						$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
 					}
 
 					$id = $object->create($user); // This include class to add_object_linked() and add add_contact()
 
-					if ($id > 0)
-					{
+					if ($id > 0) {
 						dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 						$classname = ucfirst($subelement);
@@ -1432,48 +1444,47 @@ if (empty($reshook))
 						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines or deposit lines");
 						$result = $srcobject->fetch($object->origin_id);
 
-						$typeamount = GETPOST('typedeposit', 'aZ09');
-						$valuedeposit = price2num(GETPOST('valuedeposit', 'alpha'), 'MU');
-
-						// If deposit invoice
-						if ($_POST['type'] == Facture::TYPE_DEPOSIT && in_array($typeamount, array('amount', 'variable')))
-						{
+						// If deposit invoice - down payment with 1 line (fixed amount or percent)
+						if (GETPOST('type') == Facture::TYPE_DEPOSIT && in_array($typeamount, array('amount', 'variable'))) {
+							// Define the array $amountdeposit
 							$amountdeposit = array();
-							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA))
-							{
-								if ($typeamount == 'amount') $amount = $valuedeposit;
-								else $amount = $srcobject->total_ttc * ($valuedeposit / 100);
+							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
+								if ($typeamount == 'amount') {
+									$amount = $valuedeposit;
+								} else {
+									$amount = $srcobject->total_ttc * ($valuedeposit / 100);
+								}
 
 								$TTotalByTva = array();
-								foreach ($srcobject->lines as &$line)
-								{
-									if (!empty($line->special_code)) continue;
+								foreach ($srcobject->lines as &$line) {
+									if (!empty($line->special_code)) {
+										continue;
+									}
 									$TTotalByTva[$line->tva_tx] += $line->total_ttc;
 								}
 
-								foreach ($TTotalByTva as $tva => &$total)
-								{
+								foreach ($TTotalByTva as $tva => &$total) {
 									$coef = $total / $srcobject->total_ttc; // Calc coef
 									$am = $amount * $coef;
 									$amount_ttc_diff += $am;
 									$amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline
 								}
 							} else {
-								if ($typeamount == 'amount')
-								{
+								if ($typeamount == 'amount') {
 									$amountdeposit[0] = $valuedeposit;
-								} elseif ($typeamount == 'variable')
-								{
-									if ($result > 0)
-									{
+								} elseif ($typeamount == 'variable') {
+									if ($result > 0) {
 										$totalamount = 0;
 										$lines = $srcobject->lines;
 										$numlines = count($lines);
-										for ($i = 0; $i < $numlines; $i++)
-										{
+										for ($i = 0; $i < $numlines; $i++) {
 											$qualified = 1;
-											if (empty($lines[$i]->qty)) $qualified = 0; // We discard qty=0, it is an option
-											if (!empty($lines[$i]->special_code)) $qualified = 0; // We discard special_code (frais port, ecotaxe, option, ...)
+											if (empty($lines[$i]->qty)) {
+												$qualified = 0; // We discard qty=0, it is an option
+											}
+											if (!empty($lines[$i]->special_code)) {
+												$qualified = 0; // We discard special_code (frais port, ecotaxe, option, ...)
+											}
 											if ($qualified) {
 												$totalamount += $lines[$i]->total_ht; // Fixme : is it not for the customer ? Shouldn't we take total_ttc ?
 												$tva_tx = $lines[$i]->tva_tx;
@@ -1493,9 +1504,10 @@ if (empty($reshook))
 								$amount_ttc_diff = $amountdeposit[0];
 							}
 
-							foreach ($amountdeposit as $tva => $amount)
-							{
-								if (empty($amount)) continue;
+							foreach ($amountdeposit as $tva => $amount) {
+								if (empty($amount)) {
+									continue;
+								}
 
 								$arraylist = array(
 									'amount' => 'FixAmount',
@@ -1511,56 +1523,62 @@ if (empty($reshook))
 
 								$descline .= ' - '.$srcobject->ref;
 								$result = $object->addline(
-										$descline,
-										$amount, // subprice
-										1, // quantity
-										$tva, // vat rate
-										0, // localtax1_tx
-										0, // localtax2_tx
-										(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT) ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
-										0, // remise_percent
-										0, // date_start
-										0, // date_end
-										0,
-										$lines[$i]->info_bits, // info_bits
-										0,
-										'HT',
-										0,
-										0, // product_type
-										1,
-										$lines[$i]->special_code,
-										$object->origin,
-										0,
-										0,
-										0,
-										0
-										//,$langs->trans('Deposit') //Deprecated
-									);
+									$descline,
+									$amount, // subprice
+									1, // quantity
+									$tva, // vat rate
+									0, // localtax1_tx
+									0, // localtax2_tx
+									(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT) ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
+									0, // remise_percent
+									0, // date_start
+									0, // date_end
+									0,
+									$lines[$i]->info_bits, // info_bits
+									0,
+									'HT',
+									0,
+									0, // product_type
+									1,
+									$lines[$i]->special_code,
+									$object->origin,
+									0,
+									0,
+									0,
+									0
+									//,$langs->trans('Deposit') //Deprecated
+								);
 							}
 
 							$diff = $object->total_ttc - $amount_ttc_diff;
 
-							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0)
-							{
+							if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) {
 								$object->fetch_lines();
 								$subprice_diff = $object->lines[0]->subprice - $diff / (1 + $object->lines[0]->tva_tx / 100);
 								$object->updateline($object->lines[0]->id, $object->lines[0]->desc, $subprice_diff, $object->lines[0]->qty, $object->lines[0]->remise_percent, $object->lines[0]->date_start, $object->lines[0]->date_end, $object->lines[0]->tva_tx, 0, 0, 'HT', $object->lines[0]->info_bits, $object->lines[0]->product_type, 0, 0, 0, $object->lines[0]->pa_ht, $object->lines[0]->label, 0, array(), 100);
 							}
 						}
 
-						if ($_POST['type'] != Facture::TYPE_DEPOSIT || ($_POST['type'] == Facture::TYPE_DEPOSIT && $typeamount == 'variablealllines'))
-						{
-							if ($result > 0)
-							{
+						// standard invoice, credit note, or down payment from a percent of all lines
+						if (GETPOST('type') != Facture::TYPE_DEPOSIT || (GETPOST('type') == Facture::TYPE_DEPOSIT && $typeamount == 'variablealllines')) {
+							if ($result > 0) {
 								$lines = $srcobject->lines;
-								if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
-								{
+								if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {
 									$srcobject->fetch_lines();
 									$lines = $srcobject->lines;
 								}
 
-								// If we create a deposit with all lines and a percent, we change amount
-								if ($_POST['type'] == Facture::TYPE_DEPOSIT && $typeamount == 'variablealllines') {
+								// If we create a standard invoice with a percent, we change amount by changing the qty
+								if (GETPOST('type') == Facture::TYPE_STANDARD && $valuestandardinvoice > 0 && $valuestandardinvoice < 100) {
+									if (is_array($lines)) {
+										foreach ($lines as $line) {
+											// We keep ->subprice and ->pa_ht, but we change the qty
+											$line->qty = price2num($line->qty * $valuestandardinvoice / 100, 'MS');
+										}
+									}
+								}
+								// If we create a down payment with a percent on all lines, we change amount by changing the qty
+								if (GETPOST('type') == Facture::TYPE_DEPOSIT && $typeamount == 'variablealllines') {
 									if (is_array($lines)) {
 										foreach ($lines as $line) {
 											// We keep ->subprice and ->pa_ht, but we change the qty
@@ -1572,22 +1590,30 @@ if (empty($reshook))
 								$fk_parent_line = 0;
 								$num = count($lines);
 
-								for ($i = 0; $i < $num; $i++)
-								{
-									if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
+								for ($i = 0; $i < $num; $i++) {
+									if (!in_array($lines[$i]->id, $selectedLines)) {
+										continue; // Skip unselected lines
+									}
 
 									// Don't add lines with qty 0 when coming from a shipment including all order lines
-									if ($srcobject->element == 'shipping' && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS && $lines[$i]->qty == 0) continue;
+									if ($srcobject->element == 'shipping' && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS && $lines[$i]->qty == 0) {
+										continue;
+									}
 									// Don't add closed lines when coming from a contract (Set constant to '0,5' to exclude also inactive lines)
-									if (!isset($conf->global->CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE)) $conf->global->CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE = '5';
-									if ($srcobject->element == 'contrat' && in_array($lines[$i]->statut, explode(',', $conf->global->CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE))) continue;
+									if (!isset($conf->global->CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE)) {
+										$conf->global->CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE = '5';
+									}
+									if ($srcobject->element == 'contrat' && in_array($lines[$i]->statut, explode(',', $conf->global->CONTRACT_EXCLUDE_SERVICES_STATUS_FOR_INVOICE))) {
+										continue;
+									}
 
 									$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
 									$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->libelle);
-									if ($object->situation_counter == 1) $lines[$i]->situation_percent = 0;
+									if ($object->situation_counter == 1) {
+										$lines[$i]->situation_percent = 0;
+									}
 
-									if ($lines[$i]->subprice < 0 && empty($conf->global->INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN))
-									{
+									if ($lines[$i]->subprice < 0 && empty($conf->global->INVOICE_KEEP_DISCOUNT_LINES_AS_IN_ORIGIN)) {
 										// Negative line, we create a discount line
 										$discount = new DiscountAbsolute($db);
 										$discount->fk_soc = $object->socid;
@@ -1611,23 +1637,29 @@ if (empty($reshook))
 
 										// Date start
 										$date_start = false;
-										if ($lines[$i]->date_debut_prevue)
+										if ($lines[$i]->date_debut_prevue) {
 											$date_start = $lines[$i]->date_debut_prevue;
-										if ($lines[$i]->date_debut_reel)
+										}
+										if ($lines[$i]->date_debut_reel) {
 											$date_start = $lines[$i]->date_debut_reel;
-										if ($lines[$i]->date_start)
+										}
+										if ($lines[$i]->date_start) {
 											$date_start = $lines[$i]->date_start;
+										}
 
-											// Date end
+										// Date end
 										$date_end = false;
-										if ($lines[$i]->date_fin_prevue)
+										if ($lines[$i]->date_fin_prevue) {
 											$date_end = $lines[$i]->date_fin_prevue;
-										if ($lines[$i]->date_fin_reel)
+										}
+										if ($lines[$i]->date_fin_reel) {
 											$date_end = $lines[$i]->date_fin_reel;
-										if ($lines[$i]->date_end)
+										}
+										if ($lines[$i]->date_end) {
 											$date_end = $lines[$i]->date_end;
+										}
 
-											// Reset fk_parent_line for no child products and special product
+										// 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) {
 											$fk_parent_line = 0;
 										}
@@ -1639,7 +1671,9 @@ if (empty($reshook))
 										}
 
 										$tva_tx = $lines[$i]->tva_tx;
-										if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+										if (!empty($lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
+											$tva_tx .= ' ('.$lines[$i]->vat_src_code.')';
+										}
 
 										// View third's localtaxes for NOW and do not use value from origin.
 										// TODO Is this really what we want ? Yes if source is template invoice but what if proposal or order ?
@@ -1647,11 +1681,34 @@ if (empty($reshook))
 										$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty);
 
 										$result = $object->addline(
-											$desc, $lines[$i]->subprice, $lines[$i]->qty, $tva_tx, $localtax1_tx, $localtax2_tx, $lines[$i]->fk_product,
-											$lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, $lines[$i]->fk_remise_except,
-											'HT', 0, $product_type, $lines[$i]->rang, $lines[$i]->special_code, $object->origin, $lines[$i]->rowid,
-											$fk_parent_line, $lines[$i]->fk_fournprice, $lines[$i]->pa_ht, $label, $array_options,
-											$lines[$i]->situation_percent, $lines[$i]->fk_prev_id, $lines[$i]->fk_unit
+											$desc,
+											$lines[$i]->subprice,
+											$lines[$i]->qty,
+											$tva_tx,
+											$localtax1_tx,
+											$localtax2_tx,
+											$lines[$i]->fk_product,
+											$lines[$i]->remise_percent,
+											$date_start,
+											$date_end,
+											0,
+											$lines[$i]->info_bits,
+											$lines[$i]->fk_remise_except,
+											'HT',
+											0,
+											$product_type,
+											$lines[$i]->rang,
+											$lines[$i]->special_code,
+											$object->origin,
+											$lines[$i]->rowid,
+											$fk_parent_line,
+											$lines[$i]->fk_fournprice,
+											$lines[$i]->pa_ht,
+											$label,
+											$array_options,
+											$lines[$i]->situation_percent,
+											$lines[$i]->fk_prev_id,
+											$lines[$i]->fk_unit
 										);
 
 										if ($result > 0) {
@@ -1678,34 +1735,33 @@ if (empty($reshook))
 						/* Useless, already into the create
 						if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
 						{
-    						$originforcontact = $object->origin;
-    						$originidforcontact = $object->origin_id;
-    						if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
-    						{
-    						    $originforcontact=$srcobject->origin;
-    						    $originidforcontact=$srcobject->origin_id;
-    						}
-    						$sqlcontact = "SELECT code, fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
-    						$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$db->escape($originforcontact)."'";
+							$originforcontact = $object->origin;
+							$originidforcontact = $object->origin_id;
+							if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
+							{
+								$originforcontact=$srcobject->origin;
+								$originidforcontact=$srcobject->origin_id;
+							}
+							$sqlcontact = "SELECT code, fk_socpeople FROM ".MAIN_DB_PREFIX."element_contact as ec, ".MAIN_DB_PREFIX."c_type_contact as ctc";
+							$sqlcontact.= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$db->escape($originforcontact)."'";
 
-    						$resqlcontact = $db->query($sqlcontact);
-    						if ($resqlcontact)
-    						{
-                                while($objcontact = $db->fetch_object($resqlcontact))
-                                {
-                                    //print $objcontact->code.'-'.$objcontact->fk_socpeople."\n";
-                                    $object->add_contact($objcontact->fk_socpeople, $objcontact->code);
-                                }
-    						}
-    						else dol_print_error($resqlcontact);
+							$resqlcontact = $db->query($sqlcontact);
+							if ($resqlcontact)
+							{
+								while($objcontact = $db->fetch_object($resqlcontact))
+								{
+									//print $objcontact->code.'-'.$objcontact->fk_socpeople."\n";
+									$object->add_contact($objcontact->fk_socpeople, $objcontact->code);
+								}
+							}
+							else dol_print_error($resqlcontact);
 						}*/
 
 						// Hooks
 						$parameters = array('objFrom' => $srcobject);
 						$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 						// modified by hook
-						if ($reshook < 0)
-						{
+						if ($reshook < 0) {
 							setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 							$error++;
 						}
@@ -1730,8 +1786,7 @@ if (empty($reshook))
 		}
 
 		// Situation invoices
-		if (GETPOST('type') == Facture::TYPE_SITUATION && GETPOST('situations'))
-		{
+		if (GETPOST('type') == Facture::TYPE_SITUATION && GETPOST('situations')) {
 			$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 			if (empty($dateinvoice)) {
 				$error++;
@@ -1757,24 +1812,20 @@ if (empty($reshook))
 				$object->fk_facture_source = GETPOST('situations', 'int');
 				$object->type = Facture::TYPE_SITUATION;
 
-				if (!empty($origin) && !empty($originid))
-				{
+				if (!empty($origin) && !empty($originid)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 					$object->origin = $origin;
 					$object->origin_id = $originid;
 
 					// retained warranty
-					if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY))
-					{
+					if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
 						$retained_warranty = GETPOST('retained_warranty', 'int');
-						if (price2num($retained_warranty) > 0)
-						{
+						if (price2num($retained_warranty) > 0) {
 							$object->retained_warranty = price2num($retained_warranty);
 						}
 
-						if (GETPOST('retained_warranty_fk_cond_reglement', 'int') > 0)
-						{
+						if (GETPOST('retained_warranty_fk_cond_reglement', 'int') > 0) {
 							$object->retained_warranty_fk_cond_reglement = GETPOST('retained_warranty_fk_cond_reglement', 'int');
 						}
 
@@ -1785,8 +1836,7 @@ if (empty($reshook))
 						$object->retained_warranty_date_limit = !empty($object->retained_warranty_date_limit) ? $object->retained_warranty_date_limit : $object->calculate_date_lim_reglement($object->retained_warranty_fk_cond_reglement);
 					}
 
-					foreach ($object->lines as $i => &$line)
-					{
+					foreach ($object->lines as $i => &$line) {
 						$line->origin = $object->origin;
 						$line->origin_id = $line->id;
 						$line->fk_prev_id = $line->id;
@@ -1805,15 +1855,12 @@ if (empty($reshook))
 						$line->multicurrency_total_ttc = $tabprice[18];
 
 						// Si fk_remise_except defini on vérifie si la réduction à déjà été appliquée
-						if ($line->fk_remise_except)
-						{
+						if ($line->fk_remise_except) {
 							$discount = new DiscountAbsolute($line->db);
 							$result = $discount->fetch($line->fk_remise_except);
-							if ($result > 0)
-							{
+							if ($result > 0) {
 								// Check if discount not already affected to another invoice
-								if ($discount->fk_facture_line > 0)
-								{
+								if ($discount->fk_facture_line > 0) {
 									$line->fk_remise_except = 0;
 								}
 							}
@@ -1839,8 +1886,7 @@ if (empty($reshook))
 
 				$object->situation_counter = $object->situation_counter + 1;
 				$id = $object->createFromCurrent($user);
-				if ($id <= 0)
-				{
+				if ($id <= 0) {
 					$mesg = $object->error;
 				} else {
 					$nextSituationInvoice = new Facture($db);
@@ -1857,17 +1903,19 @@ if (empty($reshook))
 		}
 
 		// End of object creation, we show it
-		if ($id > 0 && !$error)
-		{
+		if ($id > 0 && !$error) {
 			$db->commit();
 
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($object->lines))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE) && count($object->lines)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -1877,7 +1925,9 @@ if (empty($reshook))
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+				if ($result < 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			}
 
 			header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id);
@@ -1898,8 +1948,7 @@ if (empty($reshook))
 		foreach ($object->lines as $line) {
 			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice);
 		}
-	} elseif ($action == 'addline' && $usercancreate)		// Add a new line
-	{
+	} elseif ($action == 'addline' && $usercancreate) {		// Add a new line
 		$langs->load('errors');
 		$error = 0;
 
@@ -1909,8 +1958,7 @@ if (empty($reshook))
 		$price_ht = price2num(GETPOST('price_ht'));
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'));
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
-		if ($prod_entry_mode == 'free')
-		{
+		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
 		} else {
@@ -1936,10 +1984,8 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
-		if (!$prod_entry_mode)
-		{
-			if (GETPOST('type') < 0 && !GETPOST('search_idprod'))
-			{
+		if (!$prod_entry_mode) {
+			if (GETPOST('type') < 0 && !GETPOST('search_idprod')) {
 				setEventMessages($langs->trans('ErrorChooseBetweenFreeEntryOrPredefinedProduct'), null, 'errors');
 				$error++;
 			}
@@ -1948,10 +1994,8 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if (($prod_entry_mode == 'free' && empty($idprod) && (($price_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $price_ht == '') && $price_ht_devise == '') && $object->type != Facture::TYPE_CREDIT_NOTE) 	// Unit price can be 0 but not ''
-		{
-			if ($price_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES))
-			{
+		if (($prod_entry_mode == 'free' && empty($idprod) && (($price_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $price_ht == '') && $price_ht_devise == '') && $object->type != Facture::TYPE_CREDIT_NOTE) { 	// Unit price can be 0 but not ''
+			if ($price_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) {
 				$langs->load("errors");
 				if ($object->type == $object::TYPE_DEPOSIT) {
 					// Using negative lines on deposit lead to headach and blocking problems when you want to consume them.
@@ -2015,8 +2059,7 @@ if (empty($reshook))
 			// Ecrase $tva_tx par celui du produit
 			// Ecrase $base_price_type par celui du produit
 			// Replaces $fk_unit with the product's
-			if (!empty($idprod))
-			{
+			if (!empty($idprod)) {
 				$prod = new Product($db);
 				$prod->fetch($idprod);
 
@@ -2038,16 +2081,13 @@ if (empty($reshook))
 				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
 
 				// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
-				if (!empty($price_ht) || $price_ht === '0')
-				{
+				if (!empty($price_ht) || $price_ht === '0') {
 					$pu_ht = price2num($price_ht, 'MU');
 					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
-				} // On reevalue prix selon taux tva car taux tva transaction peut etre different
-				// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
-				elseif ($tmpvat != $tmpprodvat)
-				{
-					if ($price_base_type != 'HT')
-					{
+				} elseif ($tmpvat != $tmpprodvat) {
+					// On reevalue prix selon taux tva car taux tva transaction peut etre different
+					// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+					if ($price_base_type != 'HT') {
 						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
 					} else {
 						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
@@ -2060,10 +2100,12 @@ if (empty($reshook))
 				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09'))
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
-					if (empty($newlang))
+					}
+					if (empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -2080,8 +2122,11 @@ if (empty($reshook))
 					$product_desc='';
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
-				else $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+					$desc = $product_desc;
+				} else {
+					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				}
 
 				// Add custom code and origin country into description
 				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
@@ -2090,28 +2135,36 @@ if (empty($reshook))
 					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 						$outputlangs = $langs;
 						$newlang = '';
-						if (empty($newlang) && GETPOST('lang_id', 'alpha'))
+						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
 							$newlang = GETPOST('lang_id', 'alpha');
-						if (empty($newlang))
+						}
+						if (empty($newlang)) {
 							$newlang = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
 							$outputlangs->load('products');
 						}
-						if (!empty($prod->customcode))
+						if (!empty($prod->customcode)) {
 							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-						if (!empty($prod->customcode) && !empty($prod->country_code))
+						}
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
-						if (!empty($prod->country_code))
+						}
+						if (!empty($prod->country_code)) {
 							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $outputlangs, 0);
+						}
 					} else {
-						if (!empty($prod->customcode))
+						if (!empty($prod->customcode)) {
 							$tmptxt .= $langs->transnoentitiesnoconv("CustomCode").': '.$prod->customcode;
-						if (!empty($prod->customcode) && !empty($prod->country_code))
+						}
+						if (!empty($prod->customcode) && !empty($prod->country_code)) {
 							$tmptxt .= ' - ';
-						if (!empty($prod->country_code))
+						}
+						if (!empty($prod->country_code)) {
 							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin").': '.getCountry($prod->country_code, 0, $db, $langs, 0);
+						}
 					}
 					$tmptxt .= ')';
 					$desc = dol_concatdesc($desc, $tmptxt);
@@ -2124,7 +2177,9 @@ if (empty($reshook))
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 				$tva_tx = str_replace('*', '', $tva_tx);
-				if (empty($tva_tx)) $tva_npr = 0;
+				if (empty($tva_tx)) {
+					$tva_npr = 0;
+				}
 				$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
 				$desc = $product_desc;
 				$type = GETPOST('type');
@@ -2141,15 +2196,22 @@ if (empty($reshook))
 			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
 
 			$info_bits = 0;
-			if ($tva_npr)
+			if ($tva_npr) {
 				$info_bits |= 0x01;
+			}
 
 			$price2num_pu_ht = price2num($pu_ht);
 			$price2num_remise_percent = price2num($remise_percent);
 			$price2num_price_min = price2num($price_min);
-			if (empty($price2num_pu_ht)) $price2num_pu_ht = 0;
-			if (empty($price2num_remise_percent)) $price2num_remise_percent = 0;
-			if (empty($price2num_price_min)) $price2num_price_min = 0;
+			if (empty($price2num_pu_ht)) {
+				$price2num_pu_ht = 0;
+			}
+			if (empty($price2num_remise_percent)) {
+				$price2num_remise_percent = 0;
+			}
+			if (empty($price2num_price_min)) {
+				$price2num_price_min = 0;
+			}
 
 			if ($usercanproductignorepricemin && (!empty($price_min) && ($price2num_pu_ht * (1 - $price2num_remise_percent / 100) < $price2num_price_min))) {
 				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
@@ -2158,15 +2220,17 @@ if (empty($reshook))
 				// Insert line
 				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $_POST['progress'], '', $fk_unit, $pu_ht_devise);
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					// Define output language and generate document
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-					{
+					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						$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 = $object->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 = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
@@ -2176,7 +2240,9 @@ if (empty($reshook))
 						$ret = $object->fetch($id); // Reload to get new records
 
 						$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-						if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+						if ($result < 0) {
+							setEventMessages($object->error, $object->errors, 'errors');
+						}
 					}
 
 					unset($_POST['prod_entry_mode']);
@@ -2221,9 +2287,10 @@ if (empty($reshook))
 				$action = '';
 			}
 		}
-	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
-	{
-		if (!$object->fetch($id) > 0)	dol_print_error($db);
+	} elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) {
+		if (!$object->fetch($id) > 0) {
+			dol_print_error($db);
+		}
 		$object->fetch_thirdparty();
 
 		// Clean parameters
@@ -2239,7 +2306,9 @@ if (empty($reshook))
 
 		// Define info_bits
 		$info_bits = 0;
-		if (preg_match('/\*/', $vat_rate)) $info_bits |= 0x01;
+		if (preg_match('/\*/', $vat_rate)) {
+			$info_bits |= 0x01;
+		}
 
 		// Define vat_rate
 		$vat_rate = str_replace('*', '', $vat_rate);
@@ -2263,30 +2332,28 @@ if (empty($reshook))
 
 		// Define special_code for special lines
 		$special_code = GETPOST('special_code');
-		if (!GETPOST('qty')) $special_code = 3;
+		if (!GETPOST('qty')) {
+			$special_code = 3;
+		}
 
 		$line = new FactureLigne($db);
 		$line->fetch(GETPOST('lineid', 'int'));
 		$percent = $line->get_prev_progress($object->id);
 
-		if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->situation_cycle_ref > 0)
-		{
+		if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->situation_cycle_ref > 0) {
 			// in case of situation credit note
-			if (GETPOST('progress') >= 0)
-			{
+			if (GETPOST('progress') >= 0) {
 				$mesg = $langs->trans("CantBeNullOrPositive");
 				setEventMessages($mesg, null, 'warnings');
 				$error++;
 				$result = -1;
-			} elseif (GETPOST('progress') < $line->situation_percent) // TODO : use a modified $line->get_prev_progress($object->id) result
-			{
+			} elseif (GETPOST('progress') < $line->situation_percent) { // TODO : use a modified $line->get_prev_progress($object->id) result
 				$mesg = $langs->trans("CantBeLessThanMinPercent");
 				setEventMessages($mesg, null, 'warnings');
 				$error++;
 				$result = -1;
 			}
-		} elseif (GETPOST('progress') < $percent)
-		{
+		} elseif (GETPOST('progress') < $percent) {
 			$mesg = '<div class="warning">'.$langs->trans("CantBeLessThanMinPercent").'</div>';
 			setEventMessages($mesg, null, 'warnings');
 			$error++;
@@ -2295,16 +2362,16 @@ if (empty($reshook))
 
 		// Check minimum price
 		$productid = GETPOST('productid', 'int');
-		if (!empty($productid))
-		{
+		if (!empty($productid)) {
 			$product = new Product($db);
 			$product->fetch($productid);
 
 			$type = $product->type;
 
 			$price_min = $product->price_min;
-			if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($object->thirdparty->price_level))
+			if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($object->thirdparty->price_level)) {
 				$price_min = $product->multiprices_min [$object->thirdparty->price_level];
+			}
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
@@ -2328,10 +2395,8 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
 			$error++;
 		}
-		if ((empty($productid) && (($pu_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $pu_ht == '') && $pu_ht_devise == '') && $object->type != Facture::TYPE_CREDIT_NOTE) 	// Unit price can be 0 but not ''
-		{
-			if ($pu_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES))
-			{
+		if ((empty($productid) && (($pu_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) || $pu_ht == '') && $pu_ht_devise == '') && $object->type != Facture::TYPE_CREDIT_NOTE) { 	// Unit price can be 0 but not ''
+			if ($pu_ht < 0 && empty($conf->global->FACTURE_ENABLE_NEGATIVE_LINES)) {
 				$langs->load("errors");
 				if ($object->type == $object::TYPE_DEPOSIT) {
 					// Using negative lines on deposit lead to headach and blocking problems when you want to consume them.
@@ -2349,12 +2414,9 @@ if (empty($reshook))
 
 		// Update line
 		if (!$error) {
-			if (empty($usercancreatemargin))
-			{
-				foreach ($object->lines as &$line)
-				{
-					if ($line->id == GETPOST('lineid'))
-					{
+			if (empty($usercancreatemargin)) {
+				foreach ($object->lines as &$line) {
+					if ($line->id == GETPOST('lineid')) {
 						$fournprice = $line->fk_fournprice;
 						$buyingprice = $line->pa_ht;
 						break;
@@ -2362,20 +2424,43 @@ if (empty($reshook))
 				}
 			}
 
-			$result = $object->updateline(GETPOST('lineid', 'int'), $description, $pu_ht, $qty, price2num(GETPOST('remise_percent'), 2),
-				$date_start, $date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $info_bits, $type,
-				GETPOST('fk_parent_line', 'int'), 0, $fournprice, $buyingprice, $label, $special_code, $array_options, price2num(GETPOST('progress', 'alpha')),
-				GETPOST('units', 'alpha'), $pu_ht_devise);
+			$result = $object->updateline(
+				GETPOST('lineid', 'int'),
+				$description,
+				$pu_ht,
+				$qty,
+				price2num(GETPOST('remise_percent'), 2),
+				$date_start,
+				$date_end,
+				$vat_rate,
+				$localtax1_rate,
+				$localtax2_rate,
+				'HT',
+				$info_bits,
+				$type,
+				GETPOST('fk_parent_line', 'int'),
+				0,
+				$fournprice,
+				$buyingprice,
+				$label,
+				$special_code,
+				$array_options,
+				price2num(GETPOST('progress', 'alpha')),
+				GETPOST('units', 'alpha'),
+				$pu_ht_devise
+			);
 
 			if ($result >= 0) {
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					// Define output language
 					$outputlangs = $langs;
 					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+					}
+					if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -2425,54 +2510,51 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	} elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier'))	// Update all lines of situation invoice
-	{
-		if (!$object->fetch($id) > 0) dol_print_error($db);
-		if (GETPOST('all_progress') != "")
-		{
+	} elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier')) {	// Update all lines of situation invoice
+		if (!$object->fetch($id) > 0) {
+			dol_print_error($db);
+		}
+		if (GETPOST('all_progress') != "") {
 			$all_progress = GETPOST('all_progress', 'int');
-			foreach ($object->lines as $line)
-			{
+			foreach ($object->lines as $line) {
 				$percent = $line->get_prev_progress($object->id);
 				if (floatval($all_progress) < floatval($percent)) {
 					$mesg = $langs->trans("Line").' '.$i.' : '.$langs->trans("CantBeLessThanMinPercent");
 					setEventMessages($mesg, null, 'warnings');
 					$result = -1;
-				} else $object->update_percent($line, $_POST['all_progress']);
+				} else {
+					$object->update_percent($line, $_POST['all_progress']);
+				}
 			}
 		}
 	} elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans("Cancel")) {
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
 		exit();
-	} // Outing situation invoice from cycle
-	elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $usercancreate)
-	{
+	} elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $usercancreate) {
+		// Outing situation invoice from cycle
 		$object->fetch($id, '', '', '', true);
 
-	    if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
-	        && $object->type == Facture::TYPE_SITUATION
-	        && $usercancreate
-	        && !$objectidnext
-	        && $object->is_last_in_cycle()
-	    	&& $usercanunvalidate
-	        )
-	    {
-	        $outingError = 0;
-	        $newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
-	        if ($newCycle > 1)
-	        {
-	            // Search credit notes
-	            $lastCycle = $object->situation_cycle_ref;
-	            $lastSituationCounter = $object->situation_counter;
-	            $linkedCreditNotesList = array();
+		if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
+			&& $object->type == Facture::TYPE_SITUATION
+			&& $usercancreate
+			&& !$objectidnext
+			&& $object->is_last_in_cycle()
+			&& $usercanunvalidate
+			) {
+			$outingError = 0;
+			$newCycle = $object->newCycle(); // we need to keep the "situation behavior" so we place it on a new situation cycle
+			if ($newCycle > 1) {
+				// Search credit notes
+				$lastCycle = $object->situation_cycle_ref;
+				$lastSituationCounter = $object->situation_counter;
+				$linkedCreditNotesList = array();
 
 				if (count($object->tab_next_situation_invoice) > 0) {
 					foreach ($object->tab_next_situation_invoice as $next_invoice) {
 						if ($next_invoice->type == Facture::TYPE_CREDIT_NOTE
 							&& $next_invoice->situation_counter == $object->situation_counter
 							&& $next_invoice->fk_facture_source == $object->id
-						  )
-						{
+						  ) {
 							$linkedCreditNotesList[] = $next_invoice->id;
 						}
 					}
@@ -2481,11 +2563,9 @@ if (empty($reshook))
 				$object->situation_cycle_ref = $newCycle;
 				$object->situation_counter = 1;
 				$object->situation_final = 0;
-				if ($object->update($user) > 0)
-				{
+				if ($object->update($user) > 0) {
 					$errors = 0;
-					if (count($linkedCreditNotesList) > 0)
-					{
+					if (count($linkedCreditNotesList) > 0) {
 						// now, credit note must follow
 						$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture ';
 						$sql .= ' SET situation_cycle_ref='.$newCycle;
@@ -2494,24 +2574,24 @@ if (empty($reshook))
 						$sql .= ' WHERE rowid IN ('.implode(',', $linkedCreditNotesList).')';
 
 						$resql = $db->query($sql);
-						if (!$resql) $errors++;
+						if (!$resql) {
+							$errors++;
+						}
 
 						// Change each progression persent on each lines
-						foreach ($object->lines as $line)
-						{
+						foreach ($object->lines as $line) {
 							// no traitement for special product
-							if ($line->product_type == 9)  continue;
+							if ($line->product_type == 9) {
+								continue;
+							}
 
 
-							if (!empty($object->tab_previous_situation_invoice))
-							{
+							if (!empty($object->tab_previous_situation_invoice)) {
 								// search the last invoice in cycle
 								$lineIndex = count($object->tab_previous_situation_invoice) - 1;
 								$searchPreviousInvoice = true;
-								while ($searchPreviousInvoice)
-								{
-									if ($object->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1)
-									{
+								while ($searchPreviousInvoice) {
+									if ($object->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1) {
 										$searchPreviousInvoice = false; // find, exit;
 										break;
 									} else {
@@ -2521,10 +2601,8 @@ if (empty($reshook))
 
 
 								$maxPrevSituationPercent = 0;
-								foreach ($object->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine)
-								{
-									if ($prevLine->id == $line->fk_prev_id)
-									{
+								foreach ($object->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine) {
+									if ($prevLine->id == $line->fk_prev_id) {
 										$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
 									}
 								}
@@ -2532,13 +2610,14 @@ if (empty($reshook))
 
 								$line->situation_percent = $line->situation_percent - $maxPrevSituationPercent;
 
-								if ($line->update() < 0) $errors++;
+								if ($line->update() < 0) {
+									$errors++;
+								}
 							}
 						}
 					}
 
-					if (!$errors)
-					{
+					if (!$errors) {
 						setEventMessages($langs->trans('Updated'), '', 'mesgs');
 						header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 					} else {
@@ -2551,36 +2630,30 @@ if (empty($reshook))
 				setEventMessages($langs->trans('ErrorFindNextSituationInvoice'), array(), 'errors');
 			}
 		}
-	} // add lines from objectlinked
-	elseif ($action == 'import_lines_from_object'
+	} elseif ($action == 'import_lines_from_object'
 		&& $usercancreate
 		&& $object->statut == Facture::STATUS_DRAFT
-		&& ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
-	{
+		&& ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION)) {
+		// add lines from objectlinked
 		$fromElement = GETPOST('fromelement');
 		$fromElementid = GETPOST('fromelementid');
 		$importLines = GETPOST('line_checkbox');
 
-		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid))
-		{
-			if ($fromElement == 'commande')
-			{
+		if (!empty($importLines) && is_array($importLines) && !empty($fromElement) && ctype_alpha($fromElement) && !empty($fromElementid)) {
+			if ($fromElement == 'commande') {
 				dol_include_once('/'.$fromElement.'/class/'.$fromElement.'.class.php');
 				$lineClassName = 'OrderLine';
-			} elseif ($fromElement == 'propal')
-			{
+			} elseif ($fromElement == 'propal') {
 				dol_include_once('/comm/'.$fromElement.'/class/'.$fromElement.'.class.php');
 				$lineClassName = 'PropaleLigne';
 			}
 			$nextRang = count($object->lines) + 1;
 			$importCount = 0;
 			$error = 0;
-			foreach ($importLines as $lineId)
-			{
+			foreach ($importLines as $lineId) {
 				$lineId = intval($lineId);
 				$originLine = new $lineClassName($db);
-				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
-				{
+				if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0) {
 					$originLine->fetch_optionals();
 					$desc = $originLine->desc;
 					$pu_ht = $originLine->subprice;
@@ -2628,8 +2701,7 @@ if (empty($reshook))
 				}
 			}
 
-			if ($error)
-			{
+			if ($error) {
 				setEventMessages($langs->trans('ErrorsOnXLines', $error), null, 'errors');
 			}
 		}
@@ -2639,7 +2711,9 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	if (empty($id)) $id = $facid;
+	if (empty($id)) {
+		$id = $facid;
+	}
 	$triggersendname = 'BILL_SENTBYMAIL';
 	$paramname = 'id';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_INVOICE_TO';
@@ -2657,21 +2731,22 @@ if (empty($reshook))
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Actions on extra fields
 			$result = $object->insertExtraFields('BILL_MODIFY');
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 		}
 
-		if ($error)
+		if ($error) {
 			$action = 'edit_extras';
+		}
 	}
 
 	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
@@ -2715,8 +2790,9 @@ if (empty($reshook))
 			}
 		}
 
-		if ($error)
+		if ($error) {
 			$action = 'edit_extras';
+		}
 	}
 }
 
@@ -2732,32 +2808,34 @@ $formmargin = new FormMargin($db);
 $soc = new Societe($db);
 $paymentstatic = new Paiement($db);
 $bankaccountstatic = new Account($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $now = dol_now();
 
 $title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Card');
 $helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
+
 llxHeader('', $title, $helpurl);
 
 // Mode creation
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$facturestatic = new Facture($db);
 	$extrafields->fetch_name_optionals_label($facturestatic->table_element);
 
 	print load_fiche_titre($langs->trans('NewBill'), '', 'bill');
 
-	if ($socid > 0)
+	if ($socid > 0) {
 		$res = $soc->fetch($socid);
+	}
 
 	$currency_code = $conf->currency;
 
 	// Load objectsrc
 	$remise_absolue = 0;
-	if (!empty($origin) && !empty($originid))
-	{
+	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
 		$regs = array();
@@ -2803,17 +2881,18 @@ if ($action == 'create')
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
 			$objectsrc->fetch($originid);
-			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
+			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 				$objectsrc->fetch_lines();
+			}
 			$objectsrc->fetch_thirdparty();
 
 			$projectid = (!empty($projectid) ? $projectid : $objectsrc->fk_project);
 			$ref_client = (!empty($objectsrc->ref_client) ? $objectsrc->ref_client : (!empty($objectsrc->ref_customer) ? $objectsrc->ref_customer : ''));
-			$ref_int = (!empty($objectsrc->ref_int) ? $objectsrc->ref_int : '');
 
 			// only if socid not filled else it's allready done upper
-			if (empty($socid))
+			if (empty($socid)) {
 				$soc = $objectsrc->thirdparty;
+			}
 
 			$dateinvoice = (empty($dateinvoice) ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $dateinvoice);
 
@@ -2844,10 +2923,13 @@ if ($action == 'create')
 				$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_percent) ? $soc->remise_percent : 0));
 				$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 
-				if (!empty($conf->multicurrency->enabled))
-				{
-					if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
-					if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
+				if (!empty($conf->multicurrency->enabled)) {
+					if (!empty($objectsrc->multicurrency_code)) {
+						$currency_code = $objectsrc->multicurrency_code;
+					}
+					if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
+						$currency_tx = $objectsrc->multicurrency_tx;
+					}
 				}
 
 				// Replicate extrafields
@@ -2863,7 +2945,9 @@ if ($action == 'create')
 		$remise_absolue 	= 0;
 		$dateinvoice = (empty($dateinvoice) ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $dateinvoice); // Do not set 0 here (0 for a date is 1970)
 
-		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+			$currency_code = $soc->multicurrency_code;
+		}
 	}
 
 	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
@@ -2876,7 +2960,9 @@ if ($action == 'create')
 		$mode_reglement_id = GETPOST("mode_reglement_id");
 	}
 
-	if (!empty($soc->id)) $absolute_discount = $soc->getAvailableDiscounts();
+	if (!empty($soc->id)) {
+		$absolute_discount = $soc->getAvailableDiscounts();
+	}
 	$note_public = $object->getDefaultCreateValueFor('note_public', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_public : null));
 	$note_private = $object->getDefaultCreateValueFor('note_private', ((!empty($origin) && !empty($originid) && is_object($objectsrc) && !empty($conf->global->FACTURE_REUSE_NOTES_ON_CREATE_FROM)) ? $objectsrc->note_private : null));
 
@@ -2887,13 +2973,11 @@ if ($action == 'create')
 		print ajax_combobox('situations');
 	}
 
-	if ($origin == 'contrat')
-	{
+	if ($origin == 'contrat') {
 		$langs->load("admin");
 		$text = $langs->trans("ToCreateARecurringInvoice");
 		$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGene", $langs->transnoentitiesnoconv("MenuFinancial"), $langs->transnoentitiesnoconv("BillsCustomers"), $langs->transnoentitiesnoconv("ListOfTemplates"));
-		if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE))
-		{
+		if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE)) {
 			$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
 		}
 		print info_admin($text, 0, 0, 0).'<br>';
@@ -2902,7 +2986,9 @@ if ($action == 'create')
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST" id="formtocreate" name="formtocreate">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	if ($soc->id > 0) print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
+	if ($soc->id > 0) {
+		print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
+	}
 	print '<input name="ref" type="hidden" value="provisoire">';
 	print '<input name="ref_client" type="hidden" value="'.$ref_client.'">';
 	print '<input name="force_cond_reglement_id" type="hidden" value="0">';
@@ -2911,25 +2997,25 @@ if ($action == 'create')
 	print '<input type="hidden" name="origin" value="'.$origin.'">';
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
 	print '<input type="hidden" name="originentity" value="'.GETPOST('originentity').'">';
-	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
+	if (!empty($currency_tx)) {
+		print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
+	}
 
 	print dol_get_fiche_head('');
 
 	print '<table class="border centpercent">';
 
 	// Ref
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans('Draft').'</td></tr>';
+	//print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans('Draft').'</td></tr>';
 
 	$exampletemplateinvoice = new FactureRec($db);
 	$invoice_predefined = new FactureRec($db);
-	if (empty($origin) && empty($originid) && GETPOST('fac_rec', 'int') > 0)
-	{
+	if (empty($origin) && empty($originid) && GETPOST('fac_rec', 'int') > 0) {
 		$invoice_predefined->fetch(GETPOST('fac_rec', 'int'));
 	}
 
 	// Thirdparty
-	if ($soc->id > 0 && (!GETPOST('fac_rec', 'int') || !empty($invoice_predefined->frequency)))
-	{
+	if ($soc->id > 0 && (!GETPOST('fac_rec', 'int') || !empty($invoice_predefined->frequency))) {
 		// If thirdparty known and not a predefined invoiced without a recurring rule
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
@@ -2938,14 +3024,14 @@ if ($action == 'create')
 		// Outstanding Bill
 		$arrayoutstandingbills = $soc->getOutstandingBills();
 		$outstandingBills = $arrayoutstandingbills['opened'];
-		print ' ('.$langs->trans('CurrentOutstandingBill').': ';
+		print ' - <span class="opacitymedium">'.$langs->trans('CurrentOutstandingBill').':</span> ';
 		print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
-		if ($soc->outstanding_limit != '')
-		{
-			if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+		if ($soc->outstanding_limit != '') {
+			if ($outstandingBills > $soc->outstanding_limit) {
+				print img_warning($langs->trans("OutstandingBillReached"));
+			}
 			print ' / '.price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
 		}
-		print ')';
 		print '</td>';
 		print '</tr>'."\n";
 	} else {
@@ -2953,8 +3039,7 @@ if ($action == 'create')
 		print '<td colspan="2">';
 		print img_picto('', 'company').$form->select_company($soc->id, 'socid', '((s.client = 1 OR s.client = 3) AND s.status=1)', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// Option to reload page to retrieve customer informations.
-		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
-		{
+		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
@@ -2975,49 +3060,52 @@ if ($action == 'create')
 			});
 			</script>';
 		}
-		if (!GETPOST('fac_rec', 'int')) print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=3&fournisseur=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
+		if (!GETPOST('fac_rec', 'int')) {
+			print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=3&fournisseur=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
+		}
 		print '</td>';
 		print '</tr>'."\n";
 	}
 
 	// Overwrite some values if creation of invoice is from a predefined invoice
-	if (empty($origin) && empty($originid) && GETPOST('fac_rec', 'int') > 0)
-	{
+	if (empty($origin) && empty($originid) && GETPOST('fac_rec', 'int') > 0) {
 		$invoice_predefined->fetch(GETPOST('fac_rec', 'int'));
 
 		$dateinvoice = $invoice_predefined->date_when; // To use next gen date by default later
-		if (empty($projectid)) $projectid = $invoice_predefined->fk_project;
+		if (empty($projectid)) {
+			$projectid = $invoice_predefined->fk_project;
+		}
 		$cond_reglement_id = $invoice_predefined->cond_reglement_id;
 		$mode_reglement_id = $invoice_predefined->mode_reglement_id;
 		$fk_account = $invoice_predefined->fk_account;
 		$note_public = $invoice_predefined->note_public;
 		$note_private = $invoice_predefined->note_private;
 
-		if (!empty($invoice_predefined->multicurrency_code)) $currency_code = $invoice_predefined->multicurrency_code;
-		if (!empty($invoice_predefined->multicurrency_tx)) $currency_tx = $invoice_predefined->multicurrency_tx;
+		if (!empty($invoice_predefined->multicurrency_code)) {
+			$currency_code = $invoice_predefined->multicurrency_code;
+		}
+		if (!empty($invoice_predefined->multicurrency_tx)) {
+			$currency_tx = $invoice_predefined->multicurrency_tx;
+		}
 
 		$sql = 'SELECT r.rowid, r.titre as title, r.total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_rec as r';
 		$sql .= ' WHERE r.fk_soc = '.$invoice_predefined->socid;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
 
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				print '<tr><td>'.$langs->trans('CreateFromRepeatableInvoice').'</td><td>';
 				//print '<input type="hidden" name="fac_rec" id="fac_rec" value="'.GETPOST('fac_rec', 'int').'">';
 				print '<select class="flat" id="fac_rec" name="fac_rec">'; // We may want to change the template to use
 				print '<option value="0" selected></option>';
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$objp = $db->fetch_object($resql);
 					print '<option value="'.$objp->rowid.'"';
-					if (GETPOST('fac_rec', 'int') == $objp->rowid)
-					{
+					if (GETPOST('fac_rec', 'int') == $objp->rowid) {
 						print ' selected';
 						$exampletemplateinvoice->fetch(GETPOST('fac_rec', 'int'));
 					}
@@ -3026,8 +3114,7 @@ if ($action == 'create')
 				}
 				print '</select>';
 				// Option to reload page to retrieve customer informations. Note, this clear other input
-				if (empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED))
-				{
+				if (empty($conf->global->RELOAD_PAGE_ON_TEMPLATE_CHANGE_DISABLED)) {
 					print '<script type="text/javascript">
         			$(document).ready(function() {
         				$("#fac_rec").change(function() {
@@ -3049,7 +3136,6 @@ if ($action == 'create')
 	}
 
 	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td colspan="2">';
-
 	print '<div class="tagtable">'."\n";
 
 	// Standard invoice
@@ -3057,32 +3143,68 @@ if ($action == 'create')
 	$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOST('type') == 0 ? ' checked' : '').'> ';
 	$tmp  = $tmp.'<label for="radio_standard" >'.$langs->trans("InvoiceStandardAsk").'</label>';
 	$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3);
+	print '<table class="nobordernopadding"><tr>';
+	print '<td>';
 	print $desc;
+	print '</td>';
+	if ((($origin == 'propal') || ($origin == 'commande')) && (!empty($originid))) {
+		/*print '<td class="nowrap" style="padding-left: 5px">';
+		$arraylist = array(
+			//'amount' => $langs->transnoentitiesnoconv('FixAmount', $langs->transnoentitiesnoconv('Deposit')),
+			//'variable' => $langs->transnoentitiesnoconv('VarAmountOneLine', $langs->transnoentitiesnoconv('Deposit')),
+			'variablealllines' => $langs->transnoentitiesnoconv('VarAmountAllLines')
+		);
+		print $form->selectarray('typestandard', $arraylist, GETPOST('typestandard', 'aZ09'), 0, 0, 0, '', 1);
+		print '</td>';*/
+		print '<td class="nowrap" style="padding-left: 15px">';
+		print '<span class="opacitymedium">'.$langs->trans('PercentOfOriginalObject').'</span>:<input class="right" placeholder="100%" type="text" id="valuestandardinvoice" name="valuestandardinvoice" size="3" value="'.(GETPOSTISSET('valuestandardinvoice') ? GETPOST('valuestandardinvoice', 'alpha') : '100%').'"/>';
+		print '</td>';
+	}
+	print '</tr></table>';
 	print '</div></div>';
 
-	if ((empty($origin)) || ((($origin == 'propal') || ($origin == 'commande')) && (!empty($originid))))
-	{
-		// Deposit
-		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT))
-   		{
+	if ((empty($origin)) || ((($origin == 'propal') || ($origin == 'commande')) && (!empty($originid)))) {
+		// Deposit - Down payment
+		if (empty($conf->global->INVOICE_DISABLE_DEPOSIT)) {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" id="radio_deposit" name="type" value="3"'.(GETPOST('type') == 3 ? ' checked' : '').'> ';
 			print '<script type="text/javascript" language="javascript">
     		jQuery(document).ready(function() {
+    			jQuery("#typestandardinvoice, #valuestandardinvoice").click(function() {
+    				jQuery("#radio_standard").prop("checked", true);
+    			});
     			jQuery("#typedeposit, #valuedeposit").click(function() {
     				jQuery("#radio_deposit").prop("checked", true);
     			});
+				jQuery("#typedeposit").change(function() {
+					console.log("We change type of down payment");
+					jQuery("#radio_deposit").prop("checked", true);
+					setRadioForTypeOfIncoice();
+				});
+    			jQuery("#radio_standard, #radio_deposit, #radio_replacement, #radio_template").change(function() {
+					setRadioForTypeOfIncoice();
+				});
+				function setRadioForTypeOfIncoice() {
+					console.log("Change radio");
+					if (jQuery("#radio_deposit").prop("checked") && (jQuery("#typedeposit").val() == \'amount\' || jQuery("#typedeposit").val() == \'variable\')) {
+						jQuery(".checkforselect").prop("disabled", true);
+						jQuery(".checkforselect").prop("checked", false);
+					} else {
+						jQuery(".checkforselect").prop("disabled", false);
+						jQuery(".checkforselect").prop("checked", true);
+					}
+				};
     		});
     		</script>';
 
 			$tmp  = $tmp.'<label for="radio_deposit" >'.$langs->trans("InvoiceDeposit").'</label>';
 			$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceDepositDesc"), 1, 'help', '', 0, 3);
-			print '<table class="nobordernopadding"><tr><td>';
+			print '<table class="nobordernopadding"><tr>';
+			print '<td>';
 			print $desc;
 			print '</td>';
-			if (($origin == 'propal') || ($origin == 'commande'))
-			{
-				print '<td class="nowrap" style="padding-left: 5px">';
+			if (($origin == 'propal') || ($origin == 'commande')) {
+				print '<td class="nowrap" style="padding-left: 15px">';
 				$arraylist = array(
 					'amount' => $langs->transnoentitiesnoconv('FixAmount', $langs->transnoentitiesnoconv('Deposit')),
 					'variable' => $langs->transnoentitiesnoconv('VarAmountOneLine', $langs->transnoentitiesnoconv('Deposit')),
@@ -3090,18 +3212,18 @@ if ($action == 'create')
 				);
 				print $form->selectarray('typedeposit', $arraylist, GETPOST('typedeposit', 'aZ09'), 0, 0, 0, '', 1);
 				print '</td>';
-				print '<td class="nowrap" style="padding-left: 5px">'.$langs->trans('Value').':<input type="text" id="valuedeposit" name="valuedeposit" size="3" value="'.GETPOST('valuedeposit', 'int').'"/>';
+				print '<td class="nowrap" style="padding-left: 5px">';
+				print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.GETPOST('valuedeposit', 'int').'"/>';
+				print '</td>';
 			}
-			print '</td></tr></table>';
+			print '</tr></table>';
 
 			print '</div></div>';
-   		}
+		}
 	}
 
-	if ($socid > 0)
-	{
-		if (!empty($conf->global->INVOICE_USE_SITUATION))
-		{
+	if ($socid > 0) {
+		if (!empty($conf->global->INVOICE_USE_SITUATION)) {
 			// First situation invoice
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input id="radio_situation" type="radio" name="type" value="5"'.(GETPOST('type') == 5 ? ' checked' : '').'> ';
@@ -3115,13 +3237,15 @@ if ($action == 'create')
 
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" name="type" value="5"'.(GETPOST('type') == 5 && GETPOST('originid', 'int') ? ' checked' : '');
-			if ($opt == ('<option value ="0" selected>'.$langs->trans('NoSituations').'</option>') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande'))
+			if ($opt == ('<option value ="0" selected>'.$langs->trans('NoSituations').'</option>') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande')) {
 				$tmp .= ' disabled';
+			}
 			$tmp .= '> ';
 			$text = '<label>'.$tmp.$langs->trans("InvoiceSituationAsk").'</label> ';
 			$text .= '<select class="flat" id="situations" name="situations"';
-			if ($opt == ('<option value ="0" selected>'.$langs->trans('NoSituations').'</option>') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande'))
+			if ($opt == ('<option value ="0" selected>'.$langs->trans('NoSituations').'</option>') || (GETPOST('origin') && GETPOST('origin') != 'facture' && GETPOST('origin') != 'commande')) {
 				$text .= ' disabled';
+			}
 			$text .= '>';
 			$text .= $opt;
 			$text .= '</select>';
@@ -3131,8 +3255,7 @@ if ($action == 'create')
 		}
 
 		// Replacement
-		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT))
-		{
+		if (empty($conf->global->INVOICE_DISABLE_REPLACEMENT)) {
 			// Type de facture
 			$facids = $facturestatic->list_replacable_invoices($soc->id);
 			if ($facids < 0) {
@@ -3141,11 +3264,11 @@ if ($action == 'create')
 			}
 			$options = "";
 			if (is_array($facids)) {
-				foreach ($facids as $facparam)
-				{
+				foreach ($facids as $facparam) {
 					$options .= '<option value="'.$facparam ['id'].'"';
-					if ($facparam ['id'] == $_POST['fac_replacement'])
+					if ($facparam ['id'] == $_POST['fac_replacement']) {
 						$options .= ' selected';
+					}
 					$options .= '>'.$facparam ['ref'];
 					$options .= ' ('.$facturestatic->LibStatut(0, $facparam ['status']).')';
 					$options .= '</option>';
@@ -3155,7 +3278,9 @@ if ($action == 'create')
 			print '<!-- replacement line -->';
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" name="type" id="radio_replacement" value="1"'.(GETPOST('type') == 1 ? ' checked' : '');
-			if (!$options || $invoice_predefined->id > 0) $tmp .= ' disabled';
+			if (!$options || $invoice_predefined->id > 0) {
+				$tmp .= ' disabled';
+			}
 			$tmp .= '> ';
 			print '<script type="text/javascript" language="javascript">
     		jQuery(document).ready(function() {
@@ -3166,8 +3291,9 @@ if ($action == 'create')
     		</script>';
 			$text = '<label>'.$tmp.$langs->trans("InvoiceReplacementAsk").'</label>';
 			$text .= '<select class="flat" name="fac_replacement" id="fac_replacement"';
-			if (!$options || $invoice_predefined->id > 0)
+			if (!$options || $invoice_predefined->id > 0) {
 				$text .= ' disabled';
+			}
 			$text .= '>';
 			if ($options) {
 				$text .= '<option value="-1">&nbsp;</option>';
@@ -3181,8 +3307,7 @@ if ($action == 'create')
 			print '</div></div>';
 		}
 	} else {
-		if (!empty($conf->global->INVOICE_USE_SITUATION))
-		{
+		if (!empty($conf->global->INVOICE_USE_SITUATION)) {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 			$tmp = '<input type="radio" name="type" id="radio_situation" value="0" disabled> ';
 			$text = '<label>'.$tmp.$langs->trans("InvoiceFirstSituationAsk").'</label> ';
@@ -3210,24 +3335,19 @@ if ($action == 'create')
 	}
 
 
-	if (empty($origin))
-	{
-		if ($socid > 0)
-		{
+	if (empty($origin)) {
+		if ($socid > 0) {
 			// Credit note
-			if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE))
-			{
+			if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) {
 				// Show link for credit note
 				$facids = $facturestatic->list_qualified_avoir_invoices($soc->id);
-				if ($facids < 0)
-				{
+				if ($facids < 0) {
 					dol_print_error($db, $facturestatic);
 					exit;
 				}
 				$optionsav = "";
 				$newinvoice_static = new Facture($db);
-				foreach ($facids as $key => $valarray)
-				{
+				foreach ($facids as $key => $valarray) {
 					$newinvoice_static->id = $key;
 					$newinvoice_static->ref = $valarray ['ref'];
 					$newinvoice_static->statut = $valarray ['status'];
@@ -3235,8 +3355,9 @@ if ($action == 'create')
 					$newinvoice_static->paye = $valarray ['paye'];
 
 					$optionsav .= '<option value="'.$key.'"';
-					if ($key == GETPOST('fac_avoir'))
+					if ($key == GETPOST('fac_avoir')) {
 						$optionsav .= ' selected';
+					}
 					$optionsav .= '>';
 					$optionsav .= $newinvoice_static->ref;
 					$optionsav .= ' ('.$newinvoice_static->getLibStatut(1, $valarray ['paymentornot']).')';
@@ -3245,7 +3366,9 @@ if ($action == 'create')
 
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp = '<input type="radio" id="radio_creditnote" name="type" value="2"'.(GETPOST('type') == 2 ? ' checked' : '');
-				if ((!$optionsav && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) || $invoice_predefined->id > 0) $tmp .= ' disabled';
+				if ((!$optionsav && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) || $invoice_predefined->id > 0) {
+					$tmp .= ' disabled';
+				}
 				$tmp .= '> ';
 				// Show credit note options only if we checked credit note
 				print '<script type="text/javascript" language="javascript">
@@ -3265,8 +3388,9 @@ if ($action == 'create')
 				$text = '<label>'.$tmp.$langs->transnoentities("InvoiceAvoirAsk").'</label> ';
 				// $text.='<input type="text" value="">';
 				$text .= '<select class="flat valignmiddle" name="fac_avoir" id="fac_avoir"';
-				if (!$optionsav || $invoice_predefined->id > 0)
+				if (!$optionsav || $invoice_predefined->id > 0) {
 					$text .= ' disabled';
+				}
 				$text .= '>';
 				if ($optionsav) {
 					$text .= '<option value="-1"></option>';
@@ -3287,8 +3411,11 @@ if ($action == 'create')
 			}
 		} else {
 			print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
-			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) $tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
-			else $tmp = '<input type="radio" name="type" id="radio_creditnote" value="2" > ';
+			if (empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
+				$tmp = '<input type="radio" name="type" id="radio_creditnote" value="0" disabled> ';
+			} else {
+				$tmp = '<input type="radio" name="type" id="radio_creditnote" value="2" > ';
+			}
 			$text = '<label>'.$tmp.$langs->trans("InvoiceAvoir").'</label> ';
 			$text .= '<span class="opacitymedium">('.$langs->trans("YouMustCreateInvoiceFromThird").')</span> ';
 			$desc = $form->textwithpicto($text, $langs->transnoentities("InvoiceAvoirDesc"), 1, 'help', '', 0, 3);
@@ -3309,13 +3436,11 @@ if ($action == 'create')
 	print '</div>';
 
 
-	if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) // Hidden conf
-	{
+	if (!empty($conf->global->INVOICE_USE_DEFAULT_DOCUMENT)) { // Hidden conf
 		// Add auto select default document model
 		$listtType = array(Facture::TYPE_STANDARD, Facture::TYPE_REPLACEMENT, Facture::TYPE_CREDIT_NOTE, Facture::TYPE_DEPOSIT, Facture::TYPE_SITUATION);
 		$jsListType = '';
-		foreach ($listtType as $type)
-		{
+		foreach ($listtType as $type) {
 			$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$type;
 			$curent = !empty($conf->global->{$thisTypeConfName}) ? $conf->global->{$thisTypeConfName}:$conf->global->FACTURE_ADDON_PDF;
 			$jsListType .= (!empty($jsListType) ? ',' : '').'"'.$type.'":"'.$curent.'"';
@@ -3345,8 +3470,7 @@ if ($action == 'create')
 
 	print '</td></tr>';
 
-	if ($socid > 0)
-	{
+	if ($socid > 0) {
 		// Discounts for third party
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="2">';
 
@@ -3366,8 +3490,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Date point of tax
-	if (!empty($conf->global->INVOICE_POINTOFTAX_DATE))
-	{
+	if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 		print '<tr><td class="fieldrequired">'.$langs->trans('DatePointOfTax').'</td><td colspan="2">';
 		$date_pointoftax = dol_mktime(12, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
 		print $form->selectDate($date_pointoftax ? $date_pointoftax : -1, 'date_pointoftax', '', '', '', "add", 1, 1);
@@ -3436,8 +3559,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Bank Account
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		if (GETPOSTISSET('fk_account')) {
 			$fk_account = GETPOST('fk_account', 'int');
 		}
@@ -3448,8 +3570,7 @@ if ($action == 'create')
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
 		print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
@@ -3458,15 +3579,13 @@ if ($action == 'create')
 	}
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled))
-	{
+	if (!empty($conf->incoterm->enabled)) {
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).'</label></td>';
 		print '<td colspan="2" class="maxwidthonsmartphone">';
 		$incoterm_id = GETPOST('incoterm_id');
 		$incoterm_location = GETPOST('location_incoterms');
-		if (empty($incoterm_id))
-		{
+		if (empty($incoterm_id)) {
 			$incoterm_id = (!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : $soc->fk_incoterms);
 			$incoterm_location = (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : $soc->location_incoterms);
 		}
@@ -3507,8 +3626,7 @@ if ($action == 'create')
 	print "</td></tr>";
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
+	if (!empty($conf->multicurrency->enabled)) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td colspan="2" class="maxwidthonsmartphone">';
@@ -3518,10 +3636,11 @@ if ($action == 'create')
 
 	// Help of substitution key
 	$htmltext = '';
-	if (GETPOST('fac_rec', 'int') > 0)
-	{
+	if (GETPOST('fac_rec', 'int') > 0) {
 		$dateexample = ($newdateinvoice ? $newdateinvoice : $dateinvoice);
-		if (empty($dateexample)) $dateexample = dol_now();
+		if (empty($dateexample)) {
+			$dateexample = dol_now();
+		}
 		$substitutionarray = array(
 			'__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ht).')',
 			'__TOTAL_TTC__' =>  $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ttc).')',
@@ -3537,8 +3656,7 @@ if ($action == 'create')
 		);
 
 		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
-		foreach ($substitutionarray as $key => $val)
-		{
+		foreach ($substitutionarray as $key => $val) {
 			$htmltext .= $key.' = '.$langs->trans($val).'<br>';
 		}
 		$htmltext .= '</i>';
@@ -3554,8 +3672,7 @@ if ($action == 'create')
 	print $doleditor->Create(1);
 
 	// Private note
-	if (empty($user->socid))
-	{
+	if (empty($user->socid)) {
 		print '<tr>';
 		print '<td class="tdtop">';
 		print $form->textwithpicto($langs->trans('NotePrivate'), $htmltext);
@@ -3568,8 +3685,9 @@ if ($action == 'create')
 	}
 
 	// Lines from source (TODO Show them also when creating invoice from template invoice)
-	if (!empty($origin) && !empty($originid) && is_object($objectsrc))
-	{
+	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
+		$langs->loadLangs(array('orders', 'propal'));
+
 		// TODO for compatibility
 		if ($origin == 'contrat') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
@@ -3578,13 +3696,12 @@ if ($action == 'create')
 			$objectsrc->update_price(1, - 1, 1);
 		}
 
-		print "\n<!-- ".$classname." info -->";
-		print "\n";
-		print '<input type="hidden" name="amount"         value="'.$objectsrc->total_ht.'">'."\n";
-		print '<input type="hidden" name="total"          value="'.$objectsrc->total_ttc.'">'."\n";
-		print '<input type="hidden" name="tva"            value="'.$objectsrc->total_tva.'">'."\n";
-		print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-		print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+		print "\n<!-- Show ref of origin ".$classname." -->\n";
+		print '<input type="hidden" name="amount"   value="'.$objectsrc->total_ht.'">'."\n";
+		print '<input type="hidden" name="total"    value="'.$objectsrc->total_ttc.'">'."\n";
+		print '<input type="hidden" name="tva"      value="'.$objectsrc->total_tva.'">'."\n";
+		print '<input type="hidden" name="origin"   value="'.$objectsrc->element.'">';
+		print '<input type="hidden" name="originid" value="'.$objectsrc->id.'">';
 
 		switch (get_class($objectsrc)) {
 			case 'Propal':
@@ -3606,30 +3723,29 @@ if ($action == 'create')
 				$newclassname = get_class($objectsrc);
 		}
 
-		print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1);
+		// Ref of origin
+		print '<tr><td>'.$langs->trans($newclassname).'</td>';
+		print '<td colspan="2">';
+		print $objectsrc->getNomUrl(1);
 		// We check if Origin document (id and type is known) has already at least one invoice attached to it
 		$objectsrc->fetchObjectLinked($originid, $origin, '', 'facture');
-		if (is_array($objectsrc->linkedObjects['facture']) && count($objectsrc->linkedObjects['facture']) >= 1)
-		{
+		if (is_array($objectsrc->linkedObjects['facture']) && count($objectsrc->linkedObjects['facture']) >= 1) {
 			setEventMessages('WarningBillExist', null, 'warnings');
-			echo ' ('.$langs->trans('LatestRelatedBill').end($objectsrc->linkedObjects['facture'])->getNomUrl(1).')';
+			echo ' - '.$langs->trans('LatestRelatedBill').' '.end($objectsrc->linkedObjects['facture'])->getNomUrl(1);
 		}
 		echo '</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td colspan="2">'.price($objectsrc->total_ht).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="2">'.price($objectsrc->total_tva)."</td></tr>";
-		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1
-		{
+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) {		// Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax1)."</td></tr>";
 		}
 
-		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2
-		{
+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) {		// Localtax2
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td colspan="2">'.price($objectsrc->total_localtax2)."</td></tr>";
 		}
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="2">'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td colspan="2">'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -3676,15 +3792,16 @@ if ($action == 'create')
 	// fetch optionals attributes and labels
 	$extrafields->fetch_name_optionals_label($object->table_element);
 
-	if ($user->socid > 0 && $user->socid != $object->socid)
-	{
+	if ($user->socid > 0 && $user->socid != $object->socid) {
 		accessforbidden('', 0, 1);
 	}
 
 	$result = $object->fetch_thirdparty();
 
 	$result = $soc->fetch($object->socid);
-	if ($result < 0) dol_print_error($db);
+	if ($result < 0) {
+		dol_print_error($db);
+	}
 	$selleruserevenustamp = $mysoc->useRevenueStamp();
 
 	$totalpaye = $object->getSommePaiement();
@@ -3699,8 +3816,7 @@ if ($action == 'create')
 	// $resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
 	$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
 
-	if ($object->paye)
-	{
+	if ($object->paye) {
 		$resteapayer = 0;
 	}
 	$resteapayeraffiche = $resteapayer;
@@ -3733,9 +3849,13 @@ if ($action == 'create')
 
 	// Confirmation de la conversion de l'avoir en reduc
 	if ($action == 'converttoreduc') {
-		if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_SITUATION) $type_fac = 'ExcessReceived';
-		elseif ($object->type == Facture::TYPE_CREDIT_NOTE) $type_fac = 'CreditNote';
-		elseif ($object->type == Facture::TYPE_DEPOSIT) $type_fac = 'Deposit';
+		if ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_SITUATION) {
+			$type_fac = 'ExcessReceived';
+		} elseif ($object->type == Facture::TYPE_CREDIT_NOTE) {
+			$type_fac = 'CreditNote';
+		} elseif ($object->type == Facture::TYPE_DEPOSIT) {
+			$type_fac = 'Deposit';
+		}
 		$text = $langs->trans('ConfirmConvertToReduc', strtolower($langs->transnoentities($type_fac)));
 		$text .= '<br>'.$langs->trans('ConfirmConvertToReduc2');
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('ConvertToReduc'), $text, 'confirm_converttoreduc', '', "yes", 2);
@@ -3746,8 +3866,7 @@ if ($action == 'create')
 		$text = $langs->trans('ConfirmDeleteBill', $object->ref);
 		$formquestion = array();
 
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->statut >= 1)
-		{
+		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $object->statut >= 1) {
 			$qualified_for_stock_change = 0;
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
@@ -3755,14 +3874,15 @@ if ($action == 'create')
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
-			if ($qualified_for_stock_change)
-			{
+			if ($qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
 				$label = $object->type == Facture::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockDecrease") : $langs->trans("SelectWarehouseForStockIncrease");
 				$forcecombo = 0;
-				if ($conf->browser->name == 'ie') $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				if ($conf->browser->name == 'ie') {
+					$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+				}
 				$formquestion = array(
 					// 'text' => $langs->trans("ConfirmClone"),
 					// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
@@ -3780,24 +3900,22 @@ if ($action == 'create')
 
 	// Confirmation to remove invoice from cycle
 	if ($action == 'situationout') {
-	    $text = $langs->trans('ConfirmRemoveSituationFromCycle', $object->ref);
-	    $label = $langs->trans("ConfirmOuting");
-	    $formquestion = array();
-	    // remove situation from cycle
-	    if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
-	        && $usercancreate
-	        && !$objectidnext
-	        && $object->is_last_in_cycle()
-	    	&& $usercanunvalidate
-	        )
-	    {
-	        $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1);
+		$text = $langs->trans('ConfirmRemoveSituationFromCycle', $object->ref);
+		$label = $langs->trans("ConfirmOuting");
+		$formquestion = array();
+		// remove situation from cycle
+		if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
+			&& $usercancreate
+			&& !$objectidnext
+			&& $object->is_last_in_cycle()
+			&& $usercanunvalidate
+			) {
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $label, $text, 'confirm_situationout', $formquestion, "yes", 1);
 		}
 	}
 
 	// Confirmation of validation
-	if ($action == 'valid')
-	{
+	if ($action == 'valid') {
 		// we check object has a draft number
 		$objectref = substr($object->ref, 1, 4);
 		if ($objectref == 'PROV') {
@@ -3821,8 +3939,7 @@ if ($action == 'create')
 		}
 		$formquestion = array();
 
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
-		{
+		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 			$qualified_for_stock_change = 0;
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
@@ -3830,8 +3947,7 @@ if ($action == 'create')
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
-			if ($qualified_for_stock_change)
-			{
+			if ($qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -3854,8 +3970,7 @@ if ($action == 'create')
 									array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value));
 			}
 		}
-		if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->total_ttc < 0) 		// Can happen only if $conf->global->FACTURE_ENABLE_NEGATIVE is on
-		{
+		if ($object->type != Facture::TYPE_CREDIT_NOTE && $object->total_ttc < 0) { 		// Can happen only if $conf->global->FACTURE_ENABLE_NEGATIVE is on
 			$text .= '<br>'.img_warning().' '.$langs->trans("ErrorInvoiceOfThisTypeMustBePositive");
 		}
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, (($object->type != Facture::TYPE_CREDIT_NOTE && $object->total_ttc < 0) ? "no" : "yes"), 2);
@@ -3866,8 +3981,7 @@ if ($action == 'create')
 		$text = $langs->trans('ConfirmUnvalidateBill', $object->ref);
 		$formquestion = array();
 
-		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
-		{
+		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 			$qualified_for_stock_change = 0;
 			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
@@ -3875,8 +3989,7 @@ if ($action == 'create')
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
-			if ($qualified_for_stock_change)
-			{
+			if ($qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -3976,8 +4089,7 @@ if ($action == 'create')
 		}
 	}
 
-	if ($action == 'deletepayment')
-	{
+	if ($action == 'deletepayment') {
 		$payment_id = GETPOST('paiement_id');
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&paiement_id='.$payment_id, $langs->trans('DeletePayment'), $langs->trans('ConfirmDeletePayment'), 'confirm_delete_paiement', '', 'no', 1);
 	}
@@ -3988,8 +4100,7 @@ if ($action == 'create')
 	}
 
 	// Clone confirmation
-	if ($action == 'clone')
-	{
+	if ($action == 'clone') {
 		// Create an array for form
 		$formquestion = array(
 			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company($object->socid, 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', 1)),
@@ -3999,8 +4110,7 @@ if ($action == 'create')
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250);
 	}
 
-	if ($action == "remove_file_comfirm")
-	{
+	if ($action == "remove_file_comfirm") {
 		$file = GETPOST('file', 'alpha');
 
 		$formconfirm = $form->formconfirm(
@@ -4010,14 +4120,18 @@ if ($action == 'create')
 			'remove_file',
 			'',
 			'no',
-			2);
+			2
+		);
 	}
 
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid, 'remainingtopay' => &$resteapayer);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -4038,14 +4152,14 @@ if ($action == 'create')
 	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	}
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($usercancreate)
-		{
+		if ($usercancreate) {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 			}
@@ -4108,9 +4222,11 @@ if ($action == 'create')
 		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->transnoentities("InvoiceHasAvoir");
 		$i = 0;
 		foreach ($facidavoir as $id) {
-			if ($i == 0)
+			if ($i == 0) {
 				print ' ';
-			else print ',';
+			} else {
+				print ',';
+			}
 			$facavoir = new Facture($db);
 			$facavoir->fetch($id);
 			print $facavoir->getNomUrl(1);
@@ -4136,8 +4252,7 @@ if ($action == 'create')
 		}
 	}
 
-	if ($object->fk_fac_rec_source > 0)
-	{
+	if ($object->fk_fac_rec_source > 0) {
 		$tmptemplate = new FactureRec($db);
 		$result = $tmptemplate->fetch($object->fk_fac_rec_source);
 		if ($result > 0) {
@@ -4165,8 +4280,9 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateInvoice');
 	print '</td>';
-	if ($action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
+	if ($action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 
@@ -4179,8 +4295,7 @@ if ($action == 'create')
 
 	print '</tr>';
 
-	if (!empty($conf->global->INVOICE_POINTOFTAX_DATE))
-	{
+	if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 		// Date invoice
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
@@ -4202,12 +4317,12 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercancreate)
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editconditions' && $usercancreate) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE)
-	{
+	if ($object->type != Facture::TYPE_CREDIT_NOTE) {
 		if ($action == 'editconditions') {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		} else {
@@ -4223,12 +4338,12 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateMaxPayment');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercancreate)
+	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && $usercancreate) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE)
-	{
+	if ($object->type != Facture::TYPE_CREDIT_NOTE) {
 		if ($action == 'editpaymentterm') {
 			$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date_lim_reglement, 'paymentterm');
 		} else {
@@ -4247,12 +4362,12 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && $usercancreate)
+	if ($action != 'editmode' && $usercancreate) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
-	if ($action == 'editmode')
-	{
+	if ($action == 'editmode') {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
 	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->mode_reglement_id, 'none', 'CRDT');
@@ -4260,16 +4375,16 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
+	if (!empty($conf->multicurrency->enabled)) {
 		// Multicurrency code
 		print '<tr>';
 		print '<td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
-		if ($usercancreate && $action != 'editmulticurrencycode' && !empty($object->brouillon))
+		if ($usercancreate && $action != 'editmulticurrencycode' && !empty($object->brouillon)) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		$htmlname = (($usercancreate && $action == 'editmulticurrencycode') ? 'multicurrency_code' : 'none');
@@ -4277,15 +4392,15 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Multicurrency rate
-		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
-		{
+		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 			print '<tr>';
 			print '<td>';
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
-			if ($usercancreate && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
+			if ($usercancreate && $action != 'editmulticurrencyrate' && !empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td>';
 			if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
@@ -4306,18 +4421,17 @@ if ($action == 'create')
 	}
 
 	// Bank Account
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('BankAccount');
 		print '<td>';
-		if (($action != 'editbankaccount') && $usercancreate)
+		if (($action != 'editbankaccount') && $usercancreate) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
-		if ($action == 'editbankaccount')
-		{
+		if ($action == 'editbankaccount') {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 		} else {
 			$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
@@ -4327,19 +4441,20 @@ if ($action == 'create')
 	}
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled))
-	{
+	if (!empty($conf->incoterm->enabled)) {
 		print '<tr><td>';
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($usercancreate) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		else print '&nbsp;';
+		if ($usercancreate) {
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td></tr></table>';
 		print '</td>';
 		print '<td>';
-		if ($action != 'editincoterm')
-		{
+		if ($action != 'editincoterm') {
 			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 		} else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -4367,8 +4482,7 @@ if ($action == 'create')
 
 			print '</tr></table>';
 			print '</td><td>';
-			if ($action == 'editretainedwarranty')
-			{
+			if ($action == 'editretainedwarranty') {
 				print '<form  id="retained-warranty-form"  method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
 				print '<input type="hidden" name="action" value="setretainedwarranty">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4396,8 +4510,7 @@ if ($action == 'create')
 				$defaultDate = $object->date;
 			}
 
-			if ($action == 'editretainedwarrantypaymentterms')
-			{
+			if ($action == 'editretainedwarrantypaymentterms') {
 				//date('Y-m-d',$object->date_lim_reglement)
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
 				print '<input type="hidden" name="action" value="setretainedwarrantyconditions">';
@@ -4432,8 +4545,7 @@ if ($action == 'create')
 				$defaultDate = $object->date;
 			}
 
-			if ($action == 'editretainedwarrantydatelimit')
-			{
+			if ($action == 'editretainedwarrantydatelimit') {
 				//date('Y-m-d',$object->date_lim_reglement)
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'">';
 				print '<input type="hidden" name="action" value="setretainedwarrantydatelimit">';
@@ -4467,8 +4579,7 @@ if ($action == 'create')
 		$sign = -1; // We invert sign for output
 	}
 
-	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
-	{
+	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
 		print '<td class="nowrap amountcard">'.price($sign * $object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -4494,26 +4605,22 @@ if ($action == 'create')
 	print '</tr>';
 
 	// Amount Local Taxes
-	if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
-	{
+	if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) { 	// Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td class="nowrap amountcard">'.price($sign * $object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
-	if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
-	{
+	if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) {	// Localtax2
 		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td class=nowrap amountcard">'.price($sign * $object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
 
 	// Revenue stamp
-	if ($selleruserevenustamp) 	// Test company use revenue stamp
-	{
+	if ($selleruserevenustamp) {	// Test company use revenue stamp
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('RevenueStamp');
 		print '</td>';
-		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $usercancreate)
-		{
+		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $usercancreate) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
 		}
 		print '</tr></table>';
@@ -4567,40 +4674,45 @@ if ($action == 'create')
 
 	$nbrows = 8;
 	$nbcols = 3;
-	if (!empty($conf->projet->enabled))
+	if (!empty($conf->projet->enabled)) {
 		$nbrows++;
+	}
 	if (!empty($conf->banque->enabled)) {
 		$nbrows++;
 		$nbcols++;
 	}
-	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0)
+	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
 		$nbrows++;
-	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0)
+	}
+	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
 		$nbrows++;
-	if ($selleruserevenustamp)
+	}
+	if ($selleruserevenustamp) {
 		$nbrows++;
-	if (!empty($conf->multicurrency->enabled))
+	}
+	if (!empty($conf->multicurrency->enabled)) {
 		$nbrows += 5;
-	if (!empty($conf->incoterm->enabled))
+	}
+	if (!empty($conf->incoterm->enabled)) {
 		$nbrows += 1;
+	}
 
 	// List of previous situation invoices
-	if (($object->situation_cycle_ref > 0) && !empty($conf->global->INVOICE_USE_SITUATION))
-	{
+	if (($object->situation_cycle_ref > 0) && !empty($conf->global->INVOICE_USE_SITUATION)) {
 		print '<table class="noborder situationstable" width="100%">';
 
-
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('ListOfSituationInvoices').'</td>';
 		print '<td></td>';
 		print '<td class="center">'.$langs->trans('Situation').'</td>';
-		if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+		if (!empty($conf->banque->enabled)) {
+			print '<td class="right"></td>';
+		}
 		print '<td class="right">'.$langs->trans('AmountHT').'</td>';
 		print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
 		print '<td width="18">&nbsp;</td>';
 		print '</tr>';
 
-
 		$total_prev_ht = $total_prev_ttc = 0;
 		$total_global_ht = $total_global_ttc = 0;
 
@@ -4617,7 +4729,9 @@ if ($action == 'create')
 				print '<td>'.$prev_invoice->getNomUrl(1).'</td>';
 				print '<td></td>';
 				print '<td align="center" >'.(($prev_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$prev_invoice->situation_counter.'</td>';
-				if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+				if (!empty($conf->banque->enabled)) {
+					print '<td class="right"></td>';
+				}
 				print '<td class="right">'.price($prev_invoice->total_ht).'</td>';
 				print '<td class="right">'.price($prev_invoice->total_ttc).'</td>';
 				print '<td class="right">'.$prev_invoice->getLibStatut(3, $tmptotalpaidforthisinvoice).'</td>';
@@ -4635,7 +4749,9 @@ if ($action == 'create')
 		print '<td>'.$object->getNomUrl(1).'</td>';
 		print '<td></td>';
 		print '<td class="center">'.(($object->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$object->situation_counter.'</td>';
-		if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+		if (!empty($conf->banque->enabled)) {
+			print '<td class="right"></td>';
+		}
 		print '<td class="right">'.price($object->total_ht).'</td>';
 		print '<td class="right">'.price($object->total_ttc).'</td>';
 		print '<td class="right">'.$object->getLibStatut(3, $object->getSommePaiement()).'</td>';
@@ -4646,16 +4762,19 @@ if ($action == 'create')
 		print '<td colspan="2" class="left"><b>'.$langs->trans('CurrentSituationTotal').'</b></td>';
 		print '<td>';
 		$i = 0;
-		foreach ($current_situation_counter as $sit)
-		{
+		foreach ($current_situation_counter as $sit) {
 			$curSign = $sit > 0 ? '+' : '-';
 			$curType = $sit > 0 ? $langs->trans('situationInvoiceShortcode_S') : $langs->trans('situationInvoiceShortcode_AS');
-			if ($i > 0) print ' '.$curSign.' ';
+			if ($i > 0) {
+				print ' '.$curSign.' ';
+			}
 			print $curType.abs($sit);
 			$i++;
 		}
 		print '</td>';
-		if (!empty($conf->banque->enabled)) print '<td></td>';
+		if (!empty($conf->banque->enabled)) {
+			print '<td></td>';
+		}
 		print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
 		print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
 		print '<td width="18">&nbsp;</td>';
@@ -4665,14 +4784,14 @@ if ($action == 'create')
 		if (count($object->tab_next_situation_invoice) > 0) {
 			// List of next invoices
 			/*print '<tr class="liste_titre">';
-	         print '<td>' . $langs->trans('ListOfNextSituationInvoices') . '</td>';
-	         print '<td></td>';
-	         print '<td></td>';
-	         if (! empty($conf->banque->enabled)) print '<td class="right"></td>';
-	         print '<td class="right">' . $langs->trans('AmountHT') . '</td>';
-	         print '<td class="right">' . $langs->trans('AmountTTC') . '</td>';
-	         print '<td width="18">&nbsp;</td>';
-	         print '</tr>';*/
+			 print '<td>' . $langs->trans('ListOfNextSituationInvoices') . '</td>';
+			 print '<td></td>';
+			 print '<td></td>';
+			 if (! empty($conf->banque->enabled)) print '<td class="right"></td>';
+			 print '<td class="right">' . $langs->trans('AmountHT') . '</td>';
+			 print '<td class="right">' . $langs->trans('AmountTTC') . '</td>';
+			 print '<td width="18">&nbsp;</td>';
+			 print '</tr>';*/
 
 			$total_next_ht = $total_next_ttc = 0;
 
@@ -4685,7 +4804,9 @@ if ($action == 'create')
 				print '<td>'.$next_invoice->getNomUrl(1).'</td>';
 				print '<td></td>';
 				print '<td class="center">'.(($next_invoice->type == Facture::TYPE_CREDIT_NOTE) ? $langs->trans('situationInvoiceShortcode_AS') : $langs->trans('situationInvoiceShortcode_S')).$next_invoice->situation_counter.'</td>';
-				if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+				if (!empty($conf->banque->enabled)) {
+					print '<td class="right"></td>';
+				}
 				print '<td class="right">'.price($next_invoice->total_ht).'</td>';
 				print '<td class="right">'.price($next_invoice->total_ttc).'</td>';
 				print '<td class="right">'.$next_invoice->getLibStatut(3, $totalpaye).'</td>';
@@ -4697,7 +4818,9 @@ if ($action == 'create')
 
 			print '<tr class="oddeven">';
 			print '<td colspan="3" class="right"></td>';
-			if (!empty($conf->banque->enabled)) print '<td class="right"></td>';
+			if (!empty($conf->banque->enabled)) {
+				print '<td class="right"></td>';
+			}
 			print '<td class="right"><b>'.price($total_global_ht).'</b></td>';
 			print '<td class="right"><b>'.price($total_global_ttc).'</b></td>';
 			print '<td width="18">&nbsp;</td>';
@@ -4708,7 +4831,9 @@ if ($action == 'create')
 	}
 
 	$sign = 1;
-	if ($object->type == $object::TYPE_CREDIT_NOTE) $sign = -1;
+	if ($object->type == $object::TYPE_CREDIT_NOTE) {
+		$sign = -1;
+	}
 
 	// List of payments already done
 
@@ -4744,8 +4869,6 @@ if ($action == 'create')
 		$num = $db->num_rows($result);
 		$i = 0;
 
-		// if ($object->type != 2)
-		// {
 		if ($num > 0) {
 			while ($i < $num) {
 				$objp = $db->fetch_object($result);
@@ -4770,8 +4893,7 @@ if ($action == 'create')
 				print '</td>';
 				$label = ($langs->trans("PaymentType".$objp->payment_code) != ("PaymentType".$objp->payment_code)) ? $langs->trans("PaymentType".$objp->payment_code) : $objp->payment_label;
 				print '<td>'.$label.' '.$objp->num_payment.'</td>';
-				if (!empty($conf->banque->enabled))
-				{
+				if (!empty($conf->banque->enabled)) {
 					$bankaccountstatic->id = $objp->baid;
 					$bankaccountstatic->ref = $objp->baref;
 					$bankaccountstatic->label = $objp->baref;
@@ -4786,14 +4908,14 @@ if ($action == 'create')
 					}
 
 					print '<td class="nowraponall">';
-					if ($bankaccountstatic->id)
+					if ($bankaccountstatic->id) {
 						print $bankaccountstatic->getNomUrl(1, 'transactions');
+					}
 					print '</td>';
 				}
 				print '<td class="right">'.price($sign * $objp->amount).'</td>';
 				print '<td class="center">';
-				if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-				{
+				if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0) {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepayment&token='.newToken().'&paiement_id='.$objp->rowid.'">';
 					print img_delete();
 					print '</a>';
@@ -4803,10 +4925,7 @@ if ($action == 'create')
 				$i++;
 			}
 		}
-		/*else {
-            print '<tr class="oddeven"><td colspan="' . $nbcols . '" class="opacitymedium">' . $langs->trans("None") . '</td><td></td><td></td></tr>';
-        }*/
-		// }
+
 		$db->free($result);
 	} else {
 		dol_print_error($db);
@@ -4843,10 +4962,12 @@ if ($action == 'create')
 				$invoice->fetch($obj->fk_facture_source);
 				print '<tr><td colspan="'.$nbcols.'" class="right">';
 				print '<span class="opacitymedium">';
-				if ($invoice->type == Facture::TYPE_CREDIT_NOTE)
+				if ($invoice->type == Facture::TYPE_CREDIT_NOTE) {
 					print $langs->trans("CreditNote").' ';
-				if ($invoice->type == Facture::TYPE_DEPOSIT)
+				}
+				if ($invoice->type == Facture::TYPE_DEPOSIT) {
 					print $langs->trans("Deposit").' ';
+				}
 				print $invoice->getNomUrl(0);
 				print '</span>';
 				print '</td>';
@@ -4855,10 +4976,12 @@ if ($action == 'create')
 				print '<a href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=unlinkdiscount&discountid='.$obj->rowid.'">'.img_delete().'</a>';
 				print '</td></tr>';
 				$i++;
-				if ($invoice->type == Facture::TYPE_CREDIT_NOTE)
+				if ($invoice->type == Facture::TYPE_CREDIT_NOTE) {
 					$creditnoteamount += $obj->amount_ttc;
-				if ($invoice->type == Facture::TYPE_DEPOSIT)
+				}
+				if ($invoice->type == Facture::TYPE_DEPOSIT) {
 					$depositamount += $obj->amount_ttc;
+				}
 			}
 		} else {
 			dol_print_error($db);
@@ -4898,8 +5021,9 @@ if ($action == 'create')
 		if (($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED) && $object->close_code == 'abandon') {
 			print '<tr><td colspan="'.$nbcols.'" class="nowrap right">';
 			$text = $langs->trans("HelpAbandonOther");
-			if ($object->close_note)
+			if ($object->close_note) {
 				$text .= '<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
+			}
 			print '<span class="opacitymedium">';
 			print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
 			print '</span>';
@@ -4917,8 +5041,9 @@ if ($action == 'create')
 		print '<tr><td colspan="'.$nbcols.'" class="right">';
 		print '<span class="opacitymedium">';
 		print $langs->trans('RemainderToPay');
-		if ($resteapayeraffiche < 0)
+		if ($resteapayeraffiche < 0) {
 			print ' ('.$langs->trans('ExcessReceived').')';
+		}
 		print '</span>';
 		print '</td>';
 		print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
@@ -4927,8 +5052,7 @@ if ($action == 'create')
 		// Retained warranty : usualy use on construction industry
 		if (!empty($object->situation_final) && !empty($object->retained_warranty) && $displayWarranty) {
 			// Billed - retained warranty
-			if ($object->type == Facture::TYPE_SITUATION)
-			{
+			if ($object->type == Facture::TYPE_SITUATION) {
 				$retainedWarranty = $total_global_ttc * $object->retained_warranty / 100;
 			} else {
 				// Because one day retained warranty could be used on standard invoices
@@ -4945,8 +5069,7 @@ if ($action == 'create')
 			print !empty($object->retained_warranty_date_limit) ? ' '.$langs->trans("ToPayOn", dol_print_date($object->retained_warranty_date_limit, 'day')) : '';
 			print ' :</td><td align="right">'.price($retainedWarranty).'</td><td>&nbsp;</td></tr>';
 		}
-	} else // Credit note
-	{
+	} else { // Credit note
 		$cssforamountpaymentcomplete = 'amountpaymentneutral';
 
 		// Total already paid back
@@ -4960,8 +5083,9 @@ if ($action == 'create')
 		// Remainder to pay back
 		print '<tr><td colspan="'.$nbcols.'" class="right">';
 		print $langs->trans('RemainderToPayBack');
-		if ($resteapayeraffiche > 0)
+		if ($resteapayeraffiche > 0) {
 			print ' ('.$langs->trans('ExcessPaid').')';
+		}
 		print ' :</td>';
 		print '<td class="right'.($resteapayeraffiche ? ' amountremaintopayback' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td>';
 		print '<td class="nowrap">&nbsp;</td></tr>';
@@ -5002,10 +5126,8 @@ if ($action == 'create')
 	$result = $object->getLinesArray();
 
 	// Show global modifiers
-	if (!empty($conf->global->INVOICE_USE_SITUATION))
-	{
-		if ($object->situation_cycle_ref && $object->statut == 0)
-		{
+	if (!empty($conf->global->INVOICE_USE_SITUATION)) {
+		if ($object->situation_cycle_ref && $object->statut == 0) {
 			print '<!-- Area to change globally the situation percent -->'."\n";
 			print '<div class="div-table-responsive">';
 
@@ -5065,10 +5187,8 @@ if ($action == 'create')
 	}
 
 	// Form to add new line
-	if ($object->statut == 0 && $usercancreate && $action != 'valid' && $action != 'editline')
-	{
-		if ($action != 'editline' && $action != 'selectlines')
-		{
+	if ($object->statut == 0 && $usercancreate && $action != 'valid' && $action != 'editline') {
+		if ($action != 'editline' && $action != 'selectlines') {
 			// Add free products/services
 			$object->formAddObjectLine(1, $mysoc, $soc);
 
@@ -5087,27 +5207,21 @@ if ($action == 'create')
 
 	// Actions buttons
 
-	if ($action != 'prerelance' && $action != 'presend' && $action != 'valid' && $action != 'editline')
-	{
+	if ($action != 'prerelance' && $action != 'presend' && $action != 'valid' && $action != 'editline') {
 		print '<div class="tabsAction">';
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) {
 			// Editer une facture deja validee, sans paiement effectue et pas exporte en compta
-			if ($object->statut == Facture::STATUS_VALIDATED)
-			{
+			if ($object->statut == Facture::STATUS_VALIDATED) {
 				// We check if lines of invoice are not already transfered into accountancy
 				$ventilExportCompta = $object->getVentilExportCompta();
 
-				if ($ventilExportCompta == 0)
-				{
-					if (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED) || ($resteapayer == price2num($object->total_ttc, 'MT', 1) && empty($object->paye)))
-					{
-						if (!$objectidnext && $object->is_last_in_cycle())
-						{
-							if ($usercanunvalidate)
-							{
+				if ($ventilExportCompta == 0) {
+					if (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED) || ($resteapayer == price2num($object->total_ttc, 'MT', 1) && empty($object->paye))) {
+						if (!$objectidnext && $object->is_last_in_cycle()) {
+							if ($usercanunvalidate) {
 								print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
 							} else {
 								print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('Modify').'</span>';
@@ -5131,10 +5245,8 @@ if ($action == 'create')
 				|| ($object->type == Facture::TYPE_CREDIT_NOTE && empty($discount->id))
 				|| ($object->type == Facture::TYPE_DEPOSIT && empty($discount->id)))
 				&& ($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED || ($object->statut == 1 && $object->paye == 1))   // Condition ($object->statut == 1 && $object->paye == 1) should not happened but can be found due to corrupted data
-				&& ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || $usercanreopen))				// A paid invoice (partially or completely)
-			{
-				if ($object->close_code != 'replaced' || (!$objectidnext)) 				// Not replaced by another invoice or replaced but the replacement invoice has been deleted
-				{
+				&& ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || $usercanreopen)) {				// A paid invoice (partially or completely)
+				if ($object->close_code != 'replaced' || (!$objectidnext)) { 				// Not replaced by another invoice or replaced but the replacement invoice has been deleted
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a>';
 				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span>';
@@ -5143,8 +5255,7 @@ if ($action == 'create')
 
 			// Validate
 			if ($object->statut == Facture::STATUS_DRAFT && count($object->lines) > 0 && ((($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION) && (!empty($conf->global->FACTURE_ENABLE_NEGATIVE) || $object->total_ttc >= 0)) || ($object->type == Facture::TYPE_CREDIT_NOTE && $object->total_ttc <= 0))) {
-				if ($usercanvalidate)
-				{
+				if ($usercanvalidate) {
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=valid">'.$langs->trans('Validate').'</a>';
 				}
 			}
@@ -5157,20 +5268,18 @@ if ($action == 'create')
 					} else {
 						if ($usercansend) {
 							print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-						} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						} else {
+							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						}
 					}
 				}
 			}
 
 			// Request a direct debit order
-			if ($object->statut > Facture::STATUS_DRAFT && $object->paye == 0 && $num == 0)
-			{
-				if ($resteapayer > 0)
-				{
-					if ($usercancreatewithdrarequest)
-					{
-						if (!$objectidnext && $object->close_code != 'replaced') 				// Not replaced by another invoice
-						{
+			if ($object->statut > Facture::STATUS_DRAFT && $object->paye == 0 && $num == 0) {
+				if ($resteapayer > 0) {
+					if ($usercancreatewithdrarequest) {
+						if (!$objectidnext && $object->close_code != 'replaced') { 				// Not replaced by another invoice
 							print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MakeWithdrawRequest")).'">'.$langs->trans("MakeWithdrawRequest").'</a>';
 						} else {
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('MakeWithdrawRequest').'</span>';
@@ -5184,8 +5293,7 @@ if ($action == 'create')
 			}
 
 			// POS Ticket
-			if (!empty($conf->takepos->enabled) && $object->module_source == 'takepos')
-			{
+			if (!empty($conf->takepos->enabled) && $object->module_source == 'takepos') {
 				$langs->load("cashdesk");
 				$receipt_url = DOL_URL_ROOT."/takepos/receipt.php";
 				print '<a target="_blank" class="butAction" href="'.$receipt_url.'?facid='.$object->id.'">'.$langs->trans('POSTicket').'</a>';
@@ -5207,10 +5315,8 @@ if ($action == 'create')
 			// Reverse back money or convert to reduction
 			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_SITUATION) {
 				// For credit note only
-				if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercanissuepayment)
-				{
-					if ($resteapayer == 0)
-					{
+				if ($object->type == Facture::TYPE_CREDIT_NOTE && $object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercanissuepayment) {
+					if ($resteapayer == 0) {
 						print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span>';
 					} else {
 						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a>';
@@ -5218,8 +5324,7 @@ if ($action == 'create')
 				}
 
 				// For standard invoice with excess received
-				if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_SITUATION) && $object->statut == Facture::STATUS_VALIDATED && empty($object->paye) && $resteapayer < 0 && $usercancreate && empty($discount->id))
-				{
+				if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_SITUATION) && $object->statut == Facture::STATUS_VALIDATED && empty($object->paye) && $resteapayer < 0 && $usercancreate && empty($discount->id)) {
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessReceivedToReduc').'</a>';
 				}
 				// For credit note
@@ -5229,8 +5334,7 @@ if ($action == 'create')
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReduc2")).'">'.$langs->trans('ConvertToReduc').'</a>';
 				}
 				// For deposit invoice
-				if ($object->type == Facture::TYPE_DEPOSIT && $usercancreate && $object->statut > 0 && empty($discount->id))
-				{
+				if ($object->type == Facture::TYPE_DEPOSIT && $usercancreate && $object->statut > 0 && empty($discount->id)) {
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a>';
 				}
 			}
@@ -5238,24 +5342,19 @@ if ($action == 'create')
 			// Classify paid
 			if (($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $usercanissuepayment && (($object->type != Facture::TYPE_CREDIT_NOTE && $object->type != Facture::TYPE_DEPOSIT && $resteapayer <= 0) || ($object->type == Facture::TYPE_CREDIT_NOTE && $resteapayer >= 0)))
 				|| ($object->type == Facture::TYPE_DEPOSIT && $object->paye == 0 && $object->total_ttc > 0 && $resteapayer == 0 && $usercanissuepayment && empty($discount->id))
-			)
-			{
+			) {
 				print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
 			}
 
 			// Classify 'closed not completely paid' (possible si validee et pas encore classee payee)
 
-			if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && $usercanissuepayment)
-			{
-				if ($totalpaye > 0 || $totalcreditnotes > 0)
-				{
+			if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0 && $resteapayer > 0 && $usercanissuepayment) {
+				if ($totalpaye > 0 || $totalcreditnotes > 0) {
 					// If one payment or one credit note was linked to this invoice
 					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaidPartially').'</a>';
 				} else {
-					if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED))
-					{
-						if ($objectidnext)
-						{
+					if (empty($conf->global->INVOICE_CAN_NEVER_BE_CANCELED)) {
+						if ($objectidnext) {
 							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ClassifyCanceled').'</span>';
 						} else {
 							print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=canceled">'.$langs->trans('ClassifyCanceled').'</a>';
@@ -5265,10 +5364,8 @@ if ($action == 'create')
 			}
 
 			// Create a credit note
-			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $object->statut > 0 && $usercancreate)
-			{
-				if (!$objectidnext)
-				{
+			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $object->statut > 0 && $usercancreate) {
+				if (!$objectidnext) {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').($object->entity > 0 ? '&amp;originentity='.$object->entity : '').'">'.$langs->trans("CreateCreditNote").'</a>';
 				}
 			}
@@ -5281,10 +5378,8 @@ if ($action == 'create')
 				&& !$objectidnext
 				&& $object->is_last_in_cycle()
 				&& $conf->global->INVOICE_USE_SITUATION_CREDIT_NOTE
-				)
-			{
-				if ($usercanunvalidate)
-				{
+				) {
+				if ($usercanunvalidate) {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;invoiceAvoirWithLines=1&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'">'.$langs->trans("CreateCreditNote").'</a>';
 				} else {
 					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateCreditNote").'</span>';
@@ -5292,32 +5387,27 @@ if ($action == 'create')
 			}
 
 			// Clone
-			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $usercancreate)
-			{
+			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $usercancreate) {
 				print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=clone&amp;object=invoice">'.$langs->trans("ToClone").'</a>';
 			}
 
 			// Clone as predefined / Create template
-			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $object->statut == 0 && $usercancreate)
-			{
-				if (!$objectidnext && count($object->lines) > 0)
-				{
+			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $object->statut == 0 && $usercancreate) {
+				if (!$objectidnext && count($object->lines) > 0) {
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$object->id.'&amp;action=create">'.$langs->trans("ChangeIntoRepeatableInvoice").'</a>';
 				}
 			}
 
 			// Remove situation from cycle
 			if (in_array($object->statut, array(Facture::STATUS_CLOSED, Facture::STATUS_VALIDATED))
-			    && $object->type == Facture::TYPE_SITUATION
-			    && $usercancreate
-			    && !$objectidnext
-			    && $object->situation_counter > 1
-			    && $object->is_last_in_cycle()
+				&& $object->type == Facture::TYPE_SITUATION
+				&& $usercancreate
+				&& !$objectidnext
+				&& $object->situation_counter > 1
+				&& $object->is_last_in_cycle()
 				&& $usercanunvalidate
-				)
-			{
-				if (($object->total_ttc - $totalcreditnotes) == 0)
-				{
+				) {
+				if (($object->total_ttc - $totalcreditnotes) == 0) {
 					print '<a id="butSituationOut" class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=situationout">'.$langs->trans("RemoveSituationFromCycle").'</a>';
 				} else {
 					print '<a id="butSituationOutRefused" class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotEnouthCreditNote").'" >'.$langs->trans("RemoveSituationFromCycle").'</a>';
@@ -5337,8 +5427,7 @@ if ($action == 'create')
 
 			// Delete
 			$isErasable = $object->is_erasable();
-			if ($usercandelete || ($usercancreate && $isErasable == 1))	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
-			{
+			if ($usercandelete || ($usercancreate && $isErasable == 1)) {	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
 				//var_dump($isErasable);
 				if ($isErasable == -4) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a>';
@@ -5348,11 +5437,9 @@ if ($action == 'create')
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a>';
 				} elseif ($isErasable == -1) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a>';
-				} elseif ($isErasable <= 0)	// Any other cases
-				{
+				} elseif ($isErasable <= 0) {	// Any other cases
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a>';
-				} elseif ($objectidnext)
-				{
+				} elseif ($objectidnext) {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Delete').'</a>';
 				} else {
 					print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
@@ -5368,8 +5455,7 @@ if ($action == 'create')
 	if (GETPOST('modelselected', 'alpha')) {
 		$action = 'presend';
 	}
-	if ($action != 'prerelance' && $action != 'presend')
-	{
+	if ($action != 'prerelance' && $action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
@@ -5381,9 +5467,27 @@ if ($action == 'create')
 		$delallowed = $usercancreate;
 
 		print $formfile->showdocuments(
-			'facture', $filename, $filedir, $urlsource, $genallowed,
-			$delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '',
-			$soc->default_lang, '', $object, 0, 'remove_file_comfirm');
+			'facture',
+			$filename,
+			$filedir,
+			$urlsource,
+			$genallowed,
+			$delallowed,
+			$object->model_pdf,
+			1,
+			0,
+			0,
+			28,
+			0,
+			'',
+			'',
+			'',
+			$soc->default_lang,
+			'',
+			$object,
+			0,
+			'remove_file_comfirm'
+		);
 
 		$somethingshown = $formfile->numoffiles;
 
@@ -5393,8 +5497,7 @@ if ($action == 'create')
 		$compatibleImportElementsList = false;
 		if ($usercancreate
 			&& $object->statut == Facture::STATUS_DRAFT
-			&& ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION))
-		{
+			&& ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA || $object->type == Facture::TYPE_SITUATION)) {
 			$compatibleImportElementsList = array('commande', 'propal'); // import from linked elements
 		}
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, $compatibleImportElementsList);
@@ -5403,16 +5506,14 @@ if ($action == 'create')
 		// Show online payment link
 		$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-		if ($object->statut != Facture::STATUS_DRAFT && $useonlinepayment)
-		{
+		if ($object->statut != Facture::STATUS_DRAFT && $useonlinepayment) {
 			print '<br><!-- Link to pay -->'."\n";
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 			print showOnlinePaymentUrl('invoice', $object->ref).'<br>';
 		}
 
 		// Show direct download link
-		if ($object->statut != Facture::STATUS_DRAFT && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD))
-		{
+		if ($object->statut != Facture::STATUS_DRAFT && !empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD)) {
 			print '<br><!-- Link to download main doc -->'."\n";
 			print showDirectDownloadLink($object).'<br>';
 		}
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 444fca3155a..c16d79d2574 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -172,35 +172,52 @@ class Invoices extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('invoice').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
 
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 
 		// Filter by status
-		if ($status == 'draft')     $sql .= " AND t.fk_statut IN (0)";
-		if ($status == 'unpaid')    $sql .= " AND t.fk_statut IN (1)";
-		if ($status == 'paid')      $sql .= " AND t.fk_statut IN (2)";
-		if ($status == 'cancelled') $sql .= " AND t.fk_statut IN (3)";
+		if ($status == 'draft') {
+			$sql .= " AND t.fk_statut IN (0)";
+		}
+		if ($status == 'unpaid') {
+			$sql .= " AND t.fk_statut IN (1)";
+		}
+		if ($status == 'paid') {
+			$sql .= " AND t.fk_statut IN (2)";
+		}
+		if ($status == 'cancelled') {
+			$sql .= " AND t.fk_statut IN (3)";
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -208,10 +225,8 @@ class Invoices extends DolibarrApi
 		}
 
 		$sql .= $this->db->order($sortfield, $sortorder);
-		if ($limit)
-		{
-			if ($page < 0)
-			{
+		if ($limit) {
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -220,17 +235,14 @@ class Invoices extends DolibarrApi
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$i = 0;
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$invoice_static = new Facture($this->db);
-				if ($invoice_static->fetch($obj->rowid))
-				{
+				if ($invoice_static->fetch($obj->rowid)) {
 					// Get payment details
 					$invoice_static->totalpaid = $invoice_static->getSommePaiement();
 					$invoice_static->totalcreditnotes = $invoice_static->getSumCreditNotesUsed();
@@ -274,13 +286,13 @@ class Invoices extends DolibarrApi
 			$this->invoice->date = dol_now();
 		}
 		/* We keep lines as an array
-         if (isset($request_data["lines"])) {
-            $lines = array();
-            foreach ($request_data["lines"] as $line) {
-                array_push($lines, (object) $line);
-            }
-            $this->invoice->lines = $lines;
-        }*/
+		 if (isset($request_data["lines"])) {
+			$lines = array();
+			foreach ($request_data["lines"] as $line) {
+				array_push($lines, (object) $line);
+			}
+			$this->invoice->lines = $lines;
+		}*/
 
 		if ($this->invoice->create(DolibarrApiAccess::$user, 0, (empty($request_data["date_lim_reglement"]) ? 0 : $request_data["date_lim_reglement"])) < 0) {
 			throw new RestException(500, "Error creating invoice", array_merge(array($this->invoice->error), $this->invoice->errors));
@@ -585,20 +597,22 @@ class Invoices extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->invoice->$field = $value;
 		}
 
 		// update bank account
-		if (!empty($this->invoice->fk_account))
-		{
+		if (!empty($this->invoice->fk_account)) {
 			if ($this->invoice->setBankAccount($this->invoice->fk_account) == 0) {
 				throw new RestException(400, $this->invoice->error);
 			}
 		}
 
-		if ($this->invoice->update(DolibarrApiAccess::$user))
+		if ($this->invoice->update(DolibarrApiAccess::$user)) {
 			return $this->get($id);
+		}
 
 		return false;
 	}
@@ -624,8 +638,7 @@ class Invoices extends DolibarrApi
 		}
 
 		$result = $this->invoice->delete(DolibarrApiAccess::$user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			throw new RestException(500);
 		}
 
@@ -1062,10 +1075,13 @@ class Invoices extends DolibarrApi
 		$result = $discountcheck->fetch(0, $this->invoice->id);
 
 		$canconvert = 0;
-		if ($this->invoice->type == Facture::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
-		if (($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_STANDARD) && $this->invoice->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
-		if ($canconvert)
-		{
+		if ($this->invoice->type == Facture::TYPE_DEPOSIT && empty($discountcheck->id)) {
+			$canconvert = 1; // we can convert deposit into discount if deposit is payed (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
+		}
+		if (($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_STANDARD) && $this->invoice->paye == 0 && empty($discountcheck->id)) {
+			$canconvert = 1; // we can convert credit note into discount if credit note is not payed back and not already converted and amount of payment is 0 (see real condition into condition used to show button converttoreduc)
+		}
+		if ($canconvert) {
 			$this->db->begin();
 
 			$amount_ht = $amount_tva = $amount_ttc = array();
@@ -1073,10 +1089,9 @@ class Invoices extends DolibarrApi
 
 			// Loop on each vat rate
 			$i = 0;
-			foreach ($this->invoice->lines as $line)
-			{
-				if ($line->product_type < 9 && $line->total_ht != 0) // Remove lines with product_type greater than or equal to 9
-				{ 	// no need to create discount if amount is null
+			foreach ($this->invoice->lines as $line) {
+				if ($line->product_type < 9 && $line->total_ht != 0) { // Remove lines with product_type greater than or equal to 9
+					// no need to create discount if amount is null
 					$amount_ht[$line->tva_tx] += $line->total_ht;
 					$amount_tva[$line->tva_tx] += $line->total_tva;
 					$amount_ttc[$line->tva_tx] += $line->total_ttc;
@@ -1104,8 +1119,7 @@ class Invoices extends DolibarrApi
 
 			$error = 0;
 
-			if ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION)
-			{
+			if ($this->invoice->type == Facture::TYPE_STANDARD || $this->invoice->type == Facture::TYPE_REPLACEMENT || $this->invoice->type == Facture::TYPE_SITUATION) {
 				// If we're on a standard invoice, we have to get excess received to create a discount in TTC without VAT
 
 				// Total payments
@@ -1116,7 +1130,9 @@ class Invoices extends DolibarrApi
 				$sql .= ' AND pf.fk_paiement = p.rowid';
 				$sql .= ' AND p.entity IN ('.getEntity('invoice').')';
 				$resql = $this->db->query($sql);
-				if (!$resql) dol_print_error($this->db);
+				if (!$resql) {
+					dol_print_error($this->db);
+				}
 
 				$res = $this->db->fetch_object($resql);
 				$total_payments = $res->total_payments;
@@ -1129,23 +1145,24 @@ class Invoices extends DolibarrApi
 				$sql .= " WHERE fk_facture = ".$this->invoice->id;
 				$resql = $this->db->query($sql);
 				if (!empty($resql)) {
-					while ($obj = $this->db->fetch_object($resql)) $total_creditnote_and_deposit += $obj->amount_ttc;
-				} else dol_print_error($this->db);
+					while ($obj = $this->db->fetch_object($resql)) {
+						$total_creditnote_and_deposit += $obj->amount_ttc;
+					}
+				} else {
+					dol_print_error($this->db);
+				}
 
 				$discount->amount_ht = $discount->amount_ttc = $total_payments + $total_creditnote_and_deposit - $this->invoice->total_ttc;
 				$discount->amount_tva = 0;
 				$discount->tva_tx = 0;
 
 				$result = $discount->create(DolibarrApiAccess::$user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
-			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_DEPOSIT)
-			{
-				foreach ($amount_ht as $tva_tx => $xxx)
-				{
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE || $this->invoice->type == Facture::TYPE_DEPOSIT) {
+				foreach ($amount_ht as $tva_tx => $xxx) {
 					$discount->amount_ht = abs($amount_ht[$tva_tx]);
 					$discount->amount_tva = abs($amount_tva[$tva_tx]);
 					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
@@ -1155,21 +1172,18 @@ class Invoices extends DolibarrApi
 					$discount->tva_tx = abs($tva_tx);
 
 					$result = $discount->create(DolibarrApiAccess::$user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						break;
 					}
 				}
 			}
 
-			if (empty($error))
-			{
+			if (empty($error)) {
 				if ($this->invoice->type != Facture::TYPE_DEPOSIT) {
 					// Classe facture
 					$result = $this->invoice->setPaid(DolibarrApiAccess::$user);
-					if ($result >= 0)
-					{
+					if ($result >= 0) {
 						$this->db->commit();
 					} else {
 						$this->db->rollback();
@@ -1417,8 +1431,7 @@ class Invoices extends DolibarrApi
 		$paymentobj->note_private = $comment;
 
 		$payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-		if ($payment_id < 0)
-		{
+		if ($payment_id < 0) {
 			$this->db->rollback();
 			throw new RestException(400, 'Payment error : '.$paymentobj->error);
 		}
@@ -1429,10 +1442,11 @@ class Invoices extends DolibarrApi
 			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
 				throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
 			}
-			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+				$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			}
 			$result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
 			}
@@ -1501,8 +1515,7 @@ class Invoices extends DolibarrApi
 		$multicurrency_amounts = array();
 
 		// Loop on each invoice to pay
-		foreach ($arrayofamounts as $id => $amountarray)
-		{
+		foreach ($arrayofamounts as $id => $amountarray) {
 			$result = $this->invoice->fetch($id);
 			if (!$result) {
 				$this->db->rollback();
@@ -1528,13 +1541,11 @@ class Invoices extends DolibarrApi
 			$totaldeposits = $this->invoice->getSumDepositsUsed($is_multicurrency);
 			$remainstopay = $amount = price2num($total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
 
-			if (!$is_multicurrency && $amountarray["amount"] != 'remain')
-			{
+			if (!$is_multicurrency && $amountarray["amount"] != 'remain') {
 				$amount = price2num($amountarray["amount"], 'MT');
 			}
 
-			if ($is_multicurrency && $amountarray["multicurrency_amount"] != 'remain')
-			{
+			if ($is_multicurrency && $amountarray["multicurrency_amount"] != 'remain') {
 				$amount = price2num($amountarray["multicurrency_amount"], 'MT');
 			}
 
@@ -1569,8 +1580,7 @@ class Invoices extends DolibarrApi
 		$paymentobj->note_private = $comment;
 		$paymentobj->ref_ext      = $ref_ext;
 		$payment_id = $paymentobj->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-		if ($payment_id < 0)
-		{
+		if ($payment_id < 0) {
 			$this->db->rollback();
 			throw new RestException(400, 'Payment error : '.$paymentobj->error);
 		}
@@ -1579,10 +1589,11 @@ class Invoices extends DolibarrApi
 			if ($paymentobj->paiementcode == 'CHQ' && empty($chqemetteur)) {
 				  throw new RestException(400, 'Emetteur is mandatory when payment code is '.$paymentobj->paiementcode);
 			}
-			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			if ($this->invoice->type == Facture::TYPE_CREDIT_NOTE) {
+				$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			}
 			$result = $paymentobj->addPaymentToBank(DolibarrApiAccess::$user, 'payment', $label, $accountid, $chqemetteur, $chqbank);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				throw new RestException(400, 'Add payment to bank error : '.$paymentobj->error);
 			}
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 13a58a3e075..ad880470b50 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -218,11 +218,12 @@ class FactureRec extends CommonInvoice
 		$this->titre = trim(isset($this->titre) ? $this->titre : $this->title); // deprecated
 		$this->title = trim($this->title);
 		$this->usenewprice = empty($this->usenewprice) ? 0 : $this->usenewprice;
-		if (empty($this->suspended)) $this->suspended = 0;
+		if (empty($this->suspended)) {
+			$this->suspended = 0;
+		}
 
 		// No frequency defined then no next date to execution
-		if (empty($this->frequency))
-		{
+		if (empty($this->frequency)) {
 			$this->frequency = 0;
 			$this->date_when = null;
 		}
@@ -238,8 +239,7 @@ class FactureRec extends CommonInvoice
 		// Charge facture modele
 		$facsrc = new Facture($this->db);
 		$result = $facsrc->fetch($facid);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// On positionne en mode brouillon la facture
 			$this->brouillon = 1;
 
@@ -301,8 +301,7 @@ class FactureRec extends CommonInvoice
 			$sql .= ", ".$this->db->escape($this->suspended);
 			$sql .= ")";
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."facture_rec");
 
 				// Fields used into addline later
@@ -312,10 +311,11 @@ class FactureRec extends CommonInvoice
 
 				// Add lines
 				$num = count($facsrc->lines);
-				for ($i = 0; $i < $num; $i++)
-				{
+				for ($i = 0; $i < $num; $i++) {
 					$tva_tx = $facsrc->lines[$i]->tva_tx;
-					if (!empty($facsrc->lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) $tva_tx .= ' ('.$facsrc->lines[$i]->vat_src_code.')';
+					if (!empty($facsrc->lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
+						$tva_tx .= ' ('.$facsrc->lines[$i]->vat_src_code.')';
+					}
 
 					$result_insert = $this->addline(
 						$facsrc->lines[$i]->desc,
@@ -338,13 +338,11 @@ class FactureRec extends CommonInvoice
 						$facsrc->lines[$i]->multicurrency_subprice
 					);
 
-					if ($result_insert < 0)
-					{
+					if ($result_insert < 0) {
 						$error++;
 					} else {
 						$objectline = new FactureLigneRec($this->db);
-						if ($objectline->fetch($result_insert))
-						{
+						if ($objectline->fetch($result_insert)) {
 							// Extrafields
 							if (method_exists($facsrc->lines[$i], 'fetch_optionals')) {
 								$facsrc->lines[$i]->fetch_optionals($facsrc->lines[$i]->id);
@@ -352,31 +350,24 @@ class FactureRec extends CommonInvoice
 							}
 
 							$result = $objectline->insertExtraFields();
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$error++;
 							}
 						}
 					}
 				}
 
-				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-				{
+				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {	// To use new linkedObjectsIds instead of old linked_objects
 					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 				}
 
 				// Add object linked
-				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
-				{
-					foreach ($this->linked_objects as $origin => $tmp_origin_id)
-					{
-						if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-						{
-							foreach ($tmp_origin_id as $origin_id)
-							{
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) {
+					foreach ($this->linked_objects as $origin => $tmp_origin_id) {
+						if (is_array($tmp_origin_id)) {       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+							foreach ($tmp_origin_id as $origin_id) {
 								$ret = $this->add_object_linked($origin, $origin_id);
-								if (!$ret)
-								{
+								if (!$ret) {
 									$this->error = $this->db->lasterror();
 									$error++;
 								}
@@ -385,8 +376,7 @@ class FactureRec extends CommonInvoice
 						{
 							$origin_id = $tmp_origin_id;
 							$ret = $this->add_object_linked($origin, $origin_id);
-							if (!$ret)
-							{
+							if (!$ret) {
 								$this->error = $this->db->lasterror();
 								$error++;
 							}
@@ -396,26 +386,22 @@ class FactureRec extends CommonInvoice
 
 				if (!$error) {
 					$result = $this->insertExtraFields();
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				}
 
-				if (!$error && !$notrigger)
-				{
+				if (!$error && !$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('BILLREC_CREATE', $user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$this->db->rollback();
 						return -2;
 					}
 					// End call triggers
 				}
 
-				if ($error)
-				{
+				if ($error) {
 					$this->db->rollback();
 				} else {
 					$this->db->commit();
@@ -453,23 +439,18 @@ class FactureRec extends CommonInvoice
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$error)
-			{
+		if ($resql) {
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('BILLREC_UPDATE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -2;
 				}
@@ -512,18 +493,19 @@ class FactureRec extends CommonInvoice
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
 		//$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 		$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')';
-		if ($rowid) $sql .= ' AND f.rowid='.$rowid;
-		elseif ($ref) $sql .= " AND f.titre='".$this->db->escape($ref)."'";
+		if ($rowid) {
+			$sql .= ' AND f.rowid='.$rowid;
+		} elseif ($ref) {
+			$sql .= " AND f.titre='".$this->db->escape($ref)."'";
+		}
 		/* This field are not used for template invoice
 		if ($ref_ext) $sql.= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
 		if ($ref_int) $sql.= " AND f.ref_int='".$this->db->escape($ref_int)."'";
 		*/
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id                     = $obj->rowid;
@@ -584,7 +566,9 @@ class FactureRec extends CommonInvoice
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
@@ -594,8 +578,7 @@ class FactureRec extends CommonInvoice
 				 * Lines
 				 */
 				$result = $this->fetch_lines();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $this->db->lasterror();
 					return -3;
 				}
@@ -638,8 +621,7 @@ class FactureRec extends CommonInvoice
 
 		// Retrieve all extrafield for line
 		// fetch optionals attributes and labels
-		if (!is_object($extrafields))
-		{
+		if (!is_object($extrafields)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
 		}
@@ -662,12 +644,10 @@ class FactureRec extends CommonInvoice
 
 		dol_syslog('FactureRec::fetch_lines', LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($result);
 				$line = new FactureLigneRec($this->db);
 
@@ -764,18 +744,20 @@ class FactureRec extends CommonInvoice
 		dol_syslog($sqlef);
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet_rec WHERE fk_facture = ".$rowid;
 		dol_syslog($sql);
-		if ($this->db->query($sqlef) && $this->db->query($sql))
-		{
+		if ($this->db->query($sqlef) && $this->db->query($sql)) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_rec WHERE rowid = ".$rowid;
 			dol_syslog($sql);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
-				if ($res < 0) $error = -3;
+				if ($res < 0) {
+					$error = -3;
+				}
 				// Delete extrafields
 				$res = $this->deleteExtraFields();
-				if ($res < 0) $error = -4;
+				if ($res < 0) {
+					$error = -4;
+				}
 			} else {
 				$this->error = $this->db->lasterror();
 				$error = -1;
@@ -785,8 +767,7 @@ class FactureRec extends CommonInvoice
 			$error = -2;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -833,23 +814,25 @@ class FactureRec extends CommonInvoice
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Check parameters
-		if ($type < 0) return -1;
+		if ($type < 0) {
+			return -1;
+		}
 
 		$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 		// Clean vat code
 		$vat_src_code = '';
-		if (preg_match('/\((.*)\)/', $txtva, $reg))
-		{
+		if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 			$vat_src_code = $reg[1];
 			$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 		}
 
-		if ($this->brouillon)
-		{
+		if ($this->brouillon) {
 			// Clean parameters
 			$remise_percent = price2num($remise_percent);
-			if (empty($remise_percent)) $remise_percent = 0;
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
 			$qty = price2num($qty);
 			$pu_ht = price2num($pu_ht);
 			$pu_ttc = price2num($pu_ttc);
@@ -858,13 +841,20 @@ class FactureRec extends CommonInvoice
 			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
-			if (empty($txtva)) $txtva = 0;
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
-			if (empty($info_bits)) $info_bits = 0;
+			if (empty($txtva)) {
+				$txtva = 0;
+			}
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
 
-			if ($price_base_type == 'HT')
-			{
+			if ($price_base_type == 'HT') {
 				$pu = $pu_ht;
 			} else {
 				$pu = $pu_ttc;
@@ -890,8 +880,7 @@ class FactureRec extends CommonInvoice
 			$pu_ht_devise = $tabprice[19];
 
 			$product_type = $type;
-			if ($fk_product)
-			{
+			if ($fk_product) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
@@ -967,8 +956,7 @@ class FactureRec extends CommonInvoice
 			$sql .= ")";
 
 			dol_syslog(get_class($this)."::addline", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$lineId = $this->db->last_insert_id(MAIN_DB_PREFIX."facturedet_rec");
 				$this->id = $facid;
 				$this->update_price();
@@ -1019,35 +1007,51 @@ class FactureRec extends CommonInvoice
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Clean parameters
-		if (empty($remise_percent)) $remise_percent = 0;
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
 
 		// Check parameters
-		if ($type < 0) return -1;
+		if ($type < 0) {
+			return -1;
+		}
 
-		if ($this->brouillon)
-		{
+		if ($this->brouillon) {
 			// Clean parameters
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
-			if (empty($info_bits)) $info_bits = 0;
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
 			$pu_ht          = price2num($pu_ht);
 			$pu_ttc         = price2num($pu_ttc);
 			$pu_ht_devise = price2num($pu_ht_devise);
-	        if (!preg_match('/\((.*)\)/', $txtva)) {
-	        	$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
-	        }
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1	= price2num($txlocaltax1);
 			$txlocaltax2	= price2num($txlocaltax2);
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
 
-			if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
-			if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
-			if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-			if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+			if (empty($this->multicurrency_subprice)) {
+				$this->multicurrency_subprice = 0;
+			}
+			if (empty($this->multicurrency_total_ht)) {
+				$this->multicurrency_total_ht = 0;
+			}
+			if (empty($this->multicurrency_total_tva)) {
+				$this->multicurrency_total_tva = 0;
+			}
+			if (empty($this->multicurrency_total_ttc)) {
+				$this->multicurrency_total_ttc = 0;
+			}
 
-			if ($price_base_type == 'HT')
-			{
+			if ($price_base_type == 'HT') {
 				$pu = $pu_ht;
 			} else {
 				$pu = $pu_ttc;
@@ -1061,9 +1065,8 @@ class FactureRec extends CommonInvoice
 
 			// Clean vat code
 			$vat_src_code = '';
-	        $reg = array();
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			$reg = array();
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -1086,8 +1089,7 @@ class FactureRec extends CommonInvoice
 			$pu_ht_devise = $tabprice[19];
 
 			$product_type = $type;
-			if ($fk_product)
-			{
+			if ($fk_product) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
@@ -1129,8 +1131,7 @@ class FactureRec extends CommonInvoice
 			$sql .= " WHERE rowid = ".$rowid;
 
 			dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->id = $facid;
 				$this->update_price();
 				return 1;
@@ -1149,7 +1150,9 @@ class FactureRec extends CommonInvoice
 	 */
 	public function getNextDate()
 	{
-		if (empty($this->date_when)) return false;
+		if (empty($this->date_when)) {
+			return false;
+		}
 		return dol_time_plus_duree($this->date_when, $this->frequency, $this->unit_frequency);
 	}
 
@@ -1161,7 +1164,9 @@ class FactureRec extends CommonInvoice
 	public function isMaxNbGenReached()
 	{
 		$ret = false;
-		if ($this->nb_gen_max > 0 && ($this->nb_gen_done >= $this->nb_gen_max)) $ret = true;
+		if ($this->nb_gen_max > 0 && ($this->nb_gen_done >= $this->nb_gen_max)) {
+			$ret = true;
+		}
 		return $ret;
 	}
 
@@ -1209,8 +1214,9 @@ class FactureRec extends CommonInvoice
 		$sql .= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
 		$sql .= ' AND suspended = 0';
 		$sql .= ' AND entity = '.$conf->entity; // MUST STAY = $conf->entity here
-		if ($restrictioninvoiceid > 0)
+		if ($restrictioninvoiceid > 0) {
 			$sql .= ' AND rowid = '.$restrictioninvoiceid;
+		}
 		$sql .= $this->db->order('entity', 'ASC');
 		//print $sql;exit;
 		$parameters = array(
@@ -1220,19 +1226,19 @@ class FactureRec extends CommonInvoice
 		$reshook = $hookmanager->executeHooks('beforeCreationOfRecurringInvoices', $parameters, $sql); // note that $sql might be modified by hooks
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num = $this->db->num_rows($resql);
 
-			if ($num)
+			if ($num) {
 				$this->output .= $langs->trans("FoundXQualifiedRecurringInvoiceTemplate", $num)."\n";
-			else $this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
+			} else {
+				$this->output .= $langs->trans("NoQualifiedRecurringInvoiceTemplateFound");
+			}
 
 			$saventity = $conf->entity;
 
-			while ($i < $num)     // Loop on each template invoice. If $num = 0, test is false at first pass.
-			{
+			while ($i < $num) {     // Loop on each template invoice. If $num = 0, test is false at first pass.
 				$line = $this->db->fetch_object($resql);
 
 				$this->db->begin();
@@ -1243,8 +1249,7 @@ class FactureRec extends CommonInvoice
 				$facturerec = new FactureRec($this->db);
 				$facturerec->fetch($line->rowid);
 
-				if ($facturerec->id > 0)
-				{
+				if ($facturerec->id > 0) {
 					// Set entity context
 					$conf->entity = $facturerec->entity;
 
@@ -1260,24 +1265,20 @@ class FactureRec extends CommonInvoice
 					$facture->socid = $facturerec->socid;
 
 					$invoiceidgenerated = $facture->create($user);
-					if ($invoiceidgenerated <= 0)
-					{
+					if ($invoiceidgenerated <= 0) {
 						$this->errors = $facture->errors;
 						$this->error = $facture->error;
 						$error++;
 					}
-					if (!$error && ($facturerec->auto_validate || $forcevalidation))
-					{
+					if (!$error && ($facturerec->auto_validate || $forcevalidation)) {
 						$result = $facture->validate($user);
-						if ($result <= 0)
-						{
+						if ($result <= 0) {
 							$this->errors = $facture->errors;
 							$this->error = $facture->error;
 							$error++;
 						}
 					}
-					if (!$error && $facturerec->generate_pdf)
-					{
+					if (!$error && $facturerec->generate_pdf) {
 						// We refresh the object in order to have all necessary data (like date_lim_reglement)
 						$facture->fetch($facture->id);
 						$result = $facture->generateDocument($facturerec->model_pdf, $langs);
@@ -1294,8 +1295,7 @@ class FactureRec extends CommonInvoice
 					dol_syslog("createRecurringInvoices Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity);
 				}
 
-				if (!$error && $invoiceidgenerated >= 0)
-				{
+				if (!$error && $invoiceidgenerated >= 0) {
 					$this->db->commit("createRecurringInvoices Process invoice template id=".$facturerec->id.", ref=".$facturerec->ref);
 					dol_syslog("createRecurringInvoices Process invoice template ".$facturerec->ref." is finished with a success generation");
 					$nb_create++;
@@ -1318,7 +1318,9 @@ class FactureRec extends CommonInvoice
 			}
 
 			$conf->entity = $saventity; // Restore entity context
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		$this->output = trim($this->output);
 
@@ -1357,28 +1359,39 @@ class FactureRec extends CommonInvoice
 			if (!empty($this->date_when)) {
 				$label .= '<br><b>'.$langs->trans('NextDateToExecution').':</b> ';
 				$label .= (empty($this->suspended) ? '' : '<strike>').dol_print_date($this->date_when, 'day').(empty($this->suspended) ? '' : '</strike>'); // No hour for this property
-				if (!empty($this->suspended)) $label .= ' ('.$langs->trans("Disabled").')';
+				if (!empty($this->suspended)) {
+					$label .= ' ('.$langs->trans("Disabled").')';
+				}
 			}
 		}
 
 		$url = DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$this->id;
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -1417,11 +1430,9 @@ class FactureRec extends CommonInvoice
 		$statusType = 'status0';
 
 		//print "$recur,$status,$mode,$alreadypaid,$type";
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			$prefix = '';
-			if ($recur)
-			{
+			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
 				} else {
@@ -1434,11 +1445,9 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans("Draft");
 				}
 			}
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			$prefix = 'Short';
-			if ($recur)
-			{
+			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
 					$labelStatus = $langs->trans('Disabled');
 				} else {
@@ -1451,10 +1460,8 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans("Draft");
 				}
 			}
-		} elseif ($mode == 2)
-		{
-			if ($recur)
-			{
+		} elseif ($mode == 2) {
+			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
@@ -1471,10 +1478,8 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		} elseif ($mode == 3)
-		{
-			if ($recur)
-			{
+		} elseif ($mode == 3) {
+			if ($recur) {
 				$prefix = 'Short';
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
@@ -1492,11 +1497,9 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		} elseif ($mode == 4)
-		{
+		} elseif ($mode == 4) {
 			$prefix = '';
-			if ($recur)
-			{
+			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
@@ -1513,12 +1516,12 @@ class FactureRec extends CommonInvoice
 					$labelStatus = $langs->trans('Draft');
 				}
 			}
-		} elseif ($mode == 5 || $mode == 6)
-		{
+		} elseif ($mode == 5 || $mode == 6) {
 			$prefix = '';
-			if ($mode == 5) $prefix = 'Short';
-			if ($recur)
-			{
+			if ($mode == 5) {
+				$prefix = 'Short';
+			}
+			if ($recur) {
 				if ($status == self::STATUS_SUSPENDED) {
 					$statusType = 'status6';
 					$labelStatus = $langs->trans('Disabled');
@@ -1537,7 +1540,9 @@ class FactureRec extends CommonInvoice
 			}
 		}
 
-		if (empty($labelStatusShort)) $labelStatusShort = $labelStatus;
+		if (empty($labelStatusShort)) {
+			$labelStatusShort = $labelStatus;
+		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
@@ -1568,12 +1573,10 @@ class FactureRec extends CommonInvoice
 		$sql .= $this->db->plimit(100);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_prods = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_prods)
-			{
+			while ($i < $num_prods) {
 				$i++;
 				$row = $this->db->fetch_row($resql);
 				$prodids[$i] = $row[0];
@@ -1598,13 +1601,11 @@ class FactureRec extends CommonInvoice
 		$this->fk_incoterms = 0;
 		$this->location_incoterms = '';
 
-		if (empty($option) || $option != 'nolines')
-		{
+		if (empty($option) || $option != 'nolines') {
 			// Lines
 			$nbp = 5;
 			$xnbp = 0;
-			while ($xnbp < $nbp)
-			{
+			while ($xnbp < $nbp) {
 				$line = new FactureLigne($this->db);
 				$line->desc = $langs->trans("Description")." ".$xnbp;
 				$line->qty = 1;
@@ -1613,23 +1614,20 @@ class FactureRec extends CommonInvoice
 				$line->localtax1_tx = 0;
 				$line->localtax2_tx = 0;
 				$line->remise_percent = 0;
-				if ($xnbp == 1)        // Qty is negative (product line)
-				{
+				if ($xnbp == 1) {        // Qty is negative (product line)
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
 					$line->qty = -1;
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
-				} elseif ($xnbp == 2)    // UP is negative (free line)
-				{
+				} elseif ($xnbp == 2) {    // UP is negative (free line)
 					$line->subprice = -100;
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
 					$line->total_tva = -19.6;
 					$line->remise_percent = 0;
-				} elseif ($xnbp == 3)    // Discount is 50% (product line)
-				{
+				} elseif ($xnbp == 3) {    // Discount is 50% (product line)
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
 					$line->total_ht = 50;
@@ -1723,7 +1721,9 @@ class FactureRec extends CommonInvoice
 		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);
@@ -1740,21 +1740,23 @@ class FactureRec extends CommonInvoice
 	 */
 	public function setNextDate($date, $increment_nb_gen_done = 0)
 	{
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 		$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))
-		{
+		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);
@@ -1770,21 +1772,21 @@ class FactureRec extends CommonInvoice
 	 */
 	public function setMaxPeriod($nb)
 	{
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined", LOG_ERR);
 			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;
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this)."::setMaxPeriod", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->nb_gen_max = $nb;
 			return 1;
 		} else {
@@ -1801,8 +1803,7 @@ class FactureRec extends CommonInvoice
 	 */
 	public function setAutoValidate($validate)
 	{
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setAutoValidate was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
@@ -1812,8 +1813,7 @@ class FactureRec extends CommonInvoice
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->auto_validate = $validate;
 			return 1;
 		} else {
@@ -1830,8 +1830,7 @@ class FactureRec extends CommonInvoice
 	 */
 	public function setGeneratePdf($validate)
 	{
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setGeneratePdf was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
@@ -1841,8 +1840,7 @@ class FactureRec extends CommonInvoice
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this)."::setGeneratePdf", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->generate_pdf = $validate;
 			return 1;
 		} else {
@@ -1859,8 +1857,7 @@ class FactureRec extends CommonInvoice
 	 */
 	public function setModelPdf($model)
 	{
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setModelPdf was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
@@ -1870,8 +1867,7 @@ class FactureRec extends CommonInvoice
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(get_class($this)."::setModelPdf", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->model_pdf = $model;
 			return 1;
 		} else {
@@ -1918,21 +1914,21 @@ class FactureLigneRec extends CommonInvoiceLine
 			if (!$notrigger) {
 				// Call triggers
 				$result = $this->call_trigger('LINEBILLREC_DELETE', $user);
-				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
+				if ($result < 0) {
+					$error++;
+				} // Do also here what you must do to rollback action if trigger fail
 				// End call triggers
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->deleteExtraFields();
 			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
 
 			$res = $this->db->query($sql);
@@ -1974,8 +1970,7 @@ class FactureLigneRec extends CommonInvoiceLine
 
 		dol_syslog('FactureRec::fetch', LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$objp = $this->db->fetch_object($result);
 
 			$this->id = $objp->rowid;
@@ -2075,23 +2070,18 @@ class FactureLigneRec extends CommonInvoiceLine
 
 		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$error)
-			{
+		if ($resql) {
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEBILLREC_UPDATE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 				// End call triggers
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 7f686accb4e..983e42f5ff5 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -45,8 +45,12 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/margin/lib/margins.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
 
 /**
  *	Class to manage invoices
@@ -428,20 +432,28 @@ class Facture extends CommonInvoice
 		$error = 0;
 
 		// Clean parameters
-		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
+		if (empty($this->type)) {
+			$this->type = self::TYPE_STANDARD;
+		}
 		$this->ref_client = trim($this->ref_client);
 		$this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
 		$this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note_private));
 		$this->note_public = trim($this->note_public);
-		if (!$this->cond_reglement_id) $this->cond_reglement_id = 0;
-		if (!$this->mode_reglement_id) $this->mode_reglement_id = 0;
+		if (!$this->cond_reglement_id) {
+			$this->cond_reglement_id = 0;
+		}
+		if (!$this->mode_reglement_id) {
+			$this->mode_reglement_id = 0;
+		}
 		$this->brouillon = 1;
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = $conf->currency;
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
@@ -450,16 +462,14 @@ class Facture extends CommonInvoice
 		dol_syslog(get_class($this)."::create user=".$user->id." date=".$this->date);
 
 		// Check parameters
-		if (empty($this->date))
-		{
+		if (empty($this->date)) {
 			$this->error = "Try to create an invoice with an empty parameter (date)";
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -3;
 		}
 		$soc = new Societe($this->db);
 		$result = $soc->fetch($this->socid);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = "Failed to fetch company: ".$soc->error;
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -2;
@@ -474,8 +484,7 @@ class Facture extends CommonInvoice
 		$previousdaynextdatewhen = null;
 
 		// Create invoice from a template recurring invoice
-		if ($this->fac_rec > 0)
-		{
+		if ($this->fac_rec > 0) {
 			$this->fk_fac_rec_source = $this->fac_rec;
 
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
@@ -488,8 +497,7 @@ class Facture extends CommonInvoice
 			$nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency);
 			$previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd');
 
-			if (!empty($_facrec->frequency))  // Invoice are created on same thirdparty than template when there is a recurrence, but not necessarly when there is no recurrence.
-			{
+			if (!empty($_facrec->frequency)) {  // Invoice are created on same thirdparty than template when there is a recurrence, but not necessarly when there is no recurrence.
 				$this->socid = $_facrec->socid;
 			}
 			$this->entity            = $_facrec->entity; // Invoice created in same entity than template
@@ -514,7 +522,9 @@ class Facture extends CommonInvoice
 			$this->location_incoterms = $_facrec->location_incoterms;
 
 			// Clean parameters
-			if (!$this->type) $this->type = self::TYPE_STANDARD;
+			if (!$this->type) {
+				$this->type = self::TYPE_STANDARD;
+			}
 			$this->ref_client = trim($this->ref_client);
 			$this->note_public = trim($this->note_public);
 			$this->note_private = trim($this->note_private);
@@ -523,7 +533,9 @@ class Facture extends CommonInvoice
 			$this->array_options = $_facrec->array_options;
 
 			//if (! $this->remise) $this->remise = 0;
-			if (!$this->mode_reglement_id) $this->mode_reglement_id = 0;
+			if (!$this->mode_reglement_id) {
+				$this->mode_reglement_id = 0;
+			}
 			$this->brouillon = 1;
 
 			$this->linked_objects = $_facrec->linkedObjectsIds;
@@ -533,10 +545,11 @@ class Facture extends CommonInvoice
 			$forceduedate = $this->calculate_date_lim_reglement();
 
 			// For recurring invoices, update date and number of last generation of recurring template invoice, before inserting new invoice
-			if ($_facrec->frequency > 0)
-			{
+			if ($_facrec->frequency > 0) {
 				dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
-				if (empty($_facrec->date_when)) $_facrec->date_when = $now;
+				if (empty($_facrec->date_when)) {
+					$_facrec->date_when = $now;
+				}
 				$next_date = $_facrec->getNextDate(); // Calculate next date
 				$result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
 				//$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
@@ -547,10 +560,13 @@ class Facture extends CommonInvoice
 			$outputlangs = $langs;
 			$newlang = '';
 
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) $newlang = $this->thirdparty->default_lang; // for proposal, order, invoice, ...
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) $newlang = $this->default_lang; // for thirdparty
-			if (!empty($newlang))
-			{
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) {
+				$newlang = $this->thirdparty->default_lang; // for proposal, order, invoice, ...
+			}
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) {
+				$newlang = $this->default_lang; // for thirdparty
+			}
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
@@ -585,9 +601,9 @@ class Facture extends CommonInvoice
 		if (empty($forceduedate)) {
 			$duedate = $this->calculate_date_lim_reglement();
 			/*if ($duedate < 0) {	Regression, a date can be negative if before 1970.
-                dol_syslog(__METHOD__ . ' Error in calculate_date_lim_reglement. We got ' . $duedate, LOG_ERR);
-                return -1;
-            }*/
+				dol_syslog(__METHOD__ . ' Error in calculate_date_lim_reglement. We got ' . $duedate, LOG_ERR);
+				return -1;
+			}*/
 			$this->date_lim_reglement = $duedate;
 		} else {
 			$this->date_lim_reglement = $forceduedate;
@@ -662,8 +678,7 @@ class Facture extends CommonInvoice
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture');
 
 			// Update ref with new one
@@ -671,25 +686,21 @@ class Facture extends CommonInvoice
 			$sql = 'UPDATE '.MAIN_DB_PREFIX."facture SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql) $error++;
+			if (!$resql) {
+				$error++;
+			}
 
-			if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-			{
+			if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {	// To use new linkedObjectsIds instead of old linked_objects
 				$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 			}
 
 			// Add object linked
-			if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
-			{
-				foreach ($this->linked_objects as $origin => $tmp_origin_id)
-				{
-					if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-					{
-						foreach ($tmp_origin_id as $origin_id)
-						{
+			if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) {
+				foreach ($this->linked_objects as $origin => $tmp_origin_id) {
+					if (is_array($tmp_origin_id)) {       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						foreach ($tmp_origin_id as $origin_id) {
 							$ret = $this->add_object_linked($origin, $origin_id);
-							if (!$ret)
-							{
+							if (!$ret) {
 								$this->error = $this->db->lasterror();
 								$error++;
 							}
@@ -698,8 +709,7 @@ class Facture extends CommonInvoice
 					{
 						$origin_id = $tmp_origin_id;
 						$ret = $this->add_object_linked($origin, $origin_id);
-						if (!$ret)
-						{
+						if (!$ret) {
 							$this->error = $this->db->lasterror();
 							$error++;
 						}
@@ -708,23 +718,22 @@ class Facture extends CommonInvoice
 			}
 
 			// Propagate contacts
-			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id))   // Get contact from origin object
-			{
+			if (!$error && $this->id && !empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN) && !empty($this->origin) && !empty($this->origin_id)) {   // Get contact from origin object
 				$originforcontact = $this->origin;
 				$originidforcontact = $this->origin_id;
-				if ($originforcontact == 'shipping')     // shipment and order share the same contacts. If creating from shipment we take data of order
-				{
+				if ($originforcontact == 'shipping') {     // shipment and order share the same contacts. If creating from shipment we take data of order
 					require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 					$exp = new Expedition($this->db);
 					$exp->fetch($this->origin_id);
 					$exp->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-					if (count($exp->linkedObjectsIds['commande']) > 0)
-					{
-						foreach ($exp->linkedObjectsIds['commande'] as $key => $value)
-						{
+					if (count($exp->linkedObjectsIds['commande']) > 0) {
+						foreach ($exp->linkedObjectsIds['commande'] as $key => $value) {
 							$originforcontact = 'commande';
-							if (is_object($value)) $originidforcontact = $value->id;
-							else $originidforcontact = $value;
+							if (is_object($value)) {
+								$originidforcontact = $value->id;
+							} else {
+								$originidforcontact = $value;
+							}
 							break; // We take first one
 						}
 					}
@@ -734,26 +743,24 @@ class Facture extends CommonInvoice
 				$sqlcontact .= " WHERE element_id = ".$originidforcontact." AND ec.fk_c_type_contact = ctc.rowid AND ctc.element = '".$this->db->escape($originforcontact)."'";
 
 				$resqlcontact = $this->db->query($sqlcontact);
-				if ($resqlcontact)
-				{
-					while ($objcontact = $this->db->fetch_object($resqlcontact))
-					{
+				if ($resqlcontact) {
+					while ($objcontact = $this->db->fetch_object($resqlcontact)) {
 						//print $objcontact->code.'-'.$objcontact->source.'-'.$objcontact->fk_socpeople."\n";
 						$this->add_contact($objcontact->fk_socpeople, $objcontact->code, $objcontact->source); // May failed because of duplicate key or because code of contact type does not exists for new object
 					}
-				} else dol_print_error($resqlcontact);
+				} else {
+					dol_print_error($resqlcontact);
+				}
 			}
 
 			/*
 			 *  Insert lines of invoices, if not from template invoice, into database
 			 */
-			if (!$error && empty($this->fac_rec) && count($this->lines) && is_object($this->lines[0]))	// If this->lines is array of InvoiceLines (preferred mode)
-			{
+			if (!$error && empty($this->fac_rec) && count($this->lines) && is_object($this->lines[0])) {	// If this->lines is array of InvoiceLines (preferred mode)
 				$fk_parent_line = 0;
 
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
-				foreach ($this->lines as $i => $val)
-				{
+				foreach ($this->lines as $i => $val) {
 					$newinvoiceline = $this->lines[$i];
 					$newinvoiceline->fk_facture = $this->id;
 
@@ -761,17 +768,14 @@ class Facture extends CommonInvoice
 					$newinvoiceline->origin_id = $this->lines[$i]->id;
 
 					// Auto set date of service ?
-					if ($this->lines[$i]->date_start_fill == 1 && $originaldatewhen)		// $originaldatewhen is defined when generating from recurring invoice only
-					{
+					if ($this->lines[$i]->date_start_fill == 1 && $originaldatewhen) {		// $originaldatewhen is defined when generating from recurring invoice only
 						$newinvoiceline->date_start = $originaldatewhen;
 					}
-					if ($this->lines[$i]->date_end_fill == 1 && $previousdaynextdatewhen)	// $previousdaynextdatewhen is defined when generating from recurring invoice only
-					{
+					if ($this->lines[$i]->date_end_fill == 1 && $previousdaynextdatewhen) {	// $previousdaynextdatewhen is defined when generating from recurring invoice only
 						$newinvoiceline->date_end = $previousdaynextdatewhen;
 					}
 
-					if ($result >= 0)
-					{
+					if ($result >= 0) {
 						// Reset fk_parent_line for no child products and special product
 						if (($newinvoiceline->product_type != 9 && empty($newinvoiceline->fk_parent_line)) || $newinvoiceline->product_type == 9) {
 							$fk_parent_line = 0;
@@ -794,30 +798,28 @@ class Facture extends CommonInvoice
 							$fk_parent_line = $result;
 						}
 					}
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$this->error = $newinvoiceline->error;
 						$this->errors = $newinvoiceline->errors;
 						$error++;
 						break;
 					}
 				}
-			} elseif (!$error && empty($this->fac_rec)) 		// If this->lines is an array of invoice line arrays
-			{
+			} elseif (!$error && empty($this->fac_rec)) { 		// If this->lines is an array of invoice line arrays
 				$fk_parent_line = 0;
 
 				dol_syslog("There is ".count($this->lines)." lines that are array lines");
 
-				foreach ($this->lines as $i => $val)
-				{
+				foreach ($this->lines as $i => $val) {
 					$line = $this->lines[$i];
 
 					// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 					//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-					if (!is_object($line)) $line = (object) $line;
+					if (!is_object($line)) {
+						$line = (object) $line;
+					}
 
-					if ($result >= 0)
-					{
+					if ($result >= 0) {
 						// Reset fk_parent_line for no child products and special product
 						if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
 							$fk_parent_line = 0;
@@ -825,7 +827,9 @@ class Facture extends CommonInvoice
 
 						// Complete vat rate with code
 						$vatrate = $line->tva_tx;
-						if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) $vatrate .= ' ('.$line->vat_src_code.')';
+						if ($line->vat_src_code && !preg_match('/\(.*\)/', $vatrate)) {
+							$vatrate .= ' ('.$line->vat_src_code.')';
+						}
 
 						if (!empty($conf->global->MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION)) {
 							$originid = $line->origin_id;
@@ -872,8 +876,7 @@ class Facture extends CommonInvoice
 							$line->multicurrency_subprice,
 							$line->ref_ext
 						);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->error = $this->db->lasterror();
 							dol_print_error($this->db);
 							$this->db->rollback();
@@ -891,12 +894,9 @@ class Facture extends CommonInvoice
 			/*
 			 * Insert lines of template invoices
 			 */
-			if (!$error && $this->fac_rec > 0)
-			{
-				foreach ($_facrec->lines as $i => $val)
-				{
-					if ($_facrec->lines[$i]->fk_product)
-					{
+			if (!$error && $this->fac_rec > 0) {
+				foreach ($_facrec->lines as $i => $val) {
+					if ($_facrec->lines[$i]->fk_product) {
 						$prod = new Product($this->db);
 						$res = $prod->fetch($_facrec->lines[$i]->fk_product);
 					}
@@ -911,15 +911,16 @@ class Facture extends CommonInvoice
 					*/
 					$tva_tx = $_facrec->lines[$i]->tva_tx.($_facrec->lines[$i]->vat_src_code ? '('.$_facrec->lines[$i]->vat_src_code.')' : '');
 					$tva_npr = $_facrec->lines[$i]->info_bits;
-					if (empty($tva_tx)) $tva_npr = 0;
+					if (empty($tva_tx)) {
+						$tva_npr = 0;
+					}
 					$localtax1_tx = $_facrec->lines[$i]->localtax1_tx;
 					$localtax2_tx = $_facrec->lines[$i]->localtax2_tx;
 
 					$fk_product_fournisseur_price = empty($_facrec->lines[$i]->fk_product_fournisseur_price) ?null:$_facrec->lines[$i]->fk_product_fournisseur_price;
 					$buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice;
 					// If buyprice not defined from template invoice, we try to guess the best value
-					if (!$buyprice && $_facrec->lines[$i]->fk_product > 0)
-					{
+					if (!$buyprice && $_facrec->lines[$i]->fk_product > 0) {
 						require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 						$producttmp = new ProductFournisseur($this->db);
 						$producttmp->fetch($_facrec->lines[$i]->fk_product);
@@ -927,13 +928,13 @@ class Facture extends CommonInvoice
 						// If margin module defined on costprice, we try the costprice
 						// If not defined or if module margin defined and pmp and stock module enabled, we try pmp price
 						// else we get the best supplier price
-						if ($conf->global->MARGIN_TYPE == 'costprice' && !empty($producttmp->cost_price)) $buyprice = $producttmp->cost_price;
-						elseif (!empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && !empty($producttmp->pmp)) $buyprice = $producttmp->pmp;
-						else {
-							if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0)
-							{
-								if ($producttmp->product_fourn_price_id > 0)
-								{
+						if ($conf->global->MARGIN_TYPE == 'costprice' && !empty($producttmp->cost_price)) {
+							$buyprice = $producttmp->cost_price;
+						} elseif (!empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && !empty($producttmp->pmp)) {
+							$buyprice = $producttmp->pmp;
+						} else {
+							if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0) {
+								if ($producttmp->product_fourn_price_id > 0) {
 									$buyprice = price2num($producttmp->fourn_unitprice * (1 - $producttmp->fourn_remise_percent / 100) + $producttmp->fourn_remise, 'MU');
 								}
 							}
@@ -972,8 +973,7 @@ class Facture extends CommonInvoice
 						$_facrec->lines[$i]->multicurrency_subprice
 					);
 
-					if ($result_insert < 0)
-					{
+					if ($result_insert < 0) {
 						$error++;
 						$this->error = $this->db->error();
 						break;
@@ -981,30 +981,29 @@ class Facture extends CommonInvoice
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->update_price(1);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$action = 'create';
 
 					// Actions on extra fields
-					if (!$error)
-					{
+					if (!$error) {
 						$result = $this->insertExtraFields();
-						if ($result < 0) $error++;
+						if ($result < 0) {
+							$error++;
+						}
 					}
 
-					if (!$error && !$notrigger)
-					{
+					if (!$error && !$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('BILL_CREATE', $user);
-						if ($result < 0) $error++;
+						if ($result < 0) {
+							$error++;
+						}
 						// End call triggers
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						$this->db->commit();
 						return $this->id;
 					} else {
@@ -1087,11 +1086,9 @@ class Facture extends CommonInvoice
 
 
 		// Loop on each line of new invoice
-		foreach ($facture->lines as $i => $tmpline)
-		{
+		foreach ($facture->lines as $i => $tmpline) {
 			$facture->lines[$i]->fk_prev_id = $this->lines[$i]->rowid;
-			if ($invertdetail)
-			{
+			if ($invertdetail) {
 				$facture->lines[$i]->subprice  = -$facture->lines[$i]->subprice;
 				$facture->lines[$i]->total_ht  = -$facture->lines[$i]->total_ht;
 				$facture->lines[$i]->total_tva = -$facture->lines[$i]->total_tva;
@@ -1105,18 +1102,14 @@ class Facture extends CommonInvoice
 		dol_syslog(get_class($this)."::createFromCurrent invertdetail=".$invertdetail." socid=".$this->socid." nboflines=".count($facture->lines));
 
 		$facid = $facture->create($user);
-		if ($facid <= 0)
-		{
+		if ($facid <= 0) {
 			$this->error = $facture->error;
 			$this->errors = $facture->errors;
-		} elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION))
-		{
+		} elseif ($this->type == self::TYPE_SITUATION && !empty($conf->global->INVOICE_USE_SITUATION)) {
 			$this->fetchObjectLinked('', '', $this->id, 'facture');
 
-			foreach ($this->linkedObjectsIds as $typeObject => $Tfk_object)
-			{
-				foreach ($Tfk_object as $fk_object)
-				{
+			foreach ($this->linkedObjectsIds as $typeObject => $Tfk_object) {
+				foreach ($Tfk_object as $fk_object) {
 					$facture->add_object_linked($typeObject, $fk_object);
 				}
 			}
@@ -1148,12 +1141,10 @@ class Facture extends CommonInvoice
 		$object->fetch($fromid);
 
 		// Change socid if needed
-		if (!empty($this->socid) && $this->socid != $object->socid)
-		{
+		if (!empty($this->socid) && $this->socid != $object->socid) {
 			$objsoc = new Societe($this->db);
 
-			if ($objsoc->fetch($this->socid) > 0)
-			{
+			if ($objsoc->fetch($this->socid) > 0) {
 				$object->socid = $objsoc->id;
 				$object->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
 				$object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
@@ -1187,10 +1178,8 @@ class Facture extends CommonInvoice
 		}
 
 		// Loop on each line of new invoice
-		foreach ($object->lines as $i => $line)
-		{
-			if (($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
-			{
+		foreach ($object->lines as $i => $line) {
+			if (($object->lines[$i]->info_bits & 0x02) == 0x02) {	// We do not clone line of discounts
 				unset($object->lines[$i]);
 			}
 
@@ -1224,37 +1213,36 @@ class Facture extends CommonInvoice
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
 		$result = $object->create($user);
-		if ($result < 0) $error++;
-		else {
+		if ($result < 0) {
+			$error++;
+		} else {
 			// copy internal contacts
-			if ($object->copy_linked_contact($this, 'internal') < 0)
+			if ($object->copy_linked_contact($this, 'internal') < 0) {
 				$error++;
-
-			// copy external contacts if same company
-			elseif ($this->socid == $object->socid)
-			{
-				if ($object->copy_linked_contact($this, 'external') < 0)
+			} elseif ($this->socid == $object->socid) {
+				// copy external contacts if same company
+				if ($object->copy_linked_contact($this, 'external') < 0) {
 					$error++;
+				}
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Hook of thirdparty module
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('objFrom'=>$this);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 		}
 
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
@@ -1281,8 +1269,7 @@ class Facture extends CommonInvoice
 		$this->source = 0;
 
 		$num = count($object->lines);
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			$line = new FactureLigne($this->db);
 
 			$line->libelle = $object->lines[$i]->libelle; // deprecated
@@ -1345,8 +1332,7 @@ class Facture extends CommonInvoice
 		$this->contact_id           = $object->contact_id;
 		$this->ref_client           = $object->ref_client;
 
-		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN))
-		{
+		if (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN)) {
 			$this->note_private = $object->note_private;
 			$this->note_public = $object->note_public;
 		}
@@ -1361,13 +1347,13 @@ class Facture extends CommonInvoice
 
 		// get extrafields from original line
 		$object->fetch_optionals();
-		foreach ($object->array_options as $options_key => $value)
+		foreach ($object->array_options as $options_key => $value) {
 			$this->array_options[$options_key] = $value;
+		}
 
 		// Possibility to add external linked objects with hooks
 		$this->linked_objects[$this->origin] = $this->origin_id;
-		if (!empty($object->other_linked_objects) && is_array($object->other_linked_objects))
-		{
+		if (!empty($object->other_linked_objects) && is_array($object->other_linked_objects)) {
 			$this->linked_objects = array_merge($this->linked_objects, $object->other_linked_objects);
 		}
 
@@ -1380,13 +1366,18 @@ class Facture extends CommonInvoice
 			$parameters = array('objFrom'=>$object);
 			$action = '';
 			$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
+			if ($reshook < 0) {
+				$error++;
+			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				return 1;
-			} else return -1;
-		} else return -1;
+			} else {
+				return -1;
+			}
+		} else {
+			return -1;
+		}
 	}
 
 	/**
@@ -1407,65 +1398,98 @@ class Facture extends CommonInvoice
 	{
 		global $langs, $conf, $user, $mysoc;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
-		if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
-		else $url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
-
-		if (!$user->rights->facture->lire)
-			$option = 'nolink';
-
-		if ($option !== 'nolink')
-		{
-			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		if ($option == 'withdraw') {
+			$url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$this->id;
 		}
 
-		if ($short) return $url;
+		if (!$user->rights->facture->lire) {
+			$option = 'nolink';
+		}
+
+		if ($option !== 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		if ($short) {
+			return $url;
+		}
 
 		$picto = $this->picto;
-		if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
-		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
-		if ($this->type == self::TYPE_DEPOSIT) $picto .= 'd'; // Deposit invoice
+		if ($this->type == self::TYPE_REPLACEMENT) {
+			$picto .= 'r'; // Replacement invoice
+		}
+		if ($this->type == self::TYPE_CREDIT_NOTE) {
+			$picto .= 'a'; // Credit note
+		}
+		if ($this->type == self::TYPE_DEPOSIT) {
+			$picto .= 'd'; // Deposit invoice
+		}
 		$label = '';
 
 		if ($user->rights->facture->lire) {
 			$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->trans("Invoice").'</u>';
-			if ($this->type == self::TYPE_REPLACEMENT) $label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
-			if ($this->type == self::TYPE_CREDIT_NOTE) $label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
-			if ($this->type == self::TYPE_DEPOSIT)     $label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("Deposit").'</u>';
-			if ($this->type == self::TYPE_SITUATION)   $label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
+			if ($this->type == self::TYPE_REPLACEMENT) {
+				$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("ReplacementInvoice").'</u>';
+			}
+			if ($this->type == self::TYPE_CREDIT_NOTE) {
+				$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
+			}
+			if ($this->type == self::TYPE_DEPOSIT) {
+				$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("Deposit").'</u>';
+			}
+			if ($this->type == self::TYPE_SITUATION) {
+				$label = img_picto('', $picto).' <u class="paddingrightonly">'.$langs->transnoentitiesnoconv("InvoiceSituation").'</u>';
+			}
 			if (isset($this->statut) && isset($this->alreadypaid)) {
 				$label .= ' '.$this->getLibStatut(5, $this->alreadypaid);
 			}
-			if (!empty($this->ref))
+			if (!empty($this->ref)) {
 				$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-			if (!empty($this->ref_client))
+			}
+			if (!empty($this->ref_client)) {
 				$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.$this->ref_client;
-			if (!empty($this->date))
-			  	$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
-			if (!empty($this->total_ht))
+			}
+			if (!empty($this->date)) {
+				$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
+			}
+			if (!empty($this->total_ht)) {
 				$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-			if (!empty($this->total_tva))
+			}
+			if (!empty($this->total_tva)) {
 				$label .= '<br><b>'.$langs->trans('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-			if (!empty($this->total_localtax1) && $this->total_localtax1 != 0)		// We keep test != 0 because $this->total_localtax1 can be '0.00000000'
+			}
+			if (!empty($this->total_localtax1) && $this->total_localtax1 != 0) {		// We keep test != 0 because $this->total_localtax1 can be '0.00000000'
 				$label .= '<br><b>'.$langs->transcountry('AmountLT1', $mysoc->country_code).':</b> '.price($this->total_localtax1, 0, $langs, 0, -1, -1, $conf->currency);
-			if (!empty($this->total_localtax2) && $this->total_localtax2 != 0)
+			}
+			if (!empty($this->total_localtax2) && $this->total_localtax2 != 0) {
 				$label .= '<br><b>'.$langs->transcountry('AmountLT2', $mysoc->country_code).':</b> '.price($this->total_localtax2, 0, $langs, 0, -1, -1, $conf->currency);
-			if (!empty($this->total_ttc))
+			}
+			if (!empty($this->total_ttc)) {
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-			if ($moretitle) $label .= ' - '.$moretitle;
+			}
+			if ($moretitle) {
+				$label .= ' - '.$moretitle;
+			}
 		}
 
 		$linkclose = ($target ? ' target="'.$target.'"' : '');
-		if (empty($notooltip) && $user->rights->facture->lire)
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip) && $user->rights->facture->lire) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("Invoice");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -1483,15 +1507,17 @@ class Facture extends CommonInvoice
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($max ?dol_trunc($this->ref, $max) : $this->ref);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= ($max ?dol_trunc($this->ref, $max) : $this->ref);
+		}
 		$result .= $linkend;
 
-		if ($addlinktonotes)
-		{
+		if ($addlinktonotes) {
 			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-			if ($txttoshow)
-			{
+			if ($txttoshow) {
 				//$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
 				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.$txttoshow;
 				$result .= ' <span class="note inline-block">';
@@ -1521,7 +1547,9 @@ class Facture extends CommonInvoice
 	{
 		global $conf;
 
-		if (empty($rowid) && empty($ref) && empty($ref_ext)) return -1;
+		if (empty($rowid) && empty($ref) && empty($ref_ext)) {
+			return -1;
+		}
 
 		$sql = 'SELECT f.rowid,f.entity,f.ref,f.ref_client,f.ref_ext,f.ref_int,f.type,f.fk_soc';
 		$sql .= ', f.tva, f.localtax1, f.localtax2, f.total, f.total_ttc, f.revenuestamp';
@@ -1548,20 +1576,25 @@ class Facture extends CommonInvoice
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON f.fk_incoterms = i.rowid';
 
-		if ($rowid) $sql .= " WHERE f.rowid=".$rowid;
-		else {
+		if ($rowid) {
+			$sql .= " WHERE f.rowid=".$rowid;
+		} else {
 			$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')'; // Dont't use entity if you use rowid
-			if ($ref)     $sql .= " AND f.ref='".$this->db->escape($ref)."'";
-			if ($ref_ext) $sql .= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
-			if ($notused) $sql .= " AND f.ref_int='".$this->db->escape($notused)."'"; // deprecated
+			if ($ref) {
+				$sql .= " AND f.ref='".$this->db->escape($ref)."'";
+			}
+			if ($ref_ext) {
+				$sql .= " AND f.ref_ext='".$this->db->escape($ref_ext)."'";
+			}
+			if ($notused) {
+				$sql .= " AND f.ref_int='".$this->db->escape($notused)."'"; // deprecated
+			}
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $obj->rowid;
@@ -1633,7 +1666,7 @@ class Facture extends CommonInvoice
 				$this->location_incoterms   = $obj->location_incoterms;
 				$this->label_incoterms = $obj->label_incoterms;
 
-  				$this->module_source = $obj->module_source;
+				$this->module_source = $obj->module_source;
 				$this->pos_source = $obj->pos_source;
 
 				// Multicurrency
@@ -1644,12 +1677,13 @@ class Facture extends CommonInvoice
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-				if (($this->type == self::TYPE_SITUATION || ($this->type == self::TYPE_CREDIT_NOTE && $this->situation_cycle_ref > 0)) && $fetch_situation)
-				{
+				if (($this->type == self::TYPE_SITUATION || ($this->type == self::TYPE_CREDIT_NOTE && $this->situation_cycle_ref > 0)) && $fetch_situation) {
 					$this->fetchPreviousNextSituationInvoice();
 				}
 
-				if ($this->statut == self::STATUS_DRAFT)	$this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
 
 				// Retrieve all extrafield
 				// fetch optionals attributes and labels
@@ -1659,8 +1693,7 @@ class Facture extends CommonInvoice
 				$this->lines = array();
 
 				$result = $this->fetch_lines();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $this->db->error();
 					return -3;
 				}
@@ -1708,12 +1741,10 @@ class Facture extends CommonInvoice
 
 		dol_syslog(get_class($this).'::fetch_lines', LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($result);
 				$line = new FactureLigne($this->db);
 
@@ -1819,17 +1850,13 @@ class Facture extends CommonInvoice
 
 		dol_syslog(get_class($this).'::fetchPreviousNextSituationInvoice ', LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result && $this->db->num_rows($result) > 0)
-		{
-			while ($objp = $this->db->fetch_object($result))
-			{
+		if ($result && $this->db->num_rows($result) > 0) {
+			while ($objp = $this->db->fetch_object($result)) {
 				$invoice = new Facture($this->db);
-				if ($invoice->fetch($objp->rowid) > 0)
-				{
+				if ($invoice->fetch($objp->rowid) > 0) {
 					if ($objp->situation_counter < $this->situation_counter
 						|| ($objp->situation_counter == $this->situation_counter && $objp->rowid < $this->id) // This case appear when there are credit notes
-					   )
-					{
+					   ) {
 						$this->tab_previous_situation_invoice[] = $invoice;
 					} else {
 						$this->tab_next_situation_invoice[] = $invoice;
@@ -1853,19 +1880,45 @@ class Facture extends CommonInvoice
 		$error = 0;
 
 		// Clean parameters
-		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
-		if (isset($this->ref)) $this->ref = trim($this->ref);
-		if (isset($this->ref_ext)) $this->ref_ext = trim($this->ref_ext);
-		if (isset($this->ref_client)) $this->ref_client = trim($this->ref_client);
-		if (isset($this->increment)) $this->increment = trim($this->increment);
-		if (isset($this->close_code)) $this->close_code = trim($this->close_code);
-		if (isset($this->close_note)) $this->close_note = trim($this->close_note);
-		if (isset($this->note) || isset($this->note_private)) $this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
-		if (isset($this->note) || isset($this->note_private)) $this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
-		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
-		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
-		if (isset($this->retained_warranty)) $this->retained_warranty = floatval($this->retained_warranty);
+		if (empty($this->type)) {
+			$this->type = self::TYPE_STANDARD;
+		}
+		if (isset($this->ref)) {
+			$this->ref = trim($this->ref);
+		}
+		if (isset($this->ref_ext)) {
+			$this->ref_ext = trim($this->ref_ext);
+		}
+		if (isset($this->ref_client)) {
+			$this->ref_client = trim($this->ref_client);
+		}
+		if (isset($this->increment)) {
+			$this->increment = trim($this->increment);
+		}
+		if (isset($this->close_code)) {
+			$this->close_code = trim($this->close_code);
+		}
+		if (isset($this->close_note)) {
+			$this->close_note = trim($this->close_note);
+		}
+		if (isset($this->note) || isset($this->note_private)) {
+			$this->note = (isset($this->note) ? trim($this->note) : trim($this->note_private)); // deprecated
+		}
+		if (isset($this->note) || isset($this->note_private)) {
+			$this->note_private = (isset($this->note_private) ? trim($this->note_private) : trim($this->note));
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->model_pdf)) {
+			$this->model_pdf = trim($this->model_pdf);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key = trim($this->import_key);
+		}
+		if (isset($this->retained_warranty)) {
+			$this->retained_warranty = floatval($this->retained_warranty);
+		}
 
 
 		// Check parameters
@@ -1922,28 +1975,25 @@ class Facture extends CommonInvoice
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('BILL_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -1976,10 +2026,8 @@ class Facture extends CommonInvoice
 		$remise = new DiscountAbsolute($this->db);
 		$result = $remise->fetch($idremise);
 
-		if ($result > 0)
-		{
-			if ($remise->fk_facture)	// Protection against multiple submission
-			{
+		if ($result > 0) {
+			if ($remise->fk_facture) {	// Protection against multiple submission
 				$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
 				$this->db->rollback();
 				return -5;
@@ -1999,8 +2047,7 @@ class Facture extends CommonInvoice
 			$facligne->info_bits = 2;
 
 			// Get buy/cost price of invoice that is source of discount
-			if ($remise->fk_facture_source > 0)
-			{
+			if ($remise->fk_facture_source > 0) {
 				$srcinvoice = new Facture($this->db);
 				$srcinvoice->fetch($remise->fk_facture_source);
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php'; // TODO Move this into commonobject
@@ -2019,15 +2066,12 @@ class Facture extends CommonInvoice
 			$facligne->multicurrency_total_ttc = -$remise->multicurrency_amount_ttc;
 
 			$lineid = $facligne->insert();
-			if ($lineid > 0)
-			{
+			if ($lineid > 0) {
 				$result = $this->update_price(1);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					// Create link between discount and invoice line
 					$result = $remise->link_to_invoice($lineid, 0);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$this->error = $remise->error;
 						$this->db->rollback();
 						return -4;
@@ -2069,41 +2113,40 @@ class Facture extends CommonInvoice
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-		if (empty($ref_client))
+		if (empty($ref_client)) {
 			$sql .= ' SET ref_client = NULL';
-		else $sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
+		} else {
+			$sql .= ' SET ref_client = \''.$this->db->escape($ref_client).'\'';
+		}
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		dol_syslog(__METHOD__.' this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->errors[] = $this->db->error();
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->ref_client = $ref_client;
 		}
 
-		if (!$notrigger && empty($error))
-		{
+		if (!$notrigger && empty($error)) {
 			// Call trigger
 			$result = $this->call_trigger('BILL_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->ref_client = $ref_client;
 
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -2132,39 +2175,41 @@ class Facture extends CommonInvoice
 		// Test to avoid invoice deletion (allowed if draft)
 		$result = $this->is_erasable();
 
-		if ($result <= 0) return 0;
+		if ($result <= 0) {
+			return 0;
+		}
 
 		$error = 0;
 
 		$this->db->begin();
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('BILL_DELETE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
 		// Removed extrafields
 		if (!$error) {
 			$result = $this->deleteExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				dol_syslog(get_class($this)."::delete error deleteExtraFields ".$this->error, LOG_ERR);
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// If invoice was converted into a discount not yet consumed, we remove discount
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'societe_remise_except';
 			$sql .= ' WHERE fk_facture_source = '.$rowid;
@@ -2174,21 +2219,18 @@ class Facture extends CommonInvoice
 			// If invoice has consumned discounts
 			$this->fetch_lines();
 			$list_rowid_det = array();
-			foreach ($this->lines as $key => $invoiceline)
-			{
+			foreach ($this->lines as $key => $invoiceline) {
 				$list_rowid_det[] = $invoiceline->id;
 			}
 
 			// Consumned discounts are freed
-			if (count($list_rowid_det))
-			{
+			if (count($list_rowid_det)) {
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
 				$sql .= ' SET fk_facture = NULL, fk_facture_line = NULL';
 				$sql .= ' WHERE fk_facture_line IN ('.join(',', $list_rowid_det).')';
 
 				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-				if (!$this->db->query($sql))
-				{
+				if (!$this->db->query($sql)) {
 					$this->error = $this->db->error()." sql=".$sql;
 					$this->errors[] = $this->error;
 					$this->db->rollback();
@@ -2197,21 +2239,21 @@ class Facture extends CommonInvoice
 			}
 
 			// If we decrease stock on invoice validation, we increase back if a warehouse id was provided
-			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse != -1)
-			{
+			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse != -1) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
 				$num = count($this->lines);
-				for ($i = 0; $i < $num; $i++)
-				{
-					if ($this->lines[$i]->fk_product > 0)
-					{
+				for ($i = 0; $i < $num; $i++) {
+					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We decrease stock for product
-						if ($this->type == self::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceDeleteDolibarr", $this->ref));
-						else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceDeleteDolibarr", $this->ref)); // we use 0 for price, to not change the weighted average value
+						if ($this->type == self::TYPE_CREDIT_NOTE) {
+							$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceDeleteDolibarr", $this->ref));
+						} else {
+							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceDeleteDolibarr", $this->ref)); // we use 0 for price, to not change the weighted average value
+						}
 					}
 				}
 			}
@@ -2225,30 +2267,25 @@ class Facture extends CommonInvoice
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 
-			if ($this->db->query($sqlef) && $this->db->query($sql) && $this->delete_linked_contact())
-			{
+			if ($this->db->query($sqlef) && $this->db->query($sql) && $this->delete_linked_contact()) {
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture WHERE rowid = '.$rowid;
 
 				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
 					$this->deleteEcmFiles();
 
 					// On efface le repertoire de pdf provisoire
 					$ref = dol_sanitizeFileName($this->ref);
-					if ($conf->facture->dir_output && !empty($this->ref))
-					{
+					if ($conf->facture->dir_output && !empty($this->ref)) {
 						$dir = $conf->facture->dir_output."/".$ref;
 						$file = $conf->facture->dir_output."/".$ref."/".$ref.".pdf";
-						if (file_exists($file))	// We must delete all files before deleting directory
-						{
+						if (file_exists($file)) {	// We must delete all files before deleting directory
 							$ret = dol_delete_preview($this);
 
-							if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-							{
+							if (!dol_delete_file($file, 0, 0, 0, $this)) { // For triggers
 								$langs->load("errors");
 								$this->error = $langs->trans("ErrorFailToDeleteFile", $file);
 								$this->errors[] = $this->error;
@@ -2256,10 +2293,8 @@ class Facture extends CommonInvoice
 								return 0;
 							}
 						}
-						if (file_exists($dir))
-						{
-							if (!dol_delete_dir_recursive($dir)) // For remove dir and meta
-							{
+						if (file_exists($dir)) {
+							if (!dol_delete_dir_recursive($dir)) { // For remove dir and meta
 								$langs->load("errors");
 								$this->error = $langs->trans("ErrorFailToDeleteDir", $dir);
 								$this->errors[] = $this->error;
@@ -2321,8 +2356,7 @@ class Facture extends CommonInvoice
 	{
 		$error = 0;
 
-		if ($this->paye != 1)
-		{
+		if ($this->paye != 1) {
 			$this->db->begin();
 
 			$now = dol_now();
@@ -2331,27 +2365,33 @@ class Facture extends CommonInvoice
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
 			$sql .= ' fk_statut='.self::STATUS_CLOSED;
-			if (!$close_code) $sql .= ', paye=1';
-			if ($close_code) $sql .= ", close_code='".$this->db->escape($close_code)."'";
-			if ($close_note) $sql .= ", close_note='".$this->db->escape($close_note)."'";
+			if (!$close_code) {
+				$sql .= ', paye=1';
+			}
+			if ($close_code) {
+				$sql .= ", close_code='".$this->db->escape($close_code)."'";
+			}
+			if ($close_note) {
+				$sql .= ", close_note='".$this->db->escape($close_note)."'";
+			}
 			$sql .= ', fk_user_closing = '.$user->id;
 			$sql .= ", date_closing = '".$this->db->idate($now)."'";
 			$sql .= ' WHERE rowid = '.$this->id;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				// Call trigger
 				$result = $this->call_trigger('BILL_PAYED', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			} else {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2404,11 +2444,12 @@ class Facture extends CommonInvoice
 
 		dol_syslog(get_class($this)."::set_unpaid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('BILL_UNPAYED', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		} else {
 			$error++;
@@ -2416,8 +2457,7 @@ class Facture extends CommonInvoice
 			dol_print_error($this->db);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -2465,13 +2505,16 @@ class Facture extends CommonInvoice
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture SET';
 		$sql .= ' fk_statut='.self::STATUS_ABANDONED;
-		if ($close_code) $sql .= ", close_code='".$this->db->escape($close_code)."'";
-		if ($close_note) $sql .= ", close_note='".$this->db->escape($close_note)."'";
+		if ($close_code) {
+			$sql .= ", close_code='".$this->db->escape($close_code)."'";
+		}
+		if ($close_note) {
+			$sql .= ", close_note='".$this->db->escape($close_note)."'";
+		}
 		$sql .= ' WHERE rowid = '.$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// On desaffecte de la facture les remises liees
 			// car elles n'ont pas ete utilisees vu que la facture est abandonnee.
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
@@ -2479,12 +2522,10 @@ class Facture extends CommonInvoice
 			$sql .= ' WHERE fk_facture = '.$this->id;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				// Call trigger
 				$result = $this->call_trigger('BILL_CANCEL', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
 				}
@@ -2540,20 +2581,17 @@ class Facture extends CommonInvoice
 		$this->fetch_lines();
 
 		// Check parameters
-		if (!$this->brouillon)
-		{
+		if (!$this->brouillon) {
 			dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
 			return 0;
 		}
-		if (count($this->lines) <= 0)
-		{
+		if (count($this->lines) <= 0) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
 			return -1;
 		}
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->creer))
-	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate)))
-		{
+		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->facture->invoice_advance->validate))) {
 			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.$conf->global->MAIN_USE_ADVANCED_PERMS, LOG_ERR);
 			return -1;
@@ -2562,11 +2600,9 @@ class Facture extends CommonInvoice
 		$this->db->begin();
 
 		// Check parameters
-		if ($this->type == self::TYPE_REPLACEMENT)		// if this is a replacement invoice
-		{
+		if ($this->type == self::TYPE_REPLACEMENT) {		// if this is a replacement invoice
 			// Check that source invoice is known
-			if ($this->fk_facture_source <= 0)
-			{
+			if ($this->fk_facture_source <= 0) {
 				$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("InvoiceReplacement"));
 				$this->db->rollback();
 				return -10;
@@ -2575,8 +2611,7 @@ class Facture extends CommonInvoice
 			// Load source invoice that has been replaced
 			$facreplaced = new Facture($this->db);
 			$result = $facreplaced->fetch($this->fk_facture_source);
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				$this->error = $langs->trans("ErrorBadInvoice");
 				$this->db->rollback();
 				return -11;
@@ -2584,8 +2619,7 @@ class Facture extends CommonInvoice
 
 			// Check that source invoice not already replaced by another one.
 			$idreplacement = $facreplaced->getIdReplacingInvoice('validated');
-			if ($idreplacement && $idreplacement != $this->id)
-			{
+			if ($idreplacement && $idreplacement != $this->id) {
 				$facreplacement = new Facture($this->db);
 				$facreplacement->fetch($idreplacement);
 				$this->error = $langs->trans("ErrorInvoiceAlreadyReplaced", $facreplaced->ref, $facreplacement->ref);
@@ -2594,8 +2628,7 @@ class Facture extends CommonInvoice
 			}
 
 			$result = $facreplaced->setCanceled($user, self::CLOSECODE_REPLACED, '');
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error = $facreplaced->error;
 				$this->db->rollback();
 				return -13;
@@ -2603,13 +2636,10 @@ class Facture extends CommonInvoice
 		}
 
 		// Define new ref
-		if ($force_number)
-		{
+		if ($force_number) {
 			$num = $force_number;
-		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-		{
-			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
-			{
+		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) { // empty should not happened, but when it occurs, the test save life
+			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {	// If option enabled, we force invoice date
 				$this->date = dol_now();
 				$this->date_lim_reglement = $this->calculate_date_lim_reglement();
 			}
@@ -2619,15 +2649,13 @@ class Facture extends CommonInvoice
 		}
 		$this->newref = dol_sanitizeFileName($num);
 
-		if ($num)
-		{
+		if ($num) {
 			$this->update_price(1);
 
 			// Validate
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
 			$sql .= " SET ref='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".($user->id > 0 ? $user->id : "null").", date_valid = '".$this->db->idate($now)."'";
-			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION))	// If option enabled, we force invoice date
-			{
+			if (!empty($conf->global->FAC_FORCE_DATE_VALIDATION)) {	// If option enabled, we force invoice date
 				$sql .= ", datef='".$this->db->idate($this->date)."'";
 				$sql .= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'";
 			}
@@ -2635,35 +2663,29 @@ class Facture extends CommonInvoice
 
 			dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				dol_print_error($this->db);
 				$error++;
 			}
 
 			// On verifie si la facture etait une provisoire
-			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref)))
-			{
+			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref))) {
 				// La verif qu'une remise n'est pas utilisee 2 fois est faite au moment de l'insertion de ligne
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Define third party as a customer
 				$result = $this->thirdparty->set_as_client();
 
 				// Si active on decremente le produit principal et ses composants a la validation de facture
-				if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse > 0)
-				{
+				if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL) && $idwarehouse > 0) {
 					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 					$langs->load("agenda");
 
 					// Loop on each line
 					$cpt = count($this->lines);
-					for ($i = 0; $i < $cpt; $i++)
-					{
-						if ($this->lines[$i]->fk_product > 0)
-						{
+					for ($i = 0; $i < $cpt; $i++) {
+						if ($this->lines[$i]->fk_product > 0) {
 							$mouvP = new MouvementStock($this->db);
 							$mouvP->origin = &$this;
 							// We decrease stock for product
@@ -2706,13 +2728,15 @@ class Facture extends CommonInvoice
 											}
 
 											foreach ($batchList as $batch) {
-												if ($batch->qty <= 0) continue; // try to decrement only batches have positive quantity first
+												if ($batch->qty <= 0) {
+													continue; // try to decrement only batches have positive quantity first
+												}
 
 												// enough quantity in this batch
 												if ($batch->qty >= $product_qty_remain) {
 													$product_batch_qty = $product_qty_remain;
-												} // not enough (take all in batch)
-												else {
+												} else {
+													// not enough (take all in batch)
 													$product_batch_qty = $batch->qty;
 												}
 												$result = $mouvP->livraison($user, $productStatic->id, $idwarehouse, $product_batch_qty, $this->lines[$i]->subprice, $langs->trans('InvoiceValidatedInDolibarr', $num), '', '', '', $batch->batch);
@@ -2724,7 +2748,9 @@ class Facture extends CommonInvoice
 
 												$product_qty_remain -= $product_batch_qty;
 												// all product quantity was decremented
-												if ($product_qty_remain <= 0) break;
+												if ($product_qty_remain <= 0) {
+													break;
+												}
 											}
 
 											if (!$error && $product_qty_remain > 0) {
@@ -2762,43 +2788,41 @@ class Facture extends CommonInvoice
 			}
 
 			// Trigger calls
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('BILL_VALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
-				if (preg_match('/^[\(]?PROV/i', $this->ref))
-				{
+				if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 					// Now we rename also files into index
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'facture/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'facture/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
-					if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+					if (!$resql) {
+						$error++; $this->error = $this->db->lasterror();
+					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 					$oldref = dol_sanitizeFileName($this->ref);
 					$newref = dol_sanitizeFileName($num);
 					$dirsource = $conf->facture->dir_output.'/'.$oldref;
 					$dirdest = $conf->facture->dir_output.'/'.$newref;
-					if (!$error && file_exists($dirsource))
-					{
+					if (!$error && file_exists($dirsource)) {
 						dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
 
-						if (@rename($dirsource, $dirdest))
-						{
+						if (@rename($dirsource, $dirdest)) {
 							dol_syslog("Rename ok");
 							// Rename docs starting with $oldref with $newref
 							$listoffiles = dol_dir_list($conf->facture->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-							foreach ($listoffiles as $fileentry)
-							{
+							foreach ($listoffiles as $fileentry) {
 								$dirsource = $fileentry['name'];
 								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 								$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -2810,17 +2834,14 @@ class Facture extends CommonInvoice
 				}
 			}
 
-			if (!$error && !$this->is_last_in_cycle())
-			{
-				if (!$this->updatePriceNextInvoice($langs))
-				{
+			if (!$error && !$this->is_last_in_cycle()) {
+				if (!$this->updatePriceNextInvoice($langs)) {
 					$error++;
 				}
 			}
 
 			// Set new ref and define current status
-			if (!$error)
-			{
+			if (!$error) {
 				$this->ref = $num;
 				$this->ref = $num;
 				$this->statut = self::STATUS_VALIDATED;
@@ -2828,8 +2849,7 @@ class Facture extends CommonInvoice
 				$this->date_validation = $now;
 				$i = 0;
 
-				if (!empty($conf->global->INVOICE_USE_SITUATION))
-				{
+				if (!empty($conf->global->INVOICE_USE_SITUATION)) {
 					$final = true;
 					$nboflines = count($this->lines);
 					while (($i < $nboflines) && $final) {
@@ -2837,8 +2857,11 @@ class Facture extends CommonInvoice
 						$i++;
 					}
 
-					if (empty($final)) $this->situation_final = 0;
-					else $this->situation_final = 1;
+					if (empty($final)) {
+						$this->situation_final = 0;
+					} else {
+						$this->situation_final = 1;
+					}
 
 					$this->setFinal($user);
 				}
@@ -2847,8 +2870,7 @@ class Facture extends CommonInvoice
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -2865,28 +2887,42 @@ class Facture extends CommonInvoice
 	 */
 	public function updatePriceNextInvoice(&$langs)
 	{
-		foreach ($this->tab_next_situation_invoice as $next_invoice)
-		{
+		foreach ($this->tab_next_situation_invoice as $next_invoice) {
 			$is_last = $next_invoice->is_last_in_cycle();
 
-			if ($next_invoice->statut == self::STATUS_DRAFT && $is_last != 1)
-			{
+			if ($next_invoice->statut == self::STATUS_DRAFT && $is_last != 1) {
 				$this->error = $langs->trans('updatePriceNextInvoiceErrorUpdateline', $next_invoice->ref);
 				return false;
 			}
 
 			$next_invoice->brouillon = 1;
-			foreach ($next_invoice->lines as $line)
-			{
+			foreach ($next_invoice->lines as $line) {
 				$result = $next_invoice->updateline(
-					$line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent,
-					$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type,
-					$line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent,
+					$line->id,
+					$line->desc,
+					$line->subprice,
+					$line->qty,
+					$line->remise_percent,
+					$line->date_start,
+					$line->date_end,
+					$line->tva_tx,
+					$line->localtax1_tx,
+					$line->localtax2_tx,
+					'HT',
+					$line->info_bits,
+					$line->product_type,
+					$line->fk_parent_line,
+					0,
+					$line->fk_fournprice,
+					$line->pa_ht,
+					$line->label,
+					$line->special_code,
+					$line->array_options,
+					$line->situation_percent,
 					$line->fk_unit
 				);
 
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $langs->trans('updatePriceNextInvoiceErrorUpdateline', $next_invoice->ref);
 					return false;
 				}
@@ -2912,8 +2948,7 @@ class Facture extends CommonInvoice
 
 		$error = 0;
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			dol_syslog(__METHOD__." already draft status", LOG_WARNING);
 			return 0;
 		}
@@ -2927,43 +2962,39 @@ class Facture extends CommonInvoice
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if (!$error)
-			{
+		if ($result) {
+			if (!$error) {
 				$this->oldcopy = clone $this;
 			}
 
 			// If we decrease stock on invoice validation, we increase back
-			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
-			{
+			if ($this->type != self::TYPE_DEPOSIT && $result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
 				$num = count($this->lines);
-				for ($i = 0; $i < $num; $i++)
-				{
-					if ($this->lines[$i]->fk_product > 0)
-					{
+				for ($i = 0; $i < $num; $i++) {
+					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We decrease stock for product
-						if ($this->type == self::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
-						else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref)); // we use 0 for price, to not change the weighted average value
+						if ($this->type == self::TYPE_CREDIT_NOTE) {
+							$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+						} else {
+							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref)); // we use 0 for price, to not change the weighted average value
+						}
 					}
 				}
 			}
 
-			if ($error == 0)
-			{
+			if ($error == 0) {
 				$old_statut = $this->statut;
 				$this->brouillon = 1;
 				$this->statut = self::STATUS_DRAFT;
 
 				// Call trigger
 				$result = $this->call_trigger('BILL_UNVALIDATE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->statut = $old_statut;
 					$this->brouillon = 0;
@@ -2974,8 +3005,7 @@ class Facture extends CommonInvoice
 				return -1;
 			}
 
-			if ($error == 0)
-			{
+			if ($error == 0) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -3071,23 +3101,46 @@ class Facture extends CommonInvoice
 
 		dol_syslog(get_class($this)."::addline id=$this->id,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product,remise_percent=$remise_percent,date_start=$date_start,date_end=$date_end,ventil=$ventil,info_bits=$info_bits,fk_remise_except=$fk_remise_except,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type, fk_unit=$fk_unit", LOG_DEBUG);
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
-			if (empty($remise_percent)) $remise_percent = 0;
-			if (empty($qty)) $qty = 0;
-			if (empty($info_bits)) $info_bits = 0;
-			if (empty($rang)) $rang = 0;
-			if (empty($ventil)) $ventil = 0;
-			if (empty($txtva)) $txtva = 0;
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
-			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
-			if (empty($fk_prev_id)) $fk_prev_id = 'null';
-			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
-			if (empty($ref_ext)) $ref_ext = '';
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
+			if (empty($rang)) {
+				$rang = 0;
+			}
+			if (empty($ventil)) {
+				$ventil = 0;
+			}
+			if (empty($txtva)) {
+				$txtva = 0;
+			}
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
+			if (empty($fk_parent_line) || $fk_parent_line < 0) {
+				$fk_parent_line = 0;
+			}
+			if (empty($fk_prev_id)) {
+				$fk_prev_id = 'null';
+			}
+			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') {
+				$situation_percent = 100;
+			}
+			if (empty($ref_ext)) {
+				$ref_ext = '';
+			}
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
@@ -3101,15 +3154,16 @@ class Facture extends CommonInvoice
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 
-			if ($price_base_type == 'HT')
-			{
+			if ($price_base_type == 'HT') {
 				$pu = $pu_ht;
 			} else {
 				$pu = $pu_ttc;
 			}
 
 			// Check parameters
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
@@ -3120,8 +3174,7 @@ class Facture extends CommonInvoice
 			$this->db->begin();
 
 			$product_type = $type;
-			if (!empty($fk_product))
-			{
+			if (!empty($fk_product)) {
 				$product = new Product($this->db);
 				$result = $product->fetch($fk_product);
 				$product_type = $product->type;
@@ -3139,8 +3192,7 @@ class Facture extends CommonInvoice
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -3167,8 +3219,7 @@ class Facture extends CommonInvoice
 
 			// Rank to use
 			$ranktouse = $rang;
-			if ($ranktouse == -1)
-			{
+			if ($ranktouse == -1) {
 				$rangmax = $this->line_max($fk_parent_line);
 				$ranktouse = $rangmax + 1;
 			}
@@ -3234,16 +3285,16 @@ class Facture extends CommonInvoice
 			}
 
 			$result = $this->line->insert();
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour informations denormalisees au niveau de la facture meme
 				$result = $this->update_price(1, 'auto', 0, $mysoc); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$this->db->commit();
 					return $this->line->id;
 				} else {
@@ -3307,13 +3358,12 @@ class Facture extends CommonInvoice
 
 		dol_syslog(get_class($this)."::updateline rowid=$rowid, desc=$desc, pu=$pu, qty=$qty, remise_percent=$remise_percent, date_start=$date_start, date_end=$date_end, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, price_base_type=$price_base_type, info_bits=$info_bits, type=$type, fk_parent_line=$fk_parent_line pa_ht=$pa_ht, special_code=$special_code, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
 
-		if ($this->brouillon)
-		{
-			if (!$this->is_last_in_cycle() && empty($this->error))
-			{
-				if (!$this->checkProgressLine($rowid, $situation_percent))
-				{
-					if (!$this->error) $this->error = $langs->trans('invoiceLineProgressError');
+		if ($this->brouillon) {
+			if (!$this->is_last_in_cycle() && empty($this->error)) {
+				if (!$this->checkProgressLine($rowid, $situation_percent)) {
+					if (!$this->error) {
+						$this->error = $langs->trans('invoiceLineProgressError');
+					}
 					return -3;
 				}
 			}
@@ -3327,11 +3377,21 @@ class Facture extends CommonInvoice
 			$this->db->begin();
 
 			// Clean parameters
-			if (empty($qty)) $qty = 0;
-			if (empty($fk_parent_line) || $fk_parent_line < 0) $fk_parent_line = 0;
-			if (empty($special_code) || $special_code == 3) $special_code = 0;
-			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') $situation_percent = 100;
-			if (empty($ref_ext)) $ref_ext = '';
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($fk_parent_line) || $fk_parent_line < 0) {
+				$fk_parent_line = 0;
+			}
+			if (empty($special_code) || $special_code == 3) {
+				$special_code = 0;
+			}
+			if (!isset($situation_percent) || $situation_percent > 100 || (string) $situation_percent == '') {
+				$situation_percent = 100;
+			}
+			if (empty($ref_ext)) {
+				$ref_ext = '';
+			}
 
 			$remise_percent = price2num($remise_percent);
 			$qty			= price2num($qty);
@@ -3345,7 +3405,9 @@ class Facture extends CommonInvoice
 			$txlocaltax2	= price2num($txlocaltax2);
 
 			// Check parameters
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 
 			// Calculate total with, without tax and tax from qty, pu, remise_percent and txtva
 			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
@@ -3356,8 +3418,7 @@ class Facture extends CommonInvoice
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -3382,8 +3443,7 @@ class Facture extends CommonInvoice
 			// Old properties: $price, $remise (deprecated)
 			$price = $pu;
 			$remise = 0;
-			if ($remise_percent > 0)
-			{
+			if ($remise_percent > 0) {
 				$remise = round(($pu * $remise_percent / 100), 2);
 				$price = ($pu - $remise);
 			}
@@ -3394,8 +3454,7 @@ class Facture extends CommonInvoice
 			$line->fetch($rowid);
 			$line->fetch_optionals();
 
-			if (!empty($line->fk_product))
-			{
+			if (!empty($line->fk_product)) {
 				$product = new Product($this->db);
 				$result = $product->fetch($line->fk_product);
 				$product_type = $product->type;
@@ -3415,8 +3474,7 @@ class Facture extends CommonInvoice
 			$this->line->context = $this->context;
 
 			// Reorder if fk_parent_line change
-			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line)
-			{
+			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) {
 				$rangmax = $this->line_max($fk_parent_line);
 				$this->line->rang = $rangmax + 1;
 			}
@@ -3469,10 +3527,11 @@ class Facture extends CommonInvoice
 			}
 
 			$result = $this->line->update($user, $notrigger);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour info denormalisees au niveau facture
 				$this->update_price(1);
@@ -3504,16 +3563,18 @@ class Facture extends CommonInvoice
 				AND f.fk_statut <> 0';
 
 		$result = $this->db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->error = $this->db->error();
 			return false;
 		}
 
 		$obj = $this->db->fetch_object($result);
 
-		if ($obj === null) return true;
-		else return $situation_percent < $obj->situation_percent;
+		if ($obj === null) {
+			return true;
+		} else {
+			return $situation_percent < $obj->situation_percent;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3530,15 +3591,16 @@ class Facture extends CommonInvoice
 		global $mysoc, $user;
 
 		// Progress should never be changed for discount lines
-		if (($line->info_bits & 2) == 2)
-		{
+		if (($line->info_bits & 2) == 2) {
 			return;
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		// Cap percentages to 100
-		if ($percent > 100) $percent = 100;
+		if ($percent > 100) {
+			$percent = 100;
+		}
 		$line->situation_percent = $percent;
 		$tabprice = calcul_price_total($line->qty, $line->subprice, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 0, 'HT', 0, $line->product_type, $mysoc, '', $percent);
 		$line->total_ht = $tabprice[0];
@@ -3565,8 +3627,7 @@ class Facture extends CommonInvoice
 
 		dol_syslog(get_class($this)."::deleteline rowid=".$rowid, LOG_DEBUG);
 
-		if (!$this->brouillon)
-		{
+		if (!$this->brouillon) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -1;
 		}
@@ -3580,8 +3641,7 @@ class Facture extends CommonInvoice
 
 		dol_syslog(get_class($this)."::deleteline", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -3593,14 +3653,14 @@ class Facture extends CommonInvoice
 
 		// For triggers
 		$result = $line->fetch($rowid);
-		if (!($result > 0)) dol_print_error($this->db, $line->error, $line->errors);
+		if (!($result > 0)) {
+			dol_print_error($this->db, $line->error, $line->errors);
+		}
 
-		if ($line->delete($user) > 0)
-		{
+		if ($line->delete($user) > 0) {
 			$result = $this->update_price(1);
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -3644,10 +3704,11 @@ class Facture extends CommonInvoice
 	public function setDiscount($user, $remise, $notrigger = 0)
 	{
 		// Clean parameters
-		if (empty($remise)) $remise = 0;
+		if (empty($remise)) {
+			$remise = 0;
+		}
 
-		if ($user->rights->facture->creer)
-		{
+		if ($user->rights->facture->creer) {
 			$remise = price2num($remise);
 
 			$error = 0;
@@ -3661,30 +3722,28 @@ class Facture extends CommonInvoice
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('BILL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->remise_percent = $remise;
 				$this->update_price(1);
 
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -3707,10 +3766,11 @@ class Facture extends CommonInvoice
 	public function set_remise_absolue($user, $remise, $notrigger = 0)
 	{
 		// phpcs:enable
-		if (empty($remise)) $remise = 0;
+		if (empty($remise)) {
+			$remise = 0;
+		}
 
-		if ($user->rights->facture->creer)
-		{
+		if ($user->rights->facture->creer) {
 			$error = 0;
 
 			$this->db->begin();
@@ -3724,34 +3784,31 @@ class Facture extends CommonInvoice
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->remise_absolue = $remise;
 				$this->update_price(1);
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('BILL_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -3781,7 +3838,9 @@ class Facture extends CommonInvoice
 			$addonConstName = 'TAKEPOS_REF_ADDON';
 
 			// Clean parameters (if not defined or using deprecated value)
-			if (empty($conf->global->TAKEPOS_REF_ADDON)) $conf->global->TAKEPOS_REF_ADDON = 'mod_takepos_ref_simple';
+			if (empty($conf->global->TAKEPOS_REF_ADDON)) {
+				$conf->global->TAKEPOS_REF_ADDON = 'mod_takepos_ref_simple';
+			}
 
 			$addon = $conf->global->TAKEPOS_REF_ADDON;
 		} else {
@@ -3792,9 +3851,13 @@ class Facture extends CommonInvoice
 			$addonConstName = 'FACTURE_ADDON';
 
 			// Clean parameters (if not defined or using deprecated value)
-			if (empty($conf->global->FACTURE_ADDON)) $conf->global->FACTURE_ADDON = 'mod_facture_terre';
-			elseif ($conf->global->FACTURE_ADDON == 'terre') $conf->global->FACTURE_ADDON = 'mod_facture_terre';
-			elseif ($conf->global->FACTURE_ADDON == 'mercure') $conf->global->FACTURE_ADDON = 'mod_facture_mercure';
+			if (empty($conf->global->FACTURE_ADDON)) {
+				$conf->global->FACTURE_ADDON = 'mod_facture_terre';
+			} elseif ($conf->global->FACTURE_ADDON == 'terre') {
+				$conf->global->FACTURE_ADDON = 'mod_facture_terre';
+			} elseif ($conf->global->FACTURE_ADDON == 'mercure') {
+				$conf->global->FACTURE_ADDON = 'mod_facture_mercure';
+			}
 
 			$addon = $conf->global->FACTURE_ADDON;
 		}
@@ -3876,26 +3939,21 @@ class Facture extends CommonInvoice
 		$sql .= ' WHERE c.rowid = '.$id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
-				if ($obj->fk_user_closing)
-				{
+				if ($obj->fk_user_closing) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_closing);
 					$this->user_closing = $cluser;
@@ -3936,37 +3994,41 @@ class Facture extends CommonInvoice
 
 		$sql = "SELECT s.rowid, s.nom as name, s.client,";
 		$sql .= " f.rowid as fid, f.ref as ref, f.datef as df";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", sc.fk_soc, sc.fk_user";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
-		if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
 		$sql .= " AND f.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$socid) //restriction
-		{
+		if (!$user->rights->societe->client->voir && !$socid) { //restriction
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
-		if ($socid) $sql .= " AND s.rowid = ".$socid;
-		if ($draft) $sql .= " AND f.fk_statut = ".self::STATUS_DRAFT;
-		if (is_object($excluser)) $sql .= " AND f.fk_user_author <> ".$excluser->id;
+		if ($socid) {
+			$sql .= " AND s.rowid = ".$socid;
+		}
+		if ($draft) {
+			$sql .= " AND f.fk_statut = ".self::STATUS_DRAFT;
+		}
+		if (is_object($excluser)) {
+			$sql .= " AND f.fk_user_author <> ".$excluser->id;
+		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 		$sql .= $this->db->plimit($limit, $offset);
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$numc = $this->db->num_rows($result);
-			if ($numc)
-			{
+			if ($numc) {
 				$i = 0;
-				while ($i < $numc)
-				{
+				while ($i < $numc) {
 					$obj = $this->db->fetch_object($result);
 
-					if ($shortlist == 1)
-					{
+					if ($shortlist == 1) {
 						$ga[$obj->fid] = $obj->ref;
-					} elseif ($shortlist == 2)
-					{
+					} elseif ($shortlist == 2) {
 						$ga[$obj->fid] = $obj->ref.' ('.$obj->name.')';
 					} else {
 						$ga[$i]['id'] = $obj->fid;
@@ -4010,15 +4072,15 @@ class Facture extends CommonInvoice
 		$sql .= " AND f.paye = 0"; // Pas classee payee completement
 		$sql .= " AND pf.fk_paiement IS NULL"; // Aucun paiement deja fait
 		$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de remplacement
-		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".$socid;
+		}
 		$sql .= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_replacable_invoices", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$return[$obj->rowid] = array('id' => $obj->rowid,
 				'ref' => $obj->ref,
 				'status' => $obj->fk_statut);
@@ -4075,20 +4137,23 @@ class Facture extends CommonInvoice
 			$sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
 		}
 
-		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".$socid;
+		}
 		$sql .= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_qualified_avoir_invoices", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$qualified = 0;
-				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified = 1;
-				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified = 1;
-				if ($qualified)
-				{
+				if ($obj->fk_statut == self::STATUS_VALIDATED) {
+					$qualified = 1;
+				}
+				if ($obj->fk_statut == self::STATUS_CLOSED) {
+					$qualified = 1;
+				}
+				if ($qualified) {
 					//$ref=$obj->ref;
 					$paymentornot = ($obj->fk_paiement ? 1 : 0);
 					$return[$obj->rowid] = array('ref'=>$obj->ref, 'status'=>$obj->fk_statut, 'type'=>$obj->type, 'paye'=>$obj->paye, 'paymentornot'=>$paymentornot);
@@ -4119,8 +4184,7 @@ class Facture extends CommonInvoice
 
 		$sql = "SELECT f.rowid, f.date_lim_reglement as datefin,f.fk_statut, f.total";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON f.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = " AND";
@@ -4128,11 +4192,12 @@ class Facture extends CommonInvoice
 		$sql .= $clause." f.paye=0";
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
 		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;
-		if ($user->socid) $sql .= " AND f.fk_soc = ".$user->socid;
+		if ($user->socid) {
+			$sql .= " AND f.fk_soc = ".$user->socid;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$langs->load("bills");
 			$now = dol_now();
 
@@ -4145,8 +4210,7 @@ class Facture extends CommonInvoice
 
 			$generic_facture = new Facture($this->db);
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$generic_facture->date_lim_reglement = $this->db->jdate($obj->datefin);
 				$generic_facture->statut = $obj->fk_statut;
 
@@ -4216,12 +4280,10 @@ class Facture extends CommonInvoice
 		$sql .= $this->db->plimit(100);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_prods = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_prods)
-			{
+			while ($i < $num_prods) {
 				$i++;
 				$row = $this->db->fetch_row($resql);
 				$prodids[$i] = $row[0];
@@ -4258,13 +4320,11 @@ class Facture extends CommonInvoice
 		$this->fk_incoterms = 0;
 		$this->location_incoterms = '';
 
-		if (empty($option) || $option != 'nolines')
-		{
+		if (empty($option) || $option != 'nolines') {
 			// Lines
 			$nbp = 5;
 			$xnbp = 0;
-			while ($xnbp < $nbp)
-			{
+			while ($xnbp < $nbp) {
 				$line = new FactureLigne($this->db);
 				$line->desc = $langs->trans("Description")." ".$xnbp;
 				$line->qty = 1;
@@ -4273,8 +4333,7 @@ class Facture extends CommonInvoice
 				$line->localtax1_tx = 0;
 				$line->localtax2_tx = 0;
 				$line->remise_percent = 0;
-				if ($xnbp == 1)        // Qty is negative (product line)
-				{
+				if ($xnbp == 1) {        // Qty is negative (product line)
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
 					$line->qty = -1;
@@ -4284,8 +4343,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				} elseif ($xnbp == 2)    // UP is negative (free line)
-				{
+				} elseif ($xnbp == 2) {    // UP is negative (free line)
 					$line->subprice = -100;
 					$line->total_ht = -100;
 					$line->total_ttc = -119.6;
@@ -4294,8 +4352,7 @@ class Facture extends CommonInvoice
 					$line->multicurrency_total_ht = -200;
 					$line->multicurrency_total_ttc = -239.2;
 					$line->multicurrency_total_tva = -39.2;
-				} elseif ($xnbp == 3)    // Discount is 50% (product line)
-				{
+				} elseif ($xnbp == 3) {    // Discount is 50% (product line)
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
 					$line->total_ht = 50;
@@ -4374,8 +4431,7 @@ class Facture extends CommonInvoice
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
@@ -4383,10 +4439,8 @@ class Facture extends CommonInvoice
 		$sql .= " ".$clause." f.entity IN (".getEntity('invoice').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["invoices"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -4425,8 +4479,7 @@ class Facture extends CommonInvoice
 
 		$outputlangs->loadLangs(array("bills", "products"));
 
-		if (!dol_strlen($modele))
-		{
+		if (!dol_strlen($modele)) {
 			$modele = 'crabe';
 			$thisTypeConfName = 'FACTURE_ADDON_PDF_'.$this->type;
 
@@ -4457,8 +4510,7 @@ class Facture extends CommonInvoice
 		$sql .= " WHERE f.entity IN (".getEntity('invoice', 0).")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			if ($resql->num_rows > 0)
-			{
+			if ($resql->num_rows > 0) {
 				$res = $this->db->fetch_array($resql);
 				$ref = $res['max(situation_cycle_ref)'];
 				$ref++;
@@ -4536,27 +4588,25 @@ class Facture extends CommonInvoice
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->errors[] = $this->db->error();
 			$error++;
 		}
 
-		if (!$notrigger && empty($error))
-		{
+		if (!$notrigger && empty($error)) {
 			// Call trigger
 			$result = $this->call_trigger('BILL_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -4626,21 +4676,19 @@ class Facture extends CommonInvoice
 		$now = dol_now();
 
 		// Paid invoices have status STATUS_CLOSED
-		if ($this->statut != Facture::STATUS_VALIDATED) return false;
+		if ($this->statut != Facture::STATUS_VALIDATED) {
+			return false;
+		}
 
 		$hasDelay = $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay);
-		if ($hasDelay && !empty($this->retained_warranty) && !empty($this->retained_warranty_date_limit))
-		{
+		if ($hasDelay && !empty($this->retained_warranty) && !empty($this->retained_warranty_date_limit)) {
 			$totalpaye = $this->getSommePaiement();
 			$totalpaye = floatval($totalpaye);
 			$RetainedWarrantyAmount = $this->getRetainedWarrantyAmount();
-			if ($totalpaye >= 0 && $RetainedWarrantyAmount >= 0)
-			{
-				if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay))
-				{
+			if ($totalpaye >= 0 && $RetainedWarrantyAmount >= 0) {
+				if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay)) {
 					$hasDelay = 1;
-				} elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay))
-				{
+				} elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay)) {
 					$hasDelay = 1;
 				} else {
 					$hasDelay = 0;
@@ -4703,8 +4751,7 @@ class Facture extends CommonInvoice
 		$retainedWarrantyAmount = 0;
 
 		// Billed - retained warranty
-		if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION))
-		{
+		if ($this->type == Facture::TYPE_SITUATION && !empty($conf->global->INVOICE_RETAINED_WARRANTY_LIMITED_TO_FINAL_SITUATION)) {
 			$displayWarranty = true;
 			// Check if this situation invoice is 100% for real
 			if (!empty($this->lines)) {
@@ -4716,8 +4763,7 @@ class Facture extends CommonInvoice
 				}
 			}
 
-			if ($displayWarranty && !empty($this->situation_final))
-			{
+			if ($displayWarranty && !empty($this->situation_final)) {
 				$this->fetchPreviousNextSituationInvoice();
 				$TPreviousIncoice = $this->tab_previous_situation_invoice;
 
@@ -4756,15 +4802,13 @@ class Facture extends CommonInvoice
 	public function setRetainedWarranty($value)
 	{
 		dol_syslog(get_class($this).'::setRetainedWarranty('.$value.')');
-		if ($this->statut >= 0)
-		{
+		if ($this->statut >= 0) {
 			$fieldname = 'retained_warranty';
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.floatval($value);
 			$sql .= ' WHERE rowid='.$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->retained_warranty = floatval($value);
 				return 1;
 			} else {
@@ -4795,15 +4839,13 @@ class Facture extends CommonInvoice
 
 
 		dol_syslog(get_class($this).'::setRetainedWarrantyDateLimit('.$timestamp.')');
-		if ($this->statut >= 0)
-		{
+		if ($this->statut >= 0) {
 			$fieldname = 'retained_warranty_date_limit';
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(strval($timestamp) != '' ? '\''.$this->db->idate($timestamp).'\'' : 'null');
 			$sql .= ' WHERE rowid='.$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->retained_warranty_date_limit = $timestamp;
 				return 1;
 			} else {
@@ -4917,8 +4959,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ' WHERE fd.rowid = '.$rowid;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$objp = $this->db->fetch_object($result);
 
 			$this->rowid = $objp->rowid;
@@ -5002,34 +5043,74 @@ class FactureLigne extends CommonInvoiceLine
 
 		// Clean parameters
 		$this->desc = trim($this->desc);
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->rang)) $this->rang = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->subprice)) $this->subprice = 0;
-		if (empty($this->ref_ext)) $this->ref_ext = '';
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (empty($this->fk_prev_id)) $this->fk_prev_id = 0;
-		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->rang)) {
+			$this->rang = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->subprice)) {
+			$this->subprice = 0;
+		}
+		if (empty($this->ref_ext)) {
+			$this->ref_ext = '';
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (empty($this->fk_prev_id)) {
+			$this->fk_prev_id = 0;
+		}
+		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
+			$this->situation_percent = 100;
+		}
 
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
-		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
-		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
+		if (empty($this->multicurrency_subprice)) {
+			$this->multicurrency_subprice = 0;
+		}
+		if (empty($this->multicurrency_total_ht)) {
+			$this->multicurrency_total_ht = 0;
+		}
+		if (empty($this->multicurrency_total_tva)) {
+			$this->multicurrency_total_tva = 0;
+		}
+		if (empty($this->multicurrency_total_ttc)) {
+			$this->multicurrency_total_ttc = 0;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
-		{
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-			{
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -5037,17 +5118,14 @@ class FactureLigne extends CommonInvoiceLine
 		}
 
 		// Check parameters
-		if ($this->product_type < 0)
-		{
+		if ($this->product_type < 0) {
 			$this->error = 'ErrorProductTypeMustBe0orMore';
 			return -1;
 		}
-		if (!empty($this->fk_product))
-		{
+		if (!empty($this->fk_product)) {
 			// Check product exists
 			$result = Product::isExistingObject('product', $this->fk_product);
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				$this->error = 'ErrorProductIdDoesNotExists';
 				dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 				return -1;
@@ -5113,36 +5191,28 @@ class FactureLigne extends CommonInvoiceLine
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facturedet');
 			$this->rowid = $this->id; // For backward compatibility
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
 			// Si fk_remise_except defini, on lie la remise a la facture
 			// ce qui la flague comme "consommee".
-			if ($this->fk_remise_except)
-			{
+			if ($this->fk_remise_except) {
 				$discount = new DiscountAbsolute($this->db);
 				$result = $discount->fetch($this->fk_remise_except);
-				if ($result >= 0)
-				{
+				if ($result >= 0) {
 					// Check if discount was found
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						// Check if discount not already affected to another invoice
-						if ($discount->fk_facture_line > 0)
-						{
-							if (empty($noerrorifdiscountalreadylinked))
-							{
+						if ($discount->fk_facture_line > 0) {
+							if (empty($noerrorifdiscountalreadylinked)) {
 								$this->error = $langs->trans("ErrorDiscountAlreadyUsed", $discount->id);
 								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 								$this->db->rollback();
@@ -5150,8 +5220,7 @@ class FactureLigne extends CommonInvoiceLine
 							}
 						} else {
 							$result = $discount->link_to_invoice($this->rowid, 0);
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$this->error = $discount->error;
 								dol_syslog(get_class($this)."::insert Error ".$this->error, LOG_ERR);
 								$this->db->rollback();
@@ -5172,12 +5241,10 @@ class FactureLigne extends CommonInvoiceLine
 				}
 			}
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEBILL_INSERT', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -2;
 				}
@@ -5210,35 +5277,73 @@ class FactureLigne extends CommonInvoiceLine
 
 		// Clean parameters
 		$this->desc = trim($this->desc);
-		if (empty($this->ref_ext)) $this->ref_ext = '';
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = 0;
-		if (empty($this->localtax2_type)) $this->localtax2_type = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->product_type)) $this->product_type = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->ref_ext)) {
+			$this->ref_ext = '';
+		}
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = 0;
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->product_type)) {
+			$this->product_type = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
+			$this->situation_percent = 100;
+		}
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
 
-		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
-		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+		if (empty($this->multicurrency_subprice)) {
+			$this->multicurrency_subprice = 0;
+		}
+		if (empty($this->multicurrency_total_ht)) {
+			$this->multicurrency_total_ht = 0;
+		}
+		if (empty($this->multicurrency_total_tva)) {
+			$this->multicurrency_total_tva = 0;
+		}
+		if (empty($this->multicurrency_total_ttc)) {
+			$this->multicurrency_total_ttc = 0;
+		}
 
 		// Check parameters
-		if ($this->product_type < 0) return -1;
+		if ($this->product_type < 0) {
+			return -1;
+		}
 
 		// if buy price not defined, define buyprice as configured in margin admin
-		if ($this->pa_ht == 0 && $pa_ht_isemptystring)
-		{
-			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0)
-			{
+		if ($this->pa_ht == 0 && $pa_ht_isemptystring) {
+			if (($result = $this->defineBuyPrice($this->subprice, $this->remise_percent, $this->fk_product)) < 0) {
 				return $result;
 			} else {
 				$this->pa_ht = $result;
@@ -5254,8 +5359,11 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
 		$sql .= ", subprice=".price2num($this->subprice)."";
 		$sql .= ", remise_percent=".price2num($this->remise_percent)."";
-		if ($this->fk_remise_except) $sql .= ", fk_remise_except=".$this->fk_remise_except;
-		else $sql .= ", fk_remise_except=null";
+		if ($this->fk_remise_except) {
+			$sql .= ", fk_remise_except=".$this->fk_remise_except;
+		} else {
+			$sql .= ", fk_remise_except=null";
+		}
 		$sql .= ", vat_src_code = '".(empty($this->vat_src_code) ? '' : $this->db->escape($this->vat_src_code))."'";
 		$sql .= ", tva_tx=".price2num($this->tva_tx)."";
 		$sql .= ", localtax1_tx=".price2num($this->localtax1_tx)."";
@@ -5268,8 +5376,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ", product_type=".$this->product_type;
 		$sql .= ", info_bits='".$this->db->escape($this->info_bits)."'";
 		$sql .= ", special_code='".$this->db->escape($this->special_code)."'";
-		if (empty($this->skip_update_total))
-		{
+		if (empty($this->skip_update_total)) {
 			$sql .= ", total_ht=".price2num($this->total_ht);
 			$sql .= ", total_tva=".price2num($this->total_tva);
 			$sql .= ", total_ttc=".price2num($this->total_ttc);
@@ -5279,7 +5386,9 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ", fk_product_fournisseur_price=".(!empty($this->fk_fournprice) ? "'".$this->db->escape($this->fk_fournprice)."'" : "null");
 		$sql .= ", buy_price_ht='".price2num($this->pa_ht)."'";
 		$sql .= ", fk_parent_line=".($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
-		if (!empty($this->rang)) $sql .= ", rang=".$this->rang;
+		if (!empty($this->rang)) {
+			$sql .= ", rang=".$this->rang;
+		}
 		$sql .= ", situation_percent=".$this->situation_percent;
 		$sql .= ", fk_unit=".(!$this->fk_unit ? 'NULL' : $this->fk_unit);
 		$sql .= ", fk_user_modif =".$user->id;
@@ -5294,24 +5403,19 @@ class FactureLigne extends CommonInvoiceLine
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$error)
-			{
+		if ($resql) {
+			if (!$error) {
 				$this->id = $this->rowid;
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEBILL_UPDATE', $user);
-				if ($result < 0)
- 				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -2;
 				}
@@ -5340,8 +5444,7 @@ class FactureLigne extends CommonInvoiceLine
 
 		// Call trigger
 		$result = $this->call_trigger('LINEBILL_DELETE', $user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->db->rollback();
 			return -1;
 		}
@@ -5349,16 +5452,14 @@ class FactureLigne extends CommonInvoiceLine
 
 		// extrafields
 		$result = $this->deleteExtraFields();
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->db->rollback();
 			return -1;
 		}
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".$this->rowid;
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -5382,8 +5483,12 @@ class FactureLigne extends CommonInvoiceLine
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
 		// Clean parameters
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
 
 		// Mise a jour ligne en base
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet SET";
@@ -5397,8 +5502,7 @@ class FactureLigne extends CommonInvoiceLine
 		dol_syslog(get_class($this)."::update_total", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -5429,7 +5533,9 @@ class FactureLigne extends CommonInvoiceLine
 				$invoicecache[$invoiceid] = new Facture($this->db);
 				$invoicecache[$invoiceid]->fetch($invoiceid);
 			}
-			if ($invoicecache[$invoiceid]->type != Facture::TYPE_SITUATION) return 0;
+			if ($invoicecache[$invoiceid]->type != Facture::TYPE_SITUATION) {
+				return 0;
+			}
 
 			$sql = 'SELECT situation_percent FROM '.MAIN_DB_PREFIX.'facturedet WHERE rowid='.$this->fk_prev_id;
 			$resql = $this->db->query($sql);
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index e6c4a5a9c22..47644e4b13e 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -67,16 +67,14 @@ class FactureStats extends Stats
 		$this->cachefilesuffix = $mode;
 		$this->join = '';
 
-		if ($mode == 'customer')
-		{
+		if ($mode == 'customer') {
 			$object = new Facture($this->db);
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as f";
 			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
 			$this->field = 'total';
 			$this->field_line = 'total_ht';
 		}
-		if ($mode == 'supplier')
-		{
+		if ($mode == 'supplier') {
 			$object = new FactureFournisseur($this->db);
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as f";
 			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
@@ -87,24 +85,30 @@ class FactureStats extends Stats
 
 		$this->where = " f.fk_statut >= 0";
 		$this->where .= " AND f.entity IN (".getEntity('invoice').")";
-		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-		if ($mode == 'customer') $this->where .= " AND (f.fk_statut <> 3 OR f.close_code <> 'replaced')"; // Exclude replaced invoices as they are duplicated (we count closed invoices for other reasons)
-		if ($this->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$this->where .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($mode == 'customer') {
+			$this->where .= " AND (f.fk_statut <> 3 OR f.close_code <> 'replaced')"; // Exclude replaced invoices as they are duplicated (we count closed invoices for other reasons)
+		}
+		if ($this->socid) {
 			$this->where .= " AND f.fk_soc = ".$this->socid;
 		}
-		if ($this->userid > 0) $this->where .= ' AND f.fk_user_author = '.$this->userid;
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $this->where .= " AND f.type IN (0,1,2,5)";
-		else $this->where .= " AND f.type IN (0,1,2,3,5)";
+		if ($this->userid > 0) {
+			$this->where .= ' AND f.fk_user_author = '.$this->userid;
+		}
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$this->where .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$this->where .= " AND f.type IN (0,1,2,3,5)";
+		}
 
-		if ($typentid)
-		{
+		if ($typentid) {
 			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = f.fk_soc';
 			$this->where .= ' AND s.fk_typent = '.$typentid;
 		}
 
-		if ($categid)
-		{
+		if ($categid) {
 			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cs ON cs.fk_soc = f.fk_soc';
 			$this->join .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie as c ON c.rowid = cs.fk_categorie';
 			$this->where .= ' AND c.rowid = '.$categid;
@@ -125,7 +129,9 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(f.datef,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
@@ -149,7 +155,9 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(f.datef,'%Y') as dm, COUNT(*), SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -172,7 +180,9 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(datef,'%m') as dm, SUM(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
@@ -196,7 +206,9 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
@@ -217,7 +229,9 @@ class FactureStats extends Stats
 
 		$sql = "SELECT date_format(datef,'%Y') as year, COUNT(*) as nb, SUM(f.".$this->field.") as total, AVG(f.".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
@@ -239,7 +253,9 @@ class FactureStats extends Stats
 
 		$sql = "SELECT product.ref, COUNT(product.ref) as nb, SUM(tl.".$this->field_line.") as total, AVG(tl.".$this->field_line.") as avg";
 		$sql .= " FROM ".$this->from.", ".$this->from_line.", ".MAIN_DB_PREFIX."product as product";
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= $this->join;
 		$sql .= " WHERE ".$this->where;
 		$sql .= " AND f.rowid = tl.fk_facture AND tl.fk_product = product.rowid";
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index 97297582081..4795a9b2062 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -88,14 +88,30 @@ class PaymentTerm // extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->sortorder)) $this->sortorder = trim($this->sortorder);
-		if (isset($this->active)) $this->active = trim($this->active);
-		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
-		if (isset($this->libelle_facture)) $this->libelle_facture = trim($this->libelle_facture);
-		if (isset($this->type_cdr)) $this->type_cdr = trim($this->type_cdr);
-		if (isset($this->nbjour)) $this->nbjour = trim($this->nbjour);
-		if (isset($this->decalage)) $this->decalage = trim($this->decalage);
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->sortorder)) {
+			$this->sortorder = trim($this->sortorder);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
+		if (isset($this->libelle)) {
+			$this->libelle = trim($this->libelle);
+		}
+		if (isset($this->libelle_facture)) {
+			$this->libelle_facture = trim($this->libelle_facture);
+		}
+		if (isset($this->type_cdr)) {
+			$this->type_cdr = trim($this->type_cdr);
+		}
+		if (isset($this->nbjour)) {
+			$this->nbjour = trim($this->nbjour);
+		}
+		if (isset($this->decalage)) {
+			$this->decalage = trim($this->decalage);
+		}
 
 
 		// Check parameters
@@ -126,20 +142,19 @@ class PaymentTerm // extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_payment_term");
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -180,10 +195,8 @@ class PaymentTerm // extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -201,7 +214,7 @@ class PaymentTerm // extends CommonObject
 
 			return 1;
 		} else {
-	  		$this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -226,12 +239,12 @@ class PaymentTerm // extends CommonObject
 
 		dol_syslog(get_class($this)."::getDefaultId", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $ret = $obj->rowid;
+				if ($obj) {
+					$ret = $obj->rowid;
+				}
 			}
 			$this->db->free($resql);
 			return $ret;
@@ -257,14 +270,30 @@ class PaymentTerm // extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->sortorder)) $this->sortorder = trim($this->sortorder);
-		if (isset($this->active)) $this->active = trim($this->active);
-		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
-		if (isset($this->libelle_facture)) $this->libelle_facture = trim($this->libelle_facture);
-		if (isset($this->type_cdr)) $this->type_cdr = trim($this->type_cdr);
-		if (isset($this->nbjour)) $this->nbjour = trim($this->nbjour);
-		if (isset($this->decalage)) $this->decalage = trim($this->decalage);
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->sortorder)) {
+			$this->sortorder = trim($this->sortorder);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
+		if (isset($this->libelle)) {
+			$this->libelle = trim($this->libelle);
+		}
+		if (isset($this->libelle_facture)) {
+			$this->libelle_facture = trim($this->libelle_facture);
+		}
+		if (isset($this->type_cdr)) {
+			$this->type_cdr = trim($this->type_cdr);
+		}
+		if (isset($this->nbjour)) {
+			$this->nbjour = trim($this->nbjour);
+		}
+		if (isset($this->decalage)) {
+			$this->decalage = trim($this->decalage);
+		}
 
 
 
@@ -287,13 +316,13 @@ class PaymentTerm // extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -325,13 +354,13 @@ class PaymentTerm // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -373,8 +402,7 @@ class PaymentTerm // extends CommonObject
 		$result = $object->create($user);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $object->error;
 			$error++;
 		}
@@ -382,8 +410,7 @@ class PaymentTerm // extends CommonObject
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 6b8758bc472..dc1fe1e7c45 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -45,7 +45,9 @@ $socid  = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'facture', $id);
 
 $object = new Facture($db);
@@ -55,47 +57,39 @@ $object = new Facture($db);
  * Add a new contact
  */
 
-if ($action == 'addcontact' && $user->rights->facture->creer)
-{
+if ($action == 'addcontact' && $user->rights->facture->creer) {
 	$result = $object->fetch($id);
 
-	if ($result > 0 && $id > 0)
-	{
+	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-} // Toggle the status of a contact
-elseif ($action == 'swapstatut' && $user->rights->facture->creer)
-{
-	if ($object->fetch($id))
-	{
+} elseif ($action == 'swapstatut' && $user->rights->facture->creer) {
+	// Toggle the status of a contact
+	if ($object->fetch($id)) {
 		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
-} // Deletes a contact
-elseif ($action == 'deletecontact' && $user->rights->facture->creer)
-{
+} elseif ($action == 'deletecontact' && $user->rights->facture->creer) {
+	// Deletes a contact
 	$object->fetch($id);
 	$result = $object->delete_contact($lineid);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -124,10 +118,8 @@ $userstatic = new User($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref) > 0)
-	{
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref) > 0) {
 		$object->fetch_thirdparty();
 
 		$head = facture_prepare_head($object);
@@ -147,12 +139,10 @@ if ($id > 0 || !empty($ref))
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->facture->creer)
-			{
+			if ($user->rights->facture->creer) {
 				if ($action != 'classify') {
 					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
@@ -192,10 +182,11 @@ if ($id > 0 || !empty($ref))
 
 		// Contacts lines (modules that overwrite templates must declare this into descriptor)
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-		foreach ($dirtpls as $reldir)
-		{
+		foreach ($dirtpls as $reldir) {
 			$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	} else {
 		// Record not found
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index cbf6b045e85..c44aeae67ca 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -49,8 +49,7 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid)
-{
+if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'facture', $id, '');
@@ -60,16 +59,21 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new Facture($db);
-if ($object->fetch($id))
-{
+if ($object->fetch($id)) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->facture->dir_output."/".dol_sanitizeFileName($object->ref);
 }
@@ -92,10 +96,8 @@ llxHeader('', $title, $helpurl);
 
 $form = new Form($db);
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref) > 0)
-	{
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref) > 0) {
 		$object->fetch_thirdparty();
 
 		$upload_dir = $conf->facture->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
@@ -108,8 +110,7 @@ if ($id > 0 || !empty($ref))
 		// Build file list
 		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 		$totalsize = 0;
-		foreach ($filearray as $key => $file)
-		{
+		foreach ($filearray as $key => $file) {
 			$totalsize += $file['size'];
 		}
 
@@ -125,15 +126,14 @@ if ($id > 0 || !empty($ref))
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->facture->creer)
-			{
-				if ($action != 'classify')
+			if ($user->rights->facture->creer) {
+				if ($action != 'classify') {
 					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
+				}
 				if ($action == 'classify') {
 					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index e96371ad4f4..4939fbb6a95 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -34,8 +34,7 @@ $langs->load('bills');
 
 // Filter to show only result of one customer
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -58,8 +57,7 @@ print '<div class="fichecenter">';
 print '<div class="fichethirdleft">';
 
 // This is useless due to the global search combo
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
 	print getAreaSearchFrom();
 	print '<br>';
 }
@@ -129,16 +127,21 @@ function getPieChart($socid = 0)
 	$sql = "SELECT count(f.rowid), f.fk_statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture').")";
-	if ($user->socid) $sql .= ' AND f.fk_soc = '.$user->socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($user->socid) {
+		$sql .= ' AND f.fk_soc = '.$user->socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " GROUP BY f.fk_statut";
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		return '';
 	}
@@ -149,11 +152,9 @@ function getPieChart($socid = 0)
 	$total = 0;
 	$vals = [];
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
-		if ($row)
-		{
+		if ($row) {
 			$vals[$row[1]] = $row[0];
 			$total += $row[0];
 		}
@@ -173,14 +174,12 @@ function getPieChart($socid = 0)
 	$array = [Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_CLOSED, Facture::STATUS_ABANDONED];
 	$dataseries = [];
 
-	foreach ($array as $status)
-	{
+	foreach ($array as $status) {
 		$objectstatic->statut = $status;
 		$objectstatic->paye = $status == Facture::STATUS_CLOSED ? -1 : 0;
 
 		$dataseries[] = [$objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0)];
-		if (!$conf->use_javascript_ajax)
-		{
+		if (!$conf->use_javascript_ajax) {
 			$result .= '<tr class="oddeven">';
 			$result .= '<td>'.$objectstatic->getLibStatut(0).'</td>';
 			$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
@@ -188,8 +187,7 @@ function getPieChart($socid = 0)
 		}
 	}
 
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		$dolgraph = new DolGraph();
 		$dolgraph->SetData($dataseries);
 		$dolgraph->setShowLegend(2);
@@ -227,17 +225,22 @@ function getDraftTable($maxCount = 500, $socid = 0)
 	$sql = "SELECT f.rowid, f.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client, f.total as total_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture').")";
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_DRAFT;
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= $db->plimit($maxCount, 0);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		return '';
 	}
@@ -256,8 +259,7 @@ function getDraftTable($maxCount = 500, $socid = 0)
 	$result .= '</td>';
 	$result .= '</tr>';
 
-	if ($num < 1)
-	{
+	if ($num < 1) {
 		$result .= '</table>';
 		$result .= '</div>';
 		return $result;
@@ -269,8 +271,7 @@ function getDraftTable($maxCount = 500, $socid = 0)
 	$total = 0;
 	$i = 0;
 
-	while ($i < $nbofloop)
-	{
+	while ($i < $nbofloop) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->rowid;
@@ -291,14 +292,11 @@ function getDraftTable($maxCount = 500, $socid = 0)
 		$total += $obj->total_ttc;
 	}
 
-	if ($num > $nbofloop)
-	{
+	if ($num > $nbofloop) {
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
 		$result .= '</tr>';
-	}
-	elseif ($total > 0)
-	{
+	} elseif ($total > 0) {
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
 		$result .= '<td class="right">'.price($total).'</td>';
@@ -325,17 +323,22 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 	$sql .= " f.datec";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture').")";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " ORDER BY f.tms DESC";
 	$sql .= $db->plimit($maxCount, 0);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 	}
 
@@ -348,8 +351,7 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 	$result .= '<td colspan="4">'.$langs->trans("LastCustomersBills", $maxCount).'</td>';
 	$result .= '</tr>';
 
-	if ($num < 1)
-	{
+	if ($num < 1) {
 		$result .= '</table>';
 		$result .= '</div>';
 		return $result;
@@ -360,8 +362,7 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 	$companystatic = new Societe($db);
 	$i = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->rowid;
@@ -421,18 +422,23 @@ function getOpenTable($maxCount = 500, $socid = 0)
 	$sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture').")";
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 	$sql .= " ORDER BY f.rowid DESC";
 	$sql .= $db->plimit($maxCount, 0);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 	}
 
@@ -450,8 +456,7 @@ function getOpenTable($maxCount = 500, $socid = 0)
 	$result .= '</td>';
 	$result .= '</tr>';
 
-	if ($num < 1)
-	{
+	if ($num < 1) {
 		$result .= '</table>';
 		$result .= '</div>';
 		return $result;
@@ -465,8 +470,7 @@ function getOpenTable($maxCount = 500, $socid = 0)
 	$total = 0;
 	$i = 0;
 
-	while ($i < $nbofloop)
-	{
+	while ($i < $nbofloop) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->id;
@@ -490,8 +494,7 @@ function getOpenTable($maxCount = 500, $socid = 0)
 
 		$result .= '<td width="18" class="nobordernopadding nowrap">';
 
-		if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay))
-		{
+		if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
 			$result .= img_warning($langs->trans("Late"));
 		}
 
@@ -513,14 +516,11 @@ function getOpenTable($maxCount = 500, $socid = 0)
 		$total += $obj->total_ttc;
 	}
 
-	if ($num > $nbofloop)
-	{
+	if ($num > $nbofloop) {
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="4" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
 		$result .= '</tr>';
-	}
-	elseif ($total > 0)
-	{
+	} elseif ($total > 0) {
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
 		$result .= '<td align="right">'.price($total).'</td>';
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index f26f4ea0255..97646d56103 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -71,15 +71,14 @@ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_cl
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	if ($user->rights->facture->creer)
-	{
-		if ($action != 'classify')
+	if ($user->rights->facture->creer) {
+		if ($action != 'classify') {
 			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
+		}
 		if ($action == 'classify') {
 			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 6f3f8088a63..d45439286fb 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -59,9 +59,13 @@ $socid = GETPOST('socid', 'int');
 $id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
 $lineid = GETPOST('lineid', 'int');
 $ref = GETPOST('ref', 'alpha');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $objecttype = 'facture_rec';
-if ($action == "create" || $action == "add") $objecttype = '';
+if ($action == "create" || $action == "add") {
+	$objecttype = '';
+}
 $result = restrictedArea($user, 'facture', $id, $objecttype);
 
 $search_ref = GETPOST('search_ref');
@@ -86,19 +90,23 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (!$sortorder) $sortorder = 'DESC';
-if (!$sortfield) $sortfield = 'f.titre';
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
+if (!$sortfield) {
+	$sortfield = 'f.titre';
+}
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 $object = new FactureRec($db);
-if (($id > 0 || $ref) && $action != 'create' && $action != 'add')
-{
+if (($id > 0 || $ref) && $action != 'create' && $action != 'add') {
 	$ret = $object->fetch($id, $ref);
-	if (!$ret)
-	{
+	if (!$ret) {
 		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
 	}
 }
@@ -143,37 +151,47 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if ($socid > 0) {
 	$tmpthirdparty = new Societe($db);
 	$res = $tmpthirdparty->fetch($socid);
-	if ($res > 0) $search_societe = $tmpthirdparty->name;
+	if ($res > 0) {
+		$search_societe = $tmpthirdparty->name;
+	}
 }
 
 
 if ($socid > 0) {
 		$tmpthirdparty = new Societe($db);
 		$res = $tmpthirdparty->fetch($socid);
-		if ($res > 0) $search_societe = $tmpthirdparty->name;
+	if ($res > 0) {
+		$search_societe = $tmpthirdparty->name;
+	}
 }
 
 /*
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
-	if (GETPOST('cancel', 'alpha')) $action = '';
+if (empty($reshook)) {
+	if (GETPOST('cancel', 'alpha')) {
+		$action = '';
+	}
 
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Do we click on purge search criteria ?
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$search_ref = '';
 		$search_societe = '';
 		$search_montant_ht = '';
@@ -196,11 +214,11 @@ if (empty($reshook))
 
 	// Mass actions
 	/*$objectclass='MyObject';
-    $objectlabel='MyObject';
-    $permissiontoread = $user->rights->mymodule->read;
-    $permissiontodelete = $user->rights->mymodule->delete;
-    $uploaddir = $conf->mymodule->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
+	$objectlabel='MyObject';
+	$permissiontoread = $user->rights->mymodule->read;
+	$permissiontodelete = $user->rights->mymodule->delete;
+	$uploaddir = $conf->mymodule->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
 }
 
 
@@ -212,7 +230,9 @@ llxHeader('', $langs->trans("RepeatableInvoices"), 'ch-facture.html#s-fac-factur
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 $companystatic = new Societe($db);
 $invoicerectmp = new FactureRec($db);
 
@@ -231,7 +251,9 @@ $sql .= " f.datec, f.tms,";
 $sql .= " f.fk_cond_reglement, f.fk_mode_reglement";
 // 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();
@@ -249,23 +271,52 @@ $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
 if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
-if ($search_ref)                  $sql .= natural_search('f.titre', $search_ref);
-if ($socid)                       $sql .= ' AND s.rowid = '.(int) $socid;
-if ($search_societe)              $sql .= natural_search('s.nom', $search_societe);
-if ($search_montant_ht != '')     $sql .= natural_search('f.total', $search_montant_ht, 1);
-if ($search_montant_vat != '')    $sql .= natural_search('f.tva', $search_montant_vat, 1);
-if ($search_montant_ttc != '')    $sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
-if (!empty($search_payment_mode) && $search_payment_mode != '-1')   $sql .= natural_search('f.fk_mode_reglement', $search_payment_mode, 1);
-if (!empty($search_payment_term) && $search_payment_term != '-1')   $sql .= natural_search('f.fk_cond_reglement', $search_payment_term, 1);
-if ($search_recurring == '1')     $sql .= ' AND f.frequency > 0';
-if ($search_recurring == '0')     $sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
-if ($search_frequency != '')      $sql .= natural_search('f.frequency', $search_frequency, 1);
-if ($search_unit_frequency != '') $sql .= ' AND f.frequency > 0'.natural_search('f.unit_frequency', $search_unit_frequency);
-if ($search_status != '' && $search_status >= -1)
-{
-	if ($search_status == 0) $sql .= ' AND frequency = 0 AND suspended = 0';
-	if ($search_status == 1) $sql .= ' AND frequency != 0 AND suspended = 0';
-	if ($search_status == -1) $sql .= ' AND suspended = 1';
+if ($search_ref) {
+	$sql .= natural_search('f.titre', $search_ref);
+}
+if ($socid) {
+	$sql .= ' AND s.rowid = '.(int) $socid;
+}
+if ($search_societe) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if ($search_montant_ht != '') {
+	$sql .= natural_search('f.total', $search_montant_ht, 1);
+}
+if ($search_montant_vat != '') {
+	$sql .= natural_search('f.tva', $search_montant_vat, 1);
+}
+if ($search_montant_ttc != '') {
+	$sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
+}
+if (!empty($search_payment_mode) && $search_payment_mode != '-1') {
+	$sql .= natural_search('f.fk_mode_reglement', $search_payment_mode, 1);
+}
+if (!empty($search_payment_term) && $search_payment_term != '-1') {
+	$sql .= natural_search('f.fk_cond_reglement', $search_payment_term, 1);
+}
+if ($search_recurring == '1') {
+	$sql .= ' AND f.frequency > 0';
+}
+if ($search_recurring == '0') {
+	$sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
+}
+if ($search_frequency != '') {
+	$sql .= natural_search('f.frequency', $search_frequency, 1);
+}
+if ($search_unit_frequency != '') {
+	$sql .= ' AND f.frequency > 0'.natural_search('f.unit_frequency', $search_unit_frequency);
+}
+if ($search_status != '' && $search_status >= -1) {
+	if ($search_status == 0) {
+		$sql .= ' AND frequency = 0 AND suspended = 0';
+	}
+	if ($search_status == 1) {
+		$sql .= ' AND frequency != 0 AND suspended = 0';
+	}
+	if ($search_status == -1) {
+		$sql .= ' AND suspended = 1';
+	}
 }
 $sql .= dolSqlDateFilter('f.date_last_gen', $search_day, $search_month, $search_year);
 $sql .= dolSqlDateFilter('f.date_when', $search_day_date_when, $search_month_date_when, $search_year_date_when);
@@ -273,12 +324,10 @@ $sql .= dolSqlDateFilter('f.date_when', $search_day_date_when, $search_month_dat
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -287,32 +336,73 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($socid > 0)                 $param .= '&socid='.urlencode($socid);
-	if ($search_day)                $param .= '&search_day='.urlencode($search_day);
-	if ($search_month)              $param .= '&search_month='.urlencode($search_month);
-	if ($search_year)               $param .= '&search_year='.urlencode($search_year);
-	if ($search_day_date_when)      $param .= '&search_day_date_when='.urlencode($search_day_date_when);
-	if ($search_month_date_when)    $param .= '&search_month_date_when='.urlencode($search_month_date_when);
-	if ($search_year_date_when)     $param .= '&search_year_date_when='.urlencode($search_year_date_when);
-	if ($search_ref)                $param .= '&search_ref='.urlencode($search_ref);
-	if ($search_societe)            $param .= '&search_societe='.urlencode($search_societe);
-	if ($search_montant_ht != '')   $param .= '&search_montant_ht='.urlencode($search_montant_ht);
-	if ($search_montant_vat != '')  $param .= '&search_montant_vat='.urlencode($search_montant_vat);
-	if ($search_montant_ttc != '')  $param .= '&search_montant_ttc='.urlencode($search_montant_ttc);
-	if ($search_payment_mode != '') $param .= '&search_payment_mode='.urlencode($search_payment_mode);
-	if ($search_payment_term != '') $param .= '&search_payment_term='.urlencode($search_payment_term);
-	if ($search_recurring != '' && $search_recurrning != '-1')    $param .= '&search_recurring='.urlencode($search_recurring);
-	if ($search_frequency > 0)        $param .= '&search_frequency='.urlencode($search_frequency);
-	if ($search_unit_frequency != '') $param .= '&search_unit_frequency='.urlencode($search_unit_frequency);
-	if ($search_status != '')		$param .= '&search_status='.urlencode($search_status);
-	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 ($socid > 0) {
+		$param .= '&socid='.urlencode($socid);
+	}
+	if ($search_day) {
+		$param .= '&search_day='.urlencode($search_day);
+	}
+	if ($search_month) {
+		$param .= '&search_month='.urlencode($search_month);
+	}
+	if ($search_year) {
+		$param .= '&search_year='.urlencode($search_year);
+	}
+	if ($search_day_date_when) {
+		$param .= '&search_day_date_when='.urlencode($search_day_date_when);
+	}
+	if ($search_month_date_when) {
+		$param .= '&search_month_date_when='.urlencode($search_month_date_when);
+	}
+	if ($search_year_date_when) {
+		$param .= '&search_year_date_when='.urlencode($search_year_date_when);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_societe) {
+		$param .= '&search_societe='.urlencode($search_societe);
+	}
+	if ($search_montant_ht != '') {
+		$param .= '&search_montant_ht='.urlencode($search_montant_ht);
+	}
+	if ($search_montant_vat != '') {
+		$param .= '&search_montant_vat='.urlencode($search_montant_vat);
+	}
+	if ($search_montant_ttc != '') {
+		$param .= '&search_montant_ttc='.urlencode($search_montant_ttc);
+	}
+	if ($search_payment_mode != '') {
+		$param .= '&search_payment_mode='.urlencode($search_payment_mode);
+	}
+	if ($search_payment_term != '') {
+		$param .= '&search_payment_term='.urlencode($search_payment_term);
+	}
+	if ($search_recurring != '' && $search_recurrning != '-1') {
+		$param .= '&search_recurring='.urlencode($search_recurring);
+	}
+	if ($search_frequency > 0) {
+		$param .= '&search_frequency='.urlencode($search_frequency);
+	}
+	if ($search_unit_frequency != '') {
+		$param .= '&search_unit_frequency='.urlencode($search_unit_frequency);
+	}
+	if ($search_status != '') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -323,7 +413,9 @@ if ($resql)
 	//$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
 
 	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">';
@@ -348,93 +440,84 @@ if ($resql)
 	// Filters lines
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (!empty($arrayfields['f.titre']['checked']))
-	{
+	if (!empty($arrayfields['f.titre']['checked'])) {
 		print '<td class="liste_titre left">';
 		print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	// Thirpdarty
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 	}
-	if (!empty($arrayfields['f.total']['checked']))
-	{
+	if (!empty($arrayfields['f.total']['checked'])) {
 		// Amount net
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.tva']['checked']))
-	{
+	if (!empty($arrayfields['f.tva']['checked'])) {
 		// Amount Vat
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['f.total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
-	{
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 		// Payment term
 		print '<td class="liste_titre right">';
 		$form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
 		print "</td>";
 	}
-	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
-	{
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 		// Payment mode
 		print '<td class="liste_titre right">';
 		$form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
 		print '</td>';
 	}
-	if (!empty($arrayfields['recurring']['checked']))
-	{
+	if (!empty($arrayfields['recurring']['checked'])) {
 		// Recurring or not
 		print '<td class="liste_titre" align="center">';
 		print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.frequency']['checked']))
-	{
+	if (!empty($arrayfields['f.frequency']['checked'])) {
 		// Recurring or not
 		print '<td class="liste_titre" align="center">';
 		print '<input class="flat" type="text" size="1" name="search_frequency" value="'.dol_escape_htmltag($search_frequency).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.unit_frequency']['checked']))
-	{
+	if (!empty($arrayfields['f.unit_frequency']['checked'])) {
 		// Frequency unit
 		print '<td class="liste_titre" align="center">';
 		print '<input class="flat" type="text" size="1" name="search_unit_frequency" value="'.dol_escape_htmltag($search_unit_frequency).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.nb_gen_done']['checked']))
-	{
+	if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
 		// Nb generation
 		print '<td class="liste_titre" align="center">';
 		print '</td>';
 	}
 	// Date invoice
-	if (!empty($arrayfields['f.date_last_gen']['checked']))
-	{
+	if (!empty($arrayfields['f.date_last_gen']['checked'])) {
 		print '<td class="liste_titre nowraponall" align="center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+			print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
+		}
 		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
 		$formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 		print '</td>';
 	}
 	// Date next generation
-	if (!empty($arrayfields['f.date_when']['checked']))
-	{
+	if (!empty($arrayfields['f.date_when']['checked'])) {
 		print '<td class="liste_titre nowraponall" align="center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_date_when" value="'.$search_day_date_when.'">';
+		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+			print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_date_when" value="'.$search_day_date_when.'">';
+		}
 		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_date_when" value="'.$search_month_date_when.'">';
 		$formother->select_year($search_year_date_when ? $search_year_date_when : -1, 'search_year_date_when', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 		print '</td>';
@@ -447,20 +530,17 @@ if ($resql)
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['f.datec']['checked']))
-	{
+	if (!empty($arrayfields['f.datec']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['f.tms']['checked']))
-	{
+	if (!empty($arrayfields['f.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['status']['checked']))
-	{
+	if (!empty($arrayfields['status']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		$liststatus = array(
 			0=>$langs->trans("Draft"),
@@ -478,35 +558,67 @@ if ($resql)
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['f.titre']['checked']))         print_liste_field_titre($arrayfields['f.titre']['label'], $_SERVER['PHP_SELF'], "f.titre", "", $param, "", $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['f.total']['checked']))         print_liste_field_titre($arrayfields['f.total']['label'], $_SERVER['PHP_SELF'], "f.total", "", $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.tva']['checked']))           print_liste_field_titre($arrayfields['f.tva']['label'], $_SERVER['PHP_SELF'], "f.tva", "", $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))     print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['recurring']['checked']))       print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'class="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.frequency']['checked']))     print_liste_field_titre($arrayfields['f.frequency']['label'], $_SERVER['PHP_SELF'], "f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.unit_frequency']['checked'])) print_liste_field_titre($arrayfields['f.unit_frequency']['label'], $_SERVER['PHP_SELF'], "f.unit_frequency", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.nb_gen_done']['checked']))   print_liste_field_titre($arrayfields['f.nb_gen_done']['label'], $_SERVER['PHP_SELF'], "f.nb_gen_done", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.date_last_gen']['checked'])) print_liste_field_titre($arrayfields['f.date_last_gen']['label'], $_SERVER['PHP_SELF'], "f.date_last_gen", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.date_when']['checked']))     print_liste_field_titre($arrayfields['f.date_when']['label'], $_SERVER['PHP_SELF'], "f.date_when", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.datec']['checked']))         print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER['PHP_SELF'], "f.datec", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.tms']['checked']))           print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER['PHP_SELF'], "f.tms", "", $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.titre']['checked'])) {
+		print_liste_field_titre($arrayfields['f.titre']['label'], $_SERVER['PHP_SELF'], "f.titre", "", $param, "", $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['f.total']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total']['label'], $_SERVER['PHP_SELF'], "f.total", "", $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.tva']['checked'])) {
+		print_liste_field_titre($arrayfields['f.tva']['label'], $_SERVER['PHP_SELF'], "f.tva", "", $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['recurring']['checked'])) {
+		print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'class="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.frequency']['checked'])) {
+		print_liste_field_titre($arrayfields['f.frequency']['label'], $_SERVER['PHP_SELF'], "f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.unit_frequency']['checked'])) {
+		print_liste_field_titre($arrayfields['f.unit_frequency']['label'], $_SERVER['PHP_SELF'], "f.unit_frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
+		print_liste_field_titre($arrayfields['f.nb_gen_done']['label'], $_SERVER['PHP_SELF'], "f.nb_gen_done", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.date_last_gen']['checked'])) {
+		print_liste_field_titre($arrayfields['f.date_last_gen']['label'], $_SERVER['PHP_SELF'], "f.date_last_gen", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.date_when']['checked'])) {
+		print_liste_field_titre($arrayfields['f.date_when']['label'], $_SERVER['PHP_SELF'], "f.date_when", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER['PHP_SELF'], "f.datec", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER['PHP_SELF'], "f.tms", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
-	if (!empty($arrayfields['status']['checked']))          print_liste_field_titre($arrayfields['status']['label'], $_SERVER['PHP_SELF'], "f.suspended,f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	if (!empty($arrayfields['status']['checked'])) {
+		print_liste_field_titre($arrayfields['status']['label'], $_SERVER['PHP_SELF'], "f.suspended,f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
-	if ($num > 0)
-	{
+	if ($num > 0) {
 		$i = 0;
 		$totalarray = array();
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$objp = $db->fetch_object($resql);
-			if (empty($objp)) break;
+			if (empty($objp)) {
+				break;
+			}
 
 			$companystatic->id = $objp->socid;
 			$companystatic->name = $objp->name;
@@ -521,115 +633,137 @@ if ($resql)
 
 			print '<tr class="oddeven">';
 
-			if (!empty($arrayfields['f.titre']['checked']))
-			{
+			if (!empty($arrayfields['f.titre']['checked'])) {
 				print '<td class="nowrap tdoverflowmax200">';
 				print $invoicerectmp->getNomUrl(1);
 				print "</a>";
 				print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['s.nom']['checked']))
-			{
+			if (!empty($arrayfields['s.nom']['checked'])) {
 				print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'customer').'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['f.total']['checked']))
-			{
+			if (!empty($arrayfields['f.total']['checked'])) {
 				print '<td class="nowrap right">'.price($objp->total).'</td>'."\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total';
+				}
 				$totalarray['val']['f.total'] += $objp->total;
 			}
-			if (!empty($arrayfields['f.tva']['checked']))
-			{
+			if (!empty($arrayfields['f.tva']['checked'])) {
 				print '<td class="nowrap right">'.price($objp->total_vat).'</td>'."\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.tva';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.tva';
+				}
 				$totalarray['val']['f.tva'] += $objp->total_vat;
 			}
-			if (!empty($arrayfields['f.total_ttc']['checked']))
-			{
+			if (!empty($arrayfields['f.total_ttc']['checked'])) {
 				print '<td class="nowrap right">'.price($objp->total_ttc).'</td>'."\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				}
 				$totalarray['val']['f.total_ttc'] += $objp->total_ttc;
 			}
 			// Payment term
-			if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
-			{
+			if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 				print '<td class="right">';
 				$form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
 				print '</td>'."\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Payment mode
-			if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
-			{
+			if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 				print '<td class="right">';
 				$form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
 				print '</td>'."\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['recurring']['checked']))
-			{
+			if (!empty($arrayfields['recurring']['checked'])) {
 				print '<td class="center">'.yn($objp->frequency ? 1 : 0).'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['f.frequency']['checked']))
-			{
+			if (!empty($arrayfields['f.frequency']['checked'])) {
 				print '<td class="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['f.unit_frequency']['checked']))
-			{
+			if (!empty($arrayfields['f.unit_frequency']['checked'])) {
 				print '<td class="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['f.nb_gen_done']['checked']))
-			{
+			if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
 				print '<td class="center">';
 				print ($objp->frequency > 0 ? $objp->nb_gen_done.($objp->nb_gen_max > 0 ? ' / '.$objp->nb_gen_max : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Date last generation
-			if (!empty($arrayfields['f.date_last_gen']['checked']))
-			{
+			if (!empty($arrayfields['f.date_last_gen']['checked'])) {
 				print '<td class="center">';
 				print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Date next generation
-			if (!empty($arrayfields['f.date_when']['checked']))
-			{
+			if (!empty($arrayfields['f.date_when']['checked'])) {
 				print '<td class="center">';
 				print '<div class="nowraponall">';
 				print ($objp->frequency ? ($invoicerectmp->isMaxNbGenReached() ? '<strike>' : '').dol_print_date($db->jdate($objp->date_when), 'day').($invoicerectmp->isMaxNbGenReached() ? '</strike>' : '') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
-				if (!$invoicerectmp->isMaxNbGenReached())
-				{
-					if (!$objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) print img_warning($langs->trans("Late"));
+				if (!$invoicerectmp->isMaxNbGenReached()) {
+					if (!$objp->suspended && $objp->frequency > 0 && $db->jdate($objp->date_when) && $db->jdate($objp->date_when) < $now) {
+						print img_warning($langs->trans("Late"));
+					}
 				} else {
 					print img_info($langs->trans("MaxNumberOfGenerationReached"));
 				}
 				print '</div>';
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['f.datec']['checked']))
-			{
+			if (!empty($arrayfields['f.datec']['checked'])) {
 				print '<td class="center">';
 				print dol_print_date($db->jdate($objp->datec), 'dayhour');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['f.tms']['checked']))
-			{
+			if (!empty($arrayfields['f.tms']['checked'])) {
 				print '<td class="center">';
 				print dol_print_date($db->jdate($objp->tms), 'dayhour');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			$obj = $objp;
@@ -644,17 +778,16 @@ if ($resql)
 				print '<td class="center">';
 				print $invoicerectmp->getLibStatut(3, 0);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Action column
 			print '<td class="center">';
-			if ($user->rights->facture->creer && empty($invoicerectmp->suspended))
-			{
-				if ($invoicerectmp->isMaxNbGenReached())
-				{
+			if ($user->rights->facture->creer && empty($invoicerectmp->suspended)) {
+				if ($invoicerectmp->isMaxNbGenReached()) {
 					print $langs->trans("MaxNumberOfGenerationReached");
-				} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today)
-				{
+				} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today) {
 					print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
 					print $langs->trans("CreateBill").'</a>';
 				} else {
@@ -663,7 +796,9 @@ if ($resql)
 			} else {
 				print "&nbsp;";
 			}
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 			print "</td>";
 
 			print "</tr>\n";
@@ -672,7 +807,11 @@ if ($resql)
 		}
 	} else {
 		$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>';
 	}
 
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 249df885435..9f5281dc20b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -52,7 +52,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'companies', 'products', 'categories'));
@@ -71,8 +73,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'invoicelist';
 
-if ($contextpage == 'poslist')
-{
+if ($contextpage == 'poslist') {
 	$_GET['optioncss'] = 'print';
 }
 
@@ -129,17 +130,27 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
-if (!$sortorder && !empty($conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER) && $search_status == '1') $sortorder = $conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER;
-if (!$sortorder) $sortorder = 'DESC';
-if (!$sortfield) $sortfield = 'f.datef';
+if (!$sortorder && !empty($conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER) && $search_status == '1') {
+	$sortorder = $conf->global->INVOICE_DEFAULT_UNPAYED_SORT_ORDER;
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
+if (!$sortfield) {
+	$sortfield = 'f.datef';
+}
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 // Security check
 $fieldid = (!empty($ref) ? 'ref' : 'rowid');
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid);
 
 $diroutputmassaction = $conf->facture->dir_output.'/temp/massgeneration/'.$user->id;
@@ -169,7 +180,9 @@ $fieldstosearchall = array(
 	's.town'=>"Town",
 	'f.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["f.note_private"] = "NotePrivate";
+if (empty($user->socid)) {
+	$fieldstosearchall["f.note_private"] = "NotePrivate";
+}
 
 $checkedtypetiers = 0;
 $arrayfields = array(
@@ -219,8 +232,7 @@ $arrayfields = array(
 	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 
-if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY)
-{
+if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY) {
 	$arrayfields['f.retained_warranty'] = array('label'=>$langs->trans("RetainedWarranty"), 'checked'=>0, 'position'=>86);
 }
 
@@ -235,18 +247,23 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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');
+}
 
 include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 // Do we click on purge search criteria ?
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha')) // All tests are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha')) { // All tests are required to be compatible with all browsers
 	$search_user = '';
 	$search_sale = '';
 	$search_product_category = '';
@@ -292,8 +309,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_categ_cus = 0;
 }
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$objectclass = 'Facture';
 	$objectlabel = 'Invoices';
 	$permissiontoread = $user->rights->facture->lire;
@@ -322,8 +338,7 @@ if ($massaction == 'makepayment') {
 
 		$arrayofselected = is_array($toselect) ? $toselect : array();
 		$listofbills = array();
-		foreach ($arrayofselected as $toselectid)
-		{
+		foreach ($arrayofselected as $toselectid) {
 			$objecttmp = new Facture($db);
 			$result = $objecttmp->fetch($toselectid);
 			if ($result > 0) {
@@ -355,8 +370,7 @@ if ($massaction == 'makepayment') {
 				$rsql .= " ORDER BY pfd.date_demande DESC";
 
 				$result_sql = $db->query($rsql);
-				if ($result_sql)
-				{
+				if ($result_sql) {
 					$numprlv = $db->num_rows($result_sql);
 				}
 
@@ -373,15 +387,12 @@ if ($massaction == 'makepayment') {
 		}
 
 		//Massive withdraw request for request with no errors
-		if (!empty($listofbills))
-		{
+		if (!empty($listofbills)) {
 			$nbwithdrawrequestok = 0;
-			foreach ($listofbills as $aBill)
-			{
+			foreach ($listofbills as $aBill) {
 				$db->begin();
 				$result = $aBill->demande_prelevement($user, $aBill->resteapayer, 'direct-debit', 'facture');
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$db->commit();
 					$nbwithdrawrequestok++;
 				} else {
@@ -389,8 +400,7 @@ if ($massaction == 'makepayment') {
 					setEventMessages($aBill->error, $aBill->errors, 'errors');
 				}
 			}
-			if ($nbwithdrawrequestok > 0)
-			{
+			if ($nbwithdrawrequestok > 0) {
 				setEventMessages($langs->trans("WithdrawRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
 			}
 		}
@@ -416,7 +426,9 @@ $formcompany = new FormCompany($db);
 $thirdpartystatic = new Societe($db);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0 || $search_user > 0) {
+	$sql = 'SELECT DISTINCT';
+}
 $sql .= ' f.rowid as id, f.ref, f.ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total as total_ht, f.tva as total_vat, f.total_ttc,';
 $sql .= ' f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,';
 $sql .= ' f.fk_user_author,';
@@ -433,11 +445,17 @@ $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,
 $sql .= " u.login";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
-if (!$sall) $sql .= ', SUM(pf.amount) as dynamount_payed, SUM(pf.multicurrency_amount) as multicurrency_dynamount_payed';
-if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+if (!$sall) {
+	$sql .= ', SUM(pf.amount) as dynamount_payed, SUM(pf.multicurrency_amount) as multicurrency_dynamount_payed';
+}
+if ($search_categ_cus) {
+	$sql .= ", cc.fk_categorie, cc.fk_soc";
+}
 // 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();
@@ -447,96 +465,196 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if (!empty($search_categ_cus)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+if (!empty($search_categ_cus)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+}
 
 $sql .= ', '.MAIN_DB_PREFIX.'facture as f';
-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 (f.rowid = ef.fk_object)";
-if (!$sall) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
-if ($sall || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as pd ON f.rowid=pd.fk_facture';
-if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+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 (f.rowid = ef.fk_object)";
+}
+if (!$sall) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid';
+}
+if ($sall || $search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as pd ON f.rowid=pd.fk_facture';
+}
+if ($search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON f.fk_user_author = u.rowid';
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-if ($search_user > 0)
-{
+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 
 $sql .= ' WHERE f.fk_soc = s.rowid';
 $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
-if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
-if ($userid)
-{
-	if ($userid == -1) $sql .= ' AND f.fk_user_author IS NULL';
-	else $sql .= ' AND f.fk_user_author = '.$userid;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
-if ($filtre)
-{
+if ($search_product_category > 0) {
+	$sql .= " AND cp.fk_categorie = ".$db->escape($search_product_category);
+}
+if ($socid > 0) {
+	$sql .= ' AND s.rowid = '.$socid;
+}
+if ($userid) {
+	if ($userid == -1) {
+		$sql .= ' AND f.fk_user_author IS NULL';
+	} else {
+		$sql .= ' AND f.fk_user_author = '.$userid;
+	}
+}
+if ($filtre) {
 	$aFilter = explode(',', $filtre);
-	foreach ($aFilter as $filter)
-	{
+	foreach ($aFilter as $filter) {
 		$filt = explode(':', $filter);
 		$sql .= ' AND '.$db->escape(trim($filt[0])).' = '.$db->escape(trim($filt[1]));
 	}
 }
-if ($search_ref) $sql .= natural_search('f.ref', $search_ref);
-if ($search_refcustomer) $sql .= natural_search('f.ref_client', $search_refcustomer);
-if ($search_type != '' && $search_type != '-1') $sql .= " AND f.type IN (".$db->sanitize($db->escape($search_type)).")";
-if ($search_project_ref) $sql .= natural_search('p.ref', $search_project_ref);
-if ($search_project) $sql .= natural_search('p.title', $search_project);
-if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-if ($search_societe_alias) $sql .= natural_search('s.name_alias', $search_societe_alias);
-if ($search_town)  $sql .= natural_search('s.town', $search_town);
-if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
-if ($search_state) $sql .= natural_search("state.nom", $search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
-if ($search_type_thirdparty != '' && $search_type_thirdparty != '-1') $sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_company_alias) $sql .= natural_search('s.name_alias', $search_company_alias);
-if ($search_montant_ht != '') $sql .= natural_search('f.total', $search_montant_ht, 1);
-if ($search_montant_vat != '') $sql .= natural_search('f.tva', $search_montant_vat, 1);
-if ($search_montant_localtax1 != '') $sql .= natural_search('f.localtax1', $search_montant_localtax1, 1);
-if ($search_montant_localtax2 != '') $sql .= natural_search('f.localtax2', $search_montant_localtax2, 1);
-if ($search_montant_ttc != '') $sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
-if ($search_multicurrency_code != '') $sql .= ' AND f.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
-if ($search_multicurrency_tx != '') $sql .= natural_search('f.multicurrency_tx', $search_multicurrency_tx, 1);
-if ($search_multicurrency_montant_ht != '') $sql .= natural_search('f.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
-if ($search_multicurrency_montant_vat != '') $sql .= natural_search('f.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
-if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
-if ($search_login) $sql .= natural_search('u.login', $search_login);
-if ($search_categ_cus > 0) $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
-if ($search_categ_cus == -2)   $sql .= " AND cc.fk_categorie IS NULL";
-if ($search_status != '-1' && $search_status != '')
-{
-	if (is_numeric($search_status) && $search_status >= 0)
-	{
-		if ($search_status == '0') $sql .= " AND f.fk_statut = 0"; // draft
-		if ($search_status == '1') $sql .= " AND f.fk_statut = 1"; // unpayed
-		if ($search_status == '2') $sql .= " AND f.fk_statut = 2"; // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
-		if ($search_status == '3') $sql .= " AND f.fk_statut = 3"; // abandonned
+if ($search_ref) {
+	$sql .= natural_search('f.ref', $search_ref);
+}
+if ($search_refcustomer) {
+	$sql .= natural_search('f.ref_client', $search_refcustomer);
+}
+if ($search_type != '' && $search_type != '-1') {
+	$sql .= " AND f.type IN (".$db->sanitize($db->escape($search_type)).")";
+}
+if ($search_project_ref) {
+	$sql .= natural_search('p.ref', $search_project_ref);
+}
+if ($search_project) {
+	$sql .= natural_search('p.title', $search_project);
+}
+if ($search_societe) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if ($search_societe_alias) {
+	$sql .= natural_search('s.name_alias', $search_societe_alias);
+}
+if ($search_town) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+	$sql .= natural_search("s.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_country) {
+	$sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
+}
+if ($search_type_thirdparty != '' && $search_type_thirdparty != '-1') {
+	$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
+}
+if ($search_company) {
+	$sql .= natural_search('s.nom', $search_company);
+}
+if ($search_company_alias) {
+	$sql .= natural_search('s.name_alias', $search_company_alias);
+}
+if ($search_montant_ht != '') {
+	$sql .= natural_search('f.total', $search_montant_ht, 1);
+}
+if ($search_montant_vat != '') {
+	$sql .= natural_search('f.tva', $search_montant_vat, 1);
+}
+if ($search_montant_localtax1 != '') {
+	$sql .= natural_search('f.localtax1', $search_montant_localtax1, 1);
+}
+if ($search_montant_localtax2 != '') {
+	$sql .= natural_search('f.localtax2', $search_montant_localtax2, 1);
+}
+if ($search_montant_ttc != '') {
+	$sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
+}
+if ($search_multicurrency_code != '') {
+	$sql .= ' AND f.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+}
+if ($search_multicurrency_tx != '') {
+	$sql .= natural_search('f.multicurrency_tx', $search_multicurrency_tx, 1);
+}
+if ($search_multicurrency_montant_ht != '') {
+	$sql .= natural_search('f.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
+}
+if ($search_multicurrency_montant_vat != '') {
+	$sql .= natural_search('f.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
+}
+if ($search_multicurrency_montant_ttc != '') {
+	$sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+}
+if ($search_login) {
+	$sql .= natural_search('u.login', $search_login);
+}
+if ($search_categ_cus > 0) {
+	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+}
+if ($search_categ_cus == -2) {
+	$sql .= " AND cc.fk_categorie IS NULL";
+}
+if ($search_status != '-1' && $search_status != '') {
+	if (is_numeric($search_status) && $search_status >= 0) {
+		if ($search_status == '0') {
+			$sql .= " AND f.fk_statut = 0"; // draft
+		}
+		if ($search_status == '1') {
+			$sql .= " AND f.fk_statut = 1"; // unpayed
+		}
+		if ($search_status == '2') {
+			$sql .= " AND f.fk_statut = 2"; // payed     Not that some corrupted data may contains f.fk_statut = 1 AND f.paye = 1 (it means payed too but should not happend. If yes, reopen and reclassify billed)
+		}
+		if ($search_status == '3') {
+			$sql .= " AND f.fk_statut = 3"; // abandonned
+		}
 	} else {
 		$sql .= " AND f.fk_statut IN (".$db->sanitize($db->escape($search_status)).")"; // When search_status is '1,2' for example
 	}
 }
 
-if ($search_paymentmode > 0)  $sql .= " AND f.fk_mode_reglement = ".$db->escape($search_paymentmode);
-if ($search_paymentterms > 0) $sql .= " AND f.fk_cond_reglement = ".$db->escape($search_paymentterms);
-if ($search_module_source)    $sql .= natural_search("f.module_source", $search_module_source);
-if ($search_pos_source)       $sql .= natural_search("f.pos_source", $search_pos_source);
-if ($search_date_start)       $sql .= " AND f.datef >= '".$db->idate($search_date_start)."'";
-if ($search_date_end)         $sql .= " AND f.datef <= '".$db->idate($search_date_end)."'";
-if ($search_date_valid_start) $sql .= " AND f.date_valid >= '".$db->idate($search_date_valid_start)."'";
-if ($search_date_valid_end)   $sql .= " AND f.date_valid <= '".$db->idate($search_date_valid_end)."'";
-if ($search_datelimit_start)  $sql .= " AND f.date_lim_reglement >= '".$db->idate($search_datelimit_start)."'";
-if ($search_datelimit_end)    $sql .= " AND f.date_lim_reglement <= '".$db->idate($search_datelimit_end)."'";
-if ($option == 'late') $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
-if ($search_sale > 0)  $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".(int) $search_sale;
-if ($search_user > 0)
-{
+if ($search_paymentmode > 0) {
+	$sql .= " AND f.fk_mode_reglement = ".$db->escape($search_paymentmode);
+}
+if ($search_paymentterms > 0) {
+	$sql .= " AND f.fk_cond_reglement = ".$db->escape($search_paymentterms);
+}
+if ($search_module_source) {
+	$sql .= natural_search("f.module_source", $search_module_source);
+}
+if ($search_pos_source) {
+	$sql .= natural_search("f.pos_source", $search_pos_source);
+}
+if ($search_date_start) {
+	$sql .= " AND f.datef >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND f.datef <= '".$db->idate($search_date_end)."'";
+}
+if ($search_date_valid_start) {
+	$sql .= " AND f.date_valid >= '".$db->idate($search_date_valid_start)."'";
+}
+if ($search_date_valid_end) {
+	$sql .= " AND f.date_valid <= '".$db->idate($search_date_valid_end)."'";
+}
+if ($search_datelimit_start) {
+	$sql .= " AND f.date_lim_reglement >= '".$db->idate($search_datelimit_start)."'";
+}
+if ($search_datelimit_end) {
+	$sql .= " AND f.date_lim_reglement <= '".$db->idate($search_datelimit_end)."'";
+}
+if ($option == 'late') {
+	$sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->client->warning_delay)."'";
+}
+if ($search_sale > 0) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".(int) $search_sale;
+}
+if ($search_user > 0) {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='facture' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
 }
 // Add where from extra fields
@@ -546,8 +664,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-if (!$sall)
-{
+if (!$sall) {
 	$sql .= ' GROUP BY f.rowid, f.ref, ref_client, f.type, f.note_private, f.note_public, f.increment, f.fk_mode_reglement, f.fk_cond_reglement, f.total, f.tva, f.total_ttc,';
 	$sql .= ' f.localtax1, f.localtax2,';
 	$sql .= ' f.datef, f.date_valid, f.date_lim_reglement, f.module_source, f.pos_source,';
@@ -562,10 +679,14 @@ if (!$sall)
 	$sql .= ' country.code,';
 	$sql .= " p.rowid, p.ref, p.title,";
 	$sql .= " u.login";
-	if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+	if ($search_categ_cus) {
+		$sql .= ", cc.fk_categorie, cc.fk_soc";
+	}
 	// 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 : '');
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
+		}
 	}
 } else {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
@@ -574,16 +695,16 @@ if (!$sall)
 $sql .= ' ORDER BY ';
 $listfield = explode(',', $sortfield);
 $listorder = explode(',', $sortorder);
-foreach ($listfield as $key => $value) $sql .= $listfield[$key].' '.($listorder[$key] ? $listorder[$key] : 'DESC').',';
+foreach ($listfield as $key => $value) {
+	$sql .= $listfield[$key].' '.($listorder[$key] ? $listorder[$key] : 'DESC').',';
+}
 $sql .= ' f.rowid DESC ';
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -593,14 +714,12 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
 
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-	{
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 		$obj = $db->fetch_object($resql);
 		$id = $obj->id;
 
@@ -610,55 +729,138 @@ if ($resql)
 
 	llxHeader('', $langs->trans('CustomersInvoices'), 'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
 
-	if ($socid)
-	{
+	if ($socid) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
-		if (empty($search_societe)) $search_societe = $soc->name;
+		if (empty($search_societe)) {
+			$search_societe = $soc->name;
+		}
 	}
 
 	$param = '&socid='.$socid;
-	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_date_start)				$param .= '&search_date_start='.urlencode($search_date_start);
-	if ($search_date_end)				$param .= '&search_date_end='.urlencode($search_date_end);
-	if ($search_date_valid_start)		$param .= '&search_date_valid_start='.urlencode($search_date_valid_start);
-	if ($search_date_valid_end)			$param .= '&search_date_valid_end='.urlencode($search_date_valid_end);
-	if ($search_datelimit_start)		$param .= '&search_datelimit_start='.urlencode($search_datelimit_start);
-	if ($search_datelimit_end)			$param .= '&search_datelimit_end='.urlencode($search_datelimit_end);
-	if ($search_ref)         $param .= '&search_ref='.urlencode($search_ref);
-	if ($search_refcustomer) $param .= '&search_refcustomer='.urlencode($search_refcustomer);
-	if ($search_project_ref) $param .= '&search_project_ref='.urlencode($search_project_ref);
-	if ($search_project)     $param .= '&search_project='.urlencode($search_project);
-	if ($search_type != '')  $param .= '&search_type='.urlencode($search_type);
-	if ($search_societe)     $param .= '&search_societe='.urlencode($search_societe);
-	if ($search_societe_alias)			$param .= '&search_societe_alias='.urlencode($search_societe_alias);
-	if ($search_town)        $param .= '&search_town='.urlencode($search_town);
-	if ($search_zip)         $param .= '&search_zip='.urlencode($search_zip);
-	if ($search_sale > 0)    $param .= '&search_sale='.urlencode($search_sale);
-	if ($search_user > 0)    $param .= '&search_user='.urlencode($search_user);
-	if ($search_login)       $param .= '&search_login='.urlencode($search_login);
-	if ($search_product_category > 0)   $param .= '&search_product_category='.urlencode($search_product_category);
-	if ($search_montant_ht != '')  $param .= '&search_montant_ht='.urlencode($search_montant_ht);
-	if ($search_montant_vat != '')  $param .= '&search_montant_vat='.urlencode($search_montant_vat);
-	if ($search_montant_localtax1 != '')  $param .= '&search_montant_localtax1='.urlencode($search_montant_localtax1);
-	if ($search_montant_localtax2 != '')  $param .= '&search_montant_localtax2='.urlencode($search_montant_localtax2);
-	if ($search_montant_ttc != '') $param .= '&search_montant_ttc='.urlencode($search_montant_ttc);
-	if ($search_multicurrency_code != '')  $param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
-	if ($search_multicurrency_tx != '')  $param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
-	if ($search_multicurrency_montant_ht != '')  $param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
-	if ($search_multicurrency_montant_vat != '')  $param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
-	if ($search_multicurrency_montant_ttc != '') $param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
-	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
-	if ($search_paymentmode > 0) $param .= '&search_paymentmode='.urlencode($search_paymentmode);
-	if ($search_paymentterms > 0) $param .= '&search_paymentterms='.urlencode($search_paymentterms);
-	if ($search_module_source)  $param .= '&search_module_source='.urlencode($search_module_source);
-	if ($search_pos_source)  $param .= '&search_pos_source='.urlencode($search_pos_source);
-	if ($show_files)         $param .= '&show_files='.urlencode($show_files);
-	if ($option)             $param .= "&search_option=".urlencode($option);
-	if ($optioncss != '')    $param .= '&optioncss='.urlencode($optioncss);
-	if ($search_categ_cus > 0) $param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	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_date_start) {
+		$param .= '&search_date_start='.urlencode($search_date_start);
+	}
+	if ($search_date_end) {
+		$param .= '&search_date_end='.urlencode($search_date_end);
+	}
+	if ($search_date_valid_start) {
+		$param .= '&search_date_valid_start='.urlencode($search_date_valid_start);
+	}
+	if ($search_date_valid_end) {
+		$param .= '&search_date_valid_end='.urlencode($search_date_valid_end);
+	}
+	if ($search_datelimit_start) {
+		$param .= '&search_datelimit_start='.urlencode($search_datelimit_start);
+	}
+	if ($search_datelimit_end) {
+		$param .= '&search_datelimit_end='.urlencode($search_datelimit_end);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_refcustomer) {
+		$param .= '&search_refcustomer='.urlencode($search_refcustomer);
+	}
+	if ($search_project_ref) {
+		$param .= '&search_project_ref='.urlencode($search_project_ref);
+	}
+	if ($search_project) {
+		$param .= '&search_project='.urlencode($search_project);
+	}
+	if ($search_type != '') {
+		$param .= '&search_type='.urlencode($search_type);
+	}
+	if ($search_societe) {
+		$param .= '&search_societe='.urlencode($search_societe);
+	}
+	if ($search_societe_alias) {
+		$param .= '&search_societe_alias='.urlencode($search_societe_alias);
+	}
+	if ($search_town) {
+		$param .= '&search_town='.urlencode($search_town);
+	}
+	if ($search_zip) {
+		$param .= '&search_zip='.urlencode($search_zip);
+	}
+	if ($search_sale > 0) {
+		$param .= '&search_sale='.urlencode($search_sale);
+	}
+	if ($search_user > 0) {
+		$param .= '&search_user='.urlencode($search_user);
+	}
+	if ($search_login) {
+		$param .= '&search_login='.urlencode($search_login);
+	}
+	if ($search_product_category > 0) {
+		$param .= '&search_product_category='.urlencode($search_product_category);
+	}
+	if ($search_montant_ht != '') {
+		$param .= '&search_montant_ht='.urlencode($search_montant_ht);
+	}
+	if ($search_montant_vat != '') {
+		$param .= '&search_montant_vat='.urlencode($search_montant_vat);
+	}
+	if ($search_montant_localtax1 != '') {
+		$param .= '&search_montant_localtax1='.urlencode($search_montant_localtax1);
+	}
+	if ($search_montant_localtax2 != '') {
+		$param .= '&search_montant_localtax2='.urlencode($search_montant_localtax2);
+	}
+	if ($search_montant_ttc != '') {
+		$param .= '&search_montant_ttc='.urlencode($search_montant_ttc);
+	}
+	if ($search_multicurrency_code != '') {
+		$param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
+	}
+	if ($search_multicurrency_tx != '') {
+		$param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
+	}
+	if ($search_multicurrency_montant_ht != '') {
+		$param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
+	}
+	if ($search_multicurrency_montant_vat != '') {
+		$param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
+	}
+	if ($search_multicurrency_montant_ttc != '') {
+		$param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
+	}
+	if ($search_status != '') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($search_paymentmode > 0) {
+		$param .= '&search_paymentmode='.urlencode($search_paymentmode);
+	}
+	if ($search_paymentterms > 0) {
+		$param .= '&search_paymentterms='.urlencode($search_paymentterms);
+	}
+	if ($search_module_source) {
+		$param .= '&search_module_source='.urlencode($search_module_source);
+	}
+	if ($search_pos_source) {
+		$param .= '&search_pos_source='.urlencode($search_pos_source);
+	}
+	if ($show_files) {
+		$param .= '&show_files='.urlencode($show_files);
+	}
+	if ($option) {
+		$param .= "&search_option=".urlencode($option);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
+	if ($search_categ_cus > 0) {
+		$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -681,21 +883,26 @@ if ($resql)
 			$arrayofmassactions['predelete'] = $langs->trans("Delete");
 		}
 	}
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	if (in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	// Show the new button only when this page is not opend from the Extended POS
-	if ($contextpage != 'poslist')
-	{
+	if ($contextpage != 'poslist') {
 		$url = DOL_URL_ROOT.'/compta/facture/card.php?action=create';
-		if (!empty($socid)) $url .= '&socid='.$socid;
+		if (!empty($socid)) {
+			$url .= '&socid='.$socid;
+		}
 		$newcardbutton = dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', $user->rights->facture->creer);
 	}
 
 	$i = 0;
 	print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -712,33 +919,31 @@ if ($resql)
 	$trackid = 'inv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($sall)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
- 	// If the user can view prospects other than his'
-	$moreforfilter = '';
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
- 		$langs->load("commercial");
- 		$moreforfilter .= '<div class="divsearchfield">';
- 		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
-		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
-	 	$moreforfilter .= '</div>';
- 	}
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid)
-	{
+	$moreforfilter = '';
+	if ($user->rights->societe->client->voir || $socid) {
+		$langs->load("commercial");
+		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
+		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
+		$moreforfilter .= '</div>';
+	}
+	// If the user can view prospects other than his'
+	if ($user->rights->societe->client->voir || $socid) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
 		$moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
@@ -746,22 +951,23 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
-	 	$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
+		$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
 		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1);
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 	$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 ($moreforfilter)
-	{
-   		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	if ($moreforfilter) {
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
 	}
@@ -769,7 +975,9 @@ if ($resql)
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 	// Show the massaction checkboxes only when this page is not opend from the Extended POS
-	if ($massactionbutton && $contextpage != 'poslist') $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	if ($massactionbutton && $contextpage != 'poslist') {
+		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+	}
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -781,22 +989,19 @@ if ($resql)
 		print '</td>';
 	}
 	// Ref
-	if (!empty($arrayfields['f.ref']['checked']))
-	{
+	if (!empty($arrayfields['f.ref']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat maxwidth50imp" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	// Ref customer
-	if (!empty($arrayfields['f.ref_client']['checked']))
-	{
+	if (!empty($arrayfields['f.ref_client']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50imp" type="text" name="search_refcustomer" value="'.dol_escape_htmltag($search_refcustomer).'">';
 		print '</td>';
 	}
 	// Type
-	if (!empty($arrayfields['f.type']['checked']))
-	{
+	if (!empty($arrayfields['f.type']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone">';
 		$listtype = array(
 			Facture::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
@@ -804,8 +1009,7 @@ if ($resql)
 			Facture::TYPE_CREDIT_NOTE=>$langs->trans("InvoiceAvoir"),
 			Facture::TYPE_DEPOSIT=>$langs->trans("InvoiceDeposit"),
 		);
-		if (!empty($conf->global->INVOICE_USE_SITUATION))
-		{
+		if (!empty($conf->global->INVOICE_USE_SITUATION)) {
 			$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
 		}
 		//$listtype[Facture::TYPE_PROFORMA]=$langs->trans("InvoiceProForma");     // A proformat invoice is not an invoice but must be an order.
@@ -813,8 +1017,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date invoice
-	if (!empty($arrayfields['f.date']['checked']))
-	{
+	if (!empty($arrayfields['f.date']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -825,8 +1028,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date valid
-	if (!empty($arrayfields['f.date_valid']['checked']))
-	{
+	if (!empty($arrayfields['f.date_valid']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $form->selectDate($search_date_valid_start ? $search_date_valid_start : -1, 'search_date_valid_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -837,8 +1039,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date due
-	if (!empty($arrayfields['f.date_lim_reglement']['checked']))
-	{
+	if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		/*
@@ -853,202 +1054,174 @@ if ($resql)
 		print '</td>';
 	}
 	// Project ref
-	if (!empty($arrayfields['p.ref']['checked']))
-	{
+	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td class="liste_titre"><input class="flat maxwidth50imp" type="text" name="search_project_ref" value="'.$search_project_ref.'"></td>';
 	}
 	// Project label
-	if (!empty($arrayfields['p.title']['checked']))
-	{
+	if (!empty($arrayfields['p.title']['checked'])) {
 		print '<td class="liste_titre"><input class="flat maxwidth50imp" type="text" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirdparty
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_societe" value="'.$search_societe.'"></td>';
 	}
 	// Alias
-	if (!empty($arrayfields['s.name_alias']['checked']))
-	{
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
 		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_societe_alias" value="'.$search_societe_alias.'"></td>';
 	}
 	// Town
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+	}
 	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50imp" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print '<td class="liste_titre"><input class="flat maxwidth50imp" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50imp" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 		print '</td>';
 	}
 	// Company type
-	if (!empty($arrayfields['typent.code']['checked']))
-	{
+	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'maxwidth100', 1);
 		print '</td>';
 	}
 	// Payment mode
-	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
-	{
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10);
 		print '</td>';
 	}
 	// Payment terms
-	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
-	{
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->select_conditions_paiements($search_paymentterms, 'search_paymentterms', -1, 1, 1);
 		print '</td>';
 	}
 	// Module source
-	if (!empty($arrayfields['f.module_source']['checked']))
-	{
+	if (!empty($arrayfields['f.module_source']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth75" type="text" name="search_module_source" value="'.dol_escape_htmltag($search_module_source).'">';
 		print '</td>';
 	}
 	// POS Terminal
-	if (!empty($arrayfields['f.pos_source']['checked']))
-	{
+	if (!empty($arrayfields['f.pos_source']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_pos_source" value="'.dol_escape_htmltag($search_pos_source).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_ht']['checked']))
-	{
+	if (!empty($arrayfields['f.total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_vat']['checked']))
-	{
+	if (!empty($arrayfields['f.total_vat']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_localtax1']['checked']))
-	{
+	if (!empty($arrayfields['f.total_localtax1']['checked'])) {
 		// Localtax1
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_localtax2']['checked']))
-	{
+	if (!empty($arrayfields['f.total_localtax2']['checked'])) {
 		// Localtax2
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['f.total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['u.login']['checked']))
-	{
+	if (!empty($arrayfields['u.login']['checked'])) {
 		// Author
 		print '<td class="liste_titre" align="center">';
 		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.retained_warranty']['checked']))
-	{
+	if (!empty($arrayfields['f.retained_warranty']['checked'])) {
 		print '<td class="liste_titre" align="right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['dynamount_payed']['checked']))
-	{
+	if (!empty($arrayfields['dynamount_payed']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['rtp']['checked']))
-	{
+	if (!empty($arrayfields['rtp']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_code']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
 		// Currency
 		print '<td class="liste_titre">';
 		print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_tx']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
 		// Currency rate
 		print '<td class="liste_titre">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_tx" value="'.dol_escape_htmltag($search_multicurrency_tx).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_total_ht']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ht" value="'.dol_escape_htmltag($search_multicurrency_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_vat" value="'.dol_escape_htmltag($search_multicurrency_montant_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked']))
-	{
+	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['multicurrency_rtp']['checked']))
-	{
+	if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.date_closing']['checked']))
-	{
+	if (!empty($arrayfields['f.date_closing']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['total_pa']['checked']))
-	{
+	if (!empty($arrayfields['total_pa']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['total_margin']['checked']))
-	{
+	if (!empty($arrayfields['total_margin']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['total_margin_rate']['checked']))
-	{
+	if (!empty($arrayfields['total_margin_rate']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['total_mark_rate']['checked']))
-	{
+	if (!empty($arrayfields['total_mark_rate']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
@@ -1061,32 +1234,27 @@ if ($resql)
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['f.datec']['checked']))
-	{
+	if (!empty($arrayfields['f.datec']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['f.tms']['checked']))
-	{
+	if (!empty($arrayfields['f.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.note_public']['checked']))
-	{
+	if (!empty($arrayfields['f.note_public']['checked'])) {
 		// Note public
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.note_private']['checked']))
-	{
+	if (!empty($arrayfields['f.note_private']['checked'])) {
 		// Note private
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['f.fk_statut']['checked']))
-	{
+	if (!empty($arrayfields['f.fk_statut']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone right">';
 		$liststatus = array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
 		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
@@ -1100,58 +1268,150 @@ if ($resql)
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))    		  print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.ref']['checked']))                         print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER['PHP_SELF'], 'f.ref', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.ref_client']['checked']))                  print_liste_field_titre($arrayfields['f.ref_client']['label'], $_SERVER["PHP_SELF"], 'f.ref_client', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.type']['checked']))                        print_liste_field_titre($arrayfields['f.type']['label'], $_SERVER["PHP_SELF"], 'f.type', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.date']['checked']))                        print_liste_field_titre($arrayfields['f.date']['label'], $_SERVER['PHP_SELF'], 'f.datef', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.date_valid']['checked']))                  print_liste_field_titre($arrayfields['f.date_valid']['label'], $_SERVER['PHP_SELF'], 'f.date_valid', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.date_lim_reglement']['checked']))          print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'], $_SERVER['PHP_SELF'], "f.date_lim_reglement", '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.ref']['checked']))                         print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER['PHP_SELF'], "p.ref", '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['p.title']['checked']))                       print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER['PHP_SELF'], "p.title", '', $param, '', $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['s.name_alias']['checked']))                  print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER['PHP_SELF'], 's.name_alias', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.town']['checked']))                        print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.zip']['checked']))                         print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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['typent.code']['checked']))                   print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))           print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
-	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))           print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_cond_reglement", "", $param, "", $sortfield, $sortorder);
-	if (!empty($arrayfields['f.module_source']['checked']))               print_liste_field_titre($arrayfields['f.module_source']['label'], $_SERVER["PHP_SELF"], "f.module_source", "", $param, "", $sortfield, $sortorder);
-	if (!empty($arrayfields['f.pos_source']['checked']))                  print_liste_field_titre($arrayfields['f.pos_source']['label'], $_SERVER["PHP_SELF"], "f.pos_source", "", $param, "", $sortfield, $sortorder);
-	if (!empty($arrayfields['f.total_ht']['checked']))                    print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.total_vat']['checked']))                   print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.total_localtax1']['checked']))             print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.total_localtax2']['checked']))             print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.total_ttc']['checked']))                   print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['u.login']['checked']))                       print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.retained_warranty']['checked']))           print_liste_field_titre($arrayfields['f.retained_warranty']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['dynamount_payed']['checked']))               print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['rtp']['checked']))                           print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.multicurrency_code']['checked']))          print_liste_field_titre($arrayfields['f.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_code', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.multicurrency_tx']['checked']))            print_liste_field_titre($arrayfields['f.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.multicurrency_total_ht']['checked']))      print_liste_field_titre($arrayfields['f.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))     print_liste_field_titre($arrayfields['f.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['multicurrency_rtp']['checked']))             print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['total_pa']['checked']))					  print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['total_margin']['checked']))                  print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['total_margin_rate']['checked']))             print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['total_mark_rate']['checked']))               print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER['PHP_SELF'], 'f.ref', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.ref_client']['checked'])) {
+		print_liste_field_titre($arrayfields['f.ref_client']['label'], $_SERVER["PHP_SELF"], 'f.ref_client', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.type']['checked'])) {
+		print_liste_field_titre($arrayfields['f.type']['label'], $_SERVER["PHP_SELF"], 'f.type', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.date']['checked'])) {
+		print_liste_field_titre($arrayfields['f.date']['label'], $_SERVER['PHP_SELF'], 'f.datef', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.date_valid']['checked'])) {
+		print_liste_field_titre($arrayfields['f.date_valid']['label'], $_SERVER['PHP_SELF'], 'f.date_valid', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'], $_SERVER['PHP_SELF'], "f.date_lim_reglement", '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER['PHP_SELF'], "p.ref", '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.title']['checked'])) {
+		print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER['PHP_SELF'], "p.title", '', $param, '', $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['s.name_alias']['checked'])) {
+		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER['PHP_SELF'], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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['typent.code']['checked'])) {
+		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_cond_reglement", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.module_source']['checked'])) {
+		print_liste_field_titre($arrayfields['f.module_source']['label'], $_SERVER["PHP_SELF"], "f.module_source", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.pos_source']['checked'])) {
+		print_liste_field_titre($arrayfields['f.pos_source']['label'], $_SERVER["PHP_SELF"], "f.pos_source", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.total_localtax1']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.total_localtax2']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['u.login']['checked'])) {
+		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.retained_warranty']['checked'])) {
+		print_liste_field_titre($arrayfields['f.retained_warranty']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'align="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['dynamount_payed']['checked'])) {
+		print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['rtp']['checked'])) {
+		print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
+		print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
+		print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_pa']['checked'])) {
+		print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_margin']['checked'])) {
+		print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_margin_rate']['checked'])) {
+		print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['total_mark_rate']['checked'])) {
+		print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
 	// 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); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (!empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.date_closing']['checked']))       print_liste_field_titre($arrayfields['f.date_closing']['label'], $_SERVER["PHP_SELF"], "f.date_closing", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.note_public']['checked']))       print_liste_field_titre($arrayfields['f.note_public']['label'], $_SERVER["PHP_SELF"], "f.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['f.note_private']['checked']))       print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.date_closing']['checked'])) {
+		print_liste_field_titre($arrayfields['f.date_closing']['label'], $_SERVER["PHP_SELF"], "f.date_closing", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.note_public']['checked'])) {
+		print_liste_field_titre($arrayfields['f.note_public']['label'], $_SERVER["PHP_SELF"], "f.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['f.note_private']['checked'])) {
+		print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['f.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'class="right"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -1159,12 +1419,10 @@ if ($resql)
 	$discount = new DiscountAbsolute($db);
 	$userstatic = new User($db);
 
-	if ($num > 0)
-	{
+	if ($num > 0) {
 		$i = 0;
 		$totalarray = array();
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 
 			$datelimit = $db->jdate($obj->datelimite);
@@ -1193,8 +1451,7 @@ if ($resql)
 
 			$facturestatic->note_public = $obj->note_public;
 			$facturestatic->note_private = $obj->note_private;
-			if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY)
-			{
+			if ($conf->global->INVOICE_USE_SITUATION && $conf->global->INVOICE_USE_RETAINED_WARRANTY) {
 				 $facturestatic->retained_warranty = $obj->retained_warranty;
 				 $facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
 				 $facturestatic->situation_final = $obj->retained_warranty_date_limit;
@@ -1250,8 +1507,7 @@ if ($resql)
 			}
 
 			print '<tr class="oddeven"';
-			if ($contextpage == 'poslist')
-			{
+			if ($contextpage == 'poslist') {
 				print ' onclick="parent.$(\'#poslines\').load(\'invoice.php?action=history&placeid='.$obj->id.'\', function() {parent.$.colorbox.close();});"';
 			}
 			print '>';
@@ -1262,15 +1518,13 @@ if ($resql)
 			}
 
 			// Ref
-			if (!empty($arrayfields['f.ref']['checked']))
-			{
+			if (!empty($arrayfields['f.ref']['checked'])) {
 				print '<td class="nowraponall">';
 
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
 
 				print '<td class="nobordernopadding nowraponall">';
-				if ($contextpage == 'poslist')
-				{
+				if ($contextpage == 'poslist') {
 					print $obj->ref;
 				} else {
 					print $facturestatic->getNomUrl(1, '', 200, 0, '', 0, 1);
@@ -1285,339 +1539,397 @@ if ($resql)
 				print '</table>';
 
 				print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Customer ref
-			if (!empty($arrayfields['f.ref_client']['checked']))
-			{
+			if (!empty($arrayfields['f.ref_client']['checked'])) {
 				print '<td class="nowrap tdoverflowmax200">';
 				print $obj->ref_client;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Type
-			if (!empty($arrayfields['f.type']['checked']))
-			{
+			if (!empty($arrayfields['f.type']['checked'])) {
 				print '<td class="nowraponall tdoverflowmax100" title="'.$facturestatic->getLibType().'">';
 				print $facturestatic->getLibType();
 				print "</td>";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Date
-			if (!empty($arrayfields['f.date']['checked']))
-			{
+			if (!empty($arrayfields['f.date']['checked'])) {
 				print '<td align="center" class="nowraponall">';
 				print dol_print_date($db->jdate($obj->df), 'day');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Date
-			if (!empty($arrayfields['f.date_valid']['checked']))
-			{
+			if (!empty($arrayfields['f.date_valid']['checked'])) {
 				print '<td align="center" class="nowraponall">';
 				print dol_print_date($db->jdate($obj->date_valid), 'day');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Date limit
-			if (!empty($arrayfields['f.date_lim_reglement']['checked']))
-			{
+			if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
 				print '<td align="center" class="nowraponall">'.dol_print_date($datelimit, 'day');
-				if ($facturestatic->hasDelay())
-				{
+				if ($facturestatic->hasDelay()) {
 					print img_warning($langs->trans('Alert').' - '.$langs->trans('Late'));
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Project ref
-			if (!empty($arrayfields['p.ref']['checked']))
-			{
+			if (!empty($arrayfields['p.ref']['checked'])) {
 				print '<td class="nocellnopadd nowraponall">';
-				if ($obj->project_id > 0)
-				{
+				if ($obj->project_id > 0) {
 					print $projectstatic->getNomUrl(1);
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Project title
-			if (!empty($arrayfields['p.title']['checked']))
-			{
+			if (!empty($arrayfields['p.title']['checked'])) {
 				print '<td class="nowraponall">';
-				if ($obj->project_id > 0)
-				{
+				if ($obj->project_id > 0) {
 					print $projectstatic->title;
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Third party
-			if (!empty($arrayfields['s.nom']['checked']))
-			{
+			if (!empty($arrayfields['s.nom']['checked'])) {
 				print '<td class="tdoverflowmax200">';
-				if ($contextpage == 'poslist')
-				{
+				if ($contextpage == 'poslist') {
 					print $thirdpartystatic->name;
 				} else {
 					print $thirdpartystatic->getNomUrl(1, 'customer');
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Alias
-			if (!empty($arrayfields['s.name_alias']['checked']))
-			{
+			if (!empty($arrayfields['s.name_alias']['checked'])) {
 				print '<td class="tdoverflowmax150" title="'.$obj->name_alias.'">';
 				print $obj->name_alias;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Town
-			if (!empty($arrayfields['s.town']['checked']))
-			{
+			if (!empty($arrayfields['s.town']['checked'])) {
 				print '<td>';
 				print $obj->town;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Zip
-			if (!empty($arrayfields['s.zip']['checked']))
-			{
+			if (!empty($arrayfields['s.zip']['checked'])) {
 				print '<td class="nowraponall">';
 				print $obj->zip;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// State
-			if (!empty($arrayfields['state.nom']['checked']))
-			{
+			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']))
-			{
+			if (!empty($arrayfields['country.code_iso']['checked'])) {
 				print '<td class="center">';
 				$tmparray = getCountry($obj->fk_pays, 'all');
 				print $tmparray['label'];
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Type ent
-			if (!empty($arrayfields['typent.code']['checked']))
-			{
+			if (!empty($arrayfields['typent.code']['checked'])) {
 				print '<td class="center">';
-				if (!is_array($typenArray) || count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
+				if (!is_array($typenArray) || count($typenArray) == 0) {
+					$typenArray = $formcompany->typent_array(1);
+				}
 				print $typenArray[$obj->typent_code];
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Staff
-			if (!empty($arrayfields['staff.code']['checked']))
-			{
+			if (!empty($arrayfields['staff.code']['checked'])) {
 				print '<td class="center">';
-				if (!is_array($staffArray) || count($staffArray) == 0) $staffArray = $formcompany->effectif_array(1);
+				if (!is_array($staffArray) || count($staffArray) == 0) {
+					$staffArray = $formcompany->effectif_array(1);
+				}
 				print $staffArray[$obj->staff_code];
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Payment mode
-			if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
-			{
+			if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 				print '<td class="tdoverflowmax100">';
 				$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Payment terms
-			if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
-			{
+			if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 				print '<td>';
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Module Source
-			if (!empty($arrayfields['f.module_source']['checked']))
-			{
+			if (!empty($arrayfields['f.module_source']['checked'])) {
 				print '<td>';
 				print $obj->module_source;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// POS Terminal
-			if (!empty($arrayfields['f.pos_source']['checked']))
-			{
+			if (!empty($arrayfields['f.pos_source']['checked'])) {
 				print '<td>';
 				print $obj->pos_source;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Amount HT
-			if (!empty($arrayfields['f.total_ht']['checked']))
-			{
+			if (!empty($arrayfields['f.total_ht']['checked'])) {
 				  print '<td class="right nowraponall">'.price($obj->total_ht)."</td>\n";
-				  if (!$i) $totalarray['nbfield']++;
-				  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
+				}
 				  $totalarray['val']['f.total_ht'] += $obj->total_ht;
 			}
 			// Amount VAT
-			if (!empty($arrayfields['f.total_vat']['checked']))
-			{
+			if (!empty($arrayfields['f.total_vat']['checked'])) {
 				print '<td class="right nowraponall">'.price($obj->total_vat)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
+				}
 				$totalarray['val']['f.total_vat'] += $obj->total_vat;
 			}
 			// Amount LocalTax1
-			if (!empty($arrayfields['f.total_localtax1']['checked']))
-			{
+			if (!empty($arrayfields['f.total_localtax1']['checked'])) {
 				print '<td class="right nowraponall">'.price($obj->total_localtax1)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
+				}
 				$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
 			}
 			// Amount LocalTax2
-			if (!empty($arrayfields['f.total_localtax2']['checked']))
-			{
+			if (!empty($arrayfields['f.total_localtax2']['checked'])) {
 				print '<td class="right nowraponall">'.price($obj->total_localtax2)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
+				}
 				$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
 			}
 			// Amount TTC
-			if (!empty($arrayfields['f.total_ttc']['checked']))
-			{
+			if (!empty($arrayfields['f.total_ttc']['checked'])) {
 				print '<td class="right nowraponall">'.price($obj->total_ttc)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				}
 				$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
 			}
 
 			// Author
-			if (!empty($arrayfields['u.login']['checked']))
-			{
+			if (!empty($arrayfields['u.login']['checked'])) {
 				$userstatic->id = $obj->fk_user_author;
 				$userstatic->login = $obj->login;
 				print '<td class="center tdoverflowmax100">';
-				if ($userstatic->id) print $userstatic->getLoginUrl(1);
-				else print '&nbsp;';
+				if ($userstatic->id) {
+					print $userstatic->getLoginUrl(1);
+				} else {
+					print '&nbsp;';
+				}
 				print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
-			if (!empty($arrayfields['f.retained_warranty']['checked']))
-			{
+			if (!empty($arrayfields['f.retained_warranty']['checked'])) {
 				print '<td align="right">'.(!empty($obj->retained_warranty) ?price($obj->retained_warranty).'%' : '&nbsp;').'</td>';
 			}
 
-			if (!empty($arrayfields['dynamount_payed']['checked']))
-			{
+			if (!empty($arrayfields['dynamount_payed']['checked'])) {
 				print '<td class="right nowraponall">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalam';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
+				}
 				$totalarray['val']['totalam'] += $totalpay;
 			}
 
 			// Pending amount
-			if (!empty($arrayfields['rtp']['checked']))
-			{
+			if (!empty($arrayfields['rtp']['checked'])) {
 				print '<td class="right nowraponall">';
 				print (!empty($remaintopay) ? price($remaintopay, 0, $langs) : '&nbsp;');
 				print '</td>'; // TODO Use a denormalized field
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'rtp';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'rtp';
+				}
 				$totalarray['val']['rtp'] += $remaintopay;
 			}
 
 
 			// Currency
-			if (!empty($arrayfields['f.multicurrency_code']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
 				  print '<td class="nowraponall">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-				  if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Currency rate
-			if (!empty($arrayfields['f.multicurrency_tx']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
 				  print '<td class="nowraponall">';
 				  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
 				  print "</td>\n";
-				  if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Amount HT
-			if (!empty($arrayfields['f.multicurrency_total_ht']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
 				  print '<td class="right nowraponall">'.price($obj->multicurrency_total_ht)."</td>\n";
-				  if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Amount VAT
-			if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
 				print '<td class="right nowraponall">'.price($obj->multicurrency_total_vat)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Amount TTC
-			if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
 				print '<td class="right nowraponall">'.price($obj->multicurrency_total_ttc)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked']))
-			{
+			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
 				print '<td class="right nowraponall">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Pending amount
-			if (!empty($arrayfields['multicurrency_rtp']['checked']))
-			{
+			if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
 				print '<td class="right nowraponall">';
 				print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
 				print '</td>'; // TODO Use a denormalized field
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Total buying or cost price
-			if (!empty($arrayfields['total_pa']['checked']))
-			{
+			if (!empty($arrayfields['total_pa']['checked'])) {
 				print '<td class="right nowrap">'.price($marginInfo['pa_total']).'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Total margin
-			if (!empty($arrayfields['total_margin']['checked']))
-			{
+			if (!empty($arrayfields['total_margin']['checked'])) {
 				print '<td class="right nowrap">'.price($marginInfo['total_margin']).'</td>';
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
+				}
 				$totalarray['val']['total_margin'] += $marginInfo['total_margin'];
 			}
 			// Total margin rate
-			if (!empty($arrayfields['total_margin_rate']['checked']))
-			{
+			if (!empty($arrayfields['total_margin_rate']['checked'])) {
 				print '<td class="right nowrap">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// total mark rate
-			if (!empty($arrayfields['total_mark_rate']['checked']))
-			{
+			if (!empty($arrayfields['total_mark_rate']['checked'])) {
 				print '<td class="right nowrap">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Extra fields
@@ -1627,64 +1939,73 @@ if ($resql)
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
-			if (!empty($arrayfields['f.datec']['checked']))
-			{
+			if (!empty($arrayfields['f.datec']['checked'])) {
 				print '<td align="center" class="nowrap">';
 				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['f.tms']['checked']))
-			{
+			if (!empty($arrayfields['f.tms']['checked'])) {
 				print '<td align="center" class="nowrap">';
 				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Date closing
-			if (!empty($arrayfields['f.date_closing']['checked']))
-			{
+			if (!empty($arrayfields['f.date_closing']['checked'])) {
 				print '<td align="center" class="nowrap">';
 				print dol_print_date($db->jdate($obj->date_closing), 'dayhour', 'tzuser');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Note public
-			if (!empty($arrayfields['f.note_public']['checked']))
-			{
+			if (!empty($arrayfields['f.note_public']['checked'])) {
 				print '<td class="center">';
 				print dol_escape_htmltag($obj->note_public);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Note private
-			if (!empty($arrayfields['f.note_private']['checked']))
-			{
+			if (!empty($arrayfields['f.note_private']['checked'])) {
 				print '<td class="center">';
 				print dol_escape_htmltag($obj->note_private);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Status
-			if (!empty($arrayfields['f.fk_statut']['checked']))
-			{
+			if (!empty($arrayfields['f.fk_statut']['checked'])) {
 				print '<td class="nowrap right">';
 				print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
 				print "</td>";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Action column (Show the massaction button only when this page is not opend from the Extended POS)
 			print '<td class="nowrap" align="center">';
-			if (($massactionbutton || $massaction) && $contextpage != 'poslist')   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			{
+			if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // 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>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 
 			print "</tr>\n";
 
@@ -1709,7 +2030,9 @@ if ($resql)
 	// Show the file area only when this page is not opend from the Extended POS
 	if ($contextpage != 'poslist') {
 		$hidegeneratedfilelistifempty = 1;
-		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+			$hidegeneratedfilelistifempty = 0;
+		}
 
 		// Show list of available documents
 		$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index aa3bd40c591..23d4afb0417 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -43,7 +43,9 @@ $action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = 0;
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'facture', $id, '');
 
 $object = new Facture($db);
@@ -70,8 +72,7 @@ llxHeader('', $title, $helpurl);
 
 $form = new Form($db);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object = new Facture($db);
 	$object->fetch($id, $ref);
 
@@ -94,15 +95,14 @@ if ($id > 0 || !empty($ref))
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->facture->creer)
-		{
-			if ($action != 'classify')
+		if ($user->rights->facture->creer) {
+			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
+			}
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index 26bab3c1984..b6cf7ec5c06 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -48,7 +48,9 @@ $action = GETPOST('action', 'aZ09');
 $type = GETPOST('type', 'aZ09');
 
 $fieldid = (!empty($ref) ? 'ref' : 'rowid');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 
 if ($type == 'bank-transfer') {
 	$object = new FactureFournisseur($db);
@@ -57,12 +59,10 @@ if ($type == 'bank-transfer') {
 }
 
 // Load object
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref);
 	$isdraft = (($object->statut == FactureFournisseur::STATUS_DRAFT) ? 1 : 0);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$object->fetch_thirdparty();
 	}
 }
@@ -71,10 +71,14 @@ $hookmanager->initHooks(array('directdebitcard', 'globalcard'));
 
 if ($type == 'bank-transfer') {
 	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', 'fk_soc', $fieldid, $isdraft);
-	if (!$user->rights->fournisseur->facture->lire) accessforbidden();
+	if (!$user->rights->fournisseur->facture->lire) {
+		accessforbidden();
+	}
 } else {
 	$result = restrictedArea($user, 'facture', $id, '', '', 'fk_soc', $fieldid, $isdraft);
-	if (!$user->rights->facture->lire) accessforbidden();
+	if (!$user->rights->facture->lire) {
+		accessforbidden();
+	}
 }
 
 
@@ -84,14 +88,13 @@ if ($type == 'bank-transfer') {
 
 $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))
-{
-	if ($action == "new")
-	{
-		if ($object->id > 0)
-		{
+if (empty($reshook)) {
+	if ($action == "new") {
+		if ($object->id > 0) {
 			$db->begin();
 
 			$newtype = $type;
@@ -102,8 +105,7 @@ if (empty($reshook))
 			}
 
 			$result = $object->demande_prelevement($user, price2num(GETPOST('withdraw_request_amount', 'alpha')), $newtype, $sourcetype);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$db->commit();
 
 				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
@@ -115,13 +117,10 @@ if (empty($reshook))
 		$action = '';
 	}
 
-	if ($action == "delete")
-	{
-		if ($object->id > 0)
-		{
+	if ($action == "delete") {
+		if ($object->id > 0) {
 			$result = $object->demande_prelevement_delete($user, GETPOST('did', 'int'));
-			if ($result == 0)
-			{
+			if ($result == 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id.'&type='.$type);
 				exit;
 			}
@@ -155,8 +154,7 @@ llxHeader('', $title, $helpurl);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$selleruserevenustamp = $mysoc->useRevenueStamp();
 
 	$totalpaye = $object->getSommePaiement();
@@ -170,7 +168,9 @@ if ($object->id > 0)
 	//$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
 	$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
 
-	if ($object->paye) $resteapayer = 0;
+	if ($object->paye) {
+		$resteapayer = 0;
+	}
 	$resteapayeraffiche = $resteapayer;
 
 	if ($type == 'bank-transfer') {
@@ -202,8 +202,7 @@ if ($object->id > 0)
 	}
 
 	$author = new User($db);
-	if ($object->user_author)
-	{
+	if ($object->user_author) {
 		$author->fetch($object->user_author);
 	}
 
@@ -234,17 +233,19 @@ if ($object->id > 0)
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	if ($type == 'bank-transfer') {
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		}
 	} else {
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		}
 	}
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->facture->creer)
-		{
+		if ($user->rights->facture->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
@@ -293,8 +294,7 @@ if ($object->id > 0)
 	if ($object->module_source) {
 		print ' <span class="opacitymediumbycolor">('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
 	}
-	if ($object->type == $object::TYPE_REPLACEMENT)
-	{
+	if ($object->type == $object::TYPE_REPLACEMENT) {
 		if ($type == 'bank-transfer') {
 			$facreplaced = new FactureFournisseur($db);
 		} else {
@@ -303,8 +303,7 @@ if ($object->id > 0)
 		$facreplaced->fetch($object->fk_facture_source);
 		print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
 	}
-	if ($object->type == $object::TYPE_CREDIT_NOTE)
-	{
+	if ($object->type == $object::TYPE_CREDIT_NOTE) {
 		if ($type == 'bank-transfer') {
 			$facusing = new FactureFournisseur($db);
 		} else {
@@ -315,14 +314,15 @@ if ($object->id > 0)
 	}
 
 	$facidavoir = $object->getListIdAvoirFromInvoice();
-	if (count($facidavoir) > 0)
-	{
+	if (count($facidavoir) > 0) {
 		print ' ('.$langs->transnoentities("InvoiceHasAvoir");
 		$i = 0;
-		foreach ($facidavoir as $id)
-		{
-			if ($i == 0) print ' ';
-			else print ',';
+		foreach ($facidavoir as $id) {
+			if ($i == 0) {
+				print ' ';
+			} else {
+				print ',';
+			}
 			if ($type == 'bank-transfer') {
 				$facavoir = new FactureFournisseur($db);
 			} else {
@@ -374,14 +374,14 @@ if ($object->id > 0)
 	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('DateInvoice');
 	print '</td>';
-	if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $user->rights->facture->creer) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 
-	if ($object->type != $object::TYPE_CREDIT_NOTE)
-	{
-		if ($action == 'editinvoicedate')
-		{
+	if ($object->type != $object::TYPE_CREDIT_NOTE) {
+		if ($action == 'editinvoicedate') {
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $object->date, 'invoicedate');
 		} else {
 			print dol_print_date($object->date, 'day');
@@ -397,13 +397,13 @@ if ($object->id > 0)
 	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editconditions' && !empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editconditions' && !empty($object->brouillon) && $user->rights->facture->creer) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
-	if ($object->type != $object::TYPE_CREDIT_NOTE)
-	{
-		if ($action == 'editconditions')
-		{
+	if ($object->type != $object::TYPE_CREDIT_NOTE) {
+		if ($action == 'editconditions') {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		} else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
@@ -418,18 +418,18 @@ if ($object->id > 0)
 	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('DateMaxPayment');
 	print '</td>';
-	if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && !empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	if ($object->type != $object::TYPE_CREDIT_NOTE && $action != 'editpaymentterm' && !empty($object->brouillon) && $user->rights->facture->creer) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editpaymentterm&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
-	if ($object->type != $object::TYPE_CREDIT_NOTE)
-	{
+	if ($object->type != $object::TYPE_CREDIT_NOTE) {
 		$duedate = $object->date_lim_reglement;
 		if ($type == 'bank-transfer') {
 			$duedate = $object->date_echeance;
 		}
 
-		if ($action == 'editpaymentterm')
-		{
+		if ($action == 'editpaymentterm') {
 			$form->form_date($_SERVER['PHP_SELF'].'?id='.$object->id, $duedate, 'paymentterm');
 		} else {
 			print dol_print_date($duedate, 'day');
@@ -447,11 +447,12 @@ if ($object->id > 0)
 	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && !empty($object->brouillon) && $user->rights->facture->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	if ($action != 'editmode' && !empty($object->brouillon) && $user->rights->facture->creer) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
-	if ($action == 'editmode')
-	{
+	if ($action == 'editmode') {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id');
 	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
@@ -463,12 +464,12 @@ if ($object->id > 0)
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans('BankAccount');
 	print '<td>';
-	if (($action != 'editbankaccount') && $user->rights->commande->creer && !empty($object->brouillon))
+	if (($action != 'editbankaccount') && $user->rights->commande->creer && !empty($object->brouillon)) {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td colspan="3">';
-	if ($action == 'editbankaccount')
-	{
+	if ($action == 'editbankaccount') {
 		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'fk_account', 1);
 	} else {
 		$form->formSelectAccount($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_account, 'none');
@@ -487,7 +488,9 @@ if ($object->id > 0)
 
 	print $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
 	if (!empty($bac->iban)) {
-		if ($bac->verif() <= 0) print img_warning('Error on default bank number for IBAN : '.$bac->error_message);
+		if ($bac->verif() <= 0) {
+			print img_warning('Error on default bank number for IBAN : '.$bac->error_message);
+		}
 	} else {
 		print img_warning($langs->trans("NoDefaultIBANFound"));
 	}
@@ -503,8 +506,7 @@ if ($object->id > 0)
 
 	print '<table class="border centpercent tableforfield">';
 
-	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
-	{
+	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
 		print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -530,31 +532,27 @@ if ($object->id > 0)
 	print '</tr>';
 
 	// Amount Local Taxes
-	if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) 	// Localtax1
-	{
+	if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) { 	// Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td class="nowrap">'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
-	if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) 	// Localtax2
-	{
+	if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) { 	// Localtax2
 		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td class=nowrap">'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
 
 	// Revenue stamp
-	if ($selleruserevenustamp) 	// Test company use revenue stamp
-	{
+	if ($selleruserevenustamp) { 	// Test company use revenue stamp
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('RevenueStamp');
 		print '</td>';
-		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $user->rights->facture->creer)
-		{
+		if ($action != 'editrevenuestamp' && !empty($object->brouillon) && $user->rights->facture->creer) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrevenuestamp&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetRevenuStamp'), 1).'</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
-	   	print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
+		print price($object->revenuestamp, 1, '', 1, - 1, - 1, $conf->currency);
 		print '</td></tr>';
 	}
 
@@ -597,8 +595,7 @@ if ($object->id > 0)
 	$sql .= " ORDER BY pfd.date_demande DESC";
 
 	$result_sql = $db->query($sql);
-	if ($result_sql)
-	{
+	if ($result_sql) {
 		$num = $db->num_rows($result_sql);
 		$numopen = $num;
 	} else {
@@ -618,10 +615,11 @@ if ($object->id > 0)
 	$sql .= " AND pfd.ext_payment_id IS NULL";
 
 	$result_sql = $db->query($sql);
-	if ($result_sql)
-	{
+	if ($result_sql) {
 		$obj = $db->fetch_object($result_sql);
-		if ($obj) $pending = $obj->amount;
+		if ($obj) {
+			$pending = $obj->amount;
+		}
 	} else {
 		dol_print_error($db);
 	}
@@ -641,12 +639,9 @@ if ($object->id > 0)
 	}
 
 	// Add a transfer request
-	if ($object->statut > $object::STATUS_DRAFT && $object->paye == 0 && $num == 0)
-	{
-		if ($resteapayer > 0)
-		{
-			if ($user_perms)
-			{
+	if ($object->statut > $object::STATUS_DRAFT && $object->paye == 0 && $num == 0) {
+		if ($resteapayer > 0) {
+			if ($user_perms) {
 				$remaintopaylesspendingdebit = $resteapayer - $pending;
 
 				print '<form method="POST" action="">';
@@ -665,10 +660,12 @@ if ($object->id > 0)
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AmountMustBePositive")).'">'.$buttonlabel.'</a>';
 		}
 	} else {
-		if ($num == 0)
-		{
-			if ($object->statut > $object::STATUS_DRAFT) print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AlreadyPaid")).'">'.$buttonlabel.'</a>';
-			else print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("Draft")).'">'.$buttonlabel.'</a>';
+		if ($num == 0) {
+			if ($object->statut > $object::STATUS_DRAFT) {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("AlreadyPaid")).'">'.$buttonlabel.'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("Draft")).'">'.$buttonlabel.'</a>';
+			}
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("RequestAlreadyDone")).'">'.$buttonlabel.'</a>';
 		}
@@ -722,15 +719,13 @@ if ($object->id > 0)
 	$result_sql = $db->query($sql);
 
 	$num = 0;
-	if ($result_sql)
-	{
+	if ($result_sql) {
 		$i = 0;
 
 		$tmpuser = new User($db);
 
 		$num = $db->num_rows($result);
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result_sql);
 
 			$tmpuser->id = $obj->user_id;
@@ -788,16 +783,14 @@ if ($object->id > 0)
 	$sql .= " ORDER BY pfd.date_demande DESC";
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$numclosed = $num;
 		$i = 0;
 
 		$tmpuser = new User($db);
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 
 			$tmpuser->id = $obj->user_id;
@@ -819,8 +812,7 @@ if ($object->id > 0)
 			print '<td class="center">'.price($obj->amount).'</td>';
 
 			print '<td class="center">';
-			if ($obj->fk_prelevement_bons > 0)
-			{
+			if ($obj->fk_prelevement_bons > 0) {
 				$withdrawreceipt = new BonPrelevement($db);
 				$withdrawreceipt->id = $obj->fk_prelevement_bons;
 				$withdrawreceipt->ref = $obj->ref;
@@ -838,8 +830,9 @@ if ($object->id > 0)
 			$i++;
 		}
 
-		if (!$numopen && !$numclosed)
+		if (!$numopen && !$numclosed) {
 			print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
 
 		$db->free($result);
 	} else {
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 2a722f8723d..536beff168d 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -32,7 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
-if (!empty($conf->category->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+if (!empty($conf->category->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
@@ -41,8 +43,12 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 $langs->loadLangs(array('bills', 'companies', 'other'));
 
 $mode = GETPOST("mode") ?GETPOST("mode") : 'customer';
-if ($mode == 'customer' && !$user->rights->facture->lire) accessforbidden();
-if ($mode == 'supplier' && !$user->rights->fournisseur->facture->lire) accessforbidden();
+if ($mode == 'customer' && !$user->rights->facture->lire) {
+	accessforbidden();
+}
+if ($mode == 'supplier' && !$user->rights->fournisseur->facture->lire) {
+	accessforbidden();
+}
 
 $object_status = GETPOST('object_status', 'intcomma');
 $typent_id = GETPOST('typent_id', 'int');
@@ -52,23 +58,27 @@ $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 $custcats = GETPOST('custcats', 'array');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
 
 $nowyear = strftime("%Y", dol_now());
 $year = GETPOST('year') > 0 ? GETPOST('year', 'int') : $nowyear;
-if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) $startyear = $year - 2;
-else $startyear = $year - 1;
+if (!empty($conf->global->INVOICE_STATS_GRAPHS_SHOW_2_YEARS)) {
+	$startyear = $year - 2;
+} else {
+	$startyear = $year - 1;
+}
 $endyear = $year;
 
 
 /*
  * View
  */
-if (!empty($conf->category->enabled)) $langs->load('categories');
+if (!empty($conf->category->enabled)) {
+	$langs->load('categories');
+}
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
@@ -79,8 +89,7 @@ $picto = 'bill';
 $title = $langs->trans("BillsStatistics");
 $dir = $conf->facture->dir_temp;
 
-if ($mode == 'supplier')
-{
+if ($mode == 'supplier') {
 	$picto = 'supplier_invoice';
 	$title = $langs->trans("BillsStatisticsSuppliers");
 	$dir = $conf->fournisseur->facture->dir_temp;
@@ -92,17 +101,19 @@ print load_fiche_titre($title, '', $picto);
 dol_mkdir($dir);
 
 $stats = new FactureStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
-if ($mode == 'customer')
-{
-	if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+if ($mode == 'customer') {
+	if ($object_status != '' && $object_status >= 0) {
+		$stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+	}
 	if (is_array($custcats) && !empty($custcats)) {
 		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
 		$stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
 	}
 }
-if ($mode == 'supplier')
-{
-	if ($object_status != '' && $object_status >= 0) $stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+if ($mode == 'supplier') {
+	if ($object_status != '' && $object_status >= 0) {
+		$stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+	}
 }
 
 // Build graphic number of object
@@ -111,17 +122,19 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 //var_dump($data);
 
 $filenamenb = $dir."/invoicesnbinyear-".$year.".png";
-if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
-if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicesnbinyear-'.$year.'.png';
+if ($mode == 'customer') {
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
+}
+if ($mode == 'supplier') {
+	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicesnbinyear-'.$year.'.png';
+}
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -144,17 +157,19 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 $filenameamount = $dir."/invoicesamountinyear-".$year.".png";
-if ($mode == 'customer') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
-if ($mode == 'supplier') $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicesamountinyear-'.$year.'.png';
+if ($mode == 'customer') {
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
+}
+if ($mode == 'supplier') {
+	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicesamountinyear-'.$year.'.png';
+}
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px2->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -175,25 +190,30 @@ if (!$mesg)
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
 } else {
 	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	}
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px3->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -218,7 +238,9 @@ $arrayyears = array();
 foreach ($data as $val) {
 	$arrayyears[$val['year']] = $val['year'];
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 
 $h = 0;
@@ -228,8 +250,12 @@ $head[$h][1] = $langs->trans("ByMonthYear");
 $head[$h][2] = 'byyear';
 $h++;
 
-if ($mode == 'customer') $type = 'invoice_stats';
-if ($mode == 'supplier') $type = 'supplier_invoice_stats';
+if ($mode == 'customer') {
+	$type = 'invoice_stats';
+}
+if ($mode == 'supplier') {
+	$type = 'supplier_invoice_stats';
+}
 
 complete_head_from_modules($conf, $langs, null, $head, $h, $type);
 
@@ -256,8 +282,12 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->trans("Filter").'</td></tr>';
 // Company
 print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
-if ($mode == 'customer') $filter = 's.client in (1,2,3)';
-if ($mode == 'supplier') $filter = 's.fournisseur = 1';
+if ($mode == 'customer') {
+	$filter = 's.client in (1,2,3)';
+}
+if ($mode == 'supplier') {
+	$filter = 's.fournisseur = 1';
+}
 print $form->selectarray('socid', $companies, $socid, 1, 0, 0, 'style="width: 95%"', 0, 0, 0, '', '', 1);
 print '</td></tr>';
 
@@ -265,18 +295,18 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>';
 $sortparam_typent = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
 print $form->selectarray("typent_id", $formcompany->typent_array(0), $typent_id, 1, 0, 0, '', 0, 0, 0, $sortparam_typent, '', 1);
-if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+if ($user->admin) {
+	print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+}
 print '</td></tr>';
 
 // Category
 if (!empty($conf->category->enabled)) {
-	if ($mode == 'customer')
-	{
+	if ($mode == 'customer') {
 		$cat_type = Categorie::TYPE_CUSTOMER;
 		$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Customer"));
 	}
-	if ($mode == 'supplier')
-	{
+	if ($mode == 'supplier') {
 		$cat_type = Categorie::TYPE_SUPPLIER;
 		$cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
 	}
@@ -293,21 +323,23 @@ print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0
 print '</td></tr>';
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
-if ($mode == 'customer')
-{
+if ($mode == 'customer') {
 	$liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"), '1,2'=>$langs->trans("BillStatusNotPaid").' / '.$langs->trans("BillStatusPaid"), '3'=>$langs->trans("BillStatusCanceled"));
 	print $form->selectarray('object_status', $liststatus, $object_status, 1);
 }
-if ($mode == 'supplier')
-{
+if ($mode == 'supplier') {
 	$liststatus = array('0'=>$langs->trans("BillStatusDraft"), '1'=>$langs->trans("BillStatusNotPaid"), '2'=>$langs->trans("BillStatusPaid"));
 	print $form->selectarray('object_status', $liststatus, $object_status, 1);
 }
 print '</td></tr>';
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
-if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
@@ -329,11 +361,9 @@ print '<td class="right">%</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	$year = $val['year'];
-	while ($year && $oldyear > $year + 1)
-	{	// If we have empty year
+	while ($year && $oldyear > $year + 1) {	// If we have empty year
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
@@ -367,7 +397,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td align="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 92745a276e1..f9bb5902cce 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -18,8 +18,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -38,12 +37,13 @@ $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1)
 
 $total = 0;
 $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	print '<tr class="'.$trclass.'" data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
 	print '<td class="linkedcol-element">';
 	switch ($objectlink->type) {
@@ -73,7 +73,9 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 	print '<td class="linkedcol-amount right">';
 	if ($user->rights->facture->lire) {
 		$sign = 1;
-		if ($object->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
+		if ($object->type == Facture::TYPE_CREDIT_NOTE) {
+			$sign = -1;
+		}
 		if ($objectlink->statut != 3) {
 			// If not abandonned
 			$total = $total + $sign * $objectlink->total_ht;
@@ -87,8 +89,7 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 	print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
 	print "</tr>\n";
 }
-if (count($linkedObjectBlock) > 1)
-{
+if (count($linkedObjectBlock) > 1) {
 	print '<tr class="liste_total '.(empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : '').'">';
 	print '<td>'.$langs->trans("Total").'</td>';
 	print '<td></td>';
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index 1c8473637f3..935f6b03948 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -18,8 +18,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -38,16 +37,17 @@ $langs->load("bills");
 
 $total = 0;
 $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	?>
 <tr class="<?php echo $trclass; ?>" >
-    <td class="linkedcol-element"><?php echo $langs->trans("RepeatableInvoice"); ?></td>
-    <td class="linkedcol-name"><!-- nowraponall because ref is a label --><?php echo $objectlink->getNomUrl(1); ?></td>
+	<td class="linkedcol-element"><?php echo $langs->trans("RepeatableInvoice"); ?></td>
+	<td class="linkedcol-name"><!-- nowraponall because ref is a label --><?php echo $objectlink->getNomUrl(1); ?></td>
 	<td class="linkedcol-ref" align="center"></td>
 	<td class="linkedcol-date" align="center"><?php echo dol_print_date($objectlink->date_when, 'day'); ?></td>
 	<td class="linkedcol-amount right"><?php
@@ -61,19 +61,18 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 </tr>
 	<?php
 }
-if (count($linkedObjectBlock) > 1)
-{
+if (count($linkedObjectBlock) > 1) {
 	?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
-        <td><?php echo $langs->trans("Total"); ?></td>
-        <td></td>
-    	<td align="center"></td>
-    	<td align="center"></td>
-    	<td class="right"><?php echo price($total); ?></td>
-    	<td class="right"></td>
-    	<td class="right"></td>
-    </tr>
-    <?php
+	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+		<td><?php echo $langs->trans("Total"); ?></td>
+		<td></td>
+		<td align="center"></td>
+		<td align="center"></td>
+		<td class="right"><?php echo price($total); ?></td>
+		<td class="right"></td>
+		<td class="right"></td>
+	</tr>
+	<?php
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 8a50619f17c..7cc15d7f9a7 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -47,16 +47,16 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
-if (!empty($conf->commande->enabled))
+if (!empty($conf->commande->enabled)) {
 	$langs->load("orders");
+}
 
 $action = GETPOST('action', 'aZ09');
 $bid = GETPOST('bid', 'int');
 
 // Security check
 $socid = '';
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -89,37 +89,35 @@ print load_fiche_titre($langs->trans("AccountancyTreasuryArea"), '', 'bill');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	// Search customer invoices
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-	{
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
 		$listofsearchfields['search_invoice'] = array('text'=>'CustomerInvoice');
 	}
 	// Search supplier invoices
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
-	{
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire) {
 		$listofsearchfields['search_supplier_invoice'] = array('text'=>'SupplierInvoice');
 	}
-	if (!empty($conf->don->enabled) && $user->rights->don->lire)
-	{
+	if (!empty($conf->don->enabled) && $user->rights->don->lire) {
 		$langs->load("donations");
 		$listofsearchfields['search_donation'] = array('text'=>'Donation');
 	}
 
-	if (count($listofsearchfields))
-	{
+	if (count($listofsearchfields)) {
 		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder nohover centpercent">';
 		$i = 0;
-		foreach ($listofsearchfields as $key => $value)
-		{
-			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+		foreach ($listofsearchfields as $key => $value) {
+			if ($i == 0) {
+				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			}
 			print '<tr '.$bc[false].'>';
 			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			if ($i == 0) {
+				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			}
 			print '</tr>';
 			$i++;
 		}
@@ -134,8 +132,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
 /**
  * Draft customers invoices
  */
-if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-{
+if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
 	$tmpinvoice = new Facture($db);
 
 	$sql = "SELECT f.rowid, f.ref, f.datef as date, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.ref_client";
@@ -144,15 +141,20 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql .= ", s.rowid as socid, s.email";
 	$sql .= ", s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur";
 	$sql .= ", cc.rowid as country_id, cc.code as country_code";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", sc.fk_soc, sc.fk_user ";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".Facture::STATUS_DRAFT;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 
-	if ($socid)
-	{
+	if ($socid) {
 		$sql .= " AND f.fk_soc = $socid";
 	}
 	// Add where from hooks
@@ -163,7 +165,9 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql .= " GROUP BY f.rowid, f.ref, f.datef, f.total, f.tva, f.total_ttc, f.ref_client, f.type, f.fk_statut, f.paye,";
 	$sql .= " s.nom, s.rowid, s.email, s.code_client, s.code_compta, s.code_fournisseur, s.code_compta_fournisseur,";
 	$sql .= " cc.rowid, cc.code";
-	if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql.= ", sc.fk_soc, sc.fk_user";
+	}
 
 	// Add Group from hooks
 	$parameters = array();
@@ -172,8 +176,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 	$resql = $db->query($sql);
 
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
@@ -188,15 +191,13 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 		print '</th>';
 		print '</tr>';
 
-		if ($num)
-		{
+		if ($num) {
 			$companystatic = new Societe($db);
 
 			$i = 0;
 			$othernb = 0;
 			$tot_ttc = 0;
-			while ($i < $num && $i < $conf->liste_limit)
-			{
+			while ($i < $num && $i < $conf->liste_limit) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -264,8 +265,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 /**
  * Draft suppliers invoices
  */
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
-{
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 	$facturesupplierstatic = new FactureFournisseur($db);
 
 	$sql = "SELECT f.ref, f.rowid, f.total_ht, f.total_tva, f.total_ttc, f.type, f.ref_supplier, f.fk_statut as status, f.paye";
@@ -274,19 +274,24 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur";
 	$sql .= ", cc.rowid as country_id, cc.code as country_code";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE s.rowid = f.fk_soc AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
 	$sql .= " AND f.entity IN (".getEntity('invoice').')';
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid)	$sql .= " AND f.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierDraft', $parameters);
 	$sql .= $hookmanager->resPrint;
 	$resql = $db->query($sql);
 
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
@@ -301,15 +306,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 		print '</th>';
 		print '</tr>';
 
-		if ($num)
-		{
+		if ($num) {
 			$companystatic = new Societe($db);
 
 			$i = 0;
 			$othernb = 0;
 			$tot_ttc = 0;
-			while ($i < $num && $i < $conf->liste_limit)
-			{
+			while ($i < $num && $i < $conf->liste_limit) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -378,8 +381,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
 // Latest modified customer invoices
-if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-{
+if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
 	$langs->load("boxes");
 	$tmpinvoice = new Facture($db);
 
@@ -392,11 +394,17 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays, ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE s.rowid = f.fk_soc";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerLastModified', $parameters);
@@ -409,8 +417,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 		$othernb = 0;
@@ -418,16 +425,16 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastCustomerBills", $max).'</th>';
-		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+		}
 		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
 		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
 		print '<th width="16">&nbsp;</th>';
 		print '</tr>';
-		if ($num)
-		{
+		if ($num) {
 			$total_ttc = $totalam = $total = 0;
-			while ($i < $num && $i < $conf->liste_limit)
-			{
+			while ($i < $num && $i < $conf->liste_limit) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -483,7 +490,9 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				print '<td class="left">';
 				print $thirdpartystatic->getNomUrl(1, 'customer', 44);
 				print '</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="nowrap right">'.price($obj->total_ht).'</td>';
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					print '<td class="nowrap right">'.price($obj->total_ht).'</td>';
+				}
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
 				print '<td>'.$tmpinvoice->getLibStatut(3, $obj->am).'</td>';
@@ -505,7 +514,9 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			}
 		} else {
 			$colspan = 5;
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
+			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				$colspan++;
+			}
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
@@ -518,8 +529,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 
 // Last modified supplier invoices
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
-{
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 	$langs->load("boxes");
 	$facstatic = new FactureFournisseur($db);
 
@@ -530,11 +540,17 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= ", SUM(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE s.rowid = ff.fk_soc";
 	$sql .= " AND ff.entity = ".$conf->entity;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND ff.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND ff.fk_soc = ".$socid;
+	}
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierLastModified', $parameters);
@@ -546,26 +562,25 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("BoxTitleLastSupplierBills", $max).'</th>';
-		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+		}
 		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
 		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
 		print '<th width="16">&nbsp;</th>';
 		print "</tr>\n";
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
 			$total = $total_ttc = $totalam = 0;
 			$othernb = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -602,7 +617,9 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				print '<td class="nowrap tdoverflowmax100">';
 				print $thirdpartystatic->getNomUrl(1, 'supplier');
 				print '</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					print '<td class="right">'.price($obj->total_ht).'</td>';
+				}
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
 				print '<td>'.$facstatic->getLibStatut(3).'</td>';
@@ -622,7 +639,9 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			}
 		} else {
 			$colspan = 5;
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
+			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				$colspan++;
+			}
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
@@ -634,8 +653,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 
 // Latest donations
-if (!empty($conf->don->enabled) && $user->rights->don->lire)
-{
+if (!empty($conf->don->enabled) && $user->rights->don->lire) {
 	include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 	$langs->load("boxes");
@@ -653,8 +671,7 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 	$sql .= $db->plimit($max, 0);
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 
 		$i = 0;
@@ -669,12 +686,10 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
 		print '<th width="16">&nbsp;</th>';
 		print '</tr>';
-		if ($num)
-		{
+		if ($num) {
 			$total_ttc = $totalam = $total = 0;
 
-			while ($i < $num && $i < $max)
-			{
+			while ($i < $num && $i < $max) {
 				$objp = $db->fetch_object($result);
 
 				if ($i >= $max) {
@@ -694,7 +709,9 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 				$donationstatic->status = $objp->status;
 
 				$label = $donationstatic->getFullName($langs);
-				if ($objp->societe) $label .= ($label ? ' - ' : '').$objp->societe;
+				if ($objp->societe) {
+					$label .= ($label ? ' - ' : '').$objp->societe;
+				}
 
 				print '<tr class="oddeven tdoverflowmax100">';
 				print '<td>'.$donationstatic->getNomUrl(1).'</td>';
@@ -718,16 +735,16 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 			print '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 		}
 		print '</table></div><br>';
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 /**
  * Social contributions to pay
  */
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
-{
-	if (!$socid)
-	{
+if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
+	if (!$socid) {
 		$chargestatic = new ChargeSociales($db);
 
 		$sql = "SELECT c.rowid, c.amount, c.date_ech, c.paye,";
@@ -746,8 +763,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		$sql .= " GROUP BY c.rowid, c.amount, c.date_ech, c.paye, cc.libelle";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 
 			print '<div class="div-table-responsive-no-min">';
@@ -759,14 +775,12 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			print '<th class="right">'.$langs->trans("Paid").'</th>';
 			print '<th align="center" width="16">&nbsp;</th>';
 			print '</tr>';
-			if ($num)
-			{
+			if ($num) {
 				$i = 0;
 				$tot_ttc = 0;
 				$othernb = 0;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
 
 					if ($i >= $max) {
@@ -822,8 +836,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 /*
  * Customers orders to be billed
  */
-if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user->rights->commande->lire && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER))
-{
+if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user->rights->commande->lire && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
 	$commandestatic = new Commande($db);
 	$langs->load("orders");
 
@@ -834,14 +847,20 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 	$sql .= ", c.rowid, c.ref, c.facture, c.fk_statut as status, c.total_ht, c.total_tva, c.total_ttc,";
 	$sql .= " cc.rowid as country_id, cc.code as country_code";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= ", ".MAIN_DB_PREFIX."commande as c";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_source = c.rowid AND el.sourcetype = 'commande'";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON el.fk_target = f.rowid AND el.targettype = 'facture'";
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity = ".$conf->entity;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid)	$sql .= " AND c.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND c.fk_soc = ".$socid;
+	}
 	$sql .= " AND c.fk_statut = ".Commande::STATUS_CLOSED;
 	$sql .= " AND c.facture = 0";
 	// Add where from hooks
@@ -852,12 +871,10 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 	$sql .= " GROUP BY s.nom, s.email, s.rowid, s.code_client, s.code_compta, c.rowid, c.ref, c.facture, c.fk_statut, c.total_ht, c.total_tva, c.total_ttc, cc.rowid, cc.code";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
 			$othernb = 0;
 
@@ -872,7 +889,9 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 			print '</a>';
 			print '</th>';
 
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+			}
 			print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
 			print '<th class="right">'.$langs->trans("ToBill").'</th>';
 			print '<th align="center" width="16">&nbsp;</th>';
@@ -880,8 +899,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 
 			$tot_ht = $tot_ttc = $tot_tobill = 0;
 			$societestatic = new Societe($db);
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -930,7 +948,9 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 				print '<td class="nowrap tdoverflowmax100">';
 				print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					print '<td class="right">'.price($obj->total_ht).'</td>';
+				}
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc - $obj->tot_fttc).'</td>';
 				print '<td>'.$commandestatic->getLibStatut(3).'</td>';
@@ -951,7 +971,9 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 			}
 
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToBill").': '.price($tot_tobill).')</font> </td>';
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($tot_ht).'</td>';
+			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				print '<td class="right">'.price($tot_ht).'</td>';
+			}
 			print '<td class="nowrap right">'.price($tot_ttc).'</td>';
 			print '<td class="nowrap right">'.price($tot_tobill).'</td>';
 			print '<td>&nbsp;</td>';
@@ -967,8 +989,7 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 /*
  * Unpaid customers invoices
  */
-if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-{
+if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
 	$tmpinvoice = new Facture($db);
 
 	$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.datef, f.type, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.paye, f.tms";
@@ -980,11 +1001,17 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."c_country as cc ON cc.rowid = s.fk_pays,".MAIN_DB_PREFIX."facture as f";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE s.rowid = f.fk_soc AND f.paye = 0 AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 	$sql .= " AND f.entity IN (".getEntity('invoice').')';
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhereCustomerUnpaid', $parameters);
@@ -995,8 +1022,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql .= " ORDER BY f.datef ASC, f.ref ASC";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 		$othernb = 0;
@@ -1013,17 +1039,17 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 		print '</th>';
 
 		print '<th class="right">'.$langs->trans("DateDue").'</th>';
-		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+		}
 		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
 		print '<th class="right">'.$langs->trans("Received").'</th>';
 		print '<th width="16">&nbsp;</th>';
 		print '</tr>';
-		if ($num)
-		{
+		if ($num) {
 			$societestatic = new Societe($db);
 			$total_ttc = $totalam = $total = 0;
-			while ($i < $num && $i < $conf->liste_limit)
-			{
+			while ($i < $num && $i < $conf->liste_limit) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -1079,7 +1105,9 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->datelimite), 'day').'</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					print '<td class="right">'.price($obj->total_ht).'</td>';
+				}
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="nowrap right">'.price($obj->am).'</td>';
 				print '<td>'.$tmpinvoice->getLibStatut(3, $obj->am).'</td>';
@@ -1094,7 +1122,9 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 			if ($othernb) {
 				$colspan = 6;
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					$colspan++;
+				}
 				print '<tr class="oddeven">';
 				print '<td class="nowrap" colspan="'.$colspan.'">';
 				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
@@ -1104,14 +1134,18 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToTake").': '.price($total_ttc - $totalam).')</font> </td>';
 			print '<td>&nbsp;</td>';
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($total).'</td>';
+			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				print '<td class="right">'.price($total).'</td>';
+			}
 			print '<td class="nowrap right">'.price($total_ttc).'</td>';
 			print '<td class="nowrap right">'.price($totalam).'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		} else {
 			$colspan = 6;
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
+			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				$colspan++;
+			}
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
@@ -1124,8 +1158,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 /*
  * Unpaid supplier invoices
  */
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
-{
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 	$facstatic = new FactureFournisseur($db);
 
 	$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut as status, ff.type, ff.libelle as label, ff.total_ht, ff.total_tva, ff.total_ttc, ff.paye";
@@ -1137,13 +1170,19 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= ", sum(pf.amount) as am";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE s.rowid = ff.fk_soc";
 	$sql .= " AND ff.entity = ".$conf->entity;
 	$sql .= " AND ff.paye = 0";
 	$sql .= " AND ff.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND ff.fk_soc = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND ff.fk_soc = ".$socid;
+	}
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhereSupplierUnpaid', $parameters);
@@ -1154,8 +1193,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$sql .= " ORDER BY ff.date_lim_reglement ASC";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$othernb = 0;
 
@@ -1173,18 +1211,18 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 		print '</th>';
 
 		print '<th class="right">'.$langs->trans("DateDue").'</th>';
-		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+		if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+			print '<th class="right">'.$langs->trans("AmountHT").'</th>';
+		}
 		print '<th class="right">'.$langs->trans("AmountTTC").'</th>';
 		print '<th class="right">'.$langs->trans("Paid").'</th>';
 		print '<th width="16">&nbsp;</th>';
 		print "</tr>\n";
 		$societestatic = new Societe($db);
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
 			$total = $total_ttc = $totalam = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				if ($i >= $max) {
@@ -1219,7 +1257,9 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				print '</td>';
 				print '<td class="nowrap tdoverflowmax100">'.$societestatic->getNomUrl(1, 'supplier').'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').'</td>';
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					print '<td class="right">'.price($obj->total_ht).'</td>';
+				}
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '<td class="nowrap right">'.price($obj->am).'</td>';
 				print '<td>'.$facstatic->getLibStatut(3, $obj->am).'</td>';
@@ -1232,7 +1272,9 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 			if ($othernb) {
 				$colspan = 6;
-				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+					$colspan++;
+				}
 				print '<tr class="oddeven">';
 				print '<td class="nowrap" colspan="'.$colspan.'">';
 				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
@@ -1242,14 +1284,18 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 			print '<tr class="liste_total"><td colspan="2">'.$langs->trans("Total").' &nbsp; <font style="font-weight: normal">('.$langs->trans("RemainderToPay").': '.price($total_ttc - $totalam).')</font> </td>';
 			print '<td>&nbsp;</td>';
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($total).'</td>';
+			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				print '<td class="right">'.price($total).'</td>';
+			}
 			print '<td class="nowrap right">'.price($total_ttc).'</td>';
 			print '<td class="nowrap right">'.price($totalam).'</td>';
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 		} else {
 			$colspan = 6;
-			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
+			if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) {
+				$colspan++;
+			}
 			print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoInvoice").'</td></tr>';
 		}
 		print '</table></div><br>';
@@ -1262,15 +1308,13 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 // TODO Mettre ici recup des actions en rapport avec la compta
 $resql = 0;
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><thcolspan="2">'.$langs->trans("TasksToDo").'</th>';
 	print "</tr>\n";
 	$i = 0;
-	while ($i < $db->num_rows($resql))
-	{
+	while ($i < $db->num_rows($resql)) {
 		$obj = $db->fetch_object($resql);
 
 		print '<tr class="oddeven"><td>'.dol_print_date($db->jdate($obj->da), "day").'</td>';
diff --git a/htdocs/compta/journal/purchasesjournal.php b/htdocs/compta/journal/purchasesjournal.php
index 45ffae7c1ff..fda83a75668 100644
--- a/htdocs/compta/journal/purchasesjournal.php
+++ b/htdocs/compta/journal/purchasesjournal.php
@@ -45,9 +45,15 @@ $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 
 /*
@@ -70,8 +76,7 @@ $form = new Form($db);
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
-if ($pastmonth == 0)
-{
+if ($pastmonth == 0) {
 	$pastmonth = 12;
 	$pastmonthyear--;
 }
@@ -79,8 +84,7 @@ if ($pastmonth == 0)
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
@@ -90,8 +94,11 @@ $periodlink = '';
 $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescPurchasesJournal").'<br>';
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-else $description .= $langs->trans("DepositsAreIncluded");
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$description .= $langs->trans("DepositsAreNotIncluded");
+} else {
+	$description .= $langs->trans("DepositsAreIncluded");
+}
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
@@ -111,16 +118,22 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
 $sql .= " JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = fd.fk_facture_fourn";
 $sql .= " JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 $sql .= " WHERE f.fk_statut > 0 AND f.entity IN (".getEntity('invoice').")";
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)";
-else $sql .= " AND f.type IN (0,1,2,3)";
-if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND f.type IN (0,1,2)";
+} else {
+	$sql .= " AND f.type IN (0,1,2,3)";
+}
+if ($date_start && $date_end) {
+	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+}
 
 // TODO Find a better trick to avoid problem with some mysql installations
-if (in_array($db->type, array('mysql', 'mysqli'))) $db->query('SET SQL_BIG_SELECTS=1');
+if (in_array($db->type, array('mysql', 'mysqli'))) {
+	$db->query('SET SQL_BIG_SELECTS=1');
+}
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	// les variables
 	$cptfour = (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : $langs->trans("CodeNotDef"));
@@ -135,16 +148,17 @@ if ($result)
 	$tabcompany = array();
 
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 		// contrôles
 		$compta_soc = (($obj->code_compta_fournisseur != "") ? $obj->code_compta_fournisseur : $cptfour);
 		$compta_prod = $obj->accountancy_code_buy;
-		if (empty($compta_prod))
-		{
-			if ($obj->product_type == 0) $compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
-			else $compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+		if (empty($compta_prod)) {
+			if ($obj->product_type == 0) {
+				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+			} else {
+				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT : $langs->trans("CodeNotDef"));
+			}
 		}
 		$compta_tva = (!empty($obj->account_tva) ? $obj->account_tva : $cpttva);
 		$compta_localtax1 = (!empty($obj->account_localtax1) ? $obj->account_localtax1 : $langs->trans("CodeNotDef"));
@@ -161,9 +175,11 @@ if ($result)
 		$tabfac[$obj->rowid]["lib"] = $obj->label;
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht;
-		if ($obj->recuperableonly != 1) $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
+		if ($obj->recuperableonly != 1) {
+			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva;
+		}
 		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
-   		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
+		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
 		$tabcompany[$obj->rowid] = array('id'=>$obj->socid, 'name'=>$obj->name);
 
 		$i++;
@@ -188,8 +204,7 @@ print "</tr>\n";
 $invoicestatic = new FactureFournisseur($db);
 $companystatic = new Fournisseur($db);
 
-foreach ($tabfac as $key => $val)
-{
+foreach ($tabfac as $key => $val) {
 	$invoicestatic->id = $key;
 	$invoicestatic->ref = $val["ref"];
 	$invoicestatic->type = $val["type"];
@@ -222,19 +237,15 @@ foreach ($tabfac as $key => $val)
 		)
 	);
 
-	foreach ($lines as $line)
-	{
-		foreach ($line['var'] as $k => $mt)
-		{
-			if (isset($line['nomtcheck']) || $mt)
-			{
+	foreach ($lines as $line) {
+		foreach ($line['var'] as $k => $mt) {
+			if (isset($line['nomtcheck']) || $mt) {
 				print '<tr class="oddeven">';
 				print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
 
-				if (isset($line['inv']))
-				{
+				if (isset($line['inv'])) {
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 				} else {
diff --git a/htdocs/compta/journal/sellsjournal.php b/htdocs/compta/journal/sellsjournal.php
index ea6222dc63f..39faf295c45 100644
--- a/htdocs/compta/journal/sellsjournal.php
+++ b/htdocs/compta/journal/sellsjournal.php
@@ -47,9 +47,15 @@ $date_endday = GETPOST('date_endday');
 $date_endyear = GETPOST('date_endyear');
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 /*
  * Actions
@@ -73,8 +79,7 @@ llxHeader('', $langs->trans("SellsJournal"), '', '', 0, 0, '', '', $morequery);
 $year_current = strftime("%Y", dol_now());
 $pastmonth = strftime("%m", dol_now()) - 1;
 $pastmonthyear = $year_current;
-if ($pastmonth == 0)
-{
+if ($pastmonth == 0) {
 	$pastmonth = 12;
 	$pastmonthyear--;
 }
@@ -82,8 +87,7 @@ if ($pastmonth == 0)
 $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_startyear);
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false); $date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
@@ -92,8 +96,11 @@ $periodlink = '';
 $exportlink = '';
 $builddate = dol_now();
 $description = $langs->trans("DescSellsJournal").'<br>';
-if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-else $description .= $langs->trans("DepositsAreIncluded");
+if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$description .= $langs->trans("DepositsAreNotIncluded");
+} else {
+	$description .= $langs->trans("DepositsAreIncluded");
+}
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink);
 
@@ -119,15 +126,18 @@ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 }
 
 $sql .= " AND fd.product_type IN (0,1)";
-if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+if ($date_start && $date_end) {
+	$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+}
 $sql .= " ORDER BY f.rowid";
 
 // TODO Find a better trick to avoid problem with some mysql installations
-if (in_array($db->type, array('mysql', 'mysqli'))) $db->query('SET SQL_BIG_SELECTS=1');
+if (in_array($db->type, array('mysql', 'mysqli'))) {
+	$db->query('SET SQL_BIG_SELECTS=1');
+}
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$tabfac = array();
 	$tabht = array();
 	$tabtva = array();
@@ -139,19 +149,20 @@ if ($result)
 	$account_localtax2 = 0;
 
 	$num = $db->num_rows($result);
-   	$i = 0;
-   	$resligne = array();
-   	while ($i < $num)
-   	{
-   		$obj = $db->fetch_object($result);
-   		// les variables
-   		$cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
-   		$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $cptcli);
+	$i = 0;
+	$resligne = array();
+	while ($i < $num) {
+		$obj = $db->fetch_object($result);
+		// les variables
+		$cptcli = (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : $langs->trans("CodeNotDef"));
+		$compta_soc = (!empty($obj->code_compta) ? $obj->code_compta : $cptcli);
 		$compta_prod = $obj->accountancy_code_sell;
-		if (empty($compta_prod))
-		{
-			if ($obj->product_type == 0) $compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
-			else $compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+		if (empty($compta_prod)) {
+			if ($obj->product_type == 0) {
+				$compta_prod = (!empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+			} else {
+				$compta_prod = (!empty($conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
+			}
 		}
 		$cpttva = (!empty($conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
 		$compta_tva = (!empty($obj->account_tva) ? $obj->account_tva : $cpttva);
@@ -178,22 +189,34 @@ if ($result)
 		}
 
 		//la ligne facture
-   		$tabfac[$obj->rowid]["date"] = $obj->datef;
-   		$tabfac[$obj->rowid]["ref"] = $obj->ref;
-   		$tabfac[$obj->rowid]["type"] = $obj->type;
-   		if (!isset($tabttc[$obj->rowid][$compta_soc])) $tabttc[$obj->rowid][$compta_soc] = 0;
-   		if (!isset($tabht[$obj->rowid][$compta_prod])) $tabht[$obj->rowid][$compta_prod] = 0;
-   		if (!isset($tabtva[$obj->rowid][$compta_tva])) $tabtva[$obj->rowid][$compta_tva] = 0;
-   		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) $tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
-   		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) $tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		$tabfac[$obj->rowid]["date"] = $obj->datef;
+		$tabfac[$obj->rowid]["ref"] = $obj->ref;
+		$tabfac[$obj->rowid]["type"] = $obj->type;
+		if (!isset($tabttc[$obj->rowid][$compta_soc])) {
+			$tabttc[$obj->rowid][$compta_soc] = 0;
+		}
+		if (!isset($tabht[$obj->rowid][$compta_prod])) {
+			$tabht[$obj->rowid][$compta_prod] = 0;
+		}
+		if (!isset($tabtva[$obj->rowid][$compta_tva])) {
+			$tabtva[$obj->rowid][$compta_tva] = 0;
+		}
+		if (!isset($tablocaltax1[$obj->rowid][$compta_localtax1])) {
+			$tablocaltax1[$obj->rowid][$compta_localtax1] = 0;
+		}
+		if (!isset($tablocaltax2[$obj->rowid][$compta_localtax2])) {
+			$tablocaltax2[$obj->rowid][$compta_localtax2] = 0;
+		}
 		$tabttc[$obj->rowid][$compta_soc] += $obj->total_ttc * $situation_ratio;
 		$tabht[$obj->rowid][$compta_prod] += $obj->total_ht * $situation_ratio;
-		if ($obj->recuperableonly != 1) $tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
-   		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
-   		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
-   		$tabcompany[$obj->rowid] = array('id'=>$obj->socid, 'name'=>$obj->name, 'client'=>$obj->client);
-   		$i++;
-   	}
+		if ($obj->recuperableonly != 1) {
+			$tabtva[$obj->rowid][$compta_tva] += $obj->total_tva * $situation_ratio;
+		}
+		$tablocaltax1[$obj->rowid][$compta_localtax1] += $obj->total_localtax1;
+		$tablocaltax2[$obj->rowid][$compta_localtax2] += $obj->total_localtax2;
+		$tabcompany[$obj->rowid] = array('id'=>$obj->socid, 'name'=>$obj->name, 'client'=>$obj->client);
+		$i++;
+	}
 } else {
 	dol_print_error($db);
 }
@@ -216,8 +239,7 @@ print "</tr>\n";
 $invoicestatic = new Facture($db);
 $companystatic = new Client($db);
 
-foreach ($tabfac as $key => $val)
-{
+foreach ($tabfac as $key => $val) {
 	$invoicestatic->id = $key;
 	$invoicestatic->ref = $val["ref"];
 	$invoicestatic->type = $val["type"];
@@ -251,19 +273,15 @@ foreach ($tabfac as $key => $val)
 		)
 	);
 
-	foreach ($lines as $line)
-	{
-		foreach ($line['var'] as $k => $mt)
-		{
-			if (isset($line['nomtcheck']) || $mt)
-			{
+	foreach ($lines as $line) {
+		foreach ($line['var'] as $k => $mt) {
+			if (isset($line['nomtcheck']) || $mt) {
 				print '<tr class="oddeven">';
 				print "<td>".dol_print_date($db->jdate($val["date"]))."</td>";
 				print "<td>".$invoicestatic->getNomUrl(1)."</td>";
 				print "<td>".$k."</td><td>".$line['label']."</td>";
 
-				if (isset($line['inv']))
-				{
+				if (isset($line['inv'])) {
 					print '<td class="right">'.($mt >= 0 ?price($mt) : '')."</td>";
 					print '<td class="right">'.($mt < 0 ?price(-$mt) : '')."</td>";
 				} else {
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index ec365ac68e7..ee7dbb5e3f4 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -34,13 +34,17 @@ $langs->loadLangs(array('compta', 'banks', 'bills'));
 $id = GETPOST("id", 'int');
 $action = GETPOST("action", "alpha");
 $refund = GETPOST("refund", "int");
-if (empty($refund)) $refund = 0;
+if (empty($refund)) {
+	$refund = 0;
+}
 
 $lttype = GETPOST('localTaxType', 'int');
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 $object = new Localtax($db);
@@ -53,14 +57,12 @@ $hookmanager->initHooks(array('localtaxvatcard', 'globalcard'));
  * Actions
  */
 
-if ($_POST["cancel"] == $langs->trans("Cancel") && !$id)
-{
+if ($_POST["cancel"] == $langs->trans("Cancel") && !$id) {
 	header("Location: list.php?localTaxType=".$lttype);
 	exit;
 }
 
-if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
-{
+if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel")) {
 	$db->begin();
 
 	$datev = dol_mktime(12, 0, 0, $_POST["datevmonth"], $_POST["datevday"], $_POST["datevyear"]);
@@ -75,8 +77,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$object->ltt = $lttype;
 
 	$ret = $object->addPayment($user);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$db->commit();
 		header("Location: list.php?localTaxType=".$lttype);
 		exit;
@@ -88,26 +89,23 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 }
 
 //delete payment of localtax
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	$result = $object->fetch($id);
 
-	if ($object->rappro == 0)
-	{
+	if ($object->rappro == 0) {
 		$db->begin();
 
 		$ret = $object->delete($user);
-		if ($ret > 0)
-		{
-			if ($object->fk_bank)
-			{
+		if ($ret > 0) {
+			if ($object->fk_bank) {
 				$accountline = new AccountLine($db);
 				$result = $accountline->fetch($object->fk_bank);
-				if ($result > 0) $result = $accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+				if ($result > 0) {
+					$result = $accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+				}
 			}
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/compta/localtax/list.php?localTaxType='.$object->ltt);
 				exit;
@@ -131,11 +129,9 @@ if ($action == 'delete')
  *	View
  */
 
-if ($id)
-{
+if ($id) {
 	$result = $object->fetch($id);
-	if ($result <= 0)
-	{
+	if ($result <= 0) {
 		dol_print_error($db);
 		exit;
 	}
@@ -147,8 +143,7 @@ $title = $langs->trans("LT".$object->ltt)." - ".$langs->trans("Card");
 $help_url = '';
 llxHeader("", $title, $helpurl);
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->transcountry($lttype == 2 ? "newLT2Payment" : "newLT1Payment", $mysoc->country_code));
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formlocaltax" method="post">'."\n";
@@ -175,8 +170,7 @@ if ($action == 'create')
 	// Amount
 	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
 
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
 		$form->select_comptes($_POST["accountid"], "accountid", 0, "courant=1", 2); // Affiche liste des comptes courant
 		print '</td></tr>';
@@ -211,8 +205,7 @@ if ($action == 'create')
 
 
 // View mode
-if ($id)
-{
+if ($id) {
 	$h = 0;
 	$head[$h][0] = DOL_URL_ROOT.'/compta/localtax/card.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Card');
@@ -246,11 +239,9 @@ if ($id)
 
 	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
-	if (!empty($conf->banque->enabled))
-	{
-		if ($object->fk_account > 0)
-		{
- 		   	$bankline = new AccountLine($db);
+	if (!empty($conf->banque->enabled)) {
+		if ($object->fk_account > 0) {
+			$bankline = new AccountLine($db);
 			$bankline->fetch($object->fk_bank);
 
 			print '<tr>';
@@ -278,8 +269,7 @@ if ($id)
 	 * Action buttons
 	 */
 	print "<div class=\"tabsAction\">\n";
-	if ($object->rappro == 0)
-	{
+	if ($object->rappro == 0) {
 		print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
 	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("LinkedToAConcialitedTransaction").'">'.$langs->trans("Delete").'</a>';
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index 18367a04a46..cdea12902bc 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -122,19 +122,19 @@ class Localtax extends CommonObject
 		$sql .= " ".((int) $this->fk_user_modif);
 		$sql .= ")";
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax");
 
 			// Call trigger
 			$result = $this->call_trigger('LOCALTAX_CREATE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -184,22 +184,21 @@ class Localtax extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			$error++;
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('LOCALTAX_MODIFY', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -239,10 +238,8 @@ class Localtax extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id    = $obj->rowid;
@@ -265,7 +262,7 @@ class Localtax extends CommonObject
 
 			return 1;
 		} else {
-	  		$this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -281,16 +278,17 @@ class Localtax extends CommonObject
 	{
 		// Call trigger
 		$result = $this->call_trigger('LOCALTAX_DELETE', $user);
-		if ($result < 0) return -1;
+		if ($result < 0) {
+			return -1;
+		}
 		// End call triggers
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."localtax";
 		$sql .= " WHERE rowid=".$this->id;
 
-	   	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -355,16 +353,13 @@ class Localtax extends CommonObject
 		// phpcs:enable
 		$sql = "SELECT sum(f.localtax) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
-		if ($year)
-		{
+		if ($year) {
 			$sql .= " AND f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$ret = $obj->amount;
 				$this->db->free($result);
@@ -392,16 +387,13 @@ class Localtax extends CommonObject
 
 		$sql = "SELECT sum(f.total_localtax) as total_localtax";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-		if ($year)
-		{
+		if ($year) {
 			$sql .= " WHERE f.datef >= '$year-01-01' AND f.datef <= '$year-12-31' ";
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$ret = $obj->total_localtax;
 				$this->db->free($result);
@@ -430,16 +422,13 @@ class Localtax extends CommonObject
 
 		$sql = "SELECT sum(f.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."localtax as f";
-		if ($year)
-		{
+		if ($year) {
 			$sql .= " WHERE f.datev >= '$year-01-01' AND f.datev <= '$year-12-31' ";
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$ret = $obj->amount;
 				$this->db->free($result);
@@ -469,62 +458,64 @@ class Localtax extends CommonObject
 
 		// Check parameters
 		$this->amount = price2num($this->amount);
-		if (!$this->label)
-		{
+		if (!$this->label) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-		if ($this->amount <= 0)
-		{
+		if ($this->amount <= 0) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
 			return -4;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-		{
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
 			return -5;
 		}
-		if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0))
-		{
+		if (!empty($conf->banque->enabled) && (empty($this->paymenttype) || $this->paymenttype <= 0)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
 			return -5;
 		}
 
 		// Insertion dans table des paiement localtax
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."localtax (localtaxtype, datep, datev, amount";
-		if ($this->note)  $sql .= ", note";
-		if ($this->label) $sql .= ", label";
+		if ($this->note) {
+			$sql .= ", note";
+		}
+		if ($this->label) {
+			$sql .= ", label";
+		}
 		$sql .= ", fk_user_creat, fk_bank";
 		$sql .= ") ";
 		$sql .= " VALUES (".$this->ltt.", '".$this->db->idate($this->datep)."',";
 		$sql .= "'".$this->db->idate($this->datev)."',".$this->amount;
-		if ($this->note)  $sql .= ", '".$this->db->escape($this->note)."'";
-		if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
+		if ($this->note) {
+			$sql .= ", '".$this->db->escape($this->note)."'";
+		}
+		if ($this->label) {
+			$sql .= ", '".$this->db->escape($this->label)."'";
+		}
 		$sql .= ", ".((int) $user->id).", NULL";
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."localtax"); // TODO devrait s'appeler paiementlocaltax
-			if ($this->id > 0)
-			{
+			if ($this->id > 0) {
 				$ok = 1;
-				if (!empty($conf->banque->enabled))
-				{
+				if (!empty($conf->banque->enabled)) {
 					// Insertion dans llx_bank
 					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 					$acc = new Account($this->db);
 					$result = $acc->fetch($this->accountid);
-					if ($result <= 0) dol_print_error($this->db);
+					if ($result <= 0) {
+						dol_print_error($this->db);
+					}
 
 					$bank_line_id = $acc->addline($this->datep, $this->paymenttype, $this->label, -abs($this->amount), '', '', $user);
 
 					// Mise a jour fk_bank dans llx_localtax. On connait ainsi la ligne de localtax qui a g�n�r� l'�criture bancaire
-					if ($bank_line_id > 0)
-					{
+					if ($bank_line_id > 0) {
 						$this->update_fk_bank($bank_line_id);
 					} else {
 						$this->error = $acc->error;
@@ -533,15 +524,13 @@ class Localtax extends CommonObject
 
 					// Mise a jour liens
 					$result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/localtax/card.php?id=', "(VATPayment)", "payment_vat");
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
 				}
 
-				if ($ok)
-				{
+				if ($ok) {
 					$this->db->commit();
 					return $this->id;
 				} else {
@@ -601,9 +590,15 @@ class Localtax extends CommonObject
 
 		$picto = 'payment';
 
-		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result .= ' ';
-		if ($withpicto != 2) $result .= $link.$this->ref.$linkend;
+		if ($withpicto) {
+			$result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result .= ' ';
+		}
+		if ($withpicto != 2) {
+			$result .= $link.$this->ref.$linkend;
+		}
 		return $result;
 	}
 
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index fe605c2224d..603e8564927 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -37,8 +37,7 @@ $local = GETPOST('localTaxType', 'int');
 
 // Date range
 $year = GETPOST("year", "int");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$year_start = $year_current;
 } else {
@@ -48,41 +47,60 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q");
-	if (empty($q))
-	{
-		if (GETPOST("month")) { $date_start = dol_get_first_day($year_start, GETPOST("month"), false); $date_end = dol_get_last_day($year_start, GETPOST("month"), false); } else {
+	if (empty($q)) {
+		if (GETPOST("month")) {
+			$date_start = dol_get_first_day($year_start, GETPOST("month"), false); $date_end = dol_get_last_day($year_start, GETPOST("month"), false);
+		} else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
-			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
+			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) {
+				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) {
+				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {
+				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
+			}
 		}
 	} else {
-		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+		if ($q == 1) {
+			$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+		}
+		if ($q == 2) {
+			$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+		}
+		if ($q == 3) {
+			$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+		}
+		if ($q == 4) {
+			$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+		}
 	}
 }
 
 $min = price2num(GETPOST("min", "alpha"));
-if (empty($min)) $min = 0;
+if (empty($min)) {
+	$min = 0;
+}
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = $conf->global->TAX_MODE;
-if (GETPOSTISSET("modetax")) $modetax = GETPOST("modetax", 'int');
-if (empty($modetax)) $modetax = 0;
+if (GETPOSTISSET("modetax")) {
+	$modetax = GETPOST("modetax", 'int');
+}
+if (empty($modetax)) {
+	$modetax = 0;
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
-if (empty($local))
-{
+if (empty($local)) {
 	accessforbidden('Parameter localTaxType is missing');
 	exit;
 }
@@ -98,9 +116,10 @@ $company_static = new Societe($db);
 
 $morequerystring = '';
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
-foreach ($listofparams as $param)
-{
-	if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+foreach ($listofparams as $param) {
+	if (GETPOST($param) != '') {
+		$morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+	}
 }
 
 llxHeader('', '', '', '', 0, 0, '', '', $morequerystring);
@@ -117,12 +136,13 @@ $fsearch .= '<input type="text" name="min" id="min" value="'.$min.'" size="6">';
 
 $calc = $conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
 // Affiche en-tete du rapport
-if ($calc == 0 || $calc == 1)	// Calculate on invoice for goods and services
-{
+if ($calc == 0 || $calc == 1) {	// Calculate on invoice for goods and services
 	$calcmode = $calc == 0 ? $langs->trans("CalcModeLT".$local) : $langs->trans("CalcModeLT".$local."Rec");
 	$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-	if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
+	if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) {
+		$description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
+	}
 	$description .= $fsearch;
 	$description .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
 	$builddate = dol_now();
@@ -134,12 +154,13 @@ if ($calc == 0 || $calc == 1)	// Calculate on invoice for goods and services
 	$productsup = $langs->trans("Description");
 	$amountsup = $langs->trans("AmountHT");
 }
-if ($calc == 2) 	// Invoice for goods, payment for services
-{
+if ($calc == 2) { 	// Invoice for goods, payment for services
 	$calcmode = $langs->trans("CalcModeLT2Debt");
 	$calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-	if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) $description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
+	if (!empty($conf->global->MAIN_MODULE_COMPTABILITE)) {
+		$description .= '<br>'.$langs->trans("WarningDepositsNotIncluded");
+	}
 	$description .= $fsearch;
 	$description .= '<span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRulesLT", DOL_URL_ROOT.'/admin/company.php').')</span>';
 	$builddate = dol_now();
@@ -161,8 +182,7 @@ print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 
 // IRPF that the customer has retained me
-if ($calc == 0 || $calc == 2)
-{
+if ($calc == 0 || $calc == 2) {
 	print '<tr class="liste_titre">';
 	print '<td class="left">'.$langs->trans("Num").'</td>';
 	print '<td class="left">'.$langs->trans("Customer").'</td>';
@@ -185,19 +205,14 @@ if ($calc == 0 || $calc == 2)
 	$hookmanager->initHooks(array('externalbalance'));
 	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-	if (is_array($coll_list))
-	{
+	if (is_array($coll_list)) {
 		$total = 0; $totalamount = 0;
 		$i = 1;
-		foreach ($coll_list as $coll)
-		{
-			if (($min == 0 || ($min > 0 && $coll->amount > $min)) && ($local == 1 ? $coll->localtax1 : $coll->localtax2) != 0)
-			{
+		foreach ($coll_list as $coll) {
+			if (($min == 0 || ($min > 0 && $coll->amount > $min)) && ($local == 1 ? $coll->localtax1 : $coll->localtax2) != 0) {
 				$intra = str_replace($find, $replace, $coll->tva_intra);
-				if (empty($intra))
-				{
-					if ($coll->assuj == '1')
-					{
+				if (empty($intra)) {
+					if ($coll->assuj == '1') {
 						$intra = $langs->trans('Unknown');
 					} else {
 						$intra = '';
@@ -227,11 +242,13 @@ if ($calc == 0 || $calc == 2)
 		print '</tr>';
 	} else {
 		$langs->load("errors");
-		if ($coll_list == -1)
+		if ($coll_list == -1) {
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-		elseif ($coll_list == -2)
+		} elseif ($coll_list == -2) {
 			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		else print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		} else {
+			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		}
 	}
 }
 
@@ -252,19 +269,14 @@ if ($calc == 0 || $calc == 1) {
 	$parameters["type"] = 'localtax'.$local;
 
 	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-	if (is_array($coll_list))
-	{
+	if (is_array($coll_list)) {
 		$total = 0; $totalamount = 0;
 		$i = 1;
-		foreach ($coll_list as $coll)
-		{
-			if (($min == 0 || ($min > 0 && $coll->amount > $min)) && ($local == 1 ? $coll->localtax1 : $coll->localtax2) != 0)
-			{
+		foreach ($coll_list as $coll) {
+			if (($min == 0 || ($min > 0 && $coll->amount > $min)) && ($local == 1 ? $coll->localtax1 : $coll->localtax2) != 0) {
 				$intra = str_replace($find, $replace, $coll->tva_intra);
-				if (empty($intra))
-				{
-					if ($coll->assuj == '1')
-					{
+				if (empty($intra)) {
+					if ($coll->assuj == '1') {
 						$intra = $langs->trans('Unknown');
 					} else {
 						$intra = '';
@@ -294,11 +306,13 @@ if ($calc == 0 || $calc == 1) {
 		print '</tr>';
 	} else {
 		$langs->load("errors");
-		if ($coll_list == -1)
+		if ($coll_list == -1) {
 			print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-		elseif ($coll_list == -2)
+		} elseif ($coll_list == -2) {
 			print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-		else print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		} else {
+			print '<tr><td colspan="5">'.$langs->trans("Error").'</td></tr>';
+		}
 	}
 }
 
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index bedb7259184..051a98a4b3b 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -37,8 +37,7 @@ $localTaxType = GETPOST('localTaxType', 'int');
 
 // Date range
 $year = GETPOST("year", "int");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$year_start = $year_current;
 } else {
@@ -47,32 +46,46 @@ if (empty($year))
 }
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int");
-	if (empty($q))
-	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
+	if (empty($q)) {
+		if (GETPOST("month", "int")) {
+			$date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
+		} else {
 			$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 			$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
 		}
 	} else {
-		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+		if ($q == 1) {
+			$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+		}
+		if ($q == 2) {
+			$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+		}
+		if ($q == 3) {
+			$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+		}
+		if ($q == 4) {
+			$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+		}
 	}
 }
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = $conf->global->TAX_MODE;
-if (GETPOSTISSET("modetax")) $modetax = GETPOST("modetax", 'int');
-if (empty($modetax)) $modetax = 0;
+if (GETPOSTISSET("modetax")) {
+	$modetax = GETPOST("modetax", 'int');
+}
+if (empty($modetax)) {
+	$modetax = 0;
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 
@@ -114,8 +127,7 @@ function pt($db, $sql, $date)
 			$mode = $obj->mode;
 
 			//print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
-			if ($obj->mode == 'claimed' && !empty($previousmode))
-			{
+			if ($obj->mode == 'claimed' && !empty($previousmode)) {
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$previousmonth."</td>\n";
 				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
@@ -126,19 +138,16 @@ function pt($db, $sql, $date)
 				$amountpaid = 0;
 			}
 
-			if ($obj->mode == 'claimed')
-			{
+			if ($obj->mode == 'claimed') {
 				$amountclaimed = $obj->mm;
 				$totalclaimed = $totalclaimed + $amountclaimed;
 			}
-			if ($obj->mode == 'paid')
-			{
+			if ($obj->mode == 'paid') {
 				$amountpaid = $obj->mm;
 				$totalpaid = $totalpaid + $amountpaid;
 			}
 
-			if ($obj->mode == 'paid')
-			{
+			if ($obj->mode == 'paid') {
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">'.$obj->dm."</td>\n";
 				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
@@ -156,8 +165,7 @@ function pt($db, $sql, $date)
 			$i++;
 		}
 
-		if ($mode == 'claimed' && !empty($previousmode))
-		{
+		if ($mode == 'claimed' && !empty($previousmode)) {
 			print '<tr class="oddeven">';
 			print '<td class="nowrap">'.$previousmonth."</td>\n";
 			print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
@@ -181,8 +189,7 @@ function pt($db, $sql, $date)
 	}
 }
 
-if (empty($localTaxType))
-{
+if (empty($localTaxType)) {
 	accessforbidden('Parameter localTaxType is missing');
 	exit;
 }
@@ -281,11 +288,14 @@ $mend = $tmp['mon'];
 
 $total = 0; $subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
 $i = 0; $mcursor = 0;
-while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mcursor is to avoid too large loop
-{
+while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) {	// $mcursor is to avoid too large loop
 	//$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
-	if ($m == 13) $y++;
-	if ($m > 12) $m -= 12;
+	if ($m == 13) {
+		$y++;
+	}
+	if ($m > 12) {
+		$m -= 12;
+	}
 	$mcursor++;
 
 	// Get array with details of each line
@@ -294,8 +304,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 
 	$x_both = array();
 	//now, from these two arrays, get another array with one rate per line
-	foreach (array_keys($x_coll) as $my_coll_rate)
-	{
+	foreach (array_keys($x_coll) as $my_coll_rate) {
 		$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
 		$x_both[$my_coll_rate]['coll']['vat'] = $x_coll[$my_coll_rate]['vat'];
 		$x_both[$my_coll_rate]['coll']['localtax1']	 = $x_coll[$my_coll_rate]['localtax1'];
@@ -306,7 +315,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 		$x_both[$my_coll_rate]['paye']['localtax2'] = 0;
 		$x_both[$my_coll_rate]['coll']['links'] = '';
 		$x_both[$my_coll_rate]['coll']['detail'] = array();
-		foreach ($x_coll[$my_coll_rate]['facid'] as $id=>$dummy) {
+		foreach ($x_coll[$my_coll_rate]['facid'] as $id => $dummy) {
 			//$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
 			//$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
 			//$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
@@ -352,11 +361,9 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 		$x_both[$my_paye_rate]['paye']['links'] = '';
 		$x_both[$my_paye_rate]['paye']['detail'] = array();
 
-		foreach ($x_paye[$my_paye_rate]['facid'] as $id=>$dummy)
-		{
+		foreach ($x_paye[$my_paye_rate]['facid'] as $id => $dummy) {
 			// ExpenseReport
-			if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment')
-			{
+			if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment') {
 				//$expensereport->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$expensereport->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$expensereport->type=$x_paye[$my_paye_rate]['type'][$id];
@@ -425,14 +432,12 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	$hookmanager->initHooks(array('externalbalance'));
 	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-	if (!is_array($x_coll) && $coll_listbuy == -1)
-	{
+	if (!is_array($x_coll) && $coll_listbuy == -1) {
 		$langs->load("errors");
 		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
 		break;
 	}
-	if (!is_array($x_paye) && $coll_listbuy == -2)
-	{
+	if (!is_array($x_paye) && $coll_listbuy == -2) {
 		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
 		break;
 	}
@@ -442,17 +447,14 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/localtax/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
 
 	$x_coll_sum = 0;
-	foreach (array_keys($x_coll) as $rate)
-	{
+	foreach (array_keys($x_coll) as $rate) {
 		$subtot_coll_total_ht = 0;
 		$subtot_coll_vat = 0;
 
-		foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
-		{
+		foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
 			// Payment
 			$ratiopaymentinvoice = 1;
-			if ($modetax != 1)
-			{
+			if ($modetax != 1) {
 				// Define type
 				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
 				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
@@ -466,8 +468,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				}
 
 				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-				{
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
 					//print $langs->trans("NA");
 				} else {
 					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
@@ -486,17 +487,14 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
 
 	$x_paye_sum = 0;
-	foreach (array_keys($x_paye) as $rate)
-	{
+	foreach (array_keys($x_paye) as $rate) {
 		$subtot_paye_total_ht = 0;
 		$subtot_paye_vat = 0;
 
-		foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
-		{
+		foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
 			// Payment
 			$ratiopaymentinvoice = 1;
-			if ($modetax != 1)
-			{
+			if ($modetax != 1) {
 				// Define type
 				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
 				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
@@ -510,8 +508,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				}
 
 				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-				{
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
 					//print $langs->trans("NA");
 				} else {
 					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
@@ -541,8 +538,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	print "</tr>\n";
 
 	$i++; $m++;
-	if ($i > 2)
-	{
+	if ($i > 2) {
 		print '<tr class="liste_total">';
 		print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
 		print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 4d7e2bf0e54..8742589a6a9 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -29,7 +29,9 @@ $langs->load("compta");
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 $ltt = GETPOST("localTaxType", 'int');
 
@@ -43,7 +45,9 @@ llxHeader();
 $localtax_static = new Localtax($db);
 
 $url = DOL_URL_ROOT.'/compta/localtax/card.php?action=create&localTaxType='.$ltt;
-if (!empty($socid)) $url .= '&socid='.$socid;
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
 $newcardbutton = dolGetButtonTitle($langs->trans('NewLocalTaxPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
 
 print load_fiche_titre($langs->transcountry($ltt == 2 ? "LT2Payments" : "LT1Payments", $mysoc->country_code), $newcardbutton, 'title_accountancy');
@@ -54,8 +58,7 @@ $sql .= " WHERE f.entity = ".$conf->entity." AND localtaxtype = ".$db->escape($l
 $sql .= " ORDER BY datev DESC";
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 	$total = 0;
@@ -69,8 +72,7 @@ if ($result)
 	print "<td align=\"right\">".$langs->trans("PayedByThisPayment")."</td>";
 	print "</tr>\n";
 	$var = 1;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/compta/localtax/quadri_detail.php b/htdocs/compta/localtax/quadri_detail.php
index 2b0415800ac..aec90544e09 100644
--- a/htdocs/compta/localtax/quadri_detail.php
+++ b/htdocs/compta/localtax/quadri_detail.php
@@ -47,8 +47,7 @@ $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "produ
 $local = GETPOST('localTaxType', 'int');
 // Date range
 $year = GETPOST("year", "int");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$year_start = $year_current;
 } else {
@@ -58,43 +57,62 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int");
-	if (empty($q))
-	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
+	if (empty($q)) {
+		if (GETPOST("month", "int")) {
+			$date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
+		} else {
 			$date_start = dol_get_first_day($year_start, empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START, false);
-			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
+			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) {
+				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) {
+				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {
+				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
+			}
 		}
 	} else {
-		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+		if ($q == 1) {
+			$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+		}
+		if ($q == 2) {
+			$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+		}
+		if ($q == 3) {
+			$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+		}
+		if ($q == 4) {
+			$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+		}
 	}
 }
 
 $min = price2num(GETPOST("min", "alpha"));
-if (empty($min)) $min = 0;
+if (empty($min)) {
+	$min = 0;
+}
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 //$modetax = $conf->global->TAX_MODE;
 $calc = $conf->global->MAIN_INFO_LOCALTAX_CALC.$local;
 $modetax = $conf->global->$calc;
-if (GETPOSTISSET("modetax")) $modetax = GETPOST("modetax", 'int');
-if (empty($modetax)) $modetax = 0;
+if (GETPOSTISSET("modetax")) {
+	$modetax = GETPOST("modetax", 'int');
+}
+if (empty($modetax)) {
+	$modetax = 0;
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
-if (empty($local))
-{
+if (empty($local)) {
 	accessforbidden('Parameter localTaxType is missing');
 	exit;
 }
@@ -117,9 +135,10 @@ $paymentexpensereport_static = new PaymentExpenseReport($db);
 
 $morequerystring = '';
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
-foreach ($listofparams as $param)
-{
-	if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+foreach ($listofparams as $param) {
+	if (GETPOST($param) != '') {
+		$morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+	}
 }
 
 llxHeader('', $langs->trans("LocalTaxReport"), '', '', 0, 0, '', '', $morequerystring);
@@ -131,9 +150,15 @@ $fsearch .= '<input type="hidden" name="localTaxType" value="'.$local.'">';
 
 $name = $langs->transcountry($local == 1 ? "LT1ReportByQuarters" : "LT2ReportByQuarters", $mysoc->country_code);
 $calcmode = '';
-if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
-if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
-if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
+if ($modetax == 0) {
+	$calcmode = $langs->trans('OptionVATDefault');
+}
+if ($modetax == 1) {
+	$calcmode = $langs->trans('OptionVATDebitOption');
+}
+if ($modetax == 2) {
+	$calcmode = $langs->trans('OptionPaymentForProductAndServices');
+}
 $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -164,7 +189,9 @@ if (! empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$description.='<br>'.$langs->trans("DepositsAreNotIncluded");
 }
 */
-if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= $langs->trans("ThisIsAnEstimatedValue");
+if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) {
+	$description .= $langs->trans("ThisIsAnEstimatedValue");
+}
 
 // Customers invoices
 $elementcust = $langs->trans("CustomersInvoices");
@@ -212,28 +239,27 @@ $columns = 4;
 $x_coll = tax_by_rate('localtax'.$local, $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
 $x_paye = tax_by_rate('localtax'.$local, $db, 0, 0, $date_start, $date_end, $modetax, 'buy');
 
-if (!is_array($x_coll) || !is_array($x_paye))
-{
+if (!is_array($x_coll) || !is_array($x_paye)) {
 	$langs->load("errors");
-	if ($x_coll == -1)
+	if ($x_coll == -1) {
 		print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-	elseif ($x_coll == -2)
+	} elseif ($x_coll == -2) {
 		print '<tr><td colspan="'.$columns.'">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-	else print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
+	} else {
+		print '<tr><td colspan="'.$columns.'">'.$langs->trans("Error").'</td></tr>';
+	}
 } else {
 	$x_both = array();
 
 	//now, from these two arrays, get another array with one rate per line
-	foreach (array_keys($x_coll) as $my_coll_rate)
-	{
+	foreach (array_keys($x_coll) as $my_coll_rate) {
 		$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
 		$x_both[$my_coll_rate]['coll']['localtax'.$local] = $x_coll[$my_coll_rate]['localtax'.$local];
 		$x_both[$my_coll_rate]['paye']['totalht'] = 0;
 		$x_both[$my_coll_rate]['paye']['localtax'.$local] = 0;
 		$x_both[$my_coll_rate]['coll']['links'] = '';
 		$x_both[$my_coll_rate]['coll']['detail'] = array();
-		foreach ($x_coll[$my_coll_rate]['facid'] as $id=>$dummy)
-		{
+		foreach ($x_coll[$my_coll_rate]['facid'] as $id => $dummy) {
 			$invoice_customer->id = $x_coll[$my_coll_rate]['facid'][$id];
 			$invoice_customer->ref = $x_coll[$my_coll_rate]['facnum'][$id];
 			$invoice_customer->type = $x_coll[$my_coll_rate]['type'][$id];
@@ -273,8 +299,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		$x_both[$my_paye_rate]['paye']['links'] = '';
 		$x_both[$my_paye_rate]['paye']['detail'] = array();
 
-		foreach ($x_paye[$my_paye_rate]['facid'] as $id=>$dummy)
-		{
+		foreach ($x_paye[$my_paye_rate]['facid'] as $id => $dummy) {
 			$invoice_supplier->id = $x_paye[$my_paye_rate]['facid'][$id];
 			$invoice_supplier->ref = $x_paye[$my_paye_rate]['facnum'][$id];
 			$invoice_supplier->type = $x_paye[$my_paye_rate]['type'][$id];
@@ -312,15 +337,23 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	$x_paye_ht = 0;
 
 	$span = $columns - 1;
-	if ($modetax != 2) $span += 1;
-	if ($modetax != 1) $span += 1;
+	if ($modetax != 2) {
+		$span += 1;
+	}
+	if ($modetax != 1) {
+		$span += 1;
+	}
 
 	// Customers invoices
 	print '<tr class="liste_titre">';
 	print '<td class="left">'.$elementcust.'</td>';
 	print '<td class="left">'.$productcust.'</td>';
-	if ($modetax != 2) print '<td class="right">'.$amountcust.'</td>';
-	if ($modetax != 1) print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	if ($modetax != 2) {
+		print '<td class="right">'.$amountcust.'</td>';
+	}
+	if ($modetax != 1) {
+		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
+	}
 	print '<td class="right">'.$langs->trans("BI").'</td>';
 	print '<td class="right">'.$vatcust.'</td>';
 	print '</tr>';
@@ -328,29 +361,29 @@ if (!is_array($x_coll) || !is_array($x_paye))
 
 	$LT = 0;
 	$sameLT = false;
-	foreach (array_keys($x_coll) as $rate)
-	{
+	foreach (array_keys($x_coll) as $rate) {
 		$subtot_coll_total_ht = 0;
 		$subtot_coll_vat = 0;
 
-		if (is_array($x_both[$rate]['coll']['detail']))
-		{
+		if (is_array($x_both[$rate]['coll']['detail'])) {
 			// VAT Rate
 			if ($rate != 0) {
 				print "<tr>";
 				print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
 				print '</tr>'."\n";
 			}
-			foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
-			{
-				if (($local == 1 && $fields['localtax1'] != 0) || ($local == 2 && $fields['localtax2'] != 0))
-				{
+			foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
+				if (($local == 1 && $fields['localtax1'] != 0) || ($local == 2 && $fields['localtax2'] != 0)) {
 					// Define type
 					$type = ($fields['dtype'] ? $fields['dtype'] : $fields['ptype']);
 					// Try to enhance type detection using date_start and date_end for free lines where type
 					// was not saved.
-					if (!empty($fields['ddate_start'])) $type = 1;
-					if (!empty($fields['ddate_end'])) $type = 1;
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
 
 
 					print '<tr class="oddeven">';
@@ -360,21 +393,28 @@ if (!is_array($x_coll) || !is_array($x_paye))
 
 					// Description
 					print '<td class="left">';
-					if ($fields['pid'])
-					{
+					if ($fields['pid']) {
 						$product_static->id = $fields['pid'];
 						$product_static->ref = $fields['pref'];
 						$product_static->type = $fields['ptype'];
 						print $product_static->getNomUrl(1);
-						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
+						}
 					} else {
-						if ($type) $text = img_object($langs->trans('Service'), 'service');
-						else $text = img_object($langs->trans('Product'), 'product');
-						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg))
-						{
-							if ($reg[1] == 'DEPOSIT') $fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
-							elseif ($reg[1] == 'CREDIT_NOTE') $fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
-							else $fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
+						if (preg_match('/^\((.*)\)$/', $fields['descr'], $reg)) {
+							if ($reg[1] == 'DEPOSIT') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('Deposit');
+							} elseif ($reg[1] == 'CREDIT_NOTE') {
+								$fields['descr'] = $langs->transnoentitiesnoconv('CreditNote');
+							} else {
+								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
+							}
 						}
 						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
 
@@ -384,12 +424,10 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					print '</td>';
 
 					// Total HT
-					if ($modetax != 2)
-					{
+					if ($modetax != 2) {
 						print '<td class="nowrap right">';
 						print price($fields['totalht']);
-						if (price2num($fields['ftotal_ttc']))
-						{
+						if (price2num($fields['ftotal_ttc'])) {
 							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
 						}
 						print '</td>';
@@ -397,21 +435,22 @@ if (!is_array($x_coll) || !is_array($x_paye))
 
 					// Payment
 					$ratiopaymentinvoice = 1;
-					if ($modetax != 1)
-					{
-						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					if ($modetax != 1) {
+						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+						}
 						print '<td class="nowrap right">';
-						if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-						{
+						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
 							$payment_static->id = $fields['payment_id'];
 							print $payment_static->getNomUrl(2);
 						}
-						if ($type == 0)
-						{
+						if ($type == 0) {
 							print $langs->trans("NotUsedForGoods");
 						} else {
 							print price($fields['payment_amount']);
-							if (isset($fields['payment_amount'])) print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
+							if (isset($fields['payment_amount'])) {
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
+							}
 						}
 						print '</td>';
 					}
@@ -419,7 +458,9 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					// Total collected
 					print '<td class="nowrap right">';
 					$temp_ht = $fields['totalht'];
-					if ($type == 1) $temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					if ($type == 1) {
+						$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+					}
 					print price(price2num($temp_ht, 'MT'));
 					print '</td>';
 
@@ -442,8 +483,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		print '<tr class="liste_total">';
 		print '<td></td>';
 		print '<td class="right">'.$langs->trans("Total").':</td>';
-		if ($modetax != 1)
-		{
+		if ($modetax != 1) {
 			print '<td class="nowrap right">&nbsp;</td>';
 			print '<td class="right">&nbsp;</td>';
 		}
@@ -452,13 +492,11 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		print '</tr>';
 	}
 
-	if (count($x_coll) == 0)   // Show a total ine if nothing shown
-	{
+	if (count($x_coll) == 0) {   // Show a total ine if nothing shown
 		print '<tr class="liste_total">';
 		print '<td>&nbsp;</td>';
 		print '<td class="right">'.$langs->trans("Total").':</td>';
-		if ($modetax == 0)
-		{
+		if ($modetax == 0) {
 			print '<td class="nowrap right">&nbsp;</td>';
 			print '<td class="right">&nbsp;</td>';
 		}
@@ -477,8 +515,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	print '<tr class="liste_titre">';
 	print '<td class="left">'.$elementsup.'</td>';
 	print '<td class="left">'.$productsup.'</td>';
-	if ($modetax != 1)
-	{
+	if ($modetax != 1) {
 		print '<td class="right">'.$amountsup.'</td>';
 		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
 	}
@@ -486,28 +523,28 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	print '<td class="right">'.$vatsup.'</td>';
 	print '</tr>'."\n";
 
-	foreach (array_keys($x_paye) as $rate)
-	{
+	foreach (array_keys($x_paye) as $rate) {
 		$subtot_paye_total_ht = 0;
 		$subtot_paye_vat = 0;
 
-		if (is_array($x_both[$rate]['paye']['detail']))
-		{
+		if (is_array($x_both[$rate]['paye']['detail'])) {
 			if ($rate != 0) {
 				print "<tr>";
 				print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.$span.'"></td>';
 				print '</tr>'."\n";
 			}
-			foreach ($x_both[$rate]['paye']['detail'] as $index=>$fields)
-			{
-				if (($local == 1 && $fields['localtax1'] != 0) || ($local == 2 && $fields['localtax2'] != 0))
-				{
+			foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
+				if (($local == 1 && $fields['localtax1'] != 0) || ($local == 2 && $fields['localtax2'] != 0)) {
 					// Define type
 					$type = ($fields['dtype'] ? $fields['dtype'] : $fields['ptype']);
 					// Try to enhance type detection using date_start and date_end for free lines where type
 					// was not saved.
-					if (!empty($fields['ddate_start'])) $type = 1;
-					if (!empty($fields['ddate_end'])) $type = 1;
+					if (!empty($fields['ddate_start'])) {
+						$type = 1;
+					}
+					if (!empty($fields['ddate_end'])) {
+						$type = 1;
+					}
 
 
 					print '<tr class="oddeven">';
@@ -517,16 +554,20 @@ if (!is_array($x_coll) || !is_array($x_paye))
 
 					// Description
 					print '<td class="left">';
-					if ($fields['pid'])
-					{
+					if ($fields['pid']) {
 						$product_static->id = $fields['pid'];
 						$product_static->ref = $fields['pref'];
 						$product_static->type = $fields['ptype'];
 						print $product_static->getNomUrl(1);
-						if (dol_string_nohtmltag($fields['descr'])) print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
+						if (dol_string_nohtmltag($fields['descr'])) {
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
+						}
 					} else {
-						if ($type) $text = img_object($langs->trans('Service'), 'service');
-						else $text = img_object($langs->trans('Product'), 'product');
+						if ($type) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
 						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 16);
 
 						// Show range
@@ -535,12 +576,10 @@ if (!is_array($x_coll) || !is_array($x_paye))
 					print '</td>';
 
 					// Total HT
-					if ($modetax != 2)
-					{
+					if ($modetax != 2) {
 						print '<td class="nowrap right">';
 						print price($fields['totalht']);
-						if (price2num($fields['ftotal_ttc']))
-						{
+						if (price2num($fields['ftotal_ttc'])) {
 							//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
 							$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
 							//print ' ('.round($ratiolineinvoice*100,2).'%)';
@@ -550,17 +589,16 @@ if (!is_array($x_coll) || !is_array($x_paye))
 
 					// Payment
 					$ratiopaymentinvoice = 1;
-					if ($modetax != 1)
-					{
+					if ($modetax != 1) {
 						print '<td class="nowrap right">';
-						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) $ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-						if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-						{
+						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
+							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+						}
+						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
 							$paymentfourn_static->id = $fields['payment_id'];
 							print $paymentfourn_static->getNomUrl(2);
 						}
-						if ($type == 0)
-						{
+						if ($type == 0) {
 							print $langs->trans("NA");
 						} else {
 							print price(price2num($fields['payment_amount'], 'MT'));
@@ -596,8 +634,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		print '<tr class="liste_total">';
 		print '<td>&nbsp;</td>';
 		print '<td class="right">'.$langs->trans("Total").':</td>';
-		if ($modetax != 1)
-		{
+		if ($modetax != 1) {
 			print '<td class="nowrap right">&nbsp;</td>';
 			print '<td class="right">&nbsp;</td>';
 		}
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 8ea227482b1..0fcbf6a914a 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -59,16 +59,14 @@ $multicurrency_amounts = array();
 $multicurrency_amountsresttopay = array();
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
 $object = new Facture($db);
 
 // Load object
-if ($facid > 0)
-{
+if ($facid > 0) {
 	$ret = $object->fetch($facid);
 }
 
@@ -84,12 +82,12 @@ $formquestion = array();
 
 $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))
-{
-	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes'))
-	{
+if (empty($reshook)) {
+	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes')) {
 		$error = 0;
 
 		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
@@ -102,28 +100,27 @@ if (empty($reshook))
 
 		// Generate payment array and check if there is payment higher than invoice and payment date before invoice date
 		$tmpinvoice = new Facture($db);
-		foreach ($_POST as $key => $value)
-		{
-			if (substr($key, 0, 7) == 'amount_' && GETPOST($key) != '')
-			{
+		foreach ($_POST as $key => $value) {
+			if (substr($key, 0, 7) == 'amount_' && GETPOST($key) != '') {
 				$cursorfacid = substr($key, 7);
 				$amounts[$cursorfacid] = price2num(GETPOST($key));
 				$totalpayment = $totalpayment + $amounts[$cursorfacid];
-				if (!empty($amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+				if (!empty($amounts[$cursorfacid])) {
+					$atleastonepaymentnotnull++;
+				}
 				$result = $tmpinvoice->fetch($cursorfacid);
-				if ($result <= 0) dol_print_error($db);
+				if ($result <= 0) {
+					dol_print_error($db);
+				}
 				$amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
-				if ($amounts[$cursorfacid])
-				{
+				if ($amounts[$cursorfacid]) {
 					// Check amount
-					if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
-					{
+					if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid]))) {
 						$addwarning = 1;
 						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
 					}
 					// Check date
-					if ($datepaye && ($datepaye < $tmpinvoice->date))
-					{
+					if ($datepaye && ($datepaye < $tmpinvoice->date)) {
 						$langs->load("errors");
 						//$error++;
 						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
@@ -131,26 +128,26 @@ if (empty($reshook))
 				}
 
 				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-			} elseif (substr($key, 0, 21) == 'multicurrency_amount_')
-			{
+			} elseif (substr($key, 0, 21) == 'multicurrency_amount_') {
 				$cursorfacid = substr($key, 21);
 				$multicurrency_amounts[$cursorfacid] = price2num(GETPOST($key));
 				$multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
-				if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+				if (!empty($multicurrency_amounts[$cursorfacid])) {
+					$atleastonepaymentnotnull++;
+				}
 				$result = $tmpinvoice->fetch($cursorfacid);
-				if ($result <= 0) dol_print_error($db);
+				if ($result <= 0) {
+					dol_print_error($db);
+				}
 				$multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
-				if ($multicurrency_amounts[$cursorfacid])
-				{
+				if ($multicurrency_amounts[$cursorfacid]) {
 					// Check amount
-					if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
-					{
+					if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid]))) {
 						$addwarning = 1;
 						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPay")).' '.$langs->trans("HelpPaymentHigherThanReminderToPay");
 					}
 					// Check date
-					if ($datepaye && ($datepaye < $tmpinvoice->date))
-					{
+					if ($datepaye && ($datepaye < $tmpinvoice->date)) {
 						$langs->load("errors");
 						//$error++;
 						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
@@ -162,37 +159,31 @@ if (empty($reshook))
 		}
 
 		// Check parameters
-		if (!GETPOST('paiementcode'))
-		{
+		if (!GETPOST('paiementcode')) {
 			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
 			$error++;
 		}
 
-		if (!empty($conf->banque->enabled))
-		{
+		if (!empty($conf->banque->enabled)) {
 			// If bank module is on, account is required to enter a payment
-			if (GETPOST('accountid') <= 0)
-			{
+			if (GETPOST('accountid') <= 0) {
 				setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
 				$error++;
 			}
 		}
 
-		if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
-		{
+		if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull)) {
 			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
 			$error++;
 		}
 
-		if (empty($datepaye))
-		{
+		if (empty($datepaye)) {
 			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
 			$error++;
 		}
 
 		// Check if payments in both currency
-		if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
-		{
+		if ($totalpayment > 0 && $multicurrency_totalpayment > 0) {
 			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
 			$error++;
 		}
@@ -201,10 +192,8 @@ if (empty($reshook))
 	/*
 	 * Action add_paiement
 	 */
-	if ($action == 'add_paiement')
-	{
-		if ($error)
-		{
+	if ($action == 'add_paiement') {
+		if ($error) {
 			$action = 'create';
 		}
 		// The next of this action is displayed at the page's bottom.
@@ -213,8 +202,7 @@ if (empty($reshook))
 	/*
 	 * Action confirm_paiement
 	 */
-	if ($action == 'confirm_paiement' && $confirm == 'yes')
-	{
+	if ($action == 'confirm_paiement' && $confirm == 'yes') {
 		$error = 0;
 
 		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
@@ -222,36 +210,32 @@ if (empty($reshook))
 		$db->begin();
 
 		$thirdparty = new Societe($db);
-		if ($socid > 0) $thirdparty->fetch($socid);
+		if ($socid > 0) {
+			$thirdparty->fetch($socid);
+		}
 
 		// Clean parameters amount if payment is for a credit note
-		foreach ($amounts as $key => $value)	// How payment is dispatched
-		{
+		foreach ($amounts as $key => $value) {	// How payment is dispatched
 			$tmpinvoice = new Facture($db);
 			$tmpinvoice->fetch($key);
-			if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
-			{
+			if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE) {
 				$newvalue = price2num($value, 'MT');
 				$amounts[$key] = - abs($newvalue);
 			}
 		}
 
-		foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
-		{
+		foreach ($multicurrency_amounts as $key => $value) {	// How payment is dispatched
 			$tmpinvoice = new Facture($db);
 			$tmpinvoice->fetch($key);
-			if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE)
-			{
+			if ($tmpinvoice->type == Facture::TYPE_CREDIT_NOTE) {
 				$newvalue = price2num($value, 'MT');
 				$multicurrency_amounts[$key] = - abs($newvalue);
 			}
 		}
 
-		if (!empty($conf->banque->enabled))
-		{
+		if (!empty($conf->banque->enabled)) {
 			// If the bank module is active, an account is required to input a payment
-			if (GETPOST('accountid', 'int') <= 0)
-			{
+			if (GETPOST('accountid', 'int') <= 0) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
 				$error++;
 			}
@@ -266,47 +250,48 @@ if (empty($reshook))
 		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
 		$paiement->note_private = GETPOST('comment', 'alpha');
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Create payment and update this->multicurrency_amounts if this->amounts filled or
 			// this->amounts if this->multicurrency_amounts filled.
 			$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
-			if ($paiement_id < 0)
-			{
+			if ($paiement_id < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$label = '(CustomerInvoicePayment)';
-			if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) $label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) {
+				$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+			}
 			$result = $paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid'), GETPOST('chqemetteur'), GETPOST('chqbank'));
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 
 			// If payment dispatching on more than one invoice, we stay on summary page, otherwise jump on invoice card
 			$invoiceid = 0;
-			foreach ($paiement->amounts as $key => $amount)
-			{
+			foreach ($paiement->amounts as $key => $amount) {
 				$facid = $key;
-				if (is_numeric($amount) && $amount <> 0)
-				{
-					if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
-					else $invoiceid = $facid;
+				if (is_numeric($amount) && $amount <> 0) {
+					if ($invoiceid != 0) {
+						$invoiceid = -1; // There is more than one invoice payed by this payment
+					} else {
+						$invoiceid = $facid;
+					}
 				}
 			}
-			if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
-			else $loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
+			if ($invoiceid > 0) {
+				$loc = DOL_URL_ROOT.'/compta/facture/card.php?facid='.$invoiceid;
+			} else {
+				$loc = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id;
+			}
 			header('Location: '.$loc);
 			exit;
 		} else {
@@ -327,23 +312,24 @@ llxHeader('', $langs->trans("Payment"));
 
 
 
-if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
-{
+if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement') {
 	$facture = new Facture($db);
 	$result = $facture->fetch($facid);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		$facture->fetch_thirdparty();
 
 		$title = '';
-		if ($facture->type != Facture::TYPE_CREDIT_NOTE) $title .= $langs->trans("EnterPaymentReceivedFromCustomer");
-		if ($facture->type == Facture::TYPE_CREDIT_NOTE) $title .= $langs->trans("EnterPaymentDueToCustomer");
+		if ($facture->type != Facture::TYPE_CREDIT_NOTE) {
+			$title .= $langs->trans("EnterPaymentReceivedFromCustomer");
+		}
+		if ($facture->type == Facture::TYPE_CREDIT_NOTE) {
+			$title .= $langs->trans("EnterPaymentDueToCustomer");
+		}
 		print load_fiche_titre($title);
 
 		// Initialize data for confirmation (this is used because data can be change during confirmation)
-		if ($action == 'add_paiement')
-		{
+		if ($action == 'add_paiement') {
 			$i = 0;
 
 			$formquestion[$i++] = array('type' => 'hidden', 'name' => 'facid', 'value' => $facture->id);
@@ -353,15 +339,15 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 		// Invoice with Paypal transaction
 		// TODO add hook here
-		if (!empty($conf->paypalplus->enabled) && $conf->global->PAYPAL_ENABLE_TRANSACTION_MANAGEMENT && !empty($facture->ref_ext))
-		{
-			if (!empty($conf->global->PAYPAL_BANK_ACCOUNT)) $accountid = $conf->global->PAYPAL_BANK_ACCOUNT;
+		if (!empty($conf->paypalplus->enabled) && $conf->global->PAYPAL_ENABLE_TRANSACTION_MANAGEMENT && !empty($facture->ref_ext)) {
+			if (!empty($conf->global->PAYPAL_BANK_ACCOUNT)) {
+				$accountid = $conf->global->PAYPAL_BANK_ACCOUNT;
+			}
 			$paymentnum = $facture->ref_ext;
 		}
 
 		// Add realtime total information
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print '$(document).ready(function () {
             			setPaiementCode();
@@ -492,10 +478,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 		// Bank account
 		print '<tr>';
-		if (!empty($conf->banque->enabled))
-		{
-			if ($facture->type != 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
-			if ($facture->type == 2) print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
+		if (!empty($conf->banque->enabled)) {
+			if ($facture->type != 2) {
+				print '<td><span class="fieldrequired">'.$langs->trans('AccountToCredit').'</span></td>';
+			}
+			if ($facture->type == 2) {
+				print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
+			}
 			print '<td>';
 			$form->select_comptes($accountid, 'accountid', 0, '', 2);
 			print '</td>';
@@ -533,8 +522,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 
 		/*
-         * List of unpaid invoices
-         */
+		 * List of unpaid invoices
+		 */
 
 		$sql = 'SELECT f.rowid as facid, f.ref, f.total_ttc, f.multicurrency_code, f.multicurrency_total_ttc, f.type,';
 		$sql .= ' f.datef as df, f.fk_soc as socid, f.date_lim_reglement as dlr';
@@ -551,8 +540,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		}
 		$sql .= ') AND f.paye = 0';
 		$sql .= ' AND f.fk_statut = 1'; // Statut=0 => not validated, Statut=2 => canceled
-		if ($facture->type != Facture::TYPE_CREDIT_NOTE)
-		{
+		if ($facture->type != Facture::TYPE_CREDIT_NOTE) {
 			$sql .= ' AND type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
 		} else {
 			$sql .= ' AND type = 2'; // If paying back a credit note, we show all credit notes
@@ -561,19 +549,23 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 		$sql .= ' ORDER BY f.datef ASC, f.ref ASC';
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$arraytitle = $langs->trans('Invoice');
-				if ($facture->type == 2) $arraytitle = $langs->trans("CreditNotes");
+				if ($facture->type == 2) {
+					$arraytitle = $langs->trans("CreditNotes");
+				}
 				$alreadypayedlabel = $langs->trans('Received');
 				$multicurrencyalreadypayedlabel = $langs->trans('MulticurrencyReceived');
-				if ($facture->type == 2) { $alreadypayedlabel = $langs->trans("PaidBack"); $multicurrencyalreadypayedlabel = $langs->trans("MulticurrencyPaidBack"); }
+				if ($facture->type == 2) {
+					$alreadypayedlabel = $langs->trans("PaidBack"); $multicurrencyalreadypayedlabel = $langs->trans("MulticurrencyPaidBack");
+				}
 				$remaindertopay = $langs->trans('RemainderToTake');
 				$multicurrencyremaindertopay = $langs->trans('MulticurrencyRemainderToTake');
-				if ($facture->type == 2) { $remaindertopay = $langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay = $langs->trans("MulticurrencyRemainderToPayBack"); }
+				if ($facture->type == 2) {
+					$remaindertopay = $langs->trans("RemainderToPayBack"); $multicurrencyremaindertopay = $langs->trans("MulticurrencyRemainderToPayBack");
+				}
 
 				$i = 0;
 				//print '<tr><td colspan="3">';
@@ -609,12 +601,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				$totalrecucreditnote = 0;
 				$totalrecudeposits = 0;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$objp = $db->fetch_object($resql);
 
 					$sign = 1;
-					if ($facture->type == Facture::TYPE_CREDIT_NOTE) $sign = -1;
+					if ($facture->type == Facture::TYPE_CREDIT_NOTE) {
+						$sign = -1;
+					}
 
 					$soc = new Societe($db);
 					$soc->fetch($objp->socid);
@@ -641,20 +634,20 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 					print '<td class="nowraponall">';
 					print $invoice->getNomUrl(1, '');
-					if ($objp->socid != $facture->thirdparty->id) print ' - '.$soc->getNomUrl(1).' ';
+					if ($objp->socid != $facture->thirdparty->id) {
+						print ' - '.$soc->getNomUrl(1).' ';
+					}
 					print "</td>\n";
 
 					// Date
-				   	print '<td class="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
+					print '<td class="center">'.dol_print_date($db->jdate($objp->df), 'day')."</td>\n";
 
 					// Due date
-					if ($objp->dlr > 0)
-					{
+					if ($objp->dlr > 0) {
 						print '<td class="nowraponall center">';
 						print dol_print_date($db->jdate($objp->dlr), 'day');
 
-						if ($invoice->hasDelay())
-						{
+						if ($invoice->hasDelay()) {
 							print img_warning($langs->trans('Late'));
 						}
 
@@ -664,28 +657,36 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					}
 
 					// Currency
-					if (!empty($conf->multicurrency->enabled)) print '<td class="center">'.$objp->multicurrency_code."</td>\n";
+					if (!empty($conf->multicurrency->enabled)) {
+						print '<td class="center">'.$objp->multicurrency_code."</td>\n";
+					}
 
 					// Multicurrency Price
-					if (!empty($conf->multicurrency->enabled))
-					{
+					if (!empty($conf->multicurrency->enabled)) {
 						print '<td class="right">';
-						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $objp->multicurrency_total_ttc);
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
+							print price($sign * $objp->multicurrency_total_ttc);
+						}
 						print '</td>';
 
 						// Multicurrency Price
 						print '<td class="right">';
-						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-						{
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
 							print price($sign * $multicurrency_payment);
-							if ($multicurrency_creditnotes) print '+'.price($multicurrency_creditnotes);
-							if ($multicurrency_deposits) print '+'.price($multicurrency_deposits);
+							if ($multicurrency_creditnotes) {
+								print '+'.price($multicurrency_creditnotes);
+							}
+							if ($multicurrency_deposits) {
+								print '+'.price($multicurrency_deposits);
+							}
 						}
 						print '</td>';
 
 						// Multicurrency remain to pay
 						print '<td class="right">';
-						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) print price($sign * $multicurrency_remaintopay);
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
+							print price($sign * $multicurrency_remaintopay);
+						}
 						print '</td>';
 
 						print '<td class="right nowraponall">';
@@ -694,14 +695,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						$namef = 'multicurrency_amount_'.$objp->facid;
 						$nameRemain = 'multicurrency_remain_'.$objp->facid;
 
-						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-						{
-							if ($action != 'add_paiement')
-							{
-								if (!empty($conf->use_javascript_ajax))
+						if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
+							if ($action != 'add_paiement') {
+								if (!empty($conf->use_javascript_ajax)) {
 									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
-   								print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
-   								print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
+								}
+								print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
+								print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
 							} else {
 								print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
 								print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
@@ -715,8 +715,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 					// Received + already paid
 					print '<td class="right">'.price($sign * $paiement);
-					if ($creditnotes) print '<span class="opacitymedium">+'.price($creditnotes).'</span>';
-					if ($deposits) print '<span class="opacitymedium">+'.price($deposits).'</span>';
+					if ($creditnotes) {
+						print '<span class="opacitymedium">+'.price($creditnotes).'</span>';
+					}
+					if ($deposits) {
+						print '<span class="opacitymedium">+'.price($deposits).'</span>';
+					}
 					print '</td>';
 
 					// Remain to take or to pay back
@@ -730,10 +734,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					$namef = 'amount_'.$objp->facid;
 					$nameRemain = 'remain_'.$objp->facid;
 
-					if ($action != 'add_paiement')
-					{
-						if (!empty($conf->use_javascript_ajax))
+					if ($action != 'add_paiement') {
+						if (!empty($conf->use_javascript_ajax)) {
 							print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+						}
 						print '<input type="text" class="maxwidth75 amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';
 						print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 					} else {
@@ -749,8 +753,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					print '<td align="center" width="16">';
 					//print "xx".$amounts[$invoice->id]."-".$amountsresttopay[$invoice->id]."<br>";
 					if ($amounts[$invoice->id] && (abs($amounts[$invoice->id]) > abs($amountsresttopay[$invoice->id]))
-						|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id])))
-					{
+						|| $multicurrency_amounts[$invoice->id] && (abs($multicurrency_amounts[$invoice->id]) > abs($multicurrency_amountsresttopay[$invoice->id]))) {
 						print ' '.img_warning($langs->trans("PaymentHigherThanReminderToPay"));
 					}
 					print '</td>';
@@ -765,8 +768,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					$i++;
 				}
 
-				if ($i > 1)
-				{
+				if ($i > 1) {
 					// Print total
 					print '<tr class="liste_total">';
 					print '<td colspan="3" class="left">'.$langs->trans('TotalTTC').'</td>';
@@ -779,8 +781,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 					}
 					print '<td class="right"><b>'.price($sign * $total_ttc).'</b></td>';
 					print '<td class="right"><b>'.price($sign * $totalrecu);
-					if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
-					if ($totalrecudeposits) print '+'.price($totalrecudeposits);
+					if ($totalrecucreditnote) {
+						print '+'.price($totalrecucreditnote);
+					}
+					if ($totalrecudeposits) {
+						print '+'.price($totalrecudeposits);
+					}
 					print '</b></td>';
 					print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
 					print '<td class="right" id="result" style="font-weight: bold;"></td>'; // Autofilled
@@ -797,37 +803,39 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 
 		// Save button
-		if ($action != 'add_paiement')
-		{
+		if ($action != 'add_paiement') {
 			$checkboxlabel = $langs->trans("ClosePaidInvoicesAutomatically");
-			if ($facture->type == Facture::TYPE_CREDIT_NOTE) $checkboxlabel = $langs->trans("ClosePaidCreditNotesAutomatically");
+			if ($facture->type == Facture::TYPE_CREDIT_NOTE) {
+				$checkboxlabel = $langs->trans("ClosePaidCreditNotesAutomatically");
+			}
 			$buttontitle = $langs->trans('ToMakePayment');
-			if ($facture->type == Facture::TYPE_CREDIT_NOTE) $buttontitle = $langs->trans('ToMakePaymentBack');
+			if ($facture->type == Facture::TYPE_CREDIT_NOTE) {
+				$buttontitle = $langs->trans('ToMakePaymentBack');
+			}
 
 			print '<br><div class="center">';
 			print '<input type="checkbox" checked name="closepaidinvoices"> '.$checkboxlabel;
 			/*if (! empty($conf->prelevement->enabled))
-            {
-                $langs->load("withdrawals");
-                if (! empty($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS)) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
-            }*/
+			{
+				$langs->load("withdrawals");
+				if (! empty($conf->global->WITHDRAW_DISABLE_AUTOCREATE_ONPAYMENTS)) print '<br>'.$langs->trans("IfInvoiceNeedOnWithdrawPaymentWontBeClosed");
+			}*/
 			print '<br><input type="submit" class="button" value="'.dol_escape_htmltag($buttontitle).'"><br><br>';
 			print '</div>';
 		}
 
 		// Form to confirm payment
-		if ($action == 'add_paiement')
-		{
+		if ($action == 'add_paiement') {
 			$preselectedchoice = $addwarning ? 'no' : 'yes';
 
 			print '<br>';
-			if (!empty($totalpayment)) $text = $langs->trans('ConfirmCustomerPayment', $totalpayment, $langs->trans("Currency".$conf->currency));
-			if (!empty($multicurrency_totalpayment))
-			{
+			if (!empty($totalpayment)) {
+				$text = $langs->trans('ConfirmCustomerPayment', $totalpayment, $langs->trans("Currency".$conf->currency));
+			}
+			if (!empty($multicurrency_totalpayment)) {
 				$text .= '<br>'.$langs->trans('ConfirmCustomerPayment', $multicurrency_totalpayment, $langs->trans("paymentInInvoiceCurrency"));
 			}
-			if (GETPOST('closepaidinvoices'))
-			{
+			if (GETPOST('closepaidinvoices')) {
 				$text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
 				print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
 			}
@@ -842,14 +850,19 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 /**
  *  Show list of payments
  */
-if (!GETPOST('action', 'aZ09'))
-{
-	if (empty($page) || $page == -1) $page = 0;
+if (!GETPOST('action', 'aZ09')) {
+	if (empty($page) || $page == -1) {
+		$page = 0;
+	}
 	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 	$offset = $limit * $page;
 
-	if (!$sortorder) $sortorder = 'DESC';
-	if (!$sortfield) $sortfield = 'p.datep';
+	if (!$sortorder) {
+		$sortorder = 'DESC';
+	}
+	if (!$sortfield) {
+		$sortfield = 'p.datep';
+	}
 
 	$sql = 'SELECT p.datep as dp, p.amount, f.total_ttc as fa_amount, f.ref';
 	$sql .= ', f.rowid as facid, c.libelle as paiement_type, p.num_paiement as num_payment';
@@ -857,8 +870,7 @@ if (!GETPOST('action', 'aZ09'))
 	$sql .= ', '.MAIN_DB_PREFIX.'facture as f';
 	$sql .= ' WHERE p.fk_facture = f.rowid';
 	$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
-	if ($socid)
-	{
+	if ($socid) {
 		$sql .= ' AND f.fk_soc = '.$socid;
 	}
 
@@ -866,8 +878,7 @@ if (!GETPOST('action', 'aZ09'))
 	$sql .= $db->plimit($limit + 1, $offset);
 	$resql = $db->query($sql);
 
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -881,8 +892,7 @@ if (!GETPOST('action', 'aZ09'))
 		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
 		print "</tr>\n";
 
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$objp = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 3cedb27f07c..9096bfa5e5d 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -32,7 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (!empty($conf->banque->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'companies'));
@@ -53,7 +55,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 $result = restrictedArea($user, $object->element, $object->id, 'paiement', '');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 // Now check also permission on thirdparty of invoices of payments. Thirdparty were loaded by the fetch_object before based on first invoice.
 // It should be enough because all payments are done on invoices of the same thirdparty.
 if ($socid && $socid != $object->thirdparty->id) {
@@ -65,13 +69,11 @@ if ($socid && $socid != $object->thirdparty->id) {
  * Actions
  */
 
-if ($action == 'setnote' && $user->rights->facture->paiement)
-{
+if ($action == 'setnote' && $user->rights->facture->paiement) {
 	$db->begin();
 
 	$result = $object->update_note(GETPOST('note', 'restricthtml'));
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->commit();
 		$action = '';
 	} else {
@@ -80,17 +82,14 @@ if ($action == 'setnote' && $user->rights->facture->paiement)
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->paiement)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->paiement) {
 	$db->begin();
 
 	$result = $object->delete();
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->commit();
 
-		if ($backtopage)
-		{
+		if ($backtopage) {
 			header("Location: ".$backtopage);
 			exit;
 		} else {
@@ -104,24 +103,20 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
 	}
 }
 
-if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture->paiement)
-{
+if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture->paiement) {
 	$db->begin();
 
-	if ($object->validate($user) > 0)
-	{
+	if ($object->validate($user) > 0) {
 		$db->commit();
 
 		// Loop on each invoice linked to this payment to rebuild PDF
 		$factures = array();
-		foreach ($factures as $id)
-		{
+		foreach ($factures as $id) {
 			$fac = new Facture($db);
 			$fac->fetch($id);
 
 			$outputlangs = $langs;
-			if (!empty($_REQUEST['lang_id']))
-			{
+			if (!empty($_REQUEST['lang_id'])) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
 			}
@@ -139,23 +134,19 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 	}
 }
 
-if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
-{
+if ($action == 'setnum_paiement' && !empty($_POST['num_paiement'])) {
 	$res = $object->update_num($_POST['num_paiement']);
-	if ($res === 0)
-	{
+	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
 
-if ($action == 'setdatep' && !empty($_POST['datepday']))
-{
+if ($action == 'setdatep' && !empty($_POST['datepday'])) {
 	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
 	$res = $object->update_date($datepaye);
-	if ($res === 0)
-	{
+	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
@@ -172,8 +163,7 @@ llxHeader('', $langs->trans("Payment"));
 $thirdpartystatic = new Societe($db);
 
 $result = $object->fetch($id, $ref);
-if ($result <= 0)
-{
+if ($result <= 0) {
 	dol_print_error($db, 'Payement '.$id.' not found in database');
 	exit;
 }
@@ -185,14 +175,12 @@ $head = payment_prepare_head($object);
 print dol_get_fiche_head($head, 'payment', $langs->trans("PaymentCustomerInvoice"), -1, 'payment');
 
 // Confirmation of payment delete
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
 // Confirmation of payment validation
-if ($action == 'valide')
-{
+if ($action == 'valide') {
 	$facid = $_GET['facid'];
 	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_validate', '', 0, 2);
 }
@@ -223,15 +211,12 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, '',
 
 $disable_delete = 0;
 // Bank account
-if (!empty($conf->banque->enabled))
-{
+if (!empty($conf->banque->enabled)) {
 	$bankline = new AccountLine($db);
 
-	if ($object->fk_account > 0)
-	{
+	if ($object->fk_account > 0) {
 		$bankline->fetch($object->bank_line);
-		if ($bankline->rappro)
-		{
+		if ($bankline->rappro) {
 			$disable_delete = 1;
 			$title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
 		}
@@ -268,8 +253,7 @@ print '</td></tr>';
 */
 
 // Bank account
-if (!empty($conf->banque->enabled))
-{
+if (!empty($conf->banque->enabled)) {
 	if ($object->fk_account > 0) {
 		if ($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0) {
 			dol_include_once('/compta/paiement/cheque/class/remisecheque.class.php');
@@ -321,8 +305,7 @@ $sql .= ' AND f.fk_soc = s.rowid';
 $sql .= ' AND f.entity IN ('.getEntity('invoice').')';
 $sql .= ' AND pf.fk_paiement = '.$object->id;
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$i = 0;
@@ -338,17 +321,17 @@ if ($resql)
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('Bill').'</td>';
 	print '<td>'.$langs->trans('Company').'</td>';
-	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) print '<td>'.$langs->trans('Entity').'</td>';
+	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED)) {
+		print '<td>'.$langs->trans('Entity').'</td>';
+	}
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
 	print '<td class="right">'.$langs->trans('RemainderToPay').'</td>';
 	print '<td class="right">'.$langs->trans('Status').'</td>';
 	print "</tr>\n";
 
-	if ($num > 0)
-	{
-		while ($i < $num)
-		{
+	if ($num > 0) {
+		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 
 			$thirdpartystatic->fetch($objp->socid);
@@ -394,8 +377,7 @@ if ($resql)
 			print '<td class="right">'.$invoice->getLibStatut(5, $alreadypayed).'</td>';
 
 			print "</tr>\n";
-			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
-			{
+			if ($objp->paye == 1) {	// If at least one invoice is paid, disable delete
 				$disable_delete = 1;
 				$title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemovePaymentWithOneInvoicePaid"));
 			}
@@ -421,23 +403,17 @@ if ($resql)
 
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-{
-	if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '')
-	{
-		if ($user->rights->facture->paiement)
-		{
+if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
+	if ($user->socid == 0 && $object->statut == 0 && $_GET['action'] == '') {
+		if ($user->rights->facture->paiement) {
 			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
 		}
 	}
 }
 
-if ($user->socid == 0 && $action == '')
-{
-	if ($user->rights->facture->paiement)
-	{
-		if (!$disable_delete)
-		{
+if ($user->socid == 0 && $action == '') {
+	if ($user->rights->facture->paiement) {
+		if (!$disable_delete) {
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index c6afa4def1d..c8e6691afc6 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -43,15 +43,23 @@ $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
 $fieldname = (!empty($ref) ? 'ref' : 'rowid');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque', '', 'fk_user_author', $fieldname);
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "b.dateo,b.rowid";
-if (empty($page) || $page == -1) { $page = 0; }
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "b.dateo,b.rowid";
+}
+if (empty($page) || $page == -1) {
+	$page = 0;
+}
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
@@ -66,17 +74,14 @@ $object = new RemiseCheque($db);
  * Actions
  */
 
-if ($action == 'setdate' && $user->rights->banque->cheque)
-{
+if ($action == 'setdate' && $user->rights->banque->cheque) {
 	$result = $object->fetch(GETPOST('id', 'int'));
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$date = dol_mktime(0, 0, 0, $_POST['datecreate_month'], $_POST['datecreate_day'], $_POST['datecreate_year']);
 
 		$result = $object->set_date($user, $date);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} else {
@@ -84,16 +89,13 @@ if ($action == 'setdate' && $user->rights->banque->cheque)
 	}
 }
 
-if ($action == 'setrefext' && $user->rights->banque->cheque)
-{
+if ($action == 'setrefext' && $user->rights->banque->cheque) {
 	$result = $object->fetch(GETPOST('id', 'int'));
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$ref_ext = GETPOST('ref_ext');
 
 		$result = $object->setValueFrom('ref_ext', $ref_ext, '', null, 'text', '', $user, 'CHECKDEPOSIT_MODIFY');
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} else {
@@ -101,16 +103,13 @@ if ($action == 'setrefext' && $user->rights->banque->cheque)
 	}
 }
 
-if ($action == 'setref' && $user->rights->banque->cheque)
-{
+if ($action == 'setref' && $user->rights->banque->cheque) {
 	$result = $object->fetch(GETPOST('id', 'int'));
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$ref = GETPOST('ref');
 
 		$result = $object->set_number($user, $ref);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} else {
@@ -118,30 +117,27 @@ if ($action == 'setref' && $user->rights->banque->cheque)
 	}
 }
 
-if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->cheque)
-{
-	if (is_array($_POST['toRemise']))
-	{
+if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->cheque) {
+	if (is_array($_POST['toRemise'])) {
 		$result = $object->create($user, $_POST["accountid"], 0, $_POST['toRemise']);
-		if ($result > 0)
-		{
-			if ($object->statut == 1)     // If statut is validated, we build doc
-			{
+		if ($result > 0) {
+			if ($object->statut == 1) {     // If statut is validated, we build doc
 				$object->fetch($object->id); // To force to reload all properties in correct property name
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) {
+					$newlang = $_REQUEST['lang_id'];
+				}
 				//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-				if (!empty($newlang))
-				{
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
 				$result = $object->generatePdf($_POST["model"], $outputlangs);
 			}
 
-	   		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -152,12 +148,10 @@ if ($action == 'create' && $_POST["accountid"] > 0 && $user->rights->banque->che
 	}
 }
 
-if ($action == 'remove' && $id > 0 && GETPOST("lineid", 'int') > 0 && $user->rights->banque->cheque)
-{
+if ($action == 'remove' && $id > 0 && GETPOST("lineid", 'int') > 0 && $user->rights->banque->cheque) {
 	$object->id = $id;
 	$result = $object->removeCheck(GETPOST("lineid", "int"));
-	if ($result === 0)
-	{
+	if ($result === 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 		exit;
 	} else {
@@ -165,12 +159,10 @@ if ($action == 'remove' && $id > 0 && GETPOST("lineid", 'int') > 0 && $user->rig
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->cheque)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->cheque) {
 	$object->id = $id;
 	$result = $object->delete();
-	if ($result == 0)
-	{
+	if ($result == 0) {
 		header("Location: index.php");
 		exit;
 	} else {
@@ -178,19 +170,18 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c
 	}
 }
 
-if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->banque->cheque)
-{
+if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->banque->cheque) {
 	$result = $object->fetch($id);
 	$result = $object->validate($user);
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		// Define output language
 		$outputlangs = $langs;
 		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) {
+			$newlang = $_REQUEST['lang_id'];
+		}
 		//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-		if (!empty($newlang))
-		{
+		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
@@ -203,15 +194,13 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->banque-
 	}
 }
 
-if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->banque->cheque)
-{
+if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->banque->cheque) {
 	$reject_date = dol_mktime(0, 0, 0, GETPOST('rejectdate_month'), GETPOST('rejectdate_day'), GETPOST('rejectdate_year'));
 	$rejected_check = GETPOST('bankid', 'int');
 
 	$object->fetch($id);
 	$paiement_id = $object->rejectCheck($rejected_check, $reject_date);
-	if ($paiement_id > 0)
-	{
+	if ($paiement_id > 0) {
 		setEventMessages($langs->trans("CheckRejectedAndInvoicesReopened"), null, 'mesgs');
 		//header("Location: ".DOL_URL_ROOT.'/compta/paiement/card.php?id='.$paiement_id);
 		//exit;
@@ -222,8 +211,7 @@ if ($action == 'confirm_reject_check' && $confirm == 'yes' && $user->rights->ban
 	}
 }
 
-if ($action == 'builddoc' && $user->rights->banque->cheque)
-{
+if ($action == 'builddoc' && $user->rights->banque->cheque) {
 	$result = $object->fetch($id);
 
 	// Save last template used to generate document
@@ -231,16 +219,16 @@ if ($action == 'builddoc' && $user->rights->banque->cheque)
 
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) {
+		$newlang = $_REQUEST['lang_id'];
+	}
 	//if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang;
-	if (!empty($newlang))
-	{
+	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
 	$result = $object->generatePdf($_POST["model"], $outputlangs);
-	if ($result <= 0)
-	{
+	if ($result <= 0) {
 		dol_print_error($db, $object->error);
 		exit;
 	} else {
@@ -248,18 +236,19 @@ if ($action == 'builddoc' && $user->rights->banque->cheque)
 		exit;
 	}
 } // Remove file in doc form
-elseif ($action == 'remove_file' && $user->rights->banque->cheque)
-{
-	if ($object->fetch($id) > 0)
-	{
+elseif ($action == 'remove_file' && $user->rights->banque->cheque) {
+	if ($object->fetch($id) > 0) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$langs->load("other");
 
 		$file = $dir.get_exdir($object->ref, 0, 1, 0, $object, 'cheque').GETPOST('file');
 		$ret = dol_delete_file($file, 0, 0, 0, $object);
-		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');
+		}
 	}
 }
 
@@ -268,8 +257,7 @@ elseif ($action == 'remove_file' && $user->rights->banque->cheque)
  * View
  */
 
-if (GETPOST('removefilter'))
-{
+if (GETPOST('removefilter')) {
 	$filterdate = '';
 	$filteraccountid = 0;
 }
@@ -282,8 +270,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 
 
-if ($action == 'new')
-{
+if ($action == 'new') {
 	$head = array();
 	$h = 0;
 	$head[$h][0] = $_SERVER["PHP_SELF"].'?action=new';
@@ -294,8 +281,7 @@ if ($action == 'new')
 	print load_fiche_titre($langs->trans("Cheques"), '', 'bank_account');
 } else {
 	$result = $object->fetch($id, $ref);
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		dol_print_error($db, $object->error);
 		exit;
 	}
@@ -314,24 +300,21 @@ if ($action == 'new')
 	/*
 	 * Confirmation of slip's delete
 	 */
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("DeleteCheckReceipt"), $langs->trans("ConfirmDeleteCheckReceipt"), 'confirm_delete', '', '', 1);
 	}
 
 	/*
 	 * Confirmation of slip's validation
 	 */
-	if ($action == 'valide')
-	{
+	if ($action == 'valide') {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_validate', '', '', 1);
 	}
 
 	/*
 	 * Confirm check rejection
 	 */
-	if ($action == 'reject_check')
-	{
+	if ($action == 'reject_check') {
 		$formquestion = array(
 			array('type' => 'hidden', 'name' => 'bankid', 'value' => GETPOST('lineid', 'int')),
 			array('type' => 'date', 'name' => 'rejectdate_', 'label' => $langs->trans("RejectCheckDate"), 'value' => dol_now())
@@ -342,8 +325,7 @@ if ($action == 'new')
 
 $accounts = array();
 
-if ($action == 'new')
-{
+if ($action == 'new') {
 	$paymentstatic = new Paiement($db);
 	$accountlinestatic = new AccountLine($db);
 
@@ -374,8 +356,7 @@ if ($action == 'new')
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';
-	if ($filterdate || $filteraccountid > 0)
-	{
+	if ($filterdate || $filteraccountid > 0) {
 		print ' &nbsp; ';
 		print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	}
@@ -393,16 +374,18 @@ if ($action == 'new')
 	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 	$sql .= " AND b.fk_bordereau = 0";
 	$sql .= " AND b.amount > 0";
-	if ($filterdate)          $sql .= " AND b.dateo = '".$db->idate($filterdate)."'";
-	if ($filteraccountid > 0) $sql .= " AND ba.rowid = ".((int) $filteraccountid);
+	if ($filterdate) {
+		$sql .= " AND b.dateo = '".$db->idate($filterdate)."'";
+	}
+	if ($filteraccountid > 0) {
+		$sql .= " AND ba.rowid = ".((int) $filteraccountid);
+	}
 	$sql .= $db->order("b.dateo,b.rowid", "ASC");
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$i = 0;
-		while ($obj = $db->fetch_object($resql))
-		{
+		while ($obj = $db->fetch_object($resql)) {
 			$accounts[$obj->bid] = $obj->label;
 			$lines[$obj->bid][$i]["date"] = $db->jdate($obj->date);
 			$lines[$obj->bid][$i]["amount"] = $obj->amount;
@@ -415,14 +398,12 @@ if ($action == 'new')
 			$i++;
 		}
 
-		if ($i == 0)
-		{
+		if ($i == 0) {
 			print '<div class="opacitymedium">'.$langs->trans("NoWaitingChecks").'</div><br>';
 		}
 	}
 
-	foreach ($accounts as $bid => $account_label)
-	{
+	foreach ($accounts as $bid => $account_label) {
 		print '
         <script language="javascript" type="text/javascript">
         jQuery(document).ready(function()
@@ -458,14 +439,14 @@ if ($action == 'new')
 		print '<td class="center">'.$langs->trans("Payment")."</td>\n";
 		print '<td class="center">'.$langs->trans("LineRecord")."</td>\n";
 		print '<td class="center">'.$langs->trans("Select")."<br>";
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';
+		if ($conf->use_javascript_ajax) {
+			print '<a href="#" id="checkall_'.$bid.'">'.$langs->trans("All").'</a> / <a href="#" id="checknone_'.$bid.'">'.$langs->trans("None").'</a>';
+		}
 		print '</td>';
 		print "</tr>\n";
 
-		if (count($lines[$bid]))
-		{
-			foreach ($lines[$bid] as $lid => $value)
-			{
+		if (count($lines[$bid])) {
+			foreach ($lines[$bid] as $lid => $value) {
 				//$account_id = $bid; FIXME not used
 
 				// FIXME $accounts[$bid] is a label !
@@ -484,8 +465,7 @@ if ($action == 'new')
 				print '<td class="center">';
 				$paymentstatic->id = $value["paymentid"];
 				$paymentstatic->ref = $value["paymentref"];
-				if ($paymentstatic->id)
-				{
+				if ($paymentstatic->id) {
 					print $paymentstatic->getNomUrl(1);
 				} else {
 					print '&nbsp;';
@@ -494,8 +474,7 @@ if ($action == 'new')
 				// Link to bank transaction
 				print '<td class="center">';
 				$accountlinestatic->rowid = $value["id"];
-				if ($accountlinestatic->rowid)
-				{
+				if ($accountlinestatic->rowid) {
 					print $accountlinestatic->getNomUrl(1);
 				} else {
 					print '&nbsp;';
@@ -514,8 +493,7 @@ if ($action == 'new')
 		print '</div>';
 
 		print '<div class="tabsAction">';
-		if ($user->rights->banque->cheque)
-		{
+		if ($user->rights->banque->cheque) {
 			print '<input type="submit" class="button" value="'.$langs->trans('NewCheckDepositOn', $account_label).'">';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn', $account_label).'</a>';
@@ -546,11 +524,12 @@ if ($action == 'new')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('Date');
 	print '</td>';
-	if ($action != 'editdate') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	if ($action != 'editdate') {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td colspan="2">';
-	if ($action == 'editdate')
-	{
+	if ($action == 'editdate') {
 		print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate">';
@@ -569,24 +548,24 @@ if ($action == 'new')
 	print '<tr><td>';
 
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
-    print $langs->trans('RefExt');
-    print '</td>';
-    if ($action != 'editrefext') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrefext&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
-    print '</tr></table>';
-    print '</td><td colspan="2">';
-    if ($action == 'editrefext')
-    {
-        print '<form name="setrefext" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="setrefext">';
-        print '<input type="text" name="ref_ext" value="'.$object->ref_ext.'">';
-        print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
-        print '</form>';
-    }
-    else
-    {
-        print $object->ref_ext;
-    }
+	print $langs->trans('RefExt');
+	print '</td>';
+	if ($action != 'editrefext') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editrefext&amp;id='.$object->id.'">'.img_edit($langs->trans('SetRefExt'),1).'</a></td>';
+	print '</tr></table>';
+	print '</td><td colspan="2">';
+	if ($action == 'editrefext')
+	{
+		print '<form name="setrefext" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setrefext">';
+		print '<input type="text" name="ref_ext" value="'.$object->ref_ext.'">';
+		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
+		print '</form>';
+	}
+	else
+	{
+		print $object->ref_ext;
+	}
 
 	print '</td>';
 	print '</tr>';
@@ -627,8 +606,7 @@ if ($action == 'new')
 	$sql .= $db->order($sortfield, $sortorder);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive">';
@@ -649,10 +627,8 @@ if ($action == 'new')
 		print "</tr>\n";
 
 		$i = 1;
-		if ($num > 0)
-		{
-			while ($objp = $db->fetch_object($resql))
-			{
+		if ($num > 0) {
+			while ($objp = $db->fetch_object($resql)) {
 				print '<tr class="oddeven">';
 				print '<td class="center">'.$i.'</td>';
 				print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Operation date
@@ -681,16 +657,13 @@ if ($action == 'new')
 				print '</td>';
 				// Action button
 				print '<td class="right">';
-				if ($object->statut == 0)
-				{
+				if ($object->statut == 0) {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
 				}
-	   			if ($object->statut == 1 && $objp->statut != 2)
-	   			{
-	   				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';
-	   			}
-				if ($objp->statut == 2)
-				{
+				if ($object->statut == 1 && $objp->statut != 2) {
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';
+				}
+				if ($objp->statut == 2) {
 					print ' &nbsp; '.img_picto($langs->trans('CheckRejected'), 'statut8').'</a>';
 				}
 				print '</td>';
@@ -731,23 +704,19 @@ if ($action == 'new')
 
 print '<div class="tabsAction">';
 
-if ($user->socid == 0 && !empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque)
-{
+if ($user->socid == 0 && !empty($object->id) && $object->statut == 0 && $user->rights->banque->cheque) {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valide&amp;token='.newToken().'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Validate').'</a>';
 }
 
-if ($user->socid == 0 && !empty($object->id) && $user->rights->banque->cheque)
-{
+if ($user->socid == 0 && !empty($object->id) && $user->rights->banque->cheque) {
 	print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;sortfield='.$sortfield.'&amp;sortorder='.$sortorder.'">'.$langs->trans('Delete').'</a>';
 }
 print '</div>';
 
 
 
-if ($action != 'new')
-{
-	if ($object->statut == 1)
-	{
+if ($action != 'new') {
+	if ($object->statut == 1) {
 		$filename = dol_sanitizeFileName($object->ref);
 		$filedir = $dir.get_exdir($object->ref, 0, 1, 0, $object, 'checkdeposits');
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 9c685bcce1d..3d73c59d967 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -98,15 +98,17 @@ class RemiseCheque extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON bc.fk_bank_account = ba.rowid";
 		$sql .= " WHERE bc.entity = ".$conf->entity;
-		if ($id)  $sql .= " AND bc.rowid = ".((int) $id);
-		if ($ref) $sql .= " AND bc.ref = '".$this->db->escape($ref)."'";
+		if ($id) {
+			$sql .= " AND bc.rowid = ".((int) $id);
+		}
+		if ($ref) {
+			$sql .= " AND bc.ref = '".$this->db->escape($ref)."'";
+		}
 
 		dol_syslog("RemiseCheque::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			if ($obj = $this->db->fetch_object($resql)) {
 				$this->id             = $obj->rowid;
 				$this->amount         = $obj->amount;
 				$this->date_bordereau = $this->db->jdate($obj->date_bordereau);
@@ -117,8 +119,7 @@ class RemiseCheque extends CommonObject
 				$this->statut         = $obj->statut;
 				$this->ref_ext        = $obj->ref_ext;
 
-				if ($this->statut == 0)
-				{
+				if ($this->statut == 0) {
 					$this->ref = "(PROV".$this->id.")";
 				} else {
 					$this->ref = $obj->ref;
@@ -180,31 +181,26 @@ class RemiseCheque extends CommonObject
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."bordereau_cheque");
-			if ($this->id == 0)
-			{
+			if ($this->id == 0) {
 				$this->errno = -1024;
 				dol_syslog("Remisecheque::Create Error read id ".$this->errno, LOG_ERR);
 			}
 
-			if ($this->id > 0 && $this->errno == 0)
-			{
+			if ($this->id > 0 && $this->errno == 0) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
 				$sql .= " SET ref='(PROV".$this->id.")'";
 				$sql .= " WHERE rowid=".$this->id."";
 
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					$this->errno = -1025;
 					dol_syslog("RemiseCheque::Create Error update ".$this->errno, LOG_ERR);
 				}
 			}
 
-			if ($this->id > 0 && $this->errno == 0)
-			{
+			if ($this->id > 0 && $this->errno == 0) {
 				$lines = array();
 				$sql = "SELECT b.rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -212,14 +208,14 @@ class RemiseCheque extends CommonObject
 				$sql .= " AND b.amount > 0";
 				$sql .= " AND b.fk_bordereau = 0";
 				$sql .= " AND b.fk_account = ".((int) $account_id);
-				if ($limit) $sql .= $this->db->plimit($limit);
+				if ($limit) {
+					$sql .= $this->db->plimit($limit);
+				}
 
 				dol_syslog("RemiseCheque::Create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					while ($row = $this->db->fetch_row($resql))
-					{
+				if ($resql) {
+					while ($row = $this->db->fetch_row($resql)) {
 						array_push($lines, $row[0]);
 					}
 					$this->db->free($resql);
@@ -229,25 +225,22 @@ class RemiseCheque extends CommonObject
 				}
 			}
 
-			if ($this->id > 0 && $this->errno == 0)
-			{
-				foreach ($lines as $lineid)
-				{
+			if ($this->id > 0 && $this->errno == 0) {
+				foreach ($lines as $lineid) {
 					$checkremise = false;
-					foreach ($toRemise as $linetoremise)
-					{
-						if ($linetoremise == $lineid) $checkremise = true;
+					foreach ($toRemise as $linetoremise) {
+						if ($linetoremise == $lineid) {
+							$checkremise = true;
+						}
 					}
 
-					if ($checkremise)
-					{
+					if ($checkremise) {
 						$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 						$sql .= " SET fk_bordereau = ".$this->id;
 						$sql .= " WHERE rowid = ".$lineid;
 
 						$resql = $this->db->query($sql);
-						if (!$resql)
-						{
+						if (!$resql) {
 							$this->errno = -18;
 							dol_syslog("RemiseCheque::Create Error update bank ".$this->errno, LOG_ERR);
 						}
@@ -255,10 +248,8 @@ class RemiseCheque extends CommonObject
 				}
 			}
 
-			if ($this->id > 0 && $this->errno == 0)
-			{
-				if ($this->updateAmount() <> 0)
-				{
+			if ($this->id > 0 && $this->errno == 0) {
+				if ($this->updateAmount() <> 0) {
 					$this->errno = -1027;
 					dol_syslog("RemiseCheque::Create Error update amount ".$this->errno, LOG_ERR);
 				}
@@ -269,14 +260,12 @@ class RemiseCheque extends CommonObject
 			$this->errno = $this->db->lasterrno();
 		}
 
-		if (!$this->errno && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
-		{
+		if (!$this->errno && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS)) {
 			$res = $this->validate($user);
 			//if ($res < 0) $error++;
 		}
 
-		if (!$this->errno)
-		{
+		if (!$this->errno) {
 			$this->db->commit();
 			dol_syslog("RemiseCheque::Create end", LOG_DEBUG);
 			return $this->id;
@@ -305,8 +294,7 @@ class RemiseCheque extends CommonObject
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->affected_rows($resql);
 
 			if ($num <> 1) {
@@ -320,16 +308,14 @@ class RemiseCheque extends CommonObject
 				$sql .= " WHERE fk_bordereau = ".$this->id;
 
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					$this->errno = -1028;
 					dol_syslog("RemiseCheque::Delete ERREUR UPDATE ($this->errno)");
 				}
 			}
 		}
 
-		if ($this->errno === 0)
-		{
+		if ($this->errno === 0) {
 			$this->db->commit();
 		} else {
 			$this->db->rollback();
@@ -355,8 +341,7 @@ class RemiseCheque extends CommonObject
 
 		$numref = $this->getNextNumRef();
 
-		if ($this->errno == 0 && $numref)
-		{
+		if ($this->errno == 0 && $numref) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
 			$sql .= " SET statut = 1, ref = '".$this->db->escape($numref)."'";
 			$sql .= " WHERE rowid = ".$this->id;
@@ -365,12 +350,10 @@ class RemiseCheque extends CommonObject
 
 			dol_syslog("RemiseCheque::Validate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->affected_rows($resql);
 
-				if ($num == 1)
-				{
+				if ($num == 1) {
 					$this->ref = $numref;
 					$this->statut = 1;
 				} else {
@@ -384,8 +367,7 @@ class RemiseCheque extends CommonObject
 		}
 
 		// Commit/Rollback
-		if ($this->errno == 0)
-		{
+		if ($this->errno == 0) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -408,12 +390,15 @@ class RemiseCheque extends CommonObject
 		$langs->load("bills");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->CHEQUERECEIPTS_ADDON)) $conf->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
-		elseif ($conf->global->CHEQUERECEIPTS_ADDON == 'thyme') $conf->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_thyme';
-		elseif ($conf->global->CHEQUERECEIPTS_ADDON == 'mint') $conf->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
+		if (empty($conf->global->CHEQUERECEIPTS_ADDON)) {
+			$conf->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
+		} elseif ($conf->global->CHEQUERECEIPTS_ADDON == 'thyme') {
+			$conf->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_thyme';
+		} elseif ($conf->global->CHEQUERECEIPTS_ADDON == 'mint') {
+			$conf->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
+		}
 
-		if (!empty($conf->global->CHEQUERECEIPTS_ADDON))
-		{
+		if (!empty($conf->global->CHEQUERECEIPTS_ADDON)) {
 			$mybool = false;
 
 			$file = $conf->global->CHEQUERECEIPTS_ADDON.".php";
@@ -426,21 +411,18 @@ class RemiseCheque extends CommonObject
 				$dir = dol_buildpath($reldir."core/modules/cheque/");
 
 				// Load file with numbering class (if found)
-				if (is_file($dir.$file) && is_readable($dir.$file))
-				{
+				if (is_file($dir.$file) && is_readable($dir.$file)) {
 					$mybool |= include_once $dir.$file;
 				}
 			}
 
 			// For compatibility
-			if (!$mybool)
-			{
+			if (!$mybool) {
 				$file = $conf->global->CHEQUERECEIPTS_ADDON.".php";
 				$classname = "mod_chequereceipt_".$conf->global->CHEQUERECEIPTS_ADDON;
 				$classname = preg_replace('/\-.*$/', '', $classname);
 				// Include file with class
-				foreach ($conf->file->dol_document_root as $dirroot)
-				{
+				foreach ($conf->file->dol_document_root as $dirroot) {
 					$dir = $dirroot."/core/modules/cheque/";
 
 					// Load file with numbering class (if found)
@@ -450,8 +432,7 @@ class RemiseCheque extends CommonObject
 				}
 			}
 
-			if (!$mybool)
-			{
+			if (!$mybool) {
 				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
@@ -490,7 +471,9 @@ class RemiseCheque extends CommonObject
 		// phpcs:enable
 		global $conf, $langs;
 
-		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+		if ($user->socid) {
+			return -1; // protection pour eviter appel par utilisateur externe
+		}
 
 		$sql = "SELECT b.rowid, b.datev as datefin";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -502,8 +485,7 @@ class RemiseCheque extends CommonObject
 		$sql .= " AND b.amount > 0";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$langs->load("banks");
 			$now = dol_now();
 
@@ -514,8 +496,7 @@ class RemiseCheque extends CommonObject
 			$response->url = DOL_URL_ROOT.'/compta/paiement/cheque/index.php?leftmenu=checks&amp;mainmenu=bank';
 			$response->img = img_object('', "payment");
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 
 				if ($this->db->jdate($obj->datefin) < ($now - $conf->bank->cheque->warning_delay)) {
@@ -543,7 +524,9 @@ class RemiseCheque extends CommonObject
 		// phpcs:enable
 		global $user;
 
-		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+		if ($user->socid) {
+			return -1; // protection pour eviter appel par utilisateur externe
+		}
 
 		$sql = "SELECT count(b.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -554,10 +537,8 @@ class RemiseCheque extends CommonObject
 		$sql .= " AND b.amount > 0";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["cheques"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -581,7 +562,9 @@ class RemiseCheque extends CommonObject
 	{
 		global $langs, $conf;
 
-		if (empty($model)) $model = 'blochet';
+		if (empty($model)) {
+			$model = 'blochet';
+		}
 
 		dol_syslog("RemiseCheque::generatePdf model=".$model." id=".$this->id, LOG_DEBUG);
 
@@ -589,8 +572,7 @@ class RemiseCheque extends CommonObject
 
 		// Charge le modele
 		$file = "pdf_".$model.".class.php";
-		if (file_exists($dir.$file))
-		{
+		if (file_exists($dir.$file)) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 			include_once $dir.$file;
 
@@ -609,11 +591,9 @@ class RemiseCheque extends CommonObject
 
 			dol_syslog("RemiseCheque::generatePdf", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$i = 0;
-				while ($objp = $this->db->fetch_object($result))
-				{
+				while ($objp = $this->db->fetch_object($result)) {
 					$docmodel->lines[$i] = new stdClass();
 					$docmodel->lines[$i]->bank_chq = $objp->banque;
 					$docmodel->lines[$i]->emetteur_chq = $objp->emetteur;
@@ -636,8 +616,7 @@ class RemiseCheque extends CommonObject
 			// output format that does not support UTF8.
 			$sav_charseSupprimert_output = $outputlangs->charset_output;
 			$result = $docmodel->write_file($this, $conf->bank->dir_output.'/checkdeposits', $this->ref, $outputlangs);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				//$outputlangs->charset_output=$sav_charset_output;
 				return 1;
 			} else {
@@ -671,10 +650,8 @@ class RemiseCheque extends CommonObject
 		$sql .= " WHERE fk_bordereau = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($row = $this->db->fetch_row($resql))
-			{
+		if ($resql) {
+			while ($row = $this->db->fetch_row($resql)) {
 				$total += $row[0];
 				$nb++;
 			}
@@ -688,8 +665,7 @@ class RemiseCheque extends CommonObject
 			$sql .= " AND entity = ".$conf->entity;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errno = -1030;
 				dol_syslog("RemiseCheque::updateAmount ERREUR UPDATE ($this->errno)");
 			}
@@ -698,8 +674,7 @@ class RemiseCheque extends CommonObject
 			dol_syslog("RemiseCheque::updateAmount ERREUR SELECT ($this->errno)");
 		}
 
-		if ($this->errno === 0)
-		{
+		if ($this->errno === 0) {
 			$this->db->commit();
 		} else {
 			$this->db->rollback();
@@ -719,16 +694,14 @@ class RemiseCheque extends CommonObject
 	{
 		$this->errno = 0;
 
-		if ($this->id > 0)
-		{
+		if ($this->id > 0) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
 			$sql .= " SET fk_bordereau = 0";
 			$sql .= " WHERE rowid = ".((int) $account_id);
 			$sql .= " AND fk_bordereau = ".((int) $this->id);
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->updateAmount();
 			} else {
 				$this->errno = -1032;
@@ -759,8 +732,8 @@ class RemiseCheque extends CommonObject
 		/* Conciliation is allowed because when check is returned, a new line is created onto bank transaction log.
 		if ($bankline->rappro)
 		{
-            $this->error='ActionRefusedLineAlreadyConciliated';
-		    return -1;
+			$this->error='ActionRefusedLineAlreadyConciliated';
+			return -1;
 		}*/
 
 		$this->db->begin();
@@ -776,16 +749,14 @@ class RemiseCheque extends CommonObject
 		$sql .= ' WHERE pf.fk_paiement = '.$payment->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$rejectedPayment = new Paiement($this->db);
 			$rejectedPayment->amounts = array();
 			$rejectedPayment->datepaye = $rejection_date;
 			$rejectedPayment->paiementid = dol_getIdFromCode($this->db, 'CHQ', 'c_paiement', 'code', 'id', 1);
 			$rejectedPayment->num_payment = $payment->num_payment;
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$invoice = new Facture($this->db);
 				$invoice->fetch($obj->fk_facture);
 				$invoice->setUnpaid($user);
@@ -794,15 +765,12 @@ class RemiseCheque extends CommonObject
 			}
 
 			$result = $rejectedPayment->create($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// We created a negative payment, we also add the line as bank transaction
 				$result = $rejectedPayment->addPaymentToBank($user, 'payment', '(CheckRejected)', $bankaccount, '', '');
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$result = $payment->reject();
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$this->db->commit();
 						return $rejectedPayment->id;
 					} else {
@@ -847,8 +815,7 @@ class RemiseCheque extends CommonObject
 		$sql .= " AND entity = ".$conf->entity;
 
 		$result = $this->db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->errno = -1035;
 		}
 		$row = $this->db->fetch_row($result);
@@ -860,8 +827,7 @@ class RemiseCheque extends CommonObject
 		$sql .= " AND entity = ".$conf->entity;
 
 		$result = $this->db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->errno = -1035;
 		}
 		$row = $this->db->fetch_row($result);
@@ -882,16 +848,14 @@ class RemiseCheque extends CommonObject
 	public function set_date($user, $date)
 	{
 		// phpcs:enable
-		if ($user->rights->banque->cheque)
-		{
+		if ($user->rights->banque->cheque) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
 			$sql .= " SET date_bordereau = ".($date ? "'".$this->db->idate($date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog("RemiseCheque::set_date", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->date_bordereau = $date;
 				return 1;
 			} else {
@@ -914,16 +878,14 @@ class RemiseCheque extends CommonObject
 	public function set_number($user, $ref)
 	{
 		// phpcs:enable
-		if ($user->rights->banque->cheque)
-		{
+		if ($user->rights->banque->cheque) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."bordereau_cheque";
 			$sql .= " SET ref = '".$ref."'";
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog("RemiseCheque::set_number", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				return 1;
 			} else {
 				$this->error = $this->db->error();
@@ -979,33 +941,40 @@ class RemiseCheque extends CommonObject
 
 		$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowCheckReceipt");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -1033,8 +1002,7 @@ class RemiseCheque extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			$langs->load('compta');
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('ToValidate');
@@ -1044,7 +1012,9 @@ class RemiseCheque extends CommonObject
 		}
 
 		$statusType = 'status'.$status;
-		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_VALIDATED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 9de75a6e0c5..0595e144f7b 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -32,7 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array('banks', 'categories', 'compta', 'bills'));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', '', '');
 
 
@@ -97,8 +99,7 @@ $sql .= " ORDER BY bc.date_bordereau DESC, rowid DESC";
 $sql .= $db->plimit($max);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -110,8 +111,7 @@ if ($resql)
 	print '<th class="right">'.$langs->trans("Status").'</th>';
 	print "</tr>\n";
 
-	while ($objp = $db->fetch_object($resql))
-	{
+	while ($objp = $db->fetch_object($resql)) {
 		$checkdepositstatic->id = $objp->rowid;
 		$checkdepositstatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
 		$checkdepositstatic->statut = $objp->statut;
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index 39a87653cba..c13472dd1fe 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -35,7 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array('banks', 'categories', 'bills'));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'banque', '', '');
 
 $search_ref = GETPOST('search_ref', 'alpha');
@@ -46,12 +48,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "dp";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "dp";
+}
 
 $year = GETPOST("year");
 $month = GETPOST("month");
@@ -67,8 +75,7 @@ $accountstatic = new Account($db);
  */
 
 // If click on 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_ref = '';
 	$search_amount = '';
 	$search_account = '';
@@ -93,20 +100,24 @@ $sql .= " WHERE bc.fk_bank_account = ba.rowid";
 $sql .= " AND bc.entity = ".$conf->entity;
 
 // Search criteria
-if ($search_ref)			$sql .= natural_search("bc.ref", $search_ref);
-if ($search_account > 0)	$sql .= " AND bc.fk_bank_account=".$search_account;
-if ($search_amount)			$sql .= natural_search("bc.amount", price2num($search_amount));
+if ($search_ref) {
+	$sql .= natural_search("bc.ref", $search_ref);
+}
+if ($search_account > 0) {
+	$sql .= " AND bc.fk_bank_account=".$search_account;
+}
+if ($search_amount) {
+	$sql .= natural_search("bc.amount", price2num($search_amount));
+}
 $sql .= dolSqlDateFilter('bc.date_bordereau', 0, $month, $year);
 
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -116,20 +127,27 @@ $sql .= $db->plimit($limit + 1, $offset);
 //print "$sql";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.$contextpage;
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.$limit;
+	}
 
 	$url = DOL_URL_ROOT.'/compta/paiement/cheque/card.php?action=new';
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewCheckDeposit'), '', 'fa fa-plus-circle', $url, '', $user->rights->banque->cheque);
 
 	print '<form method="POST" 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="view" value="'.dol_escape_htmltag($view).'">';
@@ -150,7 +168,9 @@ if ($resql)
 	print '<input class="flat" type="text" size="4" name="search_ref" value="'.$search_ref.'">';
 	print '</td>';
 	print '<td class="liste_titre" align="center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
+	}
 	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
 	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
 	print '</td>';
@@ -178,10 +198,8 @@ if ($resql)
 	print_liste_field_titre('');
 	print "</tr>\n";
 
-	if ($num > 0)
-	{
-		while ($i < min($num, $limit))
-		{
+	if ($num > 0) {
+		while ($i < min($num, $limit)) {
 			$objp = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -199,8 +217,11 @@ if ($resql)
 
 			// Bank
 			print '<td>';
-			if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';
-			else print '&nbsp;';
+			if ($objp->bid) {
+				print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.$objp->label.'</a>';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td>';
 
 			// Number of cheques
@@ -220,9 +241,9 @@ if ($resql)
 			$i++;
 		}
 	} else {
-   		print '<tr class="oddeven">';
-   		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";
-   		print '</tr>';
+		print '<tr class="oddeven">';
+		print '<td colspan="7" class="opacitymedium">'.$langs->trans("None")."</td>";
+		print '</tr>';
 	}
 	print "</table>";
 	print "</div>";
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 842cb24a024..7db9ff922d9 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -168,18 +168,17 @@ class Paiement extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement as p LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
 		$sql .= ' WHERE p.entity IN ('.getEntity('invoice').')';
-		if ($id > 0)
+		if ($id > 0) {
 			$sql .= ' AND p.rowid = '.$id;
-		elseif ($ref)
+		} elseif ($ref) {
 			$sql .= " AND p.ref = '".$ref."'";
-		elseif ($fk_bank)
+		} elseif ($fk_bank) {
 			$sql .= ' AND p.fk_bank = '.$fk_bank;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id             = $obj->rowid;
@@ -239,8 +238,7 @@ class Paiement extends CommonObject
 		$totalamount_converted = 0;
 		$atleastonepaymentnotnull = 0;
 
-		if ($way == 'dolibarr')
-		{
+		if ($way == 'dolibarr') {
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
 		} else {
@@ -248,8 +246,7 @@ class Paiement extends CommonObject
 			$amounts_to_update = &$this->amounts;
 		}
 
-		foreach ($amounts as $key => $value)	// How payment is dispatch
-		{
+		foreach ($amounts as $key => $value) {	// How payment is dispatch
 			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value, $way);
 			$totalamount_converted += $value_converted;
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
@@ -257,15 +254,16 @@ class Paiement extends CommonObject
 			$newvalue = price2num($value, 'MT');
 			$amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
-			if (!empty($newvalue)) $atleastonepaymentnotnull++;
+			if (!empty($newvalue)) {
+				$atleastonepaymentnotnull++;
+			}
 		}
 
 		$totalamount = price2num($totalamount);
 		$totalamount_converted = price2num($totalamount_converted);
 
 		// Check parameters
-		if (empty($totalamount) && empty($atleastonepaymentnotnull))	 // We accept negative amounts for withdraw reject but not empty arrays
-		{
+		if (empty($totalamount) && empty($atleastonepaymentnotnull)) {	 // We accept negative amounts for withdraw reject but not empty arrays
 			$this->errors[] = 'TotalAmountEmpty';
 			$this->error = 'TotalAmountEmpty';
 			return -1;
@@ -281,8 +279,7 @@ class Paiement extends CommonObject
 			$this->ref_ext = '';
 		}
 
-		if ($way == 'dolibarr')
-		{
+		if ($way == 'dolibarr') {
 			$total = $totalamount;
 			$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
 		} else {
@@ -298,30 +295,25 @@ class Paiement extends CommonObject
 		$sql .= "'".$this->db->escape($num_payment)."', '".$this->db->escape($note)."', ".($this->ext_payment_id ? "'".$this->db->escape($this->ext_payment_id)."'" : "null").", ".($this->ext_payment_site ? "'".$this->db->escape($this->ext_payment_site)."'" : "null").", ".$user->id.", ".((float) $this->pos_change).")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'paiement');
 
 			// Insert links amount / invoices
-			foreach ($this->amounts as $key => $amount)
-			{
+			foreach ($this->amounts as $key => $amount) {
 				$facid = $key;
-				if (is_numeric($amount) && $amount <> 0)
-				{
+				if (is_numeric($amount) && $amount <> 0) {
 					$amount = price2num($amount);
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiement_facture (fk_facture, fk_paiement, amount, multicurrency_amount)';
 					$sql .= ' VALUES ('.$facid.', '.$this->id.', \''.$amount.'\', \''.$this->multicurrency_amounts[$key].'\')';
 
 					dol_syslog(get_class($this).'::create Amount line '.$key.' insert paiement_facture', LOG_DEBUG);
 					$resql = $this->db->query($sql);
-					if ($resql)
-					{
+					if ($resql) {
 						$invoice = new Facture($this->db);
 						$invoice->fetch($facid);
 
 						// If we want to closed payed invoices
-						if ($closepaidinvoices)
-						{
+						if ($closepaidinvoices) {
 							$paiement = $invoice->getSommePaiement();
 							$creditnotes = $invoice->getSumCreditNotesUsed();
 							$deposits = $invoice->getSumDepositsUsed();
@@ -339,13 +331,15 @@ class Paiement extends CommonObject
 								Facture::TYPE_SITUATION
 							);
 
-							if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
-							elseif ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
+							if (!in_array($invoice->type, $affected_types)) {
+								dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice, nor situation invoice. We do nothing more.");
+							} elseif ($remaintopay) {
+								dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
+							}
 							//else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
 							else {
 								// If invoice is a down payment, we also convert down payment to discount
-								if ($invoice->type == Facture::TYPE_DEPOSIT)
-								{
+								if ($invoice->type == Facture::TYPE_DEPOSIT) {
 									$amount_ht = $amount_tva = $amount_ttc = array();
 									$multicurrency_amount_ht = $multicurrency_amount_tva = $multicurrency_amount_ttc = array();
 
@@ -388,19 +382,16 @@ class Paiement extends CommonObject
 										}
 									}
 
-									if ($error)
-									{
+									if ($error) {
 										setEventMessages($discount->error, $discount->errors, 'errors');
 										$error++;
 									}
 								}
 
 								// Set invoice to paid
-								if (!$error)
-								{
+								if (!$error) {
 									$result = $invoice->setPaid($user, '', '');
-									if ($result < 0)
-									{
+									if ($result < 0) {
 										$this->error = $invoice->error;
 										$this->errors = $invoice->errors;
 										$error++;
@@ -410,8 +401,7 @@ class Paiement extends CommonObject
 						}
 
 						// Regenerate documents of invoices
-						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-						{
+						if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 							dol_syslog(get_class($this).'::create Regenerate the document after inserting payment for thirdparty default_lang='.(is_object($invoice->thirdparty) ? $invoice->thirdparty->default_lang : 'null'), LOG_DEBUG);
 
 							$newlang = '';
@@ -440,11 +430,12 @@ class Paiement extends CommonObject
 				}
 			}
 
-			if (!$error)    // All payments into $this->amounts were recorded without errors
-			{
+			if (!$error) {    // All payments into $this->amounts were recorded without errors
 				// Appel des triggers
 				$result = $this->call_trigger('PAYMENT_CUSTOMER_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// Fin appel triggers
 			}
 		} else {
@@ -452,8 +443,7 @@ class Paiement extends CommonObject
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->amount = $total;
 			$this->total = $total; // deprecated
 			$this->multicurrency_amount = $mtotal;
@@ -487,10 +477,8 @@ class Paiement extends CommonObject
 		// Verifier si paiement porte pas sur une facture classee
 		// Si c'est le cas, on refuse la suppression
 		$billsarray = $this->getBillsArray('fk_statut > 1');
-		if (is_array($billsarray))
-		{
-			if (count($billsarray))
-			{
+		if (is_array($billsarray)) {
+			if (count($billsarray)) {
 				$this->error = "ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible";
 				$this->db->rollback();
 				return -1;
@@ -501,8 +489,7 @@ class Paiement extends CommonObject
 		}
 
 		// Delete bank urls. If payment is on a conciliated line, return error.
-		if ($bank_line_id > 0)
-		{
+		if ($bank_line_id > 0) {
 			$accline = new AccountLine($this->db);
 
 			$result = $accline->fetch($bank_line_id);
@@ -512,8 +499,7 @@ class Paiement extends CommonObject
 
 			// Delete bank account url lines linked to payment
 			$result = $accline->delete_urls($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error = $accline->error;
 				$this->db->rollback();
 				return -3;
@@ -521,20 +507,17 @@ class Paiement extends CommonObject
 
 			// Delete bank account lines linked to payment
 			$result = $accline->delete($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error = $accline->error;
 				$this->db->rollback();
 				return -4;
 			}
 		}
 
-		if (!$notrigger)
-		{
+		if (!$notrigger) {
 			// Call triggers
 			$result = $this->call_trigger('PAYMENT_CUSTOMER_DELETE', $user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				return -1;
 			}
@@ -546,14 +529,12 @@ class Paiement extends CommonObject
 		$sql .= ' WHERE fk_paiement = '.$this->id;
 		dol_syslog($sql);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiement';
 			$sql .= ' WHERE rowid = '.$this->id;
 			dol_syslog($sql);
 			$result = $this->db->query($sql);
-			if (!$result)
-			{
+			if (!$result) {
 				$this->error = $this->db->lasterror();
 				$this->db->rollback();
 				return -3;
@@ -590,10 +571,8 @@ class Paiement extends CommonObject
 		$error = 0;
 		$bank_line_id = 0;
 
-		if (!empty($conf->banque->enabled))
-		{
-			if ($accountid <= 0)
-			{
+		if (!empty($conf->banque->enabled)) {
+			if ($accountid <= 0) {
 				$this->error = 'Bad value for parameter accountid='.$accountid;
 				dol_syslog(get_class($this).'::addPaymentToBank '.$this->error, LOG_ERR);
 				return -1;
@@ -611,12 +590,18 @@ class Paiement extends CommonObject
 			$result = $acc->fetch($this->fk_account);
 
 			$totalamount = $this->amount;
-			if (empty($totalamount)) $totalamount = $this->total; // For backward compatibility
+			if (empty($totalamount)) {
+				$totalamount = $this->total; // For backward compatibility
+			}
 
 			// if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
-			if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) $totalamount = $this->multicurrency_amount;
+			if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) {
+				$totalamount = $this->multicurrency_amount;
+			}
 
-			if ($mode == 'payment_supplier') $totalamount = -$totalamount;
+			if ($mode == 'payment_supplier') {
+				$totalamount = -$totalamount;
+			}
 
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
@@ -634,26 +619,25 @@ class Paiement extends CommonObject
 
 			// Mise a jour fk_bank dans llx_paiement
 			// On connait ainsi le paiement qui a genere l'ecriture bancaire
-			if ($bank_line_id > 0)
-			{
+			if ($bank_line_id > 0) {
 				$result = $this->update_fk_bank($bank_line_id);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$error++;
 					dol_print_error($this->db);
 				}
 
 				// Add link 'payment', 'payment_supplier' in bank_url between payment and bank transaction
-				if (!$error)
-				{
+				if (!$error) {
 					$url = '';
-					if ($mode == 'payment') $url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
-					if ($mode == 'payment_supplier') $url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
-					if ($url)
-					{
+					if ($mode == 'payment') {
+						$url = DOL_URL_ROOT.'/compta/paiement/card.php?id=';
+					}
+					if ($mode == 'payment_supplier') {
+						$url = DOL_URL_ROOT.'/fourn/paiement/card.php?id=';
+					}
+					if ($url) {
 						$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-						if ($result <= 0)
-						{
+						if ($result <= 0) {
 							$error++;
 							dol_print_error($this->db);
 						}
@@ -662,18 +646,14 @@ class Paiement extends CommonObject
 
 				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
 				//if (! $error && $label != '(WithdrawalPayment)')
-				if (!$error)
-				{
+				if (!$error) {
 					$linkaddedforthirdparty = array();
-					foreach ($this->amounts as $key => $value)  // We should have invoices always for same third party but we loop in case of.
-					{
-						if ($mode == 'payment')
-						{
+					foreach ($this->amounts as $key => $value) {  // We should have invoices always for same third party but we loop in case of.
+						if ($mode == 'payment') {
 							$fac = new Facture($this->db);
 							$fac->fetch($key);
 							$fac->fetch_thirdparty();
-							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
-							{
+							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) { // Not yet done for this thirdparty
 								$result = $acc->add_url_line(
 									$bank_line_id,
 									$fac->thirdparty->id,
@@ -681,17 +661,17 @@ class Paiement extends CommonObject
 									$fac->thirdparty->name,
 									'company'
 								);
-								if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								if ($result <= 0) {
+									dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								}
 								$linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
 							}
 						}
-						if ($mode == 'payment_supplier')
-						{
+						if ($mode == 'payment_supplier') {
 							$fac = new FactureFournisseur($this->db);
 							$fac->fetch($key);
 							$fac->fetch_thirdparty();
-							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) // Not yet done for this thirdparty
-							{
+							if (!in_array($fac->thirdparty->id, $linkaddedforthirdparty)) { // Not yet done for this thirdparty
 								$result = $acc->add_url_line(
 									$bank_line_id,
 									$fac->thirdparty->id,
@@ -699,7 +679,9 @@ class Paiement extends CommonObject
 									$fac->thirdparty->name,
 									'company'
 								);
-								if ($result <= 0) dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								if ($result <= 0) {
+									dol_syslog(get_class($this).'::addPaymentToBank '.$this->db->lasterror());
+								}
 								$linkaddedforthirdparty[$fac->thirdparty->id] = $fac->thirdparty->id; // Mark as done for this thirdparty
 							}
 						}
@@ -717,11 +699,12 @@ class Paiement extends CommonObject
 					);
 				}
 
-				if (!$error && !$notrigger)
-				{
+				if (!$error && !$notrigger) {
 					// Appel des triggers
 					$result = $this->call_trigger('PAYMENT_ADD_TO_BANK', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// Fin appel triggers
 				}
 			} else {
@@ -729,16 +712,14 @@ class Paiement extends CommonObject
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 			} else {
 				$this->db->rollback();
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			return $bank_line_id;
 		} else {
 			return -1;
@@ -761,8 +742,7 @@ class Paiement extends CommonObject
 
 		dol_syslog(get_class($this).'::update_fk_bank', LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -783,8 +763,7 @@ class Paiement extends CommonObject
 		// phpcs:enable
 		$error = 0;
 
-		if (!empty($date) && $this->statut != 1)
-		{
+		if (!empty($date) && $this->statut != 1) {
 			$this->db->begin();
 
 			dol_syslog(get_class($this)."::update_date with date = ".$date, LOG_DEBUG);
@@ -794,8 +773,7 @@ class Paiement extends CommonObject
 			$sql .= " WHERE rowid = ".$this->id;
 
 			$result = $this->db->query($sql);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				$this->error = 'Error -1 '.$this->db->error();
 			}
@@ -808,18 +786,15 @@ class Paiement extends CommonObject
 			$sql .= " AND rappro = 0";
 
 			$result = $this->db->query($sql);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				$this->error = 'Error -1 '.$this->db->error();
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->datepaye = $date;
 				$this->date = $date;
 
@@ -850,8 +825,7 @@ class Paiement extends CommonObject
 
 			dol_syslog(get_class($this)."::update_num", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$this->num_payment = $this->db->escape($num);
 				return 0;
 			} else {
@@ -886,8 +860,7 @@ class Paiement extends CommonObject
 
 		dol_syslog(get_class($this).'::valide', LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -908,8 +881,7 @@ class Paiement extends CommonObject
 
 		dol_syslog(get_class($this).'::reject', LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -933,20 +905,16 @@ class Paiement extends CommonObject
 		dol_syslog(get_class($this).'::info', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_creat)
-				{
+				if ($obj->fk_user_creat) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creat);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_modif)
-				{
+				if ($obj->fk_user_modif) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modif);
 					$this->user_modification = $muser;
@@ -971,16 +939,16 @@ class Paiement extends CommonObject
 		$sql = 'SELECT pf.fk_facture';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'facture as f'; // We keep link on invoice to allow use of some filters on invoice
 		$sql .= ' WHERE pf.fk_facture = f.rowid AND pf.fk_paiement = '.$this->id;
-		if ($filter) $sql .= ' AND '.$filter;
+		if ($filter) {
+			$sql .= ' AND '.$filter;
+		}
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num = $this->db->num_rows($resql);
 			$billsarray = array();
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$billsarray[$i] = $obj->fk_facture;
 				$i++;
@@ -1005,14 +973,12 @@ class Paiement extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
 		$sql .= ' WHERE pf.fk_paiement = '.$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num = $this->db->num_rows($resql);
 			$amounts = array();
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$amounts[$obj->fk_facture] = $obj->amount;
 				$i++;
@@ -1040,12 +1006,15 @@ class Paiement extends CommonObject
 		$langs->load("bills");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->PAYMENT_ADDON)) $conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
-		elseif ($conf->global->PAYMENT_ADDON == 'ant') $conf->global->PAYMENT_ADDON = 'mod_payment_ant';
-		elseif ($conf->global->PAYMENT_ADDON == 'cicada') $conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
+		if (empty($conf->global->PAYMENT_ADDON)) {
+			$conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
+		} elseif ($conf->global->PAYMENT_ADDON == 'ant') {
+			$conf->global->PAYMENT_ADDON = 'mod_payment_ant';
+		} elseif ($conf->global->PAYMENT_ADDON == 'cicada') {
+			$conf->global->PAYMENT_ADDON = 'mod_payment_cicada';
+		}
 
-		if (!empty($conf->global->PAYMENT_ADDON))
-		{
+		if (!empty($conf->global->PAYMENT_ADDON)) {
 			$mybool = false;
 
 			$file = $conf->global->PAYMENT_ADDON.".php";
@@ -1058,21 +1027,18 @@ class Paiement extends CommonObject
 				$dir = dol_buildpath($reldir."core/modules/payment/");
 
 				// Load file with numbering class (if found)
-				if (is_file($dir.$file) && is_readable($dir.$file))
-				{
+				if (is_file($dir.$file) && is_readable($dir.$file)) {
 					$mybool |= include_once $dir.$file;
 				}
 			}
 
 			// For compatibility
-			if (!$mybool)
-			{
+			if (!$mybool) {
 				$file = $conf->global->PAYMENT_ADDON.".php";
 				$classname = "mod_payment_".$conf->global->PAYMENT_ADDON;
 				$classname = preg_replace('/\-.*$/', '', $classname);
 				// Include file with class
-				foreach ($conf->file->dol_document_root as $dirroot)
-				{
+				foreach ($conf->file->dol_document_root as $dirroot) {
 					$dir = $dirroot."/core/modules/payment/";
 
 					// Load file with numbering class (if found)
@@ -1082,8 +1048,7 @@ class Paiement extends CommonObject
 				}
 			}
 
-			if (!$mybool)
-			{
+			if (!$mybool) {
 				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
@@ -1119,12 +1084,9 @@ class Paiement extends CommonObject
 		global $conf;
 
 		$way = 'dolibarr';
-		if (!empty($conf->multicurrency->enabled))
-		{
-			foreach ($this->multicurrency_amounts as $value)
-			{
-				if (!empty($value)) // one value found then payment is in invoice currency
-				{
+		if (!empty($conf->multicurrency->enabled)) {
+			foreach ($this->multicurrency_amounts as $value) {
+				if (!empty($value)) { // one value found then payment is in invoice currency
 					$way = 'customer';
 					break;
 				}
@@ -1172,31 +1134,30 @@ class Paiement extends CommonObject
 	{
 		global $conf, $langs;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Payment").'</u><br>';
 		$label .= '<strong>'.$langs->trans("Ref").':</strong> '.$this->ref;
-        $dateofpayment = ($this->datepaye ? $this->datepaye : $this->date);
-        if ($dateofpayment) {
-        	$label .= '<br><strong>'.$langs->trans("Date").':</strong> ';
-        	$tmparray = dol_getdate($dateofpayment);
-        	if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) {	// We set hours to 0:00 or 12:00 because we don't know it
-        		$label .= dol_print_date($dateofpayment, 'day');
-        	} else {	// Hours was set to real date of payment (special case for POS for example)
-        		$label .= dol_print_date($dateofpayment, 'dayhour', 'tzuser');
-        	}
-        }
-		if ($mode == 'withlistofinvoices')
-		{
+		$dateofpayment = ($this->datepaye ? $this->datepaye : $this->date);
+		if ($dateofpayment) {
+			$label .= '<br><strong>'.$langs->trans("Date").':</strong> ';
+			$tmparray = dol_getdate($dateofpayment);
+			if ($tmparray['seconds'] == 0 && $tmparray['minutes'] == 0 && ($tmparray['hours'] == 0 || $tmparray['hours'] == 12)) {	// We set hours to 0:00 or 12:00 because we don't know it
+				$label .= dol_print_date($dateofpayment, 'day');
+			} else {	// Hours was set to real date of payment (special case for POS for example)
+				$label .= dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+			}
+		}
+		if ($mode == 'withlistofinvoices') {
 			$arraybill = $this->getBillsArray();
-			if (is_array($arraybill) && count($arraybill) > 0)
-			{
+			if (is_array($arraybill) && count($arraybill) > 0) {
 				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$facturestatic = new Facture($this->db);
-				foreach ($arraybill as $billid)
-				{
+				foreach ($arraybill as $billid) {
 					$facturestatic->fetch($billid);
 					$label .= '<br> '.$facturestatic->getNomUrl(1, '', 0, 0, '', 1).' '.$facturestatic->getLibStatut(2, 1);
 				}
@@ -1204,16 +1165,16 @@ class Paiement extends CommonObject
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$url = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$this->id;
 
@@ -1222,8 +1183,12 @@ class Paiement extends CommonObject
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto && $withpicto != 2) $result .= ($this->ref ? $this->ref : $this->id);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result .= ($this->ref ? $this->ref : $this->id);
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -1285,10 +1250,10 @@ class Paiement extends CommonObject
 			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
 		}
 		if ($mode == 6)
-	    {
-	        if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
-	        if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
-	    }*/
+		{
+			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+		}*/
 		return '';
 	}
 
@@ -1305,14 +1270,11 @@ class Paiement extends CommonObject
 		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-		if (empty($force_thirdparty_id))
-		{
+		if (empty($force_thirdparty_id)) {
 			$billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him
-			if (!empty($billsarray))
-			{
+			if (!empty($billsarray)) {
 				$invoice = new Facture($this->db);
-				if ($invoice->fetch($billsarray[0]) > 0)
-				{
+				if ($invoice->fetch($billsarray[0]) > 0) {
 					$force_thirdparty_id = $invoice->socid;
 				}
 			}
diff --git a/htdocs/compta/paiement/index.php b/htdocs/compta/paiement/index.php
index 89136ec5712..4c4f6bac248 100644
--- a/htdocs/compta/paiement/index.php
+++ b/htdocs/compta/paiement/index.php
@@ -19,8 +19,9 @@
 require '../../main.inc.php';
 
 // Security check
-if (!$user->admin && $user->socid > 0)
-  accessforbidden();
+if (!$user->admin && $user->socid > 0) {
+	accessforbidden();
+}
 
 
 /*
diff --git a/htdocs/compta/paiement/info.php b/htdocs/compta/paiement/info.php
index ace21e40f95..4f279813b0a 100644
--- a/htdocs/compta/paiement/info.php
+++ b/htdocs/compta/paiement/info.php
@@ -44,7 +44,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 $result = restrictedArea($user, $object->element, $object->id, 'paiement', '');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 // Now check also permission on thirdparty of invoices of payments. Thirdparty were loaded by the fetch_object before based on first invoice.
 // It should be enough because all payments are done on invoices of the same thirdparty.
 if ($socid && $socid != $object->thirdparty->id) {
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index cfcdead5fed..269acd29600 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -33,7 +33,9 @@
 require '../../main.inc.php';
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'facture', $facid, '');
 
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
@@ -70,13 +72,19 @@ $sortfield			= GETPOST("sortfield", 'alpha');
 $sortorder			= GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
-if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0; // If $page is not defined, or '' or -1
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "p.ref";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "p.ref";
+}
 
 $search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
 
@@ -111,7 +119,9 @@ $object = new Paiement($db);
 
 $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)) {
@@ -193,20 +203,37 @@ if (GETPOST("orphelins", "alpha")) {
 		$sql .= " AND f.fk_soc = ".$socid;
 	}
 	if ($userid) {
-		if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
-		else $sql .= " AND f.fk_user_author = ".$userid;
+		if ($userid == -1) {
+			$sql .= " AND f.fk_user_author IS NULL";
+		} else {
+			$sql .= " AND f.fk_user_author = ".$userid;
+		}
 	}
 
 	// Search criteria
 	$sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
-	if ($search_ref)       		    $sql .= natural_search('p.ref', $search_ref);
-	if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
-	if ($search_paymenttype != '')  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
-	if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
-	if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
-	if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
+	if ($search_ref) {
+		$sql .= natural_search('p.ref', $search_ref);
+	}
+	if ($search_account > 0) {
+		$sql .= " AND b.fk_account=".$search_account;
+	}
+	if ($search_paymenttype != '') {
+		$sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
+	}
+	if ($search_payment_num != '') {
+		$sql .= natural_search('p.num_paiement', $search_payment_num);
+	}
+	if ($search_amount) {
+		$sql .= natural_search('p.amount', $search_amount, 1);
+	}
+	if ($search_company) {
+		$sql .= natural_search('s.nom', $search_company);
+	}
 
-	if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+	if ($search_all) {
+		$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+	}
 
 	// Add where from hooks
 	$parameters = array();
@@ -240,17 +267,25 @@ if (!$resql) {
 $num = $db->num_rows($resql);
 
 $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);
+}
 $param .= (GETPOST("orphelins") ? "&orphelins=1" : '');
 $param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : '');
 $param .= ($search_company ? "&search_company=".urlencode($search_company) : '');
 $param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : '');
 $param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : '');
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 
 print '<form method="POST" 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="action" value="list">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -261,15 +296,18 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
 
-if ($search_all)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
 $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" : '').'">';
@@ -293,7 +331,9 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 // Filter: Date
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+	}
 	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
 	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
 	print '</td>';
@@ -358,16 +398,36 @@ print '</td>';
 print "</tr>";
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.datep']['checked']))				print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], "p.datep", '', $param, '', $sortfield, $sortorder, 'center ');
-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['c.libelle']['checked']))			print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.num_paiement']['checked']))		print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
-if (!empty($arrayfields['transaction']['checked']))			print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], "ba.label", '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.amount']['checked']))			print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], "p.amount", '', $param, 'class="right"', $sortfield, $sortorder);
-if (!empty($arrayfields['p.statut']['checked']))			print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", '', $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.datep']['checked'])) {
+	print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], "p.datep", '', $param, '', $sortfield, $sortorder, 'center ');
+}
+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['c.libelle']['checked'])) {
+	print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.num_paiement']['checked'])) {
+	print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
+}
+if (!empty($arrayfields['transaction']['checked'])) {
+	print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], "ba.label", '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.amount']['checked'])) {
+	print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], "p.amount", '', $param, 'class="right"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.statut']['checked'])) {
+	print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", '', $param, 'class="right"', $sortfield, $sortorder);
+}
 
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -401,21 +461,29 @@ while ($i < min($num, $limit)) {
 	// No
 	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 		print '<td>'.(($offset * $limit) + $i).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Ref
 	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td>'.$object->getNomUrl(1).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Date
 	if (!empty($arrayfields['p.datep']['checked'])) {
 		$dateformatforpayment = 'day';
-		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
+		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) {
+			$dateformatforpayment = 'dayhour';
+		}
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Thirdparty
@@ -425,26 +493,34 @@ while ($i < min($num, $limit)) {
 			print $companystatic->getNomUrl(1, '', 24);
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Payment type
 	if (!empty($arrayfields['c.libelle']['checked'])) {
 		print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Filter: Cheque number (fund transfer)
 	if (!empty($arrayfields['p.num_paiement']['checked'])) {
 		print '<td>'.$objp->num_paiement.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Bank transaction
 	if (!empty($arrayfields['transaction']['checked'])) {
 		$bankline->fetch($objp->fk_bank);
 		print '<td>'.$bankline->getNomUrl(1, 0).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Bank account
@@ -464,13 +540,17 @@ while ($i < min($num, $limit)) {
 			print $accountstatic->getNomUrl(1);
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount
 	if (!empty($arrayfields['p.amount']['checked'])) {
 		print '<td class="right">'.price($objp->amount).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 		$totalarray['pos'][$checkedCount] = 'amount';
 		$totalarray['val']['amount'] += $objp->amount;
 	}
@@ -478,16 +558,24 @@ while ($i < min($num, $limit)) {
 	// Status
 	if (!empty($arrayfields['p.statut']['checked'])) {
 		print '<td class="right">';
-		if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
+		if ($objp->statut == 0) {
+			print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
+		}
 		print $object->LibStatut($objp->statut, 5);
-		if ($objp->statut == 0) print '</a>';
+		if ($objp->statut == 0) {
+			print '</a>';
+		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Buttons
 	print '<td></td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>';
 
@@ -498,10 +586,13 @@ while ($i < min($num, $limit)) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 // If no record found
-if ($num == 0)
-{
+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>';
 }
 
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index 0af202016df..139188c7c1b 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -33,33 +33,36 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $action = GETPOST('action', 'aZ09');
 
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
 
 $dir = $conf->facture->dir_output.'/payments';
-if (!$user->rights->societe->client->voir || $socid) $dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
+if (!$user->rights->societe->client->voir || $socid) {
+	$dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
+}
 
 $year = GETPOST('year', 'int');
-if (!$year) { $year = date("Y"); }
+if (!$year) {
+	$year = date("Y");
+}
 
 // Security check
-if (empty($user->rights->facture->lire)) accessforbidden();
+if (empty($user->rights->facture->lire)) {
+	accessforbidden();
+}
 
 
 /*
  * Actions
  */
 
-if ($action == 'builddoc')
-{
+if ($action == 'builddoc') {
 	$rap = new pdf_paiement($db);
 
 	$outputlangs = $langs;
-	if (GETPOST('lang_id', 'aZ09'))
-	{
+	if (GETPOST('lang_id', 'aZ09')) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
 	}
@@ -67,8 +70,7 @@ if ($action == 'builddoc')
 	// We save charset_output to restore it because write_file can change it if needed for
 	// output format that does not support UTF8.
 	$sav_charset_output = $outputlangs->charset_output;
-	if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0)
-	{
+	if ($rap->write_file($dir, $_POST["remonth"], $_POST["reyear"], $outputlangs) > 0) {
 		$outputlangs->charset_output = $sav_charset_output;
 	} else {
 		$outputlangs->charset_output = $sav_charset_output;
@@ -111,15 +113,11 @@ clearstatcache();
 // Show link on other years
 $linkforyear = array();
 $found = 0;
-if (is_dir($dir))
-{
+if (is_dir($dir)) {
 	$handle = opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle)) !== false)
-		{
-			if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
-			{
+	if (is_resource($handle)) {
+		while (($file = readdir($handle)) !== false) {
+			if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file)) {
 				$found = 1;
 				$linkforyear[] = $file;
 			}
@@ -127,18 +125,17 @@ if (is_dir($dir))
 	}
 }
 asort($linkforyear);
-foreach ($linkforyear as $cursoryear)
-{
+foreach ($linkforyear as $cursoryear) {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
-if ($year)
-{
-	if (is_dir($dir.'/'.$year))
-	{
+if ($year) {
+	if (is_dir($dir.'/'.$year)) {
 		$handle = opendir($dir.'/'.$year);
 
-		if ($found) print '<br>';
+		if ($found) {
+			print '<br>';
+		}
 		print '<br>';
 		print '<table width="100%" class="noborder">';
 		print '<tr class="liste_titre">';
@@ -147,12 +144,9 @@ if ($year)
 		print '<td class="right">'.$langs->trans("Date").'</td>';
 		print '</tr>';
 
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (preg_match('/^payment/i', $file))
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match('/^payment/i', $file)) {
 					$tfile = $dir.'/'.$year.'/'.$file;
 					$relativepath = $year.'/'.$file;
 					print '<tr class="oddeven">';
diff --git a/htdocs/compta/paiement/tovalidate.php b/htdocs/compta/paiement/tovalidate.php
index 4cf14ad8a5c..f41d40115b6 100644
--- a/htdocs/compta/paiement/tovalidate.php
+++ b/htdocs/compta/paiement/tovalidate.php
@@ -28,8 +28,7 @@ require '../../main.inc.php';
 $langs->load("bills");
 
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -39,15 +38,23 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "p.rowid";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "p.rowid";
+}
 
 // Security check
-if (empty($user->rights->facture->lire)) accessforbidden();
+if (empty($user->rights->facture->lire)) {
+	accessforbidden();
+}
 
 
 /*
@@ -65,14 +72,12 @@ llxHeader();
 $sql = "SELECT p.rowid, p.datep as dp, p.amount, p.statut";
 $sql .= ", c.libelle as paiement_type, p.num_paiement as num_payment";
 $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
-if ($socid)
-{
+if ($socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
 }
 $sql .= " WHERE p.entity IN (".getEntity('invoice').')';
-if ($socid)
-{
+if ($socid) {
 	$sql .= " AND f.fk_soc = ".$socid;
 }
 $sql .= " AND p.statut = 0";
@@ -81,12 +86,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -95,8 +98,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -111,8 +113,7 @@ if ($resql)
 	print_liste_field_titre('');
 	print "</tr>\n";
 
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$objp = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
@@ -122,8 +123,7 @@ if ($resql)
 		print '<td class="right">'.price($objp->amount).'</td>';
 		print '<td class="center">';
 
-		if ($objp->statut == 0)
-		{
+		if ($objp->statut == 0) {
 			print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">'.$langs->trans("PaymentStatusToValidShort").'</a>';
 		} else {
 			print "-";
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 247f66b5acf..675f8d64bcc 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -36,8 +36,7 @@ $amounts = array();
 
 // Security check
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
@@ -48,12 +47,10 @@ $charge = new ChargeSociales($db);
  * Actions
  */
 
-if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'yes'))
-{
+if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'yes')) {
 	$error = 0;
 
-	if ($_POST["cancel"])
-	{
+	if ($_POST["cancel"]) {
 		$loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
 		header("Location: ".$loc);
 		exit;
@@ -61,48 +58,40 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 
 	$datepaye = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 
-	if (!$_POST["paiementtype"] > 0)
-	{
+	if (!$_POST["paiementtype"] > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
 		$action = 'create';
 	}
-	if ($datepaye == '')
-	{
+	if ($datepaye == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 		$action = 'create';
 	}
-	if (!empty($conf->banque->enabled) && !($_POST["accountid"] > 0))
-	{
+	if (!empty($conf->banque->enabled) && !($_POST["accountid"] > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
 		$error++;
 		$action = 'create';
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$paymentid = 0;
 
 		// Read possible payments
-		foreach ($_POST as $key => $value)
-		{
-			if (substr($key, 0, 7) == 'amount_')
-			{
+		foreach ($_POST as $key => $value) {
+			if (substr($key, 0, 7) == 'amount_') {
 				$other_chid = substr($key, 7);
 				$amounts[$other_chid] = price2num($_POST[$key]);
 			}
 		}
 
-		if (count($amounts) <= 0)
-		{
+		if (count($amounts) <= 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorNoPaymentDefined"), null, 'errors');
 			$action = 'create';
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// Create a line of payments
@@ -115,30 +104,25 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 			$paiement->note         = GETPOST("note", 'restricthtml');
 			$paiement->note_private = GETPOST("note", 'restricthtml');
 
-			if (!$error)
-			{
+			if (!$error) {
 				$paymentid = $paiement->create($user, (GETPOST('closepaidcontrib') == 'on' ? 1 : 0));
-				if ($paymentid < 0)
-				{
+				if ($paymentid < 0) {
 					$error++;
 					setEventMessages($paiement->error, null, 'errors');
 					$action = 'create';
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $paiement->addPaymentToBank($user, 'payment_sc', '(SocialContributionPayment)', GETPOST('accountid', 'int'), '', '');
-				if (!($result > 0))
-				{
+				if (!($result > 0)) {
 					$error++;
 					setEventMessages($paiement->error, null, 'errors');
 					$action = 'create';
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 				$loc = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$chid;
 				header('Location: '.$loc);
@@ -161,15 +145,13 @@ $form = new Form($db);
 
 
 // Form of charge payment creation
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$charge->fetch($chid);
 	$charge->accountid = $charge->fk_account ? $charge->fk_account : $charge->accountid;
 	$charge->paiementtype = $charge->mode_reglement_id ? $charge->mode_reglement_id : $charge->paiementtype;
 
 	$total = $charge->amount;
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		print "\n".'<script type="text/javascript" language="javascript">';
 
 		//Add js for AutoFill
@@ -186,8 +168,7 @@ if ($action == 'create')
 	print load_fiche_titre($langs->trans("DoPayment"));
 	print "<br>\n";
 
-	if ($mesg)
-	{
+	if ($mesg) {
 		print "<div class=\"error\">$mesg</div>";
 	}
 
@@ -212,8 +193,7 @@ if ($action == 'create')
 	$sql .= " FROM ".MAIN_DB_PREFIX."paiementcharge as p";
 	$sql .= " WHERE p.fk_charge = ".$chid;
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$sumpaid = $obj->total;
 		$db->free();
@@ -255,7 +235,7 @@ if ($action == 'create')
 	print dol_get_fiche_end();
 
 	/*
- 	 * Other unpaid charges
+	  * Other unpaid charges
 	 */
 	$num = 1;
 	$i = 0;
@@ -273,14 +253,12 @@ if ($action == 'create')
 	$total = 0;
 	$totalrecu = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $charge;
 
 		print '<tr class="oddeven">';
 
-		if ($objp->date_ech > 0)
-		{
+		if ($objp->date_ech > 0) {
 			print '<td class="left">'.dol_print_date($objp->date_ech, 'day').'</td>'."\n";
 		} else {
 			print "<td align=\"center\"><b>!!!</b></td>\n";
@@ -293,12 +271,12 @@ if ($action == 'create')
 		print '<td class="right">'.price($objp->amount - $sumpaid)."</td>";
 
 		print '<td class="center">';
-		if ($sumpaid < $objp->amount)
-		{
+		if ($sumpaid < $objp->amount) {
 			$namef = "amount_".$objp->id;
 			$nameRemain = "remain_".$objp->id;
-			if (!empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax)) {
 					print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->amount - $sumpaid)."'");
+			}
 			$remaintopay = $objp->amount - $sumpaid;
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
@@ -313,8 +291,7 @@ if ($action == 'create')
 		$totalrecu += $objp->am;
 		$i++;
 	}
-	if ($i > 1)
-	{
+	if ($i > 1) {
 		// Print total
 		print '<tr class="oddeven">';
 		print '<td colspan="2" class="left">'.$langs->trans("Total").':</td>';
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index 5e073f69c53..c05e11c554c 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -37,8 +37,7 @@ $amounts = array();
 
 // Security check
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
@@ -47,12 +46,10 @@ if ($user->socid > 0)
  * Actions
  */
 
-if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'yes'))
-{
+if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'yes')) {
 	$error = 0;
 
-	if ($_POST["cancel"])
-	{
+	if ($_POST["cancel"]) {
 		$loc = DOL_URL_ROOT.'/compta/tva/card.php?id='.$chid;
 		header("Location: ".$loc);
 		exit;
@@ -60,92 +57,79 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 
 	$datepaye = dol_mktime(12, 0, 0, GETPOST("remonth", 'int'), GETPOST("reday", 'int'), GETPOST("reyear", 'int'));
 
-	if (!(GETPOST("paiementtype", 'int') > 0))
-	{
+	if (!(GETPOST("paiementtype", 'int') > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
-        $action = 'create';
+		$action = 'create';
 	}
-	if ($datepaye == '')
-	{
+	if ($datepaye == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
-        $action = 'create';
+		$action = 'create';
+	}
+	if (!empty($conf->banque->enabled) && !(GETPOST("accountid", 'int') > 0)) {
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
+		$error++;
+		$action = 'create';
 	}
-	if (!empty($conf->banque->enabled) && !(GETPOST("accountid", 'int') > 0))
-    {
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
-        $error++;
-        $action = 'create';
-    }
 
-	if (!$error)
-	{
+	if (!$error) {
 		$paymentid = 0;
 
 		// Read possible payments
-		foreach ($_POST as $key => $value)
-		{
-			if (substr($key, 0, 7) == 'amount_')
-			{
+		foreach ($_POST as $key => $value) {
+			if (substr($key, 0, 7) == 'amount_') {
 				$other_chid = substr($key, 7);
 				$amounts[$other_chid] = price2num(GETPOST($key));
 			}
 		}
 
-        if (count($amounts) <= 0)
-        {
-            $error++;
-            setEventMessages($langs->trans("ErrorNoPaymentDefined"), null, 'errors');
-            $action = 'create';
-        }
+		if (count($amounts) <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorNoPaymentDefined"), null, 'errors');
+			$action = 'create';
+		}
 
-        if (!$error)
-        {
-    		$db->begin();
+		if (!$error) {
+			$db->begin();
 
-    		// Create a line of payments
-    		$paiement = new PaymentVAT($db);
-    		$paiement->chid         = $chid;
-    		$paiement->datepaye     = $datepaye;
-    		$paiement->amounts      = $amounts; // Tableau de montant
-    		$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
-    		$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
-    		$paiement->note         = (string) GETPOST("note", 'restricthtml');
-    		$paiement->note_private = (string) GETPOST("note", 'restricthtml');
+			// Create a line of payments
+			$paiement = new PaymentVAT($db);
+			$paiement->chid         = $chid;
+			$paiement->datepaye     = $datepaye;
+			$paiement->amounts      = $amounts; // Tableau de montant
+			$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
+			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
+			$paiement->note         = (string) GETPOST("note", 'restricthtml');
+			$paiement->note_private = (string) GETPOST("note", 'restricthtml');
 
-    		if (!$error) {
-    		    $paymentid = $paiement->create($user, (GETPOST('closepaidvat') == 'on' ? 1 : 0));
-                if ($paymentid < 0)
-                {
-                	$error++;
-                	setEventMessages($paiement->error, null, 'errors');
-                	$action = 'create';
-                }
-    		}
+			if (!$error) {
+				$paymentid = $paiement->create($user, (GETPOST('closepaidvat') == 'on' ? 1 : 0));
+				if ($paymentid < 0) {
+					$error++;
+					setEventMessages($paiement->error, null, 'errors');
+					$action = 'create';
+				}
+			}
 
-            if (!$error)
-            {
-                $result = $paiement->addPaymentToBank($user, 'payment_vat', '(VATPayment)', GETPOST('accountid', 'int'), '', '');
-                if (!($result > 0))
-                {
-                	$error++;
-                	setEventMessages($paiement->error, null, 'errors');
-                	$action = 'create';
-                }
-            }
+			if (!$error) {
+				$result = $paiement->addPaymentToBank($user, 'payment_vat', '(VATPayment)', GETPOST('accountid', 'int'), '', '');
+				if (!($result > 0)) {
+					$error++;
+					setEventMessages($paiement->error, null, 'errors');
+					$action = 'create';
+				}
+			}
 
-    	    if (!$error)
-            {
-                $db->commit();
-                $loc = DOL_URL_ROOT.'/compta/tva/card.php?id='.$chid;
-                header('Location: '.$loc);
-                exit;
-            }
-            else {
-                $db->rollback();
-            }
-        }
+			if (!$error) {
+				$db->commit();
+				$loc = DOL_URL_ROOT.'/compta/tva/card.php?id='.$chid;
+				header('Location: '.$loc);
+				exit;
+			} else {
+				$db->rollback();
+			}
+		}
 	}
 }
 
@@ -160,16 +144,14 @@ $form = new Form($db);
 
 
 // Formulaire de creation d'un paiement de charge
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$tva = new Tva($db);
 	$tva->fetch($chid);
 	$tva->accountid = $tva->fk_account ? $tva->fk_account : $tva->accountid;
 	$tva->paiementtype = $tva->type_payment;
 
 	$total = $tva->amount;
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		print "\n".'<script type="text/javascript" language="javascript">';
 
 		//Add js for AutoFill
@@ -249,7 +231,7 @@ if ($action == 'create')
 	print dol_get_fiche_end();
 
 	/*
- 	 * Autres charges impayees
+	  * Autres charges impayees
 	 */
 	$num = 1;
 	$i = 0;
@@ -267,17 +249,14 @@ if ($action == 'create')
 	$total = 0;
 	$totalrecu = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $tva;
 
 		print '<tr class="oddeven">';
 
-		if ($objp->datev > 0)
-		{
+		if ($objp->datev > 0) {
 			print '<td class="left">'.dol_print_date($objp->datev, 'day').'</td>'."\n";
-		}
-		else {
+		} else {
 			print "<td align=\"center\"><b>!!!</b></td>\n";
 		}
 
@@ -289,8 +268,7 @@ if ($action == 'create')
 
 		print '<td class="center">';
 
-		if ($sumpaid <> $objp->amount)
-		{
+		if ($sumpaid <> $objp->amount) {
 			$namef = "amount_".$objp->id;
 			$nameRemain = "remain_".$objp->id;
 			/* Disabled, we autofil the amount with remain to pay by default
@@ -300,8 +278,7 @@ if ($action == 'create')
 			$remaintopay = $objp->amount - $sumpaid;
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 			print '<input type="text" class="right width100" name="'.$namef.'" id="'.$namef.'" value="'.$remaintopay.'">';
-		}
-		else {
+		} else {
 			print '-';
 		}
 		print "</td>";
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 78fa11fc70b..7be99cead28 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -30,7 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php'
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (!empty($conf->banque->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'companies'));
@@ -39,15 +41,18 @@ $langs->loadLangs(array('bills', 'banks', 'companies'));
 $id = GETPOST("id", 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'aZ09');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 // TODO ajouter regle pour restreindre acces paiement
 //$result = restrictedArea($user, 'facture', $id,'');
 
 $object = new PaymentSocialContribution($db);
-if ($id > 0)
-{
+if ($id > 0) {
 	$result = $object->fetch($id);
-	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
+	if (!$result) {
+		dol_print_error($db, 'Failed to get payment id '.$id);
+	}
 }
 
 
@@ -56,13 +61,11 @@ if ($id > 0)
  */
 
 // Delete payment
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->charges->supprimer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->charges->supprimer) {
 	$db->begin();
 
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->commit();
 		header("Location: ".DOL_URL_ROOT."/compta/sociales/payments.php");
 		exit;
@@ -101,8 +104,7 @@ print dol_get_fiche_head($head, $hselected, $langs->trans("PaymentSocialContribu
 /*
  * Deletion confirmation of payment
  */
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
@@ -138,10 +140,8 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->
 print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
 
 // Bank account
-if (!empty($conf->banque->enabled))
-{
-	if ($object->bank_account)
-	{
+if (!empty($conf->banque->enabled)) {
+	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);
 
@@ -174,8 +174,7 @@ $sql .= ' AND pf.rowid = '.$object->id;
 
 dol_syslog("compta/payment_sc/card.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$i = 0;
@@ -190,10 +189,8 @@ if ($resql)
 	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
 	print "</tr>\n";
 
-	if ($num > 0)
-	{
-		while ($i < $num)
-		{
+	if ($num > 0) {
+		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -216,8 +213,7 @@ if ($resql)
 			// Amount paid
 			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
-			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
-			{
+			if ($objp->paye == 1) {	// If at least one invoice is paid, disable delete
 				$disable_delete = 1;
 			}
 			$total = $total + $objp->amount;
@@ -252,12 +248,9 @@ if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
 }
 */
 
-if ($action == '')
-{
-	if ($user->rights->tax->charges->supprimer)
-	{
-		if (!$disable_delete)
-		{
+if ($action == '') {
+	if ($user->rights->tax->charges->supprimer) {
+		if (!$disable_delete) {
 			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.GETPOST('id', 'int').'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/compta/payment_vat/card.php b/htdocs/compta/payment_vat/card.php
index dee616eb2ef..70d958932e5 100644
--- a/htdocs/compta/payment_vat/card.php
+++ b/htdocs/compta/payment_vat/card.php
@@ -31,7 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (!empty($conf->banque->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'companies'));
@@ -40,15 +42,18 @@ $langs->loadLangs(array('bills', 'banks', 'companies'));
 $id = GETPOST("id", 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 // TODO ajouter regle pour restreindre acces paiement
 //$result = restrictedArea($user, 'facture', $id,'');
 
 $object = new PaymentVAT($db);
-if ($id > 0)
-{
+if ($id > 0) {
 	$result = $object->fetch($id);
-	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
+	if (!$result) {
+		dol_print_error($db, 'Failed to get payment id '.$id);
+	}
 }
 
 
@@ -57,20 +62,17 @@ if ($id > 0)
  */
 
 // Delete payment
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->charges->supprimer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->charges->supprimer) {
 	$db->begin();
 
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
-        $db->commit();
-        header("Location: ".DOL_URL_ROOT."/compta/tva/payments.php?mode=tvaonly");
-        exit;
-	}
-	else {
+	if ($result > 0) {
+		$db->commit();
+		header("Location: ".DOL_URL_ROOT."/compta/tva/payments.php?mode=tvaonly");
+		exit;
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
-        $db->rollback();
+		$db->rollback();
 	}
 }
 
@@ -192,20 +194,18 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->
 print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
 
 // Bank account
-if (!empty($conf->banque->enabled))
-{
-    if ($object->bank_account)
-    {
-    	$bankline = new AccountLine($db);
-    	$bankline->fetch($object->bank_line);
+if (!empty($conf->banque->enabled)) {
+	if ($object->bank_account) {
+		$bankline = new AccountLine($db);
+		$bankline->fetch($object->bank_line);
 
-    	print '<tr>';
-    	print '<td>'.$langs->trans('BankTransactionLine').'</td>';
+		print '<tr>';
+		print '<td>'.$langs->trans('BankTransactionLine').'</td>';
 		print '<td colspan="3">';
 		print $bankline->getNomUrl(1, 0, 'showall');
-    	print '</td>';
-    	print '</tr>';
-    }
+		print '</td>';
+		print '</tr>';
+	}
 }
 
 print '</table>';
@@ -231,8 +231,7 @@ $sql .= ' AND pf.rowid = '.$object->id;
 
 dol_syslog("compta/payment_vat/card.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$i = 0;
@@ -240,17 +239,15 @@ if ($resql)
 	print '<br><table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans('VATDeclaration').'</td>';
-    //print '<td>'.$langs->trans('Type').'</td>';
+	//print '<td>'.$langs->trans('Type').'</td>';
 	print '<td>'.$langs->trans('Label').'</td>';
 	print '<td class="right">'.$langs->trans('ExpectedToPay').'</td>';
 	print '<td class="center">'.$langs->trans('Status').'</td>';
 	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
 	print "</tr>\n";
 
-	if ($num > 0)
-	{
-		while ($i < $num)
-		{
+	if ($num > 0) {
+		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -261,8 +258,8 @@ if ($resql)
 			print "</td>\n";
 			// Type
 			/* print '<td>';
-            print $tva->type_label;4
-            print "</td>\n";*/
+			print $tva->type_label;4
+			print "</td>\n";*/
 			// Label
 			print '<td>'.$objp->label.'</td>';
 			// Expected to pay
@@ -272,8 +269,7 @@ if ($resql)
 			// Amount payed
 			print '<td class="right">'.price($objp->amount).'</td>';
 			print "</tr>\n";
-			if ($objp->paye == 1)	// If at least one invoice is paid, disable delete
-			{
+			if ($objp->paye == 1) {	// If at least one invoice is paid, disable delete
 				$disable_delete = 1;
 			}
 			$total = $total + $objp->amount;
@@ -284,8 +280,7 @@ if ($resql)
 
 	print "</table>\n";
 	$db->free($resql);
-}
-else {
+} else {
 	dol_print_error($db);
 }
 
@@ -309,15 +304,11 @@ if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
 }
 */
 
-if ($action == '')
-{
-	if ($user->rights->tax->charges->supprimer)
-	{
-		if (!$disable_delete)
-		{
+if ($action == '') {
+	if ($user->rights->tax->charges->supprimer) {
+		if (!$disable_delete) {
 			print '<a class="butActionDelete" href="card.php?id='.$_GET['id'].'&amp;action=delete">'.$langs->trans('Delete').'</a>';
-		}
-		else {
+		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentVATPaid")).'">'.$langs->trans('Delete').'</a>';
 		}
 	}
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index c6788d0edc6..f74783e038c 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -38,7 +38,9 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'paymentbybanktransfer', '', '');
 
 
@@ -55,8 +57,7 @@ $result = restrictedArea($user, 'paymentbybanktransfer', '', '');
 
 llxHeader('', $langs->trans("SuppliersStandingOrdersArea"));
 
-if (prelevement_check_config('bank-transfer') < 0)
-{
+if (prelevement_check_config('bank-transfer') < 0) {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
 }
@@ -97,24 +98,28 @@ $sql .= " pfd.date_demande, pfd.amount,";
 $sql .= " s.nom as name, s.email, s.rowid as socid, s.tva_intra";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 $sql .= " WHERE s.rowid = f.fk_soc";
 $sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 $sql .= " AND f.total_ttc > 0";
-if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
-{
+if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
 	$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
 }
 $sql .= " AND pfd.traite = 0";
 $sql .= " AND pfd.ext_payment_id IS NULL";
 $sql .= " AND pfd.fk_facture_fourn = f.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($socid) {
+	$sql .= " AND f.fk_soc = ".$socid;
+}
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -122,10 +127,8 @@ if ($resql)
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="5">'.$langs->trans("SupplierInvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
-	if ($num)
-	{
-		while ($i < $num && $i < 20)
-		{
+	if ($num) {
+		while ($i < $num && $i < 20) {
 			$obj = $db->fetch_object($resql);
 
 			$invoicestatic->id = $obj->rowid;
@@ -186,8 +189,7 @@ $sql .= " ORDER BY datec DESC";
 $sql .= $db->plimit($limit);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 
@@ -202,8 +204,7 @@ if ($result)
 	print '</tr>';
 
 	if ($num > 0) {
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($result);
 
 			print '<tr class="oddeven">';
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 73642df96bd..24ea982f01b 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -34,7 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array('banks', 'categories', 'bills', 'companies', 'withdrawals'));
 
 // Security check
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 
 // Get supervariables
 $action = GETPOST('action', 'aZ09');
@@ -48,13 +50,19 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!$sortfield) $sortfield = 'pl.fk_soc';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 'pl.fk_soc';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
 $object = new BonPrelevement($db);
 
@@ -77,15 +85,14 @@ if (!$user->rights->paymentbybanktransfer->read && $object->type == 'bank-transf
 
 $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))
-{
-	if ($action == 'confirm_delete')
-	{
+if (empty($reshook)) {
+	if ($action == 'confirm_delete') {
 		$res = $object->delete($user);
-		if ($res > 0)
-		{
+		if ($res > 0) {
 			if ($object->type == 'bank-transfer') {
 				header("Location: ".DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php');
 			} else {
@@ -96,8 +103,7 @@ if (empty($reshook))
 	}
 
 	// Seems to no be used and replaced with $action == 'infocredit'
-	if ($action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes')
-	{
+	if ($action == 'confirm_credite' && GETPOST('confirm', 'alpha') == 'yes') {
 		if ($object->statut == 2) {
 			$res = -1;
 			setEventMessages('WithdrawalCantBeCreditedTwice', array(), 'errors');
@@ -105,50 +111,46 @@ if (empty($reshook))
 			$res = $object->set_credite();
 		}
 
-		if ($res >= 0)
-		{
+		if ($res >= 0) {
 			header("Location: card.php?id=".$id);
 			exit;
 		}
 	}
 
-	if ($action == 'infotrans' && $user->rights->prelevement->bons->send)
-	{
+	if ($action == 'infotrans' && $user->rights->prelevement->bons->send) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 		/*
-        if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
-        {
-            $dir = $conf->prelevement->dir_output.'/receipts';
+		if ($_FILES['userfile']['name'] && basename($_FILES['userfile']['name'],".ps") == $object->ref)
+		{
+			$dir = $conf->prelevement->dir_output.'/receipts';
 
-            if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
-            {
-                $object->set_infotrans($user, $dt, GETPOST('methode','alpha'));
-            }
+			if (dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $dir . "/" . dol_unescapefile($_FILES['userfile']['name']),1) > 0)
+			{
+				$object->set_infotrans($user, $dt, GETPOST('methode','alpha'));
+			}
 
-            header("Location: card.php?id=".$id);
-            exit;
-        }
-        else
-        {
-            dol_syslog("Fichier invalide",LOG_WARNING);
-            $mesg='BadFile';
-        }*/
+			header("Location: card.php?id=".$id);
+			exit;
+		}
+		else
+		{
+			dol_syslog("Fichier invalide",LOG_WARNING);
+			$mesg='BadFile';
+		}*/
 
 		$error = $object->set_infotrans($user, $dt, GETPOST('methode', 'alpha'));
 
-		if ($error)
-		{
+		if ($error) {
 			header("Location: card.php?id=".$id."&error=$error");
 			exit;
 		}
 	}
 
 	// Set direct debit order to credited, create payment and close invoices
-	if ($action == 'infocredit' && $user->rights->prelevement->bons->credit)
-	{
+	if ($action == 'infocredit' && $user->rights->prelevement->bons->credit) {
 		$dt = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 		if ($object->statut == 2) {
@@ -158,9 +160,8 @@ if (empty($reshook))
 			$error = $object->set_infocredit($user, $dt);
 		}
 
-		if ($error)
-		{
-        	setEventMessages($object->error, $object->errors, 'errors');
+		if ($error) {
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 }
@@ -175,13 +176,11 @@ $form = new Form($db);
 
 llxHeader('', $langs->trans("WithdrawalsReceipts"));
 
-if ($id > 0 || $ref)
-{
+if ($id > 0 || $ref) {
 	$head = prelevement_prepare_head($object);
 	print dol_get_fiche_head($head, 'prelevement', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
-	if (GETPOST('error', 'alpha') != '')
-	{
+	if (GETPOST('error', 'alpha') != '') {
 		print '<div class="error">'.$object->getErrorString(GETPOST('error', 'alpha')).'</div>';
 	}
 
@@ -210,8 +209,7 @@ if ($id > 0 || $ref)
 	print '</tr>';
 	*/
 
-	if ($object->date_trans <> 0)
-	{
+	if ($object->date_trans <> 0) {
 		$muser = new User($db);
 		$muser->fetch($object->user_trans);
 
@@ -222,8 +220,7 @@ if ($id > 0 || $ref)
 		print $object->methodes_trans[$object->method_trans];
 		print '</td></tr>';
 	}
-	if ($object->date_credit <> 0)
-	{
+	if ($object->date_credit <> 0) {
 		print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
 		print dol_print_date($object->date_credit, 'day');
 		print '</td></tr>';
@@ -241,22 +238,29 @@ if ($id > 0 || $ref)
 
 	print '<tr><td class="titlefield">';
 	$labelofbankfield = "BankToReceiveWithdraw";
-	if ($object->type == 'bank-transfer') $labelofbankfield = 'BankToPayCreditTransfer';
+	if ($object->type == 'bank-transfer') {
+		$labelofbankfield = 'BankToPayCreditTransfer';
+	}
 	print $langs->trans($labelofbankfield);
 	print '</td>';
 	print '<td>';
-	if ($acc->id > 0)
+	if ($acc->id > 0) {
 		print $acc->getNomUrl(1);
+	}
 	print '</td>';
 	print '</tr>';
 
 	print '<tr><td class="titlefield">';
 	$labelfororderfield = 'WithdrawalFile';
-	if ($object->type == 'bank-transfer') $labelfororderfield = 'CreditTransferFile';
+	if ($object->type == 'bank-transfer') {
+		$labelfororderfield = 'CreditTransferFile';
+	}
 	print $langs->trans($labelfororderfield).'</td><td>';
 	$relativepath = 'receipts/'.$object->ref.'.xml';
 	$modulepart = 'prelevement';
-	if ($object->type == 'bank-transfer') $modulepart = 'paymentbybanktransfer';
+	if ($object->type == 'bank-transfer') {
+		$modulepart = 'paymentbybanktransfer';
+	}
 	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 	print '</td></tr></table>';
 
@@ -268,8 +272,7 @@ if ($id > 0 || $ref)
 	$formconfirm = '';
 
 	// Confirmation to delete
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Delete'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
 	}
 
@@ -283,8 +286,7 @@ if ($id > 0 || $ref)
 	print $formconfirm;
 
 
-	if (empty($object->date_trans) && $user->rights->prelevement->bons->send && $action == 'settransmitted')
-	{
+	if (empty($object->date_trans) && $user->rights->prelevement->bons->send && $action == 'settransmitted') {
 		print '<form method="post" name="userfile" action="card.php?id='.$object->id.'" enctype="multipart/form-data">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="infotrans">';
@@ -303,8 +305,7 @@ if ($id > 0 || $ref)
 		print '<br>';
 	}
 
-	if (!empty($object->date_trans) && $object->date_credit == 0 && $user->rights->prelevement->bons->credit && $action == 'setcredited')
-	{
+	if (!empty($object->date_trans) && $object->date_credit == 0 && $user->rights->prelevement->bons->credit && $action == 'setcredited') {
 		print '<form name="infocredit" method="post" action="card.php?id='.$object->id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="infocredit">';
@@ -323,17 +324,14 @@ if ($id > 0 || $ref)
 
 
 	// Actions
-	if ($action != 'settransmitted' && $action != 'setcredited')
-	{
+	if ($action != 'settransmitted' && $action != 'setcredited') {
 		print "\n<div class=\"tabsAction\">\n";
 
-		if (empty($object->date_trans) && $user->rights->prelevement->bons->send)
-		{
+		if (empty($object->date_trans) && $user->rights->prelevement->bons->send) {
 			print "<a class=\"butAction\" href=\"card.php?action=settransmitted&token='.newToken().'&id=".$object->id."\">".$langs->trans("SetToStatusSent")."</a>";
 		}
 
-		if (!empty($object->date_trans) && $object->date_credit == 0)
-		{
+		if (!empty($object->date_trans) && $object->date_credit == 0) {
 			print "<a class=\"butAction\" href=\"card.php?action=setcredited&token='.newToken().'&id=".$object->id."\">".$langs->trans("ClassCredited")."</a>";
 		}
 
@@ -357,13 +355,14 @@ if ($id > 0 || $ref)
 	$sql .= " AND pl.fk_prelevement_bons = pb.rowid";
 	$sql .= " AND pb.entity = ".$conf->entity;
 	$sql .= " AND pl.fk_soc = s.rowid";
-	if ($socid)	$sql .= " AND s.rowid = ".$socid;
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 	$sql .= $db->order($sortfield, $sortorder);
 
 	// Count total nb of records
 	$nbtotalofrecords = '';
-	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-	{
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$result = $db->query($sql);
 		$nbtotalofrecords = $db->num_rows($result);
 		if (($page * $limit) > $nbtotalofrecords) {
@@ -377,8 +376,7 @@ if ($id > 0 || $ref)
 
 	$result = $db->query($sql);
 
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
 
@@ -406,8 +404,7 @@ if ($id > 0 || $ref)
 
 		$total = 0;
 
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($result);
 
 			print '<tr class="oddeven">';
@@ -430,15 +427,12 @@ if ($id > 0 || $ref)
 
 			print '<td class="right">';
 
-			if ($obj->statut == 3)
-			{
-		  		print '<b>'.$langs->trans("StatusRefused").'</b>';
+			if ($obj->statut == 3) {
+				print '<b>'.$langs->trans("StatusRefused").'</b>';
 			} else {
-				if ($object->statut == BonPrelevement::STATUS_CREDITED)
-				{
+				if ($object->statut == BonPrelevement::STATUS_CREDITED) {
 					if ($obj->statut == 2) {
-						if ($user->rights->prelevement->bons->credit)
-						{
+						if ($user->rights->prelevement->bons->credit) {
 							//print '<a class="butActionDelete" href="line.php?action=rejet&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
 							print '<a href="line.php?action=rejet&type='.$object->type.'&id='.$obj->rowid.'">'.$langs->trans("StandingOrderReject").'</a>';
 						} else {
@@ -464,7 +458,9 @@ if ($id > 0 || $ref)
 			print '<td class="right">';
 			if (empty($offset) && $num <= $limit) {
 				// If we have all record on same page, then the following test/warning can be done
-				if ($total != $object->amount) print img_warning($langs->trans("TotalAmountOfdirectDebitOrderDiffersFromSumOfLines"));
+				if ($total != $object->amount) {
+					print img_warning($langs->trans("TotalAmountOfdirectDebitOrderDiffersFromSumOfLines"));
+				}
 			}
 			print price($total);
 			print "</td>\n";
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 22737fcfbfe..f70daf75c3a 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -144,10 +144,8 @@ class BonPrelevement extends CommonObject
 		// Add lines
 		$result = $this->addline($line_id, $client_id, $client_nom, $amount, $code_banque, $code_guichet, $number, $number_key);
 
-		if ($result == 0)
-		{
-			if ($line_id > 0)
-			{
+		if ($result == 0) {
+			if ($line_id > 0) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."prelevement_facture (";
 				if ($type != 'bank-transfer') {
 					$sql .= "fk_facture";
@@ -160,8 +158,7 @@ class BonPrelevement extends CommonObject
 				$sql .= ", ".$line_id;
 				$sql .= ")";
 
-				if ($this->db->query($sql))
-				{
+				if ($this->db->query($sql)) {
 					$result = 0;
 				} else {
 					$result = -1;
@@ -199,8 +196,7 @@ class BonPrelevement extends CommonObject
 		$result = -1;
 		$concat = 0;
 
-		if ($concat == 1)
-		{
+		if ($concat == 1) {
 			/*
 			 * We aggregate the lines
 			 */
@@ -213,8 +209,7 @@ class BonPrelevement extends CommonObject
 			$sql .= " AND number = '".$this->db->escape($number)."'";
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 			} else {
 				$result = -1;
@@ -243,8 +238,7 @@ class BonPrelevement extends CommonObject
 			$sql .= ", '".$this->db->escape($number_key)."'";
 			$sql .= ")";
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_lignes");
 				$result = 0;
 			} else {
@@ -295,15 +289,16 @@ class BonPrelevement extends CommonObject
 		$sql .= ", p.statut as status";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 		$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
-		if ($rowid > 0) $sql .= " AND p.rowid = ".$rowid;
-		else $sql .= " AND p.ref = '".$this->db->escape($ref)."'";
+		if ($rowid > 0) {
+			$sql .= " AND p.rowid = ".$rowid;
+		} else {
+			$sql .= " AND p.ref = '".$this->db->escape($ref)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id             = $obj->rowid;
@@ -349,28 +344,24 @@ class BonPrelevement extends CommonObject
 
 		$error = 0;
 
-		if ($this->db->begin())
-		{
+		if ($this->db->begin()) {
 			$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_bons";
 			$sql .= " SET statut = ".self::STATUS_TRANSFERED;
 			$sql .= " WHERE rowid = ".$this->id;
 			$sql .= " AND entity = ".$conf->entity;
 
 			$result = $this->db->query($sql);
-			if (!$result)
-			{
+			if (!$result) {
 				dol_syslog(get_class($this)."::set_credite Erreur 1");
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$facs = array();
 				$facs = $this->getListInvoices();
 
 				$num = count($facs);
-				for ($i = 0; $i < $num; $i++)
-				{
+				for ($i = 0; $i < $num; $i++) {
 					/* Tag invoice as paid */
 					dol_syslog(get_class($this)."::set_credite set_paid fac ".$facs[$i]);
 					$fac = new Facture($this->db);
@@ -379,14 +370,12 @@ class BonPrelevement extends CommonObject
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = " UPDATE ".MAIN_DB_PREFIX."prelevement_lignes";
 				$sql .= " SET statut = 2";
 				$sql .= " WHERE fk_prelevement_bons = ".$this->id;
 
-				if (!$this->db->query($sql))
-				{
+				if (!$this->db->query($sql)) {
 					dol_syslog(get_class($this)."::set_credite Erreur 1");
 					$error++;
 				}
@@ -395,8 +384,7 @@ class BonPrelevement extends CommonObject
 			/*
 			 * End of procedure
 			 */
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 0;
 			} else {
@@ -426,10 +414,8 @@ class BonPrelevement extends CommonObject
 
 		$error = 0;
 
-		if ($this->fetched == 1)
-		{
-			if ($date < $this->date_trans)
-			{
+		if ($this->fetched == 1) {
+			if ($date < $this->date_trans) {
 				$this->error = 'DateOfMovementLowerThanDateOfFileTransmission';
 				dol_syslog("bon-prelevment::set_infocredit 1027 ".$this->error);
 				return -1027;
@@ -446,8 +432,7 @@ class BonPrelevement extends CommonObject
 			$sql .= " AND statut = ".self::STATUS_TRANSFERED;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$langs->load('withdrawals');
 				$subject = $langs->trans("InfoCreditSubject", $this->ref);
 				$message = $langs->trans("InfoCreditMessage", $this->ref, dol_print_date($date, 'dayhour'));
@@ -462,8 +447,7 @@ class BonPrelevement extends CommonObject
 
 				// Loop on each invoice. $facs=array(0=>id, 1=>amount requested)
 				$num = count($facs);
-				for ($i = 0; $i < $num; $i++)
-				{
+				for ($i = 0; $i < $num; $i++) {
 					if ($this->type == 'bank-transfer') {
 						$fac = new FactureFournisseur($this->db);
 					} else {
@@ -492,8 +476,7 @@ class BonPrelevement extends CommonObject
 				//var_dump($amountsperthirdparty);exit;
 
 				// Make one payment per customer
-				foreach ($amountsperthirdparty as $thirdpartyid => $cursoramounts)
-				{
+				foreach ($amountsperthirdparty as $thirdpartyid => $cursoramounts) {
 					if ($this->type == 'bank-transfer') {
 						$paiement = new PaiementFourn($this->db);
 					} else {
@@ -514,8 +497,7 @@ class BonPrelevement extends CommonObject
 					$paiement->id_prelevement = $this->id;
 
 					$paiement_id = $paiement->create($user); // This use ->paiementid, that is ID of payment mode
-					if ($paiement_id < 0)
-					{
+					if ($paiement_id < 0) {
 						$error++;
 						$this->error = $paiement->error;
 						$this->errors = $paiement->errors;
@@ -528,8 +510,7 @@ class BonPrelevement extends CommonObject
 						}
 
 						$result = $paiement->addPaymentToBank($user, $modeforaddpayment, '(WithdrawalPayment)', $bankaccount, '', '');
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++;
 							$this->error = $paiement->error;
 							$this->errors = $paiement->errors;
@@ -562,8 +543,7 @@ class BonPrelevement extends CommonObject
 			/*
 			 * End of procedure
 			 */
-			if ($error == 0)
-			{
+			if ($error == 0) {
 				$this->date_credit = $date;
 				$this->statut = self::STATUS_CREDITED;
 
@@ -595,8 +575,7 @@ class BonPrelevement extends CommonObject
 		$error = 0;
 
 		dol_syslog(get_class($this)."::set_infotrans Start", LOG_INFO);
-		if ($this->db->begin())
-		{
+		if ($this->db->begin()) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_bons ";
 			$sql .= " SET fk_user_trans = ".$user->id;
 			$sql .= " , date_trans = '".$this->db->idate($date)."'";
@@ -606,8 +585,7 @@ class BonPrelevement extends CommonObject
 			$sql .= " AND entity = ".$conf->entity;
 			$sql .= " AND statut = 0";
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->method_trans = $method;
 				$langs->load('withdrawals');
 				$subject = $langs->trans("InfoTransSubject", $this->ref);
@@ -619,8 +597,7 @@ class BonPrelevement extends CommonObject
 				$error++;
 			}
 
-			if ($error == 0)
-			{
+			if ($error == 0) {
 				$this->date_trans = $date;
 				$this->statut = 1;
 				$this->user_trans = $user->id;
@@ -660,7 +637,9 @@ class BonPrelevement extends CommonObject
 		} else {
 			$sql .= " pf.fk_facture";
 		}
-		if ($amounts) $sql .= ", SUM(pl.amount)";
+		if ($amounts) {
+			$sql .= ", SUM(pl.amount)";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 		$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 		$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
@@ -677,18 +656,16 @@ class BonPrelevement extends CommonObject
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			if ($num)
-			{
+			if ($num) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$row = $this->db->fetch_row($resql);
-					if (!$amounts) $arr[$i] = $row[0];
-					else {
+					if (!$amounts) {
+						$arr[$i] = $row[0];
+					} else {
 						$arr[$i] = array(
 							$row[0],
 							$row[1]
@@ -725,8 +702,7 @@ class BonPrelevement extends CommonObject
 		}
 		$sql .= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 		$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
-		if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
-		{
+		if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
 			$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 		}
 		if ($mode != 'bank-transfer') {
@@ -740,8 +716,7 @@ class BonPrelevement extends CommonObject
 		$sql .= " AND f.total_ttc > 0";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 
 			$this->db->free($resql);
@@ -787,8 +762,7 @@ class BonPrelevement extends CommonObject
 		}
 		$sql .= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 		$sql .= " WHERE f.entity IN (".getEntity('invoice').")";
-		if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
-		{
+		if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
 			$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 		}
 		if ($type == 'bank-transfer') {
@@ -803,8 +777,7 @@ class BonPrelevement extends CommonObject
 		dol_syslog(get_class($this)."::NbFactureAPrelever");
 		$resql = $this->db->query($sql);
 
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 
 			$this->db->free($resql);
@@ -852,7 +825,9 @@ class BonPrelevement extends CommonObject
 
 		$datetimeprev = time();
 		//Choice the date of the execution direct debit
-		if (!empty($executiondate)) $datetimeprev = $executiondate;
+		if (!empty($executiondate)) {
+			$datetimeprev = $executiondate;
+		}
 
 		$month = strftime("%m", $datetimeprev);
 		$year = strftime("%Y", $datetimeprev);
@@ -867,8 +842,7 @@ class BonPrelevement extends CommonObject
 		$factures_prev_id = array();
 		$factures_errors = array();
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "SELECT f.rowid, pfd.rowid as pfdrowid, f.fk_soc";
 			$sql .= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib";
 			$sql .= ", pfd.amount";
@@ -896,13 +870,11 @@ class BonPrelevement extends CommonObject
 			dol_syslog(__METHOD__."::Read invoices, sql=".$sql, LOG_DEBUG);
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$i = 0;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$row = $this->db->fetch_row($resql);
 					$factures[$i] = $row; // All fields
 					if ($row[7] == 0) {
@@ -921,8 +893,7 @@ class BonPrelevement extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$soc = new Societe($this->db);
 
@@ -930,36 +901,29 @@ class BonPrelevement extends CommonObject
 			$i = 0;
 			dol_syslog(__METHOD__."::Check BAN", LOG_DEBUG);
 
-			if (count($factures) > 0)
-			{
-				foreach ($factures as $key => $fac)
-				{
+			if (count($factures) > 0) {
+				foreach ($factures as $key => $fac) {
 					if ($type != 'bank-transfer') {
 						$tmpinvoice = new Facture($this->db);
 					} else {
 						$tmpinvoice = new FactureFournisseur($this->db);
 					}
 					$resfetch = $tmpinvoice->fetch($fac[0]);
-					if ($resfetch >= 0)		// Field 0 of $fac is rowid of invoice
-					{
-						if ($soc->fetch($tmpinvoice->socid) >= 0)
-						{
+					if ($resfetch >= 0) {		// Field 0 of $fac is rowid of invoice
+						if ($soc->fetch($tmpinvoice->socid) >= 0) {
 							$bac = new CompanyBankAccount($this->db);
 							$bac->fetch(0, $soc->id);
 
 							if ($type != 'bank-transfer') {
-								if ($format == 'FRST' && $bac->frstrecur != 'FRST')
-								{
+								if ($format == 'FRST' && $bac->frstrecur != 'FRST') {
 									continue;
 								}
-								if ($format == 'RCUR' && ($bac->frstrecur != 'RCUR' && $bac->frstrecur != 'RECUR'))
-								{
+								if ($format == 'RCUR' && ($bac->frstrecur != 'RCUR' && $bac->frstrecur != 'RECUR')) {
 									continue;
 								}
 							}
 
-							if ($bac->verif() >= 1)
-							{
+							if ($bac->verif() >= 1) {
 								$factures_prev[$i] = $fac;
 								/* second array necessary for BonPrelevement */
 								$factures_prev_id[$i] = $fac[0];
@@ -998,8 +962,7 @@ class BonPrelevement extends CommonObject
 		 $i++;
 		 }*/
 
-		if (count($factures_prev) > 0)
-		{
+		if (count($factures_prev) > 0) {
 			if ($mode == 'real') {
 				$ok = 1;
 			} else {
@@ -1007,8 +970,7 @@ class BonPrelevement extends CommonObject
 			}
 		}
 
-		if ($ok)
-		{
+		if ($ok) {
 			/*
 			 * We are in real mode.
 			 * We create order and build file into disk
@@ -1020,8 +982,7 @@ class BonPrelevement extends CommonObject
 			/*
 			 * Process order generation
 			 */
-			if (!$error)
-			{
+			if (!$error) {
 				$ref = substr($year, -2).$month;
 
 				$sql = "SELECT substring(ref from char_length(ref) - 1)";
@@ -1033,8 +994,7 @@ class BonPrelevement extends CommonObject
 				dol_syslog(get_class($this)."::create sql=".$sql, LOG_DEBUG);
 				$resql = $this->db->query($sql);
 
-				if ($resql)
-				{
+				if ($resql) {
 					$row = $this->db->fetch_row($resql);
 					$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0]) + 1, 0, 2), 2, "0", STR_PAD_LEFT);
 
@@ -1043,7 +1003,9 @@ class BonPrelevement extends CommonObject
 					} else {
 						$dir = $conf->paymentbybanktransfer->dir_output.'/receipts';
 					}
-					if (!is_dir($dir)) dol_mkdir($dir);
+					if (!is_dir($dir)) {
+						dol_mkdir($dir);
+					}
 
 					$this->filename = $dir.'/'.$ref.'.xml';
 
@@ -1058,8 +1020,7 @@ class BonPrelevement extends CommonObject
 					$sql .= ")";
 
 					$resql = $this->db->query($sql);
-					if ($resql)
-					{
+					if ($resql) {
 						$prev_id = $this->db->last_insert_id(MAIN_DB_PREFIX."prelevement_bons");
 						$this->id = $prev_id;
 						$this->ref = $ref;
@@ -1073,8 +1034,7 @@ class BonPrelevement extends CommonObject
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				if ($type != 'bank-transfer') {
 					$fact = new Facture($this->db);
 				} else {
@@ -1084,10 +1044,8 @@ class BonPrelevement extends CommonObject
 				/*
 				 * Create withdrawal receipt in database
 				 */
-				if (count($factures_prev) > 0)
-				{
-					foreach ($factures_prev as $fac)	// Add a link in database for each invoice
-					{
+				if (count($factures_prev) > 0) {
+					foreach ($factures_prev as $fac) {	// Add a link in database for each invoice
 						// Fetch invoice
 						$result = $fact->fetch($fac[0]);
 						if ($result < 0) {
@@ -1109,8 +1067,7 @@ class BonPrelevement extends CommonObject
 						 * $fac[8] : client nom
 						 */
 						$ri = $this->AddFacture($fac[0], $fac[2], $fac[8], $fac[7], $fac[3], $fac[4], $fac[5], $fac[6], $type);
-						if ($ri <> 0)
-						{
+						if ($ri <> 0) {
 							$error++;
 						}
 
@@ -1122,8 +1079,7 @@ class BonPrelevement extends CommonObject
 						$sql .= " WHERE rowid = ".$fac[1];
 
 						$resql = $this->db->query($sql);
-						if (!$resql)
-						{
+						if (!$resql) {
 							$error++;
 							$this->errors[] = $this->db->lasterror();
 							dol_syslog(__METHOD__."::Update Error=".$this->db->lasterror(), LOG_ERR);
@@ -1132,16 +1088,14 @@ class BonPrelevement extends CommonObject
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				/*
 				 * Create file of type='direct-debit' for direct debit order or type='bank-transfer' for credit transfer into a XML file
 				 */
 
 				dol_syslog(__METHOD__."::Init direct debit or credit transfer file for ".count($factures_prev)." invoices", LOG_DEBUG);
 
-				if (count($factures_prev) > 0)
-				{
+				if (count($factures_prev) > 0) {
 					$this->date_echeance = $datetimeprev;
 					$this->reference_remise = $ref;
 
@@ -1150,8 +1104,7 @@ class BonPrelevement extends CommonObject
 						$id = $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT;
 					}
 					$account = new Account($this->db);
-					if ($account->fetch($id) > 0)
-					{
+					if ($account->fetch($id) > 0) {
 						$this->emetteur_code_banque = $account->code_banque;
 						$this->emetteur_code_guichet       = $account->code_guichet;
 						$this->emetteur_numero_compte      = $account->number;
@@ -1190,15 +1143,13 @@ class BonPrelevement extends CommonObject
 				$sql .= " AND entity = ".$conf->entity;
 
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					$error++;
 					dol_syslog(__METHOD__."::Error update total: ".$this->db->error(), LOG_ERR);
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				$triggername = 'DIRECT_DEBIT_ORDER_CREATE';
 				if ($type != 'bank-transfer') {
 					$triggername = 'CREDIT_TRANSFER_ORDER_CREATE';
@@ -1206,12 +1157,13 @@ class BonPrelevement extends CommonObject
 
 				// Call trigger
 				$result = $this->call_trigger($triggername, $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return count($factures_prev);
 			} else {
@@ -1238,48 +1190,52 @@ class BonPrelevement extends CommonObject
 		$error = 0;
 		$resql1 = $resql2 = $resql3 = $resql4 = 0;
 
-		if (!$notrigger)
-		{
+		if (!$notrigger) {
 			$triggername = 'DIRECT_DEBIT_ORDER_DELETE';
 			if ($this->type == 'bank-transfer') {
 				$triggername = 'PAYMENTBYBANKTRANFER_DELETE';
 			}
 			// Call trigger
 			$result = $this->call_trigger($triggername, $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_facture WHERE fk_prelevement_lignes IN (SELECT rowid FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id.")";
 			$resql1 = $this->db->query($sql);
-			if (!$resql1) dol_print_error($this->db);
+			if (!$resql1) {
+				dol_print_error($this->db);
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_lignes WHERE fk_prelevement_bons = ".$this->id;
 			$resql2 = $this->db->query($sql);
-			if (!$resql2) dol_print_error($this->db);
+			if (!$resql2) {
+				dol_print_error($this->db);
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."prelevement_bons WHERE rowid = ".$this->id;
 			$resql3 = $this->db->query($sql);
-			if (!$resql3) dol_print_error($this->db);
+			if (!$resql3) {
+				dol_print_error($this->db);
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."prelevement_facture_demande SET fk_prelevement_bons = NULL, traite = 0 WHERE fk_prelevement_bons = ".$this->id;
 			$resql4 = $this->db->query($sql);
-			if (!$resql4) dol_print_error($this->db);
+			if (!$resql4) {
+				dol_print_error($this->db);
+			}
 		}
 
-		if ($resql1 && $resql2 && $resql3 && $resql4 && !$error)
-		{
+		if ($resql1 && $resql2 && $resql3 && $resql4 && !$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -1303,7 +1259,9 @@ class BonPrelevement extends CommonObject
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -1324,19 +1282,20 @@ class BonPrelevement extends CommonObject
 			$url = DOL_URL_ROOT.'/compta/prelevement/card.php?id='.$this->id;
 		}
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -1349,15 +1308,21 @@ class BonPrelevement extends CommonObject
 			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
 			 */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -1365,8 +1330,11 @@ class BonPrelevement extends CommonObject
 		$hookmanager->initHooks(array('banktransferdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -1387,8 +1355,7 @@ class BonPrelevement extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			return 0;
 		} else {
 			return -1;
@@ -1411,8 +1378,7 @@ class BonPrelevement extends CommonObject
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
 		$sql .= " WHERE fk_user=".$user." AND fk_action='".$this->db->escape($action)."'";
 
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			return 0;
 		} else {
 			return -1;
@@ -1433,16 +1399,14 @@ class BonPrelevement extends CommonObject
 		// phpcs:enable
 		$result = 0;
 
-		if ($this->DeleteNotification($user, $action) == 0)
-		{
+		if ($this->DeleteNotification($user, $action) == 0) {
 			$now = dol_now();
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_soc, fk_contact, fk_action)";
 			$sql .= " VALUES ('".$this->db->idate($now)."', ".$user.", 'NULL', 'NULL', '".$this->db->escape($action)."')";
 
 			dol_syslog("adnotiff: ".$sql);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$result = 0;
 			} else {
 				$result = -1;
@@ -1477,8 +1441,7 @@ class BonPrelevement extends CommonObject
 		dol_syslog(get_class($this)."::generate build file=".$this->filename." type=".$type);
 
 		$this->file = fopen($this->filename, "w");
-		if (empty($this->file))
-		{
+		if (empty($this->file)) {
 			$this->error = $langs->trans('ErrorFailedToOpenFile', $this->filename);
 			return -1;
 		}
@@ -1487,8 +1450,7 @@ class BonPrelevement extends CommonObject
 		$this->total = 0;
 
 		// Build file for European countries
-		if ($mysoc->isInEEC())
-		{
+		if ($mysoc->isInEEC()) {
 			$found++;
 
 			if ($type != 'bank-transfer') {
@@ -1503,7 +1465,9 @@ class BonPrelevement extends CommonObject
 				$dateTime_ECMA = dol_print_date($now, '%Y-%m-%dT%H:%M:%S');
 
 				$date_actu = $now;
-				if (!empty($executiondate)) $date_actu = $executiondate;
+				if (!empty($executiondate)) {
+					$date_actu = $executiondate;
+				}
 
 				$dateTime_YMD = dol_print_date($date_actu, '%Y%m%d');
 				$dateTime_YMDHMS = dol_print_date($date_actu, '%Y%m%d%H%M%S');
@@ -1537,13 +1501,11 @@ class BonPrelevement extends CommonObject
 
 				// Define $fileDebiteurSection. One section DrctDbtTxInf per invoice.
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$cachearraytotestduplicate = array();
 
 					$num = $this->db->num_rows($resql);
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
 
 						if (!empty($cachearraytotestduplicate[$obj->idfac])) {
@@ -1567,8 +1529,7 @@ class BonPrelevement extends CommonObject
 				}
 
 				// Define $fileEmetteurSection. Start of bloc PmtInf. Will contains all $nbtotalDrctDbtTxInf
-				if ($result != -2)
-				{
+				if ($result != -2) {
 					$fileEmetteurSection .= $this->EnregEmetteurSEPA($conf, $date_actu, $nbtotalDrctDbtTxInf, $this->total, $CrLf, $format, $type);
 				}
 
@@ -1597,11 +1558,13 @@ class BonPrelevement extends CommonObject
 				fputs($this->file, '			</InitgPty>'.$CrLf);
 				fputs($this->file, '		</GrpHdr>'.$CrLf);
 				// SEPA File Emetteur
-				if ($result != -2)
-				{	fputs($this-> file, $fileEmetteurSection); }
+				if ($result != -2) {
+					fputs($this-> file, $fileEmetteurSection);
+				}
 				// SEPA File Debiteurs
-				if ($result != -2)
-				{	fputs($this-> file, $fileDebiteurSection); }
+				if ($result != -2) {
+					fputs($this-> file, $fileDebiteurSection);
+				}
 				// SEPA FILE FOOTER
 				fputs($this->file, '		</PmtInf>'.$CrLf);
 				fputs($this->file, '	</CstmrDrctDbtInitn>'.$CrLf);
@@ -1618,7 +1581,9 @@ class BonPrelevement extends CommonObject
 				$dateTime_ECMA = dol_print_date($now, '%Y-%m-%dT%H:%M:%S');
 
 				$date_actu = $now;
-				if (!empty($executiondate)) $date_actu = $executiondate;
+				if (!empty($executiondate)) {
+					$date_actu = $executiondate;
+				}
 
 				$dateTime_YMD = dol_print_date($date_actu, '%Y%m%d');
 				$dateTime_YMDHMS = dol_print_date($date_actu, '%Y%m%d%H%M%S');
@@ -1652,13 +1617,11 @@ class BonPrelevement extends CommonObject
 
 				// Define $fileCrediteurSection. One section DrctDbtTxInf per invoice.
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$cachearraytotestduplicate = array();
 
 					$num = $this->db->num_rows($resql);
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
 
 						if (!empty($cachearraytotestduplicate[$obj->idfac])) {
@@ -1711,11 +1674,13 @@ class BonPrelevement extends CommonObject
 				fputs($this->file, '			</InitgPty>'.$CrLf);
 				fputs($this->file, '		</GrpHdr>'.$CrLf);
 				// SEPA File Emetteur (mycompany)
-				if ($result != -2)
-				{	fputs($this-> file, $fileEmetteurSection); }
+				if ($result != -2) {
+					fputs($this-> file, $fileEmetteurSection);
+				}
 				// SEPA File Creditors
-				if ($result != -2)
-				{	fputs($this-> file, $fileCrediteurSection); }
+				if ($result != -2) {
+					fputs($this-> file, $fileCrediteurSection);
+				}
 				// SEPA FILE FOOTER
 				fputs($this->file, '		</PmtInf>'.$CrLf);
 				fputs($this->file, '	</CstmrCdtTrfInitn>'.$CrLf);
@@ -1724,8 +1689,7 @@ class BonPrelevement extends CommonObject
 		}
 
 		// Build file for Other Countries with unknow format
-		if (!$found)
-		{
+		if (!$found) {
 			if ($type != 'bank-transfer') {
 				$sql = "SELECT pl.amount";
 				$sql .= " FROM";
@@ -1739,12 +1703,10 @@ class BonPrelevement extends CommonObject
 				// Lines
 				$i = 0;
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $this->db->num_rows($resql);
 
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
 						$this->total = $this->total + $obj->amount;
 
@@ -1767,12 +1729,10 @@ class BonPrelevement extends CommonObject
 				// Lines
 				$i = 0;
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $this->db->num_rows($resql);
 
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
 						$this->total = $this->total + $obj->amount;
 
@@ -1958,8 +1918,12 @@ class BonPrelevement extends CommonObject
 			$XML_DEBITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 			$addressline1 = dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")));
 			$addressline2 = dol_string_unaccent(strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => "")));
-			if (trim($addressline1)) 	$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline1, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
-			if (trim($addressline2))	$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
+			if (trim($addressline1)) {
+				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline1, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
+			}
+			if (trim($addressline2)) {
+				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
+			}
 			$XML_DEBITOR .= '					</PstlAdr>'.$CrLf;
 			$XML_DEBITOR .= '				</Dbtr>'.$CrLf;
 			$XML_DEBITOR .= '				<DbtrAcct>'.$CrLf;
@@ -2005,8 +1969,12 @@ class BonPrelevement extends CommonObject
 			$XML_CREDITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 			$addressline1 = dol_string_unaccent(strtr($row_address, array(CHR(13) => ", ", CHR(10) => "")));
 			$addressline2 = dol_string_unaccent(strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => "")));
-			if (trim($addressline1)) 	$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline1, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
-			if (trim($addressline2))	$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
+			if (trim($addressline1)) {
+				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline1, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
+			}
+			if (trim($addressline2)) {
+				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc($addressline2, 70, 'right', 'UTF-8', true)).'</AdrLine>'.$CrLf;
+			}
 			$XML_CREDITOR .= '					</PstlAdr>'.$CrLf;
 			$XML_CREDITOR .= '				</Cdtr>'.$CrLf;
 			$XML_CREDITOR .= '				<CdtrAcct>'.$CrLf;
@@ -2122,8 +2090,7 @@ class BonPrelevement extends CommonObject
 		//$id = $configuration->global->PRELEVEMENT_ID_BANKACCOUNT;
 		$id = ($type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT);
 		$account = new Account($this->db);
-		if ($account->fetch($id) > 0)
-		{
+		if ($account->fetch($id) > 0) {
 			$this->emetteur_code_banque = $account->code_banque;
 			$this->emetteur_code_guichet = $account->code_guichet;
 			$this->emetteur_numero_compte = $account->number;
@@ -2143,8 +2110,7 @@ class BonPrelevement extends CommonObject
 		$sql .= " WHERE pb.rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 
 			$country = explode(':', $configuration->global->MAIN_INFO_SOCIETE_COUNTRY);
@@ -2175,8 +2141,12 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
 				$addressline1 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => "")));
 				$addressline2 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => "")));
-				if ($addressline1)		$XML_SEPA_INFO .= '					<AdrLine>'.$addressline1.'</AdrLine>'.$CrLf;
-				if ($addressline2)		$XML_SEPA_INFO .= '					<AdrLine>'.$addressline2.'</AdrLine>'.$CrLf;
+				if ($addressline1) {
+					$XML_SEPA_INFO .= '					<AdrLine>'.$addressline1.'</AdrLine>'.$CrLf;
+				}
+				if ($addressline2) {
+					$XML_SEPA_INFO .= '					<AdrLine>'.$addressline2.'</AdrLine>'.$CrLf;
+				}
 				$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '			</Cdtr>'.$CrLf;
 				$XML_SEPA_INFO .= '			<CdtrAcct>'.$CrLf;
@@ -2237,8 +2207,12 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
 				$addressline1 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => "")));
 				$addressline2 = dol_string_unaccent(strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => "")));
-				if ($addressline1)		$XML_SEPA_INFO .= '					<AdrLine>'.$addressline1.'</AdrLine>'.$CrLf;
-				if ($addressline2)		$XML_SEPA_INFO .= '					<AdrLine>'.$addressline2.'</AdrLine>'.$CrLf;
+				if ($addressline1) {
+					$XML_SEPA_INFO .= '					<AdrLine>'.$addressline1.'</AdrLine>'.$CrLf;
+				}
+				if ($addressline2) {
+					$XML_SEPA_INFO .= '					<AdrLine>'.$addressline2.'</AdrLine>'.$CrLf;
+				}
 				$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '			</Dbtr>'.$CrLf;
 				$XML_SEPA_INFO .= '			<DbtrAcct>'.$CrLf;
@@ -2364,8 +2338,7 @@ class BonPrelevement extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('StatusWaiting');
@@ -2377,8 +2350,12 @@ class BonPrelevement extends CommonObject
 		}
 
 		$statusType = 'status1';
-		if ($status == self::STATUS_TRANSFERED) $statusType = 'status3';
-		if ($status == self::STATUS_CREDITED) $statusType = 'status6';
+		if ($status == self::STATUS_TRANSFERED) {
+			$statusType = 'status3';
+		}
+		if ($status == self::STATUS_CREDITED) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
diff --git a/htdocs/compta/prelevement/class/ligneprelevement.class.php b/htdocs/compta/prelevement/class/ligneprelevement.class.php
index e3b0833f925..6fa9b94b637 100644
--- a/htdocs/compta/prelevement/class/ligneprelevement.class.php
+++ b/htdocs/compta/prelevement/class/ligneprelevement.class.php
@@ -84,10 +84,8 @@ class LignePrelevement
 		$sql .= " AND p.entity = ".$conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id              = $obj->rowid;
@@ -135,24 +133,32 @@ class LignePrelevement
 		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 1)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); // Waiting
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); // Credited
-			elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]); // Refused
-		} elseif ($mode == 2)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut1');
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut6');
-			elseif ($status == 3) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
-		} elseif ($mode == 3)
-		{
-			if ($status == 0) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1');
-			elseif ($status == 2) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6');
-			elseif ($status == 3) return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+		} elseif ($mode == 1) {
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut1').' '.$langs->trans($this->statuts[$status]); // Waiting
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]); // Credited
+			} elseif ($status == 3) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]); // Refused
+			}
+		} elseif ($mode == 2) {
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut1');
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut6');
+			} elseif ($status == 3) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut8');
+			}
+		} elseif ($mode == 3) {
+			if ($status == 0) {
+				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut1');
+			} elseif ($status == 2) {
+				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut6');
+			} elseif ($status == 3) {
+				return $langs->trans($this->statuts[$status]).' '.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+			}
 		}
 	}
 
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 28a3b1e4efa..70742d24685 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -119,8 +119,7 @@ class RejetPrelevement
 
 		$result = $this->db->query($sql);
 
-		if (!$result)
-		{
+		if (!$result) {
 			dol_syslog("RejetPrelevement::create Erreur 4");
 			dol_syslog("RejetPrelevement::create Erreur 4 $sql");
 			$error++;
@@ -131,8 +130,7 @@ class RejetPrelevement
 		$sql .= " SET statut = 3";
 		$sql .= " WHERE rowid = ".$id;
 
-		if (!$this->db->query($sql))
-		{
+		if (!$this->db->query($sql)) {
 			dol_syslog("RejetPrelevement::create Erreur 5");
 			$error++;
 		}
@@ -191,8 +189,7 @@ class RejetPrelevement
 			$this->_send_email($fac);
 		}
 
-		if ($error == 0)
-		{
+		if ($error == 0) {
 			dol_syslog("RejetPrelevement::Create Commit");
 			$this->db->commit();
 		} else {
@@ -221,11 +218,9 @@ class RejetPrelevement
 		$sql .= " AND pfd.fk_facture".($this->type == 'bank-transfer' ? '_fourn=' : '=').$fac->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$row = $this->db->fetch_row($resql);
 				$userid = $row[0];
 			}
@@ -233,8 +228,7 @@ class RejetPrelevement
 			dol_syslog("RejetPrelevement::_send_email Erreur lecture user");
 		}
 
-		if ($userid > 0)
-		{
+		if ($userid > 0) {
 			$emuser = new User($this->db);
 			$emuser->fetch($userid);
 
@@ -288,22 +282,22 @@ class RejetPrelevement
 		 //Returns all invoices of a withdrawal
 		$sql = "SELECT f.rowid as facid, pl.amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture as pf";
-		if ($this->type == 'bank-transfer')	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON (pf.fk_facture_fourn = f.rowid)";
-		else $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON (pf.fk_facture = f.rowid)";
+		if ($this->type == 'bank-transfer') {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON (pf.fk_facture_fourn = f.rowid)";
+		} else {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON (pf.fk_facture = f.rowid)";
+		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."prelevement_lignes as pl ON (pf.fk_prelevement_lignes = pl.rowid)";
 		$sql .= " WHERE pf.fk_prelevement_lignes = ".$this->id;
 		$sql .= " AND f.entity IN  (".getEntity('invoice').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			if ($num)
-			{
+			if ($num) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$row = $this->db->fetch_row($resql);
 					if (!$amounts) {
 						$arr[$i] = $row[0];
@@ -338,10 +332,8 @@ class RejetPrelevement
 		$sql .= " WHERE pr.fk_prelevement_lignes =".$rowid;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $rowid;
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 03bc3d8754e..deb5fe2fcd5 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -40,7 +40,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies', 'bills'));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $type = GETPOST('type', 'aZ09');
@@ -54,7 +56,9 @@ $format = GETPOST('format', 'aZ09');
 $id_bankaccount = GETPOST('id_bankaccount', 'int');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 
 $hookmanager->initHooks(array('directdebitcreatecard', 'globalcard'));
@@ -63,11 +67,15 @@ $hookmanager->initHooks(array('directdebitcreatecard', 'globalcard'));
 /*
  * Actions
  */
-if (GETPOST('cancel', 'alpha')) { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$massaction = '';
+}
 
 $parameters = array('mode' => $mode, 'format' => $format, 'limit' => $limit, 'page' => $page, 'offset' => $offset);
 $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)) {
 	// Change customer bank information to withdraw
@@ -79,14 +87,14 @@ if (empty($reshook)) {
 	if ($action == 'create') {
 		$default_account=($type == 'bank-transfer' ? 'PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT' : 'PRELEVEMENT_ID_BANKACCOUNT');
 
-		if ($id_bankaccount != $conf->global->{$default_account}){
+		if ($id_bankaccount != $conf->global->{$default_account}) {
 			$res = dolibarr_set_const($db, $default_account, $id_bankaccount, 'chaine', 0, '', $conf->entity);	//Set as default
 		}
 
 		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		$bank = new Account($db);
 		$bank->fetch($conf->global->{$default_account});
-		if (empty($bank->ics) || empty($bank->ics_transfer)){
+		if (empty($bank->ics) || empty($bank->ics_transfer)) {
 			$errormessage = str_replace('{url}', $bank->getNomUrl(1), $langs->trans("ErrorICSmissing", '{url}'));
 			setEventMessages($errormessage, null, 'errors');
 			header("Location: ".DOL_URL_ROOT.'/compta/prelevement/create.php');
@@ -148,7 +156,9 @@ $arrayofselected = is_array($toselect) ? $toselect : array();
 // List of mass actions available
 $arrayofmassactions = array(
 );
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 llxHeader('', $langs->trans("NewStandingOrder"));
@@ -180,8 +190,7 @@ print dol_get_fiche_head();
 
 $nb = $bprev->nbOfInvoiceToPay($type);
 $pricetowithdraw = $bprev->SommeAPrelever($type);
-if ($nb < 0)
-{
+if ($nb < 0) {
 	dol_print_error($bprev->error);
 }
 print '<table class="border centpercent tableforfield">';
@@ -205,7 +214,9 @@ print '</tr>';
 print '</table>';
 print '</div>';
 
-if ($mesg) print $mesg;
+if ($mesg) {
+	print $mesg;
+}
 
 print '<div class="tabsAction">'."\n";
 
@@ -213,14 +224,14 @@ print '<form action="'.$_SERVER['PHP_SELF'].'?action=create" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 if ($nb) {
-    if ($pricetowithdraw) {
-    	print $langs->trans('BankToReceiveWithdraw').': ';
-    	$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1");
-    	print ' - ';
+	if ($pricetowithdraw) {
+		print $langs->trans('BankToReceiveWithdraw').': ';
+		$form->select_comptes($conf->global->PRELEVEMENT_ID_BANKACCOUNT, 'id_bankaccount', 0, "courant=1");
+		print ' - ';
 
-        print $langs->trans('ExecutionDate').' ';
-        $datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-        print $form->selectDate($datere, 're');
+		print $langs->trans('ExecutionDate').' ';
+		$datere = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		print $form->selectDate($datere, 're');
 
 
 		if ($mysoc->isInEEC()) {
@@ -307,7 +318,9 @@ if ($type == 'bank-transfer') {
 } else {
 	$sql .= " AND pfd.fk_facture = f.rowid";
 }
-if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+if ($socid > 0) {
+	$sql .= " AND f.fk_soc = ".$socid;
+}
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -323,15 +336,20 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
 	$param = '';
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($socid) $param .= '&socid='.urlencode($socid);
-	if ($option) $param .= "&option=".urlencode($option);
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($socid) {
+		$param .= '&socid='.urlencode($socid);
+	}
+	if ($option) {
+		$param .= "&option=".urlencode($option);
+	}
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -359,19 +377,16 @@ if ($resql)
 	print '<td>'.$langs->trans("RUM").'</td>';
 	print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 	print '<td class="right">'.$langs->trans("DateRequest").'</td>';
-	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
 		print '<td align="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
 	}
 	print '</tr>';
 
-	if ($num)
-	{
+	if ($num) {
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 		$bac = new CompanyBankAccount($db);
 
-		while ($i < $num && $i < $limit)
-		{
+		while ($i < $num && $i < $limit) {
 			$obj = $db->fetch_object($resql);
 
 			$bac->fetch(0, $obj->socid);
@@ -394,7 +409,9 @@ if ($resql)
 			// RIB
 			print '<td>';
 			print $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
-			if ($bac->verif() <= 0) print img_warning('Error on default bank number for IBAN : '.$bac->error_message);
+			if ($bac->verif() <= 0) {
+				print img_warning('Error on default bank number for IBAN : '.$bac->error_message);
+			}
 			print '</td>';
 
 			// RUM
@@ -404,7 +421,9 @@ if ($resql)
 				print $rumtoshow;
 				$format = $thirdpartystatic->display_rib('format');
 				if ($type != 'bank-transfer') {
-					if ($format) print ' ('.$format.')';
+					if ($format) {
+						print ' ('.$format.')';
+					}
 				}
 			} else {
 				print img_warning($langs->trans("NoBankAccountDefined"));
@@ -419,11 +438,12 @@ if ($resql)
 			print dol_print_date($db->jdate($obj->date_demande), 'day');
 			print '</td>';
 			// Action column
-			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
 				print '<td class="nowrap center">';
 				$selected = 0;
-				if (in_array($obj->request_row_id, $arrayofselected)) $selected = 1;
+				if (in_array($obj->request_row_id, $arrayofselected)) {
+					$selected = 1;
+				}
 				print '<input id="cb'.$obj->request_row_id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->request_row_id.'"'.($selected ? ' checked="checked"' : '').'>';
 				print '</td>';
 			}
@@ -459,41 +479,41 @@ $sql.=$db->plimit($limit);
 $result = $db->query($sql);
 if ($result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
+	$num = $db->num_rows($result);
+	$i = 0;
 
-    print"\n<!-- debut table -->\n";
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td>';
-    print '<td class="center">'.$langs->trans("Date").'</td><td class="right">'.$langs->trans("Amount").'</td>';
-    print '</tr>';
+	print"\n<!-- debut table -->\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Ref").'</td>';
+	print '<td class="center">'.$langs->trans("Date").'</td><td class="right">'.$langs->trans("Amount").'</td>';
+	print '</tr>';
 
-    while ($i < min($num,$limit))
-    {
-        $obj = $db->fetch_object($result);
+	while ($i < min($num,$limit))
+	{
+		$obj = $db->fetch_object($result);
 
 
-        print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-        print "<td>";
-        $bprev->id=$obj->rowid;
-        $bprev->ref=$obj->ref;
-        print $bprev->getNomUrl(1);
-        print "</td>\n";
+		print "<td>";
+		$bprev->id=$obj->rowid;
+		$bprev->ref=$obj->ref;
+		print $bprev->getNomUrl(1);
+		print "</td>\n";
 
-        print '<td class="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
+		print '<td class="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n";
 
-        print '<td class="right">'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."</td>\n";
+		print '<td class="right">'.price($obj->amount,0,$langs,0,0,-1,$conf->currency)."</td>\n";
 
-        print "</tr>\n";
-        $i++;
-    }
-    print "</table><br>";
-    $db->free($result);
+		print "</tr>\n";
+		$i++;
+	}
+	print "</table><br>";
+	$db->free($result);
 }
 else
 {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 */
 
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 94c8c0639e1..9d0fa17d246 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -37,7 +37,9 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 // Security check
 $socid = GETPOST('socid', 'int');
 $status = GETPOST('status', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
@@ -54,12 +56,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "f.ref";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "f.ref";
+}
 
 $massactionbutton = '';
 
@@ -72,11 +80,12 @@ $hookmanager->initHooks(array('withdrawalstodolist'));
 
 $parameters = array('socid' => $socid, 'limit' => $limit, 'page' => $page, 'offset' => $offset);
 $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');
+}
 
 // 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_facture = '';
 	$search_societe = '';
 	$search_array_options = array();
@@ -123,17 +132,26 @@ if ($type != 'bank-transfer') {
 }
 $sql .= " ".MAIN_DB_PREFIX."societe as s,";
 $sql .= " ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE s.rowid = f.fk_soc";
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-if (!$status) $sql .= " AND pfd.traite = 0";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($socid) {
+	$sql .= " AND f.fk_soc = ".$socid;
+}
+if (!$status) {
+	$sql .= " AND pfd.traite = 0";
+}
 $sql .= " AND pfd.ext_payment_id IS NULL";
-if ($status) $sql .= " AND pfd.traite = ".$status;
+if ($status) {
+	$sql .= " AND pfd.traite = ".$status;
+}
 $sql .= " AND f.total_ttc > 0";
-if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
-{
+if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 }
 if ($type != 'bank-transfer') {
@@ -141,32 +159,32 @@ if ($type != 'bank-transfer') {
 } else {
 	$sql .= " AND pfd.fk_facture_fourn = f.rowid";
 }
-if ($search_facture) $sql .= natural_search("f.ref", $search_facture);
-if ($search_societe) $sql .= natural_search("s.nom", $search_societe);
+if ($search_facture) {
+	$sql .= natural_search("f.ref", $search_facture);
+}
+if ($search_societe) {
+	$sql .= natural_search("s.nom", $search_societe);
+}
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords)
-{
+if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
 	$num = $nbtotalofrecords;
 } else {
 	$sql .= $db->plimit($limit + 1, $offset);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		exit;
 	}
@@ -182,7 +200,9 @@ if ($type == 'bank-transfer') {
 }
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST"  id="searchFormList" name="searchFormList">';
-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">';
@@ -226,10 +246,11 @@ print '</td>';
 print '</tr>';
 
 $i = 0;
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
-	if (empty($obj)) break; // Should not happen
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
 	$invoicestatic->fetch($obj->rowid);
 
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 1f8ecdaeced..301a5c7808c 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -35,7 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array('banks', 'categories', 'bills', 'companies', 'withdrawals'));
 
 // Securite acces client
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 
 // Get supervariables
 $id = GETPOST('id', 'int');
@@ -48,12 +50,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'p.ref';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 'p.ref';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
 $object = new BonPrelevement($db);
 
@@ -79,10 +87,8 @@ $thirdpartytmp = new Societe($db);
 
 llxHeader('', $langs->trans("WithdrawalsReceipts"));
 
-if ($id > 0 || $ref)
-{
-  	if ($object->fetch($id, $ref) >= 0)
-	{
+if ($id > 0 || $ref) {
+	if ($object->fetch($id, $ref) >= 0) {
 		$head = prelevement_prepare_head($object);
 		print dol_get_fiche_head($head, 'invoices', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
@@ -98,8 +104,7 @@ if ($id > 0 || $ref)
 		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
-		if ($object->date_trans <> 0)
-		{
+		if ($object->date_trans <> 0) {
 			$muser = new User($db);
 			$muser->fetch($object->user_trans);
 
@@ -110,8 +115,7 @@ if ($id > 0 || $ref)
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if ($object->date_credit <> 0)
-		{
+		if ($object->date_credit <> 0) {
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
 			print dol_print_date($object->date_credit, 'day');
 			print '</td></tr>';
@@ -129,22 +133,29 @@ if ($id > 0 || $ref)
 
 		print '<tr><td class="titlefield">';
 		$labelofbankfield = "BankToReceiveWithdraw";
-		if ($object->type == 'bank-transfer') $labelofbankfield = 'BankToPayCreditTransfer';
+		if ($object->type == 'bank-transfer') {
+			$labelofbankfield = 'BankToPayCreditTransfer';
+		}
 		print $langs->trans($labelofbankfield);
 		print '</td>';
 		print '<td>';
-		if ($acc->id > 0)
+		if ($acc->id > 0) {
 			print $acc->getNomUrl(1);
+		}
 		print '</td>';
 		print '</tr>';
 
 		print '<tr><td class="titlefield">';
 		$labelfororderfield = 'WithdrawalFile';
-		if ($object->type == 'bank-transfer') $labelfororderfield = 'CreditTransferFile';
+		if ($object->type == 'bank-transfer') {
+			$labelfororderfield = 'CreditTransferFile';
+		}
 		print $langs->trans($labelfororderfield).'</td><td>';
 		$relativepath = 'receipts/'.$object->ref.'.xml';
 		$modulepart = 'prelevement';
-		if ($object->type == 'bank-transfer') $modulepart = 'paymentbybanktransfer';
+		if ($object->type == 'bank-transfer') {
+			$modulepart = 'paymentbybanktransfer';
+		}
 		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 		print '</td></tr></table>';
 
@@ -152,7 +163,7 @@ if ($id > 0 || $ref)
 
 		print dol_get_fiche_end();
 	} else {
-	  	dol_print_error($db);
+		dol_print_error($db);
 	}
 }
 
@@ -183,18 +194,20 @@ if ($object->type != 'bank-transfer') {
 } else {
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 }
-if ($object->id > 0) $sql .= " AND p.rowid=".$object->id;
-if ($socid) $sql .= " AND s.rowid = ".$socid;
+if ($object->id > 0) {
+	$sql .= " AND p.rowid=".$object->id;
+}
+if ($socid) {
+	$sql .= " AND s.rowid = ".$socid;
+}
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	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;
 	}
@@ -203,16 +216,17 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
-  	$num = $db->num_rows($resql);
-  	$i = 0;
+if ($resql) {
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-  	$param = "&id=".$id;
+	$param = "&id=".$id;
 
 	// Lines of title fields
 	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">';
@@ -226,58 +240,57 @@ if ($resql)
 
 	print_barre_liste($langs->trans("Invoices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
-  	print"\n<!-- debut table -->\n";
+	print"\n<!-- debut table -->\n";
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-  	print '<table class="liste centpercent">';
-  	print '<tr class="liste_titre">';
-  	print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
-  	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
-  	print_liste_field_titre("AmountInvoice", $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
-  	print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-  	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
+	print '<table class="liste centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("AmountInvoice", $_SERVER["PHP_SELF"], "f.total_ttc", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre("AmountRequested", $_SERVER["PHP_SELF"], "pl.amount", "", $param, 'class="right"', $sortfield, $sortorder);
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre('');
 	print "</tr>\n";
 
-  	$totalinvoices = 0;
+	$totalinvoices = 0;
 	$totalamount_requested = 0;
 
 	$invoicetmpcustomer = new Facture($db);
 	$invoicetmpsupplier = new FactureFournisseur($db);
 
-  	while ($i < min($num, $limit))
-	{
-	 	$obj = $db->fetch_object($resql);
+	while ($i < min($num, $limit)) {
+		$obj = $db->fetch_object($resql);
 
-	 	if ($obj->type == 'bank-transfer') {
-	 		$invoicetmp = $invoicetmpsupplier;
-	 	} else {
-	 		$invoicetmp = $invoicetmpcustomer;
-	 	}
-	 	$invoicetmp->fetch($obj->facid);
+		if ($obj->type == 'bank-transfer') {
+			$invoicetmp = $invoicetmpsupplier;
+		} else {
+			$invoicetmp = $invoicetmpcustomer;
+		}
+		$invoicetmp->fetch($obj->facid);
 
-	 	$thirdpartytmp->fetch($obj->socid);
+		$thirdpartytmp->fetch($obj->socid);
 
-	  	print '<tr class="oddeven">';
+		print '<tr class="oddeven">';
 
-	  	print "<td>";
-	  	print $invoicetmp->getNomUrl(1);
+		print "<td>";
+		print $invoicetmp->getNomUrl(1);
 		print "</td>\n";
 
-	  	print '<td>';
-	  	print $thirdpartytmp->getNomUrl(1);
-	  	print "</td>\n";
+		print '<td>';
+		print $thirdpartytmp->getNomUrl(1);
+		print "</td>\n";
 
-	  	// Amount of invoice
-	  	print '<td class="right">'.price($obj->total_ttc)."</td>\n";
+		// Amount of invoice
+		print '<td class="right">'.price($obj->total_ttc)."</td>\n";
 
-	  	// Amount requested
-	  	print '<td class="right">'.price($obj->amount_requested)."</td>\n";
+		// Amount requested
+		print '<td class="right">'.price($obj->amount_requested)."</td>\n";
 
-	  	// Status of requests
-	  	print '<td class="center">';
+		// Status of requests
+		print '<td class="center">';
 
-	  	if ($obj->statut == 0) {
-	  		print '-';
+		if ($obj->statut == 0) {
+			print '-';
 		} elseif ($obj->statut == 2) {
 			if ($obj->type == 'bank-transfer') {
 				print $langs->trans("StatusDebited");
@@ -285,42 +298,43 @@ if ($resql)
 				print $langs->trans("StatusCredited");
 			}
 		} elseif ($obj->statut == 3) {
-	  		print '<b>'.$langs->trans("StatusRefused").'</b>';
+			print '<b>'.$langs->trans("StatusRefused").'</b>';
 		}
 
-	  	print "</td>";
+		print "</td>";
 
-	  	print "<td></td>";
+		print "<td></td>";
 
-	  	print "</tr>\n";
+		print "</tr>\n";
 
-	  	$totalinvoices += $obj->total_ttc;
-	  	$totalamount_requested += $obj->amount_requested;
+		$totalinvoices += $obj->total_ttc;
+		$totalamount_requested += $obj->amount_requested;
 
-	  	$i++;
+		$i++;
 	}
 
-  	if ($num > 0)
-	{
-	  	print '<tr class="liste_total">';
-	 	print '<td>'.$langs->trans("Total").'</td>';
-	  	print '<td>&nbsp;</td>';
-	  	print '<td class="right">';
+	if ($num > 0) {
+		print '<tr class="liste_total">';
+		print '<td>'.$langs->trans("Total").'</td>';
+		print '<td>&nbsp;</td>';
+		print '<td class="right">';
 		//if ($totalinvoices != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");		// It is normal to have total that differs. For an amount of invoice of 100, request to pay may be 50 only.
-	  	if ($totalamount_requested != $object->amount) print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+		if ($totalamount_requested != $object->amount) {
+			print img_warning("AmountOfFileDiffersFromSumOfInvoices");
+		}
 		print "</td>\n";
-	  	print '<td class="right">';
+		print '<td class="right">';
 		print price($totalamount_requested);
-	  	print "</td>\n";
-	  	print '<td>&nbsp;</td>';
-	  	print '<td>&nbsp;</td>';
-	  	print "</tr>\n";
+		print "</td>\n";
+		print '<td>&nbsp;</td>';
+		print '<td>&nbsp;</td>';
+		print "</tr>\n";
 	}
 
-  	print "</table>";
-  	print '</div>';
+	print "</table>";
+	print '</div>';
 
-  	$db->free($result);
+	$db->free($result);
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index fb1a9451aed..62c3c4849f8 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -35,7 +35,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array("banks", "categories", 'withdrawals', 'bills'));
 
 // Security check
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 
 // Get supervariables
 $prev_id = GETPOST('id', 'int');
@@ -48,7 +50,9 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -73,10 +77,8 @@ if (!$user->rights->paymentbybanktransfer->read && $object->type == 'bank-transf
 
 llxHeader('', $langs->trans("WithdrawalsReceipts"));
 
-if ($prev_id > 0 || $ref)
-{
-  	if ($object->fetch($prev_id, $ref) >= 0)
-	{
+if ($prev_id > 0 || $ref) {
+	if ($object->fetch($prev_id, $ref) >= 0) {
 		$head = prelevement_prepare_head($object);
 		print dol_get_fiche_head($head, 'rejects', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
@@ -92,8 +94,7 @@ if ($prev_id > 0 || $ref)
 		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
-		if ($object->date_trans <> 0)
-		{
+		if ($object->date_trans <> 0) {
 			$muser = new User($db);
 			$muser->fetch($object->user_trans);
 
@@ -104,8 +105,7 @@ if ($prev_id > 0 || $ref)
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if ($object->date_credit <> 0)
-		{
+		if ($object->date_credit <> 0) {
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
 			print dol_print_date($object->date_credit, 'day');
 			print '</td></tr>';
@@ -123,22 +123,29 @@ if ($prev_id > 0 || $ref)
 
 		print '<tr><td class="titlefield">';
 		$labelofbankfield = "BankToReceiveWithdraw";
-		if ($object->type == 'bank-transfer') $labelofbankfield = 'BankToPayCreditTransfer';
+		if ($object->type == 'bank-transfer') {
+			$labelofbankfield = 'BankToPayCreditTransfer';
+		}
 		print $langs->trans($labelofbankfield);
 		print '</td>';
 		print '<td>';
-		if ($acc->id > 0)
+		if ($acc->id > 0) {
 			print $acc->getNomUrl(1);
+		}
 		print '</td>';
 		print '</tr>';
 
 		print '<tr><td class="titlefield">';
 		$labelfororderfield = 'WithdrawalFile';
-		if ($object->type == 'bank-transfer') $labelfororderfield = 'CreditTransferFile';
+		if ($object->type == 'bank-transfer') {
+			$labelfororderfield = 'CreditTransferFile';
+		}
 		print $langs->trans($labelfororderfield).'</td><td>';
 		$relativepath = 'receipts/'.$object->ref.'.xml';
 		$modulepart = 'prelevement';
-		if ($object->type == 'bank-transfer') $modulepart = 'paymentbybanktransfer';
+		if ($object->type == 'bank-transfer') {
+			$modulepart = 'paymentbybanktransfer';
+		}
 		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 		print '</td></tr></table>';
 
@@ -146,7 +153,7 @@ if ($prev_id > 0 || $ref)
 
 		print dol_get_fiche_end();
 	} else {
-	  	dol_print_error($db);
+		dol_print_error($db);
 	}
 }
 
@@ -169,17 +176,17 @@ $sql .= " AND p.entity = ".$conf->entity;
 $sql .= " AND pl.fk_soc = s.rowid";
 $sql .= " AND pl.statut = 3 ";
 $sql .= " AND pr.fk_prelevement_lignes = pl.rowid";
-if ($socid) $sql .= " AND s.rowid = ".$socid;
+if ($socid) {
+	$sql .= " AND s.rowid = ".$socid;
+}
 $sql .= " ORDER BY pl.amount DESC";
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -188,26 +195,23 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
- 	$num = $db->num_rows($resql);
+if ($resql) {
+	$num = $db->num_rows($resql);
 
- 	print_barre_liste($langs->trans("Rejects"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
+	print_barre_liste($langs->trans("Rejects"), $page, $_SERVER["PHP_SELF"], $urladd, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 
-  	print"\n<!-- debut table -->\n";
-  	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-  	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
-  	print '<tr class="liste_titre">';
-  	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td class="right">'.$langs->trans("Amount").'</td>';
-  	print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td class="center">'.$langs->trans("Invoice").'</td></tr>';
+	print"\n<!-- debut table -->\n";
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td class="right">'.$langs->trans("Amount").'</td>';
+	print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td class="center">'.$langs->trans("Invoice").'</td></tr>';
 
 	$total = 0;
 
-	if ($num > 0)
-	{
-	  	$i = 0;
-		while ($i < $num)
-		{
+	if ($num > 0) {
+		$i = 0;
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven"><td>';
@@ -233,8 +237,7 @@ if ($resql)
 		print '<tr><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 	}
 
-  	if ($num > 0)
-	{
+	if ($num > 0) {
 		print '<tr class="liste_total"><td>&nbsp;</td>';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
 		print '<td class="right">'.price($total)."</td>\n";
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 81e854ef5a0..91ecccef242 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -33,7 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array("banks", "categories", 'withdrawals', 'bills'));
 
 // Security check
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 
 // Get supervariables
 $prev_id = GETPOST('id', 'int');
@@ -46,7 +48,9 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -72,10 +76,8 @@ if (!$user->rights->paymentbybanktransfer->read && $object->type == 'bank-transf
 
 llxHeader('', $langs->trans("WithdrawalsReceipts"));
 
-if ($prev_id > 0 || $ref)
-{
-	if ($object->fetch($prev_id, $ref) >= 0)
-	{
+if ($prev_id > 0 || $ref) {
+	if ($object->fetch($prev_id, $ref) >= 0) {
 		$head = prelevement_prepare_head($object);
 		print dol_get_fiche_head($head, 'statistics', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
@@ -91,8 +93,7 @@ if ($prev_id > 0 || $ref)
 		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
 
-		if ($object->date_trans <> 0)
-		{
+		if ($object->date_trans <> 0) {
 			$muser = new User($db);
 			$muser->fetch($object->user_trans);
 
@@ -103,8 +104,7 @@ if ($prev_id > 0 || $ref)
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
 		}
-		if ($object->date_credit <> 0)
-		{
+		if ($object->date_credit <> 0) {
 			print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
 			print dol_print_date($object->date_credit, 'day');
 			print '</td></tr>';
@@ -122,22 +122,29 @@ if ($prev_id > 0 || $ref)
 
 		print '<tr><td class="titlefield">';
 		$labelofbankfield = "BankToReceiveWithdraw";
-		if ($object->type == 'bank-transfer') $labelofbankfield = 'BankToPayCreditTransfer';
+		if ($object->type == 'bank-transfer') {
+			$labelofbankfield = 'BankToPayCreditTransfer';
+		}
 		print $langs->trans($labelofbankfield);
 		print '</td>';
 		print '<td>';
-		if ($acc->id > 0)
+		if ($acc->id > 0) {
 			print $acc->getNomUrl(1);
+		}
 		print '</td>';
 		print '</tr>';
 
 		print '<tr><td class="titlefield">';
 		$labelfororderfield = 'WithdrawalFile';
-		if ($object->type == 'bank-transfer') $labelfororderfield = 'CreditTransferFile';
+		if ($object->type == 'bank-transfer') {
+			$labelfororderfield = 'CreditTransferFile';
+		}
 		print $langs->trans($labelfororderfield).'</td><td>';
 		$relativepath = 'receipts/'.$object->ref.'.xml';
 		$modulepart = 'prelevement';
-		if ($object->type == 'bank-transfer') $modulepart = 'paymentbybanktransfer';
+		if ($object->type == 'bank-transfer') {
+			$modulepart = 'paymentbybanktransfer';
+		}
 		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
 		print '</td></tr></table>';
 
@@ -159,8 +166,7 @@ if ($prev_id > 0 || $ref)
 	$sql .= " GROUP BY pl.statut";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
@@ -171,8 +177,7 @@ if ($prev_id > 0 || $ref)
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Status").'</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$row = $db->fetch_row($resql);
 
 			print '<tr class="oddeven"><td>';
@@ -183,7 +188,9 @@ if ($prev_id > 0 || $ref)
 			print price($row[0]);
 
 			print '</td><td class="right">';
-			if ($object->amount) print round($row[0] / $object->amount * 100, 2)." %";
+			if ($object->amount) {
+				print round($row[0] / $object->amount * 100, 2)." %";
+			}
 			print '</td>';
 
 			print "</tr>\n";
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 2ce24d20d90..f8a056e9e4c 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -38,7 +38,9 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'prelevement', '', '');
 
 
@@ -55,8 +57,7 @@ $result = restrictedArea($user, 'prelevement', '', '');
 
 llxHeader('', $langs->trans("CustomersStandingOrdersArea"));
 
-if (prelevement_check_config() < 0)
-{
+if (prelevement_check_config() < 0) {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Withdraw")), null, 'errors');
 }
@@ -97,24 +98,28 @@ $sql .= " pfd.date_demande, pfd.amount,";
 $sql .= " s.nom as name, s.email, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " , ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 $sql .= " WHERE s.rowid = f.fk_soc";
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
 $sql .= " AND f.total_ttc > 0";
-if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS))
-{
+if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
 	$sql .= " AND f.fk_statut = ".Facture::STATUS_VALIDATED;
 }
 $sql .= " AND pfd.traite = 0";
 $sql .= " AND pfd.ext_payment_id IS NULL";
 $sql .= " AND pfd.fk_facture = f.rowid";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($socid) {
+	$sql .= " AND f.fk_soc = ".$socid;
+}
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -122,10 +127,8 @@ if ($resql)
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="5">'.$langs->trans("InvoiceWaitingWithdraw").' ('.$num.')</th></tr>';
-	if ($num)
-	{
-		while ($i < $num && $i < 20)
-		{
+	if ($num) {
+		while ($i < $num && $i < 20) {
 			$obj = $db->fetch_object($resql);
 
 			$invoicestatic->id = $obj->rowid;
@@ -186,8 +189,7 @@ $sql .= " ORDER BY datec DESC";
 $sql .= $db->plimit($limit);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 
@@ -202,8 +204,7 @@ if ($result)
 	print '</tr>';
 
 	if ($num > 0) {
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($result);
 
 
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index ccb60486c76..4e55a78314f 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -36,7 +36,9 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadlangs(array('banks', 'categories', 'bills', 'withdrawals'));
 
 // Security check
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 
 // Get supervariables
 $action = GETPOST('action', 'aZ09');
@@ -49,52 +51,49 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if ($page == -1 || $page == null) { $page = 0; }
+if ($page == -1 || $page == null) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if ($sortorder == "") $sortorder = "DESC";
-if ($sortfield == "") $sortfield = "pl.fk_soc";
+if ($sortorder == "") {
+	$sortorder = "DESC";
+}
+if ($sortfield == "") {
+	$sortfield = "pl.fk_soc";
+}
 
 
 /*
  * Actions
  */
 
-if ($action == 'confirm_rejet')
-{
-	if (GETPOST("confirm") == 'yes')
-	{
-		if (GETPOST('remonth', 'int'))
-		{
+if ($action == 'confirm_rejet') {
+	if (GETPOST("confirm") == 'yes') {
+		if (GETPOST('remonth', 'int')) {
 			$daterej = mktime(2, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		}
 
-		if (empty($daterej))
-		{
+		if (empty($daterej)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-		} elseif ($daterej > dol_now())
-		{
+		} elseif ($daterej > dol_now()) {
 			$error++;
 			$langs->load("error");
 			setEventMessages($langs->transnoentities("ErrorDateMustBeBeforeToday"), null, 'errors');
 		}
 
-		if (GETPOST('motif', 'alpha') == 0)
-		{
+		if (GETPOST('motif', 'alpha') == 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("RefusedReason")), null, 'errors');
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$lipre = new LignePrelevement($db);
 
-			if ($lipre->fetch($id) == 0)
-
-			{
+			if ($lipre->fetch($id) == 0) {
 				$rej = new RejetPrelevement($db, $user, $type);
 
 				$rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));
@@ -133,12 +132,10 @@ $head[$h][1] = $title;
 $hselected = $h;
 $h++;
 
-if ($id)
-{
+if ($id) {
 	$lipre = new LignePrelevement($db);
 
-	if ($lipre->fetch($id) >= 0)
-	{
+	if ($lipre->fetch($id) >= 0) {
 		$bon = new BonPrelevement($db);
 		$bon->fetch($lipre->bon_rowid);
 
@@ -156,16 +153,13 @@ if ($id)
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($lipre->amount).'</td></tr>';
 		print '<tr><td>'.$langs->trans("Status").'</td><td>'.$lipre->LibStatut($lipre->statut, 1).'</td></tr>';
 
-		if ($lipre->statut == 3)
-		{
+		if ($lipre->statut == 3) {
 			$rej = new RejetPrelevement($db, $user, $type);
 			$resf = $rej->fetch($lipre->id);
-			if ($resf == 0)
-			{
+			if ($resf == 0) {
 				print '<tr><td>'.$langs->trans("RefusedReason").'</td><td>'.$rej->motif.'</td></tr>';
 				print '<tr><td>'.$langs->trans("RefusedData").'</td><td>';
-				if ($rej->date_rejet == 0)
-				{
+				if ($rej->date_rejet == 0) {
 					/* Historique pour certaines install */
 					print $langs->trans("Unknown");
 				} else {
@@ -184,8 +178,7 @@ if ($id)
 		dol_print_error($db);
 	}
 
-	if ($action == 'rejet' && $user->rights->prelevement->bons->credit)
-	{
+	if ($action == 'rejet' && $user->rights->prelevement->bons->credit) {
 		$form = new Form($db);
 
 		$soc = new Societe($db);
@@ -240,13 +233,10 @@ if ($id)
 
 	print "<div class=\"tabsAction\">";
 
-	if ($action == '')
-	{
-		if ($bon->statut == BonPrelevement::STATUS_CREDITED)
-		{
+	if ($action == '') {
+		if ($bon->statut == BonPrelevement::STATUS_CREDITED) {
 			if ($lipre->statut == 2) {
-				if ($user->rights->prelevement->bons->credit)
-				{
+				if ($user->rights->prelevement->bons->credit) {
 					print '<a class="butActionDelete" href="line.php?action=rejet&type='.$type.'&id='.$lipre->id.'">'.$langs->trans("StandingOrderReject").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("StandingOrderReject").'</a>';
@@ -276,14 +266,15 @@ if ($id)
 	$sql .= " AND pf.fk_facture = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	$sql .= " AND pl.rowid=".$id;
-	if ($socid)	$sql .= " AND s.rowid = ".$socid;
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 	$sql .= " ORDER BY $sortfield $sortorder ";
 	$sql .= $db->plimit($conf->liste_limit + 1, $offset);
 
 	$result = $db->query($sql);
 
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
 
@@ -299,8 +290,7 @@ if ($id)
 
 		$total = 0;
 
-		while ($i < min($num, $conf->liste_limit))
-		{
+		while ($i < min($num, $conf->liste_limit)) {
 			$obj = $db->fetch_object($result);
 
 			print '<tr class="oddeven"><td>';
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index f171857963c..a966e8e8b93 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -44,7 +44,9 @@ $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $type = GETPOST('type', 'aZ09');
@@ -53,12 +55,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "p.datec";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "p.datec";
+}
 
 $search_line = GETPOST('search_line', 'alpha');
 $search_bon = GETPOST('search_bon', 'alpha');
@@ -77,8 +85,7 @@ $hookmanager->initHooks(array('withdrawalsreceiptslineslist'));
  * Actions
  */
 
-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_line = "";
 	$search_bon = "";
 	$search_code = "";
@@ -117,26 +124,36 @@ if ($type == 'bank-transfer') {
 }
 $sql .= " AND f.fk_soc = s.rowid";
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
-if ($socid) $sql .= " AND s.rowid = ".$socid;
-if ($search_line) $sql .= " AND pl.rowid = '".$db->escape($search_line)."'";
-if ($search_bon) $sql .= natural_search("p.ref", $search_bon);
-if ($type == 'bank-transfer') {
-	if ($search_code) $sql .= natural_search("s.code_fourn", $search_code);
-} else {
-	if ($search_code) $sql .= natural_search("s.code_client", $search_code);
+if ($socid) {
+	$sql .= " AND s.rowid = ".$socid;
+}
+if ($search_line) {
+	$sql .= " AND pl.rowid = '".$db->escape($search_line)."'";
+}
+if ($search_bon) {
+	$sql .= natural_search("p.ref", $search_bon);
+}
+if ($type == 'bank-transfer') {
+	if ($search_code) {
+		$sql .= natural_search("s.code_fourn", $search_code);
+	}
+} else {
+	if ($search_code) {
+		$sql .= natural_search("s.code_client", $search_code);
+	}
+}
+if ($search_company) {
+	$sql .= natural_search("s.nom", $search_company);
 }
-if ($search_company) $sql .= natural_search("s.nom", $search_company);
 
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -145,18 +162,21 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 
 	$param = "&amp;statut=".urlencode($statut);
 	$param .= "&amp;search_bon=".urlencode($search_bon);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
 
 	print"\n<!-- debut table -->\n";
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -206,8 +226,7 @@ if ($result)
 	print "</tr>\n";
 
 	if ($num) {
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($result);
 
 			$bon->id = $obj->rowid;
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index 7b37238982b..eda6be0cd98 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -35,7 +35,9 @@ $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'di
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $type = GETPOST('type', 'aZ09');
@@ -44,12 +46,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "p.datec";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "p.datec";
+}
 
 // Get supervariables
 $statut = GETPOST('statut', 'int');
@@ -69,8 +77,7 @@ if ($type == 'bank-transfer') {
  * Actions
  */
 
-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_ref = "";
 	$search_amount = "";
 }
@@ -90,19 +97,21 @@ if ($type == 'bank-transfer') {
 } else {
 	$sql .= " AND p.type = 'debit-order'";
 }
-if ($search_ref) $sql .= natural_search("p.ref", $search_ref);
-if ($search_amount) $sql .= natural_search("p.amount", $search_amount, 1);
+if ($search_ref) {
+	$sql .= natural_search("p.ref", $search_ref);
+}
+if ($search_amount) {
+	$sql .= natural_search("p.amount", $search_amount, 1);
+}
 
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -111,27 +120,31 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 
 	$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);
+	}
 	$param .= "&statut=".urlencode($statut);
 
 	$selectedfields = '';
 
 	$newcardbutton = '';
-	if ($usercancreate)
-	{
+	if ($usercancreate) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php');
 	}
 
 	// Lines of title fields
 	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">';
@@ -175,8 +188,7 @@ if ($result)
 	$directdebitorder = new BonPrelevement($db);
 
 	if ($num) {
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($result);
 
 			$directdebitorder->id = $obj->rowid;
diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php
index 8a16f4ecb76..fb03f2a6c6c 100644
--- a/htdocs/compta/prelevement/rejets.php
+++ b/htdocs/compta/prelevement/rejets.php
@@ -35,7 +35,9 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $type = GETPOST('type', 'aZ09');
@@ -45,7 +47,9 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -62,8 +66,12 @@ if ($type == 'bank-transfer') {
 
 llxHeader('', $title);
 
-if ($sortorder == "") $sortorder = "DESC";
-if ($sortfield == "") $sortfield = "p.datec";
+if ($sortorder == "") {
+	$sortorder = "DESC";
+}
+if ($sortfield == "") {
+	$sortfield = "p.datec";
+}
 
 $rej = new RejetPrelevement($db, $user, $type);
 $line = new LignePrelevement($db);
@@ -90,13 +98,14 @@ if ($type == 'bank-transfer') {
 } else {
 	$sql .= " AND p.type = 'debit-order'";
 }
-if ($socid) $sql .= " AND s.rowid = ".$socid;
+if ($socid) {
+	$sql .= " AND s.rowid = ".$socid;
+}
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 
@@ -112,8 +121,7 @@ if ($result)
 	print "</tr>\n";
 
 	if ($num) {
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($result);
 
 			print '<tr class="oddeven">';
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index c046f2f278e..ae1dd54a13c 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -33,7 +33,9 @@ $langs->loadLangs(array('banks', 'categories', 'withdrawals', 'companies'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'prelevement', '', '', 'bons');
 
 $type = GETPOST('type', 'aZ09');
@@ -64,13 +66,11 @@ if ($type == 'bank-transfer') {
 }
 $sql .= " AND pb.entity = ".$conf->entity;
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	if ($num > 0)
-	{
+	if ($num > 0) {
 		$row = $db->fetch_row($resql);
 		$total = $row[0];
 		$nbtotal = $row[1];
@@ -100,8 +100,7 @@ if ($type == 'bank-transfer') {
 $sql .= " GROUP BY pl.statut";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -111,8 +110,7 @@ if ($resql)
 	print '<td width="30%">'.$langs->trans("Status").'</td><td align="center">'.$langs->trans("Number").'</td><td class="right">%</td>';
 	print '<td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
 
 		print '<tr class="oddeven"><td>';
@@ -168,13 +166,11 @@ if ($type == 'bank-transfer') {
 	$sql .= " AND pb.type = 'debit-order'";
 }
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
-	if ($num > 0)
-	{
+	if ($num > 0) {
 		$row = $db->fetch_row($resql);
 		$total = $row[0];
 		$nbtotal = $row[1];
@@ -202,8 +198,7 @@ $sql .= " GROUP BY pr.motif";
 $sql .= " ORDER BY cc DESC";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -216,8 +211,7 @@ if ($resql)
 	require_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/rejetprelevement.class.php';
 	$Rejet = new RejetPrelevement($db, $user, $type);
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
 
 		print '<tr class="oddeven"><td>';
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index 397db077515..f7abdab9c79 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -30,16 +30,22 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 // Load translation files required by the page
 $langs->load("companies");
-if (!empty($conf->facture->enabled)) $langs->load("bills");
+if (!empty($conf->facture->enabled)) {
+	$langs->load("bills");
+}
 
 $id = GETPOST('id') ?GETPOST('id', 'int') : GETPOST('socid', 'int');
 
 // Security check
-if ($user->socid) $id = $user->socid;
+if ($user->socid) {
+	$id = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
 $object = new Societe($db);
-if ($id > 0) $object->fetch($id);
+if ($id > 0) {
+	$object->fetch($id);
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('recapcomptacard', 'globalcard'));
@@ -49,12 +55,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "f.datef,f.rowid"; // Set here default search field
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) {
+	$sortfield = "f.datef,f.rowid"; // Set here default search field
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
 
 
 $arrayfields = array(
@@ -70,7 +82,9 @@ $hookmanager->initHooks(array('supplierbalencelist', 'globalcard'));
  */
 $parameters = array('socid' => $id);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object); // Note that $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');
+}
 
 // None
 
@@ -83,15 +97,18 @@ $form = new Form($db);
 $userstatic = new User($db);
 
 $title = $langs->trans("ThirdParty").' - '.$langs->trans("Summary");
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name.' - '.$langs->trans("Summary");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->name.' - '.$langs->trans("Summary");
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 
 llxHeader('', $title, $help_url);
 
-if ($id > 0)
-{
+if ($id > 0) {
 	$param = '';
-	if ($id > 0) $param .= '&socid='.$id;
+	if ($id > 0) {
+		$param .= '&socid='.$id;
+	}
 
 	$head = societe_prepare_head($object);
 
@@ -99,14 +116,15 @@ if ($id > 0)
 	dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 1);
 	print dol_get_fiche_end();
 
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-	{
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
 		// Invoice list
 		print load_fiche_titre($langs->trans("CustomerPreview"));
 
 		print '<table class="noborder tagtable liste centpercent">';
 		print '<tr class="liste_titre">';
-		if (!empty($arrayfields['f.datef']['checked']))  print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER["PHP_SELF"], "f.datef", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+		if (!empty($arrayfields['f.datef']['checked'])) {
+			print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER["PHP_SELF"], "f.datef", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
+		}
 		print '<td>'.$langs->trans("Element").'</td>';
 		print '<td>'.$langs->trans("Status").'</td>';
 		print '<td class="right">'.$langs->trans("Debit").'</td>';
@@ -127,19 +145,16 @@ if ($id > 0)
 		$sql .= $db->order($sortfield, $sortorder);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 
 			// Boucle sur chaque facture
-			for ($i = 0; $i < $num; $i++)
-			{
+			for ($i = 0; $i < $num; $i++) {
 				$objf = $db->fetch_object($resql);
 
 				$fac = new Facture($db);
 				$ret = $fac->fetch($objf->facid);
-				if ($ret < 0)
-				{
+				if ($ret < 0) {
 					print $fac->error."<br>";
 					continue;
 				}
@@ -160,7 +175,9 @@ if ($id > 0)
 
 				$parameters = array('socid' => $id, 'values' => &$values, 'fac' => $fac, 'userstatic' => $userstatic);
 				$reshook = $hookmanager->executeHooks('facdao', $parameters, $object); // Note that $parameters['values'] 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');
+				}
 
 				$TData[] = $values;
 
@@ -176,13 +193,11 @@ if ($id > 0)
 				$sql .= " ORDER BY p.datep ASC, p.rowid ASC";
 
 				$resqlp = $db->query($sql);
-				if ($resqlp)
-				{
+				if ($resqlp) {
 					$nump = $db->num_rows($resqlp);
 					$j = 0;
 
-					while ($j < $nump)
-					{
+					while ($j < $nump) {
 						$objp = $db->fetch_object($resqlp);
 
 						$paymentstatic = new Paiement($db);
@@ -203,7 +218,9 @@ if ($id > 0)
 
 						$parameters = array('socid' => $id, 'values' => &$values, 'fac' => $fac, 'userstatic' => $userstatic, 'paymentstatic' => $paymentstatic);
 						$reshook = $hookmanager->executeHooks('paydao', $parameters, $object); // Note that $parameters['values'] 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');
+						}
 
 						$TData[] = $values;
 
@@ -241,14 +258,20 @@ if ($id > 0)
 			// Display array
 			foreach ($TData as $data) {
 				$html_class = '';
-				if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
-				elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
+				if (!empty($data['fk_facture'])) {
+					$html_class = 'facid-'.$data['fk_facture'];
+				} elseif (!empty($data['fk_paiement'])) {
+					$html_class = 'payid-'.$data['fk_paiement'];
+				}
 
 				print '<tr class="oddeven '.$html_class.'">';
 
 				print "<td class=\"center\">";
-				if (!empty($data['fk_facture'])) print dol_print_date($data['date'], 'day');
-				elseif (!empty($data['fk_paiement'])) print dol_print_date($data['date'], 'dayhour');
+				if (!empty($data['fk_facture'])) {
+					print dol_print_date($data['date'], 'day');
+				} elseif (!empty($data['fk_paiement'])) {
+					print dol_print_date($data['date'], 'dayhour');
+				}
 				print "</td>\n";
 
 				print '<td>'.$data['link']."</td>\n";
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 4f1a3043c76..d9073488567 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -51,20 +51,30 @@ $showaccountdetail = GETPOST('showaccountdetail', 'aZ09') ?GETPOST('showaccountd
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 //if (! $sortfield) $sortfield='s.nom, s.rowid';
-if (!$sortorder) $sortorder = 'ASC';
+if (!$sortorder) {
+	$sortorder = 'ASC';
+}
 
 // Date range
 $year = GETPOST('year', 'int');
@@ -81,31 +91,40 @@ $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_starty
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q") ?GETPOST("q") : 0;
-	if ($q == 0)
-	{
+	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start;
 		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-		if (!GETPOST('month'))
-		{
-			if (!GETPOST("year") && $month_start > $month_current)
-			{
+		if (!GETPOST('month')) {
+			if (!GETPOST("year") && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
-		} else $month_end = $month_start;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
+		} else {
+			$month_end = $month_start;
+		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	if ($q == 1) {
+		$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+	}
+	if ($q == 2) {
+		$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+	}
+	if ($q == 3) {
+		$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+	}
+	if ($q == 4) {
+		$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+	}
 }
 
 // $date_start and $date_end are defined. We force $year_start and $nbofyear
@@ -118,8 +137,12 @@ $nbofyear = ($year_end - $year_start) + 1;
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) $modecompta = 'BOOKKEEPING';
-if (GETPOST("modecompta", 'alpha')) $modecompta = GETPOST("modecompta", 'alpha');
+if (!empty($conf->accounting->enabled)) {
+	$modecompta = 'BOOKKEEPING';
+}
+if (GETPOST("modecompta", 'alpha')) {
+	$modecompta = GETPOST("modecompta", 'alpha');
+}
 
 $AccCat = new AccountancyCategory($db);
 
@@ -140,8 +163,7 @@ $total_ht = 0;
 $total_ttc = 0;
 
 // Affiche en-tete de rapport
-if ($modecompta == "CREANCES-DETTES")
-{
+if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeDebt");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
@@ -153,12 +175,14 @@ if ($modecompta == "CREANCES-DETTES")
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] - 1)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($tmps['year'] + 1)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesResultDue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else $description .= $langs->trans("DepositsAreIncluded");
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description .= $langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description .= $langs->trans("DepositsAreIncluded");
+	}
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{s1}', '{s2}').')';
@@ -172,8 +196,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description = $langs->trans("RulesResultInOut");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPredefinedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
@@ -194,19 +217,30 @@ $hselected = 'report';
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta), $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 // Show report array
 $param = '&modecompta='.urlencode($modecompta).'&showaccountdetail='.urlencode($showaccountdetail);
-if ($date_startday) $param .= '&date_startday='.$date_startday;
-if ($date_startmonth) $param .= '&date_startmonth='.$date_startmonth;
-if ($date_startyear) $param .= '&date_startyear='.$date_startyear;
-if ($date_endday) $param .= '&date_endday='.$date_endday;
-if ($date_endmonth) $param .= '&date_endmonth='.$date_endmonth;
-if ($date_endyear) $param .= '&date_endyear='.$date_endyear;
+if ($date_startday) {
+	$param .= '&date_startday='.$date_startday;
+}
+if ($date_startmonth) {
+	$param .= '&date_startmonth='.$date_startmonth;
+}
+if ($date_startyear) {
+	$param .= '&date_startyear='.$date_startyear;
+}
+if ($date_endday) {
+	$param .= '&date_endday='.$date_endday;
+}
+if ($date_endmonth) {
+	$param .= '&date_endmonth='.$date_endmonth;
+}
+if ($date_endyear) {
+	$param .= '&date_endyear='.$date_endyear;
+}
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -216,12 +250,10 @@ if ($modecompta == 'BOOKKEEPING') {
 	print_liste_field_titre("", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'width200 ');
 }
 print_liste_field_titre('');
-if ($modecompta == 'BOOKKEEPING')
-{
+if ($modecompta == 'BOOKKEEPING') {
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'amount', '', $param, 'class="right"', $sortfield, $sortorder);
 } else {
-	if ($modecompta == 'CREANCES-DETTES')
-	{
+	if ($modecompta == 'CREANCES-DETTES') {
 		print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
 	}
 	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
@@ -232,8 +264,7 @@ print "</tr>\n";
 $total_ht_outcome = $total_ttc_outcome = $total_ht_income = $total_ttc_income = 0;
 
 
-if ($modecompta == 'BOOKKEEPING')
-{
+if ($modecompta == 'BOOKKEEPING') {
 	$predefinedgroupwhere = "(";
 	$predefinedgroupwhere .= " (pcg_type = 'EXPENSE')";
 	$predefinedgroupwhere .= " OR ";
@@ -250,8 +281,9 @@ if ($modecompta == 'BOOKKEEPING')
 	$sql .= " AND ".$predefinedgroupwhere;
 	$sql .= " AND fk_pcg_version = '".$db->escape($charofaccountstring)."'";
 	$sql .= " AND f.entity = ".$conf->entity;
-	if (!empty($date_start) && !empty($date_end))
+	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND f.doc_date >= '".$db->idate($date_start)."' AND f.doc_date <= '".$db->idate($date_end)."'";
+	}
 	$sql .= " GROUP BY pcg_type DESC, name, socid";
 	$sql .= $db->order($sortfield, $sortorder);
 
@@ -263,14 +295,11 @@ if ($modecompta == 'BOOKKEEPING')
 	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		if ($num > 0)
-		{
-			while ($i < $num)
-			{
+		if ($num > 0) {
+			while ($i < $num) {
 				$objp = $db->fetch_object($result);
 
-				if ($objp->pcg_type != $oldpcgtype)
-				{
+				if ($objp->pcg_type != $oldpcgtype) {
 					print '<tr><td colspan="4">'.$objp->pcg_type.'</td></tr>';
 					$oldpcgtype = $objp->pcg_type;
 				}
@@ -295,8 +324,7 @@ if ($modecompta == 'BOOKKEEPING')
 
 				// Loop on detail of all accounts
 				// This make 14 calls for each detail of account (NP, N and month m)
-				if ($showaccountdetail != 'no')
-				{
+				if ($showaccountdetail != 'no') {
 					$tmppredefinedgroupwhere = "pcg_type = '".$db->escape($objp->pcg_type)."'";
 					$tmppredefinedgroupwhere .= " AND fk_pcg_version = '".$db->escape($charofaccountstring)."'";
 					//$tmppredefinedgroupwhere.= " AND thirdparty_code = '".$db->escape($objp->name)."'";
@@ -304,8 +332,7 @@ if ($modecompta == 'BOOKKEEPING')
 					// Get cpts of category/group
 					$cpts = $AccCat->getCptsCat(0, $tmppredefinedgroupwhere);
 
-					foreach ($cpts as $j => $cpt)
-					{
+					foreach ($cpts as $j => $cpt) {
 						$return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cpt['dc']);
 						if ($return < 0) {
 							setEventMessages(null, $AccCat->errors, 'errors');
@@ -315,8 +342,7 @@ if ($modecompta == 'BOOKKEEPING')
 						}
 
 
-						if ($showaccountdetail == 'all' || $resultN <> 0)
-						{
+						if ($showaccountdetail == 'all' || $resultN <> 0) {
 							print '<tr>';
 							print '<td></td>';
 							print '<td class="tdoverflowmax200"> &nbsp; &nbsp; '.length_accountg($cpt['account_number']).' - '.$cpt['account_label'].'</td>';
@@ -331,31 +357,34 @@ if ($modecompta == 'BOOKKEEPING')
 		} else {
 			print '<tr><td colspan="4" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 		}
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 } else {
 	/*
 	 * Factures clients
 	 */
 	print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("CustomersInvoices").'</td></tr>';
 
-	if ($modecompta == 'CREANCES-DETTES')
-	{
+	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE f.fk_soc = s.rowid";
 		$sql .= " AND f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 			$sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
-		if (!empty($date_start) && !empty($date_end))
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	} elseif ($modecompta == 'RECETTES-DEPENSES')
-	{
+		}
+	} elseif ($modecompta == 'RECETTES-DEPENSES') {
 		/*
-	     * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
-	     * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
-	     */
+		 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
+		 * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
+		 */
 		$sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
@@ -364,11 +393,14 @@ if ($modecompta == 'BOOKKEEPING')
 		$sql .= " WHERE p.rowid = pf.fk_paiement";
 		$sql .= " AND pf.fk_facture = f.rowid";
 		$sql .= " AND f.fk_soc = s.rowid";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 	}
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
 	$sql .= " GROUP BY name, socid";
 	$sql .= $db->order($sortfield, $sortorder);
 
@@ -377,15 +409,15 @@ if ($modecompta == 'BOOKKEEPING')
 	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$objp = $db->fetch_object($result);
 
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
 
-			if ($modecompta == 'CREANCES-DETTES')
+			if ($modecompta == 'CREANCES-DETTES') {
 				print '<td class="right">'.price($objp->amount_ht)."</td>\n";
+			}
 			print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
 
 			$total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
@@ -399,8 +431,7 @@ if ($modecompta == 'BOOKKEEPING')
 	}
 
 	// On ajoute les paiements clients anciennes version, non lie par paiement_facture
-	if ($modecompta == 'RECETTES-DEPENSES')
-	{
+	if ($modecompta == 'RECETTES-DEPENSES') {
 		$sql = "SELECT 'Autres' as name, '0' as idp, sum(p.amount) as amount_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
@@ -410,8 +441,9 @@ if ($modecompta == 'BOOKKEEPING')
 		$sql .= " AND p.fk_bank = b.rowid";
 		$sql .= " AND b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " GROUP BY name, idp";
 		$sql .= " ORDER BY name";
 
@@ -421,16 +453,16 @@ if ($modecompta == 'BOOKKEEPING')
 			$num = $db->num_rows($result);
 			$i = 0;
 			if ($num) {
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$objp = $db->fetch_object($result);
 
 
 					print '<tr class="oddeven"><td>&nbsp;</td>';
 					print "<td>".$langs->trans("Bills")." ".$langs->trans("Other")." (".$langs->trans("PaymentsNotLinkedToInvoice").")\n";
 
-					if ($modecompta == 'CREANCES-DETTES')
+					if ($modecompta == 'CREANCES-DETTES') {
 						print '<td class="right">'.price($objp->amount_ht)."</td>\n";
+					}
 					print '<td class="right">'.price($objp->amount_ttc)."</td>\n";
 
 					$total_ht += (isset($objp->amount_ht) ? $objp->amount_ht : 0);
@@ -446,8 +478,7 @@ if ($modecompta == 'BOOKKEEPING')
 		}
 	}
 
-	if ($total_ttc == 0)
-	{
+	if ($total_ttc == 0) {
 		print '<tr class="oddeven"><td>&nbsp;</td>';
 		print '<td colspan="3"><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 		print '</tr>';
@@ -457,8 +488,9 @@ if ($modecompta == 'BOOKKEEPING')
 	$total_ttc_income += $total_ttc;
 
 	print '<tr class="liste_total">';
-	if ($modecompta == 'CREANCES-DETTES')
+	if ($modecompta == 'CREANCES-DETTES') {
 		print '<td colspan="3" class="right">'.price($total_ht).'</td>';
+	}
 	print '<td colspan="3" class="right">'.price($total_ttc).'</td>';
 	print '</tr>';
 
@@ -466,14 +498,11 @@ if ($modecompta == 'BOOKKEEPING')
 	 * Donations
 	 */
 
-	if (!empty($conf->don->enabled))
-	{
+	if (!empty($conf->don->enabled)) {
 		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Donations").'</td></tr>';
 
-		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
-		{
-			if ($modecompta == 'CREANCES-DETTES')
-			{
+		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') {
+			if ($modecompta == 'CREANCES-DETTES') {
 				$sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
 				$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
@@ -486,28 +515,32 @@ if ($modecompta == 'BOOKKEEPING')
 				$sql .= " WHERE p.entity IN (".getEntity('donation').")";
 				$sql .= " AND fk_statut >= 2";
 			}
-			if (!empty($date_start) && !empty($date_end))
+			if (!empty($date_start) && !empty($date_end)) {
 				$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
+			}
 		}
 		$sql .= " GROUP BY p.societe, p.firstname, p.lastname, dm";
 		$newsortfield = $sortfield;
-		if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.societe, p.firstname, p.lastname, dm';
-		if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-		if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+		if ($newsortfield == 's.nom, s.rowid') {
+			$newsortfield = 'p.societe, p.firstname, p.lastname, dm';
+		}
+		if ($newsortfield == 'amount_ht') {
+			$newsortfield = 'amount';
+		}
+		if ($newsortfield == 'amount_ttc') {
+			$newsortfield = 'amount';
+		}
 		$sql .= $db->order($newsortfield, $sortorder);
 
 		dol_syslog("get dunning");
 		$result = $db->query($sql);
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
-		if ($result)
-		{
+		if ($result) {
 			$num = $db->num_rows($result);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
 					$total_ht += $obj->amount;
@@ -519,7 +552,9 @@ if ($modecompta == 'BOOKKEEPING')
 
 					print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/don/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name." ".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
-					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
+					if ($modecompta == 'CREANCES-DETTES') {
+						print '<td class="right">'.price($obj->amount).'</td>';
+					}
 					print '<td class="right">'.price($obj->amount).'</td>';
 					print '</tr>';
 					$i++;
@@ -537,8 +572,9 @@ if ($modecompta == 'BOOKKEEPING')
 		$total_ttc_income += $subtotal_ttc;
 
 		print '<tr class="liste_total">';
-		if ($modecompta == 'CREANCES-DETTES')
+		if ($modecompta == 'CREANCES-DETTES') {
 			print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+		}
 		print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
 		print '</tr>';
 	}
@@ -546,20 +582,21 @@ if ($modecompta == 'BOOKKEEPING')
 	/*
 	 * Suppliers invoices
 	 */
-	if ($modecompta == 'CREANCES-DETTES')
-	{
+	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " WHERE f.fk_soc = s.rowid";
 		$sql .= " AND f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 			$sql .= " AND f.type IN (0,1,2)";
-		else $sql .= " AND f.type IN (0,1,2,3)";
-		if (!empty($date_start) && !empty($date_end))
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3)";
+		}
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	} elseif ($modecompta == 'RECETTES-DEPENSES')
-	{
+		}
+	} elseif ($modecompta == 'RECETTES-DEPENSES') {
 		$sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
 		$sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
@@ -568,12 +605,15 @@ if ($modecompta == 'BOOKKEEPING')
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " ON f.fk_soc = s.rowid";
 		$sql .= " WHERE p.rowid = pf.fk_paiementfourn ";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 	}
 
 	$sql .= " AND f.entity = ".$conf->entity;
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
 	$sql .= " GROUP BY name, socid";
 	$sql .= $db->order($sortfield, $sortorder);
 
@@ -586,17 +626,16 @@ if ($modecompta == 'BOOKKEEPING')
 	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		if ($num > 0)
-		{
-			while ($i < $num)
-			{
+		if ($num > 0) {
+			while ($i < $num) {
 				$objp = $db->fetch_object($result);
 
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
 
-				if ($modecompta == 'CREANCES-DETTES')
+				if ($modecompta == 'CREANCES-DETTES') {
 					print '<td class="right">'.price(-$objp->amount_ht)."</td>\n";
+				}
 				print '<td class="right">'.price(-$objp->amount_ttc)."</td>\n";
 
 				$total_ht -= (isset($objp->amount_ht) ? $objp->amount_ht : 0);
@@ -622,8 +661,9 @@ if ($modecompta == 'BOOKKEEPING')
 	$total_ttc_outcome += $subtotal_ttc;
 
 	print '<tr class="liste_total">';
-	if ($modecompta == 'CREANCES-DETTES')
+	if ($modecompta == 'CREANCES-DETTES') {
 		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+	}
 	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
@@ -634,17 +674,16 @@ if ($modecompta == 'BOOKKEEPING')
 
 	print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("SocialContributionsNondeductibles").'</td></tr>';
 
-	if ($modecompta == 'CREANCES-DETTES')
-	{
+	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE cs.fk_type = c.id";
 		$sql .= " AND c.deductible = 0";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	} elseif ($modecompta == 'RECETTES-DEPENSES')
-	{
+		}
+	} elseif ($modecompta == 'RECETTES-DEPENSES') {
 		$sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
@@ -652,15 +691,22 @@ if ($modecompta == 'BOOKKEEPING')
 		$sql .= " WHERE p.fk_charge = cs.rowid";
 		$sql .= " AND cs.fk_type = c.id";
 		$sql .= " AND c.deductible = 0";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 	}
 	$sql .= " AND cs.entity = ".$conf->entity;
 	$sql .= " GROUP BY c.libelle, c.id";
 	$newsortfield = $sortfield;
-	if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'c.libelle, c.id';
-	if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-	if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+	if ($newsortfield == 's.nom, s.rowid') {
+		$newsortfield = 'c.libelle, c.id';
+	}
+	if ($newsortfield == 'amount_ht') {
+		$newsortfield = 'amount';
+	}
+	if ($newsortfield == 'amount_ttc') {
+		$newsortfield = 'amount';
+	}
 
 	$sql .= $db->order($newsortfield, $sortorder);
 
@@ -682,7 +728,9 @@ if ($modecompta == 'BOOKKEEPING')
 
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td>'.$obj->label.'</td>';
-				if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+				if ($modecompta == 'CREANCES-DETTES') {
+					print '<td class="right">'.price(-$obj->amount).'</td>';
+				}
 				print '<td class="right">'.price(-$obj->amount).'</td>';
 				print '</tr>';
 				$i++;
@@ -700,8 +748,9 @@ if ($modecompta == 'BOOKKEEPING')
 	$total_ttc_outcome += $subtotal_ttc;
 
 	print '<tr class="liste_total">';
-	if ($modecompta == 'CREANCES-DETTES')
+	if ($modecompta == 'CREANCES-DETTES') {
 		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+	}
 	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
@@ -712,18 +761,17 @@ if ($modecompta == 'BOOKKEEPING')
 
 	print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("SocialContributionsDeductibles").'</td></tr>';
 
-	if ($modecompta == 'CREANCES-DETTES')
-	{
+	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE cs.fk_type = c.id";
 		$sql .= " AND c.deductible = 1";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND cs.entity = ".$conf->entity;
-	} elseif ($modecompta == 'RECETTES-DEPENSES')
-	{
+	} elseif ($modecompta == 'RECETTES-DEPENSES') {
 		$sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
@@ -731,15 +779,22 @@ if ($modecompta == 'BOOKKEEPING')
 		$sql .= " WHERE p.fk_charge = cs.rowid";
 		$sql .= " AND cs.fk_type = c.id";
 		$sql .= " AND c.deductible = 1";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND cs.entity = ".$conf->entity;
 	}
 	$sql .= " GROUP BY c.libelle, c.id";
 	$newsortfield = $sortfield;
-	if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'c.libelle, c.id';
-	if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-	if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+	if ($newsortfield == 's.nom, s.rowid') {
+		$newsortfield = 'c.libelle, c.id';
+	}
+	if ($newsortfield == 'amount_ht') {
+		$newsortfield = 'amount';
+	}
+	if ($newsortfield == 'amount_ttc') {
+		$newsortfield = 'amount';
+	}
 	$sql .= $db->order($newsortfield, $sortorder);
 
 	dol_syslog("get social contributions deductible=1", LOG_DEBUG);
@@ -760,8 +815,9 @@ if ($modecompta == 'BOOKKEEPING')
 
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print '<td>'.$obj->label.'</td>';
-				if ($modecompta == 'CREANCES-DETTES')
+				if ($modecompta == 'CREANCES-DETTES') {
 					print '<td class="right">'.price(-$obj->amount).'</td>';
+				}
 				print '<td class="right">'.price(-$obj->amount).'</td>';
 				print '</tr>';
 				$i++;
@@ -779,8 +835,9 @@ if ($modecompta == 'BOOKKEEPING')
 	$total_ttc_outcome += $subtotal_ttc;
 
 	print '<tr class="liste_total">';
-	if ($modecompta == 'CREANCES-DETTES')
+	if ($modecompta == 'CREANCES-DETTES') {
 		print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+	}
 	print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 	print '</tr>';
 
@@ -789,12 +846,10 @@ if ($modecompta == 'BOOKKEEPING')
 	 * Salaries
 	 */
 
-	if (!empty($conf->salaries->enabled))
-	{
+	if (!empty($conf->salaries->enabled)) {
 		print '<tr class="trforbreak"><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';
 
-	 	if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
-		{
+		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') {
 			if ($modecompta == 'CREANCES-DETTES') {
 				$column = 'p.datev';
 			} else {
@@ -805,14 +860,21 @@ if ($modecompta == 'BOOKKEEPING')
 			$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
 			$sql .= " WHERE p.entity IN (".getEntity('payment_salary').")";
-			if (!empty($date_start) && !empty($date_end))
+			if (!empty($date_start) && !empty($date_end)) {
 				$sql .= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
+			}
 
 			$sql .= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
 			$newsortfield = $sortfield;
-			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'u.firstname, u.lastname';
-			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			if ($newsortfield == 's.nom, s.rowid') {
+				$newsortfield = 'u.firstname, u.lastname';
+			}
+			if ($newsortfield == 'amount_ht') {
+				$newsortfield = 'amount';
+			}
+			if ($newsortfield == 'amount_ttc') {
+				$newsortfield = 'amount';
+			}
 			$sql .= $db->order($newsortfield, $sortorder);
 		}
 
@@ -820,14 +882,11 @@ if ($modecompta == 'BOOKKEEPING')
 		$result = $db->query($sql);
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
-		if ($result)
-		{
+		if ($result) {
 			$num = $db->num_rows($result);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
 					$total_ht -= $obj->amount;
@@ -839,7 +898,9 @@ if ($modecompta == 'BOOKKEEPING')
 
 					print "<td>".$langs->trans("Salary")." <a href=\"".DOL_URL_ROOT."/salaries/list.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
-					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+					if ($modecompta == 'CREANCES-DETTES') {
+						print '<td class="right">'.price(-$obj->amount).'</td>';
+					}
 					print '<td class="right">'.price(-$obj->amount).'</td>';
 					print '</tr>';
 					$i++;
@@ -857,8 +918,9 @@ if ($modecompta == 'BOOKKEEPING')
 		$total_ttc_outcome += $subtotal_ttc;
 
 		print '<tr class="liste_total">';
-		if ($modecompta == 'CREANCES-DETTES')
+		if ($modecompta == 'CREANCES-DETTES') {
 			print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+		}
 		print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 		print '</tr>';
 	}
@@ -868,10 +930,8 @@ if ($modecompta == 'BOOKKEEPING')
 	 * Expense
 	 */
 
-	if (!empty($conf->expensereport->enabled))
-	{
-		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')
-		{
+	if (!empty($conf->expensereport->enabled)) {
+		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') {
 			$langs->load('trips');
 			if ($modecompta == 'CREANCES-DETTES') {
 				$sql = "SELECT p.rowid, p.ref, u.rowid as userid, u.firstname, u.lastname, date_format(date_valid,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
@@ -893,14 +953,15 @@ if ($modecompta == 'BOOKKEEPING')
 				$column = 'pe.datep';
 			}
 
-			if (!empty($date_start) && !empty($date_end))
-			{
+			if (!empty($date_start) && !empty($date_end)) {
 				$sql .= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
 			}
 
 			$sql .= " GROUP BY u.rowid, p.rowid, p.ref, u.firstname, u.lastname, dm";
 			$newsortfield = $sortfield;
-			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'p.ref';
+			if ($newsortfield == 's.nom, s.rowid') {
+				$newsortfield = 'p.ref';
+			}
 			$sql .= $db->order($newsortfield, $sortorder);
 		}
 
@@ -910,13 +971,10 @@ if ($modecompta == 'BOOKKEEPING')
 		$result = $db->query($sql);
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
-		if ($result)
-		{
+		if ($result) {
 			$num = $db->num_rows($result);
-			if ($num)
-			{
-				while ($obj = $db->fetch_object($result))
-				{
+			if ($num) {
+				while ($obj = $db->fetch_object($result)) {
 					$total_ht -= $obj->amount_ht;
 					$total_ttc -= $obj->amount_ttc;
 					$subtotal_ht += $obj->amount_ht;
@@ -926,7 +984,9 @@ if ($modecompta == 'BOOKKEEPING')
 
 					print "<td>".$langs->trans("ExpenseReport")." <a href=\"".DOL_URL_ROOT."/expensereport/list.php?search_user=".$obj->userid."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
 
-					if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount_ht).'</td>';
+					if ($modecompta == 'CREANCES-DETTES') {
+						print '<td class="right">'.price(-$obj->amount_ht).'</td>';
+					}
 					print '<td class="right">'.price(-$obj->amount_ttc).'</td>';
 					print '</tr>';
 				}
@@ -943,19 +1003,20 @@ if ($modecompta == 'BOOKKEEPING')
 		$total_ttc_outcome += $subtotal_ttc;
 
 		print '<tr class="liste_total">';
-		if ($modecompta == 'CREANCES-DETTES') print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+		if ($modecompta == 'CREANCES-DETTES') {
+			print '<td colspan="3" class="right">'.price(-$subtotal_ht).'</td>';
+		}
 		print '<td colspan="3" class="right">'.price(-$subtotal_ttc).'</td>';
 		print '</tr>';
 	}
 
 
 	/*
-     * Various Payments
-     */
+	 * Various Payments
+	 */
 	//$conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY = 1;
 
-	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-	{
+	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
 
@@ -964,19 +1025,18 @@ if ($modecompta == 'BOOKKEEPING')
 		// Debit
 		$sql = "SELECT SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
 		$sql .= ' WHERE 1 = 1';
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= ' GROUP BY p.sens';
 		$sql .= ' ORDER BY p.sens';
 
 		dol_syslog('get various payments', LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			// Debit (payment of suppliers for example)
 			$obj = $db->fetch_object($result);
-			if (isset($obj->amount))
-			{
+			if (isset($obj->amount)) {
 				$subtotal_ht += -$obj->amount;
 				$subtotal_ttc += -$obj->amount;
 
@@ -985,14 +1045,15 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("Debit")."</td>\n";
-			if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+			if ($modecompta == 'CREANCES-DETTES') {
+				print '<td class="right">'.price(-$obj->amount).'</td>';
+			}
 			print '<td class="right">'.price(-$obj->amount)."</td>\n";
 			print "</tr>\n";
 
 			// Credit (payment received from customer for example)
 			$obj = $db->fetch_object($result);
-			if (isset($obj->amount))
-			{
+			if (isset($obj->amount)) {
 				$subtotal_ht += $obj->amount;
 				$subtotal_ttc += $obj->amount;
 
@@ -1001,7 +1062,9 @@ if ($modecompta == 'BOOKKEEPING')
 			}
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("Credit")."</td>\n";
-			if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price($obj->amount).'</td>';
+			if ($modecompta == 'CREANCES-DETTES') {
+				print '<td class="right">'.price($obj->amount).'</td>';
+			}
 			print '<td class="right">'.price($obj->amount)."</td>\n";
 			print "</tr>\n";
 
@@ -1009,19 +1072,21 @@ if ($modecompta == 'BOOKKEEPING')
 			$total_ht += $subtotal_ht;
 			$total_ttc += $subtotal_ttc;
 			print '<tr class="liste_total">';
-			if ($modecompta == 'CREANCES-DETTES')
+			if ($modecompta == 'CREANCES-DETTES') {
 				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+			}
 			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
 			print '</tr>';
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	/*
-     * Payement Loan
-     */
+	 * Payement Loan
+	 */
 
-	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-	{
+	if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
 
@@ -1030,25 +1095,26 @@ if ($modecompta == 'BOOKKEEPING')
 		$sql = 'SELECT l.rowid as id, l.label AS label, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) as amount FROM '.MAIN_DB_PREFIX.'payment_loan as p';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'loan AS l ON l.rowid = p.fk_loan';
 		$sql .= ' WHERE 1 = 1';
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= ' GROUP BY p.fk_loan';
 		$sql .= ' ORDER BY p.fk_loan';
 
 		dol_syslog('get loan payments', LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 			$loan_static = new Loan($db);
-			while ($obj = $db->fetch_object($result))
-			{
+			while ($obj = $db->fetch_object($result)) {
 				$loan_static->id = $obj->id;
 				$loan_static->ref = $obj->id;
 				$loan_static->label = $obj->label;
 				print '<tr class="oddeven"><td>&nbsp;</td>';
 				print "<td>".$loan_static->getNomUrl(1).' - '.$obj->label."</td>\n";
-				if ($modecompta == 'CREANCES-DETTES') print '<td class="right">'.price(-$obj->amount).'</td>';
+				if ($modecompta == 'CREANCES-DETTES') {
+					print '<td class="right">'.price(-$obj->amount).'</td>';
+				}
 				print '<td class="right">'.price(-$obj->amount)."</td>\n";
 				print "</tr>\n";
 				$subtotal_ht -= $obj->amount;
@@ -1061,11 +1127,14 @@ if ($modecompta == 'BOOKKEEPING')
 			$total_ttc_income += $subtotal_ttc;
 
 			print '<tr class="liste_total">';
-			if ($modecompta == 'CREANCES-DETTES')
+			if ($modecompta == 'CREANCES-DETTES') {
 				print '<td colspan="3" class="right">'.price($subtotal_ht).'</td>';
+			}
 			print '<td colspan="3" class="right">'.price($subtotal_ttc).'</td>';
 			print '</tr>';
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	/*
@@ -1076,38 +1145,42 @@ if ($modecompta == 'BOOKKEEPING')
 	$subtotal_ht = 0;
 	$subtotal_ttc = 0;
 
-	if ($conf->tax->enabled && ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES'))
-	{
-		if ($modecompta == 'CREANCES-DETTES')
-		{
+	if ($conf->tax->enabled && ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES')) {
+		if ($modecompta == 'CREANCES-DETTES') {
 			// VAT to pay
 			$amount = 0;
 			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.tva) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 			$sql .= " WHERE f.fk_statut IN (1,2)";
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 				$sql .= " AND f.type IN (0,1,2,5)";
-			else $sql .= " AND f.type IN (0,1,2,3,5)";
-			if (!empty($date_start) && !empty($date_end))
+			} else {
+				$sql .= " AND f.type IN (0,1,2,3,5)";
+			}
+			if (!empty($date_start) && !empty($date_end)) {
 				$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+			}
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			$sql .= " GROUP BY dm";
 			$newsortfield = $sortfield;
-			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			if ($newsortfield == 's.nom, s.rowid') {
+				$newsortfield = 'dm';
+			}
+			if ($newsortfield == 'amount_ht') {
+				$newsortfield = 'amount';
+			}
+			if ($newsortfield == 'amount_ttc') {
+				$newsortfield = 'amount';
+			}
 			$sql .= $db->order($newsortfield, $sortorder);
 
 			dol_syslog("get vat to pay", LOG_DEBUG);
 			$result = $db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $db->num_rows($result);
 				$i = 0;
-				if ($num)
-				{
-					while ($i < $num)
-					{
+				if ($num) {
+					while ($i < $num) {
 						$obj = $db->fetch_object($result);
 
 						$amount -= $obj->amount;
@@ -1136,29 +1209,35 @@ if ($modecompta == 'BOOKKEEPING')
 			$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_tva) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 			$sql .= " WHERE f.fk_statut IN (1,2)";
-			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS))
+			if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 				$sql .= " AND f.type IN (0,1,2)";
-			else $sql .= " AND f.type IN (0,1,2,3)";
-			if (!empty($date_start) && !empty($date_end))
+			} else {
+				$sql .= " AND f.type IN (0,1,2,3)";
+			}
+			if (!empty($date_start) && !empty($date_end)) {
 				$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+			}
 			$sql .= " AND f.entity = ".$conf->entity;
 			$sql .= " GROUP BY dm";
 			$newsortfield = $sortfield;
-			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			if ($newsortfield == 's.nom, s.rowid') {
+				$newsortfield = 'dm';
+			}
+			if ($newsortfield == 'amount_ht') {
+				$newsortfield = 'amount';
+			}
+			if ($newsortfield == 'amount_ttc') {
+				$newsortfield = 'amount';
+			}
 			$sql .= $db->order($newsortfield, $sortorder);
 
 			dol_syslog("get vat received back", LOG_DEBUG);
 			$result = $db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $db->num_rows($result);
 				$i = 0;
-				if ($num)
-				{
-					while ($i < $num)
-					{
+				if ($num) {
+					while ($i < $num) {
 						$obj = $db->fetch_object($result);
 
 						$amount += $obj->amount;
@@ -1188,14 +1267,21 @@ if ($modecompta == 'BOOKKEEPING')
 			$sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 			$sql .= " WHERE amount > 0";
-			if (!empty($date_start) && !empty($date_end))
+			if (!empty($date_start) && !empty($date_end)) {
 				$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+			}
 			$sql .= " AND t.entity = ".$conf->entity;
 			$sql .= " GROUP BY dm";
 			$newsortfield = $sortfield;
-			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			if ($newsortfield == 's.nom, s.rowid') {
+				$newsortfield = 'dm';
+			}
+			if ($newsortfield == 'amount_ht') {
+				$newsortfield = 'amount';
+			}
+			if ($newsortfield == 'amount_ttc') {
+				$newsortfield = 'amount';
+			}
 			$sql .= $db->order($newsortfield, $sortorder);
 
 			dol_syslog("get vat really paid", LOG_DEBUG);
@@ -1226,8 +1312,9 @@ if ($modecompta == 'BOOKKEEPING')
 
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATPaid")."</td>\n";
-			if ($modecompta == 'CREANCES-DETTES')
+			if ($modecompta == 'CREANCES-DETTES') {
 				print '<td <class="right"></td>'."\n";
+			}
 			print '<td class="right">'.price($amount)."</td>\n";
 			print "</tr>\n";
 
@@ -1236,14 +1323,21 @@ if ($modecompta == 'BOOKKEEPING')
 			$sql = "SELECT date_format(t.datev,'%Y-%m') as dm, sum(t.amount) as amount";
 			$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 			$sql .= " WHERE amount < 0";
-			if (!empty($date_start) && !empty($date_end))
+			if (!empty($date_start) && !empty($date_end)) {
 				$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+			}
 			$sql .= " AND t.entity = ".$conf->entity;
 			$sql .= " GROUP BY dm";
 			$newsortfield = $sortfield;
-			if ($newsortfield == 's.nom, s.rowid') $newsortfield = 'dm';
-			if ($newsortfield == 'amount_ht') $newsortfield = 'amount';
-			if ($newsortfield == 'amount_ttc') $newsortfield = 'amount';
+			if ($newsortfield == 's.nom, s.rowid') {
+				$newsortfield = 'dm';
+			}
+			if ($newsortfield == 'amount_ht') {
+				$newsortfield = 'amount';
+			}
+			if ($newsortfield == 'amount_ttc') {
+				$newsortfield = 'amount';
+			}
 			$sql .= $db->order($newsortfield, $sortorder);
 
 			dol_syslog("get vat really received back", LOG_DEBUG);
@@ -1274,18 +1368,19 @@ if ($modecompta == 'BOOKKEEPING')
 
 			print '<tr class="oddeven"><td>&nbsp;</td>';
 			print "<td>".$langs->trans("VATCollected")."</td>\n";
-			if ($modecompta == 'CREANCES-DETTES')
+			if ($modecompta == 'CREANCES-DETTES') {
 				print '<td class="right"></td>'."\n";
+			}
 			print '<td class="right">'.price($amount)."</td>\n";
 			print "</tr>\n";
 		}
 	}
 
-	if ($mysoc->tva_assuj != '0')	// Assujetti
-	{
+	if ($mysoc->tva_assuj != '0') {	// Assujetti
 		print '<tr class="liste_total">';
-		if ($modecompta == 'CREANCES-DETTES')
+		if ($modecompta == 'CREANCES-DETTES') {
 			print '<td colspan="3" class="right">&nbsp;</td>';
+		}
 		print '<td colspan="3" class="right">'.price(price2num($subtotal_ttc, 'MT')).'</td>';
 		print '</tr>';
 	}
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 38d0f4ec3f9..3c1d6d3fb0d 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -46,8 +46,7 @@ $nbofyear = 4;
 
 // Date range
 $year = GETPOST('year', 'int');
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$month_current = strftime("%m", dol_now());
 	$year_start = $year_current - ($nbofyear - 1);
@@ -60,31 +59,40 @@ $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_starty
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q") ?GETPOST("q") : 0;
-	if ($q == 0)
-	{
+	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
 		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-		if (!GETPOST('month'))
-		{
-			if (!GETPOST("year") && $month_start > $month_current)
-			{
+		if (!GETPOST('month')) {
+			if (!GETPOST("year") && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
-		} else $month_end = $month_start;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
+		} else {
+			$month_end = $month_start;
+		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	if ($q == 1) {
+		$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+	}
+	if ($q == 2) {
+		$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+	}
+	if ($q == 3) {
+		$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+	}
+	if ($q == 4) {
+		$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+	}
 }
 
 // $date_start and $date_end are defined. We force $year_start and $nbofyear
@@ -98,14 +106,24 @@ $nbofyear = ($year_end - $year_start) + 1;
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) $modecompta = 'BOOKKEEPING';
-if (GETPOST("modecompta", 'alpha')) $modecompta = GETPOST("modecompta", 'alpha');
+if (!empty($conf->accounting->enabled)) {
+	$modecompta = 'BOOKKEEPING';
+}
+if (GETPOST("modecompta", 'alpha')) {
+	$modecompta = GETPOST("modecompta", 'alpha');
+}
 
 
 /*
@@ -119,8 +137,7 @@ $form = new Form($db);
 $exportlink = '';
 
 // Affiche en-tete du rapport
-if ($modecompta == 'CREANCES-DETTES')
-{
+if ($modecompta == 'CREANCES-DETTES') {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeDebt");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
@@ -133,8 +150,11 @@ if ($modecompta == 'CREANCES-DETTES')
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesAmountWithTaxIncluded");
 	$description .= '<br>'.$langs->trans("RulesResultDue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= "<br>".$langs->trans("DepositsAreNotIncluded");
-	else $description .= "<br>".$langs->trans("DepositsAreIncluded");
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description .= "<br>".$langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description .= "<br>".$langs->trans("DepositsAreIncluded");
+	}
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "RECETTES-DEPENSES") {
@@ -152,8 +172,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	$description .= '<br>'.$langs->trans("RulesResultInOut");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByYear");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '{s1}', '{s2}').')';
@@ -172,8 +191,7 @@ $hselected = 'report';
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta), $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -185,21 +203,22 @@ if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
 
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
-if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
-	if ($modecompta == 'CREANCES-DETTES')
-	{
+if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= ", ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE f.fk_soc = s.rowid";
 		$sql .= " AND f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	} elseif ($modecompta == "RECETTES-DEPENSES")
-	{
+		}
+	} elseif ($modecompta == "RECETTES-DEPENSES") {
 		/*
 		 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
 		 * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
@@ -210,24 +229,25 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
 		$sql .= " WHERE p.rowid = pf.fk_paiement";
 		$sql .= " AND pf.fk_facture = f.rowid";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 	}
 
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if ($socid) $sql .= " AND f.fk_soc = $socid";
+	if ($socid) {
+		$sql .= " AND f.fk_soc = $socid";
+	}
 	$sql .= " GROUP BY dm";
 	$sql .= " ORDER BY dm";
 
 	//print $sql;
 	dol_syslog("get customers invoices", LOG_DEBUG);
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$row = $db->fetch_object($result);
 			$encaiss[$row->dm] = (isset($row->amount_ht) ? $row->amount_ht : 0);
 			$encaiss_ttc[$row->dm] = $row->amount_ttc;
@@ -237,16 +257,13 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 	} else {
 		dol_print_error($db);
 	}
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	// Nothing from this table
 }
 
-if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
+if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	// On ajoute les paiements clients anciennes version, non lies par paiement_facture
-	if ($modecompta != 'CREANCES-DETTES')
-	{
+	if ($modecompta != 'CREANCES-DETTES') {
 		$sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
@@ -256,8 +273,9 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		$sql .= " AND p.fk_bank = b.rowid";
 		$sql .= " AND b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " GROUP BY dm";
 		$sql .= " ORDER BY dm";
 
@@ -266,14 +284,17 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		if ($result) {
 			$num = $db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $db->fetch_object($result);
 
-				if (!isset($encaiss[$row->dm])) $encaiss[$row->dm] = 0;
+				if (!isset($encaiss[$row->dm])) {
+					$encaiss[$row->dm] = 0;
+				}
 				$encaiss[$row->dm] += (isset($row->amount_ht) ? $row->amount_ht : 0);
 
-				if (!isset($encaiss_ttc[$row->dm])) $encaiss_ttc[$row->dm] = 0;
+				if (!isset($encaiss_ttc[$row->dm])) {
+					$encaiss_ttc[$row->dm] = 0;
+				}
 				$encaiss_ttc[$row->dm] += $row->amount_ttc;
 
 				$i++;
@@ -281,12 +302,10 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 		} else {
 			dol_print_error($db);
 		}
-	} elseif ($modecompta == "RECETTES-DEPENSES")
-	{
+	} elseif ($modecompta == "RECETTES-DEPENSES") {
 		// Nothing from this table
 	}
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	// Nothing from this table
 }
 
@@ -297,47 +316,53 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
 
-if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
-	if ($modecompta == 'CREANCES-DETTES')
-	{
+if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc, date_format(f.datef,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " WHERE f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)";
-		else $sql .= " AND f.type IN (0,1,2,3)";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3)";
+		}
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-	} elseif ($modecompta == "RECETTES-DEPENSES")
-	{
+		}
+	} elseif ($modecompta == "RECETTES-DEPENSES") {
 		$sql = "SELECT sum(pf.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p";
 		$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
 		$sql .= " WHERE f.rowid = pf.fk_facturefourn";
 		$sql .= " AND p.rowid = pf.fk_paiementfourn";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 	}
 
 	$sql .= " AND f.entity = ".$conf->entity;
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
 	$sql .= " GROUP BY dm";
 
 	dol_syslog("get suppliers invoices", LOG_DEBUG);
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$row = $db->fetch_object($result);
 
-			if (!isset($decaiss[$row->dm])) $decaiss[$row->dm] = 0;
+			if (!isset($decaiss[$row->dm])) {
+				$decaiss[$row->dm] = 0;
+			}
 			$decaiss[$row->dm] = (isset($row->amount_ht) ? $row->amount_ht : 0);
 
-			if (!isset($decaiss_ttc[$row->dm])) $decaiss_ttc[$row->dm] = 0;
+			if (!isset($decaiss_ttc[$row->dm])) {
+				$decaiss_ttc[$row->dm] = 0;
+			}
 			$decaiss_ttc[$row->dm] = $row->amount_ttc;
 
 			$i++;
@@ -346,8 +371,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 	} else {
 		dol_print_error($db);
 	}
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	// Nothing from this table
 }
 
@@ -359,19 +383,21 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
-if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
-	if ($modecompta == 'CREANCES-DETTES')
-	{
+if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if ($modecompta == 'CREANCES-DETTES') {
 		// TVA collected to pay
 		$sql = "SELECT sum(f.tva) as amount, date_format(f.datef,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat to pay", LOG_DEBUG);
@@ -383,10 +409,14 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
-					if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
+					if (!isset($decaiss[$obj->dm])) {
+						$decaiss[$obj->dm] = 0;
+					}
 					$decaiss[$obj->dm] += $obj->amount;
 
-					if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+					if (!isset($decaiss_ttc[$obj->dm])) {
+						$decaiss_ttc[$obj->dm] = 0;
+					}
 					$decaiss_ttc[$obj->dm] += $obj->amount;
 
 					$i++;
@@ -399,11 +429,15 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql = "SELECT sum(f.total_tva) as amount, date_format(f.datef,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " WHERE f.fk_statut IN (1,2)";
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2)";
-		else $sql .= " AND f.type IN (0,1,2,3)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3)";
+		}
 		$sql .= " AND f.entity = ".$conf->entity;
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat to receive back", LOG_DEBUG);
@@ -415,10 +449,14 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
-					if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
+					if (!isset($encaiss[$obj->dm])) {
+						$encaiss[$obj->dm] = 0;
+					}
 					$encaiss[$obj->dm] += $obj->amount;
 
-					if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+					if (!isset($encaiss_ttc[$obj->dm])) {
+						$encaiss_ttc[$obj->dm] = 0;
+					}
 					$encaiss_ttc[$obj->dm] += $obj->amount;
 
 					$i++;
@@ -427,15 +465,15 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		} else {
 			dol_print_error($db);
 		}
-	} elseif ($modecompta == "RECETTES-DEPENSES")
-	{
+	} elseif ($modecompta == "RECETTES-DEPENSES") {
 		// TVA really already paid
 		$sql = "SELECT sum(t.amount) as amount, date_format(t.datev,'%Y-%m') as dm";
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " WHERE amount > 0";
 		$sql .= " AND t.entity = ".$conf->entity;
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat really paid", LOG_DEBUG);
@@ -447,10 +485,14 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
-					if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
+					if (!isset($decaiss[$obj->dm])) {
+						$decaiss[$obj->dm] = 0;
+					}
 					$decaiss[$obj->dm] += $obj->amount;
 
-					if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+					if (!isset($decaiss_ttc[$obj->dm])) {
+						$decaiss_ttc[$obj->dm] = 0;
+					}
 					$decaiss_ttc[$obj->dm] += $obj->amount;
 
 					$i++;
@@ -464,8 +506,9 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		$sql .= " WHERE amount < 0";
 		$sql .= " AND t.entity = ".$conf->entity;
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND t.datev >= '".$db->idate($date_start)."' AND t.datev <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " GROUP BY dm";
 
 		dol_syslog("get vat really received back", LOG_DEBUG);
@@ -477,10 +520,14 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 				while ($i < $num) {
 					$obj = $db->fetch_object($result);
 
-					if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
+					if (!isset($encaiss[$obj->dm])) {
+						$encaiss[$obj->dm] = 0;
+					}
 					$encaiss[$obj->dm] += -$obj->amount;
 
-					if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+					if (!isset($encaiss_ttc[$obj->dm])) {
+						$encaiss_ttc[$obj->dm] = 0;
+					}
 					$encaiss_ttc[$obj->dm] += -$obj->amount;
 
 					$i++;
@@ -490,8 +537,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 			dol_print_error($db);
 		}
 	}
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	// Nothing from this table
 }
 
@@ -501,26 +547,25 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
-if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
-	if ($modecompta == 'CREANCES-DETTES')
-	{
+if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if ($modecompta == 'CREANCES-DETTES') {
 		$sql = "SELECT c.libelle as nom, date_format(cs.date_ech,'%Y-%m') as dm, sum(cs.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " WHERE cs.fk_type = c.id";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND cs.date_ech >= '".$db->idate($date_start)."' AND cs.date_ech <= '".$db->idate($date_end)."'";
-	} elseif ($modecompta == "RECETTES-DEPENSES")
-	{
+		}
+	} elseif ($modecompta == "RECETTES-DEPENSES") {
 		$sql = "SELECT c.libelle as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 		$sql .= ", ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= ", ".MAIN_DB_PREFIX."paiementcharge as p";
 		$sql .= " WHERE p.fk_charge = cs.rowid";
 		$sql .= " AND cs.fk_type = c.id";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 	}
 
 	$sql .= " AND cs.entity = ".$conf->entity;
@@ -535,10 +580,14 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 			while ($i < $num) {
 				$obj = $db->fetch_object($result);
 
-				if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
+				if (!isset($decaiss[$obj->dm])) {
+					$decaiss[$obj->dm] = 0;
+				}
 				$decaiss[$obj->dm] += $obj->amount;
 
-				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+				if (!isset($decaiss_ttc[$obj->dm])) {
+					$decaiss_ttc[$obj->dm] = 0;
+				}
 				$decaiss_ttc[$obj->dm] += $obj->amount;
 
 				$i++;
@@ -547,8 +596,7 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 	} else {
 		dol_print_error($db);
 	}
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	// Nothing from this table
 }
 
@@ -557,18 +605,22 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
  * Salaries
  */
 
-if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
-	if ($modecompta == 'CREANCES-DETTES')   $column = 'p.datev';
-	if ($modecompta == "RECETTES-DEPENSES")	$column = 'p.datep';
+if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+	if ($modecompta == 'CREANCES-DETTES') {
+		$column = 'p.datev';
+	}
+	if ($modecompta == "RECETTES-DEPENSES") {
+		$column = 'p.datep';
+	}
 
 	$subtotal_ht = 0;
 	$subtotal_ttc = 0;
 	$sql = "SELECT p.label as nom, date_format(".$column.",'%Y-%m') as dm, sum(p.amount) as amount";
 	$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
 	$sql .= " WHERE p.entity IN (".getEntity('payment_salary').")";
-	if (!empty($date_start) && !empty($date_end))
+	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
+	}
 	$sql .= " GROUP BY p.label, dm";
 
 	dol_syslog("get social salaries payments");
@@ -580,12 +632,14 @@ if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
 			while ($i < $num) {
 				$obj = $db->fetch_object($result);
 
-				if (!isset($decaiss[$obj->dm]))
+				if (!isset($decaiss[$obj->dm])) {
 					$decaiss[$obj->dm] = 0;
+				}
 				$decaiss[$obj->dm] += $obj->amount;
 
-				if (!isset($decaiss_ttc[$obj->dm]))
+				if (!isset($decaiss_ttc[$obj->dm])) {
 					$decaiss_ttc[$obj->dm] = 0;
+				}
 				$decaiss_ttc[$obj->dm] += $obj->amount;
 
 				$i++;
@@ -594,8 +648,7 @@ if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
 	} else {
 		dol_print_error($db);
 	}
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	// Nothing from this table
 }
 
@@ -604,8 +657,7 @@ if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $mo
  * Expense reports
  */
 
-if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
+if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	$langs->load('trips');
 
 	if ($modecompta == 'CREANCES-DETTES') {
@@ -616,8 +668,9 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
 		$sql .= " AND p.fk_statut>=5";
 
 		$column = 'p.date_valid';
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
+		}
 	} elseif ($modecompta == 'RECETTES-DEPENSES') {
 		$sql = "SELECT date_format(pe.datep,'%Y-%m') as dm, sum(p.total_ht) as amount_ht,sum(p.total_ttc) as amount_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as p";
@@ -628,8 +681,9 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
 		$sql .= " AND p.fk_statut>=5";
 
 		$column = 'pe.datep';
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
+		}
 	}
 
 	$sql .= " GROUP BY dm";
@@ -638,17 +692,18 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
 	$result = $db->query($sql);
 	$subtotal_ht = 0;
 	$subtotal_ttc = 0;
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
-		if ($num)
-		{
-			while ($obj = $db->fetch_object($result))
-			{
-				if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;
+		if ($num) {
+			while ($obj = $db->fetch_object($result)) {
+				if (!isset($decaiss[$obj->dm])) {
+					$decaiss[$obj->dm] = 0;
+				}
 				$decaiss[$obj->dm] += $obj->amount_ht;
 
-				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+				if (!isset($decaiss_ttc[$obj->dm])) {
+					$decaiss_ttc[$obj->dm] = 0;
+				}
 				$decaiss_ttc[$obj->dm] += $obj->amount_ttc;
 			}
 		}
@@ -664,8 +719,7 @@ if (!empty($conf->expensereport->enabled) && ($modecompta == 'CREANCES-DETTES' |
  * Donation get dunning payments
  */
 
-if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
+if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	$subtotal_ht = 0;
 	$subtotal_ttc = 0;
 
@@ -674,15 +728,16 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 		$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 		$sql .= " WHERE p.entity IN (".getEntity('donation').")";
 		$sql .= " AND fk_statut in (1,2)";
-		if (!empty($date_start) && !empty($date_end))
+		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
+		}
 	} elseif ($modecompta == 'RECETTES-DEPENSES') {
 		$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(pe.datep,'%Y-%m') as dm, sum(p.amount) as amount";
 		$sql .= " FROM ".MAIN_DB_PREFIX."don as p";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."payment_donation as pe ON pe.fk_donation = p.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON pe.fk_typepayment = c.id";
 		$sql .= " WHERE p.entity IN (".getEntity('donation').")";
-   		$sql .= " AND fk_statut >= 2";
+		$sql .= " AND fk_statut >= 2";
 		if (!empty($date_start) && !empty($date_end)) {
 			$sql .= " AND pe.datep >= '".$db->idate($date_start)."' AND pe.datep <= '".$db->idate($date_end)."'";
 		}
@@ -692,20 +747,21 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 
 	dol_syslog("get donation payments");
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		if ($num)
-		{
-			while ($i < $num)
-			{
+		if ($num) {
+			while ($i < $num) {
 				$obj = $db->fetch_object($result);
 
-				if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;
+				if (!isset($encaiss[$obj->dm])) {
+					$encaiss[$obj->dm] = 0;
+				}
 				$encaiss[$obj->dm] += $obj->amount;
 
-				if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
+				if (!isset($encaiss_ttc[$obj->dm])) {
+					$encaiss_ttc[$obj->dm] = 0;
+				}
 				$encaiss_ttc[$obj->dm] += $obj->amount;
 
 				$i++;
@@ -722,29 +778,30 @@ if (!empty($conf->don->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
  * Various Payments
  */
 
-if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
+if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->banque->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	// decaiss
 
 	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various as p";
 	$sql .= ' WHERE p.sens = 0';
-	if (!empty($date_start) && !empty($date_end))
+	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	}
 	$sql .= ' GROUP BY dm';
 
 	dol_syslog("get various payments");
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		if ($num)
-		{
-			while ($i < $num)
-			{
+		if ($num) {
+			while ($i < $num) {
 				$obj = $db->fetch_object($result);
-				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
-				if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+				if (!isset($decaiss_ttc[$obj->dm])) {
+					$decaiss_ttc[$obj->dm] = 0;
+				}
+				if (isset($obj->amount)) {
+					$decaiss_ttc[$obj->dm] += $obj->amount;
+				}
 				$i++;
 			}
 		}
@@ -756,23 +813,25 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
 
 	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount) AS amount FROM ".MAIN_DB_PREFIX."payment_various AS p";
 	$sql .= ' WHERE p.sens = 1';
-	if (!empty($date_start) && !empty($date_end))
+	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	}
 	$sql .= ' GROUP BY dm';
 
 	dol_syslog("get various payments");
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		if ($num)
-		{
-			while ($i < $num)
-			{
+		if ($num) {
+			while ($i < $num) {
 				$obj = $db->fetch_object($result);
-				if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
-				if (isset($obj->amount)) $encaiss_ttc[$obj->dm] += $obj->amount;
+				if (!isset($encaiss_ttc[$obj->dm])) {
+					$encaiss_ttc[$obj->dm] = 0;
+				}
+				if (isset($obj->amount)) {
+					$encaiss_ttc[$obj->dm] += $obj->amount;
+				}
 				$i++;
 			}
 		}
@@ -788,27 +847,28 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_VARPAY) && !empty($conf->ba
  * Payement Loan
  */
 
-if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES"))
-{
+if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	$sql = "SELECT date_format(p.datep, '%Y-%m') AS dm, SUM(p.amount_capital + p.amount_insurance + p.amount_interest) AS amount FROM ".MAIN_DB_PREFIX."payment_loan AS p";
 	$sql .= ' WHERE 1 = 1';
-	if (!empty($date_start) && !empty($date_end))
+	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	}
 	$sql .= ' GROUP BY dm';
 
 	dol_syslog("get loan payments");
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		if ($num)
-		{
-			while ($i < $num)
-			{
+		if ($num) {
+			while ($i < $num) {
 				$obj = $db->fetch_object($result);
-				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
-				if (isset($obj->amount)) $decaiss_ttc[$obj->dm] += $obj->amount;
+				if (!isset($decaiss_ttc[$obj->dm])) {
+					$decaiss_ttc[$obj->dm] = 0;
+				}
+				if (isset($obj->amount)) {
+					$decaiss_ttc[$obj->dm] += $obj->amount;
+				}
 				$i++;
 			}
 		}
@@ -825,8 +885,7 @@ if (!empty($conf->global->ACCOUNTING_REPORTS_INCLUDE_LOAN) && !empty($conf->loan
  * Request in mode BOOKKEEPING
  */
 
-if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
-{
+if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING')) {
 	$predefinedgroupwhere = "(";
 	$predefinedgroupwhere .= " (aa.pcg_type = 'EXPENSE')";
 	$predefinedgroupwhere .= " OR ";
@@ -843,8 +902,9 @@ if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 	$sql .= " AND b.numero_compte = aa.account_number";
 	$sql .= " AND ".$predefinedgroupwhere;
 	$sql .= " AND fk_pcg_version = '".$db->escape($charofaccountstring)."'";
-	if (!empty($date_start) && !empty($date_end))
+	if (!empty($date_start) && !empty($date_end)) {
 		$sql .= " AND b.doc_date >= '".$db->idate($date_start)."' AND b.doc_date <= '".$db->idate($date_end)."'";
+	}
 	$sql .= " GROUP BY b.doc_ref, b.numero_compte, b.subledger_account, b.subledger_label, pcg_type, dm";
 	//print $sql;
 
@@ -853,30 +913,35 @@ if (!empty($conf->accounting->enabled) && ($modecompta == 'BOOKKEEPING'))
 
 	dol_syslog("get bookkeeping record");
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		if ($num)
-		{
-			while ($i < $num)
-			{
+		if ($num) {
+			while ($i < $num) {
 				$obj = $db->fetch_object($result);
 
 				if ($obj->pcg_type == 'INCOME') {
-					if (!isset($encaiss[$obj->dm])) $encaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					if (!isset($encaiss[$obj->dm])) {
+						$encaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					}
 					$encaiss[$obj->dm] += $obj->credit;
 					$encaiss[$obj->dm] -= $obj->debit;
 				}
 				if ($obj->pcg_type == 'EXPENSE') {
-					if (!isset($decaiss[$obj->dm])) $decaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					if (!isset($decaiss[$obj->dm])) {
+						$decaiss[$obj->dm] = 0;	// To avoid warning of var not defined
+					}
 					$decaiss[$obj->dm] += $obj->debit;
 					$decaiss[$obj->dm] -= $obj->credit;
 				}
 
 				// ???
-				if (!isset($encaiss_ttc[$obj->dm])) $encaiss_ttc[$obj->dm] = 0;
-				if (!isset($decaiss_ttc[$obj->dm])) $decaiss_ttc[$obj->dm] = 0;
+				if (!isset($encaiss_ttc[$obj->dm])) {
+					$encaiss_ttc[$obj->dm] = 0;
+				}
+				if (!isset($decaiss_ttc[$obj->dm])) {
+					$decaiss_ttc[$obj->dm] = 0;
+				}
 				$encaiss_ttc[$obj->dm] += 0;
 				$decaiss_ttc[$obj->dm] += 0;
 
@@ -911,19 +976,19 @@ print '<table class="tagtable liste">'."\n";
 
 print '<tr class="liste_titre"><td class="liste_titre">&nbsp;</td>';
 
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	print '<td align="center" colspan="2" class="liste_titre borderrightlight">';
 	print '<a href="clientfourn.php?year='.$annee.'">';
 	print $annee;
-	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
+	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) {
+		print '-'.($annee + 1);
+	}
 	print '</a></td>';
 }
 print '</tr>';
 print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
 // Loop on each year to ouput
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	print '<td class="liste_titre" align="center">';
 	$htmlhelp = '';
 	// if ($modecompta == 'RECETTES-DEPENSES') $htmlhelp=$langs->trans("PurchasesPlusVATEarnedAndDue");
@@ -940,52 +1005,56 @@ print '</tr>';
 
 // Loop on each month
 $nb_mois_decalage = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START - 1) : 0;
-for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
-{
+for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 	$mois_modulo = $mois;
-	if ($mois > 12) {$mois_modulo = $mois - 12; }
+	if ($mois > 12) {
+		$mois_modulo = $mois - 12;
+	}
 
 	print '<tr class="oddeven">';
 	print "<td>".dol_print_date(dol_mktime(12, 0, 0, $mois_modulo, 1, $annee), "%B")."</td>";
-	for ($annee = $year_start; $annee <= $year_end; $annee++)
-	{
+	for ($annee = $year_start; $annee <= $year_end; $annee++) {
 		$annee_decalage = $annee;
-		if ($mois > 12) {$annee_decalage = $annee + 1; }
+		if ($mois > 12) {
+			$annee_decalage = $annee + 1;
+		}
 		$case = strftime("%Y-%m", dol_mktime(12, 0, 0, $mois_modulo, 1, $annee_decalage));
 
 		print '<td class="right">&nbsp;';
-		if ($modecompta == 'BOOKKEEPING')
-		{
-			if (isset($decaiss[$case]) && $decaiss[$case] != 0)
-			{
+		if ($modecompta == 'BOOKKEEPING') {
+			if (isset($decaiss[$case]) && $decaiss[$case] != 0) {
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($decaiss[$case], 'MT')).'</a>';
-				if (!isset($totsorties[$annee])) $totsorties[$annee] = 0;
+				if (!isset($totsorties[$annee])) {
+					$totsorties[$annee] = 0;
+				}
 				$totsorties[$annee] += $decaiss[$case];
 			}
 		} else {
-			if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0)
-			{
+			if (isset($decaiss_ttc[$case]) && $decaiss_ttc[$case] != 0) {
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($decaiss_ttc[$case], 'MT')).'</a>';
-				if (!isset($totsorties[$annee])) $totsorties[$annee] = 0;
+				if (!isset($totsorties[$annee])) {
+					$totsorties[$annee] = 0;
+				}
 				$totsorties[$annee] += $decaiss_ttc[$case];
 			}
 		}
 		print "</td>";
 
 		print '<td class="borderrightlight nowrap right">&nbsp;';
-		if ($modecompta == 'BOOKKEEPING')
-		{
-			if (isset($encaiss[$case]))
-			{
+		if ($modecompta == 'BOOKKEEPING') {
+			if (isset($encaiss[$case])) {
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($encaiss[$case], 'MT')).'</a>';
-				if (!isset($totentrees[$annee])) $totentrees[$annee] = 0;
+				if (!isset($totentrees[$annee])) {
+					$totentrees[$annee] = 0;
+				}
 				$totentrees[$annee] += $encaiss[$case];
 			}
 		} else {
-			if (isset($encaiss_ttc[$case]))
-			{
+			if (isset($encaiss_ttc[$case])) {
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($encaiss_ttc[$case], 'MT')).'</a>';
-				if (!isset($totentrees[$annee])) $totentrees[$annee] = 0;
+				if (!isset($totentrees[$annee])) {
+					$totentrees[$annee] = 0;
+				}
 				$totentrees[$annee] += $encaiss_ttc[$case];
 			}
 		}
@@ -999,11 +1068,13 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 
 $nbcols = 0;
 print '<tr class="liste_total impair"><td>';
-if ($modecompta == 'BOOKKEEPING') print $langs->trans("Total");
-else print $langs->trans("TotalTTC");
+if ($modecompta == 'BOOKKEEPING') {
+	print $langs->trans("Total");
+} else {
+	print $langs->trans("TotalTTC");
+}
 print '</td>';
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	$nbcols += 2;
 	print '<td class="nowrap right">'.(isset($totsorties[$annee]) ?price(price2num($totsorties[$annee], 'MT')) : '&nbsp;').'</td>';
 	print '<td class="nowrap right" style="border-right: 1px solid #DDD">'.(isset($totentrees[$annee]) ?price(price2num($totentrees[$annee], 'MT')) : '&nbsp;').'</td>';
@@ -1018,11 +1089,9 @@ print "</tr>\n";
 // Balance
 
 print '<tr class="liste_total"><td>'.$langs->trans("AccountingResult").'</td>';
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	print '<td colspan="2" class="borderrightlight right"> ';
-	if (isset($totentrees[$annee]) || isset($totsorties[$annee]))
-	{
+	if (isset($totentrees[$annee]) || isset($totsorties[$annee])) {
 		$in = (isset($totentrees[$annee]) ?price2num($totentrees[$annee], 'MT') : 0);
 		$out = (isset($totsorties[$annee]) ?price2num($totsorties[$annee], 'MT') : 0);
 		print price(price2num($in - $out, 'MT')).'</td>';
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 2a69f590449..75d73eeca31 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -57,8 +57,7 @@ $nbofyear = 1;
 
 // Date range
 $year = GETPOST('year', 'int');
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$month_current = strftime("%m", dol_now());
 	$year_start = $year_current - ($nbofyear - 1);
@@ -71,36 +70,44 @@ $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_starty
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q") ?GETPOST("q") : 0;
-	if ($q == 0)
-	{
+	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
 		$month_start = GETPOST("month", 'int') ?GETPOST("month", 'int') : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$date_startmonth = $month_start;
-		if (!GETPOST('month'))
-		{
-			if (!GETPOST("year") && $month_start > $month_current)
-			{
+		if (!GETPOST('month')) {
+			if (!GETPOST("year") && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
-		} else $month_end = $month_start;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
+		} else {
+			$month_end = $month_start;
+		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	if ($q == 1) {
+		$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+	}
+	if ($q == 2) {
+		$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+	}
+	if ($q == 3) {
+		$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+	}
+	if ($q == 4) {
+		$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+	}
 }
 
-if (($date_start < dol_time_plus_duree($date_end, -1, 'y')) || ($date_start > $date_end))
-{
+if (($date_start < dol_time_plus_duree($date_end, -1, 'y')) || ($date_start > $date_end)) {
 	$date_end = dol_time_plus_duree($date_start - 1, 1, 'y');
 }
 
@@ -125,14 +132,20 @@ if ($cat_id == 0) {
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) $modecompta = 'BOOKKEEPING';
-if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta", 'alpha');
+if (!empty($conf->accounting->enabled)) {
+	$modecompta = 'BOOKKEEPING';
+}
+if (GETPOST("modecompta")) {
+	$modecompta = GETPOST("modecompta", 'alpha');
+}
 
 // Security check
-if ($user->socid > 0)
+if ($user->socid > 0) {
 	accessforbidden();
-if (!$user->rights->accounting->comptarapport->lire)
+}
+if (!$user->rights->accounting->comptarapport->lire) {
 	accessforbidden();
+}
 
 $AccCat = new AccountancyCategory($db);
 
@@ -167,31 +180,36 @@ $textnextyear = '&nbsp;<a href="'.$_SERVER["PHP_SELF"].'?year='.($start_year + 1
 
 
 // Affiche en-tete de rapport
-if ($modecompta == "CREANCES-DETTES")
-{
+if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("AnnualByAccountDueDebtMode");
 	$calcmode = $langs->trans("CalcModeDebt");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInInputOutputMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$start_year.(GETPOST("month") > 0 ? '&month='.GETPOST("month") : '').'&modecompta=RECETTES-DEPENSES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$start_year.'&modecompta=BOOKKEEPING">', '</a>').')';
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$start_year.'&modecompta=BOOKKEEPING">', '</a>').')';
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
 	$description = $langs->trans("RulesResultDue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else $description .= $langs->trans("DepositsAreIncluded");
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description .= $langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description .= $langs->trans("DepositsAreIncluded");
+	}
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
 } elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("AnnualByAccountInputOutputMode");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month") > 0 ? '&month='.GETPOST("month") : '').'&modecompta=CREANCES-DETTES">', '</a>').')';
-	if (!empty($conf->accounting->enabled)) $calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=BOOKKEEPING">', '</a>').')';
+	if (!empty($conf->accounting->enabled)) {
+		$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.'&modecompta=BOOKKEEPING">', '</a>').')';
+	}
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	//$periodlink='<a href="'.$_SERVER["PHP_SELF"].'?year='.($year-1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year+1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
 	$description = $langs->trans("RulesResultInOut");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	$name = $langs->trans("ReportInOut").', '.$langs->trans("ByPersonalizedAccountGroups");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
@@ -211,8 +229,7 @@ if ($modecompta == "CREANCES-DETTES")
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array('modecompta'=>$modecompta, 'action' => ''), $calcmode);
 
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -228,29 +245,24 @@ print '<th class="liste_titre"></th>';
 print '<th class="liste_titre right">'.$langs->trans("PreviousPeriod").'</th>';
 print '<th class="liste_titre right">'.$langs->trans("SelectedPeriod").'</th>';
 foreach ($months as $k => $v) {
-	if (($k + 1) >= $date_startmonth)
-	{
+	if (($k + 1) >= $date_startmonth) {
 		print '<th class="liste_titre right width50">'.$langs->trans('MonthShort'.sprintf("%02s", ($k + 1))).'</th>';
 	}
 }
 foreach ($months as $k => $v) {
-	if (($k + 1) < $date_startmonth)
-	{
+	if (($k + 1) < $date_startmonth) {
 		print '<th class="liste_titre right width50">'.$langs->trans('MonthShort'.sprintf("%02s", ($k + 1))).'</th>';
 	}
 }
 print	'</tr>';
 
-if ($modecompta == 'CREANCES-DETTES')
-{
+if ($modecompta == 'CREANCES-DETTES') {
 	//if (! empty($date_start) && ! empty($date_end))
 	//	$sql.= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	//if (! empty($date_start) && ! empty($date_end))
 	//	$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	// Get array of all report groups that are active
 	$cats = $AccCat->getCats(); // WARNING: Computed groups must be after group they include
 
@@ -386,8 +398,7 @@ if ($modecompta == 'CREANCES-DETTES')
 				$cpts = $AccCat->getCptsCat($cat['rowid']);
 
 				$arrayofaccountforfilter = array();
-				foreach ($cpts as $i => $cpt)    // Loop on each account.
-				{
+				foreach ($cpts as $i => $cpt) {    // Loop on each account.
 					$arrayofaccountforfilter[] = $cpt['account_number'];
 				}
 
@@ -399,8 +410,7 @@ if ($modecompta == 'CREANCES-DETTES')
 						setEventMessages(null, $AccCat->errors, 'errors');
 						$resultNP = 0;
 					} else {
-						foreach ($cpts as $i => $cpt)    // Loop on each account.
-						{
+						foreach ($cpts as $i => $cpt) {    // Loop on each account.
 							$resultNP = empty($AccCat->sdcperaccount[$cpt['account_number']]) ? 0 : $AccCat->sdcperaccount[$cpt['account_number']];
 
 							$totCat['NP'] += $resultNP;
@@ -412,8 +422,7 @@ if ($modecompta == 'CREANCES-DETTES')
 
 				// Set value into column N and month M ($totCat)
 				// This make 12 calls for each accountancy account (12 monthes M)
-				foreach ($cpts as $i => $cpt)    // Loop on each account.
-				{
+				foreach ($cpts as $i => $cpt) {    // Loop on each account.
 					// We make 1 loop for each account because we may want detail per account.
 					// @todo Optimize to ask a 'group by' account and a filter with account in (..., ...) in request
 
@@ -422,8 +431,9 @@ if ($modecompta == 'CREANCES-DETTES')
 					foreach ($months as $k => $v) {
 						$monthtoprocess = $k + 1; // ($k+1) is month 1, 2, ..., 12
 						$yeartoprocess = $start_year;
-						if (($k + 1) < $start_month)
+						if (($k + 1) < $start_month) {
 							$yeartoprocess++;
+						}
 
 						//var_dump($monthtoprocess.'_'.$yeartoprocess);
 						$return = $AccCat->getSumDebitCredit($cpt['account_number'], $date_start, $date_end, $cat['dc'] ? $cat['dc'] : 0, 'nofilter', $monthtoprocess, $yeartoprocess);
@@ -458,22 +468,24 @@ if ($modecompta == 'CREANCES-DETTES')
 				// Label of group
 				print '<td>';
 				print $cat['label'];
-				if (count($cpts) > 0)    // Show example of 5 first accounting accounts
-				{
+				if (count($cpts) > 0) {    // Show example of 5 first accounting accounts
 					$i = 0;
 					foreach ($cpts as $cpt) {
 						if ($i > 5) {
 							print '...)';
 							break;
 						}
-						if ($i > 0)
+						if ($i > 0) {
 							print ', ';
-						else print ' (';
+						} else {
+							print ' (';
+						}
 						print $cpt['account_number'];
 						$i++;
 					}
-					if ($i <= 5)
+					if ($i <= 5) {
 						print ')';
+					}
 				} else {
 					print ' - <span class="warning">'.$langs->trans("GroupIsEmptyCheckSetup").'</span>';
 				}
@@ -484,12 +496,14 @@ if ($modecompta == 'CREANCES-DETTES')
 
 				// Each month
 				foreach ($totCat['M'] as $k => $v) {
-					if (($k + 1) >= $date_startmonth)
+					if (($k + 1) >= $date_startmonth) {
 						print '<td class="right">'.price($v).'</td>';
+					}
 				}
 				foreach ($totCat['M'] as $k => $v) {
-					if (($k + 1) < $date_startmonth)
+					if (($k + 1) < $date_startmonth) {
 						print '<td class="right">'.price($v).'</td>';
+					}
 				}
 
 				print "</tr>\n";
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index a6ced6f2757..3c2b26a83d8 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -34,8 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -59,7 +58,9 @@ $fk_user = GETPOST('userid', 'int');
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', $id, 'chargesociales', 'charges');
 
 $object = new ChargeSociales($db);
@@ -71,19 +72,16 @@ $object = new ChargeSociales($db);
 /* *************************************************************************** */
 
 // Classify paid
-if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes')
-{
+if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes') {
 	$object->fetch($id);
 	$result = $object->setPaid($user);
 }
 
 if ($action == 'reopen' && $user->rights->tax->charges->creer) {
 	$result = $object->fetch($id);
-	if ($object->paye)
-	{
+	if ($object->paye) {
 		$result = $object->setUnpaid($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 			exit();
 		} else {
@@ -93,8 +91,7 @@ if ($action == 'reopen' && $user->rights->tax->charges->creer) {
 }
 
 // Link to a project
-if ($action == 'classin' && $user->rights->tax->charges->creer)
-{
+if ($action == 'classin' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$object->setProject(GETPOST('projectid'));
 }
@@ -105,20 +102,21 @@ if ($action == 'setfk_user' && $user->rights->tax->charges->creer) {
 	$object->update($user);
 }
 
-if ($action == 'setlib' && $user->rights->tax->charges->creer)
-{
+if ($action == 'setlib' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
-	if ($result < 0)
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 // payment mode
 if ($action == 'setmode' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	if ($result < 0)
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 // bank account
@@ -131,8 +129,7 @@ if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
 }
 
 // Delete social contribution
-if ($action == 'confirm_delete' && $confirm == 'yes')
-{
+if ($action == 'confirm_delete' && $confirm == 'yes') {
 	$object->fetch($id);
 	$result = $object->delete($user);
 	if ($result > 0) {
@@ -145,24 +142,19 @@ if ($action == 'confirm_delete' && $confirm == 'yes')
 
 
 // Add social contribution
-if ($action == 'add' && $user->rights->tax->charges->creer)
-{
+if ($action == 'add' && $user->rights->tax->charges->creer) {
 	$amount = price2num(GETPOST('amount'), 'MT');
 
-	if (!$dateech)
-	{
+	if (!$dateech) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'create';
-	} elseif (!$dateperiod)
-	{
+	} elseif (!$dateperiod) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'create';
-	} elseif (!$actioncode > 0)
-	{
+	} elseif (!$actioncode > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		$action = 'create';
-	} elseif (empty($amount))
-	{
+	} elseif (empty($amount)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	} elseif (!is_numeric($amount)) {
@@ -188,24 +180,19 @@ if ($action == 'add' && $user->rights->tax->charges->creer)
 }
 
 
-if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->creer)
-{
+if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->creer) {
 	$amount = price2num(GETPOST('amount'), 'MT');
 
-	if (!$dateech)
-	{
+	if (!$dateech) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$action = 'edit';
-	} elseif (!$dateperiod)
-	{
+	} elseif (!$dateperiod) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'edit';
-	} elseif (empty($amount))
-	{
+	} elseif (empty($amount)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'edit';
-	} elseif (!is_numeric($amount))
-	{
+	} elseif (!is_numeric($amount)) {
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
 	} else {
@@ -224,18 +211,18 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->cre
 }
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
+if ($action == 'confirm_clone' && $confirm != 'yes') {
+	$action = '';
+}
 
-if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer))
-{
+if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer)) {
 	$db->begin();
 
 	$originalId = $id;
 
 	$object->fetch($id);
 
-	if ($object->id > 0)
-	{
+	if ($object->id > 0) {
 		$object->paye = 0;
 		$object->id = $object->ref = null;
 
@@ -251,15 +238,17 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 		} else {
 			$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
 			$newdateech = dol_mktime(0, 0, 0, GETPOST('clone_date_echmonth', 'int'), GETPOST('clone_date_echday', 'int'), GETPOST('clone_date_echyear', 'int'));
-			if ($newdateperiod) $object->periode = $newdateperiod;
-			if ($newdateech) $object->date_ech = $newdateech;
+			if ($newdateperiod) {
+				$object->periode = $newdateperiod;
+			}
+			if ($newdateech) {
+				$object->date_ech = $newdateech;
+			}
 		}
 
-		if ($object->check())
-		{
+		if ($object->check()) {
 			$id = $object->create($user);
-			if ($id > 0)
-			{
+			if ($id > 0) {
 				$db->commit();
 				$db->close();
 
@@ -289,7 +278,9 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->char
 $form = new Form($db);
 $formsocialcontrib = new FormSocialContrib($db);
 $bankaccountstatic = new Account($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $title = $langs->trans("SocialContribution").' - '.$langs->trans("Card");
 $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
@@ -297,8 +288,7 @@ llxHeader("", $title, $help_url);
 
 
 // Mode creation
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewSocialContribution"));
 
 	print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
@@ -362,8 +352,7 @@ if ($action == 'create')
 	print '<td>'.img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($fk_user, 'userid', 1).'</td></tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$formproject = new FormProjets($db);
 
 		// Associated project
@@ -382,8 +371,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Bank Account
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
 		print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes($fk_account, 'fk_account', 0, '', 2, '', 0, '', 1);
 		print '</td></tr>';
@@ -407,25 +395,21 @@ if ($action == 'create')
 /* Card Mode                                                                   */
 /*                                                                             */
 /* *************************************************************************** */
-if ($id > 0)
-{
+if ($id > 0) {
 	$object = new ChargeSociales($db);
 	$result = $object->fetch($id);
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$head = tax_prepare_head($object);
 
 		$totalpaye = $object->getSommePaiement();
 
 		// Clone confirmation
-		if ($action === 'clone')
-		{
+		if ($action === 'clone') {
 			$formquestion = array(
 				array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
 			);
-			if (!empty($conf->global->TAX_ADD_CLON_FOR_NEXT_MONTH_CHECKBOX))
-			{
+			if (!empty($conf->global->TAX_ADD_CLON_FOR_NEXT_MONTH_CHECKBOX)) {
 				$formquestion[] = array('type' => 'checkbox', 'name' => 'clone_for_next_month', 'label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1);
 			} else {
 				$formquestion[] = array('type' => 'date', 'name' => 'clone_date_ech', 'label' => $langs->trans("Date"), 'value' => -1);
@@ -436,21 +420,18 @@ if ($id > 0)
 		}
 
 
-		if ($action == 'paid')
-		{
+		if ($action == 'paid') {
 			$text = $langs->trans('ConfirmPaySocialContribution');
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PaySocialContribution'), $text, "confirm_paid", '', '', 2);
 		}
 
 		// Confirmation of the removal of the Social Contribution
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			$text = $langs->trans('ConfirmDeleteSocialContribution');
 			print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteSocialContribution'), $text, 'confirm_delete', '', '', 2);
 		}
 
-		if ($action == 'edit')
-		{
+		if ($action == 'edit') {
 			print "<form name=\"charge\" action=\"".$_SERVER["PHP_SELF"]."?id=$object->id&amp;action=update\" method=\"post\">";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 		}
@@ -482,12 +463,10 @@ if ($id > 0)
 		}
 
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->tax->charges->creer)
-			{
+			if ($user->rights->tax->charges->creer) {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
@@ -536,8 +515,7 @@ if ($id > 0)
 		print "</tr>";
 
 		// Date
-		if ($action == 'edit')
-		{
+		if ($action == 'edit') {
 			print '<tr><td>'.$langs->trans("Date")."</td><td>";
 			print $form->selectDate($object->date_ech, 'ech', 0, 0, 0, 'charge', 1);
 			print "</td></tr>";
@@ -548,8 +526,7 @@ if ($id > 0)
 		// Period end date
 		print "<tr><td>".$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo"))."</td>";
 		print "<td>";
-		if ($action == 'edit')
-		{
+		if ($action == 'edit') {
 			print $form->selectDate($object->periode, 'period', 0, 0, 0, 'charge', 1);
 		} else {
 			print dol_print_date($object->periode, "day");
@@ -557,8 +534,7 @@ if ($id > 0)
 		print "</td></tr>";
 
 		// Amount
-		if ($action == 'edit')
-		{
+		if ($action == 'edit') {
 			print '<tr><td>'.$langs->trans("AmountTTC")."</td><td>";
 			print '<input type="text" name="amount" size="12" class="flat" value="'.$object->amount.'">';
 			print "</td></tr>";
@@ -571,8 +547,9 @@ if ($id > 0)
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('PaymentMode');
 		print '</td>';
-		if ($action != 'editmode')
+		if ($action != 'editmode') {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmode') {
@@ -583,14 +560,14 @@ if ($id > 0)
 		print '</td></tr>';
 
 		// Bank Account
-		if (!empty($conf->banque->enabled))
-		{
+		if (!empty($conf->banque->enabled)) {
 			print '<tr><td class="nowrap">';
 			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 			print $langs->trans('BankAccount');
 			print '<td>';
-			if ($action != 'editbankaccount' && $user->rights->tax->charges->creer)
+			if ($action != 'editbankaccount' && $user->rights->tax->charges->creer) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td>';
 			if ($action == 'editbankaccount') {
@@ -631,8 +608,7 @@ if ($id > 0)
 
 		//print $sql;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$totalpaye = 0;
 
 			$num = $db->num_rows($resql);
@@ -652,10 +628,8 @@ if ($id > 0)
 
 			$paymentsocialcontributiontmp = new PaymentSocialContribution($db);
 
-			if ($num > 0)
-			{
-				while ($i < $num)
-				{
+			if ($num > 0) {
+				while ($i < $num) {
 					$objp = $db->fetch_object($resql);
 
 					$paymentsocialcontributiontmp->id = $objp->rowid;
@@ -669,8 +643,7 @@ if ($id > 0)
 					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 					$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 					print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-					if (!empty($conf->banque->enabled))
-					{
+					if (!empty($conf->banque->enabled)) {
 						$bankaccountstatic->id = $objp->baid;
 						$bankaccountstatic->ref = $objp->baref;
 						$bankaccountstatic->label = $objp->baref;
@@ -686,8 +659,9 @@ if ($id > 0)
 						}
 
 						print '<td class="right">';
-						if ($bankaccountstatic->id)
+						if ($bankaccountstatic->id) {
 							print $bankaccountstatic->getNomUrl(1, 'transactions');
+						}
 						print '</td>';
 					}
 					print '<td class="right">'.price($objp->amount)."</td>\n";
@@ -726,8 +700,7 @@ if ($id > 0)
 
 		print dol_get_fiche_end();
 
-		if ($action == 'edit')
-		{
+		if ($action == 'edit') {
 			print '<div align="center">';
 			print '<input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
 			print ' &nbsp; ';
@@ -735,50 +708,45 @@ if ($id > 0)
 			print '</div>';
 		}
 
-		if ($action == 'edit') print "</form>\n";
+		if ($action == 'edit') {
+			print "</form>\n";
+		}
 
 
 
 		/*
 		*   Actions buttons
 		*/
-		if ($action != 'edit')
-		{
+		if ($action != 'edit') {
 			print "<div class=\"tabsAction\">\n";
 
 			// Reopen
-			if ($object->paye && $user->rights->tax->charges->creer)
-			{
+			if ($object->paye && $user->rights->tax->charges->creer) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/sociales/card.php", 1).'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a></div>';
 			}
 
 			// Edit
-			if ($object->paye == 0 && $user->rights->tax->charges->creer)
-			{
+			if ($object->paye == 0 && $user->rights->tax->charges->creer) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>';
 			}
 
 			// Emit payment
-			if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->tax->charges->creer)
-			{
+			if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->tax->charges->creer) {
 				print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/paiement_charge.php?id=$object->id&amp;action=create\">".$langs->trans("DoPayment")."</a></div>";
 			}
 
 			// Classify 'paid'
-			if ($object->paye == 0 && round($resteapayer) <= 0 && $user->rights->tax->charges->creer)
-			{
+			if ($object->paye == 0 && round($resteapayer) <= 0 && $user->rights->tax->charges->creer) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=paid&amp;token='.newToken().'">'.$langs->trans("ClassifyPaid").'</a></div>';
 			}
 
 			// Clone
-			if ($user->rights->tax->charges->creer)
-			{
+			if ($user->rights->tax->charges->creer) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/sociales/card.php", 1).'?id='.$object->id.'&amp;action=clone">'.$langs->trans("ToClone")."</a></div>";
 			}
 
 			// Delete
-			if ($user->rights->tax->charges->supprimer)
-			{
+			if ($user->rights->tax->charges->supprimer) {
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 			}
 
diff --git a/htdocs/compta/sociales/class/cchargesociales.class.php b/htdocs/compta/sociales/class/cchargesociales.class.php
index c5ec3b24968..4ae06f378b8 100644
--- a/htdocs/compta/sociales/class/cchargesociales.class.php
+++ b/htdocs/compta/sociales/class/cchargesociales.class.php
@@ -430,10 +430,11 @@ class Cchargesociales
 		$link .= '>';
 		$linkend = '</a>';
 
-		if ($withpicto)
-		{
+		if ($withpicto) {
 			$result .= ($link.img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
-			if ($withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) {
+				$result .= ' ';
+			}
 		}
 		$result .= $link.$this->ref.$linkend;
 		return $result;
@@ -463,30 +464,42 @@ class Cchargesociales
 		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		} elseif ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			elseif ($status == 0) return $langs->trans('Disabled');
-		} elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		} elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
-		} elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
-			elseif ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
-		} elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
-			elseif ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
+		if ($mode == 0) {
+			if ($status == 1) {
+				return $langs->trans('Enabled');
+			} elseif ($status == 0) {
+				return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 1) {
+			if ($status == 1) {
+				return $langs->trans('Enabled');
+			} elseif ($status == 0) {
+				return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 2) {
+			if ($status == 1) {
+				return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			} elseif ($status == 0) {
+				return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 3) {
+			if ($status == 1) {
+				return img_picto($langs->trans('Enabled'), 'statut4');
+			} elseif ($status == 0) {
+				return img_picto($langs->trans('Disabled'), 'statut5');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 1) {
+				return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			} elseif ($status == 0) {
+				return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 5) {
+			if ($status == 1) {
+				return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			} elseif ($status == 0) {
+				return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
+			}
 		}
 	}
 
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index ec4e945f922..f718a9a48b7 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -139,22 +139,23 @@ class ChargeSociales extends CommonObject
 	{
 		$sql = "SELECT cs.rowid, cs.date_ech";
 		$sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
-        $sql .= ", cs.fk_account, cs.fk_mode_reglement, cs.fk_user";
+		$sql .= ", cs.fk_account, cs.fk_mode_reglement, cs.fk_user";
 		$sql .= ", c.libelle as type_label";
 		$sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
 		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id';
 		$sql .= ' WHERE cs.entity IN ('.getEntity('tax').')';
-		if ($ref) $sql .= " AND cs.rowid = ".$ref;
-		else $sql .= " AND cs.rowid = ".$id;
+		if ($ref) {
+			$sql .= " AND cs.rowid = ".$ref;
+		} else {
+			$sql .= " AND cs.rowid = ".$id;
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -197,8 +198,7 @@ class ChargeSociales extends CommonObject
 		$newamount = price2num($this->amount, 'MT');
 
 		// Validation parametres
-		if (!$newamount > 0 || empty($this->date_ech) || empty($this->periode))
-		{
+		if (!$newamount > 0 || empty($this->date_ech) || empty($this->periode)) {
 			return false;
 		}
 
@@ -229,7 +229,7 @@ class ChargeSociales extends CommonObject
 
 		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, fk_user, date_creation)";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, fk_user, date_creation)";
 		$sql .= " VALUES (".$this->type;
 		$sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
 		$sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "NULL");
@@ -251,7 +251,9 @@ class ChargeSociales extends CommonObject
 
 			//dol_syslog("ChargesSociales::create this->id=".$this->id);
 			$result = $this->call_trigger('SOCIALCONTRIBUTION_CREATE', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 
 			if (empty($error)) {
 				$this->db->commit();
@@ -286,47 +288,39 @@ class ChargeSociales extends CommonObject
 		$lines_url = $account->get_url('', $this->id, 'sc');
 
 		// Delete bank urls
-		foreach ($lines_url as $line_url)
-		{
-			if (!$error)
-			{
+		foreach ($lines_url as $line_url) {
+			if (!$error) {
 				$accountline = new AccountLine($this->db);
 				$accountline->fetch($line_url['fk_bank']);
 				$result = $accountline->delete_urls($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 		}
 
 		// Delete payments
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge WHERE fk_charge=".$this->id;
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales WHERE rowid=".$this->id;
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -365,22 +359,20 @@ class ChargeSociales extends CommonObject
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
 		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('SOCIALCHARGES_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -412,10 +404,8 @@ class ChargeSociales extends CommonObject
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->db->free($result);
 				return $obj->amount;
@@ -456,8 +446,11 @@ class ChargeSociales extends CommonObject
 		$sql .= " paye = 1";
 		$sql .= " WHERE rowid = ".$this->id;
 		$return = $this->db->query($sql);
-		if ($return) return 1;
-		else return -1;
+		if ($return) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -488,8 +481,11 @@ class ChargeSociales extends CommonObject
 		$sql .= " paye = 0";
 		$sql .= " WHERE rowid = ".$this->id;
 		$return = $this->db->query($sql);
-		if ($return) return 1;
-		else return -1;
+		if ($return) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 	/**
@@ -525,21 +521,28 @@ class ChargeSociales extends CommonObject
 		$this->labelStatus = array();
 		$this->labelStatusShort = array();
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->trans('Paid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) {
+				$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			}
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('Unpaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('Paid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid > 0) {
+				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			}
 		}
 
 		$statusType = 'status1';
-		if ($status == 0 && $alreadypaid > 0) $statusType = 'status3';
-		if ($status == 1) $statusType = 'status6';
+		if ($status == 0 && $alreadypaid > 0) {
+			$statusType = 'status3';
+		}
+		if ($status == 1) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -559,40 +562,50 @@ class ChargeSociales extends CommonObject
 	{
 		global $langs, $conf, $user, $form;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
 		$url = DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id;
 
-		if ($short) return $url;
-
-		if ($option !== 'nolink')
-		{
-			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		if ($short) {
+			return $url;
 		}
 
-		if (empty($this->ref)) $this->ref = $this->label;
+		if ($option !== 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		if (empty($this->ref)) {
+			$this->ref = $this->label;
+		}
 
 		$label = img_picto('', 'tax').'<u class="paddingrightonly">'.$langs->trans("SocialContribution").'</u>';
 		if (isset($this->paye)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}
-		if (!empty($this->ref))
+		if (!empty($this->ref)) {
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->label))
+		}
+		if (!empty($this->label)) {
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-		if (!empty($this->type_label))
+		}
+		if (!empty($this->type_label)) {
 			$label .= '<br><b>'.$langs->trans('Type').':</b> '.$this->type_label;
+		}
 
 		$linkclose = '';
-		if (empty($notooltip) && $user->rights->facture->lire)
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip) && $user->rights->facture->lire) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("SocialContribution");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -605,8 +618,12 @@ class ChargeSociales extends CommonObject
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -632,7 +649,9 @@ class ChargeSociales extends CommonObject
 			$amount = 0;
 
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+			if ($obj) {
+				$amount = $obj->amount ? $obj->amount : 0;
+			}
 
 			$this->db->free($resql);
 			return $amount;
@@ -656,10 +675,8 @@ class ChargeSociales extends CommonObject
 
 		dol_syslog(get_class($this)."::info", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $obj->rowid;
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index c4999c0765f..4fda644e1c0 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -129,25 +129,39 @@ class PaymentSocialContribution extends CommonObject
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 
 		// Validate parametres
-		if (!$this->datepaye)
-		{
+		if (!$this->datepaye) {
 			$this->error = 'ErrorBadValueForParameterCreatePaymentSocialContrib';
 			return -1;
 		}
 
 		// Clean parameters
-		if (isset($this->fk_charge)) $this->fk_charge = (int) $this->fk_charge;
-		if (isset($this->amount)) $this->amount = trim($this->amount);
-		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
-		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_charge)) {
+			$this->fk_charge = (int) $this->fk_charge;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepaiement)) {
+			$this->fk_typepaiement = (int) $this->fk_typepaiement;
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note_private)) {
+			$this->note_private = trim($this->note_private);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 		$totalamount = 0;
-		foreach ($this->amounts as $key => $value)  // How payment is dispatch
-		{
+		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
 			$newvalue = price2num($value, 'MT');
 			$this->amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
@@ -155,13 +169,14 @@ class PaymentSocialContribution extends CommonObject
 		$totalamount = price2num($totalamount);
 
 		// Check parameters
-		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		if ($totalamount == 0) {
+			return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		}
 
 
 		$this->db->begin();
 
-		if ($totalamount != 0)
-		{
+		if ($totalamount != 0) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiementcharge (fk_charge, datec, datep, amount,";
 			$sql .= " fk_typepaiement, num_paiement, note, fk_user_creat, fk_bank)";
 			$sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
@@ -171,21 +186,17 @@ class PaymentSocialContribution extends CommonObject
 			$sql .= " 0)";
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."paiementcharge");
 
 				// Insere tableau des montants / factures
-				foreach ($this->amounts as $key => $amount)
-				{
+				foreach ($this->amounts as $key => $amount) {
 					$contribid = $key;
-					if (is_numeric($amount) && $amount <> 0)
-					{
+					if (is_numeric($amount) && $amount <> 0) {
 						$amount = price2num($amount);
 
 						// If we want to closed paid invoices
-						if ($closepaidcontrib)
-						{
+						if ($closepaidcontrib) {
 							$contrib = new ChargeSociales($this->db);
 							$contrib->fetch($contribid);
 							$paiement = $contrib->getSommePaiement();
@@ -195,10 +206,11 @@ class PaymentSocialContribution extends CommonObject
 							$deposits = 0;
 							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
 							$remaintopay = price2num($contrib->amount - $paiement - $creditnotes - $deposits, 'MT');
-							if ($remaintopay == 0)
-							{
+							if ($remaintopay == 0) {
 								$result = $contrib->setPaid($user);
-							} else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
+							} else {
+								dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
+							}
 						}
 					}
 				}
@@ -208,10 +220,11 @@ class PaymentSocialContribution extends CommonObject
 		}
 
 		$result = $this->call_trigger('PAYMENTSOCIALCONTRIBUTION_CREATE', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if ($totalamount != 0 && !$error)
-		{
+		if ($totalamount != 0 && !$error) {
 			$this->amount = $totalamount;
 			$this->total = $totalamount; // deprecated
 			$this->db->commit();
@@ -254,10 +267,8 @@ class PaymentSocialContribution extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id    = $obj->rowid;
@@ -305,14 +316,30 @@ class PaymentSocialContribution extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->fk_charge)) $this->fk_charge = (int) $this->fk_charge;
-		if (isset($this->amount)) $this->amount = trim($this->amount);
-		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
-		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_charge)) {
+			$this->fk_charge = (int) $this->fk_charge;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepaiement)) {
+			$this->fk_typepaiement = (int) $this->fk_typepaiement;
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note_private)) {
+			$this->note_private = trim($this->note_private);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 
 
@@ -341,13 +368,13 @@ class PaymentSocialContribution extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -376,8 +403,7 @@ class PaymentSocialContribution extends CommonObject
 
 		$this->db->begin();
 
-		if ($this->bank_line > 0)
-		{
+		if ($this->bank_line > 0) {
 			$accline = new AccountLine($this->db);
 			$accline->fetch($this->bank_line);
 			$result = $accline->delete();
@@ -387,21 +413,20 @@ class PaymentSocialContribution extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge";
 			$sql .= " WHERE rowid=".$this->id;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -443,8 +468,7 @@ class PaymentSocialContribution extends CommonObject
 		$result = $object->create($user);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $object->error;
 			$error++;
 		}
@@ -452,8 +476,7 @@ class PaymentSocialContribution extends CommonObject
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
@@ -510,15 +533,16 @@ class PaymentSocialContribution extends CommonObject
 
 		$error = 0;
 
-		if (!empty($conf->banque->enabled))
-		{
+		if (!empty($conf->banque->enabled)) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);
 			$acc->fetch($accountid);
 
 			$total = $this->total;
-			if ($mode == 'payment_sc') $total = -$total;
+			if ($mode == 'payment_sc') {
+				$total = -$total;
+			}
 
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
@@ -535,23 +559,21 @@ class PaymentSocialContribution extends CommonObject
 
 			// Mise a jour fk_bank dans llx_paiement.
 			// On connait ainsi le paiement qui a genere l'ecriture bancaire
-			if ($bank_line_id > 0)
-			{
+			if ($bank_line_id > 0) {
 				$result = $this->update_fk_bank($bank_line_id);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$error++;
 					dol_print_error($this->db);
 				}
 
 				// Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
 				$url = '';
-				if ($mode == 'payment_sc') $url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
-				if ($url)
-				{
+				if ($mode == 'payment_sc') {
+					$url = DOL_URL_ROOT.'/compta/payment_sc/card.php?id=';
+				}
+				if ($url) {
 					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$error++;
 						dol_print_error($this->db);
 					}
@@ -559,16 +581,16 @@ class PaymentSocialContribution extends CommonObject
 
 				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
 				$linkaddedforthirdparty = array();
-				foreach ($this->amounts as $key => $value)
-				{
-					if ($mode == 'payment_sc')
-					{
+				foreach ($this->amounts as $key => $value) {
+					if ($mode == 'payment_sc') {
 						$socialcontrib = new ChargeSociales($this->db);
 						$socialcontrib->fetch($key);
 						$result = $acc->add_url_line($bank_line_id, $socialcontrib->id, DOL_URL_ROOT.'/compta/charges.php?id=', $socialcontrib->type_label.(($socialcontrib->lib && $socialcontrib->lib != $socialcontrib->type_label) ? ' ('.$socialcontrib->lib.')' : ''), 'sc');
-						if ($result <= 0) dol_print_error($this->db);
+						if ($result <= 0) {
+							dol_print_error($this->db);
+						}
 
-                        if ($socialcontrib->fk_user) {
+						if ($socialcontrib->fk_user) {
 							$fuser = new User($this->db);
 							$fuser->fetch($socialcontrib->fk_user);
 
@@ -594,8 +616,7 @@ class PaymentSocialContribution extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			return 1;
 		} else {
 			return -1;
@@ -617,8 +638,7 @@ class PaymentSocialContribution extends CommonObject
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			$this->error = $this->db->error();
@@ -703,30 +723,41 @@ class PaymentSocialContribution extends CommonObject
 
 		$result = '';
 
-		if (empty($this->ref)) $this->ref = $this->label;
+		if (empty($this->ref)) {
+			$this->ref = $this->label;
+		}
 
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SocialContributionPayment").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->label)) {
 			$labeltoshow = $this->label;
 			$reg = array();
-			if (preg_match('/^\((.*)\)$/i', $this->label, $reg))
-			{
+			if (preg_match('/^\((.*)\)$/i', $this->label, $reg)) {
 				// Label generique car entre parentheses. On l'affiche en le traduisant
-				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+				if ($reg[1] == 'paiement') {
+					$reg[1] = 'Payment';
+				}
 				$labeltoshow = $langs->trans($reg[1]);
 			}
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
 		}
-		if ($this->datep) $label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'day');
+		if ($this->datep) {
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'day');
+		}
 
 		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend = '</a>';
 
-			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result .= ' ';
-			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+			if ($withpicto) {
+				$result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			}
+			if ($withpicto && $withpicto != 2) {
+				$result .= ' ';
+			}
+			if ($withpicto != 2) {
+				$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+			}
 		}
 
 		return $result;
@@ -746,11 +777,9 @@ class PaymentSocialContribution extends CommonObject
 
 		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->bank_line;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$alreadydispatched = $obj->nb;
 			}
 		} else {
@@ -758,8 +787,7 @@ class PaymentSocialContribution extends CommonObject
 			return -1;
 		}
 
-		if ($alreadydispatched)
-		{
+		if ($alreadydispatched) {
 			return 1;
 		}
 		return 0;
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index d65f2cf7a3c..542804b866c 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -33,8 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -47,7 +46,9 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', $id, 'chargesociales', 'charges');
 
 
@@ -62,12 +63,18 @@ if (empty($page) || $page == -1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 $object = new ChargeSociales($db);
-if ($id > 0) $object->fetch($id);
+if ($id > 0) {
+	$object->fetch($id);
+}
 
 $upload_dir = $conf->tax->dir_output.'/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'tax';
@@ -79,12 +86,12 @@ $modulepart = 'tax';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
-if ($action == 'setlib' && $user->rights->tax->charges->creer)
-{
+if ($action == 'setlib' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
-	if ($result < 0)
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 
@@ -93,14 +100,15 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
  */
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $title = $langs->trans("SocialContribution").' - '.$langs->trans("Documents");
 $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
 llxHeader("", $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	$alreadypayed = $object->getSommePaiement();
 
 	$head = tax_prepare_head($object);
@@ -112,8 +120,7 @@ if ($object->id)
 	$morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if (!empty($object->fk_project)) {
@@ -140,8 +147,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 71e49486888..1ab9b9b0ada 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -25,8 +25,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -39,7 +38,9 @@ $action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', $id, 'chargesociales', 'charges');
 
 $object = new ChargeSociales($db);
@@ -49,12 +50,12 @@ $object = new ChargeSociales($db);
  * Actions
  */
 
-if ($action == 'setlib' && $user->rights->tax->charges->creer)
-{
+if ($action == 'setlib' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
-	if ($result < 0)
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 
@@ -64,7 +65,9 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
 
 $form = new Form($db);
 
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $title = $langs->trans("SocialContribution").' - '.$langs->trans("Info");
 $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
@@ -82,8 +85,7 @@ $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 $morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 	if (!empty($object->fk_project)) {
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 9a691a1785f..5b3ca650077 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -31,14 +31,18 @@ require '../../main.inc.php';
 
 // Security check
 $socid = isset($_GET["socid"]) ? $_GET["socid"] : '';
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'banks', 'bills', 'hrm'));
@@ -65,25 +69,31 @@ $sortfield			= GETPOST("sortfield", 'alpha');
 $sortorder			= GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
-if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0; // If $page is not defined, or '' or -1
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!$sortfield) $sortfield = "cs.date_ech";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) {
+	$sortfield = "cs.date_ech";
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
 
 $year = GETPOST("year", 'int');
 $filtre = GETPOST("filtre", 'int');
 
-if (!GETPOSTISSET('search_typeid'))
-{
+if (!GETPOSTISSET('search_typeid')) {
 	$newfiltre = str_replace('filtre=', '', $filtre);
 	$filterarray = explode('-', $newfiltre);
-	foreach ($filterarray as $val)
-	{
+	foreach ($filterarray as $val) {
 		$part = explode(':', $val);
-		if ($part[0] == 'cs.fk_type') $search_typeid = $part[1];
+		if ($part[0] == 'cs.fk_type') {
+			$search_typeid = $part[1];
+		}
 	}
 } else {
 	$search_typeid = GETPOST('search_typeid', 'int');
@@ -112,7 +122,9 @@ $object = new ChargeSociales($db);
 
 $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)) {
@@ -144,33 +156,52 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formsocialcontrib = new FormSocialContrib($db);
 $chargesociale_static = new ChargeSociales($db);
-if (!empty($conf->projet->enabled)) $projectstatic = new Project($db);
+if (!empty($conf->projet->enabled)) {
+	$projectstatic = new Project($db);
+}
 
 llxHeader('', $langs->trans("SocialContributions"));
 
 $sql = "SELECT cs.rowid, cs.fk_type as type, cs.fk_user,";
 $sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode,";
-if (!empty($conf->projet->enabled)) $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
+if (!empty($conf->projet->enabled)) {
+	$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
+}
 $sql .= " c.libelle as type_label,";
 $sql .= " SUM(pc.amount) as alreadypayed";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
 $sql .= " ".MAIN_DB_PREFIX."chargesociales as cs";
-if (!empty($conf->projet->enabled)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cs.fk_projet";
+if (!empty($conf->projet->enabled)) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cs.fk_projet";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON (cs.fk_user = u.rowid)";
 $sql .= " WHERE cs.fk_type = c.id";
 $sql .= " AND cs.entity = ".$conf->entity;
 // Search criteria
-if ($search_ref)	$sql .= " AND cs.rowid=".$db->escape($search_ref);
-if ($search_label) 	$sql .= natural_search("cs.libelle", $search_label);
-if (!empty($conf->projet->enabled)) if ($search_project_ref != '') $sql .= natural_search("p.ref", $search_project_ref);
-if (!empty($search_users)) $sql .= ' AND cs.fk_user IN('.implode(', ', $search_users).')';
-if ($search_amount) $sql .= natural_search("cs.amount", $search_amount, 1);
-if ($search_status != '' && $search_status >= 0) $sql .= " AND cs.paye = ".$db->escape($search_status);
+if ($search_ref) {
+	$sql .= " AND cs.rowid=".$db->escape($search_ref);
+}
+if ($search_label) {
+	$sql .= natural_search("cs.libelle", $search_label);
+}
+if (!empty($conf->projet->enabled)) {
+	if ($search_project_ref != '') {
+		$sql .= natural_search("p.ref", $search_project_ref);
+	}
+}
+if (!empty($search_users)) {
+	$sql .= ' AND cs.fk_user IN('.implode(', ', $search_users).')';
+}
+if ($search_amount) {
+	$sql .= natural_search("cs.amount", $search_amount, 1);
+}
+if ($search_status != '' && $search_status >= 0) {
+	$sql .= " AND cs.paye = ".$db->escape($search_status);
+}
 $sql .= dolSqlDateFilter("cs.periode", $search_day_lim, $search_month_lim, $search_year_lim);
 //$sql.= dolSqlDateFilter("cs.periode", 0, 0, $year);
-if ($year > 0)
-{
+if ($year > 0) {
 	$sql .= " AND (";
 	// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
 	// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
@@ -186,20 +217,20 @@ if ($search_typeid) {
 	$sql .= " AND cs.fk_type=".$db->escape($search_typeid);
 }
 $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.fk_user, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
-if (!empty($conf->projet->enabled)) $sql .= ", p.rowid, p.ref, p.title";
+if (!empty($conf->projet->enabled)) {
+	$sql .= ", p.rowid, p.ref, p.title";
+}
 $sql .= $db->order($sortfield, $sortorder);
 
 $totalnboflines = 0;
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$totalnboflines = $db->num_rows($result);
 }
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	llxFooter();
 	$db->close();
@@ -210,27 +241,48 @@ $num = $db->num_rows($resql);
 $i = 0;
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_ref)    $param .= '&search_ref='.urlencode($search_ref);
-if ($search_label)  $param .= '&search_label='.urlencode($search_label);
-if ($search_project_ref >= 0) $param .= "&search_project_ref=".urlencode($search_project_ref);
-if ($search_amount) $param .= '&search_amount='.urlencode($search_amount);
-if ($search_typeid) $param .= '&search_typeid='.urlencode($search_typeid);
-if ($search_users) {
-	foreach ($search_users as $id_user) $param .= '&search_users[]='.urlencode($id_user);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($search_ref) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_label) {
+	$param .= '&search_label='.urlencode($search_label);
+}
+if ($search_project_ref >= 0) {
+	$param .= "&search_project_ref=".urlencode($search_project_ref);
+}
+if ($search_amount) {
+	$param .= '&search_amount='.urlencode($search_amount);
+}
+if ($search_typeid) {
+	$param .= '&search_typeid='.urlencode($search_typeid);
+}
+if ($search_users) {
+	foreach ($search_users as $id_user) {
+		$param .= '&search_users[]='.urlencode($id_user);
+	}
+}
+if ($search_status != '' && $search_status != '-1') {
+	$param .= '&search_status='.urlencode($search_status);
+}
+if ($year) {
+	$param .= '&year='.urlencode($year);
 }
-if ($search_status != '' && $search_status != '-1') $param .= '&search_status='.urlencode($search_status);
-if ($year)          $param .= '&year='.urlencode($year);
 
 $newcardbutton = '';
-if ($user->rights->tax->charges->creer)
-{
+if ($user->rights->tax->charges->creer) {
 	$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewSocialContribution'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/sociales/card.php?action=create');
 }
 
 print '<form method="POST" 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="action" value="list">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -240,8 +292,7 @@ print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $center = '';
-if ($year)
-{
+if ($year) {
 	$center = '<a href="list.php?year='.($year - 1).'">'.img_previous().'</a>';
 	$center .= ' '.$langs->trans("Year").' '.$year;
 	$center .= ' <a href="list.php?year='.($year + 1).'">'.img_next().'</a>';
@@ -249,8 +300,7 @@ if ($year)
 
 print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-if (empty($mysoc->country_id) && empty($mysoc->country_code))
-{
+if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
 	print '<div class="error">';
 	$langs->load("errors");
 	$countrynotdefined = $langs->trans("ErrorSetACountryFirst");
@@ -264,7 +314,9 @@ if (empty($mysoc->country_id) && empty($mysoc->country_code))
 
 $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";
@@ -320,7 +372,9 @@ if (!empty($arrayfields['cs.date_ech']['checked'])) {
 // Filter: Period end date
 if (!empty($arrayfields['cs.periode']['checked'])) {
 	print '<td class="liste_titre center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_lim" value="'.dol_escape_htmltag($search_day_lim).'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_lim" value="'.dol_escape_htmltag($search_day_lim).'">';
+	}
 	print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_lim" value="'.dol_escape_htmltag($search_month_lim).'">';
 	$formother->select_year($search_year_lim ? $search_year_lim : -1, 'search_year_lim', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
 	print '</td>';
@@ -354,16 +408,36 @@ print '</td>';
 print '</tr>';
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['cs.rowid']['checked']))			print_liste_field_titre($arrayfields['cs.rowid']['label'], $_SERVER["PHP_SELF"], "cs.rowid", '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['cs.libelle']['checked']))			print_liste_field_titre($arrayfields['cs.libelle']['label'], $_SERVER["PHP_SELF"], "cs.libelle", '', $param, 'class="left"', $sortfield, $sortorder);
-if (!empty($arrayfields['cs.fk_type']['checked']))			print_liste_field_titre($arrayfields['cs.fk_type']['label'], $_SERVER["PHP_SELF"], "cs.fk_type", '', $param, 'class="left"', $sortfield, $sortorder);
-if (!empty($arrayfields['cs.fk_user']['checked']))			print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname", "", $param, 'class="left"', $sortfield, $sortorder);
-if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['cs.date_ech']['checked']))			print_liste_field_titre($arrayfields['cs.date_ech']['label'], $_SERVER["PHP_SELF"], "cs.date_ech", '', $param, 'align="center"', $sortfield, $sortorder);
-if (!empty($arrayfields['cs.periode']['checked']))			print_liste_field_titre($arrayfields['cs.periode']['label'], $_SERVER["PHP_SELF"], "cs.periode", '', $param, 'align="center"', $sortfield, $sortorder);
-if (!empty($arrayfields['cs.amount']['checked']))			print_liste_field_titre($arrayfields['cs.amount']['label'], $_SERVER["PHP_SELF"], "cs.amount", '', $param, 'class="right"', $sortfield, $sortorder);
-if (!empty($arrayfields['cs.paye']['checked']))				print_liste_field_titre($arrayfields['cs.paye']['label'], $_SERVER["PHP_SELF"], "cs.paye", '', $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cs.rowid']['checked'])) {
+	print_liste_field_titre($arrayfields['cs.rowid']['label'], $_SERVER["PHP_SELF"], "cs.rowid", '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cs.libelle']['checked'])) {
+	print_liste_field_titre($arrayfields['cs.libelle']['label'], $_SERVER["PHP_SELF"], "cs.libelle", '', $param, 'class="left"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cs.fk_type']['checked'])) {
+	print_liste_field_titre($arrayfields['cs.fk_type']['label'], $_SERVER["PHP_SELF"], "cs.fk_type", '', $param, 'class="left"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cs.fk_user']['checked'])) {
+	print_liste_field_titre("Employee", $_SERVER["PHP_SELF"], "u.lastname", "", $param, 'class="left"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cs.date_ech']['checked'])) {
+	print_liste_field_titre($arrayfields['cs.date_ech']['label'], $_SERVER["PHP_SELF"], "cs.date_ech", '', $param, 'align="center"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cs.periode']['checked'])) {
+	print_liste_field_titre($arrayfields['cs.periode']['label'], $_SERVER["PHP_SELF"], "cs.periode", '', $param, 'align="center"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cs.amount']['checked'])) {
+	print_liste_field_titre($arrayfields['cs.amount']['label'], $_SERVER["PHP_SELF"], "cs.amount", '', $param, 'class="right"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['cs.paye']['checked'])) {
+	print_liste_field_titre($arrayfields['cs.paye']['label'], $_SERVER["PHP_SELF"], "cs.paye", '', $param, 'class="right"', $sortfield, $sortorder);
+}
 
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -375,8 +449,7 @@ print '</tr>';
 
 $i = 0;
 		$totalarray = $TLoadedUsers = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$chargesociale_static->id = $obj->rowid;
@@ -394,33 +467,42 @@ while ($i < min($num, $limit))
 	// Line number
 	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 		print '<td>'.(($offset * $limit) + $i).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Ref
 	if (!empty($arrayfields['cs.rowid']['checked'])) {
 		print '<td>'.$chargesociale_static->getNomUrl(1, '20').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Label
 	if (!empty($arrayfields['cs.libelle']['checked'])) {
 		print '<td>'.dol_trunc($obj->label, 42).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Type
 	if (!empty($arrayfields['cs.fk_type']['checked'])) {
 		print '<td>'.$obj->type_label.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	if (!empty($arrayfields['cs.fk_user']['checked'])) {
 		// Employee
 		print "<td>";
 		if (!empty($obj->fk_user)) {
-			if (!empty($TLoadedUsers[$obj->fk_user])) $ustatic = $TLoadedUsers[$obj->fk_user];
-			else {
+			if (!empty($TLoadedUsers[$obj->fk_user])) {
+				$ustatic = $TLoadedUsers[$obj->fk_user];
+			} else {
 				$ustatic = new User($db);
 				$ustatic->fetch($obj->fk_user);
 				$TLoadedUsers[$obj->fk_user] = $ustatic;
@@ -428,7 +510,9 @@ while ($i < min($num, $limit))
 			print $ustatic->getNomUrl(-1);
 		}
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Project ref
@@ -438,13 +522,17 @@ while ($i < min($num, $limit))
 			print $projectstatic->getNomUrl(1);
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Date
 	if (!empty($arrayfields['cs.date_ech']['checked'])) {
 		print '<td width="110" align="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Date end period
@@ -456,26 +544,36 @@ while ($i < min($num, $limit))
 			print '</a>';
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount
 	if (!empty($arrayfields['cs.amount']['checked'])) {
 		print '<td class="nowrap right">'.price($obj->amount).'</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+		}
 		$totalarray['val']['totalttcfield'] += $obj->amount;
 	}
 
 	// Status
 	if (!empty($arrayfields['cs.paye']['checked'])) {
 		print '<td class="nowrap right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Buttons
 	print '<td></td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>';
 	$i++;
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index 7432702bb34..6a573ea4621 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -46,7 +46,9 @@ $hookmanager->initHooks(array('specialexpensesindex'));
 $langs->loadLangs(array('compta', 'bills'));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 
 $year = GETPOST("year", 'int');
@@ -56,15 +58,20 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "cs.date_ech";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) {
+	$sortfield = "cs.date_ech";
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
 
-if (empty($conf->tax->enabled) || empty($user->rights->tax->charges->lire))
-{
+if (empty($conf->tax->enabled) || empty($user->rights->tax->charges->lire)) {
 	accessforbidden();
 }
 
@@ -74,8 +81,7 @@ if (empty($conf->tax->enabled) || empty($user->rights->tax->charges->lire))
  */
 
 // 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_sc_type = '';
 	//$toselect = '';
 	//$search_array_options = array();
@@ -99,16 +105,30 @@ llxHeader('', $title);
 
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($sortfield) $param .= '&sortfield='.urlencode($sortfield);
-if ($sortorder) $param .= '&sortorder='.urlencode($sortorder);
-if ($year) $param .= '&year='.urlencode($year);
-if ($search_sc_type) $param .= '&search_sc_type='.urlencode($search_sc_type);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($sortfield) {
+	$param .= '&sortfield='.urlencode($sortfield);
+}
+if ($sortorder) {
+	$param .= '&sortorder='.urlencode($sortorder);
+}
+if ($year) {
+	$param .= '&year='.urlencode($year);
+}
+if ($search_sc_type) {
+	$param .= '&search_sc_type='.urlencode($search_sc_type);
+}
 $num = 0;
 
 print '<form method="POST" 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="sortfield" value="'.$sortfield.'">';
@@ -157,7 +177,9 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$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) {
@@ -185,7 +207,9 @@ print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
-if (!empty($conf->banque->enabled)) print '<td class="liste_titre"></td>';
+if (!empty($conf->banque->enabled)) {
+	print '<td class="liste_titre"></td>';
+}
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre center">';
 $searchpicto = $form->showFilterButtons();
@@ -201,13 +225,14 @@ print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "",
 print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "pc.rowid", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "pc.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
-if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+if (!empty($conf->banque->enabled)) {
+	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
+}
 print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "pc.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 print_liste_field_titre('');
 print "</tr>\n";
 
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -222,7 +247,9 @@ while ($i < min($num, $limit)) {
 	print '<tr class="oddeven">';
 	// Date
 	$date = $obj->periode;
-	if (empty($date)) $date = $obj->date_ech;
+	if (empty($date)) {
+		$date = $obj->date_ech;
+	}
 	print '<td>'.dol_print_date($date, 'day').'</td>';
 	// Label
 	print '<td>';
@@ -243,14 +270,14 @@ while ($i < min($num, $limit)) {
 	print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
 	// Type payment
 	print '<td>';
-	if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+	if ($obj->payment_code) {
+		print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+	}
 	print $obj->num_payment.'</td>';
 	// Account
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<td>';
-		if ($obj->fk_bank > 0)
-		{
+		if ($obj->fk_bank > 0) {
 			//$accountstatic->fetch($obj->fk_bank);
 			$accountstatic->id = $obj->bid;
 			$accountstatic->ref = $obj->bref;
@@ -259,12 +286,16 @@ while ($i < min($num, $limit)) {
 			$accountstatic->accountancy_journal = $obj->accountancy_journal;
 			$accountstatic->label = $obj->blabel;
 			print $accountstatic->getNomUrl(1);
-		} else print '&nbsp;';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td>';
 	}
 	// Paid
 	print '<td class="right">';
-	if ($obj->totalpaye) print price($obj->totalpaye);
+	if ($obj->totalpaye) {
+		print price($obj->totalpaye);
+	}
 	print '</td>';
 
 	print '<td></td>';
@@ -283,7 +314,9 @@ print '<td class="liste_total right"></td>'; // A total here has no sense
 print '<td align="center" class="liste_total">&nbsp;</td>';
 print '<td align="center" class="liste_total">&nbsp;</td>';
 print '<td align="center" class="liste_total">&nbsp;</td>';
-if (!empty($conf->banque->enabled)) print '<td></td>';
+if (!empty($conf->banque->enabled)) {
+	print '<td></td>';
+}
 print '<td class="liste_total right">'.price($totalpaye)."</td>";
 print '<td></td>';
 print "</tr>";
diff --git a/htdocs/compta/stats/byratecountry.php b/htdocs/compta/stats/byratecountry.php
index ee859965552..1f4de217bac 100644
--- a/htdocs/compta/stats/byratecountry.php
+++ b/htdocs/compta/stats/byratecountry.php
@@ -43,8 +43,7 @@ $modecompta = (GETPOST('modecompta', 'alpha') ? GETPOST('modecompta', 'alpha') :
 // Date range
 $year = GETPOST("year", 'int');
 $month = GETPOST("month", 'int');
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$month_current = strftime("%m", dol_now());
 	$year_start = $year_current;
@@ -56,32 +55,39 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int");
-	if (empty($q))
-	{
+	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
-		if (!GETPOST("month"))	// If month not forced
-		{
-			if (!GETPOST('year') && $month_start > $month_current)
-			{
+		if (!GETPOST("month")) {	// If month not forced
+			if (!GETPOST('year') && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	} else {
-		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+		if ($q == 1) {
+			$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+		}
+		if ($q == 2) {
+			$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+		}
+		if ($q == 3) {
+			$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+		}
+		if ($q == 4) {
+			$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+		}
 	}
 }
 
@@ -92,20 +98,30 @@ $tmpe = dol_getdate($date_end);
 $year_end = $tmpe['year'];
 
 $tmp_date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-if ($tmp_date_end < $date_end || $date_end < $date_start) $date_end = $tmp_date_end;
+if ($tmp_date_end < $date_end || $date_end < $date_start) {
+	$date_end = $tmp_date_end;
+}
 
 $min = price2num(GETPOST("min", "alpha"));
-if (empty($min)) $min = 0;
+if (empty($min)) {
+	$min = 0;
+}
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = $conf->global->TAX_MODE;
-if (GETPOSTISSET("modetax")) $modetax = GETPOST("modetax", 'int');
-if (empty($modetax)) $modetax = 0;
+if (GETPOSTISSET("modetax")) {
+	$modetax = GETPOST("modetax", 'int');
+}
+if (empty($modetax)) {
+	$modetax = 0;
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 
@@ -126,9 +142,10 @@ $paymentexpensereport_static = new PaymentExpenseReport($db);
 
 $morequerystring = '';
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
-foreach ($listofparams as $param)
-{
-	if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+foreach ($listofparams as $param) {
+	if (GETPOST($param) != '') {
+		$morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+	}
 }
 
 llxHeader('', $langs->trans("TurnoverReport"), '', '', 0, 0, '', '', $morequerystring);
@@ -146,9 +163,15 @@ $fsearch .= '  <input type="hidden" name="modetax" value="'.$modetax.'">';
 // Show report header
 $name = $langs->trans("xxx");
 $calcmode = '';
-if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
-if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
-if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
+if ($modetax == 0) {
+	$calcmode = $langs->trans('OptionVATDefault');
+}
+if ($modetax == 1) {
+	$calcmode = $langs->trans('OptionVATDebitOption');
+}
+if ($modetax == 2) {
+	$calcmode = $langs->trans('OptionPaymentForProductAndServices');
+}
 $calcmode .= '<br>('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')';
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -167,14 +190,24 @@ if ($nextquarter < 4) {
 $description .= $fsearch;
 $builddate = dol_now();
 
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description .= $langs->trans("RulesVATDueProducts");
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description .= $langs->trans("RulesVATInProducts");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description .= '<br>'.$langs->trans("RulesVATDueServices");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description .= '<br>'.$langs->trans("RulesVATInServices");
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') {
+	$description .= $langs->trans("RulesVATDueProducts");
+}
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') {
+	$description .= $langs->trans("RulesVATInProducts");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') {
+	$description .= '<br>'.$langs->trans("RulesVATDueServices");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+	$description .= '<br>'.$langs->trans("RulesVATInServices");
+}
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
-if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) {
+	$description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+}
 
 // Customers invoices
 $elementcust = $langs->trans("CustomersInvoices");
@@ -190,8 +223,12 @@ $namesup = $namecust;
 
 
 // TODO Report from bookkeeping not yet available, so we switch on report on business events
-if ($modecompta == "BOOKKEEPING") $modecompta = "CREANCES-DETTES";
-if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
+if ($modecompta == "BOOKKEEPING") {
+	$modecompta = "CREANCES-DETTES";
+}
+if ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	$modecompta = "RECETTES-DEPENSES";
+}
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
@@ -207,8 +244,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	}
 
 	$builddate = dol_now();
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByVatRate");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
@@ -217,21 +253,21 @@ if ($modecompta == "CREANCES-DETTES") {
 	$description .= $langs->trans("DepositsAreIncluded");
 
 	$builddate = dol_now();
-} elseif ($modecompta == "BOOKKEEPING")
-{
-} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
-else $periodlink = '';
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
+	$periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+} else {
+	$periodlink = '';
+}
 
 $description .= '  <input type="hidden" name="modecompta" value="'.$modecompta.'">';
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, array(), $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -244,7 +280,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$i = 0;
 	while ($i < 12) {
 		$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 		$i++;
 	}
@@ -292,7 +330,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 			print '</td>';
 			for ($i = 0; $i < 12; $i++) {
 				$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-				if ($j > 12) $j -= 12;
+				if ($j > 12) {
+					$j -= 12;
+				}
 				$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
 				print '<td class="right" width="6%">'.price($obj->$monthj).'</td>';
 				$totalpermonth[$j] = (empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j]) + $obj->$monthj;
@@ -309,7 +349,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 		print '<td></td>';
 		for ($i = 0; $i < 12; $i++) {
 			$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-			if ($j > 12) $j -= 12;
+			if ($j > 12) {
+				$j -= 12;
+			}
 			$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
 			print '<td class="right" width="6%">'.price($totalpermonth[$j]).'</td>';
 		}
@@ -324,10 +366,11 @@ if ($modecompta == 'CREANCES-DETTES') {
 	print '<td class="left">'.$langs->trans("ProductOrService").'</td>';
 	print '<td class="left">'.$langs->trans("Country").'</td>';
 	$i = 0;
-	while ($i < 12)
-	{
+	while ($i < 12) {
 		$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-		if ($j > 12) $j -= 12;
+		if ($j > 12) {
+			$j -= 12;
+		}
 		print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
 		$i++;
 	}
@@ -374,7 +417,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 			print '</td>';
 			for ($i = 0; $i < 12; $i++) {
 				$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-				if ($j > 12) $j -= 12;
+				if ($j > 12) {
+					$j -= 12;
+				}
 				$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
 				print '<td class="right" width="6%">'.price($obj->$monthj).'</td>';
 				$totalpermonth[$j] = (empty($totalpermonth[$j]) ? 0 : $totalpermonth[$j]) + $obj->$monthj;
@@ -391,7 +436,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 		print '<td></td>';
 		for ($i = 0; $i < 12; $i++) {
 			$j = $i + (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 1 : $conf->global->SOCIETE_FISCAL_MONTH_START);
-			if ($j > 12) $j -= 12;
+			if ($j > 12) {
+				$j -= 12;
+			}
 			$monthj = 'month'.str_pad($j, 2, '0', STR_PAD_LEFT);
 			print '<td class="right" width="6%">'.price($totalpermonth[$j]).'</td>';
 		}
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 485a6088338..eb678900112 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -36,18 +36,30 @@ $langs->loadLangs(array("products", "categories", "errors", 'accountancy'));
 // Security pack (data & check)
 $socid = GETPOST('socid', 'int');
 
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta");
+if (GETPOST("modecompta")) {
+	$modecompta = GETPOST("modecompta");
+}
 
 $sortorder = isset($_GET["sortorder"]) ? $_GET["sortorder"] : $_POST["sortorder"];
 $sortfield = isset($_GET["sortfield"]) ? $_GET["sortfield"] : $_POST["sortfield"];
-if (!$sortorder) $sortorder = "asc";
-if (!$sortfield) $sortfield = "ref";
+if (!$sortorder) {
+	$sortorder = "asc";
+}
+if (!$sortfield) {
+	$sortfield = "ref";
+}
 
 // Category
 $selected_cat = (int) GETPOST('search_categ', 'int');
@@ -60,7 +72,9 @@ $categorie = new Categorie($db);
 
 // product/service
 $selected_type = GETPOST('search_type', 'int');
-if ($selected_type == '') $selected_type = -1;
+if ($selected_type == '') {
+	$selected_type = -1;
+}
 
 // Hook
 $hookmanager->initHooks(array('cabyprodservlist'));
@@ -74,8 +88,7 @@ $date_startday = GETPOST("date_startday");
 $date_endyear = GETPOST("date_endyear");
 $date_endmonth = GETPOST("date_endmonth");
 $date_endday = GETPOST("date_endday");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$month_current = strftime("%m", dol_now());
 	$year_start = $year_current;
@@ -87,32 +100,39 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int");
-	if (empty($q))
-	{
+	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
-		if (!GETPOST("month"))	// If month not forced
-		{
-			if (!GETPOST('year') && $month_start > $month_current)
-			{
+		if (!GETPOST("month")) {	// If month not forced
+			if (!GETPOST('year') && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	} else {
-		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+		if ($q == 1) {
+			$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+		}
+		if ($q == 2) {
+			$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+		}
+		if ($q == 3) {
+			$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+		}
+		if ($q == 4) {
+			$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+		}
 	}
 } else {
 	// TODO We define q
@@ -126,25 +146,53 @@ $year_end = $tmpe['year'];
 $nbofyear = ($year_end - $year_start) + 1;
 
 $commonparams = array();
-if (!empty($modecompta)) $commonparams['modecompta'] = $modecompta;
-if (!empty($sortorder)) $commonparams['sortorder'] = $sortorder;
-if (!empty($sortfield)) $commonparams['sortfield'] = $sortfield;
+if (!empty($modecompta)) {
+	$commonparams['modecompta'] = $modecompta;
+}
+if (!empty($sortorder)) {
+	$commonparams['sortorder'] = $sortorder;
+}
+if (!empty($sortfield)) {
+	$commonparams['sortfield'] = $sortfield;
+}
 
 $headerparams = array();
-if (!empty($date_startyear)) $headerparams['date_startyear'] = $date_startyear;
-if (!empty($date_startmonth)) $headerparams['date_startmonth'] = $date_startmonth;
-if (!empty($date_startday)) $headerparams['date_startday'] = $date_startday;
-if (!empty($date_endyear)) $headerparams['date_endyear'] = $date_endyear;
-if (!empty($date_endmonth)) $headerparams['date_endmonth'] = $date_endmonth;
-if (!empty($date_endday)) $headerparams['date_endday'] = $date_endday;
-if (!empty($year)) $headerparams['year'] = $year;
-if (!empty($month)) $headerparams['month'] = $month;
+if (!empty($date_startyear)) {
+	$headerparams['date_startyear'] = $date_startyear;
+}
+if (!empty($date_startmonth)) {
+	$headerparams['date_startmonth'] = $date_startmonth;
+}
+if (!empty($date_startday)) {
+	$headerparams['date_startday'] = $date_startday;
+}
+if (!empty($date_endyear)) {
+	$headerparams['date_endyear'] = $date_endyear;
+}
+if (!empty($date_endmonth)) {
+	$headerparams['date_endmonth'] = $date_endmonth;
+}
+if (!empty($date_endday)) {
+	$headerparams['date_endday'] = $date_endday;
+}
+if (!empty($year)) {
+	$headerparams['year'] = $year;
+}
+if (!empty($month)) {
+	$headerparams['month'] = $month;
+}
 $headerparams['q'] = $q;
 
 $tableparams = array();
-if (!empty($selected_cat)) $tableparams['search_categ'] = $selected_cat;
-if (!empty($selected_soc)) $tableparams['search_soc'] = $selected_soc;
-if (!empty($selected_type)) $tableparams['search_type'] = $selected_type;
+if (!empty($selected_cat)) {
+	$tableparams['search_categ'] = $selected_cat;
+}
+if (!empty($selected_soc)) {
+	$tableparams['search_soc'] = $selected_soc;
+}
+if (!empty($selected_type)) {
+	$tableparams['search_type'] = $selected_type;
+}
 $tableparams['subcat'] = ($subcat === true) ? 'yes' : '';
 
 // Adding common parameters
@@ -167,8 +215,12 @@ $form = new Form($db);
 $formother = new FormOther($db);
 
 // TODO Report from bookkeeping not yet available, so we switch on report on business events
-if ($modecompta == "BOOKKEEPING") $modecompta = "CREANCES-DETTES";
-if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
+if ($modecompta == "BOOKKEEPING") {
+	$modecompta = "CREANCES-DETTES";
+}
+if ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	$modecompta = "RECETTES-DEPENSES";
+}
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
@@ -184,8 +236,7 @@ if ($modecompta == "CREANCES-DETTES") {
 	}
 
 	$builddate = dol_now();
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByProductsAndServices");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
@@ -194,20 +245,20 @@ if ($modecompta == "CREANCES-DETTES") {
 	$description .= $langs->trans("DepositsAreIncluded");
 
 	$builddate = dol_now();
-} elseif ($modecompta == "BOOKKEEPING")
-{
-} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") {
 }
 
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
-else $periodlink = '';
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
+	$periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+} else {
+	$periodlink = '';
+}
 
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -220,13 +271,14 @@ $catotal = 0;
 $catotal_ht = 0;
 $qtytotal = 0;
 
-if ($modecompta == 'CREANCES-DETTES')
-{
+if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT DISTINCT p.rowid as rowid, p.ref as ref, p.label as label, p.fk_product_type as product_type,";
 	$sql .= " SUM(l.total_ht) as amount, SUM(l.total_ttc) as amount_ttc,";
 	$sql .= " SUM(CASE WHEN f.type = 2 THEN -l.qty ELSE l.qty END) as qty";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-	if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
+	if ($selected_soc > 0) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
+	}
 	$sql .= ",".MAIN_DB_PREFIX."facturedet as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
 	if ($selected_cat === -2) {	// Without any category
@@ -245,8 +297,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($date_start && $date_end) {
 		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_type >= 0)
-	{
+	if ($selected_type >= 0) {
 		$sql .= " AND l.product_type = ".$selected_type;
 	}
 	if ($selected_cat === -2) {	// Without any category
@@ -256,20 +307,26 @@ if ($modecompta == 'CREANCES-DETTES')
 			$TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);
 
 			$listofcatsql = "";
-			foreach ($TListOfCats as $key => $cat)
-			{
-				if ($key !== 0) $listofcatsql .= ",";
+			foreach ($TListOfCats as $key => $cat) {
+				if ($key !== 0) {
+					$listofcatsql .= ",";
+				}
 				$listofcatsql .= $cat['rowid'];
 			}
 		}
 
 		$sql .= " AND (p.rowid IN ";
 		$sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
-		if ($subcat) $sql .= "cp.fk_categorie IN (".$listofcatsql.")";
-		else $sql .= "cp.fk_categorie = ".$selected_cat;
+		if ($subcat) {
+			$sql .= "cp.fk_categorie IN (".$listofcatsql.")";
+		} else {
+			$sql .= "cp.fk_categorie = ".$selected_cat;
+		}
 		$sql .= "))";
 	}
-	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
+	if ($selected_soc > 0) {
+		$sql .= " AND soc.rowid=".$selected_soc;
+	}
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	$sql .= " GROUP BY p.rowid, p.ref, p.label, p.fk_product_type";
 	$sql .= $db->order($sortfield, $sortorder);
@@ -300,8 +357,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 	// Extra parameters management
-	foreach ($headerparams as $key => $value)
-	{
+	foreach ($headerparams as $key => $value) {
 		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}
 
@@ -400,7 +456,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	print "</tr>\n";
 
 	if (count($name)) {
-		foreach ($name as $key=>$value) {
+		foreach ($name as $key => $value) {
 			print '<tr class="oddeven">';
 
 			// Product
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 2e46e306030..494786bd8a2 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -35,18 +35,30 @@ $langs->load("accountancy");
 $socid = GETPOST('socid', 'int');
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta");
+if (GETPOST("modecompta")) {
+	$modecompta = GETPOST("modecompta");
+}
 
 $sortorder = isset($_GET["sortorder"]) ? $_GET["sortorder"] : $_POST["sortorder"];
 $sortfield = isset($_GET["sortfield"]) ? $_GET["sortfield"] : $_POST["sortfield"];
-if (!$sortorder) $sortorder = "asc";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "asc";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 // Date range
 $year = GETPOST("year");
@@ -57,8 +69,7 @@ $date_startday = GETPOST("date_startday");
 $date_endyear = GETPOST("date_endyear");
 $date_endmonth = GETPOST("date_endmonth");
 $date_endday = GETPOST("date_endday");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$month_current = strftime("%m", dol_now());
 	$year_start = $year_current;
@@ -70,32 +81,39 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]);
 $date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]);
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q") ?GETPOST("q") : 0;
-	if ($q == 0)
-	{
+	if ($q == 0) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
-		if (!GETPOST("month"))	// If month not forced
-		{
-			if (!GETPOST('year') && $month_start > $month_current)
-			{
+		if (!GETPOST("month")) {	// If month not forced
+			if (!GETPOST('year') && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	if ($q == 1) {
+		$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+	}
+	if ($q == 2) {
+		$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+	}
+	if ($q == 3) {
+		$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+	}
+	if ($q == 4) {
+		$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+	}
 } else {
 	// TODO We define q
 }
@@ -142,8 +160,12 @@ llxHeader();
 $form = new Form($db);
 
 // TODO Report from bookkeeping not yet available, so we switch on report on business events
-if ($modecompta == "BOOKKEEPING") $modecompta = "CREANCES-DETTES";
-if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
+if ($modecompta == "BOOKKEEPING") {
+	$modecompta = "CREANCES-DETTES";
+}
+if ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	$modecompta = "RECETTES-DEPENSES";
+}
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
@@ -151,12 +173,14 @@ if ($modecompta == "CREANCES-DETTES") {
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$description = $langs->trans("RulesCADue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else $description .= $langs->trans("DepositsAreIncluded");
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description .= $langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description .= $langs->trans("DepositsAreIncluded");
+	}
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByUserAuthorOfInvoice");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
@@ -164,24 +188,26 @@ if ($modecompta == "CREANCES-DETTES") {
 	$description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	// TODO
-} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
-{
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") {
 	// TODO
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
-else $periodlink = '';
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
+	$periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+} else {
+	$periodlink = '';
+}
 
 $moreparam = array();
-if (!empty($modecompta)) $moreparam['modecompta'] = $modecompta;
+if (!empty($modecompta)) {
+	$moreparam['modecompta'] = $modecompta;
+}
 
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -192,8 +218,7 @@ $name = array();
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
-foreach ($headerparams as $key => $value)
-{
+foreach ($headerparams as $key => $value) {
 	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
@@ -213,9 +238,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 	}
 } else {
 	/*
-     * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
-     * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
-     */
+	 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
+	 * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
+	 */
 	$sql = "SELECT u.rowid as rowid, u.lastname as name, u.firstname as firstname, sum(pf.amount) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON f.fk_user_author = u.rowid ";
@@ -227,7 +252,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 	}
 }
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
-if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+if ($socid) {
+	$sql .= " AND f.fk_soc = ".$socid;
+}
 $sql .= " GROUP BY u.rowid, u.lastname, u.firstname";
 $sql .= " ORDER BY u.rowid";
 
@@ -302,14 +329,14 @@ print_liste_field_titre(
 );
 if ($modecompta == 'CREANCES-DETTES') {
 	print_liste_field_titre(
-		   $langs->trans('AmountHT'),
-		   $_SERVER["PHP_SELF"],
-		   "amount_ht",
-		   "",
-		   $paramslink,
-		   'class="right"',
-		   $sortfield,
-		   $sortorder
+		$langs->trans('AmountHT'),
+		$_SERVER["PHP_SELF"],
+		"amount_ht",
+		"",
+		$paramslink,
+		'class="right"',
+		$sortfield,
+		$sortorder
 	);
 } else {
 	print_liste_field_titre('');
@@ -326,7 +353,8 @@ print_liste_field_titre(
 );
 print_liste_field_titre(
 	$langs->trans("Percentage"),
-	$_SERVER["PHP_SELF"], "amount_ttc",
+	$_SERVER["PHP_SELF"],
+	"amount_ttc",
 	"",
 	$paramslink,
 	'class="right"',
@@ -401,7 +429,9 @@ if (count($amount)) {
 				//print '<a href="#">';
 			}
 			print price($amount_ht[$key]);
-			if ($key > 0) print '</a>';
+			if ($key > 0) {
+				print '</a>';
+			}
 		}
 		print '</td>';
 
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 8fa06046076..829e196a82e 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -40,12 +40,18 @@ $langs->loadLangs(array('companies', 'categories', 'bills', 'compta'));
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta");
+if (GETPOST("modecompta")) {
+	$modecompta = GETPOST("modecompta");
+}
 
 $sortorder = isset($_GET["sortorder"]) ? $_GET["sortorder"] : $_POST["sortorder"];
 $sortfield = isset($_GET["sortfield"]) ? $_GET["sortfield"] : $_POST["sortfield"];
-if (!$sortorder) $sortorder = "asc";
-if (!$sortfield) $sortfield = "nom";
+if (!$sortorder) {
+	$sortorder = "asc";
+}
+if (!$sortfield) {
+	$sortfield = "nom";
+}
 
 $socid = GETPOST('socid', 'int');
 
@@ -57,9 +63,15 @@ if (GETPOST('subcat', 'alpha') === 'yes') {
 }
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 // Hook
 $hookmanager->initHooks(array('casoclist'));
@@ -77,8 +89,7 @@ $date_startday = GETPOST("date_startday", 'alpha');
 $date_endyear = GETPOST("date_endyear", 'alpha');
 $date_endmonth = GETPOST("date_endmonth", 'alpha');
 $date_endday = GETPOST("date_endday", 'alpha');
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$month_current = strftime("%m", dol_now());
 	$year_start = $year_current;
@@ -90,32 +101,39 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int") ?GETPOST("q", "int") : 0;
-	if (empty($q))
-	{
+	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
-		if (!GETPOST("month"))	// If month not forced
-		{
-			if (!GETPOST('year') && $month_start > $month_current)
-			{
+		if (!GETPOST("month")) {	// If month not forced
+			if (!GETPOST('year') && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	if ($q == 1) {
+		$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+	}
+	if ($q == 2) {
+		$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+	}
+	if ($q == 3) {
+		$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+	}
+	if ($q == 4) {
+		$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+	}
 } else {
 	// TODO We define q
 }
@@ -170,22 +188,27 @@ $thirdparty_static = new Societe($db);
 $formother = new FormOther($db);
 
 // TODO Report from bookkeeping not yet available, so we switch on report on business events
-if ($modecompta == "BOOKKEEPING") $modecompta = "CREANCES-DETTES";
-if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
+if ($modecompta == "BOOKKEEPING") {
+	$modecompta = "CREANCES-DETTES";
+}
+if ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	$modecompta = "RECETTES-DEPENSES";
+}
 
 // Show report header
-if ($modecompta == "CREANCES-DETTES")
-{
+if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("Turnover").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$description = $langs->trans("RulesCADue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else $description .= $langs->trans("DepositsAreIncluded");
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description .= $langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description .= $langs->trans("DepositsAreIncluded");
+	}
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("TurnoverCollected").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
@@ -193,19 +216,19 @@ if ($modecompta == "CREANCES-DETTES")
 	$description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "BOOKKEEPING")
-{
-} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
-else $periodlink = '';
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
+	$periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+} else {
+	$periodlink = '';
+}
 
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -218,11 +241,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT DISTINCT s.rowid as socid, s.nom as name, s.zip, s.town, s.fk_pays,";
 	$sql .= " sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	} elseif ($selected_cat) 	// Into a specific category
-	{
+	} elseif ($selected_cat) { 	// Into a specific category
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE f.fk_statut in (1,2)";
@@ -235,12 +256,13 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($date_start && $date_end) {
 		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$db->escape($selected_cat);
-		if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
+		if ($subcat) {
+			$sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
+		}
 		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
@@ -254,11 +276,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
 	$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	} elseif ($selected_cat) 	// Into a specific category
-	{
+	} elseif ($selected_cat) { 	// Into a specific category
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE p.rowid = pf.fk_paiement";
@@ -267,22 +287,33 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($date_start && $date_end) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$selected_cat;
-		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
+		if ($subcat) {
+			$sql .= " OR c.fk_parent = ".$selected_cat;
+		}
 		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 }
-if (!empty($search_societe))  $sql .= natural_search('s.nom', $search_societe);
-if (!empty($search_zip))      $sql .= natural_search('s.zip', $search_zip);
-if (!empty($search_town))     $sql .= natural_search('s.town', $search_town);
-if ($search_country > 0)      $sql .= ' AND s.fk_pays = '.$search_country.'';
+if (!empty($search_societe)) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if (!empty($search_zip)) {
+	$sql .= natural_search('s.zip', $search_zip);
+}
+if (!empty($search_town)) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_country > 0) {
+	$sql .= ' AND s.fk_pays = '.$search_country.'';
+}
 $sql .= " AND f.entity IN (".getEntity('invoice').")";
-if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+if ($socid) {
+	$sql .= " AND f.fk_soc = ".$socid;
+}
 $sql .= " GROUP BY s.rowid, s.nom, s.zip, s.town, s.fk_pays";
 $sql .= " ORDER BY s.rowid";
 //echo $sql;
@@ -321,7 +352,9 @@ if ($modecompta != 'CREANCES-DETTES') {
 	$sql .= " AND p.fk_bank = b.rowid";
 	$sql .= " AND b.fk_account = ba.rowid";
 	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-	if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	if ($date_start && $date_end) {
+		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+	}
 	$sql .= " GROUP BY socid, name";
 	$sql .= " ORDER BY name";
 
@@ -350,8 +383,7 @@ $i = 0;
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
-foreach ($headerparams as $key => $value)
-{
+foreach ($headerparams as $key => $value) {
 	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
@@ -405,8 +437,9 @@ print_liste_field_titre(
 	"",
 	$paramslink,
 	"",
-	$sortfield, $sortorder
-	);
+	$sortfield,
+	$sortorder
+);
 print_liste_field_titre(
 	$langs->trans("Zip"),
 	$_SERVER["PHP_SELF"],
@@ -414,8 +447,9 @@ print_liste_field_titre(
 	"",
 	$paramslink,
 	"",
-	$sortfield, $sortorder
-	);
+	$sortfield,
+	$sortorder
+);
 print_liste_field_titre(
 	$langs->trans("Town"),
 	$_SERVER["PHP_SELF"],
@@ -423,8 +457,9 @@ print_liste_field_titre(
 	"",
 	$paramslink,
 	"",
-	$sortfield, $sortorder
-	);
+	$sortfield,
+	$sortorder
+);
 print_liste_field_titre(
 	$langs->trans("Country"),
 	$_SERVER["PHP_SELF"],
@@ -432,18 +467,19 @@ print_liste_field_titre(
 	"",
 	$paramslink,
 	"",
-	$sortfield, $sortorder
-	);
+	$sortfield,
+	$sortorder
+);
 if ($modecompta == 'CREANCES-DETTES') {
 	print_liste_field_titre(
-		   $langs->trans('AmountHT'),
-		   $_SERVER["PHP_SELF"],
-		   "amount_ht",
-		   "",
-		   $paramslink,
-		   'class="right"',
-		   $sortfield,
-		   $sortorder
+		$langs->trans('AmountHT'),
+		$_SERVER["PHP_SELF"],
+		"amount_ht",
+		"",
+		$paramslink,
+		'class="right"',
+		$sortfield,
+		$sortorder
 	);
 } else {
 	print_liste_field_titre('');
@@ -531,7 +567,7 @@ if (count($amount)) {
 		$arrayforsort = $address_town;
 	}
 
-	foreach ($arrayforsort as $key=>$value) {
+	foreach ($arrayforsort as $key => $value) {
 		print '<tr class="oddeven">';
 
 		// Third party
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index 03c128e841f..eb039a63f92 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -42,8 +42,7 @@ $nbofyear = 4;
 
 // Date range
 $year = GETPOST('year', 'int');
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = dol_print_date(dol_now(), "%Y");
 	$month_current = dol_print_date(dol_now(), "%m");
 	$year_start = $year_current - ($nbofyear - 1);
@@ -56,30 +55,38 @@ $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_starty
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q") ? GETPOST("q") : 0;
-	if ($q == 0)
-	{
+	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
 		$month_start = GETPOSTISSET("month") ? GETPOST("month", 'int') : ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1);
-		if (!GETPOST('month'))
-		{
-			if (!GETPOST("year") && $month_start > $month_current)
-			{
+		if (!GETPOST('month')) {
+			if (!GETPOST("year") && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-		} else $month_end = $month_start;
+			if ($month_end < 1) {
+				$month_end = 12;
+			}
+		} else {
+			$month_end = $month_start;
+		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	if ($q == 1) {
+		$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+	}
+	if ($q == 2) {
+		$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+	}
+	if ($q == 3) {
+		$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+	}
+	if ($q == 4) {
+		$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+	}
 }
 
 $userid = GETPOST('userid', 'int');
@@ -95,13 +102,23 @@ $nbofyear = ($year_end - $year_start) + 1;
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) $modecompta = 'BOOKKEEPING';
-if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta", 'alpha');
+if (!empty($conf->accounting->enabled)) {
+	$modecompta = 'BOOKKEEPING';
+}
+if (GETPOST("modecompta")) {
+	$modecompta = GETPOST("modecompta", 'alpha');
+}
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 
 
@@ -111,16 +128,19 @@ if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'account
  */
 
 $param = '';
-if ($date_startday && $date_startmonth && $date_startyear) $param .= '&date_startday='.$date_startday.'&date_startmonth='.$date_startmonth.'&date_startyear='.$date_startyear;
-if ($date_endday && $date_endmonth && $date_endyear) $param .= '&date_endday='.$date_endday.'&date_endmonth='.$date_endmonth.'&date_endyear='.$date_endyear;
+if ($date_startday && $date_startmonth && $date_startyear) {
+	$param .= '&date_startday='.$date_startday.'&date_startmonth='.$date_startmonth.'&date_startyear='.$date_startyear;
+}
+if ($date_endday && $date_endmonth && $date_endyear) {
+	$param .= '&date_endday='.$date_endday.'&date_endmonth='.$date_endmonth.'&date_endyear='.$date_endyear;
+}
 
 llxHeader();
 
 $form = new Form($db);
 
 // Affiche en-tete du rapport
-if ($modecompta == "CREANCES-DETTES")
-{
+if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
@@ -130,12 +150,14 @@ if ($modecompta == "CREANCES-DETTES")
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 	$periodlink = ($year_start ? "<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear - 2)."&modecompta=".$modecompta."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start + $nbofyear)."&modecompta=".$modecompta."'>".img_next()."</a>" : "");
 	$description = $langs->trans("RulesCADue");
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $description .= $langs->trans("DepositsAreNotIncluded");
-	else $description .= $langs->trans("DepositsAreIncluded");
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description .= $langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description .= $langs->trans("DepositsAreIncluded");
+	}
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("TurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year_start='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
@@ -146,8 +168,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description .= $langs->trans("DepositsAreIncluded");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	$name = $langs->trans("Turnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{link1}', '{link2}').')';
@@ -162,26 +183,30 @@ if ($modecompta == "CREANCES-DETTES")
 }
 
 $moreparam = array();
-if (!empty($modecompta)) $moreparam['modecompta'] = $modecompta;
+if (!empty($modecompta)) {
+	$moreparam['modecompta'] = $modecompta;
+}
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
-if ($modecompta == 'CREANCES-DETTES')
-{
+if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sql .= " WHERE f.fk_statut in (1,2)";
-	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-	else $sql .= " AND f.type IN (0,1,2,3,5)";
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$sql .= " AND f.type IN (0,1,2,5)";
+	} else {
+		$sql .= " AND f.type IN (0,1,2,3,5)";
+	}
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	/*
 	 * Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
 	 * vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
@@ -193,9 +218,10 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " WHERE p.rowid = pf.fk_paiement";
 	$sql .= " AND pf.fk_facture = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-} elseif ($modecompta == "BOOKKEEPING")
-{
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+} elseif ($modecompta == "BOOKKEEPING") {
 	$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.credit) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
 	$sql .= " WHERE b.entity = ".$conf->entity; // In module double party accounting, we never share entities
@@ -211,17 +237,14 @@ $sql .= " ORDER BY dm";
 $minyearmonth = $maxyearmonth = 0;
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 		$cum_ht[$obj->dm] = !empty($obj->amount) ? $obj->amount : 0;
 		$cum[$obj->dm] = $obj->amount_ttc;
-		if ($obj->amount_ttc)
-		{
+		if ($obj->amount_ttc) {
 			$minyearmonth = ($minyearmonth ? min($minyearmonth, $obj->dm) : $obj->dm);
 			$maxyearmonth = max($maxyearmonth, $obj->dm);
 		}
@@ -233,8 +256,7 @@ if ($result)
 }
 
 // On ajoute les paiements anciennes version, non lies par paiement_facture (very old versions)
-if ($modecompta == 'RECETTES-DEPENSES')
-{
+if ($modecompta == 'RECETTES-DEPENSES') {
 	$sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 	$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
@@ -248,16 +270,13 @@ if ($modecompta == 'RECETTES-DEPENSES')
 	$sql .= " ORDER BY dm";
 
 	$result = $db->query($sql);
-	if ($result)
-	{
+	if ($result) {
 		$num = $db->num_rows($result);
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($result);
 			$cum[$obj->dm] += $obj->amount_ttc;
-			if ($obj->amount_ttc)
-			{
+			if ($obj->amount_ttc) {
 				$minyearmonth = ($minyearmonth ?min($minyearmonth, $obj->dm) : $obj->dm);
 				$maxyearmonth = max($maxyearmonth, $obj->dm);
 			}
@@ -275,26 +294,39 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 
 print '<tr class="liste_titre"><td>&nbsp;</td>';
 
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
-	if ($modecompta == 'CREANCES-DETTES') print '<td align="center" width="10%" colspan="3">';
-	else print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
-	if ($modecompta != 'BOOKKEEPING') print '<a href="casoc.php?year='.$annee.'">';
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
+	if ($modecompta == 'CREANCES-DETTES') {
+		print '<td align="center" width="10%" colspan="3">';
+	} else {
+		print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
+	}
+	if ($modecompta != 'BOOKKEEPING') {
+		print '<a href="casoc.php?year='.$annee.'">';
+	}
 	print $annee;
-	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
-	if ($modecompta != 'BOOKKEEPING') print '</a>';
+	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) {
+		print '-'.($annee + 1);
+	}
+	if ($modecompta != 'BOOKKEEPING') {
+		print '</a>';
+	}
 	print '</td>';
-	if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
+	if ($annee != $year_end) {
+		print '<td width="15">&nbsp;</td>';
+	}
 }
 print '</tr>';
 
 print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
-	if ($modecompta == 'CREANCES-DETTES') print '<td class="liste_titre right">'.$langs->trans("AmountHT").'</td>';
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
+	if ($modecompta == 'CREANCES-DETTES') {
+		print '<td class="liste_titre right">'.$langs->trans("AmountHT").'</td>';
+	}
 	print '<td class="liste_titre right">'.$langs->trans("AmountTTC").'</td>';
 	print '<td class="liste_titre right borderrightlight">'.$langs->trans("Delta").'</td>';
-	if ($annee != $year_end) print '<td class="liste_titre" width="15">&nbsp;</td>';
+	if ($annee != $year_end) {
+		print '<td class="liste_titre" width="15">&nbsp;</td>';
+	}
 }
 print '</tr>';
 
@@ -309,10 +341,11 @@ $casenow = dol_print_date($now, "%Y-%m");
 
 // Loop on each month
 $nb_mois_decalage = GETPOSTISSET('date_startmonth') ? (GETPOST('date_startmonth', 'int') - 1) : (empty($conf->global->SOCIETE_FISCAL_MONTH_START) ? 0 : ($conf->global->SOCIETE_FISCAL_MONTH_START - 1));
-for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
-{
+for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 	$mois_modulo = $mois; // ajout
-	if ($mois > 12) {$mois_modulo = $mois - 12; } // ajout
+	if ($mois > 12) {
+		$mois_modulo = $mois - 12;
+	} // ajout
 
 	if ($year_start == $year_end) {
 		// If we show only one year or one month, we do not show month before the selected month
@@ -330,15 +363,15 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 	// Month
 	print "<td>".dol_print_date(dol_mktime(12, 0, 0, $mois_modulo, 1, 2000), "%B")."</td>";
 
-	for ($annee = $year_start - 1; $annee <= $year_end; $annee++)	// We start one year before to have data to be able to make delta
-	{
+	for ($annee = $year_start - 1; $annee <= $year_end; $annee++) {	// We start one year before to have data to be able to make delta
 		$annee_decalage = $annee;
-		if ($mois > 12) {$annee_decalage = $annee + 1; }
+		if ($mois > 12) {
+			$annee_decalage = $annee + 1;
+		}
 		$case = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage), "%Y-%m");
 		$caseprev = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage - 1), "%Y-%m");
 
-		if ($annee >= $year_start)	// We ignore $annee < $year_start, we loop on it to be able to make delta, nothing is output.
-		{
+		if ($annee >= $year_start) {	// We ignore $annee < $year_start, we loop on it to be able to make delta, nothing is output.
 			if ($modecompta == 'CREANCES-DETTES') {
 				// Value turnover of month w/o VAT
 				print '<td class="right">';
@@ -347,7 +380,11 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 						$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 						print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
 					} else {
-						if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
+						if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) {
+							print '0';
+						} else {
+							print '&nbsp;';
+						}
 					}
 				}
 				print "</td>";
@@ -358,11 +395,19 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 			if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
 				if ($cum[$case]) {
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
-					if ($modecompta != 'BOOKKEEPING') print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
+					if ($modecompta != 'BOOKKEEPING') {
+						print '<a href="casoc.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
+					}
 					print price($cum[$case], 1);
-					if ($modecompta != 'BOOKKEEPING') print '</a>';
+					if ($modecompta != 'BOOKKEEPING') {
+						print '</a>';
+					}
 				} else {
-					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
+					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) {
+						print '0';
+					} else {
+						print '&nbsp;';
+					}
 				}
 			}
 			print "</td>";
@@ -371,38 +416,38 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 			print '<td class="borderrightlight right">';
 			//var_dump($annee.' '.$year_end.' '.$mois.' '.$month_end);
 			if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
-				if ($annee_decalage > $minyear && $case <= $casenow)
-				{
-					if ($cum[$caseprev] && $cum[$case])
-					{
+				if ($annee_decalage > $minyear && $case <= $casenow) {
+					if ($cum[$caseprev] && $cum[$case]) {
 						$percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100);
 						//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
 						print ($percent >= 0 ? "+$percent" : "$percent").'%';
 					}
-					if ($cum[$caseprev] && !$cum[$case])
-					{
+					if ($cum[$caseprev] && !$cum[$case]) {
 						print '-100%';
 					}
-					if (!$cum[$caseprev] && $cum[$case])
-					{
+					if (!$cum[$caseprev] && $cum[$case]) {
 						//print '<td class="right">+Inf%</td>';
 						print '-';
 					}
-					if (isset($cum[$caseprev]) && !$cum[$caseprev] && !$cum[$case])
-					{
+					if (isset($cum[$caseprev]) && !$cum[$caseprev] && !$cum[$case]) {
 						print '+0%';
 					}
-					if (!isset($cum[$caseprev]) && !$cum[$case])
-					{
+					if (!isset($cum[$caseprev]) && !$cum[$case]) {
 						print '-';
 					}
 				} else {
-					if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
+					if ($minyearmonth <= $case && $case <= $maxyearmonth) {
+						print '-';
+					} else {
+						print '&nbsp;';
+					}
 				}
 			}
 			print '</td>';
 
-			if ($annee_decalage < $year_end || ($annee_decalage == $year_end && $mois > 12 && $annee < $year_end)) print '<td width="15">&nbsp;</td>';
+			if ($annee_decalage < $year_end || ($annee_decalage == $year_end && $mois > 12 && $annee < $year_end)) {
+				print '<td width="15">&nbsp;</td>';
+			}
 		}
 
 		if ($annee < $year_end || ($annee == $year_end && $mois <= $month_end)) {
@@ -481,8 +526,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 
 // Show total
 print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td>';
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	if ($modecompta == 'CREANCES-DETTES') {
 		// Montant total HT
 		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
@@ -511,25 +555,28 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 			print ($percent >= 0 ? "+$percent" : "$percent").'%';
 			print '</td>';
 		}
-		if ($total[$annee - 1] && !$total[$annee])
-		{
+		if ($total[$annee - 1] && !$total[$annee]) {
 			print '<td class="borderrightlight right">-100%</td>';
 		}
-		if (!$total[$annee - 1] && $total[$annee])
-		{
+		if (!$total[$annee - 1] && $total[$annee]) {
 			print '<td class="borderrightlight right">+'.$langs->trans('Inf').'%</td>';
 		}
-		if (!$total[$annee - 1] && !$total[$annee])
-		{
+		if (!$total[$annee - 1] && !$total[$annee]) {
 			print '<td class="borderrightlight right">+0%</td>';
 		}
 	} else {
 		print '<td class="borderrightlight right">';
-		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print '&nbsp;'; }
+		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) {
+			print '-';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td>';
 	}
 
-	if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
+	if ($annee != $year_end) {
+		print '<td width="15">&nbsp;</td>';
+	}
 }
 print "</tr>\n";
 print "</table>";
diff --git a/htdocs/compta/stats/supplier_turnover.php b/htdocs/compta/stats/supplier_turnover.php
index eeb1c142712..a6adf2a2440 100644
--- a/htdocs/compta/stats/supplier_turnover.php
+++ b/htdocs/compta/stats/supplier_turnover.php
@@ -38,8 +38,7 @@ $nbofyear = 4;
 
 // Date range
 $year = GETPOST('year', 'int');
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$month_current = strftime("%m", dol_now());
 	$year_start = $year_current - ($nbofyear - 1);
@@ -52,30 +51,38 @@ $date_start = dol_mktime(0, 0, 0, $date_startmonth, $date_startday, $date_starty
 $date_end = dol_mktime(23, 59, 59, $date_endmonth, $date_endday, $date_endyear);
 
 // We define date_start and date_end
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q") ?GETPOST("q") : 0;
-	if ($q == 0)
-	{
+	if ($q == 0) {
 		// We define date_start and date_end
 		$year_end = $year_start + ($nbofyear - 1);
 		$month_start = GETPOST("month") ? GETPOST("month", 'int') : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-		if (!GETPOST('month'))
-		{
-			if (!GETPOST("year") && $month_start > $month_current)
-			{
+		if (!GETPOST('month')) {
+			if (!GETPOST("year") && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-		} else $month_end = $month_start;
+			if ($month_end < 1) {
+				$month_end = 12;
+			}
+		} else {
+			$month_end = $month_start;
+		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	if ($q == 1) {
+		$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+	}
+	if ($q == 2) {
+		$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+	}
+	if ($q == 3) {
+		$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+	}
+	if ($q == 4) {
+		$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+	}
 }
 
 $userid = GETPOST('userid', 'int');
@@ -89,13 +96,23 @@ $nbofyear = ($year_end - $year_start) + 1;
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES' or 'BOOKKEEPING')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (!empty($conf->accounting->enabled)) $modecompta = 'BOOKKEEPING';
-if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta", 'alpha');
+if (!empty($conf->accounting->enabled)) {
+	$modecompta = 'BOOKKEEPING';
+}
+if (GETPOST("modecompta")) {
+	$modecompta = GETPOST("modecompta", 'alpha');
+}
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 
 
@@ -109,8 +126,7 @@ llxHeader();
 $form = new Form($db);
 
 // Affiche en-tete du rapport
-if ($modecompta == "CREANCES-DETTES")
-{
+if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeDebt");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInBookkeepingMode", '{link1}', '{link2}').')';
@@ -121,8 +137,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("PurchaseTurnoverCollected");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -130,8 +145,7 @@ if ($modecompta == "CREANCES-DETTES")
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "BOOKKEEPING")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
 	$name = $langs->trans("PurchaseTurnover");
 	$calcmode = $langs->trans("CalcModeBookkeeping");
 	$calcmode .= '<br>('.$langs->trans("SeeReportInDueDebtMode", '{link1}', '{link2}').')';
@@ -145,25 +159,26 @@ if ($modecompta == "CREANCES-DETTES")
 }
 
 $moreparam = array();
-if (!empty($modecompta)) $moreparam['modecompta'] = $modecompta;
+if (!empty($modecompta)) {
+	$moreparam['modecompta'] = $modecompta;
+}
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $moreparam, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
 
-if ($modecompta == 'CREANCES-DETTES')
-{
+if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT date_format(f.datef,'%Y-%m') as dm, sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= " WHERE f.fk_statut in (1,2)";
 	$sql .= " AND f.type IN (0,2)";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$sql = "SELECT date_format(p.datep,'%Y-%m') as dm, sum(pf.amount) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
@@ -171,9 +186,10 @@ if ($modecompta == 'CREANCES-DETTES')
 	$sql .= " WHERE p.rowid = pf.fk_paiementfourn";
 	$sql .= " AND pf.fk_facturefourn = f.rowid";
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-} elseif ($modecompta == "BOOKKEEPING")
-{
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+} elseif ($modecompta == "BOOKKEEPING") {
 	$sql = "SELECT date_format(b.doc_date,'%Y-%m') as dm, sum(b.debit) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b, ".MAIN_DB_PREFIX."accounting_journal as aj";
 	$sql .= " WHERE b.entity = ".$conf->entity; // In module double party accounting, we never share entities
@@ -189,17 +205,14 @@ $sql .= " ORDER BY dm";
 $minyearmonth = $maxyearmonth = 0;
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($result);
 		$cum_ht[$obj->dm] = !empty($obj->amount) ? $obj->amount : 0;
 		$cum[$obj->dm] = $obj->amount_ttc;
-		if ($obj->amount_ttc)
-		{
+		if ($obj->amount_ttc) {
 			$minyearmonth = ($minyearmonth ? min($minyearmonth, $obj->dm) : $obj->dm);
 			$maxyearmonth = max($maxyearmonth, $obj->dm);
 		}
@@ -217,26 +230,39 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 
 print '<tr class="liste_titre"><td>&nbsp;</td>';
 
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
-	if ($modecompta == 'CREANCES-DETTES') print '<td align="center" width="10%" colspan="3">';
-	else print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
-	if ($modecompta != 'BOOKKEEPING') print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee.($modecompta ? '&modecompta='.$modecompta : '').'">';
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
+	if ($modecompta == 'CREANCES-DETTES') {
+		print '<td align="center" width="10%" colspan="3">';
+	} else {
+		print '<td align="center" width="10%" colspan="2" class="borderrightlight">';
+	}
+	if ($modecompta != 'BOOKKEEPING') {
+		print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee.($modecompta ? '&modecompta='.$modecompta : '').'">';
+	}
 	print $annee;
-	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) print '-'.($annee + 1);
-	if ($modecompta != 'BOOKKEEPING') print '</a>';
+	if ($conf->global->SOCIETE_FISCAL_MONTH_START > 1) {
+		print '-'.($annee + 1);
+	}
+	if ($modecompta != 'BOOKKEEPING') {
+		print '</a>';
+	}
 	print '</td>';
-	if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
+	if ($annee != $year_end) {
+		print '<td width="15">&nbsp;</td>';
+	}
 }
 print '</tr>';
 
 print '<tr class="liste_titre"><td class="liste_titre">'.$langs->trans("Month").'</td>';
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
-	if ($modecompta == 'CREANCES-DETTES') print '<td class="liste_titre right">'.$langs->trans("AmountHT").'</td>';
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
+	if ($modecompta == 'CREANCES-DETTES') {
+		print '<td class="liste_titre right">'.$langs->trans("AmountHT").'</td>';
+	}
 	print '<td class="liste_titre right">'.$langs->trans("AmountTTC").'</td>';
 	print '<td class="liste_titre right borderrightlight">'.$langs->trans("Delta").'</td>';
-	if ($annee != $year_end) print '<td class="liste_titre" width="15">&nbsp;</td>';
+	if ($annee != $year_end) {
+		print '<td class="liste_titre" width="15">&nbsp;</td>';
+	}
 }
 print '</tr>';
 
@@ -251,10 +277,11 @@ $casenow = dol_print_date($now, "%Y-%m");
 
 // Loop on each month
 $nb_mois_decalage = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START - 1) : 0;
-for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
-{
+for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 	$mois_modulo = $mois; // ajout
-	if ($mois > 12) {$mois_modulo = $mois - 12; } // ajout
+	if ($mois > 12) {
+		$mois_modulo = $mois - 12;
+	} // ajout
 
 	if ($year_start == $year_end) {
 		if ($mois > $date_endmonth && $year_end >= $date_endyear) {
@@ -267,74 +294,84 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 	// Month
 	print "<td>".dol_print_date(dol_mktime(12, 0, 0, $mois_modulo, 1, 2000), "%B")."</td>";
 
-	for ($annee = $year_start - 1; $annee <= $year_end; $annee++)	// We start one year before to have data to be able to make delta
-	{
+	for ($annee = $year_start - 1; $annee <= $year_end; $annee++) {	// We start one year before to have data to be able to make delta
 		$annee_decalage = $annee;
-		if ($mois > 12) {$annee_decalage = $annee + 1; }
+		if ($mois > 12) {
+			$annee_decalage = $annee + 1;
+		}
 		$case = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage), "%Y-%m");
 		$caseprev = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage - 1), "%Y-%m");
 
-		if ($annee >= $year_start)	// We ignore $annee < $year_start, we loop on it to be able to make delta, nothing is output.
-		{
+		if ($annee >= $year_start) {	// We ignore $annee < $year_start, we loop on it to be able to make delta, nothing is output.
 			if ($modecompta == 'CREANCES-DETTES') {
 				// Valeur CA du mois w/o VAT
 				print '<td class="right">';
-				if ($cum_ht[$case])
-				{
+				if ($cum_ht[$case]) {
 					$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
 					print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price($cum_ht[$case], 1).'</a>';
 				} else {
-					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
+					if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) {
+						print '0';
+					} else {
+						print '&nbsp;';
+					}
 				}
 				print "</td>";
 			}
 
 			// Valeur CA du mois
 			print '<td class="right">';
-			if ($cum[$case])
-			{
+			if ($cum[$case]) {
 				$now_show_delta = 1; // On a trouve le premier mois de la premiere annee generant du chiffre.
-				if ($modecompta != 'BOOKKEEPING') print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
+				if ($modecompta != 'BOOKKEEPING') {
+					print '<a href="supplier_turnover_by_thirdparty.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">';
+				}
 				print price($cum[$case], 1);
-				if ($modecompta != 'BOOKKEEPING') print '</a>';
+				if ($modecompta != 'BOOKKEEPING') {
+					print '</a>';
+				}
 			} else {
-				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) { print '0'; } else { print '&nbsp;'; }
+				if ($minyearmonth < $case && $case <= max($maxyearmonth, $nowyearmonth)) {
+					print '0';
+				} else {
+					print '&nbsp;';
+				}
 			}
 			print "</td>";
 
 			// Pourcentage du mois
-			if ($annee_decalage > $minyear && $case <= $casenow)
-			{
-				if ($cum[$caseprev] && $cum[$case])
-				{
+			if ($annee_decalage > $minyear && $case <= $casenow) {
+				if ($cum[$caseprev] && $cum[$case]) {
 					$percent = (round(($cum[$case] - $cum[$caseprev]) / $cum[$caseprev], 4) * 100);
 					//print "X $cum[$case] - $cum[$caseprev] - $cum[$caseprev] - $percent X";
 					print '<td class="borderrightlight right">'.($percent >= 0 ? "+$percent" : "$percent").'%</td>';
 				}
-				if ($cum[$caseprev] && !$cum[$case])
-				{
+				if ($cum[$caseprev] && !$cum[$case]) {
 					print '<td class="borderrightlight right">-100%</td>';
 				}
-				if (!$cum[$caseprev] && $cum[$case])
-				{
+				if (!$cum[$caseprev] && $cum[$case]) {
 					//print '<td class="right">+Inf%</td>';
 					print '<td class="borderrightlight right">-</td>';
 				}
-				if (isset($cum[$caseprev]) && !$cum[$caseprev] && !$cum[$case])
-				{
+				if (isset($cum[$caseprev]) && !$cum[$caseprev] && !$cum[$case]) {
 					print '<td class="borderrightlight right">+0%</td>';
 				}
-				if (!isset($cum[$caseprev]) && !$cum[$case])
-				{
+				if (!isset($cum[$caseprev]) && !$cum[$case]) {
 					print '<td class="borderrightlight right">-</td>';
 				}
 			} else {
 				print '<td class="borderrightlight right">';
-				if ($minyearmonth <= $case && $case <= $maxyearmonth) { print '-'; } else { print '&nbsp;'; }
+				if ($minyearmonth <= $case && $case <= $maxyearmonth) {
+					print '-';
+				} else {
+					print '&nbsp;';
+				}
 				print '</td>';
 			}
 
-			if ($annee_decalage < $year_end || ($annee_decalage == $year_end && $mois > 12 && $annee < $year_end)) print '<td width="15">&nbsp;</td>';
+			if ($annee_decalage < $year_end || ($annee_decalage == $year_end && $mois > 12 && $annee < $year_end)) {
+				print '<td width="15">&nbsp;</td>';
+			}
 		}
 
 		$total_ht[$annee] += ((!empty($cum_ht[$case])) ? $cum_ht[$case] : 0);
@@ -346,12 +383,10 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++)
 
 // Affiche total
 print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td>';
-for ($annee = $year_start; $annee <= $year_end; $annee++)
-{
+for ($annee = $year_start; $annee <= $year_end; $annee++) {
 	if ($modecompta == 'CREANCES-DETTES') {
 		// Montant total HT
-		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
-		{
+		if ($total_ht[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
 			print '<td class="nowrap right">'.($total_ht[$annee] ?price($total_ht[$annee]) : "0")."</td>";
 		} else {
 			print '<td>&nbsp;</td>';
@@ -359,39 +394,40 @@ for ($annee = $year_start; $annee <= $year_end; $annee++)
 	}
 
 	// Montant total
-	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear)))
-	{
+	if ($total[$annee] || ($annee >= $minyear && $annee <= max($nowyear, $maxyear))) {
 		print '<td class="nowrap right">'.($total[$annee] ?price($total[$annee]) : "0")."</td>";
 	} else {
 		print '<td>&nbsp;</td>';
 	}
 
 	// Pourcentage total
-	if ($annee > $minyear && $annee <= max($nowyear, $maxyear))
-	{
+	if ($annee > $minyear && $annee <= max($nowyear, $maxyear)) {
 		if ($total[$annee - 1] && $total[$annee]) {
 			$percent = (round(($total[$annee] - $total[$annee - 1]) / $total[$annee - 1], 4) * 100);
 			print '<td class="nowrap borderrightlight right">'.($percent >= 0 ? "+$percent" : "$percent").'%</td>';
 		}
-		if ($total[$annee - 1] && !$total[$annee])
-		{
+		if ($total[$annee - 1] && !$total[$annee]) {
 			print '<td class="borderrightlight right">-100%</td>';
 		}
-		if (!$total[$annee - 1] && $total[$annee])
-		{
+		if (!$total[$annee - 1] && $total[$annee]) {
 			print '<td class="borderrightlight right">+'.$langs->trans('Inf').'%</td>';
 		}
-		if (!$total[$annee - 1] && !$total[$annee])
-		{
+		if (!$total[$annee - 1] && !$total[$annee]) {
 			print '<td class="borderrightlight right">+0%</td>';
 		}
 	} else {
 		print '<td class="borderrightlight right">';
-		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) { print '-'; } else { print '&nbsp;'; }
+		if ($total[$annee] || ($minyear <= $annee && $annee <= max($nowyear, $maxyear))) {
+			print '-';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td>';
 	}
 
-	if ($annee != $year_end) print '<td width="15">&nbsp;</td>';
+	if ($annee != $year_end) {
+		print '<td width="15">&nbsp;</td>';
+	}
 }
 print "</tr>\n";
 print "</table>";
diff --git a/htdocs/compta/stats/supplier_turnover_by_prodserv.php b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
index 18e03d05f8f..553bd62899e 100644
--- a/htdocs/compta/stats/supplier_turnover_by_prodserv.php
+++ b/htdocs/compta/stats/supplier_turnover_by_prodserv.php
@@ -33,18 +33,30 @@ $langs->loadLangs(array("products", "categories", "errors", 'accountancy'));
 // Security pack (data & check)
 $socid = GETPOST('socid', 'int');
 
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta");
+if (GETPOST("modecompta")) {
+	$modecompta = GETPOST("modecompta");
+}
 
 $sortorder = isset($_GET["sortorder"]) ? $_GET["sortorder"] : $_POST["sortorder"];
 $sortfield = isset($_GET["sortfield"]) ? $_GET["sortfield"] : $_POST["sortfield"];
-if (!$sortorder) $sortorder = "asc";
-if (!$sortfield) $sortfield = "ref";
+if (!$sortorder) {
+	$sortorder = "asc";
+}
+if (!$sortfield) {
+	$sortfield = "ref";
+}
 
 // Category
 $selected_cat = (int) GETPOST('search_categ', 'int');
@@ -55,7 +67,9 @@ if (GETPOST('subcat', 'alpha') === 'yes') {
 }
 // product/service
 $selected_type = GETPOST('search_type', 'int');
-if ($selected_type == '') $selected_type = -1;
+if ($selected_type == '') {
+	$selected_type = -1;
+}
 
 // Hook
 $hookmanager->initHooks(array('supplierturnoverbyprodservlist'));
@@ -69,8 +83,7 @@ $date_startday = GETPOST("date_startday");
 $date_endyear = GETPOST("date_endyear");
 $date_endmonth = GETPOST("date_endmonth");
 $date_endday = GETPOST("date_endday");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$month_current = strftime("%m", dol_now());
 	$year_start = $year_current;
@@ -82,32 +95,39 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int");
-	if (empty($q))
-	{
+	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
-		if (!GETPOST("month"))	// If month not forced
-		{
-			if (!GETPOST('year') && $month_start > $month_current)
-			{
+		if (!GETPOST("month")) {	// If month not forced
+			if (!GETPOST('year') && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	} else {
-		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+		if ($q == 1) {
+			$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+		}
+		if ($q == 2) {
+			$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+		}
+		if ($q == 3) {
+			$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+		}
+		if ($q == 4) {
+			$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+		}
 	}
 } else {
 	// TODO We define q
@@ -121,25 +141,53 @@ $year_end = $tmpe['year'];
 $nbofyear = ($year_end - $year_start) + 1;
 
 $commonparams = array();
-if (!empty($modecompta)) $commonparams['modecompta'] = $modecompta;
-if (!empty($sortorder)) $commonparams['sortorder'] = $sortorder;
-if (!empty($sortfield)) $commonparams['sortfield'] = $sortfield;
+if (!empty($modecompta)) {
+	$commonparams['modecompta'] = $modecompta;
+}
+if (!empty($sortorder)) {
+	$commonparams['sortorder'] = $sortorder;
+}
+if (!empty($sortfield)) {
+	$commonparams['sortfield'] = $sortfield;
+}
 
 $headerparams = array();
-if (!empty($date_startyear)) $headerparams['date_startyear'] = $date_startyear;
-if (!empty($date_startmonth)) $headerparams['date_startmonth'] = $date_startmonth;
-if (!empty($date_startday)) $headerparams['date_startday'] = $date_startday;
-if (!empty($date_endyear)) $headerparams['date_endyear'] = $date_endyear;
-if (!empty($date_endmonth)) $headerparams['date_endmonth'] = $date_endmonth;
-if (!empty($date_endday)) $headerparams['date_endday'] = $date_endday;
-if (!empty($year)) $headerparams['year'] = $year;
-if (!empty($month)) $headerparams['month'] = $month;
+if (!empty($date_startyear)) {
+	$headerparams['date_startyear'] = $date_startyear;
+}
+if (!empty($date_startmonth)) {
+	$headerparams['date_startmonth'] = $date_startmonth;
+}
+if (!empty($date_startday)) {
+	$headerparams['date_startday'] = $date_startday;
+}
+if (!empty($date_endyear)) {
+	$headerparams['date_endyear'] = $date_endyear;
+}
+if (!empty($date_endmonth)) {
+	$headerparams['date_endmonth'] = $date_endmonth;
+}
+if (!empty($date_endday)) {
+	$headerparams['date_endday'] = $date_endday;
+}
+if (!empty($year)) {
+	$headerparams['year'] = $year;
+}
+if (!empty($month)) {
+	$headerparams['month'] = $month;
+}
 $headerparams['q'] = $q;
 
 $tableparams = array();
-if (!empty($selected_cat)) $tableparams['search_categ'] = $selected_cat;
-if (!empty($selected_soc)) $tableparams['search_soc'] = $selected_soc;
-if (!empty($selected_type)) $tableparams['search_type'] = $selected_type;
+if (!empty($selected_cat)) {
+	$tableparams['search_categ'] = $selected_cat;
+}
+if (!empty($selected_soc)) {
+	$tableparams['search_soc'] = $selected_soc;
+}
+if (!empty($selected_type)) {
+	$tableparams['search_type'] = $selected_type;
+}
 $tableparams['subcat'] = ($subcat === true) ? 'yes' : '';
 
 // Adding common parameters
@@ -162,8 +210,12 @@ $form = new Form($db);
 $formother = new FormOther($db);
 
 // TODO Report from bookkeeping not yet available, so we switch on report on business events
-if ($modecompta == "BOOKKEEPING") $modecompta = "CREANCES-DETTES";
-if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
+if ($modecompta == "BOOKKEEPING") {
+	$modecompta = "CREANCES-DETTES";
+}
+if ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	$modecompta = "RECETTES-DEPENSES";
+}
 
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
@@ -173,28 +225,27 @@ if ($modecompta == "CREANCES-DETTES") {
 
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByProductsAndServices");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 
 	$builddate = dol_now();
-} elseif ($modecompta == "BOOKKEEPING")
-{
-} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") {
 }
 
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
-else $periodlink = '';
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
+	$periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+} else {
+	$periodlink = '';
+}
 
 report_header($name, $namelink, $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -207,20 +258,19 @@ $catotal = 0;
 $catotal_ht = 0;
 $qtytotal = 0;
 
-if ($modecompta == 'CREANCES-DETTES')
-{
+if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT DISTINCT p.rowid as rowid, p.ref as ref, p.label as label, p.fk_product_type as product_type,";
 	$sql .= " SUM(l.total_ht) as amount, SUM(l.total_ttc) as amount_ttc,";
 	$sql .= " SUM(CASE WHEN f.type = 2 THEN -l.qty ELSE l.qty END) as qty";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-	if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
+	if ($selected_soc > 0) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
+	}
 	$sql .= ",".MAIN_DB_PREFIX."facture_fourn_det as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	} elseif ($selected_cat) 	// Into a specific category
-	{
+	} elseif ($selected_cat) { 	// Into a specific category
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
 	$sql .= " WHERE l.fk_facture_fourn = f.rowid";
@@ -230,20 +280,22 @@ if ($modecompta == 'CREANCES-DETTES')
 	if ($date_start && $date_end) {
 		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_type >= 0)
-	{
+	if ($selected_type >= 0) {
 		$sql .= " AND l.product_type = ".$selected_type;
 	}
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " AND cp.fk_product is null";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$selected_cat;
-		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
+		if ($subcat) {
+			$sql .= " OR c.fk_parent = ".$selected_cat;
+		}
 		$sql .= ")";
 		$sql .= " AND cp.fk_categorie = c.rowid AND cp.fk_product = p.rowid";
 	}
-	if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
+	if ($selected_soc > 0) {
+		$sql .= " AND soc.rowid=".$selected_soc;
+	}
 	$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
 	$sql .= " GROUP BY p.rowid, p.ref, p.label, p.fk_product_type";
 	$sql .= $db->order($sortfield, $sortorder);
@@ -274,8 +326,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 	// Extra parameters management
-	foreach ($headerparams as $key => $value)
-	{
+	foreach ($headerparams as $key => $value) {
 		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}
 
@@ -374,7 +425,7 @@ if ($modecompta == 'CREANCES-DETTES')
 	print "</tr>\n";
 
 	if (count($name)) {
-		foreach ($name as $key=>$value) {
+		foreach ($name as $key => $value) {
 			print '<tr class="oddeven">';
 
 			// Product
diff --git a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
index a7f68644f7b..0e653d542f6 100644
--- a/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
+++ b/htdocs/compta/stats/supplier_turnover_by_thirdparty.php
@@ -34,12 +34,18 @@ $langs->loadLangs(array('companies', 'categories', 'bills', 'compta'));
 
 // Define modecompta ('CREANCES-DETTES' or 'RECETTES-DEPENSES')
 $modecompta = $conf->global->ACCOUNTING_MODE;
-if (GETPOST("modecompta")) $modecompta = GETPOST("modecompta");
+if (GETPOST("modecompta")) {
+	$modecompta = GETPOST("modecompta");
+}
 
 $sortorder = isset($_GET["sortorder"]) ? $_GET["sortorder"] : $_POST["sortorder"];
 $sortfield = isset($_GET["sortfield"]) ? $_GET["sortfield"] : $_POST["sortfield"];
-if (!$sortorder) $sortorder = "asc";
-if (!$sortfield) $sortfield = "nom";
+if (!$sortorder) {
+	$sortorder = "asc";
+}
+if (!$sortfield) {
+	$sortfield = "nom";
+}
 
 $socid = GETPOST('socid', 'int');
 
@@ -54,9 +60,15 @@ if (GETPOST('subcat', 'alpha') === 'yes') {
 $hookmanager->initHooks(array('supplierturnoverbythirdpartylist'));
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
-if (!empty($conf->comptabilite->enabled)) $result = restrictedArea($user, 'compta', '', '', 'resultat');
-if (!empty($conf->accounting->enabled)) $result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
+if (!empty($conf->comptabilite->enabled)) {
+	$result = restrictedArea($user, 'compta', '', '', 'resultat');
+}
+if (!empty($conf->accounting->enabled)) {
+	$result = restrictedArea($user, 'accounting', '', '', 'comptarapport');
+}
 
 // Date range
 $year = GETPOST("year", 'int');
@@ -71,8 +83,7 @@ $date_startday = GETPOST("date_startday", 'alpha');
 $date_endyear = GETPOST("date_endyear", 'alpha');
 $date_endmonth = GETPOST("date_endmonth", 'alpha');
 $date_endday = GETPOST("date_endday", 'alpha');
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = strftime("%Y", dol_now());
 	$month_current = strftime("%m", dol_now());
 	$year_start = $year_current;
@@ -84,32 +95,39 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Quarter
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int") ?GETPOST("q", "int") : 0;
-	if (empty($q))
-	{
+	if (empty($q)) {
 		// We define date_start and date_end
 		$month_start = GETPOST("month") ?GETPOST("month") : ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
 		$year_end = $year_start;
 		$month_end = $month_start;
-		if (!GETPOST("month"))	// If month not forced
-		{
-			if (!GETPOST('year') && $month_start > $month_current)
-			{
+		if (!GETPOST("month")) {	// If month not forced
+			if (!GETPOST('year') && $month_start > $month_current) {
 				$year_start--;
 				$year_end--;
 			}
 			$month_end = $month_start - 1;
-			if ($month_end < 1) $month_end = 12;
-			else $year_end++;
+			if ($month_end < 1) {
+				$month_end = 12;
+			} else {
+				$year_end++;
+			}
 		}
 		$date_start = dol_get_first_day($year_start, $month_start, false); $date_end = dol_get_last_day($year_end, $month_end, false);
 	}
-	if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-	if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-	if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-	if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	if ($q == 1) {
+		$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+	}
+	if ($q == 2) {
+		$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+	}
+	if ($q == 3) {
+		$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+	}
+	if ($q == 4) {
+		$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+	}
 } else {
 	// TODO We define q
 }
@@ -164,39 +182,41 @@ $thirdparty_static = new Societe($db);
 $formother = new FormOther($db);
 
 // TODO Report from bookkeeping not yet available, so we switch on report on business events
-if ($modecompta == "BOOKKEEPING") $modecompta = "CREANCES-DETTES";
-if ($modecompta == "BOOKKEEPINGCOLLECTED") $modecompta = "RECETTES-DEPENSES";
+if ($modecompta == "BOOKKEEPING") {
+	$modecompta = "CREANCES-DETTES";
+}
+if ($modecompta == "BOOKKEEPINGCOLLECTED") {
+	$modecompta = "RECETTES-DEPENSES";
+}
 
 // Show report header
-if ($modecompta == "CREANCES-DETTES")
-{
+if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("PurchaseTurnover").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeDebt");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=RECETTES-DEPENSES">','</a>').')';
 	$description = $langs->trans("RulesPurchaseTurnoverDue");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "RECETTES-DEPENSES")
-{
+} elseif ($modecompta == "RECETTES-DEPENSES") {
 	$name = $langs->trans("PurchaseTurnoverCollected").', '.$langs->trans("ByThirdParties");
 	$calcmode = $langs->trans("CalcModeEngagement");
 	//$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modecompta=CREANCES-DETTES">','</a>').')';
 	$description = $langs->trans("RulesPurchaseTurnoverIn");
 	$builddate = dol_now();
 	//$exportlink=$langs->trans("NotYetAvailable");
-} elseif ($modecompta == "BOOKKEEPING")
-{
-} elseif ($modecompta == "BOOKKEEPINGCOLLECTED")
-{
+} elseif ($modecompta == "BOOKKEEPING") {
+} elseif ($modecompta == "BOOKKEEPINGCOLLECTED") {
 }
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) $periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
-else $periodlink = '';
+if ($date_end == dol_time_plus_duree($date_start, 1, 'y') - 1) {
+	$periodlink = '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start - 1).'&modecompta='.$modecompta.'">'.img_previous().'</a> <a href="'.$_SERVER["PHP_SELF"].'?year='.($year_start + 1).'&modecompta='.$modecompta.'">'.img_next().'</a>';
+} else {
+	$periodlink = '';
+}
 
 report_header($name, '', $period, $periodlink, $description, $builddate, $exportlink, $tableparams, $calcmode);
 
-if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING')
-{
+if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 	print info_admin($langs->trans("WarningReportNotReliable"), 0, 0, 1);
 }
 
@@ -210,11 +230,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql = "SELECT DISTINCT s.rowid as socid, s.nom as name, s.zip, s.town, s.fk_pays,";
 	$sql .= " sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	} elseif ($selected_cat) 	// Into a specific category
-	{
+	} elseif ($selected_cat) { 	// Into a specific category
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE f.fk_statut in (1,2)";
@@ -223,12 +241,13 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($date_start && $date_end) {
 		$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$db->escape($selected_cat);
-		if ($subcat) $sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
+		if ($subcat) {
+			$sql .= " OR c.fk_parent = ".$db->escape($selected_cat);
+		}
 		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
@@ -238,11 +257,9 @@ if ($modecompta == 'CREANCES-DETTES') {
 	$sql .= ", ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf";
 	$sql .= ", ".MAIN_DB_PREFIX."paiementfourn as p";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
-	} elseif ($selected_cat) 	// Into a specific category
-	{
+	} elseif ($selected_cat) { 	// Into a specific category
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
 	}
 	$sql .= " WHERE p.rowid = pf.fk_paiementfourn";
@@ -251,22 +268,33 @@ if ($modecompta == 'CREANCES-DETTES') {
 	if ($date_start && $date_end) {
 		$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 	}
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " AND cs.fk_soc is null";
 	} elseif ($selected_cat) {	// Into a specific category
 		$sql .= " AND (c.rowid = ".$selected_cat;
-		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
+		if ($subcat) {
+			$sql .= " OR c.fk_parent = ".$selected_cat;
+		}
 		$sql .= ")";
 		$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_soc = s.rowid";
 	}
 }
-if (!empty($search_societe))  $sql .= natural_search('s.nom', $search_societe);
-if (!empty($search_zip))      $sql .= natural_search('s.zip', $search_zip);
-if (!empty($search_town))     $sql .= natural_search('s.town', $search_town);
-if ($search_country > 0)      $sql .= ' AND s.fk_pays = '.$search_country.'';
+if (!empty($search_societe)) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if (!empty($search_zip)) {
+	$sql .= natural_search('s.zip', $search_zip);
+}
+if (!empty($search_town)) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_country > 0) {
+	$sql .= ' AND s.fk_pays = '.$search_country.'';
+}
 $sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
-if ($socid) $sql .= " AND f.fk_soc = ".$socid;
+if ($socid) {
+	$sql .= " AND f.fk_soc = ".$socid;
+}
 $sql .= " GROUP BY s.rowid, s.nom, s.zip, s.town, s.fk_pays";
 $sql .= " ORDER BY s.rowid";
 //echo $sql;
@@ -297,8 +325,7 @@ $i = 0;
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 // Extra parameters management
-foreach ($headerparams as $key => $value)
-{
+foreach ($headerparams as $key => $value) {
 	 print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 }
 
@@ -352,8 +379,9 @@ print_liste_field_titre(
 	"",
 	$paramslink,
 	"",
-	$sortfield, $sortorder
-	);
+	$sortfield,
+	$sortorder
+);
 print_liste_field_titre(
 	$langs->trans("Zip"),
 	$_SERVER["PHP_SELF"],
@@ -361,8 +389,9 @@ print_liste_field_titre(
 	"",
 	$paramslink,
 	"",
-	$sortfield, $sortorder
-	);
+	$sortfield,
+	$sortorder
+);
 print_liste_field_titre(
 	$langs->trans("Town"),
 	$_SERVER["PHP_SELF"],
@@ -370,8 +399,9 @@ print_liste_field_titre(
 	"",
 	$paramslink,
 	"",
-	$sortfield, $sortorder
-	);
+	$sortfield,
+	$sortorder
+);
 print_liste_field_titre(
 	$langs->trans("Country"),
 	$_SERVER["PHP_SELF"],
@@ -379,18 +409,19 @@ print_liste_field_titre(
 	"",
 	$paramslink,
 	"",
-	$sortfield, $sortorder
-	);
+	$sortfield,
+	$sortorder
+);
 if ($modecompta == 'CREANCES-DETTES') {
 	print_liste_field_titre(
-		   $langs->trans('AmountHT'),
-		   $_SERVER["PHP_SELF"],
-		   "amount_ht",
-		   "",
-		   $paramslink,
-		   'class="right"',
-		   $sortfield,
-		   $sortorder
+		$langs->trans('AmountHT'),
+		$_SERVER["PHP_SELF"],
+		"amount_ht",
+		"",
+		$paramslink,
+		'class="right"',
+		$sortfield,
+		$sortorder
 	);
 } else {
 	print_liste_field_titre('');
@@ -478,7 +509,7 @@ if (count($amount)) {
 		$arrayforsort = $address_town;
 	}
 
-	foreach ($arrayforsort as $key=>$value) {
+	foreach ($arrayforsort as $key => $value) {
 		print '<tr class="oddeven">';
 
 		// Third party
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 360340d84f6..87805ebf947 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 
 if (!empty($conf->accounting->enabled)) {
-        include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 }
 
 // Load translation files required by the page
@@ -49,7 +49,9 @@ if (GETPOSTISSET('auto_create_paiement') || $action === 'add') {
 	$auto_create_payment = empty($conf->global->CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT);
 }
 
-if (empty($refund)) $refund = 0;
+if (empty($refund)) {
+	$refund = 0;
+}
 
 $datev = dol_mktime(12, 0, 0, GETPOST("datevmonth", 'int'), GETPOST("datevday", 'int'), GETPOST("datevyear", 'int'));
 $datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday", 'int'), GETPOST("datepyear", 'int'));
@@ -57,7 +59,9 @@ $datep = dol_mktime(12, 0, 0, GETPOST("datepmonth", 'int'), GETPOST("datepday",
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 $object = new Tva($db);
@@ -70,36 +74,37 @@ $hookmanager->initHooks(array('taxvatcard', 'globalcard'));
  * Actions
  */
 
-if ($_POST["cancel"] == $langs->trans("Cancel") && !$id)
-{
+if ($_POST["cancel"] == $langs->trans("Cancel") && !$id) {
 	header("Location: list.php");
 	exit;
 }
 
-if ($action == 'setlib' && $user->rights->tax->charges->creer)
-{
+if ($action == 'setlib' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setValueFrom('label', GETPOST('lib', 'alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
-	if ($result < 0)
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
-if ($action == 'setdatev' && $user->rights->tax->charges->creer)
-{
-    $object->fetch($id);
-    $object->datev = $datev;
-    $result = $object->update($user);
-    if ($result < 0) dol_print_error($db, $object->error);
+if ($action == 'setdatev' && $user->rights->tax->charges->creer) {
+	$object->fetch($id);
+	$object->datev = $datev;
+	$result = $object->update($user);
+	if ($result < 0) {
+		dol_print_error($db, $object->error);
+	}
 
-    $action = '';
+	$action = '';
 }
 
 // payment mode
 if ($action == 'setmode' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	if ($result < 0)
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 // Bank account
@@ -112,19 +117,16 @@ if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
 }
 
 // Classify paid
-if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes')
-{
+if ($action == 'confirm_paid' && $user->rights->tax->charges->creer && $confirm == 'yes') {
 	$object->fetch($id);
 	$result = $object->setPaid($user);
 }
 
 if ($action == 'reopen' && $user->rights->tax->charges->creer) {
 	$result = $object->fetch($id);
-	if ($object->paye)
-	{
+	if ($object->paye) {
 		$result = $object->setUnpaid($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 			exit();
 		} else {
@@ -133,59 +135,53 @@ if ($action == 'reopen' && $user->rights->tax->charges->creer) {
 	}
 }
 
-if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
-{
-    $error = 0;
+if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel")) {
+	$error = 0;
 
-    $object->fk_account = GETPOST("accountid", 'int');
-    $object->type_payment = GETPOST("type_payment", 'alphanohtml');
+	$object->fk_account = GETPOST("accountid", 'int');
+	$object->type_payment = GETPOST("type_payment", 'alphanohtml');
 	$object->num_payment = GETPOST("num_payment", 'alphanohtml');
 
 	$object->datev = $datev;
-    $object->datep = $datep;
+	$object->datep = $datep;
 
 	$amount = price2num(GETPOST("amount", 'alpha'));
 	if ($refund == 1) {
 		$amount = -$amount;
 	}
-    $object->amount = $amount;
+	$object->amount = $amount;
 	$object->label = GETPOST("label", 'alpha');
 	$object->note = GETPOST("note", 'none');
 
-	if (empty($object->datep))
-	{
+	if (empty($object->datep)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("DatePayment")), null, 'errors');
 		$error++;
 	}
-	if (empty($object->datev))
-	{
+	if (empty($object->datev)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PeriodEndDate")), null, 'errors');
 		$error++;
 	}
-	if (!empty($auto_create_payment) && (empty($object->type_payment) || $object->type_payment < 0))
-	{
+	if (!empty($auto_create_payment) && (empty($object->type_payment) || $object->type_payment < 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PaymentMode")), null, 'errors');
 		$error++;
 	}
-	if (empty($object->amount))
-	{
+	if (empty($object->amount)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 		$error++;
 	}
-	if (!empty($auto_create_payment) && ($object->fk_account <= 0))
-	{
+	if (!empty($auto_create_payment) && ($object->fk_account <= 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountToCredit")), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$ret = $object->create($user);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
 		// Auto create payment
-		if (!empty($auto_create_payment) && !$error)
-		{
+		if (!empty($auto_create_payment) && !$error) {
 			$db->begin();
 
 			// Create a line of payments
@@ -197,32 +193,26 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 			$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
 			$paiement->note = GETPOST("note", 'none');
 
-			if (!$error)
-			{
+			if (!$error) {
 				$paymentid = $paiement->create($user, (int) GETPOST('closepaidtva'));
-				if ($paymentid < 0)
-				{
+				if ($paymentid < 0) {
 					$error++;
 					setEventMessages($paiement->error, null, 'errors');
 					$action = 'create';
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $paiement->addPaymentToBank($user, 'payment_vat', '(VATPayment)', GETPOST('accountid', 'int'), '', '');
-				if (!($result > 0))
-				{
+				if (!($result > 0)) {
 					$error++;
 					setEventMessages($paiement->error, null, 'errors');
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
-			}
-			else {
+			} else {
 				$db->rollback();
 			}
 		}
@@ -235,119 +225,105 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	$action = 'create';
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes')
-{
-    $result = $object->fetch($id);
+if ($action == 'confirm_delete' && $confirm == 'yes') {
+	$result = $object->fetch($id);
 	$totalpaye = $object->getSommePaiement();
 
-	if (empty($totalpaye))
-	{
-	    $db->begin();
+	if (empty($totalpaye)) {
+		$db->begin();
 
-	    $ret = $object->delete($user);
-	    if ($ret > 0)
-	    {
-			if ($object->fk_bank)
-			{
+		$ret = $object->delete($user);
+		if ($ret > 0) {
+			if ($object->fk_bank) {
 				$accountline = new AccountLine($db);
 				$result = $accountline->fetch($object->fk_bank);
-				if ($result > 0) $result = $accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+				if ($result > 0) {
+					$result = $accountline->delete($user); // $result may be 0 if not found (when bank entry was deleted manually and fk_bank point to nothing)
+				}
 			}
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				$db->commit();
 				header("Location: ".DOL_URL_ROOT.'/compta/tva/list.php');
 				exit;
-			}
-			else {
+			} else {
 				$object->error = $accountline->error;
 				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
-	    }
-	    else {
-	        $db->rollback();
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
-	}
-	else {
+		} else {
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
 		setEventMessages($langs->trans('DisabledBecausePayments'), null, 'errors');
 	}
 }
 
-if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->creer)
-{
+if ($action == 'update' && !$_POST["cancel"] && $user->rights->tax->charges->creer) {
 	$amount = price2num(GETPOST('amount'));
 
-	if (empty($amount))
-	{
+	if (empty($amount)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'edit';
-	}
-	elseif (!is_numeric($amount))
-	{
+	} elseif (!is_numeric($amount)) {
 		setEventMessages($langs->trans("ErrorFieldMustBeANumeric", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
-	}
-	else {
+	} else {
 		$result = $object->fetch($id);
 
 		$object->amount		= price2num($amount);
 
 		$result = $object->update($user);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 }
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
+if ($action == 'confirm_clone' && $confirm != 'yes') {
+	$action = '';
+}
 
-if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer))
-{
+if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer)) {
 	$db->begin();
 
 	$originalId = $id;
 
 	$object->fetch($id);
 
-	if ($object->id > 0)
-	{
+	if ($object->id > 0) {
 		$object->paye = 0;
 		$object->id = $object->ref = null;
 
 		if (GETPOST('clone_label', 'alphanohtml')) {
 			$object->label = GETPOST('clone_label', 'alphanohtml');
-		}
-		else {
+		} else {
 			$object->label = $langs->trans("CopyOf").' '.$object->label;
 		}
 
 		$newdateperiod = dol_mktime(0, 0, 0, GETPOST('clone_periodmonth', 'int'), GETPOST('clone_periodday', 'int'), GETPOST('clone_periodyear', 'int'));
-		if ($newdateperiod) $object->datev = $newdateperiod;
+		if ($newdateperiod) {
+			$object->datev = $newdateperiod;
+		}
 
 		//if ($object->check()) {
 		$id = $object->create($user);
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			$db->commit();
 			$db->close();
 
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
-		}
-		else {
+		} else {
 			$id = $originalId;
 			$db->rollback();
 
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 		//}
-	}
-	else {
+	} else {
 		$db->rollback();
 		dol_print_error($db, $object->error);
 	}
@@ -364,23 +340,19 @@ $help_url = '';
 llxHeader("", $title, $helpurl);
 
 
-if ($id)
-{
+if ($id) {
 	$result = $object->fetch($id);
-	if ($result <= 0)
-	{
+	if ($result <= 0) {
 		dol_print_error($db);
 		exit;
 	}
 }
 
 // Form to enter VAT
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("VAT").' - '.$langs->trans("New"));
-	if (!empty($conf->use_javascript_ajax))
-    {
-        print "\n".'<script type="text/javascript" language="javascript">';
+	if (!empty($conf->use_javascript_ajax)) {
+		print "\n".'<script type="text/javascript" language="javascript">';
 		print /** @lang JavaScript */'
 			$(document).ready(function () {
 				let onAutoCreatePaiementChange = function () {
@@ -411,40 +383,40 @@ if ($action == 'create')
 		print '</script>'."\n";
 	}
 
-    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formvat" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" name="formvat" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    print '<div id="selectmethod">';
-    print '<div class="hideonsmartphone float">';
-    print $langs->trans("Type").':&nbsp;&nbsp;&nbsp;';
-    print '</div>';
-    print '<label for="radiopayment">';
-    print '<input type="radio" id="radiopayment" data-label="'.$langs->trans('VATPayment').'" class="flat" name="refund" value="0"'.($refund ? '' : ' checked="checked"').'>';
-    print '&nbsp;';
-    print $langs->trans("Payment");
-    print '</label>';
-    print '&nbsp;&nbsp;&nbsp;';
-    print '<label for="radiorefund">';
-    print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
-    print '&nbsp;';
-    print $langs->trans("Refund");
-    print '</label>';
-    print '</div>';
-    print "<br>\n";
+	print '<div id="selectmethod">';
+	print '<div class="hideonsmartphone float">';
+	print $langs->trans("Type").':&nbsp;&nbsp;&nbsp;';
+	print '</div>';
+	print '<label for="radiopayment">';
+	print '<input type="radio" id="radiopayment" data-label="'.$langs->trans('VATPayment').'" class="flat" name="refund" value="0"'.($refund ? '' : ' checked="checked"').'>';
+	print '&nbsp;';
+	print $langs->trans("Payment");
+	print '</label>';
+	print '&nbsp;&nbsp;&nbsp;';
+	print '<label for="radiorefund">';
+	print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
+	print '&nbsp;';
+	print $langs->trans("Refund");
+	print '</label>';
+	print '</div>';
+	print "<br>\n";
 
-    dol_fiche_head();
+	dol_fiche_head();
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    print '<tr class="hide_if_no_auto_create_payment">';
-    print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
-    print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print '<tr class="hide_if_no_auto_create_payment">';
+	print '<td class="fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
+	print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
-    print '<tr><td class="titlefieldcreate fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
-    print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
+	print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
 	// Label
 	if ($refund == 1) {
@@ -457,14 +429,13 @@ if ($action == 'create')
 	// Amount
 	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount", "alpha").'"></td></tr>';
 
-    // Type payment
+	// Type payment
 	print '<tr><td class="fieldrequired" id="label_type_payment">'.$langs->trans("PaymentMode").'</td><td>';
 	$form->select_types_paiements(GETPOST("type_payment"), "type_payment");
 	print "</td>\n";
 	print "</tr>";
 
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<tr><td class="fieldrequired" id="label_fk_account">'.$langs->trans("BankAccount").'</td><td>';
 		$form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 1); // List of bank account available
 		print '</td></tr>';
@@ -485,19 +456,19 @@ if ($action == 'create')
 	print '<td class="tdtop"><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_3.'"></textarea></td>';
 	print '</tr>';
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
 	// Bouton Save payment
 	print '<tr class="hide_if_no_auto_create_payment"><td>';
 	print $langs->trans("ClosePaidVATAutomatically");
 	print '</td><td><input type="checkbox" checked value="1" name="closepaidtva"></td></tr>';
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
 	print '<div class="center">';
 	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
@@ -505,19 +476,17 @@ if ($action == 'create')
 	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 // View mode
-if ($id)
-{
+if ($id) {
 	$head = vat_prepare_head($object);
 
 	$totalpaye = $object->getSommePaiement();
 
 	// Clone confirmation
-	if ($action === 'clone')
-	{
+	if ($action === 'clone') {
 		$formquestion = array(
 			array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
 		);
@@ -528,20 +497,17 @@ if ($id)
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVAT', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 240);
 	}
 
-	if ($action == 'paid')
-	{
+	if ($action == 'paid') {
 		$text = $langs->trans('ConfirmPayVAT');
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans('PayVAT'), $text, "confirm_paid", '', '', 2);
 	}
 
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$text = $langs->trans('ConfirmDeleteVAT');
 		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteVAT'), $text, 'confirm_delete', '', '', 2);
 	}
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		print "<form name=\"charge\" action=\"".$_SERVER["PHP_SELF"]."?id=$object->id&amp;action=update\" method=\"post\">";
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 	}
@@ -593,8 +559,9 @@ if ($id)
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode')
+	if ($action != 'editmode') {
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editmode') {
@@ -605,14 +572,14 @@ if ($id)
 	print '</td></tr>';
 
 	// Bank account
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('BankAccount');
 		print '<td>';
-		if ($action != 'editbankaccount' && $user->rights->tax->charges->creer)
+		if ($action != 'editbankaccount' && $user->rights->tax->charges->creer) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editbankaccount') {
@@ -659,8 +626,7 @@ if ($id)
 
 	//print $sql;
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$totalpaye = 0;
 
 		$num = $db->num_rows($resql);
@@ -678,11 +644,9 @@ if ($id)
 		print '<td class="right">'.$langs->trans("Amount").'</td>';
 		print '</tr>';
 
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			$bankaccountstatic = new Account($db);
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
 				print '<tr class="oddeven"><td>';
@@ -690,8 +654,7 @@ if ($id)
 				print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 				$labeltype = $langs->trans("PaymentType".$objp->type_code) != ("PaymentType".$objp->type_code) ? $langs->trans("PaymentType".$objp->type_code) : $objp->paiement_type;
 				print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-				if (!empty($conf->banque->enabled))
-				{
+				if (!empty($conf->banque->enabled)) {
 					$bankaccountstatic->id = $objp->baid;
 					$bankaccountstatic->ref = $objp->baref;
 					$bankaccountstatic->label = $objp->baref;
@@ -707,8 +670,9 @@ if ($id)
 					}
 
 					print '<td class="right">';
-					if ($bankaccountstatic->id)
+					if ($bankaccountstatic->id) {
 						print $bankaccountstatic->getNomUrl(1, 'transactions');
+					}
 					print '</td>';
 				}
 				print '<td class="right">'.price($objp->amount)."</td>\n";
@@ -716,8 +680,7 @@ if ($id)
 				$totalpaye += $objp->amount;
 				$i++;
 			}
-		}
-		else {
+		} else {
 			print '<tr class="oddeven"><td><span class="opacitymedium">'.$langs->trans("None").'</span></td>';
 			print '<td></td><td></td><td></td><td></td>';
 			print '</tr>';
@@ -736,8 +699,7 @@ if ($id)
 		print '</div>';
 
 		$db->free($resql);
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 
@@ -749,8 +711,7 @@ if ($id)
 
 	dol_fiche_end();
 
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		print '<div align="center">';
 		print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
 		print ' &nbsp; ';
@@ -763,23 +724,19 @@ if ($id)
 	 * Action buttons
 	 */
 	print "<div class=\"tabsAction\">\n";
-	if ($action != 'edit')
-	{
+	if ($action != 'edit') {
 		// Reopen
-		if ($object->paye && $user->rights->tax->charges->creer)
-		{
+		if ($object->paye && $user->rights->tax->charges->creer) {
 			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".dol_buildpath("/compta/tva/card.php", 1)."?id=$object->id&amp;action=reopen\">".$langs->trans("ReOpen")."</a></div>";
 		}
 
 		// Edit
-		if ($object->paye == 0 && $user->rights->tax->charges->creer)
-		{
+		if ($object->paye == 0 && $user->rights->tax->charges->creer) {
 			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/tva/card.php?id=$object->id&amp;action=edit\">".$langs->trans("Modify")."</a></div>";
 		}
 
 		// Emit payment
-		if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->tax->charges->creer)
-		{
+		if ($object->paye == 0 && ((price2num($object->amount) < 0 && price2num($resteapayer, 'MT') < 0) || (price2num($object->amount) > 0 && price2num($resteapayer, 'MT') > 0)) && $user->rights->tax->charges->creer) {
 			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/paiement_vat.php?id=$object->id&amp;action=create\">".$langs->trans("DoPayment")."</a></div>";
 		}
 
@@ -789,22 +746,18 @@ if ($id)
 			(round($resteapayer) <= 0 && $object->amount > 0)
 			|| (round($resteapayer) >= 0 && $object->amount < 0)
 		)
-		&& $user->rights->tax->charges->creer)
-		{
+		&& $user->rights->tax->charges->creer) {
 			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/tva/card.php?id=$object->id&amp;action=paid\">".$langs->trans("ClassifyPaid")."</a></div>";
 		}
 
 		// Clone
-		if ($user->rights->tax->charges->creer)
-		{
+		if ($user->rights->tax->charges->creer) {
 			print "<div class=\"inline-block divButAction\"><a class=\"butAction\" href=\"".dol_buildpath("/compta/tva/card.php", 1)."?id=$object->id&amp;action=clone\">".$langs->trans("ToClone")."</a></div>";
 		}
 
-		if (!empty($user->rights->tax->charges->supprimer) && empty($totalpaye))
-		{
+		if (!empty($user->rights->tax->charges->supprimer) && empty($totalpaye)) {
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a></div>';
-		}
-		else {
+		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>';
 		}
 	}
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index 13369e596bc..ff1c8b46040 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -48,8 +48,8 @@ class PaymentVAT extends CommonObject
 	public $picto = 'payment';
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_tva;
 
 	public $datec = '';
@@ -62,12 +62,12 @@ class PaymentVAT extends CommonObject
 	 */
 	public $total;
 
-    public $amount; // Total amount of payment
-    public $amounts = array(); // Array of amounts
+	public $amount; // Total amount of payment
+	public $amounts = array(); // Array of amounts
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_typepaiement;
 
 	/**
@@ -82,18 +82,18 @@ class PaymentVAT extends CommonObject
 	public $num_payment;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 	/**
@@ -108,8 +108,8 @@ class PaymentVAT extends CommonObject
 
 	/**
 	 *  Create payment of social contribution into database.
-     *  Use this->amounts to have list of lines for the payment
-     *
+	 *  Use this->amounts to have list of lines for the payment
+	 *
 	 *  @param      User	$user   				User making payment
 	 *	@param		int		$closepaidcontrib   	1=Also close payed contributions to paid, 0=Do nothing more
 	 *  @return     int     						<0 if KO, id of payment if OK
@@ -120,45 +120,62 @@ class PaymentVAT extends CommonObject
 
 		$error = 0;
 
-        $now = dol_now();
+		$now = dol_now();
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 
 		// Validate parametres
-		if (!$this->datepaye)
-		{
+		if (!$this->datepaye) {
 			$this->error = 'ErrorBadValueForParameterCreatePaymentVAT';
 			return -1;
 		}
 
 		// Clean parameters
-		if (isset($this->fk_tva)) $this->fk_tva = (int) $this->fk_tva;
-		if (isset($this->amount)) $this->amount = trim($this->amount);
-		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
-		if (isset($this->num_paiement)) $this->num_paiement = trim($this->num_paiement); // deprecated
-		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-		if (isset($this->note)) $this->note = trim($this->note);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_tva)) {
+			$this->fk_tva = (int) $this->fk_tva;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepaiement)) {
+			$this->fk_typepaiement = (int) $this->fk_typepaiement;
+		}
+		if (isset($this->num_paiement)) {
+			$this->num_paiement = trim($this->num_paiement); // deprecated
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note)) {
+			$this->note = trim($this->note);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
-        $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
-        {
-            $newvalue = price2num($value, 'MT');
-            $this->amounts[$key] = $newvalue;
-            $totalamount += $newvalue;
-        }
-        $totalamount = price2num($totalamount);
+		$totalamount = 0;
+		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
+			$newvalue = price2num($value, 'MT');
+			$this->amounts[$key] = $newvalue;
+			$totalamount += $newvalue;
+		}
+		$totalamount = price2num($totalamount);
 
-        // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		// Check parameters
+		if ($totalamount == 0) {
+			return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		}
 
 
 		$this->db->begin();
 
-		if ($totalamount != 0)
-		{
+		if ($totalamount != 0) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_vat (fk_tva, datec, datep, amount,";
 			$sql .= " fk_typepaiement, num_paiement, note, fk_user_creat, fk_bank)";
 			$sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
@@ -168,21 +185,17 @@ class PaymentVAT extends CommonObject
 			$sql .= " 0)";
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_vat");
 
 				// Insere tableau des montants / factures
-				foreach ($this->amounts as $key => $amount)
-				{
+				foreach ($this->amounts as $key => $amount) {
 					$contribid = $key;
-					if (is_numeric($amount) && $amount <> 0)
-					{
+					if (is_numeric($amount) && $amount <> 0) {
 						$amount = price2num($amount);
 
 						// If we want to closed payed invoices
-						if ($closepaidcontrib)
-						{
+						if ($closepaidcontrib) {
 							$contrib = new Tva($this->db);
 							$contrib->fetch($contribid);
 							$paiement = $contrib->getSommePaiement();
@@ -192,31 +205,30 @@ class PaymentVAT extends CommonObject
 							$deposits = 0;
 							$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
 							$remaintopay = price2num($contrib->amount - $paiement - $creditnotes - $deposits, 'MT');
-							if ($remaintopay == 0)
-							{
+							if ($remaintopay == 0) {
 								$result = $contrib->setPaid($user);
+							} else {
+								dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
 							}
-							else dol_syslog("Remain to pay for conrib ".$contribid." not null. We do nothing.");
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				$error++;
 			}
 		}
 
 		$result = $this->call_trigger('PAYMENTVAT_CREATE', $user);
-		if ($result < 0) $error++;
-
-		if ($totalamount != 0 && !$error)
-		{
-		    $this->amount = $totalamount;
-            $this->total = $totalamount; // deprecated
-		    $this->db->commit();
-			return $this->id;
+		if ($result < 0) {
+			$error++;
 		}
-		else {
+
+		if ($totalamount != 0 && !$error) {
+			$this->amount = $totalamount;
+			$this->total = $totalamount; // deprecated
+			$this->db->commit();
+			return $this->id;
+		} else {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -1;
@@ -254,10 +266,8 @@ class PaymentVAT extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id    = $obj->rowid;
@@ -285,8 +295,7 @@ class PaymentVAT extends CommonObject
 			$this->db->free($resql);
 
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -307,15 +316,33 @@ class PaymentVAT extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->fk_tva)) $this->fk_tva = (int) $this->fk_tva;
-		if (isset($this->amount)) $this->amount = trim($this->amount);
-		if (isset($this->fk_typepaiement)) $this->fk_typepaiement = (int) $this->fk_typepaiement;
-		if (isset($this->num_paiement)) $this->num_paiement = trim($this->num_paiement); // deprecated
-		if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-		if (isset($this->note)) $this->note = trim($this->note);
-		if (isset($this->fk_bank)) $this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat)) $this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif)) $this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_tva)) {
+			$this->fk_tva = (int) $this->fk_tva;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepaiement)) {
+			$this->fk_typepaiement = (int) $this->fk_typepaiement;
+		}
+		if (isset($this->num_paiement)) {
+			$this->num_paiement = trim($this->num_paiement); // deprecated
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note)) {
+			$this->note = trim($this->note);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 
 
@@ -344,20 +371,19 @@ class PaymentVAT extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -380,39 +406,36 @@ class PaymentVAT extends CommonObject
 
 		$this->db->begin();
 
-	    if ($this->bank_line > 0)
-        {
-        	$accline = new AccountLine($this->db);
+		if ($this->bank_line > 0) {
+			$accline = new AccountLine($this->db);
 			$accline->fetch($this->bank_line);
 			$result = $accline->delete();
 			if ($result < 0) {
 				$this->errors[] = $accline->error;
 				$error++;
 			}
-        }
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_vat";
 			$sql .= " WHERE rowid=".$this->id;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
 			return -1 * $error;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return 1;
 		}
@@ -448,8 +471,7 @@ class PaymentVAT extends CommonObject
 		$result = $object->create($user);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $object->error;
 			$error++;
 		}
@@ -457,12 +479,10 @@ class PaymentVAT extends CommonObject
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
-		}
-		else {
+		} else {
 			$this->db->rollback();
 			return -1;
 		}
@@ -470,11 +490,11 @@ class PaymentVAT extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -495,101 +515,97 @@ class PaymentVAT extends CommonObject
 	}
 
 
-    /**
-     *      Add record into bank for payment with links between this bank record and invoices of payment.
-     *      All payment properties must have been set first like after a call to create().
-     *
-     *      @param	User	$user               Object of user making payment
-     *      @param  string	$mode               'payment_sc'
-     *      @param  string	$label              Label to use in bank record
-     *      @param  int		$accountid          Id of bank account to do link with
-     *      @param  string	$emetteur_nom       Name of transmitter
-     *      @param  string	$emetteur_banque    Name of bank
-     *      @return int                 		<0 if KO, >0 if OK
-     */
-    public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
-    {
-        global $conf;
+	/**
+	 *      Add record into bank for payment with links between this bank record and invoices of payment.
+	 *      All payment properties must have been set first like after a call to create().
+	 *
+	 *      @param	User	$user               Object of user making payment
+	 *      @param  string	$mode               'payment_sc'
+	 *      @param  string	$label              Label to use in bank record
+	 *      @param  int		$accountid          Id of bank account to do link with
+	 *      @param  string	$emetteur_nom       Name of transmitter
+	 *      @param  string	$emetteur_banque    Name of bank
+	 *      @return int                 		<0 if KO, >0 if OK
+	 */
+	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
+	{
+		global $conf;
 
 		// Clean data
-        $this->num_payment = trim($this->num_payment ? $this->num_payment : $this->num_paiement);
+		$this->num_payment = trim($this->num_payment ? $this->num_payment : $this->num_paiement);
 
-        $error = 0;
+		$error = 0;
 
-        if (!empty($conf->banque->enabled))
-        {
-            include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		if (!empty($conf->banque->enabled)) {
+			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-            $acc = new Account($this->db);
-            $acc->fetch($accountid);
+			$acc = new Account($this->db);
+			$acc->fetch($accountid);
 
-            $total = $this->total;
-            if ($mode == 'payment_vat') $total = -$total;
+			$total = $this->total;
+			if ($mode == 'payment_vat') {
+				$total = -$total;
+			}
 
-            // Insert payment into llx_bank
-            $bank_line_id = $acc->addline(
-                $this->datepaye,
-                $this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
-                $label,
-                $total,
-                $this->num_payment,
-                '',
-                $user,
-                $emetteur_nom,
-                $emetteur_banque
-            );
+			// Insert payment into llx_bank
+			$bank_line_id = $acc->addline(
+				$this->datepaye,
+				$this->paiementtype, // Payment mode id or code ("CHQ or VIR for example")
+				$label,
+				$total,
+				$this->num_payment,
+				'',
+				$user,
+				$emetteur_nom,
+				$emetteur_banque
+			);
 
-            // Mise a jour fk_bank dans llx_paiement.
-            // On connait ainsi le paiement qui a genere l'ecriture bancaire
-            if ($bank_line_id > 0)
-            {
-                $result = $this->update_fk_bank($bank_line_id);
-                if ($result <= 0)
-                {
-                    $error++;
-                    dol_print_error($this->db);
-                }
+			// Mise a jour fk_bank dans llx_paiement.
+			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			if ($bank_line_id > 0) {
+				$result = $this->update_fk_bank($bank_line_id);
+				if ($result <= 0) {
+					$error++;
+					dol_print_error($this->db);
+				}
 
-                // Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
-                $url = '';
-                if ($mode == 'payment_vat') $url = DOL_URL_ROOT.'/compta/payment_vat/card.php?id=';
-                if ($url)
-                {
-                    $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-                    if ($result <= 0)
-                    {
-                        $error++;
-                        dol_print_error($this->db);
-                    }
-                }
+				// Add link 'payment', 'payment_supplier', 'payment_sc' in bank_url between payment and bank transaction
+				$url = '';
+				if ($mode == 'payment_vat') {
+					$url = DOL_URL_ROOT.'/compta/payment_vat/card.php?id=';
+				}
+				if ($url) {
+					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
+					if ($result <= 0) {
+						$error++;
+						dol_print_error($this->db);
+					}
+				}
 
-                // Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
-                $linkaddedforthirdparty = array();
-                foreach ($this->amounts as $key => $value)
-                {
-                    if ($mode == 'payment_vat')
-                    {
-                        $tva = new Tva($this->db);
-                        $tva->fetch($key);
-                        $result = $acc->add_url_line($bank_line_id, $tva->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', '('.$tva->label.')', 'vat');
-                        if ($result <= 0) dol_print_error($this->db);
-                    }
-                }
-            }
-            else {
-                $this->error = $acc->error;
-                $error++;
-            }
-        }
+				// Add link 'company' in bank_url between invoice and bank transaction (for each invoice concerned by payment)
+				$linkaddedforthirdparty = array();
+				foreach ($this->amounts as $key => $value) {
+					if ($mode == 'payment_vat') {
+						$tva = new Tva($this->db);
+						$tva->fetch($key);
+						$result = $acc->add_url_line($bank_line_id, $tva->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', '('.$tva->label.')', 'vat');
+						if ($result <= 0) {
+							dol_print_error($this->db);
+						}
+					}
+				}
+			} else {
+				$this->error = $acc->error;
+				$error++;
+			}
+		}
 
-        if (!$error)
-        {
-            return 1;
-        }
-        else {
-            return -1;
-        }
-    }
+		if (!$error) {
+			return 1;
+		} else {
+			return -1;
+		}
+	}
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -606,11 +622,9 @@ class PaymentVAT extends CommonObject
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
-		}
-		else {
+		} else {
 			$this->error = $this->db->error();
 			return 0;
 		}
@@ -693,30 +707,41 @@ class PaymentVAT extends CommonObject
 
 		$result = '';
 
-		if (empty($this->ref)) $this->ref = $this->lib;
+		if (empty($this->ref)) {
+			$this->ref = $this->lib;
+		}
 
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("VATPayment").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
 		if (!empty($this->label)) {
 			$labeltoshow = $this->label;
 			$reg = array();
-			if (preg_match('/^\((.*)\)$/i', $this->label, $reg))
-			{
+			if (preg_match('/^\((.*)\)$/i', $this->label, $reg)) {
 				// Label generique car entre parentheses. On l'affiche en le traduisant
-				if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+				if ($reg[1] == 'paiement') {
+					$reg[1] = 'Payment';
+				}
 				$labeltoshow = $langs->trans($reg[1]);
 			}
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$labeltoshow;
 		}
-		if ($this->datep) $label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'day');
+		if ($this->datep) {
+			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->datep, 'day');
+		}
 
 		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/compta/payment_vat/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend = '</a>';
 
-			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result .= ' ';
-			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+			if ($withpicto) {
+				$result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			}
+			if ($withpicto && $withpicto != 2) {
+				$result .= ' ';
+			}
+			if ($withpicto != 2) {
+				$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+			}
 		}
 
 		return $result;
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index a39a00d8b01..f45112aedda 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -57,13 +57,13 @@ class Tva extends CommonObject
 	public $num_payment;
 
 	/**
-     * @var string label
-     */
-    public $label;
+	 * @var string label
+	 */
+	public $label;
 
-    /**
-     * @var int ID
-     */
+	/**
+	 * @var int ID
+	 */
 	public $fk_bank;
 
 	/**
@@ -72,39 +72,39 @@ class Tva extends CommonObject
 	public $accountid;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_creat;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_modif;
 
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    /**
-     *  Create in database
-     *
-     *  @param      User	$user       User that create
-     *  @return     int      			<0 if KO, >0 if OK
-     */
-    public function create($user)
-    {
-    	global $conf, $langs;
+	/**
+	 *  Create in database
+	 *
+	 *  @param      User	$user       User that create
+	 *  @return     int      			<0 if KO, >0 if OK
+	 */
+	public function create($user)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 		$now = dol_now();
@@ -135,7 +135,7 @@ class Tva extends CommonObject
 		$sql .= "fk_typepayment,";
 		$sql .= "fk_user_creat,";
 		$sql .= "fk_user_modif";
-        $sql .= ") VALUES (";
+		$sql .= ") VALUES (";
 		$sql .= " '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->idate($this->datep)."',";
 		$sql .= " '".$this->db->idate($this->datev)."',";
@@ -148,44 +148,42 @@ class Tva extends CommonObject
 		$sql .= " '".$this->db->escape($this->fk_user_modif)."'";
 		$sql .= ")";
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva");
 
-            // Call trigger
-            $result = $this->call_trigger('TVA_CREATE', $user);
-            if ($result < 0) $error++;
-            // End call triggers
+			// Call trigger
+			$result = $this->call_trigger('TVA_CREATE', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
 
-            if (!$error)
-            {
-            	$this->db->commit();
-            	return $this->id;
-            }
-            else {
+			if (!$error) {
+				$this->db->commit();
+				return $this->id;
+			} else {
 				$this->db->rollback();
 				return -1;
-            }
-        }
-        else {
+			}
+		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			$this->db->rollback();
 			return -1;
-        }
-    }
+		}
+	}
 
-    /**
-     * Update database
-     *
-     * @param   User	$user        	User that modify
-     * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
-     * @return  int         			<0 if KO, >0 if OK
-     */
-    public function update($user, $notrigger = 0)
-    {
-    	global $conf, $langs;
+	/**
+	 * Update database
+	 *
+	 * @param   User	$user        	User that modify
+	 * @param	int		$notrigger	    0=no, 1=yes (no update trigger)
+	 * @return  int         			<0 if KO, >0 if OK
+	 */
+	public function update($user, $notrigger = 0)
+	{
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -202,7 +200,7 @@ class Tva extends CommonObject
 		$this->db->begin();
 
 		// Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."tva SET";
 		$sql .= " tms='".$this->db->idate($this->tms)."',";
 		$sql .= " datep='".$this->db->idate($this->datep)."',";
 		$sql .= " datev='".$this->db->idate($this->datev)."',";
@@ -211,34 +209,32 @@ class Tva extends CommonObject
 		$sql .= " note='".$this->db->escape($this->note)."',";
 		$sql .= " fk_user_creat=".$this->fk_user_creat.",";
 		$sql .= " fk_user_modif=".($this->fk_user_modif > 0 ? $this->fk_user_modif : $user->id)."";
-        $sql .= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if (!$resql)
-        {
-            $this->error = "Error ".$this->db->lasterror();
-            $error++;
-        }
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->error = "Error ".$this->db->lasterror();
+			$error++;
+		}
 
-		if (!$error && !$notrigger)
-		{
-            // Call trigger
-            $result = $this->call_trigger('TVA_MODIFY', $user);
-            if ($result < 0) $error++;
-            // End call triggers
-    	}
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('TVA_MODIFY', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
 
-        if (!$error)
-    	{
-    		$this->db->commit();
-    		return 1;
-    	}
-    	else {
-    		$this->db->rollback();
-    		return -1;
-    	}
-    }
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
 	/**
 	 *    Tag TVA as payed completely
@@ -253,8 +249,11 @@ class Tva extends CommonObject
 		$sql .= " paye = 1";
 		$sql .= " WHERE rowid = ".$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql) return 1;
-		else return -1;
+		if ($resql) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 	/**
@@ -270,22 +269,25 @@ class Tva extends CommonObject
 		$sql .= " paye = 0";
 		$sql .= " WHERE rowid = ".$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql) return 1;
-		else return -1;
+		if ($resql) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 
-    /**
-     *  Load object in memory from database
-     *
-     *  @param	int		$id         id object
-     *  @param  User	$user       User that load
-     *  @return int         		<0 if KO, >0 if OK
-     */
-    public function fetch($id, $user = null)
-    {
-    	global $langs;
-        $sql = "SELECT";
+	/**
+	 *  Load object in memory from database
+	 *
+	 *  @param	int		$id         id object
+	 *  @param  User	$user       User that load
+	 *  @return int         		<0 if KO, >0 if OK
+	 */
+	public function fetch($id, $user = null)
+	{
+		global $langs;
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
 		$sql .= " t.tms,";
@@ -301,20 +303,18 @@ class Tva extends CommonObject
 		$sql .= " t.fk_user_modif,";
 		$sql .= " t.fk_account";
 
-        $sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
 		//$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
-        $sql .= " WHERE t.rowid = ".$id;
+		$sql .= " WHERE t.rowid = ".$id;
 
-    	dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
 
-                $this->id    = $obj->rowid;
-                $this->ref   = $obj->rowid;
+				$this->id    = $obj->rowid;
+				$this->ref   = $obj->rowid;
 				$this->tms   = $this->db->jdate($obj->tms);
 				$this->datep = $this->db->jdate($obj->datep);
 				$this->datev = $this->db->jdate($obj->datev);
@@ -329,22 +329,21 @@ class Tva extends CommonObject
 				$this->fk_account = $obj->fk_account;
 				$this->fk_type = $obj->fk_type;
 				$this->rappro  = $obj->rappro;
-            }
-            $this->db->free($resql);
+			}
+			$this->db->free($resql);
 
-            return 1;
-        }
-        else {
-      	    $this->error = "Error ".$this->db->lasterror();
-            return -1;
-        }
-    }
+			return 1;
+		} else {
+			$this->error = "Error ".$this->db->lasterror();
+			return -1;
+		}
+	}
 
 
- 	/**
+	/**
 	 *  Delete object in database
 	 *
-     *	@param	User	$user       User that delete
+	 *	@param	User	$user       User that delete
 	 *	@return	int					<0 if KO, >0 if OK
 	 */
 	public function delete($user)
@@ -355,16 +354,17 @@ class Tva extends CommonObject
 
 		// Call trigger
 		$result = $this->call_trigger('TVA_DELETE', $user);
-		if ($result < 0) return -1;
+		if ($result < 0) {
+			return -1;
+		}
 		// End call triggers
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."tva";
 		$sql .= " WHERE rowid=".$this->id;
 
-	   	dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -375,11 +375,11 @@ class Tva extends CommonObject
 
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	public function initAsSpecimen()
 	{
@@ -397,244 +397,233 @@ class Tva extends CommonObject
 	}
 
 
-    /**
-     *  Balance of VAT
-     *
-     *	@param	int		$year		Year
-     *	@return	double				Amount
-     */
-    public function solde($year = 0)
-    {
+	/**
+	 *  Balance of VAT
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	double				Amount
+	 */
+	public function solde($year = 0)
+	{
 
-        $reglee = $this->tva_sum_reglee($year);
+		$reglee = $this->tva_sum_reglee($year);
 
-        $payee = $this->tva_sum_payee($year);
-        $collectee = $this->tva_sum_collectee($year);
+		$payee = $this->tva_sum_payee($year);
+		$collectee = $this->tva_sum_collectee($year);
 
-        $solde = $reglee - ($collectee - $payee);
+		$solde = $reglee - ($collectee - $payee);
 
-        return $solde;
-    }
+		return $solde;
+	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Total of the VAT from invoices emitted by the thirdparty.
-     *
-     *	@param	int		$year		Year
-     *  @return	double				Amount
-     */
-    public function tva_sum_collectee($year = 0)
-    {
+	/**
+	 * 	Total of the VAT from invoices emitted by the thirdparty.
+	 *
+	 *	@param	int		$year		Year
+	 *  @return	double				Amount
+	 */
+	public function tva_sum_collectee($year = 0)
+	{
         // phpcs:enable
 
-        $sql = "SELECT sum(f.tva) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
-        if ($year)
-        {
+		$sql = "SELECT sum(f.tva) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
+		if ($year) {
 			$sql .= " AND f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
-        }
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
 				$ret = $obj->amount;
-                $this->db->free($result);
-                return $ret;
-            }
-            else {
-                $this->db->free($result);
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        }
-        else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	VAT payed
-     *
-     *	@param	int		$year		Year
-     *	@return	double				Amount
-     */
-    public function tva_sum_payee($year = 0)
-    {
+	/**
+	 * 	VAT payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	double				Amount
+	 */
+	public function tva_sum_payee($year = 0)
+	{
         // phpcs:enable
 
-        $sql = "SELECT sum(f.total_tva) as total_tva";
-        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-        if ($year)
-        {
-            $sql .= " WHERE f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
-        }
+		$sql = "SELECT sum(f.total_tva) as total_tva";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		if ($year) {
+			$sql .= " WHERE f.datef >= '".$this->db->escape($year)."-01-01' AND f.datef <= '".$this->db->escape($year)."-12-31' ";
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret = $obj->total_tva;
-            	$this->db->free($result);
-                return $ret;
-            }
-            else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->total_tva;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        }
-        else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * 	Total of the VAT payed
-     *
-     *	@param	int		$year		Year
-     *	@return	double				Amount
-     */
-    public function tva_sum_reglee($year = 0)
-    {
+	/**
+	 * 	Total of the VAT payed
+	 *
+	 *	@param	int		$year		Year
+	 *	@return	double				Amount
+	 */
+	public function tva_sum_reglee($year = 0)
+	{
         // phpcs:enable
 
-        $sql = "SELECT sum(f.amount) as amount";
-        $sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
+		$sql = "SELECT sum(f.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
 
-        if ($year)
-        {
+		if ($year) {
 			$sql .= " WHERE f.datev >= '".$this->db->escape($year)."-01-01' AND f.datev <= '".$this->db->escape($year)."-12-31' ";
-        }
+		}
 
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $ret = $obj->amount;
-            	$this->db->free($result);
-                return $ret;
-            }
-            else {
-            	$this->db->free($result);
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$ret = $obj->amount;
+				$this->db->free($result);
+				return $ret;
+			} else {
+				$this->db->free($result);
 				return 0;
-            }
-        }
-        else {
-            print $this->db->lasterror();
-            return -1;
-        }
-    }
+			}
+		} else {
+			print $this->db->lasterror();
+			return -1;
+		}
+	}
 
 
-    /**
-     *  Create in database
-     *
+	/**
+	 *  Create in database
+	 *
 	 *	@param	User	$user		Object user that insert
 	 *	@return	int					<0 if KO, rowid in tva table if OK
-     */
-    public function addPayment($user)
-    {
-        global $conf, $langs;
+	 */
+	public function addPayment($user)
+	{
+		global $conf, $langs;
 
-        $this->db->begin();
+		$this->db->begin();
 
-        // Clean parameters
-        $this->amount = price2num(trim($this->amount));
-        $this->label = trim($this->label);
+		// Clean parameters
+		$this->amount = price2num(trim($this->amount));
+		$this->label = trim($this->label);
 		$this->note = trim($this->note);
 		$this->num_payment = trim($this->num_payment);
 		$this->fk_bank = (int) $this->fk_bank;
 		$this->fk_user_creat = (int) $this->fk_user_creat;
 		$this->fk_user_modif = (int) $this->fk_user_modif;
-		if (empty($this->datec)) $this->datec = dol_now();
+		if (empty($this->datec)) {
+			$this->datec = dol_now();
+		}
 
-        // Check parameters
-		if (!$this->label)
-		{
+		// Check parameters
+		if (!$this->label) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Label"));
 			return -3;
 		}
-        if ($this->amount == '')
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
-            return -4;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
-            return -5;
-        }
-        if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0))
-        {
-            $this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
-            return -5;
-        }
+		if ($this->amount == '') {
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount"));
+			return -4;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->accountid) || $this->accountid <= 0)) {
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Account"));
+			return -5;
+		}
+		if (!empty($conf->banque->enabled) && (empty($this->type_payment) || $this->type_payment <= 0)) {
+			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode"));
+			return -5;
+		}
 
-        // Insert into llx_tva
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (";
-        $sql .= "datec";
-        $sql .= ", datep";
-        $sql .= ", datev";
+		// Insert into llx_tva
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva (";
+		$sql .= "datec";
+		$sql .= ", datep";
+		$sql .= ", datev";
 		$sql .= ", amount";
 		$sql .= ", fk_typepayment";
 		$sql .= ", num_payment";
-		if ($this->note)  $sql .= ", note";
-        if ($this->label) $sql .= ", label";
-        $sql .= ", fk_user_creat";
+		if ($this->note) {
+			$sql .= ", note";
+		}
+		if ($this->label) {
+			$sql .= ", label";
+		}
+		$sql .= ", fk_user_creat";
 		$sql .= ", fk_bank";
 		$sql .= ", entity";
 		$sql .= ") ";
-        $sql .= " VALUES (";
-        $sql .= " '".$this->db->idate($this->datec)."'";
-        $sql .= ", '".$this->db->idate($this->datep)."'";
-        $sql .= ", '".$this->db->idate($this->datev)."'";
+		$sql .= " VALUES (";
+		$sql .= " '".$this->db->idate($this->datec)."'";
+		$sql .= ", '".$this->db->idate($this->datep)."'";
+		$sql .= ", '".$this->db->idate($this->datev)."'";
 		$sql .= ", ".$this->amount;
-        $sql .= ", '".$this->db->escape($this->type_payment)."'";
+		$sql .= ", '".$this->db->escape($this->type_payment)."'";
 		$sql .= ", '".$this->db->escape($this->num_payment)."'";
-		if ($this->note)  $sql .= ", '".$this->db->escape($this->note)."'";
-        if ($this->label) $sql .= ", '".$this->db->escape($this->label)."'";
-        $sql .= ", '".$this->db->escape($user->id)."'";
+		if ($this->note) {
+			$sql .= ", '".$this->db->escape($this->note)."'";
+		}
+		if ($this->label) {
+			$sql .= ", '".$this->db->escape($this->label)."'";
+		}
+		$sql .= ", '".$this->db->escape($user->id)."'";
 		$sql .= ", NULL";
 		$sql .= ", ".$conf->entity;
-        $sql .= ")";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::addPayment", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called 'payment_vat'
+		$result = $this->db->query($sql);
+		if ($result) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."tva"); // TODO should be called 'payment_vat'
 
-            // Call trigger
-            //XXX: Should be done just befor commit no ?
-            $result = $this->call_trigger('TVA_ADDPAYMENT', $user);
-            if ($result < 0)
-            {
-            	$this->id = 0;
-            	$ok = 0;
-            }
-            // End call triggers
+			// Call trigger
+			//XXX: Should be done just befor commit no ?
+			$result = $this->call_trigger('TVA_ADDPAYMENT', $user);
+			if ($result < 0) {
+				$this->id = 0;
+				$ok = 0;
+			}
+			// End call triggers
 
-            if ($this->id > 0)
-            {
-                $ok = 1;
-				if (!empty($conf->banque->enabled) && !empty($this->amount))
-                {
-                    // Insert into llx_bank
-                    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+			if ($this->id > 0) {
+				$ok = 1;
+				if (!empty($conf->banque->enabled) && !empty($this->amount)) {
+					// Insert into llx_bank
+					require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
-                    $acc = new Account($this->db);
+					$acc = new Account($this->db);
 					$result = $acc->fetch($this->accountid);
-					if ($result <= 0) dol_print_error($this->db);
+					if ($result <= 0) {
+						dol_print_error($this->db);
+					}
 
 					if ($this->amount > 0) {
 						$bank_line_id = $acc->addline($this->datep, $this->type_payment, $this->label, -abs($this->amount), $this->num_payment, '', $user);
@@ -642,65 +631,56 @@ class Tva extends CommonObject
 						$bank_line_id = $acc->addline($this->datep, $this->type_payment, $this->label, abs($this->amount), $this->num_payment, '', $user);
 					}
 
-                    // Update fk_bank into llx_tva. So we know vat line used to generate bank transaction
-                    if ($bank_line_id > 0)
-					{
-                        $this->update_fk_bank($bank_line_id);
-                    }
-					else {
+					// Update fk_bank into llx_tva. So we know vat line used to generate bank transaction
+					if ($bank_line_id > 0) {
+						$this->update_fk_bank($bank_line_id);
+					} else {
 						$this->error = $acc->error;
 						$ok = 0;
 					}
 
-                    // Update links
-                    $result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat");
-                    if ($result < 0)
-                    {
-                    	$this->error = $acc->error;
-                    	$ok = 0;
-                    }
-	            }
+					// Update links
+					$result = $acc->add_url_line($bank_line_id, $this->id, DOL_URL_ROOT.'/compta/tva/card.php?id=', "(VATPayment)", "payment_vat");
+					if ($result < 0) {
+						$this->error = $acc->error;
+						$ok = 0;
+					}
+				}
 
-				if ($ok)
-				{
+				if ($ok) {
 					$this->db->commit();
 					return $this->id;
-				}
-				else {
+				} else {
 					$this->db->rollback();
 					return -3;
 				}
-            }
-            else {
-                $this->db->rollback();
-                return -2;
-            }
-        }
-        else {
-            $this->error = $this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
+			} else {
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
+	/**
 	 *  Update link between payment tva and line generate into llx_bank
-     *
-     *  @param	int		$id_bank    Id bank account
+	 *
+	 *  @param	int		$id_bank    Id bank account
 	 *	@return	int					<0 if KO, >0 if OK
-     */
+	 */
 	public function update_fk_bank($id_bank)
 	{
         // phpcs:enable
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'tva SET fk_bank = '.(int) $id_bank;
 		$sql .= ' WHERE rowid = '.(int) $this->id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 			return -1;
 		}
@@ -711,8 +691,8 @@ class Tva extends CommonObject
 	 *
 	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
 	 *	@param	string	$option			link option
-     *  @param	int  	$notooltip		1=Disable tooltip
-     *  @param	string	$morecss		More CSS
+	 *  @param	int  	$notooltip		1=Disable tooltip
+	 *  @param	string	$morecss		More CSS
 	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *	@return	string					Chaine with URL
 	 */
@@ -720,83 +700,92 @@ class Tva extends CommonObject
 	{
 		global $langs, $conf;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
 		$label = '<u>'.$langs->trans("ShowVatPayment").'</u>';
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->label))
+		if (!empty($this->label)) {
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
+		}
 
-        $url = DOL_URL_ROOT.'/compta/tva/card.php?id='.$this->id;
+		$url = DOL_URL_ROOT.'/compta/tva/card.php?id='.$this->id;
 
-        if ($option != 'nolink')
-        {
-        	// Add param to save lastsearch_values or not
-        	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-        	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-        	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-        }
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
-        $linkend = '</a>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
 
 		$picto = 'payment';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
 	}
 
 	/**
-     * 	Return amount of payments already done
-     *
-     *	@return		int		Amount of payment already done, <0 if KO
-     */
-    public function getSommePaiement()
-    {
-        $table = 'payment_vat';
-        $field = 'fk_tva';
+	 * 	Return amount of payments already done
+	 *
+	 *	@return		int		Amount of payment already done, <0 if KO
+	 */
+	public function getSommePaiement()
+	{
+		$table = 'payment_vat';
+		$field = 'fk_tva';
 
-        $sql = 'SELECT sum(amount) as amount';
-        $sql .= ' FROM '.MAIN_DB_PREFIX.$table;
-        $sql .= ' WHERE '.$field.' = '.$this->id;
+		$sql = 'SELECT sum(amount) as amount';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+		$sql .= ' WHERE '.$field.' = '.$this->id;
 
-        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            $amount = 0;
+		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$amount = 0;
 
-            $obj = $this->db->fetch_object($resql);
-            if ($obj) $amount = $obj->amount ? $obj->amount : 0;
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) {
+				$amount = $obj->amount ? $obj->amount : 0;
+			}
 
-            $this->db->free($resql);
-            return $amount;
-        }
-        else {
-            return -1;
-        }
-    }
+			$this->db->free($resql);
+			return $amount;
+		} else {
+			return -1;
+		}
+	}
 
 	/**
 	 *	Informations of vat payment object
@@ -812,10 +801,8 @@ class Tva extends CommonObject
 
 		dol_syslog(get_class($this)."::info", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $obj->rowid;
@@ -838,8 +825,7 @@ class Tva extends CommonObject
 			}
 
 			$this->db->free($result);
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}
@@ -877,21 +863,28 @@ class Tva extends CommonObject
 		$this->labelStatus = array();
 		$this->labelStatusShort = array();
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid');
 			$this->labelStatus[self::STATUS_PAID] = $langs->trans('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
+				$this->labelStatus[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			}
 			$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans('BillStatusNotPaid');
 			$this->labelStatusShort[self::STATUS_PAID] = $langs->trans('BillStatusPaid');
-			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) $this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			if ($status == self::STATUS_UNPAID && $alreadypaid <> 0) {
+				$this->labelStatusShort[self::STATUS_UNPAID] = $langs->trans("BillStatusStarted");
+			}
 		}
 
 		$statusType = 'status1';
-		if ($status == 0 && $alreadypaid <> 0) $statusType = 'status3';
-		if ($status == 1) $statusType = 'status6';
+		if ($status == 0 && $alreadypaid <> 0) {
+			$statusType = 'status3';
+		}
+		if ($status == 1) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index d4acecf063d..e0801ba1db2 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -46,12 +46,13 @@ $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "produ
 
 $now = dol_now();
 $current_date = dol_getdate($now);
-if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) $conf->global->SOCIETE_FISCAL_MONTH_START = 1;
+if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
+	$conf->global->SOCIETE_FISCAL_MONTH_START = 1;
+}
 
 // Date range
 $year = GETPOST("year", "int");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = $current_date['year'];
 	$year_start = $year_current;
 } else {
@@ -61,12 +62,12 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Set default period if not defined
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int");
-	if (empty($q))
-	{
-		if (GETPOST("month", 'int')) { $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false); } else {
+	if (empty($q)) {
+		if (GETPOST("month", 'int')) {
+			$date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false); $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false);
+		} else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
@@ -88,25 +89,41 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 		}
 	} else {
-		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+		if ($q == 1) {
+			$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+		}
+		if ($q == 2) {
+			$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+		}
+		if ($q == 3) {
+			$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+		}
+		if ($q == 4) {
+			$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+		}
 	}
 }
 
 $min = price2num(GETPOST("min", "alpha"));
-if (empty($min)) $min = 0;
+if (empty($min)) {
+	$min = 0;
+}
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = $conf->global->TAX_MODE;
-if (GETPOSTISSET("modetax")) $modetax = GETPOST("modetax", 'int');
-if (empty($modetax)) $modetax = 0;
+if (GETPOSTISSET("modetax")) {
+	$modetax = GETPOST("modetax", 'int');
+}
+if (empty($modetax)) {
+	$modetax = 0;
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 
@@ -128,9 +145,10 @@ $user_static = new User($db);
 
 $morequerystring = '';
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
-foreach ($listofparams as $param)
-{
-	if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+foreach ($listofparams as $param) {
+	if (GETPOST($param) != '') {
+		$morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+	}
 }
 
 $special_report = false;
@@ -149,9 +167,15 @@ $fsearch .= '<input type="text" name="min" id="min" value="'.$min.'" size="6">';
 // Show report header
 $name = $langs->trans("VATReportByThirdParties");
 $calcmode = '';
-if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
-if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
-if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
+if ($modetax == 0) {
+	$calcmode = $langs->trans('OptionVATDefault');
+}
+if ($modetax == 1) {
+	$calcmode = $langs->trans('OptionVATDebitOption');
+}
+if ($modetax == 2) {
+	$calcmode = $langs->trans('OptionPaymentForProductAndServices');
+}
 $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -173,19 +197,28 @@ if ($nextquarter < 4) {
 }
 $builddate = dol_now();
 
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description .= $langs->trans("RulesVATDueProducts");
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description .= $langs->trans("RulesVATInProducts");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description .= '<br>'.$langs->trans("RulesVATDueServices");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description .= '<br>'.$langs->trans("RulesVATInServices");
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') {
+	$description .= $langs->trans("RulesVATDueProducts");
+}
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') {
+	$description .= $langs->trans("RulesVATInProducts");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') {
+	$description .= '<br>'.$langs->trans("RulesVATDueServices");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+	$description .= '<br>'.$langs->trans("RulesVATInServices");
+}
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
-if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) {
+	$description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+}
 
 //$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
 $description .= ($description ? '<br>' : '').$fsearch;
-if (!empty($conf->global->TAX_REPORT_EXTRA_REPORT))
-{
+if (!empty($conf->global->TAX_REPORT_EXTRA_REPORT)) {
 	$description .= '<br>';
 	$description .= '<input type="radio" name="extra_report" value="0" '.($special_report ? '' : 'checked="checked"').'> ';
 	$description .= $langs->trans('SimpleReport');
@@ -229,8 +262,7 @@ $columns = 5;
 $x_coll = tax_by_thirdparty('vat', $db, 0, $date_start, $date_end, $modetax, 'sell');
 $x_paye = tax_by_thirdparty('vat', $db, 0, $date_start, $date_end, $modetax, 'buy');
 
-if (!is_array($x_coll) || !is_array($x_paye))
-{
+if (!is_array($x_coll) || !is_array($x_paye)) {
 	$langs->load("errors");
 	if ($x_coll == -1) {
 		print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
@@ -242,15 +274,14 @@ if (!is_array($x_coll) || !is_array($x_paye))
 } else {
 	$x_both = array();
 	//now, from these two arrays, get another array with one rate per line
-	foreach (array_keys($x_coll) as $my_coll_thirdpartyid)
-	{
+	foreach (array_keys($x_coll) as $my_coll_thirdpartyid) {
 		$x_both[$my_coll_thirdpartyid]['coll']['totalht'] = $x_coll[$my_coll_thirdpartyid]['totalht'];
 		$x_both[$my_coll_thirdpartyid]['coll']['vat'] = $x_coll[$my_coll_thirdpartyid]['vat'];
 		$x_both[$my_coll_thirdpartyid]['paye']['totalht'] = 0;
 		$x_both[$my_coll_thirdpartyid]['paye']['vat'] = 0;
 		$x_both[$my_coll_thirdpartyid]['coll']['links'] = '';
 		$x_both[$my_coll_thirdpartyid]['coll']['detail'] = array();
-		foreach ($x_coll[$my_coll_thirdpartyid]['facid'] as $id=>$dummy) {
+		foreach ($x_coll[$my_coll_thirdpartyid]['facid'] as $id => $dummy) {
 			$invoice_customer->id = $x_coll[$my_coll_thirdpartyid]['facid'][$id];
 			$invoice_customer->ref = $x_coll[$my_coll_thirdpartyid]['facnum'][$id];
 			$invoice_customer->type = $x_coll[$my_coll_thirdpartyid]['type'][$id];
@@ -289,11 +320,9 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		$x_both[$my_paye_thirdpartyid]['paye']['links'] = '';
 		$x_both[$my_paye_thirdpartyid]['paye']['detail'] = array();
 
-		foreach ($x_paye[$my_paye_thirdpartyid]['facid'] as $id=>$dummy)
-		{
+		foreach ($x_paye[$my_paye_thirdpartyid]['facid'] as $id => $dummy) {
 			// ExpenseReport
-			if ($x_paye[$my_paye_thirdpartyid]['ptype'][$id] == 'ExpenseReportPayment')
-			{
+			if ($x_paye[$my_paye_thirdpartyid]['ptype'][$id] == 'ExpenseReportPayment') {
 				$expensereport->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
 				$expensereport->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
 				$expensereport->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
@@ -356,7 +385,9 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	$x_paye_ht = 0;
 
 	$span = $columns;
-	if ($modetax != 1) $span += 2;
+	if ($modetax != 1) {
+		$span += 2;
+	}
 
 	//print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
 
@@ -364,12 +395,14 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	print '<tr class="liste_titre">';
 	print '<td class="left">'.$elementcust.'</td>';
 	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-	if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-	else print '<td></td>';
+	if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+		print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	} else {
+		print '<td></td>';
+	}
 	print '<td class="right">'.$namerate.'</td>';
 	print '<td class="left">'.$productcust.'</td>';
-	if ($modetax != 1)
-	{
+	if ($modetax != 1) {
 		print '<td class="right">'.$amountcust.'</td>';
 		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
 	}
@@ -392,10 +425,8 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		$subtot_coll_total_ht = 0;
 		$subtot_coll_vat = 0;
 
-		if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['coll']['totalht'] > $min))
-		{
-			if (is_array($x_both[$thirdparty_id]['coll']['detail']))
-			{
+		if ($min == 0 || ($min > 0 && $x_both[$thirdparty_id]['coll']['totalht'] > $min)) {
+			if (is_array($x_both[$thirdparty_id]['coll']['detail'])) {
 				// VAT Rate
 				print "<tr>";
 				print '<td class="tax_rate">';
@@ -542,8 +573,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		}
 	}
 
-	if (count($x_coll) == 0)   // Show a total ine if nothing shown
-	{
+	if (count($x_coll) == 0) {   // Show a total ine if nothing shown
 		print '<tr class="liste_total">';
 		print '<td colspan="4"></td>';
 		print '<td class="right">'.$langs->trans("Total").':</td>';
@@ -563,8 +593,11 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	print '<tr class="liste_titre liste_titre_topborder">';
 	print '<td class="left">'.$elementsup.'</td>';
 	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-	else print '<td></td>';
+	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
+		print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	} else {
+		print '<td></td>';
+	}
 	print '<td class="left">'.$namesup.'</td>';
 	print '<td class="left">'.$productsup.'</td>';
 	if ($modetax != 1) {
@@ -575,8 +608,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	print '<td class="right">'.$vatsup.'</td>';
 	print '</tr>'."\n";
 
-	foreach (array_keys($x_paye) as $thirdparty_id)
-	{
+	foreach (array_keys($x_paye) as $thirdparty_id) {
 		$subtot_paye_total_ht = 0;
 		$subtot_paye_vat = 0;
 
@@ -673,18 +705,15 @@ if (!is_array($x_coll) || !is_array($x_paye))
 
 					// Payment
 					$ratiopaymentinvoice = 1;
-					if ($modetax != 1)
-					{
+					if ($modetax != 1) {
 						print '<td class="nowrap right">';
-						if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-						{
+						if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
 							$paymentfourn_static->id = $fields['payment_id'];
 							print $paymentfourn_static->getNomUrl(2);
 						}
 
 						if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
-							|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-						{
+							|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
 							print $langs->trans("NA");
 						} else {
 							if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index addaf50d990..38d88fb3d12 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -34,8 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -48,7 +47,9 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', 'vat', 'charges');
 
 
@@ -63,12 +64,18 @@ if (empty($page) || $page == -1) {
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 $object = new Tva($db);
-if ($id > 0) $object->fetch($id);
+if ($id > 0) {
+	$object->fetch($id);
+}
 
 $upload_dir = $conf->tax->dir_output.'/vat/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'tax-vat';
@@ -80,12 +87,12 @@ $modulepart = 'tax-vat';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
-if ($action == 'setlib' && $user->rights->tax->charges->creer)
-{
+if ($action == 'setlib' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setValueFrom('label', GETPOST('lib', 'alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
-	if ($result < 0)
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 
@@ -94,14 +101,15 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer)
  */
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $title = $langs->trans("VATPayment").' - '.$langs->trans("Documents");
 $help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
 llxHeader("", $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	$alreadypayed = $object->getSommePaiement();
 
 	$head = vat_prepare_head($object);
@@ -126,8 +134,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index 081023cd2e8..76eed6b1bf8 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -39,12 +39,13 @@ $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "produ
 $form = new Form($db);
 $now = dol_now();
 $current_date = dol_getdate($now);
-if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) $conf->global->SOCIETE_FISCAL_MONTH_START = 1;
+if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
+	$conf->global->SOCIETE_FISCAL_MONTH_START = 1;
+}
 
 // Date range
 $year = GETPOST("year", "int");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = $current_date['year'];
 	$year_start = $year_current;
 } else {
@@ -54,18 +55,16 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Set default period if not defined
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int");
-	if (empty($q))
-	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); }
-		else {
+	if (empty($q)) {
+		if (GETPOST("month", "int")) {
+			$date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
+		} else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
 				if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
 					if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) {	// If period started from less than 6 years, we show past year
 						$year_start--;
@@ -77,30 +76,42 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 				}
 				$date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
 				$date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
-			}
-			elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
+			} elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) {	// monthly vat, we take last past complete month
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
 				$date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
 			}
 		}
-	}
-	else {
-		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+	} else {
+		if ($q == 1) {
+			$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+		}
+		if ($q == 2) {
+			$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+		}
+		if ($q == 3) {
+			$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+		}
+		if ($q == 4) {
+			$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+		}
 	}
 }
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = $conf->global->TAX_MODE;
-if (GETPOSTISSET("modetax")) $modetax = GETPOST("modetax", 'int');
-if (empty($modetax)) $modetax = 0;
+if (GETPOSTISSET("modetax")) {
+	$modetax = GETPOST("modetax", 'int');
+}
+if (empty($modetax)) {
+	$modetax = 0;
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 
@@ -114,102 +125,95 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
  */
 function pt($db, $sql, $date)
 {
-    global $conf, $bc, $langs, $form;
+	global $conf, $bc, $langs, $form;
 
-    $result = $db->query($sql);
-    if ($result) {
-        $num = $db->num_rows($result);
-        $i = 0;
-        $total = 0;
-        print '<table class="noborder centpercent">';
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+		$i = 0;
+		$total = 0;
+		print '<table class="noborder centpercent">';
 
-        print '<tr class="liste_titre">';
-        print '<td class="nowrap">'.$date.'</td>';
-        print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
-        print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").$form->textwithpicto('', $langs->trans('PaidDuringThisPeriodDesc'), 1).'</td>';
-        print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print '<td class="nowrap">'.$date.'</td>';
+		print '<td class="right">'.$langs->trans("ClaimedForThisPeriod").'</td>';
+		print '<td class="right">'.$langs->trans("PaidDuringThisPeriod").$form->textwithpicto('', $langs->trans('PaidDuringThisPeriodDesc'), 1).'</td>';
+		print "</tr>\n";
 
-        $totalclaimed = 0;
-        $totalpaid = 0;
-        $amountclaimed = 0;
-        $amountpaid = 0;
-        $previousmonth = '';
-        $previousmode = '';
-        $mode = '';
+		$totalclaimed = 0;
+		$totalpaid = 0;
+		$amountclaimed = 0;
+		$amountpaid = 0;
+		$previousmonth = '';
+		$previousmode = '';
+		$mode = '';
 
-        while ($i < $num) {
-            $obj = $db->fetch_object($result);
-            $mode = $obj->mode;
+		while ($i < $num) {
+			$obj = $db->fetch_object($result);
+			$mode = $obj->mode;
 
-            //print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
-            if ($obj->mode == 'claimed' && !empty($previousmode))
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$previousmonth."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
+			//print $obj->dm.' '.$obj->mode.' '.$previousmonth.' '.$previousmode;
+			if ($obj->mode == 'claimed' && !empty($previousmode)) {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$previousmonth."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
 
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            }
+				$amountclaimed = 0;
+				$amountpaid = 0;
+			}
 
-            if ($obj->mode == 'claimed')
-            {
-            	$amountclaimed = $obj->mm;
-            	$totalclaimed = $totalclaimed + $amountclaimed;
-            }
-            if ($obj->mode == 'paid')
-            {
-            	$amountpaid = $obj->mm;
-            	$totalpaid = $totalpaid + $amountpaid;
-            }
+			if ($obj->mode == 'claimed') {
+				$amountclaimed = $obj->mm;
+				$totalclaimed = $totalclaimed + $amountclaimed;
+			}
+			if ($obj->mode == 'paid') {
+				$amountpaid = $obj->mm;
+				$totalpaid = $totalpaid + $amountpaid;
+			}
 
-            if ($obj->mode == 'paid')
-            {
-            	print '<tr class="oddeven">';
-            	print '<td class="nowrap">'.$obj->dm."</td>\n";
-            	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-            	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-            	print "</tr>\n";
-            	$amountclaimed = 0;
-            	$amountpaid = 0;
-            	$previousmode = '';
-            	$previousmonth = '';
-            }
-            else {
-            	$previousmode = $obj->mode;
-            	$previousmonth = $obj->dm;
-            }
+			if ($obj->mode == 'paid') {
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$obj->dm."</td>\n";
+				print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+				print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+				print "</tr>\n";
+				$amountclaimed = 0;
+				$amountpaid = 0;
+				$previousmode = '';
+				$previousmonth = '';
+			} else {
+				$previousmode = $obj->mode;
+				$previousmonth = $obj->dm;
+			}
 
-            $i++;
-        }
+			$i++;
+		}
 
-        if ($mode == 'claimed' && !empty($previousmode))
-        {
-        	print '<tr class="oddeven">';
-        	print '<td class="nowrap">'.$previousmonth."</td>\n";
-        	print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
-        	print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
-        	print "</tr>\n";
+		if ($mode == 'claimed' && !empty($previousmode)) {
+			print '<tr class="oddeven">';
+			print '<td class="nowrap">'.$previousmonth."</td>\n";
+			print '<td class="nowrap right">'.price($amountclaimed)."</td>\n";
+			print '<td class="nowrap right">'.price($amountpaid)."</td>\n";
+			print "</tr>\n";
 
-        	$amountclaimed = 0;
-        	$amountpaid = 0;
-        }
+			$amountclaimed = 0;
+			$amountpaid = 0;
+		}
 
-        print '<tr class="liste_total">';
-        print '<td class="right">'.$langs->trans("Total").'</td>';
-        print '<td class="nowrap right">'.price($totalclaimed).'</td>';
-        print '<td class="nowrap right">'.price($totalpaid).'</td>';
-        print "</tr>";
+		print '<tr class="liste_total">';
+		print '<td class="right">'.$langs->trans("Total").'</td>';
+		print '<td class="nowrap right">'.price($totalclaimed).'</td>';
+		print '<td class="nowrap right">'.price($totalpaid).'</td>';
+		print "</tr>";
 
-        print "</table>";
+		print "</table>";
 
-        $db->free($result);
-    }
-    else {
-        dol_print_error($db);
-    }
+		$db->free($result);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
@@ -229,20 +233,36 @@ $description = $fsearch;
 // Show report header
 $name = $langs->trans("VATReportByMonth");
 $calcmode = '';
-if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
-if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
-if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
+if ($modetax == 0) {
+	$calcmode = $langs->trans('OptionVATDefault');
+}
+if ($modetax == 1) {
+	$calcmode = $langs->trans('OptionVATDebitOption');
+}
+if ($modetax == 2) {
+	$calcmode = $langs->trans('OptionPaymentForProductAndServices');
+}
 $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
 
 $description .= $langs->trans("VATSummary").'<br>';
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description .= $langs->trans("RulesVATDueProducts");
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description .= $langs->trans("RulesVATInProducts");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description .= '<br>'.$langs->trans("RulesVATDueServices");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description .= '<br>'.$langs->trans("RulesVATInServices");
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') {
+	$description .= $langs->trans("RulesVATDueProducts");
+}
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') {
+	$description .= $langs->trans("RulesVATInProducts");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') {
+	$description .= '<br>'.$langs->trans("RulesVATDueServices");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+	$description .= '<br>'.$langs->trans("RulesVATInServices");
+}
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
-if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) {
+	$description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+}
 
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
 
@@ -284,11 +304,14 @@ $mend = $tmp['mon'];
 $total = 0; $subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
 $i = 0; $mcursor = 0;
 
-while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mcursor is to avoid too large loop
-{
+while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) {	// $mcursor is to avoid too large loop
 	//$m = $conf->global->SOCIETE_FISCAL_MONTH_START + ($mcursor % 12);
-	if ($m == 13) $y++;
-	if ($m > 12) $m -= 12;
+	if ($m == 13) {
+		$y++;
+	}
+	if ($m > 12) {
+		$m -= 12;
+	}
 	$mcursor++;
 
 	$x_coll = tax_by_rate('vat', $db, $y, 0, 0, 0, $modetax, 'sell', $m);
@@ -296,15 +319,14 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 
 	$x_both = array();
 	//now, from these two arrays, get another array with one rate per line
-	foreach (array_keys($x_coll) as $my_coll_rate)
-	{
+	foreach (array_keys($x_coll) as $my_coll_rate) {
 		$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
 		$x_both[$my_coll_rate]['coll']['vat'] = $x_coll[$my_coll_rate]['vat'];
 		$x_both[$my_coll_rate]['paye']['totalht'] = 0;
 		$x_both[$my_coll_rate]['paye']['vat'] = 0;
 		$x_both[$my_coll_rate]['coll']['links'] = '';
 		$x_both[$my_coll_rate]['coll']['detail'] = array();
-		foreach ($x_coll[$my_coll_rate]['facid'] as $id=>$dummy) {
+		foreach ($x_coll[$my_coll_rate]['facid'] as $id => $dummy) {
 			//$invoice_customer->id=$x_coll[$my_coll_rate]['facid'][$id];
 			//$invoice_customer->ref=$x_coll[$my_coll_rate]['facnum'][$id];
 			//$invoice_customer->type=$x_coll[$my_coll_rate]['type'][$id];
@@ -343,11 +365,9 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 		$x_both[$my_paye_rate]['paye']['links'] = '';
 		$x_both[$my_paye_rate]['paye']['detail'] = array();
 
-		foreach ($x_paye[$my_paye_rate]['facid'] as $id=>$dummy)
-		{
+		foreach ($x_paye[$my_paye_rate]['facid'] as $id => $dummy) {
 			// ExpenseReport
-			if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment')
-			{
+			if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment') {
 				//$expensereport->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$expensereport->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$expensereport->type=$x_paye[$my_paye_rate]['type'][$id];
@@ -369,8 +389,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 				'vat'				=>$x_paye[$my_paye_rate]['vat_list'][$id],
 				//'link'				=>$expensereport->getNomUrl(1)
 				);
-			}
-			else {
+			} else {
 				//$invoice_supplier->id=$x_paye[$my_paye_rate]['facid'][$id];
 				//$invoice_supplier->ref=$x_paye[$my_paye_rate]['facnum'][$id];
 				//$invoice_supplier->type=$x_paye[$my_paye_rate]['type'][$id];
@@ -400,144 +419,133 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000)	// $mc
 	}
 	//now we have an array (x_both) indexed by rates for coll and paye
 
-    $action = "tva";
-    $object = array(&$x_coll, &$x_paye, &$x_both);
-    $parameters["mode"] = $modetax;
-    $parameters["year"] = $y;
-    $parameters["month"] = $m;
-    $parameters["type"] = 'vat';
+	$action = "tva";
+	$object = array(&$x_coll, &$x_paye, &$x_both);
+	$parameters["mode"] = $modetax;
+	$parameters["year"] = $y;
+	$parameters["month"] = $m;
+	$parameters["type"] = 'vat';
 
-    // Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
-    $hookmanager->initHooks(array('externalbalance'));
-    $reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
+	$hookmanager->initHooks(array('externalbalance'));
+	$reshook = $hookmanager->executeHooks('addVatLine', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-    if (!is_array($x_coll) && $coll_listbuy == -1)
-    {
-        $langs->load("errors");
-        print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
-        break;
-    }
-    if (!is_array($x_paye) && $coll_listbuy == -2)
-    {
-        print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
-        break;
-    }
+	if (!is_array($x_coll) && $coll_listbuy == -1) {
+		$langs->load("errors");
+		print '<tr><td colspan="5">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
+		break;
+	}
+	if (!is_array($x_paye) && $coll_listbuy == -2) {
+		print '<tr><td colspan="5">'.$langs->trans("FeatureNotYetAvailable").'</td></tr>';
+		break;
+	}
 
 
-    print '<tr class="oddeven">';
-    print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
+	print '<tr class="oddeven">';
+	print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?leftmenu=tax_vat&month='.$m.'&year='.$y.'">'.dol_print_date(dol_mktime(0, 0, 0, $m, 1, $y), "%b %Y").'</a></td>';
 
-    $x_coll_sum = 0;
-    foreach (array_keys($x_coll) as $rate)
-    {
-    	$subtot_coll_total_ht = 0;
-    	$subtot_coll_vat = 0;
+	$x_coll_sum = 0;
+	foreach (array_keys($x_coll) as $rate) {
+		$subtot_coll_total_ht = 0;
+		$subtot_coll_vat = 0;
 
-    	foreach ($x_both[$rate]['coll']['detail'] as $index => $fields)
-	    {
-	    	// Payment
-	    	$ratiopaymentinvoice = 1;
-	    	if ($modetax != 1)
-	    	{
-	    		// Define type
-	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-	    		$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-	    		// Try to enhance type detection using date_start and date_end for free lines where type
-	    		// was not saved.
-	    		if (!empty($fields['ddate_start'])) {
-	    			$type = 1;
-	    		}
-	    		if (!empty($fields['ddate_end'])) {
-	    			$type = 1;
-	    		}
+		foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1) {
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-	    		{
-	    			//print $langs->trans("NA");
-	    		} else {
-	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-	    				$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-	    			}
-	    		}
-	    	}
-	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-	    	$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-	    	$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-	    	$subtot_coll_total_ht += $temp_ht;
-	    	$subtot_coll_vat      += $temp_vat;
-	    	$x_coll_sum           += $temp_vat;
-	    }
-    }
-    print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+			$subtot_coll_total_ht += $temp_ht;
+			$subtot_coll_vat      += $temp_vat;
+			$x_coll_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_coll_sum, 'MT')).'</td>';
 
-    $x_paye_sum = 0;
-    foreach (array_keys($x_paye) as $rate)
-    {
-    	$subtot_paye_total_ht = 0;
-    	$subtot_paye_vat = 0;
+	$x_paye_sum = 0;
+	foreach (array_keys($x_paye) as $rate) {
+		$subtot_paye_total_ht = 0;
+		$subtot_paye_vat = 0;
 
-	    foreach ($x_both[$rate]['paye']['detail'] as $index => $fields)
-	    {
-	    	// Payment
-	    	$ratiopaymentinvoice = 1;
-	    	if ($modetax != 1)
-	    	{
-	    		// Define type
-	    		// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
-	    		$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
-	    		// Try to enhance type detection using date_start and date_end for free lines where type
-	    		// was not saved.
-	    		if (!empty($fields['ddate_start'])) {
-	    			$type = 1;
-	    		}
-	    		if (!empty($fields['ddate_end'])) {
-	    			$type = 1;
-	    		}
+		foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
+			// Payment
+			$ratiopaymentinvoice = 1;
+			if ($modetax != 1) {
+				// Define type
+				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
+				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
+				// Try to enhance type detection using date_start and date_end for free lines where type
+				// was not saved.
+				if (!empty($fields['ddate_start'])) {
+					$type = 1;
+				}
+				if (!empty($fields['ddate_end'])) {
+					$type = 1;
+				}
 
-	    		if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-	    			|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-	    		{
-	    			//print $langs->trans("NA");
-	    		} else {
-	    			if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-	    				$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
-	    			}
-	    		}
-	    	}
-	    	//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
-	    	$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
-	    	$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
-	    	$subtot_paye_total_ht += $temp_ht;
-	    	$subtot_paye_vat      += $temp_vat;
-	    	$x_paye_sum           += $temp_vat;
-	    }
-    }
-    print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
+				if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
+					|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
+					//print $langs->trans("NA");
+				} else {
+					if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
+						$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
+					}
+				}
+			}
+			//var_dump('type='.$type.' '.$fields['totalht'].' '.$ratiopaymentinvoice);
+			$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
+			$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
+			$subtot_paye_total_ht += $temp_ht;
+			$subtot_paye_vat      += $temp_vat;
+			$x_paye_sum           += $temp_vat;
+		}
+	}
+	print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
 
-    $subtotalcoll = $subtotalcoll + $x_coll_sum;
-    $subtotalpaye = $subtotalpaye + $x_paye_sum;
+	$subtotalcoll = $subtotalcoll + $x_coll_sum;
+	$subtotalpaye = $subtotalpaye + $x_paye_sum;
 
-    $diff = $x_coll_sum - $x_paye_sum;
-    $total = $total + $diff;
-    $subtotal = price2num($subtotal + $diff, 'MT');
+	$diff = $x_coll_sum - $x_paye_sum;
+	$total = $total + $diff;
+	$subtotal = price2num($subtotal + $diff, 'MT');
 
-    print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
-    print "<td>&nbsp;</td>\n";
-    print "</tr>\n";
+	print '<td class="nowrap right">'.price(price2num($diff, 'MT')).'</td>'."\n";
+	print "<td>&nbsp;</td>\n";
+	print "</tr>\n";
 
-    $i++; $m++;
-    if ($i > 2)
-    {
-        print '<tr class="liste_total">';
-        print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
-        print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
-        print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
-        print '<td>&nbsp;</td></tr>';
-        $i = 0;
-        $subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
-    }
+	$i++; $m++;
+	if ($i > 2) {
+		print '<tr class="liste_total">';
+		print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
+		print '<td>&nbsp;</td></tr>';
+		$i = 0;
+		$subtotalcoll = 0; $subtotalpaye = 0; $subtotal = 0;
+	}
 }
 print '<tr class="liste_total"><td class="right" colspan="3">'.$langs->trans("TotalToPay").':</td><td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
 print "<td>&nbsp;</td>\n";
@@ -579,45 +587,44 @@ $sql .= " ORDER BY dm ASC, mode ASC";
 pt($db, $sql, $langs->trans("Month"));
 
 
-if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-{
+if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
 	print '<br>';
 
 	/*
-     * Recap
-     */
+	 * Recap
+	 */
 
-    print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
+	print load_fiche_titre($langs->trans("VATBalance"), '', ''); // need to add translation
 
-    $sql1 = "SELECT SUM(amount) as mm";
-    $sql1 .= " FROM ".MAIN_DB_PREFIX."tva as f";
-    $sql1 .= " WHERE f.entity = ".$conf->entity;
-    $sql1 .= " AND f.datev >= '".$db->idate($date_start)."'";
-    $sql1 .= " AND f.datev <= '".$db->idate($date_end)."'";
+	$sql1 = "SELECT SUM(amount) as mm";
+	$sql1 .= " FROM ".MAIN_DB_PREFIX."tva as f";
+	$sql1 .= " WHERE f.entity = ".$conf->entity;
+	$sql1 .= " AND f.datev >= '".$db->idate($date_start)."'";
+	$sql1 .= " AND f.datev <= '".$db->idate($date_end)."'";
 
-    $result = $db->query($sql1);
-    if ($result) {
-        $obj = $db->fetch_object($result);
-        print '<table class="noborder centpercent">';
+	$result = $db->query($sql1);
+	if ($result) {
+		$obj = $db->fetch_object($result);
+		print '<table class="noborder centpercent">';
 
-        print "<tr>";
-        print '<td class="right">'.$langs->trans("VATDue").'</td>';
-        print '<td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
-        print "</tr>\n";
+		print "<tr>";
+		print '<td class="right">'.$langs->trans("VATDue").'</td>';
+		print '<td class="nowrap right">'.price(price2num($total, 'MT')).'</td>';
+		print "</tr>\n";
 
-        print "<tr>";
-        print '<td class="right">'.$langs->trans("VATPaid").'</td>';
-        print '<td class="nowrap right">'.price(price2num($obj->mm, 'MT'))."</td>\n";
-        print "</tr>\n";
+		print "<tr>";
+		print '<td class="right">'.$langs->trans("VATPaid").'</td>';
+		print '<td class="nowrap right">'.price(price2num($obj->mm, 'MT'))."</td>\n";
+		print "</tr>\n";
 
-        $restopay = $total - $obj->mm;
-        print "<tr>";
-        print '<td class="right">'.$langs->trans("RemainToPay").'</td>';
-        print '<td class="nowrap right">'.price(price2num($restopay, 'MT')).'</td>';
-        print "</tr>\n";
+		$restopay = $total - $obj->mm;
+		print "<tr>";
+		print '<td class="right">'.$langs->trans("RemainToPay").'</td>';
+		print '<td class="nowrap right">'.price(price2num($restopay, 'MT')).'</td>';
+		print "</tr>\n";
 
-        print '</table>';
-    }
+		print '</table>';
+	}
 }
 
 print '</div></div>';
diff --git a/htdocs/compta/tva/info.php b/htdocs/compta/tva/info.php
index 45799c8e1f5..fb3d0c62d86 100644
--- a/htdocs/compta/tva/info.php
+++ b/htdocs/compta/tva/info.php
@@ -34,7 +34,9 @@ $action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 $object = new Tva($db);
@@ -45,12 +47,12 @@ $object = new Tva($db);
  * Actions
  */
 
-if ($action == 'setlib' && $user->rights->tax->charges->creer)
-{
+if ($action == 'setlib' && $user->rights->tax->charges->creer) {
 	$object->fetch($id);
 	$result = $object->setValueFrom('label', GETPOST('lib', 'alpha'), '', '', 'text', '', $user, 'TAX_MODIFY');
-	if ($result < 0)
+	if ($result < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
 
 
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index dd5118bc656..c7146023aab 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -30,7 +30,9 @@ require '../../main.inc.php';
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
@@ -65,13 +67,19 @@ $sortfield					= GETPOST('sortfield', 'alpha');
 $sortorder					= GETPOST('sortorder', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
 
-if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0; // If $page is not defined, or '' or -1
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!$sortfield) $sortfield = 't.datev';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 't.datev';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
 $arrayfields = array(
 	't.rowid'			=>array('checked'=>1, 'position'=>10, 'label'=>"Ref",),
@@ -94,14 +102,15 @@ $object = new Tva($db);
 
 $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)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 		$search_ref = '';
 		$search_label = '';
 		$search_dateend_start = '';
@@ -137,16 +146,36 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pst ON t.fk_typepayment = ps
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_vat as ptva ON ptva.fk_tva = t.rowid";
 $sql .= ' WHERE t.entity IN ('.getEntity($object->element).')';
 
-if (!empty($search_ref))							$sql .= natural_search('t.rowid', $search_ref);
-if (!empty($search_label))							$sql .= natural_search('t.label', $search_label);
-if (!empty($search_dateend_start))					$sql .= ' AND t.datev >= "'.$db->idate($search_dateend_start).'"';
-if (!empty($search_dateend_end))					$sql .= ' AND t.datev <= "'.$db->idate($search_dateend_end).'"';
-if (!empty($search_datepayment_start))  			$sql .= ' AND t.datep >= "'.$db->idate($search_datepayment_start).'"';
-if (!empty($search_datepayment_end))				$sql .= ' AND t.datep <= "'.$db->idate($search_datepayment_end).'"';
-if (!empty($search_type) && $search_type > 0)		$sql .= ' AND t.fk_typepayment='.$search_type;
-if (!empty($search_account) && $search_account > 0)	$sql .= ' AND b.fk_account='.$search_account;
-if (!empty($search_amount))							$sql .= natural_search('t.amount', price2num(trim($search_amount)), 1);
-if ($search_status != '' && $search_status >= 0) 	$sql .= " AND t.paye = ".$db->escape($search_status);
+if (!empty($search_ref)) {
+	$sql .= natural_search('t.rowid', $search_ref);
+}
+if (!empty($search_label)) {
+	$sql .= natural_search('t.label', $search_label);
+}
+if (!empty($search_dateend_start)) {
+	$sql .= ' AND t.datev >= "'.$db->idate($search_dateend_start).'"';
+}
+if (!empty($search_dateend_end)) {
+	$sql .= ' AND t.datev <= "'.$db->idate($search_dateend_end).'"';
+}
+if (!empty($search_datepayment_start)) {
+	$sql .= ' AND t.datep >= "'.$db->idate($search_datepayment_start).'"';
+}
+if (!empty($search_datepayment_end)) {
+	$sql .= ' AND t.datep <= "'.$db->idate($search_datepayment_end).'"';
+}
+if (!empty($search_type) && $search_type > 0) {
+	$sql .= ' AND t.fk_typepayment='.$search_type;
+}
+if (!empty($search_account) && $search_account > 0) {
+	$sql .= ' AND b.fk_account='.$search_account;
+}
+if (!empty($search_amount)) {
+	$sql .= natural_search('t.amount', price2num(trim($search_amount)), 1);
+}
+if ($search_status != '' && $search_status >= 0) {
+	$sql .= " AND t.paye = ".$db->escape($search_status);
+}
 
 $sql .= " GROUP BY t.rowid, t.amount, t.label, t.datev, t.datep, t.paye, t.fk_typepayment, t.num_payment, pst.code";
 $sql .= $db->order($sortfield, $sortorder);
@@ -166,8 +195,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if (!$result)
-{
+if (!$result) {
 	dol_print_error($db);
 	llxFooter();
 	$db->close();
@@ -177,32 +205,78 @@ if (!$result)
 $num = $db->num_rows($result);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) {
+	$param .= '&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.$limit;
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 
-if (!empty($search_ref))							$param .= '&search_ref="'.$search_ref.'"';
-if (!empty($search_label))							$param .= '&search_label="'.$search_label.'"';
-if (!empty($search_dateend_start))					$param .= '&search_dateend_startyear='.GETPOST('search_dateend_startyear', 'int');
-if (!empty($search_dateend_start))					$param .= '&search_dateend_startmonth='.GETPOST('search_dateend_startmonth', 'int');
-if (!empty($search_dateend_start))					$param .= '&search_dateend_startday='.GETPOST('search_dateend_startday', 'int');
-if (!empty($search_dateend_end))					$param .= '&search_dateend_endyear='.GETPOST('search_dateend_endyear', 'int');
-if (!empty($search_dateend_end))					$param .= '&search_dateend_endmonth='.GETPOST('search_dateend_endmonth', 'int');
-if (!empty($search_dateend_end))					$param .= '&search_dateend_endday='.GETPOST('search_dateend_endday', 'int');
-if (!empty($search_datepayment_start))				$param .= '&search_datepayment_startyear='.GETPOST('search_datepayment_startyear', 'int');
-if (!empty($search_datepayment_start))				$param .= '&search_datepayment_startmonth='.GETPOST('search_datepayment_startmonth', 'int');
-if (!empty($search_datepayment_start))				$param .= '&search_datepayment_startday='.GETPOST('search_datepayment_startday', 'int');
-if (!empty($search_datepayment_end))				$param .= '&search_datepayment_endyear='.GETPOST('search_datepayment_endyear', 'int');
-if (!empty($search_datepayment_end))				$param .= '&search_datepayment_endmonth='.GETPOST('search_datepayment_endmonth', 'int');
-if (!empty($search_datepayment_end))				$param .= '&search_datepayment_endday='.GETPOST('search_datepayment_endday', 'int');
-if (!empty($search_type) && $search_type > 0)		$param .= '&search_type='.$search_type;
-if (!empty($search_cheque))							$param .= '&search_cheque="'.$search_cheque.'"';
-if (!empty($search_account) && $search_account > 0)	$param .= '&search_account='.$search_account;
-if (!empty($search_amount))							$param .= '&search_amount="'.$search_amount.'"';
-if ($search_status != '' && $search_status != '-1') $param .= '&search_status='.urlencode($search_status);
+if (!empty($search_ref)) {
+	$param .= '&search_ref="'.$search_ref.'"';
+}
+if (!empty($search_label)) {
+	$param .= '&search_label="'.$search_label.'"';
+}
+if (!empty($search_dateend_start)) {
+	$param .= '&search_dateend_startyear='.GETPOST('search_dateend_startyear', 'int');
+}
+if (!empty($search_dateend_start)) {
+	$param .= '&search_dateend_startmonth='.GETPOST('search_dateend_startmonth', 'int');
+}
+if (!empty($search_dateend_start)) {
+	$param .= '&search_dateend_startday='.GETPOST('search_dateend_startday', 'int');
+}
+if (!empty($search_dateend_end)) {
+	$param .= '&search_dateend_endyear='.GETPOST('search_dateend_endyear', 'int');
+}
+if (!empty($search_dateend_end)) {
+	$param .= '&search_dateend_endmonth='.GETPOST('search_dateend_endmonth', 'int');
+}
+if (!empty($search_dateend_end)) {
+	$param .= '&search_dateend_endday='.GETPOST('search_dateend_endday', 'int');
+}
+if (!empty($search_datepayment_start)) {
+	$param .= '&search_datepayment_startyear='.GETPOST('search_datepayment_startyear', 'int');
+}
+if (!empty($search_datepayment_start)) {
+	$param .= '&search_datepayment_startmonth='.GETPOST('search_datepayment_startmonth', 'int');
+}
+if (!empty($search_datepayment_start)) {
+	$param .= '&search_datepayment_startday='.GETPOST('search_datepayment_startday', 'int');
+}
+if (!empty($search_datepayment_end)) {
+	$param .= '&search_datepayment_endyear='.GETPOST('search_datepayment_endyear', 'int');
+}
+if (!empty($search_datepayment_end)) {
+	$param .= '&search_datepayment_endmonth='.GETPOST('search_datepayment_endmonth', 'int');
+}
+if (!empty($search_datepayment_end)) {
+	$param .= '&search_datepayment_endday='.GETPOST('search_datepayment_endday', 'int');
+}
+if (!empty($search_type) && $search_type > 0) {
+	$param .= '&search_type='.$search_type;
+}
+if (!empty($search_cheque)) {
+	$param .= '&search_cheque="'.$search_cheque.'"';
+}
+if (!empty($search_account) && $search_account > 0) {
+	$param .= '&search_account='.$search_account;
+}
+if (!empty($search_amount)) {
+	$param .= '&search_amount="'.$search_amount.'"';
+}
+if ($search_status != '' && $search_status != '-1') {
+	$param .= '&search_status='.urlencode($search_status);
+}
 
 print '<form method="POST" 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="action" value="list">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -211,13 +285,17 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $url = DOL_URL_ROOT.'/compta/tva/card.php?action=create';
-if (!empty($socid)) $url .= '&socid='.$socid;
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
 $newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
 print_barre_liste($langs->trans("VATDeclarations"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $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" : '').'">';
@@ -303,13 +381,27 @@ print '</td>';
 print '</tr>';
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['t.rowid']['checked']))				print_liste_field_titre($arrayfields['t.rowid']['label'], $_SERVER['PHP_SELF'], 't.rowid', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['t.label']['checked']))				print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER['PHP_SELF'], 't.label', '', $param, 'align="left"', $sortfield, $sortorder);
-if (!empty($arrayfields['t.datev']['checked']))				print_liste_field_titre($arrayfields['t.datev']['label'], $_SERVER['PHP_SELF'], 't.datev', '', $param, 'align="center"', $sortfield, $sortorder);
-if (!empty($arrayfields['t.fk_typepayment']['checked']))	print_liste_field_titre($arrayfields['t.fk_typepayment']['label'], $_SERVER['PHP_SELF'], 't.fk_typepayment', '', $param, '', $sortfield, $sortorder, 'left ');
-if (!empty($arrayfields['t.amount']['checked']))			print_liste_field_titre($arrayfields['t.amount']['label'], $_SERVER['PHP_SELF'], 't.amount', '', $param, '', $sortfield, $sortorder, 'right ');
-if (!empty($arrayfields['t.status']['checked'])) 			print_liste_field_titre($arrayfields['t.status']['label'], $_SERVER["PHP_SELF"], "t.paye", "", $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.rowid']['checked'])) {
+	print_liste_field_titre($arrayfields['t.rowid']['label'], $_SERVER['PHP_SELF'], 't.rowid', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.label']['checked'])) {
+	print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER['PHP_SELF'], 't.label', '', $param, 'align="left"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.datev']['checked'])) {
+	print_liste_field_titre($arrayfields['t.datev']['label'], $_SERVER['PHP_SELF'], 't.datev', '', $param, 'align="center"', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
+	print_liste_field_titre($arrayfields['t.fk_typepayment']['label'], $_SERVER['PHP_SELF'], 't.fk_typepayment', '', $param, '', $sortfield, $sortorder, 'left ');
+}
+if (!empty($arrayfields['t.amount']['checked'])) {
+	print_liste_field_titre($arrayfields['t.amount']['label'], $_SERVER['PHP_SELF'], 't.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['t.status']['checked'])) {
+	print_liste_field_titre($arrayfields['t.status']['label'], $_SERVER["PHP_SELF"], "t.paye", "", $param, 'class="right"', $sortfield, $sortorder);
+}
 
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -333,25 +425,33 @@ while ($i < min($num, $limit)) {
 	// No
 	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 		print '<td>'.(($offset * $limit) + $i).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Ref
 	if (!empty($arrayfields['t.rowid']['checked'])) {
 		print '<td>'.$tva_static->getNomUrl(1).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Label
 	if (!empty($arrayfields['t.label']['checked'])) {
 		print '<td>'.dol_trunc($obj->label, 40).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Date end period
 	if (!empty($arrayfields['t.datev']['checked'])) {
 		print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Date payment
@@ -361,10 +461,11 @@ while ($i < min($num, $limit)) {
 	}*/
 
 	// Type
-	if (!empty($arrayfields['t.fk_typepayment']['checked']))
-	{
+	if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
 		print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Account
@@ -390,15 +491,21 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['t.amount']['checked'])) {
 		$total = $total + $obj->amount;
 		print '<td class="nowrap right">' . price($obj->amount) . '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 		$totalarray['pos'][$totalarray['nbfield']] = 'amount';
 		$totalarray['val']['amount'] += $obj->amount;
 	}
 
 	if (!empty($arrayfields['t.status']['checked'])) {
 		print '<td class="nowrap right">' . $tva_static->LibStatut($obj->paye, 5, $obj->alreadypayed) . '</td>';
-		if (!$i) $totalarray['nbfield']++;
-		if (!empty($arrayfields['t.amount']['checked'])) $totalarray['pos'][$totalarray['nbfield']] = '';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!empty($arrayfields['t.amount']['checked'])) {
+			$totalarray['pos'][$totalarray['nbfield']] = '';
+		}
 	}
 
 	// Buttons
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index 0cdf7e7086b..73e2dae0e05 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -39,24 +39,34 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array('compta', 'bills'));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax|salaries', '', '', 'charges|');
 
 $mode = GETPOST("mode", 'alpha');
 $year = GETPOST("year", 'int');
 $filtre = GETPOST("filtre", 'alpha');
-if (!$year && $mode != 'tvaonly') { $year = date("Y", time()); }
+if (!$year && $mode != 'tvaonly') {
+	$year = date("Y", time());
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "ptva.datep";
-if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) {
+	$sortfield = "ptva.datep";
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
 
 
 /*
@@ -73,14 +83,24 @@ llxHeader('', $langs->trans("VATExpensesArea"));
 $title = $langs->trans("VATPayments");
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($sortfield) $param .= '&sortfield='.$sortfield;
-if ($sortorder) $param .= '&sortorder='.$sortorder;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.$limit;
+}
+if ($sortfield) {
+	$param .= '&sortfield='.$sortfield;
+}
+if ($sortorder) {
+	$param .= '&sortorder='.$sortorder;
+}
 
 
 print '<form method="POST" 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="sortfield" value="'.$sortfield.'">';
@@ -90,10 +110,11 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'title_accountancy', 0, '', '', $limit);
 
-if ($year) $param .= '&year='.$year;
+if ($year) {
+	$param .= '&year='.$year;
+}
 
-if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
-{
+if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
@@ -120,8 +141,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON ptva.fk_typepaiement = pct.id";
 	$sql .= " WHERE ptva.fk_tva = tva.rowid";
 	$sql .= " AND tva.entity = ".$conf->entity;
-	if ($year > 0)
-	{
+	if ($year > 0) {
 		$sql .= " AND (";
 		// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
 		// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
@@ -133,22 +153,22 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 		|| preg_match('/^tva\./', $sortfield)
 		|| preg_match('/^ptva\./', $sortfield)
 		|| preg_match('/^pct\./', $sortfield)
-		|| preg_match('/^bank\./', $sortfield)) $sql .= $db->order($sortfield, $sortorder);
+		|| preg_match('/^bank\./', $sortfield)) {
+		$sql .= $db->order($sortfield, $sortorder);
+	}
 	//$sql.= $db->plimit($limit+1,$offset);
 	//print $sql;
 
 	dol_syslog("compta/tva/payments.php: select payment", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 		$total = 0;
 		$totalnb = 0;
 		$totalpaye = 0;
 
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 
 			$payment_vat_static->id = $obj->pid;
@@ -159,11 +179,13 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			print '<td>'.$payment_vat_static->getNomUrl(1)."</td>\n";
 			// Date payment
 			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
-	        // Type payment
-    	    print '<td>';
-    	    if ($obj->payment_code) print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
-    	    print $obj->num_payment.'</td>';
-    	    // Account
+			// Type payment
+			print '<td>';
+			if ($obj->payment_code) {
+				print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+			}
+			print $obj->num_payment.'</td>';
+			// Account
 			print '<td>';
 			$account = new Account($db);
 			$account->fetch($obj->fk_account);
@@ -185,7 +207,9 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			print '<td class="right">'.price($obj->total).'</td>';
 			// Paid
 			print '<td class="right">';
-			if ($obj->totalpaye) print price($obj->totalpaye);
+			if ($obj->totalpaye) {
+				print price($obj->totalpaye);
+			}
 			print '</td>';
 			print '</tr>';
 
@@ -194,16 +218,15 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 			$totalpaye = $totalpaye + $obj->totalpaye;
 			$i++;
 		}
-	    print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
-	    print '<td class="liste_total right"></td>'; // A total here has no sense
-	    //print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
+		print '<td class="liste_total right"></td>'; // A total here has no sense
+		//print '<td align="center" class="liste_total">&nbsp;</td>';
 		print '<td align="center" class="liste_total">&nbsp;</td>';
 		print '<td align="center" class="liste_total">&nbsp;</td>';
-	    print '<td class="liste_total right">'.price($totalpaye)."</td>";
+		print '<td align="center" class="liste_total">&nbsp;</td>';
+		print '<td class="liste_total right">'.price($totalpaye)."</td>";
 		print "</tr>";
-	}
-	else {
+	} else {
 		dol_print_error($db);
 	}
 	print '</table>';
diff --git a/htdocs/compta/tva/quadri_detail.php b/htdocs/compta/tva/quadri_detail.php
index ba12b08b3b0..04f90ba02f9 100644
--- a/htdocs/compta/tva/quadri_detail.php
+++ b/htdocs/compta/tva/quadri_detail.php
@@ -46,12 +46,13 @@ $langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "produ
 
 $now = dol_now();
 $current_date = dol_getdate($now);
-if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) $conf->global->SOCIETE_FISCAL_MONTH_START = 1;
+if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
+	$conf->global->SOCIETE_FISCAL_MONTH_START = 1;
+}
 
 // Date range
 $year = GETPOST("year", "int");
-if (empty($year))
-{
+if (empty($year)) {
 	$year_current = $current_date['year'];
 	$year_start = $year_current;
 } else {
@@ -61,12 +62,12 @@ if (empty($year))
 $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
 $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
 // Set default period if not defined
-if (empty($date_start) || empty($date_end)) // We define date_start and date_end
-{
+if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
 	$q = GETPOST("q", "int");
-	if (empty($q))
-	{
-		if (GETPOST("month", "int")) { $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false); } else {
+	if (empty($q)) {
+		if (GETPOST("month", "int")) {
+			$date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false); $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
+		} else {
 			if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
 				$date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
 				$date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
@@ -88,25 +89,41 @@ if (empty($date_start) || empty($date_end)) // We define date_start and date_end
 			}
 		}
 	} else {
-		if ($q == 1) { $date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false); }
-		if ($q == 2) { $date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false); }
-		if ($q == 3) { $date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false); }
-		if ($q == 4) { $date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false); }
+		if ($q == 1) {
+			$date_start = dol_get_first_day($year_start, 1, false); $date_end = dol_get_last_day($year_start, 3, false);
+		}
+		if ($q == 2) {
+			$date_start = dol_get_first_day($year_start, 4, false); $date_end = dol_get_last_day($year_start, 6, false);
+		}
+		if ($q == 3) {
+			$date_start = dol_get_first_day($year_start, 7, false); $date_end = dol_get_last_day($year_start, 9, false);
+		}
+		if ($q == 4) {
+			$date_start = dol_get_first_day($year_start, 10, false); $date_end = dol_get_last_day($year_start, 12, false);
+		}
 	}
 }
 
 $min = price2num(GETPOST("min", "alpha"));
-if (empty($min)) $min = 0;
+if (empty($min)) {
+	$min = 0;
+}
 
 // Define modetax (0 or 1)
 // 0=normal, 1=option vat for services is on debit, 2=option on payments for products
 $modetax = $conf->global->TAX_MODE;
-if (GETPOSTISSET("modetax")) $modetax = GETPOST("modetax", 'int');
-if (empty($modetax)) $modetax = 0;
+if (GETPOSTISSET("modetax")) {
+	$modetax = GETPOST("modetax", 'int');
+}
+if (empty($modetax)) {
+	$modetax = 0;
+}
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'tax', '', '', 'charges');
 
 
@@ -127,9 +144,10 @@ $paymentexpensereport_static = new PaymentExpenseReport($db);
 
 $morequerystring = '';
 $listofparams = array('date_startmonth', 'date_startyear', 'date_startday', 'date_endmonth', 'date_endyear', 'date_endday');
-foreach ($listofparams as $param)
-{
-	if (GETPOST($param) != '') $morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+foreach ($listofparams as $param) {
+	if (GETPOST($param) != '') {
+		$morequerystring .= ($morequerystring ? '&' : '').$param.'='.GETPOST($param);
+	}
 }
 
 $title = $langs->trans("VATReport")." ".dol_print_date($date_start)." -> ".dol_print_date($date_end);
@@ -149,9 +167,15 @@ $fsearch .= '<input type="hidden" name="modetax" value="'.$modetax.'">';
 // Show report header
 $name = $langs->trans("VATReportByRates");
 $calcmode = '';
-if ($modetax == 0) $calcmode = $langs->trans('OptionVATDefault');
-if ($modetax == 1) $calcmode = $langs->trans('OptionVATDebitOption');
-if ($modetax == 2) $calcmode = $langs->trans('OptionPaymentForProductAndServices');
+if ($modetax == 0) {
+	$calcmode = $langs->trans('OptionVATDefault');
+}
+if ($modetax == 1) {
+	$calcmode = $langs->trans('OptionVATDebitOption');
+}
+if ($modetax == 2) {
+	$calcmode = $langs->trans('OptionPaymentForProductAndServices');
+}
 $calcmode .= ' <span class="opacitymedium">('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').')</span>';
 // Set period
 $period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
@@ -173,14 +197,24 @@ if ($nextquarter < 4) {
 $description .= $fsearch;
 $builddate = dol_now();
 
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') $description .= $langs->trans("RulesVATDueProducts");
-if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') $description .= $langs->trans("RulesVATInProducts");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') $description .= '<br>'.$langs->trans("RulesVATDueServices");
-if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') $description .= '<br>'.$langs->trans("RulesVATInServices");
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'invoice') {
+	$description .= $langs->trans("RulesVATDueProducts");
+}
+if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment') {
+	$description .= $langs->trans("RulesVATInProducts");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'invoice') {
+	$description .= '<br>'.$langs->trans("RulesVATDueServices");
+}
+if ($conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+	$description .= '<br>'.$langs->trans("RulesVATInServices");
+}
 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 	$description .= '<br>'.$langs->trans("DepositsAreNotIncluded");
 }
-if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) {
+	$description .= '<br>'.$langs->trans("ThisIsAnEstimatedValue");
+}
 
 // Customers invoices
 $elementcust = $langs->trans("CustomersInvoices");
@@ -225,8 +259,7 @@ $columns = 5;
 $x_coll = tax_by_rate('vat', $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
 $x_paye = tax_by_rate('vat', $db, 0, 0, $date_start, $date_end, $modetax, 'buy');
 
-if (!is_array($x_coll) || !is_array($x_paye))
-{
+if (!is_array($x_coll) || !is_array($x_paye)) {
 	$langs->load("errors");
 	if ($x_coll == -1) {
 		print '<tr><td colspan="'.$columns.'">'.$langs->trans("ErrorNoAccountancyModuleLoaded").'</td></tr>';
@@ -238,15 +271,14 @@ if (!is_array($x_coll) || !is_array($x_paye))
 } else {
 	$x_both = array();
 	//now, from these two arrays, get another array with one rate per line
-	foreach (array_keys($x_coll) as $my_coll_rate)
-	{
+	foreach (array_keys($x_coll) as $my_coll_rate) {
 		$x_both[$my_coll_rate]['coll']['totalht'] = $x_coll[$my_coll_rate]['totalht'];
 		$x_both[$my_coll_rate]['coll']['vat'] = $x_coll[$my_coll_rate]['vat'];
 		$x_both[$my_coll_rate]['paye']['totalht'] = 0;
 		$x_both[$my_coll_rate]['paye']['vat'] = 0;
 		$x_both[$my_coll_rate]['coll']['links'] = '';
 		$x_both[$my_coll_rate]['coll']['detail'] = array();
-		foreach ($x_coll[$my_coll_rate]['facid'] as $id=>$dummy) {
+		foreach ($x_coll[$my_coll_rate]['facid'] as $id => $dummy) {
 			$invoice_customer->id = $x_coll[$my_coll_rate]['facid'][$id];
 			$invoice_customer->ref = $x_coll[$my_coll_rate]['facnum'][$id];
 			$invoice_customer->type = $x_coll[$my_coll_rate]['type'][$id];
@@ -284,11 +316,9 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		$x_both[$my_paye_rate]['paye']['links'] = '';
 		$x_both[$my_paye_rate]['paye']['detail'] = array();
 
-		foreach ($x_paye[$my_paye_rate]['facid'] as $id=>$dummy)
-		{
+		foreach ($x_paye[$my_paye_rate]['facid'] as $id => $dummy) {
 			// ExpenseReport
-			if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment')
-			{
+			if ($x_paye[$my_paye_rate]['ptype'][$id] == 'ExpenseReportPayment') {
 				$expensereport->id = $x_paye[$my_paye_rate]['facid'][$id];
 				$expensereport->ref = $x_paye[$my_paye_rate]['facnum'][$id];
 				$expensereport->type = $x_paye[$my_paye_rate]['type'][$id];
@@ -349,7 +379,9 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	$x_paye_ht = 0;
 
 	$span = $columns;
-	if ($modetax != 1) $span += 2;
+	if ($modetax != 1) {
+		$span += 2;
+	}
 
 	//print '<tr><td colspan="'.($span+1).'">'..')</td></tr>';
 
@@ -357,12 +389,14 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	print '<tr class="liste_titre">';
 	print '<td class="left">'.$elementcust.'</td>';
 	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-	if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-	else print '<td></td>';
+	if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+		print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	} else {
+		print '<td></td>';
+	}
 	print '<td class="left">'.$namecust.'</td>';
 	print '<td class="left">'.$productcust.'</td>';
-	if ($modetax != 1)
-	{
+	if ($modetax != 1) {
 		print '<td class="right">'.$amountcust.'</td>';
 		print '<td class="right">'.$langs->trans("Payment").' ('.$langs->trans("PercentOfInvoice").')</td>';
 	}
@@ -385,8 +419,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		$subtot_coll_total_ht = 0;
 		$subtot_coll_vat = 0;
 
-		if (is_array($x_both[$rate]['coll']['detail']))
-		{
+		if (is_array($x_both[$rate]['coll']['detail'])) {
 			// VAT Rate
 			print "<tr>";
 			print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.($span + 1).'"></td>';
@@ -415,16 +448,18 @@ if (!is_array($x_coll) || !is_array($x_paye))
 				print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
 				// Payment date
-				if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
-				else print '<td></td>';
+				if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') {
+					print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
+				} else {
+					print '<td></td>';
+				}
 
 				// Company name
 				print '<td class="left">'.$fields['company_link'].'</td>';
 
 				// Description
 				print '<td class="left">';
-				if ($fields['pid'])
-				{
+				if ($fields['pid']) {
 					$product_static->id = $fields['pid'];
 					$product_static->ref = $fields['pref'];
 					$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
@@ -455,12 +490,10 @@ if (!is_array($x_coll) || !is_array($x_paye))
 				print '</td>';
 
 				// Total HT
-				if ($modetax != 1)
-				{
+				if ($modetax != 1) {
 					print '<td class="nowrap right">';
 					print price($fields['totalht']);
-					if (price2num($fields['ftotal_ttc']))
-					{
+					if (price2num($fields['ftotal_ttc'])) {
 						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
 						$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
 						//print ' ('.round($ratiolineinvoice*100,2).'%)';
@@ -470,18 +503,15 @@ if (!is_array($x_coll) || !is_array($x_paye))
 
 				// Payment
 				$ratiopaymentinvoice = 1;
-				if ($modetax != 1)
-				{
+				if ($modetax != 1) {
 					print '<td class="nowrap right">';
 					//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
-					if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-					{
+					if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
 						$payment_static->id = $fields['payment_id'];
 						print $payment_static->getNomUrl(2);
 					}
 					if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-						|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice'))
-					{
+						|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
 						print $langs->trans("NA");
 					} else {
 						if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
@@ -527,8 +557,7 @@ if (!is_array($x_coll) || !is_array($x_paye))
 		print '</tr>';
 	}
 
-	if (count($x_coll) == 0)   // Show a total line if nothing shown
-	{
+	if (count($x_coll) == 0) {   // Show a total line if nothing shown
 		print '<tr class="liste_total">';
 		print '<td colspan="4"></td>';
 		print '<td class="right">'.$langs->trans("Total").':</td>';
@@ -548,8 +577,11 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	print '<tr class="liste_titre liste_titre_topborder">';
 	print '<td class="left">'.$elementsup.'</td>';
 	print '<td class="left">'.$langs->trans("DateInvoice").'</td>';
-	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.$langs->trans("DatePayment").'</td>';
-	else print '<td></td>';
+	if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
+		print '<td class="left">'.$langs->trans("DatePayment").'</td>';
+	} else {
+		print '<td></td>';
+	}
 	print '<td class="left">'.$namesup.'</td>';
 	print '<td class="left">'.$productsup.'</td>';
 	if ($modetax != 1) {
@@ -560,18 +592,16 @@ if (!is_array($x_coll) || !is_array($x_paye))
 	print '<td class="right">'.$vatsup.'</td>';
 	print '</tr>'."\n";
 
-	foreach (array_keys($x_paye) as $rate)
-	{
+	foreach (array_keys($x_paye) as $rate) {
 		$subtot_paye_total_ht = 0;
 		$subtot_paye_vat = 0;
 
-		if (is_array($x_both[$rate]['paye']['detail']))
-		{
+		if (is_array($x_both[$rate]['paye']['detail'])) {
 			print "<tr>";
 			print '<td class="tax_rate">'.$langs->trans("Rate").': '.vatrate($rate).'%</td><td colspan="'.($span + 1).'"></td>';
 			print '</tr>'."\n";
 
-			foreach ($x_both[$rate]['paye']['detail'] as $index=>$fields) {
+			foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
 				// Define type
 				// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
 				$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
@@ -594,16 +624,18 @@ if (!is_array($x_coll) || !is_array($x_paye))
 				print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
 				// Payment date
-				if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
-				else print '<td></td>';
+				if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
+					print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
+				} else {
+					print '<td></td>';
+				}
 
 				// Company name
 				print '<td class="left">'.$fields['company_link'].'</td>';
 
 				// Description
 				print '<td class="left">';
-				if ($fields['pid'])
-				{
+				if ($fields['pid']) {
 					$product_static->id = $fields['pid'];
 					$product_static->ref = $fields['pref'];
 					$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
@@ -634,12 +666,10 @@ if (!is_array($x_coll) || !is_array($x_paye))
 				print '</td>';
 
 				// Total HT
-				if ($modetax != 1)
-				{
+				if ($modetax != 1) {
 					print '<td class="nowrap right">';
 					print price($fields['totalht']);
-					if (price2num($fields['ftotal_ttc']))
-					{
+					if (price2num($fields['ftotal_ttc'])) {
 						//print $fields['dtotal_ttc']."/".$fields['ftotal_ttc']." - ";
 						$ratiolineinvoice = ($fields['dtotal_ttc'] / $fields['ftotal_ttc']);
 						//print ' ('.round($ratiolineinvoice*100,2).'%)';
@@ -649,18 +679,15 @@ if (!is_array($x_coll) || !is_array($x_paye))
 
 				// Payment
 				$ratiopaymentinvoice = 1;
-				if ($modetax != 1)
-				{
+				if ($modetax != 1) {
 					print '<td class="nowrap right">';
-					if ($fields['payment_amount'] && $fields['ftotal_ttc'])
-					{
+					if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
 						$paymentfourn_static->id = $fields['payment_id'];
 						print $paymentfourn_static->getNomUrl(2);
 					}
 
 					if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
-						|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-					{
+						|| ($type == 1 && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
 						print $langs->trans("NA");
 					} else {
 						if (isset($fields['payment_amount']) && $fields['ftotal_ttc']) {
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 2aeb2e4e2a1..ca496540a47 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -65,36 +65,44 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $object->getCanvas($id);
 $objcanvas = null;
 $canvas = (!empty($object->canvas) ? $object->canvas : GETPOST("canvas"));
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('contact', 'contactcard', $canvas);
 }
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'a.datep, a.id';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 'a.datep, a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactagenda', 'globalcard'));
@@ -106,20 +114,19 @@ $hookmanager->initHooks(array('contactagenda', 'globalcard'));
 
 $parameters = array('id'=>$id, 'objcanvas'=>$objcanvas);
 $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))
-{
+if (empty($reshook)) {
 	// Cancel
-	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-	{
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	}
 
 	// Purge search criteria
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 		$actioncode = '';
 		$search_agenda_label = '';
 	}
@@ -133,29 +140,30 @@ if (empty($reshook))
 $form = new Form($db);
 
 $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) $title = $object->lastname;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+	$title = $object->lastname;
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
 
-if ($socid > 0)
-{
+if ($socid > 0) {
 	$objsoc = new Societe($db);
 	$objsoc->fetch($socid);
 }
 
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS
 	// -----------------------------------------
-	if (empty($object->error) && $id)
- 	{
- 		$object = new Contact($db);
- 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error('', $object->error);
- 	}
-   	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
+	if (empty($object->error) && $id) {
+		$object = new Contact($db);
+		$result = $object->fetch($id);
+		if ($result <= 0) {
+			dol_print_error('', $object->error);
+		}
+	}
+	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
 	$objcanvas->display_canvas($action); // Show template
 } else {
 	// -----------------------------------------
@@ -163,26 +171,27 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	// -----------------------------------------
 
 	// Confirm deleting contact
-	if ($user->rights->societe->contact->supprimer)
-	{
-		if ($action == 'delete')
-		{
+	if ($user->rights->societe->contact->supprimer) {
+		if ($action == 'delete') {
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id.($backtopage ? '&backtopage='.$backtopage : ''), $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
 		}
 	}
 
 	/*
-     * Onglets
-     */
+	 * Onglets
+	 */
 	$head = array();
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		// Si edition contact deja existant
 		$object = new Contact($db);
 		$res = $object->fetch($id, $user);
-		if ($res < 0) { dol_print_error($db, $object->error); exit; }
+		if ($res < 0) {
+			dol_print_error($db, $object->error); exit;
+		}
 		$res = $object->fetch_optionals();
-		if ($res < 0) { dol_print_error($db, $object->error); exit; }
+		if ($res < 0) {
+			dol_print_error($db, $object->error); exit;
+		}
 
 		// Show tabs
 		$head = contact_prepare_head($object);
@@ -190,13 +199,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 	}
 
-	if (!empty($id) && $action != 'edit' && $action != 'create')
-	{
+	if (!empty($id) && $action != 'edit' && $action != 'create') {
 		$objsoc = new Societe($db);
 
 		/*
-         * Fiche en mode visualisation
-         */
+		 * Fiche en mode visualisation
+		 */
 
 		dol_htmloutput_errors($error, $errors);
 
@@ -205,14 +213,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '<div class="refidno">';
-		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-		{
+		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 			$objsoc = new Societe($db);
 			$objsoc->fetch($object->socid);
 			// Thirdparty
 			$morehtmlref .= $langs->trans('ThirdParty').' : ';
-			if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-			else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+			if ($objsoc->id > 0) {
+				$morehtmlref .= $objsoc->getNomUrl(1);
+			} else {
+				$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+			}
 		}
 		$morehtmlref .= '</div>';
 
@@ -238,29 +248,31 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		$out = '';
 		$permok = $user->rights->agenda->myactions->create;
-		if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-		{
-			if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') $out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '');
+		if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+			if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {
+				$out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '');
+			}
 			$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;origin=contact&amp;originid='.$object->id.'&amp;percentage=-1&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objcon->id > 0 ? '?id='.$objcon->id : ''));
 			$out .= '&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog'));
 		}
 
 		$newcardbutton = '';
-		if (!empty($conf->agenda->enabled))
-		{
-			if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-			{
+		if (!empty($conf->agenda->enabled)) {
+			if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 				$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 			}
 		}
 
-		if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	   	{
-	   		print '<br>';
+		if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+			print '<br>';
 
 			$param = '&id='.$id;
-			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-			if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+				$param .= '&contextpage='.$contextpage;
+			}
+			if ($limit > 0 && $limit != $conf->liste_limit) {
+				$param .= '&limit='.$limit;
+			}
 
 			print load_fiche_titre($langs->trans("ActionsOnContact"), $newcardbutton, '');
 			//print_barre_liste($langs->trans("ActionsOnCompany"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $morehtmlcenter, 0, -1, '', '', '', '', 0, 1, 1);
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index f6f6fa0b45e..a32263cd65e 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -64,14 +64,16 @@ abstract class ActionsContactCardCommon
 	{
 		/*$ret = $this->getInstanceDao();
 
-    	if (is_object($this->object) && method_exists($this->object,'fetch'))
-    	{
-    		if (! empty($id)) $this->object->fetch($id);
-    	}
-    	else
-    	{*/
+		if (is_object($this->object) && method_exists($this->object,'fetch'))
+		{
+			if (! empty($id)) $this->object->fetch($id);
+		}
+		else
+		{*/
 			$object = new Contact($this->db);
-			if (!empty($id)) $object->fetch($id);
+		if (!empty($id)) {
+			$object->fetch($id);
+		}
 			$this->object = $object;
 		//}
 	}
@@ -90,20 +92,19 @@ abstract class ActionsContactCardCommon
 		global $conf, $langs, $user, $canvas;
 		global $form, $formcompany, $objsoc;
 
-		if ($action == 'add' || $action == 'update') $this->assign_post();
+		if ($action == 'add' || $action == 'update') {
+			$this->assign_post();
+		}
 
-		foreach ($this->object as $key => $value)
-		{
+		foreach ($this->object as $key => $value) {
 			$this->tpl[$key] = $value;
 		}
 
 		$this->tpl['error'] = $this->error;
 		$this->tpl['errors'] = $this->errors;
 
-		if ($action == 'create' || $action == 'edit')
-		{
-			if ($conf->use_javascript_ajax)
-			{
+		if ($action == 'create' || $action == 'edit') {
+			if ($conf->use_javascript_ajax) {
 				$this->tpl['ajax_selectcountry'] = "\n".'<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function () {
 						jQuery("#selectcountry_id").change(function() {
@@ -115,8 +116,7 @@ abstract class ActionsContactCardCommon
 				</script>'."\n";
 			}
 
-			if (is_object($objsoc) && $objsoc->id > 0)
-			{
+			if (is_object($objsoc) && $objsoc->id > 0) {
 				$this->tpl['company'] = $objsoc->getNomUrl(1);
 				$this->tpl['company_id'] = $objsoc->id;
 			} else {
@@ -127,14 +127,25 @@ abstract class ActionsContactCardCommon
 			$this->tpl['select_civility'] = $formcompany->select_civility($this->object->civility_id);
 
 			// Predefined with third party
-			if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS))
-			{
-				if (dol_strlen(trim($this->object->address)) == 0) $this->tpl['address'] = $objsoc->address;
-				if (dol_strlen(trim($this->object->zip)) == 0) $this->object->zip = $objsoc->zip;
-				if (dol_strlen(trim($this->object->town)) == 0) $this->object->town = $objsoc->town;
-				if (dol_strlen(trim($this->object->phone_pro)) == 0) $this->object->phone_pro = $objsoc->phone;
-				if (dol_strlen(trim($this->object->fax)) == 0) $this->object->fax = $objsoc->fax;
-				if (dol_strlen(trim($this->object->email)) == 0) $this->object->email = $objsoc->email;
+			if ((isset($objsoc->typent_code) && $objsoc->typent_code == 'TE_PRIVATE') || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) {
+				if (dol_strlen(trim($this->object->address)) == 0) {
+					$this->tpl['address'] = $objsoc->address;
+				}
+				if (dol_strlen(trim($this->object->zip)) == 0) {
+					$this->object->zip = $objsoc->zip;
+				}
+				if (dol_strlen(trim($this->object->town)) == 0) {
+					$this->object->town = $objsoc->town;
+				}
+				if (dol_strlen(trim($this->object->phone_pro)) == 0) {
+					$this->object->phone_pro = $objsoc->phone;
+				}
+				if (dol_strlen(trim($this->object->fax)) == 0) {
+					$this->object->fax = $objsoc->fax;
+				}
+				if (dol_strlen(trim($this->object->email)) == 0) {
+					$this->object->email = $objsoc->email;
+				}
 			}
 
 			// Zip
@@ -143,28 +154,33 @@ abstract class ActionsContactCardCommon
 			// Town
 			$this->tpl['select_town'] = $formcompany->select_ziptown($this->object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'));
 
-			if (dol_strlen(trim($this->object->country_id)) == 0) $this->object->country_id = $objsoc->country_id;
+			if (dol_strlen(trim($this->object->country_id)) == 0) {
+				$this->object->country_id = $objsoc->country_id;
+			}
 
 			// Country
 			$this->tpl['select_country'] = $form->select_country($this->object->country_id, 'country_id');
 			$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-			if ($user->admin) $this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				$this->tpl['info_admin'] = info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 
 			// State
-			if ($this->object->country_id) $this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
-			else $this->tpl['select_state'] = $countrynotdefined;
+			if ($this->object->country_id) {
+				$this->tpl['select_state'] = $formcompany->select_state($this->object->state_id, $this->object->country_code);
+			} else {
+				$this->tpl['select_state'] = $countrynotdefined;
+			}
 
 			// Public or private
 			$selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
 			$this->tpl['select_visibility'] = $form->selectarray('priv', $selectarray, $this->object->priv, 0);
 		}
 
-		if ($action == 'view' || $action == 'edit' || $action == 'delete')
-		{
+		if ($action == 'view' || $action == 'edit' || $action == 'delete') {
 			// Emailing
-			if (!empty($conf->mailing->enabled))
-			{
+			if (!empty($conf->mailing->enabled)) {
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
@@ -175,46 +191,41 @@ abstract class ActionsContactCardCommon
 
 			$this->object->load_ref_elements();
 
-			if (!empty($conf->commande->enabled))
-			{
+			if (!empty($conf->commande->enabled)) {
 				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForOrders");
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_commande ? $this->object->ref_commande : $langs->trans("NoContactForAnyOrder");
 				$i++;
 			}
-			if (!empty($conf->propal->enabled))
-			{
+			if (!empty($conf->propal->enabled)) {
 				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForProposals");
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_propal ? $this->object->ref_propal : $langs->trans("NoContactForAnyProposal");
 				$i++;
 			}
-			if (!empty($conf->contrat->enabled))
-			{
+			if (!empty($conf->contrat->enabled)) {
 				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForContracts");
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_contrat ? $this->object->ref_contrat : $langs->trans("NoContactForAnyContract");
 				$i++;
 			}
-			if (!empty($conf->facture->enabled))
-			{
+			if (!empty($conf->facture->enabled)) {
 				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForInvoices");
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_facturation ? $this->object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
 				$i++;
 			}
 
 			// Dolibarr user
-			if ($this->object->user_id)
-			{
+			if ($this->object->user_id) {
 				$dolibarr_user = new User($this->db);
 				$result = $dolibarr_user->fetch($this->object->user_id);
 				$this->tpl['dolibarr_user'] = $dolibarr_user->getLoginUrl(1);
-			} else $this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
+			} else {
+				$this->tpl['dolibarr_user'] = $langs->trans("NoDolibarrAccess");
+			}
 		}
 
-		if ($action == 'view' || $action == 'delete')
-		{
+		if ($action == 'view' || $action == 'delete') {
 			$this->tpl['showrefnav'] = $form->showrefnav($this->object, 'id');
 
-			if ($this->object->socid > 0)
-			{
+			if ($this->object->socid > 0) {
 				$objsoc = new Societe($this->db);
 
 				$objsoc->fetch($this->object->socid);
@@ -243,14 +254,13 @@ abstract class ActionsContactCardCommon
 			$this->tpl['note'] = nl2br($this->object->note);
 		}
 
-		if ($action == 'create_user')
-		{
+		if ($action == 'create_user') {
 			// Full firstname and lastname separated with a dot : firstname.lastname
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$login = dol_buildlogin($this->object->lastname, $this->object->firstname);
 
-	   		$generated_password = getRandomPassword(false);
+			$generated_password = getRandomPassword(false);
 			$password = $generated_password;
 
 			// Create a form array
@@ -297,12 +307,10 @@ abstract class ActionsContactCardCommon
 		$this->object->canvas = $_POST["canvas"];
 
 		// We set country_id, and country_code label of the chosen country
-		if ($this->object->country_id)
-		{
+		if ($this->object->country_id) {
 			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_country WHERE rowid = ".$this->object->country_id;
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
 			} else {
 				dol_print_error($this->db);
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
index 98a66e499b9..bd5cf24e195 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_create.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
index 2c82a868ed4..41fbdb5def9 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_edit.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
index 43fd48e3ef0..c624eca4026 100644
--- a/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
+++ b/htdocs/contact/canvas/default/tpl/contactcard_view.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -30,8 +29,12 @@ echo $this->control->tpl['showhead'];
 
 dol_htmloutput_errors($this->control->tpl['error'], $this->control->tpl['errors']);
 
-if (!empty($this->control->tpl['action_create_user'])) echo $this->control->tpl['action_create_user'];
-if (!empty($this->control->tpl['action_delete'])) echo $this->control->tpl['action_delete']; ?>
+if (!empty($this->control->tpl['action_create_user'])) {
+	echo $this->control->tpl['action_create_user'];
+}
+if (!empty($this->control->tpl['action_delete'])) {
+	echo $this->control->tpl['action_delete'];
+} ?>
 
 <table class="border allwidth">
 
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 3866405bee8..0def459d444 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -71,24 +71,26 @@ $socialnetworks = getArrayOfSocialNetworks();
 $object->getCanvas($id);
 $objcanvas = null;
 $canvas = (!empty($object->canvas) ? $object->canvas : GETPOST("canvas"));
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('contact', 'contactcard', $canvas);
 }
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('contactcard', 'globalcard'));
 
-if ($id > 0) $object->fetch($id);
+if ($id > 0) {
+	$object->fetch($id);
+}
 
-if (!($object->id > 0) && $action == 'view')
-{
+if (!($object->id > 0) && $action == 'view') {
 	$langs->load("errors");
 	print($langs->trans('ErrorRecordNotFound'));
 	exit;
@@ -100,36 +102,32 @@ if (!($object->id > 0) && $action == 'view')
 
 $parameters = array('id'=>$id, 'objcanvas'=>$objcanvas);
 $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))
-{
+if (empty($reshook)) {
 	// Cancel
-	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-	{
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	}
 
 	// Creation utilisateur depuis contact
-	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer)
-	{
+	if ($action == 'confirm_create_user' && $confirm == 'yes' && $user->rights->user->user->creer) {
 		// Recuperation contact actuel
 		$result = $object->fetch($id);
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$db->begin();
 
 			// Creation user
 			$nuser = new User($db);
 			$result = $nuser->create_from_contact($object, GETPOST("login")); // Do not use GETPOST(alpha)
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result2 = $nuser->setPassword($user, GETPOST("password"), 0, 0, 1); // Do not use GETPOST(alpha)
-				if ($result2)
-				{
+				if ($result2) {
 					$db->commit();
 				} else {
 					$error = $nuser->error; $errors = $nuser->errors;
@@ -146,11 +144,9 @@ if (empty($reshook))
 
 
 	// Confirmation desactivation
-	if ($action == 'disable')
-	{
+	if ($action == 'disable') {
 		$object->fetch($id);
-		if ($object->setstatus(0) < 0)
-		{
+		if ($object->setstatus(0) < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
@@ -159,11 +155,9 @@ if (empty($reshook))
 	}
 
 	// Confirmation activation
-	if ($action == 'enable')
-	{
+	if ($action == 'enable') {
 		$object->fetch($id);
-		if ($object->setstatus(1) < 0)
-		{
+		if ($object->setstatus(1) < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
@@ -172,11 +166,12 @@ if (empty($reshook))
 	}
 
 	// Add contact
-	if ($action == 'add' && $user->rights->societe->contact->creer)
-	{
+	if ($action == 'add' && $user->rights->societe->contact->creer) {
 		$db->begin();
 
-		if ($canvas) $object->canvas = $canvas;
+		if ($canvas) {
+			$object->canvas = $canvas;
+		}
 
 		$object->entity = (GETPOSTISSET('entity') ?GETPOST('entity', 'int') : $conf->entity);
 		$object->socid = GETPOST("socid", 'int');
@@ -221,8 +216,7 @@ if (empty($reshook))
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0)
-		{
+		if ($ret < 0) {
 			$error++;
 			$action = 'create';
 		}
@@ -233,8 +227,7 @@ if (empty($reshook))
 			$action = 'create';
 		}
 
-		if (!empty($object->email) && !isValidEMail($object->email))
-		{
+		if (!empty($object->email) && !isValidEMail($object->email)) {
 			$langs->load("errors");
 			$error++;
 			$errors[] = $langs->trans("ErrorBadEMail", GETPOST('email', 'alpha'));
@@ -279,11 +272,13 @@ if (empty($reshook))
 			}
 		}
 
-		if (empty($error) && $id > 0)
-		{
+		if (empty($error) && $id > 0) {
 			$db->commit();
-			if (!empty($backtopage)) $url = $backtopage;
-			else $url = 'card.php?id='.$id;
+			if (!empty($backtopage)) {
+				$url = $backtopage;
+			} else {
+				$url = 'card.php?id='.$id;
+			}
 			header("Location: ".$url);
 			exit;
 		} else {
@@ -291,8 +286,7 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->contact->supprimer)
-	{
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->contact->supprimer) {
 		$result = $object->fetch($id);
 		$object->oldcopy = clone $object;
 
@@ -313,10 +307,8 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update' && empty($cancel) && $user->rights->societe->contact->creer)
-	{
-		if (!GETPOST("lastname", 'alpha'))
-		{
+	if ($action == 'update' && empty($cancel) && $user->rights->societe->contact->creer) {
+		if (!GETPOST("lastname", 'alpha')) {
 			$error++; $errors = array($langs->trans("ErrorFieldRequired", $langs->transnoentities("Name").' / '.$langs->transnoentities("Label")));
 			$action = 'edit';
 		}
@@ -327,16 +319,14 @@ if (empty($reshook))
 			$action = 'edit';
 		}
 
-		if (!empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)) && !isValidEMail(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)))
-		{
+		if (!empty(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL)) && !isValidEMail(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL))) {
 			$langs->load("errors");
 			$error++;
 			$errors[] = $langs->trans("ErrorBadEMail", GETPOST('email', 'alpha'));
 			$action = 'edit';
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$contactid = GETPOST("contactid", 'int');
 			$object->fetch($contactid);
 			$object->fetchRoles($contactid);
@@ -344,27 +334,22 @@ if (empty($reshook))
 			// Photo save
 			$dir = $conf->societe->multidir_output[$object->entity]."/contact/".$object->id."/photos";
 			$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-			if (GETPOST('deletephoto') && $object->photo)
-			{
+			if (GETPOST('deletephoto') && $object->photo) {
 				$fileimg = $dir.'/'.$object->photo;
 				$dirthumbs = $dir.'/thumbs';
 				dol_delete_file($fileimg);
 				dol_delete_dir_recursive($dirthumbs);
 				$object->photo = '';
 			}
-			if ($file_OK)
-			{
-				if (image_format_supported($_FILES['photo']['name']) > 0)
-				{
+			if ($file_OK) {
+				if (image_format_supported($_FILES['photo']['name']) > 0) {
 					dol_mkdir($dir);
 
-					if (@is_dir($dir))
-					{
+					if (@is_dir($dir)) {
 						$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 						$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-						if (!$result > 0)
-						{
+						if (!$result > 0) {
 							$errors[] = "ErrorFailedToSaveFile";
 						} else {
 							$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
@@ -377,8 +362,7 @@ if (empty($reshook))
 					$errors[] = "ErrorBadImageFormat";
 				}
 			} else {
-				switch ($_FILES['photo']['error'])
-				{
+				switch ($_FILES['photo']['error']) {
 					case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 					case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 						$errors[] = "ErrorFileSizeTooLarge";
@@ -433,10 +417,11 @@ if (empty($reshook))
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $object->update($contactid, $user);
 
 				if ($result > 0) {
@@ -445,8 +430,7 @@ if (empty($reshook))
 					$object->setCategories($categories);
 
 					// Update mass emailing flag into table mailing_unsubscribe
-					if (GETPOSTISSET('no_email') && $object->email)
-					{
+					if (GETPOSTISSET('no_email') && $object->email) {
 						$no_email = GETPOST('no_email', 'int');
 						$result=$object->setNoEmail($no_email);
 						if ($result<0) {
@@ -465,31 +449,31 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error && empty($errors))
-		{
-	   		if (!empty($backtopage))
-	   		{
-	   			header("Location: ".$backtopage);
-	   			exit;
-	   		}
+		if (!$error && empty($errors)) {
+			if (!empty($backtopage)) {
+				header("Location: ".$backtopage);
+				exit;
+			}
 		}
 	}
 
-	if ($action == 'setprospectcontactlevel' && $user->rights->societe->contact->creer)
-	{
+	if ($action == 'setprospectcontactlevel' && $user->rights->societe->contact->creer) {
 		$object->fetch($id);
 		$object->fk_prospectlevel = GETPOST('prospect_contact_level_id', 'alpha');
 		$result = $object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// set communication status
-	if ($action == 'setstcomm')
-	{
+	if ($action == 'setstcomm') {
 		$object->fetch($id);
 		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcommcontact');
 		$result = $object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Actions to send emails
@@ -506,7 +490,9 @@ if (empty($reshook))
 
 
 $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) $title = $object->lastname;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+	$title = $object->lastname;
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
@@ -515,24 +501,23 @@ $formcompany = new FormCompany($db);
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-if ($socid > 0)
-{
+if ($socid > 0) {
 	$objsoc = new Societe($db);
 	$objsoc->fetch($socid);
 }
 
-if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
-{
+if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS
 	// -----------------------------------------
-	if (empty($object->error) && $id)
- 	{
- 		$object = new Contact($db);
- 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error('', $object->error);
- 	}
-   	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
+	if (empty($object->error) && $id) {
+		$object = new Contact($db);
+		$result = $object->fetch($id);
+		if ($result <= 0) {
+			dol_print_error('', $object->error);
+		}
+	}
+	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
 	$objcanvas->display_canvas($action); // Show template
 } else {
 	// -----------------------------------------
@@ -540,20 +525,17 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 	// -----------------------------------------
 
 	// Confirm deleting contact
-	if ($user->rights->societe->contact->supprimer)
-	{
-		if ($action == 'delete')
-		{
+	if ($user->rights->societe->contact->supprimer) {
+		if ($action == 'delete') {
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id.($backtopage ? '&backtopage='.$backtopage : ''), $langs->trans("DeleteContact"), $langs->trans("ConfirmDeleteContact"), "confirm_delete", '', 0, 1);
 		}
 	}
 
 	/*
-     * Onglets
-     */
+	 * Onglets
+	 */
 	$head = array();
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		// Si edition contact deja existant
 		$object = new Contact($db);
 		$res = $object->fetch($id, $user);
@@ -569,21 +551,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 	}
 
-	if ($user->rights->societe->contact->creer)
-	{
-		if ($action == 'create')
-		{
+	if ($user->rights->societe->contact->creer) {
+		if ($action == 'create') {
 			/*
-             * Fiche en mode creation
-             */
+			 * Fiche en mode creation
+			 */
 			$object->canvas = $canvas;
 
 			$object->state_id = GETPOST("state_id");
 
 			// We set country_id, country_code and label for the selected country
 			$object->country_id = $_POST["country_id"] ?GETPOST("country_id") : (empty($objsoc->country_id) ? $mysoc->country_id : $objsoc->country_id);
-			if ($object->country_id)
-			{
+			if ($object->country_id) {
 				$tmparray = getCountry($object->country_id, 'all');
 				$object->country_code = $tmparray['code'];
 				$object->country      = $tmparray['label'];
@@ -596,8 +575,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Show errors
 			dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
 
-			if ($conf->use_javascript_ajax)
-			{
+			if ($conf->use_javascript_ajax) {
 				print "\n".'<script type="text/javascript" language="javascript">'."\n";
 				print 'jQuery(document).ready(function () {
 							jQuery("#selectcountry_id").change(function() {
@@ -643,10 +621,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</tr>';
 
 			// Company
-			if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-			{
-				if ($socid > 0)
-				{
+			if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+				if ($socid > 0) {
 					print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
 					print '<td colspan="3" class="maxwidthonsmartphone">';
 					print $objsoc->getNomUrl(1, 'contact');
@@ -670,17 +646,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<td colspan="3"><input name="poste" id="title" type="text" class="minwidth100" maxlength="255" value="'.dol_escape_htmltag(GETPOSTISSET("poste") ?GETPOST("poste", 'alphanohtml') : $object->poste).'"></td>';
 
 			$colspan = 3;
-			if ($conf->use_javascript_ajax && $socid > 0) $colspan = 2;
+			if ($conf->use_javascript_ajax && $socid > 0) {
+				$colspan = 2;
+			}
 
 			// Address
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) $object->address = $objsoc->address; // Predefined with third party
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->address)) == 0) {
+				$object->address = $objsoc->address; // Predefined with third party
+			}
 			print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
 			print '<td colspan="'.$colspan.'"><textarea class="flat quatrevingtpercent" name="address" id="address" rows="'.ROWS_2.'">'.(GETPOST("address", 'alpha') ?GETPOST("address", 'alpha') : $object->address).'</textarea></td>';
 
-			if ($conf->use_javascript_ajax && $socid > 0)
-			{
+			if ($conf->use_javascript_ajax && $socid > 0) {
 				$rowspan = 3;
-				if (empty($conf->global->SOCIETE_DISABLE_STATE)) $rowspan++;
+				if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+					$rowspan++;
+				}
 
 				print '<td class="valignmiddle center" rowspan="'.$rowspan.'">';
 				print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a>';
@@ -689,8 +670,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</tr>';
 
 			// Zip / Town
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) $object->zip = $objsoc->zip; // Predefined with third party
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->town)) == 0) $object->town = $objsoc->town; // Predefined with third party
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->zip)) == 0) {
+				$object->zip = $objsoc->zip; // Predefined with third party
+			}
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->town)) == 0) {
+				$object->town = $objsoc->town; // Predefined with third party
+			}
 			print '<tr><td><label for="zipcode">'.$langs->trans("Zip").'</label> / <label for="town">'.$langs->trans("Town").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
 			print $formcompany->select_ziptown((GETPOST("zipcode", 'alpha') ? GETPOST("zipcode", 'alpha') : $object->zip), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6).'&nbsp;';
 			print $formcompany->select_ziptown((GETPOST("town", 'alpha') ? GETPOST("town", 'alpha') : $object->town), 'town', array('zipcode', 'selectcountry_id', 'state_id'));
@@ -700,21 +685,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
 			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
 			print $form->select_country((GETPOST("country_id", 'alpha') ? GETPOST("country_id", 'alpha') : $object->country_id), 'country_id');
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 			print '</td></tr>';
 
 			// State
-			if (empty($conf->global->SOCIETE_DISABLE_STATE))
-			{
-				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-				{
+			if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2)) {
 					print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
 				} else {
 					print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="'.$colspan.'" class="maxwidthonsmartphone">';
 				}
 
-				if ($object->country_id)
-				{
+				if ($object->country_id) {
 					print $formcompany->select_state(GETPOST("state_id", 'alpha') ? GETPOST("state_id", 'alpha') : $object->state_id, $object->country_code, 'state_id');
 				} else {
 					print $countrynotdefined;
@@ -722,15 +706,21 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print '</td></tr>';
 			}
 
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) $object->phone_pro = $objsoc->phone; // Predefined with third party
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) $object->fax = $objsoc->fax; // Predefined with third party
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->phone_pro)) == 0) {
+				$object->phone_pro = $objsoc->phone; // Predefined with third party
+			}
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->fax)) == 0) {
+				$object->fax = $objsoc->fax; // Predefined with third party
+			}
 
 			// Phone / Fax
 			print '<tr><td>'.$form->editfieldkey('PhonePro', 'phone_pro', '', $object, 0).'</td>';
 			print '<td>';
 			print img_picto('', 'object_phoning');
 			print '<input type="text" name="phone_pro" id="phone_pro" class="maxwidth200" value="'.(GETPOSTISSET('phone_pro') ? GETPOST('phone_pro', 'alpha') : $object->phone_pro).'"></td>';
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') {
+				print '</tr><tr>';
+			}
 			print '<td>'.$form->editfieldkey('PhonePerso', 'phone_perso', '', $object, 0).'</td>';
 			print '<td>';
 			print img_picto('', 'object_phoning');
@@ -740,14 +730,18 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<td>';
 			print img_picto('', 'object_phoning_mobile');
 			print '<input type="text" name="phone_mobile" id="phone_mobile" class="maxwidth200" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td>';
-			if ($conf->browser->layout == 'phone') print '</tr><tr>';
+			if ($conf->browser->layout == 'phone') {
+				print '</tr><tr>';
+			}
 			print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
 			print '<td>';
 			print img_picto('', 'object_phoning_fax');
 			print '<input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : $object->fax).'"></td>';
 			print '</tr>';
 
-			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) $object->email = $objsoc->email; // Predefined with third party
+			if (($objsoc->typent_code == 'TE_PRIVATE' || !empty($conf->global->CONTACT_USE_COMPANY_ADDRESS)) && dol_strlen(trim($object->email)) == 0) {
+				$object->email = $objsoc->email; // Predefined with third party
+			}
 
 			// Email
 			print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '').'</td>';
@@ -757,10 +751,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</tr>';
 
 			//Unsubscribe
-			if (!empty($conf->mailing->enabled))
-			{
-				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1)
-				{
+			if (!empty($conf->mailing->enabled)) {
+				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1) {
 					print "\n".'<script type="text/javascript" language="javascript">'."\n";
 					print '$(document).ready(function () {
 							$("#email").keyup(function() {
@@ -773,8 +765,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 						})'."\n";
 					print '</script>'."\n";
 				}
-				if (!GETPOSTISSET("no_email") && !empty($object->email))
-				{
+				if (!GETPOSTISSET("no_email") && !empty($object->email)) {
 					$result=$object->getNoEmail();
 					if ($result<0) {
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -829,8 +820,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$parameters = array('socid' => $socid, 'objsoc' => $objsoc, 'colspan' => ' colspan="3"', 'cols' => 3);
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				print $object->showOptionals($extrafields, 'edit', $parameters);
 			}
 
@@ -846,8 +836,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Date To Birth
 			print '<tr><td><label for="birthday">'.$langs->trans("DateOfBirth").'</label></td><td>';
 			$form = new Form($db);
-			if ($object->birthday)
-			{
+			if ($object->birthday) {
 				print $form->selectDate($object->birthday, 'birthday', 0, 0, 0, "perso", 1, 0);
 			} else {
 				print $form->selectDate('', 'birthday', 0, 0, 1, "perso", 1, 0);
@@ -855,8 +844,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</td>';
 
 			print '<td><label for="birthday_alert">'.$langs->trans("Alert").'</label>: ';
-			if ($object->birthday_alert)
-			{
+			if ($object->birthday_alert) {
 				print '<input type="checkbox" name="birthday_alert" id="birthday_alert" checked>';
 			} else {
 				print '<input type="checkbox" name="birthday_alert" id="birthday_alert">';
@@ -870,8 +858,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			print '<div class="center">';
 			print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
-			if (!empty($backtopage))
-			{
+			if (!empty($backtopage)) {
 				print ' &nbsp; &nbsp; ';
 				print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			} else {
@@ -883,12 +870,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print "</form>";
 		} elseif ($action == 'edit' && !empty($id)) {
 			/*
-             * Fiche en mode edition
-             */
+			 * Fiche en mode edition
+			 */
 
 			// We set country_id, and country_code label of the chosen country
-			if (GETPOSTISSET("country_id") || $object->country_id)
-			{
+			if (GETPOSTISSET("country_id") || $object->country_id) {
 				$tmparray = getCountry($object->country_id, 'all');
 				$object->country_code = $tmparray['code'];
 				$object->country      = $tmparray['label'];
@@ -900,8 +886,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Show errors
 			dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
 
-			if ($conf->use_javascript_ajax)
-			{
+			if ($conf->use_javascript_ajax) {
 				print "\n".'<script type="text/javascript" language="javascript">'."\n";
 				print 'jQuery(document).ready(function () {
 							jQuery("#selectcountry_id").change(function() {
@@ -930,19 +915,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<input type="hidden" name="contactid" value="'.$object->id.'">';
 			print '<input type="hidden" name="old_lastname" value="'.$object->lastname.'">';
 			print '<input type="hidden" name="old_firstname" value="'.$object->firstname.'">';
-			if (!empty($backtopage)) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			if (!empty($backtopage)) {
+				print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+			}
 
 			print dol_get_fiche_head($head, 'card', $title, 0, 'contact');
 
 			print '<table class="border centpercent">';
 
 			// Ref/ID
-			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID))
-		   	{
+			if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 				print '<tr><td>'.$langs->trans("ID").'</td><td colspan="3">';
 				print $object->ref;
 				print '</td></tr>';
-		   	}
+			}
 
 			// Lastname
 			print '<tr><td class="titlefieldcreate fieldrequired"><label for="lastname">'.$langs->trans("Lastname").' / '.$langs->trans("Label").'</label></td>';
@@ -955,8 +941,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</tr>';
 
 			// Company
-			if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-			{
+			if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 				print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
 				print img_picto('', 'company').$form->select_company(GETPOST('socid', 'int') ?GETPOST('socid', 'int') : ($object->socid ? $object->socid : -1), 'socid', '', $langs->trans("SelectThirdParty"));
@@ -979,7 +964,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<div class="paddingrightonly valignmiddle inline-block quatrevingtpercent">';
 			print '<textarea class="flat minwidth200 centpercent" name="address" id="address">'.(GETPOSTISSET("address") ? GETPOST("address", 'nohtml') : $object->address).'</textarea>';
 			print '</div><div class="paddingrightonly valignmiddle inline-block">';
-			if ($conf->use_javascript_ajax) print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a><br>';
+			if ($conf->use_javascript_ajax) {
+				print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a><br>';
+			}
 			print '</div>';
 			print '</td>';
 
@@ -993,14 +980,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<tr><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
 			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
 			print $form->select_country(GETPOSTISSET("country_id") ? GETPOST("country_id") : $object->country_id, 'country_id');
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 			print '</td></tr>';
 
 			// State
-			if (empty($conf->global->SOCIETE_DISABLE_STATE))
-			{
-				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-				{
+			if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2)) {
 					print '<tr><td><label for="state_id">'.$langs->trans('Region-State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
 				} else {
 					print '<tr><td><label for="state_id">'.$langs->trans('State').'</label></td><td colspan="3" class="maxwidthonsmartphone">';
@@ -1034,8 +1021,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '<td>';
 			print img_picto('', 'object_email');
 			print '<input type="text" name="email" id="email" class="maxwidth100onsmartphone quatrevingtpercent" value="'.(GETPOSTISSET('email') ?GETPOST('email', 'alpha') : $object->email).'"></td>';
-			if (!empty($conf->mailing->enabled))
-			{
+			if (!empty($conf->mailing->enabled)) {
 				$langs->load("mails");
 				print '<td class="nowrap">'.$langs->trans("NbOfEMailingsSend").'</td>';
 				print '<td>'.$object->getNbOfEMailings().'</td>';
@@ -1045,10 +1031,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			print '</tr>';
 
 			// Unsubscribe
-			if (!empty($conf->mailing->enabled))
-			{
-				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1)
-				{
+			if (!empty($conf->mailing->enabled)) {
+				if ($conf->use_javascript_ajax && $conf->global->MAILING_CONTACT_DEFAULT_BULK_STATUS==-1) {
 					print "\n".'<script type="text/javascript" language="javascript">'."\n";
 
 					print '
@@ -1067,8 +1051,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					})'."\n";
 					print '</script>'."\n";
 				}
-				if (!GETPOSTISSET("no_email") && !empty($object->email))
-				{
+				if (!GETPOSTISSET("no_email") && !empty($object->email)) {
 					$result=$object->getNoEmail();
 					if ($result<0) {
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -1145,36 +1128,31 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$parameters = array('colspan' => ' colspan="3"', 'cols'=> '3');
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				print $object->showOptionals($extrafields, 'edit', $parameters);
 			}
 
 			$object->load_ref_elements();
 
-			if (!empty($conf->commande->enabled))
-			{
+			if (!empty($conf->commande->enabled)) {
 				print '<tr><td>'.$langs->trans("ContactForOrders").'</td><td colspan="3">';
 				print $object->ref_commande ? $object->ref_commande : $langs->trans("NoContactForAnyOrder");
 				print '</td></tr>';
 			}
 
-			if (!empty($conf->propal->enabled))
-			{
+			if (!empty($conf->propal->enabled)) {
 				print '<tr><td>'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
 				print $object->ref_propal ? $object->ref_propal : $langs->trans("NoContactForAnyProposal");
 				print '</td></tr>';
 			}
 
-			if (!empty($conf->contrat->enabled))
-			{
+			if (!empty($conf->contrat->enabled)) {
 				print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
 				print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract");
 				print '</td></tr>';
 			}
 
-			if (!empty($conf->facture->enabled))
-			{
+			if (!empty($conf->facture->enabled)) {
 				print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
 				print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
 				print '</td></tr>';
@@ -1182,12 +1160,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			// Login Dolibarr
 			print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
-			if ($object->user_id)
-			{
+			if ($object->user_id) {
 				$dolibarr_user = new User($db);
 				$result = $dolibarr_user->fetch($object->user_id);
 				print $dolibarr_user->getLoginUrl(1);
-			} else print $langs->trans("NoDolibarrAccess");
+			} else {
+				print $langs->trans("NoDolibarrAccess");
+			}
 			print '</td></tr>';
 
 			// Photo
@@ -1199,7 +1178,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print "<br>\n";
 			}
 			print '<table class="nobordernopadding">';
-			if ($object->photo) print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+			if ($object->photo) {
+				print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+			}
 			//print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
 			print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
 			print '</table>';
@@ -1226,8 +1207,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$action = 'presend';
 	}
 
-	if (!empty($id) && $action != 'edit' && $action != 'create')
-	{
+	if (!empty($id) && $action != 'edit' && $action != 'create') {
 		$objsoc = new Societe($db);
 
 		// View mode
@@ -1237,15 +1217,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		print dol_get_fiche_head($head, 'card', $title, -1, 'contact');
 
-		if ($action == 'create_user')
-		{
+		if ($action == 'create_user') {
 			// Full firstname and lastname separated with a dot : firstname.lastname
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 			$login = dol_buildlogin($object->lastname, $object->firstname);
 
 			$generated_password = '';
-			if (!$ldap_sid) // TODO ldap_sid ?
-			{
+			if (!$ldap_sid) { // TODO ldap_sid ?
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$generated_password = getRandomPassword(false);
 			}
@@ -1258,10 +1236,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				//array('label' => $form->textwithpicto($langs->trans("Type"),$langs->trans("InternalExternalDesc")), 'type' => 'select', 'name' => 'intern', 'default' => 1, 'values' => array(0=>$langs->trans('Internal'),1=>$langs->trans('External')))
 			);
 			$text = $langs->trans("ConfirmCreateContact").'<br>';
-			if (!empty($conf->societe->enabled))
-			{
-				if ($object->socid > 0) $text .= $langs->trans("UserWillBeExternalUser");
-				else $text .= $langs->trans("UserWillBeInternalUser");
+			if (!empty($conf->societe->enabled)) {
+				if ($object->socid > 0) {
+					$text .= $langs->trans("UserWillBeExternalUser");
+				} else {
+					$text .= $langs->trans("UserWillBeInternalUser");
+				}
 			}
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("CreateDolibarrLogin"), $text, "confirm_create_user", $formquestion, 'yes');
 		}
@@ -1269,13 +1249,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '<div class="refidno">';
-		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-		{
+		if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 			$objsoc->fetch($object->socid);
 			// Thirdparty
 			$morehtmlref .= $langs->trans('ThirdParty').' : ';
-			if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1, 'contact');
-			else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+			if ($objsoc->id > 0) {
+				$morehtmlref .= $objsoc->getNomUrl(1, 'contact');
+			} else {
+				$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+			}
 		}
 		$morehtmlref .= '</div>';
 
@@ -1297,16 +1279,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		print '<tr><td>'.$langs->trans("PostOrFunction").'</td><td>'.$object->poste.'</td></tr>';
 
 		// Email
-		if (!empty($conf->mailing->enabled))
-		{
+		if (!empty($conf->mailing->enabled)) {
 			$langs->load("mails");
 			print '<tr><td>'.$langs->trans("NbOfEMailingsSend").'</td>';
 			print '<td><a href="'.DOL_URL_ROOT.'/comm/mailing/list.php?filteremail='.urlencode($object->email).'">'.$object->getNbOfEMailings().'</a></td></tr>';
 		}
 
 		// Unsubscribe opt-out
-		if (!empty($conf->mailing->enabled))
-		{
+		if (!empty($conf->mailing->enabled)) {
 			$result=$object->getNoEmail();
 			if ($result<0) {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -1324,8 +1304,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$object->fetch_thirdparty();
 
 		if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
-			if ($object->thirdparty->client == 2 || $object->thirdparty->client == 3)
-			{
+			if ($object->thirdparty->client == 2 || $object->thirdparty->client == 3) {
 				print '<br>';
 
 				print '<div class="underbanner clearboth"></div>';
@@ -1336,7 +1315,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 				print $langs->trans('ProspectLevel');
 				print '<td>';
-				if ($action != 'editlevel' && $user->rights->societe->contact->creer) print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;id='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+				if ($action != 'editlevel' && $user->rights->societe->contact->creer) {
+					print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;id='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+				}
 				print '</tr></table>';
 				print '</td><td>';
 				if ($action == 'editlevel') {
@@ -1354,8 +1335,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				print '<div class="floatright">';
 				foreach ($object->cacheprospectstatus as $key => $val) {
 					$titlealt = 'default';
-					if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
-					if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+					if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) {
+						$titlealt = $val['label'];
+					}
+					if ($object->stcomm_id != $val['id']) {
+						print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+					}
 				}
 				print '</div></td></tr>';
 
@@ -1391,45 +1376,48 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		$object->load_ref_elements();
 
-		if (!empty($conf->propal->enabled))
-		{
+		if (!empty($conf->propal->enabled)) {
 			print '<tr><td class="titlefield">'.$langs->trans("ContactForProposals").'</td><td colspan="3">';
 			print $object->ref_propal ? $object->ref_propal : $langs->trans("NoContactForAnyProposal");
 			print '</td></tr>';
 		}
 
-		if (!empty($conf->commande->enabled) || !empty($conf->expedition->enabled))
-		{
+		if (!empty($conf->commande->enabled) || !empty($conf->expedition->enabled)) {
 			print '<tr><td>';
-			if (!empty($conf->expedition->enabled)) { print $langs->trans("ContactForOrdersOrShipments"); } else print $langs->trans("ContactForOrders");
+			if (!empty($conf->expedition->enabled)) {
+				print $langs->trans("ContactForOrdersOrShipments");
+			} else {
+				print $langs->trans("ContactForOrders");
+			}
 			print '</td><td colspan="3">';
 			$none = $langs->trans("NoContactForAnyOrder");
-			if (!empty($conf->expedition->enabled)) { $none = $langs->trans("NoContactForAnyOrderOrShipments"); }
+			if (!empty($conf->expedition->enabled)) {
+				$none = $langs->trans("NoContactForAnyOrderOrShipments");
+			}
 			print $object->ref_commande ? $object->ref_commande : $none;
 			print '</td></tr>';
 		}
 
-		if (!empty($conf->contrat->enabled))
-		{
+		if (!empty($conf->contrat->enabled)) {
 			print '<tr><td>'.$langs->trans("ContactForContracts").'</td><td colspan="3">';
 			print $object->ref_contrat ? $object->ref_contrat : $langs->trans("NoContactForAnyContract");
 			print '</td></tr>';
 		}
 
-		if (!empty($conf->facture->enabled))
-		{
+		if (!empty($conf->facture->enabled)) {
 			print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
 			print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
 			print '</td></tr>';
 		}
 
 		print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
-		if ($object->user_id)
-		{
+		if ($object->user_id) {
 			$dolibarr_user = new User($db);
 			$result = $dolibarr_user->fetch($object->user_id);
 			print $dolibarr_user->getLoginUrl(1);
-		} else print $langs->trans("NoDolibarrAccess");
+		} else {
+			print $langs->trans("NoDolibarrAccess");
+		}
 		print '</td></tr>';
 
 		print '<tr><td>';
@@ -1452,11 +1440,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook) && $action != 'presend')
-		{
+		if (empty($reshook) && $action != 'presend') {
 			if (empty($user->socid)) {
-				if (!empty($object->email))
-				{
+				if (!empty($object->email)) {
 					$langs->load("mails");
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
 				} else {
@@ -1465,30 +1451,25 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				}
 			}
 
-			if ($user->rights->societe->contact->creer)
-			{
+			if ($user->rights->societe->contact->creer) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit">'.$langs->trans('Modify').'</a>';
 			}
 
-			if (!$object->user_id && $user->rights->user->user->creer)
-			{
+			if (!$object->user_id && $user->rights->user->user->creer) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create_user">'.$langs->trans("CreateDolibarrLogin").'</a>';
 			}
 
 			// Activer
-			if ($object->statut == 0 && $user->rights->societe->contact->creer)
-			{
+			if ($object->statut == 0 && $user->rights->societe->contact->creer) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable">'.$langs->trans("Reactivate").'</a>';
 			}
 			// Desactiver
-			if ($object->statut == 1 && $user->rights->societe->contact->creer)
-			{
+			if ($object->statut == 1 && $user->rights->societe->contact->creer) {
 				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&id='.$object->id.'">'.$langs->trans("DisableUser").'</a>';
 			}
 
 			// Delete
-			if ($user->rights->societe->contact->supprimer)
-			{
+			if ($user->rights->societe->contact->supprimer) {
 				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().''.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
 			}
 		}
@@ -1500,8 +1481,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			$action = 'presend';
 		}
 
-		if ($action != 'presend')
-		{
+		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 1d2cb3355a5..0c7f3ac73aa 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -473,40 +473,35 @@ class Contact extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."socpeople");
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->update($this->id, $user, 1, 'add'); // This include updateRoles(), ...
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->update_perso($this->id, $user, 1); // TODO Remove function update_perso, should be same than update
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->error = $this->db->lasterror();
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('CONTACT_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -558,13 +553,20 @@ class Contact extends CommonObject
 		$this->town = (empty($this->town) ? '' : trim($this->town));
 		$this->setUpperOrLowerCase();
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
-		if (empty($this->statut)) $this->statut = 0;
-		if (empty($this->civility_code) && !is_numeric($this->civility_id)) $this->civility_code = $this->civility_id; // For backward compatibility
+		if (empty($this->statut)) {
+			$this->statut = 0;
+		}
+		if (empty($this->civility_code) && !is_numeric($this->civility_id)) {
+			$this->civility_code = $this->civility_id; // For backward compatibility
+		}
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET ";
-		if ($this->socid > 0) $sql .= " fk_soc='".$this->db->escape($this->socid)."',";
-		elseif ($this->socid == -1) $sql .= " fk_soc=null,";
+		if ($this->socid > 0) {
+			$sql .= " fk_soc='".$this->db->escape($this->socid)."',";
+		} elseif ($this->socid == -1) {
+			$sql .= " fk_soc=null,";
+		}
 		$sql .= "  civility='".$this->db->escape($this->civility_code)."'";
 		$sql .= ", lastname='".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname='".$this->db->escape($this->firstname)."'";
@@ -586,8 +588,7 @@ class Contact extends CommonObject
 		$sql .= ", phone_mobile = ".(isset($this->phone_mobile) ? "'".$this->db->escape($this->phone_mobile)."'" : "null");
 		$sql .= ", priv = '".$this->db->escape($this->priv)."'";
 		$sql .= ", fk_prospectcontactlevel = '".$this->db->escape($this->fk_prospectlevel)."'";
-		if (isset($this->stcomm_id))
-		{
+		if (isset($this->stcomm_id)) {
 			$sql .= ", fk_stcommcontact = ".($this->stcomm_id > 0 || $this->stcomm_id == -1 ? $this->stcomm_id : "0");
 		}
 		$sql .= ", statut = ".$this->db->escape($this->statut);
@@ -598,8 +599,7 @@ class Contact extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			unset($this->country_code);
 			unset($this->country);
 			unset($this->state_code);
@@ -608,25 +608,21 @@ class Contact extends CommonObject
 			$action = 'update';
 
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
 			if (!$error) {
 				$result = $this->updateRoles();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && $this->user_id > 0)
-			{
+			if (!$error && $this->user_id > 0) {
 				// If contact is linked to a user
 				$tmpobj = new User($this->db);
 				$tmpobj->fetch($this->user_id);
@@ -685,14 +681,18 @@ class Contact extends CommonObject
 				// }
 				if ($usermustbemodified) {
 					$result = $tmpobj->update($user, 0, 1, 1, 1);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 				}
 			}
 
 			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('CONTACT_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -759,34 +759,69 @@ class Contact extends CommonObject
 		$this->fullname = $this->getFullName($langs);
 
 		// Fields
-		if ($this->fullname && !empty($conf->global->LDAP_CONTACT_FIELD_FULLNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FULLNAME] = $this->fullname;
-		if ($this->lastname && !empty($conf->global->LDAP_CONTACT_FIELD_NAME)) $info[$conf->global->LDAP_CONTACT_FIELD_NAME] = $this->lastname;
-		if ($this->firstname && !empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) $info[$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME] = $this->firstname;
+		if ($this->fullname && !empty($conf->global->LDAP_CONTACT_FIELD_FULLNAME)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_FULLNAME] = $this->fullname;
+		}
+		if ($this->lastname && !empty($conf->global->LDAP_CONTACT_FIELD_NAME)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_NAME] = $this->lastname;
+		}
+		if ($this->firstname && !empty($conf->global->LDAP_CONTACT_FIELD_FIRSTNAME)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_FIRSTNAME] = $this->firstname;
+		}
 
-		if ($this->poste) $info["title"] = $this->poste;
+		if ($this->poste) {
+			$info["title"] = $this->poste;
+		}
 		if ($this->socid > 0) {
 			$soc = new Societe($this->db);
 			$soc->fetch($this->socid);
 
 			$info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->name;
-			if ($soc->client == 1)      $info["businessCategory"] = "Customers";
-			if ($soc->client == 2)      $info["businessCategory"] = "Prospects";
-			if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
+			if ($soc->client == 1) {
+				$info["businessCategory"] = "Customers";
+			}
+			if ($soc->client == 2) {
+				$info["businessCategory"] = "Prospects";
+			}
+			if ($soc->fournisseur == 1) {
+				$info["businessCategory"] = "Suppliers";
+			}
+		}
+		if ($this->address && !empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address;
+		}
+		if ($this->zip && !empty($conf->global->LDAP_CONTACT_FIELD_ZIP)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->zip;
+		}
+		if ($this->town && !empty($conf->global->LDAP_CONTACT_FIELD_TOWN)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town;
+		}
+		if ($this->country_code && !empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code;
+		}
+		if ($this->phone_pro && !empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro;
+		}
+		if ($this->phone_perso && !empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
+		}
+		if ($this->phone_mobile && !empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
+		}
+		if ($this->fax && !empty($conf->global->LDAP_CONTACT_FIELD_FAX)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
+		}
+		if ($this->skype && !empty($conf->global->LDAP_CONTACT_FIELD_SKYPE)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
+		}
+		if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
+		}
+		if ($this->email && !empty($conf->global->LDAP_CONTACT_FIELD_MAIL)) {
+			$info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
 		}
-		if ($this->address && !empty($conf->global->LDAP_CONTACT_FIELD_ADDRESS)) $info[$conf->global->LDAP_CONTACT_FIELD_ADDRESS] = $this->address;
-		if ($this->zip && !empty($conf->global->LDAP_CONTACT_FIELD_ZIP))          $info[$conf->global->LDAP_CONTACT_FIELD_ZIP] = $this->zip;
-		if ($this->town && !empty($conf->global->LDAP_CONTACT_FIELD_TOWN))      $info[$conf->global->LDAP_CONTACT_FIELD_TOWN] = $this->town;
-		if ($this->country_code && !empty($conf->global->LDAP_CONTACT_FIELD_COUNTRY))      $info[$conf->global->LDAP_CONTACT_FIELD_COUNTRY] = $this->country_code;
-		if ($this->phone_pro && !empty($conf->global->LDAP_CONTACT_FIELD_PHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_PHONE] = $this->phone_pro;
-		if ($this->phone_perso && !empty($conf->global->LDAP_CONTACT_FIELD_HOMEPHONE)) $info[$conf->global->LDAP_CONTACT_FIELD_HOMEPHONE] = $this->phone_perso;
-		if ($this->phone_mobile && !empty($conf->global->LDAP_CONTACT_FIELD_MOBILE)) $info[$conf->global->LDAP_CONTACT_FIELD_MOBILE] = $this->phone_mobile;
-		if ($this->fax && !empty($conf->global->LDAP_CONTACT_FIELD_FAX))	    $info[$conf->global->LDAP_CONTACT_FIELD_FAX] = $this->fax;
-		if ($this->skype && !empty($conf->global->LDAP_CONTACT_FIELD_SKYPE))	    $info[$conf->global->LDAP_CONTACT_FIELD_SKYPE] = $this->skype;
-		if ($this->note_private && !empty($conf->global->LDAP_CONTACT_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_CONTACT_FIELD_DESCRIPTION] = dol_string_nohtmltag($this->note_private, 2);
-		if ($this->email && !empty($conf->global->LDAP_CONTACT_FIELD_MAIL))     $info[$conf->global->LDAP_CONTACT_FIELD_MAIL] = $this->email;
 
-		if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
-		{
+		if ($conf->global->LDAP_SERVER_TYPE == 'egroupware') {
 			$info["objectclass"][4] = "phpgwContact"; // compatibilite egroupware
 
 			$info['uidnumber'] = $this->id;
@@ -805,8 +840,12 @@ class Contact extends CommonObject
 
 			$info["phpgwContactOwner"] = $this->egroupware_id;
 
-			if ($this->email) $info["rfc822Mailbox"] = $this->email;
-			if ($this->phone_mobile) $info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
+			if ($this->email) {
+				$info["rfc822Mailbox"] = $this->email;
+			}
+			if ($this->phone_mobile) {
+				$info["phpgwCellTelephoneNumber"] = $this->phone_mobile;
+			}
 		}
 
 		return $info;
@@ -834,13 +873,14 @@ class Contact extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
 		$sql .= " birthday=".($this->birthday ? "'".$this->db->idate($this->birthday)."'" : "null");
 		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
-		if ($user) $sql .= ", fk_user_modif=".$user->id;
+		if ($user) {
+			$sql .= ", fk_user_modif=".$user->id;
+		}
 		$sql .= " WHERE rowid=".$this->db->escape($id);
 
 		dol_syslog(get_class($this)."::update_perso this->birthday=".$this->birthday." -", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$error++;
 			$this->error = $this->db->lasterror();
 		}
@@ -875,7 +915,9 @@ class Contact extends CommonObject
 		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('CONTACT_MODIFY', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -906,8 +948,7 @@ class Contact extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch id=".$id." ref_ext=".$ref_ext." email=".$email, LOG_DEBUG);
 
-		if (empty($id) && empty($ref_ext) && empty($email))
-		{
+		if (empty($id) && empty($ref_ext) && empty($email)) {
 			$this->error = 'BadParameter';
 			return -1;
 		}
@@ -936,8 +977,9 @@ class Contact extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcommcontact as st ON c.fk_stcommcontact = st.id';
-		if ($id) $sql .= " WHERE c.rowid = ".((int) $id);
-		else {
+		if ($id) {
+			$sql .= " WHERE c.rowid = ".((int) $id);
+		} else {
 			$sql .= " WHERE c.entity IN (".getEntity($this->element).")";
 			if ($ref_ext) {
 				$sql .= " AND c.ref_ext = '".$this->db->escape($ref_ext)."'";
@@ -948,17 +990,14 @@ class Contact extends CommonObject
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num > 1)
-			{
+			if ($num > 1) {
 				$this->error = 'Fetch found several records. Rename one of contact to avoid duplicate.';
 				dol_syslog($this->error, LOG_ERR);
 
 				return 2;
-			} elseif ($num)   // $num = 1
-			{
+			} elseif ($num) {   // $num = 1
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -1030,10 +1069,8 @@ class Contact extends CommonObject
 				$sql .= " WHERE u.fk_socpeople = ".$this->id;
 
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
-					if ($this->db->num_rows($resql))
-					{
+				if ($resql) {
+					if ($this->db->num_rows($resql)) {
 						$uobj = $this->db->fetch_object($resql);
 
 						$this->user_id = $uobj->rowid;
@@ -1049,17 +1086,14 @@ class Contact extends CommonObject
 				$this->fetch_optionals();
 
 				// Load also alerts of this user
-				if ($user)
-				{
+				if ($user) {
 					$sql = "SELECT fk_user";
 					$sql .= " FROM ".MAIN_DB_PREFIX."user_alert";
 					$sql .= " WHERE fk_user = ".$user->id." AND fk_contact = ".$this->db->escape($id);
 
 					$resql = $this->db->query($sql);
-					if ($resql)
-					{
-						if ($this->db->num_rows($resql))
-						{
+					if ($resql) {
+						if ($this->db->num_rows($resql)) {
 							$obj = $this->db->fetch_object($resql);
 
 							$this->birthday_alert = 1;
@@ -1102,11 +1136,9 @@ class Contact extends CommonObject
 	{
 		unset($this->gender);
 
-		if (in_array($this->civility_id, array('MR')) || in_array($this->civility_code, array('MR')))
-		{
+		if (in_array($this->civility_id, array('MR')) || in_array($this->civility_code, array('MR'))) {
 			$this->gender = 'man';
-		} elseif (in_array($this->civility_id, array('MME', 'MLE')) || in_array($this->civility_code, array('MME', 'MLE')))
-		{
+		} elseif (in_array($this->civility_id, array('MME', 'MLE')) || in_array($this->civility_code, array('MME', 'MLE'))) {
 			$this->gender = 'woman';
 		}
 	}
@@ -1135,16 +1167,18 @@ class Contact extends CommonObject
 		dol_syslog(get_class($this)."::load_ref_elements", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if ($obj->nb)
-				{
-					if ($obj->element == 'facture')  $this->ref_facturation = $obj->nb;
-					elseif ($obj->element == 'contrat')  $this->ref_contrat = $obj->nb;
-					elseif ($obj->element == 'commande') $this->ref_commande = $obj->nb;
-					elseif ($obj->element == 'propal')   $this->ref_propal = $obj->nb;
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				if ($obj->nb) {
+					if ($obj->element == 'facture') {
+						$this->ref_facturation = $obj->nb;
+					} elseif ($obj->element == 'contrat') {
+						$this->ref_contrat = $obj->nb;
+					} elseif ($obj->element == 'commande') {
+						$this->ref_commande = $obj->nb;
+					} elseif ($obj->element == 'propal') {
+						$this->ref_propal = $obj->nb;
+					}
 				}
 			}
 			$this->db->free($resql);
@@ -1169,8 +1203,7 @@ class Contact extends CommonObject
 
 		$this->db->begin();
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Get all rowid of element_contact linked to a type that is link to llx_socpeople
 			$sql = "SELECT ec.rowid";
 			$sql .= " FROM ".MAIN_DB_PREFIX."element_contact ec,";
@@ -1180,21 +1213,18 @@ class Contact extends CommonObject
 			$sql .= " AND tc.source='external'";
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 
 				$i = 0;
-				while ($i < $num && !$error)
-				{
+				while ($i < $num && !$error) {
 					$obj = $this->db->fetch_object($resql);
 
 					$sqldel = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
 					$sqldel .= " WHERE rowid = ".$obj->rowid;
 					dol_syslog(__METHOD__, LOG_DEBUG);
 					$result = $this->db->query($sqldel);
-					if (!$result)
-					{
+					if (!$result) {
 						$error++;
 						$this->error = $this->db->error().' sql='.$sqldel;
 					}
@@ -1207,56 +1237,48 @@ class Contact extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Remove Roles
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_socpeople = ".$this->id;
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->error .= $this->db->lasterror();
 				$errorflag = -1;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Remove Roles
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_socpeople = ".$this->id;
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->error .= $this->db->lasterror();
 				$errorflag = -1;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Remove category
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_contact WHERE fk_socpeople = ".$this->id;
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->error .= $this->db->lasterror();
 				$errorflag = -1;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople";
 			$sql .= " WHERE rowid=".$this->id;
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				$this->error = $this->db->error().' sql='.$sql;
 			}
@@ -1266,19 +1288,21 @@ class Contact extends CommonObject
 		if (!$error) {
 			// For avoid conflicts if trigger used
 			$result = $this->deleteExtraFields();
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('CONTACT_DELETE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -1303,10 +1327,8 @@ class Contact extends CommonObject
 		$sql .= " WHERE c.rowid = ".$this->db->escape($id);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -1346,8 +1368,7 @@ class Contact extends CommonObject
 		$sql .= " AND m.entity IN (".getEntity($this->element).") AND mc.statut NOT IN (-1,0)"; // -1 error, 0 not sent, 1 sent with success
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
 
@@ -1377,8 +1398,7 @@ class Contact extends CommonObject
 
 		$result = ''; $label = '';
 
-		if (!empty($this->photo) && class_exists('Form'))
-		{
+		if (!empty($this->photo) && class_exists('Form')) {
 			$label .= '<div class="photointooltip">';
 			$label .= Form::showphoto('contact', $this, 0, 40, 0, '', 'mini', 0); // Important, we must force height so image will have height tags and if image is inside a tooltip, the tooltip manager can calculate height and position correctly the tooltip.
 			$label .= '</div><div style="clear: both;"></div>';
@@ -1388,67 +1408,83 @@ class Contact extends CommonObject
 		$label .= ' '.$this->getLibStatut(4);
 		$label .= '<br><b>'.$langs->trans("Name").':</b> '.$this->getFullName($langs);
 		//if ($this->civility_id) $label.= '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate cibilty_id code
-		if (!empty($this->poste)) $label .= '<br><b>'.$langs->trans("Poste").':</b> '.$this->poste;
+		if (!empty($this->poste)) {
+			$label .= '<br><b>'.$langs->trans("Poste").':</b> '.$this->poste;
+		}
 		$label .= '<br><b>'.$langs->trans("EMail").':</b> '.$this->email;
 		$phonelist = array();
 		$country_code = empty($this->country_code) ? '': $this->country_code;
-		if ($this->phone_pro) $phonelist[] = dol_print_phone($this->phone_pro, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
-		if ($this->phone_mobile) $phonelist[] = dol_print_phone($this->phone_mobile, $country_code, $this->id, 0, '', '&nbsp;', 'mobile');
-		if ($this->phone_perso) $phonelist[] = dol_print_phone($this->phone_perso, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
+		if ($this->phone_pro) {
+			$phonelist[] = dol_print_phone($this->phone_pro, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
+		}
+		if ($this->phone_mobile) {
+			$phonelist[] = dol_print_phone($this->phone_mobile, $country_code, $this->id, 0, '', '&nbsp;', 'mobile');
+		}
+		if ($this->phone_perso) {
+			$phonelist[] = dol_print_phone($this->phone_perso, $country_code, $this->id, 0, '', '&nbsp;', 'phone');
+		}
 		$label .= '<br><b>'.$langs->trans("Phone").':</b> '.implode('&nbsp;', $phonelist);
 		$label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs);
 
 		$url = DOL_URL_ROOT.'/contact/card.php?id='.$this->id;
 
-		if ($option !== 'nolink')
-		{
+		if ($option !== 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$url .= $moreparam;
 
 		$linkclose = "";
 		if (empty($notooltip)) {
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowContact");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-		   	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-		   	$linkclose .= ' class="classfortooltip"';
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip"';
 
-		   	/*
-    	   	 $hookmanager->initHooks(array('contactdao'));
-    	   	 $parameters=array('id'=>$this->id);
-    	   	 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-    	   	 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-    	   	 */
+			/*
+				$hookmanager->initHooks(array('contactdao'));
+				$parameters=array('id'=>$this->id);
+				$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+				*/
 		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
-		if ($option == 'xxx')
-		{
+		if ($option == 'xxx') {
 			$linkstart = '<a href="'.DOL_URL_ROOT.'/contact/card.php?id='.$this->id.$moreparam.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend = '</a>';
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($this->getFullName($langs), $maxlen) : $this->getFullName($langs));
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= ($maxlen ?dol_trunc($this->getFullName($langs), $maxlen) : $this->getFullName($langs));
+		}
 		$result .= $linkend;
 
 		global $action;
 		$hookmanager->initHooks(array('contactdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -1463,7 +1499,9 @@ class Contact extends CommonObject
 		global $langs;
 
 		$code = ($this->civility_code ? $this->civility_code : (!empty($this->civility_id) ? $this->civility : (!empty($this->civilite) ? $this->civilite : '')));
-		if (empty($code)) return '';
+		if (empty($code)) {
+			return '';
+		}
 
 		$langs->load("dict");
 		return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civility", "code", "label", $code);
@@ -1507,7 +1545,9 @@ class Contact extends CommonObject
 		);
 
 		$statusType = 'status4';
-		if ($status == 0 || $status == 5) $statusType = 'status5';
+		if ($status == 0 || $status == 5) {
+			$statusType = 'status5';
+		}
 
 		$label = $langs->trans($labelStatus[$status]);
 		$labelshort = $langs->trans($labelStatusShort[$status]);
@@ -1527,8 +1567,11 @@ class Contact extends CommonObject
 	{
 		// phpcs:enable
 		global $langs;
-		if ($status == '1') return $langs->trans('ContactPrivate');
-		else return $langs->trans('ContactPublic');
+		if ($status == '1') {
+			return $langs->trans('ContactPrivate');
+		} else {
+			return $langs->trans('ContactPublic');
+		}
 	}
 
 
@@ -1547,7 +1590,9 @@ class Contact extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj) $socid = $obj->rowid;
+			if ($obj) {
+				$socid = $obj->rowid;
+			}
 		}
 
 		// Initialise parameters
@@ -1592,8 +1637,11 @@ class Contact extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if ($this->statut == $status) return 0;
-		else $this->statut = $status;
+		if ($this->statut == $status) {
+			return 0;
+		} else {
+			$this->statut = $status;
+		}
 
 		$this->db->begin();
 
@@ -1604,16 +1652,16 @@ class Contact extends CommonObject
 		$result = $this->db->query($sql);
 
 		dol_syslog(get_class($this)."::setstatus", LOG_DEBUG);
-		if ($result)
-		{
+		if ($result) {
 			// Call trigger
 			$result = $this->call_trigger('CONTACT_ENABLEDISABLE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if ($error)
-		{
+		if ($error) {
 			$this->db->rollback();
 			return -$error;
 		} else {
@@ -1725,12 +1773,10 @@ class Contact extends CommonObject
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$tab[] = array('fk_socpeople'=>$obj->id, 'type_contact'=>$obj->fk_c_type_contact);
 
@@ -1758,11 +1804,13 @@ class Contact extends CommonObject
 
 		$error = 0;
 
-		if (!isset($this->roles)) return;	// Avoid to loose roles when property not set
+		if (!isset($this->roles)) {
+			return;	// Avoid to loose roles when property not set
+		}
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_socpeople=".$this->id." AND entity IN (".getEntity("societe_contact").")";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_socpeople=".((int) $this->id)." AND entity IN (".getEntity("societe_contact").")";
 
 		$result = $this->db->query($sql);
 		if (!$result) {
@@ -1800,8 +1848,7 @@ class Contact extends CommonObject
 						$sql .= ")";
 
 						$result = $this->db->query($sql);
-						if (!$result)
-						{
+						if (!$result) {
 							$this->errors[] = $this->db->lasterror().' sql='.$sql;
 							$error++;
 						}
@@ -1830,12 +1877,13 @@ class Contact extends CommonObject
 		global $langs;
 
 		$sql = "SELECT id, code, libelle as label, picto FROM ".MAIN_DB_PREFIX."c_stcommcontact";
-		if ($active >= 0) $sql .= " WHERE active = ".$active;
+		if ($active >= 0) {
+			$sql .= " WHERE active = ".$active;
+		}
 		$resql = $this->db->query($sql);
 		$num = $this->db->num_rows($resql);
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $this->db->fetch_object($resql);
 			$this->cacheprospectstatus[$obj->id] = array('id' => $obj->id, 'code' => $obj->code, 'label' => ($langs->trans("ST_".strtoupper($obj->code)) == "ST_".strtoupper($obj->code)) ? $obj->label : $langs->trans("ST_".strtoupper($obj->code)), 'picto' => $obj->picto);
 			$i++;
@@ -1865,8 +1913,7 @@ class Contact extends CommonObject
 
 		$lib = $langs->trans("ProspectLevel".$fk_prospectlevel);
 		// If lib not found in language file, we get label from cache/databse
-		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel))
-		{
+		if ($lib == $langs->trans("ProspectLevel".$fk_prospectlevel)) {
 			$lib = $langs->getLabelFromKey($this->db, $fk_prospectlevel, 'c_prospectlevel', 'code', 'label');
 		}
 		return $lib;
@@ -1915,36 +1962,48 @@ class Contact extends CommonObject
 		global $langs;
 		$langs->load('customers');
 
-		if ($mode == 2)
-		{
-			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
-			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
-			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
-			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
-			else {
+		if ($mode == 2) {
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut == '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut == '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut == '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut == '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+			} else {
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
-		if ($mode == 3)
-		{
-			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto);
-			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto);
-			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto);
-			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto);
-			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto);
-			else {
+		if ($mode == 3) {
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"), -1, $picto);
+			} elseif ($statut == '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0, $picto);
+			} elseif ($statut == '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1, $picto);
+			} elseif ($statut == '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2, $picto);
+			} elseif ($statut == '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3, $picto);
+			} else {
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0, $picto);
 			}
 		}
-		if ($mode == 4)
-		{
-			if ($statut == '-1' || $statut == 'ST_NO') return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
-			elseif ($statut == '0' || $statut == 'ST_NEVER') return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
-			elseif ($statut == '1' || $statut == 'ST_TODO') return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
-			elseif ($statut == '2' || $statut == 'ST_PEND') return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
-			elseif ($statut == '3' || $statut == 'ST_DONE') return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
-			else {
+		if ($mode == 4) {
+			if ($statut == '-1' || $statut == 'ST_NO') {
+				return img_action($langs->trans("StatusProspect-1"), -1, $picto).' '.$langs->trans("StatusProspect-1");
+			} elseif ($statut == '0' || $statut == 'ST_NEVER') {
+				return img_action($langs->trans("StatusProspect0"), 0, $picto).' '.$langs->trans("StatusProspect0");
+			} elseif ($statut == '1' || $statut == 'ST_TODO') {
+				return img_action($langs->trans("StatusProspect1"), 1, $picto).' '.$langs->trans("StatusProspect1");
+			} elseif ($statut == '2' || $statut == 'ST_PEND') {
+				return img_action($langs->trans("StatusProspect2"), 2, $picto).' '.$langs->trans("StatusProspect2");
+			} elseif ($statut == '3' || $statut == 'ST_DONE') {
+				return img_action($langs->trans("StatusProspect3"), 3, $picto).' '.$langs->trans("StatusProspect3");
+			} else {
 				return img_action(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label, 0, $picto).' '.(($langs->trans("StatusProspect".$statut) != "StatusProspect".$statut) ? $langs->trans("StatusProspect".$statut) : $label);
 			}
 		}
@@ -1964,24 +2023,19 @@ class Contact extends CommonObject
 		$error = 0;
 
 		// Update mass emailing flag into table mailing_unsubscribe
-		if ($this->email)
-		{
+		if ($this->email) {
 			$this->db->begin();
 
-			if ($no_email)
-			{
+			if ($no_email) {
 				$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing', 0).") AND email = '".$this->db->escape($this->email)."'";
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $this->db->fetch_object($resql);
 					$noemail = $obj->nb;
-					if (empty($noemail))
-					{
+					if (empty($noemail)) {
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe(email, entity, date_creat) VALUES ('".$this->db->escape($this->email)."', ".$this->db->escape(getEntity('mailing', 0)).", '".$this->db->idate(dol_now())."')";
 						$resql = $this->db->query($sql);
-						if (!$resql)
-						{
+						if (!$resql) {
 							$error++;
 							$this->error = $this->db->lasterror();
 							$this->errors[] = $this->error;
@@ -1995,8 +2049,7 @@ class Contact extends CommonObject
 			} else {
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = '".$this->db->escape($this->email)."' AND entity = ".$this->db->escape(getEntity('mailing', 0));
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					$error++;
 					$this->error = $this->db->lasterror();
 					$this->errors[] = $this->error;
@@ -2024,8 +2077,7 @@ class Contact extends CommonObject
 	 */
 	public function getNoEmail()
 	{
-		if ($this->email)
-		{
+		if ($this->email) {
 			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE entity IN (".getEntity('mailing').") AND email = '".$this->db->escape($this->email)."'";
 			$resql = $this->db->query($sql);
 			if ($resql) {
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index da00374cc2a..1e0f5b06094 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -37,8 +37,12 @@ $id = GETPOST('id', 'int');
 
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 $object = new Contact($db);
-if ($id > 0) $object->fetch($id);
-if (empty($object->thirdparty)) $object->fetch_thirdparty();
+if ($id > 0) {
+	$object->fetch($id);
+}
+if (empty($object->thirdparty)) {
+	$object->fetch_thirdparty();
+}
 $socid = $object->thirdparty->id;
 
 // Sort & Order fields
@@ -46,12 +50,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = 'DESC';
-if (!$sortfield) $sortfield = 'dateprint';
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
+if (!$sortfield) {
+	$sortfield = 'dateprint';
+}
 
 // Search fields
 $sref = GETPOST("sref");
@@ -60,8 +70,7 @@ $month = GETPOST('month', 'int');
 $year = GETPOST('year', 'int');
 
 // Clean up on purge search criteria ?
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 	$sref = '';
 	$sprod_fulldescr = '';
 	$year = '';
@@ -84,7 +93,9 @@ $hookmanager->initHooks(array('consumptioncontact'));
 
 $parameters = array('id'=>$id);
 $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');
+}
 
 
 /*
@@ -99,8 +110,7 @@ $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("C
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if (empty($id))
-{
+if (empty($id)) {
 	dol_print_error($db);
 	exit;
 }
@@ -111,13 +121,15 @@ print dol_get_fiche_head($head, 'consumption', $langs->trans("ContactsAddresses"
 $linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 $morehtmlref = '<div class="refidno">';
-if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-{
+if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 	$objsoc->fetch($socid);
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : ';
-	if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1, 'contact');
-	else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	if ($objsoc->id > 0) {
+		$morehtmlref .= $objsoc->getNomUrl(1, 'contact');
+	} else {
+		$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+	}
 }
 $morehtmlref .= '</div>';
 
@@ -133,22 +145,34 @@ print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td>';
 print $object->getCivilityLabel();
 print '</td></tr>';
 
-if ($object->thirdparty->client)
-{
+if ($object->thirdparty->client) {
 	$thirdTypeArray['customer'] = $langs->trans("customer");
-	if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
-	if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
-	if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
-	if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
+	if ($conf->propal->enabled && $user->rights->propal->lire) {
+		$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
+	}
+	if ($conf->commande->enabled && $user->rights->commande->lire) {
+		$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
+	}
+	if ($conf->facture->enabled && $user->rights->facture->lire) {
+		$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
+	}
+	if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+		$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
+	}
 }
 
-if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) $elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
+if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) {
+	$elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
+}
 
-if ($object->thirdparty->fournisseur)
-{
+if ($object->thirdparty->fournisseur) {
 	$thirdTypeArray['supplier'] = $langs->trans("supplier");
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) $elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) $elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
+		$elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
+	}
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
+		$elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
+	}
 
 	// There no contact type for supplier proposals
 	// if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->supplier_proposal->lire) $elementTypeArray['supplier_proposal']=$langs->transnoentitiesnoconv('SupplierProposals');
@@ -166,8 +190,7 @@ print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'?id='.$id.'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
 $sql_select = '';
-if ($type_element == 'fichinter')
-{ 	// Customer : show products from invoices
+if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 	$documentstatic = new Fichinter($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, tc.libelle as type_contact_label, ';
@@ -178,8 +201,7 @@ if ($type_element == 'fichinter')
 	$where = ' WHERE f.entity IN ('.getEntity('ficheinter').')';
 	$dateprint = 'f.datec';
 	$doc_number = 'f.ref';
-} elseif ($type_element == 'invoice')
-{ 	// Customer : show products from invoices
+} elseif ($type_element == 'invoice') { 	// Customer : show products from invoices
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$documentstatic = new Facture($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle as type_contact_label, ';
@@ -192,8 +214,7 @@ if ($type_element == 'fichinter')
 	$dateprint = 'f.datef';
 	$doc_number = 'f.ref';
 	$thirdTypeSelect = 'customer';
-} elseif ($type_element == 'propal')
-{
+} elseif ($type_element == 'propal') {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$documentstatic = new Propal($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
@@ -206,8 +227,7 @@ if ($type_element == 'fichinter')
 	$datePrint = 'c.datep';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
-} elseif ($type_element == 'order')
-{
+} elseif ($type_element == 'order') {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 	$documentstatic = new Commande($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
@@ -220,8 +240,7 @@ if ($type_element == 'fichinter')
 	$dateprint = 'c.date_commande';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
-} elseif ($type_element == 'supplier_invoice')
-{ 	// Supplier : Show products from invoices.
+} elseif ($type_element == 'supplier_invoice') { 	// Supplier : Show products from invoices.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$documentstatic = new FactureFournisseur($db);
 	$sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, tc.libelle as type_contact_label, ';
@@ -234,22 +253,19 @@ if ($type_element == 'fichinter')
 	$dateprint = 'f.datef';
 	$doc_number = 'f.ref';
 	$thirdTypeSelect = 'supplier';
-}
-//elseif ($type_element == 'supplier_proposal')
-//{
-//    require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-//    $documentstatic=new SupplierProposal($db);
-//    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
-//    $tables_from = MAIN_DB_PREFIX."supplier_proposal as c,".MAIN_DB_PREFIX."supplier_proposaldet as d";
-//    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
-//    $where.= " AND d.fk_supplier_proposal = c.rowid";
-//    $where.= " AND c.entity = ".$conf->entity;
-//    $dateprint = 'c.date_valid';
-//    $doc_number='c.ref';
-//    $thirdTypeSelect='supplier';
-//}
-elseif ($type_element == 'supplier_order')
-{ 	// Supplier : Show products from orders.
+	//} elseif ($type_element == 'supplier_proposal') {
+	//    require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
+	//    $documentstatic=new SupplierProposal($db);
+	//    $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, ';
+	//    $tables_from = MAIN_DB_PREFIX."supplier_proposal as c,".MAIN_DB_PREFIX."supplier_proposaldet as d";
+	//    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = ".$socid;
+	//    $where.= " AND d.fk_supplier_proposal = c.rowid";
+	//    $where.= " AND c.entity = ".$conf->entity;
+	//    $dateprint = 'c.date_valid';
+	//    $doc_number='c.ref';
+	//    $thirdTypeSelect='supplier';
+	//}
+} elseif ($type_element == 'supplier_order') { 	// Supplier : Show products from orders.
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 	$documentstatic = new CommandeFournisseur($db);
 	$sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, tc.libelle as type_contact_label, ';
@@ -262,8 +278,7 @@ elseif ($type_element == 'supplier_order')
 	$dateprint = 'c.date_valid';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'supplier';
-} elseif ($type_element == 'contract')
-{ 	// Order
+} elseif ($type_element == 'contract') { 	// Order
 	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 	$documentstatic = new Contrat($db);
 	$documentstaticline = new ContratLigne($db);
@@ -282,26 +297,40 @@ elseif ($type_element == 'supplier_order')
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 
-if (!empty($sql_select))
-{
+if (!empty($sql_select)) {
 	$sql = $sql_select;
 	$sql .= ' d.description as description';
-	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') $sql .= ', d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'supplier_proposal') $sql .= ', d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element == 'contract') $sql .= ', d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
-	if ($type_element != 'fichinter') $sql .= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity';
+	if ($type_element != 'fichinter' && $type_element != 'contract' && $type_element != 'supplier_proposal') {
+		$sql .= ', d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_start, d.date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element == 'supplier_proposal') {
+		$sql .= ', d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element == 'contract') {
+		$sql .= ', d.label, d.fk_product as product_id, d.fk_product as fk_product, d.info_bits, d.date_ouverture as date_start, d.date_cloture as date_end, d.qty, d.qty as prod_qty, d.total_ht as total_ht, ';
+	}
+	if ($type_element != 'fichinter') {
+		$sql .= ' p.ref as ref, p.rowid as prod_id, p.rowid as fk_product, p.fk_product_type as prod_type, p.fk_product_type as fk_product_type, p.entity as pentity';
+	}
 	$sql .= " ";
-	if ($type_element != 'fichinter') $sql .= ", p.ref as prod_ref, p.label as product_label";
+	if ($type_element != 'fichinter') {
+		$sql .= ", p.ref as prod_ref, p.label as product_label";
+	}
 	$sql .= " FROM "/*.MAIN_DB_PREFIX."societe as s, "*/.$tables_from;
 	// if ($type_element != 'fichinter') $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON d.fk_product = p.rowid ';
 	$sql .= $where;
 	$sql .= dolSqlDateFilter($dateprint, 0, $month, $year);
-	if ($sref) $sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
-	if ($sprod_fulldescr)
-	{
+	if ($sref) {
+		$sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
+	}
+	if ($sprod_fulldescr) {
 		$sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%'";
-		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
-		if (GETPOST('type_element') != 'fichinter') $sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		if (GETPOST('type_element') != 'fichinter') {
+			$sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		}
+		if (GETPOST('type_element') != 'fichinter') {
+			$sql .= " OR p.label LIKE '%".$db->escape($sprod_fulldescr)."%'";
+		}
 		$sql .= ")";
 	}
 	$sql .= $db->order($sortfield, $sortorder);
@@ -332,21 +361,36 @@ $param .= "&type_element=".urlencode($type_element);
 
 $total_qty = 0;
 
-if ($sql_select)
-{
+if ($sql_select) {
 	$resql = $db->query($sql);
-	if (!$resql) dol_print_error($db);
+	if (!$resql) {
+		dol_print_error($db);
+	}
 
 	$num = $db->num_rows($resql);
 
 	$param = "&socid=".urlencode($socid)."&type_element=".urlencode($type_element);
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($sprod_fulldescr) $param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
-	if ($sref) $param .= "&sref=".urlencode($sref);
-	if ($month) $param .= "&month=".urlencode($month);
-	if ($year) $param .= "&year=".urlencode($year);
-	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 ($sprod_fulldescr) {
+		$param .= "&sprod_fulldescr=".urlencode($sprod_fulldescr);
+	}
+	if ($sref) {
+		$param .= "&sref=".urlencode($sref);
+	}
+	if ($month) {
+		$param .= "&month=".urlencode($month);
+	}
+	if ($year) {
+		$param .= "&year=".urlencode($year);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 
 	print_barre_liste($langs->trans('ProductsIntoElements').' '.$typeElementString.' '.$button, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, '', 0, '', '', $limit);
 
@@ -393,8 +437,7 @@ if ($sql_select)
 
 
 	$i = 0;
-	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit))
-	{
+	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit)) {
 		$documentstatic->id = $objp->doc_id;
 		$documentstatic->ref = $objp->doc_number;
 		$documentstatic->type = $objp->doc_type;
@@ -405,7 +448,9 @@ if ($sql_select)
 		$documentstatic->paye = $objp->paid;
 		$documentstatic->paid = $objp->paid;
 
-		if (is_object($documentstaticline)) $documentstaticline->statut = $objp->status;
+		if (is_object($documentstaticline)) {
+			$documentstaticline->statut = $objp->status;
+		}
 
 		print '<tr class="oddeven">';
 		print '<td class="nobordernopadding nowrap" width="100">';
@@ -415,8 +460,7 @@ if ($sql_select)
 
 		// Status
 		print '<td class="center">';
-		if ($type_element == 'contract')
-		{
+		if ($type_element == 'contract') {
 			print $documentstaticline->getLibStatut(2);
 		} else {
 			print $documentstatic->getLibStatut(2);
@@ -429,8 +473,7 @@ if ($sql_select)
 		$text = ''; $description = ''; $type = 0;
 
 		// Code to show product duplicated from commonobject->printObjectLine
-		if ($objp->fk_product > 0)
-		{
+		if ($objp->fk_product > 0) {
 			$product_static = new Product($db);
 
 			$product_static->type = $objp->fk_product_type;
@@ -441,20 +484,21 @@ if ($sql_select)
 		}
 
 		// Product
-		if ($objp->fk_product > 0)
-		{
+		if ($objp->fk_product > 0) {
 			// Define output language
-			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-			{
+			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 				$prod = new Product($db);
 				$prod->fetch($objp->fk_product);
 
 				$outputlangs = $langs;
 				$newlang = '';
-				if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-				if (empty($newlang)) $newlang = $object->default_lang;
-				if (!empty($newlang))
-				{
+				if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+					$newlang = GETPOST('lang_id', 'aZ09');
+				}
+				if (empty($newlang)) {
+					$newlang = $object->default_lang;
+				}
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
@@ -468,42 +512,42 @@ if ($sql_select)
 			$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($objp->description));
 		}
 
-		if (($objp->info_bits & 2) == 2)
-		{
+		if (($objp->info_bits & 2) == 2) {
 			print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'">';
 			$txt = '';
 			print img_object($langs->trans("ShowReduc"), 'reduc').' ';
-			if ($objp->description == '(DEPOSIT)') $txt = $langs->trans("Deposit");
-			elseif ($objp->description == '(EXCESS RECEIVED)') $txt = $langs->trans("ExcessReceived");
-			elseif ($objp->description == '(EXCESS PAID)') $txt = $langs->trans("ExcessPaid");
+			if ($objp->description == '(DEPOSIT)') {
+				$txt = $langs->trans("Deposit");
+			} elseif ($objp->description == '(EXCESS RECEIVED)') {
+				$txt = $langs->trans("ExcessReceived");
+			} elseif ($objp->description == '(EXCESS PAID)') {
+				$txt = $langs->trans("ExcessPaid");
+			}
 			//else $txt=$langs->trans("Discount");
 			print $txt;
 			print '</a>';
-			if ($objp->description)
-			{
-				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0)
-				{
+			if ($objp->description) {
+				if ($objp->description == '(CREDIT_NOTE)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
 				}
-				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
-				{
+				if ($objp->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
-				{
+				} elseif ($objp->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
-				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0)
-				{
+				} elseif ($objp->description == '(DEPOSIT)' && $objp->fk_remise_except > 0) {
 					$discount = new DiscountAbsolute($db);
 					$discount->fetch($objp->fk_remise_except);
 					echo ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 					// Add date of deposit
-					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) echo ' ('.dol_print_date($discount->datec).')';
+					if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+						echo ' ('.dol_print_date($discount->datec).')';
+					}
 				} else {
 					echo ($txt ? ' - ' : '').dol_htmlentitiesbr($objp->description);
 				}
@@ -516,15 +560,16 @@ if ($sql_select)
 				echo get_date_range($objp->date_start, $objp->date_end);
 
 				// Add description in form
-				if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-				{
+				if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 					print (!empty($objp->description) && $objp->description != $objp->product_label) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
 				}
 			} else {
-				if (!empty($objp->label) || !empty($objp->description))
-				{
-					if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
-					else $text = img_object($langs->trans('Product'), 'product');
+				if (!empty($objp->label) || !empty($objp->description)) {
+					if ($type == 1) {
+						$text = img_object($langs->trans('Service'), 'service');
+					} else {
+						$text = img_object($langs->trans('Product'), 'product');
+					}
 
 					if (!empty($objp->label)) {
 						$text .= ' <strong>'.$objp->label.'</strong>';
diff --git a/htdocs/contact/document.php b/htdocs/contact/document.php
index 2065ab772e6..6118553914d 100644
--- a/htdocs/contact/document.php
+++ b/htdocs/contact/document.php
@@ -43,15 +43,16 @@ $object = new Contact($db);
 $object->getCanvas($id);
 $objcanvas = null;
 $canvas = (!empty($object->canvas) ? $object->canvas : GETPOST("canvas"));
-if (!empty($canvas))
-{
+if (!empty($canvas)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
 	$objcanvas = new Canvas($db, $action);
 	$objcanvas->getCanvas('contact', 'contactcard', $canvas);
 }
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
 
 // Get parameters
@@ -59,18 +60,30 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) { $sortfield = $conf->global->MAIN_DOC_SORT_FIELD; }
-if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) { $sortorder = $conf->global->MAIN_DOC_SORT_ORDER; }
+if (!empty($conf->global->MAIN_DOC_SORT_FIELD)) {
+	$sortfield = $conf->global->MAIN_DOC_SORT_FIELD;
+}
+if (!empty($conf->global->MAIN_DOC_SORT_ORDER)) {
+	$sortorder = $conf->global->MAIN_DOC_SORT_ORDER;
+}
 
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
-if ($id > 0) $object->fetch($id);
+if ($id > 0) {
+	$object->fetch($id);
+}
 
 $upload_dir = $conf->societe->multidir_output[$object->entity].'/contact/'.dol_sanitizeFileName($object->ref);
 $modulepart = 'contact';
@@ -90,12 +103,13 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $form = new Form($db);
 
 $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) $title = $object->lastname;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+	$title = $object->lastname;
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $helpurl);
 
-if ($object->id)
-{
+if ($object->id) {
 	$head = contact_prepare_head($object);
 	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 
@@ -105,22 +119,23 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-	{
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
 		$morehtmlref .= $langs->trans('ThirdParty').' : ';
-		if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-		else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		if ($objsoc->id > 0) {
+			$morehtmlref .= $objsoc->getNomUrl(1);
+		} else {
+			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -133,23 +148,23 @@ if ($object->id)
 
 	// Company
 	/*
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-    	if ($object->socid > 0)
-    	{
-    		$objsoc = new Societe($db);
-    		$objsoc->fetch($object->socid);
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		if ($object->socid > 0)
+		{
+			$objsoc = new Societe($db);
+			$objsoc->fetch($object->socid);
 
-    		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
-    	}
+			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+		}
 
-    	else
-    	{
-    		print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-    		print $langs->trans("ContactNotLinkedToCompany");
-    		print '</td></tr>';
-    	}
-    }*/
+		else
+		{
+			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
+			print $langs->trans("ContactNotLinkedToCompany");
+			print '</td></tr>';
+		}
+	}*/
 
 	// Civility
 	print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
diff --git a/htdocs/contact/info.php b/htdocs/contact/info.php
index c39c20d3d25..4cea1cae85b 100644
--- a/htdocs/contact/info.php
+++ b/htdocs/contact/info.php
@@ -34,7 +34,9 @@ $langs->load("companies");
 
 // Security check
 $id = GETPOST("id", 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 
 $object = new Contact($db);
@@ -51,8 +53,7 @@ $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("C
 
 llxHeader('', $title, 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas');
 
-if ($id > 0)
-{
+if ($id > 0) {
 	$result = $object->fetch($id, $user);
 
 	$object->info($id);
diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php
index 78934c5857e..7f84393c858 100644
--- a/htdocs/contact/ldap.php
+++ b/htdocs/contact/ldap.php
@@ -36,12 +36,13 @@ $action = GETPOST('action', 'aZ09');
 
 // Security check
 $id = GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 
 $object = new Contact($db);
-if ($id > 0)
-{
+if ($id > 0) {
 	$object->fetch($id, $user);
 }
 
@@ -50,8 +51,7 @@ if ($id > 0)
  * Actions
  */
 
-if ($action == 'dolibarr2ldap')
-{
+if ($action == 'dolibarr2ldap') {
 	$db->begin();
 
 	$ldap = new Ldap();
@@ -63,8 +63,7 @@ if ($action == 'dolibarr2ldap')
 
 	$result = $ldap->update($dn, $info, $user, $olddn);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		setEventMessages($langs->trans("ContactSynchronized"), null, 'mesgs');
 		$db->commit();
 	} else {
@@ -98,8 +97,7 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border centpercent">';
 
 // Company
-if ($object->socid > 0)
-{
+if ($object->socid > 0) {
 	$thirdparty = new Societe($db);
 	$thirdparty->fetch($object->socid);
 
@@ -139,14 +137,15 @@ print dol_get_fiche_end();
 
 print '<div class="tabsAction">';
 
-if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr')
-{
+if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr') {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
 
-if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr') print "<br>\n";
+if (!empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr') {
+	print "<br>\n";
+}
 
 
 
@@ -163,8 +162,7 @@ print '</tr>';
 // Lecture LDAP
 $ldap = new Ldap();
 $result = $ldap->connect_bind();
-if ($result > 0)
-{
+if ($result > 0) {
 	$info = $object->_load_ldap_info();
 	$dn = $object->_load_ldap_dn($info, 1);
 	$search = "(".$object->_load_ldap_dn($info, 2).")";
@@ -174,10 +172,8 @@ if ($result > 0)
 	//var_dump($records);
 
 	// Show tree
-	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0))
-	{
-		if (!is_array($records))
-		{
+	if (((!is_numeric($records)) || $records != 0) && (!isset($records['count']) || $records['count'] > 0)) {
+		if (!is_array($records)) {
 			print '<tr class="oddeven"><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
 		} else {
 			$result = show_ldap_content($records, 0, $records['count'], true);
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index c33867fed7f..53ebbdfddd9 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -55,7 +55,9 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'con
 $id = GETPOST('id', 'int');
 $contactid = GETPOST('id', 'int');
 $ref = ''; // There is no ref for contacts
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'contact', $contactid, '');
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -95,7 +97,9 @@ $search_roles = GETPOST("search_roles", 'array');
 $search_level = GETPOST("search_level", "array");
 $search_stcomm = GETPOST('search_stcomm', 'int');
 
-if ($search_status == '') $search_status = 1; // always display active customer first
+if ($search_status == '') {
+	$search_status = 1; // always display active customer first
+}
 
 $optioncss = GETPOST('optioncss', 'alpha');
 
@@ -109,31 +113,41 @@ $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 $userid = GETPOST('userid', 'int');
 $begin = GETPOST('begin');
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "p.lastname";
-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "p.lastname";
+}
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}
 $offset = $limit * $page;
 
 $titre = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
-if ($type == "p")
-{
-	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactprospectlist';
+if ($type == "p") {
+	if (empty($contextpage) || $contextpage == 'contactlist') {
+		$contextpage = 'contactprospectlist';
+	}
 	$titre .= '  ('.$langs->trans("ThirdPartyProspects").')';
 	$urlfiche = "card.php";
 }
-if ($type == "c")
-{
-	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactcustomerlist';
+if ($type == "c") {
+	if (empty($contextpage) || $contextpage == 'contactlist') {
+		$contextpage = 'contactcustomerlist';
+	}
 	$titre .= '  ('.$langs->trans("ThirdPartyCustomers").')';
 	$urlfiche = "card.php";
-} elseif ($type == "f")
-{
-	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactsupplierlist';
+} elseif ($type == "f") {
+	if (empty($contextpage) || $contextpage == 'contactlist') {
+		$contextpage = 'contactsupplierlist';
+	}
 	$titre .= ' ('.$langs->trans("ThirdPartySuppliers").')';
 	$urlfiche = "card.php";
-} elseif ($type == "o")
-{
-	if (empty($contextpage) || $contextpage == 'contactlist') $contextpage = 'contactotherlist';
+} elseif ($type == "o") {
+	if (empty($contextpage) || $contextpage == 'contactlist') {
+		$contextpage = 'contactotherlist';
+	}
 	$titre .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
 	$urlfiche = "";
 }
@@ -150,8 +164,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	// don't allow search in private notes for external users when doing "search in all"
 	if (!empty($user->socid) && $key == "note_private") {
 		continue;
@@ -209,10 +222,11 @@ $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
 
-if (($id > 0 || !empty($ref)) && $action != 'add')
-{
+if (($id > 0 || !empty($ref)) && $action != 'add') {
 	$result = $object->fetch($id, $ref);
-	if ($result < 0) dol_print_error($db);
+	if ($result < 0) {
+		dol_print_error($db);
+	}
 }
 
 
@@ -220,21 +234,25 @@ if (($id > 0 || !empty($ref)) && $action != 'add')
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// Selection of new fields
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Did we click on 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
 		$sall = "";
 		$search_id = '';
 		$search_firstlast_only = "";
@@ -281,19 +299,22 @@ if (empty($reshook))
 	$uploaddir = $conf->societe->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
-	if ($action == 'setstcomm')
-	{
+	if ($action == 'setstcomm') {
 		$object = new Contact($db);
 		$result = $object->fetch(GETPOST('stcommcontactid'));
 		$object->stcomm_id = dol_getIdFromCode($db, GETPOST('stcomm', 'alpha'), 'c_stcommcontact');
 		$result = $object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
 		$action = '';
 	}
 }
 
-if ($search_priv < 0) $search_priv = '';
+if ($search_priv < 0) {
+	$search_priv = '';
+}
 
 
 /*
@@ -318,17 +339,18 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
 $sql .= " WHERE active > 0";
 $sql .= " ORDER BY sortorder";
 $resql = $db->query($sql);
-if ($resql)
-{
-	while ($obj = $db->fetch_object($resql))
-	{
+if ($resql) {
+	while ($obj = $db->fetch_object($resql)) {
 		// Compute level text
 		$level = $langs->trans($obj->code);
-		if ($level == $obj->code) $level = $langs->trans($obj->label);
+		if ($level == $obj->code) {
+			$level = $langs->trans($obj->label);
+		}
 		$tab_level[$obj->code] = $level;
 	}
+} else {
+	dol_print_error($db);
 }
-else dol_print_error($db);
 
 $sql = "SELECT s.rowid as socid, s.nom as name,";
 $sql .= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.zip, p.town, p.poste, p.email, p.no_email,";
@@ -338,64 +360,121 @@ $sql .= " st.libelle as stcomm, st.picto as stcomm_picto, p.fk_stcommcontact as
 $sql .= " co.label as country, co.code as country_code";
 // 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
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
-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 (p.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 (p.rowid = ef.fk_object)";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = p.fk_pays";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_stcommcontact as st ON st.id = p.fk_stcommcontact";
-if (!empty($search_categ)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cc ON p.rowid = cc.fk_socpeople"; // We need this table joined to the select in order to filter by categ
-if (!empty($search_categ_thirdparty)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
-if (!empty($search_categ_supplier)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs2 ON s.rowid = cs2.fk_soc"; // We need this table joined to the select in order to filter by categ
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+if (!empty($search_categ)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_contact as cc ON p.rowid = cc.fk_socpeople"; // We need this table joined to the select in order to filter by categ
+}
+if (!empty($search_categ_thirdparty)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc"; // We need this table joined to the select in order to filter by categ
+}
+if (!empty($search_categ_supplier)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs2 ON s.rowid = cs2.fk_soc"; // We need this table joined to the select in order to filter by categ
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+}
 $sql .= ' WHERE p.entity IN ('.getEntity('socpeople').')';
-if (!$user->rights->societe->client->voir && !$socid) //restriction
-{
+if (!$user->rights->societe->client->voir && !$socid) { //restriction
 	$sql .= " AND (sc.fk_user = ".$user->id." OR p.fk_soc IS NULL)";
 }
-if (!empty($userid))    // propre au commercial
-{
+if (!empty($userid)) {    // propre au commercial
 	$sql .= " AND p.fk_user_creat=".$db->escape($userid);
 }
-if ($search_level)  $sql .= natural_search("p.fk_prospectcontactlevel", join(',', $search_level), 3);
-if ($search_stcomm != '' && $search_stcomm != -2) $sql .= natural_search("p.fk_stcommcontact", $search_stcomm, 2);
-
-// Filter to exclude not owned private contacts
-if ($search_priv != '0' && $search_priv != '1')
-{
-	$sql .= " AND (p.priv='0' OR (p.priv='1' AND p.fk_user_creat=".$user->id."))";
-} else {
-	if ($search_priv == '0') $sql .= " AND p.priv='0'";
-	if ($search_priv == '1') $sql .= " AND (p.priv='1' AND p.fk_user_creat=".$user->id.")";
+if ($search_level) {
+	$sql .= natural_search("p.fk_prospectcontactlevel", join(',', $search_level), 3);
+}
+if ($search_stcomm != '' && $search_stcomm != -2) {
+	$sql .= natural_search("p.fk_stcommcontact", $search_stcomm, 2);
 }
 
-if ($search_categ > 0)   $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ);
-if ($search_categ == -2) $sql .= " AND cc.fk_categorie IS NULL";
-if ($search_categ_thirdparty > 0)   $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_thirdparty);
-if ($search_categ_thirdparty == -2) $sql .= " AND cs.fk_categorie IS NULL";
-if ($search_categ_supplier > 0)     $sql .= " AND cs2.fk_categorie = ".$db->escape($search_categ_supplier);
-if ($search_categ_supplier == -2)   $sql .= " AND cs2.fk_categorie IS NULL";
+// Filter to exclude not owned private contacts
+if ($search_priv != '0' && $search_priv != '1') {
+	$sql .= " AND (p.priv='0' OR (p.priv='1' AND p.fk_user_creat=".$user->id."))";
+} else {
+	if ($search_priv == '0') {
+		$sql .= " AND p.priv='0'";
+	}
+	if ($search_priv == '1') {
+		$sql .= " AND (p.priv='1' AND p.fk_user_creat=".$user->id.")";
+	}
+}
 
-if ($sall)                          $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if (strlen($search_phone))          $sql .= natural_search(array('p.phone', 'p.phone_perso', 'p.phone_mobile'), $search_phone);
-if (strlen($search_cti))            $sql .= natural_search(array('p.phone', 'p.phone_perso', 'p.phone_mobile'), $search_cti);
-if (strlen($search_firstlast_only)) $sql .= natural_search(array('p.lastname', 'p.firstname'), $search_firstlast_only);
+if ($search_categ > 0) {
+	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ);
+}
+if ($search_categ == -2) {
+	$sql .= " AND cc.fk_categorie IS NULL";
+}
+if ($search_categ_thirdparty > 0) {
+	$sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_thirdparty);
+}
+if ($search_categ_thirdparty == -2) {
+	$sql .= " AND cs.fk_categorie IS NULL";
+}
+if ($search_categ_supplier > 0) {
+	$sql .= " AND cs2.fk_categorie = ".$db->escape($search_categ_supplier);
+}
+if ($search_categ_supplier == -2) {
+	$sql .= " AND cs2.fk_categorie IS NULL";
+}
 
-if ($search_id > 0)                 $sql .= natural_search('p.rowid', $search_id, 1);
-if ($search_lastname)               $sql .= natural_search('p.lastname', $search_lastname);
-if ($search_firstname)              $sql .= natural_search('p.firstname', $search_firstname);
-if ($search_societe)                $sql .= natural_search(empty($conf->global->SOCIETE_DISABLE_CONTACTS) ? 's.nom' : 'p.fk_soc', $search_societe);
-if ($search_country)                $sql .= " AND p.fk_pays IN (".$search_country.')';
-if (strlen($search_poste))          $sql .= natural_search('p.poste', $search_poste);
-if (strlen($search_phone_perso))    $sql .= natural_search('p.phone_perso', $search_phone_perso);
-if (strlen($search_phone_pro))      $sql .= natural_search('p.phone', $search_phone_pro);
-if (strlen($search_phone_mobile))   $sql .= natural_search('p.phone_mobile', $search_phone_mobile);
-if (strlen($search_fax))            $sql .= natural_search('p.fax', $search_fax);
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if (strlen($search_phone)) {
+	$sql .= natural_search(array('p.phone', 'p.phone_perso', 'p.phone_mobile'), $search_phone);
+}
+if (strlen($search_cti)) {
+	$sql .= natural_search(array('p.phone', 'p.phone_perso', 'p.phone_mobile'), $search_cti);
+}
+if (strlen($search_firstlast_only)) {
+	$sql .= natural_search(array('p.lastname', 'p.firstname'), $search_firstlast_only);
+}
+
+if ($search_id > 0) {
+	$sql .= natural_search('p.rowid', $search_id, 1);
+}
+if ($search_lastname) {
+	$sql .= natural_search('p.lastname', $search_lastname);
+}
+if ($search_firstname) {
+	$sql .= natural_search('p.firstname', $search_firstname);
+}
+if ($search_societe) {
+	$sql .= natural_search(empty($conf->global->SOCIETE_DISABLE_CONTACTS) ? 's.nom' : 'p.fk_soc', $search_societe);
+}
+if ($search_country) {
+	$sql .= " AND p.fk_pays IN (".$search_country.')';
+}
+if (strlen($search_poste)) {
+	$sql .= natural_search('p.poste', $search_poste);
+}
+if (strlen($search_phone_perso)) {
+	$sql .= natural_search('p.phone_perso', $search_phone_perso);
+}
+if (strlen($search_phone_pro)) {
+	$sql .= natural_search('p.phone', $search_phone_pro);
+}
+if (strlen($search_phone_mobile)) {
+	$sql .= natural_search('p.phone_mobile', $search_phone_mobile);
+}
+if (strlen($search_fax)) {
+	$sql .= natural_search('p.fax', $search_fax);
+}
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active'] && strlen($search_[$key])) {
@@ -403,31 +482,38 @@ if (!empty($conf->socialnetworks->enabled)) {
 		}
 	}
 }
-if (strlen($search_email))          $sql .= natural_search('p.email', $search_email);
-if (strlen($search_zip))   			$sql .= natural_search("p.zip", $search_zip);
-if (strlen($search_town))   		$sql .= natural_search("p.town", $search_town);
+if (strlen($search_email)) {
+	$sql .= natural_search('p.email', $search_email);
+}
+if (strlen($search_zip)) {
+	$sql .= natural_search("p.zip", $search_zip);
+}
+if (strlen($search_town)) {
+	$sql .= natural_search("p.town", $search_town);
+}
 if (count($search_roles) > 0) {
 	$sql .= " AND p.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".implode(',', $search_roles)."))";
 }
 
-if ($search_no_email != '' && $search_no_email >= 0) $sql .= " AND p.no_email = ".$db->escape($search_no_email);
-if ($search_status != '' && $search_status >= 0) $sql .= " AND p.statut = ".$db->escape($search_status);
-if ($search_import_key)             $sql .= natural_search("p.import_key", $search_import_key);
-if ($type == "o")        // filtre sur type
-{
+if ($search_no_email != '' && $search_no_email >= 0) {
+	$sql .= " AND p.no_email = ".$db->escape($search_no_email);
+}
+if ($search_status != '' && $search_status >= 0) {
+	$sql .= " AND p.statut = ".$db->escape($search_status);
+}
+if ($search_import_key) {
+	$sql .= natural_search("p.import_key", $search_import_key);
+}
+if ($type == "o") {        // filtre sur type
 	$sql .= " AND p.fk_soc IS NULL";
-} elseif ($type == "f")        // filtre sur type
-{
+} elseif ($type == "f") {        // filtre sur type
 	$sql .= " AND s.fournisseur = 1";
-} elseif ($type == "c")        // filtre sur type
-{
+} elseif ($type == "c") {        // filtre sur type
 	$sql .= " AND s.client IN (1, 3)";
-} elseif ($type == "p")        // filtre sur type
-{
+} elseif ($type == "p") {        // filtre sur type
 	$sql .= " AND s.client IN (2, 3)";
 }
-if (!empty($socid))
-{
+if (!empty($socid)) {
 	$sql .= " AND s.rowid = ".$socid;
 }
 // Add where from extra fields
@@ -437,8 +523,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 // Add order
-if ($view == "recent")
-{
+if ($view == "recent") {
 	$sql .= $db->order("p.datec", "DESC");
 } else {
 	$sql .= $db->order($sortfield, $sortorder);
@@ -446,12 +531,10 @@ if ($view == "recent")
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
-	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;
 	}
@@ -460,8 +543,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if (!$resql)
-{
+if (!$resql) {
 	dol_print_error($db);
 	exit;
 }
@@ -470,8 +552,7 @@ $num = $db->num_rows($resql);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($sall != '' || $search_cti != ''))
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($sall != '' || $search_cti != '')) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".DOL_URL_ROOT.'/contact/card.php?id='.$id);
@@ -482,39 +563,91 @@ $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
 llxHeader('', $title, $help_url);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&amp;contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&amp;limit='.$limit;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&amp;contextpage='.$contextpage;
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&amp;limit='.$limit;
+}
 $param .= '&amp;begin='.urlencode($begin).'&amp;userid='.urlencode($userid).'&amp;contactname='.urlencode($sall);
 $param .= '&amp;type='.urlencode($type).'&amp;view='.urlencode($view);
-if (!empty($search_categ)) $param .= '&amp;search_categ='.urlencode($search_categ);
-if (!empty($search_categ_thirdparty)) $param .= '&amp;search_categ_thirdparty='.urlencode($search_categ_thirdparty);
-if (!empty($search_categ_supplier)) $param .= '&amp;search_categ_supplier='.urlencode($search_categ_supplier);
-if ($sall != '') $param .= '&amp;sall='.urlencode($sall);
-if ($search_id > 0) $param .= "&amp;search_id=".urlencode($search_id);
-if ($search_lastname != '') $param .= '&amp;search_lastname='.urlencode($search_lastname);
-if ($search_firstname != '') $param .= '&amp;search_firstname='.urlencode($search_firstname);
-if ($search_societe != '') $param .= '&amp;search_societe='.urlencode($search_societe);
-if ($search_zip != '') $param .= '&amp;search_zip='.urlencode($search_zip);
-if ($search_town != '') $param .= '&amp;search_town='.urlencode($search_town);
-if ($search_country != '') $param .= "&search_country=".urlencode($search_country);
-if ($search_poste != '') $param .= '&amp;search_poste='.urlencode($search_poste);
-if ($search_phone_pro != '') $param .= '&amp;search_phone_pro='.urlencode($search_phone_pro);
-if ($search_phone_perso != '') $param .= '&amp;search_phone_perso='.urlencode($search_phone_perso);
-if ($search_phone_mobile != '') $param .= '&amp;search_phone_mobile='.urlencode($search_phone_mobile);
-if ($search_fax != '') $param .= '&amp;search_fax='.urlencode($search_fax);
-if ($search_email != '') $param .= '&amp;search_email='.urlencode($search_email);
-if ($search_no_email != '') $param .= '&amp;search_no_email='.urlencode($search_no_email);
-if ($search_status != '') $param .= '&amp;search_status='.urlencode($search_status);
-if ($search_priv == '0' || $search_priv == '1') $param .= "&amp;search_priv=".urlencode($search_priv);
-if ($search_stcomm != '') $param .= '&search_stcomm='.urlencode($search_stcomm);
+if (!empty($search_categ)) {
+	$param .= '&amp;search_categ='.urlencode($search_categ);
+}
+if (!empty($search_categ_thirdparty)) {
+	$param .= '&amp;search_categ_thirdparty='.urlencode($search_categ_thirdparty);
+}
+if (!empty($search_categ_supplier)) {
+	$param .= '&amp;search_categ_supplier='.urlencode($search_categ_supplier);
+}
+if ($sall != '') {
+	$param .= '&amp;sall='.urlencode($sall);
+}
+if ($search_id > 0) {
+	$param .= "&amp;search_id=".urlencode($search_id);
+}
+if ($search_lastname != '') {
+	$param .= '&amp;search_lastname='.urlencode($search_lastname);
+}
+if ($search_firstname != '') {
+	$param .= '&amp;search_firstname='.urlencode($search_firstname);
+}
+if ($search_societe != '') {
+	$param .= '&amp;search_societe='.urlencode($search_societe);
+}
+if ($search_zip != '') {
+	$param .= '&amp;search_zip='.urlencode($search_zip);
+}
+if ($search_town != '') {
+	$param .= '&amp;search_town='.urlencode($search_town);
+}
+if ($search_country != '') {
+	$param .= "&search_country=".urlencode($search_country);
+}
+if ($search_poste != '') {
+	$param .= '&amp;search_poste='.urlencode($search_poste);
+}
+if ($search_phone_pro != '') {
+	$param .= '&amp;search_phone_pro='.urlencode($search_phone_pro);
+}
+if ($search_phone_perso != '') {
+	$param .= '&amp;search_phone_perso='.urlencode($search_phone_perso);
+}
+if ($search_phone_mobile != '') {
+	$param .= '&amp;search_phone_mobile='.urlencode($search_phone_mobile);
+}
+if ($search_fax != '') {
+	$param .= '&amp;search_fax='.urlencode($search_fax);
+}
+if ($search_email != '') {
+	$param .= '&amp;search_email='.urlencode($search_email);
+}
+if ($search_no_email != '') {
+	$param .= '&amp;search_no_email='.urlencode($search_no_email);
+}
+if ($search_status != '') {
+	$param .= '&amp;search_status='.urlencode($search_status);
+}
+if ($search_priv == '0' || $search_priv == '1') {
+	$param .= "&amp;search_priv=".urlencode($search_priv);
+}
+if ($search_stcomm != '') {
+	$param .= '&search_stcomm='.urlencode($search_stcomm);
+}
 if (is_array($search_level) && count($search_level)) {
 	foreach ($search_level as $slevel) {
 		$param .= '&search_level[]='.urlencode($slevel);
 	}
 }
-if ($search_import_key != '') $param .= '&amp;search_import_key='.urlencode($search_import_key);
-if ($optioncss != '') $param .= '&amp;optioncss='.urlencode($optioncss);
-if (count($search_roles) > 0) $param .= implode('&search_roles[]=', $search_roles);
+if ($search_import_key != '') {
+	$param .= '&amp;search_import_key='.urlencode($search_import_key);
+}
+if ($optioncss != '') {
+	$param .= '&amp;optioncss='.urlencode($optioncss);
+}
+if (count($search_roles) > 0) {
+	$param .= implode('&search_roles[]=', $search_roles);
+}
 
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -525,15 +658,23 @@ $arrayofmassactions = array(
 //    'builddoc'=>$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->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->societe->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 = dolGetButtonTitle($langs->trans('NewContactAddress'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create', '', $user->rights->societe->contact->creer);
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-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.'">';
@@ -550,35 +691,36 @@ $objecttmp = new Contact($db);
 $trackid = 'ctc'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($sall)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($sall) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 }
-if ($search_firstlast_only)
-{
+if ($search_firstlast_only) {
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_firstlast_only).$langs->trans("Lastname").", ".$langs->trans("Firstname").'</div>';
 }
 
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-{
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('Categories').': ';
 	$moreforfilter .= $formother->select_categories(Categorie::TYPE_CONTACT, $search_categ, 'search_categ', 1);
 	$moreforfilter .= '</div>';
-	if (empty($type) || $type == 'c' || $type == 'p')
-	{
+	if (empty($type) || $type == 'c' || $type == 'p') {
 		$moreforfilter .= '<div class="divsearchfield">';
-		if ($type == 'c') $moreforfilter .= $langs->trans('CustomersCategoriesShort').': ';
-		elseif ($type == 'p') $moreforfilter .= $langs->trans('ProspectsCategoriesShort').': ';
-		else $moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
+		if ($type == 'c') {
+			$moreforfilter .= $langs->trans('CustomersCategoriesShort').': ';
+		} elseif ($type == 'p') {
+			$moreforfilter .= $langs->trans('ProspectsCategoriesShort').': ';
+		} else {
+			$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
+		}
 		$moreforfilter .= $formother->select_categories(Categorie::TYPE_CUSTOMER, $search_categ_thirdparty, 'search_categ_thirdparty', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (empty($type) || $type == 'f')
-	{
+	if (empty($type) || $type == 'f') {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('SuppliersCategoriesShort').': ';
 		$moreforfilter .= $formother->select_categories(Categorie::TYPE_SUPPLIER, $search_categ_supplier, 'search_categ_supplier', 1);
@@ -600,45 +742,41 @@ print '</div>';
 
 $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";
 
 // Lines for filter fields
 print '<tr class="liste_titre_filter">';
-if (!empty($arrayfields['p.rowid']['checked']))
-{
+if (!empty($arrayfields['p.rowid']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" type="text" name="search_id" size="1" value="'.dol_escape_htmltag($search_id).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.lastname']['checked']))
-{
+if (!empty($arrayfields['p.lastname']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_lastname" size="6" value="'.dol_escape_htmltag($search_lastname).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.firstname']['checked']))
-{
+if (!empty($arrayfields['p.firstname']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_firstname" size="6" value="'.dol_escape_htmltag($search_firstname).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.poste']['checked']))
-{
+if (!empty($arrayfields['p.poste']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_poste" size="5" value="'.dol_escape_htmltag($search_poste).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.zip']['checked']))
-{
+if (!empty($arrayfields['p.zip']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_zip" size="3" value="'.dol_escape_htmltag($search_zip).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.town']['checked']))
-{
+if (!empty($arrayfields['p.town']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_town" size="5" value="'.dol_escape_htmltag($search_town).'">';
 	print '</td>';
@@ -658,44 +796,37 @@ if (!empty($arrayfields['p.town']['checked']))
  print '</td>';
  }*/
 // Country
-if (!empty($arrayfields['country.code_iso']['checked']))
-{
+if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print '<td class="liste_titre center">';
 	print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 	print '</td>';
 }
-if (!empty($arrayfields['p.phone']['checked']))
-{
+if (!empty($arrayfields['p.phone']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_phone_pro" size="6" value="'.dol_escape_htmltag($search_phone_pro).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.phone_perso']['checked']))
-{
+if (!empty($arrayfields['p.phone_perso']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_phone_perso" size="6" value="'.dol_escape_htmltag($search_phone_perso).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.phone_mobile']['checked']))
-{
+if (!empty($arrayfields['p.phone_mobile']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_phone_mobile" size="6" value="'.dol_escape_htmltag($search_phone_mobile).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.fax']['checked']))
-{
+if (!empty($arrayfields['p.fax']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_fax" size="6" value="'.dol_escape_htmltag($search_fax).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.email']['checked']))
-{
+if (!empty($arrayfields['p.email']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_email" size="6" value="'.dol_escape_htmltag($search_email).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.no_email']['checked']))
-{
+if (!empty($arrayfields['p.no_email']['checked'])) {
 	print '<td class="liste_titre center">';
 	print $form->selectarray('search_no_email', array('-1'=>'', '0'=>$langs->trans('No'), '1'=>$langs->trans('Yes')), $search_no_email);
 	print '</td>';
@@ -703,8 +834,7 @@ if (!empty($arrayfields['p.no_email']['checked']))
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
-			if (!empty($arrayfields['p.'.$key]['checked']))
-			{
+			if (!empty($arrayfields['p.'.$key]['checked'])) {
 				print '<td class="liste_titre">';
 				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_[$key]).'">';
 				print '</td>';
@@ -712,33 +842,28 @@ if (!empty($conf->socialnetworks->enabled)) {
 		}
 	}
 }
-if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom']['checked']))
-{
+if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat" type="text" name="search_societe" size="8" value="'.dol_escape_htmltag($search_societe).'">';
 	print '</td>';
 }
-if (!empty($arrayfields['p.priv']['checked']))
-{
+if (!empty($arrayfields['p.priv']['checked'])) {
 	print '<td class="liste_titre center">';
 	$selectarray = array('0'=>$langs->trans("ContactPublic"), '1'=>$langs->trans("ContactPrivate"));
 	print $form->selectarray('search_priv', $selectarray, $search_priv, 1);
 	print '</td>';
 }
 // Prospect level
-if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked']))
-{
+if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked'])) {
 	print '<td class="liste_titre center">';
 	print $form->multiselectarray('search_level', $tab_level, $search_level, 0, 0, 'width75', 0, 0, '', '', '', 2);
 	print '</td>';
 }
 // Prospect status
-if (!empty($arrayfields['p.fk_stcommcontact']['checked']))
-{
+if (!empty($arrayfields['p.fk_stcommcontact']['checked'])) {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
 	$arraystcomm = array();
-	foreach ($contactstatic->cacheprospectstatus as $key => $val)
-	{
+	foreach ($contactstatic->cacheprospectstatus as $key => $val) {
 		$arraystcomm[$val['id']] = ($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
 	}
 	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2, 0, 0, '', 0, 0, 0, '', 'nowrap ');
@@ -752,26 +877,22 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
-if (!empty($arrayfields['p.datec']['checked']))
-{
+if (!empty($arrayfields['p.datec']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Date modification
-if (!empty($arrayfields['p.tms']['checked']))
-{
+if (!empty($arrayfields['p.tms']['checked'])) {
 	print '<td class="liste_titre">';
 	print '</td>';
 }
 // Status
-if (!empty($arrayfields['p.statut']['checked']))
-{
+if (!empty($arrayfields['p.statut']['checked'])) {
 	print '<td class="liste_titre center">';
 	print $form->selectarray('search_status', array('-1'=>'', '0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status);
 	print '</td>';
 }
-if (!empty($arrayfields['p.import_key']['checked']))
-{
+if (!empty($arrayfields['p.import_key']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<input class="flat searchstring" type="text" name="search_import_key" size="3" value="'.dol_escape_htmltag($search_import_key).'">';
 	print '</td>';
@@ -786,23 +907,47 @@ print '</tr>';
 
 // Ligne des titres
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['p.rowid']['checked']))               print_liste_field_titre($arrayfields['p.rowid']['label'], $_SERVER["PHP_SELF"], "p.rowid", "", $param, "", $sortfield, $sortorder);
-if (!empty($arrayfields['p.lastname']['checked']))            print_liste_field_titre($arrayfields['p.lastname']['label'], $_SERVER["PHP_SELF"], "p.lastname", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.firstname']['checked']))           print_liste_field_titre($arrayfields['p.firstname']['label'], $_SERVER["PHP_SELF"], "p.firstname", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.poste']['checked']))               print_liste_field_titre($arrayfields['p.poste']['label'], $_SERVER["PHP_SELF"], "p.poste", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.zip']['checked']))                 print_liste_field_titre($arrayfields['p.zip']['label'], $_SERVER["PHP_SELF"], "p.zip", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.town']['checked']))                print_liste_field_titre($arrayfields['p.town']['label'], $_SERVER["PHP_SELF"], "p.town", $begin, $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.rowid']['checked'])) {
+	print_liste_field_titre($arrayfields['p.rowid']['label'], $_SERVER["PHP_SELF"], "p.rowid", "", $param, "", $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.lastname']['checked'])) {
+	print_liste_field_titre($arrayfields['p.lastname']['label'], $_SERVER["PHP_SELF"], "p.lastname", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.firstname']['checked'])) {
+	print_liste_field_titre($arrayfields['p.firstname']['label'], $_SERVER["PHP_SELF"], "p.firstname", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.poste']['checked'])) {
+	print_liste_field_titre($arrayfields['p.poste']['label'], $_SERVER["PHP_SELF"], "p.poste", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.zip']['checked'])) {
+	print_liste_field_titre($arrayfields['p.zip']['label'], $_SERVER["PHP_SELF"], "p.zip", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.town']['checked'])) {
+	print_liste_field_titre($arrayfields['p.town']['label'], $_SERVER["PHP_SELF"], "p.town", $begin, $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['region.nom']['checked']))          print_liste_field_titre($arrayfields['region.nom']['label'],$_SERVER["PHP_SELF"],"region.nom","",$param,'',$sortfield,$sortorder);
 if (!empty($arrayfields['country.code_iso']['checked'])) {
 	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "co.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
 }
-if (!empty($arrayfields['p.phone']['checked']))               print_liste_field_titre($arrayfields['p.phone']['label'], $_SERVER["PHP_SELF"], "p.phone", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.phone_perso']['checked']))         print_liste_field_titre($arrayfields['p.phone_perso']['label'], $_SERVER["PHP_SELF"], "p.phone_perso", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.phone_mobile']['checked']))        print_liste_field_titre($arrayfields['p.phone_mobile']['label'], $_SERVER["PHP_SELF"], "p.phone_mobile", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.fax']['checked']))                 print_liste_field_titre($arrayfields['p.fax']['label'], $_SERVER["PHP_SELF"], "p.fax", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.email']['checked']))               print_liste_field_titre($arrayfields['p.email']['label'], $_SERVER["PHP_SELF"], "p.email", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.no_email']['checked']))            print_liste_field_titre($arrayfields['p.no_email']['label'], $_SERVER["PHP_SELF"], "p.no_email", $begin, $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['p.phone']['checked'])) {
+	print_liste_field_titre($arrayfields['p.phone']['label'], $_SERVER["PHP_SELF"], "p.phone", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.phone_perso']['checked'])) {
+	print_liste_field_titre($arrayfields['p.phone_perso']['label'], $_SERVER["PHP_SELF"], "p.phone_perso", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.phone_mobile']['checked'])) {
+	print_liste_field_titre($arrayfields['p.phone_mobile']['label'], $_SERVER["PHP_SELF"], "p.phone_mobile", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.fax']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fax']['label'], $_SERVER["PHP_SELF"], "p.fax", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.email']['checked'])) {
+	print_liste_field_titre($arrayfields['p.email']['label'], $_SERVER["PHP_SELF"], "p.email", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.no_email']['checked'])) {
+	print_liste_field_titre($arrayfields['p.no_email']['label'], $_SERVER["PHP_SELF"], "p.no_email", $begin, $param, '', $sortfield, $sortorder, 'center ');
+}
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
@@ -810,11 +955,21 @@ if (!empty($conf->socialnetworks->enabled)) {
 		}
 	}
 }
-if (!empty($arrayfields['p.fk_soc']['checked']))					print_liste_field_titre($arrayfields['p.fk_soc']['label'], $_SERVER["PHP_SELF"], "p.fk_soc", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['s.nom']['checked']))						print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $begin, $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.priv']['checked']))						print_liste_field_titre($arrayfields['p.priv']['label'], $_SERVER["PHP_SELF"], "p.priv", $begin, $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked']))	print_liste_field_titre($arrayfields['p.fk_prospectcontactlevel']['label'], $_SERVER["PHP_SELF"], "p.fk_prospectcontactlevel", "", $param, '', $sortfield, $sortorder, 'center ');
-if (!empty($arrayfields['p.fk_stcommcontact']['checked']))			print_liste_field_titre($arrayfields['p.fk_stcommcontact']['label'], $_SERVER["PHP_SELF"], "p.fk_stcommcontact", "", $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['p.fk_soc']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_soc']['label'], $_SERVER["PHP_SELF"], "p.fk_soc", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", $begin, $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.priv']['checked'])) {
+	print_liste_field_titre($arrayfields['p.priv']['label'], $_SERVER["PHP_SELF"], "p.priv", $begin, $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_prospectcontactlevel']['label'], $_SERVER["PHP_SELF"], "p.fk_prospectcontactlevel", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['p.fk_stcommcontact']['checked'])) {
+	print_liste_field_titre($arrayfields['p.fk_stcommcontact']['label'], $_SERVER["PHP_SELF"], "p.fk_stcommcontact", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
@@ -844,8 +999,7 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array();
-while ($i < min($num, $limit))
-{
+while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
 	$arraysocialnetworks = (array) json_decode($obj->socialnetworks, true);
@@ -870,44 +1024,50 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven">';
 
 	// ID
-	if (!empty($arrayfields['p.rowid']['checked']))
-	{
+	if (!empty($arrayfields['p.rowid']['checked'])) {
 		print '<td class="tdoverflowmax50">';
 		print $obj->rowid;
 		print "</td>\n";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Name
-	if (!empty($arrayfields['p.lastname']['checked']))
-	{
+	if (!empty($arrayfields['p.lastname']['checked'])) {
 		print '<td class="middle tdoverflowmax200">';
 		print $contactstatic->getNomUrl(1);
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Firstname
-	if (!empty($arrayfields['p.firstname']['checked']))
-	{
+	if (!empty($arrayfields['p.firstname']['checked'])) {
 		print '<td class="tdoverflowmax200">'.$obj->firstname.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Job position
-	if (!empty($arrayfields['p.poste']['checked']))
-	{
+	if (!empty($arrayfields['p.poste']['checked'])) {
 		print '<td class="tdoverflowmax100">'.$obj->poste.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Zip
-	if (!empty($arrayfields['p.zip']['checked']))
-	{
+	if (!empty($arrayfields['p.zip']['checked'])) {
 		print '<td>'.$obj->zip.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Town
-	if (!empty($arrayfields['p.town']['checked']))
-	{
+	if (!empty($arrayfields['p.town']['checked'])) {
 		print '<td>'.$obj->town.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// State
 	/*if (! empty($arrayfields['state.nom']['checked']))
@@ -922,101 +1082,119 @@ while ($i < min($num, $limit))
 		if (! $i) $totalarray['nbfield']++;
 	}*/
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="center">';
 		$tmparray = getCountry($obj->fk_pays, 'all');
 		print $tmparray['label'];
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Phone
-	if (!empty($arrayfields['p.phone']['checked']))
-	{
+	if (!empty($arrayfields['p.phone']['checked'])) {
 		print '<td>'.dol_print_phone($obj->phone_pro, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Phone perso
-	if (!empty($arrayfields['p.phone_perso']['checked']))
-	{
+	if (!empty($arrayfields['p.phone_perso']['checked'])) {
 		print '<td>'.dol_print_phone($obj->phone_perso, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'phone').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Phone mobile
-	if (!empty($arrayfields['p.phone_mobile']['checked']))
-	{
+	if (!empty($arrayfields['p.phone_mobile']['checked'])) {
 		print '<td>'.dol_print_phone($obj->phone_mobile, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'mobile').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// Fax
-	if (!empty($arrayfields['p.fax']['checked']))
-	{
+	if (!empty($arrayfields['p.fax']['checked'])) {
 		print '<td>'.dol_print_phone($obj->fax, $obj->country_code, $obj->rowid, $obj->socid, 'AC_TEL', ' ', 'fax').'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// EMail
-	if (!empty($arrayfields['p.email']['checked']))
-	{
+	if (!empty($arrayfields['p.email']['checked'])) {
 		print '<td>'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 18, 0, 1).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	// No EMail
-	if (!empty($arrayfields['p.no_email']['checked']))
-	{
+	if (!empty($arrayfields['p.no_email']['checked'])) {
 		print '<td class="center">'.yn($obj->no_email).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($conf->socialnetworks->enabled)) {
 		foreach ($socialnetworks as $key => $value) {
 			if ($value['active'] && !empty($arrayfields['p.'.$key]['checked'])) {
 				print '<td>'.dol_print_socialnetworks($arraysocialnetworks[$key], $obj->rowid, $obj->socid, $key, $socialnetworks).'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 		}
 	}
 	// Company
-	if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['p.fk_soc']['checked']) || !empty($arrayfields['s.nom']['checked'])) {
 		print '<td>';
-		if ($obj->socid)
-		{
+		if ($obj->socid) {
 			$objsoc = new Societe($db);
 			$objsoc->fetch($obj->socid);
 			print $objsoc->getNomUrl(1);
-		} else print '&nbsp;';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Private/Public
-	if (!empty($arrayfields['p.priv']['checked']))
-	{
+	if (!empty($arrayfields['p.priv']['checked'])) {
 		print '<td class="center">'.$contactstatic->LibPubPriv($obj->priv).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
-	if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked']))
-	{
+	if (!empty($arrayfields['p.fk_prospectcontactlevel']['checked'])) {
 		// Prospect level
 		print '<td class="center">';
 		print $contactstatic->getLibProspLevel();
 		print "</td>";
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
-	if (!empty($arrayfields['p.fk_stcommcontact']['checked']))
-	{
+	if (!empty($arrayfields['p.fk_stcommcontact']['checked'])) {
 		// Prospect status
 		print '<td class="center nowrap"><div class="nowrap">';
 		print '<div class="inline-block">'.$contactstatic->libProspCommStatut($obj->stcomm_id, 2, $contactstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
 		print '</div> - <div class="inline-block">';
 		foreach ($contactstatic->cacheprospectstatus as $key => $val) {
 			$titlealt = 'default';
-			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
-			if ($obj->stcomm_id != $val['id']) print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommcontactid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) {
+				$titlealt = $val['label'];
+			}
+			if ($obj->stcomm_id != $val['id']) {
+				print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommcontactid='.$obj->rowid.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+			}
 		}
 		print '</div></div></td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Extra fields
@@ -1026,45 +1204,52 @@ while ($i < min($num, $limit))
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['p.datec']['checked']))
-	{
+	if (!empty($arrayfields['p.datec']['checked'])) {
 		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['p.tms']['checked']))
-	{
+	if (!empty($arrayfields['p.tms']['checked'])) {
 		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['p.statut']['checked']))
-	{
+	if (!empty($arrayfields['p.statut']['checked'])) {
 		print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
-	if (!empty($arrayfields['p.import_key']['checked']))
-	{
+	if (!empty($arrayfields['p.import_key']['checked'])) {
 		print '<td class="tdoverflowmax100">';
 		print $obj->import_key;
 		print "</td>\n";
-		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($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++;
diff --git a/htdocs/contact/note.php b/htdocs/contact/note.php
index ae32ef5c95e..9a90cafdd9a 100644
--- a/htdocs/contact/note.php
+++ b/htdocs/contact/note.php
@@ -36,11 +36,15 @@ $langs->load("companies");
 
 // Security check
 $id = GETPOST('id', 'int');
-if ($user->socid) $id = $user->socid;
+if ($user->socid) {
+	$id = $user->socid;
+}
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 
 $object = new Contact($db);
-if ($id > 0) $object->fetch($id);
+if ($id > 0) {
+	$object->fetch($id);
+}
 
 $permissionnote = $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
 
@@ -65,12 +69,13 @@ $form = new Form($db);
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($id > 0)
-{
+if ($id > 0) {
 	/*
-     * Affichage onglets
-     */
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	 * Affichage onglets
+	 */
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 
 	$head = contact_prepare_head($object);
 
@@ -79,14 +84,16 @@ if ($id > 0)
 	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-	{
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
 		$morehtmlref .= $langs->trans('ThirdParty').' : ';
-		if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-		else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		if ($objsoc->id > 0) {
+			$morehtmlref .= $objsoc->getNomUrl(1);
+		} else {
+			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		}
 	}
 	$morehtmlref .= '</div>';
 
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 0555eb84719..d313712a6a6 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -35,7 +35,9 @@ $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 $object = new Contact($db);
 
@@ -43,47 +45,43 @@ $object = new Contact($db);
  * Action
  */
 
-if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact->creer)
-{
+if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact->creer) {
 	$ret = $object->fetch($id);
 
 	// Note: Correct date should be completed with location to have exact GM time of birth.
 	$object->birthday = dol_mktime(0, 0, 0, $_POST["birthdaymonth"], $_POST["birthdayday"], $_POST["birthdayyear"]);
 	$object->birthday_alert = $_POST["birthday_alert"];
 
-	if (GETPOST('deletephoto')) $object->photo = '';
-	elseif (!empty($_FILES['photo']['name'])) $object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
+	if (GETPOST('deletephoto')) {
+		$object->photo = '';
+	} elseif (!empty($_FILES['photo']['name'])) {
+		$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
+	}
 
 	$result = $object->update_perso($id, $user);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$object->old_name = '';
 		$object->old_firstname = '';
 		// Logo/Photo save
 		$dir = $conf->societe->dir_output.'/contact/'.get_exdir($object->id, 0, 0, 1, $object, 'contact').'/photos';
 
 		$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-		if ($file_OK)
-		{
+		if ($file_OK) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
-			if (GETPOST('deletephoto'))
-			{
+			if (GETPOST('deletephoto')) {
 				$fileimg = $conf->societe->dir_output.'/contact/'.get_exdir($object->id, 0, 0, 1, $object, 'contact').'/photos/'.$object->photo;
 				$dirthumbs = $conf->societe->dir_output.'/contact/'.get_exdir($object->id, 0, 0, 1, $object, 'contact').'/photos/thumbs';
 				dol_delete_file($fileimg);
 				dol_delete_dir_recursive($dirthumbs);
 			}
 
-			if (image_format_supported($_FILES['photo']['name']) > 0)
-			{
+			if (image_format_supported($_FILES['photo']['name']) > 0) {
 				dol_mkdir($dir);
 
-				if (@is_dir($dir))
-				{
+				if (@is_dir($dir)) {
 					$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-					if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0)
-					{
+					if (!dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']) > 0) {
 						setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 					} else {
 						// Create thumbs
@@ -94,8 +92,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 				setEventMessages("ErrorBadImageFormat", null, 'errors');
 			}
 		} else {
-			switch ($_FILES['photo']['error'])
-			{
+			switch ($_FILES['photo']['error']) {
 				case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
 				case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
 					$errors[] = "ErrorFileSizeTooLarge";
@@ -118,7 +115,9 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->societe->contact-
 $now = dol_now();
 
 $title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) $title = $object->lastname;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->lastname) {
+	$title = $object->lastname;
+}
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $helpurl);
 
@@ -128,8 +127,7 @@ $object->fetch($id, $user);
 
 $head = contact_prepare_head($object);
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	/*
 	 * Fiche en mode edition
 	 */
@@ -151,11 +149,15 @@ if ($action == 'edit')
 	// Photo
 	print '<td class="center hideonsmartphone valignmiddle" rowspan="6">';
 	print $form->showphoto('contact', $object)."\n";
-	if ($object->photo) print "<br>\n";
+	if ($object->photo) {
+		print "<br>\n";
+	}
 
 	print '<table class="nobordernopadding">';
 
-	if ($object->photo) print '<tr><td class="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+	if ($object->photo) {
+		print '<tr><td class="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
+	}
 	print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
 	print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
 	print '</table>';
@@ -167,10 +169,8 @@ if ($action == 'edit')
 	print '<tr><td>'.$langs->trans("Firstname").'</td><td colspan="3">'.$object->firstname.'</td>';
 
 	// Company
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-	{
-		if ($object->socid > 0)
-		{
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
+		if ($object->socid > 0) {
 			$objsoc = new Societe($db);
 			$objsoc->fetch($object->socid);
 
@@ -194,8 +194,7 @@ if ($action == 'edit')
 	print '</td>';
 
 	print '<td colspan="2">'.$langs->trans("Alert").': ';
-	if (!empty($object->birthday_alert))
-	{
+	if (!empty($object->birthday_alert)) {
 		print '<input type="checkbox" name="birthday_alert" checked></td>';
 	} else {
 		print '<input type="checkbox" name="birthday_alert"></td>';
@@ -221,14 +220,16 @@ if ($action == 'edit')
 	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-	{
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 		$objsoc = new Societe($db);
 		$objsoc->fetch($object->socid);
 		// Thirdparty
 		$morehtmlref .= $langs->trans('ThirdParty').' : ';
-		if ($objsoc->id > 0) $morehtmlref .= $objsoc->getNomUrl(1);
-		else $morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		if ($objsoc->id > 0) {
+			$morehtmlref .= $objsoc->getNomUrl(1);
+		} else {
+			$morehtmlref .= $langs->trans("ContactNotLinkedToCompany");
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -243,23 +244,23 @@ if ($action == 'edit')
 
 	// Company
 	/*
-    if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
-    {
-        if ($object->socid > 0)
-        {
-            $objsoc = new Societe($db);
-            $objsoc->fetch($object->socid);
+	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))
+	{
+		if ($object->socid > 0)
+		{
+			$objsoc = new Societe($db);
+			$objsoc->fetch($object->socid);
 
-            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
-        }
+			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">'.$objsoc->getNomUrl(1).'</td></tr>';
+		}
 
-        else
-        {
-            print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
-            print $langs->trans("ContactNotLinkedToCompany");
-            print '</td></tr>';
-        }
-    }*/
+		else
+		{
+			print '<tr><td>'.$langs->trans("ThirdParty").'</td><td colspan="3">';
+			print $langs->trans("ContactNotLinkedToCompany");
+			print '</td></tr>';
+		}
+	}*/
 
 	// Civility
 	print '<tr><td class="titlefield">'.$langs->trans("UserTitle").'</td><td colspan="3">';
@@ -268,8 +269,7 @@ if ($action == 'edit')
 
 	// Date To Birth
 	print '<tr>';
-	if (!empty($object->birthday))
-	{
+	if (!empty($object->birthday)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3">'.dol_print_date($object->birthday, "day");
@@ -278,14 +278,21 @@ if ($action == 'edit')
 		//var_dump($birthdatearray);
 		$ageyear = convertSecondToTime($now - $object->birthday, 'year') - 1970;
 		$agemonth = convertSecondToTime($now - $object->birthday, 'month') - 1;
-		if ($ageyear >= 2) print '('.$ageyear.' '.$langs->trans("DurationYears").')';
-		elseif ($agemonth >= 2) print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
-		else print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
+		if ($ageyear >= 2) {
+			print '('.$ageyear.' '.$langs->trans("DurationYears").')';
+		} elseif ($agemonth >= 2) {
+			print '('.$agemonth.' '.$langs->trans("DurationMonths").')';
+		} else {
+			print '('.$agemonth.' '.$langs->trans("DurationMonth").')';
+		}
 
 
 		print ' &nbsp; - &nbsp; ';
-		if ($object->birthday_alert) print $langs->trans("BirthdayAlertOn");
-		else print $langs->trans("BirthdayAlertOff");
+		if ($object->birthday_alert) {
+			print $langs->trans("BirthdayAlertOn");
+		} else {
+			print $langs->trans("BirthdayAlertOff");
+		}
 		print '</td>';
 	} else {
 		print '<td>'.$langs->trans("DateOfBirth").'</td><td colspan="3"></td>';
@@ -300,15 +307,12 @@ if ($action == 'edit')
 }
 
 
-if ($action != 'edit')
-{
+if ($action != 'edit') {
 	// Barre d'actions
-	if ($user->socid == 0)
-	{
+	if ($user->socid == 0) {
 		print '<div class="tabsAction">';
 
-		if ($user->rights->societe->contact->creer)
-		{
+		if ($user->rights->societe->contact->creer) {
 			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a>';
 		}
 
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 05426db19a6..1fba506e910 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -39,8 +39,7 @@ $result = restrictedArea($user, 'contact', $id, 'socpeople&societe');
 
 
 $result = $contact->fetch($id);
-if ($result <= 0)
-{
+if ($result <= 0) {
 	dol_print_error($contact->error);
 	exit;
 }
@@ -48,8 +47,7 @@ if ($result <= 0)
 $physicalperson = 1;
 
 $company = new Societe($db);
-if ($contact->socid)
-{
+if ($contact->socid) {
 	$result = $company->fetch($contact->socid);
 }
 
@@ -76,33 +74,32 @@ $v->setNote($contact->note);
 $v->setTitle($contact->poste);
 
 // Data from linked company
-if ($company->id)
-{
+if ($company->id) {
 	$v->setURL($company->url, "TYPE=WORK");
-	if (!$contact->phone_pro) $v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
-	if (!$contact->fax)       $v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
-	if (!$contact->zip)       $v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+	if (!$contact->phone_pro) {
+		$v->setPhoneNumber($company->phone, "TYPE=WORK;VOICE");
+	}
+	if (!$contact->fax) {
+		$v->setPhoneNumber($company->fax, "TYPE=WORK;FAX");
+	}
+	if (!$contact->zip) {
+		$v->setAddress("", "", $company->address, $company->town, $company->state, $company->zip, $company->country, "TYPE=WORK;POSTAL");
+	}
 
 	// when company e-mail is empty, use only contact e-mail
-	if (empty(trim($company->email)))
-	{
+	if (empty(trim($company->email))) {
 		// was set before, don't set twice
-	}
-	// when contact e-mail is empty, use only company e-mail
-	elseif (empty(trim($contact->email)))
-	{
+	} elseif (empty(trim($contact->email))) {
+		// when contact e-mail is empty, use only company e-mail
 		$v->setEmail($company->email);
-	}
-	// when e-mail domain of contact and company are the same, use contact e-mail at first (and company e-mail at second)
-	elseif (strtolower(end(explode("@", $contact->email))) == strtolower(end(explode("@", $company->email))))
-	{
+	} elseif (strtolower(end(explode("@", $contact->email))) == strtolower(end(explode("@", $company->email)))) {
+		// when e-mail domain of contact and company are the same, use contact e-mail at first (and company e-mail at second)
 		$v->setEmail($contact->email);
 
 		// support by Microsoft Outlook (2019 and possible earlier)
 		$v->setEmail($company->email, 'INTERNET');
-	}
-	// when e-mail of contact and company complete different use company e-mail at first (and contact e-mail at second)
-	else {
+	} else {
+		// when e-mail of contact and company complete different use company e-mail at first (and contact e-mail at second)
 		$v->setEmail($company->email);
 
 		// support by Microsoft Outlook (2019 and possible earlier)
@@ -110,12 +107,16 @@ if ($company->id)
 	}
 
 	// Si contact lie a un tiers non de type "particulier"
-	if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->name);
+	if ($contact->typent_code != 'TE_PRIVATE') {
+		$v->setOrg($company->name);
+	}
 }
 
 // Personal informations
 $v->setPhoneNumber($contact->phone_perso, "TYPE=HOME;VOICE");
-if ($contact->birthday) $v->setBirthday($contact->birthday);
+if ($contact->birthday) {
+	$v->setBirthday($contact->birthday);
+}
 
 $db->close();
 
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 1c874fd2418..d7dcbf699c8 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -30,18 +30,17 @@
 // $backtopage may be defined
 // $triggermodname may be defined
 
-if (!empty($permissionedit) && empty($permissiontoadd)) $permissiontoadd = $permissionedit; // For backward compatibility
+if (!empty($permissionedit) && empty($permissiontoadd)) {
+	$permissiontoadd = $permissionedit; // For backward compatibility
+}
 
-if ($cancel)
-{
+if ($cancel) {
 	/*var_dump($cancel);
 	var_dump($backtopage);exit;*/
-	if (!empty($backtopageforcancel))
-	{
+	if (!empty($backtopageforcancel)) {
 		header("Location: ".$backtopageforcancel);
 		exit;
-	} elseif (!empty($backtopage))
-	{
+	} elseif (!empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	}
@@ -50,19 +49,25 @@ if ($cancel)
 
 
 // Action to add record
-if ($action == 'add' && !empty($permissiontoadd))
-{
-	foreach ($object->fields as $key => $val)
-	{
+if ($action == 'add' && !empty($permissiontoadd)) {
+	foreach ($object->fields as $key => $val) {
 		if ($object->fields[$key]['type'] == 'duration') {
-			if (GETPOST($key.'hour') == '' && GETPOST($key.'min') == '') continue; // The field was not submited to be edited
+			if (GETPOST($key.'hour') == '' && GETPOST($key.'min') == '') {
+				continue; // The field was not submited to be edited
+			}
 		} else {
-			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
+			if (!GETPOSTISSET($key)) {
+				continue; // The field was not submited to be edited
+			}
 		}
 		// Ignore special fields
-		if (in_array($key, array('rowid', 'entity', 'import_key'))) continue;
+		if (in_array($key, array('rowid', 'entity', 'import_key'))) {
+			continue;
+		}
 		if (in_array($key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) {
-			if (!in_array(abs($val['visible']), array(1, 3))) continue; // Only 1 and 3 that are case to create
+			if (!in_array(abs($val['visible']), array(1, 3))) {
+				continue; // Only 1 and 3 that are case to create
+			}
 		}
 
 		// Set value to insert
@@ -84,17 +89,19 @@ if ($action == 'add' && !empty($permissiontoadd))
 		} else {
 			$value = GETPOST($key, 'alphanohtml');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
-		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') {
+			$value = ''; // This is an implicit foreign key field
+		}
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') {
+			$value = ''; // This is an explicit foreign key field
+		}
 
 		//var_dump($key.' '.$value.' '.$object->fields[$key]['type']);
 		$object->$key = $value;
-		if ($val['notnull'] > 0 && $object->$key == '' && !is_null($val['default']) && $val['default'] == '(PROV)')
-		{
+		if ($val['notnull'] > 0 && $object->$key == '' && !is_null($val['default']) && $val['default'] == '(PROV)') {
 			$object->$key = '(PROV)';
 		}
-		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
-		{
+		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default'])) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
@@ -103,14 +110,14 @@ if ($action == 'add' && !empty($permissiontoadd))
 	// Fill array 'array_options' with data from add form
 	if (!$error) {
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $object->create($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Creation OK
 			$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
 			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
@@ -118,8 +125,11 @@ if ($action == 'add' && !empty($permissiontoadd))
 			exit;
 		} else {
 			// Creation KO
-			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else setEventMessages($object->error, null, 'errors');
+			if (!empty($object->errors)) {
+				setEventMessages(null, $object->errors, 'errors');
+			} else {
+				setEventMessages($object->error, null, 'errors');
+			}
 			$action = 'create';
 		}
 	} else {
@@ -128,25 +138,31 @@ if ($action == 'add' && !empty($permissiontoadd))
 }
 
 // Action to update record
-if ($action == 'update' && !empty($permissiontoadd))
-{
-	foreach ($object->fields as $key => $val)
-	{
+if ($action == 'update' && !empty($permissiontoadd)) {
+	foreach ($object->fields as $key => $val) {
 		// Check if field was submited to be edited
 		if ($object->fields[$key]['type'] == 'duration') {
-			if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) continue; // The field was not submited to be edited
+			if (!GETPOSTISSET($key.'hour') || !GETPOSTISSET($key.'min')) {
+				continue; // The field was not submited to be edited
+			}
 		} elseif ($object->fields[$key]['type'] == 'boolean') {
 			if (!GETPOSTISSET($key)) {
 				$object->$key = 0; // use 0 instead null if the field is defined as not null
 				continue;
 			}
 		} else {
-			if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
+			if (!GETPOSTISSET($key)) {
+				continue; // The field was not submited to be edited
+			}
 		}
 		// Ignore special fields
-		if (in_array($key, array('rowid', 'entity', 'import_key'))) continue;
+		if (in_array($key, array('rowid', 'entity', 'import_key'))) {
+			continue;
+		}
 		if (in_array($key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) {
-			if (!in_array(abs($val['visible']), array(1, 3, 4))) continue; // Only 1 and 3 and 4 that are case to update
+			if (!in_array(abs($val['visible']), array(1, 3, 4))) {
+				continue; // Only 1 and 3 and 4 that are case to update
+			}
 		}
 
 		// Set value to update
@@ -176,12 +192,15 @@ if ($action == 'update' && !empty($permissiontoadd))
 		} else {
 			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
-		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') {
+			$value = ''; // This is an implicit foreign key field
+		}
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') {
+			$value = ''; // This is an explicit foreign key field
+		}
 
 		$object->$key = $value;
-		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
-		{
+		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default'])) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
@@ -190,14 +209,14 @@ if ($action == 'update' && !empty($permissiontoadd))
 	// Fill array 'array_options' with data from add form
 	if (!$error) {
 		$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $object->update($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$action = 'view';
 		} else {
 			// Creation KO
@@ -210,8 +229,7 @@ if ($action == 'update' && !empty($permissiontoadd))
 }
 
 // Action to update one extrafield
-if ($action == "update_extras" && !empty($permissiontoadd))
-{
+if ($action == "update_extras" && !empty($permissiontoadd)) {
 	$object->fetch(GETPOST('id', 'int'));
 
 	$attributekey = GETPOST('attribute', 'alpha');
@@ -226,8 +244,7 @@ if ($action == "update_extras" && !empty($permissiontoadd))
 	}
 
 	$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		$action = 'view';
 	} else {
@@ -237,46 +254,42 @@ if ($action == "update_extras" && !empty($permissiontoadd))
 }
 
 // Action to delete
-if ($action == 'confirm_delete' && !empty($permissiontodelete))
-{
-	if (!($object->id > 0))
-	{
+if ($action == 'confirm_delete' && !empty($permissiontodelete)) {
+	if (!($object->id > 0)) {
 		dol_print_error('', 'Error, object must be fetched before being deleted');
 		exit;
 	}
 
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		// Delete OK
 		setEventMessages("RecordDeleted", null, 'mesgs');
 		header("Location: ".$backurlforlist);
 		exit;
 	} else {
-		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-		else setEventMessages($object->error, null, 'errors');
+		if (!empty($object->errors)) {
+			setEventMessages(null, $object->errors, 'errors');
+		} else {
+			setEventMessages($object->error, null, 'errors');
+		}
 	}
 }
 
 // Remove a line
-if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissiontoadd))
-{
+if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissiontoadd)) {
 	if (method_exists($object, 'deleteline')) {
 		$result = $object->deleteline($user, $lineid); // For backward compatibility
 	} else {
 		$result = $object->deleteLine($user, $lineid);
 	}
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		// Define output language
 		$outputlangs = $langs;
 		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
-		{
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 			$newlang = GETPOST('lang_id', 'aZ09');
 		}
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($object->thirdparty))
-		{
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($object->thirdparty)) {
 			$newlang = $object->thirdparty->default_lang;
 		}
 		if (!empty($newlang)) {
@@ -299,18 +312,20 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
 }
 
 // Action validate object
-if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
-{
+if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd) {
 	$result = $object->validate($user);
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		// Define output language
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			if (method_exists($object, 'generateDocument')) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -332,18 +347,20 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd)
 }
 
 // Action close object
-if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd)
-{
+if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd) {
 	$result = $object->cancel($user);
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		// Define output language
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			if (method_exists($object, 'generateDocument')) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -360,11 +377,9 @@ if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd)
 }
 
 // Action setdraft object
-if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd)
-{
+if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) {
 	$result = $object->setDraft($user);
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		// Nothing else done
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -372,18 +387,20 @@ if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd)
 }
 
 // Action reopen object
-if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
-{
+if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
 	$result = $object->reopen($user);
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		// Define output language
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			if (method_exists($object, 'generateDocument')) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -400,21 +417,21 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
 }
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
-{
-	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
-	{
+if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd)) {
+	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	} else {
 		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone or if createFromClone modifies the object. We use native clone to keep this->db valid.
 		//$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
 		// ...
 		$result = $objectutil->createFromClone($user, (($object->id > 0) ? $object->id : $id));
-		if (is_object($result) || $result > 0)
-		{
+		if (is_object($result) || $result > 0) {
 			$newid = 0;
-			if (is_object($result)) $newid = $result->id;
-			else $newid = $result;
+			if (is_object($result)) {
+				$newid = $result->id;
+			} else {
+				$newid = $result;
+			}
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 			exit;
 		} else {
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index 4ae83829fa4..63cac253976 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -29,27 +29,26 @@
 // $upload_dir must be defined (example $conf->projet->dir_output . "/";)
 // $hidedetails, $hidedesc, $hideref and $moreparams may have been set or not.
 
-if (!empty($permissioncreate) && empty($permissiontoadd)) $permissiontoadd = $permissioncreate; // For backward compatibility
+if (!empty($permissioncreate) && empty($permissiontoadd)) {
+	$permissiontoadd = $permissioncreate; // For backward compatibility
+}
 
 // Build doc
-if ($action == 'builddoc' && $permissiontoadd)
-{
-	if (is_numeric(GETPOST('model', 'alpha')))
-	{
+if ($action == 'builddoc' && $permissiontoadd) {
+	if (is_numeric(GETPOST('model', 'alpha'))) {
 		$error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
 	} else {
-   		// Reload to get all modified line records and be ready for hooks
+		// Reload to get all modified line records and be ready for hooks
 		$ret = $object->fetch($id);
 		$ret = $object->fetch_thirdparty();
 		/*if (empty($object->id) || ! $object->id > 0)
-        {
-            dol_print_error('Object must have been loaded by a fetch');
-            exit;
-        }*/
+		{
+			dol_print_error('Object must have been loaded by a fetch');
+			exit;
+		}*/
 
 		// Save last template used to generate document
-		if (GETPOST('model', 'alpha'))
-		{
+		if (GETPOST('model', 'alpha')) {
 			$object->setDocModel($user, GETPOST('model', 'alpha'));
 		}
 
@@ -67,29 +66,40 @@ if ($action == 'builddoc' && $permissiontoadd)
 		$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($object->thirdparty->default_lang)) $newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang = $object->default_lang; // for thirdparty
-		if (!empty($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($object->thirdparty->default_lang)) {
+			$newlang = $object->thirdparty->default_lang; // for proposal, order, invoice, ...
+		}
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) {
+			$newlang = $object->default_lang; // for thirdparty
+		}
+		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
 
 		// 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 = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		} else {
-			if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
-			{
+			if (empty($donotredirect)) {	// This is set when include is done by bulk action "Bill Orders"
 				setEventMessages($langs->trans("FileGenerated"), null);
 
 				$urltoredirect = $_SERVER['REQUEST_URI'];
@@ -104,13 +114,11 @@ if ($action == 'builddoc' && $permissiontoadd)
 }
 
 // Delete file in doc form
-if ($action == 'remove_file' && $permissiontoadd)
-{
+if ($action == 'remove_file' && $permissiontoadd) {
 	if (!empty($upload_dir)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		if (empty($object->id) || !$object->id > 0)
-		{
+		if (empty($object->id) || !$object->id > 0) {
 			// Reload to get all modified line records and be ready for hooks
 			$ret = $object->fetch($id);
 			$ret = $object->fetch_thirdparty();
@@ -120,8 +128,11 @@ if ($action == 'remove_file' && $permissiontoadd)
 		$filetodelete = GETPOST('file', 'alpha');
 		$file = $upload_dir.'/'.$filetodelete;
 		$ret = dol_delete_file($file, 0, 0, 0, $object);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+		if ($ret) {
+			setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+		}
 
 		// Make a redirect to avoid to keep the remove_file into the url that create side effects
 		$urltoredirect = $_SERVER['REQUEST_URI'];
diff --git a/htdocs/core/actions_changeselectedfields.inc.php b/htdocs/core/actions_changeselectedfields.inc.php
index 4daf53891cf..f0ead24e6b1 100644
--- a/htdocs/core/actions_changeselectedfields.inc.php
+++ b/htdocs/core/actions_changeselectedfields.inc.php
@@ -28,14 +28,16 @@
 // $object must be defined (object is loaded in this file with fetch)
 
 // Save selection
-if (GETPOST('formfilteraction', 'alphanohtml') == 'listafterchangingselectedfields')
-{
+if (GETPOST('formfilteraction', 'alphanohtml') == 'listafterchangingselectedfields') {
 	$tabparam = array();
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
-	if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
-	else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
+	if (GETPOST("selectedfields")) {
+		$tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
+	} else {
+		$tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
+	}
 
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
diff --git a/htdocs/core/actions_comments.inc.php b/htdocs/core/actions_comments.inc.php
index f590adee197..fc6bf11a115 100644
--- a/htdocs/core/actions_comments.inc.php
+++ b/htdocs/core/actions_comments.inc.php
@@ -33,19 +33,16 @@ $comment = new Comment($db);
  * Actions
  */
 
-if ($action == 'addcomment')
-{
+if ($action == 'addcomment') {
 	$description = GETPOST('comment_description', 'restricthtml');
-	if (!empty($description))
-	{
+	if (!empty($description)) {
 		$comment->description = $description;
 		$comment->datec = time();
 		$comment->fk_element = GETPOST('id', 'int');
 		$comment->element_type = GETPOST('comment_element_type', 'alpha');
 		$comment->fk_user_author = $user->id;
 		$comment->entity = $conf->entity;
-		if ($comment->create($user) > 0)
-		{
+		if ($comment->create($user) > 0) {
 			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
@@ -55,13 +52,10 @@ if ($action == 'addcomment')
 		}
 	}
 }
-if ($action === 'updatecomment')
-{
-	if ($comment->fetch($idcomment) >= 0)
-	{
+if ($action === 'updatecomment') {
+	if ($comment->fetch($idcomment) >= 0) {
 		$comment->description = GETPOST('comment_description', 'restricthtml');
-		if ($comment->update($user) > 0)
-		{
+		if ($comment->update($user) > 0) {
 			setEventMessages($langs->trans("CommentAdded"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1#comment' : ''));
 			exit;
@@ -71,12 +65,9 @@ if ($action === 'updatecomment')
 		}
 	}
 }
-if ($action == 'deletecomment')
-{
-	if ($comment->fetch($idcomment) >= 0)
-	{
-		if ($comment->delete($user) > 0)
-		{
+if ($action == 'deletecomment') {
+	if ($comment->fetch($idcomment) >= 0) {
+		if ($comment->delete($user) > 0) {
 			setEventMessages($langs->trans("CommentDeleted"), null, 'mesgs');
 			header('Location: '.$varpage.'?id='.$id.($withproject ? '&withproject=1' : ''));
 			exit;
diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index 2dd2588ca48..a7ac035506f 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -30,16 +30,16 @@ $dellinkid = GETPOST('dellinkid', 'int');
 $addlinkid = GETPOST('idtolinkto', 'int');
 
 // Link invoice to order
-if ($action == 'addlink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $id > 0 && $addlinkid > 0)
-{
+if ($action == 'addlink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $id > 0 && $addlinkid > 0) {
 	$object->fetch($id);
 	$object->fetch_thirdparty();
 	$result = $object->add_object_linked(GETPOST('addlink', 'alpha'), $addlinkid);
 }
 
 // Delete link
-if ($action == 'dellink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $dellinkid > 0)
-{
+if ($action == 'dellink' && !empty($permissiondellink) && !GETPOST('cancel', 'alpha') && $dellinkid > 0) {
 	$result = $object->deleteObjectLinked(0, '', 0, '', $dellinkid);
-	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 7ba4d7d64b9..b03c2c3d192 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -31,91 +31,85 @@ $extrasize = GETPOST('size', 'intcomma');
 $type = GETPOST('type', 'alpha');
 $param = GETPOST('param', 'alpha');
 
-if ($type == 'double' && strpos($extrasize, ',') === false) $extrasize = '24,8';
-if ($type == 'date')     $extrasize = '';
-if ($type == 'datetime') $extrasize = '';
-if ($type == 'select')   $extrasize = '';
+if ($type == 'double' && strpos($extrasize, ',') === false) {
+	$extrasize = '24,8';
+}
+if ($type == 'date') {
+	$extrasize = '';
+}
+if ($type == 'datetime') {
+	$extrasize = '';
+}
+if ($type == 'select') {
+	$extrasize = '';
+}
 
 
 // Add attribute
-if ($action == 'add')
-{
-	if (GETPOST("button") != $langs->trans("Cancel"))
-	{
+if ($action == 'add') {
+	if (GETPOST("button") != $langs->trans("Cancel")) {
 		// Check values
-		if (!$type)
-		{
+		if (!$type) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			$action = 'create';
 		}
-		if ($type == 'varchar' && $extrasize <= 0)
-		{
+		if ($type == 'varchar' && $extrasize <= 0) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
 			$action = 'edit';
 		}
-		if ($type == 'varchar' && $extrasize > $maxsizestring)
-		{
+		if ($type == 'varchar' && $extrasize > $maxsizestring) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
 			$action = 'create';
 		}
-		if ($type == 'int' && $extrasize > $maxsizeint)
-		{
+		if ($type == 'int' && $extrasize > $maxsizeint) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
 			$action = 'create';
 		}
-		if ($type == 'select' && !$param)
-		{
+		if ($type == 'select' && !$param) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorNoValueForSelectType");
 			$action = 'create';
 		}
-		if ($type == 'sellist' && !$param)
-		{
+		if ($type == 'sellist' && !$param) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
 			$action = 'create';
 		}
-		if ($type == 'checkbox' && !$param)
-		{
+		if ($type == 'checkbox' && !$param) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
 			$action = 'create';
 		}
-		if ($type == 'link' && !$param)
-		{
+		if ($type == 'link' && !$param) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorNoValueForLinkType");
 			$action = 'create';
 		}
-		if ($type == 'radio' && !$param)
-		{
+		if ($type == 'radio' && !$param) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorNoValueForRadioType");
 			$action = 'create';
 		}
-		if ((($type == 'radio') || ($type == 'checkbox')) && $param)
-		{
+		if ((($type == 'radio') || ($type == 'checkbox')) && $param) {
 			// Construct array for parameter (value of select list)
 			$parameters = $param;
 			$parameters_array = explode("\r\n", $parameters);
-			foreach ($parameters_array as $param_ligne)
-			{
+			foreach ($parameters_array as $param_ligne) {
 				if (!empty($param_ligne)) {
-					if (preg_match_all('/,/', $param_ligne, $matches))
-					{
+					if (preg_match_all('/,/', $param_ligne, $matches)) {
 						if (count($matches[0]) > 1) {
 							$error++;
 							$langs->load("errors");
@@ -160,14 +154,12 @@ if ($action == 'add')
 				$parameters_array = explode("\r\n", $parameters);
 				//In sellist we have only one line and it can have come to do SQL expression
 				if ($type == 'sellist' || $type == 'chkbxlst') {
-					foreach ($parameters_array as $param_ligne)
-					{
+					foreach ($parameters_array as $param_ligne) {
 						$params['options'] = array($parameters=>null);
 					}
 				} else {
 					// Else it's separated key/value and coma list
-					foreach ($parameters_array as $param_ligne)
-					{
+					foreach ($parameters_array as $param_ligne) {
 						list($key, $value) = explode(',', $param_ligne);
 						$params['options'][$key] = $value;
 					}
@@ -175,7 +167,9 @@ if ($action == 'add')
 
 				// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
 				$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility = 3;
+				if ($type == 'separate') {
+					$visibility = 3;
+				}
 
 				$result = $extrafields->addExtraField(
 					GETPOST('attrname', 'aZ09'),
@@ -199,8 +193,7 @@ if ($action == 'add')
 					(GETPOST('totalizable', 'alpha') ? 1 : 0),
 					GETPOST('printable', 'alpha')
 				);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
 					header("Location: ".$_SERVER["PHP_SELF"]);
 					exit;
@@ -223,77 +216,64 @@ if ($action == 'add')
 }
 
 // Rename field
-if ($action == 'update')
-{
-	if (GETPOST("button") != $langs->trans("Cancel"))
-	{
+if ($action == 'update') {
+	if (GETPOST("button") != $langs->trans("Cancel")) {
 		// Check values
-		if (!$type)
-		{
+		if (!$type) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			$action = 'edit';
 		}
-		if ($type == 'varchar' && $extrasize <= 0)
-		{
+		if ($type == 'varchar' && $extrasize <= 0) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"));
 			$action = 'edit';
 		}
-		if ($type == 'varchar' && $extrasize > $maxsizestring)
-		{
+		if ($type == 'varchar' && $extrasize > $maxsizestring) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorSizeTooLongForVarcharType", $maxsizestring);
 			$action = 'edit';
 		}
-		if ($type == 'int' && $extrasize > $maxsizeint)
-		{
+		if ($type == 'int' && $extrasize > $maxsizeint) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorSizeTooLongForIntType", $maxsizeint);
 			$action = 'edit';
 		}
-		if ($type == 'select' && !$param)
-		{
+		if ($type == 'select' && !$param) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorNoValueForSelectType");
 			$action = 'edit';
 		}
-		if ($type == 'sellist' && !$param)
-		{
+		if ($type == 'sellist' && !$param) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorNoValueForSelectListType");
 			$action = 'edit';
 		}
-		if ($type == 'checkbox' && !$param)
-		{
+		if ($type == 'checkbox' && !$param) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorNoValueForCheckBoxType");
 			$action = 'edit';
 		}
-		if ($type == 'radio' && !$param)
-		{
+		if ($type == 'radio' && !$param) {
 			$error++;
 			$langs->load("errors");
 			$mesg[] = $langs->trans("ErrorNoValueForRadioType");
 			$action = 'edit';
 		}
-		if ((($type == 'radio') || ($type == 'checkbox')) && $param)
-		{
+		if ((($type == 'radio') || ($type == 'checkbox')) && $param) {
 			// Construct array for parameter (value of select list)
 			$parameters = $param;
 			$parameters_array = explode("\r\n", $parameters);
-			foreach ($parameters_array as $param_ligne)
-			{
+			foreach ($parameters_array as $param_ligne) {
 				if (!empty($param_ligne)) {
-					if (preg_match_all('/,/', $param_ligne, $matches))
-					{
+					if (preg_match_all('/,/', $param_ligne, $matches)) {
 						if (count($matches[0]) > 1) {
 							$error++;
 							$langs->load("errors");
@@ -329,24 +309,20 @@ if ($action == 'update')
 			}
 		}
 
-		if (!$error)
-		{
-			if (GETPOSTISSET("attrname") && preg_match("/^\w[a-zA-Z0-9-_]*$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09')))
-			{
+		if (!$error) {
+			if (GETPOSTISSET("attrname") && preg_match("/^\w[a-zA-Z0-9-_]*$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09'))) {
 				$pos = GETPOST('pos', 'int');
 				// Construct array for parameter (value of select list)
 				$parameters = $param;
 				$parameters_array = explode("\r\n", $parameters);
 				//In sellist we have only one line and it can have come to do SQL expression
 				if ($type == 'sellist' || $type == 'chkbxlst') {
-					foreach ($parameters_array as $param_ligne)
-					{
+					foreach ($parameters_array as $param_ligne) {
 						$params['options'] = array($parameters=>null);
 					}
 				} else {
 					//Esle it's separated key/value and coma list
-					foreach ($parameters_array as $param_ligne)
-					{
+					foreach ($parameters_array as $param_ligne) {
 						list($key, $value) = explode(',', $param_ligne);
 						$params['options'][$key] = $value;
 					}
@@ -354,7 +330,9 @@ if ($action == 'update')
 
 				// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
 				$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility = 3;
+				if ($type == 'separate') {
+					$visibility = 3;
+				}
 
 				// Example: is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : 'objnotdefined'
 				$computedvalue = GETPOST('computed_value', 'nohtml');
@@ -409,7 +387,9 @@ if ($action == 'delete') {
 		if ($result >= 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]);
 			exit;
-		} else $mesg = $extrafields->error;
+		} else {
+			$mesg = $extrafields->error;
+		}
 	} else {
 		$error++;
 		$langs->load("errors");
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index c881b335f18..3ca797a9bb3 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -28,20 +28,15 @@
 // $cancel must be defined
 // $id or $ref must be defined (object is loaded in this file with fetch)
 
-if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0))
-{
-	if (($id > 0 && is_numeric($id)) || !empty($ref))	// To discard case when id is list of ids like '1,2,3...'
-	{
+if (($id > 0 || (!empty($ref) && !in_array($action, array('create', 'createtask', 'add')))) && (empty($cancel) || $id > 0)) {
+	if (($id > 0 && is_numeric($id)) || !empty($ref)) {	// To discard case when id is list of ids like '1,2,3...'
 		$ret = $object->fetch($id, $ref);
-		if ($ret > 0)
-		{
+		if ($ret > 0) {
 			$object->fetch_thirdparty();
 			$id = $object->id;
 		} else {
-			if (empty($object->error) && !count($object->errors))
-			{
-				if ($ret < 0)	// if $ret == 0, it means not found.
-				{
+			if (empty($object->error) && !count($object->errors)) {
+				if ($ret < 0) {	// if $ret == 0, it means not found.
 					setEventMessages('Fetch on object (type '.get_class($object).') return an error without filling $object->error nor $object->errors', null, 'errors');
 				}
 			} else {
diff --git a/htdocs/core/actions_lineupdown.inc.php b/htdocs/core/actions_lineupdown.inc.php
index e5507eeafc0..5aee952292b 100644
--- a/htdocs/core/actions_lineupdown.inc.php
+++ b/htdocs/core/actions_lineupdown.inc.php
@@ -28,15 +28,18 @@
 // $langs must be defined
 // $hidedetails, $hidedesc, $hideref must de defined
 
-if ($action == 'up' && $permissiontoedit)
-{
+if ($action == 'up' && $permissiontoedit) {
 	$object->line_up(GETPOST('rowid'));
 
 	// Define output language
 	$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 = $object->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 = $object->thirdparty->default_lang;
+	}
 	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
@@ -50,15 +53,18 @@ if ($action == 'up' && $permissiontoedit)
 	exit();
 }
 
-if ($action == 'down' && $permissiontoedit)
-{
+if ($action == 'down' && $permissiontoedit) {
 	$object->line_down(GETPOST('rowid'));
 
 	// Define output language
 	$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 = $object->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 = $object->thirdparty->default_lang;
+	}
 	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index b0671bbf555..af60583118d 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -27,17 +27,16 @@
 
 
 // Submit file/link
-if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
-{
-	if (!empty($_FILES))
-	{
-		if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
-		else $userfiles = array($_FILES['userfile']['tmp_name']);
+if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
+	if (!empty($_FILES)) {
+		if (is_array($_FILES['userfile']['tmp_name'])) {
+			$userfiles = $_FILES['userfile']['tmp_name'];
+		} else {
+			$userfiles = array($_FILES['userfile']['tmp_name']);
+		}
 
-		foreach ($userfiles as $key => $userfile)
-		{
-			if (empty($_FILES['userfile']['tmp_name'][$key]))
-			{
+		foreach ($userfiles as $key => $userfile) {
+			if (empty($_FILES['userfile']['tmp_name'][$key])) {
 				$error++;
 				if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 					setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
@@ -47,27 +46,24 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Define if we have to generate thumbs or not
 			$generatethumbs = 1;
-			if (GETPOST('section_dir', 'alpha')) $generatethumbs = 0;
+			if (GETPOST('section_dir', 'alpha')) {
+				$generatethumbs = 0;
+			}
 			$allowoverwrite = (GETPOST('overwritefile', 'int') ? 1 : 0);
 
-			if (!empty($upload_dirold) && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-			{
+			if (!empty($upload_dirold) && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 				$result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs, $object);
-			} elseif (!empty($upload_dir))
-			{
+			} elseif (!empty($upload_dir)) {
 				$result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs, $object);
 			}
 		}
 	}
-} elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
-{
+} elseif (GETPOST('linkit', 'restricthtml') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 	$link = GETPOST('link', 'alpha');
-	if ($link)
-	{
+	if ($link) {
 		if (substr($link, 0, 7) != 'http://' && substr($link, 0, 8) != 'https://' && substr($link, 0, 7) != 'file://') {
 			$link = 'http://'.$link;
 		}
@@ -77,17 +73,18 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 
 
 // Delete file/link
-if ($action == 'confirm_deletefile' && $confirm == 'yes')
-{
+if ($action == 'confirm_deletefile' && $confirm == 'yes') {
 	$urlfile = GETPOST('urlfile', 'alpha', 0, null, null, 1); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 	if (GETPOST('section', 'alpha')) {
 		// For a delete from the ECM module, upload_dir is ECM root dir and urlfile contains relative path from upload_dir
 		$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
 	} else // For a delete from the file manager into another module, or from documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
 	{
-	   	$urlfile = basename($urlfile);
-	   	$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
-		if (!empty($upload_dirold)) $fileold = $upload_dirold."/".$urlfile;
+		$urlfile = basename($urlfile);
+		$file = $upload_dir.(preg_match('/\/$/', $upload_dir) ? '' : '/').$urlfile;
+		if (!empty($upload_dirold)) {
+			$fileold = $upload_dirold."/".$urlfile;
+		}
 	}
 	$linkid = GETPOST('linkid', 'int');
 
@@ -97,21 +94,20 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 		$dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette (if file is an image)
 
 		$ret = dol_delete_file($file, 0, 0, 0, (is_object($object) ? $object : null));
-		if (!empty($fileold)) dol_delete_file($fileold, 0, 0, 0, (is_object($object) ? $object : null)); // Delete file using old path
+		if (!empty($fileold)) {
+			dol_delete_file($fileold, 0, 0, 0, (is_object($object) ? $object : null)); // Delete file using old path
+		}
 
 		// If it exists, remove thumb.
 		$regs = array();
-		if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i', $file, $regs))
-		{
+		if (preg_match('/(\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff)$/i', $file, $regs)) {
 			$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_small'.$regs[0]);
-			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
-			{
+			if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
 				dol_delete_file($dirthumb.$photo_vignette);
 			}
 
 			$photo_vignette = basename(preg_replace('/'.$regs[0].'/i', '', $file).'_mini'.$regs[0]);
-			if (file_exists(dol_osencode($dirthumb.$photo_vignette)))
-			{
+			if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {
 				dol_delete_file($dirthumb.$photo_vignette);
 			}
 		}
@@ -149,33 +145,27 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 			exit;
 		}
 	}
-} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha'))
-{
+} elseif ($action == 'confirm_updateline' && GETPOST('save', 'alpha') && GETPOST('link', 'alpha')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$langs->load('link');
 	$link = new Link($db);
 	$f = $link->fetch(GETPOST('linkid', 'int'));
-	if ($f)
-	{
+	if ($f) {
 		$link->url = GETPOST('link', 'alpha');
-		if (substr($link->url, 0, 7) != 'http://' && substr($link->url, 0, 8) != 'https://' && substr($link->url, 0, 7) != 'file://')
-		{
+		if (substr($link->url, 0, 7) != 'http://' && substr($link->url, 0, 8) != 'https://' && substr($link->url, 0, 7) != 'file://') {
 			$link->url = 'http://'.$link->url;
 		}
 		$link->label = GETPOST('label', 'alphanohtml');
 		$res = $link->update($user);
-		if (!$res)
-		{
+		if (!$res) {
 			setEventMessages($langs->trans("ErrorFailedToUpdateLink", $link->label), null, 'mesgs');
 		}
 	} else {
 		//error fetching
 	}
-} elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha'))
-{
+} elseif ($action == 'renamefile' && GETPOST('renamefilesave', 'alpha')) {
 	// For documents pages, upload_dir contains already path to file from module dir, so we clean path into urlfile.
-	if (!empty($upload_dir))
-	{
+	if (!empty($upload_dir)) {
 		$filenamefrom = dol_sanitizeFileName(GETPOST('renamefilefrom', 'alpha'), '_', 0); // Do not remove accents
 		$filenameto = dol_sanitizeFileName(GETPOST('renamefileto', 'alpha'), '_', 0); // Do not remove accents
 
@@ -183,24 +173,23 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 		// this function is also applied when we upload and when we make try to download file (by the GETPOST(filename, 'alphanohtml') call).
 		$filenameto = dol_string_nohtmltag($filenameto);
 
-		if ($filenamefrom != $filenameto)
-		{
+		if ($filenamefrom != $filenameto) {
 			// Security:
 			// Disallow file with some extensions. We rename them.
 			// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-			if (isAFileWithExecutableContent($filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
-			{
+			if (isAFileWithExecutableContent($filenameto) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED)) {
 				// $upload_dir ends with a slash, so be must be sure the medias dir to compare to ends with slash too.
 				$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
-				if (!preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash .= '/';
+				if (!preg_match('/\/$/', $publicmediasdirwithslash)) {
+					$publicmediasdirwithslash .= '/';
+				}
 
 				if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory
 					$filenameto .= '.noexe';
 				}
 			}
 
-			if ($filenamefrom && $filenameto)
-			{
+			if ($filenamefrom && $filenameto) {
 				$srcpath = $upload_dir.'/'.$filenamefrom;
 				$destpath = $upload_dir.'/'.$filenameto;
 
@@ -208,26 +197,24 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 				$parameters = array('filenamefrom' => $filenamefrom, 'filenameto' => $filenameto, 'upload_dir' => $upload_dir);
 				$reshook = $hookmanager->executeHooks('renameUploadedFile', $parameters, $object);
 
-				if (empty($reshook))
-				{
+				if (empty($reshook)) {
 					if (preg_match('/^\./', $filenameto)) {
 						$langs->load("errors"); // lang must be loaded because we can't rely on loading during output, we need var substitution to be done now.
 						setEventMessages($langs->trans("ErrorFilenameCantStartWithDot", $filenameto), null, 'errors');
 					} elseif (!file_exists($destpath)) {
 						$result = dol_move($srcpath, $destpath);
-						if ($result)
-						{
+						if ($result) {
 							// Define if we have to generate thumbs or not
 							$generatethumbs = 1;
 							// When we rename a file from the file manager in ecm, we must not regenerate thumbs (not a problem, we do pass here)
 							// When we rename a file from the website module, we must not regenerate thumbs (module = medias in such a case)
 							// but when we rename from a tab "Documents", we must regenerate thumbs
-							if (GETPOST('modulepart') == 'medias') $generatethumbs = 0;
+							if (GETPOST('modulepart') == 'medias') {
+								$generatethumbs = 0;
+							}
 
-							if ($generatethumbs)
-							{
-								if ($object->id)
-								{
+							if ($generatethumbs) {
+								if ($object->id) {
 									$object->addThumbs($destpath);
 								}
 
@@ -250,19 +237,15 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 	}
 
 	// Update properties in ECM table
-	if (GETPOST('ecmfileid', 'int') > 0)
-	{
+	if (GETPOST('ecmfileid', 'int') > 0) {
 		$shareenabled = GETPOST('shareenabled', 'alpha');
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 		$ecmfile = new EcmFiles($db);
 		$result = $ecmfile->fetch(GETPOST('ecmfileid', 'int'));
-		if ($result > 0)
-		{
-			if ($shareenabled)
-			{
-				if (empty($ecmfile->share))
-				{
+		if ($result > 0) {
+			if ($shareenabled) {
+				if (empty($ecmfile->share)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 					$ecmfile->share = getRandomPassword(true);
 				}
@@ -270,8 +253,7 @@ if ($action == 'confirm_deletefile' && $confirm == 'yes')
 				$ecmfile->share = '';
 			}
 			$result = $ecmfile->update($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 			}
 		}
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 892cb8ae4e0..057443d09b4 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -37,37 +37,38 @@
 
 
 // Protection
-if (empty($objectclass) || empty($uploaddir))
-{
+if (empty($objectclass) || empty($uploaddir)) {
 	dol_print_error(null, 'include of actions_massactions.inc.php is done but var $objectclass or $uploaddir was not defined');
 	exit;
 }
 
 // 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.
 $maxformassaction = (empty($conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS) ? 1000 : $conf->global->MAIN_LIMIT_FOR_MASS_ACTIONS);
-if (!empty($massaction) && is_array($toselect) && count($toselect) < 1)
-{
+if (!empty($massaction) && is_array($toselect) && count($toselect) < 1) {
 	$error++;
 	setEventMessages($langs->trans("NoRecordSelected"), null, "warnings");
 }
-if (!$error && is_array($toselect) && count($toselect) > $maxformassaction)
-{
+if (!$error && is_array($toselect) && count($toselect) > $maxformassaction) {
 	setEventMessages($langs->trans('TooManyRecordForMassAction', $maxformassaction), null, 'errors');
 	$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')
-{
+if (!$error && $massaction == 'confirm_presend') {
 	$resaction = '';
 	$nbsent = 0;
 	$nbignored = 0;
@@ -82,27 +83,36 @@ if (!$error && $massaction == 'confirm_presend')
 	$attachedfilesThirdpartyObj = array();
 	$oneemailperrecipient = (GETPOST('oneemailperrecipient') == 'on' ? 1 : 0);
 
-	if (!$error)
-	{
+	if (!$error) {
 		$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)
-		{
+		foreach ($toselect as $toselectid) {
 			$objecttmp = new $objectclass($db); // we must create new instance because instance is saved into $listofobjectref array for future use
 			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$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();
@@ -121,41 +131,37 @@ if (!$error && $massaction == 'confirm_presend')
 	}
 
 	// Check mandatory parameters
-	if (GETPOST('fromtype', 'alpha') === 'user' && empty($user->email))
-	{
+	if (GETPOST('fromtype', 'alpha') === 'user' && empty($user->email)) {
 		$error++;
 		setEventMessages($langs->trans("NoSenderEmailDefined"), null, 'warnings');
 		$massaction = 'presend';
 	}
 
 	$receiver = $_POST['receiver'];
-	if (!is_array($receiver))
-	{
-		if (empty($receiver) || $receiver == '-1') $receiver = array();
-		else $receiver = array($receiver);
+	if (!is_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
-	{
-	 	$error++;
-	   	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Recipient")), null, 'warnings');
-	   	$massaction = 'presend';
+	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';
 	}
 
-	if (!GETPOST('subject', 'restricthtml'))
-	{
+	if (!GETPOST('subject', 'restricthtml')) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MailTopic")), null, 'warnings');
 		$massaction = 'presend';
 	}
 
 	// Loop on each recipient/thirdparty
-	if (!$error)
-	{
-		foreach ($listofobjectthirdparties as $thirdpartyid)
-		{
+	if (!$error) {
+		foreach ($listofobjectthirdparties as $thirdpartyid) {
 			$result = $thirdparty->fetch($thirdpartyid);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				dol_print_error($db);
 				exit;
 			}
@@ -167,21 +173,16 @@ if (!$error && $massaction == 'confirm_presend')
 
 			// Define $sendto
 			$tmparray = array();
-			if (trim($_POST['sendto']))
-			{
+			if (trim($_POST['sendto'])) {
 				// Recipients are provided into free text
 				$tmparray[] = trim($_POST['sendto']);
 			}
-			if (count($receiver) > 0)
-			{
-				foreach ($receiver as $key=>$val)
-				{
+			if (count($receiver) > 0) {
+				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;
 					}
@@ -191,26 +192,23 @@ if (!$error && $massaction == 'confirm_presend')
 
 			// Define $sendtocc
 			$receivercc = $_POST['receivercc'];
-			if (!is_array($receivercc))
-			{
-				if ($receivercc == '-1') $receivercc = array();
-				else $receivercc = array($receivercc);
+			if (!is_array($receivercc)) {
+				if ($receivercc == '-1') {
+					$receivercc = array();
+				} else {
+					$receivercc = array($receivercc);
+				}
 			}
 			$tmparray = array();
-			if (trim($_POST['sendtocc']))
-			{
+			if (trim($_POST['sendtocc'])) {
 				$tmparray[] = trim($_POST['sendtocc']);
 			}
-			if (count($receivercc) > 0)
-			{
-				foreach ($receivercc as $key=>$val)
-				{
+			if (count($receivercc) > 0) {
+				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 ?
 					}
@@ -223,25 +221,21 @@ if (!$error && $massaction == 'confirm_presend')
 			$listofqualifiedref = array();
 			$thirdpartywithoutemail = array();
 
-			foreach ($listofobjectref[$thirdpartyid] as $objectid => $objectobj)
-			{
+			foreach ($listofobjectref[$thirdpartyid] as $objectid => $objectobj) {
 				//var_dump($thirdpartyid.' - '.$objectid.' - '.$objectobj->statut);
-				if ($objectclass == 'Propal' && $objectobj->statut == Propal::STATUS_DRAFT)
-				{
+				if ($objectclass == 'Propal' && $objectobj->statut == Propal::STATUS_DRAFT) {
 					$langs->load("errors");
 					$nbignored++;
 					$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyProposalNotDraftCanBeSentInMassAction', $objectobj->ref).'</div><br>';
 					continue; // Payment done or started or canceled
 				}
-				if ($objectclass == 'Commande' && $objectobj->statut == Commande::STATUS_DRAFT)
-				{
+				if ($objectclass == 'Commande' && $objectobj->statut == Commande::STATUS_DRAFT) {
 					$langs->load("errors");
 					$nbignored++;
 					$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyOrderNotDraftCanBeSentInMassAction', $objectobj->ref).'</div><br>';
 					continue;
 				}
-				if ($objectclass == 'Facture' && $objectobj->statut == Facture::STATUS_DRAFT)
-				{
+				if ($objectclass == 'Facture' && $objectobj->statut == Facture::STATUS_DRAFT) {
 					$langs->load("errors");
 					$nbignored++;
 					$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyInvoiceValidatedCanBeSentInMassAction', $objectobj->ref).'</div><br>';
@@ -249,23 +243,18 @@ if (!$error && $massaction == 'confirm_presend')
 				}
 
 				// Test recipient
-				if (empty($sendto)) 	// For the case, no recipient were set (multi thirdparties send)
-				{
-					if ($objectobj->element == 'societe')
-					{
+				if (empty($sendto)) { 	// For the case, no recipient were set (multi thirdparties send)
+					if ($objectobj->element == 'societe') {
 						$sendto = $objectobj->email;
-					} elseif ($objectobj->element == 'expensereport')
-					{
+					} elseif ($objectobj->element == 'expensereport') {
 						$fuser = new User($db);
 						$fuser->fetch($objectobj->fk_user_author);
 						$sendto = $fuser->email;
-					} elseif ($objectobj->element == 'holiday')
-					{
+					} elseif ($objectobj->element == 'holiday') {
 						$fuser = new User($db);
 						$fuser->fetch($objectobj->fk_user);
 						$sendto = $fuser->email;
-					} elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid]))
-					{
+					} elseif ($objectobj->element == 'facture' && !empty($listofobjectcontacts[$objectid])) {
 						$emails_to_sends = array();
 						$objectobj->fetch_thirdparty();
 						$contactidtosend = array();
@@ -284,25 +273,22 @@ if (!$error && $massaction == 'confirm_presend')
 					}
 				}
 
-				if (empty($sendto))
-				{
+				if (empty($sendto)) {
 					if ($objectobj->element == 'societe') {
 						$objectobj->thirdparty = $objectobj; // Hack so following code is comaptible when objectobj is a thirdparty
 					}
 
-				   	//print "No recipient for thirdparty ".$objectobj->thirdparty->name;
-				   	$nbignored++;
-				   	if (empty($thirdpartywithoutemail[$objectobj->thirdparty->id]))
-					{
+					//print "No recipient for thirdparty ".$objectobj->thirdparty->name;
+					$nbignored++;
+					if (empty($thirdpartywithoutemail[$objectobj->thirdparty->id])) {
 						$resaction .= '<div class="error">'.$langs->trans('NoRecipientEmail', $objectobj->thirdparty->name).'</div><br>';
 					}
 					dol_syslog('No recipient for thirdparty: '.$objectobj->thirdparty->name, LOG_WARNING);
 					$thirdpartywithoutemail[$objectobj->thirdparty->id] = 1;
-				   	continue;
+					continue;
 				}
 
-				if ($_POST['addmaindocfile'])
-				{
+				if ($_POST['addmaindocfile']) {
 					// TODO Use future field $objectobj->fullpathdoc to know where is stored default file
 					// TODO If not defined, use $objectobj->model_pdf (or defaut invoice config) to know what is template to use to regenerate doc.
 					$filename = dol_sanitizeFileName($objectobj->ref).'.pdf';
@@ -313,16 +299,14 @@ if (!$error && $massaction == 'confirm_presend')
 					$file = $filedir.'/'.$filename;
 
 					// For supplier invoices, we use the file provided by supplier, not the one we generate
-					if ($objectobj->element == 'invoice_supplier')
-					{
+					if ($objectobj->element == 'invoice_supplier') {
 						$fileparams = dol_most_recent_file($uploaddir.'/'.get_exdir($objectobj->id, 2, 0, 0, $objectobj, $objectobj->element).$objectobj->ref, preg_quote($objectobj->ref, '/').'([^\-])+');
 						$file = $fileparams['fullname'];
 					}
 
 					$mime = dol_mimetype($file);
 
-	   				if (dol_is_file($file))
-					{
+					if (dol_is_file($file)) {
 						// Create form object
 						$attachedfilesThirdpartyObj[$thirdpartyid][$objectid] = array(
 							'paths'=>array($file),
@@ -347,8 +331,7 @@ if (!$error && $massaction == 'confirm_presend')
 			}
 
 			// Send email if there is at least one qualified object for current thirdparty
-			if (count($listofqualifiedobj) > 0)
-			{
+			if (count($listofqualifiedobj) > 0) {
 				$langs->load("commercial");
 
 				$reg = array();
@@ -367,8 +350,7 @@ if (!$error && $massaction == 'confirm_presend')
 					$sql = 'SELECT rowid, label, email FROM '.MAIN_DB_PREFIX.'c_email_senderprofile WHERE rowid = '.(int) $reg[1];
 					$resql = $db->query($sql);
 					$obj = $db->fetch_object($resql);
-					if ($obj)
-					{
+					if ($obj) {
 						$from = $obj->label.' <'.$obj->email.'>';
 					}
 				} else {
@@ -380,22 +362,34 @@ if (!$error && $massaction == 'confirm_presend')
 				$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)
 				$looparray = array();
-				if (!$oneemailperrecipient)
-				{
+				if (!$oneemailperrecipient) {
 					$looparray = $listofqualifiedobj;
-					foreach ($looparray as $key => $objecttmp)
-					{
+					foreach ($looparray as $key => $objecttmp) {
 						$looparray[$key]->thirdparty = $thirdparty; // Force thirdparty on object
 					}
 				} else {
@@ -406,11 +400,9 @@ if (!$error && $massaction == 'confirm_presend')
 				//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))
-					{
+					if (!empty($conf->projet->enabled) && method_exists($objecttmp, 'fetch_projet') && is_null($objecttmp->project)) {
 						$objecttmp->fetch_projet();
 					}
 					$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $objecttmp);
@@ -434,12 +426,10 @@ if (!$error && $massaction == 'confirm_presend')
 					$messagereplaced = make_substitutions($message, $substitutionarray);
 
 					$attachedfiles = array('paths'=>array(), 'names'=>array(), 'mimes'=>array());
-					if ($oneemailperrecipient)
-					{
+					if ($oneemailperrecipient) {
 						// if "one email per recipient" is check we must collate $attachedfiles by thirdparty
-						if (is_array($attachedfilesThirdpartyObj[$thirdparty->id]) && count($attachedfilesThirdpartyObj[$thirdparty->id]))
-						{
-							foreach ($attachedfilesThirdpartyObj[$thirdparty->id] as $keyObjId =>  $objAttachedFiles) {
+						if (is_array($attachedfilesThirdpartyObj[$thirdparty->id]) && count($attachedfilesThirdpartyObj[$thirdparty->id])) {
+							foreach ($attachedfilesThirdpartyObj[$thirdparty->id] as $keyObjId => $objAttachedFiles) {
 								// Create form object
 								$attachedfiles = array(
 									'paths'=>array_merge($attachedfiles['paths'], $objAttachedFiles['paths']),
@@ -459,20 +449,37 @@ if (!$error && $massaction == 'confirm_presend')
 					$mimetype = $attachedfiles['mimes'];
 
 					// Define the trackid when emails sent from the mass action
-					if ($oneemailperrecipient)
-					{
+					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,40 +487,42 @@ if (!$error && $massaction == 'confirm_presend')
 					//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';
 					$mailfile = new CMailFile($subjectreplaced, $sendto, $from, $messagereplaced, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
-					if ($mailfile->error)
-					{
+					if ($mailfile->error) {
 						$resaction .= '<div class="error">'.$mailfile->error.'</div>';
 					} else {
 						$result = $mailfile->sendfile();
-						if ($result)
-						{
+						if ($result) {
 							$resaction .= $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($sendto, 2)).'<br>'; // Must not contain "
 
 							$error = 0;
 
 							// 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
+							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
+								}
 
 								dol_syslog("Try to insert email event into agenda for objid=".$objid2." => objectobj=".get_class($objectobj2));
 
 								/*if ($objectclass == 'Propale') $actiontypecode='AC_PROP';
-	                            if ($objectclass == 'Commande') $actiontypecode='AC_COM';
-	                            if ($objectclass == 'Facture') $actiontypecode='AC_FAC';
-	                            if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
-	                            if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
-	                            if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
+								if ($objectclass == 'Commande') $actiontypecode='AC_COM';
+								if ($objectclass == 'Facture') $actiontypecode='AC_FAC';
+								if ($objectclass == 'Supplier_Proposal') $actiontypecode='AC_SUP_PRO';
+								if ($objectclass == 'CommandeFournisseur') $actiontypecode='AC_SUP_ORD';
+								if ($objectclass == 'FactureFournisseur') $actiontypecode='AC_SUP_INV';*/
 
 								$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
-								if ($message)
-								{
-									if ($sendtocc) $actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+								if ($message) {
+									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,24 +537,40 @@ if (!$error && $massaction == 'confirm_presend')
 								$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))
-								{
+								if (!empty($triggername)) {
 									// Call trigger
 									$result = $objectobj2->call_trigger($triggername, $user);
-									if ($result < 0) $error++;
+									if ($result < 0) {
+										$error++;
+									}
 									// End call triggers
 
-									if ($error)
-									{
+									if ($error) {
 										setEventMessages($db->lasterror(), $errors, 'errors');
 										dol_syslog("Error in trigger ".$triggername.' '.$db->lasterror(), LOG_ERR);
 									}
@@ -555,8 +580,7 @@ if (!$error && $massaction == 'confirm_presend')
 							}
 						} else {
 							$langs->load("other");
-							if ($mailfile->error)
-							{
+							if ($mailfile->error) {
 								$resaction .= $langs->trans('ErrorFailedToSendMail', $from, $sendto);
 								$resaction .= '<br><div class="error">'.$mailfile->error.'</div>';
 							} else {
@@ -574,8 +598,7 @@ if (!$error && $massaction == 'confirm_presend')
 		$resaction .= $langs->trans("NbIgnored").': '.($nbignored ? $nbignored : 0)."\n<br>";
 		$resaction .= $langs->trans("NbSent").': '.($nbsent ? $nbsent : 0)."\n<br>";
 
-		if ($nbsent)
-		{
+		if ($nbsent) {
 			$action = ''; // Do not show form post if there was at least one successfull sent
 			//setEventMessages($langs->trans("EMailSentToNRecipients", $nbsent.'/'.count($toselect)), null, 'mesgs');
 			setEventMessages($langs->trans("EMailSentForNElements", $nbsent.'/'.count($toselect)), null, 'mesgs');
@@ -591,8 +614,7 @@ if (!$error && $massaction == 'confirm_presend')
 }
 
 // TODO Move this action into commande/list.php if called only by this page.
-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 +628,11 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 
 	$db->begin();
 
-	foreach ($orders as $id_order)
-	{
+	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])) {
@@ -624,11 +647,12 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 			$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))
-			{
+			if (empty($datefacture)) {
 				$datefacture = dol_now();
 			}
 
@@ -647,8 +671,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 			}
 		}
 
-		if ($objecttmp->id > 0)
-		{
+		if ($objecttmp->id > 0) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
 			$sql .= "fk_source";
 			$sql .= ", sourcetype";
@@ -661,16 +684,13 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 			$sql .= ", '".$db->escape($objecttmp->element)."'";
 			$sql .= ")";
 
-			if (!$db->query($sql))
-			{
+			if (!$db->query($sql)) {
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$lines = $cmd->lines;
-				if (empty($lines) && method_exists($cmd, 'fetch_lines'))
-				{
+				if (empty($lines) && method_exists($cmd, 'fetch_lines')) {
 					$cmd->fetch_lines();
 					$lines = $cmd->lines;
 				}
@@ -678,17 +698,14 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 				$fk_parent_line = 0;
 				$num = count($lines);
 
-				for ($i = 0; $i < $num; $i++)
-				{
+				for ($i = 0; $i < $num; $i++) {
 					$desc = ($lines[$i]->desc ? $lines[$i]->desc : '');
 					// If we build one invoice for several order, we must put the invoice of order on the line
-					if (!empty($createbills_onebythird))
-					{
+					if (!empty($createbills_onebythird)) {
 						$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
 					}
 
-					if ($lines[$i]->subprice < 0)
-					{
+					if ($lines[$i]->subprice < 0) {
 						// Negative line, we create a discount line
 						$discount = new DiscountAbsolute($db);
 						$discount->fk_soc = $objecttmp->socid;
@@ -699,8 +716,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 						$discount->fk_user = $user->id;
 						$discount->description = $desc;
 						$discountid = $discount->create($user);
-						if ($discountid > 0)
-						{
+						if ($discountid > 0) {
 							$result = $objecttmp->insert_discount($discountid);
 							//$result=$discount->link_to_invoice($lineid,$id);
 						} else {
@@ -713,17 +729,28 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 						$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)
-						{
+						if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
 							$fk_parent_line = 0;
 						}
 
@@ -762,9 +789,8 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 							100,
 							0,
 							$lines[$i]->fk_unit
-							);
-						if ($result > 0)
-						{
+						);
+						if ($result > 0) {
 							$lineid = $result;
 						} else {
 							$lineid = 0;
@@ -772,8 +798,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 							break;
 						}
 						// Defined the new fk_parent_line
-						if ($result > 0 && $lines[$i]->product_type == 9)
-						{
+						if ($result > 0 && $lines[$i]->product_type == 9) {
 							$fk_parent_line = $result;
 						}
 					}
@@ -783,23 +808,23 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 
 		//$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
 	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
 	$toselect = array();
 
-	if (!$error && $validate_invoices)
-	{
+	if (!$error && $validate_invoices) {
 		$massaction = $action = 'builddoc';
 
-		foreach ($TAllFact as &$objecttmp)
-		{
+		foreach ($TAllFact as &$objecttmp) {
 			$result = $objecttmp->validate($user);
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				$error++;
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				break;
@@ -815,7 +840,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 
 			// Call action to build doc
 			$savobject = $object;
-	  			$object = $objecttmp;
+				$object = $objecttmp;
 			include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 			$object = $savobject;
 		}
@@ -823,8 +848,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 		$massaction = $action = 'confirm_createbills';
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 
 		if ($nb_bills_created == 1) {
@@ -837,29 +861,75 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 
 		// 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;
@@ -873,22 +943,20 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders.
 	}
 }
 
-if (!$error && $massaction == 'cancelorders')
-{
+if (!$error && $massaction == 'cancelorders') {
 	$db->begin();
 
 	$nbok = 0;
 
 
 	$orders = GETPOST('toselect', 'array');
-	foreach ($orders as $id_order)
-	{
+	foreach ($orders as $id_order) {
 		$cmd = new Commande($db);
-		if ($cmd->fetch($id_order) <= 0)
+		if ($cmd->fetch($id_order) <= 0) {
 			continue;
+		}
 
-		if ($cmd->statut != Commande::STATUS_VALIDATED)
-		{
+		if ($cmd->statut != Commande::STATUS_VALIDATED) {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorObjectMustHaveStatusValidToBeCanceled", $cmd->ref), null, 'errors');
 			$error++;
@@ -898,18 +966,20 @@ if (!$error && $massaction == 'cancelorders')
 			$result = $cmd->cancel();
 		}
 
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($cmd->error, $cmd->errors, 'errors');
 			$error++;
 			break;
-		} else $nbok++;
+		} else {
+			$nbok++;
+		}
 	}
-	if (!$error)
-	{
-		if ($nbok > 1)
+	if (!$error) {
+		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();
@@ -917,10 +987,8 @@ if (!$error && $massaction == 'cancelorders')
 }
 
 
-if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('button_search'))
-{
-	if (empty($diroutputmassaction))
-	{
+if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('button_search')) {
+	if (empty($diroutputmassaction)) {
 		dol_print_error(null, 'include of actions_massactions.inc.php is done but var $diroutputmassaction was not defined');
 		exit;
 	}
@@ -933,12 +1001,10 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 	$listofobjectid = array();
 	$listofobjectthirdparties = array();
 	$listofobjectref = array();
-	foreach ($toselect as $toselectid)
-	{
+	foreach ($toselect as $toselectid) {
 		$objecttmp = new $objectclass($db); // must create new instance because instance is saved into $listofobjectref array for future use
 		$result = $objecttmp->fetch($toselectid);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$listofobjectid[$toselectid] = $toselectid;
 			$thirdpartyid = $objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid;
 			$listofobjectthirdparties[$thirdpartyid] = $thirdpartyid;
@@ -947,19 +1013,20 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 	}
 
 	$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
 	$files = array();
-	foreach ($listofobjectref as $basename)
-	{
+	foreach ($listofobjectref as $basename) {
 		$basename = dol_sanitizeFileName($basename);
-		foreach ($listoffiles as $filefound)
-		{
-			if (strstr($filefound["name"], $basename))
-			{
+		foreach ($listoffiles as $filefound) {
+			if (strstr($filefound["name"], $basename)) {
 				$files[] = $uploaddir.'/'.$basename.'/'.$filefound["name"];
 				break;
 			}
@@ -969,15 +1036,18 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 	// 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);
 	}
 
-	if (!empty($conf->global->USE_PDFTK_FOR_PDF_CONCAT))
-	{
+	if (!empty($conf->global->USE_PDFTK_FOR_PDF_CONCAT)) {
 		// Create output dir if not exists
 		dol_mkdir($diroutputmassaction);
 
@@ -986,16 +1056,21 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 		$filename = preg_replace('/\s/', '_', $filename);
 
 		// 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 (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 ($year) {
+			$filename .= '_'.$year;
+		}
+		if ($month) {
+			$filename .= '_'.$month;
 		}
-		if ($year) $filename .= '_'.$year;
-		if ($month) $filename .= '_'.$month;
 
-		if (count($files) > 0)
-		{
+		if (count($files) > 0) {
 			$now = dol_now();
 			$file = $diroutputmassaction.'/'.$filename.'_'.dol_print_date($now, 'dayhourlog').'.pdf';
 
@@ -1009,8 +1084,9 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 
 			// check if pdftk is installed
 			if (file_exists($file)) {
-				if (!empty($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');
@@ -1029,22 +1105,21 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 
 		$pdf = pdf_getInstance($format);
 
-		if (class_exists('TCPDF'))
-		{
+		if (class_exists('TCPDF')) {
 			$pdf->setPrintHeader(false);
 			$pdf->setPrintFooter(false);
 		}
 		$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)
-		{
+		foreach ($files as $file) {
 			// Charge un document PDF depuis un fichier.
 			$pagecount = $pdf->setSourceFile($file);
-			for ($i = 1; $i <= $pagecount; $i++)
-			{
+			for ($i = 1; $i <= $pagecount; $i++) {
 				$tplidx = $pdf->importPage($i);
 				$s = $pdf->getTemplatesize($tplidx);
 				$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
@@ -1060,20 +1135,26 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 		$filename = preg_replace('/\s/', '_', $filename);
 
 		// 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 (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 ($year) $filename .= '_'.$year;
-		if ($month) $filename .= '_'.$month;
-		if ($pagecount)
-		{
+		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))
+			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');
@@ -1084,47 +1165,43 @@ if (!$error && $massaction == "builddoc" && $permissiontoread && !GETPOST('butto
 }
 
 // Remove a file from massaction area
-if ($action == 'remove_file')
-{
+if ($action == 'remove_file') {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	$langs->load("other");
 	$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 = '';
 }
 
 
 // Validate records
-if (!$error && $massaction == 'validate' && $permissiontoadd)
-{
+if (!$error && $massaction == 'validate' && $permissiontoadd) {
 	$objecttmp = new $objectclass($db);
 
-	if (($objecttmp->element == 'facture' || $objecttmp->element == 'invoice') && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL))
-	{
+	if (($objecttmp->element == 'facture' || $objecttmp->element == 'invoice') && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorMassValidationNotAllowedWhenStockIncreaseOnAction'), null, 'errors');
 		$error++;
 	}
-	if ($objecttmp->element == 'invoice_supplier' && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
-	{
+	if ($objecttmp->element == 'invoice_supplier' && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorMassValidationNotAllowedWhenStockIncreaseOnAction'), null, 'errors');
 		$error++;
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$db->begin();
 
 		$nbok = 0;
-		foreach ($toselect as $toselectid)
-		{
+		foreach ($toselect as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result = $objecttmp->validate($user);
 				if ($result == 0) {
 					$langs->load("errors");
@@ -1174,10 +1251,12 @@ if (!$error && $massaction == 'validate' && $permissiontoadd)
 			}
 		}
 
-		if (!$error)
-		{
-			if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
-			else setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+		if (!$error) {
+			if ($nbok > 1) {
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			} else {
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			}
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -1200,7 +1279,9 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
-			} else $nbok++;
+			} else {
+				$nbok++;
+			}
 		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1209,9 +1290,11 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
 	}
 
 	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();
@@ -1221,47 +1304,45 @@ if (!$error && $massaction == 'closed' && $objectclass == "Propal" && $permissio
 //var_dump($_POST);var_dump($massaction);exit;
 
 // Delete record from mass action (massaction = 'delete' for direct delete, action/confirm='delete'/'yes' with a confirmation step before)
-if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete)
-{
+if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete) {
 	$db->begin();
 
 	$objecttmp = new $objectclass($db);
 	$nbok = 0;
-	foreach ($toselect as $toselectid)
-	{
+	foreach ($toselect as $toselectid) {
 		$result = $objecttmp->fetch($toselectid);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Refuse deletion for some objects/status
-			if ($objectclass == 'Facture' && empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $objecttmp->status != Facture::STATUS_DRAFT)
-			{
+			if ($objectclass == 'Facture' && empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $objecttmp->status != Facture::STATUS_DRAFT) {
 				$langs->load("errors");
 				$nbignored++;
 				$resaction .= '<div class="error">'.$langs->trans('ErrorOnlyDraftStatusCanBeDeletedInMassAction', $objecttmp->ref).'</div><br>';
 				continue;
 			}
 
-			if ($objectclass == "Task" && $objecttmp->hasChildren() > 0)
-			{
+			if ($objectclass == "Task" && $objecttmp->hasChildren() > 0) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task SET fk_task_parent = 0 WHERE fk_task_parent = ".$objecttmp->id;
 				$res = $db->query($sql);
 
-				if (!$res)
-				{
+				if (!$res) {
 					setEventMessage('ErrorRecordParentingNotModified', 'errors');
 					$error++;
 				}
 			}
 
-			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)
-			{
+			if ($result <= 0) {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
-			} else $nbok++;
+			} else {
+				$nbok++;
+			}
 		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1269,10 +1350,12 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 		}
 	}
 
-	if (!$error)
-	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		}
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -1282,43 +1365,54 @@ if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == '
 
 // Generate document foreach object according to model linked to object
 // @todo : propose model selection
-if (!$error && $massaction == 'generate_doc' && $permissiontoread)
-{
+if (!$error && $massaction == 'generate_doc' && $permissiontoread) {
 	$db->begin();
 
 	$objecttmp = new $objectclass($db);
 	$nbok = 0;
-	foreach ($toselect as $toselectid)
-	{
+	foreach ($toselect as $toselectid) {
 		$result = $objecttmp->fetch($toselectid);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$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 (!empty($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 (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
 
 			// 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->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
 
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
 				break;
-			} else $nbok++;
+			} else {
+				$nbok++;
+			}
 		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 			$error++;
@@ -1326,10 +1420,12 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread)
 		}
 	}
 
-	if (!$error)
-	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
-		else setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsGenerated", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("RecordGenerated", $nbok), null, 'mesgs');
+		}
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -1383,10 +1479,12 @@ if (!$error && ($action == 'affecttag' && $confirm == 'yes') && $permissiontoadd
 		}
 	}
 
-	if (!$error)
-	{
-		if ($nbok > 1) setEventMessages($langs->trans("RecordsModified", $nbok), null);
-		else setEventMessages($langs->trans("RecordsModified", $nbok), null);
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsModified", $nbok), null);
+		} else {
+			setEventMessages($langs->trans("RecordsModified", $nbok), null);
+		}
 		$db->commit();
 		$toselect=array();
 	} else {
@@ -1400,4 +1498,6 @@ $parameters['massaction'] = $massaction;
 $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');
+}
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index 3838e6963ab..de415bb4ba3 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -55,16 +55,15 @@ if ($action == 'print_file' && $user->rights->printing->read) {
 
 				$subdir = '';
 				$module = GETPOST('printer', 'alpha');
-				switch ($module)
-				{
-					case 'livraison' :
+				switch ($module) {
+					case 'livraison':
 						$subdir = 'receipt';
 						$module = 'expedition';
 						break;
-					case 'expedition' :
+					case 'expedition':
 						$subdir = 'sending';
 						break;
-					case 'commande_fournisseur' :
+					case 'commande_fournisseur':
 						$module = 'fournisseur';
 						$subdir = 'commande';
 						break;
@@ -75,20 +74,20 @@ if ($action == 'print_file' && $user->rights->printing->read) {
 						//print '<pre>'.print_r($printer->errors, true).'</pre>';
 						setEventMessages($printer->error, $printer->errors, 'errors');
 					}
-					if ($ret == 0)
-					{
+					if ($ret == 0) {
 						//print '<pre>'.print_r($printer->errors, true).'</pre>';
 						setEventMessages($printer->error, $printer->errors);
 						setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
 					}
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$ret = 1;
 					setEventMessages($e->getMessage(), null, 'errors');
 				}
 			}
 		}
-		if ($printerfound == 0) setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
+		if ($printerfound == 0) {
+			setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
+		}
 	} else {
 		setEventMessages($langs->trans("NoModuleFound"), null, 'warnings');
 	}
diff --git a/htdocs/core/actions_setmoduleoptions.inc.php b/htdocs/core/actions_setmoduleoptions.inc.php
index d662d3c85c9..e56c4a95dcd 100644
--- a/htdocs/core/actions_setmoduleoptions.inc.php
+++ b/htdocs/core/actions_setmoduleoptions.inc.php
@@ -27,66 +27,60 @@
 // $nomessageinupdate can be set to 1
 // $nomessageinsetmoduleoptions can be set to 1
 
-if ($action == 'update' && is_array($arrayofparameters))
-{
+if ($action == 'update' && is_array($arrayofparameters)) {
 	$db->begin();
 
-	foreach ($arrayofparameters as $key => $val)
-	{
+	foreach ($arrayofparameters as $key => $val) {
 		// Modify constant only if key was posted (avoid resetting key to the null value)
-		if (GETPOSTISSET($key))
-		{
+		if (GETPOSTISSET($key)) {
 			$result = dolibarr_set_const($db, $key, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				break;
 			}
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		if (empty($nomessageinupdate)) {
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		}
 	} else {
 		$db->rollback();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+		if (empty($nomessageinupdate)) {
+			setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+		}
 	}
 }
 
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
-if ($action == 'setModuleOptions')
-{
+if ($action == 'setModuleOptions') {
 	$db->begin();
 
 	// Process common param fields
-	if (is_array($_POST))
-	{
-		foreach ($_POST as $key => $val)
-		{
+	if (is_array($_POST)) {
+		foreach ($_POST as $key => $val) {
 			$reg = array();
-			if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
-			{
+			if (preg_match('/^param(\d*)$/', $key, $reg)) {    // Works for POST['param'], POST['param1'], POST['param2'], ...
 				$param = GETPOST("param".$reg[1], 'alpha');
 				$value = GETPOST("value".$reg[1], 'alpha');
-				if ($param)
-				{
+				if ($param) {
 					$res = dolibarr_set_const($db, $param, $value, 'chaine', 0, '', $conf->entity);
-					if (!($res > 0)) $error++;
+					if (!($res > 0)) {
+						$error++;
+					}
 				}
 			}
 		}
 	}
 
 	// Process upload fields
-	if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09'))
-	{
+	if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09')) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
@@ -96,24 +90,27 @@ if ($action == 'setModuleOptions')
 				if (empty($nomessageinsetmoduleoptions)) {
 					setEventMessages($langs->trans("ErrorDirNotFound", $tmpdir), null, 'warnings');
 				}
-			}
-			else {
+			} else {
 				$upload_dir = $tmpdir;
 			}
 		}
-		if ($upload_dir)
-		{
+		if ($upload_dir) {
 			$result = dol_add_file_process($upload_dir, 1, 1, 'uploadfile', '');
-			if ($result <= 0) $error++;
+			if ($result <= 0) {
+				$error++;
+			}
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
-		if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		if (empty($nomessageinsetmoduleoptions)) {
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		}
 	} else {
 		$db->rollback();
-		if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+		if (empty($nomessageinsetmoduleoptions)) {
+			setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+		}
 	}
 }
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index b9dd4194268..f2426f6523f 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -28,23 +28,29 @@
 // $id must be defined (object is loaded in this file with fetch)
 
 // Set public note
-if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel', 'alpha'))
-{
-	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
-	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
+if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel', 'alpha')) {
+	if (empty($action) || !is_object($object) || empty($id)) {
+		dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
+	}
+	if (empty($object->id)) {
+		$object->fetch($id); // Fetch may not be already done
+	}
 
 	$result_update = $object->update_note(dol_html_entity_decode(GETPOST('note_public', 'restricthtml'), ENT_QUOTES | ENT_HTML5, 'UTF-8', 1), '_public');
 
-	if ($result_update < 0) setEventMessages($object->error, $object->errors, 'errors');
-	elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture')))
-	{
+	if ($result_update < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	} elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture'))) {
 		// Define output language
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		{
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			$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 = $object->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 = $object->thirdparty->default_lang;
+			}
 			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -56,13 +62,21 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 
 			$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
-			if ($result < 0) dol_print_error($db, $result);
+			if ($result < 0) {
+				dol_print_error($db, $result);
+			}
 		}
 	}
 } elseif ($action == 'setnote_private' && !empty($permissionnote) && !GETPOST('cancel', 'alpha')) {
 	// Set public note
-	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
-	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
+	if (empty($action) || !is_object($object) || empty($id)) {
+		dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
+	}
+	if (empty($object->id)) {
+		$object->fetch($id); // Fetch may not be already done
+	}
 	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5), '_private');
-	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 }
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index 9575208f485..43438c66dc4 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -27,13 +27,20 @@
  * 				ajaxdirpreview.php?mode=nojs&action=preview&module=ecm&section=0&file=xxx
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
-if (!isset($mode) || $mode != 'noajax')    // For ajax call
-{
+if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	require_once '../../main.inc.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
@@ -50,12 +57,18 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 	$sortfield = GETPOST("sortfield", 'alpha');
 	$sortorder = GETPOST("sortorder", 'alpha');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+	if (empty($page) || $page == -1) {
+		$page = 0;
+	}     // If $page is not defined, or '' or -1
 	$offset = $limit * $page;
 	$pageprev = $page - 1;
 	$pagenext = $page + 1;
-	if (!$sortorder) $sortorder = "ASC";
-	if (!$sortfield) $sortfield = "name";
+	if (!$sortorder) {
+		$sortorder = "ASC";
+	}
+	if (!$sortfield) {
+		$sortfield = "name";
+	}
 
 	$rootdirfordoc = $conf->ecm->dir_output;
 
@@ -64,8 +77,7 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 	$ecmdir = new EcmDirectory($db);
 	if ($section > 0) {
 		$result = $ecmdir->fetch($section);
-		if (!$result > 0)
-		{
+		if (!$result > 0) {
 			//dol_print_error($db,$ecmdir->error);
 			//exit;
 		}
@@ -76,18 +88,15 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 
 	$ecmdir = new EcmDirectory($db);
 	$relativepath = '';
-	if ($section > 0)
-	{
+	if ($section > 0) {
 		$result = $ecmdir->fetch($section);
-		if (!$result > 0)
-		{
+		if (!$result > 0) {
 			dol_print_error($db, $ecmdir->error);
 			exit;
 		}
 
 		$relativepath = $ecmdir->getRelativePath(); // Example   'mydir/'
-	} elseif (GETPOST('section_dir'))
-	{
+	} elseif (GETPOST('section_dir')) {
 		$relativepath = GETPOST('section_dir');
 	}
 	//var_dump($section.'-'.GETPOST('section_dir').'-'.$relativepath);
@@ -95,24 +104,27 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 	$upload_dir = $rootdirfordoc.'/'.$relativepath;
 }
 
-if (empty($url))
-{
-	if (GETPOSTISSET('website')) $url = DOL_URL_ROOT.'/website/index.php';
-	else $url = DOL_URL_ROOT.'/ecm/index.php';
+if (empty($url)) {
+	if (GETPOSTISSET('website')) {
+		$url = DOL_URL_ROOT.'/website/index.php';
+	} else {
+		$url = DOL_URL_ROOT.'/ecm/index.php';
+	}
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array("ecm", "companies", "other"));
 
 // Security check
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 
 //print 'xxx'.$upload_dir;
 
 // Security:
 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-if (preg_match('/\.\./', $upload_dir) || preg_match('/[<>|]/', $upload_dir))
-{
+if (preg_match('/\.\./', $upload_dir) || preg_match('/[<>|]/', $upload_dir)) {
 	dol_syslog("Refused to deliver file ".$upload_dir);
 	// Do no show plain path in shown error message
 	dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $upload_dir));
@@ -120,12 +132,12 @@ if (preg_match('/\.\./', $upload_dir) || preg_match('/[<>|]/', $upload_dir))
 }
 
 // Check permissions
-if ($modulepart == 'ecm')
-{
-	if (!$user->rights->ecm->read) accessforbidden();
+if ($modulepart == 'ecm') {
+	if (!$user->rights->ecm->read) {
+		accessforbidden();
+	}
 }
-if ($modulepart == 'medias')
-{
+if ($modulepart == 'medias') {
 	// Always allowed
 }
 
@@ -142,8 +154,7 @@ if ($modulepart == 'medias')
  * View
  */
 
-if (!isset($mode) || $mode != 'noajax')
-{
+if (!isset($mode) || $mode != 'noajax') {
 	// Ajout directives pour resoudre bug IE
 	header('Cache-Control: Public, must-revalidate');
 	header('Pragma: public');
@@ -154,25 +165,27 @@ if (!isset($mode) || $mode != 'noajax')
 $type = 'directory';
 
 // This test if file exists should be useless. We keep it to find bug more easily
-if (!dol_is_dir($upload_dir))
-{
+if (!dol_is_dir($upload_dir)) {
 	//dol_mkdir($upload_dir);
 	/*$langs->load("install");
-    dol_print_error(0,$langs->trans("ErrorDirDoesNotExists",$upload_dir));
-    exit;*/
+	dol_print_error(0,$langs->trans("ErrorDirDoesNotExists",$upload_dir));
+	exit;*/
 }
 
 print '<!-- ajaxdirpreview type='.$type.' -->'."\n";
 //print '<!-- Page called with mode='.dol_escape_htmltag(isset($mode)?$mode:'').' type='.dol_escape_htmltag($type).' module='.dol_escape_htmltag($module).' url='.dol_escape_htmltag($url).' '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 $param = ($sortfield ? '&sortfield='.urlencode($sortfield) : '').($sortorder ? '&sortorder='.urlencode($sortorder) : '');
-if (!empty($websitekey)) $param .= '&website='.urlencode($websitekey);
-if (!empty($pageid))     $param .= '&pageid='.urlencode($pageid);
+if (!empty($websitekey)) {
+	$param .= '&website='.urlencode($websitekey);
+}
+if (!empty($pageid)) {
+	$param .= '&pageid='.urlencode($pageid);
+}
 
 
 // Dir scan
-if ($type == 'directory')
-{
+if ($type == 'directory') {
 	$formfile = new FormFile($db);
 
 	$maxlengthname = 40;
@@ -203,31 +216,48 @@ if ($type == 'directory')
 
 	$parameters = array('modulepart'=>$module);
 	$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
-	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0)
-	{
+	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
 		$automodules[]=$hookmanager->resArray['module'];
 	}
 
 	// TODO change for multicompany sharing
-	if ($module == 'company') $upload_dir = $conf->societe->dir_output;
-	elseif ($module == 'invoice') $upload_dir = $conf->facture->dir_output;
-	elseif ($module == 'invoice_supplier') $upload_dir = $conf->fournisseur->facture->dir_output;
-	elseif ($module == 'propal') $upload_dir = $conf->propal->dir_output;
-	elseif ($module == 'supplier_proposal') $upload_dir = $conf->supplier_proposal->dir_output;
-	elseif ($module == 'order') $upload_dir = $conf->commande->dir_output;
-	elseif ($module == 'order_supplier') $upload_dir = $conf->fournisseur->commande->dir_output;
-	elseif ($module == 'contract') $upload_dir = $conf->contrat->dir_output;
-	elseif ($module == 'product') $upload_dir = $conf->product->dir_output;
-	elseif ($module == 'tax') $upload_dir = $conf->tax->dir_output;
-	elseif ($module == 'project') $upload_dir = $conf->projet->dir_output;
-	elseif ($module == 'fichinter') $upload_dir = $conf->ficheinter->dir_output;
-	elseif ($module == 'user') $upload_dir = $conf->user->dir_output;
-	elseif ($module == 'expensereport') $upload_dir = $conf->expensereport->dir_output;
-	elseif ($module == 'holiday') $upload_dir = $conf->holiday->dir_output;
-	elseif ($module == 'recruitment-recruitmentcandidature') $upload_dir = $conf->recruitment->dir_output.'/recruitmentcandidature';
-	elseif ($module == 'banque') $upload_dir = $conf->bank->dir_output;
-	elseif ($module == 'mrp-mo') $upload_dir = $conf->mrp->dir_output.'/mo';
-	else {
+	if ($module == 'company') {
+		$upload_dir = $conf->societe->dir_output;
+	} elseif ($module == 'invoice') {
+		$upload_dir = $conf->facture->dir_output;
+	} elseif ($module == 'invoice_supplier') {
+		$upload_dir = $conf->fournisseur->facture->dir_output;
+	} elseif ($module == 'propal') {
+		$upload_dir = $conf->propal->dir_output;
+	} elseif ($module == 'supplier_proposal') {
+		$upload_dir = $conf->supplier_proposal->dir_output;
+	} elseif ($module == 'order') {
+		$upload_dir = $conf->commande->dir_output;
+	} elseif ($module == 'order_supplier') {
+		$upload_dir = $conf->fournisseur->commande->dir_output;
+	} elseif ($module == 'contract') {
+		$upload_dir = $conf->contrat->dir_output;
+	} elseif ($module == 'product') {
+		$upload_dir = $conf->product->dir_output;
+	} elseif ($module == 'tax') {
+		$upload_dir = $conf->tax->dir_output;
+	} elseif ($module == 'project') {
+		$upload_dir = $conf->projet->dir_output;
+	} elseif ($module == 'fichinter') {
+		$upload_dir = $conf->ficheinter->dir_output;
+	} elseif ($module == 'user') {
+		$upload_dir = $conf->user->dir_output;
+	} elseif ($module == 'expensereport') {
+		$upload_dir = $conf->expensereport->dir_output;
+	} elseif ($module == 'holiday') {
+		$upload_dir = $conf->holiday->dir_output;
+	} elseif ($module == 'recruitment-recruitmentcandidature') {
+		$upload_dir = $conf->recruitment->dir_output.'/recruitmentcandidature';
+	} elseif ($module == 'banque') {
+		$upload_dir = $conf->bank->dir_output;
+	} elseif ($module == 'mrp-mo') {
+		$upload_dir = $conf->mrp->dir_output.'/mo';
+	} else {
 		$parameters = array('modulepart'=>$module);
 		$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
 		if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray) > 0) {
@@ -236,14 +266,17 @@ if ($type == 'directory')
 	}
 
 	// Automatic list
-	if (in_array($module, $automodules))
-	{
+	if (in_array($module, $automodules)) {
 		$param .= '&module='.$module;
-		if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.urlencode($search_doc_ref);
+		if (isset($search_doc_ref) && $search_doc_ref != '') {
+			$param .= '&search_doc_ref='.urlencode($search_doc_ref);
+		}
 
 		$textifempty = ($section ? $langs->trans("NoFileFound") : ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("NoFileFound")));
 
-		if ($module == 'company') $excludefiles[] = '^contact$'; // The subdir 'contact' contains files of contacts with no id of thirdparty.
+		if ($module == 'company') {
+			$excludefiles[] = '^contact$'; // The subdir 'contact' contains files of contacts with no id of thirdparty.
+		}
 
 		$filter = preg_quote($search_doc_ref, '/');
 		$filearray = dol_dir_list($upload_dir, "files", 1, $filter, $excludefiles, $sortfield, $sorting, 1);
@@ -254,11 +287,10 @@ if ($type == 'directory')
 	}
 	// Manual list
 	else {
-		if ($module == 'medias')
-		{
+		if ($module == 'medias') {
 			/*
-    		   $_POST is array like
-    		  'token' => string '062380e11b7dcd009d07318b57b71750' (length=32)
+			   $_POST is array like
+			  'token' => string '062380e11b7dcd009d07318b57b71750' (length=32)
 			  'action' => string 'file_manager' (length=12)
 			  'website' => string 'template' (length=8)
 			  'pageid' => string '124' (length=3)
@@ -266,15 +298,20 @@ if ($type == 'directory')
 			  'section_id' => string '0' (length=1)
 			  'max_file_size' => string '2097152' (length=7)
 			  'sendit' => string 'Envoyer fichier' (length=15)
-    		 */
+			 */
 			$relativepath = GETPOST('file', 'alpha') ?GETPOST('file', 'alpha') : GETPOST('section_dir', 'alpha');
-			if ($relativepath && $relativepath != '/') $relativepath .= '/';
+			if ($relativepath && $relativepath != '/') {
+				$relativepath .= '/';
+			}
 			$upload_dir = $dolibarr_main_data_root.'/'.$module.'/'.$relativepath;
-			if (GETPOSTISSET('website') || GETPOSTISSET('file_manager'))
-			{
+			if (GETPOSTISSET('website') || GETPOSTISSET('file_manager')) {
 				$param .= '&file_manager=1';
-				if (!preg_match('/website=/', $param)) $param .= '&website='.urlencode(GETPOST('website', 'alpha'));
-				if (!preg_match('/pageid=/', $param)) $param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
+				if (!preg_match('/website=/', $param)) {
+					$param .= '&website='.urlencode(GETPOST('website', 'alpha'));
+				}
+				if (!preg_match('/pageid=/', $param)) {
+					$param .= '&pageid='.urlencode(GETPOST('pageid', 'int'));
+				}
 				//if (!preg_match('/backtopage=/',$param)) $param.='&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid);
 			}
 		} else {
@@ -283,47 +320,46 @@ if ($type == 'directory')
 		}
 
 		// If $section defined with value 0
-		if (($section === '0' || empty($section)) && ($module != 'medias'))
-		{
+		if (($section === '0' || empty($section)) && ($module != 'medias')) {
 			$filearray = array();
 		} else {
 			$filearray = dol_dir_list($upload_dir, "files", 0, '', array('^\.', '(\.meta|_preview.*\.png)$', '^temp$', '^CVS$'), $sortfield, $sorting, 1);
 		}
 
-		if ($section)
-		{
+		if ($section) {
 			$param .= '&section='.$section;
-			if (isset($search_doc_ref) && $search_doc_ref != '') $param .= '&search_doc_ref='.$search_doc_ref;
+			if (isset($search_doc_ref) && $search_doc_ref != '') {
+				$param .= '&search_doc_ref='.$search_doc_ref;
+			}
 
 			$textifempty = $langs->trans('NoFileFound');
-		} elseif ($section === '0')
-		{
-			if ($module == 'ecm') $textifempty = '<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
-			else $textifempty = $langs->trans('NoFileFound');
-		} else $textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
+		} elseif ($section === '0') {
+			if ($module == 'ecm') {
+				$textifempty = '<br><div class="center"><font class="warning">'.$langs->trans("DirNotSynchronizedSyncFirst").'</font></div><br>';
+			} else {
+				$textifempty = $langs->trans('NoFileFound');
+			}
+		} else {
+			$textifempty = ($showonrightsize == 'featurenotyetavailable' ? $langs->trans("FeatureNotYetAvailable") : $langs->trans("ECMSelectASection"));
+		}
 
-		if ($module == 'medias')
-		{
+		if ($module == 'medias') {
 			$useinecm = 6;
 			$modulepart = 'medias';
 			$perm = ($user->rights->website->write || $user->rights->emailing->creer);
 			$title = 'none';
-		} elseif ($module == 'ecm') // DMS/ECM -> manual structure
-		{
-			if ($user->rights->ecm->read)
-			{
+		} elseif ($module == 'ecm') { // DMS/ECM -> manual structure
+			if ($user->rights->ecm->read) {
 				// Buttons: Preview
 				$useinecm = 2;
 			}
 
-			if ($user->rights->ecm->upload)
-			{
+			if ($user->rights->ecm->upload) {
 				// Buttons: Preview + Delete
 				$useinecm = 4;
 			}
 
-			if ($user->rights->ecm->setup)
-			{
+			if ($user->rights->ecm->setup) {
 				// Buttons: Preview + Delete + Edit
 				$useinecm = 5;
 			}
@@ -349,18 +385,27 @@ if ($type == 'directory')
 
 // Bottom of page
 $useajax = 1;
-if (!empty($conf->dol_use_jmobile)) $useajax = 0;
-if (empty($conf->use_javascript_ajax)) $useajax = 0;
-if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax = 0;
+if (!empty($conf->dol_use_jmobile)) {
+	$useajax = 0;
+}
+if (empty($conf->use_javascript_ajax)) {
+	$useajax = 0;
+}
+if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+	$useajax = 0;
+}
 
 //$param.=($param?'?':'').(preg_replace('/^&/','',$param));
 
-if ($useajax || $action == 'delete')
-{
+if ($useajax || $action == 'delete') {
 	$urlfile = '';
-	if ($action == 'delete') $urlfile = GETPOST('urlfile', 'alpha');
+	if ($action == 'delete') {
+		$urlfile = GETPOST('urlfile', 'alpha');
+	}
 
-	if (empty($section_dir)) $section_dir = GETPOST("file", "alpha");
+	if (empty($section_dir)) {
+		$section_dir = GETPOST("file", "alpha");
+	}
 	$section_id = $section;
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -372,22 +417,26 @@ if ($useajax || $action == 'delete')
 	$formquestion['section_dir'] = array('type'=>'hidden', 'value'=>$section_dir, 'name'=>'section_dir'); // We must always put field, even if empty because it is filled by javascript later
 	$formquestion['sortfield'] = array('type'=>'hidden', 'value'=>$sortfield, 'name'=>'sortfield'); // We must always put field, even if empty because it is filled by javascript later
 	$formquestion['sortorder'] = array('type'=>'hidden', 'value'=>$sortorder, 'name'=>'sortorder'); // We must always put field, even if empty because it is filled by javascript later
-	if (!empty($action) && $action == 'file_manager')	$formquestion['file_manager'] = array('type'=>'hidden', 'value'=>1, 'name'=>'file_manager');
-	if (!empty($websitekey))							$formquestion['website'] = array('type'=>'hidden', 'value'=>$websitekey, 'name'=>'website');
-	if (!empty($pageid) && $pageid > 0)				$formquestion['pageid'] = array('type'=>'hidden', 'value'=>$pageid, 'name'=>'pageid');
+	if (!empty($action) && $action == 'file_manager') {
+		$formquestion['file_manager'] = array('type'=>'hidden', 'value'=>1, 'name'=>'file_manager');
+	}
+	if (!empty($websitekey)) {
+		$formquestion['website'] = array('type'=>'hidden', 'value'=>$websitekey, 'name'=>'website');
+	}
+	if (!empty($pageid) && $pageid > 0) {
+		$formquestion['pageid'] = array('type'=>'hidden', 'value'=>$pageid, 'name'=>'pageid');
+	}
 
 	print $form->formconfirm($url, $langs->trans("DeleteFile"), $langs->trans("ConfirmDeleteFile"), 'confirm_deletefile', $formquestion, "no", ($useajax ? 'deletefile' : 0));
 }
 
-if ($useajax)
-{
+if ($useajax) {
 	print '<script type="text/javascript">';
 
 	// Enable jquery handlers on new generated HTML objects (same code than into lib_footer.js.php)
 	// Because the content is reloaded by ajax call, we must also reenable some jquery hooks
 	// Wrapper to manage document_preview
-	if ($conf->browser->layout != 'phone')
-	{
+	if ($conf->browser->layout != 'phone') {
 		print "\n/* JS CODE TO ENABLE document_preview */\n";
 		print '
                 jQuery(document).ready(function () {
@@ -414,4 +463,6 @@ if ($useajax)
 }
 
 // Close db if mode is not noajax
-if ((!isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((!isset($mode) || $mode != 'noajax') && is_object($db)) {
+	$db->close();
+}
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index e6fd1e000cb..52182e2205d 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -26,13 +26,20 @@
 // This script is called with a POST method.
 // Directory to scan (full path) is inside POST['dir'] and encode by js escape() if ajax is used or encoded by urlencode if mode=noajax
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
-if (!isset($mode) || $mode != 'noajax')    // For ajax call
-{
+if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	$res = @include '../../main.inc.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -48,7 +55,9 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
+	if ($selecteddir != '/') {
+		$selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
+	}
 } else // For no ajax call
 {
 	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
@@ -59,8 +68,12 @@ if (!isset($mode) || $mode != 'noajax')    // For ajax call
 
 	$preopened = GETPOST('preopened');
 
-	if ($selecteddir != '/') $selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
-	if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
+	if ($selecteddir != '/') {
+		$selecteddir = preg_replace('/\/$/', '', $selecteddir); // We removed last '/' except if it is '/'
+	}
+	if (empty($url)) {
+		$url = DOL_URL_ROOT.'/ecm/index.php';
+	}
 }
 
 // Load translation files required by the page
@@ -68,12 +81,10 @@ $langs->load("ecm");
 
 // Define fullpathselecteddir.
 $fullpathselecteddir = '<none>';
-if ($modulepart == 'ecm')
-{
+if ($modulepart == 'ecm') {
 	$fullpathselecteddir = $conf->ecm->dir_output.'/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened = $conf->ecm->dir_output.'/'.($preopened != '/' ? $preopened : '');
-} elseif ($modulepart == 'medias')
-{
+} elseif ($modulepart == 'medias') {
 	$fullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($selecteddir != '/' ? $selecteddir : '');
 	$fullpathpreopened = $dolibarr_main_data_root.'/medias/'.($preopened != '/' ? $preopened : '');
 }
@@ -81,8 +92,7 @@ if ($modulepart == 'ecm')
 
 // Security:
 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpathselecteddir))
-{
+if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpathselecteddir)) {
 	dol_syslog("Refused to deliver file ".$original_file);
 	// Do no show plain path in shown error message
 	dol_print_error(0, $langs->trans("ErrorFileNameInvalid", GETPOST("file")));
@@ -90,11 +100,11 @@ if (preg_match('/\.\./', $fullpathselecteddir) || preg_match('/[<>|]/', $fullpat
 }
 
 // Check permissions
-if ($modulepart == 'ecm')
-{
-	if (!$user->rights->ecm->read) accessforbidden();
-} elseif ($modulepart == 'medias')
-{
+if ($modulepart == 'ecm') {
+	if (!$user->rights->ecm->read) {
+		accessforbidden();
+	}
+} elseif ($modulepart == 'medias') {
 	// Always allowed
 }
 
@@ -103,8 +113,7 @@ if ($modulepart == 'ecm')
  * View
  */
 
-if (!isset($mode) || $mode != 'noajax')	// if ajax mode
-{
+if (!isset($mode) || $mode != 'noajax') {	// if ajax mode
 	top_httphead();
 }
 
@@ -114,21 +123,20 @@ $form = new Form($db);
 $ecmdirstatic = new EcmDirectory($db);
 
 // Load full tree of ECM module from database. We will use it to define nbofsubdir and nboffilesinsubdir
-if (empty($sqltree)) $sqltree = $ecmdirstatic->get_full_arbo(0);
+if (empty($sqltree)) {
+	$sqltree = $ecmdirstatic->get_full_arbo(0);
+}
 
 // Try to find selected dir id into $sqltree and save it into $current_ecmdir_id
 $current_ecmdir_id = -1;
-foreach ($sqltree as $keycursor => $val)
-{
+foreach ($sqltree as $keycursor => $val) {
 	//print $val['fullrelativename']." == ".$selecteddir;
-	if ($val['fullrelativename'] == $selecteddir)
-	{
+	if ($val['fullrelativename'] == $selecteddir) {
 		$current_ecmdir_id = $keycursor;
 	}
 }
 
-if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
-{
+if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 	treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened);
 
 	// TODO Find a solution to not output this code for each leaf we open
@@ -155,12 +163,13 @@ if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_
 }
 
 
-if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_JS))
-{
+if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 	print '<ul class="ecmjqft">';
 
 	// Load full tree from database. We will use it to define nbofsubdir and nboffilesinsubdir
-	if (empty($sqltree)) $sqltree = $ecmdirstatic->get_full_arbo(0); // Slow
+	if (empty($sqltree)) {
+		$sqltree = $ecmdirstatic->get_full_arbo(0); // Slow
+	}
 
 	// ----- This section will show a tree from a fulltree array -----
 	// $section must also be defined
@@ -168,11 +177,9 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
 
 	// Define fullpathselected ( _x_y_z ) of $section parameter (!! not into ajaxdirtree)
 	$fullpathselected = '';
-	foreach ($sqltree as $key => $val)
-	{
+	foreach ($sqltree as $key => $val) {
 		//print $val['id']."-".$section."<br>";
-		if ($val['id'] == $section)
-		{
+		if ($val['id'] == $section) {
 			$fullpathselected = $val['fullpath'];
 			break;
 		}
@@ -181,28 +188,25 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
 
 	// Update expandedsectionarray in session
 	$expandedsectionarray = array();
-	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) $expandedsectionarray = explode(',', $_SESSION['dol_ecmexpandedsectionarray']);
+	if (isset($_SESSION['dol_ecmexpandedsectionarray'])) {
+		$expandedsectionarray = explode(',', $_SESSION['dol_ecmexpandedsectionarray']);
+	}
 
-	if ($section && GETPOST('sectionexpand') == 'true')
-	{
+	if ($section && GETPOST('sectionexpand') == 'true') {
 		// We add all sections that are parent of opened section
 		$pathtosection = explode('_', $fullpathselected);
-		foreach ($pathtosection as $idcursor)
-		{
-			if ($idcursor && !in_array($idcursor, $expandedsectionarray))	// Not already in array
-			{
+		foreach ($pathtosection as $idcursor) {
+			if ($idcursor && !in_array($idcursor, $expandedsectionarray)) {	// Not already in array
 				$expandedsectionarray[] = $idcursor;
 			}
 		}
 		$_SESSION['dol_ecmexpandedsectionarray'] = join(',', $expandedsectionarray);
 	}
-	if ($section && GETPOST('sectionexpand') == 'false')
-	{
+	if ($section && GETPOST('sectionexpand') == 'false') {
 		// We removed all expanded sections that are child of the closed section
 		$oldexpandedsectionarray = $expandedsectionarray;
 		$expandedsectionarray = array(); // Reset
-		foreach ($oldexpandedsectionarray as $sectioncursor)
-		{
+		foreach ($oldexpandedsectionarray as $sectioncursor) {
 			// TODO is_in_subtree(fulltree,sectionparent,sectionchild) does nox exists. Enable or remove this...
 			//if ($sectioncursor && ! is_in_subtree($sqltree,$section,$sectioncursor)) $expandedsectionarray[]=$sectioncursor;
 		}
@@ -212,14 +216,12 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
 
 	$nbofentries = 0;
 	$oldvallevel = 0;
-	foreach ($sqltree as $key => $val)
-	{
+	foreach ($sqltree as $key => $val) {
 		$ecmdirstatic->id = $val['id'];
 		$ecmdirstatic->ref = $val['label'];
 
 		// Refresh cache
-		if (preg_match('/refresh/i', $action))
-		{
+		if (preg_match('/refresh/i', $action)) {
 			$result = $ecmdirstatic->fetch($val['id']);
 			$ecmdirstatic->ref = $ecmdirstatic->label;
 
@@ -233,26 +235,35 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
 		$showline = 0;
 
 		// If directory is son of expanded directory, we show line
-		if (in_array($val['id_mere'], $expandedsectionarray)) $showline = 4;
+		if (in_array($val['id_mere'], $expandedsectionarray)) {
+			$showline = 4;
+		}
 		// If directory is brother of selected directory, we show line
-		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) $showline = 3;
+		elseif ($val['id'] != $section && $val['id_mere'] == $ecmdirstatic->motherof[$section]) {
+			$showline = 3;
+		}
 		// If directory is parent of selected directory or is selected directory, we show line
-		elseif (preg_match('/'.$val['fullpath'].'_/i', $fullpathselected.'_')) $showline = 2;
+		elseif (preg_match('/'.$val['fullpath'].'_/i', $fullpathselected.'_')) {
+			$showline = 2;
+		}
 		// If we are level one we show line
-		elseif ($val['level'] < 2) $showline = 1;
+		elseif ($val['level'] < 2) {
+			$showline = 1;
+		}
 
-		if ($showline)
-		{
-			if (in_array($val['id'], $expandedsectionarray)) $option = 'indexexpanded';
-			else $option = 'indexnotexpanded';
+		if ($showline) {
+			if (in_array($val['id'], $expandedsectionarray)) {
+				$option = 'indexexpanded';
+			} else {
+				$option = 'indexnotexpanded';
+			}
 			//print $option;
 
 			print '<li class="directory collapsed">';
 
 			// Show tree graph pictos
 			$cpt = 1;
-			while ($cpt < $sqltree[$key]['level'])
-			{
+			while ($cpt < $sqltree[$key]['level']) {
 				print ' &nbsp; &nbsp;';
 				$cpt++;
 			}
@@ -271,7 +282,9 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
 			print $val['cachenbofdoc'];
 			print '</td>';
 			print '<td class="left">';
-			if ($nbofsubdir && $nboffilesinsubdir) print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+			if ($nbofsubdir && $nboffilesinsubdir) {
+				print '<font color="#AAAAAA">+'.$nboffilesinsubdir.'</font> ';
+			}
 			print '</td>';
 
 			// Info
@@ -284,8 +297,11 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
 			$htmltooltip .= '<b>'.$langs->trans("ECMCreationDate").'</b>: '.dol_print_date($val['date_c'], "dayhour").'<br>';
 			$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
 			$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.$val['cachenbofdoc'].'<br>';
-			if ($nbofsubdir) $htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-			else $htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+			if ($nbofsubdir) {
+				$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+			} else {
+				$htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.$nbofsubdir.'<br>';
+			}
 			print $form->textwithpicto('', $htmltooltip, 1, 'info');
 			print "</td>";
 
@@ -301,8 +317,7 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
 	}
 
 	// If nothing to show
-	if ($nbofentries == 0)
-	{
+	if ($nbofentries == 0) {
 		print '<li class="directory collapsed">';
 		print '<div class="ecmjqft">';
 		print $langs->trans("ECMNoDirectoryYet");
@@ -315,7 +330,9 @@ if (empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_ECM_DISABLE_
 
 
 // Close db if mode is not noajax
-if ((!isset($mode) || $mode != 'noajax') && is_object($db)) $db->close();
+if ((!isset($mode) || $mode != 'noajax') && is_object($db)) {
+	$db->close();
+}
 
 
 
@@ -341,21 +358,19 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 	$ecmdirstatic = new EcmDirectory($db);
 	$userstatic = new User($db);
 
-	if (file_exists($fullpathselecteddir))
-	{
+	if (file_exists($fullpathselecteddir)) {
 		$files = @scandir($fullpathselecteddir);
 
-		if (!empty($files))
-		{
+		if (!empty($files)) {
 			natcasesort($files);
-			if (count($files) > 2)    /* The 2 accounts for . and .. */
-			{
+			if (count($files) > 2) {    /* The 2 accounts for . and .. */
 				echo '<ul class="ecmjqft" style="display: none;">'."\n";
 
 				// All dirs
-				foreach ($files as $file)    // $file can be '.', '..', or 'My dir' or 'My file'
-				{
-					if ($file == 'temp') continue;
+				foreach ($files as $file) {    // $file can be '.', '..', or 'My dir' or 'My file'
+					if ($file == 'temp') {
+						continue;
+					}
 
 					$nbofsubdir = 0;
 					$nboffilesinsubdir = 0;
@@ -363,17 +378,14 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 					$val = array();
 
 					// Loop on all database entries (sqltree) to find the one matching the subdir found into dir to scan
-					foreach ($sqltree as $key => $tmpval)
-					{
+					foreach ($sqltree as $key => $tmpval) {
 						//print "-- key=".$key." - ".$tmpval['fullrelativename']." vs ".(($selecteddir != '/'?$selecteddir.'/':'').$file)."<br>\n";
-						if ($tmpval['fullrelativename'] == (($selecteddir != '/' ? $selecteddir.'/' : '').$file))		// We found equivalent record into database
-						{
+						if ($tmpval['fullrelativename'] == (($selecteddir != '/' ? $selecteddir.'/' : '').$file)) {		// We found equivalent record into database
 							$val = $tmpval;
 							$resarray = tree_showpad($sqltree, $key, 1);
 
 							// Refresh cache for this subdir
-							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0)	// Cache is not up to date, so we update it for this directory t
-							{
+							if (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] < 0) {	// Cache is not up to date, so we update it for this directory t
 								$result = $ecmdirstatic->fetch($val['id']);
 								$ecmdirstatic->ref = $ecmdirstatic->label;
 
@@ -389,10 +401,8 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 					}
 
 					//print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
-					if ($file != '.' && $file != '..' && ((!empty($val['fullrelativename']) && $val['id'] >= 0) || dol_is_dir($fullpathselecteddir.(preg_match('/\/$/', $fullpathselecteddir) ? '' : '/').$file)))
-					{
-						if (empty($val['fullrelativename']))	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
-						{
+					if ($file != '.' && $file != '..' && ((!empty($val['fullrelativename']) && $val['id'] >= 0) || dol_is_dir($fullpathselecteddir.(preg_match('/\/$/', $fullpathselecteddir) ? '' : '/').$file))) {
+						if (empty($val['fullrelativename'])) {	// If we did not find entry into database, but found a directory (dol_is_dir was ok at previous test)
 							$val['fullrelativename'] = (($selecteddir && $selecteddir != '/') ? $selecteddir.'/' : '').$file;
 							$val['id'] = 0;
 							$val['label'] = $file;
@@ -401,7 +411,9 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 						}
 
 						$collapsedorexpanded = 'collapsed';
-						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) $collapsedorexpanded = 'expanded';
+						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) {
+							$collapsedorexpanded = 'expanded';
+						}
 						print '<li class="directory '.$collapsedorexpanded.'">'; // collapsed is opposite if expanded
 
 						print "<a class=\"fmdirlia jqft ecmjqft\" href=\"";
@@ -425,7 +437,9 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 						print (isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0) ? $val['cachenbofdoc'] : '&nbsp;';
 						print '</td>';
 						print '<td class="left">';
-						if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) print '<font class="opacitymedium">+'.$nboffilesinsubdir.'</font> ';
+						if ($nbofsubdir > 0 && $nboffilesinsubdir > 0) {
+							print '<font class="opacitymedium">+'.$nboffilesinsubdir.'</font> ';
+						}
 						print '</td>';
 
 						// Edit link
@@ -439,8 +453,7 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 						//print '<td class="right" width="14">&nbsp;</td>';
 
 						// Info
-						if ($modulepart == 'ecm')
-						{
+						if ($modulepart == 'ecm') {
 							print '<td class="right" width="18">';
 							$userstatic->id = isset($val['fk_user_c']) ? $val['fk_user_c'] : 0;
 							$userstatic->lastname = isset($val['login_c']) ? $val['login_c'] : 0;
@@ -450,8 +463,11 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 							$htmltooltip .= '<b>'.$langs->trans("ECMCreationDate").'</b>: '.(isset($val['date_c']) ?dol_print_date($val['date_c'], "dayhour") : $langs->trans("NeedRefresh")).'<br>';
 							$htmltooltip .= '<b>'.$langs->trans("Description").'</b>: '.$val['description'].'<br>';
 							$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInDir").'</b>: '.((isset($val['cachenbofdoc']) && $val['cachenbofdoc'] >= 0) ? $val['cachenbofdoc'] : $langs->trans("NeedRefresh")).'<br>';
-							if ($nboffilesinsubdir > 0) $htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
-							else $htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+							if ($nboffilesinsubdir > 0) {
+								$htmltooltip .= '<b>'.$langs->trans("ECMNbOfFilesInSubDir").'</b>: '.$nboffilesinsubdir;
+							} else {
+								$htmltooltip .= '<b>'.$langs->trans("ECMNbOfSubDir").'</b>: '.($nbofsubdir >= 0 ? $nbofsubdir : $langs->trans("NeedRefresh")).'<br>';
+							}
 							print $form->textwithpicto('', $htmltooltip, 1, "info");
 							print "</td>";
 						}
@@ -460,20 +476,19 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 						print '</div>';
 
 						//print 'selecteddir='.$selecteddir.' preopened='.$preopened.' $val[\'fullrelativename\']='.$val['fullrelativename']."<br>\n";
-						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened))
-						{
+						if (preg_match('/^'.preg_quote($val['fullrelativename'].'/', '/').'/', $preopened)) {
 							//print 'modulepart='.$modulepart.' fullpathselecteddir='.$fullpathselecteddir.' - val[fullrelativename] (in database)='.$val['fullrelativename'].' - val[id]='.$val['id'].' - is_dir='.dol_is_dir($fullpathselecteddir . $file).' - file='.$file."\n";
 							$newselecteddir = $val['fullrelativename'];
 							$newfullpathselecteddir = '';
-							if ($modulepart == 'ecm')
-							{
+							if ($modulepart == 'ecm') {
 								$newfullpathselecteddir = $conf->ecm->dir_output.'/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
-							} elseif ($modulepart == 'medias')
-							{
+							} elseif ($modulepart == 'medias') {
 								$newfullpathselecteddir = $dolibarr_main_data_root.'/medias/'.($val['fullrelativename'] != '/' ? $val['fullrelativename'] : '');
 							}
 
-							if ($newfullpathselecteddir) treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth + 1);
+							if ($newfullpathselecteddir) {
+								treeOutputForAbsoluteDir($sqltree, $newselecteddir, $newfullpathselecteddir, $modulepart, $websitekey, $pageid, $preopened, $fullpathpreopened, $depth + 1);
+							}
 						}
 
 						print "</li>\n";
@@ -482,6 +497,8 @@ function treeOutputForAbsoluteDir($sqltree, $selecteddir, $fullpathselecteddir,
 
 				echo "</ul>\n";
 			}
-		} else print "PermissionDenied";
+		} else {
+			print "PermissionDenied";
+		}
 	}
 }
diff --git a/htdocs/core/ajax/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php
index bc1c5f3721b..adcd1290fed 100644
--- a/htdocs/core/ajax/bankconciliate.php
+++ b/htdocs/core/ajax/bankconciliate.php
@@ -20,11 +20,21 @@
  *       \brief      File to set data for bank concilation
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');    // Required to know date format for dol_print_date
 
 require '../../main.inc.php';
@@ -47,8 +57,7 @@ top_httphead();
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvnext')
-{
+if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvnext') {
 	// Increase date
 	$al = new AccountLine($db);
 	$al->datev_next(GETPOST('rowid', 'int'));
@@ -59,8 +68,7 @@ if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $
 	exit;
 }
 
-if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev')
-{
+if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev') {
 	// Decrease date
 	$al = new AccountLine($db);
 	$al->datev_previous(GETPOST('rowid', 'int'));
@@ -71,8 +79,7 @@ if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $
 	exit;
 }
 
-if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'donext')
-{
+if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'donext') {
 	// Increase date
 	$al = new AccountLine($db);
 	$al->dateo_next(GETPOST('rowid', 'int'));
@@ -83,8 +90,7 @@ if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $
 	exit;
 }
 
-if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev')
-{
+if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev') {
 	// Decrease date
 	$al = new AccountLine($db);
 	$al->dateo_previous(GETPOST('rowid', 'int'));
diff --git a/htdocs/core/ajax/box.php b/htdocs/core/ajax/box.php
index cc27ca11844..17c7b3606d9 100644
--- a/htdocs/core/ajax/box.php
+++ b/htdocs/core/ajax/box.php
@@ -21,11 +21,21 @@
  *       \brief      File to return Ajax response on Box move or close
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
@@ -51,28 +61,27 @@ top_httphead();
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Add a box
-if ($boxid > 0 && $zone != '' && $userid > 0)
-{
+if ($boxid > 0 && $zone != '' && $userid > 0) {
 	$tmp = explode('-', $boxorder);
 	$nbboxonleft = substr_count($tmp[0], ',');
 	$nbboxonright = substr_count($tmp[1], ',');
 	print $nbboxonleft.'-'.$nbboxonright;
-	if ($nbboxonleft > $nbboxonright) $boxorder = preg_replace('/B:/', 'B:'.$boxid.',', $boxorder); // Insert id of new box into list
-	else $boxorder = preg_replace('/^A:/', 'A:'.$boxid.',', $boxorder); // Insert id of new box into list
+	if ($nbboxonleft > $nbboxonright) {
+		$boxorder = preg_replace('/B:/', 'B:'.$boxid.',', $boxorder); // Insert id of new box into list
+	} else {
+		$boxorder = preg_replace('/^A:/', 'A:'.$boxid.',', $boxorder); // Insert id of new box into list
+	}
 }
 
 // Registering the location of boxes after a move
-if ($boxorder && $zone != '' && $userid > 0)
-{
+if ($boxorder && $zone != '' && $userid > 0) {
 	// boxorder value is the target order: "A:idboxA1,idboxA2,A-B:idboxB1,idboxB2,B"
 	dol_syslog("AjaxBox boxorder=".$boxorder." zone=".$zone." userid=".$userid, LOG_DEBUG);
 
 	$result = InfoBox::saveboxorder($db, $zone, $boxorder, $userid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$langs->load("boxes");
-		if (!GETPOST('closing'))
-		{
+		if (!GETPOST('closing')) {
 			setEventMessages($langs->trans("BoxAdded"), null);
 		}
 	}
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index a6134b05bdc..35d10af49b6 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -17,13 +17,27 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
 
 //if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');					// Do not load object $user
 //if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');					// Do not load object $mysoc
@@ -103,25 +117,24 @@ $eventfound = array();
 
 // TODO Try to make a solution with only a javascript timer that is easier. Difficulty is to avoid notification twice when several tabs are opened.
 // This need to extend period to be sure to not miss and save in session what we notified to avoid duplicate.
-if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto_check_events_not_before'] || GETPOST('forcechecknow', 'int'))
-{
+if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto_check_events_not_before'] || GETPOST('forcechecknow', 'int')) {
 	/*$time_update = (int) $conf->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY; // Always defined
-    if (!empty($_SESSION['auto_check_events_not_before']))
-    {
-        // We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer),
-        // then we are not losing periods
-        $starttime = $_SESSION['auto_check_events_not_before'];
-        // Protection to avoid too long sessions
-        if ($starttime < ($time - (int) $conf->global->MAIN_SESSION_TIMEOUT))
-        {
-            dol_syslog("We ask to check browser notification on a too large period. We fix this with current date.");
-            $starttime = $time;
-        }
-    } else {
-        $starttime = $time;
-    }
+	if (!empty($_SESSION['auto_check_events_not_before']))
+	{
+		// We start scan from the not before so if two tabs were opend at differents seconds and we close one (so the js timer),
+		// then we are not losing periods
+		$starttime = $_SESSION['auto_check_events_not_before'];
+		// Protection to avoid too long sessions
+		if ($starttime < ($time - (int) $conf->global->MAIN_SESSION_TIMEOUT))
+		{
+			dol_syslog("We ask to check browser notification on a too large period. We fix this with current date.");
+			$starttime = $time;
+		}
+	} else {
+		$starttime = $time;
+	}
 
-    $_SESSION['auto_check_events_not_before'] = $time + $time_update;
+	$_SESSION['auto_check_events_not_before'] = $time + $time_update;
 	*/
 
 	// Force save of the session change we did.
@@ -150,8 +163,7 @@ if (empty($_SESSION['auto_check_events_not_before']) || $time >= $_SESSION['auto
 
 	$resql = $db->query($sql);
 	if ($resql) {
-		while ($obj = $db->fetch_object($resql))
-		{
+		while ($obj = $db->fetch_object($resql)) {
 			// Message must be formated and translated to be used with javascript directly
 			$event = array();
 			$event['type'] = 'agenda';
diff --git a/htdocs/core/ajax/constantonoff.php b/htdocs/core/ajax/constantonoff.php
index a530bea092f..60684c1520b 100644
--- a/htdocs/core/ajax/constantonoff.php
+++ b/htdocs/core/ajax/constantonoff.php
@@ -20,13 +20,27 @@
  *       \brief      File to set or del an on/off constant
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
-if (!defined('CSRFCHECK_WITH_TOKEN'))  define('CSRFCHECK_WITH_TOKEN', '1'); // Token is required even in GET mode
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Token is required even in GET mode
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -49,18 +63,14 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the new value of constant
-if (!empty($action) && !empty($name))
-{
+if (!empty($action) && !empty($name)) {
 	$entity = GETPOST('entity', 'int');
 	$value = (GETPOST('value') ?GETPOST('value') : 1);
 
-	if ($user->admin)
-	{
-		if ($action == 'set')
-		{
+	if ($user->admin) {
+		if ($action == 'set') {
 			dolibarr_set_const($db, $name, $value, 'chaine', 0, '', $entity);
-		} elseif ($action == 'del')
-		{
+		} elseif ($action == 'del') {
 			dolibarr_del_const($db, $name, $entity);
 		}
 	}
diff --git a/htdocs/core/ajax/contacts.php b/htdocs/core/ajax/contacts.php
index e56b8689e0d..39291eb0bba 100644
--- a/htdocs/core/ajax/contacts.php
+++ b/htdocs/core/ajax/contacts.php
@@ -21,9 +21,15 @@
  *       \brief      File to load contacts combobox
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../../main.inc.php';
 
@@ -45,12 +51,13 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (!empty($id) && !empty($action) && !empty($htmlname))
-{
+if (!empty($id) && !empty($action) && !empty($htmlname)) {
 	$form = new Form($db);
 
 	$return = array();
-	if (empty($showempty)) $showempty = 0;
+	if (empty($showempty)) {
+		$showempty = 0;
+	}
 
 	$return['value']	= $form->selectcontacts($id, '', $htmlname, $showempty, '', '', 0, '', true);
 	$return['num'] = $form->num;
diff --git a/htdocs/core/ajax/extraparams.php b/htdocs/core/ajax/extraparams.php
index 16f39af9bde..ccd8d1bc2ce 100644
--- a/htdocs/core/ajax/extraparams.php
+++ b/htdocs/core/ajax/extraparams.php
@@ -20,11 +20,21 @@
  *	\brief      File to make Ajax action on setting extra parameters of elements
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 include '../../main.inc.php';
 
@@ -41,8 +51,7 @@ top_httphead();
 
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-if (!empty($id) && !empty($element) && !empty($htmlelement) && !empty($type))
-{
+if (!empty($id) && !empty($element) && !empty($htmlelement) && !empty($type)) {
 	$value = GETPOST('value', 'alpha');
 	$params = array();
 
diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index f9f05d4ef9a..0e05036de02 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -21,10 +21,18 @@
  *       \brief      File to return Ajax response on file upload
  */
 
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
 
 
 require '../../main.inc.php';
diff --git a/htdocs/core/ajax/getaccountcurrency.php b/htdocs/core/ajax/getaccountcurrency.php
index ccd7cec64e6..3c1147a1a57 100644
--- a/htdocs/core/ajax/getaccountcurrency.php
+++ b/htdocs/core/ajax/getaccountcurrency.php
@@ -20,9 +20,15 @@
  *       \brief      File to load currency rates
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../../main.inc.php';
 
@@ -38,8 +44,7 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (!empty($id))
-{
+if (!empty($id)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 	$account = new Account($db);
 	$result = $account->fetch($id);
diff --git a/htdocs/core/ajax/loadinplace.php b/htdocs/core/ajax/loadinplace.php
index b1a72868312..0a3e30928b8 100644
--- a/htdocs/core/ajax/loadinplace.php
+++ b/htdocs/core/ajax/loadinplace.php
@@ -20,10 +20,18 @@
  *       \brief      File to load field value
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
@@ -42,24 +50,26 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
-{
+if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element)) {
 	$ext_element	= GETPOST('ext_element', 'alpha');
 	$field = substr($field, 8); // remove prefix val_
 	$type = GETPOST('type', 'alpha');
 	$loadmethod		= (GETPOST('loadmethod', 'alpha') ? GETPOST('loadmethod', 'alpha') : 'getValueFrom');
 
-	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
-	{
+	if ($element != 'order_supplier' && $element != 'invoice_supplier' && preg_match('/^([^_]+)_([^_]+)/i', $element, $regs)) {
 		$element = $regs[1];
 		$subelement = $regs[2];
 	}
 
-	if ($element == 'propal') $element = 'propale';
-	elseif ($element == 'fichinter') $element = 'ficheinter';
-	elseif ($element == 'product') $element = 'produit';
-	elseif ($element == 'member') $element = 'adherent';
-	elseif ($element == 'order_supplier') {
+	if ($element == 'propal') {
+		$element = 'propale';
+	} elseif ($element == 'fichinter') {
+		$element = 'ficheinter';
+	} elseif ($element == 'product') {
+		$element = 'produit';
+	} elseif ($element == 'member') {
+		$element = 'adherent';
+	} elseif ($element == 'order_supplier') {
 		$element = 'fournisseur';
 		$subelement = 'commande';
 	} elseif ($element == 'invoice_supplier') {
@@ -70,23 +80,20 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 	if ($user->rights->$element->lire || $user->rights->$element->read
 	|| (isset($subelement) && ($user->rights->$element->$subelement->lire || $user->rights->$element->$subelement->read))
 	|| ($element == 'payment' && $user->rights->facture->lire)
-	|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->lire))
-	{
-		if ($type == 'select')
-		{
+	|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->lire)) {
+		if ($type == 'select') {
 			$methodname = 'load_cache_'.$loadmethod;
 			$cachename = 'cache_'.GETPOST('loadmethod', 'alpha');
 
 			$form = new Form($db);
-			if (method_exists($form, $methodname))
-			{
+			if (method_exists($form, $methodname)) {
 				$ret = $form->$methodname();
-				if ($ret > 0) echo json_encode($form->$cachename);
-			} elseif (!empty($ext_element))
-			{
+				if ($ret > 0) {
+					echo json_encode($form->$cachename);
+				}
+			} elseif (!empty($ext_element)) {
 				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
-				{
+				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs)) {
 					$module = $regs[1];
 					$subelement = $regs[2];
 				}
@@ -95,7 +102,9 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$classname = 'Actions'.ucfirst($subelement);
 				$object = new $classname($db);
 				$ret = $object->$methodname($fk_element);
-				if ($ret > 0) echo json_encode($object->$cachename);
+				if ($ret > 0) {
+					echo json_encode($object->$cachename);
+				}
 			}
 		} else {
 			$object = new GenericObject($db);
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index ceb221b4870..05843abed9d 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -20,12 +20,24 @@
  *       			 This Ajax service is called when option MAIN_DIRECT_STATUS_UPDATE is set.
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
@@ -35,9 +47,19 @@ $id = GETPOST('id', 'int');
 $value = GETPOST('value', 'int');
 $field = GETPOST('field', 'alpha');
 $element = GETPOST('element', 'alpha');
+$format = 'int';
 
 $object = new GenericObject($db);
 
+$tablename = $element;
+if ($tablename == 'websitepage') {
+	$tablename = 'website_page';
+}
+
+$object->table_element = $tablename;
+$object->id = $id;
+$object->fields[$field] = array('type' => $format, 'enabled' => 1);
+
 // Security check
 if (!empty($user->socid)) {
 	$socid = $user->socid;
@@ -57,9 +79,9 @@ top_httphead();
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 if (in_array($field, array('status'))) {
-	$result = restrictedArea($user, $element, $id);
+	restrictedArea($user, $element, $id);
 } elseif ($element == 'product' && in_array($field, array('tosell', 'tobuy', 'tobatch'))) {	// Special case for products
-	$result = restrictedArea($user, 'produit|service', $id, 'product&product', '', '', 'rowid');
+	restrictedArea($user, 'produit|service', $id, 'product&product', '', '', 'rowid');
 } else {
 	accessforbidden("Bad value for combination of parameters element/field.", 0, 0, 1);
 	exit;
@@ -73,10 +95,5 @@ if (($action == 'set') && !empty($id)) {
 		$triggerkey = 'COMPANY_UPDATE';
 	}
 
-	$tablename = $element;
-	if ($tablename == 'websitepage') $tablename = 'website_page';
-
-	$format = 'int';
-
 	$object->setValueFrom($field, $value, $tablename, $id, $format, '', $user, $triggerkey);
 }
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index e58895a967f..990c3f6f858 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -20,12 +20,24 @@
  *       \brief      File to save result of an anonymous ping into database (1 ping is done per installation)
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
@@ -36,8 +48,9 @@ $hash_algo = GETPOST('hash_algo', 'alpha');
 
 
 // Security check
-if (!empty($user->socid))
+if (!empty($user->socid)) {
 	$socid = $user->socid;
+}
 
 $now = dol_now();
 
@@ -51,8 +64,7 @@ top_httphead();
 print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // If ok
-if ($action == 'firstpingok')
-{
+if ($action == 'firstpingok') {
 	// Note: pings are per installed instances / entity.
 	// Once this constants are set, no more ping will be tried (except if we add parameter &forceping=1 on URL). So we can say this are 'first' ping.
 	dolibarr_set_const($db, 'MAIN_FIRST_PING_OK_DATE', dol_print_date($now, 'dayhourlog', 'gmt'));
@@ -61,8 +73,7 @@ if ($action == 'firstpingok')
 	print 'First ping OK saved for entity '.$conf->entity;
 }
 // If ko
-elseif ($action == 'firstpingko')
-{
+elseif ($action == 'firstpingko') {
 	// Note: pings are by installation, done on entity 1.
 	dolibarr_set_const($db, 'MAIN_LAST_PING_KO_DATE', dol_print_date($now, 'dayhourlog'), 'gmt'); // erase last value
 	print 'First ping KO saved for entity '.$conf->entity;
diff --git a/htdocs/core/ajax/price.php b/htdocs/core/ajax/price.php
index 0dec4d21c68..bf93e12fce8 100644
--- a/htdocs/core/ajax/price.php
+++ b/htdocs/core/ajax/price.php
@@ -20,10 +20,18 @@
  *       \brief      File to get ht and ttc
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 
@@ -40,13 +48,11 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (!empty($output) && isset($amount) && isset($tva_tx))
-{
+if (!empty($output) && isset($amount) && isset($tva_tx)) {
 	$return = array();
 	$price = '';
 
-	if (is_numeric($amount) && $amount != '')
-	{
+	if (is_numeric($amount) && $amount != '') {
 		if ($output == 'price_ttc') {
 			$price = price2num($amount * (1 + ($tva_tx / 100)), 'MU');
 			$return['price_ht'] = $amount;
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index afb33907593..883ba664b5c 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -27,12 +27,24 @@
  *                   element_id (Example: 1)
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disable token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disable token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
@@ -48,8 +60,7 @@ print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"])
 
 // Registering the location of boxes
 if (GETPOST('roworder', 'alpha') && GETPOST('table_element_line', 'alpha', 2)
-	&& GETPOST('fk_element', 'alpha', 2) && GETPOST('element_id', 'int', 2))
-{
+	&& GETPOST('fk_element', 'alpha', 2) && GETPOST('element_id', 'int', 2)) {
 	$roworder = GETPOST('roworder', 'alpha', 2);
 	$table_element_line = GETPOST('table_element_line', 'alpha', 2);
 	$fk_element = GETPOST('fk_element', 'alpha', 2);
@@ -59,9 +70,10 @@ if (GETPOST('roworder', 'alpha') && GETPOST('table_element_line', 'alpha', 2)
 
 	$rowordertab = explode(',', $roworder);
 	$newrowordertab = array();
-	foreach ($rowordertab as $value)
-	{
-		if (!empty($value)) $newrowordertab[] = $value;
+	foreach ($rowordertab as $value) {
+		if (!empty($value)) {
+			$newrowordertab[] = $value;
+		}
 	}
 
 	$row = new GenericObject($db);
@@ -73,8 +85,7 @@ if (GETPOST('roworder', 'alpha') && GETPOST('table_element_line', 'alpha', 2)
 
 	// Reorder line to have position of children lines sharing same counter than parent lines
 	// This should be useless because there is no need to have children sharing same counter than parent, but well, it's cleaner into database.
-	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande')))
-	{
+	if (in_array($fk_element, array('fk_facture', 'fk_propal', 'fk_commande'))) {
 		$result = $row->line_order(true);
 	}
 }
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 8273683b8de..2f88cebf58b 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -20,10 +20,18 @@
  *       \brief      File to save field value
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
@@ -56,8 +64,7 @@ top_httphead();
 //print_r($_POST);
 
 // Load original field value
-if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element))
-{
+if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_element)) {
 	$ext_element = GETPOST('ext_element', 'alpha', 2);
 	$field = substr($field, 8); // remove prefix val_
 	$type = GETPOST('type', 'alpha', 2);
@@ -124,18 +131,15 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 		|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->creer))
 	*/
 
-	if ($check_access)
-	{
+	if ($check_access) {
 		// Clean parameters
 		$newvalue = trim($value);
 
-		if ($type == 'numeric')
-		{
+		if ($type == 'numeric') {
 			$newvalue = price2num($newvalue);
 
 			// Check parameters
-			if (!is_numeric($newvalue))
-			{
+			if (!is_numeric($newvalue)) {
 				$error++;
 				$return['error'] = $langs->trans('ErrorBadValue');
 			}
@@ -149,16 +153,13 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 			$loadviewname = 'view_'.$loadmethod;
 
 			$form = new Form($db);
-			if (method_exists($form, $loadmethodname))
-			{
+			if (method_exists($form, $loadmethodname)) {
 				$ret = $form->$loadmethodname();
-				if ($ret > 0)
-				{
+				if ($ret > 0) {
 					$loadcache = $form->$loadcachename;
 					$value = $loadcache[$newvalue];
 
-					if (!empty($form->$loadviewname))
-					{
+					if (!empty($form->$loadviewname)) {
 						$loadview = $form->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
@@ -168,8 +169,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				}
 			} else {
 				$module = $subelement = $ext_element;
-				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs))
-				{
+				if (preg_match('/^([^_]+)_([^_]+)/i', $ext_element, $regs)) {
 					$module = $regs[1];
 					$subelement = $regs[2];
 				}
@@ -178,13 +178,11 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 				$classname = 'Actions'.ucfirst($subelement);
 				$object = new $classname($db);
 				$ret = $object->$loadmethodname();
-				if ($ret > 0)
-				{
+				if ($ret > 0) {
 					$loadcache = $object->$loadcachename;
 					$value = $loadcache[$newvalue];
 
-					if (!empty($object->$loadviewname))
-					{
+					if (!empty($object->$loadviewname)) {
 						$loadview = $object->$loadviewname;
 						$view = $loadview[$newvalue];
 					}
@@ -195,9 +193,10 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 			}
 		}
 
-		if (!$error)
-		{
-			if ((isset($object) && !is_object($object)) || empty($savemethod)) $object = new GenericObject($db);
+		if (!$error) {
+			if ((isset($object) && !is_object($object)) || empty($savemethod)) {
+				$object = new GenericObject($db);
+			}
 
 			// Specific for add_object_linked()
 			// TODO add a function for variable treatment
@@ -207,10 +206,12 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 			$object->element = $element;
 
 			$ret = $object->$savemethodname($field, $newvalue, $table_element, $fk_element, $format);
-			if ($ret > 0)
-			{
-				if ($type == 'numeric') $value = price($newvalue);
-				elseif ($type == 'textarea') $value = dol_nl2br($newvalue);
+			if ($ret > 0) {
+				if ($type == 'numeric') {
+					$value = price($newvalue);
+				} elseif ($type == 'textarea') {
+					$value = dol_nl2br($newvalue);
+				}
 
 				$return['value'] = $value;
 				$return['view'] = (!empty($view) ? $view : $value);
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index 66071b48339..066e5b7812d 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -21,12 +21,24 @@
  *                   like key to use into URL to protect them.
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
 
 require '../../main.inc.php';
 
@@ -40,10 +52,8 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
-if (isset($_GET['action']) && !empty($_GET['action']))
-{
-	if ($_GET['action'] == 'getrandompassword' && $user->admin)
-	{
+if (isset($_GET['action']) && !empty($_GET['action'])) {
+	if ($_GET['action'] == 'getrandompassword' && $user->admin) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 		$generic = $_GET['generic'] ? true : false;
 		echo getRandomPassword($generic);
diff --git a/htdocs/core/ajax/selectobject.php b/htdocs/core/ajax/selectobject.php
index 9d9b7bbfc42..c491ad63749 100644
--- a/htdocs/core/ajax/selectobject.php
+++ b/htdocs/core/ajax/selectobject.php
@@ -20,12 +20,24 @@
  *       \brief      File to return Ajax response on a selection list request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
 
 require '../../main.inc.php';
 
@@ -54,22 +66,21 @@ $form = new Form($db);
 
 top_httphead();
 
-if (empty($htmlname)) return;
+if (empty($htmlname)) {
+	return;
+}
 
 
 $InfoFieldList = explode(":", $objectdesc);
 $classname = $InfoFieldList[0];
 $classpath = $InfoFieldList[1];
-if (!empty($classpath))
-{
+if (!empty($classpath)) {
 	dol_include_once($classpath);
-	if ($classname && class_exists($classname))
-	{
+	if ($classname && class_exists($classname)) {
 		$objecttmp = new $classname($db);
 	}
 }
-if (!is_object($objecttmp))
-{
+if (!is_object($objecttmp)) {
 	dol_syslog('Error bad param objectdesc', LOG_WARNING);
 	print 'Error bad param objectdesc';
 }
@@ -84,4 +95,6 @@ $arrayresult = $form->selectForFormsList($objecttmp, $htmlname, '', 0, $searchke
 
 $db->close();
 
-if ($outjson) print json_encode($arrayresult);
+if ($outjson) {
+	print json_encode($arrayresult);
+}
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 877379b54ad..2e19d68109a 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -24,21 +24,31 @@
 
 // This script is called with a POST method or as an include.
 
-if (!isset($usedbyinclude) || empty($usedbyinclude))
-{
-	if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-	if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-	if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-	if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-	if (!defined('NOREDIRECTBYMAINTOLOGIN')) define('NOREDIRECTBYMAINTOLOGIN', '1');
+if (!isset($usedbyinclude) || empty($usedbyinclude)) {
+	if (!defined('NOTOKENRENEWAL')) {
+		define('NOTOKENRENEWAL', 1); // Disables token renewal
+	}
+	if (!defined('NOREQUIREMENU')) {
+		define('NOREQUIREMENU', '1');
+	}
+	if (!defined('NOREQUIREHTML')) {
+		define('NOREQUIREHTML', '1');
+	}
+	if (!defined('NOREQUIREAJAX')) {
+		define('NOREQUIREAJAX', '1');
+	}
+	if (!defined('NOREDIRECTBYMAINTOLOGIN')) {
+		define('NOREDIRECTBYMAINTOLOGIN', '1');
+	}
 
 	$res = @include '../../main.inc.php';
-	if ($res == 'ERROR_NOT_LOGGED')
-	{
+	if ($res == 'ERROR_NOT_LOGGED') {
 		$langs->load("other");
 		$arrayresult['jumptologin'] = array('img'=>'object_generic', 'label'=>$langs->trans("JumpToLogin"), 'text'=>'<span class="fa fa-sign-in"></span> '.$langs->trans("JumpToLogin"), 'url'=>DOL_URL_ROOT.'/index.php');
 		print json_encode($arrayresult);
-		if (is_object($db)) $db->close();
+		if (is_object($db)) {
+			$db->close();
+		}
 		exit;
 	}
 }
@@ -54,74 +64,59 @@ $arrayresult = array();
 
 // Define $searchform
 
-if (!empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire)
-{
+if (!empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire) {
 	$arrayresult['searchintomember'] = array('position'=>8, 'shortcut'=>'M', 'img'=>'object_member', 'label'=>$langs->trans("SearchIntoMembers", $search_boxvalue), 'text'=>img_picto('', 'object_member').' '.$langs->trans("SearchIntoMembers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/adherents/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (((!empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || !empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire)
-{
+if (((!empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || !empty($conf->fournisseur->enabled)) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire) {
 	$arrayresult['searchintothirdparty'] = array('position'=>10, 'shortcut'=>'T', 'img'=>'object_company', 'label'=>$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'text'=>img_picto('', 'object_company').' '.$langs->trans("SearchIntoThirdparties", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/societe/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (!empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire)
-{
+if (!empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire) {
 	$arrayresult['searchintocontact'] = array('position'=>15, 'shortcut'=>'A', 'img'=>'object_contact', 'label'=>$langs->trans("SearchIntoContacts", $search_boxvalue), 'text'=>img_picto('', 'object_contact').' '.$langs->trans("SearchIntoContacts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contact/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
 if (((!empty($conf->product->enabled) && $user->rights->produit->lire) || (!empty($conf->service->enabled) && $user->rights->service->lire))
-&& empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED))
-{
+&& empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED)) {
 	$arrayresult['searchintoproduct'] = array('position'=>30, 'shortcut'=>'P', 'img'=>'object_product', 'label'=>$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'text'=>img_picto('', 'object_product').' '.$langs->trans("SearchIntoProductsOrServices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (!empty($conf->mrp->enabled) && $user->rights->mrp->read && empty($conf->global->MAIN_SEARCHFORM_MRP_DISABLED))
-{
+if (!empty($conf->mrp->enabled) && $user->rights->mrp->read && empty($conf->global->MAIN_SEARCHFORM_MRP_DISABLED)) {
 	$arrayresult['searchintomo'] = array('position'=>35, 'shortcut'=>'', 'img'=>'object_mrp', 'label'=>$langs->trans("SearchIntoMO", $search_boxvalue), 'text'=>img_picto('', 'object_mrp').' '.$langs->trans("SearchIntoMO", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/mrp/mo_list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire)
-{
+if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire) {
 	$arrayresult['searchintoprojects'] = array('position'=>40, 'shortcut'=>'Q', 'img'=>'object_project', 'label'=>$langs->trans("SearchIntoProjects", $search_boxvalue), 'text'=>img_picto('', 'object_project').' '.$langs->trans("SearchIntoProjects", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire)
-{
+if (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire) {
 	$arrayresult['searchintotasks'] = array('position'=>45, 'img'=>'object_projecttask', 'label'=>$langs->trans("SearchIntoTasks", $search_boxvalue), 'text'=>img_picto('', 'object_projecttask').' '.$langs->trans("SearchIntoTasks", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/projet/tasks/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
 
-if (!empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire)
-{
+if (!empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire) {
 	$arrayresult['searchintopropal'] = array('position'=>60, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'text'=>img_picto('', 'object_propal').' '.$langs->trans("SearchIntoCustomerProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/comm/propal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire)
-{
+if (!empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire) {
 	$arrayresult['searchintoorder'] = array('position'=>70, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'text'=>img_picto('', 'object_order').' '.$langs->trans("SearchIntoCustomerOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/commande/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire)
-{
+if (!empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire) {
 	$arrayresult['searchintoshipment'] = array('position'=>80, 'img'=>'object_shipment', 'label'=>$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'text'=>img_picto('', 'object_shipment').' '.$langs->trans("SearchIntoCustomerShipments", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expedition/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
-{
+if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire) {
 	$arrayresult['searchintoinvoice'] = array('position'=>90, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_bill').' '.$langs->trans("SearchIntoCustomerInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/compta/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire)
-{
+if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire) {
 	$arrayresult['searchintosupplierpropal'] = array('position'=>100, 'img'=>'object_propal', 'label'=>$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_proposal').' '.$langs->trans("SearchIntoSupplierProposals", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/supplier_proposal/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire)
-{
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
 	$arrayresult['searchintosupplierorder'] = array('position'=>110, 'img'=>'object_order', 'label'=>$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_order').' '.$langs->trans("SearchIntoSupplierOrders", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/commande/list.php'.($search_boxvalue ? '?search_all='.urlencode($search_boxvalue) : ''));
 }
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
-{
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
 // Customer payments
-if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
-{
+if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire) {
 	$arrayresult['searchintocustomerpayments'] = array(
 		'position'=>170,
 		'img'=>'object_payment',
@@ -131,8 +126,7 @@ if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUST
 }
 
 // Vendor payments
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
-{
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 	$arrayresult['searchintovendorpayments'] = array(
 		'position'=>175,
 		'img'=>'object_payment',
@@ -142,8 +136,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM
 }
 
 // Miscellaneous payments
-if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED) && $user->rights->banque->lire)
-{
+if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED) && $user->rights->banque->lire) {
 	$arrayresult['searchintomiscpayments'] = array(
 		'position'=>180,
 		'img'=>'object_payment',
@@ -152,53 +145,51 @@ if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_SEARCHFORM_MISC_
 		'url'=>DOL_URL_ROOT.'/compta/bank/various_payment/list.php?leftmenu=tax_various'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (!empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire)
-{
+if (!empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire) {
 	$arrayresult['searchintocontract'] = array('position'=>130, 'img'=>'object_contract', 'label'=>$langs->trans("SearchIntoContracts", $search_boxvalue), 'text'=>img_picto('', 'object_contract').' '.$langs->trans("SearchIntoContracts", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/contrat/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire)
-{
+if (!empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire) {
 	$arrayresult['searchintointervention'] = array('position'=>140, 'img'=>'object_intervention', 'label'=>$langs->trans("SearchIntoInterventions", $search_boxvalue), 'text'=>img_picto('', 'object_intervention').' '.$langs->trans("SearchIntoInterventions", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fichinter/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->ticket->enabled) && empty($conf->global->MAIN_SEARCHFORM_TICKET_DISABLED) && $user->rights->ticket->read)
-{
+if (!empty($conf->ticket->enabled) && empty($conf->global->MAIN_SEARCHFORM_TICKET_DISABLED) && $user->rights->ticket->read) {
 	$arrayresult['searchintotickets'] = array('position'=>145, 'img'=>'object_ticket', 'label'=>$langs->trans("SearchIntoTickets", $search_boxvalue), 'text'=>img_picto('', 'object_ticket').' '.$langs->trans("SearchIntoTickets", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/ticket/list.php?mainmenu=ticket'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
 // HR
-if (!empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire)
-{
+if (!empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire) {
 	$arrayresult['searchintouser'] = array('position'=>200, 'shortcut'=>'U', 'img'=>'object_user', 'label'=>$langs->trans("SearchIntoUsers", $search_boxvalue), 'text'=>img_picto('', 'object_user').' '.$langs->trans("SearchIntoUsers", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/user/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire)
-{
+if (!empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire) {
 	$arrayresult['searchintoexpensereport'] = array('position'=>210, 'img'=>'object_trip', 'label'=>$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'text'=>img_picto('', 'object_trip').' '.$langs->trans("SearchIntoExpenseReports", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read)
-{
+if (!empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read) {
 	$arrayresult['searchintoleaves'] = array('position'=>220, 'img'=>'object_holiday', 'label'=>$langs->trans("SearchIntoLeaves", $search_boxvalue), 'text'=>img_picto('', 'object_holiday').' '.$langs->trans("SearchIntoLeaves", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
 // Execute hook addSearchEntry
 $parameters = array('search_boxvalue'=>$search_boxvalue, 'arrayresult'=>$arrayresult);
 $reshook = $hookmanager->executeHooks('addSearchEntry', $parameters);
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$arrayresult = array_merge($arrayresult, $hookmanager->resArray);
-} else $arrayresult = $hookmanager->resArray;
+} else {
+	$arrayresult = $hookmanager->resArray;
+}
 
 // This pushes a search entry to the top
 if (!empty($conf->global->DEFAULT_SEARCH_INTO_MODULE)) {
 	$key = 'searchinto'.$conf->global->DEFAULT_SEARCH_INTO_MODULE;
-	if (array_key_exists($key, $arrayresult)) $arrayresult[$key]['position'] = -1000;
+	if (array_key_exists($key, $arrayresult)) {
+		$arrayresult[$key]['position'] = -1000;
+	}
 }
 
 // Sort on position
 $arrayresult = dol_sort_array($arrayresult, 'position');
 
 // Print output if called by ajax or do nothing (var $arrayresult will be used) if called by an include
-if (!isset($usedbyinclude) || empty($usedbyinclude))
-{
+if (!isset($usedbyinclude) || empty($usedbyinclude)) {
 	print json_encode($arrayresult);
-	if (is_object($db)) $db->close();
+	if (is_object($db)) {
+		$db->close();
+	}
 }
diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php
index 0bd16eb6449..7bb8be9e612 100644
--- a/htdocs/core/ajax/vatrates.php
+++ b/htdocs/core/ajax/vatrates.php
@@ -20,9 +20,15 @@
  *       \brief      File to load vat rates combobox
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 require '../../main.inc.php';
 
@@ -41,15 +47,13 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (!empty($id) && !empty($action) && !empty($htmlname))
-{
+if (!empty($id) && !empty($action) && !empty($htmlname)) {
 	$form = new Form($db);
 	$soc = new Societe($db);
 
 	$soc->fetch($id);
 
-	if ($action == 'getSellerVATRates')
-	{
+	if ($action == 'getSellerVATRates') {
 		$seller = $mysoc;
 		$buyer = $soc;
 	} else {
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index dfa1f3f8419..44c7bc0760b 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -22,12 +22,24 @@
  *       \brief     File to return Ajax response on zipcode or town request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
@@ -51,8 +63,7 @@ dol_syslog("GET is ".join(',', $_GET).', MAIN_USE_ZIPTOWN_DICTIONNARY='.(empty($
 //var_dump($_GET);
 
 // Generation of list of zip-town
-if (!empty($_GET['zipcode']) || !empty($_GET['town']))
-{
+if (!empty($_GET['zipcode']) || !empty($_GET['town'])) {
 	$return_arr = array();
 	$formcompany = new FormCompany($db);
 
@@ -60,8 +71,7 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 	$zipcode = $_GET['zipcode'] ? $_GET['zipcode'] : '';
 	$town = $_GET['town'] ? $_GET['town'] : '';
 
-	if (!empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY))   // Use zip-town table
-	{
+	if (!empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) {   // Use zip-town table
 		$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
 		$sql .= ", c.rowid as fk_country, c.code as country_code, c.label as country";
 		$sql .= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
@@ -71,8 +81,12 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 		$sql .= " ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE z.fk_pays = c.rowid";
 		$sql .= " AND z.active = 1 AND c.active = 1";
-		if ($zipcode) $sql .= " AND z.zip LIKE '".$db->escape($zipcode)."%'";
-		if ($town)    $sql .= " AND z.town LIKE '%".$db->escape($town)."%'";
+		if ($zipcode) {
+			$sql .= " AND z.zip LIKE '".$db->escape($zipcode)."%'";
+		}
+		if ($town) {
+			$sql .= " AND z.town LIKE '%".$db->escape($town)."%'";
+		}
 		$sql .= " ORDER BY z.zip, z.town";
 		$sql .= $db->plimit(100); // Avoid pb with bad criteria
 	} else // Use table of third parties
@@ -84,8 +98,12 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON s.fk_departement = d.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
 		$sql .= " WHERE";
-		if ($zipcode) $sql .= " s.zip LIKE '".$db->escape($zipcode)."%'";
-		if ($town)    $sql .= " s.town LIKE '%".$db->escape($town)."%'";
+		if ($zipcode) {
+			$sql .= " s.zip LIKE '".$db->escape($zipcode)."%'";
+		}
+		if ($town) {
+			$sql .= " s.town LIKE '%".$db->escape($town)."%'";
+		}
 		$sql .= " ORDER BY s.fk_pays, s.zip, s.town";
 		$sql .= $db->plimit(100); // Avoid pb with bad criteria
 	}
@@ -93,10 +111,8 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 	//print $sql;
 	$resql = $db->query($sql);
 	//var_dump($db);
-	if ($resql)
-	{
-		while ($row = $db->fetch_array($resql))
-		{
+	if ($resql) {
+		while ($row = $db->fetch_array($resql)) {
 			$country = $row['fk_country'] ? ($langs->transnoentitiesnoconv('Country'.$row['country_code']) != 'Country'.$row['country_code'] ? $langs->transnoentitiesnoconv('Country'.$row['country_code']) : $row['country']) : '';
 			$county = $row['fk_county'] ? ($langs->transnoentitiesnoconv($row['county_code']) != $row['county_code'] ? $langs->transnoentitiesnoconv($row['county_code']) : ($row['county'] != '-' ? $row['county'] : '')) : '';
 
@@ -106,13 +122,11 @@ if (!empty($_GET['zipcode']) || !empty($_GET['town']))
 			$row_array['label'] .= ($county && $country ? ' - ' : '');
 			$row_array['label'] .= $country;
 			$row_array['label'] .= ($county || $country) ? ')' : '';
-			if ($zipcode)
-			{
+			if ($zipcode) {
 				$row_array['value'] = $row['zip'];
 				$row_array['town'] = $row['town'];
 			}
-			if ($town)
-			{
+			if ($town) {
 				$row_array['value'] = $row['town'];
 				$row_array['zipcode'] = $row['zip'];
 			}
diff --git a/htdocs/core/antispamimage.php b/htdocs/core/antispamimage.php
index 7d6512a64a9..58d6b2da5e1 100644
--- a/htdocs/core/antispamimage.php
+++ b/htdocs/core/antispamimage.php
@@ -23,12 +23,24 @@
 
 define('NOLOGIN', 1);
 
-if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', 1);
-if (!defined('NOREQUIREDB'))     define('NOREQUIREDB', 1);
-if (!defined('NOREQUIRETRAN'))   define('NOREQUIRETRAN', 1);
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', 1);
+}
+if (!defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', 1);
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
 
 require_once '../main.inc.php';
 
@@ -41,8 +53,7 @@ $length = 5;
 $letters = 'aAbBCDeEFgGhHJKLmMnNpPqQRsStTuVwWXYZz2345679';
 $number = strlen($letters);
 $string = '';
-for ($i = 0; $i < $length; $i++)
-{
+for ($i = 0; $i < $length; $i++) {
 	$string .= $letters[mt_rand(0, $number - 1)];
 }
 //print $string;
@@ -52,8 +63,7 @@ $sessionkey = 'dol_antispam_value';
 $_SESSION[$sessionkey] = $string;
 
 $img = imagecreate(80, 32);
-if (empty($img))
-{
+if (empty($img)) {
 	dol_print_error('', "Problem with GD creation");
 	exit;
 }
diff --git a/htdocs/core/boxes/box_accountancy_last_manual_entries.php b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
index e9b2fe0cd2d..f3893692845 100644
--- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php
+++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
@@ -79,8 +79,7 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastManualEntries", $max));
 
-		if ($user->rights->accounting->mouvements->lire)
-		{
+		if ($user->rights->accounting->mouvements->lire) {
 			$sql = "SELECT DISTINCT b.piece_num";
 			$sql .= ", b.doc_date as date_movement";
 			$sql .= ", b.label_operation";
@@ -140,10 +139,12 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
 					'td' => 'class="center"',
 					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedManualEntries").'</span>'
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_accountancy_suspense_account.php b/htdocs/core/boxes/box_accountancy_suspense_account.php
index 653f49d2bd9..31eaa65bf72 100644
--- a/htdocs/core/boxes/box_accountancy_suspense_account.php
+++ b/htdocs/core/boxes/box_accountancy_suspense_account.php
@@ -78,11 +78,9 @@ class box_accountancy_suspense_account extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleSuspenseAccount"));
 
-		if ($user->rights->accounting->mouvements->lire)
-		{
+		if ($user->rights->accounting->mouvements->lire) {
 			$suspenseAccount = $conf->global->ACCOUNTING_ACCOUNT_SUSPENSE;
-			if (!empty($suspenseAccount) && $suspenseAccount > 0)
-			{
+			if (!empty($suspenseAccount) && $suspenseAccount > 0) {
 				$sql = "SELECT COUNT(*) as nb_suspense_account";
 				$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as b";
 				$sql .= " WHERE b.numero_compte = ".$suspenseAccount;
@@ -90,8 +88,7 @@ class box_accountancy_suspense_account extends ModeleBoxes
 
 				$result = $this->db->query($sql);
 				$nbSuspenseAccount = 0;
-				if ($result)
-				{
+				if ($result) {
 					$obj = $this->db->fetch_object($result);
 					$nbSuspenseAccount = $obj->nb_suspense_account;
 				}
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index a86ee5a609a..e14fdfcb457 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -92,14 +92,22 @@ class box_actions extends ModeleBoxes
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm AS ta, ".MAIN_DB_PREFIX."actioncomm AS a";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
+			if (!$user->rights->societe->client->voir && !$user->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 .= " WHERE a.fk_action = ta.id";
 			$sql .= " AND a.entity IN (".getEntity('actioncomm').")";
 			$sql .= " AND a.percent >= 0 AND a.percent < 100";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
-			if ($user->socid)   $sql .= " AND s.rowid = ".$user->socid;
-			if (!$user->rights->agenda->allactions->read) $sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id.")";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
+			if (!$user->rights->agenda->allactions->read) {
+				$sql .= " AND (a.fk_user_author = ".$user->id." OR a.fk_user_action = ".$user->id." OR a.fk_user_done = ".$user->id.")";
+			}
 			$sql .= " ORDER BY a.datec DESC";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -132,8 +140,9 @@ class box_actions extends ModeleBoxes
 					$societestatic->email = $objp->email;
 					$societestatic->entity = $objp->entity;
 
-					if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite < ($now - $delay_warning))
+					if ($objp->percentage >= 0 && $objp->percentage < 100 && $datelimite < ($now - $delay_warning)) {
 						$late = img_warning($langs->trans("Late"));
+					}
 
 					//($langs->transnoentities("Action".$objp->code)!=("Action".$objp->code) ? $langs->transnoentities("Action".$objp->code) : $objp->label)
 					$label = empty($objp->label) ? $objp->type_label : $objp->label;
@@ -172,11 +181,12 @@ class box_actions extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center opacitymedium"',
 						'text'=>$langs->trans("NoActionsToDo")
 					);
+				}
 
 				$this->db->free($result);
 			} else {
@@ -207,19 +217,15 @@ class box_actions extends ModeleBoxes
 		global $langs, $conf;
 		$out = parent::showBox($this->info_box_head, $this->info_box_contents, 1);
 
-		if (!empty($conf->global->SHOW_DIALOG_HOMEPAGE))
-		{
+		if (!empty($conf->global->SHOW_DIALOG_HOMEPAGE)) {
 			$actioncejour = false;
 			$contents = $this->info_box_contents;
 			$nblines = count($contents);
-			if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo"))
-			{
+			if ($contents[0][0]['text'] != $langs->trans("NoActionsToDo")) {
 				$out .= '<div id="dialogboxaction" title="'.$nblines." ".$langs->trans("ActionsToDo").'">';
 				$out .= '<table width=100%>';
-				for ($line = 0, $n = $nblines; $line < $n; $line++)
-				{
-					if (isset($contents[$line]))
-					{
+				for ($line = 0, $n = $nblines; $line < $n; $line++) {
+					if (isset($contents[$line])) {
 						// on affiche que les évènement du jours ou passé
 						// qui ne sont pas à 100%
 						$actioncejour = true;
@@ -247,12 +253,10 @@ class box_actions extends ModeleBoxes
 				$out .= '</table>';
 			}
 			$out .= '</div>';
-			if ($actioncejour)
-			{
+			if ($actioncejour) {
 				$out .= '<script>';
 				$out .= '$("#dialogboxaction").dialog({ autoOpen: true });';
-				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1)    // autoclose after this delay
-				{
+				if ($conf->global->SHOW_DIALOG_HOMEPAGE > 1) {    // autoclose after this delay
 					$out .= 'setTimeout(function(){';
 					$out .= '$("#dialogboxaction").dialog("close");';
 					$out .= '}, '.($conf->global->SHOW_DIALOG_HOMEPAGE * 1000).');';
@@ -265,8 +269,11 @@ class box_actions extends ModeleBoxes
 			}
 		}
 
-		if ($nooutput) return $out;
-		else print $out;
+		if ($nooutput) {
+			return $out;
+		} else {
+			print $out;
+		}
 
 		return '';
 	}
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index b0dc89f5817..18c1f28c590 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -88,7 +88,9 @@ class box_activity extends ModeleBoxes
 		$now = dol_now();
 		$nbofperiod = 3;
 
-		if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
+		if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) {
+			$nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
+		}
 		$textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
 		$this->info_box_head = array(
 			'text' => $textHead,
@@ -201,12 +203,18 @@ class box_activity extends ModeleBoxes
 			if ($refresh) {
 				$sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-				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 .= ")";
 				$sql .= " WHERE c.entity IN (".getEntity('commande').")";
 				$sql .= " AND c.fk_soc = s.rowid";
-				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				if (!$user->rights->societe->client->voir && !$user->socid) {
+					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				}
+				if ($user->socid) {
+					$sql .= " AND s.rowid = ".$user->socid;
+				}
 				$sql .= " AND c.date_commande >= '".$this->db->idate($tmpdate)."'";
 				$sql .= " GROUP BY c.fk_statut";
 				$sql .= " ORDER BY c.fk_statut DESC";
@@ -270,8 +278,7 @@ class box_activity extends ModeleBoxes
 
 
 		// list the summary of the bills
-		if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-		{
+		if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$facturestatic = new Facture($this->db);
 
@@ -281,15 +288,20 @@ class box_activity extends ModeleBoxes
 
 			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 			$data = array();
-			if ($refresh)
-			{
+			if ($refresh) {
 				$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
 				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-				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 .= ")";
 				$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				if (!$user->rights->societe->client->voir && !$user->socid) {
+					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				}
+				if ($user->socid) {
+					$sql .= " AND s.rowid = ".$user->socid;
+				}
 				$sql .= " AND f.fk_soc = s.rowid";
 				$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=1";
 				$sql .= " GROUP BY f.fk_statut";
@@ -343,7 +355,7 @@ class box_activity extends ModeleBoxes
 					);
 
 					// We add only for the current year
-	   				$totalnb += $data[$j]->nb;
+					$totalnb += $data[$j]->nb;
 
 					$this->info_box_contents[$line][4] = array(
 						'td' => 'class="right" width="18"',
@@ -352,11 +364,12 @@ class box_activity extends ModeleBoxes
 					$line++;
 					$j++;
 				}
-				if (count($data) == 0)
+				if (count($data) == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
 						'text'=>$langs->trans("NoRecordedInvoices"),
 					);
+				}
 			}
 
 			// part 2
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index ea83e022079..d6e6296a3cc 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -82,8 +82,7 @@ class box_birthdays extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleUserBirthdaysOfMonth"));
 
-		if ($user->rights->user->user->lire)
-		{
+		if ($user->rights->user->user->lire) {
 			$tmparray = dol_getdate(dol_now(), true);
 
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth, u.email, u.statut as status";
@@ -96,13 +95,11 @@ class box_birthdays extends ModeleBoxes
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 
 					$userstatic->id = $objp->rowid;
@@ -126,14 +123,16 @@ class box_birthdays extends ModeleBoxes
 					);
 
 					/*$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $userstatic->LibStatut($objp->status, 3)
-                    );*/
+						'td' => 'class="right" width="18"',
+						'text' => $userstatic->LibStatut($objp->status, 3)
+					);*/
 
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 56619fac581..5445ad312fa 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -82,27 +82,24 @@ class box_birthdays_members extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleMemberNextBirthdays"));
 
-		if ($user->rights->adherent->lire)
-		{
+		if ($user->rights->adherent->lire) {
 			$tmparray = dol_getdate(dol_now(), true);
 
 			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth";
 			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as u";
 			$sql .= " WHERE u.entity IN (".getEntity('adherent').")";
-	  		$sql .= " AND u.statut = 1";
-	  		$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
+			$sql .= " AND u.statut = 1";
+			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
 			$sql .= " ORDER BY DAY(u.birth) ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$memberstatic->id = $objp->rowid;
 					$memberstatic->firstname = $objp->firstname;
@@ -123,14 +120,16 @@ class box_birthdays_members extends ModeleBoxes
 					);
 
 					/*$this->info_box_contents[$line][] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $memberstatic->LibStatut($objp->status, 3)
-                    );*/
+						'td' => 'class="right" width="18"',
+						'text' => $memberstatic->LibStatut($objp->status, 3)
+					);*/
 
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_boms.php b/htdocs/core/boxes/box_boms.php
index 6a2554bcde0..d0a169321d0 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -84,8 +84,7 @@ class box_boms extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedBoms", $max));
 
-		if ($user->rights->bom->read)
-		{
+		if ($user->rights->bom->read) {
 			$sql = "SELECT p.ref as product_ref, p.tobuy, p.tosell";
 			$sql .= ", c.rowid";
 			$sql .= ", c.date_creation";
@@ -132,7 +131,9 @@ class box_boms extends ModeleBoxes
 					);
 
 					if (!empty($conf->global->BOM_BOX_LAST_BOMS_SHOW_VALIDATE_USER)) {
-						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						if ($objp->fk_user_valid > 0) {
+							$userstatic->fetch($objp->fk_user_valid);
+						}
 						$this->info_box_contents[$line][] = array(
 							'td' => 'class="right"',
 							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
@@ -153,10 +154,12 @@ class box_boms extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
 					'td' => 'class="center opacitymedium"',
 					'text'=>$langs->trans("NoRecordedOrders")
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index 795eaeccf36..9d6df6c7535 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -84,8 +84,7 @@ class box_bookmarks extends ModeleBoxes
 			$this->info_box_head['subtext'] = $langs->trans("ListOfBookmark");
 		}
 
-		if ($user->rights->bookmark->lire)
-		{
+		if ($user->rights->bookmark->lire) {
 			$sql = "SELECT b.title, b.url, b.target, b.favicon";
 			$sql .= " FROM ".MAIN_DB_PREFIX."bookmark as b";
 			$sql .= " WHERE fk_user = ".$user->id;
@@ -94,8 +93,7 @@ class box_bookmarks extends ModeleBoxes
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
@@ -123,7 +121,9 @@ class box_bookmarks extends ModeleBoxes
 
 				if ($num == 0) {
 					$mytxt = $langs->trans("NoRecordedBookmarks");
-					if ($user->rights->bookmark->creer) $mytxt .= ' '.$langs->trans("ClickToAdd");
+					if ($user->rights->bookmark->creer) {
+						$mytxt .= ' '.$langs->trans("ClickToAdd");
+					}
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center" colspan="2"',
 						'tooltip' => $mytxt,
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index adcff0d158c..56b8fa089a3 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -61,7 +61,9 @@ class box_clients extends ModeleBoxes
 		$this->db = $db;
 
 		// disable box for such cases
-		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled = 0; // disabled by this option
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$this->enabled = 0; // disabled by this option
+		}
 
 		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
 	}
@@ -84,30 +86,33 @@ class box_clients extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedCustomers", $max));
 
-		if ($user->rights->societe->lire)
-		{
+		if ($user->rights->societe->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql .= " WHERE s.client IN (1, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
 			$sql .= " ORDER BY s.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
@@ -141,10 +146,12 @@ class box_clients extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
 					'td' => 'class="center opacitymedium"',
 					'text'=>$langs->trans("NoRecordedCustomers")
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index f13f7ffa1f9..eac431918b2 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -85,8 +85,7 @@ class box_commandes extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."CustomerOrders", $max));
 
-		if ($user->rights->commande->lire)
-		{
+		if ($user->rights->commande->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
@@ -102,14 +101,25 @@ class box_commandes extends ModeleBoxes
 			$sql .= ", c.total_ttc";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande as c";
-			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 c.fk_soc = s.rowid";
 			$sql .= " AND c.entity IN (".getEntity('commande').")";
-			if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql .= " AND c.fk_statut = 1";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
-			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) {
+				$sql .= " AND c.fk_statut = 1";
+			}
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+				$sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			} else {
+				$sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			}
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
@@ -158,7 +168,9 @@ class box_commandes extends ModeleBoxes
 					);
 
 					if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_SHOW_VALIDATE_USER)) {
-						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						if ($objp->fk_user_valid > 0) {
+							$userstatic->fetch($objp->fk_user_valid);
+						}
 						$this->info_box_contents[$line][] = array(
 							'td' => 'class="right"',
 							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
@@ -179,10 +191,12 @@ class box_commandes extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
 					'td' => 'class="center opacitymedium"',
 					'text'=>$langs->trans("NoRecordedOrders")
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index f09a80f0227..1dc2abda558 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -64,7 +64,9 @@ class box_comptes extends ModeleBoxes
 
 		// disable module for such cases
 		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (!in_array('banque', $listofmodulesforexternal) && !empty($user->socid)) $this->enabled = 0; // disabled for external users
+		if (!in_array('banque', $listofmodulesforexternal) && !empty($user->socid)) {
+			$this->enabled = 0; // disabled for external users
+		}
 
 		$this->hidden = !($user->rights->banque->lire);
 	}
@@ -142,7 +144,7 @@ class box_comptes extends ModeleBoxes
 				}
 
 				// Total
-				foreach ($solde_total as $key=>$solde) {
+				foreach ($solde_total as $key => $solde) {
 					$this->info_box_contents[$line][] = array(
 						'tr' => 'class="liste_total"',
 						'td' => 'class="liste_total left"',
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 16041a63607..bd69ddc0108 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -81,8 +81,7 @@ class box_contacts extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts", $max));
 
-		if ($user->rights->societe->lire && $user->rights->societe->contact->lire)
-		{
+		if ($user->rights->societe->lire && $user->rights->societe->contact->lire) {
 			$sql = "SELECT sp.rowid as id, sp.lastname, sp.firstname, sp.civility as civility_id, sp.datec, sp.tms, sp.fk_soc, sp.statut as status";
 
 			$sql .= ", sp.address, sp.zip, sp.town, sp.phone, sp.phone_perso, sp.phone_mobile, sp.email as spemail";
@@ -94,10 +93,16 @@ class box_contacts extends ModeleBoxes
 			$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON sp.fk_pays = co.rowid";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON sp.fk_soc = s.rowid";
-			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 sp.entity IN (".getEntity('socpeople').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND sp.fk_soc = ".$user->socid;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND sp.fk_soc = ".$user->socid;
+			}
 			$sql .= " ORDER BY sp.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -109,8 +114,7 @@ class box_contacts extends ModeleBoxes
 				$societestatic = new Societe($this->db);
 
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
@@ -169,12 +173,13 @@ class box_contacts extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
 						'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedContacts").'</span>',
 						'asis'=> 1
 					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 0fa10b43fd8..ad19184691c 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -78,8 +78,7 @@ class box_contracts extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastContracts", $max));
 
-		if ($user->rights->contrat->lire)
-		{
+		if ($user->rights->contrat->lire) {
 			$contractstatic = new Contrat($this->db);
 			$thirdpartytmp = new Societe($this->db);
 
@@ -87,18 +86,26 @@ class box_contracts extends ModeleBoxes
 			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
 			$sql .= ", c.ref_customer, c.ref_supplier";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
-			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 c.fk_soc = s.rowid";
 			$sql .= " AND c.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if (! empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
-			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
+			if (! empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+				$sql .= " ORDER BY c.date_contrat DESC, c.ref DESC ";
+			} else {
+				$sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			}
 			$sql .= $this->db->plimit($max, 0);
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$now = dol_now();
 
@@ -106,8 +113,7 @@ class box_contracts extends ModeleBoxes
 
 				$langs->load("contracts");
 
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($resql);
 
 					$datec = $this->db->jdate($objp->datec);
@@ -162,11 +168,12 @@ class box_contracts extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center opacitymedium"',
 						'text'=>$langs->trans("NoRecordedContracts"),
 					);
+				}
 
 				$this->db->free($resql);
 			} else {
diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index 407e4459834..d0117526515 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -61,7 +61,9 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 		$this->db = $db;
 
 		// disable box for such cases
-		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled = 0; // disabled by this option
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$this->enabled = 0; // disabled by this option
+		}
 
 		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
 	}
@@ -84,19 +86,24 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastOutstandingBillReached", $max));
 
-		if ($user->rights->societe->lire)
-		{
+		if ($user->rights->societe->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.outstanding_limit";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql .= " WHERE s.client IN (1, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = $user->socid";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = $user->socid";
+			}
 			$sql .= " AND s.outstanding_limit > 0";
 			$sql .= " AND s.rowid IN (SELECT fk_soc from ".MAIN_DB_PREFIX."facture as f WHERE f.fk_statut = 1 and f.fk_soc = s.rowid)";
 			$sql .= " ORDER BY s.tms DESC";
@@ -104,15 +111,13 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$nboutstandingbillreachedcustomers = 0;
 
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
@@ -131,8 +136,7 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 					$outstandingtotal = $thirdpartystatic->getOutstandingBills()['opened'];
 					$outstandinglimit = $thirdpartystatic->outstanding_limit;
 
-					if ($outstandingtotal >= $outstandinglimit)
-					{
+					if ($outstandingtotal >= $outstandinglimit) {
 						$this->info_box_contents[$nboutstandingbillreachedcustomers][] = array(
 							'td' => '',
 							'text' => $thirdpartystatic->getNomUrl(1, 'customer'),
@@ -149,10 +153,12 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0 || $nboutstandingbillreachedcustomers == 0) $this->info_box_contents[$line][0] = array(
+				if ($num == 0 || $nboutstandingbillreachedcustomers == 0) {
+					$this->info_box_contents[$line][0] = array(
 					'td' => 'class="center"',
 					'text'=> '<span class="opacitymedium">'.$langs->trans("None").'</span>'
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index c1a81bafbed..7d4a290f0bc 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -249,7 +249,9 @@ class box_dolibarr_state_board extends ModeleBoxes
 					$class = $classes[$val];
 					// Search in cache if load_state_board is already realized
 					$classkeyforcache = $class;
-					if ($classkeyforcache == 'ProductService') $classkeyforcache = 'Product'; // ProductService use same load_state_board than Product
+					if ($classkeyforcache == 'ProductService') {
+						$classkeyforcache = 'Product'; // ProductService use same load_state_board than Product
+					}
 
 					if (!isset($boardloaded[$classkeyforcache]) || !is_object($boardloaded[$classkeyforcache])) {
 						include_once $includes[$val]; // Loading a class cost around 1Mb
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index 949f6ac1382..d85f0a3f44b 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -98,11 +98,12 @@ class box_external_rss extends ModeleBoxes
 		$link = $rssparser->getLink();
 
 		$title = $langs->trans("BoxTitleLastRssInfos", $max, $conf->global->$keyforparamtitle);
-		if ($result < 0 || !empty($rssparser->error))
-		{
+		if ($result < 0 || !empty($rssparser->error)) {
 			// Show warning
 			$errormessage = $langs->trans("FailedToRefreshDataInfoNotUpToDate", ($rssparser->getLastFetchDate() ? dol_print_date($rssparser->getLastFetchDate(), "dayhourtext") : $langs->trans("Unknown")));
-			if ($rssparser->error) $errormessage .= " - ".$rssparser->error;
+			if ($rssparser->error) {
+				$errormessage .= " - ".$rssparser->error;
+			}
 			$title .= " ".img_error($errormessage);
 			$this->info_box_head = array('text' => $title, 'limit' => 0);
 		} else {
@@ -119,34 +120,44 @@ class box_external_rss extends ModeleBoxes
 		$items = $rssparser->getItems();
 		//print '<pre>'.print_r($items,true).'</pre>';
 		$nbitems = count($items);
-		for ($line = 0; $line < $max && $line < $nbitems; $line++)
-		{
+		for ($line = 0; $line < $max && $line < $nbitems; $line++) {
 			$item = $items[$line];
 
 			// Feed common fields
 			$href = $item['link'];
 			$title = urldecode($item['title']);
 			$date = $item['date_timestamp']; // date will be empty if conversion into timestamp failed
-			if ($rssparser->getFormat() == 'rss')   // If RSS
-			{
-				if (!$date && isset($item['pubdate']))    $date = $item['pubdate'];
-				if (!$date && isset($item['dc']['date'])) $date = $item['dc']['date'];
+			if ($rssparser->getFormat() == 'rss') {   // If RSS
+				if (!$date && isset($item['pubdate'])) {
+					$date = $item['pubdate'];
+				}
+				if (!$date && isset($item['dc']['date'])) {
+					$date = $item['dc']['date'];
+				}
 				//$item['dc']['language']
 				//$item['dc']['publisher']
 			}
-			if ($rssparser->getFormat() == 'atom')	// If Atom
-			{
-				if (!$date && isset($item['issued']))    $date = $item['issued'];
-				if (!$date && isset($item['modified']))  $date = $item['modified'];
+			if ($rssparser->getFormat() == 'atom') {	// If Atom
+				if (!$date && isset($item['issued'])) {
+					$date = $item['issued'];
+				}
+				if (!$date && isset($item['modified'])) {
+					$date = $item['modified'];
+				}
 				//$item['issued']
 				//$item['modified']
 				//$item['atom_content']
 			}
-			if (is_numeric($date)) $date = dol_print_date($date, "dayhour");
+			if (is_numeric($date)) {
+				$date = dol_print_date($date, "dayhour");
+			}
 
 			$isutf8 = utf8_check($title);
-			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $title = utf8_encode($title);
-			elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $title = utf8_decode($title);
+			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') {
+				$title = utf8_encode($title);
+			} elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+				$title = utf8_decode($title);
+			}
 
 			$title = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $title); // Gere probleme des apostrophes mal codee/decodee par utf8
 			$title = preg_replace("/^\s+/", "", $title); // Supprime espaces de debut
@@ -155,8 +166,11 @@ class box_external_rss extends ModeleBoxes
 			$tooltip = $title;
 			$description = !empty($item['description']) ? $item['description'] : '';
 			$isutf8 = utf8_check($description);
-			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') $description = utf8_encode($description);
-			elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') $description = utf8_decode($description);
+			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') {
+				$description = utf8_encode($description);
+			} elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+				$description = utf8_decode($description);
+			}
 			$description = preg_replace("/([[:alnum:]])\?([[:alnum:]])/", "\\1'\\2", $description);
 			$description = preg_replace("/^\s+/", "", $description);
 			$description = str_replace("\r\n", "", $description);
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 20e83fb442c..e975432fcd6 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -100,19 +100,27 @@ class box_factures extends ModeleBoxes
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-			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 .= ")";
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid)	$sql .= " AND s.rowid = ".$user->socid;
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
-			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+				$sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			} else {
+				$sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			}
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 				$now = dol_now();
 
@@ -187,11 +195,12 @@ class box_factures extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
 						'text'=>$langs->trans("NoRecordedInvoices"),
 					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 1858a308756..e99b71c67eb 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -84,8 +84,7 @@ class box_factures_fourn extends ModeleBoxes
 			'text' => $langs->trans("BoxTitleLast".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."SupplierBills", $max)
 		);
 
-		if ($user->rights->fournisseur->facture->lire)
-		{
+		if ($user->rights->fournisseur->facture->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
 			$sql .= ", s.logo, s.email, s.entity";
@@ -99,18 +98,26 @@ class box_factures_fourn extends ModeleBoxes
 			$sql .= ', f.date_lim_reglement as datelimite, f.tms, f.type';
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-			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 f.fk_soc = s.rowid";
 			$sql .= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY f.datef DESC, f.ref DESC ";
-			else $sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+				$sql .= " ORDER BY f.datef DESC, f.ref DESC ";
+			} else {
+				$sql .= " ORDER BY f.tms DESC, f.ref DESC ";
+			}
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
@@ -188,11 +195,12 @@ class box_factures_fourn extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
 						'text'=>$langs->trans("NoModifiedSupplierBills"),
 					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 99848d916f4..c067e1876de 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -80,8 +80,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidSupplierBills", $max));
 
-		if ($user->rights->fournisseur->facture->lire)
-		{
+		if ($user->rights->fournisseur->facture->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
 			$sql .= ", s.logo, s.email, s.entity";
@@ -93,19 +92,24 @@ class box_factures_fourn_imp extends ModeleBoxes
 			$sql .= ", f.paye, f.fk_statut, f.type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
-			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 f.fk_soc = s.rowid";
 			$sql .= " AND f.entity = ".$conf->entity;
 			$sql .= " AND f.paye=0";
 			$sql .= " AND fk_statut = 1";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
 			$sql .= " ORDER BY datelimite DESC, f.ref_supplier DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
@@ -113,8 +117,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 				$facturestatic = new FactureFournisseur($this->db);
 
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->datelimite);
 					$date = $this->db->jdate($objp->df);
@@ -179,11 +182,12 @@ class box_factures_fourn_imp extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="center"',
 						'text'=>$langs->trans("NoUnpaidSupplierBills"),
 					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index b47f948f4ca..d4dd8e3c700 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -86,8 +86,7 @@ class box_factures_imp extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestUnpaidCustomerBills", $max));
 
-		if ($user->rights->facture->lire)
-		{
+		if ($user->rights->facture->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
@@ -101,15 +100,21 @@ class box_factures_imp extends ModeleBoxes
 			$sql .= ", f.paye, f.fk_statut, f.rowid as facid";
 			$sql .= ", sum(pf.amount) as am";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql .= ", ".MAIN_DB_PREFIX."facture as f";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid=pf.fk_facture ";
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			$sql .= " AND f.paye = 0";
 			$sql .= " AND fk_statut = 1";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
 			$sql .= " GROUP BY s.rowid, s.nom, s.name_alias, s.code_client, s.code_compta, s.client, s.logo, s.email, s.entity, s.tva_intra, s.siren, s.siret, s.ape, s.idprof4, s.idprof5, s.idprof6,";
 			$sql .= " f.ref, f.date_lim_reglement,";
 			$sql .= " f.type, f.datef, f.total, f.tva, f.total_ttc, f.paye, f.fk_statut, f.rowid";
@@ -118,16 +123,14 @@ class box_factures_imp extends ModeleBoxes
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 				$now = dol_now();
 
 				$line = 0;
 				$l_due_date = $langs->trans('Late').' ('.strtolower($langs->trans('DateDue')).': %s)';
 
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->datelimite);
 					$facturestatic->id = $objp->facid;
@@ -192,10 +195,12 @@ class box_factures_imp extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
 					'td' => 'class="center opacitymedium"',
 					'text'=>$langs->trans("NoUnpaidCustomerBills")
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 6cc213f98cb..ff99f8e6f08 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -80,8 +80,7 @@ class box_ficheinter extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastFicheInter", $max));
 
-		if (!empty($user->rights->ficheinter->lire))
-		{
+		if (!empty($user->rights->ficheinter->lire)) {
 			$sql = "SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut";
 			$sql .= ", f.datec";
 			$sql .= ", f.date_valid as datev";
@@ -90,26 +89,30 @@ class box_ficheinter extends ModeleBoxes
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir) {
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
 			$sql .= " WHERE f.fk_soc = s.rowid ";
 			$sql .= " AND f.entity = ".$conf->entity;
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid)	$sql .= " AND s.rowid = ".$user->socid;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
 			$sql .= " ORDER BY f.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this).'::loadBox', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$now = dol_now();
 
 				$i = 0;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$objp = $this->db->fetch_object($resql);
 					$datec = $this->db->jdate($objp->datec);
 
@@ -153,10 +156,12 @@ class box_ficheinter extends ModeleBoxes
 					$i++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$i][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$i][0] = array(
 					'td' => 'class="center opacitymedium"',
 					'text'=>$langs->trans("NoRecordedInterventions")
-				);
+					);
+				}
 
 				$this->db->free($resql);
 			} else {
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 7d1c72b3036..d8b7f30c103 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -81,29 +81,32 @@ class box_fournisseurs extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedSuppliers", $max));
 
-		if ($user->rights->societe->lire)
-		{
+		if ($user->rights->societe->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql .= " WHERE s.fournisseur = 1";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
 			$sql .= " ORDER BY s.tms DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
@@ -118,7 +121,7 @@ class box_fournisseurs extends ModeleBoxes
 					$thirdpartystatic->email = $objp->email;
 					$thirdpartystatic->entity = $objp->entity;
 
-				   	$this->info_box_contents[$line][] = array(
+					$this->info_box_contents[$line][] = array(
 						'td' => '',
 						'text' => $thirdpartystatic->getNomUrl(1, '', 40),
 						'asis' => 1,
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index 7efecc4001c..3a4f7e63103 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -62,8 +62,12 @@ class box_goodcustomers extends ModeleBoxes
 		$this->db = $db;
 
 		// disable box for such cases
-		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $this->enabled = 0; // disabled by this option
-		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) $this->enabled = 0; // not enabled by default. Very slow on large database
+		if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$this->enabled = 0; // disabled by this option
+		}
+		if (empty($conf->global->MAIN_BOX_ENABLE_BEST_CUSTOMERS)) {
+			$this->enabled = 0; // not enabled by default. Very slow on large database
+		}
 
 		$this->hidden = !($user->rights->societe->lire);
 	}
@@ -86,8 +90,7 @@ class box_goodcustomers extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleGoodCustomers", $max));
 
-		if ($user->rights->societe->lire)
-		{
+		if ($user->rights->societe->lire) {
 			$sql = "SELECT s.rowid, s.nom as name, s.logo, s.code_client, s.code_fournisseur, s.client, s.fournisseur, s.tms as datem, s.status as status,";
 			$sql .= " count(*) as nbfact, sum(".$this->db->ifsql('f.paye=1', '1', '0').") as nbfactpaye";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as f";
@@ -99,13 +102,11 @@ class box_goodcustomers extends ModeleBoxes
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datem = $this->db->jdate($objp->tms);
 					$thirdpartystatic->id = $objp->rowid;
@@ -142,10 +143,12 @@ class box_goodcustomers extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
 					'td' => 'class="center opacitymedium"',
 					'text'=>$langs->trans("NoRecordedCustomers")
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 97ebbee1d85..843c64bbd44 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -75,7 +75,9 @@ class box_graph_invoices_permonth extends ModeleBoxes
 		//$facturestatic=new Facture($this->db);
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+			$startmonth = 1;
+		}
 
 		$text = $langs->trans("BoxCustomersInvoicesPerMonth", $max);
 		$this->info_box_head = array(
@@ -92,11 +94,14 @@ class box_graph_invoices_permonth extends ModeleBoxes
 		$dir = ''; // We don't need a path because image file will not be saved into disk
 		$prefix = '';
 		$socid = 0;
-		if ($user->socid) $socid = $user->socid;
-		if (!$user->rights->societe->client->voir || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		if ($user->socid) {
+			$socid = $user->socid;
+		}
+		if (!$user->rights->societe->client->voir || $socid) {
+			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		}
 
-		if ($user->rights->facture->lire)
-		{
+		if ($user->rights->facture->lire) {
 			$mesg = '';
 
 			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
@@ -106,20 +111,23 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
-			{
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
-			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
-			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
-			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
+				$tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+				$endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+				$shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+				$showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
+			}
+			if (empty($shownb) && empty($showtot)) {
+				$shownb = 1; $showtot = 1;
 			}
-			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
-			if (empty($endyear)) $endyear = $nowarray['year'];
+			if (empty($endyear)) {
+				$endyear = $nowarray['year'];
+			}
 			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
 
 			$mode = 'customer';
@@ -129,28 +137,26 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			$stats = new FactureStats($this->db, $socid, $mode, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($shownb)
-			{
+			if ($shownb) {
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicesnbinyear-".$endyear.".png";
 				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$endyear.'.png';
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$endyear.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$langs->load("bills");
 
 					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear; $legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -174,28 +180,26 @@ class box_graph_invoices_permonth extends ModeleBoxes
 			}
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showtot)
-			{
+			if ($showtot) {
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicesamountinyear-".$endyear.".png";
 				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$endyear.'.png';
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$langs->load("bills");
 
 					$px2->SetData($data2);
 					unset($data2);
 					$i = $startyear; $legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -217,14 +221,12 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				}
 			}
 
-			if (empty($conf->use_javascript_ajax))
-			{
+			if (empty($conf->use_javascript_ajax)) {
 				$langs->load("errors");
 				$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
 			}
 
-			if (!$mesg)
-			{
+			if (!$mesg) {
 				$stringtoshow = '';
 				$stringtoshow .= '<script type="text/javascript" language="javascript">
 					jQuery(document).ready(function() {
@@ -247,20 +249,21 @@ class box_graph_invoices_permonth extends ModeleBoxes
 				$stringtoshow .= '<input class="reposition inline-block valigntextbottom" type="image" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
 				$stringtoshow .= '</form>';
 				$stringtoshow .= '</div>';
-				if ($shownb && $showtot)
-				{
+				if ($shownb && $showtot) {
 					$stringtoshow .= '<div class="fichecenter">';
 					$stringtoshow .= '<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow .= $px1->show();
-				if ($shownb && $showtot)
-				{
+				if ($shownb) {
+					$stringtoshow .= $px1->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow .= $px2->show();
-				if ($shownb && $showtot)
-				{
+				if ($showtot) {
+					$stringtoshow .= $px2->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '</div>';
 				}
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index d044c65b9f0..124e6e8dd24 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -74,7 +74,9 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+			$startmonth = 1;
+		}
 
 		$text = $langs->trans("BoxSuppliersInvoicesPerMonth", $max);
 		$this->info_box_head = array(
@@ -91,11 +93,14 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 		$dir = ''; // We don't need a path because image file will not be saved into disk
 		$prefix = '';
 		$socid = 0;
-		if ($user->socid) $socid = $user->socid;
-		if (!$user->rights->societe->client->voir || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		if ($user->socid) {
+			$socid = $user->socid;
+		}
+		if (!$user->rights->societe->client->voir || $socid) {
+			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		}
 
-		if ($user->rights->fournisseur->facture->lire)
-		{
+		if ($user->rights->fournisseur->facture->lire) {
 			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
@@ -103,21 +108,26 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
-			{
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
-			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
-			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
-			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
+				$tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+				$endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+				$shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+				$showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
+			}
+			if (empty($shownb) && empty($showtot)) {
+				$shownb = 1; $showtot = 1;
 			}
-			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
-			if (empty($year)) $year = $nowarray['year'];
-			if (empty($endyear)) $endyear = $nowarray['year'];
+			if (empty($year)) {
+				$year = $nowarray['year'];
+			}
+			if (empty($endyear)) {
+				$endyear = $nowarray['year'];
+			}
 			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
 
 			$mode = 'supplier';
@@ -127,29 +137,27 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			$stats = new FactureStats($this->db, $socid, $mode, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($shownb)
-			{
+			if ($shownb) {
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicessuppliernbinyear-".$year.".png";
 				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesnbinyear-'.$year.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$year.'.png';
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessuppliernbinyear-'.$year.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$langs->load("bills");
 
 					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear;
 					$legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -172,28 +180,26 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 			}
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showtot)
-			{
+			if ($showtot) {
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."invoicessupplieramountinyear-".$year.".png";
 				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstats&amp;file=invoicesamountinyear-'.$year.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$year.'.png';
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=billstatssupplier&amp;file=invoicessupplieramountinyear-'.$year.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$langs->load("bills");
 
 					$px2->SetData($data2);
 					unset($data2);
 					$i = $startyear; $legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -215,14 +221,12 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				}
 			}
 
-			if (empty($conf->use_javascript_ajax))
-			{
+			if (empty($conf->use_javascript_ajax)) {
 				$langs->load("errors");
 				$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
 			}
 
-			if (!$mesg)
-			{
+			if (!$mesg) {
 				$stringtoshow = '';
 				$stringtoshow .= '<script type="text/javascript" language="javascript">
 					jQuery(document).ready(function() {
@@ -245,20 +249,21 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 				$stringtoshow .= '<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
 				$stringtoshow .= '</form>';
 				$stringtoshow .= '</div>';
-				if ($shownb && $showtot)
-				{
+				if ($shownb && $showtot) {
 					$stringtoshow .= '<div class="fichecenter">';
 					$stringtoshow .= '<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow .= $px1->show();
-				if ($shownb && $showtot)
-				{
+				if ($shownb) {
+					$stringtoshow .= $px1->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow .= $px2->show();
-				if ($shownb && $showtot)
-				{
+				if ($showtot) {
+					$stringtoshow .= $px2->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '</div>';
 				}
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 9f0f5ece978..82e3452c151 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -75,7 +75,9 @@ class box_graph_orders_permonth extends ModeleBoxes
 		//$commandestatic=new Commande($this->db);
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+			$startmonth = 1;
+		}
 
 		$text = $langs->trans("BoxCustomersOrdersPerMonth", $max);
 		$this->info_box_head = array(
@@ -92,11 +94,14 @@ class box_graph_orders_permonth extends ModeleBoxes
 		$dir = ''; // We don't need a path because image file will not be saved into disk
 		$prefix = '';
 		$socid = 0;
-		if ($user->socid) $socid = $user->socid;
-		if (!$user->rights->societe->client->voir || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		if ($user->socid) {
+			$socid = $user->socid;
+		}
+		if (!$user->rights->societe->client->voir || $socid) {
+			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		}
 
-		if ($user->rights->commande->lire)
-		{
+		if ($user->rights->commande->lire) {
 			$langs->load("orders");
 
 			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
@@ -106,20 +111,23 @@ class box_graph_orders_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
-			{
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
-			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
-			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
-			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
+				$tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+				$endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+				$shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+				$showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
+			}
+			if (empty($shownb) && empty($showtot)) {
+				$shownb = 1; $showtot = 1;
 			}
-			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
-			if (empty($endyear)) $endyear = $nowarray['year'];
+			if (empty($endyear)) {
+				$endyear = $nowarray['year'];
+			}
 			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
 
 			$mode = 'customer';
@@ -129,27 +137,25 @@ class box_graph_orders_permonth extends ModeleBoxes
 			$stats = new CommandeStats($this->db, $socid, $mode, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($shownb)
-			{
+			if ($shownb) {
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersnbinyear-".$endyear.".png";
 				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersnbinyear-'.$endyear.'.png';
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersnbinyear-'.$endyear.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear;
 					$legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -172,26 +178,24 @@ class box_graph_orders_permonth extends ModeleBoxes
 			}
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showtot)
-			{
+			if ($showtot) {
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."ordersamountinyear-".$endyear.".png";
 				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersamountinyear-'.$endyear.'.png';
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=ordersamountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$px2->SetData($data2);
 					unset($data2);
 					$i = $startyear; $legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -213,14 +217,12 @@ class box_graph_orders_permonth extends ModeleBoxes
 				}
 			}
 
-			if (empty($conf->use_javascript_ajax))
-			{
+			if (empty($conf->use_javascript_ajax)) {
 				$langs->load("errors");
 				$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
 			}
 
-			if (!$mesg)
-			{
+			if (!$mesg) {
 				$stringtoshow = '';
 				$stringtoshow .= '<script type="text/javascript" language="javascript">
 					jQuery(document).ready(function() {
@@ -243,20 +245,21 @@ class box_graph_orders_permonth extends ModeleBoxes
 				$stringtoshow .= '<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
 				$stringtoshow .= '</form>';
 				$stringtoshow .= '</div>';
-				if ($shownb && $showtot)
-				{
+				if ($shownb && $showtot) {
 					$stringtoshow .= '<div class="fichecenter">';
 					$stringtoshow .= '<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow .= $px1->show();
-				if ($shownb && $showtot)
-				{
+				if ($shownb) {
+					$stringtoshow .= $px1->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow .= $px2->show();
-				if ($shownb && $showtot)
-				{
+				if ($showtot) {
+					$stringtoshow .= $px2->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '</div>';
 				}
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index c16c0616fbc..a4a764e6d57 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -74,7 +74,9 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+			$startmonth = 1;
+		}
 
 		$text = $langs->trans("BoxSuppliersOrdersPerMonth", $max);
 		$this->info_box_head = array(
@@ -91,11 +93,14 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 		$dir = ''; // We don't need a path because image file will not be saved into disk
 		$prefix = '';
 		$socid = 0;
-		if ($user->socid) $socid = $user->socid;
-		if (!$user->rights->societe->client->voir || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		if ($user->socid) {
+			$socid = $user->socid;
+		}
+		if (!$user->rights->societe->client->voir || $socid) {
+			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		}
 
-		if ($user->rights->fournisseur->commande->lire)
-		{
+		if ($user->rights->fournisseur->commande->lire) {
 			$langs->load("orders");
 
 			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
@@ -105,20 +110,23 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
-			{
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+				$tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
 				$endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
 				$shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
 				$showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
 			}
-			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
+			if (empty($shownb) && empty($showtot)) {
+				$shownb = 1; $showtot = 1;
+			}
 			$nowarray = dol_getdate(dol_now(), true);
-			if (empty($endyear)) $endyear = $nowarray['year'];
+			if (empty($endyear)) {
+				$endyear = $nowarray['year'];
+			}
 			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
 
 			$mode = 'supplier';
@@ -128,27 +136,25 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			$stats = new CommandeStats($this->db, $socid, $mode, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($shownb)
-			{
+			if ($shownb) {
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."orderssuppliernbinyear-".$endyear.".png";
 				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersnbinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=orderssuppliernbinyear-'.$endyear.'.png';
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=orderssuppliernbinyear-'.$endyear.'.png';
+				}
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear;
 					$legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -171,26 +177,24 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 			}
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showtot)
-			{
+			if ($showtot) {
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 
 				$filenamenb = $dir."/".$prefix."orderssupplieramountinyear-".$endyear.".png";
 				// default value for customer mode
 				$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&amp;file=ordersamountinyear-'.$endyear.'.png';
-				if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=orderssupplieramountinyear-'.$endyear.'.png';
+				if ($mode == 'supplier') {
+					$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&amp;file=orderssupplieramountinyear-'.$endyear.'.png';
+				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$px2->SetData($data2);
 					unset($data2);
 					$i = $startyear; $legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -212,14 +216,12 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				}
 			}
 
-			if (empty($conf->use_javascript_ajax))
-			{
+			if (empty($conf->use_javascript_ajax)) {
 				$langs->load("errors");
 				$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
 			}
 
-			if (!$mesg)
-			{
+			if (!$mesg) {
 				$stringtoshow = '';
 				$stringtoshow .= '<script type="text/javascript" language="javascript">
 					jQuery(document).ready(function() {
@@ -242,20 +244,21 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 				$stringtoshow .= '<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
 				$stringtoshow .= '</form>';
 				$stringtoshow .= '</div>';
-				if ($shownb && $showtot)
-				{
+				if ($shownb && $showtot) {
 					$stringtoshow .= '<div class="fichecenter">';
 					$stringtoshow .= '<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow .= $px1->show();
-				if ($shownb && $showtot)
-				{
+				if ($shownb) {
+					$stringtoshow .= $px1->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow .= $px2->show();
-				if ($shownb && $showtot)
-				{
+				if ($showtot) {
+					$stringtoshow .= $px2->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '</div>';
 				}
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 8c6049c720b..91a5f598347 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -88,31 +88,46 @@ class box_graph_product_distribution extends ModeleBoxes
 		$param_showpropalnb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showpropalnb';
 		$param_showordernb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showordernb';
 		$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
-		if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
-		{
+		if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
 			$year = GETPOST($param_year, 'int');
 			$showinvoicenb = GETPOST($param_showinvoicenb, 'alpha');
 			$showpropalnb = GETPOST($param_showpropalnb, 'alpha');
 			$showordernb = GETPOST($param_showordernb, 'alpha');
 		} else {
-		    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
-		    $year = (!empty($tmparray['year']) ? $tmparray['year'] : '');
-		    $showinvoicenb = (!empty($tmparray['showinvoicenb']) ? $tmparray['showinvoicenb'] : '');
-		    $showpropalnb = (!empty($tmparray['showpropalnb']) ? $tmparray['showpropalnb'] : '');
-		    $showordernb = (!empty($tmparray['showordernb']) ? $tmparray['showordernb'] : '');
+			$tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+			$year = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+			$showinvoicenb = (!empty($tmparray['showinvoicenb']) ? $tmparray['showinvoicenb'] : '');
+			$showpropalnb = (!empty($tmparray['showpropalnb']) ? $tmparray['showpropalnb'] : '');
+			$showordernb = (!empty($tmparray['showordernb']) ? $tmparray['showordernb'] : '');
+		}
+		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) {
+			$showpropalnb = 1; $showinvoicenb = 1; $showordernb = 1;
+		}
+		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) {
+			$showinvoicenb = 0;
+		}
+		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) {
+			$showpropalnb = 0;
+		}
+		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) {
+			$showordernb = 0;
 		}
-		if (empty($showinvoicenb) && empty($showpropalnb) && empty($showordernb)) { $showpropalnb = 1; $showinvoicenb = 1; $showordernb = 1; }
-		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) $showinvoicenb = 0;
-		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) $showpropalnb = 0;
-		if (empty($conf->commande->enabled) || empty($user->rights->commande->lire)) $showordernb = 0;
 
 		$nowarray = dol_getdate(dol_now(), true);
-		if (empty($year)) $year = $nowarray['year'];
+		if (empty($year)) {
+			$year = $nowarray['year'];
+		}
 
 		$nbofgraph = 0;
-		if ($showinvoicenb) $nbofgraph++;
-		if ($showpropalnb)  $nbofgraph++;
-		if ($showordernb)   $nbofgraph++;
+		if ($showinvoicenb) {
+			$nbofgraph++;
+		}
+		if ($showpropalnb) {
+			$nbofgraph++;
+		}
+		if ($showordernb) {
+			$nbofgraph++;
+		}
 
 		$text = $langs->trans("BoxProductDistribution", $max).' - '.$langs->trans("Year").': '.$year;
 		$this->info_box_head = array(
@@ -133,19 +148,16 @@ class box_graph_product_distribution extends ModeleBoxes
 		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '160' : '320';
 		$HEIGHT = '192';
 
-		if (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
-		{
+		if (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire)) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showpropalnb)
-			{
+			if ($showpropalnb) {
 				$langs->load("propal");
 				include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 
 				$showpointvalue = 1; $nocolor = 0;
 				$stats_proposal = new PropaleStats($this->db, $socid, ($userid > 0 ? $userid : 0));
 				$data2 = $stats_proposal->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), 5);
-				if (empty($data2))
-				{
+				if (empty($data2)) {
 					$showpointvalue = 0;
 					$nocolor = 1;
 					$data2 = array(array(0=>$langs->trans("None"), 1=>1));
@@ -156,12 +168,10 @@ class box_graph_product_distribution extends ModeleBoxes
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$i = 0; $legend = array();
 
-					foreach ($data2 as $key => $val)
-					{
+					foreach ($data2 as $key => $val) {
 						$data2[$key][0] = dol_trunc($data2[$key][0], 32);
 						$legend[] = $data2[$key][0];
 						$i++;
@@ -170,7 +180,9 @@ class box_graph_product_distribution extends ModeleBoxes
 					$px2->SetData($data2);
 					unset($data2);
 
-					if ($nocolor) $px2->SetDataColor(array(array(220, 220, 220)));
+					if ($nocolor) {
+						$px2->SetDataColor(array(array(220, 220, 220)));
+					}
 					$px2->SetLegend($legend);
 					$px2->setShowLegend(2);
 					$px2->setShowPointValue($showpointvalue);
@@ -192,11 +204,9 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 		}
 
-		if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
-		{
+		if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire)) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showordernb)
-			{
+			if ($showordernb) {
 				$langs->load("orders");
 				include_once DOL_DOCUMENT_ROOT.'/commande/class/commandestats.class.php';
 
@@ -204,8 +214,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$mode = 'customer';
 				$stats_order = new CommandeStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
 				$data3 = $stats_order->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), 5);
-				if (empty($data3))
-				{
+				if (empty($data3)) {
 					$showpointvalue = 0;
 					$nocolor = 1;
 					$data3 = array(array(0=>$langs->trans("None"), 1=>1));
@@ -216,12 +225,10 @@ class box_graph_product_distribution extends ModeleBoxes
 
 				$px3 = new DolGraph();
 				$mesg = $px3->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$i = 0; $legend = array();
 
-					foreach ($data3 as $key => $val)
-					{
+					foreach ($data3 as $key => $val) {
 						$data3[$key][0] = dol_trunc($data3[$key][0], 32);
 						$legend[] = $data3[$key][0];
 						$i++;
@@ -230,7 +237,9 @@ class box_graph_product_distribution extends ModeleBoxes
 					$px3->SetData($data3);
 					unset($data3);
 
-					if ($nocolor) $px3->SetDataColor(array(array(220, 220, 220)));
+					if ($nocolor) {
+						$px3->SetDataColor(array(array(220, 220, 220)));
+					}
 					$px3->SetLegend($legend);
 					$px3->setShowLegend(2);
 					$px3->setShowPointValue($showpointvalue);
@@ -253,11 +262,9 @@ class box_graph_product_distribution extends ModeleBoxes
 		}
 
 
-		if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
-		{
+		if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showinvoicenb)
-			{
+			if ($showinvoicenb) {
 				$langs->load("bills");
 				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facturestats.class.php';
 
@@ -266,8 +273,7 @@ class box_graph_product_distribution extends ModeleBoxes
 				$stats_invoice = new FactureStats($this->db, $socid, $mode, ($userid > 0 ? $userid : 0));
 				$data1 = $stats_invoice->getAllByProductEntry($year, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), 5);
 
-				if (empty($data1))
-				{
+				if (empty($data1)) {
 					$showpointvalue = 0;
 					$nocolor = 1;
 					$data1 = array(array(0=>$langs->trans("None"), 1=>1));
@@ -277,12 +283,10 @@ class box_graph_product_distribution extends ModeleBoxes
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$i = 0; $legend = array();
 
-					foreach ($data1 as $key => $val)
-					{
+					foreach ($data1 as $key => $val) {
 						$data1[$key][0] = dol_trunc($data1[$key][0], 32);
 						$legend[] = $data1[$key][0];
 						$i++;
@@ -291,7 +295,9 @@ class box_graph_product_distribution extends ModeleBoxes
 					$px1->SetData($data1);
 					unset($data1);
 
-					if ($nocolor) $px1->SetDataColor(array(array(220, 220, 220)));
+					if ($nocolor) {
+						$px1->SetDataColor(array(array(220, 220, 220)));
+					}
 					$px1->SetLegend($legend);
 					$px1->setShowLegend(2);
 					$px1->setShowPointValue($showpointvalue);
@@ -313,19 +319,16 @@ class box_graph_product_distribution extends ModeleBoxes
 			}
 		}
 
-		if (empty($nbofgraph))
-		{
+		if (empty($nbofgraph)) {
 			$langs->load("errors");
 			$mesg = $langs->trans("ReadPermissionNotAllowed");
 		}
-		if (empty($conf->use_javascript_ajax))
-		{
+		if (empty($conf->use_javascript_ajax)) {
 			$langs->load("errors");
 			$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
 		}
 
-		if (!$mesg)
-		{
+		if (!$mesg) {
 			$stringtoshow = '';
 			$stringtoshow .= '<script type="text/javascript" language="javascript">
 				jQuery(document).ready(function() {
@@ -340,17 +343,14 @@ class box_graph_product_distribution extends ModeleBoxes
 			$stringtoshow .= '<input type="hidden" name="action" value="'.$refreshaction.'">';
 			$stringtoshow .= '<input type="hidden" name="page_y" value="">';
 			$stringtoshow .= '<input type="hidden" name="DOL_AUTOSET_COOKIE" value="DOLUSERCOOKIE_box_'.$this->boxcode.':year,showinvoicenb,showpropalnb,showordernb">';
-			if (!empty($conf->propal->enabled) || !empty($user->rights->propale->lire))
-			{
+			if (!empty($conf->propal->enabled) || !empty($user->rights->propale->lire)) {
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showpropalnb.'"'.($showpropalnb ? ' checked' : '').'> '.$langs->trans("ForProposals");
 				$stringtoshow .= '&nbsp;';
 			}
-			if (!empty($conf->commande->enabled) || !empty($user->rights->commande->lire))
-			{
+			if (!empty($conf->commande->enabled) || !empty($user->rights->commande->lire)) {
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb ? ' checked' : '').'> '.$langs->trans("ForCustomersOrders");
 			}
-			if (!empty($conf->facture->enabled) || !empty($user->rights->facture->lire))
-			{
+			if (!empty($conf->facture->enabled) || !empty($user->rights->facture->lire)) {
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb ? ' checked' : '').'> '.$langs->trans("ForCustomersInvoices");
 				$stringtoshow .= ' &nbsp; ';
 			}
@@ -360,24 +360,31 @@ class box_graph_product_distribution extends ModeleBoxes
 			$stringtoshow .= '</form>';
 			$stringtoshow .= '</div>';
 
-			if ($nbofgraph == 1)
-			{
-				if ($showpropalnb) $stringtoshow .= $px2->show();
-				elseif ($showordernb) $stringtoshow .= $px3->show();
-				else $stringtoshow .= $px1->show();
+			if ($nbofgraph == 1) {
+				if ($showpropalnb) {
+					$stringtoshow .= $px2->show();
+				} elseif ($showordernb) {
+					$stringtoshow .= $px3->show();
+				} else {
+					$stringtoshow .= $px1->show();
+				}
 			}
-			if ($nbofgraph == 2)
-			{
+			if ($nbofgraph == 2) {
 				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
-				if ($showpropalnb) $stringtoshow .= $px2->show();
-				elseif ($showordernb) $stringtoshow .= $px3->show();
+				if ($showpropalnb) {
+					$stringtoshow .= $px2->show();
+				} elseif ($showordernb) {
+					$stringtoshow .= $px3->show();
+				}
 				$stringtoshow .= '</div><div class="fichehalfright">';
-				if ($showinvoicenb) $stringtoshow .= $px1->show();
-				elseif ($showordernb) $stringtoshow .= $px3->show();
+				if ($showinvoicenb) {
+					$stringtoshow .= $px1->show();
+				} elseif ($showordernb) {
+					$stringtoshow .= $px3->show();
+				}
 				$stringtoshow .= '</div></div></div>';
 			}
-			if ($nbofgraph == 3)
-			{
+			if ($nbofgraph == 3) {
 				$stringtoshow .= '<div class="fichecenter"><div class="containercenter"><div class="fichehalfleft">';
 				$stringtoshow .= $px2->show();
 				$stringtoshow .= '</div><div class="fichehalfright">';
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index 29b7cab5a78..116beb0e30f 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -75,7 +75,9 @@ class box_graph_propales_permonth extends ModeleBoxes
 		//$propalstatic=new Propal($this->db);
 
 		$startmonth = $conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1;
-		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) $startmonth = 1;
+		if (empty($conf->global->GRAPH_USE_FISCAL_YEAR)) {
+			$startmonth = 1;
+		}
 
 		$langs->load("propal");
 
@@ -94,11 +96,14 @@ class box_graph_propales_permonth extends ModeleBoxes
 		$dir = ''; // We don't need a path because image file will not be saved into disk
 		$prefix = '';
 		$socid = 0;
-		if ($user->socid) $socid = $user->socid;
-		if (!$user->rights->societe->client->voir || $socid) $prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		if ($user->socid) {
+			$socid = $user->socid;
+		}
+		if (!$user->rights->societe->client->voir || $socid) {
+			$prefix .= 'private-'.$user->id.'-'; // If user has no permission to see all, output dir is specific to user
+		}
 
-		if ($user->rights->propale->lire)
-		{
+		if ($user->rights->propale->lire) {
 			$param_year = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_year';
 			$param_shownb = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_shownb';
 			$param_showtot = 'DOLUSERCOOKIE_box_'.$this->boxcode.'_showtot';
@@ -106,20 +111,23 @@ class box_graph_propales_permonth extends ModeleBoxes
 			include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propalestats.class.php';
 			$autosetarray = preg_split("/[,;:]+/", GETPOST('DOL_AUTOSET_COOKIE'));
-			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray))
-			{
+			if (in_array('DOLUSERCOOKIE_box_'.$this->boxcode, $autosetarray)) {
 				$endyear = GETPOST($param_year, 'int');
 				$shownb = GETPOST($param_shownb, 'alpha');
 				$showtot = GETPOST($param_showtot, 'alpha');
 			} else {
-			    $tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
-			    $endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
-			    $shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
-			    $showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
+				$tmparray = (!empty($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode]) ? json_decode($_COOKIE['DOLUSERCOOKIE_box_'.$this->boxcode], true) : array());
+				$endyear = (!empty($tmparray['year']) ? $tmparray['year'] : '');
+				$shownb = (!empty($tmparray['shownb']) ? $tmparray['shownb'] : '');
+				$showtot = (!empty($tmparray['showtot']) ? $tmparray['showtot'] : '');
+			}
+			if (empty($shownb) && empty($showtot)) {
+				$shownb = 1; $showtot = 1;
 			}
-			if (empty($shownb) && empty($showtot)) { $shownb = 1; $showtot = 1; }
 			$nowarray = dol_getdate(dol_now(), true);
-			if (empty($endyear)) $endyear = $nowarray['year'];
+			if (empty($endyear)) {
+				$endyear = $nowarray['year'];
+			}
 			$startyear = $endyear - (empty($conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH) ? 1 : $conf->global->MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH);
 
 			$WIDTH = (($shownb && $showtot) || !empty($conf->dol_optimize_smallscreen)) ? '256' : '320';
@@ -128,8 +136,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 			$stats = new PropaleStats($this->db, $socid, 0);
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($shownb)
-			{
+			if ($shownb) {
 				$data1 = $stats->getNbByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 				$datatype1 = array_pad(array(), ($endyear - $startyear + 1), 'bars');
 
@@ -138,16 +145,13 @@ class box_graph_propales_permonth extends ModeleBoxes
 
 				$px1 = new DolGraph();
 				$mesg = $px1->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$px1->SetType($datatype1);
 					$px1->SetData($data1);
 					unset($data1);
 					$i = $startyear; $legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -170,30 +174,30 @@ class box_graph_propales_permonth extends ModeleBoxes
 			}
 
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
-			if ($showtot)
-			{
+			if ($showtot) {
 				$data2 = $stats->getAmountByMonthWithPrevYear($endyear, $startyear, (GETPOST('action', 'aZ09') == $refreshaction ?-1 : (3600 * 24)), ($WIDTH < 300 ? 2 : 0), $startmonth);
 				$datatype2 = array_pad(array(), ($endyear - $startyear + 1), 'bars');
 				//$datatype2 = array('lines','bars');
 
 				$filenamenb = $dir."/".$prefix."propalsamountinyear-".$endyear.".png";
 				if (!empty($mode)) {
-				    if ($mode == 'customer') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsamountinyear-'.$endyear.'.png';
-				    if ($mode == 'supplier') $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&amp;file=propalsamountinyear-'.$endyear.'.png';
+					if ($mode == 'customer') {
+						$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstats&amp;file=propalsamountinyear-'.$endyear.'.png';
+					}
+					if ($mode == 'supplier') {
+						$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=propalstatssupplier&amp;file=propalsamountinyear-'.$endyear.'.png';
+					}
 				}
 
 				$px2 = new DolGraph();
 				$mesg = $px2->isGraphKo();
-				if (!$mesg)
-				{
+				if (!$mesg) {
 					$px2->SetType($datatype2);
 					$px2->SetData($data2);
 					unset($data2);
 					$i = $startyear; $legend = array();
-					while ($i <= $endyear)
-					{
-						if ($startmonth != 1)
-						{
+					while ($i <= $endyear) {
+						if ($startmonth != 1) {
 							$legend[] = sprintf("%d/%d", $i - 2001, $i - 2000);
 						} else {
 							$legend[] = $i;
@@ -215,14 +219,12 @@ class box_graph_propales_permonth extends ModeleBoxes
 				}
 			}
 
-			if (empty($conf->use_javascript_ajax))
-			{
+			if (empty($conf->use_javascript_ajax)) {
 				$langs->load("errors");
 				$mesg = $langs->trans("WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs");
 			}
 
-			if (!$mesg)
-			{
+			if (!$mesg) {
 				$stringtoshow = '';
 				$stringtoshow .= '<script type="text/javascript" language="javascript">
 					jQuery(document).ready(function() {
@@ -245,20 +247,21 @@ class box_graph_propales_permonth extends ModeleBoxes
 				$stringtoshow .= '<input type="image" class="reposition inline-block valigntextbottom" alt="'.$langs->trans("Refresh").'" src="'.img_picto($langs->trans("Refresh"), 'refresh.png', '', '', 1).'">';
 				$stringtoshow .= '</form>';
 				$stringtoshow .= '</div>';
-				if ($shownb && $showtot)
-				{
+				if ($shownb && $showtot) {
 					$stringtoshow .= '<div class="fichecenter">';
 					$stringtoshow .= '<div class="fichehalfleft">';
 				}
-				if ($shownb) $stringtoshow .= $px1->show();
-				if ($shownb && $showtot)
-				{
+				if ($shownb) {
+					$stringtoshow .= $px1->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '<div class="fichehalfright">';
 				}
-				if ($showtot) $stringtoshow .= $px2->show();
-				if ($shownb && $showtot)
-				{
+				if ($showtot) {
+					$stringtoshow .= $px2->show();
+				}
+				if ($shownb && $showtot) {
 					$stringtoshow .= '</div>';
 					$stringtoshow .= '</div>';
 				}
diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php
index 94734894ad7..7cc20bd1b89 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -75,8 +75,8 @@ class box_last_modified_ticket extends ModeleBoxes
 
 		$text = $langs->trans("BoxLastModifiedTicketDescription", $max);
 		$this->info_box_head = array(
-		 	'text' => $text,
-		 	'limit' => dol_strlen($text)
+			'text' => $text,
+			'limit' => dol_strlen($text)
 		);
 
 		$this->info_box_contents[0][0] = array(
diff --git a/htdocs/core/boxes/box_lastlogin.php b/htdocs/core/boxes/box_lastlogin.php
index aa7b5ca2ea5..a487ec5bc72 100644
--- a/htdocs/core/boxes/box_lastlogin.php
+++ b/htdocs/core/boxes/box_lastlogin.php
@@ -92,8 +92,11 @@ class box_lastlogin extends ModeleBoxes
 			'td' => '',
 			'text' => $langs->trans("PreviousConnexion"),
 		);
-		if ($user->datepreviouslogin) $tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
-		else $tmp = $langs->trans("Unknown");
+		if ($user->datepreviouslogin) {
+			$tmp = dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
+		} else {
+			$tmp = $langs->trans("Unknown");
+		}
 		$this->info_box_contents[$line][1] = array(
 			'td' => '',
 			'text' => $tmp,
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index acbb1e5cd3b..b12506147bf 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -84,8 +84,7 @@ class box_mos extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatestModifiedMos", $max));
 
-		if ($user->rights->mrp->read)
-		{
+		if ($user->rights->mrp->read) {
 			$sql = "SELECT p.ref as product_ref";
 			$sql .= ", c.rowid";
 			$sql .= ", c.date_creation";
@@ -128,7 +127,9 @@ class box_mos extends ModeleBoxes
 					);
 
 					if (!empty($conf->global->MRP_BOX_LAST_MOS_SHOW_VALIDATE_USER)) {
-						if ($objp->fk_user_valid > 0) $userstatic->fetch($objp->fk_user_valid);
+						if ($objp->fk_user_valid > 0) {
+							$userstatic->fetch($objp->fk_user_valid);
+						}
 						$this->info_box_contents[$line][] = array(
 							'td' => 'class="right"',
 							'text' => (($objp->fk_user_valid > 0) ? $userstatic->getNomUrl(1) : ''),
@@ -149,10 +150,12 @@ class box_mos extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
 					'td' => 'class="center"',
 					'text'=> '<span class="opacitymedium">'.$langs->trans("NoRecordedOrders").'</span>'
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index 0c6752ec764..f47e8d40238 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -86,8 +86,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleProductsAlertStock", $max));
 
-		if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire)
-		{
+		if (($user->rights->produit->lire || $user->rights->service->lire) && $user->rights->stock->lire) {
 			$sql = "SELECT p.rowid, p.label, p.price, p.ref, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
 			$sql .= " p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export,";
 			$sql .= " p.accountancy_code_buy, p.accountancy_code_buy_intra, p.accountancy_code_buy_export,";
@@ -96,11 +95,14 @@ class box_produits_alerte_stock extends ModeleBoxes
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as s on p.rowid = s.fk_product";
 			$sql .= ' WHERE p.entity IN ('.getEntity($productstatic->element).')';
 			$sql .= " AND p.tosell = 1 AND p.seuil_stock_alerte > 0";
-			if (empty($user->rights->produit->lire)) $sql .= ' AND p.fk_product_type != 0';
-			if (empty($user->rights->service->lire)) $sql .= ' AND p.fk_product_type != 1';
+			if (empty($user->rights->produit->lire)) {
+				$sql .= ' AND p.fk_product_type != 0';
+			}
+			if (empty($user->rights->service->lire)) {
+				$sql .= ' AND p.fk_product_type != 1';
+			}
 			// Add where from hooks
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('boxproductalertstocklist'=>1);
 				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 				$sql .= $hookmanager->resPrint;
@@ -113,8 +115,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$langs->load("stocks");
 				$num = $this->db->num_rows($result);
 				$line = 0;
@@ -125,8 +126,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 					$price_base_type = '';
 
 					// Multilangs
-					if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-					{
+					if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
 						$sqld = "SELECT label";
 						$sqld .= " FROM ".MAIN_DB_PREFIX."product_lang";
 						$sqld .= " WHERE fk_product=".$objp->rowid;
@@ -134,11 +134,11 @@ class box_produits_alerte_stock extends ModeleBoxes
 						$sqld .= " LIMIT 1";
 
 						$resultd = $this->db->query($sqld);
-						if ($resultd)
-						{
+						if ($resultd) {
 							$objtp = $this->db->fetch_object($resultd);
-							if (isset($objtp->label) && $objtp->label != '')
+							if (isset($objtp->label) && $objtp->label != '') {
 								$objp->label = $objtp->label;
+							}
 						}
 					}
 					$productstatic->id = $objp->rowid;
@@ -167,18 +167,16 @@ class box_produits_alerte_stock extends ModeleBoxes
 						'text' => $objp->label,
 					);
 
-					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression))
-					{
+					if (empty($conf->dynamicprices->enabled) || empty($objp->fk_price_expression)) {
 						$price_base_type = $langs->trans($objp->price_base_type);
 						$price = ($objp->price_base_type == 'HT') ?price($objp->price) : $price = price($objp->price_ttc);
 					} else //Parse the dynamic price
-				   	{
+					{
 						$productstatic->fetch($objp->rowid, '', '', 1);
 						$priceparser = new PriceParser($this->db);
 						$price_result = $priceparser->parseProduct($productstatic);
 						if ($price_result >= 0) {
-							if ($objp->price_base_type == 'HT')
-							{
+							if ($objp->price_base_type == 'HT') {
 								$price_base_type = $langs->trans("HT");
 							} else {
 								$price_result = $price_result * (1 + ($productstatic->tva_tx / 100));
@@ -186,7 +184,7 @@ class box_produits_alerte_stock extends ModeleBoxes
 							}
 							$price = price($price_result);
 						}
-				   	}
+					}
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right nowraponall"',
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 1afbdfc6837..04aa812ea34 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -94,13 +94,17 @@ class box_project extends ModeleBoxes
 
 			// Get list of project id allowed to user (in a string list separated by coma)
 			$projectsListId = '';
-			if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			if (!$user->rights->projet->all->lire) {
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			}
 
 			$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut as status, p.public";
 			$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 			$sql .= " WHERE p.entity IN (".getEntity('project').")"; // Only current entity or severals if permission ok
 			$sql .= " AND p.fk_statut = 1"; // Only open projects
-			if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+			if (!$user->rights->projet->all->lire) {
+				$sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+			}
 
 			$sql .= " ORDER BY p.datec DESC";
 			//$sql.= $this->db->plimit($max, 0);
@@ -141,12 +145,14 @@ class box_project extends ModeleBoxes
 							'td' => 'class="right"',
 							'text' => $objTask->nb."&nbsp;".$langs->trans("Tasks"),
 						);
-						if ($objTask->nb > 0)
+						if ($objTask->nb > 0) {
 							$this->info_box_contents[$i][] = array(
 								'td' => 'class="right"',
 								'text' => round($objTask->totprogress / $objTask->nb, 0)."%",
 							);
-						else $this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+						} else {
+							$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => "N/A&nbsp;");
+						}
 						$totalnbTask += $objTask->nb;
 					} else {
 						$this->info_box_contents[$i][] = array('td' => 'class="right"', 'text' => round(0));
@@ -156,8 +162,7 @@ class box_project extends ModeleBoxes
 
 					$i++;
 				}
-				if ($max < $num)
-				{
+				if ($max < $num) {
 					$this->info_box_contents[$i][] = array('td' => 'colspan="5"', 'text' => '...');
 					$i++;
 				}
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 2492c095ad9..ea550b9d856 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -63,7 +63,9 @@ class box_prospect extends ModeleBoxes
 		$this->db = $db;
 
 		// disable box for such cases
-		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $this->enabled = 0; // disabled by this option
+		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+			$this->enabled = 0; // disabled by this option
+		}
 
 		$this->hidden = !($user->rights->societe->lire && empty($user->socid));
 	}
@@ -84,31 +86,34 @@ class box_prospect extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedProspects", $max));
 
-		if ($user->rights->societe->lire)
-		{
+		if ($user->rights->societe->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.fk_stcomm";
 			$sql .= ", s.datec, s.tms, s.status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
 			$sql .= " WHERE s.client IN (2, 3)";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
 			$sql .= " ORDER BY s.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 
 				$line = 0;
-				while ($line < $num)
-				{
+				while ($line < $num) {
 					$objp = $this->db->fetch_object($resql);
 					$datec = $this->db->jdate($objp->datec);
 					$datem = $this->db->jdate($objp->tms);
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index c4a713a03b5..6623556e27f 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -81,8 +81,7 @@ class box_services_contracts extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxLastProductsInContract", $max));
 
-		if ($user->rights->service->lire && $user->rights->contrat->lire)
-		{
+		if ($user->rights->service->lire && $user->rights->contrat->lire) {
 			$contractstatic = new Contrat($this->db);
 			$contractlinestatic = new ContratLigne($this->db);
 			$thirdpartytmp = new Societe($this->db);
@@ -96,23 +95,25 @@ class box_services_contracts extends ModeleBoxes
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON cd.fk_product = p.rowid";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
 			$sql .= ")";
 			$sql .= " WHERE c.entity = ".$conf->entity;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
 			$sql .= $this->db->order("c.tms", "DESC");
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 				$now = dol_now();
 
 				$i = 0;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$late = '';
 
 					$objp = $this->db->fetch_object($result);
@@ -145,11 +146,12 @@ class box_services_contracts extends ModeleBoxes
 					$thirdpartytmp->code_compta_fournisseur = $objp->code_compta_fournisseur;
 
 					$dateline = $this->db->jdate($objp->date_line);
-					if ($contractstatic->statut == Contrat::STATUS_VALIDATED && $objp->contractline_status == ContratLigne::STATUS_OPEN && !empty($dateline) && ($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
+					if ($contractstatic->statut == Contrat::STATUS_VALIDATED && $objp->contractline_status == ContratLigne::STATUS_OPEN && !empty($dateline) && ($dateline + $conf->contrat->services->expires->warning_delay) < $now) {
+						$late = img_warning($langs->trans("Late"));
+					}
 
 					// Label
-					if ($objp->product_id > 0)
-					{
+					if ($objp->product_id > 0) {
 						$productstatic->id = $objp->product_id;
 						$productstatic->type = $objp->product_type;
 						$productstatic->ref = $objp->product_ref;
@@ -159,8 +161,7 @@ class box_services_contracts extends ModeleBoxes
 						$productstatic->status_buy = $objp->tobuy;
 
 						$text = $productstatic->getNomUrl(1, '', 20);
-						if ($objp->product_label)
-						{
+						if ($objp->product_label) {
 							$text .= ' - ';
 							//$productstatic->ref=$objp->label;
 							//$text .= $productstatic->getNomUrl(0,'',16);
@@ -169,8 +170,7 @@ class box_services_contracts extends ModeleBoxes
 						$description = $objp->description;
 
 						// Add description in form
-						if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-						{
+						if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 							//$text .= (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
 							$description = ''; // Already added into main visible desc
 						}
@@ -212,10 +212,12 @@ class box_services_contracts extends ModeleBoxes
 
 					$i++;
 				}
-				if ($num == 0) $this->info_box_contents[$i][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$i][0] = array(
 					'td' => 'class="center opacitymedium"',
 					'text'=>$langs->trans("NoContractedProducts")
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 7a65fd0a9d2..724eb9baebf 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -79,28 +79,32 @@ class box_services_expired extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxLastExpiredServices", $max));
 
-		if ($user->rights->contrat->lire)
-		{
+		if ($user->rights->contrat->lire) {
 			// Select contracts with at least one expired service
 			$sql = "SELECT ";
 			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.ref_customer, c.ref_supplier,";
 			$sql .= " s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 			$sql .= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
 			$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
-			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 cd.statut = 4 AND cd.date_fin_validite <= '".$this->db->idate($now)."'";
 			$sql .= " AND c.entity = ".$conf->entity;
 			$sql .= " AND c.fk_soc=s.rowid AND cd.fk_contrat=c.rowid AND c.statut > 0";
-			if ($user->socid) $sql .= ' AND c.fk_soc = '.$user->socid;
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			if ($user->socid) {
+				$sql .= ' AND c.fk_soc = '.$user->socid;
+			}
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
 			$sql .= " GROUP BY c.rowid, c.ref, c.statut, c.date_contrat, c.ref_customer, c.ref_supplier, s.nom, s.rowid";
 			$sql .= ", s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur";
 			$sql .= " ORDER BY date_line ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 
 				$i = 0;
@@ -108,8 +112,7 @@ class box_services_expired extends ModeleBoxes
 				$thirdpartytmp = new Societe($this->db);
 				$contract = new Contrat($this->db);
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$late = '';
 
 					$objp = $this->db->fetch_object($resql);
@@ -131,7 +134,9 @@ class box_services_expired extends ModeleBoxes
 					$contract->ref_supplier = $objp->ref_supplier;
 
 					$dateline = $this->db->jdate($objp->date_line);
-					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) $late = img_warning($langs->trans("Late"));
+					if (($dateline + $conf->contrat->services->expires->warning_delay) < $now) {
+						$late = img_warning($langs->trans("Late"));
+					}
 
 					$this->info_box_contents[$i][] = array(
 						'td' => 'class="nowraponall"',
@@ -160,8 +165,7 @@ class box_services_expired extends ModeleBoxes
 					$i++;
 				}
 
-				if ($num == 0)
-				{
+				if ($num == 0) {
 					$langs->load("contracts");
 					$this->info_box_contents[$i][] = array(
 						'td' => 'class="nohover opacitymedium center"',
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 22b28d42761..abb639ddb94 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -86,8 +86,7 @@ class box_shipments extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastCustomerShipments", $max));
 
-		if ($user->rights->expedition->lire)
-		{
+		if ($user->rights->expedition->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
@@ -102,12 +101,21 @@ class box_shipments extends ModeleBoxes
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+			}
 			$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-			if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
-			if ($user->socid > 0) $sql.= " AND s.rowid = ".$user->socid;
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND sc.fk_user = ".$user->id;
-			else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
+			if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) {
+				$sql .= " AND e.fk_statut = 1";
+			}
+			if ($user->socid > 0) {
+				$sql.= " AND s.rowid = ".$user->socid;
+			}
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND sc.fk_user = ".$user->id;
+			} else {
+				$sql .= " ORDER BY e.date_delivery, e.ref DESC ";
+			}
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
@@ -162,10 +170,12 @@ class box_shipments extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0) $this->info_box_contents[$line][0] = array(
+				if ($num == 0) {
+					$this->info_box_contents[$line][0] = array(
 					'td' => 'class="center opacitymedium"',
 					'text'=>$langs->trans("NoRecordedShipments")
-				);
+					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index c91068b1ff3..8a0be932573 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -81,8 +81,7 @@ class box_supplier_orders extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLatest".(!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) ? "" : "Modified")."SupplierOrders", $max));
 
-		if ($user->rights->fournisseur->commande->lire)
-		{
+		if ($user->rights->fournisseur->commande->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
 			$sql .= ", s.logo, s.email, s.entity";
@@ -93,18 +92,26 @@ class box_supplier_orders extends ModeleBoxes
 			$sql .= ", c.fk_statut";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-			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 c.fk_soc = s.rowid";
 			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
-			else $sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+				$sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
+			} else {
+				$sql .= " ORDER BY c.tms DESC, c.ref DESC ";
+			}
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
@@ -156,11 +163,12 @@ class box_supplier_orders extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center"',
 						'text' => $langs->trans("NoSupplierOrder"),
 					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 2c1dc49161e..83c108c5cf3 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -81,8 +81,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleSupplierOrdersAwaitingReception", $max));
 
-		if ($user->rights->fournisseur->commande->lire)
-		{
+		if ($user->rights->fournisseur->commande->lire) {
 			$sql = "SELECT s.rowid as socid, s.nom as name, s.name_alias";
 			$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
 			$sql .= ", s.logo, s.email, s.entity";
@@ -93,19 +92,27 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 			$sql .= ", c.fk_statut";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
-			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 c.fk_soc = s.rowid";
 			$sql .= " AND c.entity IN (".getEntity('supplier_order').")";
 			$sql .= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
-			if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-			if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC";
-			else $sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC";
+			if (!$user->rights->societe->client->voir && !$user->socid) {
+				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			if ($user->socid) {
+				$sql .= " AND s.rowid = ".$user->socid;
+			}
+			if (!empty($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE)) {
+				$sql .= " ORDER BY c.date_commande DESC, c.ref DESC";
+			} else {
+				$sql .= " ORDER BY c.date_livraison ASC, c.fk_statut ASC";
+			}
 			$sql .= $this->db->plimit($max, 0);
 
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 
 				$line = 0;
@@ -162,11 +169,12 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 					$line++;
 				}
 
-				if ($num == 0)
+				if ($num == 0) {
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center"',
 						'text' => $langs->trans("NoSupplierOrder"),
 					);
+				}
 
 				$this->db->free($result);
 			} else {
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 16b96e23466..0650b10a872 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -145,7 +145,9 @@ class box_task extends ModeleBoxes
 
 			// Get list of project id allowed to user (in a string list separated by coma)
 			$projectsListId = '';
-			if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			if (!$user->rights->projet->all->lire) {
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			}
 
 			$sql = "SELECT pt.rowid, pt.ref, pt.fk_projet, pt.fk_task_parent, pt.datec, pt.dateo, pt.datee, pt.datev, pt.label, pt.description, pt.duration_effective, pt.planned_workload, pt.progress";
 			$sql .= ", p.rowid project_id, p.ref project_ref, p.title project_title";
@@ -166,7 +168,9 @@ class box_task extends ModeleBoxes
 			$sql .= " AND p.fk_statut = ".Project::STATUS_VALIDATED;
 			$sql .= " AND (pt.progress < 100 OR pt.progress IS NULL ) "; // 100% is done and not displayed
 			$sql .= " AND p.usage_task = 1 ";
-			if (!$user->rights->projet->all->lire) $sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+			if (!$user->rights->projet->all->lire) {
+				$sql .= " AND p.rowid IN (".$projectsListId.")"; // public and assigned to, or restricted to company for external users
+			}
 
 			$sql .= " ORDER BY pt.datee ASC, pt.dateo ASC";
 			$sql .= $this->db->plimit($max, 0);
diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
index 537e88b9bdf..66a4f76f1b3 100644
--- a/htdocs/core/boxes/box_validated_projects.php
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -67,7 +67,9 @@ class box_validated_projects extends ModeleBoxes
 
 		$this->hidden = !($user->rights->projet->lire);
 
-		if ($conf->global->MAIN_FEATURES_LEVEL < 2) $this->enabled = 0;
+		if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
+			$this->enabled = 0;
+		}
 	}
 
 	/**
@@ -99,7 +101,9 @@ class box_validated_projects extends ModeleBoxes
 
 			// Get list of project id allowed to user (in a string list separated by coma)
 			$projectsListId = '';
-			if (!$user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			if (!$user->rights->projet->all->lire) {
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
+			}
 
 			// I tried to solve sql error and performance problem, rewriting sql request but it is not clear what we want.
 			// Count of tasks without time spent for tasks we are assigned too or
@@ -111,7 +115,9 @@ class box_validated_projects extends ModeleBoxes
 			// TODO Replace -1, -2, -3 with ID used for type of contat project_task into llx_c_type_contact. Once done, we can switch widget as stable.
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid AND fk_c_type_contact IN (-1, -2, -3)";
 			$sql .= " WHERE p.fk_statut = 1"; // Only open projects
-			if ($projectsListId) $sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only project we ara allowed
+			if ($projectsListId) {
+				$sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only project we ara allowed
+			}
 			$sql .= " AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user =".$user->id.")";
 			$sql .= " GROUP BY p.rowid, p.ref, p.fk_soc, p.dateo";
 			$sql .= " ORDER BY p.dateo ASC";
@@ -161,8 +167,7 @@ class box_validated_projects extends ModeleBoxes
 							'asis' => 1,
 							'url' => DOL_URL_ROOT.'/societe/card.php?socid='.$obj2->rowid
 						);
-					}
-					else {
+					} else {
 						$this->info_box_contents[$i][] = array(
 							'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
 							'text' => '',
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 9faf45932e2..379a65b7a5d 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -150,11 +150,9 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 		dol_syslog(get_class($this)."::fetch rowid=".$rowid);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->id = $obj->id;
 				$this->rowid = $obj->id; // For backward compatibility
 				$this->box_id = $obj->box_id;
@@ -182,7 +180,9 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 	{
 		global $langs, $user, $conf;
 
-		if (!empty($this->hidden)) return '\n<!-- Box ".get_class($this)." hidden -->\n'; // Nothing done if hidden (for example when user has no permission)
+		if (!empty($this->hidden)) {
+			return '\n<!-- Box ".get_class($this)." hidden -->\n'; // Nothing done if hidden (for example when user has no permission)
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -200,47 +200,51 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 
 			// Define nbcol and nblines of the box to show
 			$nbcol = 0;
-			if (isset($contents[0])) $nbcol = count($contents[0]);
+			if (isset($contents[0])) {
+				$nbcol = count($contents[0]);
+			}
 			$nblines = count($contents);
 
 			$out .= "\n<!-- Box ".get_class($this)." start -->\n";
 
 			$out .= '<div class="box boxdraggable" id="boxto_'.$this->box_id.'">'."\n";
 
-			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
-			{
+			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines) {
 				$out .= '<table summary="boxtable'.$this->box_id.'" width="100%" class="noborder boxtable">'."\n";
 			}
 
 			// Show box title
-			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']))
-			{
+			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto'])) {
 				$out .= '<tr class="liste_titre box_titre">';
 				$out .= '<td';
-				if ($nbcol > 0) { $out .= ' colspan="'.$nbcol.'"'; }
+				if ($nbcol > 0) {
+					$out .= ' colspan="'.$nbcol.'"';
+				}
 				$out .= '>';
-				if (!empty($conf->use_javascript_ajax))
-				{
+				if (!empty($conf->use_javascript_ajax)) {
 					//$out.= '<table summary="" class="nobordernopadding" width="100%"><tr><td class="tdoverflowmax150 maxwidth150onsmartphone">';
 					$out .= '<div class="tdoverflowmax250 maxwidth150onsmartphone float">';
 				}
-				if (!empty($head['text']))
-				{
+				if (!empty($head['text'])) {
 					$s = dol_trunc($head['text'], isset($head['limit']) ? $head['limit'] : $MAXLENGTHBOX);
 					$out .= $s;
 				}
-				if (!empty($conf->use_javascript_ajax))
-				{
+				if (!empty($conf->use_javascript_ajax)) {
 					$out .= '</div>';
 				}
 				//$out.= '</td>';
 
-				if (!empty($conf->use_javascript_ajax))
-				{
+				if (!empty($conf->use_javascript_ajax)) {
 					$sublink = '';
-					if (!empty($head['sublink']))  $sublink .= '<a href="'.$head['sublink'].'"'.(empty($head['target']) ? '' : ' target="'.$head['target'].'"').'>';
-					if (!empty($head['subpicto'])) $sublink .= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium marginleftonly '.(empty($head['subclass']) ? '' : $head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
-					if (!empty($head['sublink']))  $sublink .= '</a>';
+					if (!empty($head['sublink'])) {
+						$sublink .= '<a href="'.$head['sublink'].'"'.(empty($head['target']) ? '' : ' target="'.$head['target'].'"').'>';
+					}
+					if (!empty($head['subpicto'])) {
+						$sublink .= img_picto($head['subtext'], $head['subpicto'], 'class="opacitymedium marginleftonly '.(empty($head['subclass']) ? '' : $head['subclass']).'" id="idsubimg'.$this->boxcode.'"');
+					}
+					if (!empty($head['sublink'])) {
+						$sublink .= '</a>';
+					}
 
 					//$out.= '<td class="nocellnopadd boxclose right nowraponall">';
 					$out .= '<div class="nocellnopadd boxclose floatright nowraponall">';
@@ -250,7 +254,9 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 					$out .= img_picto($langs->trans("CloseBox", $this->box_id), 'close_title', 'class="opacitymedium boxclose cursorpointer marginleftonly" rel="x:y" id="imgclose'.$this->box_id.'"');
 					$label = $head['text'];
 					//if (! empty($head['graph'])) $label.=' ('.$langs->trans("Graph").')';
-					if (!empty($head['graph'])) $label .= ' <span class="opacitymedium fa fa-bar-chart"></span>';
+					if (!empty($head['graph'])) {
+						$label .= ' <span class="opacitymedium fa fa-bar-chart"></span>';
+					}
 					$out .= '<input type="hidden" id="boxlabelentry'.$this->box_id.'" value="'.dol_escape_htmltag($label).'">';
 					//$out.= '</td></tr></table>';
 					$out .= '</div>';
@@ -261,23 +267,25 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			}
 
 			// Show box lines
-			if ($nblines)
-			{
+			if ($nblines) {
 				// Loop on each record
-				for ($i = 0, $n = $nblines; $i < $n; $i++)
-				{
-					if (isset($contents[$i]))
-					{
+				for ($i = 0, $n = $nblines; $i < $n; $i++) {
+					if (isset($contents[$i])) {
 						// TR
-						if (isset($contents[$i][0]['tr'])) $out .= '<tr '.$contents[$i][0]['tr'].'>';
-						else $out .= '<tr class="oddeven">';
+						if (isset($contents[$i][0]['tr'])) {
+							$out .= '<tr '.$contents[$i][0]['tr'].'>';
+						} else {
+							$out .= '<tr class="oddeven">';
+						}
 
 						// Loop on each TD
 						$nbcolthisline = count($contents[$i]);
 						for ($j = 0; $j < $nbcolthisline; $j++) {
 							// Define tdparam
 							$tdparam = '';
-							if (!empty($contents[$i][$j]['td'])) $tdparam .= ' '.$contents[$i][$j]['td'];
+							if (!empty($contents[$i][$j]['td'])) {
+								$tdparam .= ' '.$contents[$i][$j]['td'];
+							}
 
 							$text = isset($contents[$i][$j]['text']) ? $contents[$i][$j]['text'] : '';
 							$textwithnotags = preg_replace('/<([^>]+)>/i', '', $text);
@@ -286,14 +294,15 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 
 							$textnoformat = isset($contents[$i][$j]['textnoformat']) ? $contents[$i][$j]['textnoformat'] : '';
 							//$out.= "xxx $textwithnotags y";
-							if (empty($contents[$i][$j]['tooltip'])) $contents[$i][$j]['tooltip'] = "";
+							if (empty($contents[$i][$j]['tooltip'])) {
+								$contents[$i][$j]['tooltip'] = "";
+							}
 							$tooltip = isset($contents[$i][$j]['tooltip']) ? $contents[$i][$j]['tooltip'] : '';
 
 							$out .= '<td'.$tdparam.'>'."\n";
 
 							// Url
-							if (!empty($contents[$i][$j]['url']) && empty($contents[$i][$j]['logo']))
-							{
+							if (!empty($contents[$i][$j]['url']) && empty($contents[$i][$j]['logo'])) {
 								$out .= '<a href="'.$contents[$i][$j]['url'].'"';
 								if (!empty($tooltip)) {
 									$out .= ' title="'.dol_escape_htmltag($langs->trans("Show").' '.$tooltip, 1).'" class="classfortooltip"';
@@ -304,27 +313,40 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 							}
 
 							// Logo
-							if (!empty($contents[$i][$j]['logo']))
-							{
+							if (!empty($contents[$i][$j]['logo'])) {
 								$logo = preg_replace("/^object_/i", "", $contents[$i][$j]['logo']);
 								$out .= '<a href="'.$contents[$i][$j]['url'].'">';
 								$out .= img_object($langs->trans("Show").' '.$tooltip, $logo, 'class="classfortooltip"');
 							}
 
 							$maxlength = $MAXLENGTHBOX;
-							if (!empty($contents[$i][$j]['maxlength'])) $maxlength = $contents[$i][$j]['maxlength'];
+							if (!empty($contents[$i][$j]['maxlength'])) {
+								$maxlength = $contents[$i][$j]['maxlength'];
+							}
 
-							if ($maxlength) $textwithnotags = dol_trunc($textwithnotags, $maxlength);
-							if (preg_match('/^<(img|div|span)/i', $text) || !empty($contents[$i][$j]['asis'])) $out .= $text; // show text with no html cleaning
-							else $out .= $textwithnotags; // show text with html cleaning
+							if ($maxlength) {
+								$textwithnotags = dol_trunc($textwithnotags, $maxlength);
+							}
+							if (preg_match('/^<(img|div|span)/i', $text) || !empty($contents[$i][$j]['asis'])) {
+								$out .= $text; // show text with no html cleaning
+							} else {
+								$out .= $textwithnotags; // show text with html cleaning
+							}
 
 							// End Url
-							if (!empty($contents[$i][$j]['url'])) $out .= '</a>';
+							if (!empty($contents[$i][$j]['url'])) {
+								$out .= '</a>';
+							}
 
-							if (preg_match('/^<(img|div|span)/i', $text2) || !empty($contents[$i][$j]['asis2'])) $out .= $text2; // show text with no html cleaning
-							else $out .= $text2withnotags; // show text with html cleaning
+							if (preg_match('/^<(img|div|span)/i', $text2) || !empty($contents[$i][$j]['asis2'])) {
+								$out .= $text2; // show text with no html cleaning
+							} else {
+								$out .= $text2withnotags; // show text with html cleaning
+							}
 
-							if (!empty($textnoformat)) $out .= "\n".$textnoformat."\n";
+							if (!empty($textnoformat)) {
+								$out .= "\n".$textnoformat."\n";
+							}
 
 							$out .= "</td>\n";
 						}
@@ -334,13 +356,14 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				}
 			}
 
-			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines)
-			{
+			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto']) || $nblines) {
 				$out .= "</table>\n";
 			}
 
 			// If invisible box with no contents
-			if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && !$nblines) $out .= "<br>\n";
+			if (empty($head['text']) && empty($head['sublink']) && empty($head['subpicto']) && !$nblines) {
+				$out .= "<br>\n";
+			}
 
 			$out .= "</div>\n";
 
@@ -354,8 +377,11 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			$out .= dol_readcachefile($cachedir, $filename);
 		}
 
-		if ($nooutput) return $out;
-		else print $out;
+		if ($nooutput) {
+			return $out;
+		} else {
+			print $out;
+		}
 
 		return '';
 	}
@@ -382,42 +408,39 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 
 		//$dirwidget=array_merge(array('/core/boxes/'), $conf->modules_parts['widgets']);
 		$dirwidget = array('/core/boxes/'); // $conf->modules_parts['widgets'] is not required
-		if (is_array($forcedirwidget))
-		{
+		if (is_array($forcedirwidget)) {
 			$dirwidget = $forcedirwidget;
 		}
 
-		foreach ($dirwidget as $reldir)
-		{
+		foreach ($dirwidget as $reldir) {
 			$dir = dol_buildpath($reldir, 0);
 			$newdir = dol_osencode($dir);
 
 			// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-			if (!is_dir($newdir)) continue;
+			if (!is_dir($newdir)) {
+				continue;
+			}
 
 			$handle = opendir($newdir);
-			if (is_resource($handle))
-			{
-				while (($file = readdir($handle)) !== false)
-				{
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
 					$reg = array();
-					if (is_readable($newdir.'/'.$file) && preg_match('/^(.+)\.php/', $file, $reg))
-					{
-						if (preg_match('/\.back$/', $file)) continue;
+					if (is_readable($newdir.'/'.$file) && preg_match('/^(.+)\.php/', $file, $reg)) {
+						if (preg_match('/\.back$/', $file)) {
+							continue;
+						}
 
 						$part1 = $reg[1];
 
 						$modName = ucfirst($reg[1]);
 						//print "file=$file"; print "modName=$modName"; exit;
-						if (in_array($modName, $modules))
-						{
+						if (in_array($modName, $modules)) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateWidget", $modName, "").'</div>';
 						} else {
 							try {
 								include_once $newdir.'/'.$file;
-							} catch (Exception $e)
-							{
+							} catch (Exception $e) {
 								print $e->getMessage();
 							}
 						}
@@ -442,27 +465,28 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 		$j = 0;
 
 		// Loop on each widget
-		foreach ($orders as $key => $value)
-		{
+		foreach ($orders as $key => $value) {
 			$modName = $modules[$key];
-			if (empty($modName)) continue;
+			if (empty($modName)) {
+				continue;
+			}
 
-			if (!class_exists($modName))
-			{
+			if (!class_exists($modName)) {
 				print 'Error: A widget file was found but its class "'.$modName.'" was not found.'."<br>\n";
 				continue;
 			}
 
 			$objMod = new $modName($db);
-			if (is_object($objMod))
-			{
+			if (is_object($objMod)) {
 				// Define disabledbyname and disabledbymodule
 				$disabledbyname = 0;
 				$disabledbymodule = 0; // TODO Set to 2 if module is not enabled
 				$module = '';
 
 				// Check if widget file is disabled by name
-				if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
+				if (preg_match('/NORUN$/i', $files[$key])) {
+					$disabledbyname = 1;
+				}
 
 				// We set info of modules
 				$widget[$j]['picto'] = $objMod->picto ?img_object('', $objMod->picto) : img_object('', 'generic');
@@ -472,12 +496,16 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 				$widget[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
 				//$widget[$j]['version'] = $objMod->getVersion();
 				$widget[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
-				if ($disabledbyname > 0 || $disabledbymodule > 1) $widget[$j]['status'] = '';
+				if ($disabledbyname > 0 || $disabledbymodule > 1) {
+					$widget[$j]['status'] = '';
+				}
 
 				$text = '<b>'.$langs->trans("Description").':</b><br>';
 				$text .= $objMod->boxlabel.'<br>';
 				$text .= '<br><b>'.$langs->trans("Status").':</b><br>';
-				if ($disabledbymodule == 2) $text .= $langs->trans("WidgetDisabledAsModuleDisabled", $module).'<br>';
+				if ($disabledbymodule == 2) {
+					$text .= $langs->trans("WidgetDisabledAsModuleDisabled", $module).'<br>';
+				}
 
 				$widget[$j]['info'] = $text;
 			}
diff --git a/htdocs/core/class/CSMSFile.class.php b/htdocs/core/class/CSMSFile.class.php
index 62257e79447..65cf7091d39 100644
--- a/htdocs/core/class/CSMSFile.class.php
+++ b/htdocs/core/class/CSMSFile.class.php
@@ -70,12 +70,15 @@ class CSMSFile
 
 		// On definit fin de ligne
 		$this->eol = "\n";
-		if (preg_match('/^win/i', PHP_OS)) $this->eol = "\r\n";
-		if (preg_match('/^mac/i', PHP_OS)) $this->eol = "\r";
+		if (preg_match('/^win/i', PHP_OS)) {
+			$this->eol = "\r\n";
+		}
+		if (preg_match('/^mac/i', PHP_OS)) {
+			$this->eol = "\r";
+		}
 
 		// If ending method not defined
-		if (empty($conf->global->MAIN_SMS_SENDMODE))
-		{
+		if (empty($conf->global->MAIN_SMS_SENDMODE)) {
 			$this->error = 'No SMS Engine defined';
 			return -1;
 		}
@@ -113,13 +116,13 @@ class CSMSFile
 
 		$this->message = stripslashes($this->message);
 
-		if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms();
+		if (!empty($conf->global->MAIN_SMS_DEBUG)) {
+			$this->dump_sms();
+		}
 
-		if (empty($conf->global->MAIN_DISABLE_ALL_SMS))
-		{
+		if (empty($conf->global->MAIN_DISABLE_ALL_SMS)) {
 			// Action according to choosed sending method
-			if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')    // Backward compatibility    @deprecated
-			{
+			if ($conf->global->MAIN_SMS_SENDMODE == 'ovh') {    // Backward compatibility    @deprecated
 				dol_include_once('/ovh/class/ovhsms.class.php');
 				$sms = new OvhSms($this->db);
 				$sms->expe = $this->addr_from;
@@ -136,17 +139,17 @@ class CSMSFile
 
 				$res = $sms->SmsSend();
 
-				if ($res <= 0)
-				{
+				if ($res <= 0) {
 					$this->error = $sms->error;
 					dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
 				} else {
 					dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
 					//var_dump($res);        // 1973128
-					if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+					if (!empty($conf->global->MAIN_SMS_DEBUG)) {
+						$this->dump_sms_result($res);
+					}
 				}
-			} elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
-			{
+			} elseif (!empty($conf->global->MAIN_SMS_SENDMODE)) {    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
 				$tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
 				$classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
 				dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
@@ -169,16 +172,16 @@ class CSMSFile
 
 					$this->error = $sms->error;
 					$this->errors = $sms->errors;
-					if ($res <= 0)
-					{
+					if ($res <= 0) {
 						dol_syslog("CSMSFile::sendfile: sms send error=".$this->error, LOG_ERR);
 					} else {
 						dol_syslog("CSMSFile::sendfile: sms send success with id=".$res, LOG_DEBUG);
 						//var_dump($res);        // 1973128
-						if (!empty($conf->global->MAIN_SMS_DEBUG)) $this->dump_sms_result($res);
+						if (!empty($conf->global->MAIN_SMS_DEBUG)) {
+							$this->dump_sms_result($res);
+						}
 					}
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
 				}
 			} else {
@@ -210,8 +213,7 @@ class CSMSFile
 		// phpcs:enable
 		global $conf, $dolibarr_main_data_root;
 
-		if (@is_writeable($dolibarr_main_data_root))	// Avoid fatal error on fopen with open_basedir
-		{
+		if (@is_writeable($dolibarr_main_data_root)) {	// Avoid fatal error on fopen with open_basedir
 			$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";
 			$fp = fopen($outputfile, "w");
 
@@ -224,8 +226,9 @@ class CSMSFile
 			fputs($fp, "Message:\n".$this->message);
 
 			fclose($fp);
-			if (!empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) {
+				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 	}
 
@@ -242,16 +245,16 @@ class CSMSFile
 		// phpcs:enable
 		global $conf, $dolibarr_main_data_root;
 
-		if (@is_writeable($dolibarr_main_data_root))    // Avoid fatal error on fopen with open_basedir
-		{
+		if (@is_writeable($dolibarr_main_data_root)) {    // Avoid fatal error on fopen with open_basedir
 			$outputfile = $dolibarr_main_data_root."/dolibarr_sms.log";
 			$fp = fopen($outputfile, "a+");
 
 			fputs($fp, "\nResult id=".$result);
 
 			fclose($fp);
-			if (!empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) {
+				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 	}
 }
diff --git a/htdocs/core/class/antivir.class.php b/htdocs/core/class/antivir.class.php
index e6bd24ad016..7a60e7b6e03 100644
--- a/htdocs/core/class/antivir.class.php
+++ b/htdocs/core/class/antivir.class.php
@@ -75,8 +75,7 @@ class AntiVir
 
 		$return = 0;
 
-		if (preg_match('/\.virus$/i', $file))
-		{
+		if (preg_match('/\.virus$/i', $file)) {
 			$this->errors[] = 'File has an extension saying file is a virus';
 			return -97;
 		}
@@ -93,12 +92,14 @@ class AntiVir
 		// Run CLI command. If run of Windows, you can get return with echo %ERRORLEVEL%
 		$lastline = exec($fullcommand, $output, $return_var);
 
-		if (is_null($output)) $output = array();
+		if (is_null($output)) {
+			$output = array();
+		}
 
 		//print "x".$lastline." - ".join(',',$output)." - ".$return_var."y";exit;
 
 		/*
-        $outputfile=$conf->admin->dir_temp.'/dol_avscan_file.out.'.session_id();
+		$outputfile=$conf->admin->dir_temp.'/dol_avscan_file.out.'.session_id();
 		$handle = fopen($outputfile, 'w');
 		if ($handle)
 		{
@@ -130,14 +131,12 @@ class AntiVir
 		dol_syslog("AntiVir::dol_avscan_file Result return_var=".$return_var." output=".join(',', $output));
 
 		$returncodevirus = 1;
-		if ($return_var == $returncodevirus)	// Virus found
-		{
+		if ($return_var == $returncodevirus) {	// Virus found
 			$this->errors = $output;
 			return -99;
 		}
 
-		if ($return_var > 0)					// If other error
-		{
+		if ($return_var > 0) {					// If other error
 			$this->errors = $output;
 			return -98;
 		}
@@ -174,10 +173,13 @@ class AntiVir
 		$param = preg_replace('/%maxfilesize/', $maxfilesize, $param);
 		$param = preg_replace('/%file/', trim($file), $param);
 
-		if (!preg_match('/%file/', $conf->global->MAIN_ANTIVIRUS_PARAM))
+		if (!preg_match('/%file/', $conf->global->MAIN_ANTIVIRUS_PARAM)) {
 			$param = $param." ".escapeshellarg(trim($file));
+		}
 
-		if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command. Using escapeshellcmd fails.
+		if (preg_match("/\s/", $command)) {
+			$command = escapeshellarg($command); // Use quotes on command. Using escapeshellcmd fails.
+		}
 
 		$ret = $command.' '.$param;
 		//$ret=$command.' '.$param.' 2>&1';
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index 91157f52ba0..7541c58a889 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -76,9 +76,15 @@ class Canvas
 	private function _cleanaction($action)
 	{
 		$newaction = $action;
-		if ($newaction == 'add')    $newaction = 'create';
-		if ($newaction == 'update') $newaction = 'edit';
-		if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') $newaction = 'view';
+		if ($newaction == 'add') {
+			$newaction = 'create';
+		}
+		if ($newaction == 'update') {
+			$newaction = 'edit';
+		}
+		if (empty($newaction) || $newaction == 'delete' || $newaction == 'create_user' || $newaction == 'presend' || $newaction == 'send') {
+			$newaction = 'view';
+		}
 		return $newaction;
 	}
 
@@ -101,18 +107,18 @@ class Canvas
 		$this->card = $card;
 		$this->dirmodule = $module;
 		// Correct values if canvas is into an external module
-		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs))
-		{
+		if (preg_match('/^([^@]+)@([^@]+)$/i', $canvas, $regs)) {
 			$this->canvas = $regs[1];
 			$this->dirmodule = $regs[2];
 		}
 		// For compatibility
-		if ($this->dirmodule == 'thirdparty') { $this->dirmodule = 'societe'; }
+		if ($this->dirmodule == 'thirdparty') {
+			$this->dirmodule = 'societe';
+		}
 
 		// Control file
 		$controlclassfile = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/actions_'.$this->card.'_'.$this->canvas.'.class.php');
-		if (file_exists($controlclassfile))
-		{
+		if (file_exists($controlclassfile)) {
 			// Include actions class (controller)
 			$this->control_file = $controlclassfile;
 			require_once $controlclassfile;
@@ -124,8 +130,7 @@ class Canvas
 
 		// Template dir
 		$this->template_dir = dol_buildpath('/'.$this->dirmodule.'/canvas/'.$this->canvas.'/tpl/');
-		if (!is_dir($this->template_dir))
-		{
+		if (!is_dir($this->template_dir)) {
 			$this->template_dir = '';
 		}
 
@@ -145,7 +150,9 @@ class Canvas
 	public function assign_values(&$action = 'view', $id = 0, $ref = '')
 	{
 		// phpcs:enable
-		if (method_exists($this->control, 'assign_values')) $this->control->assign_values($action, $id, $ref);
+		if (method_exists($this->control, 'assign_values')) {
+			$this->control->assign_values($action, $id, $ref);
+		}
 	}
 
 	/**
@@ -156,10 +163,15 @@ class Canvas
 	 */
 	public function displayCanvasExists($action)
 	{
-		if (empty($this->template_dir)) return 0;
+		if (empty($this->template_dir)) {
+			return 0;
+		}
 
-		if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) return 1;
-		else return 0;
+		if (file_exists($this->template_dir.(!empty($this->card) ? $this->card.'_' : '').$this->_cleanaction($action).'.tpl.php')) {
+			return 1;
+		} else {
+			return 0;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -207,8 +219,7 @@ class Canvas
 	 */
 	public function doActions(&$action = 'view', $id = 0)
 	{
-		if (method_exists($this->control, 'doActions'))
-		{
+		if (method_exists($this->control, 'doActions')) {
 			$ret = $this->control->doActions($action, $id);
 			return $ret;
 		}
diff --git a/htdocs/core/class/ccountry.class.php b/htdocs/core/class/ccountry.class.php
index 561d0527796..1c886a526ed 100644
--- a/htdocs/core/class/ccountry.class.php
+++ b/htdocs/core/class/ccountry.class.php
@@ -94,10 +94,18 @@ class Ccountry // extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
-		if (isset($this->label)) $this->label = trim($this->label);
-		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+			$this->code_iso = trim($this->code_iso);
+		}
+		if (isset($this->label)) {
+			$this->label = trim($this->label);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -119,20 +127,19 @@ class Ccountry // extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_country");
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -156,22 +163,24 @@ class Ccountry // extends CommonObject
 	public function fetch($id, $code = '', $code_iso = '')
 	{
 		$sql = "SELECT";
-  		$sql .= " t.rowid,";
-  		$sql .= " t.code,";
-  		$sql .= " t.code_iso,";
-  		$sql .= " t.label,";
-  		$sql .= " t.active";
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.code_iso,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_country as t";
-		if ($id) $sql .= " WHERE t.rowid = ".((int) $id);
-		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape(strtoupper($code))."'";
-		elseif ($code_iso) $sql .= " WHERE t.code_iso = '".$this->db->escape(strtoupper($code_iso))."'";
+		if ($id) {
+			$sql .= " WHERE t.rowid = ".((int) $id);
+		} elseif ($code) {
+			$sql .= " WHERE t.code = '".$this->db->escape(strtoupper($code))."'";
+		} elseif ($code_iso) {
+			$sql .= " WHERE t.code_iso = '".$this->db->escape(strtoupper($code_iso))."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				if ($obj) {
@@ -188,7 +197,7 @@ class Ccountry // extends CommonObject
 				return 0;
 			}
 		} else {
-	  		$this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -207,10 +216,18 @@ class Ccountry // extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->code_iso)) $this->code_iso = trim($this->code_iso);
-		if (isset($this->label)) $this->label = trim($this->label);
-		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->code_iso)) {
+			$this->code_iso = trim($this->code_iso);
+		}
+		if (isset($this->label)) {
+			$this->label = trim($this->label);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
 
 
 		// Check parameters
@@ -228,13 +245,13 @@ class Ccountry // extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -247,13 +264,13 @@ class Ccountry // extends CommonObject
 	}
 
 
- 	/**
- 	 *  Delete object in database
- 	 *
- 	 *	@param  User	$user        User that delete
- 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
- 	 *  @return	int					 <0 if KO, >0 if OK
- 	 */
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param  User	$user        User that delete
+	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -266,13 +283,13 @@ class Ccountry // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 2340657ef4e..ecbfdc94454 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -92,12 +92,12 @@ abstract class CommonDocGenerator
 			'myuser_fullname'=>$user->getFullName($outputlangs, 1),
 			'myuser_login'=>$user->login,
 			'myuser_phone'=>$user->office_phone,
-	   		'myuser_address'=>$user->address,
-	   		'myuser_zip'=>$user->zip,
-	   		'myuser_town'=>$user->town,
-	   		'myuser_country'=>$user->country,
+			'myuser_address'=>$user->address,
+			'myuser_zip'=>$user->zip,
+			'myuser_town'=>$user->town,
+			'myuser_country'=>$user->country,
 			'myuser_country_code'=>$user->country_code,
-	   		'myuser_state'=>$user->state,
+			'myuser_state'=>$user->state,
 			'myuser_state_code'=>$user->state_code,
 			'myuser_fax'=>$user->office_fax,
 			'myuser_mobile'=>$user->user_mobile,
@@ -173,16 +173,13 @@ abstract class CommonDocGenerator
 		// phpcs:enable
 		global $conf;
 
-		if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))
-		{
+		if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code)) {
 			$mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);
 		}
-		if (empty($mysoc->country) && !empty($mysoc->country_code))
-		{
+		if (empty($mysoc->country) && !empty($mysoc->country_code)) {
 			$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
 		}
-		if (empty($mysoc->state) && !empty($mysoc->state_code))
-		{
+		if (empty($mysoc->state) && !empty($mysoc->state_code)) {
 			$mysoc->state = getState($mysoc->state_code, 0);
 		}
 
@@ -234,12 +231,10 @@ abstract class CommonDocGenerator
 		// phpcs:enable
 		global $conf, $extrafields;
 
-		if (empty($object->country) && !empty($object->country_code))
-		{
+		if (empty($object->country) && !empty($object->country_code)) {
 			$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
 		}
-		if (empty($object->state) && !empty($object->state_code))
-		{
+		if (empty($object->state) && !empty($object->state_code)) {
 			$object->state = getState($object->state_code, 0);
 		}
 
@@ -279,8 +274,7 @@ abstract class CommonDocGenerator
 		);
 
 		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
+		if (is_array($object->array_options) && count($object->array_options)) {
 			$object->fetch_optionals();
 
 			$array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);
@@ -302,12 +296,10 @@ abstract class CommonDocGenerator
 		// phpcs:enable
 		global $conf, $extrafields;
 
-		if (empty($object->country) && !empty($object->country_code))
-		{
+		if (empty($object->country) && !empty($object->country_code)) {
 			$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
 		}
-		if (empty($object->state) && !empty($object->state_code))
-		{
+		if (empty($object->state) && !empty($object->state_code)) {
 			$object->state = getState($object->state_code, 0);
 		}
 
@@ -342,8 +334,7 @@ abstract class CommonDocGenerator
 		);
 
 		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
+		if (is_array($object->array_options) && count($object->array_options)) {
 			$object->fetch_optionals();
 
 			$array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);
@@ -369,20 +360,22 @@ abstract class CommonDocGenerator
 			// Date in default language
 			'current_date'=>dol_print_date($now, 'day', 'tzuser'),
 			'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
-   			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),
-   			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),
+			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),
+			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),
 			// Date in requested output language
 			'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
-   			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
-   			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),
-   			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
+			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
+			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),
+			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
 		);
 
 
-		foreach ($conf->global as $key => $val)
-		{
-			if (isASecretKey($key)) $newval = '*****forbidden*****';
-			else $newval = $val;
+		foreach ($conf->global as $key => $val) {
+			if (isASecretKey($key)) {
+				$newval = '*****forbidden*****';
+			} else {
+				$newval = $val;
+			}
 			$array_other['__['.$key.']__'] = $newval;
 		}
 
@@ -407,11 +400,9 @@ abstract class CommonDocGenerator
 		$sumpayed = $sumdeposit = $sumcreditnote = '';
 		$already_payed_all = 0;
 		$remain_to_pay = 0;
-		if ($object->element == 'facture')
-		{
+		if ($object->element == 'facture') {
 			$invoice_source = new Facture($this->db);
-			if ($object->fk_facture_source > 0)
-			{
+			if ($object->fk_facture_source > 0) {
 				$invoice_source->fetch($object->fk_facture_source);
 			}
 			$sumpayed = $object->getSommePaiement();
@@ -508,10 +499,8 @@ abstract class CommonDocGenerator
 		}
 
 		// Fetch project information if there is a project assigned to this object
-		if ($object->element != "project" && !empty($object->fk_project) && $object->fk_project > 0)
-		{
-			if (!is_object($object->project))
-			{
+		if ($object->element != "project" && !empty($object->fk_project) && $object->fk_project > 0) {
+			if (!is_object($object->project)) {
 				$object->fetch_projet();
 			}
 
@@ -523,18 +512,20 @@ abstract class CommonDocGenerator
 		}
 
 		// Add vat by rates
-		if (is_array($object->lines) && count($object->lines) > 0)
-		{
+		if (is_array($object->lines) && count($object->lines) > 0) {
 			$totalUp = 0;
-			foreach ($object->lines as $line)
-			{
+			foreach ($object->lines as $line) {
 				// $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
-				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) {
+					$resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+				}
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx] = price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
 				// $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated = vatrate($line->tva_tx);
-				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated] = 0;
+				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) {
+					$resarray[$array_key.'_total_vat_'.$vatformated] = 0;
+				}
 				$resarray[$array_key.'_total_vat_'.$vatformated] += $line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$vatformated] = price($resarray[$array_key.'_total_vat_'.$vatformated]);
 
@@ -560,8 +551,7 @@ abstract class CommonDocGenerator
 		}
 
 		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
+		if (is_array($object->array_options) && count($object->array_options)) {
 			$object->fetch_optionals();
 
 			$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
@@ -630,8 +620,7 @@ abstract class CommonDocGenerator
 		);
 
 		// Units
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			  $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
 			  $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
 		}
@@ -647,32 +636,26 @@ abstract class CommonDocGenerator
 		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
 
 		// Check if the current line belongs to a supplier order
-		if (get_class($line) == 'CommandeFournisseurLigne')
-		{
+		if (get_class($line) == 'CommandeFournisseurLigne') {
 			// Add the product supplier extrafields to the substitutions
 			$extrafields->fetch_name_optionals_label("product_fournisseur_price");
 			$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
 
-			if (!empty($extralabels) && is_array($extralabels))
-			{
+			if (!empty($extralabels) && is_array($extralabels)) {
 				$columns = "";
 
-				foreach ($extralabels as $key => $label)
-				{
+				foreach ($extralabels as $key => $label) {
 					$columns .= "$key, ";
 				}
 
-				if ($columns != "")
-				{
+				if ($columns != "") {
 					$columns = substr($columns, 0, strlen($columns) - 2);
 					$resql = $this->db->query("SELECT ".$columns." FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields AS ex INNER JOIN ".MAIN_DB_PREFIX."product_fournisseur_price AS f ON ex.fk_object = f.rowid WHERE f.ref_fourn = '".$this->db->escape($line->ref_supplier)."'");
 
-					if ($this->db->num_rows($resql) > 0)
-					{
+					if ($this->db->num_rows($resql) > 0) {
 						$resql = $this->db->fetch_object($resql);
 
-						foreach ($extralabels as $key => $label)
-						{
+						foreach ($extralabels as $key => $label) {
 							$resarray['line_product_supplier_'.$key] = $resql->{$key};
 						}
 					}
@@ -681,12 +664,12 @@ abstract class CommonDocGenerator
 		}
 
 		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
-		if (isset($line->fk_product) && $line->fk_product > 0)
-		{
+		if (isset($line->fk_product) && $line->fk_product > 0) {
 			$tmpproduct = new Product($this->db);
 			$result = $tmpproduct->fetch($line->fk_product);
-			foreach ($tmpproduct->array_options as $key=>$label)
+			foreach ($tmpproduct->array_options as $key => $label) {
 				$resarray["line_product_".$key] = $label;
+			}
 		}
 
 		return $resarray;
@@ -734,15 +717,15 @@ abstract class CommonDocGenerator
 		);
 
 		// Add vat by rates
-		foreach ($object->lines as $line)
-		{
-			if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+		foreach ($object->lines as $line) {
+			if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) {
+				$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+			}
 			$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
 		}
 
 		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
+		if (is_array($object->array_options) && count($object->array_options)) {
 			$object->fetch_optionals();
 
 			$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
@@ -853,30 +836,25 @@ abstract class CommonDocGenerator
 		global $conf;
 
 		if (is_array($extrafields->attributes[$object->table_element]['label'])) {
-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key=>$label)
-			{
-				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'price')
-				{
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'price') {
 					$object->array_options['options_'.$key] = price2num($object->array_options['options_'.$key]);
 					$object->array_options['options_'.$key.'_currency'] = price($object->array_options['options_'.$key], 0, $outputlangs, 0, 0, -1, $conf->currency);
 					//Add value to store price with currency
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
-				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select')
-				{
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select') {
 					$object->array_options['options_'.$key] = $extrafields->attributes[$object->table_element]['param'][$key]['options'][$object->array_options['options_'.$key]];
 				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {
 					$valArray = explode(',', $object->array_options['options_'.$key]);
 					$output = array();
-					foreach ($extrafields->attributes[$object->table_element]['param'][$key]['options'] as $keyopt=>$valopt) {
+					foreach ($extrafields->attributes[$object->table_element]['param'][$key]['options'] as $keyopt => $valopt) {
 						if (in_array($keyopt, $valArray)) {
 							$output[] = $valopt;
 						}
 					}
 					$object->array_options['options_'.$key] = implode(', ', $output);
-				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date')
-				{
-					if (strlen($object->array_options['options_'.$key]) > 0)
-					{
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'date') {
+					if (strlen($object->array_options['options_'.$key]) > 0) {
 						$date = $object->array_options['options_'.$key];
 						$object->array_options['options_'.$key] = dol_print_date($date, 'day'); // using company output language
 						$object->array_options['options_'.$key.'_locale'] = dol_print_date($date, 'day', 'tzserver', $outputlangs); // using output language format
@@ -888,29 +866,24 @@ abstract class CommonDocGenerator
 					}
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-				} elseif ($extrafields->attributes[$object->table_element]['label'][$key] == 'datetime')
-				{
+				} elseif ($extrafields->attributes[$object->table_element]['label'][$key] == 'datetime') {
 					$datetime = $object->array_options['options_'.$key];
 					$object->array_options['options_'.$key] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour') : ''); // using company output language
 					$object->array_options['options_'.$key.'_locale'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhour', 'tzserver', $outputlangs) : ''); // using output language format
 					$object->array_options['options_'.$key.'_rfc'] = ($datetime != "0000-00-00 00:00:00" ?dol_print_date($object->array_options['options_'.$key], 'dayhourrfc') : ''); // international format
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_locale' => $object->array_options['options_'.$key.'_locale']));
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_rfc' => $object->array_options['options_'.$key.'_rfc']));
-				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link')
-				{
+				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'link') {
 					$id = $object->array_options['options_'.$key];
-					if ($id != "")
-					{
+					if ($id != "") {
 						$param = $extrafields->attributes[$object->table_element]['param'][$key];
 						$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 						$InfoFieldList = explode(":", $param_list[0]);
 						$classname = $InfoFieldList[0];
 						$classpath = $InfoFieldList[1];
-						if (!empty($classpath))
-						{
+						if (!empty($classpath)) {
 							dol_include_once($InfoFieldList[1]);
-							if ($classname && class_exists($classname))
-							{
+							if ($classname && class_exists($classname)) {
 								$tmpobject = new $classname($this->db);
 								$tmpobject->fetch($id);
 								// completely replace the id with the linked object name
@@ -942,9 +915,13 @@ abstract class CommonDocGenerator
 	 */
 	public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
 	{
-		if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
+		if (empty($hidetop) || $hidetop == -1) {
+			$pdf->line($x, $y, $x + $l, $y);
+		}
 		$pdf->line($x + $l, $y, $x + $l, $y + $h);
-		if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
+		if (empty($hidebottom)) {
+			$pdf->line($x + $l, $y + $h, $x, $y + $h);
+		}
 		$pdf->line($x, $y + $h, $x, $y);
 	}
 
@@ -958,8 +935,12 @@ abstract class CommonDocGenerator
 	 */
 	public function columnSort($a, $b)
 	{
-		if (empty($a['rank'])) { $a['rank'] = 0; }
-		if (empty($b['rank'])) { $b['rank'] = 0; }
+		if (empty($a['rank'])) {
+			$a['rank'] = 0;
+		}
+		if (empty($b['rank'])) {
+			$b['rank'] = 0;
+		}
 		if ($a['rank'] == $b['rank']) {
 			return 0;
 		}
@@ -995,9 +976,10 @@ abstract class CommonDocGenerator
 		// Count flexible column
 		$totalDefinedColWidth = 0;
 		$countFlexCol = 0;
-		foreach ($this->cols as $colKey =>& $colDef)
-		{
-			if (!$this->getColumnStatus($colKey)) continue; // continue if disabled
+		foreach ($this->cols as $colKey => & $colDef) {
+			if (!$this->getColumnStatus($colKey)) {
+				continue; // continue if disabled
+			}
 
 			if (!empty($colDef['scale'])) {
 				// In case of column width is defined by percentage
@@ -1011,8 +993,7 @@ abstract class CommonDocGenerator
 			}
 		}
 
-		foreach ($this->cols as $colKey =>& $colDef)
-		{
+		foreach ($this->cols as $colKey => & $colDef) {
 			// setting empty conf with default
 			if (!empty($colDef['title'])) {
 				$colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
@@ -1027,8 +1008,7 @@ abstract class CommonDocGenerator
 				$colDef['content'] = $this->defaultContentsFieldsStyle;
 			}
 
-			if ($this->getColumnStatus($colKey))
-			{
+			if ($this->getColumnStatus($colKey)) {
 				// In case of flexible column
 				if (empty($colDef['width'])) {
 					$colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;
@@ -1076,7 +1056,9 @@ abstract class CommonDocGenerator
 	 */
 	public function getColumnRank($colKey)
 	{
-		if (!isset($this->cols[$colKey]['rank'])) return -1;
+		if (!isset($this->cols[$colKey]['rank'])) {
+			return -1;
+		}
 		return  $this->cols[$colKey]['rank'];
 	}
 
@@ -1097,7 +1079,9 @@ abstract class CommonDocGenerator
 		// try to get rank from target column
 		if (!empty($targetCol)) {
 			$rank = $this->getColumnRank($targetCol);
-			if ($rank >= 0 && $insertAfterTarget) { $rank++; }
+			if ($rank >= 0 && $insertAfterTarget) {
+				$rank++;
+			}
 		}
 
 		// get rank from new column definition
@@ -1106,12 +1090,12 @@ abstract class CommonDocGenerator
 		}
 
 		// error: no rank
-		if ($rank < 0) { return -1; }
+		if ($rank < 0) {
+			return -1;
+		}
 
-		foreach ($this->cols as $colKey =>& $colDef)
-		{
-			if ($rank <= $colDef['rank'])
-			{
+		foreach ($this->cols as $colKey => & $colDef) {
+			if ($rank <= $colDef['rank']) {
 				$colDef['rank'] = $colDef['rank'] + 1;
 			}
 		}
@@ -1143,10 +1127,13 @@ abstract class CommonDocGenerator
 			'pdf' => &$pdf,
 		);
 		$reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		if (!$reshook)
-		{
-			if (empty($columnText)) return;
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+		if (!$reshook) {
+			if (empty($columnText)) {
+				return;
+			}
 			$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
 			$colDef = $this->cols[$colKey];
 			// save curent cell padding
@@ -1215,7 +1202,9 @@ abstract class CommonDocGenerator
 	{
 		global $hookmanager;
 
-		if (empty($object->table_element)) { return; }
+		if (empty($object->table_element)) {
+			return;
+		}
 
 		$extrafieldsKeyPrefix = "options_";
 
@@ -1229,8 +1218,12 @@ abstract class CommonDocGenerator
 
 
 		// Load extrafiels if not allready does
-		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		if (empty($this->extrafieldsCache)) {
+			$this->extrafieldsCache = new ExtraFields($this->db);
+		}
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) {
+			$this->extrafieldsCache->fetch_name_optionals_label($object->table_element);
+		}
 		$extrafields = $this->extrafieldsCache;
 
 		$extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
@@ -1248,9 +1241,10 @@ abstract class CommonDocGenerator
 			'extrafieldOutputContent' =>& $extrafieldOutputContent
 		);
 		$reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		if ($reshook)
-		{
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+		if ($reshook) {
 			$extrafieldOutputContent = $hookmanager->resPrint;
 		}
 
@@ -1275,8 +1269,12 @@ abstract class CommonDocGenerator
 		}
 
 		// Load extrafiels if not allready does
-		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		if (empty($this->extrafieldsCache)) {
+			$this->extrafieldsCache = new ExtraFields($this->db);
+		}
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) {
+			$this->extrafieldsCache->fetch_name_optionals_label($object->table_element);
+		}
 		$extrafields = $this->extrafieldsCache;
 
 		$defaultParams = array(
@@ -1315,8 +1313,7 @@ abstract class CommonDocGenerator
 		$fields = array();
 
 		if (!empty($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label'])) {
-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
-			{
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
 				// Enable extrafield ?
 				$enabled = 0;
 				$disableOnEmpty = 0;
@@ -1350,8 +1347,7 @@ abstract class CommonDocGenerator
 			}
 		}
 
-		if (!empty($fields))
-		{
+		if (!empty($fields)) {
 			// Sort extrafields by rank
 			uasort($fields, function ($a, $b) {
 				return  ($a->rank > $b->rank) ? 1 : -1;
@@ -1445,7 +1441,9 @@ abstract class CommonDocGenerator
 	{
 		if (!empty($this->cols[$colKey]['status'])) {
 			return true;
-		} else return  false;
+		} else {
+			return  false;
+		}
 	}
 
 	/**
@@ -1476,7 +1474,9 @@ abstract class CommonDocGenerator
 			if ($reshook < 0) {
 				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 			} elseif (empty($reshook)) {
-				if (!$this->getColumnStatus($colKey)) continue;
+				if (!$this->getColumnStatus($colKey)) {
+					continue;
+				}
 
 				// get title label
 				$colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
@@ -1546,17 +1546,19 @@ abstract class CommonDocGenerator
 		}
 
 		// Load extrafiels if not allready does
-		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		if (empty($this->extrafieldsCache)) {
+			$this->extrafieldsCache = new ExtraFields($this->db);
+		}
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) {
+			$this->extrafieldsCache->fetch_name_optionals_label($object->table_element);
+		}
 		$extrafields = $this->extrafieldsCache;
 
 
 		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
-			{
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
 				// Dont display separator yet even is set to be displayed (not compatible yet)
-				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
-				{
+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
 					continue;
 				}
 
@@ -1570,10 +1572,14 @@ abstract class CommonDocGenerator
 					// Note : if $printable === 3 or 4 so, it's displayed after line description not in cols
 				}
 
-				if (!$enabled) { continue; } // don't wast resourses if we don't need them...
+				if (!$enabled) {
+					continue;
+				} // don't wast resourses if we don't need them...
 
 				// Load language if required
-				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) {
+					$outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+				}
 
 				// TODO : add more extrafield customisation capacities for PDF like width, rank...
 
diff --git a/htdocs/core/class/commonincoterm.class.php b/htdocs/core/class/commonincoterm.class.php
index f98f3aaabad..25745bb4c5c 100644
--- a/htdocs/core/class/commonincoterm.class.php
+++ b/htdocs/core/class/commonincoterm.class.php
@@ -59,12 +59,10 @@ trait CommonIncoterm
 		$out = '';
 
 		$this->label_incoterms = '';
-		if (!empty($this->fk_incoterms))
-		{
+		if (!empty($this->fk_incoterms)) {
 			$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$res = $this->db->fetch_object($result);
 				$out .= $res->code;
 			}
@@ -84,11 +82,9 @@ trait CommonIncoterm
 	{
 		$sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$res = $this->db->fetch_object($resql);
 				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
 			} else {
@@ -109,23 +105,20 @@ trait CommonIncoterm
 	 */
 	public function setIncoterms($id_incoterm, $location)
 	{
-		if ($this->id && $this->table_element)
-		{
+		if ($this->id && $this->table_element) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET fk_incoterms = ".($id_incoterm > 0 ? $id_incoterm : "null");
 			$sql .= ", location_incoterms = ".($id_incoterm > 0 ? "'".$this->db->escape($location)."'" : "null");
 			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this).'::setIncoterms', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->fk_incoterms = $id_incoterm;
 				$this->location_incoterms = $location;
 
 				$sql = 'SELECT libelle as label_incotermsFROM '.MAIN_DB_PREFIX.'c_incoterms WHERE rowid = '.(int) $this->fk_incoterms;
 				$res = $this->db->query($sql);
-				if ($res)
-				{
+				if ($res) {
 					$obj = $this->db->fetch_object($res);
 					$this->label_incoterms = $obj->label_incoterms;
 				}
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 5c679848354..fc4e2058273 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -125,8 +125,7 @@ abstract class CommonInvoice extends CommonObject
 	{
 		$table = 'paiement_facture';
 		$field = 'fk_facture';
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-		{
+		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
 			$table = 'paiementfourn_facturefourn';
 			$field = 'fk_facturefourn';
 		}
@@ -137,12 +136,14 @@ abstract class CommonInvoice extends CommonObject
 
 		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$this->db->free($resql);
-			if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
+			if ($multicurrency) {
+				return $obj->multicurrency_amount;
+			} else {
+				return $obj->amount;
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -158,8 +159,7 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public function getSumDepositsUsed($multicurrency = 0)
 	{
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-		{
+		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
 			// TODO
 			return 0.0;
 		}
@@ -230,12 +230,10 @@ abstract class CommonInvoice extends CommonObject
 		$sql .= ' WHERE fk_facture_source = '.$this->id;
 		$sql .= ' AND type = 2';
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
 				$idarray[] = $row[0];
 				$i++;
@@ -258,7 +256,9 @@ abstract class CommonInvoice extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 		$sql .= ' WHERE fk_facture_source = '.$this->id;
 		$sql .= ' AND type < 2';
-		if ($option == 'validated') $sql .= ' AND fk_statut = 1';
+		if ($option == 'validated') {
+			$sql .= ' AND fk_statut = 1';
+		}
 		// PROTECTION BAD DATA
 		// In case the database is corrupted and there is a valid replectement invoice
 		// and another no, priority is given to the valid one.
@@ -267,11 +267,9 @@ abstract class CommonInvoice extends CommonObject
 		$sql .= ' ORDER BY fk_statut DESC';
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				// If there is any
 				return $obj->rowid;
 			} else {
@@ -299,8 +297,7 @@ abstract class CommonInvoice extends CommonObject
 		$field2 = 'fk_paiement';
 		$field3 = ', p.ref_ext';
 		$sharedentity = 'facture';
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-		{
+		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
 			$table = 'paiementfourn_facturefourn';
 			$table2 = 'paiementfourn';
 			$field = 'fk_facturefourn';
@@ -316,16 +313,16 @@ abstract class CommonInvoice extends CommonObject
 		$sql .= ' AND pf.'.$field2.' = p.rowid';
 		$sql .= ' AND p.fk_paiement = t.id';
 		$sql .= ' AND p.entity IN ('.getEntity($sharedentity).')';
-		if ($filtertype) $sql .= " AND t.code='PRE'";
+		if ($filtertype) {
+			$sql .= " AND t.code='PRE'";
+		}
 
 		dol_syslog(get_class($this)."::getListOfPayments", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$tmp = array('amount'=>$obj->amount, 'type'=>$obj->code, 'date'=>$obj->datep, 'num'=>$obj->num, 'ref'=>$obj->ref);
 				if (!empty($field3)) {
@@ -338,14 +335,12 @@ abstract class CommonInvoice extends CommonObject
 
 			//look for credit notes and discounts and deposits
 			$sql = '';
-			if ($this->element == 'facture' || $this->element == 'invoice')
-			{
+			if ($this->element == 'facture' || $this->element == 'invoice') {
 				$sql = 'SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
 				$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$this->id;
 				$sql .= ' AND (f.type = 2 OR f.type = 0 OR f.type = 3)'; // Find discount coming from credit note or excess received or deposits (payments from deposits are always null except if FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is set)
-			} elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-			{
+			} elseif ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
 				$sql = 'SELECT rc.amount_ttc as amount, rc.multicurrency_amount_ttc as multicurrency_amount, rc.datec as date, f.ref as ref, rc.description as type';
 				$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
 				$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$this->id;
@@ -354,12 +349,10 @@ abstract class CommonInvoice extends CommonObject
 
 			if ($sql) {
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
 						if ($multicurrency) {
 							$retarray[] = array('amount'=>$obj->multicurrency_amount, 'type'=>$obj->type, 'date'=>$obj->date, 'num'=>'0', 'ref'=>$obj->ref);
@@ -407,42 +400,50 @@ abstract class CommonInvoice extends CommonObject
 		// We check if invoice is a temporary number (PROVxxxx)
 		$tmppart = substr($this->ref, 1, 4);
 
-		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') // If draft invoice and ref not yet defined
-		{
+		if ($this->statut == self::STATUS_DRAFT && $tmppart === 'PROV') { // If draft invoice and ref not yet defined
 			return 1;
 		}
 
-		if (!empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) return 0;
+		if (!empty($conf->global->INVOICE_CAN_NEVER_BE_REMOVED)) {
+			return 0;
+		}
 
 		// If not a draft invoice and not temporary invoice
-		if ($tmppart !== 'PROV')
-		{
+		if ($tmppart !== 'PROV') {
 			$ventilExportCompta = $this->getVentilExportCompta();
-			if ($ventilExportCompta != 0) return -1;
+			if ($ventilExportCompta != 0) {
+				return -1;
+			}
 
 			// Get last number of validated invoice
-			if ($this->element != 'invoice_supplier')
-			{
-				if (empty($this->thirdparty)) $this->fetch_thirdparty(); // We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
+			if ($this->element != 'invoice_supplier') {
+				if (empty($this->thirdparty)) {
+					$this->fetch_thirdparty(); // We need to have this->thirdparty defined, in case of numbering rule use tags that depend on thirdparty (like {t} tag).
+				}
 				$maxref = $this->getNextNumRef($this->thirdparty, 'last');
 
 				// If there is no invoice into the reset range and not already dispatched, we can delete
 				// If invoice to delete is last one and not already dispatched, we can delete
-				if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) return -2;
+				if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $maxref != '' && $maxref != $this->ref) {
+					return -2;
+				}
 
 				// TODO If there is payment in bookkeeping, check payment is not dispatched in accounting
 				// ...
 
-				if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle'))
-				{
+				if ($this->situation_cycle_ref && method_exists($this, 'is_last_in_cycle')) {
 					$last = $this->is_last_in_cycle();
-					if (!$last) return -3;
+					if (!$last) {
+						return -3;
+					}
 				}
 			}
 		}
 
 		// Test if there is at least one payment. If yes, refuse to delete.
-		if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) return -4;
+		if (empty($conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED) && $this->getSommePaiement() > 0) {
+			return -4;
+		}
 
 		return 2;
 	}
@@ -457,15 +458,15 @@ abstract class CommonInvoice extends CommonObject
 		$alreadydispatched = 0;
 
 		$type = 'customer_invoice';
-		if ($this->element == 'invoice_supplier') $type = 'supplier_invoice';
+		if ($this->element == 'invoice_supplier') {
+			$type = 'supplier_invoice';
+		}
 
 		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$alreadydispatched = $obj->nb;
 			}
 		} else {
@@ -473,8 +474,7 @@ abstract class CommonInvoice extends CommonObject
 			return -1;
 		}
 
-		if ($alreadydispatched)
-		{
+		if ($alreadydispatched) {
 			return 1;
 		}
 		return 0;
@@ -489,12 +489,19 @@ abstract class CommonInvoice extends CommonObject
 	public function getLibType()
 	{
 		global $langs;
-		if ($this->type == CommonInvoice::TYPE_STANDARD) return $langs->trans("InvoiceStandard");
-		elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) return $langs->trans("InvoiceReplacement");
-		elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) return $langs->trans("InvoiceAvoir");
-		elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) return $langs->trans("InvoiceDeposit");
-		elseif ($this->type == CommonInvoice::TYPE_PROFORMA) return $langs->trans("InvoiceProForma"); // Not used.
-		elseif ($this->type == CommonInvoice::TYPE_SITUATION) return $langs->trans("InvoiceSituation");
+		if ($this->type == CommonInvoice::TYPE_STANDARD) {
+			return $langs->trans("InvoiceStandard");
+		} elseif ($this->type == CommonInvoice::TYPE_REPLACEMENT) {
+			return $langs->trans("InvoiceReplacement");
+		} elseif ($this->type == CommonInvoice::TYPE_CREDIT_NOTE) {
+			return $langs->trans("InvoiceAvoir");
+		} elseif ($this->type == CommonInvoice::TYPE_DEPOSIT) {
+			return $langs->trans("InvoiceDeposit");
+		} elseif ($this->type == CommonInvoice::TYPE_PROFORMA) {
+			return $langs->trans("InvoiceProForma"); // Not used.
+		} elseif ($this->type == CommonInvoice::TYPE_SITUATION) {
+			return $langs->trans("InvoiceSituation");
+		}
 		return $langs->trans("Unknown");
 	}
 
@@ -527,7 +534,9 @@ abstract class CommonInvoice extends CommonObject
 		global $langs;
 		$langs->load('bills');
 
-		if ($type == -1) $type = $this->type;
+		if ($type == -1) {
+			$type = $this->type;
+		}
 
 		$statusType = 'status0';
 		$prefix = 'Short';
@@ -581,8 +590,12 @@ abstract class CommonInvoice extends CommonObject
 	public function calculate_date_lim_reglement($cond_reglement = 0)
 	{
 		// phpcs:enable
-		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_code;
-		if (!$cond_reglement) $cond_reglement = $this->cond_reglement_id;
+		if (!$cond_reglement) {
+			$cond_reglement = $this->cond_reglement_code;
+		}
+		if (!$cond_reglement) {
+			$cond_reglement = $this->cond_reglement_id;
+		}
 
 		$cdr_nbjour = 0;
 		$cdr_type = 0;
@@ -590,18 +603,17 @@ abstract class CommonInvoice extends CommonObject
 
 		$sqltemp = 'SELECT c.type_cdr, c.nbjour, c.decalage';
 		$sqltemp .= ' FROM '.MAIN_DB_PREFIX.'c_payment_term as c';
-		if (is_numeric($cond_reglement)) $sqltemp .= " WHERE c.rowid=".$cond_reglement;
-		else {
+		if (is_numeric($cond_reglement)) {
+			$sqltemp .= " WHERE c.rowid=".$cond_reglement;
+		} else {
 			$sqltemp .= " WHERE c.entity IN (".getEntity('c_payment_term').")";
 			$sqltemp .= " AND c.code='".$this->db->escape($cond_reglement)."'";
 		}
 
 		dol_syslog(get_class($this).'::calculate_date_lim_reglement', LOG_DEBUG);
 		$resqltemp = $this->db->query($sqltemp);
-		if ($resqltemp)
-		{
-			if ($this->db->num_rows($resqltemp))
-			{
+		if ($resqltemp) {
+			if ($this->db->num_rows($resqltemp)) {
 				$obj = $this->db->fetch_object($resqltemp);
 				$cdr_nbjour = $obj->nbjour;
 				$cdr_type = $obj->type_cdr;
@@ -616,21 +628,18 @@ abstract class CommonInvoice extends CommonObject
 		/* Definition de la date limite */
 
 		// 0 : adding the number of days
-		if ($cdr_type == 0)
-		{
+		if ($cdr_type == 0) {
 			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
 
 			$datelim += ($cdr_decalage * 3600 * 24);
 		}
 		// 1 : application of the "end of the month" rule
-		elseif ($cdr_type == 1)
-		{
+		elseif ($cdr_type == 1) {
 			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
 
 			$mois = date('m', $datelim);
 			$annee = date('Y', $datelim);
-			if ($mois == 12)
-			{
+			if ($mois == 12) {
 				$mois = 1;
 				$annee += 1;
 			} else {
@@ -643,8 +652,7 @@ abstract class CommonInvoice extends CommonObject
 			$datelim += ($cdr_decalage * 3600 * 24);
 		}
 		// 2 : application of the rule, the N of the current or next month
-		elseif ($cdr_type == 2 && !empty($cdr_decalage))
-		{
+		elseif ($cdr_type == 2 && !empty($cdr_decalage)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			$datelim = $this->date + ($cdr_nbjour * 3600 * 24);
 
@@ -654,8 +662,11 @@ abstract class CommonInvoice extends CommonObject
 
 			$diff = $date_piece - $date_lim_current;
 
-			if ($diff < 0) $datelim = $date_lim_current;
-			else $datelim = $date_lim_next;
+			if ($diff < 0) {
+				$datelim = $date_lim_current;
+			} else {
+				$datelim = $date_lim_next;
+			}
 		} else {
 			return 'Bad value for type_cdr in database for record cond_reglement = '.$cond_reglement;
 		}
@@ -683,8 +694,7 @@ abstract class CommonInvoice extends CommonObject
 
 		dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 
-		if ($this->statut > self::STATUS_DRAFT && $this->paye == 0)
-		{
+		if ($this->statut > self::STATUS_DRAFT && $this->paye == 0) {
 			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
 			$bac = new CompanyBankAccount($this->db);
 			$bac->fetch(0, $this->socid);
@@ -701,11 +711,9 @@ abstract class CommonInvoice extends CommonObject
 
 			dol_syslog(get_class($this)."::demande_prelevement", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$row = $this->db->fetch_row($resql);
-				if ($row[0] == 0)
-				{
+				if ($row[0] == 0) {
 					$now = dol_now();
 
 					$totalpaye = $this->getSommePaiement();
@@ -717,10 +725,11 @@ abstract class CommonInvoice extends CommonObject
 					// For example print 239.2 - 229.3 - 9.9; does not return 0.
 					//$resteapayer=bcadd($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
 					//$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
-					if (empty($amount)) $amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+					if (empty($amount)) {
+						$amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+					}
 
-					if (is_numeric($amount) && $amount != 0)
-					{
+					if (is_numeric($amount) && $amount != 0) {
 						$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'prelevement_facture_demande(';
 						if ($type == 'bank-transfer') {
 							$sql .= 'fk_facture_fourn, ';
@@ -761,7 +770,9 @@ abstract class CommonInvoice extends CommonObject
 						}
 					}
 
-					if ($error) return -1;
+					if ($error) {
+						return -1;
+					}
 					return 1;
 				} else {
 					$this->error = "A request already exists";
@@ -794,8 +805,7 @@ abstract class CommonInvoice extends CommonObject
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'prelevement_facture_demande';
 		$sql .= ' WHERE rowid = '.$did;
 		$sql .= ' AND traite = 0';
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			return 0;
 		} else {
 			$this->error = $this->db->lasterror();
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 09e8ec4a00b..008a1b21e40 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -526,23 +526,30 @@ abstract class CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX.$element;
 		$sql .= " WHERE entity IN (".getEntity($element).")";
 
-		if ($id > 0) $sql .= " AND rowid = ".$db->escape($id);
-		elseif ($ref) $sql .= " AND ref = '".$db->escape($ref)."'";
-		elseif ($ref_ext) $sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
-		else {
+		if ($id > 0) {
+			$sql .= " AND rowid = ".$db->escape($id);
+		} elseif ($ref) {
+			$sql .= " AND ref = '".$db->escape($ref)."'";
+		} elseif ($ref_ext) {
+			$sql .= " AND ref_ext = '".$db->escape($ref_ext)."'";
+		} else {
 			$error = 'ErrorWrongParameters';
 			dol_print_error(get_class()."::isExistingObject ".$error, LOG_ERR);
 			return -1;
 		}
-		if ($ref || $ref_ext) $sql .= " AND entity = ".$conf->entity;
+		if ($ref || $ref_ext) {
+			$sql .= " AND entity = ".$conf->entity;
+		}
 
 		dol_syslog(get_class()."::isExistingObject", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
-			if ($num > 0) return 1;
-			else return 0;
+			if ($num > 0) {
+				return 1;
+			} else {
+				return 0;
+			}
 		}
 		return -1;
 	}
@@ -571,8 +578,7 @@ abstract class CommonObject
 		$parameters = array('objref'=>$objref);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('getFormatedCustomerRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0)
-		{
+		if ($reshook > 0) {
 			return $hookmanager->resArray['objref'];
 		}
 		return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
@@ -591,8 +597,7 @@ abstract class CommonObject
 		$parameters = array('objref'=>$objref);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('getFormatedSupplierRef', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0)
-		{
+		if ($reshook > 0) {
 			return $hookmanager->resArray['objref'];
 		}
 		return $objref.(isset($hookmanager->resArray['objref']) ? $hookmanager->resArray['objref'] : '');
@@ -612,13 +617,17 @@ abstract class CommonObject
 		//print "lastname=".$this->lastname." name=".$this->name." nom=".$this->nom."<br>\n";
 		$lastname = $this->lastname;
 		$firstname = $this->firstname;
-		if (empty($lastname))  $lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
+		if (empty($lastname)) {
+			$lastname = (isset($this->lastname) ? $this->lastname : (isset($this->name) ? $this->name : (isset($this->nom) ? $this->nom : (isset($this->societe) ? $this->societe : (isset($this->company) ? $this->company : '')))));
+		}
 
 		$ret = '';
-		if (!empty($option) && !empty($this->civility_code))
-		{
-			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) $ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';
-			else $ret .= $this->civility_code.' ';
+		if (!empty($option) && !empty($this->civility_code)) {
+			if ($langs->transnoentitiesnoconv("Civility".$this->civility_code) != "Civility".$this->civility_code) {
+				$ret .= $langs->transnoentitiesnoconv("Civility".$this->civility_code).' ';
+			} else {
+				$ret .= $this->civility_code.' ';
+			}
 		}
 
 		$ret .= dolGetFirstLastname($firstname, $lastname, $nameorder);
@@ -684,16 +693,14 @@ abstract class CommonObject
 	 */
 	public function getFullAddress($withcountry = 0, $sep = "\n", $withregion = 0, $extralangcode = '')
 	{
-		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country)))
-		{
+		if ($withcountry && $this->country_id && (empty($this->country_code) || empty($this->country))) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 			$tmparray = getCountry($this->country_id, 'all');
 			$this->country_code = $tmparray['code'];
 			$this->country = $tmparray['label'];
 		}
 
-		if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_code)))
-		{
+		if ($withregion && $this->state_id && (empty($this->state_code) || empty($this->state) || empty($this->region) || empty($this->region_code))) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 			$tmparray = getState($this->state_id, 'all', 0, 1);
 			$this->state_code   = $tmparray['code'];
@@ -738,14 +745,11 @@ abstract class CommonObject
 
 		$outdone = 0;
 		$coords = $this->getFullAddress(1, ', ', (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) ? $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT : 0));
-		if ($coords)
-		{
-			if (!empty($conf->use_javascript_ajax))
-			{
+		if ($coords) {
+			if (!empty($conf->use_javascript_ajax)) {
 				// Add picto with tooltip on map
 				$namecoords = '';
-				if ($this->element == 'contact' && !empty($conf->global->MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS))
-				{
+				if ($this->element == 'contact' && !empty($conf->global->MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS)) {
 					$namecoords .= $object->name.'<br>';
 				}
 				$namecoords .= $this->getFullName($langs, 1).'<br>'.$coords;
@@ -759,7 +763,9 @@ abstract class CommonObject
 
 			// 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)) {
@@ -768,11 +774,12 @@ abstract class CommonObject
 				}
 				$extralanguages->fetch_name_extralanguages($elementforaltlanguage);
 
-				if (!empty($extralanguages->attributes[$elementforaltlanguage]['address']) || !empty($extralanguages->attributes[$elementforaltlanguage]['town']))
-				{
+				if (!empty($extralanguages->attributes[$elementforaltlanguage]['address']) || !empty($extralanguages->attributes[$elementforaltlanguage]['town'])) {
 					$out .= "<!-- alternatelanguage for '".$elementforaltlanguage."' set to fields '".join(',', $extralanguages->attributes[$elementforaltlanguage])."' -->\n";
 					$this->fetchValuesForExtraLanguages();
-					if (!is_object($form)) $form = new Form($this->db);
+					if (!is_object($form)) {
+						$form = new Form($this->db);
+					}
 					$htmltext = '';
 					// If there is extra languages
 					foreach ($arrayoflangcode as $extralangcode) {
@@ -786,8 +793,7 @@ abstract class CommonObject
 		}
 
 		if (!in_array($this->country_code, $countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
-				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
-		{
+				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state) {
 			if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
 				$out .= ($outdone ? ' - ' : '').$this->region.' - '.$this->state;
 			} else {
@@ -796,7 +802,9 @@ abstract class CommonObject
 			$outdone++;
 		}
 
-		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) $out .= ($outdone ? '<br>' : '');
+		if (!empty($this->phone) || !empty($this->phone_pro) || !empty($this->phone_mobile) || !empty($this->phone_perso) || !empty($this->fax) || !empty($this->office_phone) || !empty($this->user_mobile) || !empty($this->office_fax)) {
+			$out .= ($outdone ? '<br>' : '');
+		}
 		if (!empty($this->phone) && empty($this->phone_pro)) {		// For objects that store pro phone into ->phone
 			$out .= dol_print_phone($this->phone, $this->country_code, $contactid, $thirdpartyid, 'AC_TEL', '&nbsp;', 'phone', $langs->trans("PhonePro"));
 			$outdone++;
@@ -830,7 +838,9 @@ abstract class CommonObject
 			$outdone++;
 		}
 
-		if ($out) $out .= '<div style="clear: both;"></div>';
+		if ($out) {
+			$out .= '<div style="clear: both;"></div>';
+		}
 		$outdone = 0;
 		if (!empty($this->email)) {
 			$out .= dol_print_email($this->email, $this->id, $object->id, 'AC_EMAIL', 0, 0, 1);
@@ -854,15 +864,25 @@ abstract class CommonObject
 					$outdone++;
 				}
 			} else {	// Old code to remove
-				if ($this->skype) $outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				if ($this->skype) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->skype, $this->id, $object->id, 'skype');
+				}
 				$outdone++;
-				if ($this->jabberid) $outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				if ($this->jabberid) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->jabberid, $this->id, $object->id, 'jabber');
+				}
 				$outdone++;
-				if ($this->twitter) $outsocialnetwork .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				if ($this->twitter) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->twitter, $this->id, $object->id, 'twitter');
+				}
 				$outdone++;
-				if ($this->facebook) $outsocialnetwork .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				if ($this->facebook) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->facebook, $this->id, $object->id, 'facebook');
+				}
 				$outdone++;
-				if ($this->linkedin) $outsocialnetwork .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				if ($this->linkedin) {
+					$outsocialnetwork .= dol_print_socialnetworks($this->linkedin, $this->id, $object->id, 'linkedin');
+				}
 				$outdone++;
 			}
 
@@ -871,8 +891,11 @@ abstract class CommonObject
 			}
 		}
 
-		if ($out) return '<!-- BEGIN part to show address block -->'."\n".$out.'<!-- END Part to show address block -->'."\n";
-		else return '';
+		if ($out) {
+			return '<!-- BEGIN part to show address block -->'."\n".$out.'<!-- END Part to show address block -->'."\n";
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -887,26 +910,22 @@ abstract class CommonObject
 	{
 		global $user, $dolibarr_main_url_root;
 
-		if (empty($this->last_main_doc))
-		{
+		if (empty($this->last_main_doc)) {
 			return ''; // No way to known which document name to use
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 		$ecmfile = new EcmFiles($this->db);
 		$result = $ecmfile->fetch(0, '', $this->last_main_doc);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $ecmfile->error;
 			$this->errors = $ecmfile->errors;
 			return -1;
 		}
 
-		if (empty($ecmfile->id))
-		{
+		if (empty($ecmfile->id)) {
 			// Add entry into index
-			if ($initsharekey)
-			{
+			if ($initsharekey) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				// TODO We can't, we dont' have full path of file, only last_main_doc adn ->element, so we must rebuild full path first
 				/*
@@ -925,16 +944,18 @@ abstract class CommonObject
 					$this->errors = $ecmfile->errors;
 				}
 				*/
-			} else return '';
-		} elseif (empty($ecmfile->share))
-		{
+			} else {
+				return '';
+			}
+		} elseif (empty($ecmfile->share)) {
 			// Add entry into index
-			if ($initsharekey)
-			{
+			if ($initsharekey) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 				$ecmfile->share = getRandomPassword(true);
 				$ecmfile->update($user);
-			} else return '';
+			} else {
+				return '';
+			}
 		}
 		// Define $urlwithroot
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -950,11 +971,14 @@ abstract class CommonObject
 		//if (! empty($modulepart)) $paramlink.=($paramlink?'&':'').'modulepart='.$modulepart;		// For sharing with hash (so public files), modulepart is not required.
 		//if (! empty($ecmfile->entity)) $paramlink.='&entity='.$ecmfile->entity; 					// For sharing with hash (so public files), entity is not required.
 		//$paramlink.=($paramlink?'&':'').'file='.urlencode($filepath);								// No need of name of file for public link, we will use the hash
-		if (!empty($ecmfile->share)) $paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share
-		if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		if (!empty($ecmfile->share)) {
+			$paramlink .= ($paramlink ? '&' : '').'hashp='.$ecmfile->share; // Hash for public share
+		}
+		if ($forcedownload) {
+			$paramlink .= ($paramlink ? '&' : '').'attachment=1';
+		}
 
-		if ($relativelink)
-		{
+		if ($relativelink) {
 			$linktoreturn = 'document.php'.($paramlink ? '?'.$paramlink : '');
 		} else {
 			$linktoreturn = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
@@ -984,15 +1008,13 @@ abstract class CommonObject
 		dol_syslog(get_class($this)."::add_contact $fk_socpeople, $type_contact, $source, $notrigger");
 
 		// Check parameters
-		if ($fk_socpeople <= 0)
-		{
+		if ($fk_socpeople <= 0) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorWrongValueForParameterX", "1");
 			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
 			return -1;
 		}
-		if (!$type_contact)
-		{
+		if (!$type_contact) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorWrongValueForParameterX", "2");
 			dol_syslog(get_class($this)."::add_contact ".$this->error, LOG_ERR);
@@ -1000,8 +1022,7 @@ abstract class CommonObject
 		}
 
 		$id_type_contact = 0;
-		if (is_numeric($type_contact))
-		{
+		if (is_numeric($type_contact)) {
 			$id_type_contact = $type_contact;
 		} else {
 			// We look for id type_contact
@@ -1012,15 +1033,15 @@ abstract class CommonObject
 			$sql .= " AND tc.code='".$this->db->escape($type_contact)."' AND tc.active=1";
 			//print $sql;
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
-				if ($obj) $id_type_contact = $obj->rowid;
+				if ($obj) {
+					$id_type_contact = $obj->rowid;
+				}
 			}
 		}
 
-		if ($id_type_contact == 0)
-		{
+		if ($id_type_contact == 0) {
 			$this->error = 'CODE_NOT_VALID_FOR_THIS_ELEMENT';
 			dol_syslog("CODE_NOT_VALID_FOR_THIS_ELEMENT: Code type of contact '".$type_contact."' does not exists or is not active for element ".$this->element.", we can ignore it");
 			return -3;
@@ -1052,13 +1073,10 @@ abstract class CommonObject
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if (!$notrigger)
-				{
+			if ($resql) {
+				if (!$notrigger) {
 					$result = $this->call_trigger(strtoupper($this->element).'_ADD_CONTACT', $user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$this->db->rollback();
 						return -1;
 					}
@@ -1067,8 +1085,7 @@ abstract class CommonObject
 				$this->db->commit();
 				return 1;
 			} else {
-				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$this->error = $this->db->errno();
 					$this->db->rollback();
 					return -2;
@@ -1095,10 +1112,8 @@ abstract class CommonObject
 	{
 		// phpcs:enable
 		$contacts = $objFrom->liste_contact(-1, $source);
-		foreach ($contacts as $contact)
-		{
-			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0)
-			{
+		foreach ($contacts as $contact) {
+			if ($this->add_contact($contact['id'], $contact['fk_c_type_contact'], $contact['source']) < 0) {
 				$this->error = $this->db->lasterror();
 				return -1;
 			}
@@ -1122,12 +1137,15 @@ abstract class CommonObject
 		// Insert into database
 		$sql = "UPDATE ".MAIN_DB_PREFIX."element_contact set";
 		$sql .= " statut = ".$statut;
-		if ($type_contact_id) $sql .= ", fk_c_type_contact = ".((int) $type_contact_id);
-		if ($fk_socpeople) $sql .= ", fk_socpeople = ".((int) $fk_socpeople);
+		if ($type_contact_id) {
+			$sql .= ", fk_c_type_contact = ".((int) $type_contact_id);
+		}
+		if ($fk_socpeople) {
+			$sql .= ", fk_socpeople = ".((int) $fk_socpeople);
+		}
 		$sql .= " where rowid = ".$rowid;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			return 0;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -1155,12 +1173,12 @@ abstract class CommonObject
 		$sql .= " WHERE rowid =".$rowid;
 
 		dol_syslog(get_class($this)."::delete_contact", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			if (!$notrigger)
-			{
+		if ($this->db->query($sql)) {
+			if (!$notrigger) {
 				$result = $this->call_trigger(strtoupper($this->element).'_DELETE_CONTACT', $user);
-				if ($result < 0) { $this->db->rollback(); return -1; }
+				if ($result < 0) {
+					$this->db->rollback(); return -1;
+				}
 			}
 
 			$this->db->commit();
@@ -1186,20 +1204,19 @@ abstract class CommonObject
 		$temp = array();
 		$typeContact = $this->liste_type_contact($source, '', 0, 0, $code);
 
-		foreach ($typeContact as $key => $value)
-		{
+		foreach ($typeContact as $key => $value) {
 			array_push($temp, $key);
 		}
 		$listId = implode(",", $temp);
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."element_contact";
 		$sql .= " WHERE element_id = ".$this->id;
-		if ($listId)
+		if ($listId) {
 			$sql .= " AND fk_c_type_contact IN (".$listId.")";
+		}
 
 		dol_syslog(get_class($this)."::delete_linked_contact", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror();
@@ -1225,36 +1242,49 @@ abstract class CommonObject
 		$tab = array();
 
 		$sql = "SELECT ec.rowid, ec.statut as statuslink, ec.fk_socpeople as id, ec.fk_c_type_contact"; // This field contains id of llx_socpeople or id of llx_user
-		if ($source == 'internal') $sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
-		if ($source == 'external' || $source == 'thirdparty') $sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+		if ($source == 'internal') {
+			$sql .= ", '-1' as socid, t.statut as statuscontact, t.login, t.photo";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql .= ", t.fk_soc as socid, t.statut as statuscontact";
+		}
 		$sql .= ", t.civility as civility, t.lastname as lastname, t.firstname, t.email";
 		$sql .= ", tc.source, tc.element, tc.code, tc.libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact tc";
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact ec";
-		if ($source == 'internal') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
-		if ($source == 'external' || $source == 'thirdparty') $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		if ($source == 'internal') {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user t on ec.fk_socpeople = t.rowid";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople t on ec.fk_socpeople = t.rowid";
+		}
 		$sql .= " WHERE ec.element_id =".$this->id;
 		$sql .= " AND ec.fk_c_type_contact=tc.rowid";
 		$sql .= " AND tc.element='".$this->db->escape($this->element)."'";
-		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
-		if ($source == 'internal') $sql .= " AND tc.source = 'internal'";
-		if ($source == 'external' || $source == 'thirdparty') $sql .= " AND tc.source = 'external'";
+		if ($code) {
+			$sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		}
+		if ($source == 'internal') {
+			$sql .= " AND tc.source = 'internal'";
+		}
+		if ($source == 'external' || $source == 'thirdparty') {
+			$sql .= " AND tc.source = 'external'";
+		}
 		$sql .= " AND tc.active=1";
-		if ($status >= 0) $sql .= " AND ec.statut = ".$status;
+		if ($status >= 0) {
+			$sql .= " AND ec.statut = ".$status;
+		}
 		$sql .= " ORDER BY t.lastname ASC";
 
 		dol_syslog(get_class($this)."::liste_contact", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
-				if (!$list)
-				{
+				if (!$list) {
 					$transkey = "TypeContact_".$obj->element."_".$obj->source."_".$obj->code;
 					$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
 					$tab[$i] = array('source'=>$obj->source, 'socid'=>$obj->socid, 'id'=>$obj->id,
@@ -1294,8 +1324,7 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this)."::swapContactStatus", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$newstatut = ($obj->statut == 4) ? 5 : 4;
 			$result = $this->update_contact($rowid, $newstatut);
@@ -1324,32 +1353,43 @@ abstract class CommonObject
 		// phpcs:enable
 		global $langs;
 
-		if (empty($order)) $order = 'position';
-		if ($order == 'position') $order .= ',code';
+		if (empty($order)) {
+			$order = 'position';
+		}
+		if ($order == 'position') {
+			$order .= ',code';
+		}
 
 		$tab = array();
 		$sql = "SELECT DISTINCT tc.rowid, tc.code, tc.libelle, tc.position";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql .= " WHERE tc.element='".$this->db->escape($this->element)."'";
-		if ($activeonly == 1) $sql .= " AND tc.active=1"; // only the active types
-		if (!empty($source) && $source != 'all') $sql .= " AND tc.source='".$this->db->escape($source)."'";
-		if (!empty($code)) $sql .= " AND tc.code='".$this->db->escape($code)."'";
+		if ($activeonly == 1) {
+			$sql .= " AND tc.active=1"; // only the active types
+		}
+		if (!empty($source) && $source != 'all') {
+			$sql .= " AND tc.source='".$this->db->escape($source)."'";
+		}
+		if (!empty($code)) {
+			$sql .= " AND tc.code='".$this->db->escape($code)."'";
+		}
 		$sql .= $this->db->order($order, 'ASC');
 
 		//print "sql=".$sql;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$transkey = "TypeContact_".$this->element."_".$source."_".$obj->code;
 				$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
-				if (empty($option)) $tab[$obj->rowid] = $libelle_type;
-				else $tab[$obj->code] = $libelle_type;
+				if (empty($option)) {
+					$tab[$obj->rowid] = $libelle_type;
+				} else {
+					$tab[$obj->code] = $libelle_type;
+				}
 				$i++;
 			}
 			return $tab;
@@ -1392,14 +1432,17 @@ abstract class CommonObject
 			$sqlWhere[] = " tc.element <> '".$this->db->escape($excludeelement)."'";
 		}
 
-		if ($activeonly == 1)
+		if ($activeonly == 1) {
 			$sqlWhere[] = " tc.active=1"; // only the active types
+		}
 
-		if (!empty($source) && $source != 'all')
+		if (!empty($source) && $source != 'all') {
 			$sqlWhere[] = " tc.source='".$this->db->escape($source)."'";
+		}
 
-		if (!empty($code))
+		if (!empty($code)) {
 			$sqlWhere[] = " tc.code='".$this->db->escape($code)."'";
+		}
 
 		if (count($sqlWhere) > 0) {
 			$sql .= " WHERE ".implode(' AND ', $sqlWhere);
@@ -1434,8 +1477,7 @@ abstract class CommonObject
 						$libelle_type = ($langs->trans($transkey) != $transkey ? $langs->trans($transkey) : $obj->libelle);
 						if (empty($option)) {
 							$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
-						}
-						else {
+						} else {
 							$tab[$obj->rowid] = $libelle_element.' - '.$libelle_type;
 						}
 					}
@@ -1479,26 +1521,36 @@ abstract class CommonObject
 
 		$sql = "SELECT ec.fk_socpeople";
 		$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec,";
-		if ($source == 'internal') $sql .= " ".MAIN_DB_PREFIX."user as c,";
-		if ($source == 'external') $sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+		if ($source == 'internal') {
+			$sql .= " ".MAIN_DB_PREFIX."user as c,";
+		}
+		if ($source == 'external') {
+			$sql .= " ".MAIN_DB_PREFIX."socpeople as c,";
+		}
 		$sql .= " ".MAIN_DB_PREFIX."c_type_contact as tc";
 		$sql .= " WHERE ec.element_id = ".$id;
 		$sql .= " AND ec.fk_socpeople = c.rowid";
-		if ($source == 'internal') $sql .= " AND c.entity IN (".getEntity('user').")";
-		if ($source == 'external') $sql .= " AND c.entity IN (".getEntity('societe').")";
+		if ($source == 'internal') {
+			$sql .= " AND c.entity IN (".getEntity('user').")";
+		}
+		if ($source == 'external') {
+			$sql .= " AND c.entity IN (".getEntity('societe').")";
+		}
 		$sql .= " AND ec.fk_c_type_contact = tc.rowid";
 		$sql .= " AND tc.element = '".$this->db->escape($element)."'";
 		$sql .= " AND tc.source = '".$this->db->escape($source)."'";
-		if ($code) $sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		if ($code) {
+			$sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		}
 		$sql .= " AND tc.active = 1";
-		if ($status) $sql .= " AND ec.statut = ".$status;
+		if ($status) {
+			$sql .= " AND ec.statut = ".$status;
+		}
 
 		dol_syslog(get_class($this)."::getIdContact", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$result[$i] = $obj->fk_socpeople;
 				$i++;
 			}
@@ -1520,9 +1572,13 @@ abstract class CommonObject
 	public function fetch_contact($contactid = null)
 	{
 		// phpcs:enable
-		if (empty($contactid)) $contactid = $this->contact_id;
+		if (empty($contactid)) {
+			$contactid = $this->contact_id;
+		}
 
-		if (empty($contactid)) return 0;
+		if (empty($contactid)) {
+			return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 		$contact = new Contact($this->db);
@@ -1543,14 +1599,16 @@ abstract class CommonObject
 		// phpcs:enable
 		global $conf;
 
-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id))
+		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
 			return 0;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
-		if ($force_thirdparty_id)
+		if ($force_thirdparty_id) {
 			$idtofetch = $force_thirdparty_id;
+		}
 
 		if ($idtofetch) {
 			$thirdparty = new Societe($this->db);
@@ -1563,7 +1621,9 @@ abstract class CommonObject
 			}
 
 			return $result;
-		} else return -1;
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -1609,24 +1669,24 @@ abstract class CommonObject
 		dol_syslog(get_class($this).'::fetch_barcode this->element='.$this->element.' this->barcode_type='.$this->barcode_type);
 
 		$idtype = $this->barcode_type;
-		if (empty($idtype) && $idtype != '0')	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
-		{
-			if ($this->element == 'product')      $idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
-			elseif ($this->element == 'societe') $idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
-			else dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+		if (empty($idtype) && $idtype != '0') {	// If type of barcode no set, we try to guess. If set to '0' it means we forced to have type remain not defined
+			if ($this->element == 'product') {
+				$idtype = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+			} elseif ($this->element == 'societe') {
+				$idtype = $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY;
+			} else {
+				dol_syslog('Call fetch_barcode with barcode_type not defined and cant be guessed', LOG_WARNING);
+			}
 		}
 
-		if ($idtype > 0)
-		{
-			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder))    // If data not already loaded
-			{
+		if ($idtype > 0) {
+			if (empty($this->barcode_type) || empty($this->barcode_type_code) || empty($this->barcode_type_label) || empty($this->barcode_type_coder)) {    // If data not already loaded
 				$sql = "SELECT rowid, code, libelle as label, coder";
 				$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
 				$sql .= " WHERE rowid = ".$idtype;
 				dol_syslog(get_class($this).'::fetch_barcode', LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $this->db->fetch_object($resql);
 					$this->barcode_type       = $obj->rowid;
 					$this->barcode_type_code  = $obj->code;
@@ -1653,8 +1713,12 @@ abstract class CommonObject
 		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($this->fk_project) && !empty($this->fk_projet)) $this->fk_project = $this->fk_projet; // For backward compatibility
-		if (empty($this->fk_project)) return 0;
+		if (empty($this->fk_project) && !empty($this->fk_projet)) {
+			$this->fk_project = $this->fk_projet; // For backward compatibility
+		}
+		if (empty($this->fk_project)) {
+			return 0;
+		}
 
 		$project = new Project($this->db);
 		$result = $project->fetch($this->fk_project);
@@ -1675,7 +1739,9 @@ abstract class CommonObject
 		// phpcs:enable
 		include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-		if (empty($this->fk_product)) return 0;
+		if (empty($this->fk_product)) {
+			return 0;
+		}
 
 		$product = new Product($this->db);
 		$result = $product->fetch($this->fk_product);
@@ -1709,9 +1775,15 @@ abstract class CommonObject
 	public function fetch_origin()
 	{
 		// phpcs:enable
-		if ($this->origin == 'shipping') $this->origin = 'expedition';
-		if ($this->origin == 'delivery') $this->origin = 'livraison';
-		if ($this->origin == 'order_supplier') $this->origin = 'commandeFournisseur';
+		if ($this->origin == 'shipping') {
+			$this->origin = 'expedition';
+		}
+		if ($this->origin == 'delivery') {
+			$this->origin = 'livraison';
+		}
+		if ($this->origin == 'order_supplier') {
+			$this->origin = 'commandeFournisseur';
+		}
 
 		$origin = $this->origin;
 
@@ -1745,8 +1817,7 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this).'::fetchObjectFrom', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $this->db->fetch_row($resql);
 			// Test for avoid error -1
 			if ($row[0] > 0) {
@@ -1774,8 +1845,7 @@ abstract class CommonObject
 
 			dol_syslog(get_class($this).'::getValueFrom', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$row = $this->db->fetch_row($resql);
 				$result = $row[0];
 			}
@@ -1803,53 +1873,73 @@ abstract class CommonObject
 	{
 		global $user, $langs, $conf;
 
-		if (empty($table)) 	  $table = $this->table_element;
-		if (empty($id))    	  $id = $this->id;
-		if (empty($format))   $format = 'text';
-		if (empty($id_field)) $id_field = 'rowid';
+		if (empty($table)) {
+			$table = $this->table_element;
+		}
+		if (empty($id)) {
+			$id = $this->id;
+		}
+		if (empty($format)) {
+			$format = 'text';
+		}
+		if (empty($id_field)) {
+			$id_field = 'rowid';
+		}
 
 		$error = 0;
 
 		$this->db->begin();
 
 		// Special case
-		if ($table == 'product' && $field == 'note_private') $field = 'note';
-		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) $fk_user_field = 'fk_user_mod';
+		if ($table == 'product' && $field == 'note_private') {
+			$field = 'note';
+		}
+		if (in_array($table, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
+			$fk_user_field = 'fk_user_mod';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$table." SET ";
 
-		if ($format == 'text') $sql .= $field." = '".$this->db->escape($value)."'";
-		elseif ($format == 'int') $sql .= $field." = ".$this->db->escape($value);
-		elseif ($format == 'date') $sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		if ($format == 'text') {
+			$sql .= $field." = '".$this->db->escape($value)."'";
+		} elseif ($format == 'int') {
+			$sql .= $field." = ".$this->db->escape($value);
+		} elseif ($format == 'date') {
+			$sql .= $field." = ".($value ? "'".$this->db->idate($value)."'" : "null");
+		}
 
-		if ($fk_user_field)
-		{
-			if (!empty($fuser) && is_object($fuser)) $sql .= ", ".$fk_user_field." = ".$fuser->id;
-			elseif (empty($fuser) || $fuser != 'none') $sql .= ", ".$fk_user_field." = ".$user->id;
+		if ($fk_user_field) {
+			if (!empty($fuser) && is_object($fuser)) {
+				$sql .= ", ".$fk_user_field." = ".$fuser->id;
+			} elseif (empty($fuser) || $fuser != 'none') {
+				$sql .= ", ".$fk_user_field." = ".$user->id;
+			}
 		}
 
 		$sql .= " WHERE ".$id_field." = ".$id;
 
 		dol_syslog(__METHOD__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($trigkey)
-			{
+		if ($resql) {
+			if ($trigkey) {
 				// call trigger with updated object values
-				if (empty($this->fields) && method_exists($this, 'fetch'))
-				{
+				if (empty($this->fields) && method_exists($this, 'fetch')) {
 					$result = $this->fetch($id);
 				} else {
 					$result = $this->fetchCommon($id);
 				}
-				if ($result >= 0) $result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
-				if ($result < 0) $error++;
+				if ($result >= 0) {
+					$result = $this->call_trigger($trigkey, (!empty($fuser) && is_object($fuser)) ? $fuser : $user); // This may set this->errors
+				}
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
-			if (!$error)
-			{
-				if (property_exists($this, $field)) $this->$field = $value;
+			if (!$error) {
+				if (property_exists($this, $field)) {
+					$this->$field = $value;
+				}
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1881,21 +1971,26 @@ abstract class CommonObject
 		// phpcs:enable
 		global $conf, $user;
 
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			dol_print_error('', get_class($this)."::load_previous_next_ref was called on objet with property table_element not defined");
 			return -1;
 		}
-		if ($fieldid == 'none') return 1;
+		if ($fieldid == 'none') {
+			return 1;
+		}
 
 		// Security on socid
 		$socid = 0;
-		if ($user->socid > 0) $socid = $user->socid;
+		if ($user->socid > 0) {
+			$socid = $user->socid;
+		}
 
 		// this->ismultientitymanaged contains
 		// 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
 		$aliastablesociete = 's';
-		if ($this->element == 'societe') $aliastablesociete = 'te'; // te as table_element
+		if ($this->element == 'societe') {
+			$aliastablesociete = 'te'; // te as table_element
+		}
 
 		$sql = "SELECT MAX(te.".$fieldid.")";
 		$sql .= " FROM ".(empty($nodbprefix) ?MAIN_DB_PREFIX:'').$this->table_element." as te";
@@ -1905,21 +2000,33 @@ abstract class CommonObject
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid)  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+		}
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		}
 		$sql .= " WHERE te.".$fieldid." < '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
-		if (!empty($filter))
-		{
-			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND sc.fk_user = ".$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		}
+		if (!empty($filter)) {
+			if (!preg_match('/^\s*AND/i', $filter)) {
+				$sql .= " AND "; // For backward compatibility
+			}
 			$sql .= $filter;
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		}
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1936,14 +2043,19 @@ abstract class CommonObject
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+			$sql .= ' AND te.fk_soc = '.$socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+			$sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+			$sql .= ' AND te.rowid = '.$socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 
 		$result = $this->db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->error = $this->db->lasterror();
 			return -1;
 		}
@@ -1958,21 +2070,33 @@ abstract class CommonObject
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ", ".MAIN_DB_PREFIX.$tmparray[1]." as ".($tmparray[1] == 'societe' ? 's' : 'parenttable'); // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
-		elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
-		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s"; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 2 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON te.fk_soc = s.rowid"; // If we need to link to societe to limit select to socid
+		}
+		if ($this->restrictiononfksoc && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ".$aliastablesociete.".rowid = sc.fk_soc";
+		}
 		$sql .= " WHERE te.".$fieldid." > '".$this->db->escape($fieldid == 'rowid' ? $this->id : $this->ref)."'"; // ->ref must always be defined (set to id if field does not exists)
-		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
-		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) $sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
-		if (!empty($filter))
-		{
-			if (!preg_match('/^\s*AND/i', $filter)) $sql .= " AND "; // For backward compatibility
+		if ($this->restrictiononfksoc == 1 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND sc.fk_user = ".$user->id;
+		}
+		if ($this->restrictiononfksoc == 2 && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= " AND (sc.fk_user = ".$user->id.' OR te.fk_soc IS NULL)';
+		}
+		if (!empty($filter)) {
+			if (!preg_match('/^\s*AND/i', $filter)) {
+				$sql .= " AND "; // For backward compatibility
+			}
 			$sql .= $filter;
 		}
 		if (isset($this->ismultientitymanaged) && !is_numeric($this->ismultientitymanaged)) {
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND te.'.$tmparray[0].' = '.($tmparray[1] == 'societe' ? 's' : 'parenttable').'.rowid'; // If we need to link to this table to limit select to entity
-		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) $sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		} elseif ($this->restrictiononfksoc == 1 && $this->element != 'societe' && !$user->rights->societe->client->voir && !$socid) {
+			$sql .= ' AND te.fk_soc = s.rowid'; // If we need to link to societe to limit select to socid
+		}
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
 			if ($this->element == 'user' && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
@@ -1989,15 +2113,20 @@ abstract class CommonObject
 			$tmparray = explode('@', $this->ismultientitymanaged);
 			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
 		}
-		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') $sql .= ' AND te.fk_soc = '.$socid;
-		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') $sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
-		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') $sql .= ' AND te.rowid = '.$socid;
+		if ($this->restrictiononfksoc == 1 && $socid && $this->element != 'societe') {
+			$sql .= ' AND te.fk_soc = '.$socid;
+		}
+		if ($this->restrictiononfksoc == 2 && $socid && $this->element != 'societe') {
+			$sql .= ' AND (te.fk_soc = '.$socid.' OR te.fk_soc IS NULL)';
+		}
+		if ($this->restrictiononfksoc && $socid && $this->element == 'societe') {
+			$sql .= ' AND te.rowid = '.$socid;
+		}
 		//print 'socid='.$socid.' restrictiononfksoc='.$this->restrictiononfksoc.' ismultientitymanaged = '.$this->ismultientitymanaged.' filter = '.$filter.' -> '.$sql."<br>";
 		// Rem: Bug in some mysql version: SELECT MIN(rowid) FROM llx_socpeople WHERE rowid > 1 when one row in database with rowid=1, returns 1 instead of null
 
 		$result = $this->db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->error = $this->db->lasterror();
 			return -2;
 		}
@@ -2021,10 +2150,12 @@ abstract class CommonObject
 		$tab = $this->liste_contact(-1, $source);
 		$num = count($tab);
 		$i = 0;
-		while ($i < $num)
-		{
-			if ($source == 'thirdparty') $contactAlreadySelected[$i] = $tab[$i]['socid'];
-			else $contactAlreadySelected[$i] = $tab[$i]['id'];
+		while ($i < $num) {
+			if ($source == 'thirdparty') {
+				$contactAlreadySelected[$i] = $tab[$i]['socid'];
+			} else {
+				$contactAlreadySelected[$i] = $tab[$i]['id'];
+			}
 			$i++;
 		}
 		return $contactAlreadySelected;
@@ -2039,33 +2170,38 @@ abstract class CommonObject
 	 */
 	public function setProject($projectid)
 	{
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		if (!empty($this->fields['fk_project']))		// Common case
-		{
-			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
-			else $sql .= ' SET fk_project = NULL';
+		if (!empty($this->fields['fk_project'])) {		// Common case
+			if ($projectid) {
+				$sql .= ' SET fk_project = '.$projectid;
+			} else {
+				$sql .= ' SET fk_project = NULL';
+			}
 			$sql .= ' WHERE rowid = '.$this->id;
-		} elseif ($this->table_element == 'actioncomm')	// Special case for actioncomm
-		{
-			if ($projectid) $sql .= ' SET fk_project = '.$projectid;
-			else $sql .= ' SET fk_project = NULL';
+		} elseif ($this->table_element == 'actioncomm') {	// Special case for actioncomm
+			if ($projectid) {
+				$sql .= ' SET fk_project = '.$projectid;
+			} else {
+				$sql .= ' SET fk_project = NULL';
+			}
 			$sql .= ' WHERE id = '.$this->id;
 		} else // Special case for old architecture objects
 		{
-			if ($projectid) $sql .= ' SET fk_projet = '.$projectid;
-			else $sql .= ' SET fk_projet = NULL';
+			if ($projectid) {
+				$sql .= ' SET fk_projet = '.$projectid;
+			} else {
+				$sql .= ' SET fk_projet = NULL';
+			}
 			$sql .= ' WHERE rowid = '.$this->id;
 		}
 
 		dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->fk_project = $projectid;
 			return 1;
 		} else {
@@ -2083,23 +2219,29 @@ abstract class CommonObject
 	public function setPaymentMethods($id)
 	{
 		dol_syslog(get_class($this).'::setPaymentMethods('.$id.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
+		if ($this->statut >= 0 || $this->element == 'societe') {
 			// TODO uniformize field name
 			$fieldname = 'fk_mode_reglement';
-			if ($this->element == 'societe') $fieldname = 'mode_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'mode_reglement_supplier';
-			if (get_class($this) == 'Tva') $fieldname = 'fk_typepayment';
+			if ($this->element == 'societe') {
+				$fieldname = 'mode_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+				$fieldname = 'mode_reglement_supplier';
+			}
+			if (get_class($this) == 'Tva') {
+				$fieldname = 'fk_typepayment';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
 			$sql .= ' WHERE rowid='.$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->mode_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+					$this->mode_reglement_supplier_id = $id;
+				}
 				return 1;
 			} else {
 				dol_syslog(get_class($this).'::setPaymentMethods Error '.$sql.' - '.$this->db->error());
@@ -2122,20 +2264,20 @@ abstract class CommonObject
 	public function setMulticurrencyCode($code)
 	{
 		dol_syslog(get_class($this).'::setMulticurrencyCode('.$code.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
+		if ($this->statut >= 0 || $this->element == 'societe') {
 			$fieldname = 'multicurrency_code';
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname." = '".$this->db->escape($code)."'";
 			$sql .= ' WHERE rowid='.$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->multicurrency_code = $code;
 
 				list($fk_multicurrency, $rate) = MultiCurrency::getIdAndTxFromCode($this->db, $code);
-				if ($rate) $this->setMulticurrencyRate($rate, 2);
+				if ($rate) {
+					$this->setMulticurrencyRate($rate, 2);
+				}
 
 				return 1;
 			} else {
@@ -2160,23 +2302,19 @@ abstract class CommonObject
 	public function setMulticurrencyRate($rate, $mode = 1)
 	{
 		dol_syslog(get_class($this).'::setMulticurrencyRate('.$rate.','.$mode.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
+		if ($this->statut >= 0 || $this->element == 'societe') {
 			$fieldname = 'multicurrency_tx';
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.$rate;
 			$sql .= ' WHERE rowid='.$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->multicurrency_tx = $rate;
 
 				// Update line price
-				if (!empty($this->lines))
-				{
-					foreach ($this->lines as &$line)
-					{
+				if (!empty($this->lines)) {
+					foreach ($this->lines as &$line) {
 						// Amounts in company currency will be recalculated
 						if ($mode == 1) {
 							$line->subprice = 0;
@@ -2190,48 +2328,148 @@ abstract class CommonObject
 						switch ($this->element) {
 							case 'propal':
 								$this->updateline(
-									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
-									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start,
-									$line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
+									$line->id,
+									$line->subprice,
+									$line->qty,
+									$line->remise_percent,
+									$line->tva_tx,
+									$line->localtax1_tx,
+									$line->localtax2_tx,
+									($line->description ? $line->description : $line->desc),
+									'HT',
+									$line->info_bits,
+									$line->special_code,
+									$line->fk_parent_line,
+									$line->skip_update_total,
+									$line->fk_fournprice,
+									$line->pa_ht,
+									$line->label,
+									$line->product_type,
+									$line->date_start,
+									$line->date_end,
+									$line->array_options,
+									$line->fk_unit,
+									$line->multicurrency_subprice
 								);
 								break;
 							case 'commande':
 								$this->updateline(
-									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
-									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end,
-									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
-									$line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
+									$line->id,
+									($line->description ? $line->description : $line->desc),
+									$line->subprice,
+									$line->qty,
+									$line->remise_percent,
+									$line->tva_tx,
+									$line->localtax1_tx,
+									$line->localtax2_tx,
+									'HT',
+									$line->info_bits,
+									$line->date_start,
+									$line->date_end,
+									$line->product_type,
+									$line->fk_parent_line,
+									$line->skip_update_total,
+									$line->fk_fournprice,
+									$line->pa_ht,
+									$line->label,
+									$line->special_code,
+									$line->array_options,
+									$line->fk_unit,
+									$line->multicurrency_subprice
 								);
 								break;
 							case 'facture':
 								$this->updateline(
-									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
-									$line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits,
-									$line->product_type, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label,
-									$line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice
+									$line->id,
+									($line->description ? $line->description : $line->desc),
+									$line->subprice,
+									$line->qty,
+									$line->remise_percent,
+									$line->date_start,
+									$line->date_end,
+									$line->tva_tx,
+									$line->localtax1_tx,
+									$line->localtax2_tx,
+									'HT',
+									$line->info_bits,
+									$line->product_type,
+									$line->fk_parent_line,
+									$line->skip_update_total,
+									$line->fk_fournprice,
+									$line->pa_ht,
+									$line->label,
+									$line->special_code,
+									$line->array_options,
+									$line->situation_percent,
+									$line->fk_unit,
+									$line->multicurrency_subprice
 								);
 								break;
 							case 'supplier_proposal':
 								$this->updateline(
-									$line->id, $line->subprice, $line->qty, $line->remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx,
-									($line->description ? $line->description : $line->desc), 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line,
-									$line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->array_options,
-									$line->ref_fourn, $line->multicurrency_subprice
+									$line->id,
+									$line->subprice,
+									$line->qty,
+									$line->remise_percent,
+									$line->tva_tx,
+									$line->localtax1_tx,
+									$line->localtax2_tx,
+									($line->description ? $line->description : $line->desc),
+									'HT',
+									$line->info_bits,
+									$line->special_code,
+									$line->fk_parent_line,
+									$line->skip_update_total,
+									$line->fk_fournprice,
+									$line->pa_ht,
+									$line->label,
+									$line->product_type,
+									$line->array_options,
+									$line->ref_fourn,
+									$line->multicurrency_subprice
 								);
 								break;
 							case 'order_supplier':
 								$this->updateline(
-									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->qty, $line->remise_percent,
-									$line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, false,
-									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
+									$line->id,
+									($line->description ? $line->description : $line->desc),
+									$line->subprice,
+									$line->qty,
+									$line->remise_percent,
+									$line->tva_tx,
+									$line->localtax1_tx,
+									$line->localtax2_tx,
+									'HT',
+									$line->info_bits,
+									$line->product_type,
+									false,
+									$line->date_start,
+									$line->date_end,
+									$line->array_options,
+									$line->fk_unit,
+									$line->multicurrency_subprice
 								);
 								break;
 							case 'invoice_supplier':
 								$this->updateline(
-									$line->id, ($line->description ? $line->description : $line->desc), $line->subprice, $line->tva_tx, $line->localtax1_tx,
-									$line->localtax2_tx, $line->qty, 0, 'HT', $line->info_bits, $line->product_type, $line->remise_percent, false,
-									$line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice
+									$line->id,
+									($line->description ? $line->description : $line->desc),
+									$line->subprice,
+									$line->tva_tx,
+									$line->localtax1_tx,
+									$line->localtax2_tx,
+									$line->qty,
+									0,
+									'HT',
+									$line->info_bits,
+									$line->product_type,
+									$line->remise_percent,
+									false,
+									$line->date_start,
+									$line->date_end,
+									$line->array_options,
+									$line->fk_unit,
+									$line->multicurrency_subprice
 								);
 								break;
 							default:
@@ -2263,22 +2501,26 @@ abstract class CommonObject
 	public function setPaymentTerms($id)
 	{
 		dol_syslog(get_class($this).'::setPaymentTerms('.$id.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
+		if ($this->statut >= 0 || $this->element == 'societe') {
 			// TODO uniformize field name
 			$fieldname = 'fk_cond_reglement';
-			if ($this->element == 'societe') $fieldname = 'cond_reglement';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'cond_reglement_supplier';
+			if ($this->element == 'societe') {
+				$fieldname = 'cond_reglement';
+			}
+			if (get_class($this) == 'Fournisseur') {
+				$fieldname = 'cond_reglement_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
 			$sql .= ' WHERE rowid='.$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->cond_reglement_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->cond_reglement_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+					$this->cond_reglement_supplier_id = $id;
+				}
 				$this->cond_reglement = $id; // for compatibility
 				return 1;
 			} else {
@@ -2302,21 +2544,25 @@ abstract class CommonObject
 	public function setTransportMode($id)
 	{
 		dol_syslog(get_class($this).'::setTransportMode('.$id.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
+		if ($this->statut >= 0 || $this->element == 'societe') {
 			$fieldname = 'fk_transport_mode';
-			if ($this->element == 'societe') $fieldname = 'transport_mode';
-			if (get_class($this) == 'Fournisseur') $fieldname = 'transport_mode_supplier';
+			if ($this->element == 'societe') {
+				$fieldname = 'transport_mode';
+			}
+			if (get_class($this) == 'Fournisseur') {
+				$fieldname = 'transport_mode_supplier';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
 			$sql .= ' WHERE rowid='.$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->transport_mode_id = $id;
 				// for supplier
-				if (get_class($this) == 'Fournisseur') $this->transport_mode_supplier_id = $id;
+				if (get_class($this) == 'Fournisseur') {
+					$this->transport_mode_supplier_id = $id;
+				}
 				return 1;
 			} else {
 				dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());
@@ -2339,16 +2585,14 @@ abstract class CommonObject
 	public function setRetainedWarrantyPaymentTerms($id)
 	{
 		dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms('.$id.')');
-		if ($this->statut >= 0 || $this->element == 'societe')
-		{
+		if ($this->statut >= 0 || $this->element == 'societe') {
 			$fieldname = 'retained_warranty_fk_cond_reglement';
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' SET '.$fieldname.' = '.$id;
 			$sql .= ' WHERE rowid='.$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->retained_warranty_fk_cond_reglement = $id;
 				return 1;
 			} else {
@@ -2373,13 +2617,14 @@ abstract class CommonObject
 	public function setDeliveryAddress($id)
 	{
 		$fieldname = 'fk_delivery_address';
-		if ($this->element == 'delivery' || $this->element == 'shipping') $fieldname = 'fk_address';
+		if ($this->element == 'delivery' || $this->element == 'shipping') {
+			$fieldname = 'fk_address';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ".$fieldname." = ".$id;
 		$sql .= " WHERE rowid = ".$this->id." AND fk_statut = 0";
 
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->fk_delivery_address = $id;
 			return 1;
 		} else {
@@ -2403,7 +2648,9 @@ abstract class CommonObject
 	{
 		global $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -2414,7 +2661,9 @@ abstract class CommonObject
 
 		$this->db->begin();
 
-		if ($shipping_method_id < 0) $shipping_method_id = 'NULL';
+		if ($shipping_method_id < 0) {
+			$shipping_method_id = 'NULL';
+		}
 		dol_syslog(get_class($this).'::setShippingMethod('.$shipping_method_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2426,17 +2675,17 @@ abstract class CommonObject
 			$this->error = $this->db->lasterror();
 			$error++;
 		} else {
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$this->context = array('shippingmethodupdate'=>1);
 				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 		}
-		if ($error)
-		{
+		if ($error) {
 			$this->db->rollback();
 			return -1;
 		} else {
@@ -2459,7 +2708,9 @@ abstract class CommonObject
 			dol_syslog(get_class($this)."::setWarehouse was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if ($warehouse_id < 0) $warehouse_id = 'NULL';
+		if ($warehouse_id < 0) {
+			$warehouse_id = 'NULL';
+		}
 		dol_syslog(get_class($this).'::setWarehouse('.$warehouse_id.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2486,8 +2737,7 @@ abstract class CommonObject
 	 */
 	public function setDocModel($user, $modelpdf)
 	{
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setDocModel was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
@@ -2500,8 +2750,7 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this)."::setDocModel", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->model_pdf = $modelpdf;
 			$this->modelpdf = $modelpdf; // For bakward compatibility
 			return 1;
@@ -2524,7 +2773,9 @@ abstract class CommonObject
 	{
 		global $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
@@ -2534,7 +2785,9 @@ abstract class CommonObject
 		}
 		$this->db->begin();
 
-		if ($fk_account < 0) $fk_account = 'NULL';
+		if ($fk_account < 0) {
+			$fk_account = 'NULL';
+		}
 		dol_syslog(get_class($this).'::setBankAccount('.$fk_account.')');
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
@@ -2542,23 +2795,22 @@ abstract class CommonObject
 		$sql .= " WHERE rowid=".$this->id;
 
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			dol_syslog(get_class($this).'::setBankAccount Error '.$sql.' - '.$this->db->error());
 			$this->error = $this->db->lasterror();
 			$error++;
 		} else {
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$this->context = array('bankaccountupdate'=>1);
 				$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 		}
-		if ($error)
-		{
+		if ($error) {
 			$this->db->rollback();
 			return -1;
 		} else {
@@ -2584,13 +2836,11 @@ abstract class CommonObject
 	public function line_order($renum = false, $rowidorder = 'ASC', $fk_parent_line = true)
 	{
 		// phpcs:enable
-		if (!$this->table_element_line)
-		{
+		if (!$this->table_element_line) {
 			dol_syslog(get_class($this)."::line_order was called on objet with property table_element_line not defined", LOG_ERR);
 			return -1;
 		}
-		if (!$this->fk_element)
-		{
+		if (!$this->fk_element) {
 			dol_syslog(get_class($this)."::line_order was called on objet with property fk_element not defined", LOG_ERR);
 			return -1;
 		}
@@ -2599,42 +2849,44 @@ abstract class CommonObject
 		$nl = 0;
 		$sql = 'SELECT count(rowid) FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql .= ' WHERE '.$this->fk_element.'='.$this->id;
-		if (!$renum) $sql .= ' AND rang = 0';
-		if ($renum) $sql .= ' AND rang <> 0';
+		if (!$renum) {
+			$sql .= ' AND rang = 0';
+		}
+		if ($renum) {
+			$sql .= ' AND rang <> 0';
+		}
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $this->db->fetch_row($resql);
 			$nl = $row[0];
-		} else dol_print_error($this->db);
-		if ($nl > 0)
-		{
+		} else {
+			dol_print_error($this->db);
+		}
+		if ($nl > 0) {
 			// The goal of this part is to reorder all lines, with all children lines sharing the same counter that parents.
 			$rows = array();
 
 			// We first search all lines that are parent lines (for multilevel details lines)
 			$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
-			if ($fk_parent_line) $sql .= ' AND fk_parent_line IS NULL';
+			if ($fk_parent_line) {
+				$sql .= ' AND fk_parent_line IS NULL';
+			}
 			$sql .= ' ORDER BY rang ASC, rowid '.$rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$i = 0;
 				$num = $this->db->num_rows($resql);
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$row = $this->db->fetch_row($resql);
 					$rows[] = $row[0]; // Add parent line into array rows
 					$childrens = $this->getChildrenOfLine($row[0]);
-					if (!empty($childrens))
-					{
-						foreach ($childrens as $child)
-						{
+					if (!empty($childrens)) {
+						foreach ($childrens as $child) {
 							array_push($rows, $child);
 						}
 					}
@@ -2642,10 +2894,8 @@ abstract class CommonObject
 				}
 
 				// Now we set a new number for each lines (parent and children with children included into parent tree)
-				if (!empty($rows))
-				{
-					foreach ($rows as $key => $row)
-					{
+				if (!empty($rows)) {
+					foreach ($rows as $key => $row) {
 						$this->updateRangOfLine($row, ($key + 1));
 					}
 				}
@@ -2674,12 +2924,13 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			if ($this->db->num_rows($resql) > 0) {
 				while ($row = $this->db->fetch_row($resql)) {
 					$rows[] = $row[0];
-					if (!empty($includealltree)) $rows = array_merge($rows, $this->getChildrenOfLine($row[0]), $includealltree);
+					if (!empty($includealltree)) {
+						$rows = array_merge($rows, $this->getChildrenOfLine($row[0]), $includealltree);
+					}
 				}
 			}
 		}
@@ -2739,14 +2990,15 @@ abstract class CommonObject
 	public function updateRangOfLine($rowid, $rang)
 	{
 		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'
-		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) {
+			$fieldposition = 'position';
+		}
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 		$sql .= ' WHERE rowid = '.$rowid;
 
 		dol_syslog(get_class($this)."::updateRangOfLine", LOG_DEBUG);
-		if (!$this->db->query($sql))
-		{
+		if (!$this->db->query($sql)) {
 			dol_print_error($this->db);
 		}
 	}
@@ -2762,8 +3014,7 @@ abstract class CommonObject
 	{
 		// phpcs:enable
 		$num = count($rows);
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			$this->updateRangOfLine($rows[$i], ($i + 1));
 		}
 	}
@@ -2777,20 +3028,19 @@ abstract class CommonObject
 	 */
 	public function updateLineUp($rowid, $rang)
 	{
-		if ($rang > 1)
-		{
+		if ($rang > 1) {
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+				$fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 			$sql .= ' AND rang = '.($rang - 1);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang - 1);
 				$sql .= ' WHERE rowid = '.$rowid;
-				if (!$this->db->query($sql))
-				{
+				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 				}
 			} else {
@@ -2809,20 +3059,19 @@ abstract class CommonObject
 	 */
 	public function updateLineDown($rowid, $rang, $max)
 	{
-		if ($rang < $max)
-		{
+		if ($rang < $max) {
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) $fieldposition = 'position';
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+				$fieldposition = 'position';
+			}
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.$rang;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 			$sql .= ' AND rang = '.($rang + 1);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element_line.' SET '.$fieldposition.' = '.($rang + 1);
 				$sql .= ' WHERE rowid = '.$rowid;
-				if (!$this->db->query($sql))
-				{
+				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 				}
 			} else {
@@ -2844,8 +3093,7 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
 		}
@@ -2863,8 +3111,7 @@ abstract class CommonObject
 		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 		$sql .= ' AND rang = '.$rang;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
 		}
@@ -2881,22 +3128,21 @@ abstract class CommonObject
 	{
 		// phpcs:enable
 		$positionfield = 'rang';
-		if ($this->table_element == 'bom_bom') $positionfield = 'position';
+		if ($this->table_element == 'bom_bom') {
+			$positionfield = 'position';
+		}
 
 		// Search the last rang with fk_parent_line
-		if ($fk_parent_line)
-		{
+		if ($fk_parent_line) {
 			$sql = 'SELECT max('.$positionfield.') FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 			$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
 			$sql .= ' AND fk_parent_line = '.$fk_parent_line;
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$row = $this->db->fetch_row($resql);
-				if (!empty($row[0]))
-				{
+				if (!empty($row[0])) {
 					return $row[0];
 				} else {
 					return $this->getRangOfLine($fk_parent_line);
@@ -2910,8 +3156,7 @@ abstract class CommonObject
 
 			dol_syslog(get_class($this)."::line_max", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$row = $this->db->fetch_row($resql);
 				return $row[0];
 			}
@@ -2928,8 +3173,7 @@ abstract class CommonObject
 	public function update_ref_ext($ref_ext)
 	{
 		// phpcs:enable
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::update_ref_ext was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
@@ -2939,8 +3183,7 @@ abstract class CommonObject
 		$sql .= " WHERE ".(isset($this->table_rowid) ? $this->table_rowid : 'rowid')." = ".$this->id;
 
 		dol_syslog(get_class($this)."::update_ref_ext", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->ref_ext = $ref_ext;
 			return 1;
 		} else {
@@ -2962,14 +3205,12 @@ abstract class CommonObject
 		// phpcs:enable
 		global $user;
 
-		if (!$this->table_element)
-		{
+		if (!$this->table_element) {
 			$this->error = 'update_note was called on objet with property table_element not defined';
 			dol_syslog(get_class($this)."::update_note was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
 		}
-		if (!in_array($suffix, array('', '_public', '_private')))
-		{
+		if (!in_array($suffix, array('', '_public', '_private'))) {
 			$this->error = 'update_note Parameter suffix must be empty, \'_private\' or \'_public\'';
 			dol_syslog(get_class($this)."::update_note Parameter suffix must be empty, '_private' or '_public'", LOG_ERR);
 			return -2;
@@ -2978,7 +3219,9 @@ abstract class CommonObject
 		$newsuffix = $suffix;
 
 		// Special cas
-		if ($this->table_element == 'product' && $newsuffix == '_private') $newsuffix = '';
+		if ($this->table_element == 'product' && $newsuffix == '_private') {
+			$newsuffix = '';
+		}
 		if (in_array($this->table_element, array('actioncomm', 'adherent', 'advtargetemailing', 'cronjob', 'establishment'))) {
 			$fieldusermod =  "fk_user_mod";
 		} elseif ($this->table_element == 'ecm_files') {
@@ -3049,36 +3292,43 @@ abstract class CommonObject
 
 		// Some external module want no update price after a trigger because they have another method to calculate the total (ex: with an extrafield)
 		$MODULE = "";
-		if ($this->element == 'propal')
+		if ($this->element == 'propal') {
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_PROPOSAL";
-		elseif ($this->element == 'commande' || $this->element == 'order')
+		} elseif ($this->element == 'commande' || $this->element == 'order') {
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
-		elseif ($this->element == 'facture' || $this->element == 'invoice')
+		} elseif ($this->element == 'facture' || $this->element == 'invoice') {
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
-		elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier')
+		} elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier') {
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
-		elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order')
+		} elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order') {
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
-		elseif ($this->element == 'supplier_proposal')
+		} elseif ($this->element == 'supplier_proposal') {
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_PROPOSAL";
+		}
 
 		if (!empty($MODULE)) {
 			if (!empty($conf->global->$MODULE)) {
 				$modsactivated = explode(',', $conf->global->$MODULE);
 				foreach ($modsactivated as $mod) {
-					if ($conf->$mod->enabled)
+					if ($conf->$mod->enabled) {
 						return 1; // update was disabled by specific setup
+					}
 				}
 			}
 		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') $roundingadjust = 'auto'; // For backward compatibility
+		if ($roundingadjust == '-1') {
+			$roundingadjust = 'auto'; // For backward compatibility
+		}
 
 		$forcedroundingmode = $roundingadjust;
-		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) $forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
-		elseif ($forcedroundingmode == 'auto') $forcedroundingmode = '0';
+		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
+			$forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
+		} elseif ($forcedroundingmode == 'auto') {
+			$forcedroundingmode = '0';
+		}
 
 		$error = 0;
 
@@ -3089,34 +3339,36 @@ abstract class CommonObject
 		$fieldlocaltax1 = 'total_localtax1';
 		$fieldlocaltax2 = 'total_localtax2';
 		$fieldup = 'subprice';
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier')
-		{
+		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
 			$fieldtva = 'tva';
 			$fieldup = 'pu_ht';
 		}
-		if ($this->element == 'expensereport')
-		{
+		if ($this->element == 'expensereport') {
 			$fieldup = 'value_unit';
 		}
 
 		$sql = 'SELECT rowid, qty, '.$fieldup.' as up, remise_percent, total_ht, '.$fieldtva.' as total_tva, total_ttc, '.$fieldlocaltax1.' as total_localtax1, '.$fieldlocaltax2.' as total_localtax2,';
 		$sql .= ' tva_tx as vatrate, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, info_bits, product_type';
-		if ($this->table_element_line == 'facturedet') $sql .= ', situation_percent';
+		if ($this->table_element_line == 'facturedet') {
+			$sql .= ', situation_percent';
+		}
 		$sql .= ', multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql .= ' WHERE '.$this->fk_element.' = '.$this->id;
-		if ($exclspec)
-		{
+		if ($exclspec) {
 			$product_field = 'product_type';
-			if ($this->table_element_line == 'contratdet') $product_field = ''; // contratdet table has no product_type field
-			if ($product_field) $sql .= ' AND '.$product_field.' <> 9';
+			if ($this->table_element_line == 'contratdet') {
+				$product_field = ''; // contratdet table has no product_type field
+			}
+			if ($product_field) {
+				$sql .= ' AND '.$product_field.' <> 9';
+			}
 		}
 		$sql .= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
 		dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->total_ht  = 0;
 			$this->total_tva = 0;
 			$this->total_localtax1 = 0;
@@ -3131,16 +3383,14 @@ abstract class CommonObject
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				// Note: There is no check on detail line and no check on total, if $forcedroundingmode = 'none'
 				$parameters = array('fk_element' => $obj->rowid);
 				$reshook = $hookmanager->executeHooks('changeRoundingMode', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (empty($reshook) && $forcedroundingmode == '0')	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
-				{
+				if (empty($reshook) && $forcedroundingmode == '0') {	// Check if data on line are consistent. This may solve lines that were not consistent because set with $forcedroundingmode='auto'
 					// This part of code is to fix data. We should not call it too often.
 					$localtax_array = array($obj->localtax1_type, $obj->localtax1_tx, $obj->localtax2_type, $obj->localtax2_tx);
 					$tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
@@ -3150,12 +3400,13 @@ abstract class CommonObject
 					//var_dump($obj->total_ht.' '.$obj->total_tva.' '.$obj->total_localtax1.' '.$obj->total_localtax2.' =? '.$obj->total_ttc);
 					//var_dump($diff_when_using_price_ht.' '.$diff_on_current_total);
 
-					if ($diff_when_using_price_ht && $diff_on_current_total)
-					{
+					if ($diff_when_using_price_ht && $diff_on_current_total) {
 						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".$tmpcal[1].", total_ttc = ".$tmpcal[2]." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found unconsistent data into detailed line (diff_when_using_price_ht = '.$diff_when_using_price_ht.' and diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix, LOG_WARNING);
 						$resqlfix = $this->db->query($sqlfix);
-						if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
+						if (!$resqlfix) {
+							dol_print_error($this->db, 'Failed to update line');
+						}
 						$obj->total_tva = $tmpcal[1];
 						$obj->total_ttc = $tmpcal[2];
 					}
@@ -3170,20 +3421,24 @@ abstract class CommonObject
 				$this->multicurrency_total_tva       += $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc       += $obj->multicurrency_total_ttc;
 
-				if (!isset($total_ht_by_vats[$obj->vatrate]))  $total_ht_by_vats[$obj->vatrate] = 0;
-				if (!isset($total_tva_by_vats[$obj->vatrate])) $total_tva_by_vats[$obj->vatrate] = 0;
-				if (!isset($total_ttc_by_vats[$obj->vatrate])) $total_ttc_by_vats[$obj->vatrate] = 0;
+				if (!isset($total_ht_by_vats[$obj->vatrate])) {
+					$total_ht_by_vats[$obj->vatrate] = 0;
+				}
+				if (!isset($total_tva_by_vats[$obj->vatrate])) {
+					$total_tva_by_vats[$obj->vatrate] = 0;
+				}
+				if (!isset($total_ttc_by_vats[$obj->vatrate])) {
+					$total_ttc_by_vats[$obj->vatrate] = 0;
+				}
 				$total_ht_by_vats[$obj->vatrate]  += $obj->total_ht;
 				$total_tva_by_vats[$obj->vatrate] += $obj->total_tva;
 				$total_ttc_by_vats[$obj->vatrate] += $obj->total_ttc;
 
-				if ($forcedroundingmode == '1')	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
-				{
+				if ($forcedroundingmode == '1') {	// Check if we need adjustement onto line for vat. TODO This works on the company currency but not on multicurrency
 					$tmpvat = price2num($total_ht_by_vats[$obj->vatrate] * $obj->vatrate / 100, 'MT', 1);
 					$diff = price2num($total_tva_by_vats[$obj->vatrate] - $tmpvat, 'MT', 1);
 					//print 'Line '.$i.' rowid='.$obj->rowid.' vat_rate='.$obj->vatrate.' total_ht='.$obj->total_ht.' total_tva='.$obj->total_tva.' total_ttc='.$obj->total_ttc.' total_ht_by_vats='.$total_ht_by_vats[$obj->vatrate].' total_tva_by_vats='.$total_tva_by_vats[$obj->vatrate].' (new calculation = '.$tmpvat.') total_ttc_by_vats='.$total_ttc_by_vats[$obj->vatrate].($diff?" => DIFF":"")."<br>\n";
-					if ($diff)
-					{
+					if ($diff) {
 						if (abs($diff) > 0.1) {
 							$errmsg = 'A rounding difference was detected into TOTAL but is too high to be corrected. Some data in your line may be corrupted. Try to edit each line manually.';
 							dol_syslog($errmsg, LOG_WARNING);
@@ -3193,7 +3448,9 @@ abstract class CommonObject
 						$sqlfix = "UPDATE ".MAIN_DB_PREFIX.$this->table_element_line." SET ".$fieldtva." = ".($obj->total_tva - $diff).", total_ttc = ".($obj->total_ttc - $diff)." WHERE rowid = ".$obj->rowid;
 						dol_syslog('We found a difference of '.$diff.' for line rowid = '.$obj->rowid.". We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 								$resqlfix = $this->db->query($sqlfix);
-								if (!$resqlfix) dol_print_error($this->db, 'Failed to update line');
+						if (!$resqlfix) {
+							dol_print_error($this->db, 'Failed to update line');
+						}
 								$this->total_tva -= $diff;
 								$this->total_ttc -= $diff;
 								$total_tva_by_vats[$obj->vatrate] -= $diff;
@@ -3209,8 +3466,7 @@ abstract class CommonObject
 			$this->multicurrency_total_ttc += isset($this->revenuestamp) ? ($this->revenuestamp * $multicurrency_tx) : 0;
 
 			// Situations totals
-			if (!empty($this->situation_cycle_ref) && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE)
-			{
+			if (!empty($this->situation_cycle_ref) && $this->situation_counter > 1 && method_exists($this, 'get_prev_sits') && $this->type != $this::TYPE_CREDIT_NOTE) {
 				$prev_sits = $this->get_prev_sits();
 
 				foreach ($prev_sits as $sit) {				// $sit is an object Facture loaded with a fetch.
@@ -3234,16 +3490,29 @@ abstract class CommonObject
 			$fieldlocaltax2 = 'localtax2';
 			$fieldttc = 'total_ttc';
 			// Specific code for backward compatibility with old field names
-			if ($this->element == 'facture' || $this->element == 'facturerec')             $fieldht = 'total';
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') $fieldtva = 'total_tva';
-			if ($this->element == 'propal')                                                $fieldtva = 'total_tva';
-			if ($this->element == 'expensereport')                                         $fieldtva = 'total_tva';
-			if ($this->element == 'supplier_proposal')                                     $fieldtva = 'total_tva';
-			if ($this->element == 'commande')                                              $fieldtva = 'total_tva';
-			if ($this->element == 'order_supplier')                                        $fieldtva = 'total_tva';
+			if ($this->element == 'facture' || $this->element == 'facturerec') {
+				$fieldht = 'total';
+			}
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+				$fieldtva = 'total_tva';
+			}
+			if ($this->element == 'propal') {
+				$fieldtva = 'total_tva';
+			}
+			if ($this->element == 'expensereport') {
+				$fieldtva = 'total_tva';
+			}
+			if ($this->element == 'supplier_proposal') {
+				$fieldtva = 'total_tva';
+			}
+			if ($this->element == 'commande') {
+				$fieldtva = 'total_tva';
+			}
+			if ($this->element == 'order_supplier') {
+				$fieldtva = 'total_tva';
+			}
 
-			if (empty($nodatabaseupdate))
-			{
+			if (empty($nodatabaseupdate)) {
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET';
 				$sql .= " ".$fieldht."='".price2num($this->total_ht)."',";
 				$sql .= " ".$fieldtva."='".price2num($this->total_tva)."',";
@@ -3258,16 +3527,14 @@ abstract class CommonObject
 
 				dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					$error++;
 					$this->error = $this->db->lasterror();
 					$this->errors[] = $this->db->lasterror();
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				return 1;
 			} else {
 				return -1;
@@ -3298,10 +3565,18 @@ abstract class CommonObject
 		$f_user = isset($f_user) ? $f_user : $user;
 
 		// Special case
-		if ($origin == 'order') $origin = 'commande';
-		if ($origin == 'invoice') $origin = 'facture';
-		if ($origin == 'invoice_template') $origin = 'facturerec';
-		if ($origin == 'supplierorder') $origin = 'order_supplier';
+		if ($origin == 'order') {
+			$origin = 'commande';
+		}
+		if ($origin == 'invoice') {
+			$origin = 'facture';
+		}
+		if ($origin == 'invoice_template') {
+			$origin = 'facturerec';
+		}
+		if ($origin == 'supplierorder') {
+			$origin = 'order_supplier';
+		}
 		$this->db->begin();
 		$error = 0;
 
@@ -3377,15 +3652,17 @@ abstract class CommonObject
 		$withtargettype = false;
 		$withsourcetype = false;
 
-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid))
-		{
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid)) {
 			$justsource = true; // the source (id and type) is a search criteria
-			if (!empty($targettype)) $withtargettype = true;
+			if (!empty($targettype)) {
+				$withtargettype = true;
+			}
 		}
-		if (!empty($targetid) && !empty($targettype) && empty($sourceid))
-		{
+		if (!empty($targetid) && !empty($targettype) && empty($sourceid)) {
 			$justtarget = true; // the target (id and type) is a search criteria
-			if (!empty($sourcetype)) $withsourcetype = true;
+			if (!empty($sourcetype)) {
+				$withsourcetype = true;
+			}
 		}
 
 		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
@@ -3403,16 +3680,17 @@ abstract class CommonObject
 		$sql = 'SELECT rowid, fk_source, sourcetype, fk_target, targettype';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_element';
 		$sql .= " WHERE ";
-		if ($justsource || $justtarget)
-		{
-			if ($justsource)
-			{
+		if ($justsource || $justtarget) {
+			if ($justsource) {
 				$sql .= "fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."'";
-				if ($withtargettype) $sql .= " AND targettype = '".$this->db->escape($targettype)."'";
-			} elseif ($justtarget)
-			{
+				if ($withtargettype) {
+					$sql .= " AND targettype = '".$this->db->escape($targettype)."'";
+				}
+			} elseif ($justtarget) {
 				$sql .= "fk_target = ".$targetid." AND targettype = '".$this->db->escape($targettype)."'";
-				if ($withsourcetype) $sql .= " AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				if ($withsourcetype) {
+					$sql .= " AND sourcetype = '".$this->db->escape($sourcetype)."'";
+				}
 			}
 		} else {
 			$sql .= "(fk_source = ".$sourceid." AND sourcetype = '".$this->db->escape($sourcetype)."')";
@@ -3422,46 +3700,36 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this)."::fetchObjectLink", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
-				if ($justsource || $justtarget)
-				{
-					if ($justsource)
-					{
+				if ($justsource || $justtarget) {
+					if ($justsource) {
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
-					} elseif ($justtarget)
-					{
+					} elseif ($justtarget) {
 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
 				} else {
-					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype)
-					{
+					if ($obj->fk_source == $sourceid && $obj->sourcetype == $sourcetype) {
 						$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
 					}
-					if ($obj->fk_target == $targetid && $obj->targettype == $targettype)
-					{
+					if ($obj->fk_target == $targetid && $obj->targettype == $targettype) {
 						$this->linkedObjectsIds[$obj->sourcetype][$obj->rowid] = $obj->fk_source;
 					}
 				}
 				$i++;
 			}
 
-			if (!empty($this->linkedObjectsIds))
-			{
+			if (!empty($this->linkedObjectsIds)) {
 				$tmparray = $this->linkedObjectsIds;
-				foreach ($tmparray as $objecttype => $objectids)       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
-				{
+				foreach ($tmparray as $objecttype => $objectids) {       // $objecttype is a module name ('facture', 'mymodule', ...) or a module name with a suffix ('project_task', 'mymodule_myobj', ...)
 					// Parse element/subelement (ex: project_task, cabinetmed_consultation, ...)
 					$module = $element = $subelement = $objecttype;
 					$regs = array();
 					if ($objecttype != 'supplier_proposal' && $objecttype != 'order_supplier' && $objecttype != 'invoice_supplier'
-						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
-					{
+						&& preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {
 						$module = $element = $regs[1];
 						$subelement = $regs[2];
 					}
@@ -3510,20 +3778,15 @@ abstract class CommonObject
 					}
 
 					// Here $module, $classfile and $classname are set
-					if ($conf->$module->enabled && (($element != $this->element) || $alsosametype))
-					{
-						if ($loadalsoobjects)
-						{
+					if ($conf->$module->enabled && (($element != $this->element) || $alsosametype)) {
+						if ($loadalsoobjects) {
 							dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
 							//print '/'.$classpath.'/'.$classfile.'.class.php '.class_exists($classname);
-							if (class_exists($classname))
-							{
-								foreach ($objectids as $i => $objectid)	// $i is rowid into llx_element_element
-								{
+							if (class_exists($classname)) {
+								foreach ($objectids as $i => $objectid) {	// $i is rowid into llx_element_element
 									$object = new $classname($this->db);
 									$ret = $object->fetch($objectid);
-									if ($ret >= 0)
-									{
+									if ($ret >= 0) {
 										$this->linkedObjects[$objecttype][$i] = $object;
 									}
 								}
@@ -3560,8 +3823,11 @@ abstract class CommonObject
 		$updatetarget = false;
 		$f_user = isset($f_user) ? $f_user : $user;
 
-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $updatesource = true;
-		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $updatetarget = true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {
+			$updatesource = true;
+		} elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {
+			$updatetarget = true;
+		}
 
 		$this->db->begin();
 		$error = 0;
@@ -3627,8 +3893,11 @@ abstract class CommonObject
 		$deletetarget = false;
 		$f_user = isset($f_user) ? $f_user : $user;
 
-		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) $deletesource = true;
-		elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) $deletetarget = true;
+		if (!empty($sourceid) && !empty($sourcetype) && empty($targetid) && empty($targettype)) {
+			$deletesource = true;
+		} elseif (empty($sourceid) && empty($sourcetype) && !empty($targetid) && !empty($targettype)) {
+			$deletetarget = true;
+		}
 
 		$sourceid = (!empty($sourceid) ? $sourceid : $this->id);
 		$sourcetype = (!empty($sourcetype) ? $sourcetype : $this->element);
@@ -3696,7 +3965,7 @@ abstract class CommonObject
 	 * @param	string	$table_element			name of association table
 	 * @return 	array							Array of record
 	 */
-	static public function getAllItemsLinkedByObjectID($fk_object_where, $field_select, $field_where, $table_element)
+	public static function getAllItemsLinkedByObjectID($fk_object_where, $field_select, $field_where, $table_element)
 	{
 		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {
 			return -1;
@@ -3725,7 +3994,7 @@ abstract class CommonObject
 	 * @param	string	$table_element			name of association table
 	 * @return 	int								<0 if KO, 0 if nothing done, >0 if OK and something done
 	 */
-	static public function deleteAllItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)
+	public static function deleteAllItemsLinkedByObjectID($fk_object_where, $field_where, $table_element)
 	{
 		if (empty($fk_object_where) || empty($field_where) || empty($table_element)) {
 			return -1;
@@ -3764,50 +4033,75 @@ abstract class CommonObject
 		$this->db->begin();
 
 		$fieldstatus = "fk_statut";
-		if ($elementTable == 'facture_rec') $fieldstatus = "suspended";
-		if ($elementTable == 'mailing') $fieldstatus = "statut";
-		if ($elementTable == 'cronjob') $fieldstatus = "status";
-		if ($elementTable == 'user') $fieldstatus = "statut";
-		if ($elementTable == 'expensereport') $fieldstatus = "fk_statut";
-		if ($elementTable == 'commande_fournisseur_dispatch') $fieldstatus = "status";
-		if (is_array($this->fields) && array_key_exists('status', $this->fields)) $fieldstatus = 'status';
+		if ($elementTable == 'facture_rec') {
+			$fieldstatus = "suspended";
+		}
+		if ($elementTable == 'mailing') {
+			$fieldstatus = "statut";
+		}
+		if ($elementTable == 'cronjob') {
+			$fieldstatus = "status";
+		}
+		if ($elementTable == 'user') {
+			$fieldstatus = "statut";
+		}
+		if ($elementTable == 'expensereport') {
+			$fieldstatus = "fk_statut";
+		}
+		if ($elementTable == 'commande_fournisseur_dispatch') {
+			$fieldstatus = "status";
+		}
+		if (is_array($this->fields) && array_key_exists('status', $this->fields)) {
+			$fieldstatus = 'status';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$elementTable;
 		$sql .= " SET ".$fieldstatus." = ".$status;
 		// If status = 1 = validated, update also fk_user_valid
-		if ($status == 1 && $elementTable == 'expensereport') $sql .= ", fk_user_valid = ".$user->id;
+		if ($status == 1 && $elementTable == 'expensereport') {
+			$sql .= ", fk_user_valid = ".$user->id;
+		}
 		$sql .= " WHERE rowid=".$elementId;
 
 		dol_syslog(get_class($this)."::setStatut", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$error = 0;
 
 			// Try autoset of trigkey
-			if (empty($trigkey))
-			{
-				if ($this->element == 'supplier_proposal' && $status == 2) $trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 3) $trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
-				if ($this->element == 'supplier_proposal' && $status == 4) $trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
-				if ($this->element == 'fichinter' && $status == 3) $trigkey = 'FICHINTER_CLASSIFY_DONE';
-				if ($this->element == 'fichinter' && $status == 2) $trigkey = 'FICHINTER_CLASSIFY_BILLED';
-				if ($this->element == 'fichinter' && $status == 1) $trigkey = 'FICHINTER_CLASSIFY_UNBILLED';
+			if (empty($trigkey)) {
+				if ($this->element == 'supplier_proposal' && $status == 2) {
+					$trigkey = 'SUPPLIER_PROPOSAL_SIGN'; // 2 = SupplierProposal::STATUS_SIGNED. Can't use constant into this generic class
+				}
+				if ($this->element == 'supplier_proposal' && $status == 3) {
+					$trigkey = 'SUPPLIER_PROPOSAL_REFUSE'; // 3 = SupplierProposal::STATUS_REFUSED. Can't use constant into this generic class
+				}
+				if ($this->element == 'supplier_proposal' && $status == 4) {
+					$trigkey = 'SUPPLIER_PROPOSAL_CLOSE'; // 4 = SupplierProposal::STATUS_CLOSED. Can't use constant into this generic class
+				}
+				if ($this->element == 'fichinter' && $status == 3) {
+					$trigkey = 'FICHINTER_CLASSIFY_DONE';
+				}
+				if ($this->element == 'fichinter' && $status == 2) {
+					$trigkey = 'FICHINTER_CLASSIFY_BILLED';
+				}
+				if ($this->element == 'fichinter' && $status == 1) {
+					$trigkey = 'FICHINTER_CLASSIFY_UNBILLED';
+				}
 			}
 
-			if ($trigkey)
-			{
+			if ($trigkey) {
 				// Call trigger
 				$result = $this->call_trigger($trigkey, $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 
-				if (empty($savElementId))    // If the element we update was $this (so $elementId is null)
-				{
+				if (empty($savElementId)) {    // If the element we update was $this (so $elementId is null)
 					$this->statut = $status;
 					$this->status = $status;
 				}
@@ -3837,8 +4131,12 @@ abstract class CommonObject
 	{
 		global $conf;
 
-		if (empty($id) && empty($ref)) return 0;
-		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) return 0; // To increase speed. Not enabled by default.
+		if (empty($id) && empty($ref)) {
+			return 0;
+		}
+		if (!empty($conf->global->MAIN_DISABLE_CANVAS)) {
+			return 0; // To increase speed. Not enabled by default.
+		}
 
 		// Clean parameters
 		$ref = trim($ref);
@@ -3846,18 +4144,22 @@ abstract class CommonObject
 		$sql = "SELECT rowid, canvas";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " WHERE entity IN (".getEntity($this->element).")";
-		if (!empty($id))  $sql .= " AND rowid = ".$id;
-		if (!empty($ref)) $sql .= " AND ref = '".$this->db->escape($ref)."'";
+		if (!empty($id)) {
+			$sql .= " AND rowid = ".$id;
+		}
+		if (!empty($ref)) {
+			$sql .= " AND ref = '".$this->db->escape($ref)."'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->canvas = $obj->canvas;
 				return 1;
-			} else return 0;
+			} else {
+				return 0;
+			}
 		} else {
 			dol_print_error($this->db);
 			return -1;
@@ -3876,8 +4178,7 @@ abstract class CommonObject
 		$sql = 'SELECT special_code FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql .= ' WHERE rowid = '.$lineid;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $this->db->fetch_row($resql);
 			return $row[0];
 		}
@@ -3894,11 +4195,12 @@ abstract class CommonObject
 	{
 		global $langs;
 
-		if (empty($id)) $id = $this->id;
+		if (empty($id)) {
+			$id = $this->id;
+		}
 
 		// Check parameters
-		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0)
-		{
+		if (!isset($this->childtables) || !is_array($this->childtables) || count($this->childtables) == 0) {
 			dol_print_error('Called isObjectUsed on a class with property this->childtables not defined');
 			return -1;
 		}
@@ -3906,30 +4208,25 @@ abstract class CommonObject
 		$arraytoscan = $this->childtables;
 		// For backward compatibility, we check if array is old format array('table1', 'table2', ...)
 		$tmparray = array_keys($this->childtables);
-		if (is_numeric($tmparray[0]))
-		{
+		if (is_numeric($tmparray[0])) {
 			$arraytoscan = array_flip($this->childtables);
 		}
 
 		// Test if child exists
 		$haschild = 0;
-		foreach ($arraytoscan as $table => $elementname)
-		{
+		foreach ($arraytoscan as $table => $elementname) {
 			//print $id.'-'.$table.'-'.$elementname.'<br>';
 			// Check if third party can be deleted
 			$sql = "SELECT COUNT(*) as nb from ".MAIN_DB_PREFIX.$table;
 			$sql .= " WHERE ".$this->fk_element." = ".$id;
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
-				if ($obj->nb > 0)
-				{
+				if ($obj->nb > 0) {
 					$langs->load("errors");
 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
 					$haschild += $obj->nb;
-					if (is_numeric($elementname))	// old usage
-					{
+					if (is_numeric($elementname)) {	// old usage
 						$this->errors[] = $langs->trans("ErrorRecordHasAtLeastOneChildOfType", $table);
 					} else // new usage: $elementname=Translation key
 					{
@@ -3942,11 +4239,12 @@ abstract class CommonObject
 				return -1;
 			}
 		}
-		if ($haschild > 0)
-		{
+		if ($haschild > 0) {
 			$this->errors[] = "ErrorRecordHasChildren";
 			return $haschild;
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -3959,15 +4257,26 @@ abstract class CommonObject
 	{
 		$nb = 0;
 
-		foreach ($this->lines as $key => $val)
-		{
+		foreach ($this->lines as $key => $val) {
 			$qualified = 0;
-			if ($predefined == -1) $qualified = 1;
-			if ($predefined == 1 && $val->fk_product > 0) $qualified = 1;
-			if ($predefined == 0 && $val->fk_product <= 0) $qualified = 1;
-			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) $qualified = 1;
-			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) $qualified = 1;
-			if ($qualified) $nb++;
+			if ($predefined == -1) {
+				$qualified = 1;
+			}
+			if ($predefined == 1 && $val->fk_product > 0) {
+				$qualified = 1;
+			}
+			if ($predefined == 0 && $val->fk_product <= 0) {
+				$qualified = 1;
+			}
+			if ($predefined == 2 && $val->fk_product > 0 && $val->product_type == 0) {
+				$qualified = 1;
+			}
+			if ($predefined == 3 && $val->fk_product > 0 && $val->product_type == 1) {
+				$qualified = 1;
+			}
+			if ($qualified) {
+				$nb++;
+			}
 		}
 		dol_syslog(get_class($this).'::hasProductsOrServices we found '.$nb.' qualified lines of products/servcies');
 		return $nb;
@@ -3988,12 +4297,10 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this).'::getTotalDiscount', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$pu_ht = $obj->pu_ht;
@@ -4027,20 +4334,22 @@ abstract class CommonObject
 		// defined for shipment only
 		$totalToShip = '';
 
-		foreach ($this->lines as $line)
-		{
-			if (isset($line->qty_asked))
-			{
-				if (empty($totalOrdered)) $totalOrdered = 0; // Avoid warning because $totalOrdered is ''
+		foreach ($this->lines as $line) {
+			if (isset($line->qty_asked)) {
+				if (empty($totalOrdered)) {
+					$totalOrdered = 0; // Avoid warning because $totalOrdered is ''
+				}
 				$totalOrdered += $line->qty_asked; // defined for shipment only
 			}
-			if (isset($line->qty_shipped))
-			{
-				if (empty($totalToShip)) $totalToShip = 0; // Avoid warning because $totalToShip is ''
+			if (isset($line->qty_shipped)) {
+				if (empty($totalToShip)) {
+					$totalToShip = 0; // Avoid warning because $totalToShip is ''
+				}
 				$totalToShip += $line->qty_shipped; // defined for shipment only
-			} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty))
-			{
-				if (empty($totalToShip)) $totalToShip = 0;
+			} elseif ($line->element == 'commandefournisseurdispatch' && isset($line->qty)) {
+				if (empty($totalToShip)) {
+					$totalToShip = 0;
+				}
 				$totalToShip += $line->qty; // defined for reception only
 			}
 
@@ -4064,15 +4373,22 @@ abstract class CommonObject
 
 			$weightUnit = 0;
 			$volumeUnit = 0;
-			if (!empty($weight_units)) $weightUnit = $weight_units;
-			if (!empty($volume_units)) $volumeUnit = $volume_units;
+			if (!empty($weight_units)) {
+				$weightUnit = $weight_units;
+			}
+			if (!empty($volume_units)) {
+				$volumeUnit = $volume_units;
+			}
 
-			if (empty($totalWeight)) $totalWeight = 0; // Avoid warning because $totalWeight is ''
-			if (empty($totalVolume)) $totalVolume = 0; // Avoid warning because $totalVolume is ''
+			if (empty($totalWeight)) {
+				$totalWeight = 0; // Avoid warning because $totalWeight is ''
+			}
+			if (empty($totalVolume)) {
+				$totalVolume = 0; // Avoid warning because $totalVolume is ''
+			}
 
 			//var_dump($line->volume_units);
-			if ($weight_units < 50)   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
-			{
+			if ($weight_units < 50) {   // < 50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 				$trueWeightUnit = pow(10, $weightUnit);
 				$totalWeight += $weight * $qty * $trueWeightUnit;
 			} else {
@@ -4088,8 +4404,7 @@ abstract class CommonObject
 					$totalWeight += $weight * $qty; // This may be wrong if we mix different units
 				}
 			}
-			if ($volume_units < 50)   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
-			{
+			if ($volume_units < 50) {   // >50 means a standard unit (power of 10 of official unit), > 50 means an exotic unit (like inch)
 				//print $line->volume."x".$line->volume_units."x".($line->volume_units < 50)."x".$volumeUnit;
 				$trueVolumeUnit = pow(10, $volumeUnit);
 				//print $line->volume;
@@ -4120,8 +4435,7 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this)."::setExtraParameters", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -4153,8 +4467,7 @@ abstract class CommonObject
 		global $form;
 
 		// Line extrafield
-		if (!is_object($extrafields))
-		{
+		if (!is_object($extrafields)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
 		}
@@ -4164,10 +4477,8 @@ abstract class CommonObject
 		// Use global variables + $dateSelector + $seller and $buyer
 		// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook 'formAddObjectLine'.
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-		foreach ($dirtpls as $module => $reldir)
-		{
-			if (!empty($module))
-			{
+		foreach ($dirtpls as $module => $reldir) {
+			if (!empty($module)) {
 				$tpl = dol_buildpath($reldir.'/objectline_create.tpl.php');
 			} else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_create.tpl.php';
@@ -4178,7 +4489,9 @@ abstract class CommonObject
 			} else {
 				$res = include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	}
 
@@ -4209,13 +4522,14 @@ abstract class CommonObject
 
 		// Define usemargins
 		$usemargins = 0;
-		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;
+		if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) {
+			$usemargins = 1;
+		}
 
 		$num = count($this->lines);
 
 		// Line extrafield
-		if (!is_object($extrafields))
-		{
+		if (!is_object($extrafields)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
 		}
@@ -4223,16 +4537,13 @@ abstract class CommonObject
 
 		$parameters = array('num'=>$num, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$this->table_element_line);
 		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
 			// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook.
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-			foreach ($dirtpls as $module => $reldir)
-			{
-				if (!empty($module))
-				{
+			foreach ($dirtpls as $module => $reldir) {
+				if (!empty($module)) {
 					$tpl = dol_buildpath($reldir.'/objectline_title.tpl.php');
 				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_title.tpl.php';
@@ -4242,23 +4553,22 @@ abstract class CommonObject
 				} else {
 					$res = include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 
 		$i = 0;
 
 		print "<!-- begin printObjectLines() --><tbody>\n";
-		foreach ($this->lines as $line)
-		{
+		foreach ($this->lines as $line) {
 			//Line extrafield
 			$line->fetch_optionals();
 
 			//if (is_object($hookmanager) && (($line->product_type == 9 && ! empty($line->special_code)) || ! empty($line->fk_parent_line)))
-			if (is_object($hookmanager))   // Old code is commented on preceding line.
-			{
-				if (empty($line->fk_parent_line))
-				{
+			if (is_object($hookmanager)) {   // Old code is commented on preceding line.
+				if (empty($line->fk_parent_line)) {
 					$parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
 					$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				} else {
@@ -4266,8 +4576,7 @@ abstract class CommonObject
 					$reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				}
 			}
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				$this->printObjectLine($action, $line, '', $num, $i, $dateSelector, $seller, $buyer, $selected, $extrafields, $defaulttpldir);
 			}
 
@@ -4306,11 +4615,9 @@ abstract class CommonObject
 		$text = ''; $description = '';
 
 		// Line in view mode
-		if ($action != 'editline' || $selected != $line->id)
-		{
+		if ($action != 'editline' || $selected != $line->id) {
 			// Product
-			if ($line->fk_product > 0)
-			{
+			if ($line->fk_product > 0) {
 				$product_static = new Product($this->db);
 				$product_static->fetch($line->fk_product);
 
@@ -4320,10 +4627,8 @@ abstract class CommonObject
 				$text = $product_static->getNomUrl(1);
 
 				// Define output language and label
-				if (!empty($conf->global->MAIN_MULTILANGS))
-				{
-					if (property_exists($this, 'socid') && !is_object($this->thirdparty))
-					{
+				if (!empty($conf->global->MAIN_MULTILANGS)) {
+					if (property_exists($this, 'socid') && !is_object($this->thirdparty)) {
 						dol_print_error('', 'Error: Method printObjectLine was called on an object and object->fetch_thirdparty was not done before');
 						return;
 					}
@@ -4333,10 +4638,13 @@ abstract class CommonObject
 
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) $newlang = $this->thirdparty->default_lang; // To use language of customer
-					if (!empty($newlang))
-					{
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						$newlang = GETPOST('lang_id', 'aZ09');
+					}
+					if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && empty($newlang) && is_object($this->thirdparty)) {
+						$newlang = $this->thirdparty->default_lang; // To use language of customer
+					}
+					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
 					}
@@ -4356,10 +4664,8 @@ abstract class CommonObject
 			// Use global variables + $dateSelector + $seller and $buyer
 			// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook printObjectLine and printObjectSubLine.
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-			foreach ($dirtpls as $module => $reldir)
-			{
-				if (!empty($module))
-				{
+			foreach ($dirtpls as $module => $reldir) {
+				if (!empty($module)) {
 					$tpl = dol_buildpath($reldir.'/objectline_view.tpl.php');
 				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_view.tpl.php';
@@ -4370,13 +4676,14 @@ abstract class CommonObject
 				} else {
 					$res = include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 
 		// Line in update mode
-		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id)
-		{
+		if ($this->statut == 0 && $action == 'editline' && $selected == $line->id) {
 			$label = (!empty($line->label) ? $line->label : (($line->fk_product > 0) ? $line->product_label : ''));
 
 			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
@@ -4385,10 +4692,8 @@ abstract class CommonObject
 			// Use global variables + $dateSelector + $seller and $buyer
 			// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook printObjectLine and printObjectSubLine.
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-			foreach ($dirtpls as $module => $reldir)
-			{
-				if (!empty($module))
-				{
+			foreach ($dirtpls as $module => $reldir) {
+				if (!empty($module)) {
 					$tpl = dol_buildpath($reldir.'/objectline_edit.tpl.php');
 				} else {
 					$tpl = DOL_DOCUMENT_ROOT.$reldir.'/objectline_edit.tpl.php';
@@ -4399,7 +4704,9 @@ abstract class CommonObject
 				} else {
 					$res = include $tpl; // for debug
 				}
-				if ($res) break;
+				if ($res) {
+					break;
+				}
 			}
 		}
 	}
@@ -4427,10 +4734,11 @@ abstract class CommonObject
 		print '<td>'.$langs->trans('Description').'</td>';
 		print '<td class="right">'.$langs->trans('VATRate').'</td>';
 		print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
-		if (!empty($conf->multicurrency->enabled)) print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		if (!empty($conf->multicurrency->enabled)) {
+			print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+		}
 		print '<td class="right">'.$langs->trans('Qty').'</td>';
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			print '<td class="left">'.$langs->trans('Unit').'</td>';
 		}
 		print '<td class="right">'.$langs->trans('ReductionShort').'</td>';
@@ -4438,14 +4746,10 @@ abstract class CommonObject
 		print '</tr>';
 		$i = 0;
 
-		if (!empty($this->lines))
-		{
-			foreach ($this->lines as $line)
-			{
-				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line)))
-				{
-					if (empty($line->fk_parent_line))
-					{
+		if (!empty($this->lines)) {
+			foreach ($this->lines as $line) {
+				if (is_object($hookmanager) && (($line->product_type == 9 && !empty($line->special_code)) || !empty($line->fk_parent_line))) {
+					if (empty($line->fk_parent_line)) {
 						$parameters = array('line'=>$line, 'i'=>$i);
 						$action = '';
 						$hookmanager->executeHooks('printOriginObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
@@ -4477,33 +4781,35 @@ abstract class CommonObject
 		global $langs, $conf;
 
 		//var_dump($line);
-		if (!empty($line->date_start))
-		{
+		if (!empty($line->date_start)) {
 			$date_start = $line->date_start;
 		} else {
 			$date_start = $line->date_debut_prevue;
-			if ($line->date_debut_reel) $date_start = $line->date_debut_reel;
+			if ($line->date_debut_reel) {
+				$date_start = $line->date_debut_reel;
+			}
 		}
-		if (!empty($line->date_end))
-		{
+		if (!empty($line->date_end)) {
 			$date_end = $line->date_end;
 		} else {
 			$date_end = $line->date_fin_prevue;
-			if ($line->date_fin_reel) $date_end = $line->date_fin_reel;
+			if ($line->date_fin_reel) {
+				$date_end = $line->date_fin_reel;
+			}
 		}
 
 		$this->tpl['id'] = $line->id;
 
 		$this->tpl['label'] = '';
-		if (!empty($line->fk_parent_line)) $this->tpl['label'] .= img_picto('', 'rightarrow');
+		if (!empty($line->fk_parent_line)) {
+			$this->tpl['label'] .= img_picto('', 'rightarrow');
+		}
 
-		if (($line->info_bits & 2) == 2)  // TODO Not sure this is used for source object
-		{
+		if (($line->info_bits & 2) == 2) {  // TODO Not sure this is used for source object
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fk_soc = $this->socid;
 			$this->tpl['label'] .= $discount->getNomUrl(0, 'discount');
-		} elseif (!empty($line->fk_product))
-		{
+		} elseif (!empty($line->fk_product)) {
 			$productstatic = new Product($this->db);
 			$productstatic->id = $line->fk_product;
 			$productstatic->ref = $line->ref;
@@ -4516,8 +4822,7 @@ abstract class CommonObject
 			$this->tpl['label'] .= $productstatic->getNomUrl(1);
 			$this->tpl['label'] .= ' - '.(!empty($line->label) ? $line->label : $line->product_label);
 			// Dates
-			if ($line->product_type == 1 && ($date_start || $date_end))
-			{
+			if ($line->product_type == 1 && ($date_start || $date_end)) {
 				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
 		} else {
@@ -4529,31 +4834,25 @@ abstract class CommonObject
 			}
 
 			// Dates
-			if ($line->product_type == 1 && ($date_start || $date_end))
-			{
+			if ($line->product_type == 1 && ($date_start || $date_end)) {
 				$this->tpl['label'] .= get_date_range($date_start, $date_end);
 			}
 		}
 
-		if (!empty($line->desc))
-		{
-			if ($line->desc == '(CREDIT_NOTE)')  // TODO Not sure this is used for source object
-			{
+		if (!empty($line->desc)) {
+			if ($line->desc == '(CREDIT_NOTE)') {  // TODO Not sure this is used for source object
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-			} elseif ($line->desc == '(DEPOSIT)')  // TODO Not sure this is used for source object
-			{
+			} elseif ($line->desc == '(DEPOSIT)') {  // TODO Not sure this is used for source object
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
-			} elseif ($line->desc == '(EXCESS RECEIVED)')
-			{
+			} elseif ($line->desc == '(EXCESS RECEIVED)') {
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-			} elseif ($line->desc == '(EXCESS PAID)')
-			{
+			} elseif ($line->desc == '(EXCESS PAID)') {
 				$discount = new DiscountAbsolute($this->db);
 				$discount->fetch($line->fk_remise_except);
 				$this->tpl['description'] = $langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
@@ -4567,25 +4866,29 @@ abstract class CommonObject
 		// VAT Rate
 		$this->tpl['vat_rate'] = vatrate($line->tva_tx, true);
 		$this->tpl['vat_rate'] .= (($line->info_bits & 1) == 1) ? '*' : '';
-		if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) $this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
+		if (!empty($line->vat_src_code) && !preg_match('/\(/', $this->tpl['vat_rate'])) {
+			$this->tpl['vat_rate'] .= ' ('.$line->vat_src_code.')';
+		}
 
 		$this->tpl['price'] = price($line->subprice);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) $this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$this->tpl['unit'] = $langs->transnoentities($line->getLabelOfUnit('long'));
+		}
 		$this->tpl['remise_percent'] = (($line->info_bits & 2) != 2) ? vatrate($line->remise_percent, true) : '&nbsp;';
 
 		// Is the line strike or not
 		$this->tpl['strike'] = 0;
-		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) $this->tpl['strike'] = 1;
+		if ($restrictlist == 'services' && $line->product_type != Product::TYPE_SERVICE) {
+			$this->tpl['strike'] = 1;
+		}
 
 		// Output template part (modules that overwrite templates must declare this into descriptor)
 		// Use global variables + $dateSelector + $seller and $buyer
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-		foreach ($dirtpls as $module => $reldir)
-		{
-			if (!empty($module))
-			{
+		foreach ($dirtpls as $module => $reldir) {
+			if (!empty($module)) {
 				$tpl = dol_buildpath($reldir.'/originproductline.tpl.php');
 			} else {
 				$tpl = DOL_DOCUMENT_ROOT.$reldir.'/originproductline.tpl.php';
@@ -4596,7 +4899,9 @@ abstract class CommonObject
 			} else {
 				$res = include $tpl; // for debug
 			}
-			if ($res) break;
+			if ($res) {
+				break;
+			}
 		}
 	}
 
@@ -4634,8 +4939,7 @@ abstract class CommonObject
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::add_element_resource", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -4667,16 +4971,16 @@ abstract class CommonObject
 		dol_syslog(get_class($this)."::delete_resource", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
 		} else {
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				$result = $this->call_trigger(strtoupper($element).'_DELETE_RESOURCE', $user);
-				if ($result < 0) { $this->db->rollback(); return -1; }
+				if ($result < 0) {
+					$this->db->rollback(); return -1;
+				}
 			}
 			$this->db->commit();
 			return 1;
@@ -4692,11 +4996,9 @@ abstract class CommonObject
 	public function __clone()
 	{
 		// Force a copy of this->lines, otherwise it will point to same object.
-		if (isset($this->lines) && is_array($this->lines))
-		{
+		if (isset($this->lines) && is_array($this->lines)) {
 			$nboflines = count($this->lines);
-			for ($i = 0; $i < $nboflines; $i++)
-			{
+			for ($i = 0; $i < $nboflines; $i++) {
 				$this->lines[$i] = clone $this->lines[$i];
 			}
 		}
@@ -4724,8 +5026,7 @@ abstract class CommonObject
 		$parameters = array('modelspath'=>$modelspath, 'modele'=>$modele, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'hidedesc'=>$hidedesc, 'hideref'=>$hideref, 'moreparams'=>$moreparams);
 		$reshook = $hookmanager->executeHooks('commonGenerateDocument', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			dol_syslog("commonGenerateDocument modele=".$modele." outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
 			if (empty($modele)) {
@@ -4741,8 +5042,7 @@ abstract class CommonObject
 
 			// If selected model is a filename template (then $modele="modelname" or "modelname:filename")
 			$tmp = explode(':', $modele, 2);
-			if (!empty($tmp[1]))
-			{
+			if (!empty($tmp[1])) {
 				$modele = $tmp[0];
 				$srctemplatepath = $tmp[1];
 			}
@@ -4752,11 +5052,11 @@ abstract class CommonObject
 			$classname = '';
 			$filefound = '';
 			$dirmodels = array('/');
-			if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
-			foreach ($dirmodels as $reldir)
-			{
-				foreach (array('doc', 'pdf') as $prefix)
-				{
+			if (is_array($conf->modules_parts['models'])) {
+				$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+			}
+			foreach ($dirmodels as $reldir) {
+				foreach (array('doc', 'pdf') as $prefix) {
 					if (in_array(get_class($this), array('Adherent'))) {
 						// Member module use prefix_modele.class.php
 						$file = $prefix."_".$modele.".class.php";
@@ -4773,12 +5073,13 @@ abstract class CommonObject
 						break;
 					}
 				}
-				if ($filefound) break;
+				if ($filefound) {
+					break;
+				}
 			}
 
 			// If generator was found
-			if ($filefound)
-			{
+			if ($filefound) {
 				global $db; // Required to solve a conception default making an include of code using $db instead of $this->db just after.
 
 				require_once $file;
@@ -4786,50 +5087,45 @@ abstract class CommonObject
 				$obj = new $classname($this->db);
 
 				// If generator is ODT, we must have srctemplatepath defined, if not we set it.
-				if ($obj->type == 'odt' && empty($srctemplatepath))
-				{
+				if ($obj->type == 'odt' && empty($srctemplatepath)) {
 					$varfortemplatedir = $obj->scandir;
-					if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir))
-					{
+					if ($varfortemplatedir && !empty($conf->global->$varfortemplatedir)) {
 						$dirtoscan = $conf->global->$varfortemplatedir;
 
 						$listoffiles = array();
 
 						// Now we add first model found in directories scanned
 						$listofdir = explode(',', $dirtoscan);
-						foreach ($listofdir as $key => $tmpdir)
-						{
+						foreach ($listofdir as $key => $tmpdir) {
 							$tmpdir = trim($tmpdir);
 							$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
-							if (!$tmpdir) { unset($listofdir[$key]); continue; }
-							if (is_dir($tmpdir))
-							{
+							if (!$tmpdir) {
+								unset($listofdir[$key]); continue;
+							}
+							if (is_dir($tmpdir)) {
 								$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0);
-								if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+								if (count($tmpfiles)) {
+									$listoffiles = array_merge($listoffiles, $tmpfiles);
+								}
 							}
 						}
 
-						if (count($listoffiles))
-						{
-							foreach ($listoffiles as $record)
-							{
+						if (count($listoffiles)) {
+							foreach ($listoffiles as $record) {
 								$srctemplatepath = $record['fullname'];
 								break;
 							}
 						}
 					}
 
-					if (empty($srctemplatepath))
-					{
+					if (empty($srctemplatepath)) {
 						$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotDefined';
 						return -1;
 					}
 				}
 
-				if ($obj->type == 'odt' && !empty($srctemplatepath))
-				{
-					if (!dol_is_file($srctemplatepath))
-					{
+				if ($obj->type == 'odt' && !empty($srctemplatepath)) {
+					if (!dol_is_file($srctemplatepath)) {
 						dol_syslog("Failed to locate template file ".$srctemplatepath, LOG_WARNING);
 						$this->error = 'ErrorGenerationAskedForOdtTemplateWithSrcFileNotFound';
 						return -1;
@@ -4840,8 +5136,7 @@ abstract class CommonObject
 				// output format that does not support UTF8.
 				$sav_charset_output = $outputlangs->charset_output;
 
-				if (in_array(get_class($this), array('Adherent')))
-				{
+				if (in_array(get_class($this), array('Adherent'))) {
 					$arrayofrecords = array(); // The write_file of templates of adherent class need this var
 					$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
 				} else {
@@ -4849,8 +5144,7 @@ abstract class CommonObject
 				}
 				// After call of write_file $obj->result['fullpath'] is set with generated file. It will be used to update the ECM database index.
 
-				if ($resultwritefile > 0)
-				{
+				if ($resultwritefile > 0) {
 					$outputlangs->charset_output = $sav_charset_output;
 
 					// We delete old preview
@@ -4858,15 +5152,13 @@ abstract class CommonObject
 					dol_delete_preview($this);
 
 					// Index file in database
-					if (!empty($obj->result['fullpath']))
-					{
+					if (!empty($obj->result['fullpath'])) {
 						$destfull = $obj->result['fullpath'];
 						$upload_dir = dirname($destfull);
 						$destfile = basename($destfull);
 						$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 
-						if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
-						{
+						if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {     // If not a tmp dir
 							$filename = basename($destfile);
 							$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 							$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -4877,11 +5169,14 @@ abstract class CommonObject
 
 							 // Set the public "share" key
 							$setsharekey = false;
-							if ($this->element == 'propal')
-							{
+							if ($this->element == 'propal') {
 								$useonlinesignature = $conf->global->MAIN_FEATURES_LEVEL; // Replace this with 1 when feature to make online signature is ok
-								if ($useonlinesignature) $setsharekey = true;
-								if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) $setsharekey = true;
+								if ($useonlinesignature) {
+									$setsharekey = true;
+								}
+								if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD)) {
+									$setsharekey = true;
+								}
 							}
 							if ($this->element == 'commande' && !empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD)) {
 								$setsharekey = true;
@@ -4897,15 +5192,13 @@ abstract class CommonObject
 							}
 
 							if ($setsharekey) {
-								if (empty($ecmfile->share))	// Because object not found or share not set yet
-								{
+								if (empty($ecmfile->share)) {	// Because object not found or share not set yet
 									require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 									$ecmfile->share = getRandomPassword(true);
 								}
 							}
 
-							if ($result > 0)
-							 {
+							if ($result > 0) {
 								$ecmfile->label = md5_file(dol_osencode($destfull)); // hash of file content
 								$ecmfile->fullpath_orig = '';
 								$ecmfile->gen_or_uploaded = 'generated';
@@ -4934,15 +5227,16 @@ abstract class CommonObject
 							}
 
 							/*$this->result['fullname']=$destfull;
-						    $this->result['filepath']=$ecmfile->filepath;
-						    $this->result['filename']=$ecmfile->filename;*/
+							$this->result['filepath']=$ecmfile->filepath;
+							$this->result['filename']=$ecmfile->filename;*/
 							//var_dump($obj->update_main_doc_field);exit;
 
 							// Update the last_main_doc field into main object (if document generator has property ->update_main_doc_field set)
 							$update_main_doc_field = 0;
-							if (!empty($obj->update_main_doc_field)) $update_main_doc_field = 1;
-							if ($update_main_doc_field && !empty($this->table_element))
-							{
+							if (!empty($obj->update_main_doc_field)) {
+								$update_main_doc_field = 1;
+							}
+							if ($update_main_doc_field && !empty($this->table_element)) {
 								$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET last_main_doc = '".$this->db->escape($ecmfile->filepath.'/'.$ecmfile->filename)."'";
 								$sql .= ' WHERE rowid = '.$this->id;
 
@@ -4977,7 +5271,9 @@ abstract class CommonObject
 				}
 				return -1;
 			}
-		} else return $reshook;
+		} else {
+			return $reshook;
+		}
 	}
 
 	/**
@@ -4994,8 +5290,7 @@ abstract class CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php'; // This define also $maxwidthsmall, $quality, ...
 
 		$file_osencoded = dol_osencode($file);
-		if (file_exists($file_osencoded))
-		{
+		if (file_exists($file_osencoded)) {
 			// Create small thumbs for company (Ratio is near 16/9)
 			// Used on logon for example
 			vignette($file_osencoded, $maxwidthsmall, $maxheightsmall, '_small', $quality);
@@ -5028,22 +5323,31 @@ abstract class CommonObject
 		global $conf, $_POST;
 
 		// If param here has been posted, we use this value first.
-		if (GETPOSTISSET($fieldname)) return GETPOST($fieldname, 'alphanohtml', 3);
+		if (GETPOSTISSET($fieldname)) {
+			return GETPOST($fieldname, 'alphanohtml', 3);
+		}
 
-		if (isset($alternatevalue)) return $alternatevalue;
+		if (isset($alternatevalue)) {
+			return $alternatevalue;
+		}
 
 		$newelement = $this->element;
-		if ($newelement == 'facture') $newelement = 'invoice';
-		if ($newelement == 'commande') $newelement = 'order';
-		if (empty($newelement))
-		{
+		if ($newelement == 'facture') {
+			$newelement = 'invoice';
+		}
+		if ($newelement == 'commande') {
+			$newelement = 'order';
+		}
+		if (empty($newelement)) {
 			dol_syslog("Ask a default value using common method getDefaultCreateValueForField on an object with no property ->element defined. Return empty string.", LOG_WARNING);
 			return '';
 		}
 
 		$keyforfieldname = strtoupper($newelement.'_DEFAULT_'.$fieldname);
 		//var_dump($keyforfieldname);
-		if (isset($conf->global->$keyforfieldname)) return $conf->global->$keyforfieldname;
+		if (isset($conf->global->$keyforfieldname)) {
+			return $conf->global->$keyforfieldname;
+		}
 
 		// TODO Ad here a scan into table llx_overwrite_default with a filter on $this->element and $fieldname
 	}
@@ -5077,10 +5381,8 @@ abstract class CommonObject
 		$interface = new Interfaces($this->db);
 		$result = $interface->run_triggers($triggerName, $this, $user, $langs, $conf);
 
-		if ($result < 0)
-		{
-			if (!empty($this->errors))
-			{
+		if ($result < 0) {
+			if (!empty($this->errors)) {
 				$this->errors = array_unique(array_merge($this->errors, $interface->errors)); // We use array_unique because when a trigger call another trigger on same object, this->errors is added twice.
 			} else {
 				$this->errors = $interface->errors;
@@ -5116,7 +5418,9 @@ abstract class CommonObject
 		$this->array_languages = array();
 
 		$element = $this->element;
-		if ($element == 'categorie') $element = 'categories'; // For compatibility
+		if ($element == 'categorie') {
+			$element = 'categories'; // For compatibility
+		}
 
 		// Request to get translation values for object
 		$sql = "SELECT rowid, property, lang , value";
@@ -5126,11 +5430,9 @@ abstract class CommonObject
 
 		//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
-			if ($numrows)
-			{
+			if ($numrows) {
 				$i = 0;
 				while ($i < $numrows) {
 					$obj = $this->db->fetch_object($resql);
@@ -5140,8 +5442,7 @@ abstract class CommonObject
 					$type = $this->fields[$key]['type'];
 
 					// we can add this attribute to object
-					if (preg_match('/date/', $type))
-					{
+					if (preg_match('/date/', $type)) {
 						$this->array_languages[$key][$codelang] = $this->db->jdate($value);
 					} else {
 						$this->array_languages[$key][$codelang] = $value;
@@ -5153,8 +5454,11 @@ abstract class CommonObject
 
 			$this->db->free($resql);
 
-			if ($numrows) return $numrows;
-			else return 0;
+			if ($numrows) {
+				return $numrows;
+			} else {
+				return 0;
+			}
 		} else {
 			dol_print_error($this->db);
 			return -1;
@@ -5174,21 +5478,26 @@ abstract class CommonObject
 		// Get extra fields
 		foreach ($_POST as $postfieldkey => $postfieldvalue) {
 			$tmparray = explode('-', $postfieldkey);
-			if ($tmparray[0] != 'field') continue;
+			if ($tmparray[0] != 'field') {
+				continue;
+			}
 
 			$element = $tmparray[1];
 			$key = $tmparray[2];
 			$codelang = $tmparray[3];
 			//var_dump("postfieldkey=".$postfieldkey." element=".$element." key=".$key." codelang=".$codelang);
 
-			if (!empty($onlykey) && $key != $onlykey) continue;
-			if ($element != $this->element) continue;
+			if (!empty($onlykey) && $key != $onlykey) {
+				continue;
+			}
+			if ($element != $this->element) {
+				continue;
+			}
 
 			$key_type = $this->fields[$key]['type'];
 
 			$enabled = 1;
-			if (isset($this->fields[$key]['enabled']))
-			{
+			if (isset($this->fields[$key]['enabled'])) {
 				$enabled = dol_eval($this->fields[$key]['enabled'], 1);
 			}
 			/*$perms = 1;
@@ -5196,34 +5505,34 @@ abstract class CommonObject
 			{
 				$perms = dol_eval($this->fields[$key]['perms'], 1);
 			}*/
-			if (empty($enabled)) continue;
+			if (empty($enabled)) {
+				continue;
+			}
 			//if (empty($perms)) continue;
 
-			if (in_array($key_type, array('date')))
-			{
+			if (in_array($key_type, array('date'))) {
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 				$value_key = dol_mktime(0, 0, 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
-			} elseif (in_array($key_type, array('datetime')))
-			{
+			} elseif (in_array($key_type, array('datetime'))) {
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
 				$value_key = dol_mktime($_POST[$postfieldkey."hour"], $_POST[$postfieldkey."min"], 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
-			} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
-			{
+			} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {
 				$value_arr = GETPOST($postfieldkey, 'array'); // check if an array
 				if (!empty($value_arr)) {
 					$value_key = implode(',', $value_arr);
 				} else {
 					$value_key = '';
 				}
-			} elseif (in_array($key_type, array('price', 'double')))
-			{
+			} elseif (in_array($key_type, array('price', 'double'))) {
 				$value_arr = GETPOST($postfieldkey, 'alpha');
 				$value_key = price2num($value_arr);
 			} else {
 				$value_key = GETPOST($postfieldkey);
-				if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
+				if (in_array($key_type, array('link')) && $value_key == '-1') {
+					$value_key = '';
+				}
 			}
 
 			$this->array_languages[$key][$codelang] = $value_key;
@@ -5276,8 +5585,12 @@ abstract class CommonObject
 		// phpcs:enable
 		global $conf, $extrafields;
 
-		if (empty($rowid)) $rowid = $this->id;
-		if (empty($rowid) && isset($this->rowid)) $rowid = $this->rowid; // deprecated
+		if (empty($rowid)) {
+			$rowid = $this->id;
+		}
+		if (empty($rowid) && isset($this->rowid)) {
+			$rowid = $this->rowid; // deprecated
+		}
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
@@ -5286,18 +5599,15 @@ abstract class CommonObject
 
 		$this->array_options = array();
 
-		if (!is_array($optionsArray))
-		{
+		if (!is_array($optionsArray)) {
 			// If $extrafields is not a known object, we initialize it. Best practice is to have $extrafields defined into card.php or list.php page.
-			if (!isset($extrafields) || !is_object($extrafields))
-			{
+			if (!isset($extrafields) || !is_object($extrafields)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 				$extrafields = new ExtraFields($this->db);
 			}
 
 			// Load array of extrafields for elementype = $this->table_element
-			if (empty($extrafields->attributes[$this->table_element]['loaded']))
-			{
+			if (empty($extrafields->attributes[$this->table_element]['loaded'])) {
 				$extrafields->fetch_name_optionals_label($this->table_element);
 			}
 			$optionsArray = (!empty($extrafields->attributes[$this->table_element]['label']) ? $extrafields->attributes[$this->table_element]['label'] : null);
@@ -5307,16 +5617,15 @@ abstract class CommonObject
 		}
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+			$table_element = 'categories'; // For compatibility
+		}
 
 		// Request to get complementary values
-		if (is_array($optionsArray) && count($optionsArray) > 0)
-		{
+		if (is_array($optionsArray) && count($optionsArray) > 0) {
 			$sql = "SELECT rowid";
-			foreach ($optionsArray as $name => $label)
-			{
-				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate')
-				{
+			foreach ($optionsArray as $name => $label) {
+				if (empty($extrafields->attributes[$this->table_element]['type'][$name]) || $extrafields->attributes[$this->table_element]['type'][$name] != 'separate') {
 					$sql .= ", ".$name;
 				}
 			}
@@ -5325,21 +5634,16 @@ abstract class CommonObject
 
 			//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$numrows = $this->db->num_rows($resql);
-				if ($numrows)
-				{
+				if ($numrows) {
 					$tab = $this->db->fetch_array($resql);
 
-					foreach ($tab as $key => $value)
-					{
+					foreach ($tab as $key => $value) {
 						// Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)
-						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key))
-						{
+						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key)) {
 							// we can add this attribute to object
-							if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
-							{
+							if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime'))) {
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key] = $this->db->jdate($value);
 							} else {
@@ -5352,8 +5656,7 @@ abstract class CommonObject
 
 					// If field is a computed field, value must become result of compute
 					foreach ($tab as $key => $value) {
-						if (!empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key]))
-						{
+						if (!empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key])) {
 							//var_dump($conf->disable_compute);
 							if (empty($conf->disable_compute)) {
 								$this->array_options["options_".$key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0);
@@ -5364,8 +5667,11 @@ abstract class CommonObject
 
 				$this->db->free($resql);
 
-				if ($numrows) return $numrows;
-				else return 0;
+				if ($numrows) {
+					return $numrows;
+				} else {
+					return 0;
+				}
 			} else {
 				dol_print_error($this->db);
 				return -1;
@@ -5384,18 +5690,21 @@ abstract class CommonObject
 	{
 		global $conf;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
 
 		$this->db->begin();
 
 		$table_element = $this->table_element;
-		if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+		if ($table_element == 'categorie') {
+			$table_element = 'categories'; // For compatibility
+		}
 
 		$sql_del = "DELETE FROM ".MAIN_DB_PREFIX.$table_element."_extrafields WHERE fk_object = ".$this->id;
 		dol_syslog(get_class($this)."::deleteExtraFields delete", LOG_DEBUG);
 		$resql = $this->db->query($sql_del);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -5419,14 +5728,17 @@ abstract class CommonObject
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
-		if (!empty($this->array_options))
-		{
+		if (!empty($this->array_options)) {
 			// Check parameters
 			$langs->load('admin');
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -5436,43 +5748,45 @@ abstract class CommonObject
 			// Eliminate copied source object extra fields that do not exist in target object
 			$new_array_options = array();
 			foreach ($this->array_options as $key => $value) {
-				if (in_array(substr($key, 8), array_keys($target_extrafields)))	// We remove the 'options_' from $key for test
+				if (in_array(substr($key, 8), array_keys($target_extrafields))) {	// We remove the 'options_' from $key for test
 					$new_array_options[$key] = $value;
-				elseif (in_array($key, array_keys($target_extrafields)))		// We test on $key that does not contains the 'options_' prefix
+				} elseif (in_array($key, array_keys($target_extrafields))) {		// We test on $key that does not contains the 'options_' prefix
 					$new_array_options['options_'.$key] = $value;
+				}
 			}
 
-			foreach ($new_array_options as $key => $value)
-			{
-			   	$attributeKey      = substr($key, 8); // Remove 'options_' prefix
-			   	$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
-			   	$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
-			   	$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
-			   	$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];
+			foreach ($new_array_options as $key => $value) {
+				$attributeKey      = substr($key, 8); // Remove 'options_' prefix
+				$attributeType     = $extrafields->attributes[$this->table_element]['type'][$attributeKey];
+				$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
+				$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
+				$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];
 				$attrfieldcomputed = $extrafields->attributes[$this->table_element]['computed'][$attributeKey];
 
 				// Similar code than into insertExtraFields
-				if ($attributeRequired)
-			   	{
-			   		$mandatorypb = false;
-			   		if ($attributeType == 'link' && $this->array_options[$key] == '-1') $mandatorypb = true;
-			   		if ($this->array_options[$key] === '') $mandatorypb = true;
-					if ($attributeType == 'sellist' && $this->array_options[$key] == '0') $mandatorypb = true;
-			   		if ($mandatorypb)
-			   		{
-			   			dol_syslog("Mandatory extra field ".$key." is empty");
-			   			$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
-			   			return -1;
-			   		}
-			   	}
+				if ($attributeRequired) {
+					$mandatorypb = false;
+					if ($attributeType == 'link' && $this->array_options[$key] == '-1') {
+						$mandatorypb = true;
+					}
+					if ($this->array_options[$key] === '') {
+						$mandatorypb = true;
+					}
+					if ($attributeType == 'sellist' && $this->array_options[$key] == '0') {
+						$mandatorypb = true;
+					}
+					if ($mandatorypb) {
+						dol_syslog("Mandatory extra field ".$key." is empty");
+						$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
+						return -1;
+					}
+				}
 
 				//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
 				//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
 
-				if (!empty($attrfieldcomputed))
-				{
-					if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS))
-					{
+				if (!empty($attrfieldcomputed)) {
+					if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) {
 						$value = dol_eval($attrfieldcomputed, 1, 0);
 						dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
 						$new_array_options[$key] = $value;
@@ -5481,71 +5795,62 @@ abstract class CommonObject
 					}
 				}
 
-				switch ($attributeType)
-			   	{
-			   		case 'int':
-			  			if (!is_numeric($value) && $value != '')
-			   			{
-			   				$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
-			   				return -1;
-			  			} elseif ($value == '')
-			   			{
-			   				$new_array_options[$key] = null;
-			   			}
-			 			break;
-			   		case 'price':
-			   		case 'double':
+				switch ($attributeType) {
+					case 'int':
+						if (!is_numeric($value) && $value != '') {
+							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
+							return -1;
+						} elseif ($value == '') {
+							$new_array_options[$key] = null;
+						}
+						break;
+					case 'price':
+					case 'double':
 						$value = price2num($value);
-						if (!is_numeric($value) && $value != '')
-						{
+						if (!is_numeric($value) && $value != '') {
 							dol_syslog($langs->trans("ExtraFieldHasWrongValue")." for ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
-						} elseif ($value == '')
-						{
+						} elseif ($value == '') {
 							$new_array_options[$key] = null;
 						}
 						//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
 						$new_array_options[$key] = $value;
 						break;
-			 		/*case 'select':	// Not required, we chosed value='0' for undefined values
-             			if ($value=='-1')
-             			{
-             				$this->array_options[$key] = null;
-             			}
-             			break;*/
-			   		case 'password':
-			   			$algo = '';
-			   			if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']))
-			   			{
-			   				// If there is an encryption choice, we use it to crypt data before insert
-			   				$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
-			   				$algo = reset($tmparrays);
-			   				if ($algo != '')
-			   				{
-			   					//global $action;		// $action may be 'create', 'update', 'update_extras'...
-			   					//var_dump($action);
-			   					//var_dump($this->oldcopy);exit;
-			   					if (is_object($this->oldcopy))		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
-			   					{
-			   						//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
-				   					if ($this->array_options[$key] == $this->oldcopy->array_options[$key])	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
-				   					{
-				   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
-				   					} else {
+					/*case 'select':	// Not required, we chosed value='0' for undefined values
+						 if ($value=='-1')
+						 {
+							 $this->array_options[$key] = null;
+						 }
+						 break;*/
+					case 'password':
+						$algo = '';
+						if ($this->array_options[$key] != '' && is_array($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options'])) {
+							// If there is an encryption choice, we use it to crypt data before insert
+							$tmparrays = array_keys($extrafields->attributes[$this->table_element]['param'][$attributeKey]['options']);
+							$algo = reset($tmparrays);
+							if ($algo != '') {
+								//global $action;		// $action may be 'create', 'update', 'update_extras'...
+								//var_dump($action);
+								//var_dump($this->oldcopy);exit;
+								if (is_object($this->oldcopy)) {		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
+									//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
+									if ($this->array_options[$key] == $this->oldcopy->array_options[$key]) {	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
+										$new_array_options[$key] = $this->array_options[$key]; // Value is kept
+									} else {
 										// var_dump($algo);
 										$newvalue = dol_hash($this->array_options[$key], $algo);
 										$new_array_options[$key] = $newvalue;
 									}
-			   					} else {
-			   						$new_array_options[$key] = $this->array_options[$key]; // Value is kept
-			   					}
-			   				}
-			   			} else // Common usage
-			   			{
-			   				$new_array_options[$key] = $this->array_options[$key];
-			   			}
-			   			break;
+								} else {
+									$new_array_options[$key] = $this->array_options[$key]; // Value is kept
+								}
+							}
+						} else // Common usage
+						{
+							$new_array_options[$key] = $this->array_options[$key];
+						}
+						break;
 					case 'date':
 					case 'datetime':
 						// If data is a string instead of a timestamp, we convert it
@@ -5554,24 +5859,26 @@ abstract class CommonObject
 						}
 						$new_array_options[$key] = $this->db->idate($this->array_options[$key]);
 						break;
-		   			case 'link':
+					case 'link':
 						$param_list = array_keys($attributeParam['options']);
 						// 0 : ObjectName
 						// 1 : classPath
 						$InfoFieldList = explode(":", $param_list[0]);
 						dol_include_once($InfoFieldList[1]);
-						if ($InfoFieldList[0] && class_exists($InfoFieldList[0]))
-						{
-							if ($value == '-1')	// -1 is key for no defined in combo list of objects
-							{
+						if ($InfoFieldList[0] && class_exists($InfoFieldList[0])) {
+							if ($value == '-1') {	// -1 is key for no defined in combo list of objects
 								$new_array_options[$key] = '';
 							} elseif ($value) {
 								$object = new $InfoFieldList[0]($this->db);
-								if (is_numeric($value)) $res = $object->fetch($value); // Common case
-								else $res = $object->fetch('', $value); // For compatibility
+								if (is_numeric($value)) {
+									$res = $object->fetch($value); // Common case
+								} else {
+									$res = $object->fetch('', $value); // For compatibility
+								}
 
-								if ($res > 0) $new_array_options[$key] = $object->id;
-								else {
+								if ($res > 0) {
+									$new_array_options[$key] = $object->id;
+								} else {
 									$this->error = "Id/Ref '".$value."' for object '".$object->element."' not found";
 									$this->db->rollback();
 									return -1;
@@ -5581,13 +5888,15 @@ abstract class CommonObject
 							dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 						}
 						break;
-			   	}
+				}
 			}
 
 			$this->db->begin();
 
 			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+			if ($table_element == 'categorie') {
+				$table_element = 'categories'; // For compatibility
+			}
 
 			dol_syslog(get_class($this)."::insertExtraFields delete then insert", LOG_DEBUG);
 
@@ -5595,16 +5904,16 @@ abstract class CommonObject
 			$this->db->query($sql_del);
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$table_element."_extrafields (fk_object";
-			foreach ($new_array_options as $key => $value)
-			{
+			foreach ($new_array_options as $key => $value) {
 				$attributeKey = substr($key, 8); // Remove 'options_' prefix
 				// Add field of attribut
-				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') // Only for other type than separator
+				if ($extrafields->attributes[$this->table_element]['type'][$attributeKey] != 'separate') { // Only for other type than separator
 					$sql .= ",".$attributeKey;
+				}
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {
-				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval) {
+				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) {
 					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {    // If field not already added previously
 						$sql .= ",".$tmpkey;
 					}
@@ -5625,10 +5934,13 @@ abstract class CommonObject
 			}
 			// We must insert a default value for fields for other entities that are mandatory to avoid not null error
 			if (!empty($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities']) && is_array($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'])) {
-				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as  $tmpkey => $tmpval) {
+				foreach ($extrafields->attributes[$this->table_element]['mandatoryfieldsofotherentities'] as $tmpkey => $tmpval) {
 					if (!isset($extrafields->attributes[$this->table_element]['type'][$tmpkey])) {   // If field not already added previously
-						if (in_array($tmpval, array('int', 'double', 'price'))) $sql .= ", 0";
-						else $sql .= ", ''";
+						if (in_array($tmpval, array('int', 'double', 'price'))) {
+							$sql .= ", 0";
+						} else {
+							$sql .= ", ''";
+						}
 					}
 				}
 			}
@@ -5636,30 +5948,31 @@ abstract class CommonObject
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
 
-			if (!$error && $trigger)
-			{
+			if (!$error && $trigger) {
 				// Call trigger
 				$this->context = array('extrafieldaddupdate'=>1);
 				$result = $this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
-			if ($error)
-			{
+			if ($error) {
 				$this->db->rollback();
 				return -1;
 			} else {
 				$this->db->commit();
 				return 1;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -5676,18 +5989,20 @@ abstract class CommonObject
 	{
 		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
-		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) return 0; // For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) {
+			return 0; // For avoid conflicts if trigger used
+		}
 
-		if (is_array($this->array_languages))
-		{
+		if (is_array($this->array_languages)) {
 			$new_array_languages = $this->array_languages;
 
-			foreach ($new_array_languages as $key => $value)
-			{
+			foreach ($new_array_languages as $key => $value) {
 				$attributeKey      = $key;
 				$attributeType     = $this->fields[$attributeKey]['type'];
 				$attributeLabel    = $this->fields[$attributeKey]['label'];
@@ -5695,27 +6010,22 @@ abstract class CommonObject
 				//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
 				//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
 
-				switch ($attributeType)
-				{
+				switch ($attributeType) {
 					case 'int':
-						if (!is_numeric($value) && $value != '')
-						{
+						if (!is_numeric($value) && $value != '') {
 							$this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel);
 							return -1;
-						} elseif ($value == '')
-						{
+						} elseif ($value == '') {
 							$new_array_languages[$key] = null;
 						}
 						break;
 					case 'double':
 						$value = price2num($value);
-						if (!is_numeric($value) && $value != '')
-						{
+						if (!is_numeric($value) && $value != '') {
 							dol_syslog($langs->trans("ExtraLanguageHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 							$this->errors[] = $langs->trans("ExtraLanguageHasWrongValue", $attributeLabel);
 							return -1;
-						} elseif ($value == '')
-						{
+						} elseif ($value == '') {
 							$new_array_languages[$key] = null;
 						}
 						//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
@@ -5733,7 +6043,9 @@ abstract class CommonObject
 			$this->db->begin();
 
 			$table_element = $this->table_element;
-			if ($table_element == 'categorie') $table_element = 'categories'; // For compatibility
+			if ($table_element == 'categorie') {
+				$table_element = 'categories'; // For compatibility
+			}
 
 			dol_syslog(get_class($this)."::insertExtraLanguages delete then insert", LOG_DEBUG);
 
@@ -5750,8 +6062,7 @@ abstract class CommonObject
 						$sql .= ")";
 
 						$resql = $this->db->query($sql);
-						if (!$resql)
-						{
+						if (!$resql) {
 							$this->error = $this->db->lasterror();
 							$error++;
 							break;
@@ -5760,24 +6071,26 @@ abstract class CommonObject
 				}
 			}
 
-			if (!$error && $trigger)
-			{
+			if (!$error && $trigger) {
 				// Call trigger
 				$this->context = array('extralanguagesaddupdate'=>1);
 				$result = $this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
-			if ($error)
-			{
+			if ($error) {
 				$this->db->rollback();
 				return -1;
 			} else {
 				$this->db->commit();
 				return 1;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -5794,14 +6107,17 @@ abstract class CommonObject
 	{
 		global $conf, $langs, $user;
 
-		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) return 0;
+		if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+			return 0;
+		}
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
-		if (!empty($this->array_options) && isset($this->array_options["options_".$key]))
-		{
+		if (!empty($this->array_options) && isset($this->array_options["options_".$key])) {
 			// Check parameters
 			$langs->load('admin');
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -5817,13 +6133,15 @@ abstract class CommonObject
 			$attrfieldcomputed = $extrafields->attributes[$this->table_element]['computed'][$key];
 
 			// Similar code than into insertExtraFields
-			if ($attributeRequired)
-			{
+			if ($attributeRequired) {
 				$mandatorypb = false;
-				if ($attributeType == 'link' && $this->array_options["options_".$key] == '-1') $mandatorypb = true;
-				if ($this->array_options["options_".$key] === '') $mandatorypb = true;
-				if ($mandatorypb)
-				{
+				if ($attributeType == 'link' && $this->array_options["options_".$key] == '-1') {
+					$mandatorypb = true;
+				}
+				if ($this->array_options["options_".$key] === '') {
+					$mandatorypb = true;
+				}
+				if ($mandatorypb) {
 					dol_syslog("Mandatory extra field options_".$key." is empty");
 					$this->errors[] = $langs->trans('ErrorFieldRequired', $attributeLabel);
 					return -1;
@@ -5833,10 +6151,8 @@ abstract class CommonObject
 			//dol_syslog("attributeLabel=".$attributeLabel, LOG_DEBUG);
 			//dol_syslog("attributeType=".$attributeType, LOG_DEBUG);
 
-			if (!empty($attrfieldcomputed))
-			{
-				if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS))
-				{
+			if (!empty($attrfieldcomputed)) {
+				if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) {
 					$value = dol_eval($attrfieldcomputed, 1, 0);
 					dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
 					$this->array_options["options_".$key] = $value;
@@ -5845,38 +6161,33 @@ abstract class CommonObject
 				}
 			}
 
-			switch ($attributeType)
-			{
+			switch ($attributeType) {
 				case 'int':
-					if (!is_numeric($value) && $value != '')
-					{
+					if (!is_numeric($value) && $value != '') {
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					} elseif ($value === '')
-					{
+					} elseif ($value === '') {
 						$this->array_options["options_".$key] = null;
 					}
 					break;
 				case 'double':
 					$value = price2num($value);
-					if (!is_numeric($value) && $value != '')
-					{
+					if (!is_numeric($value) && $value != '') {
 						dol_syslog($langs->trans("ExtraFieldHasWrongValue")." sur ".$attributeLabel."(".$value."is not '".$attributeType."')", LOG_DEBUG);
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
-					} elseif ($value === '')
-					{
+					} elseif ($value === '') {
 						$this->array_options["options_".$key] = null;
 					}
 					//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
 					$this->array_options["options_".$key] = $value;
 					break;
-			 	/*case 'select':	// Not required, we chosed value='0' for undefined values
-             		if ($value=='-1')
-             		{
-             			$this->array_options[$key] = null;
-             		}
-             		break;*/
+				/*case 'select':	// Not required, we chosed value='0' for undefined values
+					 if ($value=='-1')
+					 {
+						 $this->array_options[$key] = null;
+					 }
+					 break;*/
 				case 'price':
 					$this->array_options["options_".$key] = price2num($this->array_options["options_".$key]);
 					break;
@@ -5936,26 +6247,27 @@ abstract class CommonObject
 				$sql .= " WHERE fk_object = ".$this->id;
 			} else {
 				$result = $this->insertExtraFields('', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$error++;
 				$this->error = $this->db->lasterror();
 			}
-			if (!$error && $trigger)
-			{
+			if (!$error && $trigger) {
 				// Call trigger
 				$this->context = array('extrafieldupdate'=>1);
 				$result = $this->call_trigger($trigger, $userused);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call trigger
 			}
 
-			if ($error)
-			{
+			if ($error) {
 				dol_syslog(__METHOD__.$this->error, LOG_ERR);
 				$this->db->rollback();
 				return -1;
@@ -5963,7 +6275,9 @@ abstract class CommonObject
 				$this->db->commit();
 				return 1;
 			}
-		} else return 0;
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -5980,11 +6294,15 @@ abstract class CommonObject
 	{
 		global $conf, $langs, $user;
 
-		if (empty($userused)) $userused = $user;
+		if (empty($userused)) {
+			$userused = $user;
+		}
 
 		$error = 0;
 
-		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) return 0; // For avoid conflicts if trigger used
+		if (!empty($conf->global->MAIN_EXTRALANGUAGES_DISABLED)) {
+			return 0; // For avoid conflicts if trigger used
+		}
 
 		return 0;
 	}
@@ -6008,8 +6326,7 @@ abstract class CommonObject
 	{
 		global $conf, $langs, $form;
 
-		if (!is_object($form))
-		{
+		if (!is_object($form)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($this->db);
 		}
@@ -6073,8 +6390,11 @@ abstract class CommonObject
 		$objectid = $this->id;
 
 		if ($computed) {
-			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+			if (!preg_match('/^search_/', $keyprefix)) {
+				return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+				return '';
+			}
 		}
 
 		// Set value of $morecss. For this, we use in priority showsize from parameters, then $val['css'] then autodefine
@@ -6109,7 +6429,9 @@ abstract class CommonObject
 			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+				$value = '-1';
+			}
 
 			// TODO Must also support $moreparam
 			$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
@@ -6126,8 +6448,7 @@ abstract class CommonObject
 		} elseif (in_array($type, array('mail', 'phone', 'url'))) {
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		} elseif (preg_match('/^text/', $type)) {
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
+			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
@@ -6162,17 +6483,19 @@ abstract class CommonObject
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		} elseif ($type == 'select') {
 			$out = '';
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
 			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-				if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1))$out .= '<option value="0">&nbsp;</option>';
-			foreach ($param['options'] as $key => $val)
-			{
-				if ((string) $key == '') continue;
+			if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1)) {
+				$out .= '<option value="0">&nbsp;</option>';
+			}
+			foreach ($param['options'] as $key => $val) {
+				if ((string) $key == '') {
+					continue;
+				}
 				list($val, $parent) = explode('|', $val);
 				$out .= '<option value="'.$key.'"';
 				$out .= (((string) $value == (string) $key) ? ' selected' : '');
@@ -6222,8 +6545,7 @@ abstract class CommonObject
 				$sqlwhere = '';
 				$sql = 'SELECT '.$keyList;
 				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-				if (!empty($InfoFieldList[4]))
-				{
+				if (!empty($InfoFieldList[4])) {
 					// can use SELECT request
 					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
 						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
@@ -6236,8 +6558,7 @@ abstract class CommonObject
 						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
 					}
 					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra') !== false)
-					{
+					if (strpos($InfoFieldList[4], 'extra') !== false) {
 						$sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
 						$sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
 					} else {
@@ -6247,8 +6568,7 @@ abstract class CommonObject
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array('tablewithentity')))
-				{
+				if (in_array($InfoFieldList[0], array('tablewithentity'))) {
 					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
 				$sql .= $sqlwhere;
@@ -6258,24 +6578,20 @@ abstract class CommonObject
 
 				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$out .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 					$i = 0;
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$labeltoshow = '';
 						$obj = $this->db->fetch_object($resql);
 
 						// Several field into label (eq table:code|libelle:rowid)
 						$notrans = false;
 						$fields_label = explode('|', $InfoFieldList[1]);
-						if (count($fields_label) > 1)
-						{
+						if (count($fields_label) > 1) {
 							$notrans = true;
-							foreach ($fields_label as $field_toshow)
-							{
+							foreach ($fields_label as $field_toshow) {
 								$labeltoshow .= $obj->$field_toshow.' ';
 							}
 						} else {
@@ -6283,10 +6599,8 @@ abstract class CommonObject
 						}
 						$labeltoshow = dol_trunc($labeltoshow, 45);
 
-						if ($value == $obj->rowid)
-						{
-							foreach ($fields_label as $field_toshow)
-							{
+						if ($value == $obj->rowid) {
+							foreach ($fields_label as $field_toshow) {
 								$translabel = $langs->trans($obj->$field_toshow);
 								if ($translabel != $obj->$field_toshow) {
 									$labeltoshow = dol_trunc($translabel, 18).' ';
@@ -6296,8 +6610,7 @@ abstract class CommonObject
 							}
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						} else {
-							if (!$notrans)
-							{
+							if (!$notrans) {
 								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 								if ($translabel != $obj->{$InfoFieldList[1]}) {
 									$labeltoshow = dol_trunc($translabel, 18);
@@ -6305,14 +6618,14 @@ abstract class CommonObject
 									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 								}
 							}
-							if (empty($labeltoshow)) $labeltoshow = '(not defined)';
-							if ($value == $obj->rowid)
-							{
+							if (empty($labeltoshow)) {
+								$labeltoshow = '(not defined)';
+							}
+							if ($value == $obj->rowid) {
 								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 
-							if (!empty($InfoFieldList[3]) && $parentField)
-							{
+							if (!empty($InfoFieldList[3]) && $parentField) {
 								$parent = $parentName.':'.$obj->{$parentField};
 							}
 
@@ -6335,8 +6648,7 @@ abstract class CommonObject
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
 		} elseif ($type == 'radio') {
 			$out = '';
-			foreach ($param['options'] as $keyopt => $val)
-			{
+			foreach ($param['options'] as $keyopt => $val) {
 				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
 				$out .= ' value="'.$keyopt.'"';
 				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
@@ -6407,8 +6719,7 @@ abstract class CommonObject
 					$sqlwhere .= ' WHERE 1=1';
 				}
 				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array('tablewithentity')))
-				{
+				if (in_array($InfoFieldList[0], array('tablewithentity'))) {
 					$sqlwhere .= ' AND entity = '.$conf->entity;
 				}
 				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
@@ -6506,17 +6817,19 @@ abstract class CommonObject
 			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss, $moreparam, 0, empty($val['disabled']) ? 0 : 1);
 
 			if (!empty($param_list_array[2])) {		// If the entry into $fields is set to add a create button
-				if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton))	// To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
-				{
-		   			list($class, $classfile) = explode(':', $param_list[0]);
-		   			if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) $url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
-		   			else $url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
-		   			$paramforthenewlink = '';
-		   			$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');
-		   			$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');
-		   			$paramforthenewlink .= '&fk_'.strtolower($class).'=--IDFORBACKTOPAGE--';
-		   			// TODO Add Javascript code to add input fields already filled into $paramforthenewlink so we won't loose them when going back to main page
-		   			$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
+				if (!GETPOSTISSET('backtopage') && empty($val['disabled']) && empty($nonewbutton)) {	// To avoid to open several times the 'Create Object' button and to avoid to have button if field is protected by a "disabled".
+					list($class, $classfile) = explode(':', $param_list[0]);
+					if (file_exists(dol_buildpath(dirname(dirname($classfile)).'/card.php'))) {
+						$url_path = dol_buildpath(dirname(dirname($classfile)).'/card.php', 1);
+					} else {
+						$url_path = dol_buildpath(dirname(dirname($classfile)).'/'.strtolower($class).'_card.php', 1);
+					}
+					$paramforthenewlink = '';
+					$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');
+					$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');
+					$paramforthenewlink .= '&fk_'.strtolower($class).'=--IDFORBACKTOPAGE--';
+					// TODO Add Javascript code to add input fields already filled into $paramforthenewlink so we won't loose them when going back to main page
+					$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
 				}
 			}
 		} elseif ($type == 'password') {
@@ -6580,8 +6893,7 @@ abstract class CommonObject
 	{
 		global $conf, $langs, $form;
 
-		if (!is_object($form))
-		{
+		if (!is_object($form)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($this->db);
 		}
@@ -6593,13 +6905,18 @@ abstract class CommonObject
 		$reg = array();
 
 		// Convert var to be able to share same code than showOutputField of extrafields
-		if (preg_match('/varchar\((\d+)\)/', $type, $reg))
-		{
+		if (preg_match('/varchar\((\d+)\)/', $type, $reg)) {
 			$type = 'varchar'; // convert varchar(xx) int varchar
 			$size = $reg[1];
-		} elseif (preg_match('/varchar/', $type)) $type = 'varchar'; // convert varchar(xx) int varchar
-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) $type = 'select';
-		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) $type = 'link';
+		} elseif (preg_match('/varchar/', $type)) {
+			$type = 'varchar'; // convert varchar(xx) int varchar
+		}
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			$type = 'select';
+		}
+		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
+			$type = 'link';
+		}
 
 		$default = $val['default'];
 		$computed = $val['computed'];
@@ -6608,7 +6925,9 @@ abstract class CommonObject
 		$param = array();
 		$param['options'] = array();
 
-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) $param['options'] = $val['arrayofkeyval'];
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			$param['options'] = $val['arrayofkeyval'];
+		}
 		if (preg_match('/^integer:(.*):(.*)/i', $val['type'], $reg)) {
 			$type = 'link';
 			$param['options'] = array($reg[1].':'.$reg[2]=>$reg[1].':'.$reg[2]);
@@ -6628,18 +6947,18 @@ abstract class CommonObject
 		$help = $val['help'];
 		$hidden = (($val['visible'] == 0) ? 1 : 0); // If zero, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 
-		if ($hidden) return '';
+		if ($hidden) {
+			return '';
+		}
 
 		// If field is a computed field, value must become result of compute
-		if ($computed)
-		{
+		if ($computed) {
 			// Make the eval of compute string
 			//var_dump($computed);
 			$value = dol_eval($computed, 1, 0);
 		}
 
-		if (empty($morecss))
-		{
+		if (empty($morecss)) {
 			if ($type == 'date') {
 				$morecss = 'minwidth100imp';
 			} elseif ($type == 'datetime' || $type == 'timestamp') {
@@ -6662,9 +6981,11 @@ abstract class CommonObject
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) $value = $this->getNomUrl(1, '', 0, '', 1);
-		elseif ($key == 'status' && method_exists($this, 'getLibStatut')) $value = $this->getLibStatut(3);
-		elseif ($type == 'date') {
+		if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
+			$value = $this->getNomUrl(1, '', 0, '', 1);
+		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
+			$value = $this->getLibStatut(3);
+		} elseif ($type == 'date') {
 			if (!empty($value)) {
 				$value = dol_print_date($value, 'day');
 			} else {
@@ -6697,8 +7018,7 @@ abstract class CommonObject
 			$value = dol_print_url($value, '_blank', 32, 1);
 		} elseif ($type == 'phone') {
 			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
-		} elseif ($type == 'price')
-		{
+		} elseif ($type == 'price') {
 			if (!is_null($value) && $value !== '') {
 				$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			}
@@ -6724,8 +7044,7 @@ abstract class CommonObject
 
 			$sql = 'SELECT '.$keyList;
 			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false)
-			{
+			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
 			if ($selectkey == 'rowid' && empty($value)) {
@@ -6740,8 +7059,7 @@ abstract class CommonObject
 
 			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$value = ''; // value was used, so now we reste it to use it to build final output
 
 				$obj = $this->db->fetch_object($resql);
@@ -6749,10 +7067,8 @@ abstract class CommonObject
 				// Several field into label (eq table:code|libelle:rowid)
 				$fields_label = explode('|', $InfoFieldList[1]);
 
-				if (is_array($fields_label) && count($fields_label) > 1)
-				{
-					foreach ($fields_label as $field_toshow)
-					{
+				if (is_array($fields_label) && count($fields_label) > 1) {
+					foreach ($fields_label as $field_toshow) {
 						$translabel = '';
 						if (!empty($obj->$field_toshow)) {
 							$translabel = $langs->trans($obj->$field_toshow);
@@ -6774,16 +7090,17 @@ abstract class CommonObject
 						$value = $obj->{$InfoFieldList[1]};
 					}
 				}
-			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			} else {
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			}
 		} elseif ($type == 'radio') {
 			$value = $param['options'][$value];
 		} elseif ($type == 'checkbox') {
 			$value_arr = explode(',', $value);
 			$value = '';
-			if (is_array($value_arr) && count($value_arr) > 0)
-			{
+			if (is_array($value_arr) && count($value_arr) > 0) {
 				$toprint = array();
-				foreach ($value_arr as $keyval=>$valueval) {
+				foreach ($value_arr as $keyval => $valueval) {
 					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$param['options'][$valueval].'</li>';
 				}
 				$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
@@ -6858,19 +7175,16 @@ abstract class CommonObject
 			$out = '';
 
 			// only if something to display (perf)
-			if ($value)
-			{
+			if ($value) {
 				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
 				$classname = $InfoFieldList[0];
 				$classpath = $InfoFieldList[1];
 				$getnomurlparam = (empty($InfoFieldList[2]) ? 3 : $InfoFieldList[2]);
-				if (!empty($classpath))
-				{
+				if (!empty($classpath)) {
 					dol_include_once($InfoFieldList[1]);
-					if ($classname && class_exists($classname))
-					{
+					if ($classname && class_exists($classname)) {
 						$object = new $classname($this->db);
 						$object->fetch($value);
 						$value = $object->getNomUrl($getnomurlparam);
@@ -6879,7 +7193,9 @@ abstract class CommonObject
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
 					return 'Error bad setup of extrafield';
 				}
-			} else $value = '';
+			} else {
+				$value = '';
+			}
 		} elseif (preg_match('/^(text|html)/', $type)) {
 			$value = dol_htmlentitiesbr($value);
 		} elseif ($type == 'password') {
@@ -6912,51 +7228,57 @@ abstract class CommonObject
 	{
 		global $db, $conf, $langs, $action, $form, $hookmanager;
 
-		if (!is_object($form)) $form = new Form($db);
+		if (!is_object($form)) {
+			$form = new Form($db);
+		}
 
 		$out = '';
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('showOptionals', $parameters, $this, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
-		{
-			if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)
-			{
+		if (empty($reshook)) {
+			if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0) {
 				$out .= "\n";
 				$out .= '<!-- showOptionals --> ';
 				$out .= "\n";
 
 				$extrafields_collapse_num = '';
 				$e = 0;
-				foreach ($extrafields->attributes[$this->table_element]['label'] as $key=>$label)
-				{
+				foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $label) {
 					// Show only the key field in params
-					if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
+					if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) {
+						continue;
+					}
 
 					// Test on 'enabled' ('enabled' is different than 'list' = 'visibility')
 					$enabled = 1;
-					if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key]))
-					{
+					if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key])) {
 						$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1);
 					}
-					if (empty($enabled)) continue;
+					if (empty($enabled)) {
+						continue;
+					}
 
 					$visibility = 1;
-					if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key]))
-					{
+					if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key])) {
 						$visibility = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);
 					}
 
 					$perms = 1;
-					if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key]))
-					{
+					if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key])) {
 						$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
 					}
 
-					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
-					elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
-					elseif ($mode == 'view' && empty($visibility)) continue;
-					if (empty($perms)) continue;
+					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) {
+						continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
+					} elseif (($mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3 && abs($visibility) != 4) {
+						continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list and <> 4 = not visible at the creation
+					} elseif ($mode == 'view' && empty($visibility)) {
+						continue;
+					}
+					if (empty($perms)) {
+						continue;
+					}
 					// Load language if required
 					if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
 						$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
@@ -6990,8 +7312,7 @@ abstract class CommonObject
 							}
 							$getposttemp = GETPOST($keyprefix.'options_'.$key.$keysuffix, $check, 3); // GETPOST can get value from GET, POST or setup of default values overwrite.
 							// GETPOST("options_" . $key) can be 'abc' or array(0=>'abc')
-							if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix))
-							{
+							if (is_array($getposttemp) || $getposttemp != '' || GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)) {
 								if (is_array($getposttemp)) {
 									// $getposttemp is an array but following code expects a comma separated string
 									$value = implode(",", $getposttemp);
@@ -6999,15 +7320,14 @@ abstract class CommonObject
 									$value = $getposttemp;
 								}
 							} else {
-							    $value = (!empty($this->array_options["options_".$key]) ? $this->array_options["options_".$key] : ''); // No GET, no POST, no default value, so we take value of object.
+								$value = (!empty($this->array_options["options_".$key]) ? $this->array_options["options_".$key] : ''); // No GET, no POST, no default value, so we take value of object.
 							}
 							//var_dump($keyprefix.' - '.$key.' - '.$keysuffix.' - '.$keyprefix.'options_'.$key.$keysuffix.' - '.$this->array_options["options_".$key.$keysuffix].' - '.$getposttemp.' - '.$value);
 							break;
 					}
 
 					// Output value of the current field
-					if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate')
-					{
+					if ($extrafields->attributes[$this->table_element]['type'][$key] == 'separate') {
 						$extrafields_collapse_num = '';
 						$extrafield_param = $extrafields->attributes[$this->table_element]['param'][$key];
 						if (!empty($extrafield_param) && is_array($extrafield_param)) {
@@ -7042,31 +7362,33 @@ abstract class CommonObject
 
 						$html_id = (empty($this->id) ? '' : 'extrarow-'.$this->element.'_'.$key.'_'.$this->id);
 						if ($display_type=='card') {
-							if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) { $colspan = '0'; }
+							if (!empty($conf->global->MAIN_EXTRAFIELDS_USE_TWO_COLUMS) && ($e % 2) == 0) {
+								$colspan = '0';
+							}
 
-							if ($action == 'selectlines') { $colspan++; }
+							if ($action == 'selectlines') {
+								$colspan++;
+							}
 						}
 
 						// Convert date into timestamp format (value in memory must be a timestamp)
-						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime')))
-						{
+						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime'))) {
 							$datenotinstring = $this->array_options['options_'.$key];
-							if (!is_numeric($this->array_options['options_'.$key]))	// For backward compatibility
-							{
+							if (!is_numeric($this->array_options['options_'.$key])) {	// For backward compatibility
 								$datenotinstring = $this->db->jdate($datenotinstring);
 							}
 							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)) ? dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
 						}
 						// Convert float submited string into real php numeric (value in memory must be a php numeric)
-						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double')))
-						{
+						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double'))) {
 							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? price2num($value) : $this->array_options['options_'.$key];
 						}
 
 						// HTML, text, select, integer and varchar: take into account default value in database if in create mode
-						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'varchar', 'select', 'int')))
-						{
-							if ($action == 'create') $value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? $value : $extrafields->attributes[$this->table_element]['default'][$key];
+						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'varchar', 'select', 'int'))) {
+							if ($action == 'create') {
+								$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? $value : $extrafields->attributes[$this->table_element]['default'][$key];
+							}
 						}
 
 						$labeltoshow = $langs->trans($label);
@@ -7085,14 +7407,24 @@ abstract class CommonObject
 						$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
 						if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters
 							$out .= '">';
-							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
-							else $out .= $labeltoshow;
-							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
+							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {
+								$out .= $form->textwithpicto($labeltoshow, $helptoshow);
+							} else {
+								$out .= $labeltoshow;
+							}
+							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+								$out .= '&nbsp;<font color="red">*</font>';
+							}
 						} else {
-							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
+							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+								$out .= ' fieldrequired';
+							}
 							$out .= '">';
-							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
-							else $out .= $labeltoshow;
+							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {
+								$out .= $form->textwithpicto($labeltoshow, $helptoshow);
+							} else {
+								$out .= $labeltoshow;
+							}
 						}
 
 						$out .= ($display_type == 'card' ? '</td>' : '</div>');
@@ -7220,7 +7552,9 @@ abstract class CommonObject
 		global $user;
 
 		$element = $this->element;
-		if ($element == 'facturerec') $element = 'facture';
+		if ($element == 'facturerec') {
+			$element = 'facture';
+		}
 
 		return $user->rights->{$element};
 	}
@@ -7239,13 +7573,13 @@ abstract class CommonObject
 	 */
 	public static function commonReplaceThirdparty(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)
 	{
-		foreach ($tables as $table)
-		{
+		foreach ($tables as $table) {
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_soc = '.$dest_id.' WHERE fk_soc = '.$origin_id;
 
-			if (!$db->query($sql))
-			{
-				if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+			if (!$db->query($sql)) {
+				if ($ignoreerrors) {
+					return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				}
 				//$this->errors = $db->lasterror();
 				return false;
 			}
@@ -7272,55 +7606,43 @@ abstract class CommonObject
 
 		$buyPrice = 0;
 
-		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) // In most cases, test here is false
-		{
+		if (($unitPrice > 0) && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) { // In most cases, test here is false
 			$buyPrice = $unitPrice * (1 - $discountPercent / 100);
 		} else {
 			// Get cost price for margin calculation
-			if (!empty($fk_product))
-			{
-				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice')
-				{
+			if (!empty($fk_product)) {
+				if (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'costprice') {
 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
 					$result = $product->fetch($fk_product);
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$this->errors[] = 'ErrorProductIdDoesNotExists';
 						return -1;
 					}
-					if ($product->cost_price > 0)
-					{
+					if ($product->cost_price > 0) {
 						$buyPrice = $product->cost_price;
-					} elseif ($product->pmp > 0)
-					{
+					} elseif ($product->pmp > 0) {
 						$buyPrice = $product->pmp;
 					}
-				} elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp')
-				{
+				} elseif (isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == 'pmp') {
 					require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 					$product = new Product($this->db);
 					$result = $product->fetch($fk_product);
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$this->errors[] = 'ErrorProductIdDoesNotExists';
 						return -1;
 					}
-					if ($product->pmp > 0)
-					{
+					if ($product->pmp > 0) {
 						$buyPrice = $product->pmp;
 					}
 				}
 
-				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice')))
-				{
+				if (empty($buyPrice) && isset($conf->global->MARGIN_TYPE) && in_array($conf->global->MARGIN_TYPE, array('1', 'pmp', 'costprice'))) {
 					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 					$productFournisseur = new ProductFournisseur($this->db);
-					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0)
-					{
+					if (($result = $productFournisseur->find_min_price_product_fournisseur($fk_product)) > 0) {
 						$buyPrice = $productFournisseur->fourn_unitprice;
-					} elseif ($result < 0)
-					{
+					} elseif ($result < 0) {
 						$this->errors[] = $productFournisseur->error;
 						return -2;
 					}
@@ -7417,34 +7739,45 @@ abstract class CommonObject
 					if ($size == 1 || $size == 'small') {   // Format vignette
 						// Find name of thumb file
 						$photo_vignette = basename(getImageFileNameForSize($dir.$file, '_small'));
-						if (!dol_is_file($dirthumb.$photo_vignette)) $photo_vignette = '';
+						if (!dol_is_file($dirthumb.$photo_vignette)) {
+							$photo_vignette = '';
+						}
 
 						// Get filesize of original file
 						$imgarray = dol_getImageSize($dir.$photo);
 
-						if ($nbbyrow > 0)
-						{
-							if ($nbphoto == 1) $return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2px; border-spacing: 2px; border-collapse: separate;">';
+						if ($nbbyrow > 0) {
+							if ($nbphoto == 1) {
+								$return .= '<table class="valigntop center centpercent" style="border: 0; padding: 2px; border-spacing: 2px; border-collapse: separate;">';
+							}
 
-							if ($nbphoto % $nbbyrow == 1) $return .= '<tr class="center valignmiddle" style="border: 1px">';
+							if ($nbphoto % $nbbyrow == 1) {
+								$return .= '<tr class="center valignmiddle" style="border: 1px">';
+							}
 							$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%" class="photo">';
-						} elseif ($nbbyrow < 0) $return .= '<div class="inline-block">';
+						} elseif ($nbbyrow < 0) {
+							$return .= '<div class="inline-block">';
+						}
 
 						$return .= "\n";
 
 						$relativefile = preg_replace('/^\//', '', $pdir.$photo);
-						if (empty($nolink))
-						{
+						if (empty($nolink)) {
 							$urladvanced = getAdvancedPreviewUrl($modulepart, $relativefile, 0, 'entity='.$this->entity);
-							if ($urladvanced) $return .= '<a href="'.$urladvanced.'">';
-							else $return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							if ($urladvanced) {
+								$return .= '<a href="'.$urladvanced.'">';
+							} else {
+								$return .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'" class="aphoto" target="_blank">';
+							}
 						}
 
 						// Show image (width height=$maxHeight)
 						// Si fichier vignette disponible et image source trop grande, on utilise la vignette, sinon on utilise photo origine
 						$alt = $langs->transnoentitiesnoconv('File').': '.$relativefile;
 						$alt .= ' - '.$langs->transnoentitiesnoconv('Size').': '.$imgarray['width'].'x'.$imgarray['height'];
-						if ($notitle) $alt = '';
+						if ($notitle) {
+							$alt = '';
+						}
 
 						if ($usesharelink) {
 							if ($val['share']) {
@@ -7469,21 +7802,22 @@ abstract class CommonObject
 							}
 						}
 
-						if (empty($nolink)) $return .= '</a>';
+						if (empty($nolink)) {
+							$return .= '</a>';
+						}
 						$return .= "\n";
 
-						if ($showfilename) $return .= '<br>'.$viewfilename;
-						if ($showaction)
-						{
+						if ($showfilename) {
+							$return .= '<br>'.$viewfilename;
+						}
+						if ($showaction) {
 							$return .= '<br>';
 							// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
-							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight))
-							{
+							if ($photo_vignette && (image_format_supported($photo) > 0) && ($this->imgWidth > $maxWidth || $this->imgHeight > $maxHeight)) {
 								$return .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=addthumb&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
 							}
 							// Special cas for product
-							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
-							{
+							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer)) {
 								// Link to resize
 								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
@@ -7494,22 +7828,25 @@ abstract class CommonObject
 						}
 						$return .= "\n";
 
-						if ($nbbyrow > 0)
-						{
+						if ($nbbyrow > 0) {
 							$return .= '</td>';
-							if (($nbphoto % $nbbyrow) == 0) $return .= '</tr>';
-						} elseif ($nbbyrow < 0) $return .= '</div>';
+							if (($nbphoto % $nbbyrow) == 0) {
+								$return .= '</tr>';
+							}
+						} elseif ($nbbyrow < 0) {
+							$return .= '</div>';
+						}
 					}
 
 					if (empty($size)) {     // Format origine
 						$return .= '<img class="photo photowithmargin" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$this->entity.'&file='.urlencode($pdir.$photo).'">';
 
-						if ($showfilename) $return .= '<br>'.$viewfilename;
-						if ($showaction)
-						{
+						if ($showfilename) {
+							$return .= '<br>'.$viewfilename;
+						}
+						if ($showaction) {
 							// Special case for product
-							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer))
-							{
+							if ($modulepart == 'product' && ($user->rights->produit->creer || $user->rights->service->creer)) {
 								// Link to resize
 								$return .= '<a href="'.DOL_URL_ROOT.'/core/photos_resize.php?modulepart='.urlencode('produit|service').'&id='.$this->id.'&amp;file='.urlencode($pdir.$viewfilename).'" title="'.dol_escape_htmltag($langs->trans("Resize")).'">'.img_picto($langs->trans("Resize"), 'resize', '').'</a> &nbsp; ';
 
@@ -7521,22 +7858,23 @@ abstract class CommonObject
 					}
 
 					// On continue ou on arrete de boucler ?
-					if ($nbmax && $nbphoto >= $nbmax) break;
+					if ($nbmax && $nbphoto >= $nbmax) {
+						break;
+					}
 				}
 			}
 
-			if ($size == 1 || $size == 'small')
-			{
-				if ($nbbyrow > 0)
-				{
+			if ($size == 1 || $size == 'small') {
+				if ($nbbyrow > 0) {
 					// Ferme tableau
-					while ($nbphoto % $nbbyrow)
-					{
+					while ($nbphoto % $nbbyrow) {
 						$return .= '<td style="width: '.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
 						$nbphoto++;
 					}
 
-					if ($nbphoto) $return .= '</table>';
+					if ($nbphoto) {
+						$return .= '</table>';
+					}
 				}
 			}
 		}
@@ -7556,8 +7894,11 @@ abstract class CommonObject
 	protected function isArray($info)
 	{
 		if (is_array($info)) {
-			if (isset($info['type']) && $info['type'] == 'array') return true;
-			else return false;
+			if (isset($info['type']) && $info['type'] == 'array') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7570,7 +7911,9 @@ abstract class CommonObject
 	 */
 	public function isDate($info)
 	{
-		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) return true;
+		if (isset($info['type']) && ($info['type'] == 'date' || $info['type'] == 'datetime' || $info['type'] == 'timestamp')) {
+			return true;
+		}
 		return false;
 	}
 
@@ -7583,9 +7926,14 @@ abstract class CommonObject
 	public function isDuration($info)
 	{
 		if (is_array($info)) {
-			if (isset($info['type']) && ($info['type'] == 'duration')) return true;
-			else return false;
-		} else return false;
+			if (isset($info['type']) && ($info['type'] == 'duration')) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -7597,9 +7945,14 @@ abstract class CommonObject
 	public function isInt($info)
 	{
 		if (is_array($info)) {
-			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) return true;
-			else return false;
-		} else return false;
+			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -7611,8 +7964,11 @@ abstract class CommonObject
 	public function isFloat($info)
 	{
 		if (is_array($info)) {
-			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) return true;
-			else return false;
+			if (isset($info['type']) && (preg_match('/^(double|real|price)/i', $info['type']))) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7626,8 +7982,11 @@ abstract class CommonObject
 	public function isText($info)
 	{
 		if (is_array($info)) {
-			if (isset($info['type']) && $info['type'] == 'text') return true;
-			else return false;
+			if (isset($info['type']) && $info['type'] == 'text') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7641,8 +8000,11 @@ abstract class CommonObject
 	protected function canBeNull($info)
 	{
 		if (is_array($info)) {
-			if (isset($info['notnull']) && $info['notnull'] != '1') return true;
-			else return false;
+			if (isset($info['notnull']) && $info['notnull'] != '1') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return true;
 	}
@@ -7656,8 +8018,11 @@ abstract class CommonObject
 	protected function isForcedToNullIfZero($info)
 	{
 		if (is_array($info)) {
-			if (isset($info['notnull']) && $info['notnull'] == '-1') return true;
-			else return false;
+			if (isset($info['notnull']) && $info['notnull'] == '-1') {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7671,8 +8036,11 @@ abstract class CommonObject
 	protected function isIndex($info)
 	{
 		if (is_array($info)) {
-			if (isset($info['index']) && $info['index'] == true) return true;
-			else return false;
+			if (isset($info['index']) && $info['index'] == true) {
+				return true;
+			} else {
+				return false;
+			}
 		}
 		return false;
 	}
@@ -7690,18 +8058,15 @@ abstract class CommonObject
 		global $conf;
 
 		$queryarray = array();
-		foreach ($this->fields as $field => $info)	// Loop on definition of fields
-		{
+		foreach ($this->fields as $field => $info) {	// Loop on definition of fields
 			// Depending on field type ('datetime', ...)
-			if ($this->isDate($info))
-			{
+			if ($this->isDate($info)) {
 				if (empty($this->{$field})) {
 					$queryarray[$field] = null;
 				} else {
 					$queryarray[$field] = $this->db->idate($this->{$field});
 				}
-			} elseif ($this->isArray($info))
-			{
+			} elseif ($this->isArray($info)) {
 				if (!empty($this->{$field})) {
 					if (!is_array($this->{$field})) {
 						$this->{$field} = array($this->{$field});
@@ -7710,8 +8075,7 @@ abstract class CommonObject
 				} else {
 					$queryarray[$field] = null;
 				}
-			} elseif ($this->isDuration($info))
-			{
+			} elseif ($this->isDuration($info)) {
 				// $this->{$field} may be null, '', 0, '0', 123, '123'
 				if ((isset($this->{$field}) && $this->{$field} != '') || !empty($info['notnull'])) {
 					if (!isset($this->{$field})) {
@@ -7719,12 +8083,13 @@ abstract class CommonObject
 					} else {
 						$queryarray[$field] = (int) $this->{$field};		// If '0', it may be set to null later if $info['notnull'] == -1
 					}
+				} else {
+					$queryarray[$field] = null;
 				}
-				else $queryarray[$field] = null;
-			} elseif ($this->isInt($info) || $this->isFloat($info))
-			{
-				if ($field == 'entity' && is_null($this->{$field})) $queryarray[$field] = $conf->entity;
-				else {
+			} elseif ($this->isInt($info) || $this->isFloat($info)) {
+				if ($field == 'entity' && is_null($this->{$field})) {
+					$queryarray[$field] = $conf->entity;
+				} else {
 					// $this->{$field} may be null, '', 0, '0', 123, '123'
 					if ((isset($this->{$field}) && $this->{$field} != '') || !empty($info['notnull'])) {
 						if (!isset($this->{$field})) {
@@ -7734,14 +8099,20 @@ abstract class CommonObject
 						} elseif ($this->isFloat($info)) {
 							$queryarray[$field] = (double) $this->{$field};	// If '0', it may be set to null later if $info['notnull'] == -1
 						}
-					} else $queryarray[$field] = null;
+					} else {
+						$queryarray[$field] = null;
+					}
 				}
 			} else {
 				$queryarray[$field] = $this->{$field};
 			}
 
-			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) unset($queryarray[$field]);
-			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) $queryarray[$field] = null; // May force 0 to null
+			if ($info['type'] == 'timestamp' && empty($queryarray[$field])) {
+				unset($queryarray[$field]);
+			}
+			if (!empty($info['notnull']) && $info['notnull'] == -1 && empty($queryarray[$field])) {
+				$queryarray[$field] = null; // May force 0 to null
+			}
 		}
 
 		return $queryarray;
@@ -7755,26 +8126,33 @@ abstract class CommonObject
 	 */
 	public function setVarsFromFetchObj(&$obj)
 	{
-		foreach ($this->fields as $field => $info)
-		{
+		foreach ($this->fields as $field => $info) {
 			if ($this->isDate($info)) {
-				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') $this->{$field} = 0;
-				else $this->{$field} = strtotime($obj->{$field});
-			} elseif ($this->isArray($info))
-			{
+				if (empty($obj->{$field}) || $obj->{$field} === '0000-00-00 00:00:00' || $obj->{$field} === '1000-01-01 00:00:00') {
+					$this->{$field} = 0;
+				} else {
+					$this->{$field} = strtotime($obj->{$field});
+				}
+			} elseif ($this->isArray($info)) {
 				if (!empty($obj->{$field})) {
 					$this->{$field} = @unserialize($obj->{$field});
 					// Hack for data not in UTF8
-					if ($this->{$field } === false) @unserialize(utf8_decode($obj->{$field}));
+					if ($this->{$field } === false) {
+						@unserialize(utf8_decode($obj->{$field}));
+					}
 				} else {
 					$this->{$field} = array();
 				}
 			} elseif ($this->isInt($info)) {
-				if ($field == 'rowid') $this->id = (int) $obj->{$field};
-				else {
+				if ($field == 'rowid') {
+					$this->id = (int) $obj->{$field};
+				} else {
 					if ($this->isForcedToNullIfZero($info)) {
-						if (empty($obj->{$field})) $this->{$field} = null;
-						else $this->{$field} = (double) $obj->{$field};
+						if (empty($obj->{$field})) {
+							$this->{$field} = null;
+						} else {
+							$this->{$field} = (double) $obj->{$field};
+						}
 					} else {
 						if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 							$this->{$field} = (int) $obj->{$field};
@@ -7785,8 +8163,11 @@ abstract class CommonObject
 				}
 			} elseif ($this->isFloat($info)) {
 				if ($this->isForcedToNullIfZero($info)) {
-					if (empty($obj->{$field})) $this->{$field} = null;
-					else $this->{$field} = (double) $obj->{$field};
+					if (empty($obj->{$field})) {
+						$this->{$field} = null;
+					} else {
+						$this->{$field} = (double) $obj->{$field};
+					}
 				} else {
 					if (!is_null($obj->{$field}) || (isset($info['notnull']) && $info['notnull'] == 1)) {
 						$this->{$field} = (double) $obj->{$field};
@@ -7800,7 +8181,9 @@ abstract class CommonObject
 		}
 
 		// If there is no 'ref' field, we force property ->ref to ->id for a better compatibility with common functions.
-		if (!isset($this->fields['ref']) && isset($this->id)) $this->ref = $this->id;
+		if (!isset($this->fields['ref']) && isset($this->id)) {
+			$this->ref = $this->id;
+		}
 	}
 
 	/**
@@ -7823,13 +8206,19 @@ abstract class CommonObject
 	 */
 	protected function quote($value, $fieldsentry)
 	{
-		if (is_null($value)) return 'NULL';
-		elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) return $this->db->escape("$value");
-		elseif ($fieldsentry['type'] == 'boolean') {
-			if ($value) return 'true';
-			else return 'false';
+		if (is_null($value)) {
+			return 'NULL';
+		} elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) {
+			return $this->db->escape("$value");
+		} elseif ($fieldsentry['type'] == 'boolean') {
+			if ($value) {
+				return 'true';
+			} else {
+				return 'false';
+			}
+		} else {
+			return "'".$this->db->escape($value)."'";
 		}
-		else return "'".$this->db->escape($value)."'";
 	}
 
 
@@ -7851,10 +8240,16 @@ abstract class CommonObject
 
 		$fieldvalues = $this->setSaveQuery();
 
-		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) $fieldvalues['date_creation'] = $this->db->idate($now);
-		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) $fieldvalues['fk_user_creat'] = $user->id;
+		if (array_key_exists('date_creation', $fieldvalues) && empty($fieldvalues['date_creation'])) {
+			$fieldvalues['date_creation'] = $this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_creat', $fieldvalues) && !($fieldvalues['fk_user_creat'] > 0)) {
+			$fieldvalues['fk_user_creat'] = $user->id;
+		}
 		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into insert.
-		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
+		if (array_key_exists('ref', $fieldvalues)) {
+			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
+		}
 
 		$keys = array();
 		$values = array(); // Array to store string forged for SQL syntax
@@ -7865,38 +8260,45 @@ abstract class CommonObject
 		}
 
 		// Clean and check mandatory
-		foreach ($keys as $key)
-		{
+		foreach ($keys as $key) {
 			// If field is an implicit foreign key field
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = '';
-			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = '';
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+				$values[$key] = '';
+			}
 
-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && is_null($this->fields[$key]['default']))
-			{
+			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && is_null($this->fields[$key]['default'])) {
 				$error++;
 				$this->errors[] = $langs->trans("ErrorFieldRequired", $this->fields[$key]['label']);
 			}
 
 			// If value is null and there is a default value for field
-			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && !is_null($this->fields[$key]['default']))
-			{
+			if (isset($this->fields[$key]['notnull']) && $this->fields[$key]['notnull'] == 1 && (!isset($values[$key]) || $values[$key] === 'NULL') && !is_null($this->fields[$key]['default'])) {
 				$values[$key] = $this->fields[$key]['default'];
 			}
 
 			// If field is an implicit foreign key field
 			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && empty($values[$key])) {
-				if (isset($this->fields[$key]['default'])) $values[$key] = $this->fields[$key]['default'];
-				else $values[$key] = 'null';
+				if (isset($this->fields[$key]['default'])) {
+					$values[$key] = $this->fields[$key]['default'];
+				} else {
+					$values[$key] = 'null';
+				}
+			}
+			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) {
+				$values[$key] = 'null';
 			}
-			if (!empty($this->fields[$key]['foreignkey']) && empty($values[$key])) $values[$key] = 'null';
 		}
 
-		if ($error) return -1;
+		if ($error) {
+			return -1;
+		}
 
 		$this->db->begin();
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= ' ('.implode(", ", $keys).')';
 			$sql .= ' VALUES ('.implode(", ", $values).')';
@@ -7908,21 +8310,17 @@ abstract class CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 		}
 
 		// If we have a field ref with a default value of (PROV)
-		if (!$error)
-		{
-			if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && !is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)')
-			{
+		if (!$error) {
+			if (key_exists('ref', $this->fields) && $this->fields['ref']['notnull'] > 0 && !is_null($this->fields['ref']['default']) && $this->fields['ref']['default'] == '(PROV)') {
 				$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref = '(PROV".$this->id.")' WHERE (ref = '(PROV)' OR ref = '') AND rowid = ".$this->id;
 				$resqlupdate = $this->db->query($sql);
 
-				if ($resqlupdate === false)
-				{
+				if ($resqlupdate === false) {
 					$error++;
 					$this->errors[] = $this->db->lasterror();
 				} else {
@@ -7932,18 +8330,17 @@ abstract class CommonObject
 		}
 
 		// Create extrafields
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
 		// Create lines
-		if (!empty($this->table_element_line) && !empty($this->fk_element))
-		{
+		if (!empty($this->table_element_line) && !empty($this->fk_element)) {
 			$num = (is_array($this->lines) ? count($this->lines) : 0);
-			for ($i = 0; $i < $num; $i++)
-			{
+			for ($i = 0; $i < $num; $i++) {
 				$line = $this->lines[$i];
 
 				$keyforparent = $this->fk_element;
@@ -7951,11 +8348,12 @@ abstract class CommonObject
 
 				// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 				//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-				if (!is_object($line)) $line = (object) $line;
+				if (!is_object($line)) {
+					$line = (object) $line;
+				}
 
 				$result = $line->create($user, 1);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 					return -1;
@@ -7964,11 +8362,12 @@ abstract class CommonObject
 		}
 
 		// Triggers
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call triggers
 			$result = $this->call_trigger(strtoupper(get_class($this)).'_CREATE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -7993,27 +8392,37 @@ abstract class CommonObject
 	 */
 	public function fetchCommon($id, $ref = null, $morewhere = '')
 	{
-		if (empty($id) && empty($ref) && empty($morewhere)) return -1;
+		if (empty($id) && empty($ref) && empty($morewhere)) {
+			return -1;
+		}
 
 		$fieldlist = $this->getFieldList();
-		if (empty($fieldlist)) return 0;
+		if (empty($fieldlist)) {
+			return 0;
+		}
 
 		$sql = 'SELECT '.$fieldlist;
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element;
 
-		if (!empty($id)) $sql .= ' WHERE rowid = '.$id;
-		elseif (!empty($ref)) $sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
-		else $sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
-		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' AND entity IN ('.getEntity($this->table_element).')';
-		if ($morewhere) $sql .= $morewhere;
+		if (!empty($id)) {
+			$sql .= ' WHERE rowid = '.$id;
+		} elseif (!empty($ref)) {
+			$sql .= " WHERE ref = ".$this->quote($ref, $this->fields['ref']);
+		} else {
+			$sql .= ' WHERE 1 = 1'; // usage with empty id and empty ref is very rare
+		}
+		if (empty($id) && isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' AND entity IN ('.getEntity($this->table_element).')';
+		}
+		if ($morewhere) {
+			$sql .= $morewhere;
+		}
 		$sql .= ' LIMIT 1'; // This is a fetch, to be sure to get only one record
 
 		$res = $this->db->query($sql);
-		if ($res)
-		{
+		if ($res) {
 			$obj = $this->db->fetch_object($res);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->setVarsFromFetchObj($obj);
 
 				// Retrieve all extrafield
@@ -8040,8 +8449,7 @@ abstract class CommonObject
 	public function fetchLinesCommon($morewhere = '')
 	{
 		$objectlineclassname = get_class($this).'Line';
-		if (!class_exists($objectlineclassname))
-		{
+		if (!class_exists($objectlineclassname)) {
 			$this->error = 'Error, class '.$objectlineclassname.' not found during call of fetchLinesCommon';
 			return -1;
 		}
@@ -8051,21 +8459,20 @@ abstract class CommonObject
 		$sql = 'SELECT '.$objectline->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$objectline->table_element;
 		$sql .= ' WHERE fk_'.$this->element.' = '.$this->id;
-		if ($morewhere)   $sql .= $morewhere;
+		if ($morewhere) {
+			$sql .= $morewhere;
+		}
 		if (isset($objectline->fields['position'])) {
 			$sql .= $this->db->order('position', 'ASC');
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_rows = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_rows)
-			{
+			while ($i < $num_rows) {
 				$obj = $this->db->fetch_object($resql);
-				if ($obj)
-				{
+				if ($obj) {
 					$newline = new $objectlineclassname($this->db);
 					$newline->setVarsFromFetchObj($obj);
 
@@ -8100,10 +8507,16 @@ abstract class CommonObject
 
 		$fieldvalues = $this->setSaveQuery();
 
-		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) $fieldvalues['date_modification'] = $this->db->idate($now);
-		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) $fieldvalues['fk_user_modif'] = $user->id;
+		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
+			$fieldvalues['date_modification'] = $this->db->idate($now);
+		}
+		if (array_key_exists('fk_user_modif', $fieldvalues) && !($fieldvalues['fk_user_modif'] > 0)) {
+			$fieldvalues['fk_user_modif'] = $user->id;
+		}
 		unset($fieldvalues['rowid']); // The field 'rowid' is reserved field name for autoincrement field so we don't need it into update.
-		if (array_key_exists('ref', $fieldvalues)) $fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
+		if (array_key_exists('ref', $fieldvalues)) {
+			$fieldvalues['ref'] = dol_string_nospecial($fieldvalues['ref']); // If field is a ref, we sanitize data
+		}
 
 		// Add quotes and escape on fields with type string
 		$keys = array();
@@ -8117,10 +8530,13 @@ abstract class CommonObject
 		}
 
 		// Clean and check mandatory fields
-		foreach ($keys as $key)
-		{
-			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') $values[$key] = ''; // This is an implicit foreign key field
-			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') $values[$key] = ''; // This is an explicit foreign key field
+		foreach ($keys as $key) {
+			if (preg_match('/^integer:/i', $this->fields[$key]['type']) && $values[$key] == '-1') {
+				$values[$key] = ''; // This is an implicit foreign key field
+			}
+			if (!empty($this->fields[$key]['foreignkey']) && $values[$key] == '-1') {
+				$values[$key] = ''; // This is an explicit foreign key field
+			}
 
 			//var_dump($key.'-'.$values[$key].'-'.($this->fields[$key]['notnull'] == 1));
 			/*
@@ -8134,32 +8550,29 @@ abstract class CommonObject
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET '.implode(', ', $tmp).' WHERE rowid='.$this->id;
 
 		$this->db->begin();
-		if (!$error)
-		{
+		if (!$error) {
 			$res = $this->db->query($sql);
-			if ($res === false)
-			{
+			if ($res === false) {
 				$error++;
 				$this->errors[] = $this->db->lasterror();
 			}
 		}
 
 		// Update extrafield
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 			}
 		}
 
 		// Triggers
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call triggers
 			$result = $this->call_trigger(strtoupper(get_class($this)).'_MODIFY', $user);
-			if ($result < 0) { $error++; } //Do also here what you must do to rollback action if trigger fail
+			if ($result < 0) {
+				$error++;
+			} //Do also here what you must do to rollback action if trigger fail
 			// End call triggers
 		}
 
@@ -8189,25 +8602,20 @@ abstract class CommonObject
 
 		$this->db->begin();
 
-		if ($forcechilddeletion)	// Force also delete of childtables that should lock deletion in standard case when option force is off
-		{
-			foreach ($this->childtables as $table)
-			{
+		if ($forcechilddeletion) {	// Force also delete of childtables that should lock deletion in standard case when option force is off
+			foreach ($this->childtables as $table) {
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$table.' WHERE '.$this->fk_element.' = '.$this->id;
 				$resql = $this->db->query($sql);
-				if (!$resql)
-				{
+				if (!$resql) {
 					$this->error = $this->db->lasterror();
 					$this->errors[] = $this->error;
 					$this->db->rollback();
 					return -1;
 				}
 			}
-		} elseif (!empty($this->fk_element) && !empty($this->childtables))	// If object has childs linked with a foreign key field, we check all child tables.
-		{
+		} elseif (!empty($this->fk_element) && !empty($this->childtables)) {	// If object has childs linked with a foreign key field, we check all child tables.
 			$objectisused = $this->isObjectUsed($this->id);
-			if (!empty($objectisused))
-			{
+			if (!empty($objectisused)) {
 				dol_syslog(get_class($this)."::deleteCommon Can't delete record as it has some child", LOG_WARNING);
 				$this->error = 'ErrorRecordHasChildren';
 				$this->errors[] = $this->error;
@@ -8218,8 +8626,7 @@ abstract class CommonObject
 
 		// Delete cascade first
 		if (is_array($this->childtablesoncascade) && !empty($this->childtablesoncascade)) {
-			foreach ($this->childtablesoncascade as $table)
-			{
+			foreach ($this->childtablesoncascade as $table) {
 				$deleteFromObject = explode(':', $table);
 				if (count($deleteFromObject) >= 2) {
 					$className = str_replace('@', '', $deleteFromObject[0]);
@@ -8263,7 +8670,9 @@ abstract class CommonObject
 			if (!$notrigger) {
 				// Call triggers
 				$result = $this->call_trigger(strtoupper(get_class($this)).'_DELETE', $user);
-				if ($result < 0) { $error++; } // Do also here what you must do to rollback action if trigger fail
+				if ($result < 0) {
+					$error++;
+				} // Do also here what you must do to rollback action if trigger fail
 				// End call triggers
 			}
 		}
@@ -8276,14 +8685,14 @@ abstract class CommonObject
 			}
 		}
 
-		if (!$error && !empty($this->isextrafieldmanaged))
-		{
+		if (!$error && !empty($this->isextrafieldmanaged)) {
 			$result = $this->deleteExtraFields();
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE rowid='.$this->id;
 
 			$res = $this->db->query($sql);
@@ -8382,7 +8791,9 @@ abstract class CommonObject
 
 		// Call trigger
 		$result = $this->call_trigger('LINE'.strtoupper($tmpforobjectclass).'_DELETE', $user);
-		if ($result < 0) return -1;
+		if ($result < 0) {
+			return -1;
+		}
 		// End call triggers
 
 		$this->db->begin();
@@ -8392,8 +8803,7 @@ abstract class CommonObject
 
 		dol_syslog(get_class($this)."::deleteLineCommon", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			$error++;
 		}
@@ -8404,8 +8814,7 @@ abstract class CommonObject
 			if (!isset($tmpobjectline->isextrafieldmanaged) || !empty($tmpobjectline->isextrafieldmanaged)) {
 				$tmpobjectline->id = $idline;
 				$result = $tmpobjectline->deleteExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->error = "Error ".get_class($this)."::deleteLineCommon deleteExtraFields error -4 ".$tmpobjectline->error;
 				}
@@ -8439,23 +8848,25 @@ abstract class CommonObject
 		$this->db->begin();
 
 		$statusfield = 'status';
-		if ($this->element == 'don' || $this->element == 'donation') $statusfield = 'fk_statut';
+		if ($this->element == 'don' || $this->element == 'donation') {
+			$statusfield = 'fk_statut';
+		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 		$sql .= " SET ".$statusfield." = ".((int) $status);
 		$sql .= " WHERE rowid = ".$this->id;
 
-		if ($this->db->query($sql))
-		{
-			if (!$error)
-			{
+		if ($this->db->query($sql)) {
+			if (!$error) {
 				$this->oldcopy = clone $this;
 			}
 
 			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger($triggercode, $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (!$error) {
@@ -8500,7 +8911,9 @@ abstract class CommonObject
 			'date' => dol_now(),
 		);
 		foreach ($fields as $key => $value) {
-			if (array_key_exists($key, $this->fields)) $this->{$key} = $value;
+			if (array_key_exists($key, $this->fields)) {
+				$this->{$key} = $value;
+			}
 		}
 		return 1;
 	}
@@ -8545,7 +8958,9 @@ abstract class CommonObject
 	 */
 	public function trimParameters($parameters)
 	{
-		if (!is_array($parameters)) return;
+		if (!is_array($parameters)) {
+			return;
+		}
 		foreach ($parameters as $parameter) {
 			if (isset($this->$parameter)) {
 				$this->$parameter = trim($this->$parameter);
@@ -8628,8 +9043,7 @@ abstract class CommonObject
 		foreach ($to_del as $del) {
 			if ($c->fetch($del) > 0) {
 				$result=$c->del_type($this, $type_categ);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->error = $c->error;
 					$this->errors = $c->errors;
@@ -8640,11 +9054,9 @@ abstract class CommonObject
 			}
 		}
 		foreach ($to_add as $add) {
-			if ($c->fetch($add) > 0)
-			{
+			if ($c->fetch($add) > 0) {
 				$result = $c->add_type($this, $type_categ);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->error = $c->error;
 					$this->errors = $c->errors;
@@ -8670,7 +9082,9 @@ abstract class CommonObject
 	{
 		$this->db->begin();
 
-		if (empty($type)) $type = $this->table_element;
+		if (empty($type)) {
+			$type = $this->table_element;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categorystatic = new Categorie($this->db);
@@ -8679,8 +9093,7 @@ abstract class CommonObject
 		$sql .= " SELECT fk_categorie, $toId FROM ".MAIN_DB_PREFIX."categorie_".(empty($categorystatic->MAP_CAT_TABLE[$type]) ? $type : $categorystatic->MAP_CAT_TABLE[$type]);
 		$sql .= " WHERE fk_product = ".((int) $fromId);
 
-		if (!$this->db->query($sql))
-		{
+		if (!$this->db->query($sql)) {
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 0d4cfbe4f34..f821e5050b1 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -80,15 +80,21 @@ abstract class CommonObjectLine extends CommonObject
 		$label_type = 'label';
 
 		$label_type = 'label';
-		if ($type == 'short') $label_type = 'short_label';
-		elseif ($type == 'code') $label_type = 'code';
+		if ($type == 'short') {
+			$label_type = 'short_label';
+		} elseif ($type == 'code') {
+			$label_type = 'code';
+		}
 
 		$sql = 'select '.$label_type.', code from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;
 		$resql = $this->db->query($sql);
 		if ($resql && $this->db->num_rows($resql) > 0) {
 			$res = $this->db->fetch_array($resql);
-			if ($label_type == 'code') $label = 'unit'.$res['code'];
-			else $label = $res[$label_type];
+			if ($label_type == 'code') {
+				$label = 'unit'.$res['code'];
+			} else {
+				$label = $res[$label_type];
+			}
 			$this->db->free($resql);
 			return $label;
 		} else {
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index 3a8712ad67d..284b41ee4ba 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -121,7 +121,7 @@ abstract class CommonStickerGenerator
 	 *	@param	string		$outputdir			Output directory for pdf file
 	 *  @return int             				1=OK, 0=KO
 	 */
-	public abstract function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');
+	abstract public function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '');
 	// phpcs:enable
 
 	/**
@@ -132,7 +132,7 @@ abstract class CommonStickerGenerator
 	 * @param   array     	$param          Associative array containing label content and optional parameters
 	 * @return  void
 	 */
-	public abstract function addSticker(&$pdf, $outputlangs, $param);
+	abstract public function addSticker(&$pdf, $outputlangs, $param);
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index d8fbceeecf8..19555adf3fb 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -168,17 +168,14 @@ class Conf
 		$sql .= " ORDER BY entity"; // This is to have entity 0 first, then entity 1 that overwrite.
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$numr = $db->num_rows($resql);
-			while ($i < $numr)
-			{
+			while ($i < $numr) {
 				$objp = $db->fetch_object($resql);
 				$key = $objp->name;
 				$value = $objp->value;
-				if ($key)
-				{
+				if ($key) {
 					// Allow constants values to be overridden by environment variables
 					if (isset($_SERVER['DOLIBARR_'.$key])) {
 						$value = $_SERVER['DOLIBARR_'.$key];
@@ -189,15 +186,15 @@ class Conf
 					//if (! defined("$key")) define("$key", $value);	// In some cases, the constant might be already forced (Example: SYSLOG_HANDLERS during install)
 					$this->global->$key = $value;
 
-					if ($value && strpos($key, 'MAIN_MODULE_') === 0)
-					{
+					if ($value && strpos($key, 'MAIN_MODULE_') === 0) {
 						$reg = array();
 						// If this is constant for a new tab page activated by a module. It initializes modules_parts['tabs'].
-						if (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_TABS_/i', $key))
-						{
+						if (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_TABS_/i', $key)) {
 							$partname = 'tabs';
 							$params = explode(':', $value, 2);
-							if (!is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
+							if (!is_array($this->modules_parts[$partname])) {
+								$this->modules_parts[$partname] = array();
+							}
 							$this->modules_parts[$partname][$params[0]][] = $value; // $value may be a string or an array
 						}
 						// If this is constant for all generic part activated by a module. It initializes
@@ -205,26 +202,38 @@ class Conf
 						// modules_parts['models'], modules_parts['theme']
 						// modules_parts['sms'],
 						// modules_parts['css'], ...
-						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_([A-Z]+)$/i', $key, $reg))
-						{
+						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)_([A-Z]+)$/i', $key, $reg)) {
 							$modulename = strtolower($reg[1]);
 							$partname = strtolower($reg[2]);
-							if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
+							if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) {
+								$this->modules_parts[$partname] = array();
+							}
 							$arrValue = json_decode($value, true);
-							if (is_array($arrValue) && !empty($arrValue)) $value = $arrValue;
-							elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) $value = '/'.$modulename.'/core/'.$partname.'/';
-							elseif (in_array($partname, array('models', 'theme'))) $value = '/'.$modulename.'/';
-							elseif (in_array($partname, array('sms'))) $value = '/'.$modulename.'/';
-							elseif ($value == 1) $value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
+							if (is_array($arrValue) && !empty($arrValue)) {
+								$value = $arrValue;
+							} elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) {
+								$value = '/'.$modulename.'/core/'.$partname.'/';
+							} elseif (in_array($partname, array('models', 'theme'))) {
+								$value = '/'.$modulename.'/';
+							} elseif (in_array($partname, array('sms'))) {
+								$value = '/'.$modulename.'/';
+							} elseif ($value == 1) {
+								$value = '/'.$modulename.'/core/modules/'.$partname.'/'; // ex: partname = societe
+							}
 							$this->modules_parts[$partname] = array_merge($this->modules_parts[$partname], array($modulename => $value)); // $value may be a string or an array
 						}
 						// If this is a module constant (must be at end)
-						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg))
-						{
+						elseif (preg_match('/^MAIN_MODULE_([0-9A-Z_]+)$/i', $key, $reg)) {
 							$modulename = strtolower($reg[1]);
-							if ($modulename == 'propale') $modulename = 'propal';
-							if ($modulename == 'supplierproposal') $modulename = 'supplier_proposal';
-							if (!isset($this->$modulename) || !is_object($this->$modulename)) $this->$modulename = new stdClass();
+							if ($modulename == 'propale') {
+								$modulename = 'propal';
+							}
+							if ($modulename == 'supplierproposal') {
+								$modulename = 'supplier_proposal';
+							}
+							if (!isset($this->$modulename) || !is_object($this->$modulename)) {
+								$this->$modulename = new stdClass();
+							}
 							$this->$modulename->enabled = true;
 							$this->modules[] = $modulename; // Add this module in list of enabled modules
 						}
@@ -251,12 +260,10 @@ class Conf
 		// If you can't set timezone of your PHP, set this constant. Better is to set it to UTC.
 		// In future, this constant will be forced to 'UTC' so PHP server timezone will not have effect anymore.
 		//$this->global->MAIN_SERVER_TZ='Europe/Paris';
-		if (!empty($this->global->MAIN_SERVER_TZ) && $this->global->MAIN_SERVER_TZ != 'auto')
-		{
+		if (!empty($this->global->MAIN_SERVER_TZ) && $this->global->MAIN_SERVER_TZ != 'auto') {
 			try {
 				date_default_timezone_set($this->global->MAIN_SERVER_TZ);
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				dol_syslog("Error: Bad value for parameter MAIN_SERVER_TZ=".$this->global->MAIN_SERVER_TZ, LOG_ERR);
 			}
 		}
@@ -272,36 +279,58 @@ class Conf
 		}
 
 		// Clean some variables
-		if (empty($this->global->MAIN_MENU_STANDARD)) $this->global->MAIN_MENU_STANDARD = "eldy_menu.php";
-		if (empty($this->global->MAIN_MENUFRONT_STANDARD)) $this->global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";
-		if (empty($this->global->MAIN_MENU_SMARTPHONE)) $this->global->MAIN_MENU_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
-		if (empty($this->global->MAIN_MENUFRONT_SMARTPHONE)) $this->global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
-		if (!isset($this->global->FACTURE_TVAOPTION)) $this->global->FACTURE_TVAOPTION = 1;
+		if (empty($this->global->MAIN_MENU_STANDARD)) {
+			$this->global->MAIN_MENU_STANDARD = "eldy_menu.php";
+		}
+		if (empty($this->global->MAIN_MENUFRONT_STANDARD)) {
+			$this->global->MAIN_MENUFRONT_STANDARD = "eldy_menu.php";
+		}
+		if (empty($this->global->MAIN_MENU_SMARTPHONE)) {
+			$this->global->MAIN_MENU_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
+		}
+		if (empty($this->global->MAIN_MENUFRONT_SMARTPHONE)) {
+			$this->global->MAIN_MENUFRONT_SMARTPHONE = "eldy_menu.php"; // Use eldy by default because smartphone does not work on all phones
+		}
+		if (!isset($this->global->FACTURE_TVAOPTION)) {
+			$this->global->FACTURE_TVAOPTION = 1;
+		}
 
 		// Variable globales LDAP
-		if (empty($this->global->LDAP_FIELD_FULLNAME)) $this->global->LDAP_FIELD_FULLNAME = '';
-		if (!isset($this->global->LDAP_KEY_USERS)) $this->global->LDAP_KEY_USERS = $this->global->LDAP_FIELD_FULLNAME;
-		if (!isset($this->global->LDAP_KEY_GROUPS)) $this->global->LDAP_KEY_GROUPS = $this->global->LDAP_FIELD_FULLNAME;
-		if (!isset($this->global->LDAP_KEY_CONTACTS)) $this->global->LDAP_KEY_CONTACTS = $this->global->LDAP_FIELD_FULLNAME;
-		if (!isset($this->global->LDAP_KEY_MEMBERS)) $this->global->LDAP_KEY_MEMBERS = $this->global->LDAP_FIELD_FULLNAME;
-		if (!isset($this->global->LDAP_KEY_MEMBERS_TYPES)) $this->global->LDAP_KEY_MEMBERS_TYPES = $this->global->LDAP_FIELD_FULLNAME;
+		if (empty($this->global->LDAP_FIELD_FULLNAME)) {
+			$this->global->LDAP_FIELD_FULLNAME = '';
+		}
+		if (!isset($this->global->LDAP_KEY_USERS)) {
+			$this->global->LDAP_KEY_USERS = $this->global->LDAP_FIELD_FULLNAME;
+		}
+		if (!isset($this->global->LDAP_KEY_GROUPS)) {
+			$this->global->LDAP_KEY_GROUPS = $this->global->LDAP_FIELD_FULLNAME;
+		}
+		if (!isset($this->global->LDAP_KEY_CONTACTS)) {
+			$this->global->LDAP_KEY_CONTACTS = $this->global->LDAP_FIELD_FULLNAME;
+		}
+		if (!isset($this->global->LDAP_KEY_MEMBERS)) {
+			$this->global->LDAP_KEY_MEMBERS = $this->global->LDAP_FIELD_FULLNAME;
+		}
+		if (!isset($this->global->LDAP_KEY_MEMBERS_TYPES)) {
+			$this->global->LDAP_KEY_MEMBERS_TYPES = $this->global->LDAP_FIELD_FULLNAME;
+		}
 
 		// Load translation object with current language
-		if (empty($this->global->MAIN_LANG_DEFAULT)) $this->global->MAIN_LANG_DEFAULT = "en_US";
+		if (empty($this->global->MAIN_LANG_DEFAULT)) {
+			$this->global->MAIN_LANG_DEFAULT = "en_US";
+		}
 
 		$rootfordata = DOL_DATA_ROOT;
 		$rootforuser = DOL_DATA_ROOT;
 		// If multicompany module is enabled, we redefine the root of data
-		if (!empty($this->multicompany->enabled) && !empty($this->entity) && $this->entity > 1)
-		{
+		if (!empty($this->multicompany->enabled) && !empty($this->entity) && $this->entity > 1) {
 			$rootfordata .= '/'.$this->entity;
 		}
 		// Set standard temporary folder name or global override
 		$rootfortemp = empty($this->global->MAIN_TEMP_DIR) ? $rootfordata : $this->global->MAIN_TEMP_DIR;
 
 		// Define default dir_output and dir_temp for directories of modules
-		foreach ($this->modules as $module)
-		{
+		foreach ($this->modules as $module) {
 			//var_dump($module);
 			// For multicompany sharings
 			$this->$module->multidir_output = array($this->entity => $rootfordata."/".$module);
@@ -312,19 +341,14 @@ class Conf
 		}
 
 		// External modules storage
-		if (!empty($this->modules_parts['dir']))
-		{
-			foreach ($this->modules_parts['dir'] as $module => $dirs)
-			{
-				if (!empty($this->$module->enabled))
-				{
-					foreach ($dirs as $type => $name)  // $type is 'output' or 'temp'
-					{
+		if (!empty($this->modules_parts['dir'])) {
+			foreach ($this->modules_parts['dir'] as $module => $dirs) {
+				if (!empty($this->$module->enabled)) {
+					foreach ($dirs as $type => $name) {  // $type is 'output' or 'temp'
 						$multidirname = 'multidir_'.$type;
 						$dirname = 'dir_'.$type;
 
-						if ($type != 'temp')
-						{
+						if ($type != 'temp') {
 							// For multicompany sharings
 							$this->$module->$multidirname = array($this->entity => $rootfordata."/".$name);
 
@@ -380,8 +404,7 @@ class Conf
 		$this->delivery_note->enabled = (!empty($this->global->MAIN_SUBMODULE_DELIVERY) ? $this->global->MAIN_SUBMODULE_DELIVERY : 0);
 
 		// Module fournisseur
-		if (!empty($this->fournisseur))
-		{
+		if (!empty($this->fournisseur)) {
 			$this->fournisseur->commande = new stdClass();
 			$this->fournisseur->commande->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
 			$this->fournisseur->commande->multidir_temp = array($this->entity => $rootfortemp."/fournisseur/commande/temp");
@@ -407,8 +430,7 @@ class Conf
 			$this->fournisseur->payment->dir_temp = $rootfortemp."/fournisseur/payment/temp"; // For backward compatibility
 
 			// To prepare split of module fournisseur into module 'fournisseur' + supplier_order + supplier_invoice
-			if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD))  // By default, if module supplier is on, and we don't use yet the new modules, we set artificialy the module properties
-			{
+			if (!empty($this->fournisseur->enabled) && empty($this->global->MAIN_USE_NEW_SUPPLIERMOD)) {  // By default, if module supplier is on, and we don't use yet the new modules, we set artificialy the module properties
 				$this->supplier_order = new stdClass();
 				$this->supplier_order->enabled = 1;
 				$this->supplier_order->multidir_output = array($this->entity => $rootfordata."/fournisseur/commande");
@@ -437,8 +459,8 @@ class Conf
 		$this->service->dir_temp				= $rootfortemp."/produit/temp";
 
 		// Module productbatch
-		$this->productbatch->multidir_output = array($this->entity => $rootfordata."/produitlot");
-		$this->productbatch->multidir_temp = array($this->entity => $rootfortemp."/produitlot/temp");
+		$this->productbatch->multidir_output = array($this->entity => $rootfordata."/productlot");
+		$this->productbatch->multidir_temp = array($this->entity => $rootfortemp."/productlot/temp");
 
 		// Module contrat
 		$this->contrat->multidir_output = array($this->entity => $rootfordata."/contract");
@@ -459,30 +481,42 @@ class Conf
 		$this->global->MAIN_MAIL_USE_MULTI_PART = 1;
 
 		// societe
-		if (empty($this->global->SOCIETE_CODECLIENT_ADDON))		$this->global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";
-		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON))		$this->global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";
+		if (empty($this->global->SOCIETE_CODECLIENT_ADDON)) {
+			$this->global->SOCIETE_CODECLIENT_ADDON = "mod_codeclient_leopard";
+		}
+		if (empty($this->global->SOCIETE_CODECOMPTA_ADDON)) {
+			$this->global->SOCIETE_CODECOMPTA_ADDON = "mod_codecompta_panicum";
+		}
 
-		if (empty($this->global->CHEQUERECEIPTS_ADDON))			$this->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
-		if (empty($this->global->TICKET_ADDON))				    $this->global->TICKET_ADDON = 'mod_ticket_simple';
+		if (empty($this->global->CHEQUERECEIPTS_ADDON)) {
+			$this->global->CHEQUERECEIPTS_ADDON = 'mod_chequereceipt_mint';
+		}
+		if (empty($this->global->TICKET_ADDON)) {
+			$this->global->TICKET_ADDON = 'mod_ticket_simple';
+		}
 
 		// Security
-		if (empty($this->global->USER_PASSWORD_GENERATED)) $this->global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator
-		if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK = '0664'; // Default mask
+		if (empty($this->global->USER_PASSWORD_GENERATED)) {
+			$this->global->USER_PASSWORD_GENERATED = 'standard'; // Default password generator
+		}
+		if (empty($this->global->MAIN_UMASK)) {
+			$this->global->MAIN_UMASK = '0664'; // Default mask
+		}
 
 		// conf->use_javascript_ajax
 		$this->use_javascript_ajax = 1;
-		if (isset($this->global->MAIN_DISABLE_JAVASCRIPT)) $this->use_javascript_ajax = !$this->global->MAIN_DISABLE_JAVASCRIPT;
+		if (isset($this->global->MAIN_DISABLE_JAVASCRIPT)) {
+			$this->use_javascript_ajax = !$this->global->MAIN_DISABLE_JAVASCRIPT;
+		}
 		// If no javascript_ajax, Ajax features are disabled.
-		if (empty($this->use_javascript_ajax))
-		{
+		if (empty($this->use_javascript_ajax)) {
 			unset($this->global->PRODUIT_USE_SEARCH_TO_SELECT);
 			unset($this->global->COMPANY_USE_SEARCH_TO_SELECT);
 			unset($this->global->CONTACT_USE_SEARCH_TO_SELECT);
 			unset($this->global->PROJECT_USE_SEARCH_TO_SELECT);
 		}
 
-		if (!empty($this->productbatch->enabled))
-		{
+		if (!empty($this->productbatch->enabled)) {
 			$this->global->STOCK_CALCULATE_ON_BILL = 0;
 			$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER = 0;
 			$this->global->STOCK_CALCULATE_ON_SHIPMENT = 1;
@@ -491,59 +525,88 @@ class Conf
 			$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;
 			if (empty($this->reception->enabled)) {
 				$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
-			}
-			else {
+			} else {
 				$this->global->STOCK_CALCULATE_ON_RECEPTION = 1;
 				$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 0;
 			}
 		}
 
 		// conf->currency
-		if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE = 'EUR';
+		if (empty($this->global->MAIN_MONNAIE)) {
+			$this->global->MAIN_MONNAIE = 'EUR';
+		}
 		$this->currency = $this->global->MAIN_MONNAIE;
 
-		if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) $this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure
+		if (empty($this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY)) {
+			$this->global->MAIN_BROWSER_NOTIFICATION_FREQUENCY = 30; // Less than 1 minutes to be sure
+		}
 
 		// conf->global->ACCOUNTING_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...)
-		if (empty($this->global->ACCOUNTING_MODE)) $this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
+		if (empty($this->global->ACCOUNTING_MODE)) {
+			$this->global->ACCOUNTING_MODE = 'RECETTES-DEPENSES'; // By default. Can be 'RECETTES-DEPENSES' ou 'CREANCES-DETTES'
+		}
 
 		// By default, suppliers objects can be linked to all projects
-		if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) $this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
+		if (!isset($this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS)) {
+			$this->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS = 1;
+		}
 
 		// By default we enable feature to bill time spent
-		if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) $this->global->PROJECT_BILL_TIME_SPENT = 1;
+		if (!isset($this->global->PROJECT_BILL_TIME_SPENT)) {
+			$this->global->PROJECT_BILL_TIME_SPENT = 1;
+		}
 
 		// MAIN_HTML_TITLE
-		if (!isset($this->global->MAIN_HTML_TITLE)) $this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
+		if (!isset($this->global->MAIN_HTML_TITLE)) {
+			$this->global->MAIN_HTML_TITLE = 'noapp,thirdpartynameonly,contactnameonly,projectnameonly';
+		}
 
 		// conf->liste_limit = constante de taille maximale des listes
-		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) $this->global->MAIN_SIZE_LISTE_LIMIT = 25;
+		if (empty($this->global->MAIN_SIZE_LISTE_LIMIT)) {
+			$this->global->MAIN_SIZE_LISTE_LIMIT = 25;
+		}
 		$this->liste_limit = $this->global->MAIN_SIZE_LISTE_LIMIT;
 
 		// conf->product->limit_size = constante de taille maximale des select de produit
-		if (!isset($this->global->PRODUIT_LIMIT_SIZE)) $this->global->PRODUIT_LIMIT_SIZE = 1000;
+		if (!isset($this->global->PRODUIT_LIMIT_SIZE)) {
+			$this->global->PRODUIT_LIMIT_SIZE = 1000;
+		}
 		$this->product->limit_size = $this->global->PRODUIT_LIMIT_SIZE;
 
 		// conf->theme et $this->css
-		if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME = "eldy";
-		if (!empty($this->global->MAIN_FORCETHEME)) $this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;
+		if (empty($this->global->MAIN_THEME)) {
+			$this->global->MAIN_THEME = "eldy";
+		}
+		if (!empty($this->global->MAIN_FORCETHEME)) {
+			$this->global->MAIN_THEME = $this->global->MAIN_FORCETHEME;
+		}
 		$this->theme = $this->global->MAIN_THEME;
 		$this->css = "/theme/".$this->theme."/style.css.php";
 
 		// conf->email_from = email pour envoi par dolibarr des mails automatiques
 		$this->email_from = "robot@example.com";
-		if (!empty($this->global->MAIN_MAIL_EMAIL_FROM)) $this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM;
+		if (!empty($this->global->MAIN_MAIL_EMAIL_FROM)) {
+			$this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM;
+		}
 
 		// conf->notification->email_from = email pour envoi par Dolibarr des notifications
 		$this->notification->email_from = $this->email_from;
-		if (!empty($this->global->NOTIFICATION_EMAIL_FROM)) $this->notification->email_from = $this->global->NOTIFICATION_EMAIL_FROM;
+		if (!empty($this->global->NOTIFICATION_EMAIL_FROM)) {
+			$this->notification->email_from = $this->global->NOTIFICATION_EMAIL_FROM;
+		}
 
 		// conf->mailing->email_from = email pour envoi par Dolibarr des mailings
 		$this->mailing->email_from = $this->email_from;
-		if (!empty($this->global->MAILING_EMAIL_FROM))	$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
-		if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) $this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
+		if (!empty($this->global->MAILING_EMAIL_FROM)) {
+			$this->mailing->email_from = $this->global->MAILING_EMAIL_FROM;
+		}
+		if (!isset($this->global->MAIN_EMAIL_ADD_TRACK_ID)) {
+			$this->global->MAIN_EMAIL_ADD_TRACK_ID = 1;
+		}
 
-		if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) $this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;
+		if (!isset($this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
+			$this->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP = 1;
+		}
 
 		// Format for date (used by default when not found or not searched in lang)
 		$this->format_date_short = "%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
@@ -558,54 +621,93 @@ class Conf
 		$this->format_date_hour_text = "%d %B %Y %H:%M";
 
 		// Duration of workday
-		if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) $this->global->MAIN_DURATION_OF_WORKDAY = 86400;
+		if (!isset($this->global->MAIN_DURATION_OF_WORKDAY)) {
+			$this->global->MAIN_DURATION_OF_WORKDAY = 86400;
+		}
 
 		// Limites decimales si non definie (peuvent etre egale a 0)
-		if (!isset($this->global->MAIN_MAX_DECIMALS_UNIT))  $this->global->MAIN_MAX_DECIMALS_UNIT = 5;
-		if (!isset($this->global->MAIN_MAX_DECIMALS_TOT))   $this->global->MAIN_MAX_DECIMALS_TOT = 2;
-		if (!isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) $this->global->MAIN_MAX_DECIMALS_SHOWN = 8;
+		if (!isset($this->global->MAIN_MAX_DECIMALS_UNIT)) {
+			$this->global->MAIN_MAX_DECIMALS_UNIT = 5;
+		}
+		if (!isset($this->global->MAIN_MAX_DECIMALS_TOT)) {
+			$this->global->MAIN_MAX_DECIMALS_TOT = 2;
+		}
+		if (!isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) {
+			$this->global->MAIN_MAX_DECIMALS_SHOWN = 8;
+		}
 
 		// Default pdf option
-		if (!isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) $this->global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines
-		if (!isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) $this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text
+		if (!isset($this->global->MAIN_PDF_DASH_BETWEEN_LINES)) {
+			$this->global->MAIN_PDF_DASH_BETWEEN_LINES = 1; // use dash between lines
+		}
+		if (!isset($this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
+			$this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text
+		}
 
 		// Default max file size for upload
 		$this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : (int) $this->global->MAIN_UPLOAD_DOC * 1024);
 
 		// By default, we propagate contacts
-		if (!isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) $this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*'; // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)
+		if (!isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) {
+			$this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN = '*'; // Can be also '*' or '^(BILLING|SHIPPING|CUSTOMER|.*)$' (regex not yet implemented)
+		}
 
 		// By default, we do not use the zip town table but the table of third parties
-		if (!isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) $this->global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;
+		if (!isset($this->global->MAIN_USE_ZIPTOWN_DICTIONNARY)) {
+			$this->global->MAIN_USE_ZIPTOWN_DICTIONNARY = 0;
+		}
 
 		// By default, we open card if one found
-		if (!isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) $this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;
+		if (!isset($this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE)) {
+			$this->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE = 1;
+		}
 
 		// By default, we show state code in combo list
-		if (!isset($this->global->MAIN_SHOW_STATE_CODE)) $this->global->MAIN_SHOW_STATE_CODE = 1;
+		if (!isset($this->global->MAIN_SHOW_STATE_CODE)) {
+			$this->global->MAIN_SHOW_STATE_CODE = 1;
+		}
 
 		// Use a SCA ready workflow with Stripe module (STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION by default if nothing defined)
-		if (!isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) $this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1;
+		if (!isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) {
+			$this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1;
+		}
 
 		// Define list of limited modules (value must be key found for "name" property of module, so for example 'supplierproposal' for Module "Supplier Proposal"
-		if (!isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) $this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.
-		if (!empty($this->modules_parts['moduleforexternal']))		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
-		{
-			foreach ($this->modules_parts['moduleforexternal'] as $key=>$value) $this->global->MAIN_MODULES_FOR_EXTERNAL .= ",".$key;
+		if (!isset($this->global->MAIN_MODULES_FOR_EXTERNAL)) {
+			$this->global->MAIN_MODULES_FOR_EXTERNAL = 'user,societe,propal,commande,facture,categorie,supplierproposal,fournisseur,contact,projet,contrat,ficheinter,expedition,agenda,resource,adherent,blockedlog'; // '' means 'all'. Note that contact is added here as it should be a module later.
+		}
+		if (!empty($this->modules_parts['moduleforexternal'])) {		// Module part to include an external module into the MAIN_MODULES_FOR_EXTERNAL list
+			foreach ($this->modules_parts['moduleforexternal'] as $key => $value) {
+				$this->global->MAIN_MODULES_FOR_EXTERNAL .= ",".$key;
+			}
 		}
 
 		// Enable select2
-		if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') $this->global->MAIN_USE_JQUERY_MULTISELECT = 'select2';
+		if (empty($this->global->MAIN_USE_JQUERY_MULTISELECT) || $this->global->MAIN_USE_JQUERY_MULTISELECT == '1') {
+			$this->global->MAIN_USE_JQUERY_MULTISELECT = 'select2';
+		}
 
 		// Timeouts
-		if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT = 10;
-		if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) $this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;
+		if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) {
+			$this->global->MAIN_USE_CONNECT_TIMEOUT = 10;
+		}
+		if (empty($this->global->MAIN_USE_RESPONSE_TIMEOUT)) {
+			$this->global->MAIN_USE_RESPONSE_TIMEOUT = 30;
+		}
 
 		// Set default variable to calculate VAT as if option tax_mode was 0 (standard)
-		if (empty($this->global->TAX_MODE_SELL_PRODUCT)) $this->global->TAX_MODE_SELL_PRODUCT = 'invoice';
-		if (empty($this->global->TAX_MODE_BUY_PRODUCT))  $this->global->TAX_MODE_BUY_PRODUCT = 'invoice';
-		if (empty($this->global->TAX_MODE_SELL_SERVICE)) $this->global->TAX_MODE_SELL_SERVICE = 'payment';
-		if (empty($this->global->TAX_MODE_BUY_SERVICE))  $this->global->TAX_MODE_BUY_SERVICE = 'payment';
+		if (empty($this->global->TAX_MODE_SELL_PRODUCT)) {
+			$this->global->TAX_MODE_SELL_PRODUCT = 'invoice';
+		}
+		if (empty($this->global->TAX_MODE_BUY_PRODUCT)) {
+			$this->global->TAX_MODE_BUY_PRODUCT = 'invoice';
+		}
+		if (empty($this->global->TAX_MODE_SELL_SERVICE)) {
+			$this->global->TAX_MODE_SELL_SERVICE = 'payment';
+		}
+		if (empty($this->global->TAX_MODE_BUY_SERVICE)) {
+			$this->global->TAX_MODE_BUY_SERVICE = 'payment';
+		}
 
 		// Delay before warnings
 		// Avoid strict errors. TODO: Replace xxx->warning_delay with a property ->warning_delay_xxx
@@ -616,8 +718,7 @@ class Conf
 		if (isset($this->agenda)) {
 			$this->agenda->warning_delay = (isset($this->global->MAIN_DELAY_ACTIONS_TODO) ? $this->global->MAIN_DELAY_ACTIONS_TODO : 7) * 86400;
 		}
-		if (isset($this->projet))
-		{
+		if (isset($this->projet)) {
 			$this->projet->warning_delay = (isset($this->global->MAIN_DELAY_PROJECT_TO_CLOSE) ? $this->global->MAIN_DELAY_PROJECT_TO_CLOSE : 7) * 86400;
 			$this->projet->task = new StdClass();
 			$this->projet->task->warning_delay = (isset($this->global->MAIN_DELAY_TASKS_TODO) ? $this->global->MAIN_DELAY_TASKS_TODO : 7) * 86400;
@@ -644,9 +745,9 @@ class Conf
 		if (isset($this->contrat)) {
 			$this->contrat->services = new stdClass();
 			$this->contrat->services->inactifs = new stdClass();
-	   		$this->contrat->services->expires = new stdClass();
-	   		$this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
-	   		$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
+			$this->contrat->services->expires = new stdClass();
+			$this->contrat->services->inactifs->warning_delay = (isset($this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES) ? $this->global->MAIN_DELAY_NOT_ACTIVATED_SERVICES : 0) * 86400;
+			$this->contrat->services->expires->warning_delay = (isset($this->global->MAIN_DELAY_RUNNING_SERVICES) ? $this->global->MAIN_DELAY_RUNNING_SERVICES : 0) * 86400;
 		}
 		if (isset($this->commande)) {
 			$this->bank->rappro					= new stdClass();
@@ -665,37 +766,57 @@ class Conf
 			$this->holiday->approve->warning_delay = (isset($this->global->MAIN_DELAY_HOLIDAYS) ? $this->global->MAIN_DELAY_HOLIDAYS : 0) * 86400;
 		}
 
-		if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT))
-		{
+		if (!empty($this->global->PRODUIT_MULTIPRICES) && empty($this->global->PRODUIT_MULTIPRICES_LIMIT)) {
 			$this->global->PRODUIT_MULTIPRICES_LIMIT = 5;
 		}
 
 		// For modules that want to disable top or left menu
-		if (!empty($this->global->MAIN_HIDE_TOP_MENU)) $this->dol_hide_topmenu = $this->global->MAIN_HIDE_TOP_MENU;
-		if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) $this->dol_hide_leftmenu = $this->global->MAIN_HIDE_LEFT_MENU;
+		if (!empty($this->global->MAIN_HIDE_TOP_MENU)) {
+			$this->dol_hide_topmenu = $this->global->MAIN_HIDE_TOP_MENU;
+		}
+		if (!empty($this->global->MAIN_HIDE_LEFT_MENU)) {
+			$this->dol_hide_leftmenu = $this->global->MAIN_HIDE_LEFT_MENU;
+		}
 
-		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) $this->global->MAIN_SIZE_SHORTLIST_LIMIT = 3;
+		if (empty($this->global->MAIN_SIZE_SHORTLIST_LIMIT)) {
+			$this->global->MAIN_SIZE_SHORTLIST_LIMIT = 3;
+		}
 
-		if (!isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) $this->global->THEME_HIDE_BORDER_ON_INPUT = 0;
+		if (!isset($this->global->THEME_HIDE_BORDER_ON_INPUT)) {
+			$this->global->THEME_HIDE_BORDER_ON_INPUT = 0;
+		}
 
 		// Save inconsistent option
-		if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (!isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO'))
-		{
+		if (empty($this->global->AGENDA_USE_EVENT_TYPE) && (!isset($this->global->AGENDA_DEFAULT_FILTER_TYPE) || $this->global->AGENDA_DEFAULT_FILTER_TYPE == 'AC_NON_AUTO')) {
 			$this->global->AGENDA_DEFAULT_FILTER_TYPE = '0'; // 'AC_NON_AUTO' does not exists when AGENDA_DEFAULT_FILTER_TYPE is not on.
 		}
 
-		if (!isset($this->global->MAIN_JS_GRAPH)) $this->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library
+		if (!isset($this->global->MAIN_JS_GRAPH)) {
+			$this->global->MAIN_JS_GRAPH = 'chart'; // Use chart.js library
+		}
 
-		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) $this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
-		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) $this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';
+		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_SRV)) {
+			$this->global->MAIN_MODULE_DOLISTORE_API_SRV = 'https://www.dolistore.com';
+		}
+		if (empty($this->global->MAIN_MODULE_DOLISTORE_API_KEY)) {
+			$this->global->MAIN_MODULE_DOLISTORE_API_KEY = 'dolistorecatalogpublickey1234567';
+		}
 
 		// If we are in develop mode, we activate the option MAIN_SECURITY_CSRF_WITH_TOKEN to 1 if not already defined.
-		if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $this->global->MAIN_FEATURES_LEVEL >= 2) $this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;
+		if (!isset($this->global->MAIN_SECURITY_CSRF_WITH_TOKEN) && $this->global->MAIN_FEATURES_LEVEL >= 2) {
+			$this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;
+		}
 
-		if (defined('MAIN_ANTIVIRUS_COMMAND')) $this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
-		if (defined('MAIN_ANTIVIRUS_PARAM')) $this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');
+		if (defined('MAIN_ANTIVIRUS_COMMAND')) {
+			$this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
+		}
+		if (defined('MAIN_ANTIVIRUS_PARAM')) {
+			$this->global->MAIN_ANTIVIRUS_PARAM = constant('MAIN_ANTIVIRUS_PARAM');
+		}
 
-		if (!empty($this->global->MAIN_TZUSERINPUTKEY)) $this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY;	// 'tzserver' or 'tzuserrel'
+		if (!empty($this->global->MAIN_TZUSERINPUTKEY)) {
+			$this->tzuserinputkey = $this->global->MAIN_TZUSERINPUTKEY;	// 'tzserver' or 'tzuserrel'
+		}
 
 		if (!empty($this->global->PRODUIT_AUTOFILL_DESC)) {
 			$this->global->MAIN_NO_CONCAT_DESCRIPTION = 1;
@@ -704,17 +825,30 @@ class Conf
 		}
 
 		// For backward compatibility
-		if (isset($this->product))   $this->produit = $this->product;
-		if (isset($this->facture))   $this->invoice = $this->facture;
-		if (isset($this->commande))  $this->order = $this->commande;
-		if (isset($this->contrat))   $this->contract = $this->contrat;
-		if (isset($this->categorie)) $this->category = $this->categorie;
-		if (isset($this->project))   $this->project = $this->projet;
+		if (isset($this->product)) {
+			$this->produit = $this->product;
+		}
+		if (isset($this->facture)) {
+			$this->invoice = $this->facture;
+		}
+		if (isset($this->commande)) {
+			$this->order = $this->commande;
+		}
+		if (isset($this->contrat)) {
+			$this->contract = $this->contrat;
+		}
+		if (isset($this->categorie)) {
+			$this->category = $this->categorie;
+		}
+		if (isset($this->project)) {
+			$this->project = $this->projet;
+		}
 
 		// Object $mc
-		if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled))
-		{
-			if (is_object($mc)) $mc->setValues($this);
+		if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {
+			if (is_object($mc)) {
+				$mc->setValues($this);
+			}
 		}
 
 		if (!empty($this->syslog->enabled)) {
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
index ad7d93506f4..45018cb1d8f 100644
--- a/htdocs/core/class/coreobject.class.php
+++ b/htdocs/core/class/coreobject.class.php
@@ -59,15 +59,19 @@ class CoreObject extends CommonObject
 		$this->datec = 0;
 		$this->tms = 0;
 
-		if (!empty($this->fields))
-		{
-			foreach ($this->fields as $field=>$info)
-			{
-				if ($this->isDate($info)) $this->{$field} = time();
-				elseif ($this->isArray($info)) $this->{$field} = array();
-				elseif ($this->isInt($info)) $this->{$field} = (int) 0;
-				elseif ($this->isFloat($info)) $this->{$field} = (double) 0;
-				else $this->{$field} = '';
+		if (!empty($this->fields)) {
+			foreach ($this->fields as $field => $info) {
+				if ($this->isDate($info)) {
+					$this->{$field} = time();
+				} elseif ($this->isArray($info)) {
+					$this->{$field} = array();
+				} elseif ($this->isInt($info)) {
+					$this->{$field} = (int) 0;
+				} elseif ($this->isFloat($info)) {
+					$this->{$field} = (double) 0;
+				} else {
+					$this->{$field} = '';
+				}
 			}
 
 			$this->to_delete = false;
@@ -88,8 +92,7 @@ class CoreObject extends CommonObject
 	 */
 	private function checkFieldType($field, $type)
 	{
-		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type))
-		{
+		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type)) {
 			return $this->{'is_'.$type}($this->fields[$field]);
 		} else {
 			return false;
@@ -107,7 +110,9 @@ class CoreObject extends CommonObject
 	{
 		$res = $this->fetchCommon($id);
 		if ($res > 0) {
-			if ($loadChild) $this->fetchChild();
+			if ($loadChild) {
+				$this->fetchChild();
+			}
 		}
 
 		return $res;
@@ -125,11 +130,11 @@ class CoreObject extends CommonObject
 	 */
 	public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false)
 	{
-		if (!empty($id))
-		{
-			foreach ($this->{$tabName} as $k=>&$object)
-			{
-				if ($object->{$key} === $id) return $k;
+		if (!empty($id)) {
+			foreach ($this->{$tabName} as $k => &$object) {
+				if ($object->{$key} === $id) {
+					return $k;
+				}
 			}
 		}
 
@@ -137,8 +142,7 @@ class CoreObject extends CommonObject
 
 		$className = ucfirst($tabName);
 		$this->{$tabName}[$k] = new $className($this->db);
-		if ($id > 0 && $key === 'id' && $try_to_load)
-		{
+		if ($id > 0 && $key === 'id' && $try_to_load) {
 			$this->{$tabName}[$k]->fetch($id);
 		}
 
@@ -156,10 +160,8 @@ class CoreObject extends CommonObject
 	 */
 	public function removeChild($tabName, $id, $key = 'id')
 	{
-		foreach ($this->{$tabName} as &$object)
-		{
-			if ($object->{$key} == $id)
-			{
+		foreach ($this->{$tabName} as &$object) {
+			if ($object->{$key} == $id) {
 				$object->to_delete = true;
 				return true;
 			}
@@ -175,10 +177,8 @@ class CoreObject extends CommonObject
 	 */
 	public function fetchChild()
 	{
-		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
-		{
-			foreach ($this->childtables as &$childTable)
-			{
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
+			foreach ($this->childtables as &$childTable) {
 				$className = ucfirst($childTable);
 
 				$this->{$className} = array();
@@ -186,10 +186,8 @@ class CoreObject extends CommonObject
 				$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.$childTable.' WHERE '.$this->fk_element.' = '.$this->id;
 				$res = $this->db->query($sql);
 
-				if ($res)
-				{
-					while ($obj = $this->db->fetch_object($res))
-					{
+				if ($res) {
+					while ($obj = $this->db->fetch_object($res)) {
 						$o = new $className($this->db);
 						$o->fetch($obj->rowid);
 
@@ -210,19 +208,17 @@ class CoreObject extends CommonObject
 	 */
 	public function saveChild(User &$user)
 	{
-		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element))
-		{
-			foreach ($this->childtables as &$childTable)
-			{
+		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
+			foreach ($this->childtables as &$childTable) {
 				$className = ucfirst($childTable);
-				if (!empty($this->{$className}))
-				{
-					foreach ($this->{$className} as $i => &$object)
-					{
+				if (!empty($this->{$className})) {
+					foreach ($this->{$className} as $i => &$object) {
 						$object->{$this->fk_element} = $this->id;
 
 						$object->update($user);
-						if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) unset($this->{$className}[$i]);
+						if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) {
+							unset($this->{$className}[$i]);
+						}
 					}
 				}
 			}
@@ -238,26 +234,30 @@ class CoreObject extends CommonObject
 	 */
 	public function update(User &$user)
 	{
-		if (empty($this->id)) return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-		elseif (isset($this->to_delete) && $this->to_delete == true) return $this->delete($user);
+		if (empty($this->id)) {
+			return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
+		} elseif (isset($this->to_delete) && $this->to_delete == true) {
+			return $this->delete($user);
+		}
 
 		$error = 0;
 		$this->db->begin();
 
 		$res = $this->updateCommon($user);
-		if ($res)
-		{
+		if ($res) {
 			$result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
-			if ($result < 0) $error++;
-			else $this->saveChild($user);
+			if ($result < 0) {
+				$error++;
+			} else {
+				$this->saveChild($user);
+			}
 		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 		}
 
-		if (empty($error))
-		{
+		if (empty($error)) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -274,27 +274,30 @@ class CoreObject extends CommonObject
 	 */
 	public function create(User $user)
 	{
-		if ($this->id > 0) return $this->update($user);
+		if ($this->id > 0) {
+			return $this->update($user);
+		}
 
 		$error = 0;
 		$this->db->begin();
 
 		$res = $this->createCommon($user);
-		if ($res)
-		{
+		if ($res) {
 			$this->id = $this->db->last_insert_id($this->table_element);
 
 			$result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
-			if ($result < 0) $error++;
-			else $this->saveChild($user);
+			if ($result < 0) {
+				$error++;
+			} else {
+				$this->saveChild($user);
+			}
 		} else {
 			$error++;
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->error;
 		}
 
-		if (empty($error))
-		{
+		if (empty($error)) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -311,26 +314,25 @@ class CoreObject extends CommonObject
 	 */
 	public function delete(User &$user)
 	{
-		if ($this->id <= 0) return 0;
+		if ($this->id <= 0) {
+			return 0;
+		}
 
 		$error = 0;
 		$this->db->begin();
 
 		$result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->deleteCommon($user);
-			if ($this->withChild && !empty($this->childtables))
-			{
-				foreach ($this->childtables as &$childTable)
-				{
+			if ($this->withChild && !empty($this->childtables)) {
+				foreach ($this->childtables as &$childTable) {
 					$className = ucfirst($childTable);
-					if (!empty($this->{$className}))
-					{
-						foreach ($this->{$className} as &$object)
-						{
+					if (!empty($this->{$className})) {
+						foreach ($this->{$className} as &$object) {
 							$object->delete($user);
 						}
 					}
@@ -338,8 +340,7 @@ class CoreObject extends CommonObject
 			}
 		}
 
-		if (empty($error))
-		{
+		if (empty($error)) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -360,8 +361,9 @@ class CoreObject extends CommonObject
 	 */
 	public function getDate($field, $format = '')
 	{
-		if (empty($this->{$field})) return '';
-		else {
+		if (empty($this->{$field})) {
+			return '';
+		} else {
 			return dol_print_date($this->{$field}, $format);
 		}
 	}
@@ -375,8 +377,7 @@ class CoreObject extends CommonObject
 	 */
 	public function setDate($field, $date)
 	{
-		if (empty($date))
-		{
+		if (empty($date)) {
 			$this->{$field} = 0;
 		} else {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -395,13 +396,10 @@ class CoreObject extends CommonObject
 	 */
 	public function setValues(&$Tab)
 	{
-		foreach ($Tab as $key => $value)
-		{
-			if ($this->checkFieldType($key, 'date'))
-			{
+		foreach ($Tab as $key => $value) {
+			if ($this->checkFieldType($key, 'date')) {
 				$this->setDate($key, $value);
-			} elseif ($this->checkFieldType($key, 'float'))
-			{
+			} elseif ($this->checkFieldType($key, 'float')) {
 				$this->{$key} = (double) price2num($value);
 			} elseif ($this->checkFieldType($key, 'int')) {
 				$this->{$key} = (int) price2num($value);
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
index eb16cff53ea..c95822bf226 100644
--- a/htdocs/core/class/cproductnature.class.php
+++ b/htdocs/core/class/cproductnature.class.php
@@ -116,7 +116,7 @@ class CProductNature // extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		// Commit or rollback
 		if (!$resql) {
@@ -150,17 +150,19 @@ class CProductNature // extends CommonObject
 		$sql .= " t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		$sql_where = array();
-		if ($id)   $sql_where[] = " t.rowid = ".$id;
-		if ($code >= 0) $sql_where[] = " t.code = ".((int) $code);
+		if ($id) {
+			$sql_where[] = " t.rowid = ".$id;
+		}
+		if ($code >= 0) {
+			$sql_where[] = " t.code = ".((int) $code);
+		}
 		if (count($sql_where) > 0) {
 			$sql .= ' WHERE '.implode(' AND ', $sql_where);
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -172,7 +174,7 @@ class CProductNature // extends CommonObject
 
 			return 1;
 		} else {
-	  		$this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -232,8 +234,7 @@ class CProductNature // extends CommonObject
 			$this->records = array();
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) {
-				while ($obj = $this->db->fetch_object($resql))
-				{
+				while ($obj = $this->db->fetch_object($resql)) {
 					$record = new self($this->db);
 
 					$record->id    = $obj->rowid;
@@ -289,13 +290,13 @@ class CProductNature // extends CommonObject
 	}
 
 
- 	/**
- 	 *  Delete object in database
- 	 *
- 	 *	@param  User	$user        User that delete
- 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
- 	 *  @return	int					 <0 if KO, >0 if OK
- 	 */
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param  User	$user        User that delete
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 75ef9cc7f77..acddb09d547 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -92,9 +92,15 @@ class Cstate // extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);
-		if (isset($this->nom)) $this->nom = trim($this->nom);
-		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->code_departement)) {
+			$this->code_departement = trim($this->code_departement);
+		}
+		if (isset($this->nom)) {
+			$this->nom = trim($this->nom);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -114,19 +120,19 @@ class Cstate // extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_departements");
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -155,15 +161,16 @@ class Cstate // extends CommonObject
 		$sql .= " t.nom,";
 		$sql .= " t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_departements as t";
-		if ($id)   $sql .= " WHERE t.rowid = ".$id;
-		elseif ($code) $sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+		if ($id) {
+			$sql .= " WHERE t.rowid = ".$id;
+		} elseif ($code) {
+			$sql .= " WHERE t.code_departement = '".$this->db->escape($code)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -177,7 +184,7 @@ class Cstate // extends CommonObject
 
 			return 1;
 		} else {
-	  		$this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -196,9 +203,15 @@ class Cstate // extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code_departement)) $this->code_departement = trim($this->code_departement);
-		if (isset($this->nom)) $this->nom = trim($this->nom);
-		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->code_departement)) {
+			$this->code_departement = trim($this->code_departement);
+		}
+		if (isset($this->nom)) {
+			$this->nom = trim($this->nom);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
 
 
 		// Check parameters
@@ -215,7 +228,9 @@ class Cstate // extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
 		if ($error) {
@@ -231,13 +246,13 @@ class Cstate // extends CommonObject
 		}
 	}
 
- 	/**
- 	 *  Delete object in database
- 	 *
- 	 *	@param  User	$user        User that delete
- 	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
- 	 *  @return	int					 <0 if KO, >0 if OK
- 	 */
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param  User	$user        User that delete
+	 *  @param	int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -250,13 +265,13 @@ class Cstate // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index fccdec72ab6..ff2bcc58f40 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -83,11 +83,21 @@ class Ctypent // extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->id)) $this->id = trim($this->id);
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
-		if (isset($this->active)) $this->active = trim($this->active);
-		if (isset($this->module)) $this->module = trim($this->module);
+		if (isset($this->id)) {
+			$this->id = trim($this->id);
+		}
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->libelle)) {
+			$this->libelle = trim($this->libelle);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
+		if (isset($this->module)) {
+			$this->module = trim($this->module);
+		}
 
 
 
@@ -117,20 +127,19 @@ class Ctypent // extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_typent");
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -162,15 +171,17 @@ class Ctypent // extends CommonObject
 		$sql .= " t.active,";
 		$sql .= " t.module";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_typent as t";
-		if ($id)   $sql .= " WHERE t.id = ".$id;
-		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";
+		if ($id) {
+			$sql .= " WHERE t.id = ".$id;
+		} elseif ($code) {
+			$sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		} elseif ($label) {
+			$sql .= " WHERE t.libelle = '".$this->db->escape($label)."'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->id;
@@ -184,7 +195,7 @@ class Ctypent // extends CommonObject
 
 			return 1;
 		} else {
-	  		$this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -203,10 +214,18 @@ class Ctypent // extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->libelle)) $this->libelle = trim($this->libelle);
-		if (isset($this->active)) $this->active = trim($this->active);
-		if (isset($this->module)) $this->module = trim($this->module);
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->libelle)) {
+			$this->libelle = trim($this->libelle);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
+		if (isset($this->module)) {
+			$this->module = trim($this->module);
+		}
 
 
 		// Check parameters
@@ -224,13 +243,13 @@ class Ctypent // extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -243,13 +262,13 @@ class Ctypent // extends CommonObject
 	}
 
 
- 	/**
- 	 *  Delete object in database
- 	 *
- 	 *	@param  User	$user        User that delete
- 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
- 	 *  @return	int					 <0 if KO, >0 if OK
- 	 */
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param  User	$user        User that delete
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -262,13 +281,13 @@ class Ctypent // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 9d1e5c53de1..77d2fe507d3 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -172,9 +172,13 @@ class Ctyperesource
 
 
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		if ($id)   $sql .= " WHERE t.id = ".$id;
-		elseif ($code) $sql .= " WHERE t.code = '".$this->db->escape($code)."'";
-		elseif ($label) $sql .= " WHERE t.label = '".$this->db->escape($label)."'";
+		if ($id) {
+			$sql .= " WHERE t.id = ".$id;
+		} elseif ($code) {
+			$sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		} elseif ($label) {
+			$sql .= " WHERE t.label = '".$this->db->escape($label)."'";
+		}
 
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index c94919eb1dc..757e3fb0e66 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -86,13 +86,27 @@ class CUnits // extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->id)) $this->id = (int) $this->id;
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->label)) $this->libelle = trim($this->label);
-		if (isset($this->short_label)) $this->libelle = trim($this->short_label);
-		if (isset($this->unit_type)) $this->active = trim($this->unit_type);
-		if (isset($this->active)) $this->active = trim($this->active);
-		if (isset($this->scale)) $this->scale = trim($this->scale);
+		if (isset($this->id)) {
+			$this->id = (int) $this->id;
+		}
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			$this->libelle = trim($this->label);
+		}
+		if (isset($this->short_label)) {
+			$this->libelle = trim($this->short_label);
+		}
+		if (isset($this->unit_type)) {
+			$this->active = trim($this->unit_type);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
+		if (isset($this->scale)) {
+			$this->scale = trim($this->scale);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -116,20 +130,19 @@ class CUnits // extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."c_units");
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -166,19 +179,25 @@ class CUnits // extends CommonObject
 		$sql .= " t.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
 		$sql_where = array();
-		if ($id)   $sql_where[] = " t.rowid = ".$id;
-		if ($unit_type)   $sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";
-		if ($code) $sql_where[] = " t.code = '".$this->db->escape($code)."'";
-		if ($short_label) $sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";
+		if ($id) {
+			$sql_where[] = " t.rowid = ".$id;
+		}
+		if ($unit_type) {
+			$sql_where[] = " t.unit_type = '".$this->db->escape($unit_type)."'";
+		}
+		if ($code) {
+			$sql_where[] = " t.code = '".$this->db->escape($code)."'";
+		}
+		if ($short_label) {
+			$sql_where[] = " t.short_label = '".$this->db->escape($short_label)."'";
+		}
 		if (count($sql_where) > 0) {
 			$sql .= ' WHERE '.implode(' AND ', $sql_where);
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -194,7 +213,7 @@ class CUnits // extends CommonObject
 
 			return 1;
 		} else {
-	  		$this->error = "Error ".$this->db->lasterror();
+			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
 	}
@@ -295,12 +314,24 @@ class CUnits // extends CommonObject
 		$error = 0;
 
 		// Clean parameters
-		if (isset($this->code)) $this->code = trim($this->code);
-		if (isset($this->label)) $this->libelle = trim($this->label);
-		if (isset($this->short_label)) $this->libelle = trim($this->short_label);
-		if (isset($this->unit_type)) $this->libelle = trim($this->unit_type);
-		if (isset($this->scale)) $this->scale = trim($this->scale);
-		if (isset($this->active)) $this->active = trim($this->active);
+		if (isset($this->code)) {
+			$this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			$this->libelle = trim($this->label);
+		}
+		if (isset($this->short_label)) {
+			$this->libelle = trim($this->short_label);
+		}
+		if (isset($this->unit_type)) {
+			$this->libelle = trim($this->unit_type);
+		}
+		if (isset($this->scale)) {
+			$this->scale = trim($this->scale);
+		}
+		if (isset($this->active)) {
+			$this->active = trim($this->active);
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -319,13 +350,13 @@ class CUnits // extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -338,13 +369,13 @@ class CUnits // extends CommonObject
 	}
 
 
- 	/**
- 	 *  Delete object in database
- 	 *
- 	 *	@param  User	$user        User that delete
- 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
- 	 *  @return	int					 <0 if KO, >0 if OK
- 	 */
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param  User	$user        User that delete
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -357,13 +388,13 @@ class CUnits // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -414,8 +445,7 @@ class CUnits // extends CommonObject
 		if ($fk_new_unit != 0) {
 			// Calcul en unité de base
 			$scaleUnitPow = $this->scaleOfUnitPow($fk_new_unit);
-			if (!empty($scaleUnitPow))
-			{
+			if (!empty($scaleUnitPow)) {
 				// convert to new unit
 				$value = $value / $scaleUnitPow;
 			}
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index af336c38745..310f141fc1c 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -126,8 +126,7 @@ class DiscountAbsolute
 		global $conf;
 
 		// Check parameters
-		if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source)
-		{
+		if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source) {
 			$this->error = 'ErrorBadParameters';
 			return -1;
 		}
@@ -144,16 +143,20 @@ class DiscountAbsolute
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
 		$sql .= " WHERE sr.entity IN (".getEntity('invoice').")";
-		if ($rowid) $sql .= " AND sr.rowid=".$rowid;
-		if ($fk_facture_source) $sql .= " AND sr.fk_facture_source=".$fk_facture_source;
-		if ($fk_invoice_supplier_source) $sql .= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+		if ($rowid) {
+			$sql .= " AND sr.rowid=".$rowid;
+		}
+		if ($fk_facture_source) {
+			$sql .= " AND sr.fk_facture_source=".$fk_facture_source;
+		}
+		if ($fk_invoice_supplier_source) {
+			$sql .= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -219,22 +222,28 @@ class DiscountAbsolute
 		$this->multicurrency_amount_tva = price2num($this->multicurrency_amount_tva);
 		$this->multicurrency_amount_ttc = price2num($this->multicurrency_amount_ttc);
 
-		if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht = 0;
-		if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva = 0;
-		if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc = 0;
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
+		if (empty($this->multicurrency_amount_ht)) {
+			$this->multicurrency_amount_ht = 0;
+		}
+		if (empty($this->multicurrency_amount_tva)) {
+			$this->multicurrency_amount_tva = 0;
+		}
+		if (empty($this->multicurrency_amount_ttc)) {
+			$this->multicurrency_amount_ttc = 0;
+		}
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
 
 		// Check parameters
-		if (empty($this->description))
-		{
+		if (empty($this->description)) {
 			$this->error = 'BadValueForPropertyDescription';
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
 		}
 
 		$userid = $user->id;
-		if (!($userid > 0))		// For example when record is saved into an anonymous context with a not loaded object $user.
-		{
+		if (!($userid > 0)) {		// For example when record is saved into an anonymous context with a not loaded object $user.
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$tmpinvoice = new Facture($this->db);
 			$tmpinvoice->fetch($this->fk_facture_source);
@@ -257,8 +266,7 @@ class DiscountAbsolute
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
 			return $this->id;
 		} else {
@@ -279,8 +287,7 @@ class DiscountAbsolute
 		global $conf, $langs;
 
 		// Check if we can remove the discount
-		if ($this->fk_facture_source)
-		{
+		if ($this->fk_facture_source) {
 			$sql = "SELECT COUNT(rowid) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
 			$sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
@@ -290,11 +297,9 @@ class DiscountAbsolute
 
 			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
-				if ($obj->nb > 0)
-				{
+				if ($obj->nb > 0) {
 					$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
 					return -2;
 				}
@@ -305,8 +310,7 @@ class DiscountAbsolute
 		}
 
 		// Check if we can remove the discount
-		if ($this->fk_invoice_supplier_source)
-		{
+		if ($this->fk_invoice_supplier_source) {
 			$sql = "SELECT COUNT(rowid) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
 			$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount
@@ -316,11 +320,9 @@ class DiscountAbsolute
 
 			dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
-				if ($obj->nb > 0)
-				{
+				if ($obj->nb > 0) {
 					$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
 					return -2;
 				}
@@ -334,9 +336,13 @@ class DiscountAbsolute
 
 		// Delete but only if not used
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-		if ($this->fk_facture_source) $sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie
-		elseif ($this->fk_invoice_supplier_source) $sql .= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source; // Delete all lines of same serie
-		else $sql .= " WHERE rowid = ".$this->id; // Delete only line
+		if ($this->fk_facture_source) {
+			$sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie
+		} elseif ($this->fk_invoice_supplier_source) {
+			$sql .= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source; // Delete all lines of same serie
+		} else {
+			$sql .= " WHERE rowid = ".$this->id; // Delete only line
+		}
 		$sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount
 		$sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit
 		$sql .= " AND (fk_invoice_supplier_line IS NULL"; // Not used as absolute simple discount
@@ -344,19 +350,16 @@ class DiscountAbsolute
 
 		dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			// If source of discount was a credit note or deposit, we change source statut.
-			if ($this->fk_facture_source)
-			{
+			if ($this->fk_facture_source) {
 				$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
 				$sql .= " set paye=0, fk_statut=1";
 				$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
 
 				dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
 				$result = $this->db->query($sql);
-				if ($result)
-				{
+				if ($result) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -371,8 +374,7 @@ class DiscountAbsolute
 
 				dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
 				$result = $this->db->query($sql);
-				if ($result)
-				{
+				if ($result) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -407,31 +409,36 @@ class DiscountAbsolute
 	{
 		// phpcs:enable
 		// Check parameters
-		if (!$rowidline && !$rowidinvoice)
-		{
+		if (!$rowidline && !$rowidinvoice) {
 			$this->error = 'ErrorBadParameters';
 			return -1;
 		}
-		if ($rowidline && $rowidinvoice)
-		{
+		if ($rowidline && $rowidinvoice) {
 			$this->error = 'ErrorBadParameters';
 			return -2;
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
 		if (!empty($this->discount_type)) {
-			if ($rowidline)    $sql .= " SET fk_invoice_supplier_line = ".$rowidline;
-			if ($rowidinvoice) $sql .= " SET fk_invoice_supplier = ".$rowidinvoice;
+			if ($rowidline) {
+				$sql .= " SET fk_invoice_supplier_line = ".$rowidline;
+			}
+			if ($rowidinvoice) {
+				$sql .= " SET fk_invoice_supplier = ".$rowidinvoice;
+			}
 		} else {
-			if ($rowidline)    $sql .= " SET fk_facture_line = ".$rowidline;
-			if ($rowidinvoice) $sql .= " SET fk_facture = ".$rowidinvoice;
+			if ($rowidline) {
+				$sql .= " SET fk_facture_line = ".$rowidline;
+			}
+			if ($rowidinvoice) {
+				$sql .= " SET fk_facture = ".$rowidinvoice;
+			}
 		}
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			if (!empty($this->discount_type)) {
 				$this->fk_invoice_supplier_line = $rowidline;
 				$this->fk_invoice_supplier = $rowidinvoice;
@@ -467,8 +474,7 @@ class DiscountAbsolute
 
 		dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			return 1;
 		} else {
 			$this->error = $this->db->error();
@@ -503,22 +509,28 @@ class DiscountAbsolute
 		} else {
 			$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
 		}
-		if (is_object($company)) $sql .= " AND rc.fk_soc = ".$company->id;
-		if (is_object($user))    $sql .= " AND rc.fk_user = ".$user->id;
-		if ($filter)   $sql .= ' AND ('.$filter.')';
-		if ($maxvalue) $sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
+		if (is_object($company)) {
+			$sql .= " AND rc.fk_soc = ".$company->id;
+		}
+		if (is_object($user)) {
+			$sql .= " AND rc.fk_user = ".$user->id;
+		}
+		if ($filter) {
+			$sql .= ' AND ('.$filter.')';
+		}
+		if ($maxvalue) {
+			$sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			//while ($obj)
 			//{
 			//print 'zz'.$obj->amount;
 			//$obj = $this->db->fetch_object($resql);
 			//}
-			if ($multicurrency)
-			{
+			if ($multicurrency) {
 				return $obj->amount_multicurrency;
 			}
 
@@ -540,14 +552,12 @@ class DiscountAbsolute
 	{
 		dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
 
-		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-		{
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice') {
 			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
 			$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
 			$sql .= ' AND f.type = 3';
-		} elseif ($invoice->element == 'invoice_supplier')
-		{
+		} elseif ($invoice->element == 'invoice_supplier') {
 			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
 			$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
@@ -559,11 +569,13 @@ class DiscountAbsolute
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($multicurrency == 1) return $obj->multicurrency_amount;
-			else return $obj->amount;
+			if ($multicurrency == 1) {
+				return $obj->multicurrency_amount;
+			} else {
+				return $obj->amount;
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -581,14 +593,12 @@ class DiscountAbsolute
 	{
 		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
 
-		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-		{
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice') {
 			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
 			$sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
 			$sql .= ' AND f.type IN ('.$invoice::TYPE_STANDARD.', '.$invoice::TYPE_CREDIT_NOTE.', '.$invoice::TYPE_SITUATION.')'; // Find discount coming from credit note or excess received
-		} elseif ($invoice->element == 'invoice_supplier')
-		{
+		} elseif ($invoice->element == 'invoice_supplier') {
 			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
 			$sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
@@ -600,11 +610,13 @@ class DiscountAbsolute
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($multicurrency == 1) return $obj->multicurrency_amount;
-			else return $obj->amount;
+			if ($multicurrency == 1) {
+				return $obj->multicurrency_amount;
+			} else {
+				return $obj->amount;
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -621,13 +633,11 @@ class DiscountAbsolute
 	{
 		dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
 
-		if ($invoice->element == 'facture' || $invoice->element == 'invoice')
-		{
+		if ($invoice->element == 'facture' || $invoice->element == 'invoice') {
 			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
 			$sql .= ' WHERE rc.fk_facture IS NULL AND rc.fk_facture_source = '.$invoice->id;
-		} elseif ($invoice->element == 'invoice_supplier')
-		{
+		} elseif ($invoice->element == 'invoice_supplier') {
 			$sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc';
 			$sql .= ' WHERE rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_source = '.$invoice->id;
@@ -638,11 +648,13 @@ class DiscountAbsolute
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
+			if ($multicurrency) {
+				return $obj->multicurrency_amount;
+			} else {
+				return $obj->amount;
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 			return -1;
@@ -685,8 +697,12 @@ class DiscountAbsolute
 		}
 
 
-		if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto) {
+			$result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result .= ' ';
+		}
 		$result .= $link.$ref.$linkend;
 		return $result;
 	}
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index a5405fd7158..c9f3d3837d1 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -70,8 +70,12 @@ class DolEditor
 
 		dol_syslog(get_class($this)."::DolEditor htmlname=".$htmlname." width=".$width." height=".$height." toolbarname=".$toolbarname);
 
-		if (!$rows) $rows = round($height / 20);
-		if (!$cols) $cols = ($width ?round($width / 6) : 80);
+		if (!$rows) {
+			$rows = round($height / 20);
+		}
+		if (!$cols) {
+			$cols = ($width ?round($width / 6) : 80);
+		}
 		$shorttoolbarname = preg_replace('/_encoded$/', '', $toolbarname);
 
 		// Name of extended editor to use (FCKEDITOR_EDITORNAME can be 'ckeditor' or 'fckeditor')
@@ -81,17 +85,19 @@ class DolEditor
 		$this->readonly = $readonly;
 
 		// Check if extended editor is ok. If not we force textarea
-		if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) $this->tool = 'textarea';
-		if ($okforextendededitor === 'ace') $this->tool = 'ace';
+		if ((empty($conf->fckeditor->enabled) && $okforextendededitor != 'ace') || empty($okforextendededitor)) {
+			$this->tool = 'textarea';
+		}
+		if ($okforextendededitor === 'ace') {
+			$this->tool = 'ace';
+		}
 		//if ($conf->dol_use_jmobile) $this->tool = 'textarea';       // ckeditor and ace seems ok with mobile
 
 		// Define some properties
-		if (in_array($this->tool, array('textarea', 'ckeditor', 'ace')))
-		{
+		if (in_array($this->tool, array('textarea', 'ckeditor', 'ace'))) {
 			if ($this->tool == 'ckeditor' && !dol_textishtml($content)) {	// We force content to be into HTML if we are using an advanced editor if content is not HTML.
 				$this->content = dol_nl2br($content);
-			}
-			else {
+			} else {
 				$this->content = $content;
 			}
 			$this->htmlname 			= $htmlname;
@@ -122,16 +128,14 @@ class DolEditor
 		global $conf, $langs;
 
 		$fullpage = false;
-		if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT))
-		{
+		if (isset($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT)) {
 			$disallowAnyContent = empty($conf->global->FCKEDITOR_ALLOW_ANY_CONTENT); // Only predefined list of html tags are allowed or all
 		}
 
 		$found = 0;
 		$out = '';
 
-		if (in_array($this->tool, array('textarea', 'ckeditor')))
-		{
+		if (in_array($this->tool, array('textarea', 'ckeditor'))) {
 			$found = 1;
 			//$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
 			// TODO We do not put the 'disabled' tag because on a read form, it change style with grey.
@@ -140,9 +144,10 @@ class DolEditor
 			$out .= htmlspecialchars($this->content);
 			$out .= '</textarea>';
 
-			if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && !empty($conf->fckeditor->enabled))
-			{
-				if (!defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR', '1');
+			if ($this->tool == 'ckeditor' && !empty($conf->use_javascript_ajax) && !empty($conf->fckeditor->enabled)) {
+				if (!defined('REQUIRE_CKEDITOR')) {
+					define('REQUIRE_CKEDITOR', '1');
+				}
 
 				if (!empty($conf->global->FCKEDITOR_SKIN)) {
 					$skin = $conf->global->FCKEDITOR_SKIN;
@@ -191,8 +196,7 @@ class DolEditor
                                             },
 											disableNativeSpellChecker: '.(empty($conf->global->CKEDITOR_NATIVE_SPELLCHECKER) ? 'true' : 'false');
 
-				if ($this->uselocalbrowser)
-				{
+				if ($this->uselocalbrowser) {
 					$out .= ','."\n";
 					// To use filemanager with old fckeditor (GPL)
 					$out .= '    filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,';
@@ -202,11 +206,11 @@ class DolEditor
 					$out .= "\n";
 					// To use filemanager with ckfinder (Non free) and ckfinder directory is inside htdocs/includes
 					/* $out.= '    filebrowserBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html\',
-                               filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
-                               filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',
-                               filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files\',
-                               filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images\',
-                               filebrowserFlashUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash\','."\n";
+							   filebrowserImageBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Images\',
+							   filebrowserFlashBrowseUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/ckfinder.html?Type=Flash\',
+							   filebrowserUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Files\',
+							   filebrowserImageUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Images\',
+							   filebrowserFlashUploadUrl : \''.DOL_URL_ROOT.'/includes/ckfinder/core/connector/php/connector.php?command=QuickUpload&type=Flash\','."\n";
 					*/
 					$out .= '    filebrowserWindowWidth : \'900\',
                                filebrowserWindowHeight : \'500\',
@@ -221,15 +225,13 @@ class DolEditor
 
 		// Output editor ACE
 		// Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
-		if (preg_match('/^ace/', $this->tool))
-		{
+		if (preg_match('/^ace/', $this->tool)) {
 			$found = 1;
 			$format = $option;
 
 			$out .= "\n".'<!-- Output Ace editor -->'."\n";
 
-			if ($titlecontent)
-			{
+			if ($titlecontent) {
 				$out .= '<div class="aceeditorstatusbar" id="statusBar'.$this->htmlname.'">'.$titlecontent;
 				$out .= ' &nbsp; - &nbsp; <a id="morelines" href="#" class="right morelines'.$this->htmlname.' reposition">'.dol_escape_htmltag($langs->trans("ShowMoreLines")).'</a> &nbsp; &nbsp; ';
 				$out .= '</div>';
@@ -304,12 +306,14 @@ class DolEditor
 			$out .= '</script>'."\n";
 		}
 
-		if (empty($found))
-		{
+		if (empty($found)) {
 			$out .= 'Error, unknown value for tool '.$this->tool.' in DolEditor Create function.';
 		}
 
-		if ($noprint) return $out;
-		else print $out;
+		if ($noprint) {
+			return $out;
+		} else {
+			print $out;
+		}
 	}
 }
diff --git a/htdocs/core/class/dolgeoip.class.php b/htdocs/core/class/dolgeoip.class.php
index 98fbe62e4c5..0eecbbf6d36 100644
--- a/htdocs/core/class/dolgeoip.class.php
+++ b/htdocs/core/class/dolgeoip.class.php
@@ -46,54 +46,48 @@ class DolGeoIP
 		global $conf;
 
 		$geoipversion = '2'; // 'php', or '2'
-		if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+		if (!empty($conf->global->GEOIP_VERSION)) {
+			$geoipversion = $conf->global->GEOIP_VERSION;
+		}
 
-		if ($type == 'country')
-		{
+		if ($type == 'country') {
 			// geoip may have been already included with PEAR
-			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))
-			{
+			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name'))) {
 				require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
 			}
-		} elseif ($type == 'city')
-		{
+		} elseif ($type == 'city') {
 			// geoip may have been already included with PEAR
-			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name')))
-			{
+			if ($geoipversion == '2' || ($geoipversion != 'php' && !function_exists('geoip_country_code_by_name'))) {
 				require_once DOL_DOCUMENT_ROOT.'/includes/geoip2/geoip2.phar';
 			}
-		} else { print 'ErrorBadParameterInConstructor'; return 0; }
+		} else {
+			print 'ErrorBadParameterInConstructor'; return 0;
+		}
 
 		// Here, function exists (embedded into PHP or exists because we made include)
-		if (empty($type) || empty($datfile))
-		{
+		if (empty($type) || empty($datfile)) {
 			$this->errorlabel = 'Constructor was called with no datafile parameter';
 			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 			return 0;
 		}
-		if (!file_exists($datfile) || !is_readable($datfile))
-		{
+		if (!file_exists($datfile) || !is_readable($datfile)) {
 			$this->error = 'ErrorGeoIPClassNotInitialized';
 			$this->errorlabel = "Datafile ".$datfile." not found";
 			dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 			return 0;
 		}
 
-		if ($geoipversion == '2')
-		{
+		if ($geoipversion == '2') {
 			try {
 				$this->gi = new GeoIp2\Database\Reader($datfile); // '/usr/local/share/GeoIP/GeoIP2-City.mmdb'
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				$this->error = $e->getMessage();
 				dol_syslog('DolGeoIP '.$this->errorlabel, LOG_ERR);
 				return 0;
 			}
-		} elseif (function_exists('geoip_open'))
-		{
+		} elseif (function_exists('geoip_open')) {
 			$this->gi = geoip_open($datfile, GEOIP_STANDARD);
-		}
-		elseif (function_exists('geoip_country_code_by_name')) {
+		} elseif (function_exists('geoip_country_code_by_name')) {
 			$this->gi = 'NOGI'; // We are using embedded php geoip functions
 			//print 'function_exists(geoip_country_code_by_name))='.function_exists('geoip_country_code_by_name');
 			//print geoip_database_info();
@@ -113,21 +107,19 @@ class DolGeoIP
 		global $conf;
 
 		$geoipversion = '2'; // 'php', or '2'
-		if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+		if (!empty($conf->global->GEOIP_VERSION)) {
+			$geoipversion = $conf->global->GEOIP_VERSION;
+		}
 
-		if (empty($this->gi))
-		{
+		if (empty($this->gi)) {
 			return '';
 		}
-		if ($this->gi == 'NOGI')
-		{
+		if ($this->gi == 'NOGI') {
 			// geoip_country_code_by_addr does not exists
 			return strtolower(geoip_country_code_by_name($ip));
 		} else {
-			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip))
-			{
-				if ($geoipversion == '2')
-				{
+			if (preg_match('/^[0-9]+.[0-9]+\.[0-9]+\.[0-9]+/', $ip)) {
+				if ($geoipversion == '2') {
 					try {
 						$record = $this->gi->country($ip);
 						return strtolower($record->country->isoCode);
@@ -136,12 +128,13 @@ class DolGeoIP
 						return '';
 					}
 				} else {
-					if (!function_exists('geoip_country_code_by_addr')) return strtolower(geoip_country_code_by_name($this->gi, $ip));
+					if (!function_exists('geoip_country_code_by_addr')) {
+						return strtolower(geoip_country_code_by_name($this->gi, $ip));
+					}
 					return strtolower(geoip_country_code_by_addr($this->gi, $ip));
 				}
 			} else {
-				if ($geoipversion == '2')
-				{
+				if ($geoipversion == '2') {
 					try {
 						$record = $this->gi->country($ip);
 						return strtolower($record->country->isoCode);
@@ -150,7 +143,9 @@ class DolGeoIP
 						return '';
 					}
 				} else {
-					if (!function_exists('geoip_country_code_by_addr_v6')) return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
+					if (!function_exists('geoip_country_code_by_addr_v6')) {
+						return strtolower(geoip_country_code_by_name_v6($this->gi, $ip));
+					}
 					return strtolower(geoip_country_code_by_addr_v6($this->gi, $ip));
 				}
 			}
@@ -168,15 +163,15 @@ class DolGeoIP
 		global $conf;
 
 		$geoipversion = '2'; // 'php', or '2'
-		if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+		if (!empty($conf->global->GEOIP_VERSION)) {
+			$geoipversion = $conf->global->GEOIP_VERSION;
+		}
 
-		if (empty($this->gi))
-		{
+		if (empty($this->gi)) {
 			return '';
 		}
 
-		if ($geoipversion == '2')
-		{
+		if ($geoipversion == '2') {
 			try {
 				$record = $this->gi->country($name);
 				return $record->country->isoCode;
@@ -199,12 +194,16 @@ class DolGeoIP
 		global $conf;
 
 		$geoipversion = '2'; // 'php', or '2'
-		if (!empty($conf->global->GEOIP_VERSION)) $geoipversion = $conf->global->GEOIP_VERSION;
+		if (!empty($conf->global->GEOIP_VERSION)) {
+			$geoipversion = $conf->global->GEOIP_VERSION;
+		}
 
-		if ($geoipversion == 'php')
-		{
-			if ($this->gi == 'NOGI') return geoip_database_info();
-			else return 'geoip_database_info() function not available';
+		if ($geoipversion == 'php') {
+			if ($this->gi == 'NOGI') {
+				return geoip_database_info();
+			} else {
+				return 'geoip_database_info() function not available';
+			}
 		}
 
 		return 'Not available (not using PHP internal geo functions - We are using embedded Geoip v'.$geoipversion.')';
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index fada0975938..607993dc325 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -114,9 +114,15 @@ class DolGraph
 		$color_file = DOL_DOCUMENT_ROOT . '/theme/' . $conf->theme . '/theme_vars.inc.php';
 		if (is_readable($color_file)) {
 			include_once $color_file;
-			if (isset($theme_bordercolor)) $this->bordercolor = $theme_bordercolor;
-			if (isset($theme_datacolor))   $this->datacolor   = $theme_datacolor;
-			if (isset($theme_bgcolor))     $this->bgcolor     = $theme_bgcolor;
+			if (isset($theme_bordercolor)) {
+				$this->bordercolor = $theme_bordercolor;
+			}
+			if (isset($theme_datacolor)) {
+				$this->datacolor   = $theme_datacolor;
+			}
+			if (isset($theme_bgcolor)) {
+				$this->bgcolor     = $theme_bgcolor;
+			}
 		}
 		//print 'bgcolor: '.join(',',$this->bgcolor).'<br>';
 
@@ -597,7 +603,9 @@ class DolGraph
 	public function GetMaxValueInData()
 	{
 		// phpcs:enable
-		if (!is_array($this->data)) return 0;
+		if (!is_array($this->data)) {
+			return 0;
+		}
 
 		$k = 0;
 		$vals = array();
@@ -624,7 +632,9 @@ class DolGraph
 	public function GetMinValueInData()
 	{
 		// phpcs:enable
-		if (!is_array($this->data)) return 0;
+		if (!is_array($this->data)) {
+			return 0;
+		}
 
 		$k = 0;
 		$vals = array();
@@ -652,7 +662,9 @@ class DolGraph
 	{
 		// phpcs:enable
 		$max = $this->GetMaxValueInData();
-		if ($max != 0) $max++;
+		if ($max != 0) {
+			$max++;
+		}
 		$size = dol_strlen(abs(ceil($max)));
 		$factor = 1;
 		for ($i = 0; $i < ($size - 1); $i++) {
@@ -660,7 +672,9 @@ class DolGraph
 		}
 
 		$res = 0;
-		if (is_numeric($max)) $res = ceil($max / $factor) * $factor;
+		if (is_numeric($max)) {
+			$res = ceil($max / $factor) * $factor;
+		}
 
 		//print "max=".$max." res=".$res;
 		return $res;
@@ -676,8 +690,12 @@ class DolGraph
 	{
 		// phpcs:enable
 		$min = $this->GetMinValueInData();
-		if ($min == '') $min = 0;
-		if ($min != 0) $min--;
+		if ($min == '') {
+			$min = 0;
+		}
+		if ($min != 0) {
+			$min--;
+		}
 		$size = dol_strlen(abs(floor($min)));
 		$factor = 1;
 		for ($i = 0; $i < ($size - 1); $i++) {
@@ -751,22 +769,22 @@ class DolGraph
 		if (is_array($this->data) && is_array($this->data[0])) {
 			$nblot = count($this->data[0]) - 1; // -1 to remove legend
 		}
-		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		if ($nblot < 0) {
+			dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		}
 		$firstlot = 0;
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
 
 		$i = $firstlot;
 		$serie = array();
-		while ($i < $nblot)	// Loop on each serie
-		{
+		while ($i < $nblot) {	// Loop on each serie
 			$values = array(); // Array with horizontal y values (specific values of a serie) for each abscisse x
 			$serie[$i] = "var d" . $i . " = [];\n";
 
 			// Fill array $values
 			$x = 0;
-			foreach ($this->data as $valarray)	// Loop on each x
-			{
+			foreach ($this->data as $valarray) {	// Loop on each x
 				$legends[$x] = $valarray[0];
 				$values[$x]  = (is_numeric($valarray[$i + 1]) ? $valarray[$i + 1] : null);
 				$x++;
@@ -774,11 +792,15 @@ class DolGraph
 
 			if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {
 				foreach ($values as $x => $y) {
-					if (isset($y)) $serie[$i] .= 'd' . $i . '.push({"label":"' . dol_escape_js($legends[$x]) . '", "data":' . $y . '});' . "\n";
+					if (isset($y)) {
+						$serie[$i] .= 'd' . $i . '.push({"label":"' . dol_escape_js($legends[$x]) . '", "data":' . $y . '});' . "\n";
+					}
 				}
 			} else {
 				foreach ($values as $x => $y) {
-					if (isset($y)) $serie[$i] .= 'd' . $i . '.push([' . $x . ', ' . $y . ']);' . "\n";
+					if (isset($y)) {
+						$serie[$i] .= 'd' . $i . '.push([' . $x . ', ' . $y . ']);' . "\n";
+					}
 				}
 			}
 
@@ -788,7 +810,9 @@ class DolGraph
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
 		$this->stringtoshow = '<!-- Build using jflot -->' . "\n";
-		if (!empty($this->title)) $this->stringtoshow .= '<div class="center dolgraphtitle' . (empty($this->cssprefix) ? '' : ' dolgraphtitle' . $this->cssprefix) . '">' . $this->title . '</div>';
+		if (!empty($this->title)) {
+			$this->stringtoshow .= '<div class="center dolgraphtitle' . (empty($this->cssprefix) ? '' : ' dolgraphtitle' . $this->cssprefix) . '">' . $this->title . '</div>';
+		}
 		if (!empty($this->shownographyet)) {
 			$this->stringtoshow .= '<div style="width:' . $this->width . 'px;height:' . $this->height . 'px;" class="nographyet"></div>';
 			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';
@@ -797,7 +821,9 @@ class DolGraph
 
 		// Start the div that will contains all the graph
 		$dolxaxisvertical = '';
-		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';
+		if (count($this->data) > 20) {
+			$dolxaxisvertical = 'dol-xaxis-vertical';
+		}
 		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="width:' . $this->width . 'px;height:' . $this->height . 'px;" class="dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"></div>' . "\n";
 
 		$this->stringtoshow .= '<script id="' . $tag . '">' . "\n";
@@ -818,8 +844,11 @@ class DolGraph
 		if (isset($this->type[$firstlot]) && in_array($this->type[$firstlot], array('pie', 'piesemicircle', 'polar'))) {
 			$datacolor = array();
 			foreach ($this->datacolor as $val) {
-				if (is_array($val)) $datacolor[] = "#" . sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]); // If datacolor is array(R, G, B)
-				else $datacolor[] = "#" . str_replace(array('#', '-'), '', $val); // If $val is '124' or '#124'
+				if (is_array($val)) {
+					$datacolor[] = "#" . sprintf("%02x%02x%02x", $val[0], $val[1], $val[2]); // If datacolor is array(R, G, B)
+				} else {
+					$datacolor[] = "#" . str_replace(array('#', '-'), '', $val); // If $val is '124' or '#124'
+				}
 			}
 
 			$urltemp = ''; // TODO Add support for url link into labels
@@ -847,13 +876,17 @@ class DolGraph
 								var number=series.data[0][1];
 								return \'';
 			$this->stringtoshow .= '<span style="font-size:8pt;text-align:center;padding:2px;color:black;">';
-			if ($urltemp) $this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="' . $urltemp . '">';
+			if ($urltemp) {
+				$this->stringtoshow .= '<a style="color: #FFFFFF;" border="0" href="' . $urltemp . '">';
+			}
 			$this->stringtoshow .= '\'+';
 			$this->stringtoshow .= ($showlegend ? '' : 'label+\' \'+'); // Hide label if already shown in legend
 			$this->stringtoshow .= ($showpointvalue ? 'number+' : '');
 			$this->stringtoshow .= ($showpercent ? '\'<br/>\'+percent+\'%\'+' : '');
 			$this->stringtoshow .= '\'';
-			if ($urltemp) $this->stringtoshow .= '</a>';
+			if ($urltemp) {
+				$this->stringtoshow .= '</a>';
+			}
 			$this->stringtoshow .= '</span>\';
 							},
 							background: {
@@ -912,9 +945,11 @@ class DolGraph
 						var y = item.datapoint[1].toFixed(2);
 						var z = item.series.xaxis.ticks[item.dataIndex].label;
 						';
-			if ($this->showpointvalue > 0) $this->stringtoshow .= '
+			if ($this->showpointvalue > 0) {
+				$this->stringtoshow .= '
 							showTooltip_' . $tag . '(item.pageX, item.pageY, item.series.label + "<br>" + z + " => " + y);
 						';
+			}
 			$this->stringtoshow .= '
 					}
 				}
@@ -931,18 +966,28 @@ class DolGraph
 			$this->stringtoshow .= '$.plot($("#placeholder_' . $tag . '"), [ ' . "\n";
 			$i = $firstlot;
 			while ($i < $nblot) {
-				if ($i > $firstlot) $this->stringtoshow .= ', ' . "\n";
+				if ($i > $firstlot) {
+					$this->stringtoshow .= ', ' . "\n";
+				}
 				$color = sprintf("%02x%02x%02x", $this->datacolor[$i][0], $this->datacolor[$i][1], $this->datacolor[$i][2]);
 				$this->stringtoshow .= '{ ';
 				if (!isset($this->type[$i]) || $this->type[$i] == 'bars') {
 					if ($nblot == 3) {
-						if ($i == $firstlot) $align = 'right';
-						elseif ($i == $firstlot + 1) $align = 'center';
-						else $align = 'left';
+						if ($i == $firstlot) {
+							$align = 'right';
+						} elseif ($i == $firstlot + 1) {
+							$align = 'center';
+						} else {
+							$align = 'left';
+						}
 						$this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . $align . '", barWidth: 0.45 }, ';
-					} else $this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . ($i == $firstlot ? 'center' : 'left') . '", barWidth: 0.5 }, ';
+					} else {
+						$this->stringtoshow .= 'bars: { lineWidth: 1, show: true, align: "' . ($i == $firstlot ? 'center' : 'left') . '", barWidth: 0.5 }, ';
+					}
+				}
+				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) {
+					$this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: ' . ($this->type[$i] == 'linesnopoint' ? 'false' : 'true') . ' }, ';
 				}
-				if (isset($this->type[$i]) && ($this->type[$i] == 'lines' || $this->type[$i] == 'linesnopoint')) $this->stringtoshow .= 'lines: { show: true, fill: false }, points: { show: ' . ($this->type[$i] == 'linesnopoint' ? 'false' : 'true') . ' }, ';
 				$this->stringtoshow .= 'color: "#' . $color . '", label: "' . (isset($this->Legend[$i]) ? dol_escape_js($this->Legend[$i]) : '') . '", data: d' . $i . ' }';
 				$i++;
 			}
@@ -953,7 +998,9 @@ class DolGraph
 			$this->stringtoshow .= ', xaxis: { ticks: [' . "\n";
 			$x = 0;
 			foreach ($this->data as $key => $valarray) {
-				if ($x > 0) $this->stringtoshow .= ', ' . "\n";
+				if ($x > 0) {
+					$this->stringtoshow .= ', ' . "\n";
+				}
 				$this->stringtoshow .= ' [' . $x . ', "' . $valarray[0] . '"]';
 				$x++;
 			}
@@ -1010,13 +1057,14 @@ class DolGraph
 		$legends = array();
 		$nblot = 0;
 		if (is_array($this->data)) {
-			foreach ($this->data as $valarray)      // Loop on each x
-			{
+			foreach ($this->data as $valarray) {      // Loop on each x
 				$nblot = max($nblot, count($valarray) - 1); // -1 to remove legend
 			}
 		}
 		//var_dump($nblot);
-		if ($nblot < 0) dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		if ($nblot < 0) {
+			dol_syslog('Bad value for property ->data. Must be set by mydolgraph->SetData before calling mydolgrapgh->draw', LOG_WARNING);
+		}
 		$firstlot = 0;
 		// Works with line but not with bars
 		//if ($nblot > 2) $firstlot = ($nblot - 2);        // We limit nblot to 2 because jflot can't manage more than 2 bars on same x
@@ -1026,15 +1074,13 @@ class DolGraph
 		//var_dump($this->data);
 
 		$i = $firstlot;
-		while ($i < $nblot)	// Loop on each serie
-		{
+		while ($i < $nblot) {	// Loop on each serie
 			$values = array(); // Array with horizontal y values (specific values of a serie) for each abscisse x (with x=0,1,2,...)
 			$serie[$i] = "";
 
 			// Fill array $values
 			$x = 0;
-			foreach ($this->data as $valarray)	// Loop on each x
-			{
+			foreach ($this->data as $valarray) {	// Loop on each x
 				$legends[$x] = (array_key_exists('label', $valarray) ? $valarray['label'] : $valarray[0]);
 				$array_of_ykeys = array_keys($valarray);
 				$alabelexists = 1;
@@ -1074,7 +1120,9 @@ class DolGraph
 		$tag = dol_escape_htmltag(dol_string_unaccent(dol_string_nospecial(basename($file), '_', array('-', '.'))));
 
 		$this->stringtoshow = '<!-- Build using chart -->' . "\n";
-		if (!empty($this->title)) $this->stringtoshow .= '<div class="center dolgraphtitle' . (empty($this->cssprefix) ? '' : ' dolgraphtitle' . $this->cssprefix) . '">' . $this->title . '</div>';
+		if (!empty($this->title)) {
+			$this->stringtoshow .= '<div class="center dolgraphtitle' . (empty($this->cssprefix) ? '' : ' dolgraphtitle' . $this->cssprefix) . '">' . $this->title . '</div>';
+		}
 		if (!empty($this->shownographyet)) {
 			$this->stringtoshow .= '<div style="width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . '; height:' . $this->height . 'px;" class="nographyet"></div>';
 			$this->stringtoshow .= '<div class="nographyettext margintoponly">' . $langs->trans("NotEnoughDataYet") . '...</div>';
@@ -1083,10 +1131,14 @@ class DolGraph
 
 		// Start the div that will contains all the graph
 		$dolxaxisvertical = '';
-		if (count($this->data) > 20) $dolxaxisvertical = 'dol-xaxis-vertical';
+		if (count($this->data) > 20) {
+			$dolxaxisvertical = 'dol-xaxis-vertical';
+		}
 		// No height for the pie grah
 		$cssfordiv = 'dolgraphchart';
-		if (isset($this->type[$firstlot])) $cssfordiv .= ' dolgraphchar' . $this->type[$firstlot];
+		if (isset($this->type[$firstlot])) {
+			$cssfordiv .= ' dolgraphchar' . $this->type[$firstlot];
+		}
 		$this->stringtoshow .= '<div id="placeholder_' . $tag . '" style="min-height: ' . $this->height . (strpos($this->height, '%') > 0 ? '' : 'px') . '; width:' . $this->width . (strpos($this->width, '%') > 0 ? '' : 'px') . ';" class="' . $cssfordiv . ' dolgraph' . (empty($dolxaxisvertical) ? '' : ' ' . $dolxaxisvertical) . (empty($this->cssprefix) ? '' : ' dolgraph' . $this->cssprefix) . ' center"><canvas id="canvas_' . $tag . '"></canvas></div>' . "\n";
 
 		$this->stringtoshow .= '<script id="' . $tag . '">' . "\n";
@@ -1126,16 +1178,20 @@ class DolGraph
 			$this->stringtoshow .= 'backgroundColor: [';
 			$i = 0;
 			$foundnegativecolor = 0;
-			foreach ($legends as $val)	// Loop on each serie
-			{
-				if ($i > 0) $this->stringtoshow .= ', ' . "\n";
-				if (is_array($this->datacolor[$i])) $color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')'; // If datacolor is array(R, G, B)
-				else {
+			foreach ($legends as $val) {	// Loop on each serie
+				if ($i > 0) {
+					$this->stringtoshow .= ', ' . "\n";
+				}
+				if (is_array($this->datacolor[$i])) {
+					$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')'; // If datacolor is array(R, G, B)
+				} else {
 					$tmp = str_replace('#', '', $this->datacolor[$i]);
 					if (strpos($tmp, '-') !== false) {
 						$foundnegativecolor++;
 						$color = '#FFFFFF'; // If $val is '-123'
-					} else $color = "#" . $tmp; // If $val is '123' or '#123'
+					} else {
+						$color = "#" . $tmp; // If $val is '123' or '#123'
+					}
 				}
 				$this->stringtoshow .= "'" . $color . "'";
 				$i++;
@@ -1145,14 +1201,19 @@ class DolGraph
 			if ($foundnegativecolor) {
 				$this->stringtoshow .= 'borderColor: [';
 				$i = 0;
-				foreach ($legends as $val)	// Loop on each serie
-				{
-					if ($i > 0) $this->stringtoshow .= ', ' . "\n";
-					if (is_array($this->datacolor[$i])) $color = 'null'; // If datacolor is array(R, G, B)
-					else {
+				foreach ($legends as $val) {	// Loop on each serie
+					if ($i > 0) {
+						$this->stringtoshow .= ', ' . "\n";
+					}
+					if (is_array($this->datacolor[$i])) {
+						$color = 'null'; // If datacolor is array(R, G, B)
+					} else {
 						$tmp = str_replace('#', '', $this->datacolor[$i]);
-						if (strpos($tmp, '-') !== false) $color = '#' . str_replace('-', '', $tmp); // If $val is '-123'
-						else $color = 'null'; // If $val is '123' or '#123'
+						if (strpos($tmp, '-') !== false) {
+							$color = '#' . str_replace('-', '', $tmp); // If $val is '-123'
+						} else {
+							$color = 'null'; // If $val is '123' or '#123'
+						}
 					}
 					$this->stringtoshow .= ($color == 'null' ? "'rgba(0,0,0,0.2)'" : "'" . $color . "'");
 					$i++;
@@ -1172,9 +1233,10 @@ class DolGraph
 					labels: [';
 
 			$i = 0;
-			foreach ($legends as $val)	// Loop on each serie
-			{
-				if ($i > 0) $this->stringtoshow .= ', ';
+			foreach ($legends as $val) {	// Loop on each serie
+				if ($i > 0) {
+					$this->stringtoshow .= ', ';
+				}
 				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 32)) . "'";
 				$i++;
 			}
@@ -1183,12 +1245,13 @@ class DolGraph
 					datasets: [';
 			$i = 0;
 			$i = 0;
-			while ($i < $nblot)	// Loop on each serie
-			{
+			while ($i < $nblot) {	// Loop on each serie
 				$color = 'rgb(' . $this->datacolor[$i][0] . ', ' . $this->datacolor[$i][1] . ', ' . $this->datacolor[$i][2] . ')';
 				//$color = (!empty($data['seriescolor']) ? json_encode($data['seriescolor']) : json_encode($datacolor));
 
-				if ($i > 0) $this->stringtoshow .= ', ' . "\n";
+				if ($i > 0) {
+					$this->stringtoshow .= ', ' . "\n";
+				}
 				$this->stringtoshow .= '{' . "\n";
 				//$this->stringtoshow .= 'borderColor: \''.$color.'\', ';
 				//$this->stringtoshow .= 'backgroundColor: \''.$color.'\', ';
@@ -1204,9 +1267,15 @@ class DolGraph
 		else {
 			$type = 'bar';
 
-			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') $type = 'bar';
-			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') $type = 'horizontalBar';
-			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) $type = 'line';
+			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') {
+				$type = 'bar';
+			}
+			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') {
+				$type = 'horizontalBar';
+			}
+			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) {
+				$type = 'line';
+			}
 
 			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
 			if (empty($showlegend)) {
@@ -1259,9 +1328,10 @@ class DolGraph
 					labels: [';
 
 			$i = 0;
-			foreach ($legends as $val)	// Loop on each serie
-			{
-				if ($i > 0) $this->stringtoshow .= ', ';
+			foreach ($legends as $val) {	// Loop on each serie
+				if ($i > 0) {
+					$this->stringtoshow .= ', ';
+				}
 				$this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 32)) . "'";
 				$i++;
 			}
@@ -1276,8 +1346,7 @@ class DolGraph
 			$i = 0;
 			$iinstack = 0;
 			$oldstacknum = -1;
-			while ($i < $nblot)	// Loop on each serie
-			{
+			while ($i < $nblot) {	// Loop on each serie
 				$foundnegativecolor = 0;
 				$usecolorvariantforgroupby = 0;
 				// We used a 'group by' and we have too many colors so we generated color variants per
@@ -1335,7 +1404,9 @@ class DolGraph
 						}
 					}
 				}
-				if ($i > 0) $this->stringtoshow .= ', ';
+				if ($i > 0) {
+					$this->stringtoshow .= ', ';
+				}
 				$this->stringtoshow .= "\n";
 				$this->stringtoshow .= '{';
 				$this->stringtoshow .= 'dolibarrinfo: \'y_' . $i . '\', ';
@@ -1347,7 +1418,9 @@ class DolGraph
 				}
 				$this->stringtoshow .= 'borderColor: \'' . $bordercolor . '\', ';
 				$this->stringtoshow .= 'backgroundColor: \'' . $color . '\', ';
-				if (!empty($arrayofgroupslegend) && !empty($arrayofgroupslegend[$i])) $this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
+				if (!empty($arrayofgroupslegend) && !empty($arrayofgroupslegend[$i])) {
+					$this->stringtoshow .= 'stack: \'' . $arrayofgroupslegend[$i]['stacknum'] . '\', ';
+				}
 				$this->stringtoshow .= 'data: [';
 
 				$this->stringtoshow .= $this->mirrorGraphValues ? '[' . -$serie[$i] . ',' . $serie[$i] . ']' : $serie[$i];
@@ -1374,8 +1447,7 @@ class DolGraph
 	public function total()
 	{
 		$value = 0;
-		foreach ($this->data as $valarray)	// Loop on each x
-		{
+		foreach ($this->data as $valarray) {	// Loop on each x
 			$value += $valarray[1];
 		}
 		return $value;
@@ -1419,8 +1491,11 @@ class DolGraph
 		global $conf;
 
 		if ($direction == 'width') {
-			if (empty($conf->dol_optimize_smallscreen)) return ($defaultsize ? $defaultsize : '500');
-			else return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width'] - 40));
+			if (empty($conf->dol_optimize_smallscreen)) {
+				return ($defaultsize ? $defaultsize : '500');
+			} else {
+				return (empty($_SESSION['dol_screen_width']) ? '280' : ($_SESSION['dol_screen_width'] - 40));
+			}
 		}
 		if ($direction == 'height') {
 			return (empty($conf->dol_optimize_smallscreen) ? ($defaultsize ? $defaultsize : '200') : '160');
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 8091d5debbe..49eda053b8d 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -109,7 +109,6 @@ use Mike42\Escpos\CapabilityProfile;
 use Mike42\Escpos\Printer;
 use Mike42\Escpos\EscposImage;
 
-
 /**
  * Class to manage Receipt Printers
  */
@@ -127,8 +126,8 @@ class dolReceiptPrinter extends Printer
 	public $db;
 
 	/*
-     * @var string[] array of tags
-     */
+	 * @var string[] array of tags
+	 */
 	public $tags;
 	public $printer;
 	public $template;
@@ -540,8 +539,7 @@ class dolReceiptPrinter extends Printer
 				$this->printer->cut();
 
 				// If is DummyPrintConnector send to log to debugging
-				if ($this->printer->connector instanceof DummyPrintConnector)
-				{
+				if ($this->printer->connector instanceof DummyPrintConnector) {
 					$data = $this->printer->connector-> getData();
 					dol_syslog($data);
 				}
@@ -631,14 +629,12 @@ class dolReceiptPrinter extends Printer
 						break;
 					case 'DOL_PRINT_OBJECT_LINES':
 						foreach ($object->lines as $line) {
-							if ($line->fk_product)
-							{
+							if ($line->fk_product) {
 								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;
 								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 								$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 								$this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n");
-							}
-							else {
+							} else {
 								$spacestoadd = $nbcharactbyline - strlen($line->description) - strlen($line->qty) - 10 - 1;
 								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 								$this->printer->text($line->description.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
@@ -775,8 +771,7 @@ class dolReceiptPrinter extends Printer
 						break;
 					case 'DOL_PRINT_ORDER_LINES':
 						foreach ($object->lines as $line) {
-							if ($line->special_code == $this->orderprinter)
-							{
+							if ($line->special_code == $this->orderprinter) {
 								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;
 								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 								$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
@@ -792,8 +787,7 @@ class dolReceiptPrinter extends Printer
 						$sql .= " WHERE pf.fk_paiement = p.rowid AND pf.fk_facture = ".$object->id;
 						$sql .= " ORDER BY p.datep";
 						$resql = $this->db->query($sql);
-						if ($resql)
-						{
+						if ($resql) {
 							$num = $this->db->num_rows($resql);
 							$i = 0;
 							while ($i < $num) {
@@ -801,10 +795,11 @@ class dolReceiptPrinter extends Printer
 								$spacestoadd = $nbcharactbyline - strlen($langs->transnoentitiesnoconv("PaymentTypeShort".$row->code)) - 12;
 								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 								$amount_payment = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
-								if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
+								if ($row->code == "LIQ") {
+									$amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
+								}
 								$this->printer->text($spaces.$langs->transnoentitiesnoconv("PaymentTypeShort".$row->code).' '.str_pad(price($amount_payment), 10, ' ', STR_PAD_LEFT)."\n");
-								if ($row->code == "LIQ" && $row->pos_change > 0) // Print change only in cash payments
-								{
+								if ($row->code == "LIQ" && $row->pos_change > 0) { // Print change only in cash payments
 									$spacestoadd = $nbcharactbyline - strlen($langs->trans("Change")) - 12;
 									$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 									$this->printer->text($spaces.$langs->trans("Change").' '.str_pad(price($row->pos_change), 10, ' ', STR_PAD_LEFT)."\n");
@@ -822,10 +817,11 @@ class dolReceiptPrinter extends Printer
 				}
 			}
 			// If is DummyPrintConnector send to log to debugging
-			if ($this->printer->connector instanceof DummyPrintConnector || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
-			{
+			if ($this->printer->connector instanceof DummyPrintConnector || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 				$data = $this->printer->connector->getData();
-				if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") echo rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
+				if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+					echo rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
+				}
 				dol_syslog($data);
 			}
 			// Close and print
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 0d9ddd72e24..39a5aec95fe 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -144,8 +144,12 @@ class EmailSenderProfile extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled)) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 	}
 
 	/**
@@ -221,7 +225,9 @@ class EmailSenderProfile extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -288,7 +294,9 @@ class EmailSenderProfile extends CommonObject
 
 		if ($withpicto) {
 			$result .= ($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
-			if ($withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) {
+				$result .= ' ';
+			}
 		}
 		$result .= $linkstart.$this->label.$linkend;
 		return $result;
@@ -324,7 +332,9 @@ class EmailSenderProfile extends CommonObject
 		}
 
 		$statusType = 'status'.$status;
-		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+		if ($status == self::STATUS_ENABLED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($label, $labelshort, '', $statusType, $mode);
 	}
@@ -342,28 +352,23 @@ class EmailSenderProfile extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index c30c37266c1..ccd495bb623 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -147,8 +147,9 @@ class EvalMath
 		$this->last_error = null;
 		$this->last_error_code = null;
 		$expr = trim($expr);
-		if (substr($expr, - 1, 1) == ';')
+		if (substr($expr, - 1, 1) == ';') {
 			$expr = substr($expr, 0, strlen($expr) - 1); // strip semicolons at the end
+		}
 														 // ===============
 														 // is it a variable assignment?
 		$matches = array();
@@ -156,8 +157,9 @@ class EvalMath
 			if (in_array($matches[1], $this->vb)) { // make sure we're not assigning to a constant
 				return $this->trigger(1, "cannot assign to constant '$matches[1]'", $matches[1]);
 			}
-			if (($tmp = $this->pfx($this->nfx($matches[2]))) === false)
+			if (($tmp = $this->pfx($this->nfx($matches[2]))) === false) {
 				return false; // get the result and make sure it's good
+			}
 			$this->v[$matches[1]] = $tmp; // if so, stick it in the variable array
 			return $this->v[$matches[1]]; // and return the resulting value
 										  // ===============
@@ -168,8 +170,9 @@ class EvalMath
 				return $this->trigger(2, "cannot redefine built-in function '$matches[1]()'", $matches[1]);
 			}
 			$args = explode(",", preg_replace("/\s+/", "", $matches[2])); // get the arguments
-			if (($stack = $this->nfx($matches[3])) === false)
+			if (($stack = $this->nfx($matches[3])) === false) {
 				return false; // see if it can be converted to postfix
+			}
 			$nbstack = count($stack);
 			for ($i = 0; $i < $nbstack; $i++) { // freeze the state of the non-argument variables
 				$token = $stack[$i];
@@ -210,8 +213,9 @@ class EvalMath
 	private function funcs()
 	{
 		$output = array();
-		foreach ($this->f as $fnn => $dat)
+		foreach ($this->f as $fnn => $dat) {
 			$output[] = $fnn.'('.implode(',', $dat['args']).')';
+		}
 		return $output;
 	}
 
@@ -281,11 +285,13 @@ class EvalMath
 					$arg_count = $stack->pop(); // see how many arguments there were (cleverly stored on the stack, thank you)
 					$output[] = $stack->pop(); // pop the function and push onto the output
 					if (in_array($fnn, $this->fb)) { // check the argument count
-						if ($arg_count > 1)
+						if ($arg_count > 1) {
 							return $this->trigger(6, "wrong number of arguments ($arg_count given, 1 expected)", array($arg_count, 1));
+						}
 					} elseif (array_key_exists($fnn, $this->f)) {
-						if ($arg_count != count($this->f[$fnn]['args']))
+						if ($arg_count != count($this->f[$fnn]['args'])) {
 							return $this->trigger(6, "wrong number of arguments ($arg_count given, ".count($this->f[$fnn]['args'])." expected)", array($arg_count, count($this->f[$fnn]['args'])));
+						}
 					} else { // did we somehow push a non-function on the stack? this should never happen
 						return $this->trigger(7, "internal error");
 					}
@@ -301,8 +307,9 @@ class EvalMath
 					}
 				}
 				// make sure there was a function
-				if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches))
+				if (!preg_match("/^([a-z]\w*)\($/", $stack->last(2), $matches)) {
 					return $this->trigger(5, "unexpected ','", ",");
+				}
 				$stack->push($stack->pop() + 1); // increment the argument count
 				$stack->push('('); // put the ( back on, we'll need to pop back to it again
 				$index++;
@@ -350,8 +357,9 @@ class EvalMath
 			}
 		}
 		while (!is_null($op = $stack->pop())) { // pop everything off the stack and push onto output
-			if ($op == '(')
+			if ($op == '(') {
 				return $this->trigger(11, "expecting ')'", ")"); // if there are (s on the stack, ()s were unbalanced
+			}
 			$output[] = $op;
 		}
 		return $output;
@@ -366,8 +374,9 @@ class EvalMath
 	 */
 	private function pfx($tokens, $vars = array())
 	{
-		if ($tokens == false)
+		if ($tokens == false) {
 			return false;
+		}
 
 		$stack = new EvalMathStack();
 
@@ -375,10 +384,12 @@ class EvalMath
 									  // if the token is a binary operator, pop two values off the stack, do the operation, and push the result back on
 			$matches = array();
 			if (in_array($token, array('+', '-', '*', '/', '^'))) {
-				if (is_null($op2 = $stack->pop()))
+				if (is_null($op2 = $stack->pop())) {
 					return $this->trigger(12, "internal error");
-				if (is_null($op1 = $stack->pop()))
+				}
+				if (is_null($op1 = $stack->pop())) {
 					return $this->trigger(13, "internal error");
+				}
 				switch ($token) {
 					case '+':
 						$stack->push($op1 + $op2);
@@ -390,8 +401,9 @@ class EvalMath
 						$stack->push($op1 * $op2);
 						break;
 					case '/':
-						if ($op2 == 0)
+						if ($op2 == 0) {
 							return $this->trigger(14, "division by zero");
+						}
 						$stack->push($op1 / $op2);
 						break;
 					case '^':
@@ -405,18 +417,21 @@ class EvalMath
 			} elseif (preg_match("/^([a-z]\w*)\($/", $token, $matches)) { // it's a function!
 				$fnn = $matches[1];
 				if (in_array($fnn, $this->fb)) { // built-in function:
-					if (is_null($op1 = $stack->pop()))
+					if (is_null($op1 = $stack->pop())) {
 						return $this->trigger(15, "internal error");
+					}
 					$fnn = preg_replace("/^arc/", "a", $fnn); // for the 'arc' trig synonyms
-					if ($fnn == 'ln')
+					if ($fnn == 'ln') {
 						$fnn = 'log';
+					}
 					eval('$stack->push('.$fnn.'($op1));'); // perfectly safe eval()
 				} elseif (array_key_exists($fnn, $this->f)) { // user function
 															  // get args
 					$args = array();
 					for ($i = count($this->f[$fnn]['args']) - 1; $i >= 0; $i--) {
-						if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop()))
+						if (is_null($args[$this->f[$fnn]['args'][$i]] = $stack->pop())) {
 							return $this->trigger(16, "internal error");
+						}
 					}
 					$stack->push($this->pfx($this->f[$fnn]['func'], $args)); // yay... recursion!!!!
 				}
@@ -434,8 +449,9 @@ class EvalMath
 			}
 		}
 		// when we're out of tokens, the stack should have a single element, the final result
-		if ($stack->count != 1)
+		if ($stack->count != 1) {
 			return $this->trigger(18, "internal error");
+		}
 		return $stack->pop();
 	}
 
@@ -451,8 +467,9 @@ class EvalMath
 	{
 		$this->last_error = $msg;
 		$this->last_error_code = array($code, $info);
-		if (!$this->suppress_errors)
+		if (!$this->suppress_errors) {
 			trigger_error($msg, E_USER_WARNING);
+		}
 		return false;
 	}
 }
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 16c133f9dab..6f674c0b600 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -141,10 +141,14 @@ class Events // extends CommonObject
 
 		// Clean parameters
 		$this->description = trim($this->description);
-		if (empty($this->user_agent)) $this->user_agent = (empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT']);
+		if (empty($this->user_agent)) {
+			$this->user_agent = (empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT']);
+		}
 
 		// Check parameters
-		if (empty($this->description)) { $this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1; }
+		if (empty($this->description)) {
+			$this->error = 'ErrorBadValueForParameterCreateEventDesc'; return -1;
+		}
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."events(";
@@ -169,8 +173,7 @@ class Events // extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."events");
 			return $this->id;
 		} else {
@@ -206,8 +209,7 @@ class Events // extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -239,10 +241,8 @@ class Events // extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -278,8 +278,7 @@ class Events // extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index db436574086..35747920ec5 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -243,30 +243,39 @@ class ExtraFields
 	 */
 	public function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
 	{
-		if (empty($attrname)) return -1;
-		if (empty($label)) return -1;
+		if (empty($attrname)) {
+			return -1;
+		}
+		if (empty($label)) {
+			return -1;
+		}
 
-		if ($type == 'separate') { $unique = 0; $required = 0; }	// Force unique and not required if this is a separator field to avoid troubles.
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($type == 'separate') {
+			$unique = 0; $required = 0;
+		}	// Force unique and not required if this is a separator field to avoid troubles.
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		// Create field into database except for separator type which is not stored in database
-		if ($type != 'separate')
-		{
+		if ($type != 'separate') {
 			$result = $this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
 		}
 		$err1 = $this->errno;
-		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate')
-		{
+		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate') {
 			// Add declaration of field into table
 			$result2 = $this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled, $totalizable, $printable);
 			$err2 = $this->errno;
-			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS'))
-			{
+			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS')) {
 				$this->error = '';
 				$this->errno = 0;
 				return 1;
-			} else return -2;
+			} else {
+				return -2;
+			}
 		} else {
 			return -1;
 		}
@@ -292,14 +301,19 @@ class ExtraFields
 	 */
 	private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '', $help = '')
 	{
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		$table = $elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+		if ($elementtype == 'categorie') {
+			$table = 'categories_extrafields';
+		}
 
-		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname))
-		{
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9_]*$/", $attrname) && !is_numeric($attrname)) {
 			if ($type == 'boolean') {
 				$typedb = 'int';
 				$lengthdb = '1';
@@ -330,7 +344,9 @@ class ExtraFields
 			} else {
 				$typedb = $type;
 				$lengthdb = $length;
-				if ($type == 'varchar' && empty($lengthdb)) $lengthdb = '255';
+				if ($type == 'varchar' && empty($lengthdb)) {
+					$lengthdb = '255';
+				}
 			}
 			$field_desc = array(
 				'type'=>$typedb,
@@ -340,10 +356,8 @@ class ExtraFields
 			);
 
 			$result = $this->db->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
-			if ($result > 0)
-			{
-				if ($unique)
-				{
+			if ($result > 0) {
+				if ($unique) {
 					$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
 					$resql = $this->db->query($sql, 1, 'dml');
 				}
@@ -390,25 +404,40 @@ class ExtraFields
 		// phpcs:enable
 		global $conf, $user;
 
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		// Clean parameters
-		if (empty($pos)) $pos = 0;
-		if (empty($list)) $list = '0';
-		if (empty($required)) $required = 0;
-		if (empty($unique)) $unique = 0;
-		if (empty($printable)) $printable = 0;
-		if (empty($alwayseditable)) $alwayseditable = 0;
-		if (empty($totalizable)) $totalizable = 0;
+		if (empty($pos)) {
+			$pos = 0;
+		}
+		if (empty($list)) {
+			$list = '0';
+		}
+		if (empty($required)) {
+			$required = 0;
+		}
+		if (empty($unique)) {
+			$unique = 0;
+		}
+		if (empty($printable)) {
+			$printable = 0;
+		}
+		if (empty($alwayseditable)) {
+			$alwayseditable = 0;
+		}
+		if (empty($totalizable)) {
+			$totalizable = 0;
+		}
 
-		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname))
-		{
-			if (is_array($param) && count($param) > 0)
-			{
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname)) {
+			if (is_array($param) && count($param) > 0) {
 				$params = serialize($param);
-			} elseif (strlen($param) > 0)
-			{
+			} elseif (strlen($param) > 0) {
 				$params = trim($param);
 			} else {
 				$params = '';
@@ -465,8 +494,7 @@ class ExtraFields
 			$sql .= ')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				return 1;
 			} else {
 				$this->error = $this->db->lasterror();
@@ -485,40 +513,40 @@ class ExtraFields
 	 */
 	public function delete($attrname, $elementtype = 'member')
 	{
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		$table = $elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+		if ($elementtype == 'categorie') {
+			$table = 'categories_extrafields';
+		}
 
 		$error = 0;
 
-		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
-		{
+		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {
 			$result = $this->delete_label($attrname, $elementtype);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error = $this->db->lasterror();
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "SELECT COUNT(rowid) as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
 				$sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'";
 				$sql .= " AND name = '".$this->db->escape($attrname)."'";
 				//$sql.= " AND entity IN (0,".$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$obj = $this->db->fetch_object($resql);
-					if ($obj->nb <= 0)
-					{
+					if ($obj->nb <= 0) {
 						$result = $this->db->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->error = $this->db->lasterror();
 							$this->errors[] = $this->db->lasterror();
 							$error++;
@@ -546,11 +574,14 @@ class ExtraFields
 		// phpcs:enable
 		global $conf;
 
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
-		{
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
 			$sql .= " WHERE name = '".$this->db->escape($attrname)."'";
 			$sql .= " AND entity IN  (0,".$conf->entity.')';
@@ -558,8 +589,7 @@ class ExtraFields
 
 			dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				return 1;
 			} else {
 				dol_print_error($this->db);
@@ -598,14 +628,19 @@ class ExtraFields
 	 */
 	public function update($attrname, $label, $type, $length, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
 	{
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
 		$table = $elementtype.'_extrafields';
-		if ($elementtype == 'categorie') $table = 'categories_extrafields';
+		if ($elementtype == 'categorie') {
+			$table = 'categories_extrafields';
+		}
 
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
-		{
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {
 			if ($type == 'boolean') {
 				$typedb = 'int';
 				$lengthdb = '1';
@@ -638,21 +673,16 @@ class ExtraFields
 			}
 			$field_desc = array('type'=>$typedb, 'value'=>$lengthdb, 'null'=>($required ? 'NOT NULL' : 'NULL'), 'default'=>$default);
 
-			if ($type != 'separate') // No table update when separate type
-			{
+			if ($type != 'separate') { // No table update when separate type
 				$result = $this->db->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
 			}
-			if ($result > 0 || $type == 'separate')
-			{
-				if ($label)
-				{
+			if ($result > 0 || $type == 'separate') {
+				if ($label) {
 					$result = $this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable, $printable);
 				}
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$sql = '';
-					if ($unique)
-					{
+					if ($unique) {
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
 					} else {
 						$sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
@@ -707,34 +737,44 @@ class ExtraFields
 		dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable.", ".$printable);
 
 		// Clean parameters
-		if ($elementtype == 'thirdparty') $elementtype = 'societe';
-		if ($elementtype == 'contact') $elementtype = 'socpeople';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
 
-		if (empty($pos)) $pos = 0;
-		if (empty($list)) $list = '0';
+		if (empty($pos)) {
+			$pos = 0;
+		}
+		if (empty($list)) {
+			$list = '0';
+		}
 		if (empty($totalizable)) {
 			$totalizable = 0;
 		}
-		if (empty($required)) $required = 0;
-		if (empty($unique)) $unique = 0;
-		if (empty($alwayseditable)) $alwayseditable = 0;
+		if (empty($required)) {
+			$required = 0;
+		}
+		if (empty($unique)) {
+			$unique = 0;
+		}
+		if (empty($alwayseditable)) {
+			$alwayseditable = 0;
+		}
 
-		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname))
-		{
+		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {
 			$this->db->begin();
 
-			if (is_array($param) && count($param) > 0)
-			{
+			if (is_array($param) && count($param) > 0) {
 				$params = serialize($param);
-			} elseif (strlen($param) > 0)
-			{
+			} elseif (strlen($param) > 0) {
 				$params = trim($param);
 			} else {
 				$params = '';
 			}
 
-			if ($entity === '' || $entity != '0')
-			{
+			if ($entity === '' || $entity != '0') {
 				// We dont want on all entities, we delete all and current
 				$sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
 				$sql_del .= " WHERE name = '".$this->db->escape($attrname)."'";
@@ -801,8 +841,7 @@ class ExtraFields
 
 			$resql2 = $this->db->query($sql);
 
-			if ($resql1 && $resql2)
-			{
+			if ($resql1 && $resql2) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -829,12 +868,22 @@ class ExtraFields
 		// phpcs:enable
 		global $conf;
 
-		if (empty($elementtype)) return array();
+		if (empty($elementtype)) {
+			return array();
+		}
 
-		if ($elementtype == 'thirdparty')     $elementtype = 'societe';
-		if ($elementtype == 'contact')        $elementtype = 'socpeople';
-		if ($elementtype == 'order_supplier') $elementtype = 'commande_fournisseur';
-		if ($elementtype == 'stock_mouvement') $elementtype = 'movement';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
+		if ($elementtype == 'order_supplier') {
+			$elementtype = 'commande_fournisseur';
+		}
+		if ($elementtype == 'stock_mouvement') {
+			$elementtype = 'movement';
+		}
 
 		$array_name_label = array();
 
@@ -842,29 +891,25 @@ class ExtraFields
 		$sql = "SELECT rowid, name, label, type, size, elementtype, fieldunique, fieldrequired, param, pos, alwayseditable, perms, langs, list, printable, totalizable, fielddefault, fieldcomputed, entity, enabled, help";
 		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
 		//$sql.= " WHERE entity IN (0,".$conf->entity.")";    // Filter is done later
-		if ($elementtype) $sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'"; // Filed with object->table_element
+		if ($elementtype) {
+			$sql .= " WHERE elementtype = '".$this->db->escape($elementtype)."'"; // Filed with object->table_element
+		}
 		$sql .= " ORDER BY pos";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
-				while ($tab = $this->db->fetch_object($resql))
-				{
-					if ($tab->entity != 0 && $tab->entity != $conf->entity)
-					{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				while ($tab = $this->db->fetch_object($resql)) {
+					if ($tab->entity != 0 && $tab->entity != $conf->entity) {
 						// This field is not in current entity. We discard but before we save it into the array of mandatory fields if it is a mandatory field without default value
-						if ($tab->fieldrequired && is_null($tab->fielddefault))
-						{
+						if ($tab->fieldrequired && is_null($tab->fielddefault)) {
 							$this->attributes[$tab->elementtype]['mandatoryfieldsofotherentities'][$tab->name] = $tab->type;
 						}
 						continue;
 					}
 
 					// We can add this attribute to object. TODO Remove this and return $this->attributes[$elementtype]['label']
-					if ($tab->type != 'separate')
-					{
+					if ($tab->type != 'separate') {
 						$array_name_label[$tab->name] = $tab->label;
 					}
 
@@ -910,7 +955,9 @@ class ExtraFields
 					$this->attributes[$tab->elementtype]['loaded'] = 1;
 				}
 			}
-			if ($elementtype) $this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
+			if ($elementtype) {
+				$this->attributes[$elementtype]['loaded'] = 1; // If nothing found, we also save tag 'loaded'
+			}
 		} else {
 			$this->error = $this->db->lasterror();
 			dol_syslog(get_class($this)."::fetch_name_optionals_label ".$this->error, LOG_ERR);
@@ -939,21 +986,18 @@ class ExtraFields
 	{
 		global $conf, $langs, $form;
 
-		if (!is_object($form))
-		{
+		if (!is_object($form)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($this->db);
 		}
 
 		$out = '';
 
-		if (!preg_match('/options_$/', $keyprefix))	// Because we work on extrafields, we add 'options_' to prefix if not already added
-		{
+		if (!preg_match('/options_$/', $keyprefix)) {	// Because we work on extrafields, we add 'options_' to prefix if not already added
 			$keyprefix = $keyprefix.'options_';
 		}
 
-		if (!empty($extrafieldsobjectkey))
-		{
+		if (!empty($extrafieldsobjectkey)) {
 			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
 			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
 			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
@@ -985,10 +1029,12 @@ class ExtraFields
 			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
-		if ($computed)
-		{
-			if (!preg_match('/^search_/', $keyprefix)) return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
-			else return '';
+		if ($computed) {
+			if (!preg_match('/^search_/', $keyprefix)) {
+				return '<span class="opacitymedium">'.$langs->trans("AutomaticallyCalculated").'</span>';
+			} else {
+				return '';
+			}
 		}
 
 		if (empty($morecss)) {
@@ -1022,7 +1068,9 @@ class ExtraFields
 			$showtime = in_array($type, array('datetime')) ? 1 : 0;
 
 			// Do not show current date when field not required (see selectDate() method)
-			if (!$required && $value == '') $value = '-1';
+			if (!$required && $value == '') {
+				$value = '-1';
+			}
 
 			if ($mode == 1) {
 				// search filter on a date extrafield shows two inputs to select a date range
@@ -1039,41 +1087,32 @@ class ExtraFields
 				// TODO Must also support $moreparam
 				$out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
 			}
-		} elseif (in_array($type, array('int', 'integer')))
-		{
+		} elseif (in_array($type, array('int', 'integer'))) {
 			$tmp = explode(',', $size);
 			$newsize = $tmp[0];
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		} elseif (preg_match('/varchar/', $type))
-		{
+		} elseif (preg_match('/varchar/', $type)) {
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		} elseif (in_array($type, array('mail', 'phone', 'url')))
-		{
+		} elseif (in_array($type, array('mail', 'phone', 'url'))) {
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
-		} elseif ($type == 'text')
-		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
+		} elseif ($type == 'text') {
+			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		} elseif ($type == 'html')
-		{
-			if (!preg_match('/search_/', $keyprefix))		// If keyprefix is search_ or search_options_, we must just use a simple text field
-			{
+		} elseif ($type == 'html') {
+			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
 				$out = $doleditor->Create(1);
 			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
-		} elseif ($type == 'boolean')
-		{
-			if (empty($mode))
-			{
+		} elseif ($type == 'boolean') {
+			if (empty($mode)) {
 				$checked = '';
 				if (!empty($value)) {
 					$checked = ' checked value="1" ';
@@ -1084,59 +1123,56 @@ class ExtraFields
 			} else {
 				$out .= $form->selectyesno($keyprefix.$key.$keysuffix, $value, 1, false, 1);
 			}
-		} elseif ($type == 'price')
-		{
+		} elseif ($type == 'price') {
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.$langs->getCurrencySymbol($conf->currency);
-		} elseif ($type == 'double')
-		{
+		} elseif ($type == 'double') {
 			if (!empty($value)) {		// $value in memory is a php numeric, we format it into user number format.
 				$value = price($value);
 			}
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
-		} elseif ($type == 'select')
-		{
+		} elseif ($type == 'select') {
 			$out = '';
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
 			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
 			$out .= '<option value="0">&nbsp;</option>';
-			foreach ($param['options'] as $key => $val)
-			{
-				if ((string) $key == '') continue;
+			foreach ($param['options'] as $key => $val) {
+				if ((string) $key == '') {
+					continue;
+				}
 				$valarray = explode('|', $val);
 				$val = $valarray[0];
 				$parent = '';
 				if (!empty($valarray[1])) {
-				    $parent = $valarray[1];
+					$parent = $valarray[1];
 				}
 				$out .= '<option value="'.$key.'"';
 				$out .= (((string) $value == (string) $key) ? ' selected' : '');
 				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
 				$out .= '>';
-				if ($langfile && $val) $out .= $langs->trans($val);
-				else $out .= $val;
+				if ($langfile && $val) {
+					$out .= $langs->trans($val);
+				} else {
+					$out .= $val;
+				}
 				$out .= '</option>';
 			}
 			$out .= '</select>';
-		} elseif ($type == 'sellist')
-		{
+		} elseif ($type == 'sellist') {
 			$out = '';
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2))
-			{
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 			}
 
 			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-			if (is_array($param['options']))
-			{
+			if (is_array($param['options'])) {
 				$param_list = array_keys($param['options']);
 				$InfoFieldList = explode(":", $param_list[0]);
 				$parentName = '';
@@ -1151,17 +1187,14 @@ class ExtraFields
 				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
-				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4]))
-				{
-					if (strpos($InfoFieldList[4], 'extra.') !== false)
-					{
+				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
+					if (strpos($InfoFieldList[4], 'extra.') !== false) {
 						$keyList = 'main.'.$InfoFieldList[2].' as rowid';
 					} else {
 						$keyList = $InfoFieldList[2].' as rowid';
 					}
 				}
-				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3]))
-				{
+				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
 					list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
 					$keyList .= ', '.$parentField;
 				}
@@ -1254,7 +1287,9 @@ class ExtraFields
 									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
 									$labeltoshow = $translabel;
 								}
-								if (empty($labeltoshow)) $labeltoshow = '(not defined)';
+								if (empty($labeltoshow)) {
+									$labeltoshow = '(not defined)';
+								}
 
 								if (!empty($InfoFieldList[3]) && $parentField) {
 									$parent = $parentName.':'.$obj->{$parentField};
@@ -1284,23 +1319,19 @@ class ExtraFields
 				}
 			}
 			$out .= '</select>';
-		} elseif ($type == 'checkbox')
-		{
+		} elseif ($type == 'checkbox') {
 			$value_arr = explode(',', $value);
 			$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
-		} elseif ($type == 'radio')
-		{
+		} elseif ($type == 'radio') {
 			$out = '';
-			foreach ($param['options'] as $keyopt => $val)
-			{
+			foreach ($param['options'] as $keyopt => $val) {
 				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
 				$out .= ' value="'.$keyopt.'"';
 				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
 				$out .= ($value == $keyopt ? 'checked' : '');
 				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
 			}
-		} elseif ($type == 'chkbxlst')
-		{
+		} elseif ($type == 'chkbxlst') {
 			if (is_array($value)) {
 				$value_arr = $value;
 			} else {
@@ -1473,8 +1504,9 @@ class ExtraFields
 										$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
 									}
 								}
-								if (empty($labeltoshow))
+								if (empty($labeltoshow)) {
 									$labeltoshow = '(not defined)';
+								}
 
 								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
 									$data[$obj->rowid] = $labeltoshow;
@@ -1501,13 +1533,11 @@ class ExtraFields
 					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
 				}
 			}
-		} elseif ($type == 'link')
-		{
+		} elseif ($type == 'link') {
 			$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 			$showempty = (($required && $default != '') ? 0 : 1);
 			$out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss);
-		} elseif ($type == 'password')
-		{
+		} elseif ($type == 'password') {
 			// If prefix is 'search_', field is used as a filter, we use a common text field.
 			$out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
 			$out .= '<input autocomplete="new-password" type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
@@ -1539,8 +1569,7 @@ class ExtraFields
 	{
 		global $conf, $langs;
 
-		if (!empty($extrafieldsobjectkey))
-		{
+		if (!empty($extrafieldsobjectkey)) {
 			$label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
 			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
 			$size = $this->attributes[$extrafieldsobjectkey]['size'][$key];
@@ -1572,58 +1601,55 @@ class ExtraFields
 			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		}
 
-		if ($hidden) return ''; // This is a protection. If field is hidden, we should just not call this method.
+		if ($hidden) {
+			return ''; // This is a protection. If field is hidden, we should just not call this method.
+		}
 
 		//if ($computed) $value =		// $value is already calculated into $value before calling this method
 
 		$showsize = 0;
-		if ($type == 'date')
-		{
+		if ($type == 'date') {
 			$showsize = 10;
 			$value = dol_print_date($value, 'day');
-		} elseif ($type == 'datetime')
-		{
+		} elseif ($type == 'datetime') {
 			$showsize = 19;
 			$value = dol_print_date($value, 'dayhour');
-		} elseif ($type == 'int')
-		{
+		} elseif ($type == 'int') {
 			$showsize = 10;
-		} elseif ($type == 'double')
-		{
+		} elseif ($type == 'double') {
 			if (!empty($value)) {
 				//$value=price($value);
 				$sizeparts = explode(",", $size);
 				$number_decimals = $sizeparts[1];
 				$value = price($value, 0, $langs, 0, 0, $number_decimals, '');
 			}
-		} elseif ($type == 'boolean')
-		{
+		} elseif ($type == 'boolean') {
 			$checked = '';
 			if (!empty($value)) {
 				$checked = ' checked ';
 			}
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		} elseif ($type == 'mail')
-		{
+		} elseif ($type == 'mail') {
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
-		} elseif ($type == 'url')
-		{
+		} elseif ($type == 'url') {
 			$value = dol_print_url($value, '_blank', 32, 1);
-		} elseif ($type == 'phone')
-		{
+		} elseif ($type == 'phone') {
 			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');
-		} elseif ($type == 'price')
-		{
+		} elseif ($type == 'price') {
 			//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
-			if ($value || $value == '0') $value = price($value, 0, $langs, 0, 0, -1);
+			if ($value || $value == '0') {
+				$value = price($value, 0, $langs, 0, 0, -1);
+			}
 		} elseif ($type == 'select') {
 			$valstr = $param['options'][$value];
-			if (($pos = strpos($valstr, "|")) !== false)
-			{
+			if (($pos = strpos($valstr, "|")) !== false) {
 				$valstr = substr($valstr, 0, $pos);
 			}
-			if ($langfile && $valstr) $value = $langs->trans($valstr);
-			else $value = $valstr;
+			if ($langfile && $valstr) {
+				$value = $langs->trans($valstr);
+			} else {
+				$value = $valstr;
+			}
 		} elseif ($type == 'sellist') {
 			$param_list = array_keys($param['options']);
 			$InfoFieldList = explode(":", $param_list[0]);
@@ -1631,8 +1657,7 @@ class ExtraFields
 			$selectkey = "rowid";
 			$keyList = 'rowid';
 
-			if (count($InfoFieldList) >= 3)
-			{
+			if (count($InfoFieldList) >= 3) {
 				$selectkey = $InfoFieldList[2];
 				$keyList = $InfoFieldList[2].' as rowid';
 			}
@@ -1652,8 +1677,7 @@ class ExtraFields
 
 			$sql = 'SELECT '.$keyList;
 			$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
-			if (strpos($InfoFieldList[4], 'extra') !== false)
-			{
+			if (strpos($InfoFieldList[4], 'extra') !== false) {
 				$sql .= ' as main';
 			}
 			if ($selectkey == 'rowid' && empty($value)) {
@@ -1668,8 +1692,7 @@ class ExtraFields
 
 			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				if ($filter_categorie === false) {
 					$value = ''; // value was used, so now we reste it to use it to build final output
 
@@ -1714,24 +1737,22 @@ class ExtraFields
 					}
 					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 				}
-			} else dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
-		} elseif ($type == 'radio')
-		{
+			} else {
+				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
+			}
+		} elseif ($type == 'radio') {
 			$value = $param['options'][$value];
-		} elseif ($type == 'checkbox')
-		{
+		} elseif ($type == 'checkbox') {
 			$value_arr = explode(',', $value);
 			$value = '';
 			$toprint = array();
-			if (is_array($value_arr))
-			{
-				foreach ($value_arr as $keyval=>$valueval) {
+			if (is_array($value_arr)) {
+				foreach ($value_arr as $keyval => $valueval) {
 					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$param['options'][$valueval].'</li>';
 				}
 			}
 			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
-		} elseif ($type == 'chkbxlst')
-		{
+		} elseif ($type == 'chkbxlst') {
 			$value_arr = explode(',', $value);
 
 			$param_list = array_keys($param['options']);
@@ -1820,23 +1841,19 @@ class ExtraFields
 			} else {
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
-		} elseif ($type == 'link')
-		{
+		} elseif ($type == 'link') {
 			$out = '';
 
 			// Only if something to display (perf)
-			if ($value)		// If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)
-			{
+			if ($value) {		// If we have -1 here, pb is into insert, not into ouptut (fix insert instead of changing code here to compensate)
 				$param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
 				$InfoFieldList = explode(":", $param_list[0]);
 				$classname = $InfoFieldList[0];
 				$classpath = $InfoFieldList[1];
-				if (!empty($classpath))
-				{
+				if (!empty($classpath)) {
 					dol_include_once($InfoFieldList[1]);
-					if ($classname && class_exists($classname))
-					{
+					if ($classname && class_exists($classname)) {
 						$object = new $classname($this->db);
 						$object->fetch($value);
 						$value = $object->getNomUrl(3);
@@ -1846,18 +1863,17 @@ class ExtraFields
 					return 'Error bad setup of extrafield';
 				}
 			}
-		} elseif ($type == 'text')
-		{
+		} elseif ($type == 'text') {
 			$value = dol_htmlentitiesbr($value);
-		} elseif ($type == 'html')
-		{
+		} elseif ($type == 'html') {
 			$value = dol_htmlentitiesbr($value);
-		} elseif ($type == 'password')
-		{
+		} elseif ($type == 'password') {
 			$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
 		} else {
 			$showsize = round($size);
-			if ($showsize > 48) $showsize = 48;
+			if ($showsize > 48) {
+				$showsize = 48;
+			}
 		}
 
 		//print $type.'-'.$size;
@@ -1877,37 +1893,31 @@ class ExtraFields
 	{
 		global $conf, $langs;
 
-		if (!empty($extrafieldsobjectkey)) $type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
-		else $type = $this->attribute_type[$key];
+		if (!empty($extrafieldsobjectkey)) {
+			$type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
+		} else {
+			$type = $this->attribute_type[$key];
+		}
 
 		$align = '';
 
-		if ($type == 'date')
-		{
+		if ($type == 'date') {
 			$align = "center";
-		} elseif ($type == 'datetime')
-		{
+		} elseif ($type == 'datetime') {
 			$align = "center";
-		} elseif ($type == 'int')
-		{
+		} elseif ($type == 'int') {
 			$align = "right";
-		} elseif ($type == 'price')
-		{
+		} elseif ($type == 'price') {
 			$align = "right";
-		} elseif ($type == 'double')
-		{
+		} elseif ($type == 'double') {
 			$align = "right";
-		} elseif ($type == 'boolean')
-		{
+		} elseif ($type == 'boolean') {
 			$align = "center";
-		} elseif ($type == 'radio')
-		{
+		} elseif ($type == 'radio') {
 			$align = "center";
-		} elseif ($type == 'checkbox')
-		{
+		} elseif ($type == 'checkbox') {
 			$align = "center";
-		} elseif ($type == 'price')
-		{
+		} elseif ($type == 'price') {
 			$align = "right";
 		}
 
@@ -1930,7 +1940,7 @@ class ExtraFields
 		if ($display_type=='card') {
 			$tagtype='tr';
 			$tagtype_dyn='td';
-		}elseif ($display_type=='line') {
+		} elseif ($display_type=='line') {
 			$tagtype='div';
 			$tagtype_dyn='span';
 			$colspan=0;
@@ -2003,42 +2013,48 @@ class ExtraFields
 		$nofillrequired = 0; // For error when required field left blank
 		$error_field_required = array();
 
-		if (is_array($this->attributes[$object->table_element]['label'])) $extralabels = $this->attributes[$object->table_element]['label'];
+		if (is_array($this->attributes[$object->table_element]['label'])) {
+			$extralabels = $this->attributes[$object->table_element]['label'];
+		}
 
-		if (is_array($extralabels))
-		{
+		if (is_array($extralabels)) {
 			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
-				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) continue;
-				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key)) continue;
+			foreach ($extralabels as $key => $value) {
+				if (!empty($onlykey) && $onlykey != '@GETPOSTISSET' && $key != $onlykey) {
+					continue;
+				}
+				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key)) {
+					continue;
+				}
 
 				$key_type = $this->attributes[$object->table_element]['type'][$key];
-				if ($key_type == 'separate') continue;
+				if ($key_type == 'separate') {
+					continue;
+				}
 
 				$enabled = 1;
-				if (isset($this->attributes[$object->table_element]['list'][$key]))
-				{
+				if (isset($this->attributes[$object->table_element]['list'][$key])) {
 					$enabled = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
 				}
 				$perms = 1;
-				if (isset($this->attributes[$object->table_element]['perms'][$key]))
-				{
+				if (isset($this->attributes[$object->table_element]['perms'][$key])) {
 					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
 				}
-				if (empty($enabled)) continue;
-				if (empty($perms)) continue;
+				if (empty($enabled)) {
+					continue;
+				}
+				if (empty($perms)) {
+					continue;
+				}
 
-				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
-				{
+				if ($this->attributes[$object->table_element]['required'][$key]) {	// Value is required
 					// Check if functionally empty without using GETPOST (depending on the type of extrafield, a
 					// technically non-empty value may be treated as empty functionally).
 					// value can be alpha, int, array, etc...
-				    if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
-				        || (!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
-				        || (!is_array($_POST["options_".$key]) && isset($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'sellist' && $_POST['options_'.$key] == '0')
-						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
-					{
+					if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
+						|| (!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
+						|| (!is_array($_POST["options_".$key]) && isset($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'sellist' && $_POST['options_'.$key] == '0')
+						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key]))) {
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
 						$nofillrequired++;
 						$error_field_required[] = $langs->transnoentitiesnoconv($value);
@@ -2069,7 +2085,9 @@ class ExtraFields
 					$value_key = GETPOST("options_".$key, 'alphanohtml');
 				} else {
 					$value_key = GETPOST("options_".$key);
-					if (in_array($key_type, array('link')) && $value_key == '-1') $value_key = '';
+					if (in_array($key_type, array('link')) && $value_key == '-1') {
+						$value_key = '';
+					}
 				}
 
 				$object->array_options["options_".$key] = $value_key;
@@ -2099,43 +2117,44 @@ class ExtraFields
 	{
 		global $_POST;
 
-		if (is_string($extrafieldsobjectkey) && !empty($this->attributes[$extrafieldsobjectkey]['label']) && is_array($this->attributes[$extrafieldsobjectkey]['label']))
-		{
+		if (is_string($extrafieldsobjectkey) && !empty($this->attributes[$extrafieldsobjectkey]['label']) && is_array($this->attributes[$extrafieldsobjectkey]['label'])) {
 			$extralabels = $this->attributes[$extrafieldsobjectkey]['label'];
 		} else {
 			$extralabels = $extrafieldsobjectkey;
 		}
 
-		if (is_array($extralabels))
-		{
+		if (is_array($extralabels)) {
 			$array_options = array();
 
 			// Get extra fields
-			foreach ($extralabels as $key => $value)
-			{
+			foreach ($extralabels as $key => $value) {
 				$key_type = '';
-				if (is_string($extrafieldsobjectkey))
-				{
+				if (is_string($extrafieldsobjectkey)) {
 					$key_type = $this->attributes[$extrafieldsobjectkey]['type'][$key];
 				}
 
-				if (in_array($key_type, array('date', 'datetime')))
-				{
+				if (in_array($key_type, array('date', 'datetime'))) {
 					$dateparamname_start = $keysuffix . 'options_' . $key . $keyprefix . '_start';
 					$dateparamname_end   = $keysuffix . 'options_' . $key . $keyprefix . '_end';
 					if (GETPOSTISSET($dateparamname_start . 'year') && GETPOSTISSET($dateparamname_end . 'year')) {
 						// values provided as a date pair (start date + end date), each date being broken down as year, month, day, etc.
 						$value_key = array(
 							'start' => dol_mktime(
-								0, 0, 0,
+								0,
+								0,
+								0,
 								GETPOST($dateparamname_start . 'month', 'int'),
 								GETPOST($dateparamname_start . 'day', 'int'),
-								GETPOST($dateparamname_start . 'year', 'int')),
+								GETPOST($dateparamname_start . 'year', 'int')
+							),
 							'end' => dol_mktime(
-								23, 59, 59,
+								23,
+								59,
+								59,
 								GETPOST($dateparamname_end . 'month', 'int'),
 								GETPOST($dateparamname_end . 'day', 'int'),
-								GETPOST($dateparamname_end . 'year', 'int'))
+								GETPOST($dateparamname_end . 'year', 'int')
+							)
 						);
 					} elseif (GETPOSTISSET($keysuffix."options_".$key.$keyprefix."year")) {
 						// Clean parameters
@@ -2143,20 +2162,24 @@ class ExtraFields
 					} else {
 						continue; // Value was not provided, we should not set it.
 					}
-				} elseif (in_array($key_type, array('checkbox', 'chkbxlst')))
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
+				} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {
+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {
+						continue; // Value was not provided, we should not set it.
+					}
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					// Make sure we get an array even if there's only one checkbox
 					$value_arr = (array) $value_arr;
 					$value_key = implode(',', $value_arr);
-				} elseif (in_array($key_type, array('price', 'double', 'int')))
-				{
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
+				} elseif (in_array($key_type, array('price', 'double', 'int'))) {
+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {
+						continue; // Value was not provided, we should not set it.
+					}
 					$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
 					$value_key = price2num($value_arr);
 				} else {
-					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) continue; // Value was not provided, we should not set it.
+					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {
+						continue; // Value was not provided, we should not set it.
+					}
 					$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
 				}
 
diff --git a/htdocs/core/class/extralanguages.class.php b/htdocs/core/class/extralanguages.class.php
index 34c2e34dc82..af733c8f6cb 100644
--- a/htdocs/core/class/extralanguages.class.php
+++ b/htdocs/core/class/extralanguages.class.php
@@ -83,11 +83,19 @@ class ExtraLanguages
 		// phpcs:enable
 		global $conf;
 
-		if (empty($elementtype)) return array();
+		if (empty($elementtype)) {
+			return array();
+		}
 
-		if ($elementtype == 'thirdparty')     $elementtype = 'societe';
-		if ($elementtype == 'contact')        $elementtype = 'socpeople';
-		if ($elementtype == 'order_supplier') $elementtype = 'commande_fournisseur';
+		if ($elementtype == 'thirdparty') {
+			$elementtype = 'societe';
+		}
+		if ($elementtype == 'contact') {
+			$elementtype = 'socpeople';
+		}
+		if ($elementtype == 'order_supplier') {
+			$elementtype = 'commande_fournisseur';
+		}
 
 
 		$array_name_label = array();
@@ -133,16 +141,14 @@ class ExtraLanguages
 	{
 		global $conf, $langs, $form;
 
-		if (!is_object($form))
-		{
+		if (!is_object($form)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($this->db);
 		}
 
 		$out = '';
 
-		if (!preg_match('/options_$/', $keyprefix))	// Because we work on extrafields, we add 'options_' to prefix if not already added
-		{
+		if (!preg_match('/options_$/', $keyprefix)) {	// Because we work on extrafields, we add 'options_' to prefix if not already added
 			$keyprefix = $keyprefix.'options_';
 		}
 
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index b601994536e..21d948b2160 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -52,8 +52,7 @@ class FileUpload
 		$this->element = $element;
 
 		$pathname = $filename = $element;
-		if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs))
-		{
+		if (preg_match('/^([^_]+)_([^_]+)/i', $element, $regs)) {
 			$pathname = $regs[1];
 			$filename = $regs[2];
 		}
@@ -234,8 +233,7 @@ class FileUpload
 	protected function getFileObject($file_name)
 	{
 		$file_path = $this->options['upload_dir'].$file_name;
-		if (is_file($file_path) && $file_name[0] !== '.')
-		{
+		if (is_file($file_path) && $file_name[0] !== '.') {
 			$file = new stdClass();
 			$file->name = $file_name;
 			$file->mime = dol_mimetype($file_name, '', 2);
@@ -277,8 +275,7 @@ class FileUpload
 		$file_path = $this->options['upload_dir'].$file_name;
 		$new_file_path = $options['upload_dir'].$file_name;
 
-		if (dol_mkdir($options['upload_dir']) >= 0)
-		{
+		if (dol_mkdir($options['upload_dir']) >= 0) {
 			list($img_width, $img_height) = @getimagesize($file_path);
 			if (!$img_width || !$img_height) {
 				return false;
@@ -286,7 +283,9 @@ class FileUpload
 
 			$res = vignette($file_path, $maxwidthmini, $maxheightmini, '_mini'); // We don't use ->addThumbs here because there is no object and we don't need all thumbs, only the "mini".
 
-			if (preg_match('/error/i', $res)) return false;
+			if (preg_match('/error/i', $res)) {
+				return false;
+			}
 			return true;
 		} else {
 			return false;
@@ -398,10 +397,8 @@ class FileUpload
 				preg_match('/^image\/(gif|jpe?g|png)/', $type, $matches)) {
 			$file_name .= '.'.$matches[1];
 		}
-		if ($this->options['discard_aborted_uploads'])
-		{
-			while (is_file($this->options['upload_dir'].$file_name))
-			{
+		if ($this->options['discard_aborted_uploads']) {
+			while (is_file($this->options['upload_dir'].$file_name)) {
 				$file_name = $this->upcountName($file_name);
 			}
 		}
@@ -426,15 +423,13 @@ class FileUpload
 		$file->mime = dol_mimetype($file->name, '', 2);
 		$file->size = intval($size);
 		$file->type = $type;
-		if ($this->validate($uploaded_file, $file, $error, $index) && dol_mkdir($this->options['upload_dir']) >= 0)
-		{
+		if ($this->validate($uploaded_file, $file, $error, $index) && dol_mkdir($this->options['upload_dir']) >= 0) {
 			$file_path = $this->options['upload_dir'].$file->name;
 			$append_file = !$this->options['discard_aborted_uploads'] && is_file($file_path) && $file->size > filesize($file_path);
 			clearstatcache();
 			if ($uploaded_file && is_uploaded_file($uploaded_file)) {
 				// multipart/formdata uploads (POST method uploads)
-				if ($append_file)
-				{
+				if ($append_file) {
 					file_put_contents($file_path, fopen($uploaded_file, 'r'), FILE_APPEND);
 				} else {
 					dol_move_uploaded_file($uploaded_file, $file_path, 1, 0, 0, 0, 'userfile');
@@ -444,19 +439,15 @@ class FileUpload
 				file_put_contents($file_path, fopen('php://input', 'r'), $append_file ? FILE_APPEND : 0);
 			}
 			$file_size = filesize($file_path);
-			if ($file_size === $file->size)
-			{
+			if ($file_size === $file->size) {
 				$file->url = $this->options['upload_url'].rawurlencode($file->name);
-				foreach ($this->options['image_versions'] as $version => $options)
-				{
-					if ($this->createScaledImage($file->name, $options))
-					{
+				foreach ($this->options['image_versions'] as $version => $options) {
+					if ($this->createScaledImage($file->name, $options)) {
 						$tmp = explode('.', $file->name);
 						$file->{$version.'_url'} = $options['upload_url'].rawurlencode($tmp[0].'_mini.'.$tmp[1]);
 					}
 				}
-			} elseif ($this->options['discard_aborted_uploads'])
-			{
+			} elseif ($this->options['discard_aborted_uploads']) {
 				unlink($file_path);
 				$file->error = 'abort';
 			}
@@ -475,8 +466,7 @@ class FileUpload
 	{
 		$file_name = isset($_REQUEST['file']) ?
 		basename(stripslashes($_REQUEST['file'])) : null;
-		if ($file_name)
-		{
+		if ($file_name) {
 			$info = $this->getFileObject($file_name);
 		} else {
 			$info = $this->getFileObjects();
@@ -492,15 +482,13 @@ class FileUpload
 	 */
 	public function post()
 	{
-		if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE')
-		{
+		if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
 			return $this->delete();
 		}
 		$upload = isset($_FILES[$this->options['param_name']]) ?
 		$_FILES[$this->options['param_name']] : null;
 		$info = array();
-		if ($upload && is_array($upload['tmp_name']))
-		{
+		if ($upload && is_array($upload['tmp_name'])) {
 			// param_name is an array identifier like "files[]",
 			// $_FILES is a multi-dimensional array:
 			foreach ($upload['tmp_name'] as $index => $value) {
@@ -553,13 +541,10 @@ class FileUpload
 		basename(stripslashes($_REQUEST['file'])) : null;
 		$file_path = $this->options['upload_dir'].$file_name;
 		$success = is_file($file_path) && $file_name[0] !== '.' && unlink($file_path);
-		if ($success)
-		{
-			foreach ($this->options['image_versions'] as $version => $options)
-			{
+		if ($success) {
+			foreach ($this->options['image_versions'] as $version => $options) {
 				$file = $options['upload_dir'].$file_name;
-				if (is_file($file))
-				{
+				if (is_file($file)) {
 					unlink($file);
 				}
 			}
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index ebbdb2c3274..ebcf4adc7b0 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -154,13 +154,11 @@ class Fiscalyear extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."accounting_fiscalyear");
 
 			$result = $this->update($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->db->commit();
 				return $this->id;
 			} else {
@@ -186,8 +184,7 @@ class Fiscalyear extends CommonObject
 		global $langs;
 
 		// Check parameters
-		if (empty($this->date_start) && empty($this->date_end))
-		{
+		if (empty($this->date_start) && empty($this->date_end)) {
 			$this->error = 'ErrorBadParameter';
 			return -1;
 		}
@@ -204,8 +201,7 @@ class Fiscalyear extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -230,8 +226,7 @@ class Fiscalyear extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$obj = $this->db->fetch_object($result);
 
 			$this->id = $obj->rowid;
@@ -262,8 +257,7 @@ class Fiscalyear extends CommonObject
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -285,26 +279,36 @@ class Fiscalyear extends CommonObject
 	{
 		global $conf, $langs, $user;
 
-		if (empty($this->ref)) $this->ref = $this->id;
+		if (empty($this->ref)) {
+			$this->ref = $this->id;
+		}
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
 		$url = DOL_URL_ROOT.'/accountancy/admin/fiscalyear_card.php?id='.$this->id;
 
-		if (!$user->rights->accounting->fiscalyear->write)
+		if (!$user->rights->accounting->fiscalyear->write) {
 			$option = 'nolink';
-
-		if ($option !== 'nolink')
-		{
-			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		}
 
-		if ($short) return $url;
+		if ($option !== 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		if ($short) {
+			return $url;
+		}
 
 		$label = '';
 
@@ -317,10 +321,8 @@ class Fiscalyear extends CommonObject
 		}
 
 		$linkclose = '';
-		if (empty($notooltip) && $user->rights->accounting->fiscalyear->write)
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip) && $user->rights->accounting->fiscalyear->write) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("FiscalYear");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -338,8 +340,12 @@ class Fiscalyear extends CommonObject
 		}
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -369,28 +375,34 @@ class Fiscalyear extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 2)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 3)
-		{
-			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8');
-		} elseif ($mode == 4)
-		{
-			if ($status == 0 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
-		} elseif ($mode == 5)
-		{
-			if ($status == 0 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			elseif ($status == 1 && !empty($this->statuts_short[$status])) return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+		} elseif ($mode == 2) {
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts_short[$status]);
+			}
+		} elseif ($mode == 3) {
+			if ($status == 0 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut8');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 0 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
+				return img_picto($langs->trans($this->statuts_short[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
+			}
+		} elseif ($mode == 5) {
+			if ($status == 0 && !empty($this->statuts_short[$status])) {
+				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
+			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
+				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
+			}
 		}
 	}
 
@@ -410,20 +422,16 @@ class Fiscalyear extends CommonObject
 		dol_syslog(get_class($this)."::fetch info", LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_modif)
-				{
+				if ($obj->fk_user_modif) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modif);
 					$this->user_modification = $muser;
@@ -448,10 +456,12 @@ class Fiscalyear extends CommonObject
 	{
 		global $conf;
 
-		if (empty($datestart))
+		if (empty($datestart)) {
 			$datestart = $this->date_start;
-		if (empty($dateend))
+		}
+		if (empty($dateend)) {
 			$dateend = $this->date_end;
+		}
 
 		$sql = "SELECT count(DISTINCT piece_num) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping";
@@ -459,11 +469,12 @@ class Fiscalyear extends CommonObject
 		$sql .= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return $nb;
 	}
@@ -479,10 +490,12 @@ class Fiscalyear extends CommonObject
 	{
 		global $conf;
 
-		if (empty($datestart))
+		if (empty($datestart)) {
 			$datestart = $this->date_start;
-		if (empty($dateend))
+		}
+		if (empty($dateend)) {
 			$dateend = $this->date_end;
+		}
 
 		$sql = "SELECT count(rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping ";
@@ -490,11 +503,12 @@ class Fiscalyear extends CommonObject
 		$sql .= " AND doc_date >= '".$this->db->idate($datestart)."' and doc_date <= '".$this->db->idate($dateend)."'";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$nb = $obj->nb;
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return $nb;
 	}
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index f1577496f8b..8b211a34864 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -84,36 +84,40 @@ class HookManager
 		global $conf;
 
 		// Test if there is hooks to manage
-		if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
+		if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) {
+			return;
+		}
 
 		// For backward compatibility
-		if (!is_array($arraycontext)) $arraycontext = array($arraycontext);
+		if (!is_array($arraycontext)) {
+			$arraycontext = array($arraycontext);
+		}
 
 		$this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
 
 		$arraytolog = array();
-		foreach ($conf->modules_parts['hooks'] as $module => $hooks)	// Loop on each module that brings hooks
-		{
-			if (empty($conf->$module->enabled)) continue;
+		foreach ($conf->modules_parts['hooks'] as $module => $hooks) {	// Loop on each module that brings hooks
+			if (empty($conf->$module->enabled)) {
+				continue;
+			}
 
 			//dol_syslog(get_class($this).'::initHooks module='.$module.' arraycontext='.join(',',$arraycontext));
-			foreach ($arraycontext as $context)
-			{
-				if (is_array($hooks)) $arrayhooks = $hooks; // New system
-				else $arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)
+			foreach ($arraycontext as $context) {
+				if (is_array($hooks)) {
+					$arrayhooks = $hooks; // New system
+				} else {
+					$arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)
+				}
 
-				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if initialized hook is handled by module
-				{
+				if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks)) {    // We instantiate action class only if initialized hook is handled by module
 					// Include actions class overwriting hooks
-					if (empty($this->hooks[$context][$module]) || !is_object($this->hooks[$context][$module]))	// If set to an object value, class was already loaded
-					{
+					if (empty($this->hooks[$context][$module]) || !is_object($this->hooks[$context][$module])) {	// If set to an object value, class was already loaded
 						$path = '/'.$module.'/class/';
 						$actionfile = 'actions_'.$module.'.class.php';
 
 						$arraytolog[] = 'context='.$context.'-path='.$path.$actionfile;
 						$resaction = dol_include_once($path.$actionfile);
-						if ($resaction)
-						{
+						if ($resaction) {
 							$controlclassname = 'Actions'.ucfirst($module);
 							$actionInstance = new $controlclassname($this->db);
 							$this->hooks[$context][$module] = $actionInstance;
@@ -122,8 +126,7 @@ class HookManager
 				}
 			}
 		}
-		if (count($arraytolog) > 0)
-		{
+		if (count($arraytolog) > 0) {
 			dol_syslog(get_class($this)."::initHooks Loading hooks: ".join(', ', $arraytolog), LOG_DEBUG);
 		}
 
@@ -144,7 +147,9 @@ class HookManager
 	 */
 	public function executeHooks($method, $parameters = array(), &$object = '', &$action = '')
 	{
-		if (!is_array($this->hooks) || empty($this->hooks)) return 0; // No hook available, do nothing.
+		if (!is_array($this->hooks) || empty($this->hooks)) {
+			return 0; // No hook available, do nothing.
+		}
 
 		$parameters['context'] = join(':', $this->contextarray);
 		//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
@@ -218,7 +223,9 @@ class HookManager
 				'setHtmlTitle',
 				'completeTabsHead'
 				)
-			)) $hooktype = 'addreplace';
+		)) {
+			$hooktype = 'addreplace';
+		}
 
 		// Init return properties
 		$this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;
@@ -226,19 +233,20 @@ class HookManager
 		// Loop on each hook to qualify modules that have declared context
 		$modulealreadyexecuted = array();
 		$resaction = 0; $error = 0;
-		foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
-		{
-			if (!empty($modules))
-			{
-				foreach ($modules as $module => $actionclassinstance)
-				{
+		foreach ($this->hooks as $context => $modules) {    // $this->hooks is an array with context as key and value is an array of modules that handle this context
+			if (!empty($modules)) {
+				foreach ($modules as $module => $actionclassinstance) {
 					//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
 
 					// test to avoid running twice a hook, when a module implements several active contexts
-					if (in_array($module, $modulealreadyexecuted)) continue;
+					if (in_array($module, $modulealreadyexecuted)) {
+						continue;
+					}
 
 					// jump to next module/class if method does not exist
-					if (!method_exists($actionclassinstance, $method)) continue;
+					if (!method_exists($actionclassinstance, $method)) {
+						continue;
+					}
 
 					$this->resNbOfHooks++;
 
@@ -253,40 +261,48 @@ class HookManager
 					// Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
 					$parameters['currentcontext'] = $context;
 					// Hooks that must return int (hooks with type 'addreplace')
-					if ($hooktype == 'addreplace')
-					{
+					if ($hooktype == 'addreplace') {
 						$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-						if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
-						{
+						if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0)) {
 							$error++;
 							$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
 							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
 						}
 
-						if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-						if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
+						if (isset($actionclassinstance->results) && is_array($actionclassinstance->results)) {
+							$this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+						}
+						if (!empty($actionclassinstance->resprints)) {
+							$this->resPrint .= $actionclassinstance->resprints;
+						}
 					}
 					// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
 					else {
 						// TODO. this test should be done into the method of hook by returning nothing
-						if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+						if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) {
+							continue;
+						}
 
 						//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
 						$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
-						if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-						if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
-						if (is_numeric($resaction) && $resaction < 0)
-						{
+						if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) {
+							$this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+						}
+						if (!empty($actionclassinstance->resprints)) {
+							$this->resPrint .= $actionclassinstance->resprints;
+						}
+						if (is_numeric($resaction) && $resaction < 0) {
 							$error++;
 							$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
 							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
 						}
 						// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
-						if (!is_array($resaction) && !is_numeric($resaction))
-						{
+						if (!is_array($resaction) && !is_numeric($resaction)) {
 							dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-							if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }
+							if (empty($actionclassinstance->resprints)) {
+								$this->resPrint .= $resaction; $resaction = 0;
+							}
 						}
 					}
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 1abb7eb26e0..483d356891c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -111,46 +111,74 @@ class Form
 		$ret = '';
 
 		// TODO change for compatibility
-		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;/', $typeofdata))
-		{
-			if (!empty($perm))
-			{
+		if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;/', $typeofdata)) {
+			if (!empty($perm)) {
 				$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,39 +209,39 @@ class Form
 		$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)
-			{
+			if ($editmode) {
 				$ret .= "\n";
 				$ret .= '<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam ? '?'.$moreparam : '').'">';
 				$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 (preg_match('/^(string|safehtmlstring|email)/', $typeofdata))
-				{
+				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);
 					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').' autofocus>';
-				} elseif (preg_match('/^(numeric|amount)/', $typeofdata))
-				{
+				} elseif (preg_match('/^(numeric|amount)/', $typeofdata)) {
 					$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))
-					{
+					if (preg_match('/%/', $cols)) {
 						$morealt = ' style="width: '.$cols.'"';
 						$cols = '';
 					}
@@ -225,64 +253,79 @@ class Form
 					$valuetoshow = str_replace('&', '&amp;', $valuetoshow);
 					$ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));
 					$ret .= '</textarea>';
-				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')
-				{
+				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
 					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0);
-				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
-				{
+				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
 					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0);
-				} elseif (preg_match('/^select;/', $typeofdata))
-				{
+				} elseif (preg_match('/^select;/', $typeofdata)) {
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
-					foreach ($arraydata as $val)
-					{
+					foreach ($arraydata as $val) {
 						$tmp = explode(':', $val);
 						$tmpkey = str_replace('|', ':', $tmp[0]);
 						$arraylist[$tmpkey] = $tmp[1];
 					}
 					$ret .= $this->selectarray($htmlname, $arraylist, $value);
-				} elseif (preg_match('/^ckeditor/', $typeofdata))
-				{
+				} elseif (preg_match('/^ckeditor/', $typeofdata)) {
 					$tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols:uselocalbrowser
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 					$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="smallpaddingimp 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="smallpaddingimp 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();
-					foreach ($arraydata as $val)
-					{
+					foreach ($arraydata as $val) {
 						$tmp = explode(':', $val);
 						$arraylist[$tmp[0]] = $tmp[1];
 					}
 					$ret .= $arraylist[$value];
-				} elseif (preg_match('/^ckeditor/', $typeofdata))
-				{
+					if ($htmlname == 'fk_product_type') {
+						if ($value == 0) {
+							$ret = img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"').$ret;
+						} else {
+							$ret = img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"').$ret;
+						}
+					}
+				} elseif (preg_match('/^ckeditor/', $typeofdata)) {
 					$tmpcontent = dol_htmlentitiesbr($value);
-					if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-					{
+					if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 						$firstline = preg_replace('/<br>.*/', '', $tmpcontent);
 						$firstline = preg_replace('/[\n\r].*/', '', $firstline);
 						$tmpcontent = $firstline.((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');
@@ -294,8 +337,7 @@ class Form
 					$ret .= dol_escape_htmltag($value);
 				}
 
-				if ($formatfunc && method_exists($object, $formatfunc))
-				{
+				if ($formatfunc && method_exists($object, $formatfunc)) {
 					$ret = $object->$formatfunc($ret);
 				}
 			}
@@ -322,7 +364,9 @@ class Form
 
 		// 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)) {
@@ -344,8 +388,7 @@ class Form
 			$result .= '<div class="inline-block hidden field-'.$object->element.'-'.$fieldname.'">';
 
 			$resultforextrlang = '';
-			foreach ($arrayoflangcode as $langcode)
-			{
+			foreach ($arrayoflangcode as $langcode) {
 				$valuetoshow = GETPOSTISSET('field-'.$object->element."-".$fieldname."-".$langcode) ? GETPOST('field-'.$object->element.'-'.$fieldname."-".$langcode, $check) : '';
 				if (empty($valuetoshow)) {
 					$object->fetchValuesForExtraLanguages();
@@ -394,12 +437,15 @@ class Form
 		$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)
-		{
+		if ($condition) {
 			$element = false;
 			$table_element = false;
 			$fk_element		= false;
@@ -409,55 +455,65 @@ class Form
 			$button_only	= false;
 			$inputOption = '';
 
-			if (is_object($object))
-			{
+			if (is_object($object)) {
 				$element = $object->element;
 				$table_element = $object->table_element;
 				$fk_element = $object->id;
 			}
 
-			if (is_object($extObject))
-			{
+			if (is_object($extObject)) {
 				$ext_element = $extObject->element;
 			}
 
-			if (preg_match('/^(string|email|numeric)/', $inputType))
-			{
+			if (preg_match('/^(string|email|numeric)/', $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="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";
-			} elseif ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType)))
-			{
+			} 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))
-			{
+			} 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;
-			} elseif (preg_match('/^textarea/', $inputType))
-			{
+				if (!empty($tmp[2])) {
+					$savemethod = $tmp[2];
+				}
+				if (!empty($tmp[3])) {
+					$button_only = true;
+				}
+			} elseif (preg_match('/^textarea/', $inputType)) {
 				$tmp = explode(':', $inputType);
 				$inputType = $tmp[0];
 				$rows = (empty($tmp[1]) ? '8' : $tmp[1]);
 				$cols = (empty($tmp[2]) ? '80' : $tmp[2]);
-			} elseif (preg_match('/^ckeditor/', $inputType))
-			{
+			} elseif (preg_match('/^ckeditor/', $inputType)) {
 				$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))
-				{
+				if (!empty($conf->fckeditor->enabled)) {
 					$out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";
 				} else {
 					$inputType = 'textarea';
@@ -468,17 +524,23 @@ class Form
 			$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($custommsg))
-			{
-				if (is_array($custommsg))
-				{
-					if (!empty($custommsg['success']))
+			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['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,44 +575,66 @@ class Form
 	 */
 	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);
 
 		$extrastyle = '';
-		if ($direction < 0) { $extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : ''); $extrastyle = 'padding: 0px; padding-left: 3px !important;'; }
-		if ($direction > 0) { $extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : ''); $extrastyle = 'padding: 0px; padding-right: 3px !important;'; }
+		if ($direction < 0) {
+			$extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : ''); $extrastyle = 'padding: 0px; padding-left: 3px !important;';
+		}
+		if ($direction > 0) {
+			$extracss = ($extracss ? $extracss.' ' : '').($notabs != 3 ? 'inline-block' : ''); $extrastyle = 'padding: 0px; padding-right: 3px !important;';
+		}
 
 		$classfortooltip = 'classfortooltip';
 
 		$s = ''; $textfordialog = '';
 
-		if ($tooltiptrigger == '')
-		{
+		if ($tooltiptrigger == '') {
 			$htmltext = str_replace('"', '&quot;', $htmltext);
 		} else {
 			$classfortooltip = 'classfortooltiponclick';
 			$textfordialog .= '<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';
 		}
-		if ($tooltipon == 2 || $tooltipon == 3)
-		{
+		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 ($tooltipon == 1 || $tooltipon == 3)
-		{
+			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 +645,22 @@ class Form
 		}
 		// 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,26 +684,32 @@ class Form
 		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 (empty($conf->use_javascript_ajax)) {
+			if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') {
+				return $text;
+			} else {
 				$alt = $htmltext;
 				$htmltext = '';
 			}
 		}
 
 		// 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 (!empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger)) {
+			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 +718,21 @@ class Form
 		//}
 
 		$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,12 +760,12 @@ class Form
 		$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 (empty($reshook))
-		{
+		if (count($arrayofaction) == 0 && empty($hookmanager->resPrint)) {
+			return;
+		}
+		if (empty($reshook)) {
 			$ret .= '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>-- '.$langs->trans("SelectAction").' --</option>';
-			foreach ($arrayofaction as $code => $label)
-			{
+			foreach ($arrayofaction as $code => $label) {
 				$ret .= '<option value="'.$code.'"'.($disabled ? ' disabled="disabled"' : '').' data-html="'.dol_escape_htmltag($label).'">'.$label.'</option>';
 			}
 		}
@@ -668,15 +773,16 @@ class Form
 
 		$ret .= '</select>';
 
-		if (empty($conf->dol_optimize_smallscreen)) $ret .= ajax_combobox('.'.$name.'select');
+		if (empty($conf->dol_optimize_smallscreen)) {
+			$ret .= ajax_combobox('.'.$name.'select');
+		}
 
 		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
 		$ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.
 		$ret .= '<input type="submit" disabled name="confirmmassaction"'.(empty($conf->use_javascript_ajax) ? '' : ' style="display: none"').' class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
 		$ret .= '</div>';
 
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			$ret .= '<!-- JS CODE TO ENABLE mass action select -->
     		<script>
                         function initCheckForSelect(mode, name, cssclass)	/* mode is 0 during init of page or click all, 1 when we click on 1 checkboxi, "name" refers to the class of the massaction button, "cssclass" to the class of the checkfor select boxes */
@@ -773,15 +879,12 @@ class Form
 
 		dol_syslog(get_class($this)."::select_country", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$out .= '<select id="select'.$htmlname.'" class="flat maxwidth200onsmartphone selectcountry'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" '.$htmloption.'>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
 					$countryArray[$i]['rowid'] = $obj->rowid;
@@ -794,40 +897,50 @@ class Form
 					$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)
-				{
+				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>';
 				}
 
-				foreach ($countryArray as $row)
-				{
+				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($row['favorite']) && $atleastonefavorite)
-					{
+					if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) {
+						$atleastonefavorite++;
+					}
+					if (empty($row['favorite']) && $atleastonefavorite) {
 						$atleastonefavorite = 0;
 						$out .= '<option value="" disabled class="selectoptiondisabledwhite">------------</option>';
 					}
 
 					$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"');
@@ -885,16 +998,13 @@ class Form
 
 		dol_syslog(get_class($this)."::select_incoterm", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($conf->use_javascript_ajax && !$forcecombo)
-			{
+		if ($resql) {
+			if ($conf->use_javascript_ajax && !$forcecombo) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname, $events);
 			}
 
-			if (!empty($page))
-			{
+			if (!empty($page)) {
 				$out .= '<form method="post" action="'.$page.'">';
 				$out .= '<input type="hidden" name="action" value="set_incoterms">';
 				$out .= '<input type="hidden" name="token" value="'.newToken().'">';
@@ -904,28 +1014,26 @@ class Form
 			$out .= '<option value="0">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
+			if ($num) {
 				$foundselected = false;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$incotermArray[$i]['rowid'] = $obj->rowid;
 					$incotermArray[$i]['code'] = $obj->code;
 					$i++;
 				}
 
-				foreach ($incotermArray as $row)
-				{
-					if ($selected && ($selected == $row['rowid'] || $selected == $row['code']))
-					{
+				foreach ($incotermArray as $row) {
+					if ($selected && ($selected == $row['rowid'] || $selected == $row['code'])) {
 						$out .= '<option value="'.$row['rowid'].'" selected>';
 					} else {
 						$out .= '<option value="'.$row['rowid'].'">';
 					}
 
-					if ($row['code']) $out .= $row['code'];
+					if ($row['code']) {
+						$out .= $row['code'];
+					}
 
 					$out .= '</option>';
 				}
@@ -934,8 +1042,7 @@ class Form
 
 			$out .= '<input id="location_incoterms" class="maxwidth100onsmartphone" name="location_incoterms" value="'.$location_incoterms.'">';
 
-			if (!empty($page))
-			{
+			if (!empty($page)) {
 				$out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';
 			}
 		} else {
@@ -964,41 +1071,44 @@ class Form
 
 		// If product & services are enabled or both disabled.
 		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").': ';
+			|| (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled))) {
+			if (empty($hidetext)) {
+				print $langs->trans("Type").': ';
+			}
 			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-			if ($showempty)
-			{
+			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>';
 			print ajax_combobox('select_'.$htmlname);
 			//if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 		}
-		if ((empty($forceall) && empty($conf->product->enabled) && !empty($conf->service->enabled)) || $forceall == 3)
-		{
+		if ((empty($forceall) && empty($conf->product->enabled) && !empty($conf->service->enabled)) || $forceall == 3) {
 			print $langs->trans("Service");
 			print '<input type="hidden" name="'.$htmlname.'" value="1">';
 		}
-		if ((empty($forceall) && !empty($conf->product->enabled) && empty($conf->service->enabled)) || $forceall == 2)
-		{
+		if ((empty($forceall) && !empty($conf->product->enabled) && empty($conf->service->enabled)) || $forceall == 2) {
 			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
 		}
 	}
@@ -1015,7 +1125,9 @@ class Form
 		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);
 
@@ -1026,13 +1138,11 @@ class Form
 		$sql .= " WHERE active > 0";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
@@ -1069,24 +1179,28 @@ class Form
 		$this->load_cache_types_fees();
 
 		print '<select id="select_'.$htmlname.'" class="flat" name="'.$htmlname.'">';
-		if ($showempty)
-		{
+		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)
-		{
+		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);
+		}
 	}
 
 
@@ -1117,12 +1231,10 @@ class Form
 
 		$out = '';
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && !$forcecombo)
-		{
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT) && !$forcecombo) {
 			// No immediate load of all database
 			$placeholder = '';
-			if ($selected && empty($selected_input_value))
-			{
+			if ($selected && empty($selected_input_value)) {
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$societetmp = new Societe($this->db);
 				$societetmp->fetch($selected);
@@ -1133,8 +1245,9 @@ class Form
 			$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');
@@ -1181,8 +1294,11 @@ class Form
 		$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')) {
@@ -1201,29 +1317,43 @@ class Form
 		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 != '')
-		{
+		if ($filterkey && $filterkey != '') {
 			$sql .= " AND (";
 			$prefix = empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if COMPANY_DONOTSEARCH_ANYWHERE is on
 			// 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 (!empty($conf->barcode->enabled))
-			{
+			if (count($scrit) > 1) {
+				$sql .= ")";
+			}
+			if (!empty($conf->barcode->enabled)) {
 				$sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			}
 			$sql .= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";
@@ -1235,10 +1365,8 @@ class Form
 		// Build output string
 		dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$forcecombo)
-			{
+		if ($resql) {
+			if (!$forcecombo) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);
 			}
@@ -1247,21 +1375,23 @@ class Form
 			$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($moreparam ? ' '.$moreparam : '').' name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').'>'."\n";
 
 			$textifempty = (($showempty && !is_numeric($showempty)) ? $langs->trans($showempty) : '');
-			if (!empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
-			{
+			if (!empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
 				// 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;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$label = '';
 					if ($conf->global->SOCIETE_ADD_REF_IN_LIST) {
@@ -1280,13 +1410,22 @@ class Form
 						$label .= ' ('.$obj->name_alias.')';
 					}
 
-					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 ($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 (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
@@ -1296,10 +1435,8 @@ class Form
 						}
 					}
 
-					if (empty($outputmode))
-					{
-						if (in_array($obj->rowid, $selected))
-						{
+					if (empty($outputmode)) {
+						if (in_array($obj->rowid, $selected)) {
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
 						} else {
 							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
@@ -1309,7 +1446,9 @@ class Form
 					}
 
 					$i++;
-					if (($i % 10) == 0) $out .= "\n";
+					if (($i % 10) == 0) {
+						$out .= "\n";
+					}
 				}
 			}
 			$out .= '</select>'."\n";
@@ -1319,7 +1458,9 @@ class Form
 
 		$this->result = array('nbofthirdparties'=>$num);
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -1346,45 +1487,54 @@ class Form
 		$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);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			print '<select id="select_'.$htmlname.'" class="flat maxwidthonsmartphone" name="'.$htmlname.'">';
 			$num = $this->db->num_rows($resql);
 
 			$qualifiedlines = $num;
 
 			$i = 0;
-			if ($num)
-			{
+			if ($num) {
 				print '<option value="0">&nbsp;</option>';
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$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)
-					{
+					if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue) {
 						$qualifiedlines--;
 						$disabled = ' disabled';
 					}
 
-					if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source))
-					{
+					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>';
@@ -1457,37 +1607,47 @@ class Form
 
 		$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))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 
 		// 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)."::selectcontacts", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			if ($conf->use_javascript_ajax && !$forcecombo && !$options_only)
-			{
+			if ($conf->use_javascript_ajax && !$forcecombo && !$options_only) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);
 			}
@@ -1496,17 +1656,19 @@ class Form
 				$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)
-			{
+			if ($num) {
 				include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 				$contactstatic = new Contact($this->db);
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
 					// Set email (or phones) and town extended infos
@@ -1514,56 +1676,85 @@ class Form
 					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;
 					$contactstatic->lastname = $obj->lastname;
 					$contactstatic->firstname = $obj->firstname;
 					if ($obj->statut == 1) {
-						if ($htmlname != 'none')
-						{
+						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 (!empty($selected) && in_array($obj->rowid, $selected))
-							{
+							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))
-							{
+							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.')';
+								}
 							}
 						}
 					}
@@ -1587,8 +1778,7 @@ class Form
 
 			$reshook = $hookmanager->executeHooks('afterSelectContactOptions', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-			if ($htmlname != 'none' && !$options_only)
-			{
+			if ($htmlname != 'none' && !$options_only) {
 				$out .= '</select>';
 			}
 
@@ -1652,24 +1842,30 @@ class Form
 		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));
-		} elseif ($include == 'hierarchyme')
-		{
+		} elseif ($include == 'hierarchyme') {
 			// Build list includeUsers to have only hierarchy and current user
 			$includeUsers = implode(",", $user->getAllChildIds(1));
 		}
@@ -1679,19 +1875,19 @@ class Form
 
 		// Forge request to select users
 		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut as status, u.login, u.admin, u.entity, u.photo";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
-		{
+		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= ", e.label";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
-		{
+		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))
-			{
+			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";
 				$sql .= " ON ug.fk_user = u.rowid";
 				$sql .= " WHERE ug.entity = ".$conf->entity;
@@ -1699,18 +1895,29 @@ class Form
 				$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";
@@ -1718,25 +1925,26 @@ class Form
 
 		dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
+			if ($num) {
 				// Enhance with select2
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname);
 
 				// 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);
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
 					$userstatic->id = $obj->rowid;
@@ -1748,54 +1956,52 @@ class Form
 					$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 = '';
 
 					// $fullNameMode is 0=Lastname+Firstname (MAIN_FIRSTNAME_NAME_POSITION=1), 1=Firstname+Lastname (MAIN_FIRSTNAME_NAME_POSITION=0)
 					$fullNameMode = 0;
-					if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION))
-					{
+					if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) {
 						$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 = '';
-					if (!empty($conf->global->MAIN_SHOW_LOGIN))
-					{
+					if (!empty($conf->global->MAIN_SHOW_LOGIN)) {
 						$moreinfo .= ($moreinfo ? ' - ' : ' (').$obj->login;
 					}
-					if ($showstatus >= 0)
-					{
-						if ($obj->status == 1 && $showstatus == 1)
-						{
+					if ($showstatus >= 0) {
+						if ($obj->status == 1 && $showstatus == 1) {
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
 						}
-						if ($obj->status == 0 && $showstatus == 1)
-						{
+						if ($obj->status == 0 && $showstatus == 1) {
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
 						}
 					}
-					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity)
-					{
-						if (!$obj->entity)
-						{
+					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {
+						if (!$obj->entity) {
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");
 						} else {
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));
 						}
 					}
 					$moreinfo .= ($moreinfo ? ')' : '');
-					if ($disableline && $disableline != '1')
-					{
+					if ($disableline && $disableline != '1') {
 						$moreinfo .= ' - '.$disableline; // This is text from $enableonlytext parameter
 					}
 					$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 +2010,13 @@ class Form
 					// if (!empty($obj->photo)) {
 					$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 +2035,9 @@ class Form
 			dol_print_error($this->db);
 		}
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -1863,32 +2075,33 @@ class Form
 
 
 		$assignedtouser = array();
-		if (!empty($_SESSION['assignedtouser']))
-		{
+		if (!empty($_SESSION['assignedtouser'])) {
 			$assignedtouser = json_decode($_SESSION['assignedtouser'], true);
 		}
 		$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;
+		foreach ($assignedtouser as $key => $value) {
+			if ($value['id'] == $ownerid) {
+				continue;
+			}
 
 			$out .= '<li>';
 			$userstatic->fetch($value['id']);
 			$out .= $userstatic->getNomUrl(-1);
-			if ($i == 0) { $ownerid = $value['id']; $out .= ' ('.$langs->trans("Owner").')'; }
-			if ($nbassignetouser > 1 && $action != 'view')
-			{
+			if ($i == 0) {
+				$ownerid = $value['id']; $out .= ' ('.$langs->trans("Owner").')';
+			}
+			if ($nbassignetouser > 1 && $action != 'view') {
 				$out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';
 			}
 			// Show my availability
-			if ($showproperties)
-			{
-				if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid)))
-				{
+			if ($showproperties) {
+				if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid))) {
 					$out .= '<div class="myavailability inline-block">';
 					$out .= '<span class="hideonsmartphone">&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  </span><input id="transparency" class="paddingrightonly" '.($action == 'view' ? 'disabled' : '').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency'] ? ' checked' : '').'><label for="transparency">'.$langs->trans("Busy").'</label>';
 					$out .= '</div>';
@@ -1900,11 +2113,12 @@ class Form
 			$out .= '</li>';
 			$i++;
 		}
-		if ($nbassignetouser) $out .= '</ul>';
+		if ($nbassignetouser) {
+			$out .= '</ul>';
+		}
 
 		// Method with no ajax
-		if ($action != 'view')
-		{
+		if ($action != 'view') {
 			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
 			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {';
 			$out .= 'jQuery(".removedassigned").click(function() { jQuery(".removedassignedhidden").val(jQuery(this).val()); });';
@@ -1958,7 +2172,9 @@ class Form
 
 		// 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)) {
@@ -1968,12 +2184,10 @@ class Form
 			}
 		}
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
-		{
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
 			$placeholder = '';
 
-			if ($selected && empty($selected_input_value))
-			{
+			if ($selected && empty($selected_input_value)) {
 				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 				$producttmpselect = new Product($this->db);
 				$producttmpselect->fetch($selected);
@@ -1981,8 +2195,7 @@ class Form
 				unset($producttmpselect);
 			}
 			// handle case where product or service module is disabled + no filter specified
-			if ($filtertype == '')
-			{
+			if ($filtertype == '') {
 				if (empty($conf->product->enabled)) { // when product module is disabled, show services only
 					$filtertype = 1;
 				} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
@@ -2073,8 +2286,9 @@ class Form
                 ';
 			}
 
-			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');
@@ -2088,8 +2302,11 @@ class Form
 			$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
@@ -2131,26 +2348,21 @@ class Form
 		}
 
 		$warehouseStatusArray = array();
-		if (!empty($warehouseStatus))
-		{
+		if (!empty($warehouseStatus)) {
 			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-			if (preg_match('/warehouseclosed/', $warehouseStatus))
-			{
+			if (preg_match('/warehouseclosed/', $warehouseStatus)) {
 				$warehouseStatusArray[] = Entrepot::STATUS_CLOSED;
 			}
-			if (preg_match('/warehouseopen/', $warehouseStatus))
-			{
+			if (preg_match('/warehouseopen/', $warehouseStatus)) {
 				$warehouseStatusArray[] = Entrepot::STATUS_OPEN_ALL;
 			}
-			if (preg_match('/warehouseinternal/', $warehouseStatus))
-			{
+			if (preg_match('/warehouseinternal/', $warehouseStatus)) {
 				$warehouseStatusArray[] = Entrepot::STATUS_OPEN_INTERNAL;
 			}
 		}
 
 		$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_country, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
-		if (count($warehouseStatusArray))
-		{
+		if (count($warehouseStatusArray)) {
 			$selectFieldsGrouped = ", sum(".$this->db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
 		} else {
 			$selectFieldsGrouped = ", ".$this->db->ifsql("p.stock IS NULL", 0, "p.stock")." AS stock";
@@ -2159,8 +2371,7 @@ class Form
 		$sql = "SELECT ";
 		$sql .= $selectFields.$selectFieldsGrouped;
 
-		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
-		{
+		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY)) {
 			//Product category
 			$sql .= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie
 						FROM ".MAIN_DB_PREFIX."categorie_product
@@ -2170,8 +2381,7 @@ class Form
 		}
 
 		//Price by customer
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid))
-		{
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
 			$sql .= ', pcp.rowid as idprodcustprice, pcp.price as custprice, pcp.price_ttc as custprice_ttc,';
 			$sql .= ' pcp.price_base_type as custprice_base_type, pcp.tva_tx as custtva_tx, pcp.ref_customer as custref';
 			$selectFields .= ", idprodcustprice, custprice, custprice_ttc, custprice_base_type, custtva_tx, custref";
@@ -2183,37 +2393,37 @@ class Form
 		}
 
 		// Multilang : we add translation
-		if (!empty($conf->global->MAIN_MULTILANGS))
-		{
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$sql .= ", pl.label as label_translated";
 			$sql .= ", pl.description as description_translated";
 			$selectFields .= ", label_translated";
 			$selectFields .= ", description_translated";
 		}
 		// Price by quantity
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-		{
+		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";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-		if (count($warehouseStatusArray))
-		{
+		if (count($warehouseStatusArray)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid AND e.entity IN (".getEntity('stock').")";
 			$sql .= ' AND e.statut IN ('.$this->db->sanitize($this->db->escape(implode(',', $warehouseStatusArray))).')'; // Return line if product is inside the selected stock. If not, an empty line will be returned so we will count 0.
 		}
 
 		// include search in supplier ref
-		if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))
-		{
+		if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
 		}
 
@@ -2226,8 +2436,7 @@ class Form
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_units u ON u.rowid = p.fk_unit";
 		}
 		// Multilang : we add translation
-		if (!empty($conf->global->MAIN_MULTILANGS))
-		{
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid ";
 			if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE) && !empty($socid)) {
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
@@ -2253,60 +2462,71 @@ class Form
 			$sql .= " AND pac.rowid IS NULL";
 		}
 
-		if ($finished == 0)
-		{
+		if ($finished == 0) {
 			$sql .= " AND p.finished = ".$finished;
-		} elseif ($finished == 1)
-		{
+		} elseif ($finished == 1) {
 			$sql .= " AND p.finished = ".$finished;
-			if ($status >= 0)  $sql .= " AND p.tosell = ".$status;
-		} elseif ($status >= 0)
-		{
+			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";
 		}
 		// Add criteria on ref/label
-		if ($filterkey != '')
-		{
+		if ($filterkey != '') {
 			$sql .= ' AND (';
 			$prefix = empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
-			foreach ($scrit as $crit)
-			{
-				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->PRODUIT_CUSTOMER_PRICES) && ! empty($socid)) $sql .= " OR pcp.ref_customer 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 (count($scrit) > 1) {
+				$sql .= "(";
+			}
+			foreach ($scrit as $crit) {
+				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->PRODUIT_CUSTOMER_PRICES) && ! empty($socid)) {
+					$sql .= " OR pcp.ref_customer 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_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))
-		{
+		if (count($warehouseStatusArray)) {
 			$sql .= ' GROUP BY'.$selectFields;
 		}
 
 		//Sort by category
-		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY))
-		{
+		if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY)) {
 			$sql .= " ORDER BY categorie_product_id ";
 			//ASC OR DESC order
 			($conf->global->PRODUCT_SORT_BY_CATEGORY == 1) ? $sql .= "ASC" : $sql .= "DESC";
@@ -2319,8 +2539,7 @@ class Form
 		// Build output string
 		dol_syslog(get_class($this)."::select_produits_list search products", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
@@ -2329,8 +2548,7 @@ class Form
 
 			$events = null;
 
-			if (!$forcecombo)
-			{
+			if (!$forcecombo) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$out .= ajax_combobox($htmlname, $events, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);
 			}
@@ -2340,24 +2558,28 @@ class Form
 			$textifempty = '';
 			// Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.
 			//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 (!empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
+				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)
-			{
+			while ($num && $i < $num) {
 				$opt = '';
 				$optJson = array();
 				$objp = $this->db->fetch_object($result);
 
-				if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1)
-				{ // Price by quantity will return many prices for the same product
+				if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product
 					$sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise, price_base_type";
 					$sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";
 					$sql .= " WHERE fk_product_price=".$objp->price_rowid;
@@ -2365,8 +2587,7 @@ class Form
 
 					dol_syslog(get_class($this)."::select_produits_list search prices by qty", LOG_DEBUG);
 					$result2 = $this->db->query($sql);
-					if ($result2)
-					{
+					if ($result2) {
 						$nb_prices = $this->db->num_rows($result2);
 						$j = 0;
 						while ($nb_prices && $j < $nb_prices) {
@@ -2425,7 +2646,9 @@ class Form
 
 			$this->db->free($result);
 
-			if (empty($outputmode)) return $out;
+			if (empty($outputmode)) {
+				return $out;
+			}
 			return $outarray;
 		} else {
 			dol_print_error($db);
@@ -2470,16 +2693,19 @@ class Form
 		$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;
 		$outrefcust = empty($objp->custref) ? '' : $objp->custref;
 		$outlabel = $objp->label;
 		$outdesc = $objp->description;
-		if (!empty($conf->global->MAIN_MULTILANGS))
-		{
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			$outlabel_translated = $objp->label_translated;
 			$outdesc_translated = $objp->description_translated;
 		}
@@ -2491,7 +2717,9 @@ class Form
 		$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 = '';
@@ -2533,15 +2761,16 @@ class Form
 
 		$opt = '<option value="'.$objp->rowid.'"';
 		$opt .= ($objp->rowid == $selected) ? ' selected' : '';
-		if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0)
-		{
+		if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0) {
 			$opt .= ' pbq="'.$objp->price_by_qty_rowid.'" data-pbq="'.$objp->price_by_qty_rowid.'" data-pbqup="'.$objp->price_by_qty_unitprice.'" data-pbqbase="'.$objp->price_by_qty_price_base_type.'" data-pbqqty="'.$objp->price_by_qty_quantity.'" data-pbqpercent="'.$objp->price_by_qty_remise_percent.'"';
 		}
-		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
-		{
+		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"';
+				}
 			}
 		}
 		if (!empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
@@ -2550,18 +2779,32 @@ class Form
 		}
 		$opt .= '>';
 		$opt .= $objp->ref;
-		if (! empty($objp->custref)) $opt.= ' (' . $objp->custref . ')';
-		if ($outbarcode) $opt .= ' ('.$outbarcode.')';
+		if (! empty($objp->custref)) {
+			$opt.= ' (' . $objp->custref . ')';
+		}
+		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($objp->custref)) $objRef .= ' (' . $objp->custref . ')';
-		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
+		if (! empty($objp->custref)) {
+			$objRef .= ' (' . $objp->custref . ')';
+		}
+		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;
@@ -2571,8 +2814,7 @@ class Form
 
 		// Multiprice
 		// If we need a particular price level (from 1 to 6)
-		if (empty($hidepriceinlabel) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
-		{
+		if (empty($hidepriceinlabel) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
 			$sql = "SELECT price, price_ttc, price_base_type, tva_tx";
 			$sql .= " FROM ".MAIN_DB_PREFIX."product_price";
 			$sql .= " WHERE fk_product = ".((int) $objp->rowid);
@@ -2583,14 +2825,11 @@ class Form
 
 			dol_syslog(get_class($this).'::constructProductListOption search price for product '.$objp->rowid.' AND level '.$price_level.'', LOG_DEBUG);
 			$result2 = $this->db->query($sql);
-			if ($result2)
-			{
+			if ($result2) {
 				$objp2 = $this->db->fetch_object($result2);
-				if ($objp2)
-				{
+				if ($objp2) {
 					$found = 1;
-					if ($objp2->price_base_type == 'HT')
-					{
+					if ($objp2->price_base_type == 'HT') {
 						$opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 						$outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
 					} else {
@@ -2608,13 +2847,11 @@ class Form
 		}
 
 		// Price by quantity
-		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)))
-		{
+		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1 && (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {
 			$found = 1;
 			$outqty = $objp->quantity;
 			$outdiscount = $objp->remise_percent;
-			if ($objp->quantity == 1)
-			{
+			if ($objp->quantity == 1) {
 				$opt .= ' - '.price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/";
 				$outval .= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/";
 				$opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
@@ -2631,26 +2868,21 @@ class Form
 			$outpricebasetype = $objp->price_base_type;
 			$outtva_tx = $objp->tva_tx;
 		}
-		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1)
-		{
+		if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1) {
 			$opt .= " (".price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
 			$outval .= " (".price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
 		}
-		if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1)
-		{
+		if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1) {
 			$opt .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
 			$outval .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
 		}
 
 		// Price by customer
-		if (empty($hidepriceinlabel) && !empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-		{
-			if (!empty($objp->idprodcustprice))
-			{
+		if (empty($hidepriceinlabel) && !empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+			if (!empty($objp->idprodcustprice)) {
 				$found = 1;
 
-				if ($objp->custprice_base_type == 'HT')
-				{
+				if ($objp->custprice_base_type == 'HT') {
 					$opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 					$outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
 				} else {
@@ -2666,10 +2898,8 @@ class Form
 		}
 
 		// If level no defined or multiprice not found, we used the default price
-		if (empty($hidepriceinlabel) && !$found)
-		{
-			if ($objp->price_base_type == 'HT')
-			{
+		if (empty($hidepriceinlabel) && !$found) {
+			if ($objp->price_base_type == 'HT') {
 				$opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");
 				$outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");
 			} else {
@@ -2682,8 +2912,7 @@ class Form
 			$outtva_tx = $objp->tva_tx;
 		}
 
-		if (!empty($conf->stock->enabled) && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
-		{
+		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)) {
 				$opt .= ' - '.$langs->trans("Stock").': '.price(price2num($objp->stock, 'MS'));
 
@@ -2694,8 +2923,7 @@ class Form
 				}
 				$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);
@@ -2764,10 +2992,8 @@ class Form
 		global $price_level, $status, $finished;
 
 		$selected_input_value = '';
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT))
-		{
-			if ($selected > 0)
-			{
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {
+			if ($selected > 0) {
 				require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 				$producttmpselect = new Product($this->db);
 				$producttmpselect->fetch($selected);
@@ -2833,10 +3059,14 @@ class Form
 		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)) {
@@ -2844,20 +3074,26 @@ class Form
 		}
 		$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 != '')
-		{
+		if ($filterkey != '') {
 			$sql .= ' AND (';
 			$prefix = empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE) ? '%' : ''; // Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
 			// For natural search
 			$scrit = explode(' ', $filterkey);
 			$i = 0;
-			if (count($scrit) > 1) $sql .= "(";
-			foreach ($scrit as $crit)
-			{
-				if ($i > 0) $sql .= " AND ";
+			if (count($scrit) > 1) {
+				$sql .= "(";
+			}
+			foreach ($scrit as $crit) {
+				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)."%'";
 				if (!empty($conf->global->PRODUIT_FOURN_TEXTS)) {
 					$sql .= " OR pfp.desc_fourn LIKE '".$this->db->escape($prefix.$crit)."%'";
@@ -2865,7 +3101,9 @@ class Form
 				$sql .= ")";
 				$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)."%'";
@@ -2879,8 +3117,7 @@ class Form
 
 		dol_syslog(get_class($this)."::select_produits_fournisseurs_list", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
@@ -2888,16 +3125,20 @@ class Form
 
 			//$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax
 			$out .= '<select class="flat '.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-			if (!$selected) $out .= '<option value="-1" selected>'.($placeholder ? $placeholder : '&nbsp;').'</option>';
-			else $out .= '<option value="-1">'.($placeholder ? $placeholder : '&nbsp;').'</option>';
+			if (!$selected) {
+				$out .= '<option value="-1" selected>'.($placeholder ? $placeholder : '&nbsp;').'</option>';
+			} else {
+				$out .= '<option value="-1">'.($placeholder ? $placeholder : '&nbsp;').'</option>';
+			}
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$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 = '';
@@ -2945,11 +3186,17 @@ class Form
 				}
 
 				$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,8 +3220,7 @@ class Form
 				$optlabel .= $outvalUnits;
 				$outvallabel .= $outvalUnits;
 
-				if (!empty($objp->idprodfournprice))
-				{
+				if (!empty($objp->idprodfournprice)) {
 					$outqty = $objp->quantity;
 					$outdiscount = $objp->remise_percent;
 					if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {
@@ -2988,14 +3234,12 @@ class Form
 						$price_result = $priceparser->parseProductSupplier($prod_supplier);
 						if ($price_result >= 0) {
 							$objp->fprice = $price_result;
-							if ($objp->quantity >= 1)
-							{
+							if ($objp->quantity >= 1) {
 								$objp->unitprice = $objp->fprice / $objp->quantity; // Replace dynamically unitprice
 							}
 						}
 					}
-					if ($objp->quantity == 1)
-					{
+					if ($objp->quantity == 1) {
 						$optlabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/";
 						$outvallabel .= ' - '.price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/";
 						$optlabel .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding
@@ -3007,28 +3251,23 @@ class Form
 						$outvallabel .= ' '.$langs->transnoentities("Units");
 					}
 
-					if ($objp->quantity > 1)
-					{
+					if ($objp->quantity > 1) {
 						$optlabel .= " (".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").")"; // Do not use strtolower because it breaks utf8 encoding
 						$outvallabel .= " (".price($objp->unitprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding
 					}
-					if ($objp->remise_percent >= 1)
-					{
+					if ($objp->remise_percent >= 1) {
 						$optlabel .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';
 						$outvallabel .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';
 					}
-					if ($objp->duration)
-					{
+					if ($objp->duration) {
 						$optlabel .= " - ".$objp->duration;
 						$outvallabel .= " - ".$objp->duration;
 					}
-					if (!$socid)
-					{
+					if (!$socid) {
 						$optlabel .= " - ".dol_trunc($objp->name, 8);
 						$outvallabel .= " - ".dol_trunc($objp->name, 8);
 					}
-					if ($objp->supplier_reputation)
-					{
+					if ($objp->supplier_reputation) {
 						//TODO dictionary
 						$reputations = array(''=>$langs->trans('Standard'), 'FAVORITE'=>$langs->trans('Favorite'), 'NOTTHGOOD'=>$langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER'=>$langs->trans('DoNotOrderThisProductToThisSupplier'));
 
@@ -3036,8 +3275,7 @@ class Form
 						$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
@@ -3047,8 +3285,7 @@ class Form
 					}
 				}
 
-				if (!empty($conf->stock->enabled) && $showstockinlist && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)))
-				{
+				if (!empty($conf->stock->enabled) && $showstockinlist && isset($objp->stock) && ($objp->fk_product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
 					$novirtualstock = ($showstockinlist == 2);
 
 					if (!empty($user->rights->stock->lire)) {
@@ -3061,8 +3298,7 @@ class Form
 						}
 						$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);
@@ -3087,10 +3323,13 @@ class Form
 				}
 
 				$opt = '<option value="'.$outkey.'"';
-				if ($selected && $selected == $objp->idprodfournprice) $opt .= ' selected';
-				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) $opt .= ' disabled';
-				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0)
-				{
+				if ($selected && $selected == $objp->idprodfournprice) {
+					$opt .= ' selected';
+				}
+				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) {
+					$opt .= ' disabled';
+				}
+				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {
 					$opt .= ' data-qty="'.$objp->quantity.'" data-up="'.$objp->unitprice.'" data-discount="'.$outdiscount.'"';
 				}
 				$opt .= ' data-description="'.dol_escape_htmltag($objp->description).'"';
@@ -3107,7 +3346,8 @@ class Form
 				// "key" value of json key array is used by jQuery automatically as selected value. Example: 'type' = product or service, 'price_ht' = unit price without tax
 				// "label" value of json key array is used by jQuery automatically as text for combo box
 				$out .= $opt;
-				array_push($outarray,
+				array_push(
+					$outarray,
 					array('key'=>$outkey,
 						'value'=>$outref,
 						'label'=>$outval,
@@ -3139,7 +3379,9 @@ class Form
 			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);
@@ -3177,22 +3419,19 @@ class Form
 		dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 
 			$form = '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
 
-			if (!$num)
-			{
+			if (!$num) {
 				$form .= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';
 			} else {
 				require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
 				$form .= '<option value="0">&nbsp;</option>';
 
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$objp = $this->db->fetch_object($result);
 
 					$opt = '<option value="'.$objp->idprodfournprice.'"';
@@ -3213,31 +3452,29 @@ class Form
 						$price_result = $priceparser->parseProductSupplier($prod_supplier);
 						if ($price_result >= 0) {
 							$objp->fprice = $price_result;
-							if ($objp->quantity >= 1)
-							{
+							if ($objp->quantity >= 1) {
 								$objp->unitprice = $objp->fprice / $objp->quantity;
 							}
 						}
 					}
-					if ($objp->quantity == 1)
-					{
+					if ($objp->quantity == 1) {
 						$opt .= price($objp->fprice * (!empty($conf->global->DISPLAY_DISCOUNTED_SUPPLIER_PRICE) ? (1 - $objp->remise_percent / 100) : 1), 1, $langs, 0, 0, -1, $conf->currency)."/";
 					}
 
 					$opt .= $objp->quantity.' ';
 
-					if ($objp->quantity == 1)
-					{
+					if ($objp->quantity == 1) {
 						$opt .= $langs->trans("Unit");
 					} else {
 						$opt .= $langs->trans("Units");
 					}
-					if ($objp->quantity > 1)
-					{
+					if ($objp->quantity > 1) {
 						$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;
@@ -3274,20 +3511,18 @@ class Form
 
 		dol_syslog(get_class($this)."::select_address", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		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)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
-					if ($selected && $selected == $obj->rowid)
-					{
+					if ($selected && $selected == $obj->rowid) {
 						print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';
 					} else {
 						print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';
@@ -3315,7 +3550,9 @@ class Form
 		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);
 
@@ -3326,12 +3563,10 @@ class Form
 		$sql .= " ORDER BY sortorder";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
@@ -3362,7 +3597,9 @@ class Form
 		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);
 
@@ -3373,12 +3610,10 @@ class Form
 		$sql .= " WHERE active > 0";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
@@ -3416,11 +3651,11 @@ class Form
 		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>';
-		foreach ($this->cache_availability as $id => $arrayavailability)
-		{
-			if ($selected == $id)
-			{
+		if ($addempty) {
+			print '<option value="0">&nbsp;</option>';
+		}
+		foreach ($this->cache_availability as $id => $arrayavailability) {
+			if ($selected == $id) {
 				print '<option value="'.$id.'" selected>';
 			} else {
 				print '<option value="'.$id.'">';
@@ -3429,7 +3664,9 @@ class Form
 			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);
 	}
 
@@ -3443,26 +3680,30 @@ class Form
 		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';
 		$sql .= " WHERE active > 0";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			$tmparray = array();
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				// 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;
@@ -3497,13 +3738,15 @@ class Form
 		$this->loadCacheInputReason();
 
 		print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-		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 ($addempty) {
+			print '<option value="0"'.(empty($selected) ? ' selected' : '').'>&nbsp;</option>';
+		}
+		foreach ($this->cache_demand_reason as $id => $arraydemandreason) {
+			if ($arraydemandreason['code'] == $exclude) {
+				continue;
+			}
 
-			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code']))
-			{
+			if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code'])) {
 				print '<option value="'.$arraydemandreason['id'].'" selected>';
 			} else {
 				print '<option value="'.$arraydemandreason['id'].'">';
@@ -3513,7 +3756,9 @@ class Form
 			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);
 	}
 
@@ -3529,7 +3774,9 @@ class Form
 		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);
 
@@ -3541,12 +3788,10 @@ class Form
 		//if ($active >= 0) $sql.= " AND active = ".$active;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
@@ -3593,14 +3838,16 @@ class Form
 		$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>';
-		foreach ($this->cache_conditions_paiements as $id => $arrayconditions)
-		{
-			if ($selected == $id)
-			{
+		if ($addempty) {
+			print '<option value="0">&nbsp;</option>';
+		}
+		foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {
+			if ($selected == $id) {
 				print '<option value="'.$id.'" selected>';
 			} else {
 				print '<option value="'.$id.'">';
@@ -3609,7 +3856,9 @@ class Form
 			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);
 	}
 
@@ -3638,48 +3887,77 @@ class Form
 		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>';
-		foreach ($this->cache_types_paiements as $id => $arraytypes)
-		{
+		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);
 	}
 
@@ -3701,10 +3979,8 @@ class Form
 			'HT'=>$langs->trans("HT"),
 			'TTC'=>$langs->trans("TTC")
 		);
-		foreach ($options as $id => $value)
-		{
-			if ($selected == $id)
-			{
+		foreach ($options as $id => $value) {
+			if ($selected == $id) {
 				$return .= '<option value="'.$id.'" selected>'.$value;
 			} else {
 				$return .= '<option value="'.$id.'">'.$value;
@@ -3712,7 +3988,9 @@ class Form
 			$return .= '</option>';
 		}
 		$return .= '</select>';
-		if ($addjscombo) $return .= ajax_combobox('select_'.$htmlname);
+		if ($addjscombo) {
+			$return .= ajax_combobox('select_'.$htmlname);
+		}
 
 		return $return;
 	}
@@ -3729,7 +4007,9 @@ class Form
 		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);
 
@@ -3741,12 +4021,10 @@ class Form
 		//if ($active >= 0) $sql.= " AND active = ".$active;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				// If traduction exist, we use it else we take the default label
@@ -3761,8 +4039,7 @@ class Form
 			$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;
 		}
@@ -3790,32 +4067,52 @@ class Form
 		$this->load_cache_transport_mode();
 
 		print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';
-		if ($empty) print '<option value="">&nbsp;</option>';
-		foreach ($this->cache_transport_mode as $id => $arraytypes)
-		{
+		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);
+		}
 	}
 
 	/**
@@ -3839,7 +4136,9 @@ class Form
 		$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);
@@ -3864,7 +4163,9 @@ class Form
 					$i++;
 				}
 				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('select'.$htmlname);
 			} else {
@@ -3955,8 +4256,7 @@ class Form
 		} else {
 				dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);
 		}
-		if ($opt == '<option value ="" selected></option>')
-		{
+		if ($opt == '<option value ="" selected></option>') {
 			$opt = '<option value ="0" selected>'.$langs->trans('NoSituations').'</option>';
 		}
 		return $opt;
@@ -3986,20 +4286,18 @@ class Form
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql && $this->db->num_rows($resql) > 0)
-		{
-			if ($showempty) $return .= '<option value="none"></option>';
+		if ($resql && $this->db->num_rows($resql) > 0) {
+			if ($showempty) {
+				$return .= '<option value="none"></option>';
+			}
 
-			while ($res = $this->db->fetch_object($resql))
-			{
+			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)
-				{
+				if ($selected == $res->rowid) {
 					$return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';
 				} else {
 					$return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';
@@ -4038,26 +4336,26 @@ class Form
 		$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);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			if ($num)
-			{
+			if ($num) {
 				$out .= '<select id="select'.$htmlname.'" class="flat selectbankaccount'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-				if ($useempty == 1 || ($useempty == 2 && $num > 1))
-				{
+				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
 					$out .= '<option value="-1">&nbsp;</option>';
 				}
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
 					if ($selected == $obj->rowid || ($useempty == 2 && $num == 1 && empty($selected))) {
 						$out .= '<option value="'.$obj->rowid.'" selected>';
@@ -4065,24 +4363,34 @@ class Form
 						$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;
 	}
@@ -4109,42 +4417,46 @@ class Form
 		$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);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			if ($num)
-			{
+			if ($num) {
 				print '<select id="select'.$htmlname.'" class="flat selectestablishment" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-				if ($useempty == 1 || ($useempty == 2 && $num > 1))
-				{
+				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
 					print '<option value="-1">&nbsp;</option>';
 				}
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
-					if ($selected == $obj->rowid)
-					{
+					if ($selected == $obj->rowid) {
 						print '<option value="'.$obj->rowid.'" selected>';
 					} else {
 						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);
@@ -4169,7 +4481,9 @@ class Form
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 			$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');
@@ -4178,7 +4492,9 @@ class Form
 				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;";
 			}
@@ -4213,13 +4529,11 @@ class Form
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 		// For backward compatibility
-		if (is_numeric($type))
-		{
+		if (is_numeric($type)) {
 			dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
 		}
 
-		if ($type === Categorie::TYPE_BANK_LINE)
-		{
+		if ($type === Categorie::TYPE_BANK_LINE) {
 			// TODO Move this into common category feature
 			$cate_arbo = array();
 			$sql = "SELECT c.label, c.rowid";
@@ -4227,18 +4541,20 @@ class Form
 			$sql .= " WHERE entity = ".$conf->entity;
 			$sql .= " ORDER BY c.label";
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 				$i = 0;
-				while ($i < $num)
-				{
+				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);
@@ -4246,15 +4562,13 @@ class Form
 
 		$output = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 		$outarray = array();
-		if (is_array($cate_arbo))
-		{
-			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
-			else {
+		if (is_array($cate_arbo)) {
+			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)
-				{
-					if ($cate_arbo[$key]['id'] == $selected || ($selected === 'auto' && count($cate_arbo) == 1))
-					{
+				foreach ($cate_arbo as $key => $value) {
+					if ($cate_arbo[$key]['id'] == $selected || ($selected === 'auto' && count($cate_arbo) == 1)) {
 						$add = 'selected ';
 					} else {
 						$add = '';
@@ -4268,7 +4582,9 @@ class Form
 		$output .= '</select>';
 		$output .= "\n";
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $output;
 	}
 
@@ -4331,7 +4647,9 @@ class Form
 
 		// 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)) {
@@ -4341,15 +4659,11 @@ class Form
 			}
 		}
 
-		if (is_array($formquestion) && !empty($formquestion))
-		{
+		if (is_array($formquestion) && !empty($formquestion)) {
 			// First add hidden fields and value
-			foreach ($formquestion as $key => $input)
-			{
-				if (is_array($input) && !empty($input))
-				{
-					if ($input['type'] == 'hidden')
-					{
+			foreach ($formquestion as $key => $input) {
+				if (is_array($input) && !empty($input)) {
+					if ($input['type'] == 'hidden') {
 						$more .= '<input type="hidden" id="'.$input['name'].'" name="'.$input['name'].'" value="'.dol_escape_htmltag($input['value']).'">'."\n";
 					}
 				}
@@ -4358,10 +4672,8 @@ class Form
 			// Now add questions
 			$moreonecolumn = '';
 			$more .= '<div class="tagtable paddingtopbottomonly centpercent noborderspacing">'."\n";
-			foreach ($formquestion as $key => $input)
-			{
-				if (is_array($input) && !empty($input))
-				{
+			foreach ($formquestion as $key => $input) {
+				if (is_array($input) && !empty($input)) {
 					$size = (!empty($input['size']) ? ' size="'.$input['size'].'"' : '');
 					$moreattr = (!empty($input['moreattr']) ? ' '.$input['moreattr'] : '');
 					$morecss = (!empty($input['morecss']) ? ' '.$input['morecss'] : '');
@@ -4375,28 +4687,42 @@ class Form
 							$morecss = 'minwidth100';
 						}
 						$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') {
 						$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') {
 						$i = 0;
-						foreach ($input['values'] as $selkey => $selval)
-						{
+						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";
@@ -4414,7 +4740,9 @@ class Form
 						$formquestion[] = array('name'=>$input['name'].'min');
 					} 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') {
@@ -4435,16 +4763,18 @@ class Form
 		// 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)
-		{
+		if ($useajax) {
 			$autoOpen = true;
 			$dialogconfirm = 'dialog-confirm';
 			$button = '';
-			if (!is_numeric($useajax))
-			{
+			if (!is_numeric($useajax)) {
 				$button = $useajax;
 				$useajax = 1;
 				$autoOpen = false;
@@ -4466,7 +4796,9 @@ class Form
 						}
 					}
 					// Add name of fields to propagate with the GET when submitting the form with button KO.
-					if (isset($input['inputko']) && $input['inputko'] == 1) array_push($inputko, $input['name']);
+					if (isset($input['inputko']) && $input['inputko'] == 1) {
+						array_push($inputko, $input['name']);
+					}
 				}
 			}
 
@@ -4488,8 +4820,7 @@ class Form
             	$( "#'.$dialogconfirm.'" ).dialog(
             	{
                     autoOpen: '.($autoOpen ? "true" : "false").',';
-			if ($newselectedchoice == 'no')
-			{
+			if ($newselectedchoice == 'no') {
 				$formconfirm .= '
 						open: function() {
             				$(this).parent().find("button.ui-button:eq(2)").focus();
@@ -4560,7 +4891,9 @@ class Form
 		} 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";
@@ -4576,8 +4909,7 @@ class Form
 			}
 
 			// Line form fields
-			if ($more)
-			{
+			if ($more) {
 				$formconfirm .= '<tr class="valid"><td class="valid" colspan="3">'."\n";
 				$formconfirm .= $more;
 				$formconfirm .= '</td></tr>'."\n";
@@ -4594,7 +4926,9 @@ class Form
 
 			$formconfirm .= '</table>'."\n";
 
-			if (empty($disableformtag)) $formconfirm .= "</form>\n";
+			if (empty($disableformtag)) {
+				$formconfirm .= "</form>\n";
+			}
 			$formconfirm .= '<br>';
 
 			if (empty($conf->use_javascript_ajax)) {
@@ -4648,8 +4982,7 @@ class Form
 		$formproject = new FormProjets($this->db);
 
 		$langs->load("project");
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			$out .= "\n";
 			$out .= '<form method="post" action="'.$page.'">';
 			$out .= '<input type="hidden" name="action" value="classin">';
@@ -4658,8 +4991,7 @@ class Form
 			$out .= '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
-			if ($selected)
-			{
+			if ($selected) {
 				$projet = new Project($this->db);
 				$projet->fetch($selected);
 				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
@@ -4669,8 +5001,7 @@ class Form
 			}
 		}
 
-		if (empty($nooutput))
-		{
+		if (empty($nooutput)) {
 			print $out;
 			return '';
 		}
@@ -4691,8 +5022,7 @@ class Form
 	{
 		// phpcs:enable
 		global $langs;
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="post" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setconditions">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4700,8 +5030,7 @@ class Form
 			print '<input type="submit" class="button valignmiddle smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
-			if ($selected)
-			{
+			if ($selected) {
 				$this->load_cache_conditions_paiements();
 				print $this->cache_conditions_paiements[$selected]['label'];
 			} else {
@@ -4724,8 +5053,7 @@ class Form
 	{
 		// phpcs:enable
 		global $langs;
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="post" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setavailability">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4733,8 +5061,7 @@ class Form
 			print '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
-			if ($selected)
-			{
+			if ($selected) {
 				$this->load_cache_availability();
 				print $this->cache_availability[$selected]['label'];
 			} else {
@@ -4756,8 +5083,7 @@ class Form
 	public function formInputReason($page, $selected = '', $htmlname = 'demandreason', $addempty = 0)
 	{
 		global $langs;
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="post" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setdemandreason">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4765,13 +5091,10 @@ class Form
 			print '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
-			if ($selected)
-			{
+			if ($selected) {
 				$this->loadCacheInputReason();
-				foreach ($this->cache_demand_reason as $key => $val)
-				{
-					if ($val['id'] == $selected)
-					{
+				foreach ($this->cache_demand_reason as $key => $val) {
+					if ($val['id'] == $selected) {
 						print $val['label'];
 						break;
 					}
@@ -4802,8 +5125,7 @@ class Form
 
 		$ret = '';
 
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			$ret .= '<form method="post" action="'.$page.'" name="form'.$htmlname.'">';
 			$ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
 			$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4814,11 +5136,16 @@ class Form
 			$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;
 	}
 
@@ -4839,8 +5166,7 @@ class Form
 		// phpcs:enable
 		global $langs;
 
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="POST" action="'.$page.'" name="form'.$htmlname.'">';
 			print '<input type="hidden" name="action" value="set'.$htmlname.'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4848,8 +5174,7 @@ class Form
 			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
-			if ($selected)
-			{
+			if ($selected) {
 				require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 				$theuser = new User($this->db);
 				$theuser->fetch($selected);
@@ -4877,8 +5202,7 @@ class Form
 	{
 		// phpcs:enable
 		global $langs;
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="POST" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setmode">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4886,8 +5210,7 @@ class Form
 			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
-			if ($selected)
-			{
+			if ($selected) {
 				$this->load_cache_types_paiements();
 				print $this->cache_types_paiements[$selected]['label'];
 			} else {
@@ -4909,18 +5232,15 @@ class Form
 	public function formSelectTransportMode($page, $selected = '', $htmlname = 'transport_mode_id', $active = 1, $addempty = 0)
 	{
 		global $langs;
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="POST" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setmode">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			$this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
 			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
-		}
-		else {
-			if ($selected)
-			{
+		} else {
+			if ($selected) {
 				$this->load_cache_transport_mode();
 				print $this->cache_transport_mode[$selected]['label'];
 			} else {
@@ -4942,8 +5262,7 @@ class Form
 	{
 		// phpcs:enable
 		global $langs;
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="POST" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setmulticurrencycode">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4971,8 +5290,7 @@ class Form
 		// phpcs:enable
 		global $langs, $mysoc, $conf;
 
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="POST" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setmulticurrencyrate">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -4984,10 +5302,11 @@ class Form
 			print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
-			if (!empty($rate))
-			{
+			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;
 			}
@@ -5015,36 +5334,46 @@ class Form
 	{
 		// phpcs:enable
 		global $conf, $langs;
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="post" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setabsolutediscount">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<div class="inline-block">';
 			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 (!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';
+					}
 				} 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 (!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';
+					}
 				} 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))
-			{
+			if (empty($hidelist)) {
 				print '<div class="inline-block" style="padding-right: 10px">';
 				$newfilter = 'discount_type='.intval($discount_type);
 				if (!empty($discount_type)) {
@@ -5052,30 +5381,31 @@ class Form
 				} 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)
-				{
+				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)%')")
+					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)%')")
+					}
+					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 '>';
 				}
 				print '</div>';
 			}
-			if ($more)
-			{
+			if ($more) {
 				print '<div class="inline-block">';
 				print $more;
 				print '</div>';
 			}
 			print '</form>';
 		} else {
-			if ($selected)
-			{
+			if ($selected) {
 				print $selected;
 			} else {
 				print "0";
@@ -5099,8 +5429,7 @@ class Form
 		// phpcs:enable
 		global $langs, $conf;
 
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			print '<form method="post" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="set_contact">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -5108,8 +5437,7 @@ class Form
 			print '<tr><td>';
 			print $this->selectcontacts($societe->id, $selected, $htmlname);
 			$num = $this->num;
-			if ($num == 0)
-			{
+			if ($num == 0) {
 				$addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
 				print '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$addcontact.'</a>';
 			}
@@ -5117,8 +5445,7 @@ class Form
 			print '<td class="left"><input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		} else {
-			if ($selected)
-			{
+			if ($selected) {
 				require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 				$contact = new Contact($this->db);
 				$contact->fetch($selected);
@@ -5150,8 +5477,7 @@ class Form
 		global $langs;
 
 		$out = '';
-		if ($htmlname != "none")
-		{
+		if ($htmlname != "none") {
 			$out .= '<form method="post" action="'.$page.'">';
 			$out .= '<input type="hidden" name="action" value="set_thirdparty">';
 			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
@@ -5159,8 +5485,7 @@ class Form
 			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
-			if ($selected)
-			{
+			if ($selected) {
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$soc = new Societe($this->db);
 				$soc->fetch($selected);
@@ -5170,8 +5495,11 @@ class Form
 			}
 		}
 
-		if ($nooutput) return $out;
-		else print $out;
+		if ($nooutput) {
+			return $out;
+		} else {
+			print $out;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -5205,21 +5533,20 @@ class Form
 
 		$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)
-		{
+		foreach ($langs->cache_currencies as $code_iso => $currency) {
 			$labeltoshow = $currency['label'];
-			if ($mode == 1)
-			{
+			if ($mode == 1) {
 				$labeltoshow .= ' <span class="opacitymedium">('.$code_iso.')</span>';
 			} else {
 				$labeltoshow .= ' <span class="opacitymedium">('.$langs->getCurrencySymbol($code_iso).')</span>';
 			}
 
-			if ($selected && $selected == $code_iso)
-			{
+			if ($selected && $selected == $code_iso) {
 				$out .= '<option value="'.$code_iso.'" selected data-html="'.dol_escape_htmltag($labeltoshow).'">';
 			} else {
 				$out .= '<option value="'.$code_iso.'" data-html="'.dol_escape_htmltag($labeltoshow).'">';
@@ -5228,7 +5555,9 @@ class Form
 			$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';
@@ -5257,29 +5586,33 @@ class Form
 
 		$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;
+		if ($resql) {
+			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)
-		{
+		if (!in_array($conf->currency, $TCurrency) && !$excludeConfCurrency) {
 			$TCurrency[$conf->currency] = $conf->currency;
 		}
-		if (count($TCurrency) > 0)
-		{
-			foreach ($langs->cache_currencies as $code_iso => $currency)
-			{
-				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 (count($TCurrency) > 0) {
+			foreach ($langs->cache_currencies as $code_iso => $currency) {
+				if (isset($TCurrency[$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).')';
@@ -5309,7 +5642,9 @@ class Form
 		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);
 
@@ -5321,13 +5656,10 @@ class Form
 		$sql .= " ORDER BY t.code ASC, t.taux ASC, t.recuperableonly ASC";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
-				for ($i = 0; $i < $num; $i++)
-				{
+			if ($num) {
+				for ($i = 0; $i < $num; $i++) {
 					$obj = $this->db->fetch_object($resql);
 					$this->cache_vatrates[$i]['rowid']	= $obj->rowid;
 					$this->cache_vatrates[$i]['code'] = $obj->code;
@@ -5341,10 +5673,18 @@ class Form
 					$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
 				}
 
@@ -5395,18 +5735,15 @@ class Form
 		$defaultnpr = (preg_match('/\*/', $selectedrate) ? 1 : $defaultnpr);
 		$defaulttx = str_replace('*', '', $selectedrate);
 		$defaultcode = '';
-		if (preg_match('/\((.*)\)/', $defaulttx, $reg))
-		{
+		if (preg_match('/\((.*)\)/', $defaulttx, $reg)) {
 			$defaultcode = $reg[1];
 			$defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);
 		}
 		//var_dump($selectedrate.'-'.$defaulttx.'-'.$defaultnpr.'-'.$defaultcode);
 
 		// Check parameters
-		if (is_object($societe_vendeuse) && !$societe_vendeuse->country_code)
-		{
-			if ($societe_vendeuse->id == $mysoc->id)
-			{
+		if (is_object($societe_vendeuse) && !$societe_vendeuse->country_code) {
+			if ($societe_vendeuse->id == $mysoc->id) {
 				$return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</font>';
 			} else {
 				$return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</font>';
@@ -5420,32 +5757,25 @@ class Form
 
 		// Define list of countries to use to search VAT rates to show
 		// First we defined code_country to use to find list
-		if (is_object($societe_vendeuse))
-		{
+		if (is_object($societe_vendeuse)) {
 			$code_country = "'".$societe_vendeuse->country_code."'";
 		} 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())))
-			{
+			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 (is_numeric($type)) {
+					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."'";
 					}
 				}
@@ -5455,11 +5785,9 @@ class Form
 		// Now we get list
 		$num = $this->load_cache_vatrates($code_country); // If no vat defined, return -1 with message into this->error
 
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			// Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')
-			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0)
-			{
+			if ($defaulttx < 0 || dol_strlen($defaulttx) == 0) {
 				$tmpthirdparty = new Societe($this->db);
 				$defaulttx = get_default_tva($societe_vendeuse, (is_object($societe_acheteuse) ? $societe_acheteuse : $tmpthirdparty), $idprod);
 				$defaultnpr = get_default_npr($societe_vendeuse, (is_object($societe_acheteuse) ? $societe_acheteuse : $tmpthirdparty), $idprod);
@@ -5467,64 +5795,68 @@ class Form
 					$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 ($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);
+				}
 			}
 
 			// Disabled if seller is not subject to VAT
 			$disabled = false; $title = '';
-			if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0")
-			{
+			if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0") {
 				// Override/enable VAT for expense report regardless of global setting - needed if expense report used for business expenses instead
 				// of using supplier invoices (this is a very bad idea !)
-				if (empty($conf->global->EXPENSEREPORT_OVERRIDE_VAT))
-				{
+				if (empty($conf->global->EXPENSEREPORT_OVERRIDE_VAT)) {
 					$title = ' title="'.$langs->trans('VATIsNotUsed').'"';
 					$disabled = true;
 				}
 			}
 
-			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)
-			{
+			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 == $rate['code'])
-						{
+				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 == $rate['code']) {
 							$return .= ' selected';
 							$selectedfound = true;
 						}
-					} elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr)
-			   		{
-			   			$return .= ' selected';
-			   			$selectedfound = true;
+					} elseif ($rate['txtva'] == $defaulttx && $rate['nprtva'] == $defaultnpr) {
+						$return .= ' selected';
+						$selectedfound = true;
 					}
 				}
 				$return .= '>';
 				//if (! empty($conf->global->MAIN_VAT_SHOW_POSITIVE_RATES))
-				if ($mysoc->country_code == 'IN' || !empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES))
-				{
+				if ($mysoc->country_code == 'IN' || !empty($conf->global->MAIN_VAT_LABEL_IS_POSITIVE_RATES)) {
 					$return .= $rate['labelpositiverates'];
 				} else {
 					$return .= vatrate($rate['label']);
@@ -5535,7 +5867,9 @@ class Form
 				$return .= '</option>';
 			}
 
-			if (!$options_only) $return .= '</select>';
+			if (!$options_only) {
+				$return .= '</select>';
+			}
 		} else {
 			$return .= $this->error;
 		}
@@ -5642,18 +5976,29 @@ class Form
 
 		$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 ($empty == 1) { $emptydate = 1; $emptyhours = 1; }
-		if ($empty == 2) { $emptydate = 0; $emptyhours = 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;
 
-		if ($set_time === '' && $emptydate == 0)
-		{
+		if ($set_time === '' && $emptydate == 0) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 			if ($gm == 'tzuser' || $gm == 'tzuserrel') {
 				$set_time = dol_now($gm);
@@ -5664,22 +6009,19 @@ class Form
 
 		// 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] : '');
 			$smin	= (!empty($reg[5]) ? $reg[5] : '');
-		} elseif (strval($set_time) != '' && $set_time != -1)
-		{
+		} elseif (strval($set_time) != '' && $set_time != -1) {
 			// set_time est un timestamps (0 possible)
 			$syear = dol_print_date($set_time, "%Y", $gm);
 			$smonth = dol_print_date($set_time, "%m", $gm);
 			$sday = dol_print_date($set_time, "%d", $gm);
-			if ($orig_set_time != '')
-			{
+			if ($orig_set_time != '') {
 				$shour = dol_print_date($set_time, "%H", $gm);
 				$smin = dol_print_date($set_time, "%M", $gm);
 				$ssec = dol_print_date($set_time, "%S", $gm);
@@ -5697,8 +6039,12 @@ class Form
 			$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 = '';
+		}
 
 		$nowgmt = dol_now('gmt');
 		//var_dump(dol_print_date($nowgmt, 'dayhourinputnoreduce', 'tzuserrel'));
@@ -5709,22 +6055,18 @@ class Form
 			$usecalendar = ((empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == 'eldy') ? 'jquery' : $conf->global->MAIN_POPUP_CALENDAR);
 		}
 
-		if ($d)
-		{
+		if ($d) {
 			// Show date with popup
-			if ($usecalendar != 'combo')
-			{
+			if ($usecalendar != 'combo') {
 				$formated_date = '';
 				//print "e".$set_time." t ".$conf->format_date_short;
-				if (strval($set_time) != '' && $set_time != -1)
-				{
+				if (strval($set_time) != '' && $set_time != -1) {
 					//$formated_date=dol_print_date($set_time,$conf->format_date_short);
 					$formated_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput"), $gm); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
 				}
 
 				// Calendrier popup version eldy
-				if ($usecalendar == "eldy")
-				{
+				if ($usecalendar == "eldy") {
 					// Input area to enter date manually
 					$retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidthdate" maxlength="11" value="'.$formated_date.'"';
 					$retstring .= ($disabled ? ' disabled' : '');
@@ -5746,18 +6088,15 @@ class Form
 					$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";
 					$retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
-				} elseif ($usecalendar == 'jquery')
-				{
-					if (!$disabled)
-					{
+				} elseif ($usecalendar == 'jquery') {
+					if (!$disabled) {
 						// Output javascript for datepicker
 						$retstring .= "<script type='text/javascript'>";
 						$retstring .= "$(function(){ $('#".$prefix."').datepicker({
 							dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',
 							autoclose: true,
 							todayHighlight: true,";
-						if (!empty($conf->dol_use_jmobile))
-						{
+						if (!empty($conf->dol_use_jmobile)) {
 							$retstring .= "
 								beforeShow: function (input, datePicker) {
 									input.disabled = true;
@@ -5768,8 +6107,7 @@ class Form
 								";
 						}
 						// Note: We don't need monthNames, monthNamesShort, dayNames, dayNamesShort, dayNamesMin, they are set globally on datepicker component in lib_head.js.php
-						if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))
-						{
+						if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS)) {
 							$retstring .= "
 								showOn: 'button',	/* both has problem with autocompletion */
 								buttonImage: '".DOL_URL_ROOT."/theme/".$conf->theme."/img/object_calendarday.png',
@@ -5789,17 +6127,16 @@ class Form
 					$retstring .= '>';
 
 					// Icone calendrier
-					if (!$disabled)
-					{
+					if (!$disabled) {
 						/* Not required. Managed by option buttonImage of jquery
-                		$retstring.=img_object($langs->trans("SelectDate"),'calendarday','id="'.$prefix.'id" class="datecallink"');
-                		$retstring.="<script type='text/javascript'>";
-                		$retstring.="jQuery(document).ready(function() {";
-                		$retstring.='	jQuery("#'.$prefix.'id").click(function() {';
-                		$retstring.="    	jQuery('#".$prefix."').focus();";
-                		$retstring.='    });';
-                		$retstring.='});';
-                		$retstring.="</script>";*/
+						$retstring.=img_object($langs->trans("SelectDate"),'calendarday','id="'.$prefix.'id" class="datecallink"');
+						$retstring.="<script type='text/javascript'>";
+						$retstring.="jQuery(document).ready(function() {";
+						$retstring.='	jQuery("#'.$prefix.'id").click(function() {';
+						$retstring.="    	jQuery('#".$prefix."').focus();";
+						$retstring.='    });';
+						$retstring.='});';
+						$retstring.="</script>";*/
 					} else {
 						$retstringbutton = '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';
 						$retsring = $retstringbutton.$retstring;
@@ -5818,27 +6155,23 @@ class Form
 				// Day
 				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
 
-				if ($emptydate || $set_time == -1)
-				{
+				if ($emptydate || $set_time == -1) {
 					$retstring .= '<option value="0" selected>&nbsp;</option>';
 				}
 
-				for ($day = 1; $day <= 31; $day++)
-				{
+				for ($day = 1; $day <= 31; $day++) {
 					$retstring .= '<option value="'.$day.'"'.($day == $sday ? ' selected' : '').'>'.$day.'</option>';
 				}
 
 				$retstring .= "</select>";
 
 				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'month" name="'.$prefix.'month">';
-				if ($emptydate || $set_time == -1)
-				{
+				if ($emptydate || $set_time == -1) {
 					$retstring .= '<option value="0" selected>&nbsp;</option>';
 				}
 
 				// Month
-				for ($month = 1; $month <= 12; $month++)
-				{
+				for ($month = 1; $month <= 12; $month++) {
 					$retstring .= '<option value="'.$month.'"'.($month == $smonth ? ' selected' : '').'>';
 					$retstring .= dol_print_date(mktime(12, 0, 0, $month, 1, 2000), "%b");
 					$retstring .= "</option>";
@@ -5846,14 +6179,12 @@ class Form
 				$retstring .= "</select>";
 
 				// Year
-				if ($emptydate || $set_time == -1)
-				{
+				if ($emptydate || $set_time == -1) {
 					$retstring .= '<input'.($disabled ? ' disabled' : '').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';
 				} else {
 					$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';
 
-					for ($year = $syear - 10; $year < $syear + 10; $year++)
-					{
+					for ($year = $syear - 10; $year < $syear + 10; $year++) {
 						$retstring .= '<option value="'.$year.'"'.($year == $syear ? ' selected' : '').'>'.$year.'</option>';
 					}
 					$retstring .= "</select>\n";
@@ -5866,39 +6197,47 @@ class Form
 			$retstring .= '<span class="nowraponall">';
 		}
 
-		if ($h)
-		{
+		if ($h) {
 			$hourstart = 0;
 			$hourend = 24;
 			if ($openinghours != '') {
 				$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>';
-			for ($hour = $hourstart; $hour < $hourend; $hour++)
-			{
-				if (strlen($hour) < 2) $hour = "0".$hour;
+			if ($emptyhours) {
+				$retstring .= '<option value="-1">&nbsp;</option>';
+			}
+			for ($hour = $hourstart; $hour < $hourend; $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)
-		{
+		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>';
-			for ($min = 0; $min < 60; $min += $stepminutes)
-			{
-				if (strlen($min) < 2) $min = "0".$min;
+			if ($emptyhours) {
+				$retstring .= '<option value="-1">&nbsp;</option>';
+			}
+			for ($min = 0; $min < 60; $min += $stepminutes) {
+				if (strlen($min) < 2) {
+					$min = "0".$min;
+				}
 				$retstring .= '<option value="'.$min.'"'.(($min == $smin) ? ' selected' : '').'>'.$min.(empty($conf->dol_optimize_smallscreen) ? '' : '').'</option>';
 			}
 			$retstring .= '</select>';
@@ -5911,8 +6250,7 @@ class Form
 		}
 
 		// Add a "Now" link
-		if ($conf->use_javascript_ajax && $addnowlink)
-		{
+		if ($conf->use_javascript_ajax && $addnowlink) {
 			// Script which will be inserted in the onClick of the "Now" link
 			$reset_scripts = "";
 			if ($addnowlink == 2) { // local computer time
@@ -5933,64 +6271,65 @@ class Form
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date($nowgmt, '%Y', 'tzuserrel').'\');';
 			} elseif ($addnowlink == 2) {
 				/* Disabled because the output does not use the string format defined by FormatDateShort key to forge the value into #prefix.
-            	 * This break application for foreign languages.
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(parseInt(d.getMonth().pad()) + 1);';
-                $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(d.getFullYear());';
-                */
+				 * This break application for foreign languages.
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(d.toLocaleDateString(\''.str_replace('_', '-', $langs->defaultlang).'\'));';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(d.getDate().pad());';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(parseInt(d.getMonth().pad()) + 1);';
+				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(d.getFullYear());';
+				*/
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date($nowgmt, 'day', 'tzuserrel').'\');';
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date($nowgmt, '%d', 'tzuserrel').'\');';
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date($nowgmt, '%m', 'tzuserrel').'\');';
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date($nowgmt, '%Y', 'tzuserrel').'\');';
 			}
 			/*if ($usecalendar == "eldy")
-            {
-                $base=DOL_URL_ROOT.'/core/';
-                $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');';
-            }
-            else
-            {
-                $reset_scripts .= 'this.form.elements[\''.$prefix.'day\'].value=formatDate(new Date(), \'d\'); ';
-                $reset_scripts .= 'this.form.elements[\''.$prefix.'month\'].value=formatDate(new Date(), \'M\'); ';
-                $reset_scripts .= 'this.form.elements[\''.$prefix.'year\'].value=formatDate(new Date(), \'yyyy\'); ';
-            }*/
-			// Update the hour part
-			if ($h)
 			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				$base=DOL_URL_ROOT.'/core/';
+				$reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');';
+			}
+			else
+			{
+				$reset_scripts .= 'this.form.elements[\''.$prefix.'day\'].value=formatDate(new Date(), \'d\'); ';
+				$reset_scripts .= 'this.form.elements[\''.$prefix.'month\'].value=formatDate(new Date(), \'M\'); ';
+				$reset_scripts .= 'this.form.elements[\''.$prefix.'year\'].value=formatDate(new Date(), \'yyyy\'); ';
+			}*/
+			// Update the hour part
+			if ($h) {
+				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)
-				{
+				if ($addnowlink == 1) {
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date($nowgmt, '%H', 'tzuserrel').'\');';
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').change();';
-				} elseif ($addnowlink == 2)
-				{
+				} elseif ($addnowlink == 2) {
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(d.getHours().pad());';
 					$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 ($m) {
+				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)
-				{
+				if ($addnowlink == 1) {
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date($nowgmt, '%M', 'tzuserrel').'\');';
 					$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').change();';
-				} elseif ($addnowlink == 2)
-				{
+				} elseif ($addnowlink == 2) {
 					$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))
-			{
+			if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {
 				$retstring .= ' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="now" onClick="'.$reset_scripts.'">';
 				$retstring .= $langs->trans("Now");
 				$retstring .= '</button> ';
@@ -5998,8 +6337,7 @@ class Form
 		}
 
 		// Add a "Plus one hour" link
-		if ($conf->use_javascript_ajax && $addplusone)
-		{
+		if ($conf->use_javascript_ajax && $addplusone) {
 			// Script which will be inserted in the onClick of the "Add plusone" link
 			$reset_scripts = "";
 
@@ -6009,22 +6347,27 @@ class Form
 			$reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date($nowgmt, '%m', 'tzuserrel').'\');';
 			$reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date($nowgmt, '%Y', 'tzuserrel').'\');';
 			// Update the hour part
-			if ($h)
-			{
-				if ($fullday) $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+			if ($h) {
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date($nowgmt, '%H', 'tzuserrel').'\');';
-				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 ($m) {
+				if ($fullday) {
+					$reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+				}
 				$reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date($nowgmt, '%M', 'tzuserrel').'\');';
-				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))
-			{
+			if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {
 				$retstring .= ' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="'.$reset_scripts.'">';
 				$retstring .= $langs->trans("DateStartPlusOne");
 				$retstring .= '</button> ';
@@ -6032,10 +6375,11 @@ class Form
 		}
 
 		// Add a link to set data
-		if ($conf->use_javascript_ajax && $adddateof)
-		{
+		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="console.log(\'Click on now link\'); jQuery(\'#re\').val(\''.dol_print_date($adddateof, 'dayinputnoreduce').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$labeladddateof.'</a>';
 		}
 
@@ -6107,8 +6451,7 @@ class Form
 		$hourSelected = 0; $minSelected = 0;
 
 		// Hours
-		if ($iSecond != '')
-		{
+		if ($iSecond != '') {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 			$hourSelected = convertSecondToTime($iSecond, 'allhour');
@@ -6117,11 +6460,9 @@ class Form
 
 		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)
-				{
+				if ($hourSelected == $hour) {
 					$retstring .= " selected";
 				}
 				$retstring .= ">".$hour."</option>";
@@ -6133,33 +6474,42 @@ class Form
 			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')
-		{
+		if ($typehour == 'select' || $typehour == 'textselect') {
 			$retstring .= '<select class="flat" id="select_'.$prefix.'min" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').'>';
-			for ($min = 0; $min <= 55; $min = $min + 5)
-			{
+			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>";
-		} elseif ($typehour == 'text')
-		{
+		} elseif ($typehour == 'text') {
 			$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;
@@ -6197,41 +6547,41 @@ class Form
 		$addcreatebuttonornot = empty($InfoFieldList[2]) ? 0 : $InfoFieldList[2];
 		$filter = empty($InfoFieldList[3]) ? '' : $InfoFieldList[3];
 
-		if (!empty($classpath))
-		{
+		if (!empty($classpath)) {
 			dol_include_once($classpath);
 
-			if ($classname && class_exists($classname))
-			{
+			if ($classname && class_exists($classname)) {
 				$objecttmp = new $classname($this->db);
 				// Make some replacement
 				$sharedentities = getEntity(strtolower($classname));
 				$objecttmp->filter = str_replace(
 					array('__ENTITY__', '__SHARED_ENTITIES__', '__USER_ID__'),
 					array($conf->entity, $sharedentities, $user->id),
-					$filter);
+					$filter
+				);
 			}
 		}
-		if (!is_object($objecttmp))
-		{
+		if (!is_object($objecttmp)) {
 			dol_syslog('Error bad setup of type for field '.$InfoFieldList, LOG_WARNING);
 			return 'Error bad setup of type for field '.join(',', $InfoFieldList);
 		}
 
 		//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);
 		$out = '';
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->$confkeyforautocompletemode) && !$forcecombo)
-		{
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->$confkeyforautocompletemode) && !$forcecombo) {
 			// No immediate load of all database
 			$placeholder = '';
-			if ($preselectedvalue && empty($selected_input_value))
-			{
+			if ($preselectedvalue && empty($selected_input_value)) {
 				$objecttmp->fetch($preselectedvalue);
 				$selected_input_value = ($prefixforautocompletemode == 'company' ? $objecttmp->name : $objecttmp->ref);
 				//unset($objecttmp);
@@ -6245,7 +6595,9 @@ class Form
 			// 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
@@ -6266,14 +6618,17 @@ class Form
 		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();
-		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
-		{
+		if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis)) {
 			$tmpescaped = "'".$db->escape($regbis[1])."'";
 		} else {
 			$tmpescaped = $db->escape($tmpescaped);
@@ -6306,25 +6661,30 @@ class Form
 		//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;
+			foreach ($objecttmp->fields as $key => $val) {
+				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);
 		}
 
-		if (empty($fieldstoshow))
-		{
+		if (empty($fieldstoshow)) {
 			if (isset($objecttmp->fields['ref'])) {
 				$fieldstoshow = 't.ref';
 			} else {
@@ -6345,44 +6705,56 @@ class Form
 			$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";
+			}
+		}
 
 		// Add where from hooks
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('selectForFormsListWhere', $parameters); // Note that $action and $object may have been modified by hook
-        if (!empty($hookmanager->resPrint)) $sql .= $hookmanager->resPrint;
-		else {
-		    $sql .= " WHERE 1=1";
-            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 ($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 ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
-                /*if (! DolibarrApi::_checkFilters($objecttmp->filter))
-                {
-                    throw new RestException(503, 'Error when validating parameter sqlfilters '.$objecttmp->filter);
-                }*/
-                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-                $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $objecttmp->filter).")";
-            }
-        }
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('selectForFormsListWhere', $parameters); // Note that $action and $object may have been modified by hook
+		if (!empty($hookmanager->resPrint)) {
+			$sql .= $hookmanager->resPrint;
+		} else {
+			$sql .= " WHERE 1=1";
+			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 ($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 ($objecttmp->filter) {	 // Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+				/*if (! DolibarrApi::_checkFilters($objecttmp->filter))
+				{
+					throw new RestException(503, 'Error when validating parameter sqlfilters '.$objecttmp->filter);
+				}*/
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+				$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'Form::forgeCriteriaCallback', $objecttmp->filter).")";
+			}
+		}
 		$sql .= $this->db->order($fieldstoshow, "ASC");
 		//$sql.=$this->db->plimit($limit, 0);
 		//print $sql;
 
 		// Build output string
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Construct $out and $outarray
 			$out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').($moreparams ? ' '.$moreparams : '').' name="'.$htmlname.'">'."\n";
 
@@ -6390,29 +6762,29 @@ class Form
 			$textifempty = '&nbsp;';
 
 			//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 (!empty($conf->global->$confkeyforautocompletemode)) {
+				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;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$label = '';
 					$tmparray = explode(',', $fieldstoshow);
-					foreach ($tmparray as $key => $val)
-					{
+					foreach ($tmparray as $key => $val) {
 						$val = preg_replace('/t\./', '', $val);
 						$label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;
 					}
-					if (empty($outputmode))
-					{
+					if (empty($outputmode)) {
 						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid) {
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
 						} else {
@@ -6423,7 +6795,9 @@ class Form
 					}
 
 					$i++;
-					if (($i % 10) == 0) $out .= "\n";
+					if (($i % 10) == 0) {
+						$out .= "\n";
+					}
 				}
 			}
 
@@ -6439,7 +6813,9 @@ class Form
 
 		$this->result = array('nbofelement'=>$num);
 
-		if ($outputmode) return $outarray;
+		if ($outputmode) {
+			return $outarray;
+		}
 		return $out;
 	}
 
@@ -6476,13 +6852,18 @@ class Form
 		//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 = '';
 
 		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
@@ -6498,28 +6879,35 @@ class Form
 
 		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";
 		}
 
 		if (is_array($array)) {
 			// Translate
-			if ($translate)
-			{
-				foreach ($array as $key => $value)
-				{
-					if (!is_array($value)) $array[$key] = $langs->trans($value);
-					else $array[$key]['label'] = $langs->trans($value['label']);
+			if ($translate) {
+				foreach ($array as $key => $value) {
+					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)
-			{
+			foreach ($array as $key => $tmpvalue) {
 				if (is_array($tmpvalue)) {
 					$value = $tmpvalue['label'];
 					$disabled = empty($tmpvalue['disabled']) ? '' : ' disabled';
@@ -6530,36 +6918,49 @@ class Form
 				}
 				if (!empty($disablebademail)) {
 					if (($disablebademail == 1 && !preg_match('/&lt;.+@.+&gt;/', $value))
-						|| ($disablebademail == 2 && preg_match('/---/', $value)))
-					{
+						|| ($disablebademail == 2 && preg_match('/---/', $value))) {
 						$disabled = ' disabled';
 						$style = ' class="warning"';
 					}
 				}
 
 				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 (is_array($tmpvalue))
-				{
-					foreach ($tmpvalue as $keyforvalue => $valueforvalue)
-					{
-						if (preg_match('/^data-/', $keyforvalue)) $out .= ' '.$keyforvalue.'="'.$valueforvalue.'"';
+				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.'"';
+						}
 					}
 				}
 				$out .= '>';
@@ -6598,7 +6999,9 @@ class Form
 		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>';
 
@@ -6665,8 +7068,7 @@ class Form
     	   });
 	       </script>';
 
-		if ($acceptdelayedhtml)
-		{
+		if ($acceptdelayedhtml) {
 			$delayedhtmlcontent .= $outdelayed;
 		} else {
 			$out .= $outdelayed;
@@ -6698,7 +7100,9 @@ class Form
 		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>';
 
@@ -6814,8 +7218,11 @@ class Form
 		$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
@@ -6937,8 +7344,8 @@ class Form
 
 		foreach ($array as $key => $val) {
 			/* var_dump($val);
-            var_dump(array_key_exists('enabled', $val));
-            var_dump(!$val['enabled']);*/
+			var_dump(array_key_exists('enabled', $val));
+			var_dump(!$val['enabled']);*/
 			if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) {
 				unset($array[$key]); // We don't want this field
 				continue;
@@ -7015,22 +7422,18 @@ class Form
 		$cat = new Categorie($db);
 		$categories = $cat->containing($id, $type);
 
-		if ($rendermode == 1)
-		{
+		if ($rendermode == 1) {
 			$toprint = array();
-			foreach ($categories as $c)
-			{
+			foreach ($categories as $c) {
 				$ways = $c->print_all_ways(' &gt;&gt; ', ($nolink ? 'none' : ''), 0, 1); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text
-				foreach ($ways as $way)
-				{
+				foreach ($ways as $way) {
 					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.$way.'</li>';
 				}
 			}
 			return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 
-		if ($rendermode == 0)
-		{
+		if ($rendermode == 0) {
 			$arrayselected = array();
 			$cate_arbo = $this->select_all_categories($type, '', 'parent', 64, 0, 1);
 			foreach ($categories as $c) {
@@ -7066,8 +7469,7 @@ class Form
 		);
 		$reshook = $hookmanager->executeHooks('showLinkedObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			$nbofdifferenttypes = count($object->linkedObjects);
 
 			print '<!-- showLinkedObjectBlock -->';
@@ -7089,8 +7491,7 @@ class Form
 
 			$nboftypesoutput = 0;
 
-			foreach ($object->linkedObjects as $objecttype => $objects)
-			{
+			foreach ($object->linkedObjects as $objecttype => $objects) {
 				$tplpath = $element = $subelement = $objecttype;
 
 				// to display inport button on tpl
@@ -7100,8 +7501,7 @@ class Form
 				}
 
 				$regs = array();
-				if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
-				{
+				if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {
 					$element = $regs[1];
 					$subelement = $regs[2];
 					$tplpath = $element.'/'.$subelement;
@@ -7111,25 +7511,39 @@ class Form
 				// 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') {
@@ -7146,32 +7560,27 @@ class Form
 
 				// Output template part (modules that overwrite templates must declare this into descriptor)
 				$dirtpls = array_merge($conf->modules_parts['tpl'], array('/'.$tplpath.'/tpl'));
-				foreach ($dirtpls as $reldir)
-				{
-					if ($nboftypesoutput == ($nbofdifferenttypes - 1))    // No more type to show after
-					{
+				foreach ($dirtpls as $reldir) {
+					if ($nboftypesoutput == ($nbofdifferenttypes - 1)) {    // No more type to show after
 						global $noMoreLinkedObjectBlockAfter;
 						$noMoreLinkedObjectBlockAfter = 1;
 					}
 
 					$res = @include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');
-					if ($res)
-					{
+					if ($res) {
 						$nboftypesoutput++;
 						break;
 					}
 				}
 			}
 
-			if (!$nboftypesoutput)
-			{
+			if (!$nboftypesoutput) {
 				print '<tr><td class="impair opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';
 			}
 
 			print '</table>';
 
-			if (!empty($compatibleImportElementsList))
-			{
+			if (!empty($compatibleImportElementsList)) {
 				$res = @include dol_buildpath('core/tpl/ajax/objectlinked_lineimport.tpl.php');
 			}
 
@@ -7199,19 +7608,23 @@ class Form
 		$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)
-		{
+		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->fk_project > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO))
-			{
+			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);
 			}
 
@@ -7234,39 +7647,33 @@ class Form
 		$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
 		}
 
-		if (empty($reshook))
-		{
-			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
-			{
+		if (empty($reshook)) {
+			if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {
 				$possiblelinks = array_merge($possiblelinks, $hookmanager->resArray);
 			}
-		} elseif ($reshook > 0)
-		{
-			if (is_array($hookmanager->resArray) && count($hookmanager->resArray))
-			{
+		} elseif ($reshook > 0) {
+			if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {
 				$possiblelinks = $hookmanager->resArray;
 			}
 		}
 
-		foreach ($possiblelinks as $key => $possiblelink)
-		{
+		foreach ($possiblelinks as $key => $possiblelink) {
 			$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)))
-			{
+			if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {
 				print '<div id="'.$key.'list"'.(empty($conf->use_javascript_ajax) ? '' : ' style="display:none"').'>';
 				$sql = $possiblelink['sql'];
 
 				$resqllist = $this->db->query($sql);
-				if ($resqllist)
-				{
+				if ($resqllist) {
 					$num = $this->db->num_rows($resqllist);
 					$i = 0;
 
@@ -7284,8 +7691,7 @@ class Form
 					print '<td class="right">'.$langs->trans("AmountHTShort").'</td>';
 					print '<td class="left">'.$langs->trans("Company").'</td>';
 					print '</tr>';
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$objp = $this->db->fetch_object($resqllist);
 
 						print '<tr class="oddeven">';
@@ -7308,23 +7714,27 @@ class Form
 					dol_print_error($this->db);
 				}
 				print '</div>';
-				if ($num > 0)
-				{
+				if ($num > 0) {
 				}
 
 				//$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>';
+				}
 			}
 		}
 
-		if ($linktoelemlist)
-		{
+		if ($linktoelemlist) {
 			$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.'
@@ -7336,8 +7746,7 @@ class Form
 			$linktoelem = '';
 		}
 
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			print '<!-- Add js to show linkto box -->
 				<script>
 				jQuery(document).ready(function() {
@@ -7369,8 +7778,7 @@ class Form
 		global $langs;
 
 		$yes = "yes"; $no = "no";
-		if ($option)
-		{
+		if ($option) {
 			$yes = "1";
 			$no = "0";
 		}
@@ -7378,13 +7786,14 @@ class Form
 		$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 (("$value" == 'yes') || ($value == 1))
-		{
+		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";
 			$resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
 		} else {
-	   		$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');
+			$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');
 			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
 			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
 		}
@@ -7415,21 +7824,17 @@ class Form
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
 		$sql .= " ORDER BY rowid";
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';
-			if ($useempty)
-			{
+			if ($useempty) {
 				print '<option value="-1">&nbsp;</option>';
 			}
 
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($selected == $obj->rowid)
-				{
+				if ($selected == $obj->rowid) {
 					print '<option value="'.$obj->rowid.'" selected>';
 				} else {
 					print '<option value="'.$obj->rowid.'">';
@@ -7467,28 +7872,28 @@ class Form
 		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))
-		{
+		if (is_object($hookmanager)) {
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 			$object->next_prev_filter .= $hookmanager->resPrint;
 		}
 		$previous_ref = $next_ref = '';
-		if ($shownav)
-		{
+		if ($shownav) {
 			//print "paramid=$paramid,morehtml=$morehtml,shownav=$shownav,$fieldid,$fieldref,$morehtmlref,$moreparam";
 			$object->load_previous_next_ref((isset($object->next_prev_filter) ? $object->next_prev_filter : ''), $fieldid, $nodbprefix);
 
 			$navurl = $_SERVER["PHP_SELF"];
 			// 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 ($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
 					$navurl = preg_replace('/\/tasks\/(task|contact|time|note|document)\.php/', '/tasks.php', $navurl);
 					$paramid = 'ref';
 				}
@@ -7497,11 +7902,9 @@ class Form
 			// accesskey is for Windows or Linux:  ALT + key for chrome, ALT + SHIFT + KEY for firefox
 			// accesskey is for Mac:               CTRL + key for all browsers
 			$stringforfirstkey = $langs->trans("KeyboardShortcut");
-			if ($conf->browser->name == 'chrome')
-			{
+			if ($conf->browser->name == 'chrome') {
 				$stringforfirstkey .= ' ALT +';
-			} elseif ($conf->browser->name == 'firefox')
-			{
+			} elseif ($conf->browser->name == 'firefox') {
 				$stringforfirstkey .= ' ALT + SHIFT +';
 			} else {
 				$stringforfirstkey .= ' CTL +';
@@ -7515,55 +7918,64 @@ class Form
 		$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)
-		{
+		if ($previous_ref || $next_ref || $morehtml) {
 			$ret .= '<div class="pagination paginationref"><ul class="right">';
 		}
-		if ($morehtml)
-		{
+		if ($morehtml) {
 			$ret .= '<li class="noborder litext'.(($shownav && $previous_ref && $next_ref) ? ' clearbothonsmartphone' : '').'">'.$morehtml.'</li>';
 		}
-		if ($shownav && ($previous_ref || $next_ref))
-		{
+		if ($shownav && ($previous_ref || $next_ref)) {
 			$ret .= '<li class="pagination">'.$previous_ref.'</li>';
 			$ret .= '<li class="pagination">'.$next_ref.'</li>';
 		}
-		if ($previous_ref || $next_ref || $morehtml)
-		{
+		if ($previous_ref || $next_ref || $morehtml) {
 			$ret .= '</ul></div>';
 		}
 
 		$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 ($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.='<div class="clearboth"></div>';
 		$ret .= '<div class="inline-block floatleft valignmiddle maxwidth750 marginbottomonly refid'.(($shownav && ($previous_ref || $next_ref)) ? ' refidpadding' : '').'">';
 
 		// For thirdparty, contact, user, member, the ref is the id, so we show something else
-		if ($object->element == 'societe')
-		{
+		if ($object->element == 'societe') {
 			$ret .= dol_htmlentities($object->name);
 
 			// 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)) {
@@ -7572,8 +7984,7 @@ class Form
 				}
 				$extralanguages->fetch_name_extralanguages('societe');
 
-				if (!empty($extralanguages->attributes['societe']['name']))
-				{
+				if (!empty($extralanguages->attributes['societe']['name'])) {
 					$object->fetchValuesForExtraLanguages();
 
 					$htmltext = '';
@@ -7590,8 +8001,7 @@ class Form
 					$ret .= $this->textwithpicto('', $htmltext, -1, 'language', 'opacitymedium paddingleft');
 				}
 			}
-		} elseif ($object->element == 'member')
-		{
+		} elseif ($object->element == 'member') {
 			$ret .= $object->ref.'<br>';
 			$fullname = $object->getFullName($langs);
 			if ($object->morphy == 'mor' && $object->societe) {
@@ -7599,28 +8009,21 @@ class Form
 			} else {
 				$ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');
 			}
-		} elseif (in_array($object->element, array('contact', 'user', 'usergroup')))
-		{
+		} elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) {
 			$ret .= dol_htmlentities($object->getFullName($langs));
-		} elseif (in_array($object->element, array('action', 'agenda')))
-		{
+		} elseif (in_array($object->element, array('action', 'agenda'))) {
 			$ret .= $object->ref.'<br>'.$object->label;
-		} elseif (in_array($object->element, array('adherent_type')))
-		{
+		} elseif (in_array($object->element, array('adherent_type'))) {
 			$ret .= $object->label;
-		} elseif ($object->element == 'ecm_directories')
-		{
+		} elseif ($object->element == 'ecm_directories') {
 			$ret .= '';
-		} elseif ($fieldref != 'none')
-		{
+		} elseif ($fieldref != 'none') {
 			$ret .= dol_htmlentities($object->$fieldref);
 		}
 
-		if ($morehtmlref)
-		{
+		if ($morehtmlref) {
 			// don't add a additional space, when "$morehtmlref" starts with a HTML div tag
-			if (substr($morehtmlref, 0, 4) != '<div')
-			{
+			if (substr($morehtmlref, 0, 4) != '<div') {
 				$ret .= ' ';
 			}
 
@@ -7647,14 +8050,17 @@ class Form
 		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))
-		{
+		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
@@ -7688,86 +8094,117 @@ class Form
 		$id = (!empty($object->id) ? $object->id : $object->rowid);
 
 		$ret = ''; $dir = ''; $file = ''; $originalfile = ''; $altfile = ''; $email = ''; $capture = '';
-		if ($modulepart == 'societe')
-		{
+		if ($modulepart == 'societe') {
 			$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;
 		} elseif ($modulepart == 'contact')	{
 			$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 (!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;
+				}
 				$originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'photos/'.$object->photo;
 			}
 			$email = $object->email;
 			$capture = 'user';
 		} elseif ($modulepart == 'userphoto') {
 			$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 (!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;
+				}
 				$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 (!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;
+				}
 				$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 {
 			// Generic case to show photos
 			$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 (!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;
+				}
 				$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)
-		{
-			if ($file && file_exists($dir."/".$file))
-			{
+		if ($dir) {
+			if ($file && file_exists($dir."/".$file)) {
 				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
@@ -7775,8 +8212,12 @@ class Form
 						$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';
+						}
 					}
 				}
 
@@ -7792,15 +8233,20 @@ class Form
 				}
 			}
 
-			if ($caneditfield)
-			{
-				if ($object->photo) $ret .= "<br>\n";
+			if ($caneditfield) {
+				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;
 	}
@@ -7828,66 +8274,78 @@ class Form
 		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 = '';
 
 		// On recherche les groupes
 		$sql = "SELECT ug.rowid, ug.nom as name";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
-		{
+		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {
 			$sql .= ", e.label";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";
-		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
-		{
+		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);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Enhance with select2
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-		   	$out .= ajax_combobox($htmlname);
+			$out .= ajax_combobox($htmlname);
 
 			$out .= '<select class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
-				if ($show_empty && !$multiple) $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>&nbsp;</option>'."\n";
+			if ($num) {
+				if ($show_empty && !$multiple) {
+					$out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>&nbsp;</option>'."\n";
+				}
 
-				while ($i < $num)
-				{
+				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 ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected)))
-					{
+					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';
 					}
 					$out .= '>';
 
 					$out .= $obj->name;
-					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1)
-					{
+					if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {
 						$out .= " (".$obj->label.")";
 					}
 
@@ -7895,7 +8353,9 @@ class Form
 					$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>';
@@ -7936,7 +8396,9 @@ class Form
 
 		$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() {
@@ -7949,7 +8411,9 @@ class Form
                         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);
@@ -7972,8 +8436,7 @@ class Form
 	public function showFilterAndCheckAddButtons($addcheckuncheckall = 0, $cssclass = 'checkforaction', $calljsfunction = 0, $massactionname = "massaction")
 	{
 		$out = $this->showFilterButtons();
-		if ($addcheckuncheckall)
-		{
+		if ($addcheckuncheckall) {
 			$out .= $this->showCheckAddButtons($cssclass, $calljsfunction, $massactionname);
 		}
 		return $out;
@@ -7999,39 +8462,42 @@ class Form
 		$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)
-		{
+		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))
-			{
+			while ($obj = $db->fetch_object($resql)) {
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).'</option>';
 			}
 			$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))
-			{
+			if (!empty($target)) {
 				$sql = "SELECT c.id FROM ".MAIN_DB_PREFIX."c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";
 				$resql = $db->query($sql);
-				if ($resql)
-				{
-					if ($db->num_rows($resql) > 0)
-					{
+				if ($resql) {
+					if ($db->num_rows($resql) > 0) {
 						$obj = $db->fetch_object($resql);
 						$out .= '<script>
 							$(function() {
 								$("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();
@@ -8091,13 +8557,13 @@ class Form
 		$sql .= ' WHERE entity = '.$conf->entity.' AND active = 1';
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		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))
-			{
+			while ($obj = $db->fetch_object($resql)) {
 				$out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';
 			}
 			$out .= '</select>';
@@ -8127,17 +8593,21 @@ class Form
 		$sql .= ' WHERE active = 1';
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		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))
-			{
+			while ($obj = $db->fetch_object($resql)) {
 				$key = $langs->trans($obj->code);
 				$out .= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';
 			}
@@ -8173,20 +8643,19 @@ class Form
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (is_null($usertofilter))
-		{
+		if (is_null($usertofilter)) {
 			$usertofilter = $user;
 		}
 
 		$out = '';
 
 		$hideunselectables = false;
-		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+			$hideunselectables = true;
+		}
 
-		if (empty($projectsListId))
-		{
-			if (empty($usertofilter->rights->projet->all->lire))
-			{
+		if (empty($projectsListId)) {
+			if (empty($usertofilter->rights->projet->all->lire)) {
 				$projectstatic = new Project($this->db);
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1);
 			}
@@ -8207,13 +8676,11 @@ class Form
 		$sql .= " GROUP BY f.ref ORDER BY p.ref, f.ref ASC";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Use select2 selector
-			if (!empty($conf->use_javascript_ajax))
-			{
+			if (!empty($conf->use_javascript_ajax)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-			   	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
 				$out .= $comboenhancement;
 				$morecss = 'minwidth200imp maxwidth500';
 			}
@@ -8223,63 +8690,62 @@ class Form
 			}
 			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);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
-					{
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire)) {
 						// Do nothing
 					} else {
-						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
-						{
+						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED) {
 							$i++;
 							continue;
 						}
 
 						$labeltoshow = '';
 
-						if ($showproject == 'all')
-						{
+						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)
-							{
+							if ($obj->fk_statut == Project::STATUS_DRAFT) {
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("Draft");
-							} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
-							{
-								if ($discard_closed == 2) $disabled = 1;
+							} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {
+								if ($discard_closed == 2) {
+									$disabled = 1;
+								}
 								$labeltoshow .= ' - '.$langs->trans("Closed");
-							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
+							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 						}
 
-						if (!empty($selected) && $selected == $obj->rowid)
-						{
+						if (!empty($selected) && $selected == $obj->rowid) {
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
 						} else {
-							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
-							{
+							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {
 								$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 .= '>';
@@ -8336,8 +8802,12 @@ class Form
 		// 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">';
@@ -8379,7 +8849,9 @@ class Form
 		$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;
@@ -8388,14 +8860,16 @@ class Form
 
 		$retstring .= '<select class="flat" id="select_'.$prefix.'model_mail" name="'.$prefix.'model_mail">';
 
-		foreach ($TModels as $id_model=>$label_model) {
+		foreach ($TModels as $id_model => $label_model) {
 			$retstring .= '<option value="'.$id_model.'"';
 			$retstring .= ">".$label_model."</option>";
 		}
 
 		$retstring .= "</select>";
 
-		if ($addjscombo) $retstring .= ajax_combobox('select_'.$prefix.'model_mail');
+		if ($addjscombo) {
+			$retstring .= ajax_combobox('select_'.$prefix.'model_mail');
+		}
 
 		return $retstring;
 	}
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index b95f73506b9..7efe910a814 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -78,8 +78,7 @@ class FormAccounting extends Form
 		$out = '';
 
 		$options = array();
-		if ($usecache && !empty($this->options_cache[$usecache]))
-		{
+		if ($usecache && !empty($this->options_cache[$usecache])) {
 			$options = $this->options_cache[$usecache];
 			$selected = $selectid;
 		} else {
@@ -87,7 +86,9 @@ class FormAccounting extends Form
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE active = 1";
 			$sql .= " AND entity = ".$conf->entity;
-			if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
+			if ($nature && is_numeric($nature)) {
+				$sql .= " AND nature = ".$nature;
+			}
 			$sql .= " ORDER BY code";
 
 			dol_syslog(get_class($this)."::select_journal", LOG_DEBUG);
@@ -101,8 +102,7 @@ class FormAccounting extends Form
 
 			$selected = 0;
 			$langs->load('accountancy');
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$label = $obj->code.' - '.$langs->trans($obj->label);
 
 				$select_value_in = $obj->rowid;
@@ -125,8 +125,7 @@ class FormAccounting extends Form
 			}
 			$this->db->free($resql);
 
-			if ($usecache)
-			{
+			if ($usecache) {
 				$this->options_cache[$usecache] = $options;
 			}
 		}
@@ -159,8 +158,7 @@ class FormAccounting extends Form
 		$out = '';
 
 		$options = array();
-		if ($usecache && !empty($this->options_cache[$usecache]))
-		{
+		if ($usecache && !empty($this->options_cache[$usecache])) {
 			$options = $this->options_cache[$usecache];
 			$selected = $selectedIds;
 		} else {
@@ -168,7 +166,9 @@ class FormAccounting extends Form
 			$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
 			$sql .= " WHERE active = 1";
 			$sql .= " AND entity = ".$conf->entity;
-			if ($nature && is_numeric($nature))   $sql .= " AND nature = ".$nature;
+			if ($nature && is_numeric($nature)) {
+				$sql .= " AND nature = ".$nature;
+			}
 			$sql .= " ORDER BY code";
 
 			dol_syslog(get_class($this)."::multi_select_journal", LOG_DEBUG);
@@ -182,8 +182,7 @@ class FormAccounting extends Form
 
 			$selected = array();
 			$langs->load('accountancy');
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$label = $langs->trans($obj->label);
 
 				$select_value_in = $obj->rowid;
@@ -205,8 +204,7 @@ class FormAccounting extends Form
 			}
 			$this->db->free($resql);
 
-			if ($usecache)
-			{
+			if ($usecache) {
 				$this->options_cache[$usecache] = $options;
 			}
 		}
@@ -234,19 +232,19 @@ class FormAccounting extends Form
 		// phpcs:enable
 		global $db, $langs, $user, $mysoc;
 
-		if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries))
-		{
+		if (empty($mysoc->country_id) && empty($mysoc->country_code) && empty($allcountries)) {
 			dol_print_error('', 'Call to select_accounting_account with mysoc country not yet defined');
 			exit;
 		}
 
-		if (!empty($mysoc->country_id))
-		{
+		if (!empty($mysoc->country_id)) {
 			$sql = "SELECT c.rowid, c.label as type, c.range_account";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
 			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.category_type = 0";
-			if (empty($allcountries)) $sql .= " AND c.fk_country = ".$mysoc->country_id;
+			if (empty($allcountries)) {
+				$sql .= " AND c.fk_country = ".$mysoc->country_id;
+			}
 			$sql .= " ORDER BY c.label ASC";
 		} else {
 			$sql = "SELECT c.rowid, c.label as type, c.range_account";
@@ -254,26 +252,29 @@ class FormAccounting extends Form
 			$sql .= " WHERE c.active = 1";
 			$sql .= " AND c.category_type = 0";
 			$sql .= " AND c.fk_country = co.rowid";
-			if (empty($allcountries)) $sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
+			if (empty($allcountries)) {
+				$sql .= " AND co.code = '".$this->db->escape($mysoc->country_code)."'";
+			}
 			$sql .= " ORDER BY c.label ASC";
 		}
 
 		dol_syslog(get_class($this).'::'.__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$out = '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'">';
 				$i = 0;
 
-				if ($useempty) $out .= '<option value="0">&nbsp;</option>';
-				while ($i < $num)
-				{
+				if ($useempty) {
+					$out .= '<option value="0">&nbsp;</option>';
+				}
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$out .= '<option value="'.$obj->rowid.'"';
-					if ($obj->rowid == $selected) $out .= ' selected';
+					if ($obj->rowid == $selected) {
+						$out .= ' selected';
+					}
 					$out .= '>'.($maxlen ? dol_trunc($obj->type, $maxlen) : $obj->type);
 					$out .= ' ('.$obj->range_account.')';
 					$i++;
@@ -350,13 +351,11 @@ class FormAccounting extends Form
 
 		$options = array();
 
-		if ($showempty == 2)
-		{
+		if ($showempty == 2) {
 			$options['0'] = '--- '.$langs->trans("None").' ---';
 		}
 
-		if ($usecache && !empty($this->options_cache[$usecache]))
-		{
+		if ($usecache && !empty($this->options_cache[$usecache])) {
 			$options = $options + $this->options_cache[$usecache]; // We use + instead of array_merge because we don't want to reindex key from 0
 			$selected = $selectid;
 		} else {
@@ -380,10 +379,8 @@ class FormAccounting extends Form
 			}
 
 			$selected = $selectid; // selectid can be -1, 0, 123
-			while ($obj = $this->db->fetch_object($resql))
-			{
-				if (empty($obj->labelshort))
-				{
+			while ($obj = $this->db->fetch_object($resql)) {
+				if (empty($obj->labelshort)) {
 					$labeltoshow = $obj->label;
 				} else {
 					$labeltoshow = $obj->labelshort;
@@ -413,8 +410,7 @@ class FormAccounting extends Form
 			}
 			$this->db->free($resql);
 
-			if ($usecache)
-			{
+			if ($usecache) {
 				$this->options_cache[$usecache] = $options;
 				unset($this->options_cache[$usecache]['0']);
 			}
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 92c697ceae7..7d909440ecc 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -77,8 +77,7 @@ class FormActions
 		);
 		// +ActionUncomplete
 
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			print "\n";
 			print "<script type=\"text/javascript\">
                 var htmlname = '".$htmlname."';
@@ -125,27 +124,29 @@ class FormActions
                 }
                 </script>\n";
 		}
-		if (!empty($conf->use_javascript_ajax) || $onlyselect)
-		{
+		if (!empty($conf->use_javascript_ajax) || $onlyselect) {
 			//var_dump($selected);
-			if ($selected == 'done') $selected = '100';
+			if ($selected == 'done') {
+				$selected = '100';
+			}
 			print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
-			if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'>&nbsp;</option>';
-			foreach ($listofstatus as $key => $val)
-			{
+			if ($showempty) {
+				print '<option value=""'.($selected == '' ? ' selected' : '').'>&nbsp;</option>';
+			}
+			foreach ($listofstatus as $key => $val) {
 				print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
-				if ($key == '50' && $onlyselect == 2)
-				{
+				if ($key == '50' && $onlyselect == 2) {
 					print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';
 				}
 			}
 			print '</select>';
-			if ($selected == 0 || $selected == 100) $canedit = 0;
+			if ($selected == 0 || $selected == 100) {
+				$canedit = 0;
+			}
 
 			print ajax_combobox('select'.$htmlname);
 
-			if (empty($onlyselect))
-			{
+			if (empty($onlyselect)) {
 				print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
 				print '<span class="hideonsmartphone hideifna">%</span>';
 			}
@@ -178,34 +179,49 @@ class FormActions
 		$sortorder = 'DESC,DESC';
 
 		$listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
-		if (!is_array($listofactions)) dol_print_error($this->db, 'FailedToGetActions');
+		if (!is_array($listofactions)) {
+			dol_print_error($this->db, 'FailedToGetActions');
+		}
 
 		$num = count($listofactions);
-		if ($num || $forceshowtitle)
-		{
-			if ($typeelement == 'invoice')               $title = $langs->trans('ActionsOnBill');
-			elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title = $langs->trans('ActionsOnBill');
-			elseif ($typeelement == 'propal')            $title = $langs->trans('ActionsOnPropal');
-			elseif ($typeelement == 'supplier_proposal') $title = $langs->trans('ActionsOnSupplierProposal');
-			elseif ($typeelement == 'order')             $title = $langs->trans('ActionsOnOrder');
-			elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title = $langs->trans('ActionsOnOrder');
-			elseif ($typeelement == 'shipping')          $title = $langs->trans('ActionsOnShipping');
-			elseif ($typeelement == 'fichinter')         $title = $langs->trans('ActionsOnFicheInter');
-			elseif ($typeelement == 'project')           $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
-			elseif ($typeelement == 'task')              $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
-			elseif ($typeelement == 'member')            $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
-			else $title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
+		if ($num || $forceshowtitle) {
+			if ($typeelement == 'invoice') {
+				$title = $langs->trans('ActionsOnBill');
+			} elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') {
+				$title = $langs->trans('ActionsOnBill');
+			} elseif ($typeelement == 'propal') {
+				$title = $langs->trans('ActionsOnPropal');
+			} elseif ($typeelement == 'supplier_proposal') {
+				$title = $langs->trans('ActionsOnSupplierProposal');
+			} elseif ($typeelement == 'order') {
+				$title = $langs->trans('ActionsOnOrder');
+			} elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') {
+				$title = $langs->trans('ActionsOnOrder');
+			} elseif ($typeelement == 'shipping') {
+				$title = $langs->trans('ActionsOnShipping');
+			} elseif ($typeelement == 'fichinter') {
+				$title = $langs->trans('ActionsOnFicheInter');
+			} elseif ($typeelement == 'project') {
+				$title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+			} elseif ($typeelement == 'task') {
+				$title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+			} elseif ($typeelement == 'member') {
+				$title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+			} else {
+				$title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
+			}
 
 			$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');
 
 			$projectid = $object->fk_project;
-			if ($typeelement == 'project') $projectid = $object->id;
+			if ($typeelement == 'project') {
+				$projectid = $object->id;
+			}
 
 			$newcardbutton = '';
-			if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create))
-			{
-			    $url = DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog', 'tzuser')).'&amp;origin='.urlencode($typeelement).'&amp;originid='.$object->id.((!empty($object->socid) && $object->socid > 0) ? '&amp;socid='.$object->socid : ((!empty($socid) && $socid > 0) ? '&amp;socid='.$socid : '')).($projectid > 0 ? '&amp;projectid='.$projectid : '').'&amp;backtopage='.urlencode($urlbacktopage);
-			    $newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', $url);
+			if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create)) {
+				$url = DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog', 'tzuser')).'&amp;origin='.urlencode($typeelement).'&amp;originid='.$object->id.((!empty($object->socid) && $object->socid > 0) ? '&amp;socid='.$object->socid : ((!empty($socid) && $socid > 0) ? '&amp;socid='.$socid : '')).($projectid > 0 ? '&amp;projectid='.$projectid : '').'&amp;backtopage='.urlencode($urlbacktopage);
+				$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', $url);
 			}
 
 			print '<!-- formactions->showactions -->'."\n";
@@ -225,14 +241,14 @@ class FormActions
 			print '</tr>';
 			print "\n";
 
-			if (is_array($listofactions) && count($listofactions))
-			{
+			if (is_array($listofactions) && count($listofactions)) {
 				$cacheusers = array();
 
 				$cursorevent = 0;
-				foreach ($listofactions as $actioncomm)
-				{
-					if ($max && $cursorevent >= $max) break;
+				foreach ($listofactions as $actioncomm) {
+					if ($max && $cursorevent >= $max) {
+						break;
+					}
 
 					$ref = $actioncomm->getNomUrl(1, -1);
 					$label = $actioncomm->getNomUrl(0, 36);
@@ -244,18 +260,15 @@ class FormActions
 
 					// Onwer
 					print '<td class="nowraponall tdoverflowmax125">';
-					if (!empty($actioncomm->userownerid))
-					{
-					    if (isset($cacheusers[$actioncomm->userownerid]) && is_object($cacheusers[$actioncomm->userownerid]))
-						{
+					if (!empty($actioncomm->userownerid)) {
+						if (isset($cacheusers[$actioncomm->userownerid]) && is_object($cacheusers[$actioncomm->userownerid])) {
 							$tmpuser = $cacheusers[$actioncomm->userownerid];
 						} else {
 							$tmpuser = new User($this->db);
 							$tmpuser->fetch($actioncomm->userownerid);
 							$cacheusers[$actioncomm->userownerid] = $tmpuser;
 						}
-						if ($tmpuser->id > 0)
-						{
+						if ($tmpuser->id > 0) {
 							print $tmpuser->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
 						}
 					}
@@ -276,14 +289,16 @@ class FormActions
 
 					// Date
 					print '<td class="center">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
-					if ($actioncomm->datef)
-					{
+					if ($actioncomm->datef) {
 						$tmpa = dol_getdate($actioncomm->datep);
 						$tmpb = dol_getdate($actioncomm->datef);
-						if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
-						{
-							if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
-						} else print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
+						if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+							if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) {
+								print '-'.dol_print_date($actioncomm->datef, 'hour', 'tzuserrel');
+							}
+						} else {
+							print '-'.dol_print_date($actioncomm->datef, 'dayhour', 'tzuserrel');
+						}
 					}
 					print '</td>';
 					print '<td class="right">';
@@ -297,8 +312,7 @@ class FormActions
 				print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 			}
 
-			if ($max && $num > $max)
-			{
+			if ($max && $num > $max) {
 				print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
 			}
 
@@ -329,7 +343,9 @@ class FormActions
 		// phpcs:enable
 		global $langs, $user, $form, $conf;
 
-		if (!is_object($form)) $form = new Form($this->db);
+		if (!is_object($form)) {
+			$form = new Form($this->db);
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -343,28 +359,37 @@ class FormActions
 		}
 		//asort($arraylist);
 
-	   	if ($selected == 'manual') $selected = 'AC_OTH';
-	   	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';
+		if ($selected == 'manual') {
+			$selected = 'AC_OTH';
+		}
+		if ($selected == 'auto') {
+			$selected = 'AC_OTH_AUTO';
+		}
 
-	   	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+		if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) {
+			unset($arraylist['AC_OTH_AUTO']);
+		}
 
-	   	$out = '';
+		$out = '';
 
-		if (!empty($multiselect))
-		{
-			if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+		if (!empty($multiselect)) {
+			if (!is_array($selected) && !empty($selected)) {
+				$selected = explode(',', $selected);
+			}
 			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		} else {
 			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', 'minwidth300'.($morecss ? ' '.$morecss : ''), 1);
 		}
 
-		if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
-		{
+		if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0) {
 			$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);
 		}
 
-		if ($nooutput) return $out;
-		else print $out;
+		if ($nooutput) {
+			return $out;
+		} else {
+			print $out;
+		}
 		return '';
 	}
 }
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 36af8bfa875..f58e567a37d 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -67,45 +67,59 @@ class FormAdmin
 		// phpcs:enable
 		global $conf, $langs;
 
-		if (!empty($conf->global->MAIN_DEFAULT_LANGUAGE_FILTER)) $filter[$conf->global->MAIN_DEFAULT_LANGUAGE_FILTER] = 1;
+		if (!empty($conf->global->MAIN_DEFAULT_LANGUAGE_FILTER)) {
+			$filter[$conf->global->MAIN_DEFAULT_LANGUAGE_FILTER] = 1;
+		}
 
 		$langs_available = $langs->get_available_languages(DOL_DOCUMENT_ROOT, 12, 0, $mainlangonly);
 
 		$out = '';
 
 		$out .= '<select '.($multiselect ? 'multiple="multiple" ' : '').'class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.($multiselect ? '[]' : '').'"'.($disabled ? ' disabled' : '').'>';
-		if ($showempty && !$multiselect)
-		{
+		if ($showempty && !$multiselect) {
 			$out .= '<option value="0"';
-			if ($selected === '') $out .= ' selected';
+			if ($selected === '') {
+				$out .= ' selected';
+			}
 			$out .= '>';
-			if ($showempty != '1') $out .= $showempty;
-			else $out .= '&nbsp;';
+			if ($showempty != '1') {
+				$out .= $showempty;
+			} else {
+				$out .= '&nbsp;';
+			}
 			$out .= '</option>';
 		}
-		if ($showauto)
-		{
+		if ($showauto) {
 			$out .= '<option value="auto"';
-			if ($selected === 'auto') $out .= ' selected';
+			if ($selected === 'auto') {
+				$out .= ' selected';
+			}
 			$out .= '>'.$langs->trans("AutoDetectLang").'</option>';
 		}
 
 		asort($langs_available);
 
-		foreach ($langs_available as $key => $value)
-		{
+		foreach ($langs_available as $key => $value) {
 			$valuetoshow = $value;
 			if ($showcode == 1) {
-				if ($mainlangonly) $valuetoshow = '<span class="opacitymedium">'.preg_replace('/[_-].*$/', '', $key).'</span> - '.$value;
-				else $valuetoshow = '<span class="opacitymedium">'.$key.'</span> - '.$value;
+				if ($mainlangonly) {
+					$valuetoshow = '<span class="opacitymedium">'.preg_replace('/[_-].*$/', '', $key).'</span> - '.$value;
+				} else {
+					$valuetoshow = '<span class="opacitymedium">'.$key.'</span> - '.$value;
+				}
 			}
 			if ($showcode == 2) {
-				if ($mainlangonly) $valuetoshow = $value.' <span class="opacitymedium">('.preg_replace('/[_-].*$/', '', $key).')</span>';
-				else $valuetoshow = $value.' <span class="opacitymedium">('.$key.')</span>';
+				if ($mainlangonly) {
+					$valuetoshow = $value.' <span class="opacitymedium">('.preg_replace('/[_-].*$/', '', $key).')</span>';
+				} else {
+					$valuetoshow = $value.' <span class="opacitymedium">('.$key.')</span>';
+				}
 			}
 
 			$keytouse = $key;
-			if ($mainlangonly) $keytouse = preg_replace('/[_-].*$/', '', $key);
+			if ($mainlangonly) {
+				$keytouse = preg_replace('/[_-].*$/', '', $key);
+			}
 
 			if ($filter && is_array($filter) && array_key_exists($keytouse, $filter)) {
 				continue;
@@ -124,8 +138,7 @@ class FormAdmin
 		$out .= '</select>';
 
 		// Make select dynamic
-		if (!$forcecombo)
-		{
+		if (!$forcecombo) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 		}
@@ -152,38 +165,45 @@ class FormAdmin
 
 
 		// Check parameters
-		if (!is_array($dirmenuarray)) return -1;
+		if (!is_array($dirmenuarray)) {
+			return -1;
+		}
 
 		$menuarray = array();
-		foreach ($conf->file->dol_document_root as $dirroot)
-		{
-			foreach ($dirmenuarray as $dirtoscan)
-			{
+		foreach ($conf->file->dol_document_root as $dirroot) {
+			foreach ($dirmenuarray as $dirtoscan) {
 				$dir = $dirroot.$dirtoscan;
 				//print $dir.'<br>';
-				if (is_dir($dir))
-				{
+				if (is_dir($dir)) {
 					$handle = opendir($dir);
-					if (is_resource($handle))
-					{
-						while (($file = readdir($handle)) !== false)
-						{
-							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index')
-							{
-								if (preg_match('/lib\.php$/i', $file)) continue; // We exclude library files
-								if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
-								if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
-								if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) continue; // We exclude all menu manager files
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && substr($file, 0, 5) != 'index') {
+								if (preg_match('/lib\.php$/i', $file)) {
+									continue; // We exclude library files
+								}
+								if (preg_match('/eldy_(backoffice|frontoffice)\.php$/i', $file)) {
+									continue; // We exclude all menu manager files
+								}
+								if (preg_match('/auguria_(backoffice|frontoffice)\.php$/i', $file)) {
+									continue; // We exclude all menu manager files
+								}
+								if (preg_match('/smartphone_(backoffice|frontoffice)\.php$/i', $file)) {
+									continue; // We exclude all menu manager files
+								}
 
 								$filelib = preg_replace('/\.php$/i', '', $file);
 								$prefix = '';
 								// 0=Recommanded, 1=Experimental, 2=Developpement, 3=Other
-								if (preg_match('/^eldy/i', $file)) $prefix = '0';
-								elseif (preg_match('/^smartphone/i', $file)) $prefix = '2';
-								else $prefix = '3';
+								if (preg_match('/^eldy/i', $file)) {
+									$prefix = '0';
+								} elseif (preg_match('/^smartphone/i', $file)) {
+									$prefix = '2';
+								} else {
+									$prefix = '3';
+								}
 
-								if ($file == $selected)
-								{
+								if ($file == $selected) {
 									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'" selected>'.$filelib.'</option>';
 								} else {
 									$menuarray[$prefix.'_'.$file] = '<option value="'.$file.'">'.$filelib.'</option>';
@@ -200,20 +220,30 @@ class FormAdmin
 		// Output combo list of menus
 		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 		$oldprefix = '';
-		foreach ($menuarray as $key => $val)
-		{
+		foreach ($menuarray as $key => $val) {
 			$tab = explode('_', $key);
 			$newprefix = $tab[0];
-			if ($newprefix == '1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) continue;
-			if ($newprefix == '2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) continue;
-			if ($newprefix != $oldprefix)	// Add separators
-			{
+			if ($newprefix == '1' && ($conf->global->MAIN_FEATURES_LEVEL < 1)) {
+				continue;
+			}
+			if ($newprefix == '2' && ($conf->global->MAIN_FEATURES_LEVEL < 2)) {
+				continue;
+			}
+			if ($newprefix != $oldprefix) {	// Add separators
 				// Affiche titre
 				print '<option value="-1" disabled>';
-				if ($newprefix == '0') print '-- '.$langs->trans("VersionRecommanded").' --';
-				if ($newprefix == '1') print '-- '.$langs->trans("VersionExperimental").' --';
-				if ($newprefix == '2') print '-- '.$langs->trans("VersionDevelopment").' --';
-				if ($newprefix == '3') print '-- '.$langs->trans("Other").' --';
+				if ($newprefix == '0') {
+					print '-- '.$langs->trans("VersionRecommanded").' --';
+				}
+				if ($newprefix == '1') {
+					print '-- '.$langs->trans("VersionExperimental").' --';
+				}
+				if ($newprefix == '2') {
+					print '-- '.$langs->trans("VersionDevelopment").' --';
+				}
+				if ($newprefix == '3') {
+					print '-- '.$langs->trans("Other").' --';
+				}
 				print '</option>';
 				$oldprefix = $newprefix;
 			}
@@ -241,26 +271,30 @@ class FormAdmin
 
 		$menuarray = array();
 
-		foreach ($dirmenuarray as $dirmenu)
-		{
-			foreach ($conf->file->dol_document_root as $dirroot)
-			{
+		foreach ($dirmenuarray as $dirmenu) {
+			foreach ($conf->file->dol_document_root as $dirroot) {
 				$dir = $dirroot.$dirmenu;
-				if (is_dir($dir))
-				{
+				if (is_dir($dir)) {
 					$handle = opendir($dir);
-					if (is_resource($handle))
-					{
-						while (($file = readdir($handle)) !== false)
-						{
-							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS')
-							{
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
+							if (is_file($dir."/".$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS') {
 								$filelib = preg_replace('/(_backoffice|_frontoffice)?\.php$/i', '', $file);
-								if (preg_match('/^index/i', $filelib)) continue;
-								if (preg_match('/^default/i', $filelib)) continue;
-								if (preg_match('/^empty/i', $filelib)) continue;
-								if (preg_match('/\.lib/i', $filelib)) continue;
-								if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) continue;
+								if (preg_match('/^index/i', $filelib)) {
+									continue;
+								}
+								if (preg_match('/^default/i', $filelib)) {
+									continue;
+								}
+								if (preg_match('/^empty/i', $filelib)) {
+									continue;
+								}
+								if (preg_match('/\.lib/i', $filelib)) {
+									continue;
+								}
+								if (empty($conf->global->MAIN_FEATURES_LEVEL) && in_array($file, $expdevmenu)) {
+									continue;
+								}
 
 								$menuarray[$filelib] = 1;
 							}
@@ -277,18 +311,19 @@ class FormAdmin
 		// Affichage liste deroulante des menus
 		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 		$oldprefix = '';
-		foreach ($menuarray as $key => $val)
-		{
+		foreach ($menuarray as $key => $val) {
 			$tab = explode('_', $key);
 			$newprefix = $tab[0];
 			print '<option value="'.$key.'"';
-			if ($key == $selected)
-			{
+			if ($key == $selected) {
 				print '	selected';
 			}
 			print '>';
-			if ($key == 'all') print $langs->trans("AllMenus");
-			else print $key;
+			if ($key == 'all') {
+				print $langs->trans("AllMenus");
+			} else {
+				print $key;
+			}
 			print '</option>'."\n";
 		}
 		print '</select>';
@@ -340,7 +375,9 @@ class FormAdmin
 		);
 		foreach ($arraytz as $lib => $gmt) {
 			print '<option value="'.$lib.'"';
-			if ($selected == $lib || $selected == $gmt) print ' selected';
+			if ($selected == $lib || $selected == $gmt) {
+				print ' selected';
+			}
 			print '>'.$gmt.'</option>'."\n";
 		}
 		print '</select>';
@@ -368,15 +405,15 @@ class FormAdmin
 		$sql = "SELECT code, label, width, height, unit";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_paper_format";
 		$sql .= " WHERE active=1";
-		if ($filter) $sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
+		if ($filter) {
+			$sql .= " AND code LIKE '%".$this->db->escape($filter)."%'";
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$unitKey = $langs->trans('SizeUnit'.$obj->unit);
 
@@ -391,16 +428,15 @@ class FormAdmin
 		$out = '';
 
 		$out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-		if ($showempty)
-		{
+		if ($showempty) {
 			$out .= '<option value=""';
-			if ($selected == '') $out .= ' selected';
+			if ($selected == '') {
+				$out .= ' selected';
+			}
 			$out .= '>&nbsp;</option>';
 		}
-		foreach ($paperformat as $key => $value)
-		{
-			if ($selected == $key)
-			{
+		foreach ($paperformat as $key => $value) {
+			if ($selected == $key) {
 				$out .= '<option value="'.$key.'" selected>'.$value.'</option>';
 			} else {
 				$out .= '<option value="'.$key.'">'.$value.'</option>';
diff --git a/htdocs/core/class/html.formbarcode.class.php b/htdocs/core/class/html.formbarcode.class.php
index 52d4c795c85..8f3dc86c760 100644
--- a/htdocs/core/class/html.formbarcode.class.php
+++ b/htdocs/core/class/html.formbarcode.class.php
@@ -66,8 +66,7 @@ class FormBarCode
 
 		$disable = '';
 
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			print "\n".'<script type="text/javascript" language="javascript">';
 			print 'jQuery(document).ready(function () {
                         jQuery("#select'.$idForm.'").change(function() {
@@ -82,13 +81,11 @@ class FormBarCode
 
 		// We check if barcode is already selected by default
 		if (((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE == $code_id) ||
-		(!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id))
-		{
+		(!empty($conf->societe->enabled) && $conf->global->GENBARCODE_BARCODETYPE_THIRDPARTY == $code_id)) {
 			$disable = 'disabled';
 		}
 
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			$select_encoder = '<form action="'.DOL_URL_ROOT.'/admin/barcode.php" method="POST" id="form'.$idForm.'">';
 			$select_encoder .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$select_encoder .= '<input type="hidden" name="action" value="update">';
@@ -99,14 +96,12 @@ class FormBarCode
 		$select_encoder .= '<select id="select'.$idForm.'" class="flat" name="'.$selectname.'">';
 		$select_encoder .= '<option value="0"'.($selected == 0 ? ' selected' : '').' '.$disable.'>'.$langs->trans('Disable').'</option>';
 		$select_encoder .= '<option value="-1" disabled>--------------------</option>';
-		foreach ($barcodelist as $key => $value)
-		{
+		foreach ($barcodelist as $key => $value) {
 			$select_encoder .= '<option value="'.$key.'"'.($selected == $key ? ' selected' : '').'>'.$value.'</option>';
 		}
 		$select_encoder .= '</select>';
 
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			$select_encoder .= '</form>';
 		}
 
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 767a064ab31..320a1cd2a49 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -40,8 +40,7 @@ class FormCategory extends Form
 	{
 		global $langs;
 
-		if (empty($preSelected) || !is_array($preSelected))
-		{
+		if (empty($preSelected) || !is_array($preSelected)) {
 			$preSelected = array();
 		}
 
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 1ed2af9aa2d..e7d8d94b6d2 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -58,23 +58,31 @@ class FormCompany extends Form
 		$sql = "SELECT id, code, libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_typent";
 		$sql .= " WHERE active = 1 AND (fk_country IS NULL OR fk_country = ".(empty($mysoc->country_id) ? '0' : $mysoc->country_id).")";
-		if ($filter) $sql .= " ".$filter;
+		if ($filter) {
+			$sql .= " ".$filter;
+		}
 		$sql .= " ORDER by position, id";
 		dol_syslog(get_class($this).'::typent_array', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($resql);
-				if (!$mode) $key = $objp->id;
-				else $key = $objp->code;
-				if ($langs->trans($objp->code) != $objp->code) $effs[$key] = $langs->trans($objp->code);
-				else $effs[$key] = $objp->libelle;
-				if ($effs[$key] == '-') $effs[$key] = '';
+				if (!$mode) {
+					$key = $objp->id;
+				} else {
+					$key = $objp->code;
+				}
+				if ($langs->trans($objp->code) != $objp->code) {
+					$effs[$key] = $langs->trans($objp->code);
+				} else {
+					$effs[$key] = $objp->libelle;
+				}
+				if ($effs[$key] == '-') {
+					$effs[$key] = '';
+				}
 				$i++;
 			}
 			$this->db->free($resql);
@@ -99,20 +107,23 @@ class FormCompany extends Form
 		$sql = "SELECT id, code, libelle";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_effectif";
 		$sql .= " WHERE active = 1";
-		if ($filter) $sql .= " ".$filter;
+		if ($filter) {
+			$sql .= " ".$filter;
+		}
 		$sql .= " ORDER BY id ASC";
 		dol_syslog(get_class($this).'::effectif_array', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($resql);
-				if (!$mode) $key = $objp->id;
-				else $key = $objp->code;
+				if (!$mode) {
+					$key = $objp->id;
+				} else {
+					$key = $objp->code;
+				}
 
 				$effs[$key] = $objp->libelle != '-' ? $objp->libelle : '';
 				$i++;
@@ -148,8 +159,7 @@ class FormCompany extends Form
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$options = array();
 
 			if ($empty) {
@@ -167,8 +177,12 @@ class FormCompany extends Form
 			}
 
 			print Form::selectarray($htmlname, $options, $selected);
-		} else dol_print_error($this->db);
-		if (!empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		} else {
+			dol_print_error($this->db);
+		}
+		if (!empty($htmlname) && $user->admin) {
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
@@ -196,21 +210,17 @@ class FormCompany extends Form
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY sortorder";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$options = array();
 
-			if ($empty)
-			{
+			if ($empty) {
 				$options[''] = '';
 			}
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$level = $langs->trans($obj->code);
 
-				if ($level == $obj->code)
-				{
+				if ($level == $obj->code) {
 					$level = $langs->trans($obj->label);
 				}
 
@@ -218,9 +228,12 @@ class FormCompany extends Form
 			}
 
 			print Form::selectarray($htmlname, $options, $selected);
+		} else {
+			dol_print_error($this->db);
+		}
+		if (!empty($htmlname) && $user->admin) {
+			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		else dol_print_error($this->db);
-		if (!empty($htmlname) && $user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
@@ -272,40 +285,41 @@ class FormCompany extends Form
 		$sql .= " ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
 		$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
-		if ($country_codeid && is_numeric($country_codeid))   $sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
-		if ($country_codeid && !is_numeric($country_codeid)) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
+		if ($country_codeid && is_numeric($country_codeid)) {
+			$sql .= " AND c.rowid = '".$this->db->escape($country_codeid)."'";
+		}
+		if ($country_codeid && !is_numeric($country_codeid)) {
+			$sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
+		}
 		$sql .= " ORDER BY c.code, d.code_departement";
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if (!empty($htmlname)) $out .= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
-			if ($country_codeid) $out .= '<option value="0">&nbsp;</option>';
+		if ($result) {
+			if (!empty($htmlname)) {
+				$out .= '<select id="'.$htmlname.'" class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'">';
+			}
+			if ($country_codeid) {
+				$out .= '<option value="0">&nbsp;</option>';
+			}
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			dol_syslog(get_class($this)."::select_departement num=".$num, LOG_DEBUG);
-			if ($num)
-			{
+			if ($num) {
 				$country = '';
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
-					if ($obj->code == '0')		// Le code peut etre une chaine
-					{
+					if ($obj->code == '0') {		// Le code peut etre une chaine
 						$out .= '<option value="0">&nbsp;</option>';
 					} else {
-						if (!$country || $country != $obj->country)
-						{
+						if (!$country || $country != $obj->country) {
 							// Affiche la rupture si on est en mode liste multipays
-							if (!$country_codeid && $obj->country_code)
-							{
+							if (!$country_codeid && $obj->country_code) {
 								$out .= '<option value="-1" disabled>----- '.$obj->country." -----</option>\n";
 								$country = $obj->country;
 							}
 						}
 
-						if (!empty($selected) && $selected == $obj->rowid)
-						{
+						if (!empty($selected) && $selected == $obj->rowid) {
 							$out .= '<option value="'.$obj->rowid.'" selected>';
 						} else {
 							$out .= '<option value="'.$obj->rowid.'">';
@@ -332,15 +346,18 @@ class FormCompany extends Form
 					$i++;
 				}
 			}
-			if (!empty($htmlname)) $out .= '</select>';
-			if (!empty($htmlname) && $user->admin) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if (!empty($htmlname)) {
+				$out .= '</select>';
+			}
+			if (!empty($htmlname) && $user->admin) {
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 		} else {
 			dol_print_error($this->db);
 		}
 
 		// Make select dynamic
-		if (!empty($htmlname))
-		{
+		if (!empty($htmlname)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
 		}
@@ -373,22 +390,18 @@ class FormCompany extends Form
 
 		dol_syslog(get_class($this)."::select_region", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
+			if ($num) {
 				$country = '';
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					if ($obj->code == 0) {
 						print '<option value="0">&nbsp;</option>';
 					} else {
-						if ($country == '' || $country != $obj->country)
-						{
+						if ($country == '' || $country != $obj->country) {
 							// Show break
 							$key = $langs->trans("Country".strtoupper($obj->country_code));
 							$valuetoshow = ($key != "Country".strtoupper($obj->country_code)) ? $obj->country_code." - ".$key : $obj->country;
@@ -396,8 +409,7 @@ class FormCompany extends Form
 							$country = $obj->country;
 						}
 
-						if ($selected > 0 && $selected == $obj->code)
-						{
+						if ($selected > 0 && $selected == $obj->code) {
 							print '<option value="'.$obj->code.'" selected>'.$obj->label.'</option>';
 						} else {
 							print '<option value="'.$obj->code.'">'.$obj->label.'</option>';
@@ -436,19 +448,15 @@ class FormCompany extends Form
 
 		dol_syslog("Form::select_civility", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 			$out .= '<option value="">&nbsp;</option>';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
-					if ($selected == $obj->code)
-					{
+					if ($selected == $obj->code) {
 						$out .= '<option value="'.$obj->code.'" selected>';
 					} else {
 						$out .= '<option value="'.$obj->code.'">';
@@ -460,7 +468,9 @@ class FormCompany extends Form
 				}
 			}
 			$out .= '</select>';
-			if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				$out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 
 			if ($addjscombo) {
 				// Enhance with select2
@@ -517,29 +527,31 @@ class FormCompany extends Form
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c";
 		$sql .= " WHERE f.fk_pays=c.rowid";
 		$sql .= " AND f.active = 1 AND c.active = 1";
-		if ($country_codeid) $sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
-		if ($filter) $sql .= " ".$filter;
+		if ($country_codeid) {
+			$sql .= " AND c.code = '".$this->db->escape($country_codeid)."'";
+		}
+		if ($filter) {
+			$sql .= " ".$filter;
+		}
 		$sql .= " ORDER BY c.code";
 
 		dol_syslog(get_class($this)."::select_juridicalstatus", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$out .= '<div id="particulier2" class="visible">';
 			$out .= '<select class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($country_codeid) $out .= '<option value="0">&nbsp;</option>'; // When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
+			if ($country_codeid) {
+				$out .= '<option value="0">&nbsp;</option>'; // When country_codeid is set, we force to add an empty line because it does not appears from select. When not set, we already get the empty line from select.
+			}
 
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$i = 0;
 				$country = ''; $arraydata = array();
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
-					if ($obj->code)		// We exclude empty line, we will add it later
-					{
+					if ($obj->code) {		// We exclude empty line, we will add it later
 						$labelcountry = (($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) ? $langs->trans("Country".$obj->country_code) : $obj->country);
 						$labeljs = (($langs->trans("JuridicalStatus".$obj->code) != "JuridicalStatus".$obj->code) ? $langs->trans("JuridicalStatus".$obj->code) : ($obj->label != '-' ? $obj->label : '')); // $obj->label is already in output charset (converted by database driver)
 						$arraydata[$obj->code] = array('code'=>$obj->code, 'label'=>$labeljs, 'label_sort'=>$labelcountry.'_'.$labeljs, 'country_code'=>$obj->country_code, 'country'=>$labelcountry);
@@ -548,25 +560,20 @@ class FormCompany extends Form
 				}
 
 				$arraydata = dol_sort_array($arraydata, 'label_sort', 'ASC');
-				if (empty($country_codeid))	// Introduce empty value (if $country_codeid not empty, empty value was already added)
-				{
+				if (empty($country_codeid)) {	// Introduce empty value (if $country_codeid not empty, empty value was already added)
 					$arraydata[0] = array('code'=>0, 'label'=>'', 'label_sort'=>'_', 'country_code'=>'', 'country'=>'');
 				}
 
-				foreach ($arraydata as $key => $val)
-				{
-					if (!$country || $country != $val['country'])
-					{
+				foreach ($arraydata as $key => $val) {
+					if (!$country || $country != $val['country']) {
 						// Show break when we are in multi country mode
-						if (empty($country_codeid) && $val['country_code'])
-						{
+						if (empty($country_codeid) && $val['country_code']) {
 							$out .= '<option value="0" disabled class="selectoptiondisabledwhite">----- '.$val['country']." -----</option>\n";
 							$country = $val['country'];
 						}
 					}
 
-					if ($selected > 0 && $selected == $val['code'])
-					{
+					if ($selected > 0 && $selected == $val['code']) {
 						$out .= '<option value="'.$val['code'].'" selected>';
 					} else {
 						$out .= '<option value="'.$val['code'].'">';
@@ -577,7 +584,9 @@ class FormCompany extends Form
 				}
 			}
 			$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';
@@ -609,18 +618,15 @@ class FormCompany extends Form
 	{
 		global $conf, $langs;
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT))
-		{
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
 			// Use Ajax search
 			$minLength = (is_numeric($conf->global->COMPANY_USE_SEARCH_TO_SELECT) ? $conf->global->COMPANY_USE_SEARCH_TO_SELECT : 2);
 
 			$socid = 0; $name = '';
-			if ($selected > 0)
-			{
+			if ($selected > 0) {
 				$tmpthirdparty = new Societe($this->db);
 				$result = $tmpthirdparty->fetch($selected);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$socid = $selected;
 					$name = $tmpthirdparty->name;
 				}
@@ -635,8 +641,7 @@ class FormCompany extends Form
 			// To refresh contacts list on thirdparty list change
 			$events[] = array('method' => 'getContacts', 'url' => dol_buildpath('/core/ajax/contacts.php', 1), 'htmlname' => 'contactid', 'params' => array('add-customer-contact' => 'disabled'));
 
-			if (count($events))	// If there is some ajax events to run once selection is done, we add code here to run events
-			{
+			if (count($events)) {	// If there is some ajax events to run once selection is done, we add code here to run events
 				print '<script type="text/javascript">
 				jQuery(document).ready(function() {
 					$("#search_'.$htmlname.'").change(function() {
@@ -697,41 +702,43 @@ class FormCompany extends Form
 			$sql .= " ".MAIN_DB_PREFIX."societe as s";
 			$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 			// For ajax search we limit here. For combo list, we limit later
-			if (is_array($limitto) && count($limitto))
-			{
+			if (is_array($limitto) && count($limitto)) {
 				$sql .= " AND s.rowid IN (".join(',', $limitto).")";
 			}
 			$sql .= " ORDER BY s.nom ASC";
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				print '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"';
-				if ($conf->use_javascript_ajax)
-				{
+				if ($conf->use_javascript_ajax) {
 					$javaScript = "window.location='".$_SERVER['PHP_SELF']."?".$var_id."=".($forceid > 0 ? $forceid : $object->id).$moreparam."&".$htmlname."=' + form.".$htmlname.".options[form.".$htmlname.".selectedIndex].value;";
 					print ' onChange="'.$javaScript.'"';
 				}
 				print '>';
 				$num = $this->db->num_rows($resql);
 				$i = 0;
-				if ($num)
-				{
-					while ($i < $num)
-					{
+				if ($num) {
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
-						if ($i == 0) $firstCompany = $obj->rowid;
+						if ($i == 0) {
+							$firstCompany = $obj->rowid;
+						}
 						$disabled = 0;
-						if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) $disabled = 1;
-						if ($selected > 0 && $selected == $obj->rowid)
-						{
+						if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) {
+							$disabled = 1;
+						}
+						if ($selected > 0 && $selected == $obj->rowid) {
 							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
+							if ($disabled) {
+								print ' disabled';
+							}
 							print ' selected>'.dol_trunc($obj->name, 24).'</option>';
 							$firstCompany = $obj->rowid;
 						} else {
 							print '<option value="'.$obj->rowid.'"';
-							if ($disabled) print ' disabled';
+							if ($disabled) {
+								print ' disabled';
+							}
 							print '>'.dol_trunc($obj->name, 24).'</option>';
 						}
 						$i++;
@@ -765,20 +772,24 @@ class FormCompany extends Form
 	{
 		global $user, $langs;
 		$out = '';
-		if (is_object($object) && method_exists($object, 'liste_type_contact'))
-		{
+		if (is_object($object) && method_exists($object, 'liste_type_contact')) {
 			$lesTypes = $object->liste_type_contact($source, $sortorder, 0, 1);
 
 			$out .= '<select class="flat valignmiddle'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($showempty) $out .= '<option value="0"></option>';
-			foreach ($lesTypes as $key=>$value)
-			{
+			if ($showempty) {
+				$out .= '<option value="0"></option>';
+			}
+			foreach ($lesTypes as $key => $value) {
 				$out .= '<option value="'.$key.'"';
-				if ($key == $selected) $out .= ' selected';
+				if ($key == $selected) {
+					$out .= ' selected';
+				}
 				$out .= '>'.$value.'</option>';
 			}
 			$out .= "</select>";
-			if ($user->admin && empty($forcehidetooltip)) $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin && empty($forcehidetooltip)) {
+				$out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 
 			$out .= ajax_combobox($htmlname);
 
@@ -810,19 +821,20 @@ class FormCompany extends Form
 			return '<div class="select2-container-multi-dolibarr" style="width: 90%;" id="'.$htmlname.'"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 		}
 
-		if ($rendermode === 'edit')
-		{
+		if ($rendermode === 'edit') {
 			$contactType = $contact->listeTypeContacts('external', '', 1, '', '', 'agenda'); // We exclude agenda as there is no contact on such element
 			if (count($selected) > 0) {
 				$newselected = array();
-				foreach ($selected as $key=>$val) {
+				foreach ($selected as $key => $val) {
 					if (is_array($val) && array_key_exists('id', $val) && in_array($val['id'], array_keys($contactType))) {
 						$newselected[] = $val['id'];
 					} else {
 						break;
 					}
 				}
-				if (count($newselected) > 0) $selected = $newselected;
+				if (count($newselected) > 0) {
+					$selected = $newselected;
+				}
 			}
 			return $this->multiselectarray($htmlname, $contactType, $selected, 0, 0, 'minwidth500');
 		}
@@ -851,10 +863,11 @@ class FormCompany extends Form
 		$out = '';
 
 		$size = '';
-		if (!empty($fieldsize)) $size = 'size="'.$fieldsize.'"';
+		if (!empty($fieldsize)) {
+			$size = 'size="'.$fieldsize.'"';
+		}
 
-		if ($conf->use_javascript_ajax && empty($disableautocomplete))
-		{
+		if ($conf->use_javascript_ajax && empty($disableautocomplete)) {
 			$out .= ajax_multiautocompleter($htmlname, $fields, DOL_URL_ROOT.'/core/ajax/ziptown.php')."\n";
 			$moreattrib .= ' autocomplete="off"';
 		}
@@ -881,41 +894,58 @@ class FormCompany extends Form
 
 		$formlength = 0;
 		if (empty($conf->global->MAIN_DISABLEPROFIDRULES)) {
-			if ($country_code == 'FR')
-			{
+			if ($country_code == 'FR') {
 				if (isset($idprof)) {
-					if ($idprof == 1) $formlength = 9;
-					elseif ($idprof == 2) $formlength = 14;
-					elseif ($idprof == 3) $formlength = 5; // 4 chiffres et 1 lettre depuis janvier
-					elseif ($idprof == 4) $formlength = 32; // No maximum as we need to include a town name in this id
+					if ($idprof == 1) {
+						$formlength = 9;
+					} elseif ($idprof == 2) {
+						$formlength = 14;
+					} elseif ($idprof == 3) {
+						$formlength = 5; // 4 chiffres et 1 lettre depuis janvier
+					} elseif ($idprof == 4) {
+						$formlength = 32; // No maximum as we need to include a town name in this id
+					}
+				}
+			} elseif ($country_code == 'ES') {
+				if ($idprof == 1) {
+					$formlength = 9; //CIF/NIF/NIE 9 digits
+				}
+				if ($idprof == 2) {
+					$formlength = 12; //NASS 12 digits without /
+				}
+				if ($idprof == 3) {
+					$formlength = 5; //CNAE 5 digits
+				}
+				if ($idprof == 4) {
+					$formlength = 32; //depend of college
 				}
-			} elseif ($country_code == 'ES')
-			{
-				if ($idprof == 1) $formlength = 9; //CIF/NIF/NIE 9 digits
-				if ($idprof == 2) $formlength = 12; //NASS 12 digits without /
-				if ($idprof == 3) $formlength = 5; //CNAE 5 digits
-				if ($idprof == 4) $formlength = 32; //depend of college
 			}
 		}
 
 		$selected = $preselected;
 		if (!$selected && isset($idprof)) {
-			if ($idprof == 1 && !empty($this->idprof1)) $selected = $this->idprof1;
-			elseif ($idprof == 2 && !empty($this->idprof2)) $selected = $this->idprof2;
-			elseif ($idprof == 3 && !empty($this->idprof3)) $selected = $this->idprof3;
-			elseif ($idprof == 4 && !empty($this->idprof4)) $selected = $this->idprof4;
+			if ($idprof == 1 && !empty($this->idprof1)) {
+				$selected = $this->idprof1;
+			} elseif ($idprof == 2 && !empty($this->idprof2)) {
+				$selected = $this->idprof2;
+			} elseif ($idprof == 3 && !empty($this->idprof3)) {
+				$selected = $this->idprof3;
+			} elseif ($idprof == 4 && !empty($this->idprof4)) {
+				$selected = $this->idprof4;
+			}
 		}
 
 		$maxlength = $formlength;
-		if (empty($formlength)) { $formlength = 24; $maxlength = 128; }
+		if (empty($formlength)) {
+			$formlength = 24; $maxlength = 128;
+		}
 
 		$out = '';
 
 		// Execute hook getInputIdProf to complete or replace $out
 		$parameters = array('formlength'=>$formlength, 'selected'=>$preselected, 'idprof'=>$idprof, 'htmlname'=>$htmlname, 'country_code'=>$country_code);
 		$reshook = $hookmanager->executeHooks('getInputIdProf', $parameters);
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			$out .= '<input type="text" '.($morecss ? 'class="'.$morecss.'" ' : '').'name="'.$htmlname.'" id="'.$htmlname.'" maxlength="'.$maxlength.'" value="'.$selected.'">';
 		}
 		$out .= $hookmanager->resPrint;
@@ -939,18 +969,14 @@ class FormCompany extends Form
 
 		$num = $this->db->num_rows($tax);
 		$i = 0;
-		if ($num)
-		{
+		if ($num) {
 			$valors = explode(":", $tax);
 
-			if (count($valors) > 1)
-			{
+			if (count($valors) > 1) {
 				//montar select
 				print '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-				while ($i <= (count($valors)) - 1)
-				{
-					if ($selected == $valors[$i])
-					{
+				while ($i <= (count($valors)) - 1) {
+					if ($selected == $valors[$i]) {
 						print '<option value="'.$valors[$i].'" selected>';
 					} else {
 						print '<option value="'.$valors[$i].'">';
@@ -981,7 +1007,9 @@ class FormCompany extends Form
 
 		$out = '<select class="flat '.$morecss.'" name="'.$htmlname.'" id="'.$htmlidname.'">';
 		if ($typeinput == 'form') {
-			if ($selected == '' || $selected == '-1') $out .= '<option value="-1">&nbsp;</option>';
+			if ($selected == '' || $selected == '-1') {
+				$out .= '<option value="-1">&nbsp;</option>';
+			}
 			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
 				$out .= '<option value="2"'.($selected == 2 ? ' selected' : '').'>'.$langs->trans('Prospect').'</option>';
 			}
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index 7c91c1a4148..c764b7fc17e 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -67,7 +67,9 @@ class FormContract
 		global $db, $user, $conf, $langs;
 
 		$hideunselectables = false;
-		if (!empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) {
+			$hideunselectables = true;
+		}
 
 		// Search all contacts
 		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut,';
@@ -75,8 +77,7 @@ class FormContract
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'contrat as c';
 		$sql .= " WHERE c.entity = ".$conf->entity;
 		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
-		if ($socid > 0)
-		{
+		if ($socid > 0) {
 			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 			if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
 				$sql .= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
@@ -85,59 +86,60 @@ class FormContract
 				$sql .= " OR c.fk_soc IS NULL)";
 			}
 		}
-		if ($socid == 0) $sql .= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+		if ($socid == 0) {
+			$sql .= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+		}
 		$sql .= " ORDER BY c.ref ";
 
 		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			print '<select class="flat" 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)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
-					{
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire) {
 						// Do nothing
 					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
 
-						if ($showRef)
-						{
-							if ($obj->ref_customer) $labeltoshow = $labeltoshow." - ".$obj->ref_customer;
-							if ($obj->ref_supplier) $labeltoshow = $labeltoshow." - ".$obj->ref_supplier;
+						if ($showRef) {
+							if ($obj->ref_customer) {
+								$labeltoshow = $labeltoshow." - ".$obj->ref_customer;
+							}
+							if ($obj->ref_supplier) {
+								$labeltoshow = $labeltoshow." - ".$obj->ref_supplier;
+							}
 						}
 
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
-						{
+						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0) {
 							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						} else {
 							$disabled = 0;
-							if ($obj->statut == 0)
-							{
+							if ($obj->statut == 0) {
 								$disabled = 1;
 								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
-							if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
+							if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 
-							if ($hideunselectables && $disabled)
-							{
+							if ($hideunselectables && $disabled) {
 								$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 .= '>'.$labeltoshow;
@@ -152,8 +154,7 @@ class FormContract
 			print '</select>';
 			$this->db->free($resql);
 
-			if (!empty($conf->use_javascript_ajax))
-			{
+			if (!empty($conf->use_javascript_ajax)) {
 				// Make select dynamic
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				print ajax_combobox($htmlname);
diff --git a/htdocs/core/class/html.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php
index d65f68423b2..b25d4397f81 100644
--- a/htdocs/core/class/html.formexpensereport.class.php
+++ b/htdocs/core/class/html.formexpensereport.class.php
@@ -66,13 +66,15 @@ class FormExpenseReport
 		$tmpep = new ExpenseReport($this->db);
 
 		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-		if ($useempty) print '<option value="-1">&nbsp;</option>';
+		if ($useempty) {
+			print '<option value="-1">&nbsp;</option>';
+		}
 		$arrayoflabels = $tmpep->statuts;
-		if ($useshortlabel) $arrayoflabels = $tmpep->statuts_short;
-		foreach ($arrayoflabels as $key => $val)
-		{
-			if ($selected != '' && $selected == $key)
-			{
+		if ($useshortlabel) {
+			$arrayoflabels = $tmpep->statuts_short;
+		}
+		foreach ($arrayoflabels as $key => $val) {
+			if ($selected != '' && $selected == $key) {
 				print '<option value="'.$key.'" selected>';
 			} else {
 				print '<option value="'.$key.'">';
@@ -102,30 +104,36 @@ class FormExpenseReport
 		$out = '';
 
 		$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
-		if ($showempty)
-		{
+		if ($showempty) {
 			$out .= '<option value="-1"';
-			if ($selected == -1) $out .= ' selected';
+			if ($selected == -1) {
+				$out .= ' selected';
+			}
 			$out .= '>&nbsp;</option>';
 		}
 
 		$sql = "SELECT c.id, c.code, c.label as type FROM ".MAIN_DB_PREFIX."c_type_fees as c";
-		if ($active >= 0) $sql .= " WHERE c.active = ".$active;
+		if ($active >= 0) {
+			$sql .= " WHERE c.active = ".$active;
+		}
 		$sql .= " ORDER BY c.label ASC";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$out .= '<option value="'.$obj->id.'"';
-				if ($obj->code == $selected || $obj->id == $selected) $out .= ' selected';
+				if ($obj->code == $selected || $obj->id == $selected) {
+					$out .= ' selected';
+				}
 				$out .= '>';
-				if ($obj->code != $langs->trans($obj->code)) $out .= $langs->trans($obj->code);
-				else $out .= $langs->trans($obj->type);
+				if ($obj->code != $langs->trans($obj->code)) {
+					$out .= $langs->trans($obj->code);
+				} else {
+					$out .= $langs->trans($obj->type);
+				}
 				$i++;
 			}
 		}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index c53bc1a0750..d5586a2c9d2 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -93,10 +93,11 @@ class FormFile
 			dol_syslog(__METHOD__.": using 2 for useajax is deprecated and should be not used", LOG_WARNING);
 		}
 
-		if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $useajax = 0;
+		if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
+			$useajax = 0;
+		}
 
-		if ((!empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax == 2))
-		{
+		if ((!empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) && $useajax) || ($useajax == 2)) {
 			// TODO: Check this works with 2 forms on same page
 			// TODO: Check this works with GED module, otherwise, force useajax to 0
 			// TODO: This does not support option savingdocmask
@@ -110,11 +111,14 @@ class FormFile
 
 			$out = "\n\n".'<!-- Start form attach new file --><div class="formattachnewfile">'."\n";
 
-			if (empty($title)) $title = $langs->trans("AttachANewFile");
-			if ($title != 'none') $out .= load_fiche_titre($title, null, null);
+			if (empty($title)) {
+				$title = $langs->trans("AttachANewFile");
+			}
+			if ($title != 'none') {
+				$out .= load_fiche_titre($title, null, null);
+			}
 
-			if (empty($usewithoutform))		// Try to avoid this and set instead the form by the caller.
-			{
+			if (empty($usewithoutform)) {		// Try to avoid this and set instead the form by the caller.
 				// Add a param as GET parameter to detect when POST were cleaned by PHP because a file larger than post_max_size
 				$url .= (strpos($url, '?') === false ? '?' : '&').'uploadform=1';
 
@@ -129,66 +133,64 @@ class FormFile
 			$out .= '<table class="nobordernopadding centpercent">';
 			$out .= '<tr>';
 
-			if (!empty($options)) $out .= '<td>'.$options.'</td>';
+			if (!empty($options)) {
+				$out .= '<td>'.$options.'</td>';
+			}
 
 			$out .= '<td class="valignmiddle nowrap">';
 
 			$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
 			$maxphp = @ini_get('upload_max_filesize'); // In unknown
 			if (preg_match('/k$/i', $maxphp)) {
-			    $maxphp = preg_replace('/k$/i', '', $maxphp);
-			    $maxphp = $maxphp * 1;
+				$maxphp = preg_replace('/k$/i', '', $maxphp);
+				$maxphp = $maxphp * 1;
 			}
 			if (preg_match('/m$/i', $maxphp)) {
-			    $maxphp = preg_replace('/m$/i', '', $maxphp);
-			    $maxphp = $maxphp * 1024;
+				$maxphp = preg_replace('/m$/i', '', $maxphp);
+				$maxphp = $maxphp * 1024;
 			}
 			if (preg_match('/g$/i', $maxphp)) {
-			    $maxphp = preg_replace('/g$/i', '', $maxphp);
-			    $maxphp = $maxphp * 1024 * 1024;
+				$maxphp = preg_replace('/g$/i', '', $maxphp);
+				$maxphp = $maxphp * 1024 * 1024;
 			}
 			if (preg_match('/t$/i', $maxphp)) {
-			    $maxphp = preg_replace('/t$/i', '', $maxphp);
-			    $maxphp = $maxphp * 1024 * 1024 * 1024;
+				$maxphp = preg_replace('/t$/i', '', $maxphp);
+				$maxphp = $maxphp * 1024 * 1024 * 1024;
 			}
 			$maxphp2 = @ini_get('post_max_size'); // In unknown
 			if (preg_match('/k$/i', $maxphp2)) {
-			    $maxphp2 = preg_replace('/k$/i', '', $maxphp2);
-			    $maxphp2 = $maxphp2 * 1;
+				$maxphp2 = preg_replace('/k$/i', '', $maxphp2);
+				$maxphp2 = $maxphp2 * 1;
 			}
 			if (preg_match('/m$/i', $maxphp2)) {
-			    $maxphp2 = preg_replace('/m$/i', '', $maxphp2);
-			    $maxphp2 = $maxphp2 * 1024;
+				$maxphp2 = preg_replace('/m$/i', '', $maxphp2);
+				$maxphp2 = $maxphp2 * 1024;
 			}
 			if (preg_match('/g$/i', $maxphp2)) {
-			    $maxphp2 = preg_replace('/g$/i', '', $maxphp2);
-			    $maxphp2 = $maxphp2 * 1024 * 1024;
+				$maxphp2 = preg_replace('/g$/i', '', $maxphp2);
+				$maxphp2 = $maxphp2 * 1024 * 1024;
 			}
 			if (preg_match('/t$/i', $maxphp2)) {
-			    $maxphp2 = preg_replace('/t$/i', '', $maxphp2);
-			    $maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+				$maxphp2 = preg_replace('/t$/i', '', $maxphp2);
+				$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
 			}
 			// Now $max and $maxphp and $maxphp2 are in Kb
 			$maxmin = $max;
 			$maxphptoshow = $maxphptoshowparam = '';
-			if ($maxphp > 0)
-			{
+			if ($maxphp > 0) {
 				$maxmin = min($max, $maxphp);
 				$maxphptoshow = $maxphp;
 				$maxphptoshowparam = 'upload_max_filesize';
 			}
-			if ($maxphp2 > 0)
-			{
+			if ($maxphp2 > 0) {
 				$maxmin = min($max, $maxphp2);
-				if ($maxphp2 < $maxphp)
-				{
+				if ($maxphp2 < $maxphp) {
 					$maxphptoshow = $maxphp2;
 					$maxphptoshowparam = 'post_max_size';
 				}
 			}
 
-			if ($maxmin > 0)
-			{
+			if ($maxmin > 0) {
 				// MAX_FILE_SIZE doit précéder le champ input de type file
 				$out .= '<input type="hidden" name="max_file_size" value="'.($maxmin * 1024).'">';
 			}
@@ -209,16 +211,13 @@ class FormFile
 			$out .= (empty($conf->global->MAIN_UPLOAD_DOC) || empty($perm) ? ' disabled' : '');
 			$out .= '>';
 
-			if ($addcancel)
-			{
+			if ($addcancel) {
 				$out .= ' &nbsp; ';
 				$out .= '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			}
 
-			if (!empty($conf->global->MAIN_UPLOAD_DOC))
-			{
-				if ($perm)
-				{
+			if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
+				if ($perm) {
 					$langs->load('other');
 					$out .= ' ';
 					$out .= info_admin($langs->trans("ThisLimitIsDefinedInSetup", $max, $maxphptoshow), 1);
@@ -228,13 +227,14 @@ class FormFile
 			}
 			$out .= "</td></tr>";
 
-			if ($savingdocmask)
-			{
+			if ($savingdocmask) {
 				//add a global variable for disable the auto renaming on upload
 				$rename = (empty($conf->global->MAIN_DOC_UPLOAD_NOT_RENAME_BY_DEFAULT) ? 'checked' : '');
 
 				$out .= '<tr>';
-   				if (!empty($options)) $out .= '<td>'.$options.'</td>';
+				if (!empty($options)) {
+					$out .= '<td>'.$options.'</td>';
+				}
 				$out .= '<td valign="middle" class="nowrap">';
 				$out .= '<input type="checkbox" '.$rename.' class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> ';
 				$out .= '<span class="opacitymedium">';
@@ -246,23 +246,22 @@ class FormFile
 
 			$out .= "</table>";
 
-			if (empty($usewithoutform))
-			{
+			if (empty($usewithoutform)) {
 				$out .= '</form>';
-		   		if (empty($sectionid)) $out .= '<br>';
+				if (empty($sectionid)) {
+					$out .= '<br>';
+				}
 			}
 
 			$out .= "\n</div><!-- End form attach new file -->\n";
 
-			if ($linkfiles)
-			{
+			if ($linkfiles) {
 				$out .= "\n".'<!-- Start form link new url --><div class="formlinknewurl">'."\n";
 				$langs->load('link');
 				$title = $langs->trans("LinkANewFile");
 				$out .= load_fiche_titre($title, null, null);
 
-				if (empty($usewithoutform))
-				{
+				if (empty($usewithoutform)) {
 					$out .= '<form name="'.$htmlname.'_link" id="'.$htmlname.'_link" action="'.$url.'" method="POST">'."\n";
 					$out .= '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 					$out .= '<input type="hidden" id="'.$htmlname.'_link_section_dir" name="link_section_dir" value="">'."\n";
@@ -271,11 +270,15 @@ class FormFile
 
 				$out .= '<div class="valignmiddle">';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="link">'.$langs->trans("URLToLink").':</label> ';
+				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) {
+					$out .= '<label for="link">'.$langs->trans("URLToLink").':</label> ';
+				}
 				$out .= '<input type="text" name="link" class="flat minwidth400imp" id="link" placeholder="'.dol_escape_htmltag($langs->trans("URLToLink")).'">';
 				$out .= '</div>';
 				$out .= '<div class="inline-block" style="padding-right: 10px;">';
-				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) $out .= '<label for="label">'.$langs->trans("Label").':</label> ';
+				if (!empty($conf->global->OPTIMIZEFORTEXTBROWSER)) {
+					$out .= '<label for="label">'.$langs->trans("Label").':</label> ';
+				}
 				$out .= '<input type="text" class="flat" name="label" id="label" placeholder="'.dol_escape_htmltag($langs->trans("Label")).'">';
 				$out .= '<input type="hidden" name="objecttype" value="'.$object->element.'">';
 				$out .= '<input type="hidden" name="objectid" value="'.$object->id.'">';
@@ -286,8 +289,7 @@ class FormFile
 				$out .= '>';
 				$out .= '</div>';
 				$out .= '</div>';
-				if (empty($usewithoutform))
-				{
+				if (empty($usewithoutform)) {
 					$out .= '<div class="clearboth"></div>';
 					$out .= '</form><br>';
 				}
@@ -297,8 +299,7 @@ class FormFile
 
 			$parameters = array('socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'url'=>$url, 'perm'=>$perm);
 			$res = $hookmanager->executeHooks('formattachOptions', $parameters, $object);
-			if (empty($res))
-			{
+			if (empty($res)) {
 				print '<div class="'.($usewithoutform ? 'inline-block valignmiddle' : 'attacharea attacharea'.$htmlname).'">';
 				print $out;
 				print '</div>';
@@ -376,7 +377,9 @@ class FormFile
 		global $langs, $conf, $user, $hookmanager;
 		global $form;
 
-		if (!is_object($form)) $form = new Form($this->db);
+		if (!is_object($form)) {
+			$form = new Form($this->db);
+		}
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
@@ -391,8 +394,7 @@ class FormFile
 		}
 
 		$printer = 0;
-		if (in_array($modulepart, array('facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'delivery', 'ticket')))	// The direct print feature is implemented only for such elements
-		{
+		if (in_array($modulepart, array('facture', 'supplier_proposal', 'propal', 'proposal', 'order', 'commande', 'expedition', 'commande_fournisseur', 'expensereport', 'delivery', 'ticket'))) {	// The direct print feature is implemented only for such elements
 			$printer = (!empty($user->rights->printing->read) && !empty($conf->printing->enabled)) ?true:false;
 		}
 
@@ -400,11 +402,12 @@ class FormFile
 
 		// Get list of files
 		$file_list = null;
-		if (!empty($filedir))
-		{
+		if (!empty($filedir)) {
 			$file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
 		}
-		if ($hideifempty && empty($file_list)) return '';
+		if ($hideifempty && empty($file_list)) {
+			return '';
+		}
 
 		$out = '';
 		$forname = 'builddoc';
@@ -415,8 +418,7 @@ class FormFile
 		$out .= "\n".'<!-- Start show_document -->'."\n";
 		//print 'filedir='.$filedir;
 
-		if (preg_match('/massfilesarea_/', $modulepart))
-		{
+		if (preg_match('/massfilesarea_/', $modulepart)) {
 			$out .= '<div id="show_files"><br></div>'."\n";
 			$title = $langs->trans("MassFilesArea").' <a href="" id="togglemassfilesarea" ref="shown">('.$langs->trans("Hide").')</a>';
 			$title .= '<script>
@@ -441,205 +443,205 @@ class FormFile
 		}
 
 		$titletoshow = $langs->trans("Documents");
-		if (!empty($title)) $titletoshow = ($title == 'none' ? '' : $title);
+		if (!empty($title)) {
+			$titletoshow = ($title == 'none' ? '' : $title);
+		}
 
 		// Show table
-		if ($genallowed)
-		{
+		if ($genallowed) {
 			$modellist = array();
 
-			if ($modulepart == 'company')
-			{
+			if ($modulepart == 'company') {
 				$showempty = 1;		// can have no template active
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php';
 					$modellist = ModeleThirdPartyDoc::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'propal')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'propal') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/propale/modules_propale.php';
 					$modellist = ModelePDFPropales::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'supplier_proposal')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'supplier_proposal') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier_proposal.php';
 					$modellist = ModelePDFSupplierProposal::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'commande')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'commande') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 					$modellist = ModelePDFCommandes::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'expedition')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'expedition') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 					$modellist = ModelePDFExpedition::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'reception')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'reception') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/reception/modules_reception.php';
 					$modellist = ModelePdfReception::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'delivery')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'delivery') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/modules_delivery.php';
 					$modellist = ModelePDFDeliveryOrder::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'ficheinter')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'ficheinter') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 					$modellist = ModelePDFFicheinter::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'facture')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'facture') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 					$modellist = ModelePDFFactures::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'contract')
-			{
+			} elseif ($modulepart == 'contract') {
 				$showempty = 1;		// can have no template active
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
 					$modellist = ModelePDFContract::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'project')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'project') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/modules_project.php';
 					$modellist = ModelePDFProjects::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'project_task')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'project_task') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 					$modellist = ModelePDFTask::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'product')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'product') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';
 					$modellist = ModelePDFProduct::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'product_batch')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'product_batch') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/product_batch/modules_product_batch.class.php';
 					$modellist = ModelePDFProductBatch::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'stock')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'stock') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_stock.php';
 					$modellist = ModelePDFStock::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'movement')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'movement') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/stock/modules_movement.php';
 					$modellist = ModelePDFMovement::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'export')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'export') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 					$modellist = ModeleExports::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_order/modules_commandefournisseur.php';
 					$modellist = ModelePDFSuppliersOrders::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice')
-			{
+			} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice') {
 				$showempty = 1; 	// can have no template active
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 					$modellist = ModelePDFSuppliersInvoices::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'supplier_payment')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'supplier_payment') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 					$modellist = ModelePDFSuppliersPayments::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'remisecheque')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'remisecheque') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/cheque/modules_chequereceipts.php';
 					$modellist = ModeleChequeReceipts::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'donation')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'donation') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/dons/modules_don.php';
 					$modellist = ModeleDon::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'member')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'member') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/member/modules_cards.php';
 					$modellist = ModelePDFCards::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'agenda' || $modulepart == 'actions')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'agenda' || $modulepart == 'actions') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/action/modules_action.php';
 					$modellist = ModeleAction::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'expensereport')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'expensereport') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
 					$modellist = ModeleExpenseReport::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'unpaid')
-			{
+			} elseif ($modulepart == 'unpaid') {
 				$modellist = '';
-			} elseif ($modulepart == 'user')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'user') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/user/modules_user.class.php';
 					$modellist = ModelePDFUser::liste_modeles($this->db);
 				}
-			} elseif ($modulepart == 'usergroup')
-			{
-				if (is_array($genallowed)) $modellist = $genallowed;
-				else {
+			} elseif ($modulepart == 'usergroup') {
+				if (is_array($genallowed)) {
+					$modellist = $genallowed;
+				} else {
 					include_once DOL_DOCUMENT_ROOT.'/core/modules/usergroup/modules_usergroup.class.php';
 					$modellist = ModelePDFUserGroup::liste_modeles($this->db);
 				}
@@ -655,8 +657,7 @@ class FormFile
 
 				// For normalized standard modules
 				$file = dol_buildpath('/core/modules/'.$modulepart.'/modules_'.strtolower($submodulepart).'.php', 0);
-				if (file_exists($file))
-				{
+				if (file_exists($file)) {
 					$res = include_once $file;
 				}
 				// For normalized external modules.
@@ -667,8 +668,7 @@ class FormFile
 
 				$class = 'ModelePDF'.$submodulepart;
 
-				if (class_exists($class))
-				{
+				if (class_exists($class)) {
 					$modellist = call_user_func($class.'::liste_modeles', $this->db);
 				} else {
 					dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments");
@@ -679,10 +679,16 @@ class FormFile
 			// Set headershown to avoid to have table opened a second time later
 			$headershown = 1;
 
-			if (empty($buttonlabel)) $buttonlabel = $langs->trans('Generate');
+			if (empty($buttonlabel)) {
+				$buttonlabel = $langs->trans('Generate');
+			}
 
-			if ($conf->browser->layout == 'phone') $urlsource .= '#'.$forname.'_form'; // So we switch to form after a generation
-			if (empty($noform)) $out .= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" id="'.$forname.'_form" method="post">';
+			if ($conf->browser->layout == 'phone') {
+				$urlsource .= '#'.$forname.'_form'; // So we switch to form after a generation
+			}
+			if (empty($noform)) {
+				$out .= '<form action="'.$urlsource.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#builddoc').'" id="'.$forname.'_form" method="post">';
+			}
 			$out .= '<input type="hidden" name="action" value="builddoc">';
 			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 
@@ -698,20 +704,19 @@ class FormFile
 			$out .= '<th colspan="'.$colspan.'" class="formdoc liste_titre maxwidthonsmartphone center">';
 
 			// Model
-			if (!empty($modellist))
-			{
+			if (!empty($modellist)) {
 				asort($modellist);
 				$out .= '<span class="hideonsmartphone">'.$langs->trans('Model').' </span>';
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
-				{
+				if (is_array($modellist) && count($modellist) == 1) {    // If there is only one element
 					$arraykeys = array_keys($modellist);
 					$modelselected = $arraykeys[0];
 				}
 				$morecss = 'maxwidth200';
-				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';
+				if ($conf->browser->layout == 'phone') {
+					$morecss = 'maxwidth100';
+				}
 				$out .= $form->selectarray('model', $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', $morecss);
-				if ($conf->use_javascript_ajax)
-				{
+				if ($conf->use_javascript_ajax) {
 					$out .= ajax_combobox('model');
 				}
 			} else {
@@ -719,13 +724,14 @@ class FormFile
 			}
 
 			// Language code (if multilang)
-			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && !$forcenomultilang && (!empty($modellist) || $showempty))
-			{
+			if (($allowgenifempty || (is_array($modellist) && count($modellist) > 0)) && $conf->global->MAIN_MULTILANGS && !$forcenomultilang && (!empty($modellist) || $showempty)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 				$formadmin = new FormAdmin($this->db);
 				$defaultlang = $codelang ? $codelang : $langs->getDefaultLang();
 				$morecss = 'maxwidth150';
-				if ($conf->browser->layout == 'phone') $morecss = 'maxwidth100';
+				if ($conf->browser->layout == 'phone') {
+					$morecss = 'maxwidth100';
+				}
 				$out .= $formadmin->select_language($defaultlang, 'lang_id', 0, null, 0, 0, 0, $morecss);
 			} else {
 				$out .= '&nbsp;';
@@ -734,24 +740,26 @@ class FormFile
 			// Button
 			$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
 			$genbutton .= ' type="submit" value="'.$buttonlabel.'"';
-			if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) $genbutton .= ' disabled';
-			$genbutton .= '>';
-			if ($allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
-			{
-			   	$langs->load("errors");
-			   	$genbutton .= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+			if (!$allowgenifempty && !is_array($modellist) && empty($modellist)) {
+				$genbutton .= ' disabled';
+			}
+			$genbutton .= '>';
+			if ($allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {
+				$langs->load("errors");
+				$genbutton .= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
+			}
+			if (!$allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {
+				$genbutton = '';
+			}
+			if (empty($modellist) && !$showempty && $modulepart != 'unpaid') {
+				$genbutton = '';
 			}
-			if (!$allowgenifempty && !is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton = '';
-			if (empty($modellist) && !$showempty && $modulepart != 'unpaid') $genbutton = '';
 			$out .= $genbutton;
 			$out .= '</th>';
 
-			if (!empty($hookmanager->hooks['formfile']))
-			{
-				foreach ($hookmanager->hooks['formfile'] as $module)
-				{
-					if (method_exists($module, 'formBuilddocLineOptions'))
-					{
+			if (!empty($hookmanager->hooks['formfile'])) {
+				foreach ($hookmanager->hooks['formfile'] as $module) {
+					if (method_exists($module, 'formBuilddocLineOptions')) {
 						$colspanmore++;
 						$out .= '<th></th>';
 					}
@@ -761,19 +769,16 @@ class FormFile
 
 			// Execute hooks
 			$parameters = array('colspan'=>($colspan + $colspanmore), 'socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart'=>$modulepart);
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$reshook = $hookmanager->executeHooks('formBuilddocOptions', $parameters, $GLOBALS['object']);
 				$out .= $hookmanager->resPrint;
 			}
 		}
 
 		// Get list of files
-		if (!empty($filedir))
-		{
+		if (!empty($filedir)) {
 			$link_list = array();
-			if (is_object($object))
-			{
+			if (is_object($object)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 				$link = new Link($this->db);
 				$sortfield = $sortorder = null;
@@ -784,8 +789,7 @@ class FormFile
 
 			// Show title of array if not already shown
 			if ((!empty($file_list) || !empty($link_list) || preg_match('/^massfilesarea/', $modulepart))
-				&& !$headershown)
-			{
+				&& !$headershown) {
 				$headershown = 1;
 				$out .= '<div class="titre">'.$titletoshow.'</div>'."\n";
 				$out .= '<div class="div-table-responsive-no-min">';
@@ -793,26 +797,32 @@ class FormFile
 			}
 
 			// Loop on each file found
-			if (is_array($file_list))
-			{
-				foreach ($file_list as $file)
-				{
+			if (is_array($file_list)) {
+				foreach ($file_list as $file) {
 					// Define relative path for download link (depends on module)
 					$relativepath = $file["name"]; // Cas general
-					if ($modulesubdir) $relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...
-					if ($modulepart == 'export') $relativepath = $file["name"]; // Other case
+					if ($modulesubdir) {
+						$relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...
+					}
+					if ($modulepart == 'export') {
+						$relativepath = $file["name"]; // Other case
+					}
 
 					$out .= '<tr class="oddeven">';
 
 					$documenturl = DOL_URL_ROOT.'/document.php';
-					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) $documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper
+					if (isset($conf->global->DOL_URL_ROOT_DOCUMENT_PHP)) {
+						$documenturl = $conf->global->DOL_URL_ROOT_DOCUMENT_PHP; // To use another wrapper
+					}
 
 					// Show file name with link to download
 					$out .= '<td class="minwidth200">';
 					$out .= '<a class="documentdownload paddingright" href="'.$documenturl.'?modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).($param ? '&'.$param : '').'"';
 
 					$mime = dol_mimetype($relativepath, '', 0);
-					if (preg_match('/text/', $mime)) $out .= ' target="_blank"';
+					if (preg_match('/text/', $mime)) {
+						$out .= ' target="_blank"';
+					}
 					$out .= '>';
 					$out .= img_mime($file["name"], $langs->trans("File").': '.$file["name"]);
 					$out .= dol_trunc($file["name"], 150);
@@ -828,11 +838,9 @@ class FormFile
 					$date = (!empty($file['date']) ? $file['date'] : dol_filemtime($filedir."/".$file["name"]));
 					$out .= '<td class="nowrap right">'.dol_print_date($date, 'dayhour', 'tzuser').'</td>';
 
-					if ($delallowed || $printer || $morepicto)
-					{
+					if ($delallowed || $printer || $morepicto) {
 						$out .= '<td class="right nowraponall">';
-						if ($delallowed)
-						{
+						if ($delallowed) {
 							$tmpurlsource = preg_replace('/#[a-zA-Z0-9_]*$/', '', $urlsource);
 							$out .= '<a href="'.$tmpurlsource.((strpos($tmpurlsource, '?') === false) ? '?' : '&amp;').'action='.$removeaction.'&amp;file='.urlencode($relativepath);
 							$out .= ($param ? '&amp;'.$param : '');
@@ -840,44 +848,38 @@ class FormFile
 							//$out.= '&urlsource='.urlencode($urlsource); // TODO obsolete ?
 							$out .= '">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						}
-						if ($printer)
-						{
+						if ($printer) {
 							//$out.= '<td class="right">';
 							$out .= '<a class="marginleftonly" href="'.$urlsource.(strpos($urlsource, '?') ? '&amp;' : '?').'action=print_file&amp;printer='.$modulepart.'&amp;file='.urlencode($relativepath);
 							$out .= ($param ? '&amp;'.$param : '');
 							$out .= '">'.img_picto($langs->trans("PrintFile", $relativepath), 'printer.png').'</a>';
 						}
-						if ($morepicto)
-						{
+						if ($morepicto) {
 							$morepicto = preg_replace('/__FILENAMEURLENCODED__/', urlencode($relativepath), $morepicto);
 							$out .= $morepicto;
 						}
 						$out .= '</td>';
 					}
 
-					if (is_object($hookmanager))
-					{
+					if (is_object($hookmanager)) {
 						$parameters = array('colspan'=>($colspan + $colspanmore), 'socid'=>(isset($GLOBALS['socid']) ? $GLOBALS['socid'] : ''), 'id'=>(isset($GLOBALS['id']) ? $GLOBALS['id'] : ''), 'modulepart'=>$modulepart, 'relativepath'=>$relativepath);
 						$res = $hookmanager->executeHooks('formBuilddocLineOptions', $parameters, $file);
-						if (empty($res))
-						{
+						if (empty($res)) {
 							$out .= $hookmanager->resPrint; // Complete line
 							$out .= '</tr>';
 						} else {
 							$out = $hookmanager->resPrint; // Replace all $out
 						}
-			  		}
+					}
 				}
 
 				$this->numoffiles++;
 			}
 			// Loop on each link found
-			if (is_array($link_list))
-			{
+			if (is_array($link_list)) {
 				$colspan = 2;
 
-				foreach ($link_list as $file)
-				{
+				foreach ($link_list as $file) {
 					$out .= '<tr class="oddeven">';
 					$out .= '<td colspan="'.$colspan.'" class="maxwidhtonsmartphone">';
 					$out .= '<a data-ajax="false" href="'.$file->url.'" target="_blank">';
@@ -887,26 +889,27 @@ class FormFile
 					$out .= '<td class="right">';
 					$out .= dol_print_date($file->datea, 'dayhour');
 					$out .= '</td>';
-					if ($delallowed || $printer || $morepicto) $out .= '<td></td>';
+					if ($delallowed || $printer || $morepicto) {
+						$out .= '<td></td>';
+					}
 					$out .= '</tr>'."\n";
 				}
 				$this->numoffiles++;
 			}
 
-		 	if (count($file_list) == 0 && count($link_list) == 0 && $headershown)
-			{
+			if (count($file_list) == 0 && count($link_list) == 0 && $headershown) {
 				$out .= '<tr><td colspan="'.(3 + ($addcolumforpicto ? 1 : 0)).'" class="opacitymedium">'.$langs->trans("None").'</td></tr>'."\n";
 			}
 		}
 
-		if ($headershown)
-		{
+		if ($headershown) {
 			// Affiche pied du tableau
 			$out .= "</table>\n";
 			$out .= "</div>\n";
-			if ($genallowed)
-			{
-				if (empty($noform)) $out .= '</form>'."\n";
+			if ($genallowed) {
+				if (empty($noform)) {
+					$out .= '</form>'."\n";
+				}
 			}
 		}
 		$out .= '<!-- End show_document -->'."\n";
@@ -937,8 +940,7 @@ class FormFile
 		$entity = 1; // Without multicompany
 
 		// Get object entity
-		if (!empty($conf->multicompany->enabled))
-		{
+		if (!empty($conf->multicompany->enabled)) {
 			$regs = array();
 			preg_match('/\/([0-9]+)\/[^\/]+\/'.preg_quote($modulesubdir, '/').'$/', $filedir, $regs);
 			$entity = ((!empty($regs[1]) && $regs[1] > 1) ? $regs[1] : 1); // If entity id not found in $filedir this is entity 1 by default
@@ -946,8 +948,7 @@ class FormFile
 
 		// Get list of files starting with name of ref (but not followed by "-" to discard uploaded files and get only generated files)
 		// @todo Why not showing by default all files by just removing the '[^\-]+' at end of regex ?
-		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP))
-		{
+		if (!empty($conf->global->MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP)) {
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/');
 		} else {
 			$filterforfilesearch = preg_quote(basename($modulesubdir), '/').'[^\-]+';
@@ -957,8 +958,7 @@ class FormFile
 		//var_dump($file_list);
 		// For ajax treatment
 		$out .= '<!-- html.formfile::getDocumentsLink -->'."\n";
-		if (!empty($file_list))
-		{
+		if (!empty($file_list)) {
 			$out = '<dl class="dropdown inline-block">
     			<dt><a data-ajax="false" href="#" onClick="return false;">'.img_picto('', 'listlight', '', 0, 0, 0, '', 'valignmiddle').'</a></dt>
     			<dd><div class="multichoicedoc" style="position:absolute;left:100px;" ><ul class="ulselectedfields">';
@@ -966,15 +966,18 @@ class FormFile
 
 			// Loop on each file found
 			$found = 0;
-			foreach ($file_list as $file)
-			{
+			foreach ($file_list as $file) {
 				$i++;
-				if ($filter && !preg_match('/'.$filter.'/i', $file["name"])) continue; // Discard this. It does not match provided filter.
+				if ($filter && !preg_match('/'.$filter.'/i', $file["name"])) {
+					continue; // Discard this. It does not match provided filter.
+				}
 
 				$found++;
 				// Define relative path for download link (depends on module)
 				$relativepath = $file["name"]; // Cas general
-				if ($modulesubdir) $relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...
+				if ($modulesubdir) {
+					$relativepath = $modulesubdir."/".$file["name"]; // Cas propal, facture...
+				}
 				// Autre cas
 				if ($modulepart == 'donation') {
 					$relativepath = get_exdir($modulesubdir, 2, 0, 0, null, 'donation').$file["name"];
@@ -986,15 +989,16 @@ class FormFile
 				$this->infofiles['nboffiles']++;
 				$this->infofiles['files'][] = $file['fullname'];
 				$ext = pathinfo($file["name"], PATHINFO_EXTENSION);
-				if (empty($this->infofiles[$ext])) $this->infofiles['extensions'][$ext] = 1;
-				else $this->infofiles['extensions'][$ext]++;
+				if (empty($this->infofiles[$ext])) {
+					$this->infofiles['extensions'][$ext] = 1;
+				} else {
+					$this->infofiles['extensions'][$ext]++;
+				}
 
 				// Preview
-				if (!empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone'))
-				{
+				if (!empty($conf->use_javascript_ajax) && ($conf->browser->layout != 'phone')) {
 					$tmparray = getAdvancedPreviewUrl($modulepart, $relativepath, 1, '&entity='.$entity);
-					if ($tmparray && $tmparray['url'])
-					{
+					if ($tmparray && $tmparray['url']) {
 						$tmpout .= '<li><a href="'.$tmparray['url'].'"'.($tmparray['css'] ? ' class="'.$tmparray['css'].'"' : '').($tmparray['mime'] ? ' mime="'.$tmparray['mime'].'"' : '').($tmparray['target'] ? ' target="'.$tmparray['target'].'"' : '').'>';
 						//$tmpout.= img_picto('','detail');
 						$tmpout .= '<i class="fa fa-search-plus paddingright" style="color: gray"></i>';
@@ -1005,7 +1009,9 @@ class FormFile
 				// Download
 				$tmpout .= '<li class="nowrap"><a class="pictopreview nowrap" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;entity='.$entity.'&amp;file='.urlencode($relativepath).'"';
 				$mime = dol_mimetype($relativepath, '', 0);
-				if (preg_match('/text/', $mime)) $tmpout .= ' target="_blank"';
+				if (preg_match('/text/', $mime)) {
+					$tmpout .= ' target="_blank"';
+				}
 				$tmpout .= '>';
 				$tmpout .= img_mime($relativepath, $file["name"]);
 				$tmpout .= $langs->trans("Download").' '.$ext;
@@ -1015,7 +1021,9 @@ class FormFile
 			$out .= '</ul></div></dd>
     			</dl>';
 
-			if (!$found) $out = '';
+			if (!$found) {
+				$out = '';
+			}
 		} else {
 			// TODO Add link to regenerate doc ?
 			//$out.= '<div id="gen_pdf_'.$modulesubdir.'" class="linkobject hideobject">'.img_picto('', 'refresh').'</div>'."\n";
@@ -1065,29 +1073,31 @@ class FormFile
 		global $sortfield, $sortorder, $maxheightmini;
 		global $dolibarr_main_url_root;
 
-		if ($disablecrop == -1)
-		{
+		if ($disablecrop == -1) {
 			$disablecrop = 1;
 			// Values here must be supported by the photo_resize.php page.
-			if (in_array($modulepart, array('bank', 'bom', 'expensereport', 'facture', 'facture_fournisseur', 'holiday', 'medias', 'member', 'mrp', 'project', 'product', 'produit', 'propal', 'service', 'societe', 'tax', 'tax-vat', 'ticket', 'user'))) $disablecrop = 0;
+			if (in_array($modulepart, array('bank', 'bom', 'expensereport', 'facture', 'facture_fournisseur', 'holiday', 'medias', 'member', 'mrp', 'project', 'product', 'produit', 'propal', 'service', 'societe', 'tax', 'tax-vat', 'ticket', 'user'))) {
+				$disablecrop = 0;
+			}
 		}
 
 		// Define relative path used to store the file
-		if (empty($relativepath))
-		{
+		if (empty($relativepath)) {
 			$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
-			if (!empty($object->element) && $object->element == 'invoice_supplier') $relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath
-			if (!empty($object->element) && $object->element == 'project_task') $relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+			if (!empty($object->element) && $object->element == 'invoice_supplier') {
+				$relativepath = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$relativepath; // TODO Call using a defined value for $relativepath
+			}
+			if (!empty($object->element) && $object->element == 'project_task') {
+				$relativepath = 'Call_not_supported_._Call_function_using_a_defined_relative_path_.';
+			}
 		}
 		// For backward compatiblity, we detect file stored into an old path
-		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos')
-		{
+		if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO) && $filearray[0]['level1name'] == 'photos') {
 			$relativepath = preg_replace('/^.*\/produit\//', '', $filearray[0]['path']).'/';
 		}
 		// Defined relative dir to DOL_DATA_ROOT
 		$relativedir = '';
-		if ($upload_dir)
-		{
+		if ($upload_dir) {
 			$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dir);
 			$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
 		}
@@ -1111,42 +1121,48 @@ class FormFile
 		);
 		$reshook = $hookmanager->executeHooks('showFilesList', $parameters, $object);
 
-		if (isset($reshook) && $reshook != '') // null or '' for bypass
-		{
+		if (isset($reshook) && $reshook != '') { // null or '' for bypass
 			return $reshook;
 		} else {
-			if (!is_object($form))
-			{
+			if (!is_object($form)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // The compoent may be included into ajax page that does not include the Form class
 				$form = new Form($this->db);
 			}
 
-			if (!preg_match('/&id=/', $param) && isset($object->id)) $param .= '&id='.$object->id;
+			if (!preg_match('/&id=/', $param) && isset($object->id)) {
+				$param .= '&id='.$object->id;
+			}
 			$relativepathwihtoutslashend = preg_replace('/\/$/', '', $relativepath);
-			if ($relativepathwihtoutslashend) $param .= '&file='.urlencode($relativepathwihtoutslashend);
+			if ($relativepathwihtoutslashend) {
+				$param .= '&file='.urlencode($relativepathwihtoutslashend);
+			}
 
-			if ($permtoeditline < 0)  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
-			{
+			if ($permtoeditline < 0) {  // Old behaviour for backward compatibility. New feature should call method with value 0 or 1
 				$permtoeditline = 0;
-				if (in_array($modulepart, array('product', 'produit', 'service')))
-				{
-					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) $permtoeditline = 1;
-					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) $permtoeditline = 1;
+				if (in_array($modulepart, array('product', 'produit', 'service'))) {
+					if ($user->rights->produit->creer && $object->type == Product::TYPE_PRODUCT) {
+						$permtoeditline = 1;
+					}
+					if ($user->rights->service->creer && $object->type == Product::TYPE_SERVICE) {
+						$permtoeditline = 1;
+					}
 				}
 			}
-			if (empty($conf->global->MAIN_UPLOAD_DOC))
-			{
+			if (empty($conf->global->MAIN_UPLOAD_DOC)) {
 				$permtoeditline = 0;
 				$permonobject = 0;
 			}
 
 			// Show list of existing files
-			if ((empty($useinecm) || $useinecm == 6) && $title != 'none') print load_fiche_titre($title ? $title : $langs->trans("AttachedFiles"), '', 'file-upload', 0, '', 'table-list-of-attached-files');
-			if (empty($url)) $url = $_SERVER["PHP_SELF"];
+			if ((empty($useinecm) || $useinecm == 6) && $title != 'none') {
+				print load_fiche_titre($title ? $title : $langs->trans("AttachedFiles"), '', 'file-upload', 0, '', 'table-list-of-attached-files');
+			}
+			if (empty($url)) {
+				$url = $_SERVER["PHP_SELF"];
+			}
 
 			print '<!-- html.formfile::list_of_documents -->'."\n";
-			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)
-			{
+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline) {
 				print '<form action="'.$_SERVER["PHP_SELF"].'?'.$param.'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="renamefile">';
@@ -1157,16 +1173,19 @@ class FormFile
 			print '<div class="div-table-responsive-no-min">';
 			print '<table width="100%" id="tablelines" class="liste noborder nobottom">'."\n";
 
-			if (!empty($addfilterfields))
-			{
+			if (!empty($addfilterfields)) {
 				print '<tr class="liste_titre nodrag nodrop">';
 				print '<td><input type="search_doc_ref" value="'.dol_escape_htmltag(GETPOST('search_doc_ref', 'alpha')).'"></td>';
 				print '<td></td>';
 				print '<td></td>';
-				if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) print '<td></td>';
+				if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) {
+					print '<td></td>';
+				}
 				print '<td></td>';
 				print '<td></td>';
-				if (!$disablemove) print '<td></td>';
+				if (!$disablemove) {
+					print '<td></td>';
+				}
 				print "</tr>\n";
 			}
 
@@ -1175,37 +1194,41 @@ class FormFile
 			print_liste_field_titre('Documents2', $url, "name", "", $param, '', $sortfield, $sortorder, 'left ');
 			print_liste_field_titre('Size', $url, "size", "", $param, '', $sortfield, $sortorder, 'right ');
 			print_liste_field_titre('Date', $url, "date", "", $param, '', $sortfield, $sortorder, 'center ');
-			if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) print_liste_field_titre('', $url, "", "", $param, '', $sortfield, $sortorder, 'center '); // Preview
+			if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) {
+				print_liste_field_titre('', $url, "", "", $param, '', $sortfield, $sortorder, 'center '); // Preview
+			}
 			// Shared or not - Hash of file
 			print_liste_field_titre('');
 			// Action button
 			print_liste_field_titre('');
-			if (!$disablemove) print_liste_field_titre('');
+			if (!$disablemove) {
+				print_liste_field_titre('');
+			}
 			print "</tr>\n";
 
 			// Get list of files stored into database for same relative directory
-			if ($relativedir)
-			{
+			if ($relativedir) {
 				completeFileArrayWithDatabaseInfo($filearray, $relativedir);
 
 				//var_dump($sortfield.' - '.$sortorder);
-				if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
-				{
+				if ($sortfield && $sortorder) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
 					$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
 				}
 			}
 
 			$nboffiles = count($filearray);
-			if ($nboffiles > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+			if ($nboffiles > 0) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+			}
 
 			$i = 0; $nboflines = 0; $lastrowid = 0;
-			foreach ($filearray as $key => $file)      // filearray must be only files here
-			{
+			foreach ($filearray as $key => $file) {      // filearray must be only files here
 				if ($file['name'] != '.'
 						&& $file['name'] != '..'
-						&& !preg_match('/\.meta$/i', $file['name']))
-				{
-					if ($filearray[$key]['rowid'] > 0) $lastrowid = $filearray[$key]['rowid'];
+						&& !preg_match('/\.meta$/i', $file['name'])) {
+					if ($filearray[$key]['rowid'] > 0) {
+						$lastrowid = $filearray[$key]['rowid'];
+					}
 					$filepath = $relativepath.$file['name'];
 
 					$editline = 0;
@@ -1221,18 +1244,25 @@ class FormFile
 					// Show file name with link to download
 					//print "XX".$file['name'];	//$file['name'] must be utf8
 					print '<a class="paddingright" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-					if ($forcedownload) print '&attachment=1';
-					if (!empty($object->entity)) print '&entity='.$object->entity;
+					if ($forcedownload) {
+						print '&attachment=1';
+					}
+					if (!empty($object->entity)) {
+						print '&entity='.$object->entity;
+					}
 					print '&file='.urlencode($filepath);
 					print '">';
 					print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')', 'inline-block valignbottom paddingright');
-					if ($showrelpart == 1) print $relativepath;
+					if ($showrelpart == 1) {
+						print $relativepath;
+					}
 					//print dol_trunc($file['name'],$maxlength,'middle');
-					if (GETPOST('action', 'aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile', 'alpha')))
-					{
+					if (GETPOST('action', 'aZ09') == 'editfile' && $file['name'] == basename(GETPOST('urlfile', 'alpha'))) {
 						print '</a>';
 						$section_dir = dirname(GETPOST('urlfile', 'alpha'));
-						if (!preg_match('/\/$/', $section_dir)) $section_dir .= '/';
+						if (!preg_match('/\/$/', $section_dir)) {
+							$section_dir .= '/';
+						}
 						print '<input type="hidden" name="section_dir" value="'.$section_dir.'">';
 						print '<input type="hidden" name="renamefilefrom" value="'.dol_escape_htmltag($file['name']).'">';
 						print '<input type="text" name="renamefileto" class="quatrevingtpercent" value="'.dol_escape_htmltag($file['name']).'">';
@@ -1243,7 +1273,9 @@ class FormFile
 						print '</a>';
 					}
 					// Preview link
-					if (!$editline) print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+					if (!$editline) {
+						print $this->showPreview($file, $modulepart, $filepath, 0, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
+					}
 
 					print "</td>\n";
 
@@ -1251,8 +1283,9 @@ class FormFile
 					$sizetoshow = dol_print_size($file['size'], 1, 1);
 					$sizetoshowbytes = dol_print_size($file['size'], 0, 1);
 					print '<td class="right nowraponall">';
-					if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
-					else {
+					if ($sizetoshow == $sizetoshowbytes) {
+						print $sizetoshow;
+					} else {
 						print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
 					}
 					print '</td>';
@@ -1261,19 +1294,18 @@ class FormFile
 					print '<td class="center" style="width: 140px">'.dol_print_date($file['date'], "dayhour", "tzuser").'</td>'; // 140px = width for date with PM format
 
 					// Preview
-					if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6)
-					{
+					if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) {
 						$fileinfo = pathinfo($file['name']);
 						print '<td class="center">';
-						if (image_format_supported($file['name']) >= 0)
-						{
-							if ($useinecm == 5 || $useinecm == 6)
-							{
+						if (image_format_supported($file['name']) >= 0) {
+							if ($useinecm == 5 || $useinecm == 6) {
 								$smallfile = getImageFileNameForSize($file['name'], ''); // There is no thumb for ECM module and Media filemanager, so we use true image. TODO Change this it is slow on image dir.
 							} else {
 								$smallfile = getImageFileNameForSize($file['name'], '_small'); // For new thumbs using same ext (in lower case however) than original
 							}
-							if (!dol_is_file($file['path'].'/'.$smallfile)) $smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+							if (!dol_is_file($file['path'].'/'.$smallfile)) {
+								$smallfile = getImageFileNameForSize($file['name'], '_small', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+							}
 							//print $file['path'].'/'.$smallfile.'<br>';
 
 							$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
@@ -1285,7 +1317,9 @@ class FormFile
 							}
 							print '<img class="photo maxwidth200 shadow valignmiddle" height="'.(($useinecm == 4 || $useinecm == 5 || $useinecm == 6) ? '12' : $maxheightmini).'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.(!empty($object->entity) ? $object->entity : $conf->entity).'&file='.urlencode($relativepath.$smallfile).'" title="">';
 							print '</a>';
-						} else print '&nbsp;';
+						} else {
+							print '&nbsp;';
+						}
 						print '</td>';
 					}
 
@@ -1296,8 +1330,7 @@ class FormFile
 							print $langs->trans("FileSharedViaALink").' ';
 							print '<input class="inline-block" type="checkbox" name="shareenabled"'.($file['share'] ? ' checked="checked"' : '').' /> ';
 						} else {
-							if ($file['share'])
-							{
+							if ($file['share']) {
 								// Define $urlwithroot
 								$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 								$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
@@ -1306,8 +1339,12 @@ class FormFile
 								//print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';
 								$forcedownload = 0;
 								$paramlink = '';
-								if (!empty($file['share'])) $paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share
-								if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
+								if (!empty($file['share'])) {
+									$paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share
+								}
+								if ($forcedownload) {
+									$paramlink .= ($paramlink ? '&' : '').'attachment=1';
+								}
 
 								$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 
@@ -1321,30 +1358,27 @@ class FormFile
 					print '</td>';
 
 					// Actions buttons (1 column or 2 if !disablemove)
-					if (!$editline)
-					{
+					if (!$editline) {
 						// Delete or view link
 						// ($param must start with &)
 						print '<td class="valignmiddle right actionbuttons nowraponall"><!-- action on files -->';
-						if ($useinecm == 1 || $useinecm == 5)	// ECM manual tree only
-						{
+						if ($useinecm == 1 || $useinecm == 5) {	// ECM manual tree only
 							// $section is inside $param
 							$newparam .= preg_replace('/&file=.*$/', '', $param); // We don't need param file=
 							$backtopage = DOL_URL_ROOT.'/ecm/index.php?&section_dir='.urlencode($relativepath).$newparam;
 							print '<a class="editfielda" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" class="editfilelink" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 						}
 
-						if (empty($useinecm) || $useinecm == 2 || $useinecm == 6)	// 6=Media file manager
-						{
+						if (empty($useinecm) || $useinecm == 2 || $useinecm == 6) {	// 6=Media file manager
 							$newmodulepart = $modulepart;
-							if (in_array($modulepart, array('product', 'produit', 'service'))) $newmodulepart = 'produit|service';
+							if (in_array($modulepart, array('product', 'produit', 'service'))) {
+								$newmodulepart = 'produit|service';
+							}
 
-							if (!$disablecrop && image_format_supported($file['name']) > 0)
-							{
-								if ($permtoeditline)
-								{
-	   								// Link to resize
-	   								$moreparaminurl = '';
+							if (!$disablecrop && image_format_supported($file['name']) > 0) {
+								if ($permtoeditline) {
+									// Link to resize
+									$moreparaminurl = '';
 									if ($object->id > 0) {
 										$moreparaminurl = '&id='.$object->id;
 									} elseif (GETPOST('website', 'alpha')) {
@@ -1354,24 +1388,27 @@ class FormFile
 								}
 							}
 
-							if ($permtoeditline)
-							{
+							if ($permtoeditline) {
 								$paramsectiondir = (in_array($modulepart, array('medias', 'ecm')) ? '&section_dir='.urlencode($relativepath) : '');
 								print '<a class="editfielda reposition" href="'.(($useinecm == 1 || $useinecm == 5) ? '#' : ($url.'?action=editfile&urlfile='.urlencode($filepath).$paramsectiondir.$param)).'" class="editfilelink" rel="'.$filepath.'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 							}
 						}
-						if ($permonobject)
-						{
+						if ($permonobject) {
 							$useajax = 1;
-							if (!empty($conf->dol_use_jmobile)) $useajax = 0;
-							if (empty($conf->use_javascript_ajax)) $useajax = 0;
-							if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) $useajax = 0;
+							if (!empty($conf->dol_use_jmobile)) {
+								$useajax = 0;
+							}
+							if (empty($conf->use_javascript_ajax)) {
+								$useajax = 0;
+							}
+							if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+								$useajax = 0;
+							}
 							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=delete&token='.newToken().'&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
 						}
 						print "</td>";
 
-						if (empty($disablemove))
-						{
+						if (empty($disablemove)) {
 							if ($nboffiles > 1 && $conf->browser->layout != 'phone') {
 								print '<td class="linecolmove tdlineupdown center">';
 								if ($i > 0) {
@@ -1382,8 +1419,8 @@ class FormFile
 								}
 								print '</td>';
 							} else {
-							   	print '<td'.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
-							   	print '</td>';
+								print '<td'.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
+								print '</td>';
 							}
 						}
 					} else {
@@ -1392,20 +1429,26 @@ class FormFile
 						print '<input type="submit" class="button button-save" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 						print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 						print '</td>';
-						if (empty($disablemove)) print '<td class="right"></td>';
+						if (empty($disablemove)) {
+							print '<td class="right"></td>';
+						}
 					}
 					print "</tr>\n";
 
 					$i++;
 				}
 			}
-			if ($nboffiles == 0)
-			{
+			if ($nboffiles == 0) {
 				$colspan = '6';
-				if (empty($disablemove)) $colspan++; // 6 columns or 7
+				if (empty($disablemove)) {
+					$colspan++; // 6 columns or 7
+				}
 				print '<tr class="oddeven"><td colspan="'.$colspan.'" class="opacitymedium">';
-				if (empty($textifempty)) print $langs->trans("NoFileFound");
-				else print $textifempty;
+				if (empty($textifempty)) {
+					print $langs->trans("NoFileFound");
+				} else {
+					print $textifempty;
+				}
 				print '</td></tr>';
 			}
 
@@ -1421,8 +1464,7 @@ class FormFile
 
 			print ajax_autoselect('downloadlink');
 
-			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline)
-			{
+			if (GETPOST('action', 'aZ09') == 'editfile' && $permtoeditline) {
 				print '</form>';
 			}
 
@@ -1461,11 +1503,14 @@ class FormFile
 		dol_syslog(get_class($this).'::list_of_autoecmfiles upload_dir='.$upload_dir.' modulepart='.$modulepart);
 
 		// Show list of documents
-		if (empty($useinecm) || $useinecm == 6) print load_fiche_titre($langs->trans("AttachedFiles"));
-		if (empty($url)) $url = $_SERVER["PHP_SELF"];
+		if (empty($useinecm) || $useinecm == 6) {
+			print load_fiche_titre($langs->trans("AttachedFiles"));
+		}
+		if (empty($url)) {
+			$url = $_SERVER["PHP_SELF"];
+		}
 
-		if (!empty($addfilterfields))
-		{
+		if (!empty($addfilterfields)) {
 			print '<form action="'.$_SERVER['PHP_SELF'].'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="module" value="'.$modulepart.'">';
@@ -1474,8 +1519,7 @@ class FormFile
 		print '<div class="div-table-responsive-no-min">';
 		print '<table width="100%" class="noborder">'."\n";
 
-		if (!empty($addfilterfields))
-		{
+		if (!empty($addfilterfields)) {
 			print '<tr class="liste_titre nodrag nodrop">';
 			print '<td class="liste_titre"></td>';
 			print '<td class="liste_titre"><input type="text" class="maxwidth100onsmartphone" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"></td>';
@@ -1491,7 +1535,9 @@ class FormFile
 
 		print '<tr class="liste_titre">';
 		$sortref = "fullname";
-		if ($modulepart == 'invoice_supplier') $sortref = 'level1name';
+		if ($modulepart == 'invoice_supplier') {
+			$sortref = 'level1name';
+		}
 		print_liste_field_titre("Ref", $url, $sortref, "", $param, '', $sortfield, $sortorder);
 		print_liste_field_titre("Documents2", $url, "name", "", $param, '', $sortfield, $sortorder);
 		print_liste_field_titre("Size", $url, "size", "", $param, '', $sortfield, $sortorder, 'right ');
@@ -1500,83 +1546,64 @@ class FormFile
 		print '</tr>'."\n";
 
 		// To show ref or specific information according to view to show (defined by $module)
-		if ($modulepart == 'company')
-		{
+		if ($modulepart == 'company') {
 			include_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 			$object_instance = new Societe($this->db);
-		} elseif ($modulepart == 'invoice')
-		{
+		} elseif ($modulepart == 'invoice') {
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$object_instance = new Facture($this->db);
-		} elseif ($modulepart == 'invoice_supplier')
-		{
+		} elseif ($modulepart == 'invoice_supplier') {
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 			$object_instance = new FactureFournisseur($this->db);
-		} elseif ($modulepart == 'propal')
-		{
+		} elseif ($modulepart == 'propal') {
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$object_instance = new Propal($this->db);
-		} elseif ($modulepart == 'supplier_proposal')
-		{
+		} elseif ($modulepart == 'supplier_proposal') {
 			include_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 			$object_instance = new SupplierProposal($this->db);
-		} elseif ($modulepart == 'order')
-		{
+		} elseif ($modulepart == 'order') {
 			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 			$object_instance = new Commande($this->db);
-		} elseif ($modulepart == 'order_supplier')
-		{
+		} elseif ($modulepart == 'order_supplier') {
 			include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 			$object_instance = new CommandeFournisseur($this->db);
-		} elseif ($modulepart == 'contract')
-		{
+		} elseif ($modulepart == 'contract') {
 			include_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 			$object_instance = new Contrat($this->db);
-		} elseif ($modulepart == 'product')
-		{
+		} elseif ($modulepart == 'product') {
 			include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$object_instance = new Product($this->db);
-		} elseif ($modulepart == 'tax')
-		{
+		} elseif ($modulepart == 'tax') {
 			include_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 			$object_instance = new ChargeSociales($this->db);
-		} elseif ($modulepart == 'project')
-		{
+		} elseif ($modulepart == 'project') {
 			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 			$object_instance = new Project($this->db);
-		} elseif ($modulepart == 'fichinter')
-		{
+		} elseif ($modulepart == 'fichinter') {
 			include_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 			$object_instance = new Fichinter($this->db);
-		} elseif ($modulepart == 'user')
-		{
+		} elseif ($modulepart == 'user') {
 			include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 			$object_instance = new User($this->db);
-		} elseif ($modulepart == 'expensereport')
-		{
+		} elseif ($modulepart == 'expensereport') {
 			include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 			$object_instance = new ExpenseReport($this->db);
-		} elseif ($modulepart == 'holiday')
-		{
+		} elseif ($modulepart == 'holiday') {
 			include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 			$object_instance = new Holiday($this->db);
-		} elseif ($modulepart == 'recruitment-recruitmentcandidature')
-		{
+		} elseif ($modulepart == 'recruitment-recruitmentcandidature') {
 			include_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
 			$object_instance = new RecruitmentCandidature($this->db);
-		} elseif ($modulepart == 'banque')
-		{
+		} elseif ($modulepart == 'banque') {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 			$object_instance = new Account($this->db);
-		} elseif ($modulepart == 'mrp-mo')
-		{
+		} elseif ($modulepart == 'mrp-mo') {
 			include_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 			$object_instance = new Mo($this->db);
 		} else {
 			$parameters = array('modulepart'=>$modulepart);
 			$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
-			if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0)
-			{
+			if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
 				if (array_key_exists('classpath', $hookmanager->resArray) && !empty($hookmanager->resArray['classpath'])) {
 					dol_include_once($hookmanager->resArray['classpath']);
 					if (array_key_exists('classname', $hookmanager->resArray) && !empty($hookmanager->resArray['classname'])) {
@@ -1592,27 +1619,23 @@ class FormFile
 
 		// Get list of files stored into database for same relative directory
 		$relativepathfromroot = preg_replace('/'.preg_quote(DOL_DATA_ROOT.'/', '/').'/', '', $upload_dir);
-		if ($relativepathfromroot)
-		{
+		if ($relativepathfromroot) {
 			completeFileArrayWithDatabaseInfo($filearray, $relativepathfromroot.'/%');
 
 			//var_dump($sortfield.' - '.$sortorder);
-			if ($sortfield && $sortorder)	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
-			{
+			if ($sortfield && $sortorder) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
 				$filearray = dol_sort_array($filearray, $sortfield, $sortorder, 1);
 			}
 		}
 
 		//var_dump($filearray);
 
-		foreach ($filearray as $key => $file)
-		{
+		foreach ($filearray as $key => $file) {
 			if (!is_dir($file['name'])
 			&& $file['name'] != '.'
 			&& $file['name'] != '..'
 			&& $file['name'] != 'CVS'
-			&& !preg_match('/\.meta$/i', $file['name']))
-			{
+			&& !preg_match('/\.meta$/i', $file['name'])) {
 				// Define relative path used to store the file
 				$relativefile = preg_replace('/'.preg_quote($upload_dir.'/', '/').'/', '', $file['fullname']);
 
@@ -1620,10 +1643,16 @@ class FormFile
 
 				// To show ref or specific information according to view to show (defined by $module)
 				$reg = array();
-				if ($modulepart == 'company' || $modulepart == 'tax') { preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
-				elseif ($modulepart == 'invoice_supplier') { preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) { $id = $ref; $ref = ''; } }	// $ref may be also id with old supplier invoices
-				elseif ($modulepart == 'user' || $modulepart == 'holiday') { preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : ''); }
-				elseif (in_array($modulepart, array(
+				if ($modulepart == 'company' || $modulepart == 'tax') {
+					preg_match('/(\d+)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : '');
+				} elseif ($modulepart == 'invoice_supplier') {
+					preg_match('/([^\/]+)\/[^\/]+$/', $relativefile, $reg); $ref = (isset($reg[1]) ? $reg[1] : ''); if (is_numeric($ref)) {
+						$id = $ref; $ref = '';
+					}
+				}	// $ref may be also id with old supplier invoices
+				elseif ($modulepart == 'user' || $modulepart == 'holiday') {
+					preg_match('/(.*)\/[^\/]+$/', $relativefile, $reg); $id = (isset($reg[1]) ? $reg[1] : '');
+				} elseif (in_array($modulepart, array(
 					'invoice',
 					'propal',
 					'supplier_proposal',
@@ -1641,8 +1670,7 @@ class FormFile
 				} else {
 					$parameters = array('modulepart'=>$modulepart,'fileinfo'=>$file);
 					$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
-					if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0)
-					{
+					if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
 						if (array_key_exists('ref', $hookmanager->resArray) && !empty($hookmanager->resArray['ref'])) {
 							$ref = $hookmanager->resArray['ref'];
 						}
@@ -1653,10 +1681,11 @@ class FormFile
 					//print 'Error: Value for modulepart = '.$modulepart.' is not yet implemented in function list_of_autoecmfiles'."\n";
 				}
 
-				if (!$id && !$ref) continue;
+				if (!$id && !$ref) {
+					continue;
+				}
 				$found = 0;
-				if (!empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref]))
-				{
+				if (!empty($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
 					$found = 1;
 				} else {
 					//print 'Fetch '.$id." - ".$ref.' class='.get_class($object_instance).'<br>';
@@ -1676,16 +1705,23 @@ class FormFile
 					if ($result > 0) {  // Save object loaded into a cache
 						$found = 1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = clone $object_instance;
 					}
-					if ($result == 0) { $found = 1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = 'notfound'; unset($filearray[$key]); }
+					if ($result == 0) {
+						$found = 1; $this->cache_objects[$modulepart.'_'.$id.'_'.$ref] = 'notfound'; unset($filearray[$key]);
+					}
 				}
 
-				if (!$found > 0 || !is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) continue; // We do not show orphelins files
+				if (!$found > 0 || !is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
+					continue; // We do not show orphelins files
+				}
 
 				print '<!-- Line list_of_autoecmfiles '.$key.' -->'."\n";
 				print '<tr class="oddeven">';
 				print '<td>';
-				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1, 'document');
-				else print $langs->trans("ObjectDeleted", ($id ? $id : $ref));
+				if ($found > 0 && is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
+					print $this->cache_objects[$modulepart.'_'.$id.'_'.$ref]->getNomUrl(1, 'document');
+				} else {
+					print $langs->trans("ObjectDeleted", ($id ? $id : $ref));
+				}
 
 				//$modulesubdir=dol_sanitizeFileName($ref);
 				//$modulesubdir = dirname($relativefile);
@@ -1700,7 +1736,9 @@ class FormFile
 				print '<td>';
 				//print "XX".$file['name']; //$file['name'] must be utf8
 				print '<a href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
-				if ($forcedownload) print '&attachment=1';
+				if ($forcedownload) {
+					print '&attachment=1';
+				}
 				print '&file='.urlencode($relativefile).'">';
 				print img_mime($file['name'], $file['name'].' ('.dol_print_size($file['size'], 0, 0).')');
 				print dol_trunc($file['name'], $maxlength, 'middle');
@@ -1716,8 +1754,9 @@ class FormFile
 				$sizetoshow = dol_print_size($file['size'], 1, 1);
 				$sizetoshowbytes = dol_print_size($file['size'], 0, 1);
 				print '<td class="right nowraponall">';
-				if ($sizetoshow == $sizetoshowbytes) print $sizetoshow;
-				else {
+				if ($sizetoshow == $sizetoshowbytes) {
+					print $sizetoshow;
+				} else {
 					print $form->textwithpicto($sizetoshow, $sizetoshowbytes, -1);
 				}
 				print '</td>';
@@ -1736,8 +1775,12 @@ class FormFile
 					//print '<span class="opacitymedium">'.$langs->trans("Hash").' : '.$file['share'].'</span>';
 					$forcedownload = 0;
 					$paramlink = '';
-					if (!empty($file['share'])) $paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share
-					if ($forcedownload) $paramlink .= ($paramlink ? '&' : '').'attachment=1';
+					if (!empty($file['share'])) {
+						$paramlink .= ($paramlink ? '&' : '').'hashp='.$file['share']; // Hash for public share
+					}
+					if ($forcedownload) {
+						$paramlink .= ($paramlink ? '&' : '').'attachment=1';
+					}
 
 					$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 
@@ -1756,17 +1799,21 @@ class FormFile
 			}
 		}
 
-		if (count($filearray) == 0)
-		{
+		if (count($filearray) == 0) {
 			print '<tr class="oddeven"><td colspan="5">';
-			if (empty($textifempty)) print '<span class="opacitymedium">'.$langs->trans("NoFileFound").'</span>';
-			else print '<span class="opacitymedium">'.$textifempty.'</span>';
+			if (empty($textifempty)) {
+				print '<span class="opacitymedium">'.$langs->trans("NoFileFound").'</span>';
+			} else {
+				print '<span class="opacitymedium">'.$textifempty.'</span>';
+			}
 			print '</td></tr>';
 		}
 		print "</table>";
 		print '</div>';
 
-		if (!empty($addfilterfields)) print '</form>';
+		if (!empty($addfilterfields)) {
+			print '</form>';
+		}
 		// Fin de zone
 	}
 
@@ -1888,14 +1935,14 @@ class FormFile
 		print_liste_field_titre('', '', '');
 		print '</tr>';
 		$nboflinks = count($links);
-		if ($nboflinks > 0) include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+		if ($nboflinks > 0) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+		}
 
-		foreach ($links as $link)
-		{
+		foreach ($links as $link) {
 			print '<tr class="oddeven">';
 			//edit mode
-			if ($action == 'update' && $selected === $link->id)
-			{
+			if ($action == 'update' && $selected === $link->id) {
 				print '<td>';
 				print '<input type="hidden" name="id" value="'.$object->id.'">';
 				print '<input type="hidden" name="linkid" value="'.$link->id.'">';
@@ -1932,8 +1979,7 @@ class FormFile
 			}
 			print "</tr>\n";
 		}
-		if ($nboflinks == 0)
-		{
+		if ($nboflinks == 0) {
 			print '<tr class="oddeven"><td colspan="5" class="opacitymedium">';
 			print $langs->trans("NoLinkFound");
 			print '</td></tr>';
@@ -1961,11 +2007,9 @@ class FormFile
 		global $langs, $conf;
 
 		$out = '';
-		if ($conf->browser->layout != 'phone' && !empty($conf->use_javascript_ajax))
-		{
+		if ($conf->browser->layout != 'phone' && !empty($conf->use_javascript_ajax)) {
 			$urladvancedpreview = getAdvancedPreviewUrl($modulepart, $relativepath, 1, $param); // Return if a file is qualified for preview.
-			if (count($urladvancedpreview))
-			{
+			if (count($urladvancedpreview)) {
 				$out .= '<a class="pictopreview '.$urladvancedpreview['css'].'" href="'.$urladvancedpreview['url'].'"'.(empty($urladvancedpreview['mime']) ? '' : ' mime="'.$urladvancedpreview['mime'].'"').' '.(empty($urladvancedpreview['target']) ? '' : ' target="'.$urladvancedpreview['target'].'"').'>';
 				//$out.= '<a class="pictopreview">';
 				if (empty($ruleforpicto)) {
diff --git a/htdocs/core/class/html.formintervention.class.php b/htdocs/core/class/html.formintervention.class.php
index 81c857e2683..aa0259ba288 100644
--- a/htdocs/core/class/html.formintervention.class.php
+++ b/htdocs/core/class/html.formintervention.class.php
@@ -73,53 +73,51 @@ class FormIntervention
 		$sql = 'SELECT f.rowid, f.ref, f.fk_soc, f.fk_statut';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter as f';
 		$sql .= " WHERE f.entity = ".$conf->entity;
-		if ($socid != '')
-		{
-			if ($socid == '0') $sql .= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
-			else $sql .= " AND f.fk_soc = ".$socid;
+		if ($socid != '') {
+			if ($socid == '0') {
+				$sql .= " AND (f.fk_soc = 0 OR f.fk_soc IS NULL)";
+			} else {
+				$sql .= " AND f.fk_soc = ".$socid;
+			}
 		}
 
 		dol_syslog(get_class($this)."::select_intervention", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$out .= '<select id="interventionid" class="flat" name="'.$htmlname.'">';
-			if ($showempty) $out .= '<option value="0">&nbsp;</option>';
+			if ($showempty) {
+				$out .= '<option value="0">&nbsp;</option>';
+			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
-					{
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire) {
 						// Do nothing
 					} else {
 						$labeltoshow = dol_trunc($obj->ref, 18);
-						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
-						{
+						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0) {
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 						} else {
 							$disabled = 0;
-							if (!$obj->fk_statut > 0)
-							{
+							if (!$obj->fk_statut > 0) {
 								$disabled = 1;
 								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
-							if ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
+							if ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 								$disabled = 1;
 								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 
-							if ($hideunselectables && $disabled)
-							{
+							if ($hideunselectables && $disabled) {
 								$resultat = '';
 							} else {
 								$resultat = '<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat .= ' disabled';
+								if ($disabled) {
+									$resultat .= ' disabled';
+								}
 								$resultat .= '>'.$labeltoshow;
 								$resultat .= '</option>';
 							}
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index e8b291ebfca..8abb9aef576 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -488,7 +488,7 @@ class FormMail extends Form
 
 			// Zone to select email template
 			if (count($modelmail_array) > 0) {
-				$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOST('modelmailselected', 'int') : $arraydefaultmessage->id;
+				$model_mail_selected_id = GETPOSTISSET('modelmailselected') ? GETPOST('modelmailselected', 'int') : ($arraydefaultmessage->id > 0 ? $arraydefaultmessage->id : 0);
 
 				// If list of template is filled
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
diff --git a/htdocs/core/class/html.formmargin.class.php b/htdocs/core/class/html.formmargin.class.php
index 233f98df662..c58b0a4036a 100644
--- a/htdocs/core/class/html.formmargin.class.php
+++ b/htdocs/core/class/html.formmargin.class.php
@@ -82,14 +82,13 @@ class FormMargin
 				'total_mark_rate' => ''
 		);
 
-		foreach ($object->lines as $line)
-		{
-			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)
-			{
+		foreach ($object->lines as $line) {
+			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price) {
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 				$product = new ProductFournisseur($this->db);
-				if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
+				if ($product->fetch_product_fournisseur_price($line->fk_fournprice)) {
 					$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+				}
 			}
 			// si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente
 			if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
@@ -161,25 +160,31 @@ class FormMargin
 				}
 			}
 		}
-		if ($marginInfos['pa_products'] > 0)
+		if ($marginInfos['pa_products'] > 0) {
 			$marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
-		if ($marginInfos['pv_products'] > 0)
+		}
+		if ($marginInfos['pv_products'] > 0) {
 			$marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
+		}
 
-		if ($marginInfos['pa_services'] > 0)
+		if ($marginInfos['pa_services'] > 0) {
 			$marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
-		if ($marginInfos['pv_services'] > 0)
+		}
+		if ($marginInfos['pv_services'] > 0) {
 			$marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
+		}
 
 		// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 		//if ($marginInfos['pv_total'] < 0)
 		//	$marginInfos['total_margin'] = -1 * (abs($marginInfos['pv_total']) - $marginInfos['pa_total']);
 		//else
 			$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
-		if ($marginInfos['pa_total'] > 0)
+		if ($marginInfos['pa_total'] > 0) {
 			$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
-		if ($marginInfos['pv_total'] > 0)
+		}
+		if ($marginInfos['pv_total'] > 0) {
 			$marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
+		}
 
 		return $marginInfos;
 	}
@@ -195,14 +200,17 @@ class FormMargin
 	{
 		global $langs, $conf, $user;
 
-		if (!empty($user->socid)) return;
+		if (!empty($user->socid)) {
+			return;
+		}
 
-		if (!$user->rights->margins->liretous) return;
+		if (!$user->rights->margins->liretous) {
+			return;
+		}
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
-		{
+		if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) {	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
 			print $langs->trans('ShowMarginInfos').' : ';
 			$hidemargininfos = preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW']); // Clean cookie
 			print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';
@@ -212,7 +220,9 @@ class FormMargin
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
         	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
-			if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+			if (!empty($hidemargininfos)) {
+				print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+			}
 		}
 
 		print '<div class="div-table-responsive-no-min">';
@@ -222,56 +232,63 @@ class FormMargin
 		print '<tr class="liste_titre">';
 		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
 		print '<td class="liste_titre right">'.$langs->trans('SellingPrice').'</td>';
-		if ($conf->global->MARGIN_TYPE == "1")
+		if ($conf->global->MARGIN_TYPE == "1") {
 			print '<td class="liste_titre right">'.$langs->trans('BuyingPrice').'</td>';
-		else print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
+		} else {
+			print '<td class="liste_titre right">'.$langs->trans('CostPrice').'</td>';
+		}
 		print '<td class="liste_titre right">'.$langs->trans('Margin').'</td>';
-		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 			print '<td class="liste_titre right">'.$langs->trans('MarginRate').'</td>';
-		if (!empty($conf->global->DISPLAY_MARK_RATES))
+		}
+		if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 			print '<td class="liste_titre right">'.$langs->trans('MarkRate').'</td>';
+		}
 		print '</tr>';
 
-		if (!empty($conf->product->enabled))
-		{
+		if (!empty($conf->product->enabled)) {
 			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnProducts').'</td>';
 			print '<td class="right">'.price($marginInfo['pv_products']).'</td>';
 			print '<td class="right">'.price($marginInfo['pa_products']).'</td>';
 			print '<td class="right">'.price($marginInfo['margin_on_products']).'</td>';
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 				print '<td class="right">'.(($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, 2).'%').'</td>';
-			if (!empty($conf->global->DISPLAY_MARK_RATES))
+			}
+			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 				print '<td class="right">'.(($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, 2).'%').'</td>';
+			}
 			print '</tr>';
 		}
 
-		if (!empty($conf->service->enabled))
-		{
+		if (!empty($conf->service->enabled)) {
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnServices').'</td>';
 			print '<td class="right">'.price($marginInfo['pv_services']).'</td>';
 			print '<td class="right">'.price($marginInfo['pa_services']).'</td>';
 			print '<td class="right">'.price($marginInfo['margin_on_services']).'</td>';
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 				print '<td class="right">'.(($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, 2).'%').'</td>';
-			if (!empty($conf->global->DISPLAY_MARK_RATES))
+			}
+			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 				print '<td class="right">'.(($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, 2).'%').'</td>';
+			}
 			print '</tr>';
 		}
 
-		if (!empty($conf->product->enabled) && !empty($conf->service->enabled))
-		{
+		if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans('TotalMargin').'</td>';
 			print '<td class="right">'.price($marginInfo['pv_total']).'</td>';
 			print '<td class="right">'.price($marginInfo['pa_total']).'</td>';
 			print '<td class="right">'.price($marginInfo['total_margin']).'</td>';
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 				print '<td class="right">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%').'</td>';
-			if (!empty($conf->global->DISPLAY_MARK_RATES))
+			}
+			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 				print '<td class="right">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%').'</td>';
+			}
 			print '</tr>';
 		}
 		print '</table>';
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index be169106621..9c75d15bae5 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -62,8 +62,11 @@ class FormOrder extends Form
 			$options[$value] = $tmpsupplierorder->getLibStatut($short);
 		}
 
-		if (is_array($selected)) $selectedarray = $selected;
-		else $selectedarray = explode(',', $selected);
+		if (is_array($selected)) {
+			$selectedarray = $selected;
+		} else {
+			$selectedarray = explode(',', $selected);
+		}
 
 		print Form::multiselectarray($hmlname, $options, $selectedarray, 0);
 	}
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index dc6820c56fc..6fee9eb1000 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -76,21 +76,20 @@ class FormOther
 		$sql = "SELECT rowid, label, fk_user";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
-		if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
+		if (!empty($fk_user)) {
+			$sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
+		}
 		$sql .= " ORDER BY label";
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($useempty)
-			{
+			if ($useempty) {
 				print '<option value="-1">&nbsp;</option>';
 			}
 
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 
 				$label = $obj->label;
@@ -102,8 +101,7 @@ class FormOther
 					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
 				}
 
-				if ($selected == $obj->rowid)
-				{
+				if ($selected == $obj->rowid) {
 					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
 				} else {
 					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
@@ -139,21 +137,20 @@ class FormOther
 		$sql = "SELECT rowid, label, fk_user";
 		$sql .= " FROM ".MAIN_DB_PREFIX."import_model";
 		$sql .= " WHERE type = '".$this->db->escape($type)."'";
-		if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
+		if (!empty($fk_user)) {
+			$sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
+		}
 		$sql .= " ORDER BY rowid";
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($useempty)
-			{
+			if ($useempty) {
 				print '<option value="-1">&nbsp;</option>';
 			}
 
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 
 				$label = $obj->label;
@@ -165,8 +162,7 @@ class FormOther
 					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
 				}
 
-				if ($selected == $obj->rowid)
-				{
+				if ($selected == $obj->rowid) {
 					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
 				} else {
 					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
@@ -204,19 +200,15 @@ class FormOther
 
 		dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			print '<select class="flat" name="'.$htmlname.'">';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			print '<option value="-1">&nbsp;</option>'."\n";
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
-					if ($selected && $selected == $obj->rowid)
-					{
+					if ($selected && $selected == $obj->rowid) {
 						print '<option value="'.$obj->rowid.'" selected>';
 					} else {
 						print '<option value="'.$obj->rowid.'">';
@@ -260,19 +252,15 @@ class FormOther
 
 		dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$out .= '<select class="flat" name="'.$htmlname.'">';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			$out .= '<option value="0">&nbsp;</option>'."\n";
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
-					if (($selected && $selected == $obj->taux) || $num == 1)
-					{
+					if (($selected && $selected == $obj->taux) || $num == 1) {
 						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
 					} else {
 						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
@@ -309,12 +297,12 @@ class FormOther
 	{
 		// phpcs:enable
 		$return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
-		if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
+		if ($showempty) {
+			$return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
+		}
 
-		for ($i = $start; $i <= $end; $i += $increment)
-		{
-			if ($selected != '' && (int) $selected == $i)
-			{
+		for ($i = $start; $i <= $end; $i += $increment) {
+			if ($selected != '' && (int) $selected == $i) {
 				$return .= '<option value="'.$i.'" selected>';
 			} else {
 				$return .= '<option value="'.$i.'">';
@@ -348,8 +336,7 @@ class FormOther
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 		// For backward compatibility
-		if (is_numeric($type))
-		{
+		if (is_numeric($type)) {
 			dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
 		}
 
@@ -359,8 +346,7 @@ class FormOther
 
 		$moreforfilter = '';
 		// Enhance with select2
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$comboenhancement = ajax_combobox('select_categ_'.$htmlname);
 			$moreforfilter .= $comboenhancement;
@@ -370,23 +356,26 @@ class FormOther
 		$moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
 		if ($showempty) {
 			$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($showempty)) $textforempty = $showempty;
+			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($showempty)) {
+				$textforempty = $showempty;
+			}
 			$moreforfilter .= '<option class="optiongrey" '.($moreparamonempty ? $moreparamonempty.' ' : '').'value="'.($showempty < 0 ? $showempty : -1).'"'.($selected == $showempty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";
 			//$moreforfilter .= '<option value="0" '.($moreparamonempty ? $moreparamonempty.' ' : '').' class="optiongrey">'.(is_numeric($showempty) ? '&nbsp;' : $showempty).'</option>'; // Should use -1 to say nothing
 		}
 
-		if (is_array($tab_categs))
-		{
-			foreach ($tab_categs as $categ)
-			{
+		if (is_array($tab_categs)) {
+			foreach ($tab_categs as $categ) {
 				$moreforfilter .= '<option value="'.$categ['id'].'"';
-				if ($categ['id'] == $selected) $moreforfilter .= ' selected';
+				if ($categ['id'] == $selected) {
+					$moreforfilter .= ' selected';
+				}
 				$moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';
 			}
 		}
-		if ($nocateg)
-		{
+		if ($nocateg) {
 			$langs->load("categories");
 			$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';
 		}
@@ -418,13 +407,11 @@ class FormOther
 
 		$out = '';
 		// Enhance with select2
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 
 			$comboenhancement = ajax_combobox($htmlname);
-			if ($comboenhancement)
-			{
+			if ($comboenhancement) {
 				$out .= $comboenhancement;
 			}
 		}
@@ -435,8 +422,12 @@ class FormOther
 		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
 		if ($showempty) {
 			$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($showempty)) $textforempty = $showempty;
+			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($showempty)) {
+				$textforempty = $showempty;
+			}
 			$out .= '<option class="optiongrey" value="'.($showempty < 0 ? $showempty : -1).'"'.($selected == $showempty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";
 		}
 
@@ -444,8 +435,7 @@ class FormOther
 		$sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut as status, u.login, u.photo, u.gender, u.entity, u.admin";
 		$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-		if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-		{
+		if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 			if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
 				$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users
 			} else {
@@ -456,21 +446,25 @@ class FormOther
 			$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
 		}
 
-		if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;
-		if (!empty($user->socid)) $sql_usr .= " AND u.fk_soc = ".$user->socid;
+		if (empty($user->rights->user->user->lire)) {
+			$sql_usr .= " AND u.rowid = ".$user->id;
+		}
+		if (!empty($user->socid)) {
+			$sql_usr .= " AND u.fk_soc = ".$user->socid;
+		}
 
 		//Add hook to filter on user (for exemple on usergroup define in custom modules)
-		if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[0];
+		if (!empty($reshook)) {
+			$sql_usr .= $hookmanager->resArray[0];
+		}
 
 		// Add existing sales representatives of thirdparty of external user
-		if (empty($user->rights->user->user->lire) && $user->socid)
-		{
+		if (empty($user->rights->user->user->lire) && $user->socid) {
 			$sql_usr .= " UNION ";
 			$sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut as status, u2.login, u2.photo, u2.gender, u2.entity, u2.admin";
 			$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 
-			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-			{
+			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
 					$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users
 				} else {
@@ -483,19 +477,19 @@ class FormOther
 			$sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
 
 			//Add hook to filter on user (for exemple on usergroup define in custom modules)
-			if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[1];
+			if (!empty($reshook)) {
+				$sql_usr .= $hookmanager->resArray[1];
+			}
 		}
 		$sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
 		//print $sql_usr;exit;
 
 		$resql_usr = $this->db->query($sql_usr);
-		if ($resql_usr)
-		{
+		if ($resql_usr) {
 			$userstatic = new User($this->db);
 			$showstatus = 1;
 
-			while ($obj_usr = $this->db->fetch_object($resql_usr))
-			{
+			while ($obj_usr = $this->db->fetch_object($resql_usr)) {
 				$userstatic->id = $obj_usr->rowid;
 				$userstatic->lastname = $obj_usr->lastname;
 				$userstatic->firstname = $obj_usr->firstname;
@@ -505,35 +499,39 @@ class FormOther
 				$userstatic->admin = $obj_usr->admin;
 
 				$labeltoshow = dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
-				if (empty($obj_usr->firstname) && empty($obj_usr->lastname)) $labeltoshow = $obj_usr->login;
+				if (empty($obj_usr->firstname) && empty($obj_usr->lastname)) {
+					$labeltoshow = $obj_usr->login;
+				}
 
 				$out .= '<option value="'.$obj_usr->rowid.'"';
-				if ($obj_usr->rowid == $selected) $out .= ' selected';
+				if ($obj_usr->rowid == $selected) {
+					$out .= ' selected';
+				}
 				$out .= ' data-html="';
 				$outhtml = $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
-				if ($showstatus >= 0 && $obj_usr->status == 0) $outhtml .= '<strike class="opacitymediumxxx">';
+				if ($showstatus >= 0 && $obj_usr->status == 0) {
+					$outhtml .= '<strike class="opacitymediumxxx">';
+				}
 				$outhtml .= $labeltoshow;
-				if ($showstatus >= 0 && $obj_usr->status == 0) $outhtml .= '</strike>';
+				if ($showstatus >= 0 && $obj_usr->status == 0) {
+					$outhtml .= '</strike>';
+				}
 				$out .= dol_escape_htmltag($outhtml);
 				$out .= '">';
 
 				$out .= $labeltoshow;
 				// Complete name with more info
 				$moreinfo = 0;
-				if (!empty($conf->global->MAIN_SHOW_LOGIN))
-				{
+				if (!empty($conf->global->MAIN_SHOW_LOGIN)) {
 					$out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
 					$moreinfo++;
 				}
-				if ($showstatus >= 0)
-				{
-					if ($obj_usr->status == 1 && $showstatus == 1)
-					{
+				if ($showstatus >= 0) {
+					if ($obj_usr->status == 1 && $showstatus == 1) {
 						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
 						$moreinfo++;
 					}
-					if ($obj_usr->status == 0)
-					{
+					if ($obj_usr->status == 0) {
 						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
 						$moreinfo++;
 					}
@@ -546,8 +544,7 @@ class FormOther
 			dol_print_error($this->db);
 		}
 
-		if ($norepresentative)
-		{
+		if ($norepresentative) {
 			$langs->load("companies");
 			$out .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NoSalesRepresentativeAffected").' -</option>';
 		}
@@ -581,10 +578,11 @@ class FormOther
 		//print $modeproject.'-'.$modetask;
 		$task = new Task($this->db);
 		$tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);
-		if ($tasksarray)
-		{
+		if ($tasksarray) {
 			print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($useempty) print '<option value="0">&nbsp;</option>';
+			if ($useempty) {
+				print '<option value="0">&nbsp;</option>';
+			}
 			$j = 0;
 			$level = 0;
 			$this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
@@ -620,13 +618,15 @@ class FormOther
 				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
 
 				// Break on a new project
-				if ($parent == 0)	// We are on a task at first level
-				{
-					if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
-					{
-						if ($i > 0) print '<option value="0" disabled>----------</option>';
+				if ($parent == 0) {	// We are on a task at first level
+					if ($lines[$i]->fk_project != $lastprojectid) {	// Break found on project
+						if ($i > 0) {
+							print '<option value="0" disabled>----------</option>';
+						}
 						print '<option value="'.$lines[$i]->fk_project.'_0"';
-						if ($selectedproject == $lines[$i]->fk_project) print ' selected';
+						if ($selectedproject == $lines[$i]->fk_project) {
+							print ' selected';
+						}
 
 						$labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
 						if (empty($lines[$i]->public)) {
@@ -648,31 +648,35 @@ class FormOther
 				$newdisablechildoftaskid = $disablechildoftaskid;
 
 				// Print task
-				if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
-				{
+				if (isset($lines[$i]->id)) {		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
 					// Check if we must disable entry
 					$disabled = 0;
-					if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
-					{
-			   			$disabled++;
-			   			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too
+					if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid))) {
+						$disabled++;
+						if ($lines[$i]->fk_parent == $disablechildoftaskid) {
+							$newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too
+						}
 					}
 
 					print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
-					if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
-					if ($disabled) print ' disabled';
+					if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) {
+						print ' selected';
+					}
+					if ($disabled) {
+						print ' disabled';
+					}
 
 					$labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
 					$labeltoshow .= ' '.$lines[$i]->projectlabel;
-					if (empty($lines[$i]->public))
-					{
+					if (empty($lines[$i]->public)) {
 						$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
 					} else {
 						$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
 					}
-					if ($lines[$i]->id) $labeltoshow .= ' > ';
-					for ($k = 0; $k < $level; $k++)
-					{
+					if ($lines[$i]->id) {
+						$labeltoshow .= ' > ';
+					}
+					for ($k = 0; $k < $level; $k++) {
 						$labeltoshow .= "&nbsp;&nbsp;&nbsp;";
 					}
 					$labeltoshow .= $lines[$i]->ref.' '.$lines[$i]->label;
@@ -685,7 +689,9 @@ class FormOther
 				}
 
 				$level++;
-				if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+				if ($lines[$i]->id) {
+					$this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+				}
 				$level--;
 			}
 		}
@@ -704,12 +710,17 @@ class FormOther
 	{
 		$textcolor = 'FFF';
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		if (colorIsLight($color)) $textcolor = '000';
+		if (colorIsLight($color)) {
+			$textcolor = '000';
+		}
 
 		$color = colorArrayToHex(colorStringToArray($color, array()), '');
 
-		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
-		else print $textifnotdefined;
+		if ($color) {
+			print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
+		} else {
+			print $textifnotdefined;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -755,11 +766,9 @@ class FormOther
 
 		$out = '';
 
-		if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)
-		{
+		if (!is_array($arrayofcolors) || count($arrayofcolors) < 1) {
 			$langs->load("other");
-			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
-			{
+			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax)) {
 				$out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
 				$out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
 				$out .= '<script type="text/javascript">
@@ -800,7 +809,9 @@ class FormOther
 				        },
 						function(color, context) { console.log("close"); },
 						function(color, context) { var hex = color.val(\'hex\'); console.log("new color selected in jpicker "+hex);';
-				if ($setpropertyonselect) { $out .= ' if (hex != null) document.documentElement.style.setProperty(\'--'.$setpropertyonselect.'\', \'#\'+hex);'; }
+				if ($setpropertyonselect) {
+					$out .= ' if (hex != null) document.documentElement.style.setProperty(\'--'.$setpropertyonselect.'\', \'#\'+hex);';
+				}
 						$out .= '},
 						function(color, context) { console.log("cancel"); }
 					);
@@ -810,8 +821,7 @@ class FormOther
 			$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
 		} else // In most cases, this is not used. We used instead function with no specific list of colors
 		{
-			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
-			{
+			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax)) {
 				$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
 				$out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
 				$out .= '<script type="text/javascript">
@@ -826,10 +836,11 @@ class FormOther
 			}
 			$out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
 			//print '<option value="-1">&nbsp;</option>';
-			foreach ($arrayofcolors as $val)
-			{
+			foreach ($arrayofcolors as $val) {
 				$out .= '<option value="'.$val.'"';
-				if ($set_color == $val) $out .= ' selected';
+				if ($set_color == $val) {
+					$out .= ' selected';
+				}
 				$out .= '>'.$val.'</option>';
 			}
 			$out .= '</select>';
@@ -857,8 +868,7 @@ class FormOther
 		$file = $conf->$module->dir_temp.'/'.$name.'.png';
 
 		// On cree le repertoire contenant les icones
-		if (!file_exists($conf->$module->dir_temp))
-		{
+		if (!file_exists($conf->$module->dir_temp)) {
 			dol_mkdir($conf->$module->dir_temp);
 		}
 
@@ -904,14 +914,11 @@ class FormOther
 		);
 
 		$select_week = '<select class="flat" name="'.$htmlname.'">';
-		if ($useempty)
-		{
+		if ($useempty) {
 			$select_week .= '<option value="-1">&nbsp;</option>';
 		}
-		foreach ($week as $key => $val)
-		{
-			if ($selected == $key)
-			{
+		foreach ($week as $key => $val) {
+			if ($selected == $key) {
 				$select_week .= '<option value="'.$key.'" selected>';
 			} else {
 				$select_week .= '<option value="'.$key.'">';
@@ -942,18 +949,18 @@ class FormOther
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-		if ($longlabel) $montharray = monthArray($langs, 0); // Get array
-		else $montharray = monthArray($langs, 1);
+		if ($longlabel) {
+			$montharray = monthArray($langs, 0); // Get array
+		} else {
+			$montharray = monthArray($langs, 1);
+		}
 
 		$select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-		if ($useempty)
-		{
+		if ($useempty) {
 			$select_month .= '<option value="0">&nbsp;</option>';
 		}
-		foreach ($montharray as $key => $val)
-		{
-			if ($selected == $key)
-			{
+		foreach ($montharray as $key => $val) {
+			if ($selected == $key) {
 				$select_month .= '<option value="'.$key.'" selected>';
 			} else {
 				$select_month .= '<option value="'.$key.'">';
@@ -964,8 +971,7 @@ class FormOther
 		$select_month .= '</select>';
 
 		// Add code for jquery to use multiselect
-		if ($addjscombo)
-		{
+		if ($addjscombo) {
 			// Enhance with select2
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$select_month .= ajax_combobox($htmlname);
@@ -1017,36 +1023,39 @@ class FormOther
 		$currentyear = date("Y") + $offset;
 		$max_year = $currentyear + $max_year;
 		$min_year = $currentyear - $min_year;
-		if (empty($selected) && empty($useempty)) $selected = $currentyear;
+		if (empty($selected) && empty($useempty)) {
+			$selected = $currentyear;
+		}
 
 		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';
-		if ($useempty)
-		{
+		if ($useempty) {
 			$selected_html = '';
-			if ($selected == '') $selected_html = ' selected';
+			if ($selected == '') {
+				$selected_html = ' selected';
+			}
 			$out .= '<option value=""'.$selected_html.'>&nbsp;</option>';
 		}
-		if (!$invert)
-		{
-			for ($y = $max_year; $y >= $min_year; $y--)
-			{
+		if (!$invert) {
+			for ($y = $max_year; $y >= $min_year; $y--) {
 				$selected_html = '';
-				if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+				if ($selected > 0 && $y == $selected) {
+					$selected_html = ' selected';
+				}
 				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
 			}
 		} else {
-			for ($y = $min_year; $y <= $max_year; $y++)
-			{
+			for ($y = $min_year; $y <= $max_year; $y++) {
 				$selected_html = '';
-				if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+				if ($selected > 0 && $y == $selected) {
+					$selected_html = ' selected';
+				}
 				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
 			}
 		}
 		$out .= "</select>\n";
 
 		// Add code for jquery to use multiselect
-		if ($addjscombo)
-		{
+		if ($addjscombo) {
 			// Enhance with select2
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			$out .= ajax_combobox($htmlname);
@@ -1079,32 +1088,33 @@ class FormOther
 		$boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)
 
 		$boxidactivatedforuser = array();
-		foreach ($boxactivated as $box)
-		{
-			if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user
+		foreach ($boxactivated as $box) {
+			if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) {
+				$boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user
+			}
 		}
 
 		// Define selectboxlist
 		$arrayboxtoactivatelabel = array();
-		if (!empty($user->conf->$confuserzone))
-		{
+		if (!empty($user->conf->$confuserzone)) {
 			$boxorder = '';
 			$langs->load("boxes"); // Load label of boxes
-			foreach ($boxactivated as $box)
-			{
-				if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user
+			foreach ($boxactivated as $box) {
+				if (!empty($boxidactivatedforuser[$box->id])) {
+					continue; // Already visible for user
+				}
 				$label = $langs->transnoentitiesnoconv($box->boxlabel);
 				//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
-				if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')
-				{
+				if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone') {
 					$label = $label.' <span class="fa fa-bar-chart"></span>';
 				}
 				$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list
 			}
-			foreach ($boxidactivatedforuser as $boxid)
-			{
-	   			if (empty($boxorder)) $boxorder .= 'A:';
-  				$boxorder .= $boxid.',';
+			foreach ($boxidactivatedforuser as $boxid) {
+				if (empty($boxorder)) {
+					$boxorder .= 'A:';
+				}
+				$boxorder .= $boxid.',';
 			}
 
 			//var_dump($boxidactivatedforuser);
@@ -1118,18 +1128,18 @@ class FormOther
 			$selectboxlist .= '<input type="hidden" name="areacode" value="'.$areacode.'">';
 			$selectboxlist .= '<input type="hidden" name="boxorder" value="'.$boxorder.'">';
 			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
-			if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+			if (empty($conf->use_javascript_ajax)) {
+				$selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+			}
 			$selectboxlist .= '</form>';
-			if (!empty($conf->use_javascript_ajax))
-			{
+			if (!empty($conf->use_javascript_ajax)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$selectboxlist .= ajax_combobox("boxcombo");
 			}
 		}
 
 		// Javascript code for dynamic actions
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			$selectboxlist .= '<script type="text/javascript" language="javascript">
 
 	        // To update list of activated boxes
@@ -1169,7 +1179,9 @@ class FormOther
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=addbox&boxid=\'+boxid;
 	                }
 	        	});';
-				if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';
+			if (!count($arrayboxtoactivatelabel)) {
+				$selectboxlist .= 'jQuery("#boxcombo").hide();';
+			}
 				$selectboxlist .= '
 
 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({
@@ -1202,8 +1214,7 @@ class FormOther
 		$boxlista = ''; $boxlistb = '';
 		$nbboxactivated = count($boxidactivatedforuser);
 
-		if ($nbboxactivated)
-		{
+		if ($nbboxactivated) {
 			// Load translation files required by the page
 			$langs->loadLangs(array("boxes", "projects"));
 
@@ -1213,15 +1224,19 @@ class FormOther
 
 			// Define $box_max_lines
 			$box_max_lines = 5;
-			if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
+			if (!empty($conf->global->MAIN_BOXES_MAXLINES)) {
+				$box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
+			}
 
 			$ii = 0;
-			foreach ($boxactivated as $key => $box)
-			{
-				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
-				if (preg_match('/^A/i', $box->box_order)) // column A
-				{
+			foreach ($boxactivated as $key => $box) {
+				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {
+					continue;
+				}
+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {
+					$box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
+				}
+				if (preg_match('/^A/i', $box->box_order)) { // column A
 					$ii++;
 					//print 'box_id '.$boxactivated[$ii]->box_id.' ';
 					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
@@ -1231,8 +1246,7 @@ class FormOther
 				}
 			}
 
-			if ($conf->browser->layout != 'phone')
-			{
+			if ($conf->browser->layout != 'phone') {
 				$emptybox->box_id = 'A';
 				$emptybox->info_box_head = array();
 				$emptybox->info_box_contents = array();
@@ -1243,12 +1257,14 @@ class FormOther
 			$boxlistb .= "\n<!-- Box right container -->\n";
 
 			$ii = 0;
-			foreach ($boxactivated as $key => $box)
-			{
-				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
-				if (preg_match('/^B/i', $box->box_order)) // colonne B
-				{
+			foreach ($boxactivated as $key => $box) {
+				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) {
+					continue;
+				}
+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) {
+					$box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
+				}
+				if (preg_match('/^B/i', $box->box_order)) { // colonne B
 					$ii++;
 					//print 'box_id '.$boxactivated[$ii]->box_id.' ';
 					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
@@ -1258,8 +1274,7 @@ class FormOther
 				}
 			}
 
-			if ($conf->browser->layout != 'phone')
-			{
+			if ($conf->browser->layout != 'phone') {
 				$emptybox->box_id = 'B';
 				$emptybox->info_box_head = array();
 				$emptybox->info_box_contents = array();
@@ -1299,23 +1314,18 @@ class FormOther
 
 		dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			if ($num)
-			{
+			if ($num) {
 				print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-				if ($useempty == 1 || ($useempty == 2 && $num > 1))
-				{
+				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
 					print '<option value="-1">&nbsp;</option>';
 				}
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
-					if ($selected == $obj->rowid || $selected == $obj->$keyfield)
-					{
+					if ($selected == $obj->rowid || $selected == $obj->$keyfield) {
 						print '<option value="'.$obj->$keyfield.'" selected>';
 					} else {
 						print '<option value="'.$obj->$keyfield.'">';
@@ -1348,8 +1358,7 @@ class FormOther
 		global $langs;
 
 		$automatic = "automatic"; $manual = "manual";
-		if ($option)
-		{
+		if ($option) {
 			$automatic = "1";
 			$manual = "0";
 		}
@@ -1357,13 +1366,14 @@ class FormOther
 		$disabled = ($disabled ? ' disabled' : '');
 
 		$resultautomanual = '<select class="flat width100" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
-		if ($useempty) $resultautomanual .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";
-		if (("$value" == 'automatic') || ($value == 1))
-		{
+		if ($useempty) {
+			$resultautomanual .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";
+		}
+		if (("$value" == 'automatic') || ($value == 1)) {
 			$resultautomanual .= '<option value="'.$automatic.'" selected>'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'">'.$langs->trans("Manual").'</option>'."\n";
 		} else {
-	   		$selected = (($useempty && $value != '0' && $value != 'manual') ? '' : ' selected');
+			$selected = (($useempty && $value != '0' && $value != 'manual') ? '' : ' selected');
 			$resultautomanual .= '<option value="'.$automatic.'">'.$langs->trans("Automatic").'</option>'."\n";
 			$resultautomanual .= '<option value="'.$manual.'"'.$selected.'>'.$langs->trans("Manual").'</option>'."\n";
 		}
@@ -1396,12 +1406,24 @@ class FormOther
 			if (!$val['measure']) {
 				if (in_array($key, array(
 					'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
-					'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) continue;
-				if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) continue;
-				if (isset($val['visible']) && !dol_eval($val['visible'], 1)) continue;
-				if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) continue;
-				if (preg_match('/^pass/', $key)) continue;
-				if (in_array($val['type'], array('html', 'text'))) continue;
+					'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
+					continue;
+				}
+				if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) {
+					continue;
+				}
+				if (isset($val['visible']) && !dol_eval($val['visible'], 1)) {
+					continue;
+				}
+				if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
+					continue;
+				}
+				if (preg_match('/^pass/', $key)) {
+					continue;
+				}
+				if (in_array($val['type'], array('html', 'text'))) {
+					continue;
+				}
 				if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
 					$arrayofgroupby['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>', 'position' => $val['position'].'-y');
 					$arrayofgroupby['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>', 'position' => $val['position'].'-m');
@@ -1414,8 +1436,12 @@ class FormOther
 		// Add extrafields to Group by
 		if ($object->isextrafieldmanaged) {
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
-				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;
+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
+					continue;
+				}
+				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
+					continue;
+				}
 				$arrayofgroupby['te.'.$key] = array('label' => $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]), 'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
 			}
 		}
@@ -1454,12 +1480,24 @@ class FormOther
 			if (!$val['measure']) {
 				if (in_array($key, array(
 					'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
-					'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) continue;
-				if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) continue;
-				if (isset($val['visible']) && !dol_eval($val['visible'], 1)) continue;
-				if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) continue;
-				if (preg_match('/^pass/', $key)) continue;
-				if (in_array($val['type'], array('html', 'text'))) continue;
+					'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
+					continue;
+				}
+				if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) {
+					continue;
+				}
+				if (isset($val['visible']) && !dol_eval($val['visible'], 1)) {
+					continue;
+				}
+				if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
+					continue;
+				}
+				if (preg_match('/^pass/', $key)) {
+					continue;
+				}
+				if (in_array($val['type'], array('html', 'text'))) {
+					continue;
+				}
 				if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
 					$arrayofxaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position'].'-y');
 					$arrayofxaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position'].'-m');
@@ -1473,8 +1511,12 @@ class FormOther
 		// Add extrafields to X-Axis
 		if ($object->isextrafieldmanaged) {
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
-				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;
+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
+					continue;
+				}
+				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
+					continue;
+				}
 				$arrayofxaxis['te.'.$key] = array('label' => $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]), 'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
 			}
 		}
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index f246342a17e..21f8b2684fe 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -78,12 +78,10 @@ class FormProjets
 
 		$out = '';
 
-		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))
-		{
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
 			$placeholder = '';
 
-			if ($selected && empty($selected_input_value))
-			{
+			if ($selected && empty($selected_input_value)) {
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$project = new Project($this->db);
 				$project->fetch($selected);
@@ -100,20 +98,21 @@ class FormProjets
 		} else {
 			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
 		}
-		if ($discard_closed > 0)
-		{
-			if (class_exists('Form'))
-			{
-				if (!is_object($form)) $form = new Form($this->db);
+		if ($discard_closed > 0) {
+			if (class_exists('Form')) {
+				if (!is_object($form)) {
+					$form = new Form($this->db);
+				}
 				$out .= $form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
 			}
 		}
 
-		if (empty($nooutput))
-		{
+		if (empty($nooutput)) {
 			print $out;
 			return '';
-		} else return $out;
+		} else {
+			return $out;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -144,17 +143,20 @@ class FormProjets
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($htmlid)) $htmlid = $htmlname;
+		if (empty($htmlid)) {
+			$htmlid = $htmlname;
+		}
 
 		$out = '';
 		$outarray = array();
 
 		$hideunselectables = false;
-		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+			$hideunselectables = true;
+		}
 
 		$projectsListId = false;
-		if (empty($user->rights->projet->all->lire))
-		{
+		if (empty($user->rights->projet->all->lire)) {
 			$projectstatic = new Project($this->db);
 			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		}
@@ -163,27 +165,30 @@ class FormProjets
 		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
 		$sql .= " WHERE p.entity IN (".getEntity('project').")";
-		if ($projectsListId !== false) $sql .= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)
-		{
-			if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-			elseif ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-			{
+		if ($projectsListId !== false) {
+			$sql .= " AND p.rowid IN (".$projectsListId.")";
+		}
+		if ($socid == 0) {
+			$sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		}
+		if ($socid > 0) {
+			if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+				$sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+			} elseif ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') {    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 				$sql .= " AND (p.fk_soc IN (".$socid.", ".((int) $conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY).") OR p.fk_soc IS NULL)";
 			}
 		}
-		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
+		if (!empty($filterkey)) {
+			$sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
+		}
 		$sql .= " ORDER BY p.ref ASC";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Use select2 selector
-			if (!empty($conf->use_javascript_ajax))
-			{
+			if (!empty($conf->use_javascript_ajax)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-			   	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
+				$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
 				$out .= $comboenhancement;
 				$morecss .= ' minwidth100';
 			}
@@ -196,18 +201,14 @@ class FormProjets
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
-					{
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire) {
 						// Do nothing
 					} else {
-						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
-						{
+						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) { // We discard closed except if selected
 							$i++;
 							continue;
 						}
@@ -216,39 +217,39 @@ class FormProjets
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						$labeltoshow .= ', '.dol_trunc($obj->title, $maxlength);
-						if ($obj->name)
-						{
+						if ($obj->name) {
 							$labeltoshow .= ' - '.$obj->name;
-							if ($obj->name_alias) $labeltoshow .= ' ('.$obj->name_alias.')';
+							if ($obj->name_alias) {
+								$labeltoshow .= ' ('.$obj->name_alias.')';
+							}
 						}
 
 						$disabled = 0;
-						if ($obj->fk_statut == 0)
-						{
+						if ($obj->fk_statut == 0) {
 							$disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("Draft");
-						} elseif ($obj->fk_statut == 2)
-						{
-							if ($discard_closed == 2) $disabled = 1;
+						} elseif ($obj->fk_statut == 2) {
+							if ($discard_closed == 2) {
+								$disabled = 1;
+							}
 							$labeltoshow .= ' - '.$langs->trans("Closed");
-						} elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
-						{
+						} elseif (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 							$disabled = 1;
 							$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 						}
 
-						if (!empty($selected) && $selected == $obj->rowid)
-						{
+						if (!empty($selected) && $selected == $obj->rowid) {
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
 						} else {
-							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
-							{
+							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {
 								$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 .= '>';
@@ -274,12 +275,15 @@ class FormProjets
 			$this->db->free($resql);
 
 			if (!$mode) {
-				if (empty($option_only)) $out .= '</select>';
-				if (empty($nooutput))
-				{
+				if (empty($option_only)) {
+					$out .= '</select>';
+				}
+				if (empty($nooutput)) {
 					print $out;
 					return '';
-				} else return $out;
+				} else {
+					return $out;
+				}
 			} else {
 				return $outarray;
 			}
@@ -313,20 +317,19 @@ class FormProjets
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (is_null($usertofilter))
-		{
+		if (is_null($usertofilter)) {
 			$usertofilter = $user;
 		}
 
 		$out = '';
 
 		$hideunselectables = false;
-		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+			$hideunselectables = true;
+		}
 
-		if (empty($projectsListId))
-		{
-			if (empty($usertofilter->rights->projet->all->lire))
-			{
+		if (empty($projectsListId)) {
+			if (empty($usertofilter->rights->projet->all->lire)) {
 				$projectstatic = new Project($this->db);
 				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertofilter, 0, 1);
 			}
@@ -340,17 +343,21 @@ class FormProjets
 		$sql .= ' '.MAIN_DB_PREFIX.'projet_task as t';
 		$sql .= " WHERE p.entity IN (".getEntity('project').")";
 		$sql .= " AND t.fk_projet = p.rowid";
-		if ($projectsListId) $sql .= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		if ($projectsListId) {
+			$sql .= " AND p.rowid IN (".$projectsListId.")";
+		}
+		if ($socid == 0) {
+			$sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		}
+		if ($socid > 0) {
+			$sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		}
 		$sql .= " ORDER BY p.ref, t.ref ASC";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Use select2 selector
-			if (empty($option_only) && !empty($conf->use_javascript_ajax))
-			{
+			if (empty($option_only) && !empty($conf->use_javascript_ajax)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
 				$out .= $comboenhancement;
@@ -366,24 +373,22 @@ class FormProjets
 					//if (! empty($conf->use_javascript_ajax)) $out .= '<span class="opacitymedium">aaa';
 					$out .= $show_empty;
 					//if (! empty($conf->use_javascript_ajax)) $out .= '</span>';
-				} else $out .= '&nbsp;';
+				} else {
+					$out .= '&nbsp;';
+				}
 				$out .= '</option>';
 			}
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
+			if ($num) {
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire))
-					{
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($usertofilter->rights->societe->lire)) {
 						// Do nothing
 					} else {
-						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED)
-						{
+						if ($discard_closed == 1 && $obj->fk_statut == Project::STATUS_CLOSED) {
 							$i++;
 							continue;
 						}
@@ -391,19 +396,17 @@ class FormProjets
 						$labeltoshow = ''; $titletoshow = '';
 
 						$disabled = 0;
-						if ($obj->fk_statut == Project::STATUS_DRAFT)
-						{
+						if ($obj->fk_statut == Project::STATUS_DRAFT) {
 							$disabled = 1;
-						} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
-						{
-							if ($discard_closed == 2) $disabled = 1;
-						} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
-						{
+						} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {
+							if ($discard_closed == 2) {
+								$disabled = 1;
+							}
+						} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
 							$disabled = 1;
 						}
 
-						if ($showproject == 'all')
-						{
+						if ($showproject == 'all') {
 							$labeltoshow .= dol_trunc($obj->ref, 18); // Project ref
 							//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 							//else $labeltoshow.=' ('.$langs->trans("Private").')';
@@ -421,7 +424,9 @@ class FormProjets
 								$labeltoshow .= ' - '.$langs->trans("Draft");
 								$titletoshow .= ' -  <span class="opacitymedium">'.$langs->trans("Draft").'</span>';
 							} elseif ($obj->fk_statut == Project::STATUS_CLOSED) {
-								if ($discard_closed == 2) $disabled = 1;
+								if ($discard_closed == 2) {
+									$disabled = 1;
+								}
 								$labeltoshow .= ' - '.$langs->trans("Closed");
 								$titletoshow .= ' - <span class="opacitymedium">'.$langs->trans("Closed").'</span>';
 							} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid)) {
@@ -437,19 +442,19 @@ class FormProjets
 						$labeltoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
 						$titletoshow .= $obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
 
-						if (!empty($selected) && $selected == $obj->rowid)
-						{
+						if (!empty($selected) && $selected == $obj->rowid) {
 							$out .= '<option value="'.$obj->rowid.'" selected';
 							$out .= ' data-html="'.dol_escape_htmltag($titletoshow).'"';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out .= '>'.$labeltoshow.'</option>';
 						} else {
-							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
-							{
+							if ($hideunselectables && $disabled && ($selected != $obj->rowid)) {
 								$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 .= ' data-html="'.dol_escape_htmltag($titletoshow).'"';
@@ -494,16 +499,19 @@ class FormProjets
 		// phpcs:enable
 		global $conf, $langs;
 
-		if ($table_element == 'projet_task') return ''; // Special cas of element we never link to a project (already always done)
+		if ($table_element == 'projet_task') {
+			return ''; // Special cas of element we never link to a project (already always done)
+		}
 
 		$linkedtothirdparty = false;
-		if (!in_array($table_element, array('don', 'expensereport_det', 'expensereport', 'loan', 'stock_mouvement', 'payment_salary', 'payment_various', 'chargesociales'))) $linkedtothirdparty = true;
+		if (!in_array($table_element, array('don', 'expensereport_det', 'expensereport', 'loan', 'stock_mouvement', 'payment_salary', 'payment_various', 'chargesociales'))) {
+			$linkedtothirdparty = true;
+		}
 
 		$sqlfilter = '';
 
 		//print $table_element;
-		switch ($table_element)
-		{
+		switch ($table_element) {
 			case "loan":
 				$sql = "SELECT t.rowid, t.label as ref";
 				break;
@@ -551,36 +559,49 @@ class FormProjets
 				$sql = "SELECT t.rowid, t.ref";
 				break;
 		}
-		if ($linkedtothirdparty) $sql .= ", s.nom as name";
-		$sql .= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
-		if ($linkedtothirdparty) $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-		$sql .= " WHERE ".$projectkey." is null";
-		if (!empty($socid) && $linkedtothirdparty)
-		{
-			if (is_numeric($socid)) $sql .= " AND t.fk_soc=".$socid;
-			else $sql .= " AND t.fk_soc IN (".$socid.")";
+		if ($linkedtothirdparty) {
+			$sql .= ", s.nom as name";
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
+		if ($linkedtothirdparty) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		}
+		$sql .= " WHERE ".$projectkey." is null";
+		if (!empty($socid) && $linkedtothirdparty) {
+			if (is_numeric($socid)) {
+				$sql .= " AND t.fk_soc=".$socid;
+			} else {
+				$sql .= " AND t.fk_soc IN (".$socid.")";
+			}
+		}
+		if (!in_array($table_element, array('expensereport_det', 'stock_mouvement'))) {
+			$sql .= ' AND t.entity IN ('.getEntity('project').')';
+		}
+		if ($linkedtothirdparty) {
+			$sql .= " AND s.rowid = t.fk_soc";
+		}
+		if ($sqlfilter) {
+			$sql .= " AND ".$sqlfilter;
 		}
-		if (!in_array($table_element, array('expensereport_det', 'stock_mouvement'))) $sql .= ' AND t.entity IN ('.getEntity('project').')';
-		if ($linkedtothirdparty) $sql .= " AND s.rowid = t.fk_soc";
-		if ($sqlfilter) $sql .= " AND ".$sqlfilter;
 		$sql .= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$sellist = '<select class="flat elementselect css'.$table_element.($morecss ? ' '.$morecss : '').'" name="elementselect">';
 				$sellist .= '<option value="-1"></option>';
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$ref = $obj->ref ? $obj->ref : $obj->rowid;
-					if (!empty($obj->ref_supplier)) $ref .= ' ('.$obj->ref_supplier.')';
-					if (!empty($obj->name)) $ref .= ' - '.$obj->name;
+					if (!empty($obj->ref_supplier)) {
+						$ref .= ' ('.$obj->ref_supplier.')';
+					}
+					if (!empty($obj->name)) {
+						$ref .= ' - '.$obj->name;
+					}
 					$sellist .= '<option value="'.$obj->rowid.'">'.$ref.'</option>';
 					$i++;
 				}
@@ -629,12 +650,10 @@ class FormProjets
 		$sql .= " ORDER BY position";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$sellist = '<select class="flat oppstatus'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
 				if ($showempty) {
 					// Without &nbsp, strange move of screen when switching value
@@ -646,19 +665,21 @@ class FormProjets
 					$sellist .= '<option value="notopenedopp"'.($preselected == 'notopenedopp' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotOpenedOpportunitiesShort").' --</option>';
 					$sellist .= '<option value="none"'.($preselected == 'none' ? ' selected="selected"' : '').'>-- '.$langs->trans("NotAnOpportunityShort").' --</option>';
 				}
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 
 					$sellist .= '<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
-					if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';
+					if ($obj->rowid == $preselected) {
+						$sellist .= ' selected="selected"';
+					}
 					$sellist .= '>';
-					if ($useshortlabel)
-					{
+					if ($useshortlabel) {
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
 					} else {
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-						if ($showpercent) $finallabel .= ' ('.$obj->percent.'%)';
+						if ($showpercent) {
+							$finallabel .= ' ('.$obj->percent.'%)';
+						}
 					}
 					$sellist .= $finallabel;
 					$sellist .= '</option>';
@@ -666,9 +687,13 @@ class FormProjets
 				}
 				$sellist .= '</select>';
 
-				if ($user->admin && !$noadmininfo) $sellist .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				if ($user->admin && !$noadmininfo) {
+					$sellist .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				}
 
-				if ($addcombojs) $sellist .= ajax_combobox($htmlname);
+				if ($addcombojs) {
+					$sellist .= ajax_combobox($htmlname);
+				}
 			}
 			/*else
 			{
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index 78a35a5dd50..b78ff5cfa8e 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -84,14 +84,11 @@ class FormPropal
 			$sql .= " WHERE active = 1";
 			dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $this->db->num_rows($resql);
 				$i = 0;
-				if ($num)
-				{
-					while ($i < $num)
-					{
+				if ($num) {
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($resql);
 						$listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);
 						$i++;
@@ -103,31 +100,30 @@ class FormPropal
 		}
 
 		print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
-		if ($showempty) print '<option value="-1">&nbsp;</option>';
+		if ($showempty) {
+			print '<option value="-1">&nbsp;</option>';
+		}
 
-		foreach ($listofstatus as $key => $obj)
-		{
-			if ($excludedraft)
-			{
-				if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
-				{
+		foreach ($listofstatus as $key => $obj) {
+			if ($excludedraft) {
+				if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT') {
 					$i++;
 					continue;
 				}
 			}
-			if ($selected != '' && $selected == $obj['id'])
-			{
+			if ($selected != '' && $selected == $obj['id']) {
 				print '<option value="'.$obj['id'].'" selected>';
 			} else {
 				print '<option value="'.$obj['id'].'">';
 			}
 			$key = $obj['code'];
-			if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
-			{
+			if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) {
 				print $langs->trans($prefix.$key.($short ? 'Short' : ''));
 			} else {
 				$conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
-				if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
+				if (!empty($conv_to_new_code[$obj['code']])) {
+					$key = $conv_to_new_code[$obj['code']];
+				}
 
 				print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);
 			}
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 96156ef3fd2..ac69ca5ce26 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -112,14 +112,15 @@ class FormSms
 	 // phpcs:enable
 		global $conf, $langs, $user, $form;
 
-		if (!is_object($form)) $form = new Form($this->db);
+		if (!is_object($form)) {
+			$form = new Form($this->db);
+		}
 
 		// Load translation files required by the page
 		$langs->loadLangs(array('other', 'mails', 'sms'));
 
 		$soc = new Societe($this->db);
-		if (!empty($this->withtosocid) && $this->withtosocid > 0)
-		{
+		if (!empty($this->withtosocid) && $this->withtosocid > 0) {
 			$soc->fetch($this->withtosocid);
 		}
 
@@ -138,22 +139,21 @@ function limitChars(textarea, limit, infodiv)
 }
 </script>';
 
-		if ($showform) print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+		if ($showform) {
+			print "<form method=\"POST\" name=\"smsform\" enctype=\"multipart/form-data\" action=\"".$this->param["returnurl"]."\">\n";
+		}
 
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		foreach ($this->param as $key=>$value)
-		{
+		foreach ($this->param as $key => $value) {
 			print "<input type=\"hidden\" name=\"$key\" value=\"$value\">\n";
 		}
 		print "<table class=\"border centpercent\">\n";
 
 		// Substitution array
-		if (!empty($this->withsubstit))		// Unset or set ->withsubstit=0 to disable this.
-		{
+		if (!empty($this->withsubstit)) {		// Unset or set ->withsubstit=0 to disable this.
 			print "<tr><td colspan=\"2\">";
 			$help = "";
-			foreach ($this->substit as $key => $val)
-			{
+			foreach ($this->substit as $key => $val) {
 				$help .= $key.' -> '.$langs->trans($val).'<br>';
 			}
 			print $form->textwithpicto($langs->trans("SmsTestSubstitutionReplacedByGenericValues"), $help);
@@ -161,27 +161,22 @@ function limitChars(textarea, limit, infodiv)
 		}
 
 		// From
-		if ($this->withfrom)
-		{
-			if ($this->withfromreadonly)
-			{
+		if ($this->withfrom) {
+			if ($this->withfromreadonly) {
 				print '<tr><td class="titlefield '.$morecss.'">'.$langs->trans("SmsFrom");
 				print '<input type="hidden" name="fromsms" value="'.$this->fromsms.'">';
 				print "</td><td>";
-				if ($this->fromtype == 'user')
-				{
+				if ($this->fromtype == 'user') {
 					$langs->load("users");
 					$fuser = new User($this->db);
 					$fuser->fetch($this->fromid);
 					print $fuser->getNomUrl(1);
 					print ' &nbsp; ';
 				}
-				if ($this->fromsms)
-				{
+				if ($this->fromsms) {
 					print $this->fromsms;
 				} else {
-					if ($this->fromtype)
-					{
+					if ($this->fromtype) {
 						$langs->load("errors");
 						print '<font class="warning"> &lt;'.$langs->trans("ErrorNoPhoneDefinedForThisUser").'&gt; </font>';
 					}
@@ -191,38 +186,32 @@ function limitChars(textarea, limit, infodiv)
 			} else {
 				print '<tr><td class="'.$morecss.'">'.$langs->trans("SmsFrom")."</td><td>";
 				//print '<input type="text" name="fromname" size="30" value="'.$this->fromsms.'">';
-				if ($conf->global->MAIN_SMS_SENDMODE == 'ovh')        // For backward compatibility        @deprecated
-				{
+				if ($conf->global->MAIN_SMS_SENDMODE == 'ovh') {        // For backward compatibility        @deprecated
 					dol_include_once('/ovh/class/ovhsms.class.php');
 					try {
 						$sms = new OvhSms($this->db);
-						if (empty($conf->global->OVHSMS_ACCOUNT))
-						{
+						if (empty($conf->global->OVHSMS_ACCOUNT)) {
 							$resultsender = 'ErrorOVHSMS_ACCOUNT not defined';
 						} else {
 							$resultsender = $sms->SmsSenderList();
 						}
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
 					}
-				} elseif (!empty($conf->global->MAIN_SMS_SENDMODE))    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
-				{
+				} elseif (!empty($conf->global->MAIN_SMS_SENDMODE)) {    // $conf->global->MAIN_SMS_SENDMODE looks like a value 'class@module'
 					$tmp = explode('@', $conf->global->MAIN_SMS_SENDMODE);
 					$classfile = $tmp[0]; $module = (empty($tmp[1]) ? $tmp[0] : $tmp[1]);
 					dol_include_once('/'.$module.'/class/'.$classfile.'.class.php');
 					try {
 						$classname = ucfirst($classfile);
-						if (class_exists($classname))
-						{
+						if (class_exists($classname)) {
 							$sms = new $classname($this->db);
 							$resultsender = $sms->SmsSenderList();
 						} else {
 							$sms = new stdClass();
 							$sms->error = 'The SMS manager "'.$classfile.'" defined into SMS setup MAIN_SMS_SENDMODE is not found';
 						}
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						dol_print_error('', 'Error to get list of senders: '.$e->getMessage());
 						exit;
 					}
@@ -232,17 +221,17 @@ function limitChars(textarea, limit, infodiv)
 					$resultsender[0]->number = $this->fromsms;
 				}
 
-				if (is_array($resultsender) && count($resultsender) > 0)
-				{
+				if (is_array($resultsender) && count($resultsender) > 0) {
 					print '<select name="fromsms" id="fromsms" class="flat">';
-					foreach ($resultsender as $obj)
-					{
+					foreach ($resultsender as $obj) {
 						print '<option value="'.$obj->number.'">'.$obj->number.'</option>';
 					}
 					print '</select>';
 				} else {
 					print '<span class="error">'.$langs->trans("SmsNoPossibleSenderFound");
-					if (is_object($sms) && !empty($sms->error)) print ' '.$sms->error;
+					if (is_object($sms) && !empty($sms->error)) {
+						print ' '.$sms->error;
+					}
 					print '</span>';
 				}
 				print '</td>';
@@ -251,23 +240,19 @@ function limitChars(textarea, limit, infodiv)
 		}
 
 		// To (target)
-		if ($this->withto || is_array($this->withto))
-		{
+		if ($this->withto || is_array($this->withto)) {
 			print '<tr><td>';
 			//$moretext=$langs->trans("YouCanUseCommaSeparatorForSeveralRecipients");
 			$moretext = '';
 			print $form->textwithpicto($langs->trans("SmsTo"), $moretext);
 			print '</td><td>';
-			if ($this->withtoreadonly)
-			{
+			if ($this->withtoreadonly) {
 				print (!is_array($this->withto) && !is_numeric($this->withto)) ? $this->withto : "";
 			} else {
 				print "<input size=\"16\" id=\"sendto\" name=\"sendto\" value=\"".dol_escape_htmltag(!is_array($this->withto) && $this->withto != '1' ? (isset($_REQUEST["sendto"]) ?GETPOST("sendto") : $this->withto) : "+")."\">";
-				if (!empty($this->withtosocid) && $this->withtosocid > 0)
-				{
+				if (!empty($this->withtosocid) && $this->withtosocid > 0) {
 					$liste = array();
-					foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value)
-					{
+					foreach ($soc->thirdparty_and_contact_phone_array() as $key => $value) {
 						$liste[$key] = $value;
 					}
 					print " ".$langs->trans("or")." ";
@@ -280,22 +265,21 @@ function limitChars(textarea, limit, infodiv)
 		}
 
 		// Message
-		if ($this->withbody)
-		{
+		if ($this->withbody) {
 			$defaultmessage = '';
-			if ($this->param["models"] == 'body')
-			{
+			if ($this->param["models"] == 'body') {
 				$defaultmessage = $this->withbody;
 			}
 			$defaultmessage = make_substitutions($defaultmessage, $this->substit);
-			if (GETPOSTISSET("message")) $defaultmessage = GETPOST("message", 'restricthtml');
+			if (GETPOSTISSET("message")) {
+				$defaultmessage = GETPOST("message", 'restricthtml');
+			}
 			$defaultmessage = str_replace('\n', "\n", $defaultmessage);
 
 			print "<tr>";
 			print '<td class="tdtop">'.$langs->trans("SmsText")."</td>";
 			print "<td>";
-			if ($this->withbodyreadonly)
-			{
+			if ($this->withbodyreadonly) {
 				print nl2br($defaultmessage);
 				print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
 			} else {
@@ -335,12 +319,10 @@ function limitChars(textarea, limit, infodiv)
 		print "</table>\n";
 
 
-		if ($showform)
-		{
+		if ($showform) {
 			print '<div class="center">';
 			print '<input class="button" type="submit" name="sendmail" value="'.dol_escape_htmltag($langs->trans("SendSms")).'">';
-			if ($this->withcancel)
-			{
+			if ($this->withcancel) {
 				print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 				print '<input class="button button-cancel" type="submit" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 			}
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index ea96f393525..8a40eed9da8 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -67,14 +67,12 @@ class FormSocialContrib
 		// phpcs:enable
 		global $conf, $db, $langs, $user, $mysoc;
 
-		if (empty($mysoc->country_id) && empty($mysoc->country_code))
-		{
+		if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
 			print $langs->trans("ErrorSetupOfCountryMustBeDone");
 			return;
 		}
 
-		if (!empty($mysoc->country_id))
-		{
+		if (!empty($mysoc->country_id)) {
 			$sql = "SELECT c.id, c.libelle as type";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
 			$sql .= " WHERE c.active = 1";
@@ -90,28 +88,35 @@ class FormSocialContrib
 
 		dol_syslog("Form::select_type_socialcontrib", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				print '<select class="'.($morecss ? $morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
 				$i = 0;
 
-				if ($useempty) print '<option value="0">&nbsp;</option>';
-				while ($i < $num)
-				{
+				if ($useempty) {
+					print '<option value="0">&nbsp;</option>';
+				}
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					print '<option value="'.$obj->id.'"';
-					if ($obj->id == $selected) print ' selected';
+					if ($obj->id == $selected) {
+						print ' selected';
+					}
 					print '>'.dol_trunc($obj->type, $maxlen);
 					$i++;
 				}
 				print '</select>';
-				if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
-				if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
+				if ($user->admin && $help) {
+					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				}
+				if (!empty($conf->use_javascript_ajax)) {
+					print ajax_combobox($htmlname);
+				}
 			} else {
-				if (empty($noerrorifempty)) print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
+				if (empty($noerrorifempty)) {
+					print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
+				}
 			}
 		} else {
 			dol_print_error($this->db);
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index c1837af4c56..c220e890a2d 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -150,7 +150,9 @@ class FormTicket
 
 		print "\n<!-- Begin form TICKET -->\n";
 
-		if ($withdolfichehead) print dol_get_fiche_head(null, 'card', '', 0, '');
+		if ($withdolfichehead) {
+			print dol_get_fiche_head(null, 'card', '', 0, '');
+		}
 
 		print '<form method="POST" '.($withdolfichehead ? '' : 'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -236,8 +238,7 @@ class FormTicket
 
 		// If public form, display more information
 		$toolbarname = 'dolibarr_notes';
-		if ($this->ispublic)
-		{
+		if ($this->ispublic) {
 			$toolbarname = 'dolibarr_details';
 			print '<div class="warning">'.($conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe')).'</div>';
 		}
@@ -410,16 +411,14 @@ class FormTicket
 			}
 
 			// Notify thirdparty at creation
-			if (empty($this->ispublic))
-			{
+			if (empty($this->ispublic)) {
 				print '<tr><td><label for="notify_tiers_at_create">'.$langs->trans("TicketNotifyTiersAtCreation").'</label></td><td>';
 				print '<input type="checkbox" id="notify_tiers_at_create" name="notify_tiers_at_create"'.($this->withnotifytiersatcreate ? ' checked="checked"' : '').'>';
 				print '</td></tr>';
 			}
 		}
 
-		if (!empty($conf->projet->enabled) && !$this->ispublic)
-		{
+		if (!empty($conf->projet->enabled) && !$this->ispublic) {
 			$formproject = new FormProjets($this->db);
 			print '<tr><td><label for="project"><span class="">'.$langs->trans("Project").'</span></label></td><td>';
 			print img_picto('', 'project').$formproject->select_projects(-1, GETPOST('projectid', 'int'), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
@@ -429,14 +428,15 @@ class FormTicket
 		// Other attributes
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $ticketstat, $this->action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			print $ticketstat->showOptionals($extrafields, 'create');
 		}
 
 		print '</table>';
 
-		if ($withdolfichehead) print dol_get_fiche_end();
+		if ($withdolfichehead) {
+			print dol_get_fiche_end();
+		}
 
 		print '<div class="center">';
 		print '<input class="button" type="submit" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")).'" />';
@@ -761,7 +761,9 @@ class FormTicket
 		// Set tmp user directory
 		$vardir = $conf->user->dir_output."/".$user->id;
 		$upload_dir = $vardir.'/temp/'; // TODO Add $keytoavoidconflict in upload_dir path
-		if (is_dir($upload_dir)) dol_delete_dir_recursive($upload_dir);
+		if (is_dir($upload_dir)) {
+			dol_delete_dir_recursive($upload_dir);
+		}
 
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 		unset($_SESSION["listofpaths".$keytoavoidconflict]);
@@ -782,23 +784,25 @@ class FormTicket
 		$formmail = new FormMail($this->db);
 		$addfileaction = 'addfile';
 
-		if (!is_object($form)) $form = new Form($this->db);
+		if (!is_object($form)) {
+			$form = new Form($this->db);
+		}
 
 		// Load translation files required by the page
 		$langs->loadLangs(array('other', 'mails'));
 
 		// Clear temp files. Must be done at beginning, before call of triggers
-		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
-		{
+		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
 			$this->clear_attached_files();
 		}
 
 		// Define output language
 		$outputlangs = $langs;
 		$newlang = '';
-		if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $this->param['langsmodels'];
-		if (!empty($newlang))
-		{
+		if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+			$newlang = $this->param['langsmodels'];
+		}
+		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 			$outputlangs->load('other');
@@ -806,11 +810,9 @@ class FormTicket
 
 		// Get message template for $this->param["models"] into c_email_templates
 		$arraydefaultmessage = -1;
-		if ($this->param['models'] != 'none')
-		{
+		if ($this->param['models'] != 'none') {
 			$model_id = 0;
-			if (array_key_exists('models_id', $this->param))
-			{
+			if (array_key_exists('models_id', $this->param)) {
 				$model_id = $this->param["models_id"];
 			}
 
@@ -823,20 +825,23 @@ class FormTicket
 		$listofmimes = array();
 		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 
-		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1'))
-		{
-			if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit']))
-			{
-				foreach ($this->param['fileinit'] as $file)
-				{
+		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
+			if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit'])) {
+				foreach ($this->param['fileinit'] as $file) {
 					$this->add_attached_files($file, basename($file), dol_mimetype($file));
 				}
 			}
 		}
 
-		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+			$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+			$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+		}
+		if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+			$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+		}
 
 		// Define output language
 		$outputlangs = $langs;
@@ -902,8 +907,7 @@ class FormTicket
 		print '<table class="border" width="'.$width.'">';
 
 		// External users can't send message email
-		if ($user->rights->ticket->write && !$user->socid)
-		{
+		if ($user->rights->ticket->write && !$user->socid) {
 			print '<tr><td></td><td>';
 			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : '');
 			print '<input type="checkbox" name="send_email" value="1" id="send_msg_email" '.$checkbox_selected.'/> ';
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 8cbb7967415..9f1afab13f7 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -68,21 +68,17 @@ class FormWebsite
 		$sql .= " WHERE 1 = 1";
 		$sql .= " ORDER BY rowid";
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
-			if ($useempty)
-			{
+			if ($useempty) {
 				$out .= '<option value="-1">&nbsp;</option>';
 			}
 
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($selected == $obj->rowid)
-				{
+				if ($selected == $obj->rowid) {
 					$out .= '<option value="'.$obj->rowid.'" selected>';
 				} else {
 					$out .= '<option value="'.$obj->rowid.'">';
@@ -123,23 +119,18 @@ class FormWebsite
 
 		dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			if ($num)
-			{
+			if ($num) {
 				print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer minwidth200" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-				if ($useempty == 1 || ($useempty == 2 && $num > 1))
-				{
+				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
 					print '<option value="-1">&nbsp;</option>';
 				}
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
-					if ($selected == $obj->rowid || $selected == $obj->code)
-					{
+					if ($selected == $obj->rowid || $selected == $obj->code) {
 						print '<option value="'.$obj->code.'" selected>';
 					} else {
 						print '<option value="'.$obj->code.'">';
@@ -149,7 +140,9 @@ class FormWebsite
 					$i++;
 				}
 				print "</select>";
-				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				if ($user->admin) {
+					print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+				}
 
 				if ($addjscombo) {
 					print ajax_combobox('select'.$htmlname);
@@ -183,14 +176,14 @@ class FormWebsite
 
 		$arrayofsamples = array();
 		$arrayofsamples['empty'] = 'EmptyPage'; // Always this one first
-		foreach ($listofsamples as $sample)
-		{
+		foreach ($listofsamples as $sample) {
 			$reg = array();
-			if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg))
-			{
+			if (preg_match('/^page-sample-(.*)\.html$/', $sample['name'], $reg)) {
 				$key = $reg[1];
 				$labelkey = ucfirst($key);
-				if ($key == 'empty') $labelkey = 'EmptyPage';
+				if ($key == 'empty') {
+					$labelkey = 'EmptyPage';
+				}
 				$arrayofsamples[$key] = $labelkey;
 			}
 		}
@@ -198,15 +191,12 @@ class FormWebsite
 		$out = '';
 		$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer minwidth200" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 
-		if ($useempty == 1 || $useempty == 2)
-		{
+		if ($useempty == 1 || $useempty == 2) {
 			$out .= '<option value="-1">&nbsp;</option>';
 		}
 
-		foreach ($arrayofsamples as $key => $val)
-		{
-			if ($selected == $key)
-			{
+		foreach ($arrayofsamples as $key => $val) {
+			if ($selected == $key) {
 				$out .= '<option value="'.$key.'" selected>';
 			} else {
 				$out .= '<option value="'.$key.'">';
@@ -244,31 +234,34 @@ class FormWebsite
 		$atleastonepage = (is_array($website->lines) && count($website->lines) > 0);
 
 		$out = '';
-		if ($atleastonepage && $action != 'editsource')
-		{
+		if ($atleastonepage && $action != 'editsource') {
 			$out .= '<select name="'.$htmlname.'" id="'.$htmlname.'" class="maxwidth300'.($morecss ? ' '.$morecss : '').'">';
 		} else {
 			$out .= '<select name="pageidbis" id="pageid" class="maxwidth300'.($morecss ? ' '.$morecss : '').'" disabled="disabled">';
 		}
 
-		if ($showempty || !$atleastonepage) $out .= '<option value="-1">&nbsp;</option>';
+		if ($showempty || !$atleastonepage) {
+			$out .= '<option value="-1">&nbsp;</option>';
+		}
 
-		if ($atleastonepage)
-		{
-			if (empty($pageid) && $action != 'createcontainer')      // Page id is not defined, we try to take one
-			{
+		if ($atleastonepage) {
+			if (empty($pageid) && $action != 'createcontainer') {      // Page id is not defined, we try to take one
 				$firstpageid = 0; $homepageid = 0;
-				foreach ($website->lines as $key => $valpage)
-				{
-					if (empty($firstpageid)) $firstpageid = $valpage->id;
-					if ($website->fk_default_home && $key == $website->fk_default_home) $homepageid = $valpage->id;
+				foreach ($website->lines as $key => $valpage) {
+					if (empty($firstpageid)) {
+						$firstpageid = $valpage->id;
+					}
+					if ($website->fk_default_home && $key == $website->fk_default_home) {
+						$homepageid = $valpage->id;
+					}
 				}
 				$pageid = $homepageid ? $homepageid : $firstpageid; // We choose home page and if not defined yet, we take first page
 			}
 
-			foreach ($website->lines as $key => $valpage)
-			{
-				if (is_array($excludeids) && count($excludeids) && in_array($valpage->id, $excludeids)) continue;
+			foreach ($website->lines as $key => $valpage) {
+				if (is_array($excludeids) && count($excludeids) && in_array($valpage->id, $excludeids)) {
+					continue;
+				}
 
 				$valueforoption = '<span class="opacitymedium">['.$valpage->type_container.' '.sprintf("%03d", $valpage->id).']</span> ';
 				$valueforoption .= $valpage->pageurl.' - '.$valpage->title;
@@ -283,7 +276,9 @@ class FormWebsite
 				}
 
 				$out .= '<option value="'.$key.'"';
-				if ($pageid > 0 && $pageid == $key) $out .= ' selected'; // To preselect a value
+				if ($pageid > 0 && $pageid == $key) {
+					$out .= ' selected'; // To preselect a value
+				}
 				$out .= ' data-html="'.dol_escape_htmltag($valueforoption).'"';
 				$out .= '>';
 				$out .= $valueforoption;
@@ -294,8 +289,7 @@ class FormWebsite
 		}
 		$out .= '</select>';
 
-		if ($atleastonepage && $action != 'editsource')
-		{
+		if ($atleastonepage && $action != 'editsource') {
 			$out .= ajax_combobox($htmlname);
 		} else {
 			$out .= '<input type="hidden" name="'.$htmlname.'" value="'.$pageid.'">';
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index cedcebbd7cf..de44d238726 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -153,11 +153,13 @@ class InfoBox
 						$box->sourcefile = $relsourcefile;
 						$box->class     = $boxname;
 
-						if ($mode == 'activated' && !is_object($user))	// List of activated box was not yet personalized into database
-						{
+						if ($mode == 'activated' && !is_object($user)) {	// List of activated box was not yet personalized into database
 							if (is_numeric($box->box_order)) {
-								if ($box->box_order % 2 == 1) $box->box_order = 'A'.$box->box_order;
-								elseif ($box->box_order % 2 == 0) $box->box_order = 'B'.$box->box_order;
+								if ($box->box_order % 2 == 1) {
+									$box->box_order = 'A'.$box->box_order;
+								} elseif ($box->box_order % 2 == 0) {
+									$box->box_order = 'B'.$box->box_order;
+								}
 							}
 						}
 						// box_def properties
@@ -173,11 +175,12 @@ class InfoBox
 								$tmpenabled = 0; // $tmpenabled is used for the '|' test (OR)
 								foreach ($arrayelem as $module) {
 									$tmpmodule = preg_replace('/@[^@]+/', '', $module);
-									if (!empty($conf->$tmpmodule->enabled)) $tmpenabled = 1;
+									if (!empty($conf->$tmpmodule->enabled)) {
+										$tmpenabled = 1;
+									}
 									//print $boxname.'-'.$module.'-module enabled='.(empty($conf->$tmpmodule->enabled)?0:1).'<br>';
 								}
-								if (empty($tmpenabled))	// We found at least one module required that is disabled
-								{
+								if (empty($tmpenabled)) {	// We found at least one module required that is disabled
 									$enabled = 0;
 									break;
 								}
@@ -186,8 +189,11 @@ class InfoBox
 						//print '=>'.$boxname.'-enabled='.$enabled.'<br>';
 
 						//print 'xx module='.$module.' enabled='.$enabled;
-						if ($enabled && ($includehidden || empty($box->hidden))) $boxes[] = $box;
-						else unset($box);
+						if ($enabled && ($includehidden || empty($box->hidden))) {
+							$boxes[] = $box;
+						} else {
+							unset($box);
+						}
 					} else {
 						dol_syslog("Failed to load box '".$boxname."' into file '".$relsourcefile."'", LOG_WARNING);
 					}
@@ -222,7 +228,9 @@ class InfoBox
 
 		dol_syslog(get_class()."::saveboxorder zone=".$zone." userid=".$userid);
 
-		if (!$userid || $userid == 0) return 0;
+		if (!$userid || $userid == 0) {
+			return 0;
+		}
 
 		$user = new User($db);
 		$user->id = $userid;
@@ -247,11 +255,9 @@ class InfoBox
 
 		dol_syslog(get_class()."::saveboxorder", LOG_DEBUG);
 		$result = $db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$colonnes = explode('-', $boxorder);
-			foreach ($colonnes as $collist)
-			{
+			foreach ($colonnes as $collist) {
 				$part = explode(':', $collist);
 				$colonne = $part[0];
 				$list = $part[1];
@@ -259,10 +265,8 @@ class InfoBox
 
 				$i = 0;
 				$listarray = explode(',', $list);
-				foreach ($listarray as $id)
-				{
-					if (is_numeric($id))
-					{
+				foreach ($listarray as $id) {
+					if (is_numeric($id)) {
 						//dol_syslog("aaaaa".count($listarray));
 						$i++;
 						$ii = sprintf('%02d', $i);
@@ -290,8 +294,7 @@ class InfoBox
 			$error++;
 		}
 
-		if ($error)
-		{
+		if ($error) {
 			$db->rollback();
 			return -2;
 		} else {
diff --git a/htdocs/core/class/interfaces.class.php b/htdocs/core/class/interfaces.class.php
index 534d6b5803e..f442038c51d 100644
--- a/htdocs/core/class/interfaces.class.php
+++ b/htdocs/core/class/interfaces.class.php
@@ -69,19 +69,16 @@ class Interfaces
 	{
 		// phpcs:enable
 		// Check parameters
-		if (!is_object($object) || !is_object($conf))	// Error
-		{
+		if (!is_object($object) || !is_object($conf)) {	// Error
 			$this->error = 'function run_triggers called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf);
 			dol_syslog(get_class($this).'::run_triggers '.$this->error, LOG_ERR);
 			$this->errors[] = $this->error;
 			return -1;
 		}
-		if (!is_object($langs))	// Warning
-		{
+		if (!is_object($langs)) {	// Warning
 			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
 		}
-		if (!is_object($user))	    // Warning
-		{
+		if (!is_object($user)) {	    // Warning
 			dol_syslog(get_class($this).'::run_triggers was called with wrong parameters action='.$action.' object='.is_object($object).' user='.is_object($user).' langs='.is_object($langs).' conf='.is_object($conf), LOG_WARNING);
 			$user = new User($this->db);
 		}
@@ -96,24 +93,22 @@ class Interfaces
 
 
 		$dirtriggers = array_merge(array('/core/triggers'), $conf->modules_parts['triggers']);
-		foreach ($dirtriggers as $reldir)
-		{
+		foreach ($dirtriggers as $reldir) {
 			$dir = dol_buildpath($reldir, 0);
 			$newdir = dol_osencode($dir);
 			//print "xx".$dir;exit;
 
 			// Check if directory exists (we do not use dol_is_dir to avoir loading files.lib.php at each call)
-			if (!is_dir($newdir)) continue;
+			if (!is_dir($newdir)) {
+				continue;
+			}
 
 			$handle = opendir($newdir);
-			if (is_resource($handle))
-			{
+			if (is_resource($handle)) {
 				$fullpathfiles = array();
-				while (($file = readdir($handle)) !== false)
-				{
+				while (($file = readdir($handle)) !== false) {
 					$reg = array();
-					if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg))
-					{
+					if (is_readable($newdir."/".$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php$/i', $file, $reg)) {
 						$part1 = $reg[1];
 						$part2 = $reg[2];
 						$part3 = $reg[3];
@@ -121,26 +116,27 @@ class Interfaces
 						$nbfile++;
 
 						// Check if trigger file is disabled by name
-						if (preg_match('/NORUN$/i', $file)) continue;
+						if (preg_match('/NORUN$/i', $file)) {
+							continue;
+						}
 						// Check if trigger file is for a particular module
 						$qualified = true;
-						if (strtolower($reg[2]) != 'all')
-						{
+						if (strtolower($reg[2]) != 'all') {
 							$module = preg_replace('/^mod/i', '', $reg[2]);
 							$constparam = 'MAIN_MODULE_'.strtoupper($module);
-							if (empty($conf->global->$constparam)) $qualified = false;
+							if (empty($conf->global->$constparam)) {
+								$qualified = false;
+							}
 						}
 
-						if (!$qualified)
-						{
+						if (!$qualified) {
 							//dol_syslog(get_class($this)."::run_triggers action=".$action." Triggers for file '".$file."' need module to be enabled", LOG_DEBUG);
 							continue;
 						}
 
 						$modName = "Interface".ucfirst($reg[3]);
 						//print "file=$file - modName=$modName\n";
-						if (in_array($modName, $modules))    // $modules = list of modName already loaded
-						{
+						if (in_array($modName, $modules)) {    // $modules = list of modName already loaded
 							$langs->load("errors");
 							dol_syslog(get_class($this)."::run_triggers action=".$action." ".$langs->trans("ErrorDuplicateTrigger", $newdir."/".$file, $fullpathfiles[$modName]), LOG_WARNING);
 							continue;
@@ -150,8 +146,7 @@ class Interfaces
 							//print 'Todo for '.$modName." : ".$newdir.'/'.$file."\n";
 							include_once $newdir.'/'.$file;
 							//print 'Done for '.$modName."\n";
-						} catch (Exception $e)
-						{
+						} catch (Exception $e) {
 							dol_syslog('ko for '.$modName." ".$e->getMessage()."\n", LOG_ERR);
 						}
 
@@ -171,14 +166,14 @@ class Interfaces
 		asort($orders);
 
 		// Loop on each trigger
-		foreach ($orders as $key => $value)
-		{
+		foreach ($orders as $key => $value) {
 			$modName = $modules[$key];
-			if (empty($modName)) continue;
+			if (empty($modName)) {
+				continue;
+			}
 
 			$objMod = new $modName($this->db);
-			if ($objMod)
-			{
+			if ($objMod) {
 				$dblevelbefore = $this->db->transaction_opened;
 
 				$result = 0;
@@ -202,25 +197,25 @@ class Interfaces
 					$result = -1;
 				}
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					// Action OK
 					$nbtotal++;
 					$nbok++;
 				}
-				if ($result == 0)
-				{
+				if ($result == 0) {
 					// Aucune action faite
 					$nbtotal++;
 				}
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					// Action KO
 					//dol_syslog("Error in trigger ".$action." - result = ".$result." - Nb of error string returned = ".count($objMod->errors), LOG_ERR);
 					$nbtotal++;
 					$nbko++;
-					if (!empty($objMod->errors)) $this->errors = array_merge($this->errors, $objMod->errors);
-					elseif (!empty($objMod->error))  $this->errors[] = $objMod->error;
+					if (!empty($objMod->errors)) {
+						$this->errors = array_merge($this->errors, $objMod->errors);
+					} elseif (!empty($objMod->error)) {
+						$this->errors[] = $objMod->error;
+					}
 					//dol_syslog("Error in trigger ".$action." - Nb of error string returned = ".count($this->errors), LOG_ERR);
 				}
 			} else {
@@ -228,8 +223,7 @@ class Interfaces
 			}
 		}
 
-		if ($nbko)
-		{
+		if ($nbko) {
 			dol_syslog(get_class($this)."::run_triggers action=".$action." Files found: ".$nbfile.", Files launched: ".$nbtotal.", Done: ".$nbok.", Failed: ".$nbko." - Nb of error string returned in this->errors = ".count($this->errors), LOG_ERR);
 			return -$nbko;
 		} else {
@@ -258,28 +252,27 @@ class Interfaces
 		$i = 0;
 
 		$dirtriggers = array_merge(array('/core/triggers/'), $conf->modules_parts['triggers']);
-		if (is_array($forcedirtriggers))
-		{
+		if (is_array($forcedirtriggers)) {
 			$dirtriggers = $forcedirtriggers;
 		}
 
-		foreach ($dirtriggers as $reldir)
-		{
+		foreach ($dirtriggers as $reldir) {
 			$dir = dol_buildpath($reldir, 0);
 			$newdir = dol_osencode($dir);
 
 			// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php at each call)
-			if (!is_dir($newdir)) continue;
+			if (!is_dir($newdir)) {
+				continue;
+			}
 
 			$handle = opendir($newdir);
-			if (is_resource($handle))
-			{
-				while (($file = readdir($handle)) !== false)
-				{
+			if (is_resource($handle)) {
+				while (($file = readdir($handle)) !== false) {
 					$reg = array();
-					if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg))
-					{
-						if (preg_match('/\.back$/', $file)) continue;
+					if (is_readable($newdir.'/'.$file) && preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/', $file, $reg)) {
+						if (preg_match('/\.back$/', $file)) {
+							continue;
+						}
 
 						$part1 = $reg[1];
 						$part2 = $reg[2];
@@ -287,8 +280,7 @@ class Interfaces
 
 						$modName = 'Interface'.ucfirst($reg[3]);
 						//print "file=$file"; print "modName=$modName"; exit;
-						if (in_array($modName, $modules))
-						{
+						if (in_array($modName, $modules)) {
 							$langs->load("errors");
 							print '<div class="error">'.$langs->trans("Error").' : '.$langs->trans("ErrorDuplicateTrigger", $modName, "/htdocs/core/triggers/").'</div>';
 						} else {
@@ -315,13 +307,13 @@ class Interfaces
 		$j = 0;
 
 		// Loop on each trigger
-		foreach ($orders as $key => $value)
-		{
+		foreach ($orders as $key => $value) {
 			$modName = $modules[$key];
-			if (empty($modName)) continue;
+			if (empty($modName)) {
+				continue;
+			}
 
-			if (!class_exists($modName))
-			{
+			if (!class_exists($modName)) {
 				print 'Error: A trigger file was found but its class "'.$modName.'" was not found.'."<br>\n";
 				continue;
 			}
@@ -331,22 +323,25 @@ class Interfaces
 			try {
 				$objMod = new $modName($db);
 
-				if (is_subclass_of($objMod, 'DolibarrTriggers'))
-				{
+				if (is_subclass_of($objMod, 'DolibarrTriggers')) {
 					// Define disabledbyname and disabledbymodule
 					$disabledbyname = 0;
 					$disabledbymodule = 1;
 					$module = '';
 
 					// Check if trigger file is disabled by name
-					if (preg_match('/NORUN$/i', $files[$key])) $disabledbyname = 1;
+					if (preg_match('/NORUN$/i', $files[$key])) {
+						$disabledbyname = 1;
+					}
 					// Check if trigger file is for a particular module
-					if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg))
-					{
+					if (preg_match('/^interface_([0-9]+)_([^_]+)_(.+)\.class\.php/i', $files[$key], $reg)) {
 						$module = preg_replace('/^mod/i', '', $reg[2]);
 						$constparam = 'MAIN_MODULE_'.strtoupper($module);
-						if (strtolower($module) == 'all') $disabledbymodule = 0;
-						elseif (empty($conf->global->$constparam)) $disabledbymodule = 2;
+						if (strtolower($module) == 'all') {
+							$disabledbymodule = 0;
+						} elseif (empty($conf->global->$constparam)) {
+							$disabledbymodule = 2;
+						}
 						$triggers[$j]['module'] = strtolower($module);
 					}
 
@@ -358,19 +353,28 @@ class Interfaces
 					$triggers[$j]['iscoreorexternal'] = $iscoreorexternal[$key];
 					$triggers[$j]['version'] = $objMod->getVersion();
 					$triggers[$j]['status'] = img_picto($langs->trans("Active"), 'tick');
-					if ($disabledbyname > 0 || $disabledbymodule > 1) $triggers[$j]['status'] = '';
+					if ($disabledbyname > 0 || $disabledbymodule > 1) {
+						$triggers[$j]['status'] = '';
+					}
 
 					$text = '<b>'.$langs->trans("Description").':</b><br>';
 					$text .= $objMod->getDesc().'<br>';
 					$text .= '<br><b>'.$langs->trans("Status").':</b><br>';
-					if ($disabledbyname == 1)
-					{
+					if ($disabledbyname == 1) {
 						$text .= $langs->trans("TriggerDisabledByName").'<br>';
-						if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+						if ($disabledbymodule == 2) {
+							$text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+						}
 					} else {
-						if ($disabledbymodule == 0) $text .= $langs->trans("TriggerAlwaysActive").'<br>';
-						if ($disabledbymodule == 1) $text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
-						if ($disabledbymodule == 2) $text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+						if ($disabledbymodule == 0) {
+							$text .= $langs->trans("TriggerAlwaysActive").'<br>';
+						}
+						if ($disabledbymodule == 1) {
+							$text .= $langs->trans("TriggerActiveAsModuleActive", $module).'<br>';
+						}
+						if ($disabledbymodule == 2) {
+							$text .= $langs->trans("TriggerDisabledAsModuleDisabled", $module).'<br>';
+						}
 					}
 				} else {
 					print 'Error: Trigger '.$modName.' does not extends DolibarrTriggers<br>';
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 1bd25e123a3..9963a178d1b 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -122,8 +122,12 @@ class Ldap
 		global $conf;
 
 		// Server
-		if (!empty($conf->global->LDAP_SERVER_HOST))       $this->server[] = $conf->global->LDAP_SERVER_HOST;
-		if (!empty($conf->global->LDAP_SERVER_HOST_SLAVE)) $this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+		if (!empty($conf->global->LDAP_SERVER_HOST)) {
+			$this->server[] = $conf->global->LDAP_SERVER_HOST;
+		}
+		if (!empty($conf->global->LDAP_SERVER_HOST_SLAVE)) {
+			$this->server[] = $conf->global->LDAP_SERVER_HOST_SLAVE;
+		}
 		$this->serverPort          = $conf->global->LDAP_SERVER_PORT;
 		$this->ldapProtocolVersion = $conf->global->LDAP_SERVER_PROTOCOLVERSION;
 		$this->dn                  = $conf->global->LDAP_SERVER_DN;
@@ -170,39 +174,38 @@ class Ldap
 		$this->bind = 0;
 
 		// Check parameters
-		if (count($this->server) == 0 || empty($this->server[0]))
-		{
+		if (count($this->server) == 0 || empty($this->server[0])) {
 			$this->error = 'LDAP setup (file conf.php) is not complete';
 			dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
 			return -1;
 		}
 
-		if (!function_exists("ldap_connect"))
-		{
+		if (!function_exists("ldap_connect")) {
 			$this->error = 'LDAPFunctionsNotAvailableOnPHP';
 			dol_syslog(get_class($this)."::connect_bind ".$this->error, LOG_WARNING);
 			$return = -1;
 		}
 
-		if (empty($this->error))
-		{
+		if (empty($this->error)) {
 			// Loop on each ldap server
-			foreach ($this->server as $host)
-			{
-				if ($connected) break;
-				if (empty($host)) continue;
+			foreach ($this->server as $host) {
+				if ($connected) {
+					break;
+				}
+				if (empty($host)) {
+					continue;
+				}
 
 				if ($this->serverPing($host, $this->serverPort) === true) {
 					$this->connection = ldap_connect($host, $this->serverPort);
-				} else continue;
+				} else {
+					continue;
+				}
 
-				if (is_resource($this->connection))
-				{
+				if (is_resource($this->connection)) {
 					// Begin TLS if requested by the configuration
-					if (!empty($conf->global->LDAP_SERVER_USE_TLS))
-					{
-						if (!ldap_start_tls($this->connection))
-						{
+					if (!empty($conf->global->LDAP_SERVER_USE_TLS)) {
+						if (!ldap_start_tls($this->connection)) {
 							dol_syslog(get_class($this)."::connect_bind failed to start tls", LOG_WARNING);
 							$connected = 0;
 							$this->close();
@@ -214,13 +217,11 @@ class Ldap
 					ldap_set_option($this->connection, LDAP_OPT_SIZELIMIT, 0); // no limit here. should return true.
 
 
-					if ($this->serverType == "activedirectory")
-					{
+					if ($this->serverType == "activedirectory") {
 						$result = $this->setReferrals();
 						dol_syslog(get_class($this)."::connect_bind try bindauth for activedirectory on ".$host." user=".$this->searchUser." password=".preg_replace('/./', '*', $this->searchPassword), LOG_DEBUG);
 						$this->result = $this->bindauth($this->searchUser, $this->searchPassword);
-						if ($this->result)
-						{
+						if ($this->result) {
 							$this->bind = $this->result;
 							$connected = 2;
 							break;
@@ -229,12 +230,10 @@ class Ldap
 						}
 					} else {
 						// Try in auth mode
-						if ($this->searchUser && $this->searchPassword)
-						{
+						if ($this->searchUser && $this->searchPassword) {
 							dol_syslog(get_class($this)."::connect_bind try bindauth on ".$host." user=".$this->searchUser." password=".preg_replace('/./', '*', $this->searchPassword), LOG_DEBUG);
 							$this->result = $this->bindauth($this->searchUser, $this->searchPassword);
-							if ($this->result)
-							{
+							if ($this->result) {
 								$this->bind = $this->result;
 								$connected = 2;
 								break;
@@ -243,12 +242,10 @@ class Ldap
 							}
 						}
 						// Try in anonymous
-						if (!$this->bind)
-						{
+						if (!$this->bind) {
 							dol_syslog(get_class($this)."::connect_bind try bind on ".$host, LOG_DEBUG);
 							$result = $this->bind();
-							if ($result)
-							{
+							if ($result) {
 								$this->bind = $this->result;
 								$connected = 1;
 								break;
@@ -259,12 +256,13 @@ class Ldap
 					}
 				}
 
-				if (!$connected) $this->close();
+				if (!$connected) {
+					$this->close();
+				}
 			}
 		}
 
-		if ($connected)
-		{
+		if ($connected) {
 			$return = $connected;
 			dol_syslog(get_class($this)."::connect_bind return=".$return, LOG_DEBUG);
 		} else {
@@ -285,8 +283,7 @@ class Ldap
 	 */
 	public function close()
 	{
-		if ($this->connection && !@ldap_close($this->connection))
-		{
+		if ($this->connection && !@ldap_close($this->connection)) {
 			return false;
 		} else {
 			return true;
@@ -301,8 +298,7 @@ class Ldap
 	 */
 	public function bind()
 	{
-		if (!$this->result = @ldap_bind($this->connection))
-		{
+		if (!$this->result = @ldap_bind($this->connection)) {
 			$this->ldapErrorCode = ldap_errno($this->connection);
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
@@ -324,8 +320,7 @@ class Ldap
 	 */
 	public function bindauth($bindDn, $pass)
 	{
-		if (!$this->result = @ldap_bind($this->connection, $bindDn, $pass))
-		{
+		if (!$this->result = @ldap_bind($this->connection, $bindDn, $pass)) {
 			$this->ldapErrorCode = ldap_errno($this->connection);
 			$this->ldapErrorText = ldap_error($this->connection);
 			$this->error = $this->ldapErrorCode." ".$this->ldapErrorText;
@@ -342,8 +337,7 @@ class Ldap
 	 */
 	public function unbind()
 	{
-		if (!$this->result = @ldap_unbind($this->connection))
-		{
+		if (!$this->result = @ldap_unbind($this->connection)) {
 			return false;
 		} else {
 			return true;
@@ -402,22 +396,21 @@ class Ldap
 		dol_syslog(get_class($this)."::add dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (!$this->connection)
-		{
+		if (!$this->connection) {
 			$this->error = "NotConnected";
 			return -2;
 		}
-		if (!$this->bind)
-		{
+		if (!$this->bind) {
 			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
 		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
-		foreach ($info as $key => $val)
-		{
-			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+		foreach ($info as $key => $val) {
+			if (!is_array($val)) {
+				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn, $info);
@@ -425,8 +418,7 @@ class Ldap
 		//print_r($info);
 		$result = @ldap_add($this->connection, $dn, $info);
 
-		if ($result)
-		{
+		if ($result) {
 			dol_syslog(get_class($this)."::add successfull", LOG_DEBUG);
 			return 1;
 		} else {
@@ -452,22 +444,21 @@ class Ldap
 		dol_syslog(get_class($this)."::modify dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (!$this->connection)
-		{
+		if (!$this->connection) {
 			$this->error = "NotConnected";
 			return -2;
 		}
-		if (!$this->bind)
-		{
+		if (!$this->bind) {
 			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
 		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
-		foreach ($info as $key => $val)
-		{
-			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+		foreach ($info as $key => $val) {
+			if (!is_array($val)) {
+				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn, $info);
@@ -480,8 +471,7 @@ class Ldap
 		}
 		$result = @ldap_modify($this->connection, $dn, $info);
 
-		if ($result)
-		{
+		if ($result) {
 			dol_syslog(get_class($this)."::modify successfull", LOG_DEBUG);
 			return 1;
 		} else {
@@ -507,13 +497,11 @@ class Ldap
 		dol_syslog(get_class($this)."::modify dn=".$dn." newrdn=".$newrdn." newparent=".$newparent." deleteoldrdn=".($deleteoldrdn ? 1 : 0));
 
 		// Check parameters
-		if (!$this->connection)
-		{
+		if (!$this->connection) {
 			$this->error = "NotConnected";
 			return -2;
 		}
-		if (!$this->bind)
-		{
+		if (!$this->bind) {
 			$this->error = "NotConnected";
 			return -3;
 		}
@@ -526,8 +514,7 @@ class Ldap
 		//print_r($info);
 		$result = @ldap_rename($this->connection, $dn, $newrdn, $newparent, $deleteoldrdn);
 
-		if ($result)
-		{
+		if ($result) {
 			dol_syslog(get_class($this)."::rename successfull", LOG_DEBUG);
 			return 1;
 		} else {
@@ -554,36 +541,33 @@ class Ldap
 		dol_syslog(get_class($this)."::update dn=".$dn." olddn=".$olddn);
 
 		// Check parameters
-		if (!$this->connection)
-		{
+		if (!$this->connection) {
 			$this->error = "NotConnected";
 			return -2;
 		}
-		if (!$this->bind)
-		{
+		if (!$this->bind) {
 			$this->error = "NotConnected";
 			return -3;
 		}
 
-		if (!$olddn || $olddn != $dn)
-		{
-			if (!empty($olddn) && !empty($newrdn) && !empty($newparent) && $this->ldapProtocolVersion === '3')
-			{
+		if (!$olddn || $olddn != $dn) {
+			if (!empty($olddn) && !empty($newrdn) && !empty($newparent) && $this->ldapProtocolVersion === '3') {
 				// This function currently only works with LDAPv3
 				$result = $this->rename($olddn, $newrdn, $newparent, $user, true);
 				$result = $this->modify($dn, $info, $user); // We force "modify" for avoid some fields not modify
 			} else {
 				// If change we make is rename the key of LDAP record, we create new one and if ok, we delete old one.
 				$result = $this->add($dn, $info, $user);
-				if ($result > 0 && $olddn && $olddn != $dn) $result = $this->delete($olddn); // If add fails, we do not try to delete old one
+				if ($result > 0 && $olddn && $olddn != $dn) {
+					$result = $this->delete($olddn); // If add fails, we do not try to delete old one
+				}
 			}
 		} else {
 			//$result = $this->delete($olddn);
 			$result = $this->add($dn, $info, $user); // If record has been deleted from LDAP, we recreate it. We ignore error if it already exists.
 			$result = $this->modify($dn, $info, $user); // We use add/modify instead of delete/add when olddn is received
 		}
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			$this->error = ldap_error($this->connection).' (Code '.ldap_errno($this->connection).") ".$this->error;
 			dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
 			//print_r($info);
@@ -607,13 +591,11 @@ class Ldap
 		dol_syslog(get_class($this)."::delete Delete LDAP entry dn=".$dn);
 
 		// Check parameters
-		if (!$this->connection)
-		{
+		if (!$this->connection) {
 			$this->error = "NotConnected";
 			return -2;
 		}
-		if (!$this->bind)
-		{
+		if (!$this->bind) {
 			$this->error = "NotConnected";
 			return -3;
 		}
@@ -623,7 +605,9 @@ class Ldap
 
 		$result = @ldap_delete($this->connection, $dn);
 
-		if ($result) return 1;
+		if ($result) {
+			return 1;
+		}
 		return -1;
 	}
 
@@ -641,8 +625,7 @@ class Ldap
 		$content = '';
 
 		// Create file content
-		if (preg_match('/^ldap/', $this->server[0]))
-		{
+		if (preg_match('/^ldap/', $this->server[0])) {
 			$target = "-H ".join(',', $this->server);
 		} else {
 			$target = "-h ".join(',', $this->server)." -p ".$this->serverPort;
@@ -650,16 +633,15 @@ class Ldap
 		$content .= "# ldapadd $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
 		$content .= "# ldapmodify $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
 		$content .= "# ldapdelete $target -c -v -D ".$this->searchUser." -W -f ldapinput.in\n";
-		if (in_array('localhost', $this->server)) $content .= "# If commands fails to connect, try without -h and -p\n";
+		if (in_array('localhost', $this->server)) {
+			$content .= "# If commands fails to connect, try without -h and -p\n";
+		}
 		$content .= "dn: ".$dn."\n";
-		foreach ($info as $key => $value)
-		{
-			if (!is_array($value))
-			{
+		foreach ($info as $key => $value) {
+			if (!is_array($value)) {
 				$content .= "$key: $value\n";
 			} else {
-				foreach ($value as $valuevalue)
-				{
+				foreach ($value as $valuevalue) {
 					$content .= "$key: $valuevalue\n";
 				}
 			}
@@ -686,12 +668,12 @@ class Ldap
 
 		$outputfile = $conf->ldap->dir_temp.'/ldapinput.in';
 		$fp = fopen($outputfile, "w");
-		if ($fp)
-		{
+		if ($fp) {
 			fputs($fp, $content);
 			fclose($fp);
-			if (!empty($conf->global->MAIN_UMASK))
-			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) {
+				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 			return 1;
 		} else {
 			return -1;
@@ -717,8 +699,9 @@ class Ldap
 			$host = $regs[1];
 		}
 		$op = @fsockopen($host, $port, $errno, $errstr, $timeout);
-		if (!$op) return false; //DC is N/A
-		else {
+		if (!$op) {
+			return false; //DC is N/A
+		} else {
 			fclose($op); //explicitly close open socket connection
 			return true; //DC is up & running, we can safely connect with ldap_connect
 		}
@@ -741,22 +724,21 @@ class Ldap
 		dol_syslog(get_class($this)."::addAttribute dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (!$this->connection)
-		{
+		if (!$this->connection) {
 			$this->error = "NotConnected";
 			return -2;
 		}
-		if (!$this->bind)
-		{
+		if (!$this->bind) {
 			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
 		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
-		foreach ($info as $key => $val)
-		{
-			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+		foreach ($info as $key => $val) {
+			if (!is_array($val)) {
+				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn, $info);
@@ -764,8 +746,7 @@ class Ldap
 		//print_r($info);
 		$result = @ldap_mod_add($this->connection, $dn, $info);
 
-		if ($result)
-		{
+		if ($result) {
 			dol_syslog(get_class($this)."::add_attribute successfull", LOG_DEBUG);
 			return 1;
 		} else {
@@ -789,22 +770,21 @@ class Ldap
 		dol_syslog(get_class($this)."::updateAttribute dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (!$this->connection)
-		{
+		if (!$this->connection) {
 			$this->error = "NotConnected";
 			return -2;
 		}
-		if (!$this->bind)
-		{
+		if (!$this->bind) {
 			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
 		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
-		foreach ($info as $key => $val)
-		{
-			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+		foreach ($info as $key => $val) {
+			if (!is_array($val)) {
+				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn, $info);
@@ -812,8 +792,7 @@ class Ldap
 		//print_r($info);
 		$result = @ldap_mod_replace($this->connection, $dn, $info);
 
-		if ($result)
-		{
+		if ($result) {
 			dol_syslog(get_class($this)."::updateAttribute successfull", LOG_DEBUG);
 			return 1;
 		} else {
@@ -837,22 +816,21 @@ class Ldap
 		dol_syslog(get_class($this)."::deleteAttribute dn=".$dn." info=".join(',', $info));
 
 		// Check parameters
-		if (!$this->connection)
-		{
+		if (!$this->connection) {
 			$this->error = "NotConnected";
 			return -2;
 		}
-		if (!$this->bind)
-		{
+		if (!$this->bind) {
 			$this->error = "NotConnected";
 			return -3;
 		}
 
 		// Encode to LDAP page code
 		$dn = $this->convFromOutputCharset($dn, $this->ldapcharset);
-		foreach ($info as $key => $val)
-		{
-			if (!is_array($val)) $info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+		foreach ($info as $key => $val) {
+			if (!is_array($val)) {
+				$info[$key] = $this->convFromOutputCharset($val, $this->ldapcharset);
+			}
 		}
 
 		$this->dump($dn, $info);
@@ -860,8 +838,7 @@ class Ldap
 		//print_r($info);
 		$result = @ldap_mod_del($this->connection, $dn, $info);
 
-		if ($result)
-		{
+		if ($result) {
 			dol_syslog(get_class($this)."::deleteAttribute successfull", LOG_DEBUG);
 			return 1;
 		} else {
@@ -881,13 +858,11 @@ class Ldap
 	public function getAttribute($dn, $filter)
 	{
 		// Check parameters
-		if (!$this->connection)
-		{
+		if (!$this->connection) {
 			$this->error = "NotConnected";
 			return -2;
 		}
-		if (!$this->bind)
-		{
+		if (!$this->bind) {
 			$this->error = "NotConnected";
 			return -3;
 		}
@@ -897,16 +872,14 @@ class Ldap
 		// Only one entry should ever be returned
 		$entry = ldap_first_entry($this->connection, $search);
 
-		if (!$entry)
-		{
+		if (!$entry) {
 			$this->ldapErrorCode = -1;
 			$this->ldapErrorText = "Couldn't find entry";
 			return 0; // Couldn't find entry...
 		}
 
 		// Get values
-		if (!($values = ldap_get_attributes($this->connection, $entry)))
-		{
+		if (!($values = ldap_get_attributes($this->connection, $entry))) {
 			$this->ldapErrorCode = ldap_errno($this->connection);
 			$this->ldapErrorText = ldap_error($this->connection);
 			return 0; // No matching attributes
@@ -937,16 +910,14 @@ class Ldap
 		// Only one entry should ever be returned (no user will have the same uid)
 		$entry = ldap_first_entry($this->connection, $this->result);
 
-		if (!$entry)
-		{
+		if (!$entry) {
 			$this->ldapErrorCode = -1;
 			$this->ldapErrorText = "Couldn't find user";
 			return false; // Couldn't find the user...
 		}
 
 		// Get values
-		if (!$values = @ldap_get_values($this->connection, $entry, $attribute))
-		{
+		if (!$values = @ldap_get_values($this->connection, $entry, $attribute)) {
 			$this->ldapErrorCode = ldap_errno($this->connection);
 			$this->ldapErrorText = ldap_error($this->connection);
 			return false; // No matching attributes
@@ -975,15 +946,13 @@ class Ldap
 		dol_syslog(get_class($this)."::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',', $attributeArray).") activefilter=".$activefilter);
 
 		// if the directory is AD, then bind first with the search user first
-		if ($this->serverType == "activedirectory")
-		{
+		if ($this->serverType == "activedirectory") {
 			$this->bindauth($this->searchUser, $this->searchPassword);
 			dol_syslog(get_class($this)."::bindauth serverType=activedirectory searchUser=".$this->searchUser);
 		}
 
 		// Define filter
-		if (!empty($activefilter))
-		{
+		if (!empty($activefilter)) {
 			if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) {
 				$filter = '('.$this->filter.')';
 			} elseif (((string) $activefilter == 'member') && $this->filter) {
@@ -996,8 +965,7 @@ class Ldap
 			$filter = '('.$useridentifier.'='.$search.')';
 		}
 
-		if (is_array($attributeArray))
-		{
+		if (is_array($attributeArray)) {
 			// Return list with required fields
 			$attributeArray = array_values($attributeArray); // This is to force to have index reordered from 0 (not make ldap_search fails)
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter." attributeArray=(".join(',', $attributeArray).")");
@@ -1008,8 +976,7 @@ class Ldap
 			dol_syslog(get_class($this)."::getRecords connection=".$this->connection." userDn=".$userDn." filter=".$filter);
 			$this->result = @ldap_search($this->connection, $userDn, $filter);
 		}
-		if (!$this->result)
-		{
+		if (!$this->result) {
 			$this->error = 'LDAP search failed: '.ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
 		}
@@ -1020,24 +987,20 @@ class Ldap
 		// a ldap_search en majuscule !!!
 		//print_r($info);
 
-		for ($i = 0; $i < $info["count"]; $i++)
-		{
+		for ($i = 0; $i < $info["count"]; $i++) {
 			$recordid = $this->convToOutputCharset($info[$i][$useridentifier][0], $this->ldapcharset);
-			if ($recordid)
-			{
+			if ($recordid) {
 				//print "Found record with key $useridentifier=".$recordid."<br>\n";
 				$fulllist[$recordid][$useridentifier] = $recordid;
 
 				// Add to the array for each attribute in my list
 				$num = count($attributeArray);
-				for ($j = 0; $j < $num; $j++)
-				{
+				for ($j = 0; $j < $num; $j++) {
 					$keyattributelower = strtolower($attributeArray[$j]);
 					//print " Param ".$attributeArray[$j]."=".$info[$i][$keyattributelower][0]."<br>\n";
 
 					//permet de recuperer le SID avec Active Directory
-					if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid")
-					{
+					if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid") {
 						$objectsid = $this->getObjectSid($recordid);
 						$fulllist[$recordid][$attributeArray[$j]] = $objectsid;
 					} else {
@@ -1089,28 +1052,24 @@ class Ldap
 		$justthese = array("objectsid");
 
 		// if the directory is AD, then bind first with the search user first
-		if ($this->serverType == "activedirectory")
-		{
+		if ($this->serverType == "activedirectory") {
 			$this->bindauth($this->searchUser, $this->searchPassword);
 		}
 
 		$i = 0;
 		$searchDN = $this->people;
 
-		while ($i <= 2)
-		{
+		while ($i <= 2) {
 			$ldapSearchResult = @ldap_search($this->connection, $searchDN, $criteria, $justthese);
 
-			if (!$ldapSearchResult)
-			{
+			if (!$ldapSearchResult) {
 				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 				return -1;
 			}
 
 			$entry = ldap_first_entry($this->connection, $ldapSearchResult);
 
-			if (!$entry)
-			{
+			if (!$entry) {
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
@@ -1120,8 +1079,7 @@ class Ldap
 			}
 		}
 
-		if ($entry)
-		{
+		if ($entry) {
 			$ldapBinary = ldap_get_values_len($this->connection, $entry, "objectsid");
 			$SIDText = $this->binSIDtoText($ldapBinary[0]);
 			return $SIDText;
@@ -1145,8 +1103,7 @@ class Ldap
 		$subcount = hexdec(substr($hex_sid, 2, 2)); // Get count of sub-auth entries
 		$auth = hexdec(substr($hex_sid, 4, 12)); // SECURITY_NT_AUTHORITY
 		$result = "$rev-$auth";
-		for ($x = 0; $x < $subcount; $x++)
-		{
+		for ($x = 0; $x < $subcount; $x++) {
 			$result .= "-".hexdec($this->littleEndian(substr($hex_sid, 16 + ($x * 8), 8))); // get all SECURITY_NT_AUTHORITY
 		}
 		return $result;
@@ -1179,8 +1136,7 @@ class Ldap
 		$this->result = @ldap_search($this->connection, $checkDn, $filter);
 
 		$result = @ldap_get_entries($this->connection, $this->result);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
 		} else {
@@ -1211,15 +1167,16 @@ class Ldap
 
 		$result = '';
 		$i = 0;
-		while ($i <= 2)
-		{
+		while ($i <= 2) {
 			dol_syslog(get_class($this)."::fetch search with searchDN=".$searchDN." filter=".$filter);
 			$this->result = @ldap_search($this->connection, $searchDN, $filter);
-			if ($this->result)
-			{
+			if ($this->result) {
 				$result = @ldap_get_entries($this->connection, $this->result);
-				if ($result['count'] > 0) dol_syslog('Ldap::fetch search found '.$result['count'].' records');
-				else dol_syslog('Ldap::fetch search returns but found no records');
+				if ($result['count'] > 0) {
+					dol_syslog('Ldap::fetch search found '.$result['count'].' records');
+				} else {
+					dol_syslog('Ldap::fetch search returns but found no records');
+				}
 				//var_dump($result);exit;
 			} else {
 				$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
@@ -1227,8 +1184,7 @@ class Ldap
 				return -1;
 			}
 
-			if (!$result)
-			{
+			if (!$result) {
 				// Si pas de resultat on cherche dans le domaine
 				$searchDN = $this->domain;
 				$i++;
@@ -1237,8 +1193,7 @@ class Ldap
 			}
 		}
 
-		if (!$result)
-		{
+		if (!$result) {
 			$this->error = ldap_errno($this->connection)." ".ldap_error($this->connection);
 			return -1;
 		} else {
@@ -1252,13 +1207,14 @@ class Ldap
 			$this->mobile     = $this->convToOutputCharset($result[0][$this->attr_mobile][0], $this->ldapcharset);
 
 			$this->uacf       = $this->parseUACF($this->convToOutputCharset($result[0]["useraccountcontrol"][0], $this->ldapcharset));
-			if (isset($result[0]["pwdlastset"][0]))	// If expiration on password exists
-			{
+			if (isset($result[0]["pwdlastset"][0])) {	// If expiration on password exists
 				$this->pwdlastset = ($result[0]["pwdlastset"][0] != 0) ? $this->convert_time($this->convToOutputCharset($result[0]["pwdlastset"][0], $this->ldapcharset)) : 0;
 			} else {
 				$this->pwdlastset = -1;
 			}
-			if (!$this->name && !$this->login) $this->pwdlastset = -1;
+			if (!$this->name && !$this->login) {
+				$this->pwdlastset = -1;
+			}
 			$this->badpwdtime = $this->convert_time($this->convToOutputCharset($result[0]["badpasswordtime"][0], $this->ldapcharset));
 
 			// FQDN domain
@@ -1364,7 +1320,9 @@ class Ldap
 				break;
 			}
 		}
-		if (empty($retval)) $retval = "UNKNOWN_TYPE_".$samtype;
+		if (empty($retval)) {
+			$retval = "UNKNOWN_TYPE_".$samtype;
+		}
 
 		return($retval);
 	}
@@ -1397,8 +1355,12 @@ class Ldap
 	private function convToOutputCharset($str, $pagecodefrom = 'UTF-8')
 	{
 		global $conf;
-		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8')  $str = utf8_encode($str);
-		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1')  $str = utf8_decode($str);
+		if ($pagecodefrom == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {
+			$str = utf8_encode($str);
+		}
+		if ($pagecodefrom == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {
+			$str = utf8_decode($str);
+		}
 		return $str;
 	}
 
@@ -1412,8 +1374,12 @@ class Ldap
 	public function convFromOutputCharset($str, $pagecodeto = 'UTF-8')
 	{
 		global $conf;
-		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') $str = utf8_decode($str);
-		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') $str = utf8_encode($str);
+		if ($pagecodeto == 'ISO-8859-1' && $conf->file->character_set_client == 'UTF-8') {
+			$str = utf8_decode($str);
+		}
+		if ($pagecodeto == 'UTF-8' && $conf->file->character_set_client == 'ISO-8859-1') {
+			$str = utf8_encode($str);
+		}
 		return $str;
 	}
 
@@ -1428,16 +1394,16 @@ class Ldap
 	{
 		global $conf;
 
-		if (empty($keygroup)) $keygroup = 'LDAP_KEY_GROUPS';
+		if (empty($keygroup)) {
+			$keygroup = 'LDAP_KEY_GROUPS';
+		}
 
 		$search = '('.$conf->global->$keygroup.'=*)';
 		$result = $this->search($this->groups, $search);
-		if ($result)
-		{
+		if ($result) {
 			$c = $result['count'];
 			$gids = array();
-			for ($i = 0; $i < $c; $i++)
-			{
+			for ($i = 0; $i < $c; $i++) {
 				$gids[] = $result[$i]['gidnumber'][0];
 			}
 			rsort($gids);
diff --git a/htdocs/core/class/lessc.class.php b/htdocs/core/class/lessc.class.php
index b85cfc3f399..73007db9363 100644
--- a/htdocs/core/class/lessc.class.php
+++ b/htdocs/core/class/lessc.class.php
@@ -35,7 +35,8 @@
  * The `lessc_formatter` takes a CSS tree, and dumps it to a formatted string,
  * handling things like indentation.
  */
-class Lessc {
+class Lessc
+{
 	public static $VERSION = "v0.5.0";
 
 	public static $TRUE = array("keyword", "true");
@@ -64,7 +65,8 @@ class Lessc {
 	protected static $nextImportId = 0; // uniquely identify imports
 
 	// attempts to find the path of an import url, returns null for css files
-	protected function findImport($url) {
+	protected function findImport($url)
+	{
 		foreach ((array) $this->importDir as $dir) {
 			$full = $dir.(substr($dir, -1) != '/' ? '/' : '').$url;
 			if ($this->fileExists($file = $full.'.less') || $this->fileExists($file = $full)) {
@@ -81,35 +83,48 @@ class Lessc {
 	 * @param 	string 	$name	Filename
 	 * @return 	boolean
 	 */
-	protected function fileExists($name) {
+	protected function fileExists($name)
+	{
 		return is_file($name);
 	}
 
-	public static function compressList($items, $delim) {
-		if (!isset($items[1]) && isset($items[0])) return $items[0];
-		else return array('list', $delim, $items);
+	public static function compressList($items, $delim)
+	{
+		if (!isset($items[1]) && isset($items[0])) {
+			return $items[0];
+		} else {
+			return array('list', $delim, $items);
+		}
 	}
 
-	public static function preg_quote($what) {
+	public static function preg_quote($what)
+	{
 		return preg_quote($what, '/');
 	}
 
-	protected function tryImport($importPath, $parentBlock, $out) {
+	protected function tryImport($importPath, $parentBlock, $out)
+	{
 		if ($importPath[0] == "function" && $importPath[1] == "url") {
 			$importPath = $this->flattenList($importPath[2]);
 		}
 
 		$str = $this->coerceString($importPath);
-		if ($str === null) return false;
+		if ($str === null) {
+			return false;
+		}
 
 		$url = $this->compileValue($this->lib_e($str));
 
 		// don't import if it ends in css
-		if (substr_compare($url, '.css', -4, 4) === 0) return false;
+		if (substr_compare($url, '.css', -4, 4) === 0) {
+			return false;
+		}
 
 		$realPath = $this->findImport($url);
 
-		if ($realPath === null) return false;
+		if ($realPath === null) {
+			return false;
+		}
 
 		if ($this->importDisabled) {
 			return array(false, "/* import disabled */");
@@ -137,7 +152,8 @@ class Lessc {
 			if (isset($parentBlock->children[$childName])) {
 				$parentBlock->children[$childName] = array_merge(
 					$parentBlock->children[$childName],
-					$child);
+					$child
+				);
 			} else {
 				$parentBlock->children[$childName] = $child;
 			}
@@ -152,7 +168,8 @@ class Lessc {
 		return array(true, $bottom, $parser, $dir);
 	}
 
-	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir) {
+	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir)
+	{
 		$oldSourceParser = $this->sourceParser;
 
 		$oldImport = $this->importDir;
@@ -190,7 +207,8 @@ class Lessc {
 	 * See lessc::compileProp()
 	 *
 	 */
-	protected function compileBlock($block) {
+	protected function compileBlock($block)
+	{
 		switch ($block->type) {
 			case "root":
 				$this->compileRoot($block);
@@ -214,7 +232,8 @@ class Lessc {
 		}
 	}
 
-	protected function compileCSSBlock($block) {
+	protected function compileCSSBlock($block)
+	{
 		$env = $this->pushEnv();
 
 		$selectors = $this->compileSelectors($block->tags);
@@ -228,7 +247,8 @@ class Lessc {
 		$this->popEnv();
 	}
 
-	protected function compileMedia($media) {
+	protected function compileMedia($media)
+	{
 		$env = $this->pushEnv($media);
 		$parentScope = $this->mediaParent($this->scope);
 
@@ -253,7 +273,8 @@ class Lessc {
 		$this->popEnv();
 	}
 
-	protected function mediaParent($scope) {
+	protected function mediaParent($scope)
+	{
 		while (!empty($scope->parent)) {
 			if (!empty($scope->type) && $scope->type != "media") {
 				break;
@@ -264,7 +285,8 @@ class Lessc {
 		return $scope;
 	}
 
-	protected function compileNestedBlock($block, $selectors) {
+	protected function compileNestedBlock($block, $selectors)
+	{
 		$this->pushEnv($block);
 		$this->scope = $this->makeOutputBlock($block->type, $selectors);
 		$this->scope->parent->children[] = $this->scope;
@@ -275,14 +297,16 @@ class Lessc {
 		$this->popEnv();
 	}
 
-	protected function compileRoot($root) {
+	protected function compileRoot($root)
+	{
 		$this->pushEnv();
 		$this->scope = $this->makeOutputBlock($root->type);
 		$this->compileProps($root, $this->scope);
 		$this->popEnv();
 	}
 
-	protected function compileProps($block, $out) {
+	protected function compileProps($block, $out)
+	{
 		foreach ($this->sortProps($block->props) as $prop) {
 			$this->compileProp($prop, $block, $out);
 		}
@@ -294,7 +318,8 @@ class Lessc {
 	 * duplicate rule is detected, the comments immediately preceding each
 	 * occurence are consolidated.
 	 */
-	protected function deduplicate($lines) {
+	protected function deduplicate($lines)
+	{
 		$unique = array();
 		$comments = array();
 
@@ -312,7 +337,8 @@ class Lessc {
 		return array_merge($unique, $comments);
 	}
 
-	protected function sortProps($props, $split = false) {
+	protected function sortProps($props, $split = false)
+	{
 		$vars = array();
 		$imports = array();
 		$other = array();
@@ -356,7 +382,8 @@ class Lessc {
 		}
 	}
 
-	protected function compileMediaQuery($queries) {
+	protected function compileMediaQuery($queries)
+	{
 		$compiledQueries = array();
 		foreach ($queries as $query) {
 			$parts = array();
@@ -392,34 +419,36 @@ class Lessc {
 		return $out;
 	}
 
-	protected function multiplyMedia($env, $childQueries = null) {
+	protected function multiplyMedia($env, $childQueries = null)
+	{
 		if (is_null($env) ||
 			!empty($env->block->type) && $env->block->type != "media"
 			) {
 				return $childQueries;
-			}
+		}
 
 			// plain old block, skip
-			if (empty($env->block->type)) {
-				return $this->multiplyMedia($env->parent, $childQueries);
-			}
+		if (empty($env->block->type)) {
+			return $this->multiplyMedia($env->parent, $childQueries);
+		}
 
 			$out = array();
 			$queries = $env->block->queries;
-			if (is_null($childQueries)) {
-				$out = $queries;
-			} else {
-				foreach ($queries as $parent) {
-					foreach ($childQueries as $child) {
-						$out[] = array_merge($parent, $child);
-					}
+		if (is_null($childQueries)) {
+			$out = $queries;
+		} else {
+			foreach ($queries as $parent) {
+				foreach ($childQueries as $child) {
+					$out[] = array_merge($parent, $child);
 				}
 			}
+		}
 
 			return $this->multiplyMedia($env->parent, $out);
 	}
 
-	protected function expandParentSelectors(&$tag, $replace) {
+	protected function expandParentSelectors(&$tag, $replace)
+	{
 		$parts = explode("$&$", $tag);
 		$count = 0;
 		foreach ($parts as &$part) {
@@ -430,7 +459,8 @@ class Lessc {
 		return $count;
 	}
 
-	protected function findClosestSelectors() {
+	protected function findClosestSelectors()
+	{
 		$env = $this->env;
 		$selectors = null;
 		while ($env !== null) {
@@ -446,7 +476,8 @@ class Lessc {
 
 
 	// multiply $selectors against the nearest selectors in env
-	protected function multiplySelectors($selectors) {
+	protected function multiplySelectors($selectors)
+	{
 		// find parent selectors
 
 		$parentSelectors = $this->findClosestSelectors();
@@ -477,7 +508,8 @@ class Lessc {
 	}
 
 	// reduces selector expressions
-	protected function compileSelectors($selectors) {
+	protected function compileSelectors($selectors)
+	{
 		$out = array();
 
 		foreach ($selectors as $s) {
@@ -492,11 +524,13 @@ class Lessc {
 		return $out;
 	}
 
-	protected function eq($left, $right) {
+	protected function eq($left, $right)
+	{
 		return $left == $right;
 	}
 
-	protected function patternMatch($block, $orderedArgs, $keywordArgs) {
+	protected function patternMatch($block, $orderedArgs, $keywordArgs)
+	{
 		// match the guards if it has them
 		// any one of the groups must have all its guards pass for a match
 		if (!empty($block->guards)) {
@@ -513,7 +547,9 @@ class Lessc {
 					}
 
 					$passed = $this->reduce($guard) == self::$TRUE;
-					if ($negate) $passed = !$passed;
+					if ($negate) {
+						$passed = !$passed;
+					}
 
 					$this->popEnv();
 
@@ -525,7 +561,9 @@ class Lessc {
 					}
 				}
 
-				if ($groupPassed) break;
+				if ($groupPassed) {
+					break;
+				}
 			}
 
 			if (!$groupPassed) {
@@ -579,7 +617,8 @@ class Lessc {
 		}
 	}
 
-	protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip = array()) {
+	protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip = array())
+	{
 		$matches = null;
 		foreach ($blocks as $block) {
 			// skip seen blocks that don't have arguments
@@ -596,9 +635,14 @@ class Lessc {
 	}
 
 	// attempt to find blocks matched by path and args
-	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen = array()) {
-		if ($searchIn == null) return null;
-		if (isset($seen[$searchIn->id])) return null;
+	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen = array())
+	{
+		if ($searchIn == null) {
+			return null;
+		}
+		if (isset($seen[$searchIn->id])) {
+			return null;
+		}
 		$seen[$searchIn->id] = true;
 
 		$name = $path[0];
@@ -615,8 +659,13 @@ class Lessc {
 			} else {
 				$matches = array();
 				foreach ($blocks as $subBlock) {
-					$subMatches = $this->findBlocks($subBlock,
-						array_slice($path, 1), $orderedArgs, $keywordArgs, $seen);
+					$subMatches = $this->findBlocks(
+						$subBlock,
+						array_slice($path, 1),
+						$orderedArgs,
+						$keywordArgs,
+						$seen
+					);
 
 					if (!is_null($subMatches)) {
 						foreach ($subMatches as $sm) {
@@ -628,13 +677,16 @@ class Lessc {
 				return count($matches) > 0 ? $matches : null;
 			}
 		}
-		if ($searchIn->parent === $searchIn) return null;
+		if ($searchIn->parent === $searchIn) {
+			return null;
+		}
 		return $this->findBlocks($searchIn->parent, $path, $orderedArgs, $keywordArgs, $seen);
 	}
 
 	// sets all argument names in $args to either the default value
 	// or the one passed in through $values
-	protected function zipSetArgs($args, $orderedValues, $keywordValues) {
+	protected function zipSetArgs($args, $orderedValues, $keywordValues)
+	{
 		$assignedValues = array();
 
 		$i = 0;
@@ -676,7 +728,8 @@ class Lessc {
 	}
 
 	// compile a prop and update $lines or $blocks appropriately
-	protected function compileProp($prop, $block, $out) {
+	protected function compileProp($prop, $block, $out)
+	{
 		// set error position context
 		$this->sourceLoc = isset($prop[-1]) ? $prop[-1] : -1;
 
@@ -686,8 +739,10 @@ class Lessc {
 				if ($name[0] == $this->vPrefix) {
 					$this->set($name, $value);
 				} else {
-					$out->lines[] = $this->formatter->property($name,
-						$this->compileValue($this->reduce($value)));
+					$out->lines[] = $this->formatter->property(
+						$name,
+						$this->compileValue($this->reduce($value))
+					);
 				}
 				break;
 			case 'block':
@@ -744,7 +799,9 @@ class Lessc {
 					}
 
 					$oldParent = $mixin->parent;
-					if ($mixin != $block) $mixin->parent = $block;
+					if ($mixin != $block) {
+						$mixin->parent = $block;
+					}
 
 					foreach ($this->sortProps($mixin->props) as $subProp) {
 						if ($suffix !== null &&
@@ -756,15 +813,19 @@ class Lessc {
 									'list', ' ',
 									array($subProp[2], array('keyword', $suffix))
 								);
-							}
+						}
 
 							$this->compileProp($subProp, $mixin, $out);
 					}
 
 					$mixin->parent = $oldParent;
 
-					if ($haveArgs) $this->popEnv();
-					if ($haveScope) $this->popEnv();
+					if ($haveArgs) {
+						$this->popEnv();
+					}
+					if ($haveScope) {
+						$this->popEnv();
+					}
 				}
 
 				break;
@@ -822,7 +883,8 @@ class Lessc {
 	 * The input is expected to be reduced. This function will not work on
 	 * things like expressions and variables.
 	 */
-	public function compileValue($value) {
+	public function compileValue($value)
+	{
 		switch ($value[0]) {
 			case 'list':
 				// [1] - delimiter
@@ -886,52 +948,63 @@ class Lessc {
 		}
 	}
 
-	protected function lib_pow($args) {
+	protected function lib_pow($args)
+	{
 		list($base, $exp) = $this->assertArgs($args, 2, "pow");
 		return pow($this->assertNumber($base), $this->assertNumber($exp));
 	}
 
-	protected function lib_pi() {
+	protected function lib_pi()
+	{
 		return pi();
 	}
 
-	protected function lib_mod($args) {
+	protected function lib_mod($args)
+	{
 		list($a, $b) = $this->assertArgs($args, 2, "mod");
 		return $this->assertNumber($a) % $this->assertNumber($b);
 	}
 
-	protected function lib_tan($num) {
+	protected function lib_tan($num)
+	{
 		return tan($this->assertNumber($num));
 	}
 
-	protected function lib_sin($num) {
+	protected function lib_sin($num)
+	{
 		return sin($this->assertNumber($num));
 	}
 
-	protected function lib_cos($num) {
+	protected function lib_cos($num)
+	{
 		return cos($this->assertNumber($num));
 	}
 
-	protected function lib_atan($num) {
+	protected function lib_atan($num)
+	{
 		$num = atan($this->assertNumber($num));
 		return array("number", $num, "rad");
 	}
 
-	protected function lib_asin($num) {
+	protected function lib_asin($num)
+	{
 		$num = asin($this->assertNumber($num));
 		return array("number", $num, "rad");
 	}
 
-	protected function lib_acos($num) {
+	protected function lib_acos($num)
+	{
 		$num = acos($this->assertNumber($num));
 		return array("number", $num, "rad");
 	}
 
-	protected function lib_sqrt($num) {
+	protected function lib_sqrt($num)
+	{
 		return sqrt($this->assertNumber($num));
 	}
 
-	protected function lib_extract($value) {
+	protected function lib_extract($value)
+	{
 		list($list, $idx) = $this->assertArgs($value, 2, "extract");
 		$idx = $this->assertNumber($idx);
 		// 1 indexed
@@ -940,53 +1013,64 @@ class Lessc {
 		}
 	}
 
-	protected function lib_isnumber($value) {
+	protected function lib_isnumber($value)
+	{
 		return $this->toBool($value[0] == "number");
 	}
 
-	protected function lib_isstring($value) {
+	protected function lib_isstring($value)
+	{
 		return $this->toBool($value[0] == "string");
 	}
 
-	protected function lib_iscolor($value) {
+	protected function lib_iscolor($value)
+	{
 		return $this->toBool($this->coerceColor($value));
 	}
 
-	protected function lib_iskeyword($value) {
+	protected function lib_iskeyword($value)
+	{
 		return $this->toBool($value[0] == "keyword");
 	}
 
-	protected function lib_ispixel($value) {
+	protected function lib_ispixel($value)
+	{
 		return $this->toBool($value[0] == "number" && $value[2] == "px");
 	}
 
-	protected function lib_ispercentage($value) {
+	protected function lib_ispercentage($value)
+	{
 		return $this->toBool($value[0] == "number" && $value[2] == "%");
 	}
 
-	protected function lib_isem($value) {
+	protected function lib_isem($value)
+	{
 		return $this->toBool($value[0] == "number" && $value[2] == "em");
 	}
 
-	protected function lib_isrem($value) {
+	protected function lib_isrem($value)
+	{
 		return $this->toBool($value[0] == "number" && $value[2] == "rem");
 	}
 
-	protected function lib_rgbahex($color) {
+	protected function lib_rgbahex($color)
+	{
 		$color = $this->coerceColor($color);
 		if (is_null($color)) {
 			$this->throwError("color expected for rgbahex");
 		}
 
-		return sprintf("#%02x%02x%02x%02x",
+		return sprintf(
+			"#%02x%02x%02x%02x",
 			isset($color[4]) ? $color[4] * 255 : 255,
 			$color[1],
 			$color[2],
 			$color[3]
-			);
+		);
 	}
 
-	protected function lib_argb($color) {
+	protected function lib_argb($color)
+	{
 		return $this->lib_rgbahex($color);
 	}
 
@@ -996,7 +1080,8 @@ class Lessc {
 	 * @param  array  $value either an argument list (two strings) or a single string
 	 * @return string        formatted url(), either as a link or base64-encoded
 	 */
-	protected function lib_data_uri($value) {
+	protected function lib_data_uri($value)
+	{
 		$mime = ($value[0] === 'list') ? $value[2][0][2] : null;
 		$url = ($value[0] === 'list') ? $value[2][1][2][0] : $value[2][0];
 
@@ -1015,8 +1100,9 @@ class Lessc {
 					}
 				}
 
-				if (!is_null($mime)) // fallback if the mime type is still unknown
+				if (!is_null($mime)) { // fallback if the mime type is still unknown
 					$url = sprintf('data:%s;base64,%s', $mime, base64_encode(file_get_contents($fullpath)));
+				}
 			}
 		}
 
@@ -1024,7 +1110,8 @@ class Lessc {
 	}
 
 	// utility func to unquote a string
-	protected function lib_e($arg) {
+	protected function lib_e($arg)
+	{
 		switch ($arg[0]) {
 			case "list":
 				$items = $arg[2];
@@ -1043,8 +1130,11 @@ class Lessc {
 		}
 	}
 
-	protected function lib__sprintf($args) {
-		if ($args[0] != "list") return $args;
+	protected function lib__sprintf($args)
+	{
+		if ($args[0] != "list") {
+			return $args;
+		}
 		$values = $args[2];
 		$string = array_shift($values);
 		$template = $this->compileValue($this->lib_e($string));
@@ -1063,8 +1153,12 @@ class Lessc {
 
 				$i++;
 				$rep = $this->compileValue($this->lib_e($val));
-				$template = preg_replace('/'.self::preg_quote($match).'/',
-					$rep, $template, 1);
+				$template = preg_replace(
+					'/'.self::preg_quote($match).'/',
+					$rep,
+					$template,
+					1
+				);
 			}
 		}
 
@@ -1072,17 +1166,20 @@ class Lessc {
 		return array("string", $d, array($template));
 	}
 
-	protected function lib_floor($arg) {
+	protected function lib_floor($arg)
+	{
 		$value = $this->assertNumber($arg);
 		return array("number", floor($value), $arg[2]);
 	}
 
-	protected function lib_ceil($arg) {
+	protected function lib_ceil($arg)
+	{
 		$value = $this->assertNumber($arg);
 		return array("number", ceil($value), $arg[2]);
 	}
 
-	protected function lib_round($arg) {
+	protected function lib_round($arg)
+	{
 		if ($arg[0] != "list") {
 			$value = $this->assertNumber($arg);
 			return array("number", round($value), $arg[2]);
@@ -1093,7 +1190,8 @@ class Lessc {
 		}
 	}
 
-	protected function lib_unit($arg) {
+	protected function lib_unit($arg)
+	{
 		if ($arg[0] == "list") {
 			list($number, $newUnit) = $arg[2];
 			return array("number", $this->assertNumber($number),
@@ -1107,7 +1205,8 @@ class Lessc {
 	 * Helper function to get arguments for color manipulation functions.
 	 * takes a list that contains a color like thing and a percentage
 	 */
-	public function colorArgs($args) {
+	public function colorArgs($args)
+	{
 		if ($args[0] != 'list' || count($args[2]) < 2) {
 			return array(array('color', 0, 0, 0), 0);
 		}
@@ -1118,7 +1217,8 @@ class Lessc {
 		return array($color, $delta);
 	}
 
-	protected function lib_darken($args) {
+	protected function lib_darken($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1126,7 +1226,8 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_lighten($args) {
+	protected function lib_lighten($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1134,7 +1235,8 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_saturate($args) {
+	protected function lib_saturate($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1142,7 +1244,8 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_desaturate($args) {
+	protected function lib_desaturate($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1150,7 +1253,8 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_spin($args) {
+	protected function lib_spin($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 
 		$hsl = $this->toHSL($color);
@@ -1163,49 +1267,57 @@ class Lessc {
 		return $this->toRGB($hsl);
 	}
 
-	protected function lib_fadeout($args) {
+	protected function lib_fadeout($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta / 100);
 		return $color;
 	}
 
-	protected function lib_fadein($args) {
+	protected function lib_fadein($args)
+	{
 		list($color, $delta) = $this->colorArgs($args);
 		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta / 100);
 		return $color;
 	}
 
-	protected function lib_hue($color) {
+	protected function lib_hue($color)
+	{
 		$hsl = $this->toHSL($this->assertColor($color));
 		return round($hsl[1]);
 	}
 
-	protected function lib_saturation($color) {
+	protected function lib_saturation($color)
+	{
 		$hsl = $this->toHSL($this->assertColor($color));
 		return round($hsl[2]);
 	}
 
-	protected function lib_lightness($color) {
+	protected function lib_lightness($color)
+	{
 		$hsl = $this->toHSL($this->assertColor($color));
 		return round($hsl[3]);
 	}
 
 	// get the alpha of a color
 	// defaults to 1 for non-colors or colors without an alpha
-	protected function lib_alpha($value) {
+	protected function lib_alpha($value)
+	{
 		if (!is_null($color = $this->coerceColor($value))) {
 			return isset($color[4]) ? $color[4] : 1;
 		}
 	}
 
 	// set the alpha of the color
-	protected function lib_fade($args) {
+	protected function lib_fade($args)
+	{
 		list($color, $alpha) = $this->colorArgs($args);
 		$color[4] = $this->clamp($alpha / 100.0);
 		return $color;
 	}
 
-	protected function lib_percentage($arg) {
+	protected function lib_percentage($arg)
+	{
 		$num = $this->assertNumber($arg);
 		return array("number", $num * 100, "%");
 	}
@@ -1221,7 +1333,8 @@ class Lessc {
 	 *
 	 * @return array Color
 	 */
-	protected function lib_tint($args) {
+	protected function lib_tint($args)
+	{
 		$white = ['color', 255, 255, 255];
 		if ($args[0] == 'color') {
 			return $this->lib_mix(['list', ',', [$white, $args]]);
@@ -1243,7 +1356,8 @@ class Lessc {
 	 *
 	 * @return array Color
 	 */
-	protected function lib_shade($args) {
+	protected function lib_shade($args)
+	{
 		$black = ['color', 0, 0, 0];
 		if ($args[0] == 'color') {
 			return $this->lib_mix(['list', ',', [$black, $args]]);
@@ -1257,9 +1371,11 @@ class Lessc {
 	// mixes two colors by weight
 	// mix(@color1, @color2, [@weight: 50%]);
 	// http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
-	protected function lib_mix($args) {
-		if ($args[0] != "list" || count($args[2]) < 2)
+	protected function lib_mix($args)
+	{
+		if ($args[0] != "list" || count($args[2]) < 2) {
 			$this->throwError("mix expects (color1, color2, weight)");
+		}
 
 			list($first, $second) = $args[2];
 			$first = $this->assertColor($first);
@@ -1268,11 +1384,11 @@ class Lessc {
 			$first_a = $this->lib_alpha($first);
 			$second_a = $this->lib_alpha($second);
 
-			if (isset($args[2][2])) {
-				$weight = $args[2][2][1] / 100.0;
-			} else {
-				$weight = 0.5;
-			}
+		if (isset($args[2][2])) {
+			$weight = $args[2][2][1] / 100.0;
+		} else {
+			$weight = 0.5;
+		}
 
 			$w = $weight * 2 - 1;
 			$a = $first_a - $second_a;
@@ -1293,7 +1409,8 @@ class Lessc {
 			return $this->fixColor($new);
 	}
 
-	protected function lib_contrast($args) {
+	protected function lib_contrast($args)
+	{
 		$darkColor  = array('color', 0, 0, 0);
 		$lightColor = array('color', 255, 255, 255);
 		$threshold  = 0.43;
@@ -1303,8 +1420,7 @@ class Lessc {
 			$darkColor  = (isset($args[2][1])) ? $this->assertColor($args[2][1]) : $darkColor;
 			$lightColor = (isset($args[2][2])) ? $this->assertColor($args[2][2]) : $lightColor;
 			$threshold  = (isset($args[2][3])) ? $this->assertNumber($args[2][3]) : $threshold;
-		}
-		else {
+		} else {
 			$inputColor = $this->assertColor($args);
 		}
 
@@ -1326,7 +1442,8 @@ class Lessc {
 		return $darkColor;
 	}
 
-	private function toLuma($color) {
+	private function toLuma($color)
+	{
 		list(, $r, $g, $b) = $this->coerceColor($color);
 
 		$r = $r / 255;
@@ -1340,27 +1457,37 @@ class Lessc {
 		return (0.2126 * $r) + (0.7152 * $g) + (0.0722 * $b);
 	}
 
-	protected function lib_luma($color) {
+	protected function lib_luma($color)
+	{
 		return array("number", round($this->toLuma($color) * 100, 8), "%");
 	}
 
 
-	public function assertColor($value, $error = "expected color value") {
+	public function assertColor($value, $error = "expected color value")
+	{
 		$color = $this->coerceColor($value);
-		if (is_null($color)) $this->throwError($error);
+		if (is_null($color)) {
+			$this->throwError($error);
+		}
 		return $color;
 	}
 
-	public function assertNumber($value, $error = "expecting number") {
-		if ($value[0] == "number") return $value[1];
+	public function assertNumber($value, $error = "expecting number")
+	{
+		if ($value[0] == "number") {
+			return $value[1];
+		}
 		$this->throwError($error);
 	}
 
-	public function assertArgs($value, $expectedArgs, $name = "") {
+	public function assertArgs($value, $expectedArgs, $name = "")
+	{
 		if ($expectedArgs == 1) {
 			return $value;
 		} else {
-			if ($value[0] !== "list" || $value[1] != ",") $this->throwError("expecting list");
+			if ($value[0] !== "list" || $value[1] != ",") {
+				$this->throwError("expecting list");
+			}
 			$values = $value[2];
 			$numValues = count($values);
 			if ($expectedArgs != $numValues) {
@@ -1375,7 +1502,8 @@ class Lessc {
 		}
 	}
 
-	protected function toHSL($color) {
+	protected function toHSL($color)
+	{
 		if ($color[0] === 'hsl') {
 			return $color;
 		}
@@ -1403,7 +1531,6 @@ class Lessc {
 			} elseif ($b == $max) {
 				$H = 4.0 + ($r - $g) / ($max - $min);
 			}
-
 		}
 
 		$out = array('hsl',
@@ -1419,7 +1546,8 @@ class Lessc {
 		return $out;
 	}
 
-	protected function toRGB_helper($comp, $temp1, $temp2) {
+	protected function toRGB_helper($comp, $temp1, $temp2)
+	{
 		if ($comp < 0) {
 			$comp += 1.0;
 		} elseif ($comp > 1) {
@@ -1443,7 +1571,8 @@ class Lessc {
 	 * Converts a hsl array into a color value in rgb.
 	 * Expects H to be in range of 0 to 360, S and L in 0 to 100
 	 */
-	protected function toRGB($color) {
+	protected function toRGB($color)
+	{
 		if ($color[0] === 'color') {
 			return $color;
 		}
@@ -1474,7 +1603,8 @@ class Lessc {
 		return $out;
 	}
 
-	protected function clamp($v, $max = 1, $min = 0) {
+	protected function clamp($v, $max = 1, $min = 0)
+	{
 		return min($max, max($min, $v));
 	}
 
@@ -1482,7 +1612,8 @@ class Lessc {
 	 * Convert the rgb, rgba, hsl color literals of function type
 	 * as returned by the parser into values of color type.
 	 */
-	protected function funcToColor($func) {
+	protected function funcToColor($func)
+	{
 		$fname = $func[1];
 		if ($func[2][0] != 'list') {
 			// need a list of arguments
@@ -1513,7 +1644,6 @@ class Lessc {
 				$hsl[] = 0;
 			}
 			return $this->toRGB($hsl);
-
 		} elseif ($fname == 'rgb' || $fname == 'rgba') {
 			$components = array();
 			$i = 1;
@@ -1531,7 +1661,9 @@ class Lessc {
 					} else {
 						$components[] = floatval($c[1]);
 					}
-				} else break;
+				} else {
+					break;
+				}
 
 				$i++;
 			}
@@ -1545,7 +1677,8 @@ class Lessc {
 		return false;
 	}
 
-	protected function reduce($value, $forExpression = false) {
+	protected function reduce($value, $forExpression = false)
+	{
 		switch ($value[0]) {
 			case "interpolate":
 				$reduced = $this->reduce($value[1]);
@@ -1556,7 +1689,9 @@ class Lessc {
 					$res = $this->coerceColor($res);
 				}
 
-				if (empty($value[2])) $res = $this->lib_e($res);
+				if (empty($value[2])) {
+					$res = $this->lib_e($res);
+				}
 
 				return $res;
 			case "variable":
@@ -1588,7 +1723,9 @@ class Lessc {
 					if (is_array($part)) {
 						$strip = $part[0] == "variable";
 						$part = $this->reduce($part);
-						if ($strip) $part = $this->lib_e($part);
+						if ($strip) {
+							$part = $this->lib_e($part);
+						}
 					}
 				}
 				return $value;
@@ -1597,32 +1734,37 @@ class Lessc {
 				return $this->lib_e($this->reduce($inner));
 			case "function":
 				$color = $this->funcToColor($value);
-				if ($color) return $color;
+				if ($color) {
+					return $color;
+				}
 
 				list(, $name, $args) = $value;
-				if ($name == "%") $name = "_sprintf";
+				if ($name == "%") {
+					$name = "_sprintf";
+				}
 
 				$f = isset($this->libFunctions[$name]) ?
 				$this->libFunctions[$name] : array($this, 'lib_'.str_replace('-', '_', $name));
 
 				if (is_callable($f)) {
-					if ($args[0] == 'list')
+					if ($args[0] == 'list') {
 						$args = self::compressList($args[2], $args[1]);
+					}
 
 						$ret = call_user_func($f, $this->reduce($args, true), $this);
 
-						if (is_null($ret)) {
-							return array("string", "", array(
-								$name, "(", $args, ")"
-							));
-						}
+					if (is_null($ret)) {
+						return array("string", "", array(
+							$name, "(", $args, ")"
+						));
+					}
 
 						// convert to a typed value if the result is a php primitive
-						if (is_numeric($ret)) {
-							$ret = array('number', $ret, "");
-						} elseif (!is_array($ret)) {
-							$ret = array('keyword', $ret);
-						}
+					if (is_numeric($ret)) {
+						$ret = array('number', $ret, "");
+					} elseif (!is_array($ret)) {
+						$ret = array('keyword', $ret);
+					}
 
 						return $ret;
 				}
@@ -1663,9 +1805,11 @@ class Lessc {
 
 
 	// coerce a value for use in color operation
-	protected function coerceColor($value) {
+	protected function coerceColor($value)
+	{
 		switch ($value[0]) {
-			case 'color': return $value;
+			case 'color':
+				return $value;
 			case 'raw_color':
 				$c = array("color", 0, 0, 0);
 				$colorStr = substr($value[1], 1);
@@ -1695,7 +1839,8 @@ class Lessc {
 	}
 
 	// make something string like into a string
-	protected function coerceString($value) {
+	protected function coerceString($value)
+	{
 		switch ($value[0]) {
 			case "string":
 				return $value;
@@ -1706,19 +1851,22 @@ class Lessc {
 	}
 
 	// turn list of length 1 into value type
-	protected function flattenList($value) {
+	protected function flattenList($value)
+	{
 		if ($value[0] == "list" && count($value[2]) == 1) {
 			return $this->flattenList($value[2][0]);
 		}
 		return $value;
 	}
 
-	public function toBool($a) {
+	public function toBool($a)
+	{
 		return $a ? self::$TRUE : self::$FALSE;
 	}
 
 	// evaluate an expression
-	protected function evaluate($exp) {
+	protected function evaluate($exp)
+	{
 		list(, $op, $left, $right, $whiteBefore, $whiteAfter) = $exp;
 
 		$left = $this->reduce($left, true);
@@ -1752,7 +1900,9 @@ class Lessc {
 		$fname = "op_${ltype}_${rtype}";
 		if (is_callable(array($this, $fname))) {
 			$out = $this->$fname($op, $left, $right);
-			if (!is_null($out)) return $out;
+			if (!is_null($out)) {
+				return $out;
+			}
 		}
 
 		// make the expression look it did before being parsed
@@ -1767,7 +1917,8 @@ class Lessc {
 		return array("string", "", array($left, $paddedOp, $right));
 	}
 
-	protected function stringConcatenate($left, $right) {
+	protected function stringConcatenate($left, $right)
+	{
 		if ($strLeft = $this->coerceString($left)) {
 			if ($right[0] == "string") {
 				$right[1] = "";
@@ -1784,29 +1935,42 @@ class Lessc {
 
 
 	// make sure a color's components don't go out of bounds
-	protected function fixColor($c) {
+	protected function fixColor($c)
+	{
 		foreach (range(1, 3) as $i) {
-			if ($c[$i] < 0) $c[$i] = 0;
-			if ($c[$i] > 255) $c[$i] = 255;
+			if ($c[$i] < 0) {
+				$c[$i] = 0;
+			}
+			if ($c[$i] > 255) {
+				$c[$i] = 255;
+			}
 		}
 
 		return $c;
 	}
 
-	protected function op_number_color($op, $lft, $rgt) {
+	protected function op_number_color($op, $lft, $rgt)
+	{
 		if ($op == '+' || $op == '*') {
 			return $this->op_color_number($op, $rgt, $lft);
 		}
 	}
 
-	protected function op_color_number($op, $lft, $rgt) {
-		if ($rgt[0] == '%') $rgt[1] /= 100;
+	protected function op_color_number($op, $lft, $rgt)
+	{
+		if ($rgt[0] == '%') {
+			$rgt[1] /= 100;
+		}
 
-		return $this->op_color_color($op, $lft,
-			array_fill(1, count($lft) - 1, $rgt[1]));
+		return $this->op_color_color(
+			$op,
+			$lft,
+			array_fill(1, count($lft) - 1, $rgt[1])
+		);
 	}
 
-	protected function op_color_color($op, $left, $right) {
+	protected function op_color_color($op, $left, $right)
+	{
 		$out = array('color');
 		$max = count($left) > count($right) ? count($left) : count($right);
 		foreach (range(1, $max - 1) as $i) {
@@ -1838,7 +2002,8 @@ class Lessc {
 		return $this->fixColor($out);
 	}
 
-	public function lib_red($color) {
+	public function lib_red($color)
+	{
 		$color = $this->coerceColor($color);
 		if (is_null($color)) {
 			$this->throwError('color expected for red()');
@@ -1847,7 +2012,8 @@ class Lessc {
 		return $color[1];
 	}
 
-	public function lib_green($color) {
+	public function lib_green($color)
+	{
 		$color = $this->coerceColor($color);
 		if (is_null($color)) {
 			$this->throwError('color expected for green()');
@@ -1856,7 +2022,8 @@ class Lessc {
 		return $color[2];
 	}
 
-	public function lib_blue($color) {
+	public function lib_blue($color)
+	{
 		$color = $this->coerceColor($color);
 		if (is_null($color)) {
 			$this->throwError('color expected for blue()');
@@ -1867,7 +2034,8 @@ class Lessc {
 
 
 	// operator on two numbers
-	protected function op_number_number($op, $left, $right) {
+	protected function op_number_number($op, $left, $right)
+	{
 		$unit = empty($left[2]) ? $right[2] : $left[2];
 
 		$value = 0;
@@ -1885,7 +2053,9 @@ class Lessc {
 				$value = $left[1] % $right[1];
 				break;
 			case '/':
-				if ($right[1] == 0) $this->throwError('parse error: divide by zero');
+				if ($right[1] == 0) {
+					$this->throwError('parse error: divide by zero');
+				}
 				$value = $left[1] / $right[1];
 				break;
 			case '<':
@@ -1906,7 +2076,8 @@ class Lessc {
 
 	/* environment functions */
 
-	protected function makeOutputBlock($type, $selectors = null) {
+	protected function makeOutputBlock($type, $selectors = null)
+	{
 		$b = new stdclass;
 		$b->lines = array();
 		$b->children = array();
@@ -1917,7 +2088,8 @@ class Lessc {
 	}
 
 	// the state of execution
-	protected function pushEnv($block = null) {
+	protected function pushEnv($block = null)
+	{
 		$e = new stdclass;
 		$e->parent = $this->env;
 		$e->store = array();
@@ -1928,20 +2100,23 @@ class Lessc {
 	}
 
 	// pop something off the stack
-	protected function popEnv() {
+	protected function popEnv()
+	{
 		$old = $this->env;
 		$this->env = $this->env->parent;
 		return $old;
 	}
 
 	// set something in the current env
-	protected function set($name, $value) {
+	protected function set($name, $value)
+	{
 		$this->env->store[$name] = $value;
 	}
 
 
 	// get the highest occurrence entry for a name
-	protected function get($name) {
+	protected function get($name)
+	{
 		$current = $this->env;
 
 		$isArguments = $name == $this->vPrefix.'arguments';
@@ -1962,7 +2137,8 @@ class Lessc {
 	}
 
 	// inject array of unparsed strings into environment as variables
-	protected function injectVariables($args) {
+	protected function injectVariables($args)
+	{
 		$this->pushEnv();
 		$parser = new lessc_parser($this, __METHOD__);
 		foreach ($args as $name => $strValue) {
@@ -1983,14 +2159,16 @@ class Lessc {
 	 * Initialize any static state, can initialize parser for a file
 	 * $opts isn't used yet
 	 */
-	public function __construct($fname = null) {
+	public function __construct($fname = null)
+	{
 		if ($fname !== null) {
 			// used for deprecated parse method
 			$this->_parseFile = $fname;
 		}
 	}
 
-	public function compile($string, $name = null) {
+	public function compile($string, $name = null)
+	{
 		$locale = setlocale(LC_NUMERIC, 0);
 		setlocale(LC_NUMERIC, "C");
 
@@ -2016,7 +2194,8 @@ class Lessc {
 		return $out;
 	}
 
-	public function compileFile($fname, $outFname = null) {
+	public function compileFile($fname, $outFname = null)
+	{
 		if (!is_readable($fname)) {
 			throw new Exception('load error: failed to find '.$fname);
 		}
@@ -2042,7 +2221,8 @@ class Lessc {
 	}
 
 	// compile only if changed input has changed or output doesn't exist
-	public function checkedCompile($in, $out) {
+	public function checkedCompile($in, $out)
+	{
 		if (!is_file($out) || filemtime($in) > filemtime($out)) {
 			$this->compileFile($in, $out);
 			return true;
@@ -2070,7 +2250,8 @@ class Lessc {
 	 * @param bool $force Force rebuild?
 	 * @return array lessphp cache structure
 	 */
-	public function cachedCompile($in, $force = false) {
+	public function cachedCompile($in, $force = false)
+	{
 		// assume no root
 		$root = null;
 
@@ -2111,12 +2292,12 @@ class Lessc {
 			// we were given initially.
 			return $in;
 		}
-
 	}
 
 	// parse and compile buffer
 	// This is deprecated
-	public function parse($str = null, $initialVariables = null) {
+	public function parse($str = null, $initialVariables = null)
+	{
 		if (is_array($str)) {
 			$initialVariables = $str;
 			$str = null;
@@ -2141,69 +2322,83 @@ class Lessc {
 		return $out;
 	}
 
-	protected function makeParser($name) {
+	protected function makeParser($name)
+	{
 		$parser = new lessc_parser($this, $name);
 		$parser->writeComments = $this->preserveComments;
 
 		return $parser;
 	}
 
-	public function setFormatter($name) {
+	public function setFormatter($name)
+	{
 		$this->formatterName = $name;
 	}
 
-	protected function newFormatter() {
+	protected function newFormatter()
+	{
 		$className = "lessc_formatter_lessjs";
 		if (!empty($this->formatterName)) {
-			if (!is_string($this->formatterName))
+			if (!is_string($this->formatterName)) {
 				return $this->formatterName;
+			}
 				$className = "lessc_formatter_$this->formatterName";
 		}
 
 		return new $className;
 	}
 
-	public function setPreserveComments($preserve) {
+	public function setPreserveComments($preserve)
+	{
 		$this->preserveComments = $preserve;
 	}
 
-	public function registerFunction($name, $func) {
+	public function registerFunction($name, $func)
+	{
 		$this->libFunctions[$name] = $func;
 	}
 
-	public function unregisterFunction($name) {
+	public function unregisterFunction($name)
+	{
 		unset($this->libFunctions[$name]);
 	}
 
-	public function setVariables($variables) {
+	public function setVariables($variables)
+	{
 		$this->registeredVars = array_merge($this->registeredVars, $variables);
 	}
 
-	public function unsetVariable($name) {
+	public function unsetVariable($name)
+	{
 		unset($this->registeredVars[$name]);
 	}
 
-	public function setImportDir($dirs) {
+	public function setImportDir($dirs)
+	{
 		$this->importDir = (array) $dirs;
 	}
 
-	public function addImportDir($dir) {
+	public function addImportDir($dir)
+	{
 		$this->importDir = (array) $this->importDir;
 		$this->importDir[] = $dir;
 	}
 
-	public function allParsedFiles() {
+	public function allParsedFiles()
+	{
 		return $this->allParsedFiles;
 	}
 
-	public function addParsedFile($file) {
+	public function addParsedFile($file)
+	{
 		$this->allParsedFiles[realpath($file)] = filemtime($file);
 	}
 
 	/**
 	 * Uses the current value of $this->count to show line and line number
 	 */
-	public function throwError($msg = null) {
+	public function throwError($msg = null)
+	{
 		if ($this->sourceLoc >= 0) {
 			$this->sourceParser->throwError($msg, $this->sourceLoc);
 		}
@@ -2212,14 +2407,16 @@ class Lessc {
 
 	// compile file $in to file $out if $in is newer than $out
 	// returns true when it compiles, false otherwise
-	public static function ccompile($in, $out, $less = null) {
+	public static function ccompile($in, $out, $less = null)
+	{
 		if ($less === null) {
 			$less = new self;
 		}
 		return $less->checkedCompile($in, $out);
 	}
 
-	public static function cexecute($in, $force = false, $less = null) {
+	public static function cexecute($in, $force = false, $less = null)
+	{
 		if ($less === null) {
 			$less = new self;
 		}
@@ -2380,7 +2577,8 @@ class Lessc {
 
 // responsible for taking a string of LESS code and converting it into a
 // syntax tree
-class lessc_parser {
+class lessc_parser
+{
 	protected static $nextBlockId = 0; // used to uniquely identify blocks
 
 	protected static $precedence = array(
@@ -2428,7 +2626,8 @@ class lessc_parser {
 	// caches preg escaped literals
 	protected static $literalCache = array();
 
-	public function __construct($lessc, $sourceName = null) {
+	public function __construct($lessc, $sourceName = null)
+	{
 		$this->eatWhiteDefault = true;
 		// reference to less needed for vPrefix, mPrefix, and parentSelector
 		$this->lessc = $lessc;
@@ -2439,8 +2638,10 @@ class lessc_parser {
 
 		if (!self::$operatorString) {
 			self::$operatorString =
-			'('.implode('|', array_map(array('lessc', 'preg_quote'),
-				array_keys(self::$precedence))).')';
+			'('.implode('|', array_map(
+				array('lessc', 'preg_quote'),
+				array_keys(self::$precedence)
+			)).')';
 
 				$commentSingle = lessc::preg_quote(self::$commentSingle);
 				$commentMultiLeft = lessc::preg_quote(self::$commentMultiLeft);
@@ -2458,7 +2659,8 @@ class lessc_parser {
 	 * @throws exception
 	 * @return NULL|stdclass
 	 */
-	public function parse($buffer) {
+	public function parse($buffer)
+	{
 		$this->count = 0;
 		$this->line = 1;
 
@@ -2478,19 +2680,17 @@ class lessc_parser {
 			// parse the entire file
 			while (false !== $this->parseChunk());
 
-			if ($this->count != strlen($this->buffer))
-			{
-				$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));
-			}
+		if ($this->count != strlen($this->buffer)) {
+			$this->throwError('parse error count '.$this->count.' != len buffer '.strlen($this->buffer));
+		}
 
 			// TODO report where the block was opened
-			if (!property_exists($this->env, 'parent') || !is_null($this->env->parent))
-			{
-				throw new exception('parse error: unclosed block');
-			}
+		if (!property_exists($this->env, 'parent') || !is_null($this->env->parent)) {
+			throw new exception('parse error: unclosed block');
+		}
 
 			return $this->env;
-		}
+	}
 
 		/**
 		 * Parse a single chunk off the head of the buffer and append it to the
@@ -2528,1257 +2728,1397 @@ class lessc_parser {
 		 * position into $s. Then if a chain fails, use $this->seek($s) to
 		 * go back where we started.
 		 */
-		protected function parseChunk() {
-			if (empty($this->buffer)) return false;
-			$s = $this->seek();
-
-			if ($this->whitespace()) {
-				return true;
-			}
-
-			// setting a property
-			if ($this->keyword($key) && $this->assign() &&
-				$this->propertyValue($value, $key) && $this->end()
-				) {
-					$this->append(array('assign', $key, $value), $s);
-					return true;
-				} else {
-					$this->seek($s);
-				}
-
-
-				// look for special css blocks
-				if ($this->literal('@', false)) {
-					$this->count--;
-
-					// media
-					if ($this->literal('@media')) {
-						if (($this->mediaQueryList($mediaQueries) || true)
-							&& $this->literal('{')
-							) {
-								$media = $this->pushSpecialBlock("media");
-								$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
-								return true;
-							} else {
-								$this->seek($s);
-								return false;
-							}
-					}
-
-					if ($this->literal("@", false) && $this->keyword($dirName)) {
-						if ($this->isDirective($dirName, $this->blockDirectives)) {
-							if (($this->openString("{", $dirValue, null, array(";")) || true) &&
-								$this->literal("{")
-								) {
-									$dir = $this->pushSpecialBlock("directive");
-									$dir->name = $dirName;
-									if (isset($dirValue)) $dir->value = $dirValue;
-									return true;
-								}
-						} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
-							if ($this->propertyValue($dirValue) && $this->end()) {
-								$this->append(array("directive", $dirName, $dirValue));
-								return true;
-							}
-						}
-					}
-
-					$this->seek($s);
-				}
-
-				// setting a variable
-				if ($this->variable($var) && $this->assign() &&
-					$this->propertyValue($value) && $this->end()
-					) {
-						$this->append(array('assign', $var, $value), $s);
-						return true;
-					} else {
-						$this->seek($s);
-					}
-
-					if ($this->import($importValue)) {
-						$this->append($importValue, $s);
-						return true;
-					}
-
-					// opening parametric mixin
-					if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
-						($this->guards($guards) || true) &&
-						$this->literal('{')
-						) {
-							$block = $this->pushBlock($this->fixTags(array($tag)));
-							$block->args = $args;
-							$block->isVararg = $isVararg;
-							if (!empty($guards)) $block->guards = $guards;
-							return true;
-						} else {
-							$this->seek($s);
-						}
-
-						// opening a simple block
-						if ($this->tags($tags) && $this->literal('{', false)) {
-							$tags = $this->fixTags($tags);
-							$this->pushBlock($tags);
-							return true;
-						} else {
-							$this->seek($s);
-						}
-
-						// closing a block
-						if ($this->literal('}', false)) {
-							try {
-								$block = $this->pop();
-							} catch (exception $e) {
-								$this->seek($s);
-								$this->throwError($e->getMessage());
-							}
-
-							$hidden = false;
-							if (is_null($block->type)) {
-								$hidden = true;
-								if (!isset($block->args)) {
-									foreach ($block->tags as $tag) {
-										if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) {
-											$hidden = false;
-											break;
-										}
-									}
-								}
-
-								foreach ($block->tags as $tag) {
-									if (is_string($tag)) {
-										$this->env->children[$tag][] = $block;
-									}
-								}
-							}
-
-							if (!$hidden) {
-								$this->append(array('block', $block), $s);
-							}
-
-							// this is done here so comments aren't bundled into he block that
-							// was just closed
-							$this->whitespace();
-							return true;
-						}
-
-						// mixin
-						if ($this->mixinTags($tags) &&
-							($this->argumentDef($argv, $isVararg) || true) &&
-							($this->keyword($suffix) || true) && $this->end()
-							) {
-								$tags = $this->fixTags($tags);
-								$this->append(array('mixin', $tags, $argv, $suffix), $s);
-								return true;
-							} else {
-								$this->seek($s);
-							}
-
-							// spare ;
-							if ($this->literal(';')) return true;
-
-							return false; // got nothing, throw error
+	protected function parseChunk()
+	{
+		if (empty($this->buffer)) {
+			return false;
 		}
+		$s = $this->seek();
 
-		protected function isDirective($dirname, $directives) {
-			// TODO: cache pattern in parser
-			$pattern = implode("|",
-				array_map(array("lessc", "preg_quote"), $directives));
-			$pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
-
-			return preg_match($pattern, $dirname);
-		}
-
-		protected function fixTags($tags) {
-			// move @ tags out of variable namespace
-			foreach ($tags as &$tag) {
-				if ($tag[0] == $this->lessc->vPrefix)
-					$tag[0] = $this->lessc->mPrefix;
-			}
-			return $tags;
-		}
-
-		// a list of expressions
-		protected function expressionList(&$exps) {
-			$values = array();
-
-			while ($this->expression($exp)) {
-				$values[] = $exp;
-			}
-
-			if (count($values) == 0) return false;
-
-			$exps = lessc::compressList($values, ' ');
+		if ($this->whitespace()) {
 			return true;
 		}
 
+		// setting a property
+		if ($this->keyword($key) && $this->assign() &&
+			$this->propertyValue($value, $key) && $this->end()
+			) {
+				$this->append(array('assign', $key, $value), $s);
+				return true;
+		} else {
+			$this->seek($s);
+		}
+
+
+			// look for special css blocks
+		if ($this->literal('@', false)) {
+			$this->count--;
+
+			// media
+			if ($this->literal('@media')) {
+				if (($this->mediaQueryList($mediaQueries) || true)
+					&& $this->literal('{')
+					) {
+						$media = $this->pushSpecialBlock("media");
+						$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
+						return true;
+				} else {
+					$this->seek($s);
+					return false;
+				}
+			}
+
+			if ($this->literal("@", false) && $this->keyword($dirName)) {
+				if ($this->isDirective($dirName, $this->blockDirectives)) {
+					if (($this->openString("{", $dirValue, null, array(";")) || true) &&
+						$this->literal("{")
+						) {
+							$dir = $this->pushSpecialBlock("directive");
+							$dir->name = $dirName;
+						if (isset($dirValue)) {
+							$dir->value = $dirValue;
+						}
+							return true;
+					}
+				} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
+					if ($this->propertyValue($dirValue) && $this->end()) {
+						$this->append(array("directive", $dirName, $dirValue));
+						return true;
+					}
+				}
+			}
+
+			$this->seek($s);
+		}
+
+			// setting a variable
+		if ($this->variable($var) && $this->assign() &&
+				$this->propertyValue($value) && $this->end()
+				) {
+				$this->append(array('assign', $var, $value), $s);
+				return true;
+		} else {
+			$this->seek($s);
+		}
+
+		if ($this->import($importValue)) {
+			$this->append($importValue, $s);
+			return true;
+		}
+
+				// opening parametric mixin
+		if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
+					($this->guards($guards) || true) &&
+					$this->literal('{')
+					) {
+				$block = $this->pushBlock($this->fixTags(array($tag)));
+				$block->args = $args;
+				$block->isVararg = $isVararg;
+			if (!empty($guards)) {
+				$block->guards = $guards;
+			}
+				return true;
+		} else {
+			$this->seek($s);
+		}
+
+					// opening a simple block
+		if ($this->tags($tags) && $this->literal('{', false)) {
+			$tags = $this->fixTags($tags);
+			$this->pushBlock($tags);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+					// closing a block
+		if ($this->literal('}', false)) {
+			try {
+				$block = $this->pop();
+			} catch (exception $e) {
+				$this->seek($s);
+				$this->throwError($e->getMessage());
+			}
+
+			$hidden = false;
+			if (is_null($block->type)) {
+				$hidden = true;
+				if (!isset($block->args)) {
+					foreach ($block->tags as $tag) {
+						if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) {
+							$hidden = false;
+							break;
+						}
+					}
+				}
+
+				foreach ($block->tags as $tag) {
+					if (is_string($tag)) {
+						$this->env->children[$tag][] = $block;
+					}
+				}
+			}
+
+			if (!$hidden) {
+				$this->append(array('block', $block), $s);
+			}
+
+			// this is done here so comments aren't bundled into he block that
+						// was just closed
+						$this->whitespace();
+						return true;
+		}
+
+					// mixin
+		if ($this->mixinTags($tags) &&
+						($this->argumentDef($argv, $isVararg) || true) &&
+						($this->keyword($suffix) || true) && $this->end()
+						) {
+				$tags = $this->fixTags($tags);
+				$this->append(array('mixin', $tags, $argv, $suffix), $s);
+				return true;
+		} else {
+			$this->seek($s);
+		}
+
+						// spare ;
+		if ($this->literal(';')) {
+			return true;
+		}
+
+						return false; // got nothing, throw error
+	}
+
+	protected function isDirective($dirname, $directives)
+	{
+		// TODO: cache pattern in parser
+		$pattern = implode(
+			"|",
+			array_map(array("lessc", "preg_quote"), $directives)
+		);
+		$pattern = '/^(-[a-z-]+-)?('.$pattern.')$/i';
+
+		return preg_match($pattern, $dirname);
+	}
+
+	protected function fixTags($tags)
+	{
+		// move @ tags out of variable namespace
+		foreach ($tags as &$tag) {
+			if ($tag[0] == $this->lessc->vPrefix) {
+				$tag[0] = $this->lessc->mPrefix;
+			}
+		}
+		return $tags;
+	}
+
+		// a list of expressions
+	protected function expressionList(&$exps)
+	{
+		$values = array();
+
+		while ($this->expression($exp)) {
+			$values[] = $exp;
+		}
+
+		if (count($values) == 0) {
+			return false;
+		}
+
+		$exps = lessc::compressList($values, ' ');
+		return true;
+	}
+
 		/**
 		 * Attempt to consume an expression.
 		 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
 		 */
-		protected function expression(&$out) {
-			if ($this->value($lhs)) {
-				$out = $this->expHelper($lhs, 0);
+	protected function expression(&$out)
+	{
+		if ($this->value($lhs)) {
+			$out = $this->expHelper($lhs, 0);
 
-				// look for / shorthand
-				if (!empty($this->env->supressedDivision)) {
-					unset($this->env->supressedDivision);
-					$s = $this->seek();
-					if ($this->literal("/") && $this->value($rhs)) {
-						$out = array("list", "",
-							array($out, array("keyword", "/"), $rhs));
-					} else {
-						$this->seek($s);
-					}
+			// look for / shorthand
+			if (!empty($this->env->supressedDivision)) {
+				unset($this->env->supressedDivision);
+				$s = $this->seek();
+				if ($this->literal("/") && $this->value($rhs)) {
+					$out = array("list", "",
+						array($out, array("keyword", "/"), $rhs));
+				} else {
+					$this->seek($s);
 				}
-
-				return true;
 			}
-			return false;
+
+			return true;
 		}
+		return false;
+	}
 
 		/**
 		 * recursively parse infix equation with $lhs at precedence $minP
 		 */
-		protected function expHelper($lhs, $minP) {
-			$this->inExp = true;
-			$ss = $this->seek();
+	protected function expHelper($lhs, $minP)
+	{
+		$this->inExp = true;
+		$ss = $this->seek();
 
-			while (true) {
-				$whiteBefore = isset($this->buffer[$this->count - 1]) &&
-				ctype_space($this->buffer[$this->count - 1]);
+		while (true) {
+			$whiteBefore = isset($this->buffer[$this->count - 1]) &&
+			ctype_space($this->buffer[$this->count - 1]);
 
-				// If there is whitespace before the operator, then we require
-				// whitespace after the operator for it to be an expression
-				$needWhite = $whiteBefore && !$this->inParens;
+			// If there is whitespace before the operator, then we require
+			// whitespace after the operator for it to be an expression
+			$needWhite = $whiteBefore && !$this->inParens;
 
-				if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
-					if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
-						foreach (self::$supressDivisionProps as $pattern) {
-							if (preg_match($pattern, $this->env->currentProperty)) {
-								$this->env->supressedDivision = true;
-								break 2;
-							}
+			if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
+				if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
+					foreach (self::$supressDivisionProps as $pattern) {
+						if (preg_match($pattern, $this->env->currentProperty)) {
+							$this->env->supressedDivision = true;
+							break 2;
 						}
 					}
-
-
-					$whiteAfter = isset($this->buffer[$this->count - 1]) &&
-					ctype_space($this->buffer[$this->count - 1]);
-
-					if (!$this->value($rhs)) break;
-
-					// peek for next operator to see what to do with rhs
-					if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
-						$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
-					}
-
-					$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
-					$ss = $this->seek();
-
-					continue;
 				}
 
-				break;
-			}
 
-			$this->seek($ss);
+				$whiteAfter = isset($this->buffer[$this->count - 1]) &&
+				ctype_space($this->buffer[$this->count - 1]);
 
-			return $lhs;
-		}
-
-		// consume a list of values for a property
-		public function propertyValue(&$value, $keyName = null) {
-			$values = array();
-
-			if ($keyName !== null) $this->env->currentProperty = $keyName;
-
-			$s = null;
-			while ($this->expressionList($v)) {
-				$values[] = $v;
-				$s = $this->seek();
-				if (!$this->literal(',')) break;
-			}
-
-			if ($s) $this->seek($s);
-
-			if ($keyName !== null) unset($this->env->currentProperty);
-
-			if (count($values) == 0) return false;
-
-			$value = lessc::compressList($values, ', ');
-			return true;
-		}
-
-		protected function parenValue(&$out) {
-			$s = $this->seek();
-
-			// speed shortcut
-			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
-				return false;
-			}
-
-			$inParens = $this->inParens;
-			if ($this->literal("(") &&
-				($this->inParens = true) && $this->expression($exp) &&
-				$this->literal(")")
-				) {
-					$out = $exp;
-					$this->inParens = $inParens;
-					return true;
-				} else {
-					$this->inParens = $inParens;
-					$this->seek($s);
-				}
-
-				return false;
-		}
-
-		// a single value
-		protected function value(&$value) {
-			$s = $this->seek();
-
-			// speed shortcut
-			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
-				// negation
-				if ($this->literal("-", false) &&
-					(($this->variable($inner) && $inner = array("variable", $inner)) ||
-						$this->unit($inner) ||
-						$this->parenValue($inner))
-					) {
-						$value = array("unary", "-", $inner);
-						return true;
-					} else {
-						$this->seek($s);
-					}
-			}
-
-			if ($this->parenValue($value)) return true;
-			if ($this->unit($value)) return true;
-			if ($this->color($value)) return true;
-			if ($this->func($value)) return true;
-			if ($this->string($value)) return true;
-
-			if ($this->keyword($word)) {
-				$value = array('keyword', $word);
-				return true;
-			}
-
-			// try a variable
-			if ($this->variable($var)) {
-				$value = array('variable', $var);
-				return true;
-			}
-
-			// unquote string (should this work on any type?
-			if ($this->literal("~") && $this->string($str)) {
-				$value = array("escape", $str);
-				return true;
-			} else {
-				$this->seek($s);
-			}
-
-			// css hack: \0
-			if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
-				$value = array('keyword', '\\'.$m[1]);
-				return true;
-			} else {
-				$this->seek($s);
-			}
-
-			return false;
-		}
-
-		// an import statement
-		protected function import(&$out) {
-			if (!$this->literal('@import')) return false;
-
-			// @import "something.css" media;
-			// @import url("something.css") media;
-			// @import url(something.css) media;
-
-			if ($this->propertyValue($value)) {
-				$out = array("import", $value);
-				return true;
-			}
-		}
-
-		protected function mediaQueryList(&$out) {
-			if ($this->genericList($list, "mediaQuery", ",", false)) {
-				$out = $list[2];
-				return true;
-			}
-			return false;
-		}
-
-		protected function mediaQuery(&$out) {
-			$s = $this->seek();
-
-			$expressions = null;
-			$parts = array();
-
-			if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
-				$prop = array("mediaType");
-				if (isset($only)) $prop[] = "only";
-				if (isset($not)) $prop[] = "not";
-				$prop[] = $mediaType;
-				$parts[] = $prop;
-			} else {
-				$this->seek($s);
-			}
-
-
-			if (!empty($mediaType) && !$this->literal("and")) {
-				// ~
-			} else {
-				$this->genericList($expressions, "mediaExpression", "and", false);
-				if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]);
-			}
-
-			if (count($parts) == 0) {
-				$this->seek($s);
-				return false;
-			}
-
-			$out = $parts;
-			return true;
-		}
-
-		protected function mediaExpression(&$out) {
-			$s = $this->seek();
-			$value = null;
-			if ($this->literal("(") &&
-				$this->keyword($feature) &&
-				($this->literal(":") && $this->expression($value) || true) &&
-				$this->literal(")")
-				) {
-					$out = array("mediaExp", $feature);
-					if ($value) $out[] = $value;
-					return true;
-				} elseif ($this->variable($variable)) {
-					$out = array('variable', $variable);
-					return true;
-				}
-
-				$this->seek($s);
-				return false;
-		}
-
-		// an unbounded string stopped by $end
-		protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null) {
-			$oldWhite = $this->eatWhiteDefault;
-			$this->eatWhiteDefault = false;
-
-			$stop = array("'", '"', "@{", $end);
-			$stop = array_map(array("lessc", "preg_quote"), $stop);
-			// $stop[] = self::$commentMulti;
-
-			if (!is_null($rejectStrs)) {
-				$stop = array_merge($stop, $rejectStrs);
-			}
-
-			$patt = '(.*?)('.implode("|", $stop).')';
-
-			$nestingLevel = 0;
-
-			$content = array();
-			while ($this->match($patt, $m, false)) {
-				if (!empty($m[1])) {
-					$content[] = $m[1];
-					if ($nestingOpen) {
-						$nestingLevel += substr_count($m[1], $nestingOpen);
-					}
-				}
-
-				$tok = $m[2];
-
-				$this->count -= strlen($tok);
-				if ($tok == $end) {
-					if ($nestingLevel == 0) {
-						break;
-					} else {
-						$nestingLevel--;
-					}
-				}
-
-				if (($tok == "'" || $tok == '"') && $this->string($str)) {
-					$content[] = $str;
-					continue;
-				}
-
-				if ($tok == "@{" && $this->interpolation($inter)) {
-					$content[] = $inter;
-					continue;
-				}
-
-				if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {
+				if (!$this->value($rhs)) {
 					break;
 				}
 
-				$content[] = $tok;
-				$this->count += strlen($tok);
+				// peek for next operator to see what to do with rhs
+				if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
+					$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
+				}
+
+				$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
+				$ss = $this->seek();
+
+				continue;
 			}
 
-			$this->eatWhiteDefault = $oldWhite;
+			break;
+		}
 
-			if (count($content) == 0) return false;
+		$this->seek($ss);
 
-			// trim the end
-			if (is_string(end($content))) {
-				$content[count($content) - 1] = rtrim(end($content));
+		return $lhs;
+	}
+
+		// consume a list of values for a property
+	public function propertyValue(&$value, $keyName = null)
+	{
+		$values = array();
+
+		if ($keyName !== null) {
+			$this->env->currentProperty = $keyName;
+		}
+
+		$s = null;
+		while ($this->expressionList($v)) {
+			$values[] = $v;
+			$s = $this->seek();
+			if (!$this->literal(',')) {
+				break;
 			}
+		}
 
-			$out = array("string", "", $content);
+		if ($s) {
+			$this->seek($s);
+		}
+
+		if ($keyName !== null) {
+			unset($this->env->currentProperty);
+		}
+
+		if (count($values) == 0) {
+			return false;
+		}
+
+		$value = lessc::compressList($values, ', ');
+		return true;
+	}
+
+	protected function parenValue(&$out)
+	{
+		$s = $this->seek();
+
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
+			return false;
+		}
+
+		$inParens = $this->inParens;
+		if ($this->literal("(") &&
+			($this->inParens = true) && $this->expression($exp) &&
+			$this->literal(")")
+			) {
+				$out = $exp;
+				$this->inParens = $inParens;
+				return true;
+		} else {
+			$this->inParens = $inParens;
+			$this->seek($s);
+		}
+
+			return false;
+	}
+
+		// a single value
+	protected function value(&$value)
+	{
+		$s = $this->seek();
+
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
+			// negation
+			if ($this->literal("-", false) &&
+				(($this->variable($inner) && $inner = array("variable", $inner)) ||
+					$this->unit($inner) ||
+					$this->parenValue($inner))
+				) {
+					$value = array("unary", "-", $inner);
+					return true;
+			} else {
+				$this->seek($s);
+			}
+		}
+
+		if ($this->parenValue($value)) {
+			return true;
+		}
+		if ($this->unit($value)) {
+			return true;
+		}
+		if ($this->color($value)) {
+			return true;
+		}
+		if ($this->func($value)) {
+			return true;
+		}
+		if ($this->string($value)) {
 			return true;
 		}
 
-		protected function string(&$out) {
-			$s = $this->seek();
-			if ($this->literal('"', false)) {
-				$delim = '"';
-			} elseif ($this->literal("'", false)) {
-				$delim = "'";
-			} else {
-				return false;
-			}
-
-			$content = array();
-
-			// look for either ending delim , escape, or string interpolation
-			$patt = '([^\n]*?)(@\{|\\\\|'.
-				lessc::preg_quote($delim).')';
-
-				$oldWhite = $this->eatWhiteDefault;
-				$this->eatWhiteDefault = false;
-
-				while ($this->match($patt, $m, false)) {
-					$content[] = $m[1];
-					if ($m[2] == "@{") {
-						$this->count -= strlen($m[2]);
-						if ($this->interpolation($inter)) {
-							$content[] = $inter;
-						} else {
-							$this->count += strlen($m[2]);
-							$content[] = "@{"; // ignore it
-						}
-					} elseif ($m[2] == '\\') {
-						$content[] = $m[2];
-						if ($this->literal($delim, false)) {
-							$content[] = $delim;
-						}
-					} else {
-						$this->count -= strlen($delim);
-						break; // delim
-					}
-				}
-
-				$this->eatWhiteDefault = $oldWhite;
-
-				if ($this->literal($delim)) {
-					$out = array("string", $delim, $content);
-					return true;
-				}
-
-				$this->seek($s);
-				return false;
+		if ($this->keyword($word)) {
+			$value = array('keyword', $word);
+			return true;
 		}
 
-		protected function interpolation(&$out) {
-			$oldWhite = $this->eatWhiteDefault;
-			$this->eatWhiteDefault = true;
-
-			$s = $this->seek();
-			if ($this->literal("@{") &&
-				$this->openString("}", $interp, null, array("'", '"', ";")) &&
-				$this->literal("}", false)
-				) {
-					$out = array("interpolate", $interp);
-					$this->eatWhiteDefault = $oldWhite;
-					if ($this->eatWhiteDefault) $this->whitespace();
-					return true;
-				}
-
-				$this->eatWhiteDefault = $oldWhite;
-				$this->seek($s);
-				return false;
+		// try a variable
+		if ($this->variable($var)) {
+			$value = array('variable', $var);
+			return true;
 		}
 
-		protected function unit(&$unit) {
-			// speed shortcut
-			if (isset($this->buffer[$this->count])) {
-				$char = $this->buffer[$this->count];
-				if (!ctype_digit($char) && $char != ".") return false;
-			}
+		// unquote string (should this work on any type?
+		if ($this->literal("~") && $this->string($str)) {
+			$value = array("escape", $str);
+			return true;
+		} else {
+			$this->seek($s);
+		}
 
-			if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
-				$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
-				return true;
-			}
+		// css hack: \0
+		if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
+			$value = array('keyword', '\\'.$m[1]);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		return false;
+	}
+
+		// an import statement
+	protected function import(&$out)
+	{
+		if (!$this->literal('@import')) {
 			return false;
 		}
 
+		// @import "something.css" media;
+		// @import url("something.css") media;
+		// @import url(something.css) media;
+
+		if ($this->propertyValue($value)) {
+			$out = array("import", $value);
+			return true;
+		}
+	}
+
+	protected function mediaQueryList(&$out)
+	{
+		if ($this->genericList($list, "mediaQuery", ",", false)) {
+			$out = $list[2];
+			return true;
+		}
+		return false;
+	}
+
+	protected function mediaQuery(&$out)
+	{
+		$s = $this->seek();
+
+		$expressions = null;
+		$parts = array();
+
+		if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
+			$prop = array("mediaType");
+			if (isset($only)) {
+				$prop[] = "only";
+			}
+			if (isset($not)) {
+				$prop[] = "not";
+			}
+			$prop[] = $mediaType;
+			$parts[] = $prop;
+		} else {
+			$this->seek($s);
+		}
+
+
+		if (!empty($mediaType) && !$this->literal("and")) {
+			// ~
+		} else {
+			$this->genericList($expressions, "mediaExpression", "and", false);
+			if (is_array($expressions)) {
+				$parts = array_merge($parts, $expressions[2]);
+			}
+		}
+
+		if (count($parts) == 0) {
+			$this->seek($s);
+			return false;
+		}
+
+		$out = $parts;
+		return true;
+	}
+
+	protected function mediaExpression(&$out)
+	{
+		$s = $this->seek();
+		$value = null;
+		if ($this->literal("(") &&
+			$this->keyword($feature) &&
+			($this->literal(":") && $this->expression($value) || true) &&
+			$this->literal(")")
+			) {
+				$out = array("mediaExp", $feature);
+			if ($value) {
+				$out[] = $value;
+			}
+				return true;
+		} elseif ($this->variable($variable)) {
+			$out = array('variable', $variable);
+			return true;
+		}
+
+			$this->seek($s);
+			return false;
+	}
+
+		// an unbounded string stopped by $end
+	protected function openString($end, &$out, $nestingOpen = null, $rejectStrs = null)
+	{
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		$stop = array("'", '"', "@{", $end);
+		$stop = array_map(array("lessc", "preg_quote"), $stop);
+		// $stop[] = self::$commentMulti;
+
+		if (!is_null($rejectStrs)) {
+			$stop = array_merge($stop, $rejectStrs);
+		}
+
+		$patt = '(.*?)('.implode("|", $stop).')';
+
+		$nestingLevel = 0;
+
+		$content = array();
+		while ($this->match($patt, $m, false)) {
+			if (!empty($m[1])) {
+				$content[] = $m[1];
+				if ($nestingOpen) {
+					$nestingLevel += substr_count($m[1], $nestingOpen);
+				}
+			}
+
+			$tok = $m[2];
+
+			$this->count -= strlen($tok);
+			if ($tok == $end) {
+				if ($nestingLevel == 0) {
+					break;
+				} else {
+					$nestingLevel--;
+				}
+			}
+
+			if (($tok == "'" || $tok == '"') && $this->string($str)) {
+				$content[] = $str;
+				continue;
+			}
+
+			if ($tok == "@{" && $this->interpolation($inter)) {
+				$content[] = $inter;
+				continue;
+			}
+
+			if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {
+				break;
+			}
+
+			$content[] = $tok;
+			$this->count += strlen($tok);
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+
+		if (count($content) == 0) {
+			return false;
+		}
+
+		// trim the end
+		if (is_string(end($content))) {
+			$content[count($content) - 1] = rtrim(end($content));
+		}
+
+		$out = array("string", "", $content);
+		return true;
+	}
+
+	protected function string(&$out)
+	{
+		$s = $this->seek();
+		if ($this->literal('"', false)) {
+			$delim = '"';
+		} elseif ($this->literal("'", false)) {
+			$delim = "'";
+		} else {
+			return false;
+		}
+
+		$content = array();
+
+		// look for either ending delim , escape, or string interpolation
+		$patt = '([^\n]*?)(@\{|\\\\|'.
+			lessc::preg_quote($delim).')';
+
+			$oldWhite = $this->eatWhiteDefault;
+			$this->eatWhiteDefault = false;
+
+		while ($this->match($patt, $m, false)) {
+			$content[] = $m[1];
+			if ($m[2] == "@{") {
+				$this->count -= strlen($m[2]);
+				if ($this->interpolation($inter)) {
+					$content[] = $inter;
+				} else {
+					$this->count += strlen($m[2]);
+					$content[] = "@{"; // ignore it
+				}
+			} elseif ($m[2] == '\\') {
+				$content[] = $m[2];
+				if ($this->literal($delim, false)) {
+					$content[] = $delim;
+				}
+			} else {
+				$this->count -= strlen($delim);
+				break; // delim
+			}
+		}
+
+			$this->eatWhiteDefault = $oldWhite;
+
+		if ($this->literal($delim)) {
+			$out = array("string", $delim, $content);
+			return true;
+		}
+
+			$this->seek($s);
+			return false;
+	}
+
+	protected function interpolation(&$out)
+	{
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = true;
+
+		$s = $this->seek();
+		if ($this->literal("@{") &&
+			$this->openString("}", $interp, null, array("'", '"', ";")) &&
+			$this->literal("}", false)
+			) {
+				$out = array("interpolate", $interp);
+				$this->eatWhiteDefault = $oldWhite;
+			if ($this->eatWhiteDefault) {
+				$this->whitespace();
+			}
+				return true;
+		}
+
+			$this->eatWhiteDefault = $oldWhite;
+			$this->seek($s);
+			return false;
+	}
+
+	protected function unit(&$unit)
+	{
+		// speed shortcut
+		if (isset($this->buffer[$this->count])) {
+			$char = $this->buffer[$this->count];
+			if (!ctype_digit($char) && $char != ".") {
+				return false;
+			}
+		}
+
+		if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
+			$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
+			return true;
+		}
+		return false;
+	}
+
 		// a # color
-		protected function color(&$out) {
-			if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
-				if (strlen($m[1]) > 7) {
-					$out = array("string", "", array($m[1]));
-				} else {
-					$out = array("raw_color", $m[1]);
-				}
-				return true;
+	protected function color(&$out)
+	{
+		if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
+			if (strlen($m[1]) > 7) {
+				$out = array("string", "", array($m[1]));
+			} else {
+				$out = array("raw_color", $m[1]);
 			}
-
-			return false;
+			return true;
 		}
 
+		return false;
+	}
+
 		// consume an argument definition list surrounded by ()
 		// each argument is a variable name with optional value
 		// or at the end a ... or a variable named followed by ...
 		// arguments are separated by , unless a ; is in the list, then ; is the
 		// delimiter.
-		protected function argumentDef(&$args, &$isVararg) {
-			$s = $this->seek();
-			if (!$this->literal('(')) {
-				return false;
+	protected function argumentDef(&$args, &$isVararg)
+	{
+		$s = $this->seek();
+		if (!$this->literal('(')) {
+			return false;
+		}
+
+		$values = array();
+		$delim = ",";
+		$method = "expressionList";
+
+		$isVararg = false;
+		while (true) {
+			if ($this->literal("...")) {
+				$isVararg = true;
+				break;
 			}
 
-			$values = array();
-			$delim = ",";
-			$method = "expressionList";
+			if ($this->$method($value)) {
+				if ($value[0] == "variable") {
+					$arg = array("arg", $value[1]);
+					$ss = $this->seek();
 
-			$isVararg = false;
-			while (true) {
-				if ($this->literal("...")) {
-					$isVararg = true;
-					break;
-				}
-
-				if ($this->$method($value)) {
-					if ($value[0] == "variable") {
-						$arg = array("arg", $value[1]);
-						$ss = $this->seek();
-
-						if ($this->assign() && $this->$method($rhs)) {
-							$arg[] = $rhs;
-						} else {
-							$this->seek($ss);
-							if ($this->literal("...")) {
-								$arg[0] = "rest";
-								$isVararg = true;
-							}
-						}
-
-						$values[] = $arg;
-						if ($isVararg) {
-							break;
-						}
-						continue;
+					if ($this->assign() && $this->$method($rhs)) {
+						$arg[] = $rhs;
 					} else {
-						$values[] = array("lit", $value);
+						$this->seek($ss);
+						if ($this->literal("...")) {
+							$arg[0] = "rest";
+							$isVararg = true;
+						}
 					}
-				}
 
-
-				if (!$this->literal($delim)) {
-					if ($delim == "," && $this->literal(";")) {
-						// found new delim, convert existing args
-						$delim = ";";
-						$method = "propertyValue";
-
-						// transform arg list
-						if (isset($values[1])) { // 2 items
-							$newList = array();
-							foreach ($values as $i => $arg) {
-								switch ($arg[0]) {
-									case "arg":
-										if ($i) {
-											$this->throwError("Cannot mix ; and , as delimiter types");
-										}
-										$newList[] = $arg[2];
-										break;
-									case "lit":
-										$newList[] = $arg[1];
-										break;
-									case "rest":
-										$this->throwError("Unexpected rest before semicolon");
-								}
-							}
-
-							$newList = array("list", ", ", $newList);
-
-							switch ($values[0][0]) {
-								case "arg":
-									$newArg = array("arg", $values[0][1], $newList);
-									break;
-								case "lit":
-									$newArg = array("lit", $newList);
-									break;
-							}
-
-						} elseif ($values) { // 1 item
-							$newArg = $values[0];
-						}
-
-						if ($newArg) {
-							$values = array($newArg);
-						}
-					} else {
+					$values[] = $arg;
+					if ($isVararg) {
 						break;
 					}
+					continue;
+				} else {
+					$values[] = array("lit", $value);
 				}
 			}
 
-			if (!$this->literal(')')) {
-				$this->seek($s);
-				return false;
-			}
 
-			$args = $values;
+			if (!$this->literal($delim)) {
+				if ($delim == "," && $this->literal(";")) {
+					// found new delim, convert existing args
+					$delim = ";";
+					$method = "propertyValue";
 
-			return true;
-		}
-
-		// consume a list of tags
-		// this accepts a hanging delimiter
-		protected function tags(&$tags, $simple = false, $delim = ',') {
-			$tags = array();
-			while ($this->tag($tt, $simple)) {
-				$tags[] = $tt;
-				if (!$this->literal($delim)) break;
-			}
-			if (count($tags) == 0) return false;
-
-			return true;
-		}
-
-		// list of tags of specifying mixin path
-		// optionally separated by > (lazy, accepts extra >)
-		protected function mixinTags(&$tags) {
-			$tags = array();
-			while ($this->tag($tt, true)) {
-				$tags[] = $tt;
-				$this->literal(">");
-			}
-
-			if (!$tags) {
-				return false;
-			}
-
-			return true;
-		}
-
-		// a bracketed value (contained within in a tag definition)
-		protected function tagBracket(&$parts, &$hasExpression) {
-			// speed shortcut
-			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
-				return false;
-			}
-
-			$s = $this->seek();
-
-			$hasInterpolation = false;
-
-			if ($this->literal("[", false)) {
-				$attrParts = array("[");
-				// keyword, string, operator
-				while (true) {
-					if ($this->literal("]", false)) {
-						$this->count--;
-						break; // get out early
-					}
-
-					if ($this->match('\s+', $m)) {
-						$attrParts[] = " ";
-						continue;
-					}
-					if ($this->string($str)) {
-						// escape parent selector, (yuck)
-						foreach ($str[2] as &$chunk) {
-							$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
+					// transform arg list
+					if (isset($values[1])) { // 2 items
+						$newList = array();
+						foreach ($values as $i => $arg) {
+							switch ($arg[0]) {
+								case "arg":
+									if ($i) {
+										$this->throwError("Cannot mix ; and , as delimiter types");
+									}
+									$newList[] = $arg[2];
+									break;
+								case "lit":
+									$newList[] = $arg[1];
+									break;
+								case "rest":
+									$this->throwError("Unexpected rest before semicolon");
+							}
 						}
 
-						$attrParts[] = $str;
-						$hasInterpolation = true;
-						continue;
+						$newList = array("list", ", ", $newList);
+
+						switch ($values[0][0]) {
+							case "arg":
+								$newArg = array("arg", $values[0][1], $newList);
+								break;
+							case "lit":
+								$newArg = array("lit", $newList);
+								break;
+						}
+					} elseif ($values) { // 1 item
+						$newArg = $values[0];
 					}
 
-					if ($this->keyword($word)) {
-						$attrParts[] = $word;
-						continue;
+					if ($newArg) {
+						$values = array($newArg);
 					}
-
-					if ($this->interpolation($inter)) {
-						$attrParts[] = $inter;
-						$hasInterpolation = true;
-						continue;
-					}
-
-					// operator, handles attr namespace too
-					if ($this->match('[|-~\$\*\^=]+', $m)) {
-						$attrParts[] = $m[0];
-						continue;
-					}
-
+				} else {
 					break;
 				}
-
-				if ($this->literal("]", false)) {
-					$attrParts[] = "]";
-					foreach ($attrParts as $part) {
-						$parts[] = $part;
-					}
-					$hasExpression = $hasExpression || $hasInterpolation;
-					return true;
-				}
-				$this->seek($s);
 			}
+		}
 
+		if (!$this->literal(')')) {
 			$this->seek($s);
 			return false;
 		}
 
-		// a space separated list of selectors
-		protected function tag(&$tag, $simple = false) {
-			if ($simple) {
-				$chars = '^@,:;{}\][>\(\) "\'';
-			} else {
-				$chars = '^@,;{}["\'';
+		$args = $values;
+
+		return true;
+	}
+
+		// consume a list of tags
+		// this accepts a hanging delimiter
+	protected function tags(&$tags, $simple = false, $delim = ',')
+	{
+		$tags = array();
+		while ($this->tag($tt, $simple)) {
+			$tags[] = $tt;
+			if (!$this->literal($delim)) {
+				break;
 			}
-			$s = $this->seek();
+		}
+		if (count($tags) == 0) {
+			return false;
+		}
 
-			$hasExpression = false;
-			$parts = array();
-			while ($this->tagBracket($parts, $hasExpression));
+		return true;
+	}
 
-			$oldWhite = $this->eatWhiteDefault;
-			$this->eatWhiteDefault = false;
+		// list of tags of specifying mixin path
+		// optionally separated by > (lazy, accepts extra >)
+	protected function mixinTags(&$tags)
+	{
+		$tags = array();
+		while ($this->tag($tt, true)) {
+			$tags[] = $tt;
+			$this->literal(">");
+		}
 
+		if (!$tags) {
+			return false;
+		}
+
+		return true;
+	}
+
+		// a bracketed value (contained within in a tag definition)
+	protected function tagBracket(&$parts, &$hasExpression)
+	{
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
+			return false;
+		}
+
+		$s = $this->seek();
+
+		$hasInterpolation = false;
+
+		if ($this->literal("[", false)) {
+			$attrParts = array("[");
+			// keyword, string, operator
 			while (true) {
-				if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
-					$parts[] = $m[1];
-					if ($simple) break;
+				if ($this->literal("]", false)) {
+					$this->count--;
+					break; // get out early
+				}
 
-					while ($this->tagBracket($parts, $hasExpression));
+				if ($this->match('\s+', $m)) {
+					$attrParts[] = " ";
+					continue;
+				}
+				if ($this->string($str)) {
+					// escape parent selector, (yuck)
+					foreach ($str[2] as &$chunk) {
+						$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
+					}
+
+					$attrParts[] = $str;
+					$hasInterpolation = true;
 					continue;
 				}
 
-				if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
-					if ($this->interpolation($interp)) {
-						$hasExpression = true;
-						$interp[2] = true; // don't unescape
-						$parts[] = $interp;
-						continue;
-					}
-
-					if ($this->literal("@")) {
-						$parts[] = "@";
-						continue;
-					}
+				if ($this->keyword($word)) {
+					$attrParts[] = $word;
+					continue;
 				}
 
-				if ($this->unit($unit)) { // for keyframes
-					$parts[] = $unit[1];
-					$parts[] = $unit[2];
+				if ($this->interpolation($inter)) {
+					$attrParts[] = $inter;
+					$hasInterpolation = true;
+					continue;
+				}
+
+				// operator, handles attr namespace too
+				if ($this->match('[|-~\$\*\^=]+', $m)) {
+					$attrParts[] = $m[0];
 					continue;
 				}
 
 				break;
 			}
 
-			$this->eatWhiteDefault = $oldWhite;
-			if (!$parts) {
-				$this->seek($s);
-				return false;
+			if ($this->literal("]", false)) {
+				$attrParts[] = "]";
+				foreach ($attrParts as $part) {
+					$parts[] = $part;
+				}
+				$hasExpression = $hasExpression || $hasInterpolation;
+				return true;
 			}
-
-			if ($hasExpression) {
-				$tag = array("exp", array("string", "", $parts));
-			} else {
-				$tag = trim(implode($parts));
-			}
-
-			$this->whitespace();
-			return true;
+			$this->seek($s);
 		}
 
-		// a css function
-		protected function func(&$func) {
-			$s = $this->seek();
+		$this->seek($s);
+		return false;
+	}
 
-			if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
-				$fname = $m[1];
+		// a space separated list of selectors
+	protected function tag(&$tag, $simple = false)
+	{
+		if ($simple) {
+			$chars = '^@,:;{}\][>\(\) "\'';
+		} else {
+			$chars = '^@,;{}["\'';
+		}
+		$s = $this->seek();
 
-				$sPreArgs = $this->seek();
+		$hasExpression = false;
+		$parts = array();
+		while ($this->tagBracket($parts, $hasExpression));
 
-				$args = array();
-				while (true) {
-					$ss = $this->seek();
-					// this ugly nonsense is for ie filter properties
-					if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
-						$args[] = array("string", "", array($name, "=", $value));
-					} else {
-						$this->seek($ss);
-						if ($this->expressionList($value)) {
-							$args[] = $value;
-						}
-					}
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
 
-					if (!$this->literal(',')) break;
+		while (true) {
+			if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
+				$parts[] = $m[1];
+				if ($simple) {
+					break;
 				}
-				$args = array('list', ',', $args);
 
-				if ($this->literal(')')) {
-					$func = array('function', $fname, $args);
-					return true;
-				} elseif ($fname == 'url') {
-					// couldn't parse and in url? treat as string
-					$this->seek($sPreArgs);
-					if ($this->openString(")", $string) && $this->literal(")")) {
-						$func = array('function', $fname, $string);
-						return true;
-					}
+				while ($this->tagBracket($parts, $hasExpression));
+				continue;
+			}
+
+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
+				if ($this->interpolation($interp)) {
+					$hasExpression = true;
+					$interp[2] = true; // don't unescape
+					$parts[] = $interp;
+					continue;
+				}
+
+				if ($this->literal("@")) {
+					$parts[] = "@";
+					continue;
 				}
 			}
 
+			if ($this->unit($unit)) { // for keyframes
+				$parts[] = $unit[1];
+				$parts[] = $unit[2];
+				continue;
+			}
+
+			break;
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+		if (!$parts) {
 			$this->seek($s);
 			return false;
 		}
 
-		// consume a less variable
-		protected function variable(&$name) {
-			$s = $this->seek();
-			if ($this->literal($this->lessc->vPrefix, false) &&
-				($this->variable($sub) || $this->keyword($name))
-				) {
-					if (!empty($sub)) {
-						$name = array('variable', $sub);
-					} else {
-						$name = $this->lessc->vPrefix.$name;
+		if ($hasExpression) {
+			$tag = array("exp", array("string", "", $parts));
+		} else {
+			$tag = trim(implode($parts));
+		}
+
+		$this->whitespace();
+		return true;
+	}
+
+		// a css function
+	protected function func(&$func)
+	{
+		$s = $this->seek();
+
+		if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
+			$fname = $m[1];
+
+			$sPreArgs = $this->seek();
+
+			$args = array();
+			while (true) {
+				$ss = $this->seek();
+				// this ugly nonsense is for ie filter properties
+				if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
+					$args[] = array("string", "", array($name, "=", $value));
+				} else {
+					$this->seek($ss);
+					if ($this->expressionList($value)) {
+						$args[] = $value;
 					}
-					return true;
 				}
 
-				$name = null;
-				$this->seek($s);
-				return false;
+				if (!$this->literal(',')) {
+					break;
+				}
+			}
+			$args = array('list', ',', $args);
+
+			if ($this->literal(')')) {
+				$func = array('function', $fname, $args);
+				return true;
+			} elseif ($fname == 'url') {
+				// couldn't parse and in url? treat as string
+				$this->seek($sPreArgs);
+				if ($this->openString(")", $string) && $this->literal(")")) {
+					$func = array('function', $fname, $string);
+					return true;
+				}
+			}
 		}
 
+		$this->seek($s);
+		return false;
+	}
+
+		// consume a less variable
+	protected function variable(&$name)
+	{
+		$s = $this->seek();
+		if ($this->literal($this->lessc->vPrefix, false) &&
+			($this->variable($sub) || $this->keyword($name))
+			) {
+			if (!empty($sub)) {
+				$name = array('variable', $sub);
+			} else {
+				$name = $this->lessc->vPrefix.$name;
+			}
+				return true;
+		}
+
+			$name = null;
+			$this->seek($s);
+			return false;
+	}
+
 		/**
 		 * Consume an assignment operator
 		 * Can optionally take a name that will be set to the current property name
 		 */
-		protected function assign($name = null) {
-			if ($name) $this->currentProperty = $name;
-			return $this->literal(':') || $this->literal('=');
+	protected function assign($name = null)
+	{
+		if ($name) {
+			$this->currentProperty = $name;
 		}
+		return $this->literal(':') || $this->literal('=');
+	}
 
 		// consume a keyword
-		protected function keyword(&$word) {
-			if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {
-				$word = $m[1];
-				return true;
-			}
-			return false;
+	protected function keyword(&$word)
+	{
+		if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {
+			$word = $m[1];
+			return true;
 		}
+		return false;
+	}
 
 		// consume an end of statement delimiter
-		protected function end() {
-			if ($this->literal(';', false)) {
-				return true;
-			} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {
-				// if there is end of file or a closing block next then we don't need a ;
-				return true;
-			}
-			return false;
-		}
-
-		protected function guards(&$guards) {
-			$s = $this->seek();
-
-			if (!$this->literal("when")) {
-				$this->seek($s);
-				return false;
-			}
-
-			$guards = array();
-
-			while ($this->guardGroup($g)) {
-				$guards[] = $g;
-				if (!$this->literal(",")) break;
-			}
-
-			if (count($guards) == 0) {
-				$guards = null;
-				$this->seek($s);
-				return false;
-			}
-
+	protected function end()
+	{
+		if ($this->literal(';', false)) {
+			return true;
+		} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {
+			// if there is end of file or a closing block next then we don't need a ;
 			return true;
 		}
+		return false;
+	}
 
-		// a bunch of guards that are and'd together
-		// TODO rename to guardGroup
-		protected function guardGroup(&$guardGroup) {
-			$s = $this->seek();
-			$guardGroup = array();
-			while ($this->guard($guard)) {
-				$guardGroup[] = $guard;
-				if (!$this->literal("and")) break;
-			}
-
-			if (count($guardGroup) == 0) {
-				$guardGroup = null;
-				$this->seek($s);
-				return false;
-			}
-
-			return true;
-		}
-
-		protected function guard(&$guard) {
-			$s = $this->seek();
-			$negate = $this->literal("not");
-
-			if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
-				$guard = $exp;
-				if ($negate) $guard = array("negate", $guard);
-				return true;
-			}
+	protected function guards(&$guards)
+	{
+		$s = $this->seek();
 
+		if (!$this->literal("when")) {
 			$this->seek($s);
 			return false;
 		}
 
-		/* raw parsing functions */
+		$guards = array();
 
-		protected function literal($what, $eatWhitespace = null) {
-			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
-
-			// shortcut on single letter
-			if (!isset($what[1]) && isset($this->buffer[$this->count])) {
-				if ($this->buffer[$this->count] == $what) {
-					if (!$eatWhitespace) {
-						$this->count++;
-						return true;
-					}
-					// goes below...
-				} else {
-					return false;
-				}
+		while ($this->guardGroup($g)) {
+			$guards[] = $g;
+			if (!$this->literal(",")) {
+				break;
 			}
-
-			if (!isset(self::$literalCache[$what])) {
-				self::$literalCache[$what] = lessc::preg_quote($what);
-			}
-
-			return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
 		}
 
-		protected function genericList(&$out, $parseItem, $delim = "", $flatten = true) {
-			$s = $this->seek();
-			$items = array();
-			while ($this->$parseItem($value)) {
-				$items[] = $value;
-				if ($delim) {
-					if (!$this->literal($delim)) break;
-				}
-			}
+		if (count($guards) == 0) {
+			$guards = null;
+			$this->seek($s);
+			return false;
+		}
 
-			if (count($items) == 0) {
-				$this->seek($s);
-				return false;
-			}
+		return true;
+	}
 
-			if ($flatten && count($items) == 1) {
-				$out = $items[0];
-			} else {
-				$out = array("list", $delim, $items);
+		// a bunch of guards that are and'd together
+		// TODO rename to guardGroup
+	protected function guardGroup(&$guardGroup)
+	{
+		$s = $this->seek();
+		$guardGroup = array();
+		while ($this->guard($guard)) {
+			$guardGroup[] = $guard;
+			if (!$this->literal("and")) {
+				break;
 			}
+		}
 
+		if (count($guardGroup) == 0) {
+			$guardGroup = null;
+			$this->seek($s);
+			return false;
+		}
+
+		return true;
+	}
+
+	protected function guard(&$guard)
+	{
+		$s = $this->seek();
+		$negate = $this->literal("not");
+
+		if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
+			$guard = $exp;
+			if ($negate) {
+				$guard = array("negate", $guard);
+			}
 			return true;
 		}
 
+		$this->seek($s);
+		return false;
+	}
+
+		/* raw parsing functions */
+
+	protected function literal($what, $eatWhitespace = null)
+	{
+		if ($eatWhitespace === null) {
+			$eatWhitespace = $this->eatWhiteDefault;
+		}
+
+		// shortcut on single letter
+		if (!isset($what[1]) && isset($this->buffer[$this->count])) {
+			if ($this->buffer[$this->count] == $what) {
+				if (!$eatWhitespace) {
+					$this->count++;
+					return true;
+				}
+				// goes below...
+			} else {
+				return false;
+			}
+		}
+
+		if (!isset(self::$literalCache[$what])) {
+			self::$literalCache[$what] = lessc::preg_quote($what);
+		}
+
+		return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
+	}
+
+	protected function genericList(&$out, $parseItem, $delim = "", $flatten = true)
+	{
+		$s = $this->seek();
+		$items = array();
+		while ($this->$parseItem($value)) {
+			$items[] = $value;
+			if ($delim) {
+				if (!$this->literal($delim)) {
+					break;
+				}
+			}
+		}
+
+		if (count($items) == 0) {
+			$this->seek($s);
+			return false;
+		}
+
+		if ($flatten && count($items) == 1) {
+			$out = $items[0];
+		} else {
+			$out = array("list", $delim, $items);
+		}
+
+		return true;
+	}
+
 
 		// advance counter to next occurrence of $what
 		// $until - don't include $what in advance
 		// $allowNewline, if string, will be used as valid char set
-		protected function to($what, &$out, $until = false, $allowNewline = false) {
-			if (is_string($allowNewline)) {
-				$validChars = $allowNewline;
-			} else {
-				$validChars = $allowNewline ? "." : "[^\n]";
-			}
-			if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) return false;
-			if ($until) $this->count -= strlen($what); // give back $what
-			$out = $m[1];
-			return true;
+	protected function to($what, &$out, $until = false, $allowNewline = false)
+	{
+		if (is_string($allowNewline)) {
+			$validChars = $allowNewline;
+		} else {
+			$validChars = $allowNewline ? "." : "[^\n]";
 		}
-
-		// try to match something on head of buffer
-		protected function match($regex, &$out, $eatWhitespace = null) {
-			if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
-
-			$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
-			if (preg_match($r, $this->buffer, $out, null, $this->count)) {
-				$this->count += strlen($out[0]);
-				if ($eatWhitespace && $this->writeComments) $this->whitespace();
-				return true;
-			}
+		if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) {
 			return false;
 		}
+		if ($until) {
+			$this->count -= strlen($what); // give back $what
+		}
+		$out = $m[1];
+		return true;
+	}
 
-		// match some whitespace
-		protected function whitespace() {
-			if ($this->writeComments) {
-				$gotWhite = false;
-				while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {
-					if (isset($m[1]) && empty($this->seenComments[$this->count])) {
-						$this->append(array("comment", $m[1]));
-						$this->seenComments[$this->count] = true;
-					}
-					$this->count += strlen($m[0]);
-					$gotWhite = true;
-				}
-				return $gotWhite;
-			} else {
-				$this->match("", $m);
-				return strlen($m[0]) > 0;
+		// try to match something on head of buffer
+	protected function match($regex, &$out, $eatWhitespace = null)
+	{
+		if ($eatWhitespace === null) {
+			$eatWhitespace = $this->eatWhiteDefault;
+		}
+
+		$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
+		if (preg_match($r, $this->buffer, $out, null, $this->count)) {
+			$this->count += strlen($out[0]);
+			if ($eatWhitespace && $this->writeComments) {
+				$this->whitespace();
 			}
-		}
-
-		// match something without consuming it
-		protected function peek($regex, &$out = null, $from = null) {
-			if (is_null($from)) $from = $this->count;
-			$r = '/'.$regex.'/Ais';
-			$result = preg_match($r, $this->buffer, $out, null, $from);
-
-			return $result;
-		}
-
-		// seek to a spot in the buffer or return where we are on no argument
-		protected function seek($where = null) {
-			if ($where === null) return $this->count;
-			else $this->count = $where;
 			return true;
 		}
+		return false;
+	}
+
+		// match some whitespace
+	protected function whitespace()
+	{
+		if ($this->writeComments) {
+			$gotWhite = false;
+			while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {
+				if (isset($m[1]) && empty($this->seenComments[$this->count])) {
+					$this->append(array("comment", $m[1]));
+					$this->seenComments[$this->count] = true;
+				}
+				$this->count += strlen($m[0]);
+				$gotWhite = true;
+			}
+			return $gotWhite;
+		} else {
+			$this->match("", $m);
+			return strlen($m[0]) > 0;
+		}
+	}
+
+		// match something without consuming it
+	protected function peek($regex, &$out = null, $from = null)
+	{
+		if (is_null($from)) {
+			$from = $this->count;
+		}
+		$r = '/'.$regex.'/Ais';
+		$result = preg_match($r, $this->buffer, $out, null, $from);
+
+		return $result;
+	}
+
+		// seek to a spot in the buffer or return where we are on no argument
+	protected function seek($where = null)
+	{
+		if ($where === null) {
+			return $this->count;
+		} else {
+			$this->count = $where;
+		}
+		return true;
+	}
 
 		/* misc functions */
 
-		public function throwError($msg = "parse error", $count = null) {
-			$count = is_null($count) ? $this->count : $count;
+	public function throwError($msg = "parse error", $count = null)
+	{
+		$count = is_null($count) ? $this->count : $count;
 
-			$line = $this->line +
-			substr_count(substr($this->buffer, 0, $count), "\n");
+		$line = $this->line +
+		substr_count(substr($this->buffer, 0, $count), "\n");
 
-			if (!empty($this->sourceName)) {
-				$loc = "$this->sourceName on line $line";
-			} else {
-				$loc = "line: $line";
-			}
-
-			// TODO this depends on $this->count
-			if ($this->peek("(.*?)(\n|$)", $m, $count)) {
-				throw new exception("$msg: failed at `$m[1]` $loc");
-			} else {
-				throw new exception("$msg: $loc");
-			}
+		if (!empty($this->sourceName)) {
+			$loc = "$this->sourceName on line $line";
+		} else {
+			$loc = "line: $line";
 		}
 
-		protected function pushBlock($selectors = null, $type = null) {
-			$b = new stdclass;
-			$b->parent = $this->env;
-
-			$b->type = $type;
-			$b->id = self::$nextBlockId++;
-
-			$b->isVararg = false; // TODO: kill me from here
-			$b->tags = $selectors;
-
-			$b->props = array();
-			$b->children = array();
-
-			$this->env = $b;
-			return $b;
+		// TODO this depends on $this->count
+		if ($this->peek("(.*?)(\n|$)", $m, $count)) {
+			throw new exception("$msg: failed at `$m[1]` $loc");
+		} else {
+			throw new exception("$msg: $loc");
 		}
+	}
+
+	protected function pushBlock($selectors = null, $type = null)
+	{
+		$b = new stdclass;
+		$b->parent = $this->env;
+
+		$b->type = $type;
+		$b->id = self::$nextBlockId++;
+
+		$b->isVararg = false; // TODO: kill me from here
+		$b->tags = $selectors;
+
+		$b->props = array();
+		$b->children = array();
+
+		$this->env = $b;
+		return $b;
+	}
 
 		// push a block that doesn't multiply tags
-		protected function pushSpecialBlock($type) {
-			return $this->pushBlock(null, $type);
-		}
+	protected function pushSpecialBlock($type)
+	{
+		return $this->pushBlock(null, $type);
+	}
 
 		// append a property to the current block
-		protected function append($prop, $pos = null) {
-			if ($pos !== null) $prop[-1] = $pos;
-			$this->env->props[] = $prop;
+	protected function append($prop, $pos = null)
+	{
+		if ($pos !== null) {
+			$prop[-1] = $pos;
 		}
+		$this->env->props[] = $prop;
+	}
 
 		// pop something off the stack
-		protected function pop() {
-			$old = $this->env;
-			$this->env = $this->env->parent;
-			return $old;
-		}
+	protected function pop()
+	{
+		$old = $this->env;
+		$this->env = $this->env->parent;
+		return $old;
+	}
 
 		// remove comments from $text
 		// todo: make it work for all functions, not just url
-		protected function removeComments($text) {
-			$look = array(
-				'url(', '//', '/*', '"', "'"
-			);
+	protected function removeComments($text)
+	{
+		$look = array(
+			'url(', '//', '/*', '"', "'"
+		);
 
-			$out = '';
-			$min = null;
-			while (true) {
-				// find the next item
-				foreach ($look as $token) {
-					$pos = strpos($text, $token);
-					if ($pos !== false) {
-						if (!isset($min) || $pos < $min[1]) $min = array($token, $pos);
+		$out = '';
+		$min = null;
+		while (true) {
+			// find the next item
+			foreach ($look as $token) {
+				$pos = strpos($text, $token);
+				if ($pos !== false) {
+					if (!isset($min) || $pos < $min[1]) {
+						$min = array($token, $pos);
 					}
 				}
-
-				if (is_null($min)) break;
-
-				$count = $min[1];
-				$skip = 0;
-				$newlines = 0;
-				switch ($min[0]) {
-					case 'url(':
-						if (preg_match('/url\(.*?\)/', $text, $m, 0, $count))
-							$count += strlen($m[0]) - strlen($min[0]);
-							break;
-					case '"':
-					case "'":
-						if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count))
-							$count += strlen($m[0]) - 1;
-							break;
-					case '//':
-						$skip = strpos($text, "\n", $count);
-						if ($skip === false) $skip = strlen($text) - $count;
-						else $skip -= $count;
-						break;
-					case '/*':
-						if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {
-							$skip = strlen($m[0]);
-							$newlines = substr_count($m[0], "\n");
-						}
-						break;
-				}
-
-				if ($skip == 0) $count += strlen($min[0]);
-
-				$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
-				$text = substr($text, $count + $skip);
-
-				$min = null;
 			}
 
-			return $out.$text;
+			if (is_null($min)) {
+				break;
+			}
+
+			$count = $min[1];
+			$skip = 0;
+			$newlines = 0;
+			switch ($min[0]) {
+				case 'url(':
+					if (preg_match('/url\(.*?\)/', $text, $m, 0, $count)) {
+						$count += strlen($m[0]) - strlen($min[0]);
+					}
+					break;
+				case '"':
+				case "'":
+					if (preg_match('/'.$min[0].'.*?(?<!\\\\)'.$min[0].'/', $text, $m, 0, $count)) {
+						$count += strlen($m[0]) - 1;
+					}
+					break;
+				case '//':
+					$skip = strpos($text, "\n", $count);
+					if ($skip === false) {
+						$skip = strlen($text) - $count;
+					} else {
+						$skip -= $count;
+					}
+					break;
+				case '/*':
+					if (preg_match('/\/\*.*?\*\//s', $text, $m, 0, $count)) {
+						$skip = strlen($m[0]);
+						$newlines = substr_count($m[0], "\n");
+					}
+					break;
+			}
+
+			if ($skip == 0) {
+				$count += strlen($min[0]);
+			}
+
+			$out .= substr($text, 0, $count).str_repeat("\n", $newlines);
+			$text = substr($text, $count + $skip);
+
+			$min = null;
 		}
 
+		return $out.$text;
+	}
 }
 
-class lessc_formatter_classic {
+class lessc_formatter_classic
+{
 	public $indentChar = "  ";
 
 	public $break = "\n";
@@ -3795,22 +4135,28 @@ class lessc_formatter_classic {
 
 	public $compressColors = false;
 
-	public function __construct() {
+	public function __construct()
+	{
 		$this->indentLevel = 0;
 	}
 
-	public function indentStr($n = 0) {
+	public function indentStr($n = 0)
+	{
 		return str_repeat($this->indentChar, max($this->indentLevel + $n, 0));
 	}
 
-	public function property($name, $value) {
+	public function property($name, $value)
+	{
 		return $name.$this->assignSeparator.$value.";";
 	}
 
-	protected function isEmpty($block) {
+	protected function isEmpty($block)
+	{
 		if (empty($block->lines)) {
 			foreach ($block->children as $child) {
-				if (!$this->isEmpty($child)) return false;
+				if (!$this->isEmpty($child)) {
+					return false;
+				}
 			}
 
 			return true;
@@ -3818,8 +4164,11 @@ class lessc_formatter_classic {
 		return false;
 	}
 
-	public function block($block) {
-		if ($this->isEmpty($block)) return;
+	public function block($block)
+	{
+		if ($this->isEmpty($block)) {
+			return;
+		}
 
 		$inner = $pre = $this->indentStr();
 
@@ -3844,7 +4193,6 @@ class lessc_formatter_classic {
 				echo $this->open.$this->break;
 				$inner = $this->indentStr();
 			}
-
 		}
 
 		if (!empty($block->lines)) {
@@ -3860,7 +4208,9 @@ class lessc_formatter_classic {
 		}
 
 		if (!empty($block->selectors)) {
-			if (!$isSingle && empty($block->children)) echo $this->break;
+			if (!$isSingle && empty($block->children)) {
+				echo $this->break;
+			}
 
 			if ($isSingle) {
 				echo $this->closeSingle.$this->break;
@@ -3876,7 +4226,8 @@ class lessc_formatter_classic {
 /**
  *	Class for compressed result
  */
-class lessc_formatter_compressed extends lessc_formatter_classic {
+class lessc_formatter_compressed extends lessc_formatter_classic
+{
 	public $disableSingle = true;
 	public $open = "{";
 	public $selectorSeparator = ",";
@@ -3884,7 +4235,8 @@ class lessc_formatter_compressed extends lessc_formatter_classic {
 	public $break = "";
 	public $compressColors = true;
 
-	public function indentStr($n = 0) {
+	public function indentStr($n = 0)
+	{
 		return "";
 	}
 }
@@ -3892,7 +4244,8 @@ class lessc_formatter_compressed extends lessc_formatter_classic {
 /**
  *	Class for lessjs
  */
-class lessc_formatter_lessjs extends lessc_formatter_classic {
+class lessc_formatter_lessjs extends lessc_formatter_classic
+{
 	public $disableSingle = true;
 	public $breakSelectors = true;
 	public $assignSeparator = ": ";
diff --git a/htdocs/core/class/link.class.php b/htdocs/core/class/link.class.php
index 2c08d2709ca..0f59859bd64 100644
--- a/htdocs/core/class/link.class.php
+++ b/htdocs/core/class/link.class.php
@@ -112,14 +112,15 @@ class Link extends CommonObject
 			if ($this->id > 0) {
 				// Call trigger
 				$result = $this->call_trigger('LINK_CREATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			} else {
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				dol_syslog(get_class($this)."::Create success id=".$this->id);
 				$this->db->commit();
 				return $this->id;
@@ -129,8 +130,7 @@ class Link extends CommonObject
 				return -3;
 			}
 		} else {
-			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$this->error = $langs->trans("ErrorCompanyNameAlreadyExists", $this->name);
 				$result = -1;
 			} else {
@@ -160,15 +160,16 @@ class Link extends CommonObject
 		dol_syslog(get_class($this)."::Update id = ".$this->id." call_trigger = ".$call_trigger);
 
 		// Check parameters
-		if (empty($this->url))
-		{
+		if (empty($this->url)) {
 			$this->error = $langs->trans("NoURL");
 			return -1;
 		}
 
 		// Clean parameters
 		$this->url       = clean_url($this->url, 1);
-		if (empty($this->label)) $this->label = basename($this->url);
+		if (empty($this->label)) {
+			$this->label = basename($this->url);
+		}
 		$this->label     = trim($this->label);
 
 
@@ -185,18 +186,17 @@ class Link extends CommonObject
 
 		dol_syslog(get_class($this)."::update sql = ".$sql);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($call_trigger)
-			{
+		if ($resql) {
+			if ($call_trigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINK_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				dol_syslog(get_class($this)."::Update success");
 				$this->db->commit();
 				return 1;
@@ -206,8 +206,7 @@ class Link extends CommonObject
 				return -1;
 			}
 		} else {
-			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				// Doublon
 				$this->error = $langs->trans("ErrorDuplicateField");
 				$result = -1;
@@ -236,7 +235,9 @@ class Link extends CommonObject
 
 		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
 		$sql .= " WHERE objecttype = '".$this->db->escape($objecttype)."' AND objectid = ".$objectid;
-		if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
+		if ($conf->entity != 0) {
+			$sql .= " AND entity = ".$conf->entity;
+		}
 		if ($sortfield) {
 			if (empty($sortorder)) {
 				$sortorder = "ASC";
@@ -246,14 +247,11 @@ class Link extends CommonObject
 
 		dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			dol_syslog(get_class($this)."::fetchAll ".$num."records", LOG_DEBUG);
-			if ($num > 0)
-			{
-				while ($obj = $this->db->fetch_object($resql))
-				{
+			if ($num > 0) {
+				while ($obj = $this->db->fetch_object($resql)) {
 					$link = new Link($this->db);
 					$link->id = $obj->rowid;
 					$link->entity = $obj->entity;
@@ -287,13 +285,16 @@ class Link extends CommonObject
 
 		$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."links";
 		$sql .= " WHERE objecttype = '".$db->escape($objecttype)."' AND objectid = ".$objectid;
-		if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
+		if ($conf->entity != 0) {
+			$sql .= " AND entity = ".$conf->entity;
+		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) return $obj->nb;
+			if ($obj) {
+				return $obj->nb;
+			}
 		}
 		return -1;
 	}
@@ -314,14 +315,14 @@ class Link extends CommonObject
 
 		$sql = "SELECT rowid, entity, datea, url, label, objecttype, objectid FROM ".MAIN_DB_PREFIX."links";
 		$sql .= " WHERE rowid = ".$rowid;
-		if ($conf->entity != 0) $sql .= " AND entity = ".$conf->entity;
+		if ($conf->entity != 0) {
+			$sql .= " AND entity = ".$conf->entity;
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql) > 0)
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql) > 0) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -356,8 +357,7 @@ class Link extends CommonObject
 
 		// Call trigger
 		$result = $this->call_trigger('LINK_DELETE', $user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->db->rollback();
 			return -1;
 		}
@@ -368,8 +368,7 @@ class Link extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		if (!$this->db->query($sql))
-		{
+		if (!$this->db->query($sql)) {
 			$error++;
 			$this->error = $this->db->lasterror();
 		}
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index 52bd1ebddad..e88ec701320 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -118,10 +118,11 @@ class Menu
 	public function getNbOfVisibleMenuEntries()
 	{
 		$nb = 0;
-		foreach ($this->liste as $val)
-		{
+		foreach ($this->liste as $val) {
 			//if (dol_eval($val['enabled'], 1)) $nb++;
-			if (!empty($val['enabled'])) $nb++; // $val['enabled'] is already evaluated to 0 or 1, no need for dol_eval()
+			if (!empty($val['enabled'])) {
+				$nb++; // $val['enabled'] is already evaluated to 0 or 1, no need for dol_eval()
+			}
 		}
 		return $nb;
 	}
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index a31c5245ce0..a9fb8b01c16 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -178,7 +178,9 @@ class Menubase
 		global $conf, $langs;
 
 		// Clean parameters
-		if (!isset($this->enabled)) $this->enabled = '1';
+		if (!isset($this->enabled)) {
+			$this->enabled = '1';
+		}
 		$this->menu_handler = trim($this->menu_handler);
 		$this->module = trim($this->module);
 		$this->type = trim($this->type);
@@ -195,17 +197,22 @@ class Menubase
 		$this->perms = trim($this->perms);
 		$this->enabled = trim($this->enabled);
 		$this->user = (int) $this->user;
-		if (empty($this->position)) $this->position = 0;
-		if (!$this->level) $this->level = 0;
+		if (empty($this->position)) {
+			$this->position = 0;
+		}
+		if (!$this->level) {
+			$this->level = 0;
+		}
 
 		// Check parameters
-		if (empty($this->menu_handler)) return -1;
+		if (empty($this->menu_handler)) {
+			return -1;
+		}
 
 		// For PGSQL, we must first found the max rowid and use it as rowid in insert because postgresql
 		// may use an already used value because its internal cursor does not increase when we do
 		// an insert with a forced id.
-		if (in_array($this->db->type, array('pgsql')))
-		{
+		if (in_array($this->db->type, array('pgsql'))) {
 			$sql = "SELECT MAX(rowid) as maxrowid FROM ".MAIN_DB_PREFIX."menu";
 			$resqlrowid = $this->db->query($sql);
 			if ($resqlrowid) {
@@ -213,13 +220,19 @@ class Menubase
 				$maxrowid = $obj->maxrowid;
 
 				// Max rowid can be empty if there is no record yet
-				if (empty($maxrowid)) $maxrowid = 1;
+				if (empty($maxrowid)) {
+					$maxrowid = 1;
+				}
 
 				$sql = "SELECT setval('".MAIN_DB_PREFIX."menu_rowid_seq', ".($maxrowid).")";
 				//print $sql; exit;
 				$resqlrowidset = $this->db->query($sql);
-				if (!$resqlrowidset) dol_print_error($this->db);
-			} else dol_print_error($this->db);
+				if (!$resqlrowidset) {
+					dol_print_error($this->db);
+				}
+			} else {
+				dol_print_error($this->db);
+			}
 		}
 
 		// Check that entry does not exists yet on key menu_handler-fk_menu-position-url-entity, to avoid errors with postgresql
@@ -232,12 +245,10 @@ class Menubase
 		$sql .= " AND entity = ".$conf->entity;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$row = $this->db->fetch_row($result);
 
-			if ($row[0] == 0)   // If not found
-			{
+			if ($row[0] == 0) {   // If not found
 				// Insert request
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(";
 				$sql .= "menu_handler,";
@@ -281,8 +292,7 @@ class Menubase
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."menu");
 					dol_syslog(get_class($this)."::create record added has rowid=".$this->id, LOG_DEBUG);
 
@@ -358,8 +368,7 @@ class Menubase
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -405,10 +414,8 @@ class Menubase
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -458,8 +465,7 @@ class Menubase
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Error ".$this->db->lasterror();
 			return -1;
 		}
@@ -517,7 +523,9 @@ class Menubase
 
 		$newTabMenu = array();
 		foreach ($tabMenu as $val) {
-			if ($val['type'] == 'top') $newTabMenu[] = $val;
+			if ($val['type'] == 'top') {
+				$newTabMenu[] = $val;
+			}
 		}
 
 		return $newTabMenu;
@@ -545,11 +553,9 @@ class Menubase
 
 		// Detect what is top mainmenu id
 		$menutopid = '';
-		foreach ($tabMenu as $key => $val)
-		{
+		foreach ($tabMenu as $key => $val) {
 			// Define menutopid of mainmenu
-			if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu)
-			{
+			if (empty($menutopid) && $val['type'] == 'top' && $val['mainmenu'] == $mainmenu) {
 				$menutopid = $val['rowid'];
 				break;
 			}
@@ -562,10 +568,8 @@ class Menubase
 		$this->recur($tabMenu, $menutopid, 1);
 
 		// Now complete $this->newmenu->list when fk_menu value is -1 (left menu added by modules with no top menu)
-		foreach ($tabMenu as $key => $val)
-		{
-			if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu)    // We found a menu entry not linked to parent with good mainmenu
-			{
+		foreach ($tabMenu as $key => $val) {
+			if ($val['fk_menu'] == -1 && $val['fk_mainmenu'] == $mainmenu) {    // We found a menu entry not linked to parent with good mainmenu
 				//print 'Try to add menu (current is mainmenu='.$mainmenu.' leftmenu='.$leftmenu.') for '.join(',',$val).' fk_mainmenu='.$val['fk_mainmenu'].' fk_leftmenu='.$val['fk_leftmenu'].'<br>';
 				//var_dump($this->newmenu->liste);exit;
 
@@ -575,14 +579,13 @@ class Menubase
 				} else {
 					// Search first menu with this couple (mainmenu,leftmenu)=(fk_mainmenu,fk_leftmenu)
 					$searchlastsub = 0; $lastid = 0; $nextid = 0; $found = 0;
-					foreach ($this->newmenu->liste as $keyparent => $valparent)
-					{
+					foreach ($this->newmenu->liste as $keyparent => $valparent) {
 						//var_dump($valparent);
-						if ($searchlastsub)    // If we started to search for last submenu
-						{
-							if ($valparent['level'] >= $searchlastsub) $lastid = $keyparent;
-							if ($valparent['level'] < $searchlastsub)
-							{
+						if ($searchlastsub) {    // If we started to search for last submenu
+							if ($valparent['level'] >= $searchlastsub) {
+								$lastid = $keyparent;
+							}
+							if ($valparent['level'] < $searchlastsub) {
 								$nextid = $keyparent;
 								break;
 							}
@@ -632,52 +635,53 @@ class Menubase
 		$sql .= " FROM ".MAIN_DB_PREFIX."menu as m";
 		$sql .= " WHERE m.entity IN (0,".$conf->entity.")";
 		$sql .= " AND m.menu_handler IN ('".$this->db->escape($menu_handler)."','all')";
-		if ($type_user == 0) $sql .= " AND m.usertype IN (0,2)";
-		if ($type_user == 1) $sql .= " AND m.usertype IN (1,2)";
+		if ($type_user == 0) {
+			$sql .= " AND m.usertype IN (0,2)";
+		}
+		if ($type_user == 1) {
+			$sql .= " AND m.usertype IN (1,2)";
+		}
 		$sql .= " ORDER BY m.position, m.rowid";
 		//print $sql;
 
 		//dol_syslog(get_class($this)."::menuLoad mymainmenu=".$mymainmenu." myleftmenu=".$myleftmenu." type_user=".$type_user." menu_handler=".$menu_handler." tabMenu size=".count($tabMenu)."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$numa = $this->db->num_rows($resql);
 
 			$a = 0;
 			$b = 0;
-			while ($a < $numa)
-			{
+			while ($a < $numa) {
 				//$objm = $this->db->fetch_object($resql);
 				$menu = $this->db->fetch_array($resql);
 
 				// Define $right
 				$perms = true;
-				if (isset($menu['perms']))
-				{
+				if (isset($menu['perms'])) {
 					$tmpcond = $menu['perms'];
-					if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+					if ($leftmenu == 'all') {
+						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+					}
 					$perms = verifCond($tmpcond);
 					//print "verifCond rowid=".$menu['rowid']." ".$tmpcond.":".$perms."<br>\n";
 				}
 
 				// Define $enabled
 				$enabled = true;
-				if (isset($menu['enabled']))
-				{
+				if (isset($menu['enabled'])) {
 					$tmpcond = $menu['enabled'];
-					if ($leftmenu == 'all') $tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+					if ($leftmenu == 'all') {
+						$tmpcond = preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/', '1==1', $tmpcond); // Force part of condition to true
+					}
 					$enabled = verifCond($tmpcond);
 				}
 
 				// Define $title
-				if ($enabled)
-				{
+				if ($enabled) {
 					$title = $langs->trans($menu['titre']); // If $menu['titre'] start with $, a dol_eval is done.
 					//var_dump($title.'-'.$menu['titre']);
-					if ($title == $menu['titre'])   // Translation not found
-					{
-						if (!empty($menu['langs']))    // If there is a dedicated translation file
-						{
+					if ($title == $menu['titre']) {   // Translation not found
+						if (!empty($menu['langs'])) {    // If there is a dedicated translation file
 							//print 'Load file '.$menu['langs'].'<br>';
 							$langs->load($menu['langs']);
 						}
@@ -685,12 +689,10 @@ class Menubase
 						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
 						$menu['titre'] = make_substitutions($menu['titre'], $substitarray);
 
-						if (preg_match("/\//", $menu['titre'])) // To manage translation when title is string1/string2
-						{
+						if (preg_match("/\//", $menu['titre'])) { // To manage translation when title is string1/string2
 							$tab_titre = explode("/", $menu['titre']);
 							$title = $langs->trans($tab_titre[0])."/".$langs->trans($tab_titre[1]);
-						} elseif (preg_match('/\|\|/', $menu['titre']))
-						{
+						} elseif (preg_match('/\|\|/', $menu['titre'])) {
 							// To manage different translation (Title||AltTitle@ConditionForAltTitle)
 							$tab_title = explode("||", $menu['titre']);
 							$alt_title = explode("@", $tab_title[1]);
@@ -758,8 +760,7 @@ class Menubase
 	{
 		// Loop on tab array
 		$num = count($tab);
-		for ($x = 0; $x < $num; $x++)
-		{
+		for ($x = 0; $x < $num; $x++) {
 			//si un element a pour pere : $pere
 			if ((($tab[$x]['fk_menu'] >= 0 && $tab[$x]['fk_menu'] == $pere)) && $tab[$x]['enabled']) {
 				$this->newmenu->add($tab[$x]['url'], $tab[$x]['titre'], ($level - 1), $tab[$x]['perms'], $tab[$x]['target'], $tab[$x]['mainmenu'], $tab[$x]['leftmenu'], 0, '', '', '', $tab[$x]['prefix']);
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 86380651658..add5ccda7b3 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -82,7 +82,7 @@ class Notify
 		'EXPENSE_REPORT_APPROVE',
 		'HOLIDAY_VALIDATE',
 		'HOLIDAY_APPROVE',
-        'ACTION_CREATE'
+		'ACTION_CREATE'
 	);
 
 
@@ -531,18 +531,18 @@ class Notify
 								$object_type = 'holiday';
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayValidated", $link);
 								break;
-                            case 'HOLIDAY_APPROVE':
-                                $link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
-                                $dir_output = $conf->holiday->dir_output;
-                                $object_type = 'holiday';
-                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
-                                break;
-                            case 'ACTION_CREATE':
-                                $link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'">'.$newref.'</a>';
-                                $dir_output = $conf->agenda->dir_output;
-                                $object_type = 'action';
-                                $mesg = $outputlangs->transnoentitiesnoconv("EMailTextActionAdded", $link);
-                                break;
+							case 'HOLIDAY_APPROVE':
+								$link = '<a href="'.$urlwithroot.'/holiday/card.php?id='.$object->id.'">'.$newref.'</a>';
+								$dir_output = $conf->holiday->dir_output;
+								$object_type = 'holiday';
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
+								break;
+							case 'ACTION_CREATE':
+								$link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'">'.$newref.'</a>';
+								$dir_output = $conf->agenda->dir_output;
+								$object_type = 'action';
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextActionAdded", $link);
+								break;
 						}
 						$ref = dol_sanitizeFileName($newref);
 						$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
@@ -756,12 +756,12 @@ class Notify
 						$object_type = 'holiday';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextHolidayApproved", $link);
 						break;
-                    case 'ACTION_CREATE':
-                        $link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'">'.$newref.'</a>';
-                        $dir_output = $conf->agenda->dir_output;
-                        $object_type = 'action';
-                        $mesg = $langs->transnoentitiesnoconv("EMailTextActionAdded", $link);
-                        break;
+					case 'ACTION_CREATE':
+						$link = '<a href="'.$urlwithroot.'/comm/action/card.php?id='.$object->id.'">'.$newref.'</a>';
+						$dir_output = $conf->agenda->dir_output;
+						$object_type = 'action';
+						$mesg = $langs->transnoentitiesnoconv("EMailTextActionAdded", $link);
+						break;
 				}
 				$ref = dol_sanitizeFileName($newref);
 				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index b2a265c47d5..5156e7b767a 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -39,8 +39,7 @@ class SimpleOpenID
 	 */
 	public function __construct()
 	{
-		if (!function_exists('curl_exec'))
-		{
+		if (!function_exists('curl_exec')) {
 			die('Error: Class SimpleOpenID requires curl extension to work');
 		}
 	}
@@ -147,18 +146,18 @@ class SimpleOpenID
 			$a = 'http://'.$a;
 		}
 		/*
-         $u = parse_url(trim($a));
-         if (!isset($u['path'])){
-         $u['path'] = '/';
-         }else if(substr($u['path'],-1,1) == '/'){
-         $u['path'] = substr($u['path'], 0, strlen($u['path'])-1);
-         }
-         if (isset($u['query'])){ // If there is a query string, then use identity as is
-         $identity = $a;
-         }else{
-         $identity = $u['scheme'] . '://' . $u['host'] . $u['path'];
-         }
-        */
+		 $u = parse_url(trim($a));
+		 if (!isset($u['path'])){
+		 $u['path'] = '/';
+		 }else if(substr($u['path'],-1,1) == '/'){
+		 $u['path'] = substr($u['path'], 0, strlen($u['path'])-1);
+		 }
+		 if (isset($u['query'])){ // If there is a query string, then use identity as is
+		 $identity = $a;
+		 }else{
+		 $identity = $u['scheme'] . '://' . $u['host'] . $u['path'];
+		 }
+		*/
 		$this->openid_url_identity = $a;
 	}
 
@@ -215,8 +214,7 @@ class SimpleOpenID
 	public function IsError()
 	{
 		// phpcs:enable
-		if (count($this->error) > 0)
-		{
+		if (count($this->error) > 0) {
 			return true;
 		} else {
 			return false;
@@ -253,8 +251,9 @@ class SimpleOpenID
 	public function OpenID_Standarize($openid_identity = null)
 	{
 		// phpcs:enable
-		if ($openid_identity === null)
-		$openid_identity = $this->openid_url_identity;
+		if ($openid_identity === null) {
+			$openid_identity = $this->openid_url_identity;
+		}
 
 		$u = parse_url(strtolower(trim($openid_identity)));
 
@@ -337,7 +336,9 @@ class SimpleOpenID
 	{
 		// phpcs:enable
 		// Remember, SSL MUST BE SUPPORTED
-		if (is_array($params)) $params = $this->array2url($params);
+		if (is_array($params)) {
+			$params = $this->array2url($params);
+		}
 
 		$curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
 		@curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
@@ -345,7 +346,9 @@ class SimpleOpenID
 		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
 		curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
 		curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
-		if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+		if ($method == "POST") {
+			curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+		}
 		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 		$response = curl_exec($curl);
 
@@ -398,7 +401,9 @@ class SimpleOpenID
 		global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+			$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
 		$response = getURLContent($url);
 
@@ -451,8 +456,7 @@ class SimpleOpenID
 	{
 		// phpcs:enable
 		$redirect_to = $this->GetRedirectURL();
-		if (headers_sent())
-		{ // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)
+		if (headers_sent()) { // Use JavaScript to redirect if content has been previously sent (not recommended, but safe)
 			echo '<script language="JavaScript" type="text/javascript">window.location=\'';
 			echo $redirect_to;
 			echo '\';</script>';
@@ -478,8 +482,7 @@ class SimpleOpenID
 		// Send only required parameters to confirm validity
 		$arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));
 		$num = count($arr_signed);
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			$s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);
 			$c = $_GET['openid_'.$arr_signed[$i]];
 			// if ($c != ""){
@@ -489,14 +492,12 @@ class SimpleOpenID
 		$params['openid.mode'] = "check_authentication";
 
 		$openid_server = $this->GetOpenIDServer();
-		if ($openid_server == false)
-		{
+		if ($openid_server == false) {
 			return false;
 		}
 		$response = $this->CURL_Request($openid_server, 'POST', $params);
 		$data = $this->splitResponse($response);
-		if ($data['is_valid'] == "true")
-		{
+		if ($data['is_valid'] == "true") {
 			return true;
 		} else {
 			return false;
@@ -517,35 +518,35 @@ class SimpleOpenID
 		global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+			$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
 		$addheaders = array('Accept: application/xrds+xml');
 		$response = getURLContent($url, 'GET', '', 1, $addheaders);
 		/* response should like this:
-        <?xml version="1.0" encoding="UTF-8"?>
-        <xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
-        <XRD>
-        <Service priority="0">
-        <Type>http://specs.openid.net/auth/2.0/server</Type>
-        <Type>http://openid.net/srv/ax/1.0</Type>
-        ...
-        <URI>https://www.google.com/accounts/o8/ud</URI>
-        </Service>
-        </XRD>
-        </xrds:XRDS>
-        */
+		<?xml version="1.0" encoding="UTF-8"?>
+		<xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
+		<XRD>
+		<Service priority="0">
+		<Type>http://specs.openid.net/auth/2.0/server</Type>
+		<Type>http://openid.net/srv/ax/1.0</Type>
+		...
+		<URI>https://www.google.com/accounts/o8/ud</URI>
+		</Service>
+		</XRD>
+		</xrds:XRDS>
+		*/
 		$content = $response['content'];
 
 		$server = '';
-		if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg))
-		{
+		if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg)) {
 			$server = $reg[1];
 		}
 
-		if (empty($server))
-		{
+		if (empty($server)) {
 			$this->ErrorStore('OPENID_NOSERVERSFOUND');
 			return false;
 		} else {
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index 578e180edff..aae4acd7bc0 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -194,8 +194,7 @@ class RssParser
 		$str = ''; // This will contain content of feed
 
 		// Check parameters
-		if (!dol_is_url($urlRSS))
-		{
+		if (!dol_is_url($urlRSS)) {
 			$this->error = "ErrorBadUrl";
 			return -1;
 		}
@@ -209,11 +208,9 @@ class RssParser
 
 		// Search into cache
 		$foundintocache = 0;
-		if ($cachedelay > 0 && $cachedir)
-		{
+		if ($cachedelay > 0 && $cachedir) {
 			$filedate = dol_filemtime($newpathofdestfile);
-			if ($filedate >= ($nowgmt - $cachedelay))
-			{
+			if ($filedate >= ($nowgmt - $cachedelay)) {
 				//dol_syslog("RssParser::parser cache file ".$newpathofdestfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay.") so we use it.");
 				$foundintocache = 1;
 
@@ -224,8 +221,7 @@ class RssParser
 		}
 
 		// Load file into $str
-		if ($foundintocache)    // Cache file found and is not too old
-		{
+		if ($foundintocache) {    // Cache file found and is not too old
 			$str = file_get_contents($newpathofdestfile);
 		} else {
 			try {
@@ -234,8 +230,12 @@ class RssParser
 				ini_set("default_socket_timeout", $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
 				$opts = array('http'=>array('method'=>"GET"));
-				if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) $opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;
-				if (!empty($conf->global->MAIN_PROXY_USE))           $opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+				if (!empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)) {
+					$opts['http']['timeout'] = $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+				}
+				if (!empty($conf->global->MAIN_PROXY_USE)) {
+					$opts['http']['proxy'] = 'tcp://'.$conf->global->MAIN_PROXY_HOST.':'.$conf->global->MAIN_PROXY_PORT;
+				}
 				//var_dump($opts);exit;
 				$context = stream_context_create($opts);
 
@@ -245,11 +245,9 @@ class RssParser
 			}
 		}
 
-		if ($str !== false)
-		{
+		if ($str !== false) {
 			// Convert $str into xml
-			if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-			{
+			if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
 				//print 'xx'.LIBXML_NOCDATA;
 				libxml_use_internal_errors(false);
 				$rss = simplexml_load_string($str, "SimpleXMLElement", LIBXML_NOCDATA);
@@ -276,19 +274,20 @@ class RssParser
 		}
 
 		// If $rss loaded
-		if ($rss)
-		{
+		if ($rss) {
 			// Save file into cache
-			if (empty($foundintocache) && $cachedir)
-			{
+			if (empty($foundintocache) && $cachedir) {
 				dol_syslog(get_class($this)."::parser cache file ".$newpathofdestfile." is saved onto disk.");
-				if (!dol_is_dir($cachedir)) dol_mkdir($cachedir);
+				if (!dol_is_dir($cachedir)) {
+					dol_mkdir($cachedir);
+				}
 				$fp = fopen($newpathofdestfile, 'w');
-				if ($fp)
-				{
+				if ($fp) {
 					fwrite($fp, $str);
 					fclose($fp);
-					if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+					if (!empty($conf->global->MAIN_UMASK)) {
+						$newmask = $conf->global->MAIN_UMASK;
+					}
 					@chmod($newpathofdestfile, octdec($newmask));
 
 					$this->_lastfetchdate = $nowgmt;
@@ -299,10 +298,11 @@ class RssParser
 
 			unset($str); // Free memory
 
-			if (empty($rss->_format))    // If format not detected automatically
-			{
+			if (empty($rss->_format)) {    // If format not detected automatically
 				$rss->_format = 'rss';
-				if (empty($rss->channel)) $rss->_format = 'atom';
+				if (empty($rss->channel)) {
+					$rss->_format = 'atom';
+				}
 			}
 
 			$items = array();
@@ -311,46 +311,98 @@ class RssParser
 			if ($rss->_format == 'rss') {
 				//var_dump($rss);
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
-					if (!empty($rss->channel->language))      $this->_language = (string) $rss->channel->language;
-					if (!empty($rss->channel->generator))     $this->_generator = (string) $rss->channel->generator;
-					if (!empty($rss->channel->copyright))     $this->_copyright = (string) $rss->channel->copyright;
-					if (!empty($rss->channel->lastbuilddate)) $this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
-					if (!empty($rss->channel->image->url[0])) $this->_imageurl = (string) $rss->channel->image->url[0];
-					if (!empty($rss->channel->link))		  $this->_link = (string) $rss->channel->link;
-					if (!empty($rss->channel->title))         $this->_title = (string) $rss->channel->title;
-					if (!empty($rss->channel->description))	  $this->_description = (string) $rss->channel->description;
+					if (!empty($rss->channel->language)) {
+						$this->_language = (string) $rss->channel->language;
+					}
+					if (!empty($rss->channel->generator)) {
+						$this->_generator = (string) $rss->channel->generator;
+					}
+					if (!empty($rss->channel->copyright)) {
+						$this->_copyright = (string) $rss->channel->copyright;
+					}
+					if (!empty($rss->channel->lastbuilddate)) {
+						$this->_lastbuilddate = (string) $rss->channel->lastbuilddate;
+					}
+					if (!empty($rss->channel->image->url[0])) {
+						$this->_imageurl = (string) $rss->channel->image->url[0];
+					}
+					if (!empty($rss->channel->link)) {
+						$this->_link = (string) $rss->channel->link;
+					}
+					if (!empty($rss->channel->title)) {
+						$this->_title = (string) $rss->channel->title;
+					}
+					if (!empty($rss->channel->description)) {
+						$this->_description = (string) $rss->channel->description;
+					}
 				} else {
 					//var_dump($rss->channel);
-					if (!empty($rss->channel['language']))      $this->_language = (string) $rss->channel['language'];
-					if (!empty($rss->channel['generator']))     $this->_generator = (string) $rss->channel['generator'];
-					if (!empty($rss->channel['copyright']))     $this->_copyright = (string) $rss->channel['copyright'];
-					if (!empty($rss->channel['lastbuilddate'])) $this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
-					if (!empty($rss->image['url']))             $this->_imageurl = (string) $rss->image['url'];
-					if (!empty($rss->channel['link']))		    $this->_link = (string) $rss->channel['link'];
-					if (!empty($rss->channel['title']))         $this->_title = (string) $rss->channel['title'];
-					if (!empty($rss->channel['description']))   $this->_description = (string) $rss->channel['description'];
+					if (!empty($rss->channel['language'])) {
+						$this->_language = (string) $rss->channel['language'];
+					}
+					if (!empty($rss->channel['generator'])) {
+						$this->_generator = (string) $rss->channel['generator'];
+					}
+					if (!empty($rss->channel['copyright'])) {
+						$this->_copyright = (string) $rss->channel['copyright'];
+					}
+					if (!empty($rss->channel['lastbuilddate'])) {
+						$this->_lastbuilddate = (string) $rss->channel['lastbuilddate'];
+					}
+					if (!empty($rss->image['url'])) {
+						$this->_imageurl = (string) $rss->image['url'];
+					}
+					if (!empty($rss->channel['link'])) {
+						$this->_link = (string) $rss->channel['link'];
+					}
+					if (!empty($rss->channel['title'])) {
+						$this->_title = (string) $rss->channel['title'];
+					}
+					if (!empty($rss->channel['description'])) {
+						$this->_description = (string) $rss->channel['description'];
+					}
 				}
 
-				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) $items = $rss->channel->item; // With simplexml
-				else $items = $rss->items; // With xmlparse
+				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+					$items = $rss->channel->item; // With simplexml
+				} else {
+					$items = $rss->items; // With xmlparse
+				}
 				//var_dump($items);exit;
 			} elseif ($rss->_format == 'atom') {
 				//var_dump($rss);
-				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML))
-				{
-					if (!empty($rss->generator))     $this->_generator = (string) $rss->generator;
-					if (!empty($rss->lastbuilddate)) $this->_lastbuilddate = (string) $rss->modified;
-					if (!empty($rss->link->href))    $this->_link = (string) $rss->link->href;
-					if (!empty($rss->title))         $this->_title = (string) $rss->title;
-					if (!empty($rss->description))	 $this->_description = (string) $rss->description;
+				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
+					if (!empty($rss->generator)) {
+						$this->_generator = (string) $rss->generator;
+					}
+					if (!empty($rss->lastbuilddate)) {
+						$this->_lastbuilddate = (string) $rss->modified;
+					}
+					if (!empty($rss->link->href)) {
+						$this->_link = (string) $rss->link->href;
+					}
+					if (!empty($rss->title)) {
+						$this->_title = (string) $rss->title;
+					}
+					if (!empty($rss->description)) {
+						$this->_description = (string) $rss->description;
+					}
 				} else {
 					//if (!empty($rss->channel['rss_language']))	$this->_language = (string) $rss->channel['rss_language'];
-					if (!empty($rss->channel['generator']))			$this->_generator = (string) $rss->channel['generator'];
+					if (!empty($rss->channel['generator'])) {
+						$this->_generator = (string) $rss->channel['generator'];
+					}
 					//if (!empty($rss->channel['rss_copyright']))	$this->_copyright = (string) $rss->channel['rss_copyright'];
-					if (!empty($rss->channel['modified']))			$this->_lastbuilddate = (string) $rss->channel['modified'];
+					if (!empty($rss->channel['modified'])) {
+						$this->_lastbuilddate = (string) $rss->channel['modified'];
+					}
 					//if (!empty($rss->image['rss_url']))			$this->_imageurl = (string) $rss->image['rss_url'];
-					if (!empty($rss->channel['link']))				$this->_link = (string) $rss->channel['link'];
-					if (!empty($rss->channel['title']))				$this->_title = (string) $rss->channel['title'];
+					if (!empty($rss->channel['link'])) {
+						$this->_link = (string) $rss->channel['link'];
+					}
+					if (!empty($rss->channel['title'])) {
+						$this->_title = (string) $rss->channel['title'];
+					}
 					//if (!empty($rss->channel['rss_description']))	$this->_description = (string) $rss->channel['rss_description'];
 
 					if (!empty($rss->channel)) {
@@ -360,7 +412,9 @@ class RssParser
 				if (!empty($conf->global->EXTERNALRSS_USE_SIMPLEXML)) {
 					$tmprss = xml2php($rss); $items = $tmprss['entry'];
 				} // With simplexml
-				else $items = $rss->items; // With xmlparse
+				else {
+					$items = $rss->items; // With xmlparse
+				}
 				//var_dump($items);exit;
 			}
 
@@ -436,7 +490,9 @@ class RssParser
 
 					$i++;
 
-					if ($i > $maxNb)    break; // We get all records we want
+					if ($i > $maxNb) {
+						break; // We get all records we want
+					}
 				}
 			}
 
@@ -466,18 +522,15 @@ class RssParser
 
 		// check for a namespace, and split if found
 		$ns = false;
-		if (strpos($element, ':'))
-		{
+		if (strpos($element, ':')) {
 			list($ns, $el) = explode(':', $element, 2);
 		}
-		if ($ns and $ns != 'rdf')
-		{
+		if ($ns and $ns != 'rdf') {
 			$this->current_namespace = $ns;
 		}
 
 		// if feed type isn't set, then this is first element of feed identify feed from root element
-		if (empty($this->_format))
-		{
+		if (empty($this->_format)) {
 			if ($el == 'rdf') {
 				$this->_format = 'rss';
 				$this->feed_version = '1.0';
@@ -492,11 +545,9 @@ class RssParser
 			return;
 		}
 
-		if ($el == 'channel')
-		{
+		if ($el == 'channel') {
 			$this->inchannel = true;
-		} elseif ($el == 'item' or $el == 'entry')
-		{
+		} elseif ($el == 'item' or $el == 'entry') {
 			$this->initem = true;
 			if (isset($attrs['rdf:about'])) {
 				$this->current_item['about'] = $attrs['rdf:about'];
@@ -505,23 +556,18 @@ class RssParser
 
 		// if we're in the default namespace of an RSS feed,
 		//  record textinput or image fields
-		elseif (
-		$this->_format == 'rss' and
+		elseif ($this->_format == 'rss' and
 		$this->current_namespace == '' and
-		$el == 'textinput' )
-		{
+		$el == 'textinput') {
 			$this->intextinput = true;
-		} elseif (
-		$this->_format == 'rss' and
+		} elseif ($this->_format == 'rss' and
 		$this->current_namespace == '' and
-		$el == 'image' )
-		{
+		$el == 'image') {
 			$this->inimage = true;
 		}
 
 		// handle atom content constructs
-		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
-		{
+		elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS)) {
 			// avoid clashing w/ RSS mod_content
 			if ($el == 'content') {
 				$el = 'atom_content';
@@ -531,8 +577,7 @@ class RssParser
 		}
 
 		// if inside an Atom content construct (e.g. content or summary) field treat tags as text
-		elseif ($this->_format == 'atom' and $this->incontent)
-		{
+		elseif ($this->_format == 'atom' and $this->incontent) {
 			// if tags are inlined, then flatten
 			$attrs_str = join(' ', array_map('map_attrs', array_keys($attrs), array_values($attrs)));
 
@@ -545,13 +590,10 @@ class RssParser
 		// Magpie treats link elements of type rel='alternate'
 		// as being equivalent to RSS's simple link element.
 		//
-		elseif ($this->_format == 'atom' and $el == 'link')
-		{
-			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate')
-			{
+		elseif ($this->_format == 'atom' and $el == 'link') {
+			if (isset($attrs['rel']) && $attrs['rel'] == 'alternate') {
 				$link_el = 'link';
-			} elseif (!isset($attrs['rel']))
-			{
+			} elseif (!isset($attrs['rel'])) {
 				$link_el = 'link';
 			} else {
 				$link_el = 'link_'.$attrs['rel'];
@@ -577,8 +619,7 @@ class RssParser
 	public function feed_cdata($p, $text)
 	{
 		// phpcs:enable
-		if ($this->_format == 'atom' and $this->incontent)
-		{
+		if ($this->_format == 'atom' and $this->incontent) {
 			$this->append_content($text);
 		} else {
 			$current_el = join('_', array_reverse($this->stack));
@@ -599,28 +640,22 @@ class RssParser
 		// phpcs:enable
 		$el = strtolower($el);
 
-		if ($el == 'item' or $el == 'entry')
-		{
+		if ($el == 'item' or $el == 'entry') {
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
-		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput')
-		{
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'textinput') {
 			$this->intextinput = false;
-		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image')
-		{
+		} elseif ($this->_format == 'rss' and $this->current_namespace == '' and $el == 'image') {
 			$this->inimage = false;
-		} elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS))
-		{
+		} elseif ($this->_format == 'atom' and in_array($el, $this->_CONTENT_CONSTRUCTS)) {
 			$this->incontent = false;
-		} elseif ($el == 'channel' or $el == 'feed')
-		{
+		} elseif ($el == 'channel' or $el == 'feed') {
 			$this->inchannel = false;
 		} elseif ($this->_format == 'atom' and $this->incontent) {
 			// balance tags properly
 			// note:  i don't think this is actually neccessary
-			if ($this->stack[0] == $el)
-			{
+			if ($this->stack[0] == $el) {
 				$this->append_content("</$el>");
 			} else {
 				$this->append_content("<$el />");
@@ -679,8 +714,7 @@ class RssParser
 		if (!$el) {
 			return;
 		}
-		if ($this->current_namespace)
-		{
+		if ($this->current_namespace) {
 			if ($this->initem) {
 				$this->concat($this->current_item[$this->current_namespace][$el], $text);
 			} elseif ($this->inchannel) {
@@ -714,11 +748,9 @@ class RssParser
 	{
 		$result = "";
 
-		if (isset($item['summary']))
-		{
+		if (isset($item['summary'])) {
 			$result = $item['summary'];
-		} elseif (isset($item['atom_content']))
-		{
+		} elseif (isset($item['atom_content'])) {
 			$result = $item['atom_content'];
 		}
 
@@ -728,8 +760,7 @@ class RssParser
 
 		$result = str_replace("\n", "", $result);
 
-		if (strlen($result) > $maxlength)
-		{
+		if (strlen($result) > $maxlength) {
 			$result = substr($result, 0, $maxlength);
 			$result .= "...";
 		}
@@ -745,28 +776,23 @@ class RssParser
 	 */
 	private function getAtomImageUrl(array $feed)
 	{
-		if (isset($feed['icon']))
-		{
+		if (isset($feed['icon'])) {
 			return $feed['logo'];
 		}
 
-		if (isset($feed['icon']))
-		{
+		if (isset($feed['icon'])) {
 			return $feed['logo'];
 		}
 
-		if (isset($feed['webfeeds:logo']))
-		{
+		if (isset($feed['webfeeds:logo'])) {
 			return $feed['webfeeds:logo'];
 		}
 
-		if (isset($feed['webfeeds:icon']))
-		{
+		if (isset($feed['webfeeds:icon'])) {
 			return $feed['webfeeds:icon'];
 		}
 
-		if (isset($feed['webfeeds:wordmark']))
-		{
+		if (isset($feed['webfeeds:wordmark'])) {
 			return $feed['webfeeds:wordmark'];
 		}
 
@@ -786,27 +812,23 @@ function xml2php($xml)
 	$fils = 0;
 	$tab = false;
 	$array = array();
-	foreach ($xml->children() as $key => $value)
-	{
+	foreach ($xml->children() as $key => $value) {
 		$child = xml2php($value);
 
 		//To deal with the attributes
-		foreach ($value->attributes() as $ak=>$av)
-		{
+		foreach ($value->attributes() as $ak => $av) {
 			$child[$ak] = (string) $av;
 		}
 
 		//Let see if the new child is not in the array
-		if ($tab === false && in_array($key, array_keys($array)))
-		{
+		if ($tab === false && in_array($key, array_keys($array))) {
 			//If this element is already in the array we will create an indexed array
 			$tmp = $array[$key];
 			$array[$key] = null;
 			$array[$key][] = $tmp;
 			$array[$key][] = $child;
 			$tab = true;
-		} elseif ($tab === true)
-		{
+		} elseif ($tab === true) {
 			//Add an element in an existing array
 			$array[$key][] = $child;
 		} else {
@@ -818,8 +840,7 @@ function xml2php($xml)
 	}
 
 
-	if ($fils == 0)
-	{
+	if ($fils == 0) {
 		return (string) $xml;
 	}
 
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 8254cc56ed2..3618cfc2413 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -315,8 +315,9 @@ class SMTPs
 	 */
 	public function setErrorsTo($_strErrorsTo)
 	{
-		if ($_strErrorsTo)
-		$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+		if ($_strErrorsTo) {
+			$this->_errorsTo = $this->_strip_email($_strErrorsTo);
+		}
 	}
 
 	/**
@@ -329,9 +330,11 @@ class SMTPs
 	{
 		$_retValue = '';
 
-		if ($_part === true)
-		$_retValue = $this->_errorsTo;
-		else $_retValue = $this->_errorsTo[$_part];
+		if ($_part === true) {
+			$_retValue = $this->_errorsTo;
+		} else {
+			$_retValue = $this->_errorsTo[$_part];
+		}
 
 		return $_retValue;
 	}
@@ -383,8 +386,7 @@ class SMTPs
 		// @CHANGE LDR
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		if ((!is_ip($host)) && ((gethostbyname($host)) == $host))
-		{
+		if ((!is_ip($host)) && ((gethostbyname($host)) == $host)) {
 			$this->_setErr(99, $host.' is either offline or is an invalid host name.');
 			$_retVal = false;
 		} else {
@@ -403,30 +405,34 @@ class SMTPs
 			} else {
 				$this->socket = @fsockopen(
 					preg_replace('@tls://@i', '', $this->getHost()), // Host to 'hit', IP or domain
-				$this->getPort(), // which Port number to use
-				$this->errno, // actual system level error
-				$this->errstr, // and any text that goes with the error
-				$this->_smtpTimeout     // timeout for reading/writing data over the socket
+					$this->getPort(), // which Port number to use
+					$this->errno, // actual system level error
+					$this->errstr, // and any text that goes with the error
+					$this->_smtpTimeout     // timeout for reading/writing data over the socket
 				);
 			}
 
 			//See if we can connect to the SMTP server
-			if (is_resource($this->socket))
-			{
+			if (is_resource($this->socket)) {
 				// Fix from PHP SMTP class by 'Chris Ryan'
 				// Sometimes the SMTP server takes a little longer to respond
 				// so we will give it a longer timeout for the first read
 				// Windows still does not have support for this timeout function
-				if (function_exists('stream_set_timeout')) stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
+				if (function_exists('stream_set_timeout')) {
+					stream_set_timeout($this->socket, $this->_smtpTimeout, 0);
+				}
 
 				// Check response from Server
-				if ($_retVal = $this->server_parse($this->socket, "220"))
-				$_retVal = $this->socket;
+				if ($_retVal = $this->server_parse($this->socket, "220")) {
+					$_retVal = $this->socket;
+				}
 			}
 			// This connection attempt failed.
 			else {
 				// @CHANGE LDR
-				if (empty($this->errstr)) $this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				if (empty($this->errstr)) {
+					$this->errstr = 'Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
+				}
 				$this->_setErr($this->errno, $this->errstr);
 				$_retVal = false;
 			}
@@ -456,12 +462,13 @@ class SMTPs
 		$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
 		$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-		if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
+		if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) {
+			$host = 'tls://'.$host;
+		}
 
 		$hosth = $host;
 
-		if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-		{
+		if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
 			// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
 			$hosth = $this->getFrom('addr');
 			$hosth = preg_replace('/^.*</', '', $hosth);
@@ -469,31 +476,28 @@ class SMTPs
 			$hosth = preg_replace('/.*@/', '', $hosth);
 		}
 
-		if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
-		{
-			if ($usetls)
-			{
+		if ($_retVal = $this->socket_send_str('EHLO '.$hosth, '250')) {
+			if ($usetls) {
 				/*
-                The following dialog illustrates how a client and server can start a TLS STARTTLS session
-                S: <waits for connection on TCP port 25>
-                C: <opens connection>
-                S: 220 mail.imc.org SMTP service ready
-                C: EHLO mail.ietf.org
-                S: 250-mail.imc.org offers a warm hug of welcome
-                S: 250 STARTTLS
-                C: STARTTLS
-                S: 220 Go ahead
-                C: <starts TLS negotiation>
-                C & S: <negotiate a TLS session>
-                C & S: <check result of negotiation>
-                // Second pass EHLO
-                C: EHLO client-domain.com
-                S: 250-server-domain.com
-                S: 250 AUTH LOGIN
-                C: <continues by sending an SMTP command
-                */
-				if (!$_retVal = $this->socket_send_str('STARTTLS', 220))
-				{
+				The following dialog illustrates how a client and server can start a TLS STARTTLS session
+				S: <waits for connection on TCP port 25>
+				C: <opens connection>
+				S: 220 mail.imc.org SMTP service ready
+				C: EHLO mail.ietf.org
+				S: 250-mail.imc.org offers a warm hug of welcome
+				S: 250 STARTTLS
+				C: STARTTLS
+				S: 220 Go ahead
+				C: <starts TLS negotiation>
+				C & S: <negotiate a TLS session>
+				C & S: <check result of negotiation>
+				// Second pass EHLO
+				C: EHLO client-domain.com
+				S: 250-server-domain.com
+				S: 250 AUTH LOGIN
+				C: <continues by sending an SMTP command
+				*/
+				if (!$_retVal = $this->socket_send_str('STARTTLS', 220)) {
 					$this->_setErr(131, 'STARTTLS connection is not supported.');
 					return $_retVal;
 				}
@@ -511,22 +515,22 @@ class SMTPs
 					$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
 				}
 
-				if (!stream_socket_enable_crypto($this->socket, true, $crypto_method))
-				{
+				if (!stream_socket_enable_crypto($this->socket, true, $crypto_method)) {
 					$this->_setErr(132, 'STARTTLS connection failed.');
 					return $_retVal;
 				}
 				// Most server servers expect a 2nd pass of EHLO after TLS is established to get another time
 				// the answer with list of supported AUTH methods. They may differs between non STARTTLS and with STARTTLS.
-				if (!$_retVal = $this->socket_send_str('EHLO '.$hosth, '250'))
-				{
+				if (!$_retVal = $this->socket_send_str('EHLO '.$hosth, '250')) {
 					$this->_setErr(126, '"'.$hosth.'" does not support authenticated connections.');
 					return $_retVal;
 				}
 			}
 
 			// Default authentication method is LOGIN
-			if (empty($conf->global->MAIL_SMTP_AUTH_TYPE)) $conf->global->MAIL_SMTP_AUTH_TYPE = 'LOGIN';
+			if (empty($conf->global->MAIL_SMTP_AUTH_TYPE)) {
+				$conf->global->MAIL_SMTP_AUTH_TYPE = 'LOGIN';
+			}
 
 			// Send Authentication to Server
 			// Check for errors along the way
@@ -571,11 +575,9 @@ class SMTPs
 		$_retVal = false;
 
 		// Connect to Server
-		if ($this->socket = $this->_server_connect())
-		{
+		if ($this->socket = $this->_server_connect()) {
 			// If a User ID *and* a password is given, assume Authentication is desired
-			if (!empty($this->_smtpsID) && !empty($this->_smtpsPW))
-			{
+			if (!empty($this->_smtpsID) && !empty($this->_smtpsPW)) {
 				// Send the RFC2554 specified EHLO.
 				$_retVal = $this->_server_authenticate();
 			}
@@ -590,12 +592,13 @@ class SMTPs
 				$host = preg_replace('@ssl://@i', '', $host); // Remove prefix
 				$host = preg_replace('@tls://@i', '', $host); // Remove prefix
 
-				if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) $host = 'tls://'.$host;
+				if ($usetls && !empty($conf->global->MAIN_SMTPS_ADD_TLS_TO_HOST_FOR_HELO)) {
+					$host = 'tls://'.$host;
+				}
 
 				$hosth = $host;
 
-				if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO))
-				{
+				if (!empty($conf->global->MAIL_SMTP_USE_FROM_FOR_HELO)) {
 					// If the from to is 'aaa <bbb@ccc.com>', we will keep 'ccc.com'
 					$hosth = $this->getFrom('addr');
 					$hosth = preg_replace('/^.*</', '', $hosth);
@@ -607,8 +610,7 @@ class SMTPs
 			}
 
 			// Well, did we get to the server?
-			if ($_retVal)
-			{
+			if ($_retVal) {
 				// From this point onward most server response codes should be 250
 				// Specify who the mail is from....
 				// This has to be the raw email address, strip the "name" off
@@ -621,22 +623,21 @@ class SMTPs
 				// 'RCPT TO:' must be given a single address, so this has to loop
 				// through the list of addresses, regardless of TO, CC or BCC
 				// and send it out "single file"
-				foreach ($this->get_RCPT_list() as $_address)
-				{
+				foreach ($this->get_RCPT_list() as $_address) {
 					/* Note:
-                     * BCC email addresses must be listed in the RCPT TO command list,
-                     * but the BCC header should not be printed under the DATA command.
-                     * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
-                     */
+					 * BCC email addresses must be listed in the RCPT TO command list,
+					 * but the BCC header should not be printed under the DATA command.
+					 * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
+					 */
 
 					/*
-                     * TODO
-                     * After each 'RCPT TO:' is sent, we need to make sure it was kosher,
-                     * if not, the whole message will fail
-                     * If any email address fails, we will need to RESET the connection,
-                     * mark the last address as "bad" and start the address loop over again.
-                     * If any address fails, the entire message fails.
-                     */
+					 * TODO
+					 * After each 'RCPT TO:' is sent, we need to make sure it was kosher,
+					 * if not, the whole message will fail
+					 * If any email address fails, we will need to RESET the connection,
+					 * mark the last address as "bad" and start the address loop over again.
+					 * If any address fails, the entire message fails.
+					 */
 					$this->socket_send_str('RCPT TO: <'.$_address.'>', '250');
 				}
 
@@ -697,12 +698,10 @@ class SMTPs
 		$_retVal = true;
 
 		// if we have a path...
-		if (!empty($_strConfigPath))
-		{
+		if (!empty($_strConfigPath)) {
 			// If the path is not valid, this will NOT generate an error,
 			// it will simply return false.
-			if (!@include $_strConfigPath)
-			{
+			if (!@include $_strConfigPath) {
 				$this->_setErr(110, '"'.$_strConfigPath.'" is not a valid path.');
 				$_retVal = false;
 			}
@@ -712,14 +711,17 @@ class SMTPs
 		else {
 			// Set these properties ONLY if they are set in the php.ini file.
 			// Otherwise the default values will be used.
-			if ($_host = ini_get('SMTPs'))
-			$this->setHost($_host);
+			if ($_host = ini_get('SMTPs')) {
+				$this->setHost($_host);
+			}
 
-			if ($_port = ini_get('smtp_port'))
-			$this->setPort($_port);
+			if ($_port = ini_get('smtp_port')) {
+				$this->setPort($_port);
+			}
 
-			if ($_from = ini_get('sendmail_from'))
-			$this->setFrom($_from);
+			if ($_from = ini_get('sendmail_from')) {
+				$this->setFrom($_from);
+			}
 		}
 
 		// Send back what we have
@@ -780,8 +782,9 @@ class SMTPs
 	 */
 	public function setHost($_strHost)
 	{
-		if ($_strHost)
-		$this->_smtpsHost = $_strHost;
+		if ($_strHost) {
+			$this->_smtpsHost = $_strHost;
+		}
 	}
 
 	/**
@@ -806,8 +809,9 @@ class SMTPs
 	public function setPort($_intPort)
 	{
 		if ((is_numeric($_intPort)) &&
-		(($_intPort >= 1) && ($_intPort <= 65536)))
-		$this->_smtpsPort = $_intPort;
+		(($_intPort >= 1) && ($_intPort <= 65536))) {
+			$this->_smtpsPort = $_intPort;
+		}
 	}
 
 	/**
@@ -872,8 +876,9 @@ class SMTPs
 	 */
 	public function setCharSet($_strCharSet)
 	{
-		if ($_strCharSet)
-		$this->_smtpsCharSet = $_strCharSet;
+		if ($_strCharSet) {
+			$this->_smtpsCharSet = $_strCharSet;
+		}
 	}
 
 	/**
@@ -903,8 +908,9 @@ class SMTPs
 	 */
 	public function setTransEncode($_strTransEncode)
 	{
-		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncode = $_strTransEncode;
+		if (array_search($_strTransEncode, $this->_smtpsTransEncodeTypes)) {
+			$this->_smtpsTransEncode = $_strTransEncode;
+		}
 	}
 
 	/**
@@ -935,8 +941,9 @@ class SMTPs
 	 */
 	public function setTransEncodeType($_strTransEncodeType)
 	{
-		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes))
-		$this->_smtpsTransEncodeType = $_strTransEncodeType;
+		if (array_search($_strTransEncodeType, $this->_smtpsTransEncodeTypes)) {
+			$this->_smtpsTransEncodeType = $_strTransEncodeType;
+		}
 	}
 
 	/**
@@ -960,8 +967,9 @@ class SMTPs
 	 */
 	public function setFrom($_strFrom)
 	{
-		if ($_strFrom)
-		$this->_msgFrom = $this->_strip_email($_strFrom);
+		if ($_strFrom) {
+			$this->_msgFrom = $this->_strip_email($_strFrom);
+		}
 	}
 
 	/**
@@ -974,9 +982,11 @@ class SMTPs
 	{
 		$_retValue = '';
 
-		if ($_part === true)
-		$_retValue = $this->_msgFrom;
-		else $_retValue = $this->_msgFrom[$_part];
+		if ($_part === true) {
+			$_retValue = $this->_msgFrom;
+		} else {
+			$_retValue = $this->_msgFrom[$_part];
+		}
 
 		return $_retValue;
 	}
@@ -989,8 +999,9 @@ class SMTPs
 	 */
 	public function setReplyTo($_strReplyTo)
 	{
-		if ($_strReplyTo)
+		if ($_strReplyTo) {
 			$this->_msgReplyTo = $this->_strip_email($_strReplyTo);
+		}
 	}
 
 	/**
@@ -1003,9 +1014,11 @@ class SMTPs
 	{
 		$_retValue = '';
 
-		if ($_part === true)
+		if ($_part === true) {
 			$_retValue = $this->_msgReplyTo;
-		else $_retValue = $this->_msgReplyTo[$_part];
+		} else {
+			$_retValue = $this->_msgReplyTo[$_part];
+		}
 
 		return $_retValue;
 	}
@@ -1028,23 +1041,23 @@ class SMTPs
 		$aryHost = $this->_msgRecipients;
 
 		// Only run this if we have something
-		if (!empty($_addrList))
-		{
+		if (!empty($_addrList)) {
 			// $_addrList can be a STRING or an array
-			if (is_string($_addrList))
-			{
+			if (is_string($_addrList)) {
 				// This could be a COMMA delimited string
-				if (strstr($_addrList, ','))
-				// "explode "list" into an array
-				$_addrList = explode(',', $_addrList);
+				if (strstr($_addrList, ',')) {
+					// "explode "list" into an array
+					$_addrList = explode(',', $_addrList);
+				}
 
 				// Stick it in an array
-				else $_addrList = array($_addrList);
+				else {
+					$_addrList = array($_addrList);
+				}
 			}
 
 			// take the array of addresses and split them further
-			foreach ($_addrList as $_strAddr)
-			{
+			foreach ($_addrList as $_strAddr) {
 				// Strip off the end '>'
 				$_strAddr = str_replace('>', '', $_strAddr);
 
@@ -1053,8 +1066,7 @@ class SMTPs
 				$_tmpaddr = explode('<', $_strAddr);
 
 				// We have a "Real Name" and eMail address
-				if (count($_tmpaddr) == 2)
-				{
+				if (count($_tmpaddr) == 2) {
 					$_tmpHost = explode('@', $_tmpaddr[1]);
 					$_tmpaddr[0] = trim($_tmpaddr[0], ' ">');
 					$aryHost[$_tmpHost[1]][$_type][$_tmpHost[0]] = $_tmpaddr[0];
@@ -1109,14 +1121,16 @@ class SMTPs
 		$_tmpAry = explode('<', $_strAddr);
 
 		// Do we have a "Real name"
-		if (count($_tmpAry) == 2)
-		{
+		if (count($_tmpAry) == 2) {
 			// We may not really have a "Real Name"
-			if ($_tmpAry[0])
-			$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+			if ($_tmpAry[0]) {
+				$_aryEmail['real'] = trim($_tmpAry[0], ' ">');
+			}
 
 			$_aryEmail['addr'] = $_tmpAry[1];
-		} else $_aryEmail['addr'] = $_tmpAry[0];
+		} else {
+			$_aryEmail['addr'] = $_tmpAry[0];
+		}
 
 		// Pull User Name and Host.tld apart
 		list($_aryEmail['user'], $_aryEmail['host']) = explode('@', $_aryEmail['addr']);
@@ -1144,12 +1158,9 @@ class SMTPs
 		$_RCPT_list = array();
 
 		// walk down Recipients array and pull just email addresses
-		foreach ($this->_msgRecipients as $_host => $_list)
-		{
-			foreach ($_list as $_subList)
-			{
-				foreach ($_subList as $_name => $_addr)
-				{
+		foreach ($this->_msgRecipients as $_host => $_list) {
+			foreach ($_list as $_subList) {
+				foreach ($_subList as $_name => $_addr) {
 					// build RCPT list
 					$_RCPT_list[] = $_name.'@'.$_host;
 				}
@@ -1170,21 +1181,15 @@ class SMTPs
 	{
 		// phpcs:enable
 		// We need to know which address segment to pull
-		if ($_which)
-		{
+		if ($_which) {
 			// Make sure we have addresses to process
-			if ($this->_msgRecipients)
-			{
+			if ($this->_msgRecipients) {
 				$_RCPT_list = array();
 				// walk down Recipients array and pull just email addresses
-				foreach ($this->_msgRecipients as $_host => $_list)
-				{
-					if ($this->_msgRecipients[$_host][$_which])
-					{
-						foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName)
-						{
-							if ($_realName)	// @CHANGE LDR
-							{
+				foreach ($this->_msgRecipients as $_host => $_list) {
+					if ($this->_msgRecipients[$_host][$_which]) {
+						foreach ($this->_msgRecipients[$_host][$_which] as $_addr => $_realName) {
+							if ($_realName) {	// @CHANGE LDR
 								$_realName = '"'.$_realName.'"';
 								$_RCPT_list[] = $_realName.' <'.$_addr.'@'.$_host.'>';
 							} else {
@@ -1213,8 +1218,9 @@ class SMTPs
 	 */
 	public function setTO($_addrTo)
 	{
-		if ($_addrTo)
-		$this->_buildAddrList('to', $_addrTo);
+		if ($_addrTo) {
+			$this->_buildAddrList('to', $_addrTo);
+		}
 	}
 
 	/**
@@ -1235,8 +1241,9 @@ class SMTPs
 	 */
 	public function setCC($_strCC)
 	{
-		if ($_strCC)
-		$this->_buildAddrList('cc', $_strCC);
+		if ($_strCC) {
+			$this->_buildAddrList('cc', $_strCC);
+		}
 	}
 
 	/**
@@ -1257,8 +1264,9 @@ class SMTPs
 	 */
 	public function setBCC($_strBCC)
 	{
-		if ($_strBCC)
-		$this->_buildAddrList('bcc', $_strBCC);
+		if ($_strBCC) {
+			$this->_buildAddrList('bcc', $_strBCC);
+		}
 	}
 
 	/**
@@ -1279,8 +1287,9 @@ class SMTPs
 	 */
 	public function setSubject($_strSubject = '')
 	{
-		if ($_strSubject)
-		$this->_msgSubject = $_strSubject;
+		if ($_strSubject) {
+			$this->_msgSubject = $_strSubject;
+		}
 	}
 
 	/**
@@ -1305,19 +1314,20 @@ class SMTPs
 		$_header = 'From: '.$this->getFrom('org')."\r\n"
 		. 'To: '.$this->getTO()."\r\n";
 
-		if ($this->getCC())
-		$_header .= 'Cc: '.$this->getCC()."\r\n";
+		if ($this->getCC()) {
+			$_header .= 'Cc: '.$this->getCC()."\r\n";
+		}
 
 		/* Note:
-         * BCC email addresses must be listed in the RCPT TO command list,
-         * but the BCC header should not be printed under the DATA command.
-         * So it is included into the function sendMsg() but not here.
-         * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
-         */
+		 * BCC email addresses must be listed in the RCPT TO command list,
+		 * but the BCC header should not be printed under the DATA command.
+		 * So it is included into the function sendMsg() but not here.
+		 * http://stackoverflow.com/questions/2750211/sending-bcc-emails-using-a-smtp-server
+		 */
 		/*
-        if ( $this->getBCC() )
-        $_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";
-        */
+		if ( $this->getBCC() )
+		$_header .= 'Bcc: ' . $this->getBCC()  . "\r\n";
+		*/
 
 		$host = dol_getprefix('email');
 
@@ -1326,8 +1336,7 @@ class SMTPs
 		$_header .= 'Date: '.date("r")."\r\n";
 
 		$trackid = $this->getTrackId();
-		if ($trackid)
-		{
+		if ($trackid) {
 			// References is kept in response and Message-ID is returned into In-Reply-To:
 			$_header .= 'Message-ID: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
 			$_header .= 'References: <'.time().'.SMTPs-dolibarr-'.$trackid.'@'.$host.">\r\n";
@@ -1335,28 +1344,36 @@ class SMTPs
 		} else {
 			$_header .= 'Message-ID: <'.time().'.SMTPs@'.$host.">\r\n";
 		}
-		if (!empty($_SERVER['REMOTE_ADDR'])) $_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
-		if ($this->getMoreInHeader())
+		if (!empty($_SERVER['REMOTE_ADDR'])) {
+			$_header .= "X-RemoteAddr: ".$_SERVER['REMOTE_ADDR']."\r\n";
+		}
+		if ($this->getMoreInHeader()) {
 			$_header .= $this->getMoreInHeader(); // Value must include the "\r\n";
+		}
 
 		//$_header .=
 		//                 'Read-Receipt-To: '   . $this->getFrom( 'org' ) . "\r\n"
 		//                 'Return-Receipt-To: ' . $this->getFrom( 'org' ) . "\r\n";
 
-		if ($this->getSensitivity())
-		$_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";
+		if ($this->getSensitivity()) {
+			$_header .= 'Sensitivity: '.$this->getSensitivity()."\r\n";
+		}
 
-		if ($this->_msgPriority != 3)
-		$_header .= $this->getPriority();
+		if ($this->_msgPriority != 3) {
+			$_header .= $this->getPriority();
+		}
 
 
 		// @CHANGE LDR
-		if ($this->getDeliveryReceipt())
+		if ($this->getDeliveryReceipt()) {
 			$_header .= 'Disposition-Notification-To: '.$this->getFrom('addr')."\r\n";
-		if ($this->getErrorsTo())
+		}
+		if ($this->getErrorsTo()) {
 			$_header .= 'Errors-To: '.$this->getErrorsTo('addr')."\r\n";
-		if ($this->getReplyTo())
+		}
+		if ($this->getReplyTo()) {
 			$_header .= "Reply-To: ".$this->getReplyTo('addr')."\r\n";
+		}
 
 		$_header .= 'X-Mailer: Dolibarr version '.DOL_VERSION.' (using SMTPs Mailer)'."\r\n";
 		$_header .= 'X-Dolibarr-Option: '.($conf->global->MAIN_MAIL_USE_MULTI_PART ? 'MAIN_MAIL_USE_MULTI_PART' : 'No MAIN_MAIL_USE_MULTI_PART')."\r\n";
@@ -1377,16 +1394,17 @@ class SMTPs
 	{
 		//if ( $strContent )
 		//{
-		if ($strType == 'html')
-		$strMimeType = 'text/html';
-		else $strMimeType = 'text/plain';
+		if ($strType == 'html') {
+			$strMimeType = 'text/html';
+		} else {
+			$strMimeType = 'text/plain';
+		}
 
 		// Make RFC821 Compliant, replace bare linefeeds
 		$strContent = preg_replace("/(?<!\r)\n/si", "\r\n", $strContent);
 
 		$strContentAltText = '';
-		if ($strType == 'html')
-		{
+		if ($strType == 'html') {
 			// Similar code to forge a text from html is also in CMailFile.class.php
 			$strContentAltText = preg_replace('/<head><title>.*<\/style><\/head>/', '', $strContent);
 			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContentAltText);
@@ -1404,8 +1422,9 @@ class SMTPs
 		$this->_msgContent[$strType]['data']     = $strContent;
 		$this->_msgContent[$strType]['dataText'] = $strContentAltText;
 
-		if ($this->getMD5flag())
-		$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		if ($this->getMD5flag()) {
+			$this->_msgContent[$strType]['md5']      = dol_hash($strContent, 3);
+		}
 		//}
 	}
 
@@ -1428,12 +1447,12 @@ class SMTPs
 		$keyCount = count($_types);
 
 		// If we have ZERO, we have a problem
-		if ($keyCount === 0)
-		die("Sorry, no content");
+		if ($keyCount === 0) {
+			die("Sorry, no content");
+		}
 
 		// If we have ONE, we can use the simple format
-		elseif ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
-		{
+		elseif ($keyCount === 1 && empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
 			$_msgData = $this->_msgContent;
 			$_msgData = $_msgData[$_types[0]];
 
@@ -1442,16 +1461,16 @@ class SMTPs
 			. 'Content-Disposition: inline'."\r\n"
 			. 'Content-Description: Message'."\r\n";
 
-			if ($this->getMD5flag())
-			$content .= 'Content-MD5: '.$_msgData['md5']."\r\n";
+			if ($this->getMD5flag()) {
+				$content .= 'Content-MD5: '.$_msgData['md5']."\r\n";
+			}
 
 			$content .= "\r\n"
 			.  $_msgData['data']."\r\n";
 		}
 
 		// If we have more than ONE, we use the multi-part format
-		elseif ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))
-		{
+		elseif ($keyCount >= 1 || !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {
 			// Since this is an actual multi-part message
 			// We need to define a content message Boundary
 			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
@@ -1466,8 +1485,7 @@ class SMTPs
 
 			$content .= "--".$this->_getBoundary('mixed')."\r\n";
 
-			if (key_exists('image', $this->_msgContent))     // If inline image found
-			{
+			if (key_exists('image', $this->_msgContent)) {     // If inline image found
 				$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
 				$content .= "\r\n";
 				$content .= "--".$this->_getBoundary('alternative')."\r\n";
@@ -1478,31 +1496,27 @@ class SMTPs
 
 
 			// Loop through message content array
-			foreach ($this->_msgContent as $type => $_content)
-			{
-				if ($type == 'attachment')
-				{
+			foreach ($this->_msgContent as $type => $_content) {
+				if ($type == 'attachment') {
 					// loop through all attachments
-					foreach ($_content as $_file => $_data)
-					{
+					foreach ($_content as $_file => $_data) {
 						$content .= "--".$this->_getBoundary('mixed')."\r\n"
 						.  'Content-Disposition: attachment; filename="'.$_data['fileName'].'"'."\r\n"
 						.  'Content-Type: '.$_data['mimeType'].'; name="'.$_data['fileName'].'"'."\r\n"
 						.  'Content-Transfer-Encoding: base64'."\r\n"
 						.  'Content-Description: '.$_data['fileName']."\r\n";
 
-						if ($this->getMD5flag())
-						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
+						if ($this->getMD5flag()) {
+							$content .= 'Content-MD5: '.$_data['md5']."\r\n";
+						}
 
 						$content .= "\r\n".$_data['data']."\r\n\r\n";
 					}
 				}
 				// @CHANGE LDR
-				elseif ($type == 'image')
-				{
+				elseif ($type == 'image') {
 					// loop through all images
-					foreach ($_content as $_image => $_data)
-					{
+					foreach ($_content as $_image => $_data) {
 						$content .= "--".$this->_getBoundary('related')."\r\n"; // always related for an inline image
 
 						$content .= 'Content-Type: '.$_data['mimeType'].'; name="'.$_data['imageName'].'"'."\r\n"
@@ -1510,8 +1524,9 @@ class SMTPs
 						.  'Content-Disposition: inline; filename="'.$_data['imageName'].'"'."\r\n"
 						.  'Content-ID: <'.$_data['cid'].'> '."\r\n";
 
-						if ($this->getMD5flag())
-						$content .= 'Content-MD5: '.$_data['md5']."\r\n";
+						if ($this->getMD5flag()) {
+							$content .= 'Content-MD5: '.$_data['md5']."\r\n";
+						}
 
 						$content .= "\r\n"
 						. $_data['data']."\r\n";
@@ -1522,8 +1537,7 @@ class SMTPs
 					$content .= "\r\n--".$this->_getBoundary('alternative')."--\r\n";
 					$content .= "\r\n";
 				} else {
-					if (key_exists('image', $this->_msgContent))
-					{
+					if (key_exists('image', $this->_msgContent)) {
 						$content .= "Content-Type: text/plain; charset=".$this->getCharSet()."\r\n";
 						$content .= "\r\n".($_content['dataText'] ? $_content['dataText'] : strip_tags($_content['data']))."\r\n"; // Add plain text message
 						$content .= "--".$this->_getBoundary('alternative')."\r\n";
@@ -1532,8 +1546,7 @@ class SMTPs
 						$content .= "--".$this->_getBoundary('related')."\r\n";
 					}
 
-					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part before html part
-					{
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {  // Add plain text message part before html part
 						$content .= 'Content-Type: multipart/alternative; boundary="'.$this->_getBoundary('alternative').'"'."\r\n";
 						$content .= "\r\n";
 						   $content .= "--".$this->_getBoundary('alternative')."\r\n";
@@ -1553,8 +1566,7 @@ class SMTPs
 
 					$content .= "\r\n".$_content['data']."\r\n";
 
-					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART))  // Add plain text message part after html part
-					{
+					if (!key_exists('image', $this->_msgContent) && $_content['dataText'] && !empty($conf->global->MAIN_MAIL_USE_MULTI_PART)) {  // Add plain text message part after html part
 						$content .= "--".$this->_getBoundary('alternative')."--\r\n";
 					}
 
@@ -1579,16 +1591,16 @@ class SMTPs
 	 */
 	public function setAttachment($strContent, $strFileName = 'unknown', $strMimeType = 'unknown')
 	{
-		if ($strContent)
-		{
+		if ($strContent) {
 			$strContent = rtrim(chunk_split(base64_encode($strContent), 76, "\r\n")); // 76 max is defined into http://tools.ietf.org/html/rfc2047
 
 			$this->_msgContent['attachment'][$strFileName]['mimeType'] = $strMimeType;
 			$this->_msgContent['attachment'][$strFileName]['fileName'] = $strFileName;
 			$this->_msgContent['attachment'][$strFileName]['data']     = $strContent;
 
-			if ($this->getMD5flag())
-			$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+			if ($this->getMD5flag()) {
+				$this->_msgContent['attachment'][$strFileName]['md5']      = dol_hash($strContent, 3);
+			}
 		}
 	}
 
@@ -1607,15 +1619,15 @@ class SMTPs
 	 */
 	public function setImageInline($strContent, $strImageName = 'unknown', $strMimeType = 'unknown', $strImageCid = 'unknown')
 	{
-		if ($strContent)
-		{
+		if ($strContent) {
 			$this->_msgContent['image'][$strImageName]['mimeType'] = $strMimeType;
 			$this->_msgContent['image'][$strImageName]['imageName'] = $strImageName;
 			$this->_msgContent['image'][$strImageName]['cid']      = $strImageCid;
 			$this->_msgContent['image'][$strImageName]['data']     = $strContent;
 
-			if ($this->getMD5flag())
-			$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+			if ($this->getMD5flag()) {
+				$this->_msgContent['image'][$strImageName]['md5']      = dol_hash($strContent, 3);
+			}
 		}
 	}
 	// END @CHANGE LDR
@@ -1635,8 +1647,9 @@ class SMTPs
 	public function setSensitivity($_value = 0)
 	{
 		if ((is_numeric($_value)) &&
-		(($_value >= 0) && ($_value <= 3)))
-		$this->_msgSensitivity = $_value;
+		(($_value >= 0) && ($_value <= 3))) {
+			$this->_msgSensitivity = $_value;
+		}
 	}
 
 	/**
@@ -1670,8 +1683,9 @@ class SMTPs
 	public function setPriority($_value = 3)
 	{
 		if ((is_numeric($_value)) &&
-		(($_value >= 0) && ($_value <= 5)))
-		$this->_msgPriority = $_value;
+		(($_value >= 0) && ($_value <= 5))) {
+			$this->_msgPriority = $_value;
+		}
 	}
 
 	/**
@@ -1724,8 +1738,9 @@ class SMTPs
 	 */
 	public function setXheader($strXdata)
 	{
-		if ($strXdata)
-		$this->_msgXheader[] = $strXdata;
+		if ($strXdata) {
+			$this->_msgXheader[] = $strXdata;
+		}
 	}
 
 	/**
@@ -1758,9 +1773,13 @@ class SMTPs
 	 */
 	private function _getBoundary($type = 'mixed')
 	{
-		if ($type == 'mixed') return $this->_smtpsBoundary;
-		elseif ($type == 'related') return $this->_smtpsRelatedBoundary;
-		elseif ($type == 'alternative') return $this->_smtpsAlternativeBoundary;
+		if ($type == 'mixed') {
+			return $this->_smtpsBoundary;
+		} elseif ($type == 'related') {
+			return $this->_smtpsRelatedBoundary;
+		} elseif ($type == 'alternative') {
+			return $this->_smtpsAlternativeBoundary;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1786,10 +1805,8 @@ class SMTPs
 		// avoid infinite loop
 		$limit = 0;
 
-		while (substr($server_response, 3, 1) != ' ' && $limit < 100)
-		{
-			if (!($server_response = fgets($socket, 256)))
-			{
+		while (substr($server_response, 3, 1) != ' ' && $limit < 100) {
+			if (!($server_response = fgets($socket, 256))) {
 				$this->_setErr(121, "Couldn't get mail server response codes");
 				$_retVal = false;
 				break;
@@ -1798,8 +1815,7 @@ class SMTPs
 			$limit++;
 		}
 
-		if (!(substr($server_response, 0, 3) == $response))
-		{
+		if (!(substr($server_response, 0, 3) == $response)) {
 			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
 			$_retVal = false;
 		}
@@ -1819,12 +1835,17 @@ class SMTPs
 	public function socket_send_str($_strSend, $_returnCode = null, $CRLF = "\r\n")
 	{
 		// phpcs:enable
-		if ($this->_debug) $this->log .= $_strSend; // @CHANGE LDR for log
+		if ($this->_debug) {
+			$this->log .= $_strSend; // @CHANGE LDR for log
+		}
 		fputs($this->socket, $_strSend.$CRLF);
-		if ($this->_debug) $this->log .= ' ('.$_returnCode.')'.$CRLF;
+		if ($this->_debug) {
+			$this->log .= ' ('.$_returnCode.')'.$CRLF;
+		}
 
-		if ($_returnCode)
-		return $this->server_parse($this->socket, $_returnCode);
+		if ($_returnCode) {
+			return $this->server_parse($this->socket, $_returnCode);
+		}
 	}
 
 	// =============================================================
@@ -1854,10 +1875,8 @@ class SMTPs
 	{
 		$_errMsg = array();
 
-		if (is_array($this->_smtpsErrors))
-		{
-			foreach ($this->_smtpsErrors as $_err => $_info)
-			{
+		if (is_array($this->_smtpsErrors)) {
+			foreach ($this->_smtpsErrors as $_err => $_info) {
 				$_errMsg[] = 'Error ['.$_info['num'].']: '.$_info['msg'];
 			}
 		}
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index b1d569eae45..b2c9b069095 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -47,13 +47,14 @@ abstract class Stats
 	{
 		global $conf, $user, $langs;
 
-		if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) {
+			return -1;
+		}
 
 		$datay = array();
 
 		// Search into cache
-		if (!empty($cachedelay))
-		{
+		if (!empty($cachedelay)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 		}
@@ -64,11 +65,9 @@ abstract class Stats
 		$nowgmt = dol_now();
 
 		$foundintocache = 0;
-		if ($cachedelay > 0)
-		{
+		if ($cachedelay > 0) {
 			$filedate = dol_filemtime($newpathofdestfile);
-			if ($filedate >= ($nowgmt - $cachedelay))
-			{
+			if ($filedate >= ($nowgmt - $cachedelay)) {
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
@@ -77,28 +76,26 @@ abstract class Stats
 			}
 		}
 		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
-		{
+		if ($foundintocache) {    // Cache file found and is not too old
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		} else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
-			if ($sm != 0) $year = $year - 1;
-			while ($year <= $endyear)
-			{
+			if ($sm != 0) {
+				$year = $year - 1;
+			}
+			while ($year <= $endyear) {
 				$datay[$year] = $this->getNbByMonth($year, $format);
 				$year++;
 			}
 
 			$data = array();
 
-			for ($i = 0; $i < 12; $i++)
-			{
+			for ($i = 0; $i < 12; $i++) {
 				$data[$i][] = $datay[$endyear][($i + $sm) % 12][0];
 				$year = $startyear;
-				while ($year <= $endyear)
-				{
+				while ($year <= $endyear) {
 					$data[$i][] = $datay[$year - (1 - ((int) ($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1];
 					$year++;
 				}
@@ -106,14 +103,17 @@ abstract class Stats
 		}
 
 		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
-		{
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1)) {
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) {
+				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
 			fwrite($fp, json_encode($data));
 			fclose($fp);
-			if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+			if (!empty($conf->global->MAIN_UMASK)) {
+				$newmask = $conf->global->MAIN_UMASK;
+			}
 			@chmod($newpathofdestfile, octdec($newmask));
 
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
@@ -140,13 +140,14 @@ abstract class Stats
 	{
 		global $conf, $user, $langs;
 
-		if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) {
+			return -1;
+		}
 
 		$datay = array();
 
 		// Search into cache
-		if (!empty($cachedelay))
-		{
+		if (!empty($cachedelay)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 		}
@@ -157,11 +158,9 @@ abstract class Stats
 		$nowgmt = dol_now();
 
 		$foundintocache = 0;
-		if ($cachedelay > 0)
-		{
+		if ($cachedelay > 0) {
 			$filedate = dol_filemtime($newpathofdestfile);
-			if ($filedate >= ($nowgmt - $cachedelay))
-			{
+			if ($filedate >= ($nowgmt - $cachedelay)) {
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
@@ -171,28 +170,26 @@ abstract class Stats
 		}
 
 		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
-		{
+		if ($foundintocache) {    // Cache file found and is not too old
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		} else {
 			$year = $startyear;
 			$sm = $startmonth - 1;
-			if ($sm != 0) $year = $year - 1;
-			while ($year <= $endyear)
-			{
+			if ($sm != 0) {
+				$year = $year - 1;
+			}
+			while ($year <= $endyear) {
 				$datay[$year] = $this->getAmountByMonth($year, $format);
 				$year++;
 			}
 
 			$data = array();
 			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
-			for ($i = 0; $i < 12; $i++)
-			{
+			for ($i = 0; $i < 12; $i++) {
 				$data[$i][] = isset($datay[$endyear][($i + $sm) % 12]['label']) ? $datay[$endyear][($i + $sm) % 12]['label'] : $datay[$endyear][($i + $sm) % 12][0]; // set label
 				$year = $startyear;
-				while ($year <= $endyear)
-				{
+				while ($year <= $endyear) {
 					$data[$i][] = $datay[$year - (1 - ((int) ($i + $sm) / 12)) + ($sm == 0 ? 1 : 0)][($i + $sm) % 12][1]; // set yval for x=i
 					$year++;
 				}
@@ -200,18 +197,22 @@ abstract class Stats
 		}
 
 		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
-		{
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1)) {
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) {
+				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
-			if ($fp)
-			{
+			if ($fp) {
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) {
+					$newmask = $conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
-			} else dol_syslog("Failed to write cache file", LOG_ERR);
+			} else {
+				dol_syslog("Failed to write cache file", LOG_ERR);
+			}
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
 		}
 
@@ -227,25 +228,24 @@ abstract class Stats
 	 */
 	public function getAverageByMonthWithPrevYear($endyear, $startyear)
 	{
-		if ($startyear > $endyear) return -1;
+		if ($startyear > $endyear) {
+			return -1;
+		}
 
 		$datay = array();
 
 		$year = $startyear;
-		while ($year <= $endyear)
-		{
+		while ($year <= $endyear) {
 			$datay[$year] = $this->getAverageByMonth($year);
 			$year++;
 		}
 
 		$data = array();
 
-		for ($i = 0; $i < 12; $i++)
-		{
+		for ($i = 0; $i < 12; $i++) {
 			$data[$i][] = $datay[$endyear][$i][0];
 			$year = $startyear;
-			while ($year <= $endyear)
-			{
+			while ($year <= $endyear) {
 				$data[$i][] = $datay[$year][$i][1];
 				$year++;
 			}
@@ -269,8 +269,7 @@ abstract class Stats
 		$data = array();
 
 		// Search into cache
-		if (!empty($cachedelay))
-		{
+		if (!empty($cachedelay)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 		}
@@ -281,11 +280,9 @@ abstract class Stats
 		$nowgmt = dol_now();
 
 		$foundintocache = 0;
-		if ($cachedelay > 0)
-		{
+		if ($cachedelay > 0) {
 			$filedate = dol_filemtime($newpathofdestfile);
-			if ($filedate >= ($nowgmt - $cachedelay))
-			{
+			if ($filedate >= ($nowgmt - $cachedelay)) {
 				$foundintocache = 1;
 
 				$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $filedate;
@@ -295,8 +292,7 @@ abstract class Stats
 		}
 
 		// Load file into $data
-		if ($foundintocache)    // Cache file found and is not too old
-		{
+		if ($foundintocache) {    // Cache file found and is not too old
 			dol_syslog(get_class($this).'::'.__FUNCTION__." read data from cache file ".$newpathofdestfile." ".$filedate.".");
 			$data = json_decode(file_get_contents($newpathofdestfile), true);
 		} else {
@@ -305,16 +301,18 @@ abstract class Stats
 		}
 
 		// Save cache file
-		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1))
-		{
+		if (empty($foundintocache) && ($cachedelay > 0 || $cachedelay == -1)) {
 			dol_syslog(get_class($this).'::'.__FUNCTION__." save cache file ".$newpathofdestfile." onto disk.");
-			if (!dol_is_dir($conf->user->dir_temp)) dol_mkdir($conf->user->dir_temp);
+			if (!dol_is_dir($conf->user->dir_temp)) {
+				dol_mkdir($conf->user->dir_temp);
+			}
 			$fp = fopen($newpathofdestfile, 'w');
-			if ($fp)
-			{
+			if ($fp) {
 				fwrite($fp, json_encode($data));
 				fclose($fp);
-				if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+				if (!empty($conf->global->MAIN_UMASK)) {
+					$newmask = $conf->global->MAIN_UMASK;
+				}
 				@chmod($newpathofdestfile, octdec($newmask));
 			}
 			$this->lastfetchdate[get_class($this).'_'.__FUNCTION__] = $nowgmt;
@@ -341,12 +339,10 @@ abstract class Stats
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
 				$result[$i] = $row;
 				$i++;
@@ -372,25 +368,30 @@ abstract class Stats
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $this->db->fetch_object($resql);
 				$result[$i]['year'] = $row->year;
 				$result[$i]['nb'] = $row->nb;
-				if ($i > 0 && $row->nb > 0) $result[$i - 1]['nb_diff'] = ($result[$i - 1]['nb'] - $row->nb) / $row->nb * 100;
+				if ($i > 0 && $row->nb > 0) {
+					$result[$i - 1]['nb_diff'] = ($result[$i - 1]['nb'] - $row->nb) / $row->nb * 100;
+				}
 				$result[$i]['total'] = $row->total;
-				if ($i > 0 && $row->total > 0) $result[$i - 1]['total_diff'] = ($result[$i - 1]['total'] - $row->total) / $row->total * 100;
+				if ($i > 0 && $row->total > 0) {
+					$result[$i - 1]['total_diff'] = ($result[$i - 1]['total'] - $row->total) / $row->total * 100;
+				}
 				$result[$i]['avg'] = $row->avg;
-				if ($i > 0 && $row->avg > 0) $result[$i - 1]['avg_diff'] = ($result[$i - 1]['avg'] - $row->avg) / $row->avg * 100;
+				if ($i > 0 && $row->avg > 0) {
+					$result[$i - 1]['avg_diff'] = ($result[$i - 1]['avg'] - $row->avg) / $row->avg * 100;
+				}
 				// For some $sql only
-				if (isset($row->weighted))
-				{
+				if (isset($row->weighted)) {
 					$result[$i]['weighted'] = $row->weighted;
-					if ($i > 0 && $row->weighted > 0) $result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
+					if ($i > 0 && $row->weighted > 0) {
+						$result[$i - 1]['avg_weighted'] = ($result[$i - 1]['weighted'] - $row->weighted) / $row->weighted * 100;
+					}
 				}
 				$i++;
 			}
@@ -421,12 +422,10 @@ abstract class Stats
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0; $j = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
 				$j = $row[0] * 1;
 				$result[$j] = $row[1];
@@ -437,19 +436,21 @@ abstract class Stats
 			dol_print_error($this->db);
 		}
 
-		for ($i = 1; $i < 13; $i++)
-		{
+		for ($i = 1; $i < 13; $i++) {
 			$res[$i] = (isset($result[$i]) ? $result[$i] : 0);
 		}
 
 		$data = array();
 
-		for ($i = 1; $i < 13; $i++)
-		{
+		for ($i = 1; $i < 13; $i++) {
 			$month = 'unknown';
-			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month = $i;
-			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			if ($format == 0) {
+				$month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			} elseif ($format == 1) {
+				$month = $i;
+			} elseif ($format == 2) {
+				$month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			}
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
 			$data[$i - 1] = array($month, $res[$i]);
@@ -479,33 +480,35 @@ abstract class Stats
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-		  	{
-		  		$row = $this->db->fetch_row($resql);
-		  		$j = $row[0] * 1;
-		  		$result[$j] = $row[1];
-		  		$i++;
-		  	}
-		  	$this->db->free($resql);
-		} else dol_print_error($this->db);
+			while ($i < $num) {
+				$row = $this->db->fetch_row($resql);
+				$j = $row[0] * 1;
+				$result[$j] = $row[1];
+				$i++;
+			}
+			$this->db->free($resql);
+		} else {
+			dol_print_error($this->db);
+		}
 
-		for ($i = 1; $i < 13; $i++)
-		{
+		for ($i = 1; $i < 13; $i++) {
 			$res[$i] = (int) round((isset($result[$i]) ? $result[$i] : 0));
 		}
 
 		$data = array();
 
-		for ($i = 1; $i < 13; $i++)
-		{
+		for ($i = 1; $i < 13; $i++) {
 			$month = 'unknown';
-			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month = $i;
-			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			if ($format == 0) {
+				$month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			} elseif ($format == 1) {
+				$month = $i;
+			} elseif ($format == 2) {
+				$month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			}
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
 			$data[$i - 1] = array($month, $res[$i]);
@@ -534,33 +537,35 @@ abstract class Stats
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0; $j = 0;
-			while ($i < $num)
-			{
-		  		$row = $this->db->fetch_row($resql);
-		  		$j = $row[0] * 1;
-		  		$result[$j] = $row[1];
-		  		$i++;
-		  	}
-		  	$this->db->free($resql);
-		} else dol_print_error($this->db);
+			while ($i < $num) {
+				$row = $this->db->fetch_row($resql);
+				$j = $row[0] * 1;
+				$result[$j] = $row[1];
+				$i++;
+			}
+			$this->db->free($resql);
+		} else {
+			dol_print_error($this->db);
+		}
 
-		for ($i = 1; $i < 13; $i++)
-		{
+		for ($i = 1; $i < 13; $i++) {
 			$res[$i] = (isset($result[$i]) ? $result[$i] : 0);
 		}
 
 		$data = array();
 
-		for ($i = 1; $i < 13; $i++)
-		{
+		for ($i = 1; $i < 13; $i++) {
 			$month = 'unknown';
-			if ($format == 0) $month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
-			elseif ($format == 1) $month = $i;
-			elseif ($format == 2) $month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			if ($format == 0) {
+				$month = $langs->transnoentitiesnoconv('MonthShort'.sprintf("%02d", $i));
+			} elseif ($format == 1) {
+				$month = $i;
+			} elseif ($format == 2) {
+				$month = $langs->transnoentitiesnoconv('MonthVeryShort'.sprintf("%02d", $i));
+			}
 			//$month=dol_print_date(dol_mktime(12,0,0,$i,1,$year),($format?"%m":"%b"));
 			//$month=dol_substr($month,0,3);
 			$data[$i - 1] = array($month, $res[$i]);
@@ -587,20 +592,25 @@ abstract class Stats
 
 		dol_syslog(get_class($this).'::'.__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0; $other = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
-		  		if ($i < $limit || $num == $limit) $result[$i] = array($row[0], $row[1]); // Ref of product, nb
-		  		else $other += $row[1];
-		  		$i++;
+				if ($i < $limit || $num == $limit) {
+					$result[$i] = array($row[0], $row[1]); // Ref of product, nb
+				} else {
+					$other += $row[1];
+				}
+				$i++;
 			}
-		  	if ($num > $limit) $result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
-		  	$this->db->free($resql);
-		} else dol_print_error($this->db);
+			if ($num > $limit) {
+				$result[$i] = array($langs->transnoentitiesnoconv("Other"), $other);
+			}
+			$this->db->free($resql);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return $result;
 	}
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index c2850990ff5..0aa00153f5b 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -51,9 +51,14 @@ class Translate
 	 */
 	public function __construct($dir, $conf)
 	{
-		if (!empty($conf->file->character_set_client)) $this->charset_output = $conf->file->character_set_client; // If charset output is forced
-		if ($dir) $this->dir = array($dir);
-		else $this->dir = $conf->file->dol_document_root;
+		if (!empty($conf->file->character_set_client)) {
+			$this->charset_output = $conf->file->character_set_client; // If charset output is forced
+		}
+		if ($dir) {
+			$this->dir = array($dir);
+		} else {
+			$this->dir = $conf->file->dol_document_root;
+		}
 	}
 
 
@@ -70,15 +75,12 @@ class Translate
 		//dol_syslog(get_class($this)."::setDefaultLang srclang=".$srclang,LOG_DEBUG);
 
 		// If a module ask to force a priority on langs directories (to use its own lang files)
-		if (!empty($conf->global->MAIN_FORCELANGDIR))
-		{
+		if (!empty($conf->global->MAIN_FORCELANGDIR)) {
 			$more = array();
 			$i = 0;
-			foreach ($conf->file->dol_document_root as $dir)
-			{
+			foreach ($conf->file->dol_document_root as $dir) {
 				$newdir = $dir.$conf->global->MAIN_FORCELANGDIR; // For example $conf->global->MAIN_FORCELANGDIR is '/mymodule' meaning we search files into '/mymodule/langs/xx_XX'
-				if (!in_array($newdir, $this->dir))
-				{
+				if (!in_array($newdir, $this->dir)) {
 					$more['module_'.$i] = $newdir; $i++; // We add the forced dir into the array $more. Just after, we add entries into $more to list of lang dir $this->dir.
 				}
 			}
@@ -87,30 +89,35 @@ class Translate
 
 		$this->origlang = $srclang;
 
-		if (empty($srclang) || $srclang == 'auto')
-		{
+		if (empty($srclang) || $srclang == 'auto') {
 			// $_SERVER['HTTP_ACCEPT_LANGUAGE'] can be 'fr-FR,fr;q=0.9,en-US;q=0.8,en;q=0.7,it;q=0.6' but can contains also malicious content
 			$langpref = empty($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? '' : $_SERVER['HTTP_ACCEPT_LANGUAGE'];
 			$langpref = preg_replace("/;([^,]*)/i", "", $langpref); // Remove the 'q=x.y,' part
 			$langpref = str_replace("-", "_", $langpref);
 			$langlist = preg_split("/[;,]/", $langpref);
 			$codetouse = preg_replace('/[^_a-zA-Z]/', '', $langlist[0]);
-		} else $codetouse = $srclang;
+		} else {
+			$codetouse = $srclang;
+		}
 
 		// We redefine $srclang
 		$langpart = explode("_", $codetouse);
 		//print "Short code before _ : ".$langpart[0].' / Short code after _ : '.$langpart[1].'<br>';
-		if (!empty($langpart[1]))	// If it's for a codetouse that is a long code xx_YY
-		{
+		if (!empty($langpart[1])) {	// If it's for a codetouse that is a long code xx_YY
 			// Array force long code from first part, even if long code is defined
 			$longforshort = array('ar'=>'ar_SA');
 			$longforshortexcep = array('ar_EG');
-			if (isset($longforshort[strtolower($langpart[0])]) && !in_array($codetouse, $longforshortexcep)) $srclang = $longforshort[strtolower($langpart[0])];
-			elseif (!is_numeric($langpart[1])) {		// Second part YY may be a numeric with some Chrome browser
+			if (isset($longforshort[strtolower($langpart[0])]) && !in_array($codetouse, $longforshortexcep)) {
+				$srclang = $longforshort[strtolower($langpart[0])];
+			} elseif (!is_numeric($langpart[1])) {		// Second part YY may be a numeric with some Chrome browser
 				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[1]);
 				$longforlong = array('no_nb'=>'nb_NO');
-				if (isset($longforlong[strtolower($srclang)])) $srclang = $longforlong[strtolower($srclang)];
-			} else $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
+				if (isset($longforlong[strtolower($srclang)])) {
+					$srclang = $longforlong[strtolower($srclang)];
+				}
+			} else {
+				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
+			}
 		} else {						// If it's for a codetouse that is a short code xx
 			// Array to convert short lang code into long code.
 			$longforshort = array(
@@ -119,9 +126,13 @@ class Translate
 				'ka'=>'ka_GE', 'km'=>'km_KH', 'kn'=>'kn_IN', 'ko'=>'ko_KR', 'lo'=>'lo_LA', 'nb'=>'nb_NO', 'no'=>'nb_NO', 'ne'=>'ne_NP',
 				'sl'=>'sl_SI', 'sq'=>'sq_AL', 'sr'=>'sr_RS', 'sv'=>'sv_SE', 'uk'=>'uk_UA', 'vi'=>'vi_VN', 'zh'=>'zh_CN'
 			);
-			if (isset($longforshort[strtolower($langpart[0])])) $srclang = $longforshort[strtolower($langpart[0])];
-			elseif (!empty($langpart[0])) $srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
-			else $srclang = 'en_US';
+			if (isset($longforshort[strtolower($langpart[0])])) {
+				$srclang = $longforshort[strtolower($langpart[0])];
+			} elseif (!empty($langpart[0])) {
+				$srclang = strtolower($langpart[0])."_".strtoupper($langpart[0]);
+			} else {
+				$srclang = 'en_US';
+			}
 		}
 
 		$this->defaultlang = $srclang;
@@ -139,8 +150,11 @@ class Translate
 	 */
 	public function getDefaultLang($mode = 0)
 	{
-		if (empty($mode)) return $this->defaultlang;
-		else return substr($this->defaultlang, 0, 2);
+		if (empty($mode)) {
+			return $this->defaultlang;
+		} else {
+			return substr($this->defaultlang, 0, 2);
+		}
 	}
 
 
@@ -152,8 +166,7 @@ class Translate
 	 */
 	public function loadLangs($domains)
 	{
-		foreach ($domains as $domain)
-		{
+		foreach ($domains as $domain) {
 			$this->load($domain);
 		}
 	}
@@ -186,16 +199,19 @@ class Translate
 		//dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
 
 		// Check parameters
-		if (empty($domain))
-		{
+		if (empty($domain)) {
 			dol_print_error('', get_class($this)."::Load ErrorWrongParameters");
 			return -1;
 		}
-		if ($this->defaultlang == 'none_NONE') return 0; // Special language code to not translate keys
+		if ($this->defaultlang == 'none_NONE') {
+			return 0; // Special language code to not translate keys
+		}
 
 
 		// Load $this->tab_translate[] from database
-		if (empty($loadfromfileonly) && count($this->tab_translate) == 0) $this->loadFromDatabase($db); // No translation was never loaded yet, so we load database.
+		if (empty($loadfromfileonly) && count($this->tab_translate) == 0) {
+			$this->loadFromDatabase($db); // No translation was never loaded yet, so we load database.
+		}
 
 
 		$newdomain = $domain;
@@ -203,16 +219,14 @@ class Translate
 
 		// Search if a module directory name is provided into lang file name
 		$regs = array();
-		if (preg_match('/^([^@]+)@([^@]+)$/i', $domain, $regs))
-		{
+		if (preg_match('/^([^@]+)@([^@]+)$/i', $domain, $regs)) {
 			$newdomain = $regs[1];
 			$modulename = $regs[2];
 		}
 
 		// Check cache
 		if (!empty($this->_tab_loaded[$newdomain])
-			&& ($this->_tab_loaded[$newdomain] != 2 || empty($forceloadifalreadynotfound))) // File already loaded and found and not forced for this domain
-		{
+			&& ($this->_tab_loaded[$newdomain] != 2 || empty($forceloadifalreadynotfound))) { // File already loaded and found and not forced for this domain
 			//dol_syslog("Translate::Load already loaded for newdomain=".$newdomain);
 			return 0;
 		}
@@ -222,17 +236,19 @@ class Translate
 
 		// Redefine alt
 		$langarray = explode('_', $langofdir);
-		if ($alt < 1 && isset($langarray[1]) && (strtolower($langarray[0]) == strtolower($langarray[1]) || in_array(strtolower($langofdir), array('el_gr')))) $alt = 1;
-		if ($alt < 2 && strtolower($langofdir) == 'en_us') $alt = 2;
+		if ($alt < 1 && isset($langarray[1]) && (strtolower($langarray[0]) == strtolower($langarray[1]) || in_array(strtolower($langofdir), array('el_gr')))) {
+			$alt = 1;
+		}
+		if ($alt < 2 && strtolower($langofdir) == 'en_us') {
+			$alt = 2;
+		}
 
-		if (empty($langofdir))	// This may occurs when load is called without setting the language and without providing a value for forcelangdir
-		{
+		if (empty($langofdir)) {	// This may occurs when load is called without setting the language and without providing a value for forcelangdir
 			dol_syslog("Error: ".get_class($this)."::load was called for domain=".$domain." but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
 			return -1;
 		}
 
-		foreach ($this->dir as $searchdir)
-		{
+		foreach ($this->dir as $searchdir) {
 			// Directory of translation files
 			$file_lang = $searchdir.($modulename ? '/'.$modulename : '')."/langs/".$langofdir."/".$newdomain.".lang";
 			$file_lang_osencoded = dol_osencode($file_lang);
@@ -242,61 +258,55 @@ class Translate
 			//dol_syslog(get_class($this).'::Load Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' file_lang='.$file_lang." => filelangexists=".$filelangexists);
 			//print 'Try to read for alt='.$alt.' langofdir='.$langofdir.' domain='.$domain.' newdomain='.$newdomain.' modulename='.$modulename.' this->_tab_loaded[newdomain]='.$this->_tab_loaded[$newdomain].' file_lang='.$file_lang." => filelangexists=".$filelangexists."\n";
 
-			if ($filelangexists)
-			{
+			if ($filelangexists) {
 				// TODO Move cache read out of loop on dirs or at least filelangexists
 				$found = false;
 
 				// Enable caching of lang file in memory (not by default)
 				$usecachekey = '';
 				// Using a memcached server
-				if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER))
-				{
+				if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER)) {
 					$usecachekey = $newdomain.'_'.$langofdir.'_'.md5($file_lang); // Should not contains special chars
 				}
 				// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)
-				elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
-				{
+				elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
 					$usecachekey = $newdomain;
 				}
 
-				if ($usecachekey)
-				{
+				if ($usecachekey) {
 					//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
 					//global $aaa; $aaa+=1;
 					//print $aaa." ".$usecachekey."\n";
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 					$tmparray = dol_getcache($usecachekey);
-					if (is_array($tmparray) && count($tmparray))
-					{
+					if (is_array($tmparray) && count($tmparray)) {
 						$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
 						//print $newdomain."\n";
 						//var_dump($this->tab_translate);
-						if ($alt == 2) $fileread = 1;
+						if ($alt == 2) {
+							$fileread = 1;
+						}
 						$found = true; // Found in dolibarr PHP cache
 					}
 				}
 
-				if (!$found)
-				{
-					if ($fp = @fopen($file_lang, "rt"))
-					{
-						if ($usecachekey) $tabtranslatedomain = array(); // To save lang content in cache
+				if (!$found) {
+					if ($fp = @fopen($file_lang, "rt")) {
+						if ($usecachekey) {
+							$tabtranslatedomain = array(); // To save lang content in cache
+						}
 
 						/**
 						 * Read each lines until a '=' (with any combination of spaces around it)
 						 * and split the rest until a line feed.
 						 * This is more efficient than fgets + explode + trim by a factor of ~2.
 						 */
-						while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n\r]"))
-						{
-							if (isset($line[1]))
-							{
+						while ($line = fscanf($fp, "%[^= ]%*[ =]%[^\n\r]")) {
+							if (isset($line[1])) {
 								list($key, $value) = $line;
 								//if ($domain == 'orders') print "Domain=$domain, found a string for $tab[0] with value $tab[1]. Currently in cache ".$this->tab_translate[$key]."<br>";
 								//if ($key == 'Order') print "Domain=$domain, found a string for key=$key=$tab[0] with value $tab[1]. Currently in cache ".$this->tab_translate[$key]."<br>";
-								if (empty($this->tab_translate[$key]))
-								{ // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
+								if (empty($this->tab_translate[$key])) { // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
 									if ($key == 'DIRECTION') { // This is to declare direction of language
 										if ($alt < 2 || empty($this->tab_translate[$key])) { // We load direction only for primary files or if not yet loaded
 											$this->tab_translate[$key] = $value;
@@ -306,8 +316,7 @@ class Translate
 												$tabtranslatedomain[$key] = $value;
 											}
 										}
-									} elseif ($key[0] == '#')
-									{
+									} elseif ($key[0] == '#') {
 										continue;
 									} else {
 										// Convert some strings: Parse and render carriage returns. Also, change '\\s' into '\s' because transifex sync pull the string '\s' into string '\\s'
@@ -324,36 +333,38 @@ class Translate
 
 						// TODO Move cache write out of loop on dirs
 						// To save lang content for usecachekey into cache
-						if ($usecachekey && count($tabtranslatedomain))
-						{
+						if ($usecachekey && count($tabtranslatedomain)) {
 							$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
-							if ($ressetcache < 0)
-							{
+							if ($ressetcache < 0) {
 								$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
 								dol_syslog($error, LOG_ERR);
 							}
 						}
 
-						if (empty($conf->global->MAIN_FORCELANGDIR)) break; // Break loop on each root dir. If a module has forced dir, we do not stop loop.
+						if (empty($conf->global->MAIN_FORCELANGDIR)) {
+							break; // Break loop on each root dir. If a module has forced dir, we do not stop loop.
+						}
 					}
 				}
 			}
 		}
 
 		// Now we complete with next file (fr_CA->fr_FR, es_MX->ex_ES, ...)
-		if ($alt == 0)
-		{
+		if ($alt == 0) {
 			// This function MUST NOT contains call to syslog
 			//dol_syslog("Translate::Load loading alternate translation file (to complete ".$this->defaultlang."/".$newdomain.".lang file)", LOG_DEBUG);
 			$langofdir = strtolower($langarray[0]).'_'.strtoupper($langarray[0]);
-			if ($langofdir == 'el_EL') $langofdir = 'el_GR'; // main parent for el_CY is not 'el_EL' but 'el_GR'
-			if ($langofdir == 'ar_AR') $langofdir = 'ar_SA'; // main parent for ar_EG is not 'ar_AR' but 'ar_SA'
+			if ($langofdir == 'el_EL') {
+				$langofdir = 'el_GR'; // main parent for el_CY is not 'el_EL' but 'el_GR'
+			}
+			if ($langofdir == 'ar_AR') {
+				$langofdir = 'ar_SA'; // main parent for ar_EG is not 'ar_AR' but 'ar_SA'
+			}
 			$this->load($domain, $alt + 1, $stopafterdirection, $langofdir);
 		}
 
 		// Now we complete with reference file (en_US)
-		if ($alt == 1)
-		{
+		if ($alt == 1) {
 			// This function MUST NOT contains call to syslog
 			//dol_syslog("Translate::Load loading alternate translation file (to complete ".$this->defaultlang."/".$newdomain.".lang file)", LOG_DEBUG);
 			$langofdir = 'en_US';
@@ -361,33 +372,37 @@ class Translate
 		}
 
 		// We are in the pass of the reference file. No more files to scan to complete.
-		if ($alt == 2)
-		{
-			if ($fileread) $this->_tab_loaded[$newdomain] = 1; // Set domain file as found so loaded
+		if ($alt == 2) {
+			if ($fileread) {
+				$this->_tab_loaded[$newdomain] = 1; // Set domain file as found so loaded
+			}
 
-			if (empty($this->_tab_loaded[$newdomain])) $this->_tab_loaded[$newdomain] = 2; // Set this file as not found
+			if (empty($this->_tab_loaded[$newdomain])) {
+				$this->_tab_loaded[$newdomain] = 2; // Set this file as not found
+			}
 		}
 
 		// This part is deprecated and replaced with table llx_overwrite_trans
 		// Kept for backward compatibility.
-		if (empty($loadfromfileonly))
-		{
+		if (empty($loadfromfileonly)) {
 			$overwritekey = 'MAIN_OVERWRITE_TRANS_'.$this->defaultlang;
-			if (!empty($conf->global->$overwritekey))    // Overwrite translation with key1:newstring1,key2:newstring2
-			{
+			if (!empty($conf->global->$overwritekey)) {    // Overwrite translation with key1:newstring1,key2:newstring2
 				// Overwrite translation with param MAIN_OVERWRITE_TRANS_xx_XX
 				$tmparray = explode(',', $conf->global->$overwritekey);
-				foreach ($tmparray as $tmp)
-				{
+				foreach ($tmparray as $tmp) {
 					$tmparray2 = explode(':', $tmp);
-					if (!empty($tmparray2[1])) $this->tab_translate[$tmparray2[0]] = $tmparray2[1];
+					if (!empty($tmparray2[1])) {
+						$this->tab_translate[$tmparray2[0]] = $tmparray2[1];
+					}
 				}
 			}
 		}
 
 		// Check to be sure that SeparatorDecimal differs from SeparatorThousand
 		if (!empty($this->tab_translate["SeparatorDecimal"]) && !empty($this->tab_translate["SeparatorThousand"])
-		&& $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) $this->tab_translate["SeparatorThousand"] = '';
+		&& $this->tab_translate["SeparatorDecimal"] == $this->tab_translate["SeparatorThousand"]) {
+			$this->tab_translate["SeparatorThousand"] = '';
+		}
 
 		return 1;
 	}
@@ -411,15 +426,16 @@ class Translate
 		$domain = 'database';
 
 		// Check parameters
-		if (empty($db)) return 0; // Database handler can't be used
+		if (empty($db)) {
+			return 0; // Database handler can't be used
+		}
 
 		//dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
 
 		$newdomain = $domain;
 
 		// Check cache
-		if (!empty($this->_tab_loaded[$newdomain]))	// File already loaded for this domain 'database'
-		{
+		if (!empty($this->_tab_loaded[$newdomain])) {	// File already loaded for this domain 'database'
 			//dol_syslog("Translate::Load already loaded for newdomain=".$newdomain);
 			return 0;
 		}
@@ -429,8 +445,7 @@ class Translate
 		$fileread = 0;
 		$langofdir = $this->defaultlang;
 
-		if (empty($langofdir))	// This may occurs when load is called without setting the language and without providing a value for forcelangdir
-		{
+		if (empty($langofdir)) {	// This may occurs when load is called without setting the language and without providing a value for forcelangdir
 			dol_syslog("Error: ".get_class($this)."::loadFromDatabase was called but language was not set yet with langs->setDefaultLang(). Nothing will be loaded.", LOG_WARNING);
 			return -1;
 		}
@@ -441,25 +456,21 @@ class Translate
 		// Enable caching of lang file in memory (not by default)
 		$usecachekey = '';
 		// Using a memcached server
-		if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER))
-		{
+		if (!empty($conf->memcached->enabled) && !empty($conf->global->MEMCACHED_SERVER)) {
 			$usecachekey = $newdomain.'_'.$langofdir; // Should not contains special chars
 		}
 		// Using cache with shmop. Speed gain: 40ms - Memory overusage: 200ko (Size of session cache file)
-		elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02))
-		{
+		elseif (isset($conf->global->MAIN_OPTIMIZE_SPEED) && ($conf->global->MAIN_OPTIMIZE_SPEED & 0x02)) {
 			$usecachekey = $newdomain;
 		}
 
-		if ($usecachekey)
-		{
+		if ($usecachekey) {
 			//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
 			//global $aaa; $aaa+=1;
 			//print $aaa." ".$usecachekey."\n";
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
 			$tmparray = dol_getcache($usecachekey);
-			if (is_array($tmparray) && count($tmparray))
-			{
+			if (is_array($tmparray) && count($tmparray)) {
 				$this->tab_translate += $tmparray; // Faster than array_merge($tmparray,$this->tab_translate). Note: If a value already exists into tab_translate, value into tmparaay is not added.
 				//print $newdomain."\n";
 				//var_dump($this->tab_translate);
@@ -468,36 +479,35 @@ class Translate
 			}
 		}
 
-		if (!$found && !empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
-		{
+		if (!$found && !empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) {
 			// Overwrite translation with database read
 			$sql = "SELECT transkey, transvalue FROM ".MAIN_DB_PREFIX."overwrite_trans where lang='".$db->escape($this->defaultlang)."' OR lang IS NULL";
 			$sql .= " AND entity IN (0, ".getEntity('overwrite_trans').")";
 			$sql .= $db->order("lang", "DESC");
 			$resql = $db->query($sql);
 
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $db->num_rows($resql);
-				if ($num)
-				{
-					if ($usecachekey) $tabtranslatedomain = array(); // To save lang content in cache
+				if ($num) {
+					if ($usecachekey) {
+						$tabtranslatedomain = array(); // To save lang content in cache
+					}
 
 					$i = 0;
-					while ($i < $num)	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents
-					{
+					while ($i < $num) {	// Ex: Need 225ms for all fgets on all lang file for Third party page. Same speed than file_get_contents
 						$obj = $db->fetch_object($resql);
 
 						$key = $obj->transkey;
 						$value = $obj->transvalue;
 
 						//print "Domain=$domain, found a string for $tab[0] with value $tab[1]<br>";
-						if (empty($this->tab_translate[$key]))    // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
-						{
+						if (empty($this->tab_translate[$key])) {    // If translation was already found, we must not continue, even if MAIN_FORCELANGDIR is set (MAIN_FORCELANGDIR is to replace lang dir, not to overwrite entries)
 							// Convert some strings: Parse and render carriage returns. Also, change '\\s' int '\s' because transifex sync pull the string '\s' into string '\\s'
 							$this->tab_translate[$key] = str_replace(array('\\n', '\\\\s'), array("\n", '\s'), $value);
 
-							if ($usecachekey) $tabtranslatedomain[$key] = $value; // To save lang content in cache
+							if ($usecachekey) {
+								$tabtranslatedomain[$key] = $value; // To save lang content in cache
+							}
 						}
 
 						$i++;
@@ -507,11 +517,9 @@ class Translate
 
 					// TODO Move cache write out of loop on dirs
 					// To save lang content for usecachekey into cache
-					if ($usecachekey && count($tabtranslatedomain))
-					{
+					if ($usecachekey && count($tabtranslatedomain)) {
 						$ressetcache = dol_setcache($usecachekey, $tabtranslatedomain);
-						if ($ressetcache < 0)
-						{
+						if ($ressetcache < 0) {
 							$error = 'Failed to set cache for usecachekey='.$usecachekey.' result='.$ressetcache;
 							dol_syslog($error, LOG_ERR);
 						}
@@ -522,9 +530,13 @@ class Translate
 			}
 		}
 
-		if ($fileread) $this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded
+		if ($fileread) {
+			$this->_tab_loaded[$newdomain] = 1; // Set domain file as loaded
+		}
 
-		if (empty($this->_tab_loaded[$newdomain])) $this->_tab_loaded[$newdomain] = 2; // Mark this case as not found (no lines found for language)
+		if (empty($this->_tab_loaded[$newdomain])) {
+			$this->_tab_loaded[$newdomain] = 2; // Mark this case as not found (no lines found for language)
+		}
 
 		return 1;
 	}
@@ -561,32 +573,26 @@ class Translate
 		}
 
 		$newstr = $key;
-		if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg))
-		{
+		if (preg_match('/^Civility([0-9A-Z]+)$/i', $key, $reg)) {
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_civility', 'code', 'label');
-		} elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg))
-		{
+		} elseif (preg_match('/^Currency([A-Z][A-Z][A-Z])$/i', $key, $reg)) {
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_currencies', 'code_iso', 'label');
-		} elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg))
-		{
+		} elseif (preg_match('/^SendingMethod([0-9A-Z]+)$/i', $key, $reg)) {
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_shipment_mode', 'code', 'libelle');
-		} elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg))
-		{
+		} elseif (preg_match('/^PaymentTypeShort([0-9A-Z]+)$/i', $key, $reg)) {
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_paiement', 'code', 'libelle', '', 1);
-		} elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg))
-		{
+		} elseif (preg_match('/^OppStatus([0-9A-Z]+)$/i', $key, $reg)) {
 			$newstr = $this->getLabelFromKey($db, $reg[1], 'c_lead_status', 'code', 'label');
-		} elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg))
-		{
+		} elseif (preg_match('/^OrderSource([0-9A-Z]+)$/i', $key, $reg)) {
 			// TODO OrderSourceX must be replaced with content of table llx_c_input_reason or llx_c_input_method
 			//$newstr=$this->getLabelFromKey($db,$reg[1],'c_ordersource','code','label');
 		}
 
 		/* Disabled. There is too many cases where translation of $newstr is not defined is normal (like when output with setEventMessage an already translated string)
-        if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
-        {
-        	dol_syslog(__METHOD__." MAIN_FEATURES_LEVEL=DEVELOP: missing translation for key '".$newstr."' in ".$_SERVER["PHP_SELF"], LOG_DEBUG);
-        }*/
+		if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2)
+		{
+			dol_syslog(__METHOD__." MAIN_FEATURES_LEVEL=DEVELOP: missing translation for key '".$newstr."' in ".$_SERVER["PHP_SELF"], LOG_DEBUG);
+		}*/
 
 		return $newstr;
 	}
@@ -609,17 +615,14 @@ class Translate
 	{
 		global $conf;
 
-		if (!empty($this->tab_translate[$key]))	// Translation is available
-		{
+		if (!empty($this->tab_translate[$key])) {	// Translation is available
 			$str = $this->tab_translate[$key];
 
 			// Make some string replacement after translation
 			$replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
-			if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
-			{
+			if (!empty($conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2
 				$tmparray = explode(';', $conf->global->$replacekey);
-				foreach ($tmparray as $tmp)
-				{
+				foreach ($tmparray as $tmp) {
 					$tmparray2 = explode(':', $tmp);
 					$str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
 				}
@@ -633,8 +636,7 @@ class Translate
 				$str
 			);
 
-			if (strpos($key, 'Format') !== 0)
-			{
+			if (strpos($key, 'Format') !== 0) {
 				$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.
 			}
 
@@ -648,7 +650,9 @@ class Translate
 				$str
 			);
 
-			if ($maxsize) $str = dol_trunc($str, $maxsize);
+			if ($maxsize) {
+				$str = dol_trunc($str, $maxsize);
+			}
 
 			return $str;
 		} else { // Translation is not available
@@ -697,31 +701,29 @@ class Translate
 	{
 		global $conf;
 
-		if (!empty($this->tab_translate[$key]))	// Translation is available
-		{
+		if (!empty($this->tab_translate[$key])) {	// Translation is available
 			$str = $this->tab_translate[$key];
 
 			// Make some string replacement after translation
 			$replacekey = 'MAIN_REPLACE_TRANS_'.$this->defaultlang;
-			if (!empty($conf->global->$replacekey))    // Replacement translation variable with string1:newstring1;string2:newstring2
-			{
+			if (!empty($conf->global->$replacekey)) {    // Replacement translation variable with string1:newstring1;string2:newstring2
 				$tmparray = explode(';', $conf->global->$replacekey);
-				foreach ($tmparray as $tmp)
-				{
+				foreach ($tmparray as $tmp) {
 					$tmparray2 = explode(':', $tmp);
 					$str = preg_replace('/'.preg_quote($tmparray2[0]).'/', $tmparray2[1], $str);
 				}
 			}
 
-			if (!preg_match('/^Format/', $key))
-			{
+			if (!preg_match('/^Format/', $key)) {
 				//print $str;
-		   		$str = sprintf($str, $param1, $param2, $param3, $param4, $param5); // Replace %s and %d except for FormatXXX strings.
+				$str = sprintf($str, $param1, $param2, $param3, $param4, $param5); // Replace %s and %d except for FormatXXX strings.
 			}
 
 			return $str;
 		} else {
-			if ($key[0] == '$') { return dol_eval($key, 1); }
+			if ($key[0] == '$') {
+				return dol_eval($key, 1);
+			}
 			return $this->getTradFromKey($key);
 		}
 	}
@@ -736,8 +738,11 @@ class Translate
 	 */
 	public function transcountry($str, $countrycode)
 	{
-		if (!empty($this->tab_translate["$str$countrycode"])) return $this->trans("$str$countrycode");
-		else return $this->trans($str);
+		if (!empty($this->tab_translate["$str$countrycode"])) {
+			return $this->trans("$str$countrycode");
+		} else {
+			return $this->trans($str);
+		}
 	}
 
 
@@ -750,8 +755,11 @@ class Translate
 	 */
 	public function transcountrynoentities($str, $countrycode)
 	{
-		if (!empty($this->tab_translate["$str$countrycode"])) return $this->transnoentities("$str$countrycode");
-		else return $this->transnoentities($str);
+		if (!empty($this->tab_translate["$str$countrycode"])) {
+			return $this->transnoentities("$str$countrycode");
+		} else {
+			return $this->transnoentities($str);
+		}
 	}
 
 
@@ -764,8 +772,12 @@ class Translate
 	 */
 	public function convToOutputCharset($str, $pagecodefrom = 'UTF-8')
 	{
-		if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8')  $str = utf8_encode($str);
-		if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1')	$str = utf8_decode(str_replace('€', chr(128), $str));
+		if ($pagecodefrom == 'ISO-8859-1' && $this->charset_output == 'UTF-8') {
+			$str = utf8_encode($str);
+		}
+		if ($pagecodefrom == 'UTF-8' && $this->charset_output == 'ISO-8859-1') {
+			$str = utf8_decode(str_replace('€', chr(128), $str));
+		}
 		return $str;
 	}
 
@@ -790,11 +802,9 @@ class Translate
 		// We scan directory langs to detect available languages
 		$handle = opendir($langdir."/langs");
 		$langs_available = array();
-		while ($dir = trim(readdir($handle)))
-		{
+		while ($dir = trim(readdir($handle))) {
 			$regs = array();
-			if (preg_match('/^([a-z]+)_([A-Z]+)/i', $dir, $regs))
-			{
+			if (preg_match('/^([a-z]+)_([A-Z]+)/i', $dir, $regs)) {
 				// We must keep only main languages
 				if ($mainlangonly) {
 					$arrayofspecialmainlanguages = array(
@@ -827,18 +837,20 @@ class Translate
 						'vi'=>'vi_VN',
 						'zh'=>'zh_CN'
 					);
-					if (strtolower($regs[1]) != strtolower($regs[2]) && !in_array($dir, $arrayofspecialmainlanguages)) continue;
+					if (strtolower($regs[1]) != strtolower($regs[2]) && !in_array($dir, $arrayofspecialmainlanguages)) {
+						continue;
+					}
 				}
 				// We must keep only languages into MAIN_LANGUAGES_ALLOWED
-				if (!empty($conf->global->MAIN_LANGUAGES_ALLOWED) && !in_array($dir, explode(',', $conf->global->MAIN_LANGUAGES_ALLOWED))) continue;
+				if (!empty($conf->global->MAIN_LANGUAGES_ALLOWED) && !in_array($dir, explode(',', $conf->global->MAIN_LANGUAGES_ALLOWED))) {
+					continue;
+				}
 
-				if ($usecode == 2)
-				{
+				if ($usecode == 2) {
 					$langs_available[$dir] = $dir;
 				}
 
-				if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE))
-				{
+				if ($usecode == 1 || !empty($conf->global->MAIN_SHOW_LANGUAGE_CODE)) {
 					$langs_available[$dir] = $dir.': '.dol_trunc($this->trans('Language_'.$dir), $maxlength);
 				} else {
 					$langs_available[$dir] = $this->trans('Language_'.$dir);
@@ -864,16 +876,20 @@ class Translate
 	{
 		// phpcs:enable
 		// Test si fichier dans repertoire de la langue
-		foreach ($this->dir as $searchdir)
-		{
-			if (is_readable(dol_osencode($searchdir."/langs/".$this->defaultlang."/".$filename))) return true;
+		foreach ($this->dir as $searchdir) {
+			if (is_readable(dol_osencode($searchdir."/langs/".$this->defaultlang."/".$filename))) {
+				return true;
+			}
 
-			if ($searchalt)
-			{
+			if ($searchalt) {
 				// Test si fichier dans repertoire de la langue alternative
-				if ($this->defaultlang != "en_US") $filenamealt = $searchdir."/langs/en_US/".$filename;
+				if ($this->defaultlang != "en_US") {
+					$filenamealt = $searchdir."/langs/en_US/".$filename;
+				}
 				//else $filenamealt = $searchdir."/langs/fr_FR/".$filename;
-				if (is_readable(dol_osencode($filenamealt))) return true;
+				if (is_readable(dol_osencode($filenamealt))) {
+					return true;
+				}
 			}
 		}
 
@@ -899,17 +915,17 @@ class Translate
 		$newnumber = $number;
 
 		$dirsubstitutions = array_merge(array(), $conf->modules_parts['substitutions']);
-		foreach ($dirsubstitutions as $reldir)
-		{
+		foreach ($dirsubstitutions as $reldir) {
 			$dir = dol_buildpath($reldir, 0);
 			$newdir = dol_osencode($dir);
 
 			// Check if directory exists
-			if (!is_dir($newdir)) continue; // We must not use dol_is_dir here, function may not be loaded
+			if (!is_dir($newdir)) {
+				continue; // We must not use dol_is_dir here, function may not be loaded
+			}
 
 			$fonc = 'numberwords';
-			if (file_exists($newdir.'/functions_'.$fonc.'.lib.php'))
-			{
+			if (file_exists($newdir.'/functions_'.$fonc.'.lib.php')) {
 				include_once $newdir.'/functions_'.$fonc.'.lib.php';
 				$newnumber = numberwords_getLabelFromNumber($this, $number, $isamount);
 				break;
@@ -938,34 +954,38 @@ class Translate
 	public function getLabelFromKey($db, $key, $tablename, $fieldkey, $fieldlabel, $keyforselect = '', $filteronentity = 0)
 	{
 		// If key empty
-		if ($key == '') return '';
+		if ($key == '') {
+			return '';
+		}
 
 		//print 'param: '.$key.'-'.$keydatabase.'-'.$this->trans($key); exit;
 
 		// Check if a translation is available (this can call getTradFromKey)
 		$tmp = $this->transnoentitiesnoconv($key);
-		if ($tmp != $key && $tmp != 'ErrorBadValueForParamNotAString')
-		{
+		if ($tmp != $key && $tmp != 'ErrorBadValueForParamNotAString') {
 			return $tmp; // Found in language array
 		}
 
 		// Check in cache
-		if (isset($this->cache_labels[$tablename][$key]))	// Can be defined to 0 or ''
-		{
+		if (isset($this->cache_labels[$tablename][$key])) {	// Can be defined to 0 or ''
 			return $this->cache_labels[$tablename][$key]; // Found in cache
 		}
 
 		$sql = "SELECT ".$fieldlabel." as label";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$tablename;
 		$sql .= " WHERE ".$fieldkey." = '".$db->escape($keyforselect ? $keyforselect : $key)."'";
-		if ($filteronentity) $sql .= " AND entity IN (".getEntity($tablename).')';
+		if ($filteronentity) {
+			$sql .= " AND entity IN (".getEntity($tablename).')';
+		}
 		dol_syslog(get_class($this).'::getLabelFromKey', LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $this->cache_labels[$tablename][$key] = $obj->label;
-			else $this->cache_labels[$tablename][$key] = $key;
+			if ($obj) {
+				$this->cache_labels[$tablename][$key] = $obj->label;
+			} else {
+				$this->cache_labels[$tablename][$key] = $key;
+			}
 
 			$db->free($resql);
 			return $this->cache_labels[$tablename][$key];
@@ -989,8 +1009,11 @@ class Translate
 	{
 		$symbol = $this->getCurrencySymbol($currency_code);
 
-		if (in_array($currency_code, array('USD'))) return $symbol.$amount;
-		else return $amount.$symbol;
+		if (in_array($currency_code, array('USD'))) {
+			return $symbol.$amount;
+		} else {
+			return $amount.$symbol;
+		}
 	}
 
 	/**
@@ -1005,14 +1028,11 @@ class Translate
 	{
 		$currency_sign = ''; // By default return iso code
 
-		if (function_exists("mb_convert_encoding"))
-		{
+		if (function_exists("mb_convert_encoding")) {
 			$this->loadCacheCurrencies($forceloadall ? '' : $currency_code);
 
-			if (isset($this->cache_currencies[$currency_code]) && !empty($this->cache_currencies[$currency_code]['unicode']) && is_array($this->cache_currencies[$currency_code]['unicode']))
-			{
-				foreach ($this->cache_currencies[$currency_code]['unicode'] as $unicode)
-				{
+			if (isset($this->cache_currencies[$currency_code]) && !empty($this->cache_currencies[$currency_code]['unicode']) && is_array($this->cache_currencies[$currency_code]['unicode'])) {
+				foreach ($this->cache_currencies[$currency_code]['unicode'] as $unicode) {
 					$currency_sign .= mb_convert_encoding("&#{$unicode};", "UTF-8", 'HTML-ENTITIES');
 				}
 			}
@@ -1031,27 +1051,35 @@ class Translate
 	{
 		global $db;
 
-		if ($this->cache_currencies_all_loaded) return 0; // Cache already loaded for all
-		if (!empty($currency_code) && isset($this->cache_currencies[$currency_code])) return 0; // Cache already loaded for the currency
+		if ($this->cache_currencies_all_loaded) {
+			return 0; // Cache already loaded for all
+		}
+		if (!empty($currency_code) && isset($this->cache_currencies[$currency_code])) {
+			return 0; // Cache already loaded for the currency
+		}
 
 		$sql = "SELECT code_iso, label, unicode";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_currencies";
 		$sql .= " WHERE active = 1";
-		if (!empty($currency_code)) $sql .= " AND code_iso = '".$db->escape($currency_code)."'";
+		if (!empty($currency_code)) {
+			$sql .= " AND code_iso = '".$db->escape($currency_code)."'";
+		}
 		//$sql.= " ORDER BY code_iso ASC"; // Not required, a sort is done later
 
 		dol_syslog(get_class($this).'::loadCacheCurrencies', LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->load("dict");
 			$label = array();
-			if (!empty($currency_code)) foreach ($this->cache_currencies as $key => $val) $label[$key] = $val['label']; // Label in already loaded cache
+			if (!empty($currency_code)) {
+				foreach ($this->cache_currencies as $key => $val) {
+					$label[$key] = $val['label']; // Label in already loaded cache
+				}
+			}
 
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
@@ -1060,7 +1088,9 @@ class Translate
 				$label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];
 				$i++;
 			}
-			if (empty($currency_code)) $this->cache_currencies_all_loaded = true;
+			if (empty($currency_code)) {
+				$this->cache_currencies_all_loaded = true;
+			}
 			//print count($label).' '.count($this->cache_currencies);
 
 			// Resort cache
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 9cf8439483a..3806e5bda4d 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -77,58 +77,53 @@ class Utils
 		foreach ($choicesarray as $choice) {
 			$filesarray = array();
 
-			if ($choice == 'tempfiles' || $choice == 'tempfilesold')
-			{
+			if ($choice == 'tempfiles' || $choice == 'tempfilesold') {
 				// Delete temporary files
-				if ($dolibarr_main_data_root)
-				{
+				if ($dolibarr_main_data_root) {
 					$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
 
-					if ($choice == 'tempfilesold')
-					{
+					if ($choice == 'tempfilesold') {
 						$now = dol_now();
-						foreach ($filesarray as $key => $val)
-						{
-							if ($val['date'] > ($now - ($nbsecondsold))) unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold
+						foreach ($filesarray as $key => $val) {
+							if ($val['date'] > ($now - ($nbsecondsold))) {
+								unset($filesarray[$key]); // Discard temp dir not older than $nbsecondsold
+							}
 						}
 					}
 				}
 			}
 
-			if ($choice == 'allfiles')
-			{
+			if ($choice == 'allfiles') {
 				// Delete all files (except install.lock, do not follow symbolic links)
-				if ($dolibarr_main_data_root)
-				{
+				if ($dolibarr_main_data_root) {
 					$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
 				}
 			}
 
-			if ($choice == 'logfile' || $choice == 'logfiles')
-			{
+			if ($choice == 'logfile' || $choice == 'logfiles') {
 				// Define files log
-				if ($dolibarr_main_data_root)
-				{
+				if ($dolibarr_main_data_root) {
 					$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
 				}
 
-				if (!empty($conf->syslog->enabled))
-				{
+				if (!empty($conf->syslog->enabled)) {
 					$filelog = $conf->global->SYSLOG_FILE;
 					$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);
 
 					$alreadyincluded = false;
-					foreach ($filesarray as $tmpcursor)
-					{
-						if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded = true; }
+					foreach ($filesarray as $tmpcursor) {
+						if ($tmpcursor['fullname'] == $filelog) {
+							$alreadyincluded = true;
+						}
+					}
+					if (!$alreadyincluded) {
+						$filesarray[] = array('fullname'=>$filelog, 'type'=>'file');
 					}
-					if (!$alreadyincluded) $filesarray[] = array('fullname'=>$filelog, 'type'=>'file');
 				}
 			}
 
 			if (is_array($filesarray) && count($filesarray)) {
-				foreach ($filesarray as $key => $value)
-				{
+				foreach ($filesarray as $key => $value) {
 					//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
 					if ($filesarray[$key]['type'] == 'dir') {
 						$startcount = 0;
@@ -142,8 +137,7 @@ class Utils
 						}
 					} elseif ($filesarray[$key]['type'] == 'file') {
 						// If (file that is not logfile) or (if mode is logfile)
-						if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile' || $choice == 'logfiles')
-						{
+						if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile' || $choice == 'logfiles') {
 							$result = dol_delete_file($filesarray[$key]['fullname'], 1, 1);
 							if ($result) {
 								$count++;
@@ -156,8 +150,7 @@ class Utils
 				}
 
 				// Update cachenbofdoc
-				if (!empty($conf->ecm->enabled) && $choice == 'allfiles')
-				{
+				if (!empty($conf->ecm->enabled) && $choice == 'allfiles') {
 					require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 					$ecmdirstatic = new EcmDirectory($this->db);
 					$result = $ecmdirstatic->refreshcachenboffile(1);
@@ -208,30 +201,33 @@ class Utils
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		// Check compression parameter
-		if (!in_array($compression, array('none', 'gz', 'bz', 'zip')))
-		{
+		if (!in_array($compression, array('none', 'gz', 'bz', 'zip'))) {
 			$langs->load("errors");
 			$this->error = $langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
 			return -1;
 		}
 
 		// Check type parameter
-		if ($type == 'auto') $type = $this->db->type;
-		if (!in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
-		{
+		if ($type == 'auto') {
+			$type = $this->db->type;
+		}
+		if (!in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin'))) {
 			$langs->load("errors");
 			$this->error = $langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
 			return -1;
 		}
 
 		// Check file parameter
-		if ($file == 'auto')
-		{
+		if ($file == 'auto') {
 			$prefix = 'dump';
 			$ext = 'sql';
-			if (in_array($type, array('mysql', 'mysqli'))) { $prefix = 'mysqldump'; $ext = 'sql'; }
+			if (in_array($type, array('mysql', 'mysqli'))) {
+				$prefix = 'mysqldump'; $ext = 'sql';
+			}
 			//if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
-			if (in_array($type, array('pgsql'))) { $prefix = 'pg_dump'; $ext = 'sql'; }
+			if (in_array($type, array('pgsql'))) {
+				$prefix = 'pg_dump'; $ext = 'sql';
+			}
 			$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
 		}
 
@@ -240,58 +236,88 @@ class Utils
 		$errormsg = '';
 
 		// MYSQL
-		if ($type == 'mysql' || $type == 'mysqli')
-		{
+		if ($type == 'mysql' || $type == 'mysqli') {
 			$cmddump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
 
 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
 			$compression = $compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile .= '.gz';
-			if ($compression == 'bz') $outputfile .= '.bz2';
+			if ($compression == 'gz') {
+				$outputfile .= '.gz';
+			}
+			if ($compression == 'bz') {
+				$outputfile .= '.bz2';
+			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
 			$command = $cmddump;
 			$command = preg_replace('/(\$|%)/', '', $command); // We removed chars that can be used to inject vars that contains space inside path of command without seeing there is a space to bypass the escapeshellarg.
-			if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // If there is spaces, we add quotes on command to be sure $command is only a program and not a program+parameters
+			if (preg_match("/\s/", $command)) {
+				$command = escapeshellarg($command); // If there is spaces, we add quotes on command to be sure $command is only a program and not a program+parameters
+			}
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
 			$param = $dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
 			$param .= " -u ".$dolibarr_main_db_user;
-			if (!empty($dolibarr_main_db_port)) $param .= " -P ".$dolibarr_main_db_port;
-			if (!GETPOST("use_transaction", "alpha"))    $param .= " -l --single-transaction";
-			if (GETPOST("disable_fk", "alpha") || $usedefault) $param .= " -K";
-			if (GETPOST("sql_compat", "alpha") && GETPOST("sql_compat", "alpha") != 'NONE') $param .= " --compatible=".escapeshellarg(GETPOST("sql_compat", "alpha"));
-			if (GETPOST("drop_database", "alpha"))        $param .= " --add-drop-database";
-			if (GETPOST("use_mysql_quick_param", "alpha"))$param .= " --quick";
-			if (GETPOST("sql_structure", "alpha") || $usedefault)
-			{
-				if (GETPOST("drop", "alpha") || $usedefault)	$param .= " --add-drop-table=TRUE";
-				else $param .= " --add-drop-table=FALSE";
+			if (!empty($dolibarr_main_db_port)) {
+				$param .= " -P ".$dolibarr_main_db_port;
+			}
+			if (!GETPOST("use_transaction", "alpha")) {
+				$param .= " -l --single-transaction";
+			}
+			if (GETPOST("disable_fk", "alpha") || $usedefault) {
+				$param .= " -K";
+			}
+			if (GETPOST("sql_compat", "alpha") && GETPOST("sql_compat", "alpha") != 'NONE') {
+				$param .= " --compatible=".escapeshellarg(GETPOST("sql_compat", "alpha"));
+			}
+			if (GETPOST("drop_database", "alpha")) {
+				$param .= " --add-drop-database";
+			}
+			if (GETPOST("use_mysql_quick_param", "alpha")) {
+				$param .= " --quick";
+			}
+			if (GETPOST("sql_structure", "alpha") || $usedefault) {
+				if (GETPOST("drop", "alpha") || $usedefault) {
+					$param .= " --add-drop-table=TRUE";
+				} else {
+					$param .= " --add-drop-table=FALSE";
+				}
 			} else {
 				$param .= " -t";
 			}
-			if (GETPOST("disable-add-locks", "alpha")) $param .= " --add-locks=FALSE";
-			if (GETPOST("sql_data", "alpha") || $usedefault)
-			{
+			if (GETPOST("disable-add-locks", "alpha")) {
+				$param .= " --add-locks=FALSE";
+			}
+			if (GETPOST("sql_data", "alpha") || $usedefault) {
 				$param .= " --tables";
-				if (GETPOST("showcolumns", "alpha") || $usedefault)	 $param .= " -c";
-				if (GETPOST("extended_ins", "alpha") || $usedefault) $param .= " -e";
-				else $param .= " --skip-extended-insert";
-				if (GETPOST("delayed", "alpha"))	 	 $param .= " --delayed-insert";
-				if (GETPOST("sql_ignore", "alpha"))	 $param .= " --insert-ignore";
-				if (GETPOST("hexforbinary", "alpha") || $usedefault) $param .= " --hex-blob";
+				if (GETPOST("showcolumns", "alpha") || $usedefault) {
+					$param .= " -c";
+				}
+				if (GETPOST("extended_ins", "alpha") || $usedefault) {
+					$param .= " -e";
+				} else {
+					$param .= " --skip-extended-insert";
+				}
+				if (GETPOST("delayed", "alpha")) {
+					$param .= " --delayed-insert";
+				}
+				if (GETPOST("sql_ignore", "alpha")) {
+					$param .= " --insert-ignore";
+				}
+				if (GETPOST("hexforbinary", "alpha") || $usedefault) {
+					$param .= " --hex-blob";
+				}
 			} else {
 				$param .= " -d"; // No row information (no data)
 			}
 			$param .= " --default-character-set=utf8"; // We always save output into utf8 charset
 			$paramcrypted = $param;
 			$paramclear = $param;
-			if (!empty($dolibarr_main_db_pass))
-			{
+			if (!empty($dolibarr_main_db_pass)) {
 				$paramcrypted .= ' -p"'.preg_replace('/./i', '*', $dolibarr_main_db_pass).'"';
 				$paramclear .= ' -p"'.str_replace(array('"', '`', '$'), array('\"', '\`', '\$'), $dolibarr_main_db_pass).'"';
 			}
@@ -301,69 +327,89 @@ class Utils
 			// Start call method to execute dump
 			$fullcommandcrypted = $command." ".$paramcrypted." 2>&1";
 			$fullcommandclear = $command." ".$paramclear." 2>&1";
-			if ($compression == 'none') $handle = fopen($outputfile, 'w');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
+			if ($compression == 'none') {
+				$handle = fopen($outputfile, 'w');
+			}
+			if ($compression == 'gz') {
+				$handle = gzopen($outputfile, 'w');
+			}
+			if ($compression == 'bz') {
+				$handle = bzopen($outputfile, 'w');
+			}
 
 			$ok = 0;
-			if ($handle)
-			{
-				if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
-				if (empty($execmethod)) $execmethod = 1;
+			if ($handle) {
+				if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+					$execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+				}
+				if (empty($execmethod)) {
+					$execmethod = 1;
+				}
 
 				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
 
 				// TODO Replace with executeCLI function
-				if ($execmethod == 1)
-				{
+				if ($execmethod == 1) {
 					$output_arr = array(); $retval = null;
 					exec($fullcommandclear, $output_arr, $retval);
 
-					if ($retval != 0)
-					{
+					if ($retval != 0) {
 						$langs->load("errors");
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
 						$errormsg = 'Error '.$retval;
 						$ok = 0;
 					} else {
 						$i = 0;
-						if (!empty($output_arr))
-						{
-							foreach ($output_arr as $key => $read)
-							{
+						if (!empty($output_arr)) {
+							foreach ($output_arr as $key => $read) {
 								$i++; // output line number
-								if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+								if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {
+									continue;
+								}
 								fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
-								if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1;
-								elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1;
+								if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) {
+									$ok = 1;
+								} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) {
+									$ok = 1;
+								}
 							}
 						}
 					}
 				}
-				if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
-				{
+				if ($execmethod == 2) {	// With this method, there is no way to get the return code, only output
 					$handlein = popen($fullcommandclear, 'r');
 					$i = 0;
-					while (!feof($handlein))
-					{
+					while (!feof($handlein)) {
 						$i++; // output line number
 						$read = fgets($handlein);
 						// Exclude warning line we don't want
-						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {
+							continue;
+						}
 						fwrite($handle, $read);
-						if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1;
-						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1;
+						if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) {
+							$ok = 1;
+						} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) {
+							$ok = 1;
+						}
 					}
 					pclose($handlein);
 				}
 
 
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
+				if ($compression == 'none') {
+					fclose($handle);
+				}
+				if ($compression == 'gz') {
+					gzclose($handle);
+				}
+				if ($compression == 'bz') {
+					bzclose($handle);
+				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+				}
 			} else {
 				$langs->load("errors");
 				dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
@@ -371,19 +417,30 @@ class Utils
 			}
 
 			// Get errorstring
-			if ($compression == 'none') $handle = fopen($outputfile, 'r');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');
-			if ($handle)
-			{
+			if ($compression == 'none') {
+				$handle = fopen($outputfile, 'r');
+			}
+			if ($compression == 'gz') {
+				$handle = gzopen($outputfile, 'r');
+			}
+			if ($compression == 'bz') {
+				$handle = bzopen($outputfile, 'r');
+			}
+			if ($handle) {
 				// Get 2048 first chars of error message.
 				$errormsg = fgets($handle, 2048);
 				//$ok=0;$errormsg='';  To force error
 
 				// Close file
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
+				if ($compression == 'none') {
+					fclose($handle);
+				}
+				if ($compression == 'gz') {
+					gzclose($handle);
+				}
+				if ($compression == 'bz') {
+					bzclose($handle);
+				}
 				if ($ok && preg_match('/^-- (MySql|MariaDB)/i', $errormsg)) {	// No error
 					$errormsg = '';
 				} else {
@@ -392,8 +449,7 @@ class Utils
 					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
 					@rename($outputfile, $outputerror);
 					// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
-					if (!$errormsg)
-					{
+					if (!$errormsg) {
 						$langs->load("errors");
 						$errormsg = $langs->trans("ErrorFailedToRunExternalCommand");
 					}
@@ -408,19 +464,21 @@ class Utils
 		}
 
 		// MYSQL NO BIN
-		if ($type == 'mysqlnobin')
-		{
+		if ($type == 'mysqlnobin') {
 			$outputfile = $outputdir.'/'.$file;
 			$outputfiletemp = $outputfile.'-TMP.sql';
 			// for compression format, we add extension
 			$compression = $compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile .= '.gz';
-			if ($compression == 'bz') $outputfile .= '.bz2';
+			if ($compression == 'gz') {
+				$outputfile .= '.gz';
+			}
+			if ($compression == 'bz') {
+				$outputfile .= '.bz2';
+			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
-			if ($compression == 'gz' or $compression == 'bz')
-			{
+			if ($compression == 'gz' or $compression == 'bz') {
 				$this->backupTables($outputfiletemp);
 				dol_compress_file($outputfiletemp, $outputfile, $compression);
 				unlink($outputfiletemp);
@@ -433,44 +491,63 @@ class Utils
 		}
 
 		// POSTGRESQL
-		if ($type == 'postgresql' || $type == 'pgsql')
-		{
+		if ($type == 'postgresql' || $type == 'pgsql') {
 			$cmddump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
 			$compression = $compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile .= '.gz';
-			if ($compression == 'bz') $outputfile .= '.bz2';
+			if ($compression == 'gz') {
+				$outputfile .= '.gz';
+			}
+			if ($compression == 'bz') {
+				$outputfile .= '.bz2';
+			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
 			$command = $cmddump;
 			$command = preg_replace('/(\$|%)/', '', $command); // We removed chars that can be used to inject vars that contains space inside path of command without seeing there is a space to bypass the escapeshellarg.
-			if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // If there is spaces, we add quotes on command to be sure $command is only a program and not a program+parameters
+			if (preg_match("/\s/", $command)) {
+				$command = escapeshellarg($command); // If there is spaces, we add quotes on command to be sure $command is only a program and not a program+parameters
+			}
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
 			//$param="-F c";
 			$param = "-F p";
 			$param .= " --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
 			$param .= " -U ".$dolibarr_main_db_user;
-			if (!empty($dolibarr_main_db_port)) $param .= " -p ".$dolibarr_main_db_port;
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param .= "  --disable-dollar-quoting";
-			if (GETPOST("drop_database"))        $param .= " -c -C";
-			if (GETPOST("sql_structure"))
-			{
-				if (GETPOST("drop"))			 $param .= " --add-drop-table";
-				if (!GETPOST("sql_data"))       $param .= " -s";
+			if (!empty($dolibarr_main_db_port)) {
+				$param .= " -p ".$dolibarr_main_db_port;
 			}
-			if (GETPOST("sql_data"))
-			{
-				if (!GETPOST("sql_structure"))	 $param .= " -a";
-				if (GETPOST("showcolumns"))	     $param .= " -c";
+			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') {
+				$param .= "  --disable-dollar-quoting";
+			}
+			if (GETPOST("drop_database")) {
+				$param .= " -c -C";
+			}
+			if (GETPOST("sql_structure")) {
+				if (GETPOST("drop")) {
+					$param .= " --add-drop-table";
+				}
+				if (!GETPOST("sql_data")) {
+					$param .= " -s";
+				}
+			}
+			if (GETPOST("sql_data")) {
+				if (!GETPOST("sql_structure")) {
+					$param .= " -a";
+				}
+				if (GETPOST("showcolumns")) {
+					$param .= " -c";
+				}
 			}
 			$param .= ' -f "'.$outputfile.'"';
 			//if ($compression == 'none')
-			if ($compression == 'gz')   $param .= ' -Z 9';
+			if ($compression == 'gz') {
+				$param .= ' -Z 9';
+			}
 			//if ($compression == 'bz')
 			$paramcrypted = $param;
 			$paramclear = $param;
@@ -487,14 +564,14 @@ class Utils
 		}
 
 		// Clean old files
-		if (!$errormsg && $keeplastnfiles > 0)
-		{
+		if (!$errormsg && $keeplastnfiles > 0) {
 			$tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
 			$i = 0;
-			foreach ($tmpfiles as $key => $val)
-			{
+			foreach ($tmpfiles as $key => $val) {
 				$i++;
-				if ($i <= $keeplastnfiles) continue;
+				if ($i <= $keeplastnfiles) {
+					continue;
+				}
 				dol_delete_file($val['fullname'], 0, 0, 0, null, false, 0);
 			}
 		}
@@ -523,34 +600,33 @@ class Utils
 		$command = escapeshellcmd($command);
 		$command .= " 2>&1";
 
-		if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
-		if (empty($execmethod)) $execmethod = 1;
+		if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+			$execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+		}
+		if (empty($execmethod)) {
+			$execmethod = 1;
+		}
 		//$execmethod=1;
 
 		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
 		$output_arr = array();
 
-		if ($execmethod == 1)
-		{
+		if ($execmethod == 1) {
 			$retval = null;
 			exec($command, $output_arr, $retval);
 			$result = $retval;
-			if ($retval != 0)
-			{
+			if ($retval != 0) {
 				$langs->load("errors");
 				dol_syslog("Utils::executeCLI retval after exec=".$retval, LOG_ERR);
 				$error = 'Error '.$retval;
 			}
 		}
-		if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
-		{
+		if ($execmethod == 2) {	// With this method, there is no way to get the return code, only output
 			$handle = fopen($outputfile, 'w+b');
-			if ($handle)
-			{
+			if ($handle) {
 				dol_syslog("Utils::executeCLI run command ".$command);
 				$handlein = popen($command, 'r');
-				while (!feof($handlein))
-				{
+				while (!feof($handlein)) {
 					$read = fgets($handlein);
 					fwrite($handle, $read);
 					$output_arr[] = $read;
@@ -558,14 +634,14 @@ class Utils
 				pclose($handlein);
 				fclose($handle);
 			}
-			if (!empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) {
+				@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 
 		// Update with result
-		if (is_array($output_arr) && count($output_arr) > 0)
-		{
-			foreach ($output_arr as $val)
-			{
+		if (is_array($output_arr) && count($output_arr) > 0) {
+			foreach ($output_arr as $val) {
 				$output .= $val.($execmethod == 2 ? '' : "\n");
 			}
 		}
@@ -600,12 +676,10 @@ class Utils
 		dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
 		$class = 'mod'.$module;
 
-		if (class_exists($class))
-		{
+		if (class_exists($class)) {
 			try {
 				$moduleobj = new $class($this->db);
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				$error++;
 				dol_print_error($e->getMessage());
 			}
@@ -617,8 +691,7 @@ class Utils
 		}
 
 		$arrayversion = explode('.', $moduleobj->version, 3);
-		if (count($arrayversion))
-		{
+		if (count($arrayversion)) {
 			$FILENAMEASCII = strtolower($module).'.asciidoc';
 			$FILENAMEDOC = strtolower($module).'.html';
 			$FILENAMEDOCPDF = strtolower($module).'.pdf';
@@ -627,18 +700,19 @@ class Utils
 			$dirofmoduledoc = dol_buildpath(strtolower($module), 0).'/doc';
 			$dirofmoduletmp = dol_buildpath(strtolower($module), 0).'/doc/temp';
 			$outputfiledoc = $dirofmoduledoc.'/'.$FILENAMEDOC;
-			if ($dirofmoduledoc)
-			{
-				if (!dol_is_dir($dirofmoduledoc)) dol_mkdir($dirofmoduledoc);
-				if (!dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
-				if (!is_writable($dirofmoduletmp))
-				{
+			if ($dirofmoduledoc) {
+				if (!dol_is_dir($dirofmoduledoc)) {
+					dol_mkdir($dirofmoduledoc);
+				}
+				if (!dol_is_dir($dirofmoduletmp)) {
+					dol_mkdir($dirofmoduletmp);
+				}
+				if (!is_writable($dirofmoduletmp)) {
 					$this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable';
 					return -1;
 				}
 
-				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR) && empty($conf->global->MODULEBUILDER_ASCIIDOCTORPDF))
-				{
+				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR) && empty($conf->global->MODULEBUILDER_ASCIIDOCTORPDF)) {
 					$this->error = 'Setup of module ModuleBuilder not complete';
 					return -1;
 				}
@@ -659,24 +733,29 @@ class Utils
 				$destfile = $dirofmoduletmp.'/'.$FILENAMEASCII;
 
 				$fhandle = fopen($destfile, 'w+');
-				if ($fhandle)
-				{
+				if ($fhandle) {
 					$specs = dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
 
 					$i = 0;
-					foreach ($specs as $spec)
-					{
-						if (preg_match('/notindoc/', $spec['relativename'])) continue; // Discard file
-						if (preg_match('/example/', $spec['relativename'])) continue; // Discard file
-						if (preg_match('/disabled/', $spec['relativename'])) continue; // Discard file
+					foreach ($specs as $spec) {
+						if (preg_match('/notindoc/', $spec['relativename'])) {
+							continue; // Discard file
+						}
+						if (preg_match('/example/', $spec['relativename'])) {
+							continue; // Discard file
+						}
+						if (preg_match('/disabled/', $spec['relativename'])) {
+							continue; // Discard file
+						}
 
 						$pathtofile = strtolower($module).'/doc/'.$spec['relativename'];
 						$format = 'asciidoc';
-						if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown';
+						if (preg_match('/\.md$/i', $spec['name'])) {
+							$format = 'markdown';
+						}
 
 						$filecursor = @file_get_contents($spec['fullname']);
-						if ($filecursor)
-						{
+						if ($filecursor) {
 							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
 						} else {
 							$this->error = 'Failed to concat content of file '.$spec['fullname'];
@@ -729,8 +808,7 @@ class Utils
 				$outfile = $dirofmoduletmp.'/out.tmp';
 
 				$resarray = $utils->executeCLI($command, $outfile);
-				if ($resarray['result'] != '0')
-				{
+				if ($resarray['result'] != '0') {
 					$this->error = $resarray['error'].' '.$resarray['output'];
 				}
 				$result = ($resarray['result'] == 0) ? 1 : 0;
@@ -739,8 +817,7 @@ class Utils
 				$command = $conf->global->MODULEBUILDER_ASCIIDOCTORPDF.' '.$destfile.' -n -o '.$dirofmoduledoc.'/'.$FILENAMEDOCPDF;
 				$outfile = $dirofmoduletmp.'/outpdf.tmp';
 				$resarray = $utils->executeCLI($command, $outfile);
-				if ($resarray['result'] != '0')
-				{
+				if ($resarray['result'] != '0') {
 					$this->error = $resarray['error'].' '.$resarray['output'];
 				}
 				$result = ($resarray['result'] == 0) ? 1 : 0;
@@ -750,8 +827,7 @@ class Utils
 				$result = 0;
 			}
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				return 1;
 			} else {
 				$error++;
@@ -807,8 +883,7 @@ class Utils
 			$logname = $file['name'];
 			$logpath = $file['path'];
 
-			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0)	// If log file exists and is not empty
-			{
+			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0) {	// If log file exists and is not empty
 				// Handle already compressed files to rename them and add +1
 
 				$filter = '^'.preg_quote($logname, '/').'\.([0-9]+)\.gz$';
@@ -907,12 +982,10 @@ class Utils
 		}
 
 		//get all of the tables
-		if ($tables == '*')
-		{
+		if ($tables == '*') {
 			$tables = array();
 			$result = $db->query('SHOW FULL TABLES WHERE Table_type = \'BASE TABLE\'');
-			while ($row = $db->fetch_row($result))
-			{
+			while ($row = $db->fetch_row($result)) {
 				$tables[] = $row[0];
 			}
 		} else {
@@ -921,8 +994,7 @@ class Utils
 
 		//cycle through
 		$handle = fopen($outputfile, 'w+');
-		if (fwrite($handle, '') === false)
-		{
+		if (fwrite($handle, '') === false) {
 			$langs->load("errors");
 			dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
 			$errormsg = $langs->trans("ErrorFailedToWriteInDir");
@@ -950,30 +1022,38 @@ class Utils
 
 ";
 
-		if (GETPOST("nobin_disable_fk")) $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
+		if (GETPOST("nobin_disable_fk")) {
+			$sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
+		}
 		//$sqlhead .= "SET SQL_MODE=\"NO_AUTO_VALUE_ON_ZERO\";\n";
-		if (GETPOST("nobin_use_transaction")) $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
+		if (GETPOST("nobin_use_transaction")) {
+			$sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
+		}
 
 		fwrite($handle, $sqlhead);
 
 		$ignore = '';
-		if (GETPOST("nobin_sql_ignore")) $ignore = 'IGNORE ';
+		if (GETPOST("nobin_sql_ignore")) {
+			$ignore = 'IGNORE ';
+		}
 		$delayed = '';
-		if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';
+		if (GETPOST("nobin_delayed")) {
+			$delayed = 'DELAYED ';
+		}
 
 		// Process each table and print their definition + their datas
-		foreach ($tables as $table)
-		{
+		foreach ($tables as $table) {
 			// Saving the table structure
 			fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n");
 
-			if (GETPOST("nobin_drop")) fwrite($handle, "DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
+			if (GETPOST("nobin_drop")) {
+				fwrite($handle, "DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
+			}
 			fwrite($handle, "/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
 			fwrite($handle, "/*!40101 SET character_set_client = utf8 */;\n");
 			$resqldrop = $db->query('SHOW CREATE TABLE '.$table);
 			$row2 = $db->fetch_row($resqldrop);
-			if (empty($row2[1]))
-			{
+			if (empty($row2[1])) {
 				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
 			} else {
 				fwrite($handle, $row2[1].";\n");
@@ -981,14 +1061,18 @@ class Utils
 
 				// Dumping the data (locking the table and disabling the keys check while doing the process)
 				fwrite($handle, "\n--\n-- Dumping data for table `".$table."`\n--\n");
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
-				else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
+				if (!GETPOST("nobin_nolocks")) {
+					fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)
+				}
+				if (GETPOST("nobin_disable_fk")) {
+					fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
+				} else {
+					fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
+				}
 
 				$sql = 'SELECT * FROM '.$table; // Here SELECT * is allowed because we don't have definition of columns to take
 				$result = $db->query($sql);
-				while ($row = $db->fetch_row($result))
-				{
+				while ($row = $db->fetch_row($result)) {
 					// For each row of data we print a line of INSERT
 					fwrite($handle, 'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
 					$columns = count($row);
@@ -1011,8 +1095,12 @@ class Utils
 					}
 					fwrite($handle, implode(',', $row).");\n");
 				}
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
+				if (GETPOST("nobin_disable_fk")) {
+					fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
+				}
+				if (!GETPOST("nobin_nolocks")) {
+					fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
+				}
 				fwrite($handle, "\n\n\n");
 			}
 		}
@@ -1038,8 +1126,12 @@ class Utils
 
 		// Write the footer (restore the previous database settings)
 		$sqlfooter = "\n\n";
-		if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";
-		if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
+		if (GETPOST("nobin_use_transaction")) {
+			$sqlfooter .= "COMMIT;\n";
+		}
+		if (GETPOST("nobin_disable_fk")) {
+			$sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
+		}
 		$sqlfooter .= "\n\n-- Dump completed on ".date('Y-m-d G-i-s');
 		fwrite($handle, $sqlfooter);
 
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index 9c03475453f..229966468c1 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -53,8 +53,7 @@ function dol_quoted_printable_encode($input, $line_max = 76)
 	$output = "";
 
 	$num = count($lines);
-	for ($j = 0; $j < $num; $j++)
-	{
+	for ($j = 0; $j < $num; $j++) {
 		$line = $lines[$j];
 		$linlen = strlen($line);
 		$newline = "";
@@ -74,7 +73,9 @@ function dol_quoted_printable_encode($input, $line_max = 76)
 			$newline .= $c;
 		} // end of for
 		$output .= $newline;
-		if ($j < count($lines) - 1) $output .= $linebreak;
+		if ($j < count($lines) - 1) {
+			$output .= $linebreak;
+		}
 	}
 	return trim($output);
 }
@@ -112,7 +113,9 @@ class vCard
 	{
 		// type may be PREF | WORK | HOME | VOICE | FAX | MSG | CELL | PAGER | BBS | CAR | MODEM | ISDN | VIDEO or any senseful combination, e.g. "PREF;WORK;VOICE"
 		$key = "TEL";
-		if ($type != "") $key .= ";".$type;
+		if ($type != "") {
+			$key .= ";".$type;
+		}
 		$key .= ";CHARSET=".$this->encoding;
 		$this->properties[$key] = encode($number);
 	}
@@ -156,7 +159,9 @@ class vCard
 	{
 		$this->properties["N;CHARSET=".$this->encoding] = encode($family).";".encode($first).";".encode($additional).";".encode($prefix).";".encode($suffix);
 		$this->filename = "$first%20$family.vcf";
-		if (empty($this->properties["FN"])) $this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+		if (empty($this->properties["FN"])) {
+			$this->setFormattedName(trim("$prefix $first $additional $family $suffix"));
+		}
 	}
 
 	/**
@@ -188,12 +193,13 @@ class vCard
 	{
 		// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
 		$key = "ADR";
-		if ($type != "") $key .= ";$type";
+		if ($type != "") {
+			$key .= ";$type";
+		}
 		$key .= ";CHARSET=".$this->encoding;
 		$this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
-		if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "")
-		{
+		if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "") {
 			//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
 		}
 	}
@@ -214,13 +220,27 @@ class vCard
 	public function setLabel($postoffice = "", $extended = "", $street = "", $city = "", $region = "", $zip = "", $country = "", $type = "HOME;POSTAL")
 	{
 		$label = "";
-		if ($postoffice != "") $label .= "$postoffice\r\n";
-		if ($extended != "") $label .= "$extended\r\n";
-		if ($street != "") $label .= "$street\r\n";
-		if ($zip != "") $label .= "$zip ";
-		if ($city != "") $label .= "$city\r\n";
-		if ($region != "") $label .= "$region\r\n";
-		if ($country != "") $country .= "$country\r\n";
+		if ($postoffice != "") {
+			$label .= "$postoffice\r\n";
+		}
+		if ($extended != "") {
+			$label .= "$extended\r\n";
+		}
+		if ($street != "") {
+			$label .= "$street\r\n";
+		}
+		if ($zip != "") {
+			$label .= "$zip ";
+		}
+		if ($city != "") {
+			$label .= "$city\r\n";
+		}
+		if ($region != "") {
+			$label .= "$region\r\n";
+		}
+		if ($country != "") {
+			$country .= "$country\r\n";
+		}
 
 		$this->properties["LABEL;$type;CHARSET=".$this->encoding] = encode($label);
 	}
@@ -235,7 +255,9 @@ class vCard
 	public function setEmail($address, $type = "TYPE=INTERNET;PREF")
 	{
 		$key = "EMAIL";
-		if ($type != "") $key .= ";".$type;
+		if ($type != "") {
+			$key .= ";".$type;
+		}
 		$this->properties[$key] = $address;
 	}
 
@@ -309,7 +331,9 @@ class vCard
 	{
 		// $type may be WORK | HOME
 		$key = "URL";
-		if ($type != "") $key .= ";$type";
+		if ($type != "") {
+			$key .= ";$type";
+		}
 		$this->properties[$key] = $url;
 	}
 
@@ -323,8 +347,7 @@ class vCard
 		$text = "BEGIN:VCARD\r\n";
 		$text .= "VERSION:3.0\r\n";
 		//$text.= "VERSION:2.1\r\n";
-		foreach ($this->properties as $key => $value)
-		{
+		foreach ($this->properties as $key => $value) {
 			$text .= "$key:$value\r\n";
 		}
 		$text .= "REV:".date("Y-m-d")."T".date("H:i:s")."Z\r\n";
@@ -345,29 +368,29 @@ class vCard
 
 	/* Example from Microsoft Outlook 2019
 
-    BEGIN:VCARD
-    VERSION:2.1
+	BEGIN:VCARD
+	VERSION:2.1
 
-    N;LANGUAGE=de:surename;forename;secondname;Sir;jun.
-    FN:Sir surename secondname forename jun.
-    ORG:Companyname
-    TITLE:position
-    TEL;WORK;VOICE:work-phone-number
-    TEL;HOME;VOICE:private-phone-number
-    TEL;CELL;VOICE:mobile-phone-number
-    TEL;WORK;FAX:fax-phone-number
-    ADR;WORK;PREF:;;street and number;town;region;012345;Deutschland
-    LABEL;WORK;PREF;ENCODING=QUOTED-PRINTABLE:street and number=0D=0A=
-    =0D=0A=
-    012345  town  region
-    X-MS-OL-DEFAULT-POSTAL-ADDRESS:2
-    URL;WORK:www.mywebpage.de
-    EMAIL;PREF;INTERNET:test1@test1.de
-    EMAIL;INTERNET:test2@test2.de
-    EMAIL;INTERNET:test3@test3.de
-    X-MS-IMADDRESS:test@jabber.org
-    REV:20200424T104242Z
+	N;LANGUAGE=de:surename;forename;secondname;Sir;jun.
+	FN:Sir surename secondname forename jun.
+	ORG:Companyname
+	TITLE:position
+	TEL;WORK;VOICE:work-phone-number
+	TEL;HOME;VOICE:private-phone-number
+	TEL;CELL;VOICE:mobile-phone-number
+	TEL;WORK;FAX:fax-phone-number
+	ADR;WORK;PREF:;;street and number;town;region;012345;Deutschland
+	LABEL;WORK;PREF;ENCODING=QUOTED-PRINTABLE:street and number=0D=0A=
+	=0D=0A=
+	012345  town  region
+	X-MS-OL-DEFAULT-POSTAL-ADDRESS:2
+	URL;WORK:www.mywebpage.de
+	EMAIL;PREF;INTERNET:test1@test1.de
+	EMAIL;INTERNET:test2@test2.de
+	EMAIL;INTERNET:test3@test3.de
+	X-MS-IMADDRESS:test@jabber.org
+	REV:20200424T104242Z
 
-    END:VCARD
-    */
+	END:VCARD
+	*/
 }
diff --git a/htdocs/core/commonfieldsinexport.inc.php b/htdocs/core/commonfieldsinexport.inc.php
index 5db67f36c78..a02a21afdd6 100644
--- a/htdocs/core/commonfieldsinexport.inc.php
+++ b/htdocs/core/commonfieldsinexport.inc.php
@@ -1,21 +1,20 @@
 <?php
 
-if (empty($keyforclass) || empty($keyforclassfile) || empty($keyforelement))
-{
+if (empty($keyforclass) || empty($keyforclassfile) || empty($keyforelement)) {
 	//print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement;
 	dol_print_error('', 'include of file commonfieldsinexport.inc.php was done but var $keyforclass or $keyforclassfile or $keyforelement was not set');
 	exit;
 }
-if (empty($keyforalias)) $keyforalias = 't';
+if (empty($keyforalias)) {
+	$keyforalias = 't';
+}
 
 dol_include_once($keyforclassfile);
-if (class_exists($keyforclass))
-{
+if (class_exists($keyforclass)) {
 	$tmpobject = new $keyforclass($this->db);
 
 	// Add common fields
-	foreach ($tmpobject->fields as $keyfield => $valuefield)
-	{
+	foreach ($tmpobject->fields as $keyfield => $valuefield) {
 		$fieldname = $keyforalias.'.'.$keyfield;
 		$fieldlabel = ucfirst($valuefield['label']);
 		$typeFilter = "Text";
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 901a0aa0f59..2d3210cad66 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -25,8 +25,7 @@
  *		\brief      Page to make custom reports
  */
 
-if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE'))
-{
+if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE')) {
 	require '../main.inc.php';
 
 	// Get parameters
@@ -37,17 +36,25 @@ if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE'))
 	$objecttype = GETPOST('objecttype', 'aZ09');
 	$tabfamily  = GETPOST('tabfamily', 'aZ09');
 
-	if (empty($objecttype)) $objecttype = 'thirdparty';
+	if (empty($objecttype)) {
+		$objecttype = 'thirdparty';
+	}
 
 	$search_filters = GETPOST('search_filters', 'array');
 	$search_measures = GETPOST('search_measures', 'array');
 
 	//$search_xaxis = GETPOST('search_xaxis', 'array');
-	if (GETPOST('search_xaxis', 'alpha') && GETPOST('search_xaxis', 'alpha') != '-1') $search_xaxis = array(GETPOST('search_xaxis', 'alpha'));
-	else $search_xaxis = array();
+	if (GETPOST('search_xaxis', 'alpha') && GETPOST('search_xaxis', 'alpha') != '-1') {
+		$search_xaxis = array(GETPOST('search_xaxis', 'alpha'));
+	} else {
+		$search_xaxis = array();
+	}
 	//$search_groupby = GETPOST('search_groupby', 'array');
-	if (GETPOST('search_groupby', 'alpha') && GETPOST('search_groupby', 'alpha') != '-1') $search_groupby = array(GETPOST('search_groupby', 'alpha'));
-	else $search_groupby = array();
+	if (GETPOST('search_groupby', 'alpha') && GETPOST('search_groupby', 'alpha') != '-1') {
+		$search_groupby = array(GETPOST('search_groupby', 'alpha'));
+	} else {
+		$search_groupby = array();
+	}
 
 	$search_yaxis = GETPOST('search_yaxis', 'array');
 	$search_graph = GETPOST('search_graph', 'none');
@@ -57,7 +64,9 @@ if (!defined('USE_CUSTOME_REPORT_AS_INCLUDE'))
 	$sortfield = GETPOST('sortfield', 'aZ09comma');
 	$sortorder = GETPOST('sortorder', 'aZ09comma');
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-	if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+	if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+		$page = 0;
+	}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 	$offset = $limit * $page;
 	$pageprev = $page - 1;
 	$pagenext = $page + 1;
@@ -102,8 +111,9 @@ $arrayoftype = array(
 // Complete $arrayoftype by external modules
 $parameters = array('objecttype'=>$objecttype, 'tabfamily'=>$tabfamily);
 $reshook = $hookmanager->executeHooks('loadDataForCustomReports', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-elseif (is_array($hookmanager->resArray)) {
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+} elseif (is_array($hookmanager->resArray)) {
 	if (!empty($hookmanager->resArray['title'])) {		// Add entries for tabs
 		$title = $hookmanager->resArray['title'];
 	}
@@ -136,8 +146,7 @@ if ($objecttype) {
 
 // Security check
 $socid = 0;
-if ($user->socid > 0)	// Protection if external user
-{
+if ($user->socid > 0) {	// Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
@@ -262,7 +271,9 @@ if (is_array($search_groupby) && count($search_groupby)) {
 			$regs = array();
 			if (!empty($object->fields[$gvalwithoutprefix]['arrayofkeyval'])) {
 				$valuetranslated = $object->fields[$gvalwithoutprefix]['arrayofkeyval'][$obj->val];
-				if (is_null($valuetranslated)) $valuetranslated = $langs->transnoentitiesnoconv("UndefinedKey");
+				if (is_null($valuetranslated)) {
+					$valuetranslated = $langs->transnoentitiesnoconv("UndefinedKey");
+				}
 				$valuetranslated = $langs->trans($valuetranslated);
 			} elseif (preg_match('/integer:([^:]+):([^:]+)$/', $object->fields[$gvalwithoutprefix]['type'], $regs)) {
 				$classname = $regs[1];
@@ -337,8 +348,9 @@ foreach ($arrayoftype as $key => $val) {
 	}
 }
 print $form->selectarray('objecttype', $newarrayoftype, $objecttype, 0, 0, 0, '', 1, 0, 0, '', 'minwidth200', 1);
-if (empty($conf->use_javascript_ajax)) print '<input type="submit" class="button buttongen" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
-else {
+if (empty($conf->use_javascript_ajax)) {
+	print '<input type="submit" class="button buttongen" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
+} else {
 	print '<script type="text/javascript" language="javascript">
         jQuery(document).ready(function() {
         	jQuery("#objecttype").change(function() {
@@ -400,9 +412,15 @@ if ($mode == 'grid') {
 	print '<div class="divadvancedsearchfield">';
 	foreach ($object->fields as $key => $val) {
 		if (empty($val['measure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1))) {
-			if (in_array($key, array('id', 'rowid', 'entity', 'last_main_doc', 'extraparams'))) continue;
-			if (preg_match('/^fk_/', $key)) continue;
-			if (in_array($val['type'], array('html', 'text'))) continue;
+			if (in_array($key, array('id', 'rowid', 'entity', 'last_main_doc', 'extraparams'))) {
+				continue;
+			}
+			if (preg_match('/^fk_/', $key)) {
+				continue;
+			}
+			if (in_array($val['type'], array('html', 'text'))) {
+				continue;
+			}
 			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
 				$arrayofyaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position']);
 				$arrayofyaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position']);
@@ -445,8 +463,7 @@ print '</form>';
 
 // Generate the SQL request
 $sql = '';
-if (!empty($search_measures) && !empty($search_xaxis))
-{
+if (!empty($search_measures) && !empty($search_xaxis)) {
 	$fieldid = 'rowid';
 
 	$sql = 'SELECT ';
@@ -460,7 +477,9 @@ if (!empty($search_measures) && !empty($search_xaxis))
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
 			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as x_".$key.', ';
-		} else $sql .= $val.' as x_'.$key.', ';
+		} else {
+			$sql .= $val.' as x_'.$key.', ';
+		}
 	}
 	foreach ($search_groupby as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
@@ -472,11 +491,14 @@ if (!empty($search_measures) && !empty($search_xaxis))
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
 			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d') as g_".$key.', ';
-		} else $sql .= $val.' as g_'.$key.', ';
+		} else {
+			$sql .= $val.' as g_'.$key.', ';
+		}
 	}
 	foreach ($search_measures as $key => $val) {
-		if ($val == 't.count') $sql .= 'COUNT(t.'.$fieldid.') as y_'.$key.', ';
-		elseif (preg_match('/\-sum$/', $val)) {
+		if ($val == 't.count') {
+			$sql .= 'COUNT(t.'.$fieldid.') as y_'.$key.', ';
+		} elseif (preg_match('/\-sum$/', $val)) {
 			$tmpval = preg_replace('/\-sum$/', '', $val);
 			$sql .= 'SUM('.$db->ifsql($tmpval.' IS NULL', '0', $tmpval).') as y_'.$key.', ';
 		} elseif (preg_match('/\-average$/', $val)) {
@@ -507,7 +529,7 @@ if (!empty($search_measures) && !empty($search_xaxis))
 	}
 	$sql .= ' WHERE 1 = 1';
 	if ($object->ismultientitymanaged == 1) {
-   		$sql .= ' AND entity IN ('.getEntity($object->element).')';
+		$sql .= ' AND entity IN ('.getEntity($object->element).')';
 	}
 	foreach ($search_filters as $key => $val) {
 		// TODO Add the where here
@@ -523,7 +545,9 @@ if (!empty($search_measures) && !empty($search_xaxis))
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
 			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-		} else $sql .= $val.', ';
+		} else {
+			$sql .= $val.', ';
+		}
 	}
 	foreach ($search_groupby as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
@@ -535,7 +559,9 @@ if (!empty($search_measures) && !empty($search_xaxis))
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
 			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-		} else $sql .= $val.', ';
+		} else {
+			$sql .= $val.', ';
+		}
 	}
 	$sql = preg_replace('/,\s*$/', '', $sql);
 	$sql .= ' ORDER BY ';
@@ -549,7 +575,9 @@ if (!empty($search_measures) && !empty($search_xaxis))
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
 			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-		} else $sql .= $val.', ';
+		} else {
+			$sql .= $val.', ';
+		}
 	}
 	foreach ($search_groupby as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
@@ -561,7 +589,9 @@ if (!empty($search_measures) && !empty($search_xaxis))
 		} elseif (preg_match('/\-day$/', $val)) {
 			$tmpval = preg_replace('/\-day$/', '', $val);
 			$sql .= 'DATE_FORMAT('.$tmpval.", '%Y-%m-%d'), ";
-		} else $sql .= $val.', ';
+		} else {
+			$sql .= $val.', ';
+		}
 	}
 	$sql = preg_replace('/,\s*$/', '', $sql);
 }
@@ -607,7 +637,7 @@ if ($sql) {
 			$oldlabeltouse = $labeltouse;
 
 			/* Example of value for $arrayofvaluesforgroupby
-    		 * array (size=1)
+			 * array (size=1)
 			 *	  'g_0' =>
 			 *	    array (size=6)
 			 *	      0 => string '0' (length=1)
@@ -616,7 +646,7 @@ if ($sql) {
 			 *	      'done' => string 'done' (length=4)
 			 *	      'processing' => string 'processing' (length=10)
 			 *	      'undeployed' => string 'undeployed' (length=10)
-    		 */
+			 */
 			foreach ($search_measures as $key => $val) {
 				$gi = 0;
 				foreach ($search_groupby as $gkey) {
@@ -632,7 +662,9 @@ if ($sql) {
 						//var_dump('gvaluepossiblekey='.$gvaluepossiblekey.' gvaluepossiblelabel='.$gvaluepossiblelabel.' ykeysuffix='.$ykeysuffix.' gval='.$gval.' gvalwithoutsuffix='.$gvalwithoutprefix);
 						//var_dump('fieldforg='.$fieldforg.' obj->$fieldforg='.$obj->$fieldforg.' fieldfory='.$fieldfory.' obj->$fieldfory='.$obj->$fieldfory.' fieldforybis='.$fieldforybis);
 
-						if (!is_array($data[$xi])) $data[$xi] = array();
+						if (!is_array($data[$xi])) {
+							$data[$xi] = array();
+						}
 
 						if (!array_key_exists('label', $data[$xi])) {
 							$data[$xi] = array();
@@ -640,7 +672,9 @@ if ($sql) {
 						}
 
 						$objfieldforg = $obj->$fieldforg;
-						if (is_null($objfieldforg)) $objfieldforg = '__NULL__';
+						if (is_null($objfieldforg)) {
+							$objfieldforg = '__NULL__';
+						}
 
 						if ($gvaluepossiblekey == '0') {	// $gvaluepossiblekey can have type int or string. So we create a special if, used when value is '0'
 							//var_dump($objfieldforg.' == \'0\' -> '.($objfieldforg == '0'));
@@ -709,10 +743,9 @@ if ($mode == 'graph') {
 	// Show graph
 	$px1 = new DolGraph();
 	$mesg = $px1->isGraphKo();
-	if (!$mesg)
-	{
+	if (!$mesg) {
 		/*var_dump($legend);
-    	var_dump($data);*/
+		var_dump($data);*/
 		$px1->SetData($data);
 		unset($data);
 
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index d3a6d3a01c9..c6aaef77f9c 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -26,20 +26,36 @@
  *       \brief      File to manage popup date selector
  */
 
-if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1'); // disabled
+if (!defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1'); // disabled
+}
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');	// Not disabled cause need to load personalized language
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');	// Not disabled cause need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN')) define('NOLOGIN', 1); // disabled
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1); // disabled
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
 
 require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("main", "agenda"));
@@ -56,8 +72,7 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'."\n";
 print '<html>'."\n";
 print '<head>'."\n";
-if (GETPOST('mode') && GETPOST('mode') == 'test')
-{
+if (GETPOST('mode') && GETPOST('mode') == 'test') {
 	print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php"></script>'."\n";
 } else {
 	print '<title>'.$langs->trans("Calendar").'</title>';
@@ -80,8 +95,7 @@ $tradTemp = array(
 );
 print '<script type="text/javascript">';
 print 'var tradMonths = [';
-foreach ($tradTemp as $val)
-{
+foreach ($tradTemp as $val) {
 	print '"'.addslashes($val).'",';
 }
 print '""];';
@@ -93,18 +107,24 @@ print '<body>'."\n";
 
 $qualified = true;
 
-if (!isset($_GET["sd"])) $_GET["sd"] = "00000000";
+if (!isset($_GET["sd"])) {
+	$_GET["sd"] = "00000000";
+}
 
-if (!isset($_GET["m"]) || !isset($_GET["y"])) $qualified = false;
-if (isset($_GET["m"]) && isset($_GET["y"]))
-{
-	if ($_GET["m"] < 1 || $_GET["m"] > 12) $qualified = false;
-	if ($_GET["y"] < 0 || $_GET["y"] > 9999) $qualified = false;
+if (!isset($_GET["m"]) || !isset($_GET["y"])) {
+	$qualified = false;
+}
+if (isset($_GET["m"]) && isset($_GET["y"])) {
+	if ($_GET["m"] < 1 || $_GET["m"] > 12) {
+		$qualified = false;
+	}
+	if ($_GET["y"] < 0 || $_GET["y"] > 9999) {
+		$qualified = false;
+	}
 }
 
 // If parameters provided, we show calendar
-if ($qualified)
-{
+if ($qualified) {
 	//print $_GET["cm"].",".$_GET["sd"].",".$_GET["m"].",".$_GET["y"];exit;
 	displayBox(GETPOST("sd", 'alpha'), GETPOST("m", 'int'), GETPOST("y", 'int'));
 } else {
@@ -146,8 +166,7 @@ function displayBox($selectedDate, $month, $year)
 	//print "thedate=$thedate";
 	$today = dol_now();
 	$todayArray = dol_getdate($today);
-	if ($selectedDate != "00000000")
-	{
+	if ($selectedDate != "00000000") {
 		$selDate = xyzToUnixTimestamp($selectedDate);
 		$xyz = dol_print_date($selDate, "%Y%m%d");
 	} else {
@@ -171,11 +190,27 @@ function displayBox($selectedDate, $month, $year)
 		<td class="dpButtons"
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year - 1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;&lt;</td>
 		<td class="dpButtons"
-			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if ($month == 1) echo "12"; else echo $month - 1?>','<?php if ($month == 1) echo $year - 1; else echo $year?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;</td>
+			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if ($month == 1) {
+				echo "12";
+								} else {
+									echo $month - 1;
+								}?>','<?php if ($month == 1) {
+								echo $year - 1;
+								} else {
+									echo $year;
+								}?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&lt;</td>
 		<td colspan="3" class="dpButtons"
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo (int) dol_print_date($today, '%m')?>','<?php echo $todayArray["year"]?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')"><?php echo '-' ?></td>
 		<td class="dpButtons"
-			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if ($month == 12) echo "1"; else echo $month + 1?>','<?php if ($month == 12) echo $year + 1; else echo $year; ?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;</td>
+			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php if ($month == 12) {
+				echo "1";
+								} else {
+									echo $month + 1;
+								}?>','<?php if ($month == 12) {
+								echo $year + 1;
+								} else {
+									echo $year;
+								} ?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;</td>
 		<td class="dpButtons"
 			onClick="loadMonth('<?php echo DOL_URL_ROOT.'/core/' ?>','<?php echo $month?>','<?php echo $year + 1?>','<?php echo $xyz ?>','<?php echo $langs->defaultlang ?>')">&gt;&gt;</td>
 	</tr>
@@ -183,8 +218,7 @@ function displayBox($selectedDate, $month, $year)
 	<?php
 	$startday = isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : 1;
 	$day_names = array('ShortSunday', 'ShortMonday', 'ShortTuesday', 'ShortWednesday', 'ShortThursday', 'ShortFriday', 'ShortSaturday');
-	for ($i = 0; $i < 7; $i++)
-	{
+	for ($i = 0; $i < 7; $i++) {
 		echo '<td width="', (int) (($i + 1) * 100 / 7) - (int) ($i * 100 / 7), '%">', $langs->trans($day_names[($i + $startday) % 7]), '</td>', "\n";
 	}
 	print '</tr>';
@@ -195,19 +229,15 @@ function displayBox($selectedDate, $month, $year)
 
 	// Loop on each day of month
 	$stoploop = 0; $day = 1; $cols = 0;
-	while (!$stoploop)
-	{
+	while (!$stoploop) {
 		//print_r($mydate);
-		if ($mydate < $firstdate)	// At first run
-		{
+		if ($mydate < $firstdate) {	// At first run
 			echo "<tr class=\"dpWeek\">";
 			//echo $conf->global->MAIN_START_WEEK.' '.$firstdate["wday"].' '.$startday;
 			$cols = 0;
-			for ($i = 0; $i < 7; $i++)
-			{
+			for ($i = 0; $i < 7; $i++) {
 				$w = ($i + $startday) % 7;
-				if ($w == $firstdate["wday"])
-				{
+				if ($w == $firstdate["wday"]) {
 					$mydate = $firstdate;
 					break;
 				}
@@ -215,19 +245,20 @@ function displayBox($selectedDate, $month, $year)
 				$cols++;
 			}
 		} else {
-			if ($mydate["wday"] == $startday)
-			{
+			if ($mydate["wday"] == $startday) {
 				echo "<tr class=\"dpWeek\">";
 				$cols = 0;
 			}
 		}
 
 		$dayclass = "dpReg";
-		if ($thedate == $selDate) $dayclass = "dpSelected";
-		elseif ($thedate == $today) $dayclass = "dpToday";
+		if ($thedate == $selDate) {
+			$dayclass = "dpSelected";
+		} elseif ($thedate == $today) {
+			$dayclass = "dpToday";
+		}
 
-		if ($langs->trans("FormatDateShortJavaInput") == "FormatDateShortJavaInput")
-		{
+		if ($langs->trans("FormatDateShortJavaInput") == "FormatDateShortJavaInput") {
 			print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang;
 			exit;
 		}
@@ -239,30 +270,33 @@ function displayBox($selectedDate, $month, $year)
 		echo ">".sprintf("%02s", $mydate["mday"])."</td>";
 		$cols++;
 
-		if (($mydate["wday"] + 1) % 7 == $startday) echo "</TR>\n";
+		if (($mydate["wday"] + 1) % 7 == $startday) {
+			echo "</TR>\n";
+		}
 
 		//$thedate=strtotime("tomorrow",$thedate);
 		$day++;
 		$thedate = dol_mktime(12, 0, 0, $month, $day, $year);
-		if ($thedate == '')
-		{
+		if ($thedate == '') {
 			$stoploop = 1;
 		} else {
 			$mydate = dol_getdate($thedate);
-			if ($firstdate["month"] != $mydate["month"]) $stoploop = 1;
+			if ($firstdate["month"] != $mydate["month"]) {
+				$stoploop = 1;
+			}
 		}
 	}
 
-	if ($cols < 7)
-	{
-		for ($i = 6; $i >= $cols; $i--) echo "<td>&nbsp;</td>";
+	if ($cols < 7) {
+		for ($i = 6; $i >= $cols; $i--) {
+			echo "<td>&nbsp;</td>";
+		}
 		echo "</tr>\n";
 	}
 	?>
 	<tr>
 		<td id="dpExp" class="dpExplanation" colspan="7"><?php
-		if ($selDate)
-		{
+		if ($selDate) {
 			$tempDate = dol_getdate($selDate);
 			print $langs->trans("Month".$selectMonth)." ";
 			print sprintf("%02s", $tempDate["mday"]);
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index e900af925f4..2ed93a9b5f4 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -127,11 +127,9 @@ abstract class DoliDB implements Database
 	 */
 	public function begin()
 	{
-		if (!$this->transaction_opened)
-		{
+		if (!$this->transaction_opened) {
 			$ret = $this->query("BEGIN");
-			if ($ret)
-			{
+			if ($ret) {
 				$this->transaction_opened++;
 				dol_syslog("BEGIN Transaction", LOG_DEBUG);
 				dol_syslog('', 0, 1);
@@ -153,11 +151,9 @@ abstract class DoliDB implements Database
 	public function commit($log = '')
 	{
 		dol_syslog('', 0, -1);
-		if ($this->transaction_opened <= 1)
-		{
+		if ($this->transaction_opened <= 1) {
 			$ret = $this->query("COMMIT");
-			if ($ret)
-			{
+			if ($ret) {
 				$this->transaction_opened = 0;
 				dol_syslog("COMMIT Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
 				return 1;
@@ -179,8 +175,7 @@ abstract class DoliDB implements Database
 	public function rollback($log = '')
 	{
 		dol_syslog('', 0, -1);
-		if ($this->transaction_opened <= 1)
-		{
+		if ($this->transaction_opened <= 1) {
 			$ret = $this->query("ROLLBACK");
 			$this->transaction_opened = 0;
 			dol_syslog("ROLLBACK Transaction".($log ? ' '.$log : ''), LOG_DEBUG);
@@ -201,10 +196,17 @@ abstract class DoliDB implements Database
 	public function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit = $conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
+		if (empty($limit)) {
+			return "";
+		}
+		if ($limit < 0) {
+			$limit = $conf->liste_limit;
+		}
+		if ($offset > 0) {
+			return " LIMIT $offset,$limit ";
+		} else {
+			return " LIMIT $limit ";
+		}
 	}
 
 	/**
@@ -236,16 +238,18 @@ abstract class DoliDB implements Database
 	 */
 	public function order($sortfield = null, $sortorder = null)
 	{
-		if (!empty($sortfield))
-		{
+		if (!empty($sortfield)) {
 			$oldsortorder = '';
 			$return = '';
 			$fields = explode(',', $sortfield);
 			$orders = explode(',', $sortorder);
 			$i = 0;
 			foreach ($fields as $val) {
-				if (!$return) $return .= ' ORDER BY ';
-				else $return .= ', ';
+				if (!$return) {
+					$return .= ' ORDER BY ';
+				} else {
+					$return .= ', ';
+				}
 
 				$return .= preg_replace('/[^0-9a-z_\.]/i', '', $val); // Add field
 
@@ -292,7 +296,9 @@ abstract class DoliDB implements Database
 	public function jdate($string, $gm = 'tzserver')
 	{
 		// TODO $string should be converted into a GMT timestamp, so param gm should be set to true by default instead of false
-		if ($string == 0 || $string == "0000-00-00 00:00:00") return '';
+		if ($string == 0 || $string == "0000-00-00 00:00:00") {
+			return '';
+		}
 		$string = preg_replace('/([^0-9])/i', '', $string);
 		$tmp = $string.'000000';
 		$date = dol_mktime((int) substr($tmp, 8, 2), (int) substr($tmp, 10, 2), (int) substr($tmp, 12, 2), (int) substr($tmp, 4, 2), (int) substr($tmp, 6, 2), (int) substr($tmp, 0, 4), $gm);
@@ -321,8 +327,7 @@ abstract class DoliDB implements Database
 		$sql .= ' LIMIT 1;';
 
 		$res = $this->query($sql);
-		if ($res)
-		{
+		if ($res) {
 			return $this->fetch_object($res);
 		}
 
@@ -339,8 +344,7 @@ abstract class DoliDB implements Database
 	public function getRows($sql)
 	{
 		$res = $this->query($sql);
-		if ($res)
-		{
+		if ($res) {
 			$results = array();
 			if ($this->num_rows($res) > 0) {
 				while ($obj = $this->fetch_object($res)) {
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 2c24cfe7461..343f4c8cc3e 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -59,8 +59,12 @@ class DoliDBMysqli extends DoliDB
 		global $conf, $langs;
 
 		// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
-		if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		if (!empty($conf->db->character_set)) {
+			$this->forcecharset = $conf->db->character_set;
+		}
+		if (!empty($conf->db->dolibarr_main_db_collation)) {
+			$this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		}
 
 		$this->database_user = $user;
 		$this->database_host = $host;
@@ -70,16 +74,14 @@ class DoliDBMysqli extends DoliDB
 
 		//print "Name DB: $host,$user,$pass,$name<br>";
 
-		if (!class_exists('mysqli'))
-		{
+		if (!class_exists('mysqli')) {
 			$this->connected = false;
 			$this->ok = false;
 			$this->error = "Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.";
 			dol_syslog(get_class($this)."::DoliDBMysqli : Mysqli PHP functions for using Mysqli driver are not available in this version of PHP. Try to use another driver.", LOG_ERR);
 		}
 
-		if (!$host)
-		{
+		if (!$host) {
 			$this->connected = false;
 			$this->ok = false;
 			$this->error = $langs->trans("ErrorWrongHostParameter");
@@ -101,25 +103,29 @@ class DoliDBMysqli extends DoliDB
 		}
 
 		// If server connection is ok, we try to connect to the database
-		if ($this->connected && $name)
-		{
-			if ($this->select_db($name))
-			{
+		if ($this->connected && $name) {
+			if ($this->select_db($name)) {
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
 
 				// If client is old latin, we force utf8
 				$clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
-				if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
+				if (preg_match('/latin1/', $clientmustbe)) {
+					$clientmustbe = 'utf8';
+				}
 
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe); // This set charset, but with a bad collation
 
 					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
+					if (preg_match('/latin1/', $collation)) {
+						$collation = 'utf8_unicode_ci';
+					}
 
-					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+					if (!preg_match('/general/', $collation)) {
+						$this->db->query("SET collation_connection = ".$collation);
+					}
 				}
 			} else {
 				$this->database_selected = false;
@@ -132,21 +138,30 @@ class DoliDBMysqli extends DoliDB
 			// Pas de selection de base demandee, ok ou ko
 			$this->database_selected = false;
 
-			if ($this->connected)
-			{
+			if ($this->connected) {
 				// If client is old latin, we force utf8
 				$clientmustbe = empty($conf->db->dolibarr_main_db_character_set) ? 'utf8' : $conf->db->dolibarr_main_db_character_set;
-				if (preg_match('/latin1/', $clientmustbe)) $clientmustbe = 'utf8';
-				if (preg_match('/utf8mb4/', $clientmustbe)) $clientmustbe = 'utf8';
+				if (preg_match('/latin1/', $clientmustbe)) {
+					$clientmustbe = 'utf8';
+				}
+				if (preg_match('/utf8mb4/', $clientmustbe)) {
+					$clientmustbe = 'utf8';
+				}
 
 				if ($this->db->character_set_name() != $clientmustbe) {
 					$this->db->set_charset($clientmustbe); // This set utf8_unicode_ci
 
 					$collation = $conf->db->dolibarr_main_db_collation;
-					if (preg_match('/latin1/', $collation)) $collation = 'utf8_unicode_ci';
-					if (preg_match('/utf8mb4/', $collation)) $collation = 'utf8_unicode_ci';
+					if (preg_match('/latin1/', $collation)) {
+						$collation = 'utf8_unicode_ci';
+					}
+					if (preg_match('/utf8mb4/', $collation)) {
+						$collation = 'utf8_unicode_ci';
+					}
 
-					if (!preg_match('/general/', $collation)) $this->db->query("SET collation_connection = ".$collation);
+					if (!preg_match('/general/', $collation)) {
+						$this->db->query("SET collation_connection = ".$collation);
+					}
 				}
 			}
 		}
@@ -230,9 +245,10 @@ class DoliDBMysqli extends DoliDB
 	 */
 	public function close()
 	{
-		if ($this->db)
-		{
-			if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+		if ($this->db) {
+			if ($this->transaction_opened > 0) {
+				dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+			}
 			$this->connected = false;
 			return $this->db->close();
 		}
@@ -254,31 +270,31 @@ class DoliDBMysqli extends DoliDB
 
 		$query = trim($query);
 
-		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
-		{
+		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK'))) {
 			$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
 			dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
 		}
-		if (empty($query)) return false; // Return false = error if empty request
+		if (empty($query)) {
+			return false; // Return false = error if empty request
+		}
 
-		if (!$this->database_name)
-		{
+		if (!$this->database_name) {
 			// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 			$ret = $this->db->query($query);
 		} else {
 			$ret = $this->db->query($query);
 		}
 
-		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
-		{
+		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query)) {
 			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
-			if (!$ret)
-			{
+			if (!$ret) {
 				$this->lastqueryerror = $query;
 				$this->lasterror = $this->error();
 				$this->lasterrno = $this->errno();
 
-				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) {
+					dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+				}
 				dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterrno." ".$this->lasterror, LOG_ERR);
 				//var_dump(debug_print_backtrace());
 			}
@@ -300,7 +316,9 @@ class DoliDBMysqli extends DoliDB
 	{
 		// phpcs:enable
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		return $resultset->fetch_object();
 	}
 
@@ -316,7 +334,9 @@ class DoliDBMysqli extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		return $resultset->fetch_array();
 	}
 
@@ -331,9 +351,10 @@ class DoliDBMysqli extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_bool($resultset))
-		{
-			if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_bool($resultset)) {
+			if (!is_object($resultset)) {
+				$resultset = $this->_results;
+			}
 			return $resultset->fetch_row();
 		} else {
 			// si le curseur est un booleen on retourne la valeur 0
@@ -353,7 +374,9 @@ class DoliDBMysqli extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		return $resultset->num_rows;
 	}
 
@@ -369,7 +392,9 @@ class DoliDBMysqli extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		// mysql necessite un link de base pour cette fonction contrairement
 		// a pqsql qui prend un resultset
 		return $this->db->affected_rows;
@@ -385,9 +410,13 @@ class DoliDBMysqli extends DoliDB
 	public function free($resultset = null)
 	{
 		// If resultset not provided, we take the last used by connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		// Si resultset en est un, on libere la memoire
-		if (is_object($resultset)) $resultset->free_result();
+		if (is_object($resultset)) {
+			$resultset->free_result();
+		}
 	}
 
 	/**
@@ -503,13 +532,10 @@ class DoliDBMysqli extends DoliDB
 
 		$return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
-		if ($cryptType && !empty($cryptKey))
-		{
-			if ($cryptType == 2)
-			{
+		if ($cryptType && !empty($cryptKey)) {
+			if ($cryptType == 2) {
 				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-			} elseif ($cryptType == 1)
-			{
+			} elseif ($cryptType == 1) {
 				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
 			}
 		}
@@ -535,13 +561,10 @@ class DoliDBMysqli extends DoliDB
 
 		$return = $value;
 
-		if ($cryptType && !empty($cryptKey))
-		{
-			if ($cryptType == 2)
-			{
+		if ($cryptType && !empty($cryptKey)) {
+			if ($cryptType == 2) {
 				$return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-			} elseif ($cryptType == 1)
-			{
+			} elseif ($cryptType == 1) {
 				$return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
 			}
 		}
@@ -560,11 +583,12 @@ class DoliDBMysqli extends DoliDB
 	{
 		// phpcs:enable
 		$resql = $this->query('SELECT CONNECTION_ID()');
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $this->fetch_row($resql);
 			return $row[0];
-		} else return '?';
+		} else {
+			return '?';
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -582,8 +606,12 @@ class DoliDBMysqli extends DoliDB
 	public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
 	{
 		// phpcs:enable
-		if (empty($charset))   $charset = $this->forcecharset;
-		if (empty($collation)) $collation = $this->forcecollate;
+		if (empty($charset)) {
+			$charset = $this->forcecharset;
+		}
+		if (empty($collation)) {
+			$collation = $this->forcecollate;
+		}
 
 		// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
 		$sql = "CREATE DATABASE `".$this->escape($database)."`";
@@ -591,8 +619,7 @@ class DoliDBMysqli extends DoliDB
 
 		dol_syslog($sql, LOG_DEBUG);
 		$ret = $this->query($sql);
-		if (!$ret)
-		{
+		if (!$ret) {
 			// We try again for compatibility with Mysql < 4.1.1
 			$sql = "CREATE DATABASE `".$this->escape($database)."`";
 			dol_syslog($sql, LOG_DEBUG);
@@ -615,14 +642,14 @@ class DoliDBMysqli extends DoliDB
 		$listtables = array();
 
 		$like = '';
-		if ($table) $like = "LIKE '".$table."'";
+		if ($table) {
+			$like = "LIKE '".$table."'";
+		}
 		$sql = "SHOW TABLES FROM ".$database." ".$like.";";
 		//print $sql;
 		$result = $this->query($sql);
-		if ($result)
-		{
-			while ($row = $this->fetch_row($result))
-			{
+		if ($result) {
+			while ($row = $this->fetch_row($result)) {
 				$listtables[] = $row[0];
 			}
 		}
@@ -645,10 +672,8 @@ class DoliDBMysqli extends DoliDB
 
 		dol_syslog($sql, LOG_DEBUG);
 		$result = $this->query($sql);
-		if ($result)
-		{
-			while ($row = $this->fetch_row($result))
-			{
+		if ($result) {
+			while ($row = $this->fetch_row($result)) {
 				$infotables[] = $row;
 			}
 		}
@@ -678,8 +703,7 @@ class DoliDBMysqli extends DoliDB
 		$sql = "CREATE TABLE ".$table."(";
 		$i = 0;
 		$sqlfields = array();
-		foreach ($fields as $field_name => $field_desc)
-		{
+		foreach ($fields as $field_name => $field_desc) {
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i] .= $field_desc['type'];
 			if (preg_match("/^[^\s]/i", $field_desc['value'])) {
@@ -688,8 +712,7 @@ class DoliDBMysqli extends DoliDB
 			if (preg_match("/^[^\s]/i", $field_desc['attribute'])) {
 				$sqlfields[$i]  .= " ".$field_desc['attribute'];
 			}
-			if (preg_match("/^[^\s]/i", $field_desc['default']))
-			{
+			if (preg_match("/^[^\s]/i", $field_desc['default'])) {
 				if ((preg_match("/null/i", $field_desc['default'])) || (preg_match("/CURRENT_TIMESTAMP/i", $field_desc['default']))) {
 					$sqlfields[$i]  .= " default ".$field_desc['default'];
 				} else {
@@ -704,38 +727,41 @@ class DoliDBMysqli extends DoliDB
 			}
 			$i++;
 		}
-		if ($primary_key != "")
-		$pk = "primary key(".$primary_key.")";
+		if ($primary_key != "") {
+			$pk = "primary key(".$primary_key.")";
+		}
 
 		if (is_array($unique_keys)) {
 			$i = 0;
-			foreach ($unique_keys as $key => $value)
-			{
+			foreach ($unique_keys as $key => $value) {
 				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
 				$i++;
 			}
 		}
-		if (is_array($keys))
-		{
+		if (is_array($keys)) {
 			$i = 0;
-			foreach ($keys as $key => $value)
-			{
+			foreach ($keys as $key => $value) {
 				$sqlk[$i] = "KEY ".$key." (".$value.")";
 				$i++;
 			}
 		}
 		$sql .= implode(',', $sqlfields);
-		if ($primary_key != "")
-		$sql .= ",".$pk;
-		if ($unique_keys != "")
-		$sql .= ",".implode(',', $sqluq);
-		if (is_array($keys))
-		$sql .= ",".implode(',', $sqlk);
+		if ($primary_key != "") {
+			$sql .= ",".$pk;
+		}
+		if ($unique_keys != "") {
+			$sql .= ",".implode(',', $sqluq);
+		}
+		if (is_array($keys)) {
+			$sql .= ",".implode(',', $sqlk);
+		}
 		$sql .= ") engine=".$type;
 
-		if (!$this->query($sql))
-		return -1;
-		else return 1;
+		if (!$this->query($sql)) {
+			return -1;
+		} else {
+			return 1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -750,9 +776,11 @@ class DoliDBMysqli extends DoliDB
 		// phpcs:enable
 		$sql = "DROP TABLE ".$table;
 
-		if (!$this->query($sql))
- 			return -1;
-		else return 1;
+		if (!$this->query($sql)) {
+			return -1;
+		} else {
+			return 1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -790,29 +818,25 @@ class DoliDBMysqli extends DoliDB
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
-		if (preg_match("/^[^\s]/i", $field_desc['value']))
-		{
-			if (!in_array($field_desc['type'], array('date', 'datetime')) && $field_desc['value'])
-			{
+		if (preg_match("/^[^\s]/i", $field_desc['value'])) {
+			if (!in_array($field_desc['type'], array('date', 'datetime')) && $field_desc['value']) {
 				$sql .= "(".$field_desc['value'].")";
 			}
 		}
-		if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i", $field_desc['attribute']))
-		{
+		if (isset($field_desc['attribute']) && preg_match("/^[^\s]/i", $field_desc['attribute'])) {
 			$sql .= " ".$field_desc['attribute'];
 		}
-		if (isset($field_desc['null']) && preg_match("/^[^\s]/i", $field_desc['null']))
-		{
+		if (isset($field_desc['null']) && preg_match("/^[^\s]/i", $field_desc['null'])) {
 			$sql .= " ".$field_desc['null'];
 		}
-		if (isset($field_desc['default']) && preg_match("/^[^\s]/i", $field_desc['default']))
-		{
-			if (preg_match("/null/i", $field_desc['default']))
-			$sql .= " default ".$field_desc['default'];
-			else $sql .= " default '".$this->escape($field_desc['default'])."'";
+		if (isset($field_desc['default']) && preg_match("/^[^\s]/i", $field_desc['default'])) {
+			if (preg_match("/null/i", $field_desc['default'])) {
+				$sql .= " default ".$field_desc['default'];
+			} else {
+				$sql .= " default '".$this->escape($field_desc['default'])."'";
+			}
 		}
-		if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra']))
-		{
+		if (isset($field_desc['extra']) && preg_match("/^[^\s]/i", $field_desc['extra'])) {
 			$sql .= " ".$field_desc['extra'];
 		}
 		$sql .= " ".$field_position;
@@ -841,15 +865,12 @@ class DoliDBMysqli extends DoliDB
 		if (in_array($field_desc['type'], array('double', 'tinyint', 'int', 'varchar')) && $field_desc['value']) {
 			$sql .= "(".$field_desc['value'].")";
 		}
-		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
-		{
+		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL') {
 			// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
-			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
-			{
+			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text') {
 				$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
 				$this->query($sqlbis);
-			} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
-			{
+			} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') {
 				$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
 				$this->query($sqlbis);
 			}
@@ -857,16 +878,20 @@ class DoliDBMysqli extends DoliDB
 			$sql .= " NOT NULL";
 		}
 
-		if ($field_desc['default'] != '')
-		{
-			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
-			elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
+		if ($field_desc['default'] != '') {
+			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') {
+				$sql .= " DEFAULT ".$this->escape($field_desc['default']);
+			} elseif ($field_desc['type'] != 'text') {
+				$sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
+			}
 		}
 
 		dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
-		if (!$this->query($sql))
-		return -1;
-		else return 1;
+		if (!$this->query($sql)) {
+			return -1;
+		} else {
+			return 1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -906,10 +931,8 @@ class DoliDBMysqli extends DoliDB
 		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
 		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
 		$resql = $this->query($sql);
-		if (!$resql)
-		{
-			if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
-			{
+		if (!$resql) {
+			if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS') {
 				return -1;
 			} else {
 				// If user already exists, we continue to set permissions
@@ -924,8 +947,7 @@ class DoliDBMysqli extends DoliDB
 		$sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
 		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
 		$resql = $this->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = "Connected user not allowed to GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."'  IDENTIFIED BY '*****'";
 			return -1;
 		}
@@ -934,8 +956,7 @@ class DoliDBMysqli extends DoliDB
 
 		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
 		$resql = $this->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			return -1;
 		}
 
@@ -952,8 +973,7 @@ class DoliDBMysqli extends DoliDB
 	public function getDefaultCharacterSetDatabase()
 	{
 		$resql = $this->query('SHOW VARIABLES LIKE \'character_set_database\'');
-		if (!$resql)
-		{
+		if (!$resql) {
 			// version Mysql < 4.1.1
 			return $this->forcecharset;
 		}
@@ -972,11 +992,9 @@ class DoliDBMysqli extends DoliDB
 	{
 		$resql = $this->query('SHOW CHARSET');
 		$liste = array();
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
-			while ($obj = $this->fetch_object($resql))
-			{
+			while ($obj = $this->fetch_object($resql)) {
 				$liste[$i]['charset'] = $obj->Charset;
 				$liste[$i]['description'] = $obj->Description;
 				$i++;
@@ -998,8 +1016,7 @@ class DoliDBMysqli extends DoliDB
 	public function getDefaultCollationDatabase()
 	{
 		$resql = $this->query('SHOW VARIABLES LIKE \'collation_database\'');
-		if (!$resql)
-		{
+		if (!$resql) {
 			// version Mysql < 4.1.1
 			return $this->forcecollate;
 		}
@@ -1018,11 +1035,9 @@ class DoliDBMysqli extends DoliDB
 	{
 		$resql = $this->query('SHOW COLLATION');
 		$liste = array();
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
-			while ($obj = $this->fetch_object($resql))
-			{
+			while ($obj = $this->fetch_object($resql)) {
 				$liste[$i]['collation'] = $obj->Collation;
 				$i++;
 			}
@@ -1044,8 +1059,7 @@ class DoliDBMysqli extends DoliDB
 		$fullpathofdump = '/pathtomysqldump/mysqldump';
 
 		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-		if ($resql)
-		{
+		if ($resql) {
 			$liste = $this->fetch_array($resql);
 			$basedir = $liste['Value'];
 			$fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
@@ -1063,8 +1077,7 @@ class DoliDBMysqli extends DoliDB
 		$fullpathofimport = '/pathtomysql/mysql';
 
 		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-		if ($resql)
-		{
+		if ($resql) {
 			$liste = $this->fetch_array($resql);
 			$basedir = $liste['Value'];
 			$fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
@@ -1083,11 +1096,14 @@ class DoliDBMysqli extends DoliDB
 		$result = array();
 
 		$sql = 'SHOW VARIABLES';
-		if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+		if ($filter) {
+			$sql .= " LIKE '".$this->escape($filter)."'";
+		}
 		$resql = $this->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
+		if ($resql) {
+			while ($obj = $this->fetch_object($resql)) {
+				$result[$obj->Variable_name] = $obj->Value;
+			}
 		}
 
 		return $result;
@@ -1104,11 +1120,14 @@ class DoliDBMysqli extends DoliDB
 		$result = array();
 
 		$sql = 'SHOW STATUS';
-		if ($filter) $sql .= " LIKE '".$this->escape($filter)."'";
+		if ($filter) {
+			$sql .= " LIKE '".$this->escape($filter)."'";
+		}
 		$resql = $this->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->fetch_object($resql)) $result[$obj->Variable_name] = $obj->Value;
+		if ($resql) {
+			while ($obj = $this->fetch_object($resql)) {
+				$result[$obj->Variable_name] = $obj->Value;
+			}
 		}
 
 		return $result;
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 6ceb39b7080..83d00ba8a2a 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -73,8 +73,12 @@ class DoliDBPgsql extends DoliDB
 		global $conf, $langs;
 
 		// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
-		if (!empty($conf->db->dolibarr_main_db_collation))	$this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		if (!empty($conf->db->character_set)) {
+			$this->forcecharset = $conf->db->character_set;
+		}
+		if (!empty($conf->db->dolibarr_main_db_collation)) {
+			$this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		}
 
 		$this->database_user = $user;
 		$this->database_host = $host;
@@ -84,8 +88,7 @@ class DoliDBPgsql extends DoliDB
 
 		//print "Name DB: $host,$user,$pass,$name<br>";
 
-		if (!function_exists("pg_connect"))
-		{
+		if (!function_exists("pg_connect")) {
 			$this->connected = false;
 			$this->ok = false;
 			$this->error = "Pgsql PHP functions are not available in this version of PHP";
@@ -93,8 +96,7 @@ class DoliDBPgsql extends DoliDB
 			return $this->ok;
 		}
 
-		if (!$host)
-		{
+		if (!$host) {
 			$this->connected = false;
 			$this->ok = false;
 			$this->error = $langs->trans("ErrorWrongHostParameter");
@@ -106,8 +108,7 @@ class DoliDBPgsql extends DoliDB
 		//print "$host, $user, $pass, $name, $port";
 		$this->db = $this->connect($host, $user, $pass, $name, $port);
 
-		if ($this->db)
-		{
+		if ($this->db) {
 			$this->connected = true;
 			$this->ok = true;
 		} else {
@@ -119,10 +120,8 @@ class DoliDBPgsql extends DoliDB
 		}
 
 		// Si connexion serveur ok et si connexion base demandee, on essaie connexion base
-		if ($this->connected && $name)
-		{
-			if ($this->select_db($name))
-			{
+		if ($this->connected && $name) {
+			if ($this->select_db($name)) {
 				$this->database_selected = true;
 				$this->database_name = $name;
 				$this->ok = true;
@@ -159,12 +158,10 @@ class DoliDBPgsql extends DoliDB
 			return '';
 		}
 		// Return line if this is a comment
-		if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line))
-		{
+		if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line)) {
 			return $line;
 		}
-		if ($line != "")
-		{
+		if ($line != "") {
 			// group_concat support (PgSQL >= 9.0)
 			// Replace group_concat(x) or group_concat(x SEPARATOR ',') with string_agg(x, ',')
 			$line = preg_replace('/GROUP_CONCAT/i', 'STRING_AGG', $line);
@@ -172,17 +169,19 @@ class DoliDBPgsql extends DoliDB
 			$line = preg_replace('/STRING_AGG\(([^,\)]+)\)/i', 'STRING_AGG(\\1, \',\')', $line);
 			//print $line."\n";
 
-			if ($type == 'auto')
-			{
-				if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
-				elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
-				elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
+			if ($type == 'auto') {
+				if (preg_match('/ALTER TABLE/i', $line)) {
+					$type = 'dml';
+				} elseif (preg_match('/CREATE TABLE/i', $line)) {
+					$type = 'dml';
+				} elseif (preg_match('/DROP TABLE/i', $line)) {
+					$type = 'dml';
+				}
 			}
 
 			$line = preg_replace('/ as signed\)/i', ' as integer)', $line);
 
-			if ($type == 'dml')
-			{
+			if ($type == 'dml') {
 				$reg = array();
 
 				$line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
@@ -247,8 +246,7 @@ class DoliDBPgsql extends DoliDB
 				$line = preg_replace('/(\s*)ON(\s*)UPDATE(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
 
 				// unique index(field1,field2)
-				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
-				{
+				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line)) {
 					$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
 				}
 
@@ -259,15 +257,13 @@ class DoliDBPgsql extends DoliDB
 				$line = preg_replace('/ALTER TABLE [a-z0-9_]+\s+DROP INDEX/i', 'DROP INDEX', $line);
 
 				// Translate order to rename fields
-				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg)) {
 					$line = "-- ".$line." replaced by --\n";
 					$line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
 				}
 
 				// Translate order to modify field format
-				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+)\s+MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg)) {
 					$line = "-- ".$line." replaced by --\n";
 					$newreg3 = $reg[3];
 					$newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
@@ -281,40 +277,35 @@ class DoliDBPgsql extends DoliDB
 
 				// alter table add primary key (field1, field2 ...) -> We remove the primary key name not accepted by PostGreSQL
 				// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity)
-				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg)) {
 					$line = "-- ".$line." replaced by --\n";
 					$line .= "ALTER TABLE ".$reg[1]." ADD PRIMARY KEY (".$reg[3];
 				}
 
 				// Translate order to drop primary keys
 				// ALTER TABLE llx_dolibarr_modules DROP PRIMARY KEY pk_xxx
-				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+PRIMARY\s+KEY\s*([^;]+)$/i', $line, $reg)) {
 					$line = "-- ".$line." replaced by --\n";
 					$line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
 				}
 
 				// Translate order to drop foreign keys
 				// ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx
-				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg)) {
 					$line = "-- ".$line." replaced by --\n";
 					$line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
 				}
 
 				// Translate order to add foreign keys
 				// ALTER TABLE llx_tablechild ADD CONSTRAINT fk_tablechild_fk_fieldparent FOREIGN KEY (fk_fieldparent) REFERENCES llx_tableparent (rowid)
-				if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER\s+TABLE\s+(.*)\s*ADD CONSTRAINT\s+(.*)\s*FOREIGN\s+KEY\s*(.*)$/i', $line, $reg)) {
 					$line = preg_replace('/;$/', '', $line);
 					$line .= " DEFERRABLE INITIALLY IMMEDIATE;";
 				}
 
 				// alter table add [unique] [index] (field1, field2 ...)
 				// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
-				{
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg)) {
 					$fieldlist = $reg[4];
 					$idxname = $reg[3];
 					$tablename = $reg[1];
@@ -326,8 +317,7 @@ class DoliDBPgsql extends DoliDB
 			// To have postgresql case sensitive
 			$count_like = 0;
 			$line = str_replace(' LIKE \'', ' ILIKE \'', $line, $count_like);
-			if (!empty($conf->global->PSQL_USE_UNACCENT) && $count_like > 0)
-			{
+			if (!empty($conf->global->PSQL_USE_UNACCENT) && $count_like > 0) {
 				// @see https://docs.postgresql.fr/11/unaccent.html : 'unaccent()' function must be installed before
 				$line = preg_replace('/\s+(\(+\s*)([a-zA-Z0-9\-\_\.]+) ILIKE /', ' \1unaccent(\2) ILIKE ', $line);
 			}
@@ -339,10 +329,8 @@ class DoliDBPgsql extends DoliDB
 
 			// Delete using criteria on other table must not declare twice the deleted table
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
-			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', $line, $reg))
-			{
-				if ($reg[1] == $reg[2])	// If same table, we remove second one
-				{
+			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', $line, $reg)) {
+				if ($reg[1] == $reg[2]) {	// If same table, we remove second one
 					$line = preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
 				}
 			}
@@ -371,7 +359,9 @@ class DoliDBPgsql extends DoliDB
 			// By default we do not (should be already done by db->escape function if required
 			// except for sql insert in data file that are mysql escaped so we removed them to
 			// be compatible with standard_conforming_strings=on that considers \ as ordinary character).
-			if ($unescapeslashquot) $line = preg_replace("/\\\'/", "''", $line);
+			if ($unescapeslashquot) {
+				$line = preg_replace("/\\\'/", "''", $line);
+			}
 
 			//print "type=".$type." newline=".$line."<br>\n";
 		}
@@ -422,28 +412,31 @@ class DoliDBPgsql extends DoliDB
 		$name = str_replace(array("\\", "'"), array("\\\\", "\\'"), $name);
 		$port = str_replace(array("\\", "'"), array("\\\\", "\\'"), $port);
 
-		if (!$name) $name = "postgres"; // When try to connect using admin user
+		if (!$name) {
+			$name = "postgres"; // When try to connect using admin user
+		}
 
 		// try first Unix domain socket (local)
-		if ((!empty($host) && $host == "socket") && !defined('NOLOCALSOCKETPGCONNECT'))
-		{
+		if ((!empty($host) && $host == "socket") && !defined('NOLOCALSOCKETPGCONNECT')) {
 			$con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'"; // $name may be empty
 			$this->db = @pg_connect($con_string);
 		}
 
 		// if local connection failed or not requested, use TCP/IP
-		if (!$this->db)
-		{
-			if (!$host) $host = "localhost";
-			if (!$port) $port = 5432;
+		if (!$this->db) {
+			if (!$host) {
+				$host = "localhost";
+			}
+			if (!$port) {
+				$port = 5432;
+			}
 
 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
 			$this->db = @pg_connect($con_string);
 		}
 
 		// now we test if at least one connect method was a success
-		if ($this->db)
-		{
+		if ($this->db) {
 			$this->database_name = $name;
 			pg_set_error_verbosity($this->db, PGSQL_ERRORS_VERBOSE); // Set verbosity to max
 			pg_query($this->db, "set datestyle = 'ISO, YMD';");
@@ -460,8 +453,7 @@ class DoliDBPgsql extends DoliDB
 	public function getVersion()
 	{
 		$resql = $this->query('SHOW server_version');
-		if ($resql)
-		{
+		if ($resql) {
 			$liste = $this->fetch_array($resql);
 			return $liste['server_version'];
 		}
@@ -486,9 +478,10 @@ class DoliDBPgsql extends DoliDB
 	 */
 	public function close()
 	{
-		if ($this->db)
-		{
-			if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+		if ($this->db) {
+			if ($this->transaction_opened > 0) {
+				dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+			}
 			$this->connected = false;
 			return pg_close($this->db);
 		}
@@ -513,27 +506,24 @@ class DoliDBPgsql extends DoliDB
 		$query = $this->convertSQLFromMysql($query, $type, ($this->unescapeslashquot && $this->standard_conforming_strings));
 		//print "After convertSQLFromMysql:\n".$query."<br>\n";
 
-		if (!empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST))
-		{
+		if (!empty($conf->global->MAIN_DB_AUTOFIX_BAD_SQL_REQUEST)) {
 			// Fix bad formed requests. If request contains a date without quotes, we fix this but this should not occurs.
 			$loop = true;
-			while ($loop)
-			{
-				if (preg_match('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', $query))
-				{
+			while ($loop) {
+				if (preg_match('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', $query)) {
 					$query = preg_replace('/([^\'])([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9])/', '\\1\'\\2\'', $query);
 					dol_syslog("Warning: Bad formed request converted into ".$query, LOG_WARNING);
-				} else $loop = false;
+				} else {
+					$loop = false;
+				}
 			}
 		}
 
-		if ($usesavepoint && $this->transaction_opened)
-		{
+		if ($usesavepoint && $this->transaction_opened) {
 			@pg_query($this->db, 'SAVEPOINT mysavepoint');
 		}
 
-		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
-		{
+		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK'))) {
 			$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
 			dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
 		}
@@ -541,23 +531,21 @@ class DoliDBPgsql extends DoliDB
 		$ret = @pg_query($this->db, $query);
 
 		//print $query;
-		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
-		{
-			if (!$ret)
-			{
-				if ($this->errno() != 'DB_ERROR_25P02')	// Do not overwrite errors if this is a consecutive error
-				{
+		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query)) { // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+			if (!$ret) {
+				if ($this->errno() != 'DB_ERROR_25P02') {	// Do not overwrite errors if this is a consecutive error
 					$this->lastqueryerror = $query;
 					$this->lasterror = $this->error();
 					$this->lasterrno = $this->errno();
 
-					if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+					if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) {
+						dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+					}
 					dol_syslog(get_class($this)."::query SQL Error message: ".$this->lasterror." (".$this->lasterrno.")", LOG_ERR);
 					dol_syslog(get_class($this)."::query SQL Error usesavepoint = ".$usesavepoint, LOG_ERR);
 				}
 
-				if ($usesavepoint && $this->transaction_opened)	// Warning, after that errno will be erased
-				{
+				if ($usesavepoint && $this->transaction_opened) {	// Warning, after that errno will be erased
 					@pg_query($this->db, 'ROLLBACK TO SAVEPOINT mysavepoint');
 				}
 			}
@@ -579,7 +567,9 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) { $resultset = $this->_results; }
+		if (!is_resource($resultset)) {
+			$resultset = $this->_results;
+		}
 		return pg_fetch_object($resultset);
 	}
 
@@ -594,7 +584,9 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) { $resultset = $this->_results; }
+		if (!is_resource($resultset)) {
+			$resultset = $this->_results;
+		}
 		return pg_fetch_array($resultset);
 	}
 
@@ -609,7 +601,9 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (!is_resource($resultset)) { $resultset = $this->_results; }
+		if (!is_resource($resultset)) {
+			$resultset = $this->_results;
+		}
 		return pg_fetch_row($resultset);
 	}
 
@@ -625,7 +619,9 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) { $resultset = $this->_results; }
+		if (!is_resource($resultset)) {
+			$resultset = $this->_results;
+		}
 		return pg_num_rows($resultset);
 	}
 
@@ -641,7 +637,9 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) { $resultset = $this->_results; }
+		if (!is_resource($resultset)) {
+			$resultset = $this->_results;
+		}
 		// pgsql necessite un resultset pour cette fonction contrairement
 		// a mysql qui prend un link de base
 		return pg_affected_rows($resultset);
@@ -657,9 +655,13 @@ class DoliDBPgsql extends DoliDB
 	public function free($resultset = null)
 	{
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) { $resultset = $this->_results; }
+		if (!is_resource($resultset)) {
+			$resultset = $this->_results;
+		}
 		// Si resultset en est un, on libere la memoire
-		if (is_resource($resultset)) pg_free_result($resultset);
+		if (is_resource($resultset)) {
+			pg_free_result($resultset);
+		}
 	}
 
 
@@ -673,10 +675,17 @@ class DoliDBPgsql extends DoliDB
 	public function plimit($limit = 0, $offset = 0)
 	{
 		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit = $conf->liste_limit;
-		if ($offset > 0) return " LIMIT ".$limit." OFFSET ".$offset." ";
-		else return " LIMIT $limit ";
+		if (empty($limit)) {
+			return "";
+		}
+		if ($limit < 0) {
+			$limit = $conf->liste_limit;
+		}
+		if ($offset > 0) {
+			return " LIMIT ".$limit." OFFSET ".$offset." ";
+		} else {
+			return " LIMIT $limit ";
+		}
 	}
 
 
@@ -748,11 +757,9 @@ class DoliDBPgsql extends DoliDB
 
 			$errorlabel = pg_last_error($this->db);
 			$errorcode = '';
-			if (preg_match('/: *([0-9P]+):/', $errorlabel, $reg))
-			{
+			if (preg_match('/: *([0-9P]+):/', $errorlabel, $reg)) {
 				$errorcode = $reg[1];
-				if (isset($errorcode_map[$errorcode]))
-				{
+				if (isset($errorcode_map[$errorcode])) {
 					return $errorcode_map[$errorcode];
 				}
 			}
@@ -792,8 +799,7 @@ class DoliDBPgsql extends DoliDB
 		// phpcs:enable
 		//$result = pg_query($this->db,"SELECT MAX(".$fieldid.") FROM ".$tab);
 		$result = pg_query($this->db, "SELECT currval('".$tab."_".$fieldid."_seq')");
-		if (!$result)
-		{
+		if (!$result) {
 			print pg_last_error($this->db);
 			exit;
 		}
@@ -875,8 +881,12 @@ class DoliDBPgsql extends DoliDB
 	public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
 	{
 		// phpcs:enable
-		if (empty($charset))   $charset = $this->forcecharset;
-		if (empty($collation)) $collation = $this->forcecollate;
+		if (empty($charset)) {
+			$charset = $this->forcecharset;
+		}
+		if (empty($collation)) {
+			$collation = $this->forcecollate;
+		}
 
 		// Test charset match LC_TYPE (pgsql error otherwise)
 		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
@@ -901,12 +911,12 @@ class DoliDBPgsql extends DoliDB
 		$listtables = array();
 
 		$like = '';
-		if ($table) $like = " AND table_name LIKE '".$this->escape($table)."'";
+		if ($table) {
+			$like = " AND table_name LIKE '".$this->escape($table)."'";
+		}
 		$result = pg_query($this->db, "SELECT table_name FROM information_schema.tables WHERE table_schema = 'public'".$like." ORDER BY table_name");
-		if ($result)
-		{
-			while ($row = $this->fetch_row($result))
-			{
+		if ($result) {
+			while ($row = $this->fetch_row($result)) {
 				$listtables[] = $row[0];
 			}
 		}
@@ -944,10 +954,8 @@ class DoliDBPgsql extends DoliDB
 
 		dol_syslog($sql, LOG_DEBUG);
 		$result = $this->query($sql);
-		if ($result)
-		{
-			while ($row = $this->fetch_row($result))
-			{
+		if ($result) {
+			while ($row = $this->fetch_row($result)) {
 				$infotables[] = $row;
 			}
 		}
@@ -977,60 +985,62 @@ class DoliDBPgsql extends DoliDB
 		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "create table ".$table."(";
 		$i = 0;
-		foreach ($fields as $field_name => $field_desc)
-		{
+		foreach ($fields as $field_name => $field_desc) {
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i] .= $field_desc['type'];
-			if (preg_match("/^[^\s]/i", $field_desc['value']))
+			if (preg_match("/^[^\s]/i", $field_desc['value'])) {
 				$sqlfields[$i] .= "(".$field_desc['value'].")";
-			elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
+			} elseif (preg_match("/^[^\s]/i", $field_desc['attribute'])) {
 				$sqlfields[$i] .= " ".$field_desc['attribute'];
-			elseif (preg_match("/^[^\s]/i", $field_desc['default']))
-			{
-				if (preg_match("/null/i", $field_desc['default']))
+			} elseif (preg_match("/^[^\s]/i", $field_desc['default'])) {
+				if (preg_match("/null/i", $field_desc['default'])) {
 					$sqlfields[$i] .= " default ".$field_desc['default'];
-				else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
-			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+				} else {
+					$sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
+				}
+			} elseif (preg_match("/^[^\s]/i", $field_desc['null'])) {
 				$sqlfields[$i]  .= " ".$field_desc['null'];
-
-			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
+			} elseif (preg_match("/^[^\s]/i", $field_desc['extra'])) {
 				$sqlfields[$i]  .= " ".$field_desc['extra'];
+			}
 			$i++;
 		}
-		if ($primary_key != "")
-		$pk = "primary key(".$primary_key.")";
+		if ($primary_key != "") {
+			$pk = "primary key(".$primary_key.")";
+		}
 
-		if (is_array($unique_keys))
-		{
+		if (is_array($unique_keys)) {
 			$i = 0;
-			foreach ($unique_keys as $key => $value)
-			{
+			foreach ($unique_keys as $key => $value) {
 				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
 				$i++;
 			}
 		}
-		if (is_array($keys))
-		{
+		if (is_array($keys)) {
 			$i = 0;
-			foreach ($keys as $key => $value)
-			{
+			foreach ($keys as $key => $value) {
 				$sqlk[$i] = "KEY ".$key." (".$value.")";
 				$i++;
 			}
 		}
 		$sql .= implode(',', $sqlfields);
-		if ($primary_key != "")
-		$sql .= ",".$pk;
-		if (is_array($unique_keys))
-		$sql .= ",".implode(',', $sqluq);
-		if (is_array($keys))
-		$sql .= ",".implode(',', $sqlk);
+		if ($primary_key != "") {
+			$sql .= ",".$pk;
+		}
+		if (is_array($unique_keys)) {
+			$sql .= ",".implode(',', $sqluq);
+		}
+		if (is_array($keys)) {
+			$sql .= ",".implode(',', $sqlk);
+		}
 		$sql .= ") type=".$type;
 
 		dol_syslog($sql, LOG_DEBUG);
-		if (!$this->query($sql))
-		return -1;
-		else return 1;
+		if (!$this->query($sql)) {
+			return -1;
+		} else {
+			return 1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1045,9 +1055,11 @@ class DoliDBPgsql extends DoliDB
 		// phpcs:enable
 		$sql = "DROP TABLE ".$table;
 
-		if (!$this->query($sql))
+		if (!$this->query($sql)) {
 			return -1;
-		else return 1;
+		} else {
+			return 1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1068,8 +1080,7 @@ class DoliDBPgsql extends DoliDB
 
 		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
 		$resql = $this->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			return -1;
 		}
 
@@ -1089,7 +1100,9 @@ class DoliDBPgsql extends DoliDB
 		// phpcs:enable
 		$sql = "SELECT attname FROM pg_attribute, pg_type WHERE typname = '".$this->escape($table)."' AND attrelid = typrelid";
 		$sql .= " AND attname NOT IN ('cmin', 'cmax', 'ctid', 'oid', 'tableoid', 'xmin', 'xmax')";
-		if ($field) $sql .= " AND attname = '".$this->escape($field)."'";
+		if ($field) {
+			$sql .= " AND attname = '".$this->escape($field)."'";
+		}
 
 		dol_syslog($sql, LOG_DEBUG);
 		$this->_results = $this->query($sql);
@@ -1114,15 +1127,16 @@ class DoliDBPgsql extends DoliDB
 		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
 		if (preg_match("/^[^\s]/i", $field_desc['value'])) {
-			if (!in_array($field_desc['type'], array('int', 'date', 'datetime')) && $field_desc['value'])
-			{
+			if (!in_array($field_desc['type'], array('int', 'date', 'datetime')) && $field_desc['value']) {
 				$sql .= "(".$field_desc['value'].")";
 			}
 		}
-		if (preg_match("/^[^\s]/i", $field_desc['attribute']))
+		if (preg_match("/^[^\s]/i", $field_desc['attribute'])) {
 			$sql .= " ".$field_desc['attribute'];
-		if (preg_match("/^[^\s]/i", $field_desc['null']))
+		}
+		if (preg_match("/^[^\s]/i", $field_desc['null'])) {
 			$sql .= " ".$field_desc['null'];
+		}
 		if (preg_match("/^[^\s]/i", $field_desc['default'])) {
 			if (preg_match("/null/i", $field_desc['default'])) {
 				$sql .= " default ".$field_desc['default'];
@@ -1136,8 +1150,9 @@ class DoliDBPgsql extends DoliDB
 		$sql .= " ".$field_position;
 
 		dol_syslog($sql, LOG_DEBUG);
-		if (!$this -> query($sql))
+		if (!$this -> query($sql)) {
 			return -1;
+		}
 		return 1;
 	}
 
@@ -1159,29 +1174,29 @@ class DoliDBPgsql extends DoliDB
 			$sql .= "(".$field_desc['value'].")";
 		}
 
-		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL')
-		{
+		if ($field_desc['null'] == 'not null' || $field_desc['null'] == 'NOT NULL') {
 			// We will try to change format of column to NOT NULL. To be sure the ALTER works, we try to update fields that are NULL
-			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text')
-			{
+			if ($field_desc['type'] == 'varchar' || $field_desc['type'] == 'text') {
 				$sqlbis = "UPDATE ".$table." SET ".$field_name." = '".$this->escape($field_desc['default'] ? $field_desc['default'] : '')."' WHERE ".$field_name." IS NULL";
 				$this->query($sqlbis);
-			} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int')
-			{
+			} elseif ($field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') {
 				$sqlbis = "UPDATE ".$table." SET ".$field_name." = ".((int) $this->escape($field_desc['default'] ? $field_desc['default'] : 0))." WHERE ".$field_name." IS NULL";
 				$this->query($sqlbis);
 			}
 		}
 
-		if ($field_desc['default'] != '')
-		{
-			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') $sql .= " DEFAULT ".$this->escape($field_desc['default']);
-			elseif ($field_desc['type'] != 'text') $sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
+		if ($field_desc['default'] != '') {
+			if ($field_desc['type'] == 'double' || $field_desc['type'] == 'tinyint' || $field_desc['type'] == 'int') {
+				$sql .= " DEFAULT ".$this->escape($field_desc['default']);
+			} elseif ($field_desc['type'] != 'text') {
+				$sql .= " DEFAULT '".$this->escape($field_desc['default'])."'"; // Default not supported on text fields
+			}
 		}
 
 		dol_syslog($sql, LOG_DEBUG);
-		if (!$this->query($sql))
+		if (!$this->query($sql)) {
 			return -1;
+		}
 		return 1;
 	}
 
@@ -1198,8 +1213,7 @@ class DoliDBPgsql extends DoliDB
 		// phpcs:enable
 		$sql = "ALTER TABLE ".$table." DROP COLUMN ".$field_name;
 		dol_syslog($sql, LOG_DEBUG);
-		if (!$this->query($sql))
-		{
+		if (!$this->query($sql)) {
 			$this->error = $this->lasterror();
 			return -1;
 		}
@@ -1214,11 +1228,12 @@ class DoliDBPgsql extends DoliDB
 	public function getDefaultCharacterSetDatabase()
 	{
 		$resql = $this->query('SHOW SERVER_ENCODING');
-		if ($resql)
-		{
+		if ($resql) {
 			$liste = $this->fetch_array($resql);
 			return $liste['server_encoding'];
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -1230,11 +1245,9 @@ class DoliDBPgsql extends DoliDB
 	{
 		$resql = $this->query('SHOW SERVER_ENCODING');
 		$liste = array();
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
-			while ($obj = $this->fetch_object($resql))
-			{
+			while ($obj = $this->fetch_object($resql)) {
 				$liste[$i]['charset'] = $obj->server_encoding;
 				$liste[$i]['description'] = 'Default database charset';
 				$i++;
@@ -1254,11 +1267,12 @@ class DoliDBPgsql extends DoliDB
 	public function getDefaultCollationDatabase()
 	{
 		$resql = $this->query('SHOW LC_COLLATE');
-		if ($resql)
-		{
+		if ($resql) {
 			$liste = $this->fetch_array($resql);
 			return $liste['lc_collate'];
-		} else return '';
+		} else {
+			return '';
+		}
 	}
 
 	/**
@@ -1270,11 +1284,9 @@ class DoliDBPgsql extends DoliDB
 	{
 		$resql = $this->query('SHOW LC_COLLATE');
 		$liste = array();
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
-			while ($obj = $this->fetch_object($resql))
-			{
+			while ($obj = $this->fetch_object($resql)) {
 				$liste[$i]['collation'] = $obj->lc_collate;
 				$i++;
 			}
@@ -1294,14 +1306,12 @@ class DoliDBPgsql extends DoliDB
 	{
 		$fullpathofdump = '/pathtopgdump/pg_dump';
 
-		if (file_exists('/usr/bin/pg_dump'))
-		{
+		if (file_exists('/usr/bin/pg_dump')) {
 			$fullpathofdump = '/usr/bin/pg_dump';
 		} else {
 			// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
 			$resql = $this->query('SHOW data_directory');
-			if ($resql)
-			{
+			if ($resql) {
 				$liste = $this->fetch_array($resql);
 				$basedir = $liste['data_directory'];
 				$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/pg_dump';
@@ -1323,14 +1333,12 @@ class DoliDBPgsql extends DoliDB
 
 		$fullpathofdump = '/pathtopgrestore/'.$tool;
 
-		if (file_exists('/usr/bin/'.$tool))
-		{
+		if (file_exists('/usr/bin/'.$tool)) {
 			$fullpathofdump = '/usr/bin/'.$tool;
 		} else {
 			// TODO L'utilisateur de la base doit etre un superadmin pour lancer cette commande
 			$resql = $this->query('SHOW data_directory');
-			if ($resql)
-			{
+			if ($resql) {
 				$liste = $this->fetch_array($resql);
 				$basedir = $liste['data_directory'];
 				$fullpathofdump = preg_replace('/data$/', 'bin', $basedir).'/'.$tool;
@@ -1351,11 +1359,14 @@ class DoliDBPgsql extends DoliDB
 		$result = array();
 
 		$resql = 'select name,setting from pg_settings';
-		if ($filter) $resql .= " WHERE name = '".$this->escape($filter)."'";
+		if ($filter) {
+			$resql .= " WHERE name = '".$this->escape($filter)."'";
+		}
 		$resql = $this->query($resql);
-		if ($resql)
-		{
-			while ($obj = $this->fetch_object($resql)) $result[$obj->name] = $obj->setting;
+		if ($resql) {
+			while ($obj = $this->fetch_object($resql)) {
+				$result[$obj->name] = $obj->setting;
+			}
 		}
 
 		return $result;
@@ -1371,13 +1382,13 @@ class DoliDBPgsql extends DoliDB
 	{
 		/* This is to return current running requests.
 		$sql='SELECT datname,procpid,current_query FROM pg_stat_activity ORDER BY procpid';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
-        $resql=$this->query($sql);
-        if ($resql)
-        {
-            $obj=$this->fetch_object($resql);
-            $result[$obj->Variable_name]=$obj->Value;
-        }
+		if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
+		$resql=$this->query($sql);
+		if ($resql)
+		{
+			$obj=$this->fetch_object($resql);
+			$result[$obj->Variable_name]=$obj->Value;
+		}
 		*/
 
 		return array();
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index a6ca38c7e15..563ccb19aac 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -62,8 +62,12 @@ class DoliDBSqlite3 extends DoliDB
 		global $conf;
 
 		// Note that having "static" property for "$forcecharset" and "$forcecollate" will make error here in strict mode, so they are not static
-		if (!empty($conf->db->character_set)) $this->forcecharset = $conf->db->character_set;
-		if (!empty($conf->db->dolibarr_main_db_collation)) $this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		if (!empty($conf->db->character_set)) {
+			$this->forcecharset = $conf->db->character_set;
+		}
+		if (!empty($conf->db->dolibarr_main_db_collation)) {
+			$this->forcecollate = $conf->db->dolibarr_main_db_collation;
+		}
 
 		$this->database_user = $user;
 		$this->database_host = $host;
@@ -74,29 +78,28 @@ class DoliDBSqlite3 extends DoliDB
 		//print "Name DB: $host,$user,$pass,$name<br>";
 
 		/*if (! function_exists("sqlite_query"))
-        {
-            $this->connected = false;
-            $this->ok = false;
-            $this->error="Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.";
-            dol_syslog(get_class($this)."::DoliDBSqlite3 : Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
-            return $this->ok;
-        }*/
+		{
+			$this->connected = false;
+			$this->ok = false;
+			$this->error="Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.";
+			dol_syslog(get_class($this)."::DoliDBSqlite3 : Sqlite PHP functions for using Sqlite driver are not available in this version of PHP. Try to use another driver.",LOG_ERR);
+			return $this->ok;
+		}*/
 
 		/*if (! $host)
-        {
-            $this->connected = false;
-            $this->ok = false;
-            $this->error=$langs->trans("ErrorWrongHostParameter");
-            dol_syslog(get_class($this)."::DoliDBSqlite3 : Erreur Connect, wrong host parameters",LOG_ERR);
-            return $this->ok;
-        }*/
+		{
+			$this->connected = false;
+			$this->ok = false;
+			$this->error=$langs->trans("ErrorWrongHostParameter");
+			dol_syslog(get_class($this)."::DoliDBSqlite3 : Erreur Connect, wrong host parameters",LOG_ERR);
+			return $this->ok;
+		}*/
 
 		// Essai connexion serveur
 		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
 		$this->db = $this->connect($host, $user, $pass, $name, $port);
 
-		if ($this->db)
-		{
+		if ($this->db) {
 			$this->connected = true;
 			$this->ok = true;
 			$this->database_selected = true;
@@ -139,21 +142,21 @@ class DoliDBSqlite3 extends DoliDB
 			return '';
 		}
 		// Return line if this is a comment
-		if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line))
-		{
+		if (preg_match('/^#/i', $line) || preg_match('/^$/i', $line) || preg_match('/^--/i', $line)) {
 			return $line;
 		}
-		if ($line != "")
-		{
-			if ($type == 'auto')
-			{
-				if (preg_match('/ALTER TABLE/i', $line)) $type = 'dml';
-				elseif (preg_match('/CREATE TABLE/i', $line)) $type = 'dml';
-				elseif (preg_match('/DROP TABLE/i', $line)) $type = 'dml';
+		if ($line != "") {
+			if ($type == 'auto') {
+				if (preg_match('/ALTER TABLE/i', $line)) {
+					$type = 'dml';
+				} elseif (preg_match('/CREATE TABLE/i', $line)) {
+					$type = 'dml';
+				} elseif (preg_match('/DROP TABLE/i', $line)) {
+					$type = 'dml';
+				}
 			}
 
-			if ($type == 'dml')
-			{
+			if ($type == 'dml') {
 				$line = preg_replace('/\s/', ' ', $line); // Replace tabulation with space
 
 				// we are inside create table statement so lets process datatypes
@@ -196,8 +199,7 @@ class DoliDBSqlite3 extends DoliDB
 				$line = preg_replace('/(\s*)float/i', '\\1numeric', $line);
 
 				// unique index(field1,field2)
-				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
-				{
+				if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line)) {
 					$line = preg_replace('/unique index\s*\((\w+\s*,\s*\w+)\)/i', 'UNIQUE\(\\1\)', $line);
 				}
 
@@ -208,15 +210,13 @@ class DoliDBSqlite3 extends DoliDB
 				$line = preg_replace('/ALTER TABLE [a-z0-9_]+ DROP INDEX/i', 'DROP INDEX', $line);
 
 				// Translate order to rename fields
-				if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+) CHANGE(?: COLUMN)? ([a-z0-9_]+) ([a-z0-9_]+)(.*)$/i', $line, $reg)) {
 					$line = "-- ".$line." replaced by --\n";
 					$line .= "ALTER TABLE ".$reg[1]." RENAME COLUMN ".$reg[2]." TO ".$reg[3];
 				}
 
 				// Translate order to modify field format
-				if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER TABLE ([a-z0-9_]+) MODIFY(?: COLUMN)? ([a-z0-9_]+) (.*)$/i', $line, $reg)) {
 					$line = "-- ".$line." replaced by --\n";
 					$newreg3 = $reg[3];
 					$newreg3 = preg_replace('/ DEFAULT NULL/i', '', $newreg3);
@@ -230,24 +230,21 @@ class DoliDBSqlite3 extends DoliDB
 
 				// alter table add primary key (field1, field2 ...) -> We create a unique index instead as dynamic creation of primary key is not supported
 				// ALTER TABLE llx_dolibarr_modules ADD PRIMARY KEY pk_dolibarr_modules (numero, entity);
-				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+PRIMARY\s+KEY\s*(.*)\s*\((.*)$/i', $line, $reg)) {
 					$line = "-- ".$line." replaced by --\n";
 					$line .= "CREATE UNIQUE INDEX ".$reg[2]." ON ".$reg[1]."(".$reg[3];
 				}
 
 				// Translate order to drop foreign keys
 				// ALTER TABLE llx_dolibarr_modules DROP FOREIGN KEY fk_xxx;
-				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg))
-				{
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*DROP\s+FOREIGN\s+KEY\s*(.*)$/i', $line, $reg)) {
 					$line = "-- ".$line." replaced by --\n";
 					$line .= "ALTER TABLE ".$reg[1]." DROP CONSTRAINT ".$reg[2];
 				}
 
 				// alter table add [unique] [index] (field1, field2 ...)
 				// ALTER TABLE llx_accountingaccount ADD INDEX idx_accountingaccount_fk_pcg_version (fk_pcg_version)
-				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg))
-				{
+				if (preg_match('/ALTER\s+TABLE\s*(.*)\s*ADD\s+(UNIQUE INDEX|INDEX|UNIQUE)\s+(.*)\s*\(([\w,\s]+)\)/i', $line, $reg)) {
 					$fieldlist = $reg[4];
 					$idxname = $reg[3];
 					$tablename = $reg[1];
@@ -267,10 +264,8 @@ class DoliDBSqlite3 extends DoliDB
 
 			// Delete using criteria on other table must not declare twice the deleted table
 			// DELETE FROM tabletodelete USING tabletodelete, othertable -> DELETE FROM tabletodelete USING othertable
-			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', $line, $reg))
-			{
-				if ($reg[1] == $reg[2])	// If same table, we remove second one
-				{
+			if (preg_match('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', $line, $reg)) {
+				if ($reg[1] == $reg[2]) {	// If same table, we remove second one
 					$line = preg_replace('/DELETE FROM ([a-z_]+) USING ([a-z_]+), ([a-z_]+)/i', 'DELETE FROM \\1 USING \\3', $line);
 				}
 			}
@@ -328,7 +323,9 @@ class DoliDBSqlite3 extends DoliDB
 		dol_syslog(get_class($this)."::connect name=".$name, LOG_DEBUG);
 
 		$dir = $main_data_dir;
-		if (empty($dir)) $dir = DOL_DATA_ROOT;
+		if (empty($dir)) {
+			$dir = DOL_DATA_ROOT;
+		}
 		// With sqlite, port must be in connect parameters
 		//if (! $newport) $newport=3306;
 		$database_name = $dir.'/database_'.$name.'.sdb';
@@ -337,8 +334,7 @@ class DoliDBSqlite3 extends DoliDB
 			//$this->db = new PDO("sqlite:".$dir.'/database_'.$name.'.sdb');
 			$this->db = new SQLite3($database_name);
 			//$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-		} catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			$this->error = self::LABEL.' '.$e->getMessage().' current dir='.$database_name;
 			return '';
 		}
@@ -378,9 +374,10 @@ class DoliDBSqlite3 extends DoliDB
 	 */
 	public function close()
 	{
-		if ($this->db)
-		{
-			if ($this->transaction_opened > 0) dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+		if ($this->db) {
+			if ($this->transaction_opened > 0) {
+				dol_syslog(get_class($this)."::close Closing a connection with an opened transaction depth=".$this->transaction_opened, LOG_ERR);
+			}
 			$this->connected = false;
 			$this->db->close();
 			unset($this->db); // Clean this->db
@@ -450,12 +447,13 @@ class DoliDBSqlite3 extends DoliDB
 		}
 		//print "After convertSQLFromMysql:\n".$query."<br>\n";
 
-		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK')))
-		{
+		if (!in_array($query, array('BEGIN', 'COMMIT', 'ROLLBACK'))) {
 			$SYSLOG_SQL_LIMIT = 10000; // limit log to 10kb per line to limit DOS attacks
 			dol_syslog('sql='.substr($query, 0, $SYSLOG_SQL_LIMIT), LOG_DEBUG);
 		}
-		if (empty($query)) return false; // Return false = error if empty request
+		if (empty($query)) {
+			return false; // Return false = error if empty request
+		}
 
 		// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
 		try {
@@ -464,16 +462,13 @@ class DoliDBSqlite3 extends DoliDB
 			if ($ret) {
 				$ret->queryString = $query;
 			}
-		} catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			$this->error = $this->db->lastErrorMsg();
 		}
 
-		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query))
-		{
+		if (!preg_match("/^COMMIT/i", $query) && !preg_match("/^ROLLBACK/i", $query)) {
 			// Si requete utilisateur, on la sauvegarde ainsi que son resultset
-			if (!is_object($ret) || $this->error)
-			{
+			if (!is_object($ret) || $this->error) {
 				$this->lastqueryerror = $query;
 				$this->lasterror = $this->error();
 				$this->lasterrno = $this->errno();
@@ -486,7 +481,9 @@ class DoliDBSqlite3 extends DoliDB
 					$errormsg .= ' ('.$this->lasterrno.')';
 				}
 
-				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+				if ($conf->global->SYSLOG_LEVEL < LOG_DEBUG) {
+					dol_syslog(get_class($this)."::query SQL Error query: ".$query, LOG_ERR); // Log of request was not yet done previously
+				}
 				dol_syslog(get_class($this)."::query SQL Error message: ".$errormsg, LOG_ERR);
 			}
 			$this->lastquery = $query;
@@ -507,7 +504,9 @@ class DoliDBSqlite3 extends DoliDB
 	{
 		// phpcs:enable
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		//return $resultset->fetch(PDO::FETCH_OBJ);
 		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
 		if ($ret) {
@@ -528,7 +527,9 @@ class DoliDBSqlite3 extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		//return $resultset->fetch(PDO::FETCH_ASSOC);
 		$ret = $resultset->fetchArray(SQLITE3_ASSOC);
 		return $ret;
@@ -545,9 +546,10 @@ class DoliDBSqlite3 extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_bool($resultset))
-		{
-			if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_bool($resultset)) {
+			if (!is_object($resultset)) {
+				$resultset = $this->_results;
+			}
 			return $resultset->fetchArray(SQLITE3_NUM);
 		} else {
 			// si le curseur est un booleen on retourne la valeur 0
@@ -569,7 +571,9 @@ class DoliDBSqlite3 extends DoliDB
 		// FIXME: SQLite3Result does not have a queryString member
 
 		// If resultset not provided, we take the last used by connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		if (preg_match("/^SELECT/i", $resultset->queryString)) {
 			return $this->db->querySingle("SELECT count(*) FROM (".$resultset->queryString.") q");
 		}
@@ -590,7 +594,9 @@ class DoliDBSqlite3 extends DoliDB
 		// FIXME: SQLite3Result does not have a queryString member
 
 		// If resultset not provided, we take the last used by connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		if (preg_match("/^SELECT/i", $resultset->queryString)) {
 			return $this->num_rows($resultset);
 		}
@@ -609,9 +615,13 @@ class DoliDBSqlite3 extends DoliDB
 	public function free($resultset = null)
 	{
 		// If resultset not provided, we take the last used by connexion
-		if (!is_object($resultset)) { $resultset = $this->_results; }
+		if (!is_object($resultset)) {
+			$resultset = $this->_results;
+		}
 		// Si resultset en est un, on libere la memoire
-		if ($resultset && is_object($resultset)) $resultset->finalize();
+		if ($resultset && is_object($resultset)) {
+			$resultset->finalize();
+		}
 	}
 
 	/**
@@ -638,48 +648,53 @@ class DoliDBSqlite3 extends DoliDB
 		} else {
 			// Constants to convert error code to a generic Dolibarr error code
 			/*$errorcode_map = array(
-            1004 => 'DB_ERROR_CANNOT_CREATE',
-            1005 => 'DB_ERROR_CANNOT_CREATE',
-            1006 => 'DB_ERROR_CANNOT_CREATE',
-            1007 => 'DB_ERROR_ALREADY_EXISTS',
-            1008 => 'DB_ERROR_CANNOT_DROP',
-            1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
-            1044 => 'DB_ERROR_ACCESSDENIED',
-            1046 => 'DB_ERROR_NODBSELECTED',
-            1048 => 'DB_ERROR_CONSTRAINT',
-            'HY000' => 'DB_ERROR_TABLE_ALREADY_EXISTS',
-            1051 => 'DB_ERROR_NOSUCHTABLE',
-            1054 => 'DB_ERROR_NOSUCHFIELD',
-            1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
-            1061 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
-            1062 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
-            1064 => 'DB_ERROR_SYNTAX',
-            1068 => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
-            1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
-            1091 => 'DB_ERROR_NOSUCHFIELD',
-            1100 => 'DB_ERROR_NOT_LOCKED',
-            1136 => 'DB_ERROR_VALUE_COUNT_ON_ROW',
-            1146 => 'DB_ERROR_NOSUCHTABLE',
-            1216 => 'DB_ERROR_NO_PARENT',
-            1217 => 'DB_ERROR_CHILD_EXISTS',
-            1451 => 'DB_ERROR_CHILD_EXISTS'
-            );
+			1004 => 'DB_ERROR_CANNOT_CREATE',
+			1005 => 'DB_ERROR_CANNOT_CREATE',
+			1006 => 'DB_ERROR_CANNOT_CREATE',
+			1007 => 'DB_ERROR_ALREADY_EXISTS',
+			1008 => 'DB_ERROR_CANNOT_DROP',
+			1025 => 'DB_ERROR_NO_FOREIGN_KEY_TO_DROP',
+			1044 => 'DB_ERROR_ACCESSDENIED',
+			1046 => 'DB_ERROR_NODBSELECTED',
+			1048 => 'DB_ERROR_CONSTRAINT',
+			'HY000' => 'DB_ERROR_TABLE_ALREADY_EXISTS',
+			1051 => 'DB_ERROR_NOSUCHTABLE',
+			1054 => 'DB_ERROR_NOSUCHFIELD',
+			1060 => 'DB_ERROR_COLUMN_ALREADY_EXISTS',
+			1061 => 'DB_ERROR_KEY_NAME_ALREADY_EXISTS',
+			1062 => 'DB_ERROR_RECORD_ALREADY_EXISTS',
+			1064 => 'DB_ERROR_SYNTAX',
+			1068 => 'DB_ERROR_PRIMARY_KEY_ALREADY_EXISTS',
+			1075 => 'DB_ERROR_CANT_DROP_PRIMARY_KEY',
+			1091 => 'DB_ERROR_NOSUCHFIELD',
+			1100 => 'DB_ERROR_NOT_LOCKED',
+			1136 => 'DB_ERROR_VALUE_COUNT_ON_ROW',
+			1146 => 'DB_ERROR_NOSUCHTABLE',
+			1216 => 'DB_ERROR_NO_PARENT',
+			1217 => 'DB_ERROR_CHILD_EXISTS',
+			1451 => 'DB_ERROR_CHILD_EXISTS'
+			);
 
-            if (isset($errorcode_map[$this->db->errorCode()]))
-            {
-                return $errorcode_map[$this->db->errorCode()];
-            }*/
+			if (isset($errorcode_map[$this->db->errorCode()]))
+			{
+				return $errorcode_map[$this->db->errorCode()];
+			}*/
 			$errno = $this->db->lastErrorCode();
-			if ($errno == 'HY000' || $errno == 0)
-			{
-				if (preg_match('/table.*already exists/i', $this->error))     return 'DB_ERROR_TABLE_ALREADY_EXISTS';
-				elseif (preg_match('/index.*already exists/i', $this->error)) return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
-				elseif (preg_match('/syntax error/i', $this->error))          return 'DB_ERROR_SYNTAX';
+			if ($errno == 'HY000' || $errno == 0) {
+				if (preg_match('/table.*already exists/i', $this->error)) {
+					return 'DB_ERROR_TABLE_ALREADY_EXISTS';
+				} elseif (preg_match('/index.*already exists/i', $this->error)) {
+					return 'DB_ERROR_KEY_NAME_ALREADY_EXISTS';
+				} elseif (preg_match('/syntax error/i', $this->error)) {
+					return 'DB_ERROR_SYNTAX';
+				}
 			}
-			if ($errno == '23000')
-			{
-				if (preg_match('/column.* not unique/i', $this->error))       return 'DB_ERROR_RECORD_ALREADY_EXISTS';
-				elseif (preg_match('/PRIMARY KEY must be unique/i', $this->error)) return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+			if ($errno == '23000') {
+				if (preg_match('/column.* not unique/i', $this->error)) {
+					return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+				} elseif (preg_match('/PRIMARY KEY must be unique/i', $this->error)) {
+					return 'DB_ERROR_RECORD_ALREADY_EXISTS';
+				}
 			}
 			if ($errno > 1) {
 				// TODO Voir la liste des messages d'erreur
@@ -738,13 +753,10 @@ class DoliDBSqlite3 extends DoliDB
 
 		$return = ($withQuotes ? "'" : "").$this->escape($fieldorvalue).($withQuotes ? "'" : "");
 
-		if ($cryptType && !empty($cryptKey))
-		{
-			if ($cryptType == 2)
-			{
+		if ($cryptType && !empty($cryptKey)) {
+			if ($cryptType == 2) {
 				$return = 'AES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
-			} elseif ($cryptType == 1)
-			{
+			} elseif ($cryptType == 1) {
 				$return = 'DES_ENCRYPT('.$return.',\''.$cryptKey.'\')';
 			}
 		}
@@ -770,13 +782,10 @@ class DoliDBSqlite3 extends DoliDB
 
 		$return = $value;
 
-		if ($cryptType && !empty($cryptKey))
-		{
-			if ($cryptType == 2)
-			{
+		if ($cryptType && !empty($cryptKey)) {
+			if ($cryptType == 2) {
 				$return = 'AES_DECRYPT('.$value.',\''.$cryptKey.'\')';
-			} elseif ($cryptType == 1)
-			{
+			} elseif ($cryptType == 1) {
 				$return = 'DES_DECRYPT('.$value.',\''.$cryptKey.'\')';
 			}
 		}
@@ -813,8 +822,12 @@ class DoliDBSqlite3 extends DoliDB
 	public function DDLCreateDb($database, $charset = '', $collation = '', $owner = '')
 	{
 		// phpcs:enable
-		if (empty($charset))   $charset = $this->forcecharset;
-		if (empty($collation)) $collation = $this->forcecollate;
+		if (empty($charset)) {
+			$charset = $this->forcecharset;
+		}
+		if (empty($collation)) {
+			$collation = $this->forcecollate;
+		}
 
 		// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
 		$sql = 'CREATE DATABASE '.$database;
@@ -822,8 +835,7 @@ class DoliDBSqlite3 extends DoliDB
 
 		dol_syslog($sql, LOG_DEBUG);
 		$ret = $this->query($sql);
-		if (!$ret)
-		{
+		if (!$ret) {
 			// We try again for compatibility with Mysql < 4.1.1
 			$sql = 'CREATE DATABASE '.$database;
 			$ret = $this->query($sql);
@@ -846,14 +858,14 @@ class DoliDBSqlite3 extends DoliDB
 		$listtables = array();
 
 		$like = '';
-		if ($table) $like = "LIKE '".$table."'";
+		if ($table) {
+			$like = "LIKE '".$table."'";
+		}
 		$sql = "SHOW TABLES FROM ".$database." ".$like.";";
 		//print $sql;
 		$result = $this->query($sql);
-		if ($result)
-		{
-			while ($row = $this->fetch_row($result))
-			{
+		if ($result) {
+			while ($row = $this->fetch_row($result)) {
 				$listtables[] = $row[0];
 			}
 		}
@@ -877,10 +889,8 @@ class DoliDBSqlite3 extends DoliDB
 
 		dol_syslog($sql, LOG_DEBUG);
 		$result = $this->query($sql);
-		if ($result)
-		{
-			while ($row = $this->fetch_row($result))
-			{
+		if ($result) {
+			while ($row = $this->fetch_row($result)) {
 				$infotables[] = $row;
 			}
 		}
@@ -909,59 +919,60 @@ class DoliDBSqlite3 extends DoliDB
 		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "create table ".$table."(";
 		$i = 0;
-		foreach ($fields as $field_name => $field_desc)
-		{
+		foreach ($fields as $field_name => $field_desc) {
 			$sqlfields[$i] = $field_name." ";
 			$sqlfields[$i] .= $field_desc['type'];
-			if (preg_match("/^[^\s]/i", $field_desc['value']))
+			if (preg_match("/^[^\s]/i", $field_desc['value'])) {
 				$sqlfields[$i]  .= "(".$field_desc['value'].")";
-			elseif (preg_match("/^[^\s]/i", $field_desc['attribute']))
+			} elseif (preg_match("/^[^\s]/i", $field_desc['attribute'])) {
 				$sqlfields[$i]  .= " ".$field_desc['attribute'];
-			elseif (preg_match("/^[^\s]/i", $field_desc['default']))
-			{
-				if (preg_match("/null/i", $field_desc['default']))
+			} elseif (preg_match("/^[^\s]/i", $field_desc['default'])) {
+				if (preg_match("/null/i", $field_desc['default'])) {
 					$sqlfields[$i] .= " default ".$field_desc['default'];
-				else $sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
-			} elseif (preg_match("/^[^\s]/i", $field_desc['null']))
+				} else {
+					$sqlfields[$i] .= " default '".$this->escape($field_desc['default'])."'";
+				}
+			} elseif (preg_match("/^[^\s]/i", $field_desc['null'])) {
 				$sqlfields[$i] .= " ".$field_desc['null'];
-
-			elseif (preg_match("/^[^\s]/i", $field_desc['extra']))
+			} elseif (preg_match("/^[^\s]/i", $field_desc['extra'])) {
 				$sqlfields[$i] .= " ".$field_desc['extra'];
+			}
 			$i++;
 		}
-		if ($primary_key != "")
-		$pk = "primary key(".$primary_key.")";
+		if ($primary_key != "") {
+			$pk = "primary key(".$primary_key.")";
+		}
 
-		if (is_array($unique_keys))
-		{
+		if (is_array($unique_keys)) {
 			$i = 0;
-			foreach ($unique_keys as $key => $value)
-			{
+			foreach ($unique_keys as $key => $value) {
 				$sqluq[$i] = "UNIQUE KEY '".$key."' ('".$this->escape($value)."')";
 				$i++;
 			}
 		}
-		if (is_array($keys))
-		{
+		if (is_array($keys)) {
 			$i = 0;
-			foreach ($keys as $key => $value)
-			{
+			foreach ($keys as $key => $value) {
 				$sqlk[$i] = "KEY ".$key." (".$value.")";
 				$i++;
 			}
 		}
 		$sql .= implode(',', $sqlfields);
-		if ($primary_key != "")
-		$sql .= ",".$pk;
-		if (is_array($unique_keys))
-		$sql .= ",".implode(',', $sqluq);
-		if (is_array($keys))
-		$sql .= ",".implode(',', $sqlk);
+		if ($primary_key != "") {
+			$sql .= ",".$pk;
+		}
+		if (is_array($unique_keys)) {
+			$sql .= ",".implode(',', $sqluq);
+		}
+		if (is_array($keys)) {
+			$sql .= ",".implode(',', $sqlk);
+		}
 		$sql .= ") type=".$type;
 
 		dol_syslog($sql, LOG_DEBUG);
-		if (!$this -> query($sql))
+		if (!$this -> query($sql)) {
 			return -1;
+		}
 		return 1;
 	}
 
@@ -977,9 +988,11 @@ class DoliDBSqlite3 extends DoliDB
 		// phpcs:enable
 		$sql = "DROP TABLE ".$table;
 
-		if (!$this->query($sql))
+		if (!$this->query($sql)) {
 			return -1;
-		else return 1;
+		} else {
+			return 1;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1017,28 +1030,31 @@ class DoliDBSqlite3 extends DoliDB
 		// ex. : $field_desc = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "ALTER TABLE ".$table." ADD ".$field_name." ";
 		$sql .= $field_desc['type'];
-		if (preg_match("/^[^\s]/i", $field_desc['value']))
-		if (!in_array($field_desc['type'], array('date', 'datetime')))
-		{
-			$sql .= "(".$field_desc['value'].")";
+		if (preg_match("/^[^\s]/i", $field_desc['value'])) {
+			if (!in_array($field_desc['type'], array('date', 'datetime'))) {
+				$sql .= "(".$field_desc['value'].")";
+			}
 		}
-		if (preg_match("/^[^\s]/i", $field_desc['attribute']))
-		$sql .= " ".$field_desc['attribute'];
-		if (preg_match("/^[^\s]/i", $field_desc['null']))
-		$sql .= " ".$field_desc['null'];
-		if (preg_match("/^[^\s]/i", $field_desc['default']))
-		{
-			if (preg_match("/null/i", $field_desc['default']))
-			$sql .= " default ".$field_desc['default'];
-			else $sql .= " default '".$this->escape($field_desc['default'])."'";
+		if (preg_match("/^[^\s]/i", $field_desc['attribute'])) {
+			$sql .= " ".$field_desc['attribute'];
+		}
+		if (preg_match("/^[^\s]/i", $field_desc['null'])) {
+			$sql .= " ".$field_desc['null'];
+		}
+		if (preg_match("/^[^\s]/i", $field_desc['default'])) {
+			if (preg_match("/null/i", $field_desc['default'])) {
+				$sql .= " default ".$field_desc['default'];
+			} else {
+				$sql .= " default '".$this->escape($field_desc['default'])."'";
+			}
+		}
+		if (preg_match("/^[^\s]/i", $field_desc['extra'])) {
+			$sql .= " ".$field_desc['extra'];
 		}
-		if (preg_match("/^[^\s]/i", $field_desc['extra']))
-		$sql .= " ".$field_desc['extra'];
 		$sql .= " ".$field_position;
 
 		dol_syslog(get_class($this)."::DDLAddField ".$sql, LOG_DEBUG);
-		if (!$this->query($sql))
-		{
+		if (!$this->query($sql)) {
 			return -1;
 		}
 		return 1;
@@ -1063,8 +1079,9 @@ class DoliDBSqlite3 extends DoliDB
 		}
 
 		dol_syslog(get_class($this)."::DDLUpdateField ".$sql, LOG_DEBUG);
-		if (!$this->query($sql))
+		if (!$this->query($sql)) {
 			return -1;
+		}
 		return 1;
 	}
 
@@ -1081,8 +1098,7 @@ class DoliDBSqlite3 extends DoliDB
 		// phpcs:enable
 		$sql = "ALTER TABLE ".$table." DROP COLUMN `".$field_name."`";
 		dol_syslog(get_class($this)."::DDLDropField ".$sql, LOG_DEBUG);
-		if (!$this->query($sql))
-		{
+		if (!$this->query($sql)) {
 			$this->error = $this->lasterror();
 			return -1;
 		}
@@ -1110,8 +1126,7 @@ class DoliDBSqlite3 extends DoliDB
 
 		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
 		$resql = $this->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			return -1;
 		}
 
@@ -1122,8 +1137,7 @@ class DoliDBSqlite3 extends DoliDB
 
 		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
 		$resql = $this->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			return -1;
 		}
 
@@ -1131,8 +1145,7 @@ class DoliDBSqlite3 extends DoliDB
 
 		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG);
 		$resql = $this->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			return -1;
 		}
 		return 1;
@@ -1197,8 +1210,7 @@ class DoliDBSqlite3 extends DoliDB
 		$fullpathofdump = '/pathtomysqldump/mysqldump';
 
 		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-		if ($resql)
-		{
+		if ($resql) {
 			$liste = $this->fetch_array($resql);
 			$basedir = $liste['Value'];
 			$fullpathofdump = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysqldump';
@@ -1217,8 +1229,7 @@ class DoliDBSqlite3 extends DoliDB
 		$fullpathofimport = '/pathtomysql/mysql';
 
 		$resql = $this->query('SHOW VARIABLES LIKE \'basedir\'');
-		if ($resql)
-		{
+		if ($resql) {
 			$liste = $this->fetch_array($resql);
 			$basedir = $liste['Value'];
 			$fullpathofimport = $basedir.(preg_match('/\/$/', $basedir) ? '' : '/').'bin/mysql';
@@ -1261,8 +1272,7 @@ class DoliDBSqlite3 extends DoliDB
 		foreach ($pragmas as $var) {
 			$sql = "PRAGMA $var";
 			$resql = $this->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $this->fetch_row($resql);
 				//dol_syslog(get_class($this)."::select_db getServerParametersValues $var=". print_r($obj, true), LOG_DEBUG);
 				$result[$var] = $obj[0];
@@ -1284,14 +1294,14 @@ class DoliDBSqlite3 extends DoliDB
 	{
 		$result = array();
 		/*
-        $sql='SHOW STATUS';
-        if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
-        $resql=$this->query($sql);
-        if ($resql)
-        {
-            while ($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
-        }
-         */
+		$sql='SHOW STATUS';
+		if ($filter) $sql.=" LIKE '".$this->escape($filter)."'";
+		$resql=$this->query($sql);
+		if ($resql)
+		{
+			while ($obj=$this->fetch_object($resql)) $result[$obj->Variable_name]=$obj->Value;
+		}
+		 */
 
 		return $result;
 	}
@@ -1307,8 +1317,7 @@ class DoliDBSqlite3 extends DoliDB
 	 */
 	private function addCustomFunction($name, $arg_count = -1)
 	{
-		if ($this->db)
-		{
+		if ($this->db) {
 			$newname = preg_replace('/_/', '', $name);
 			$localname = __CLASS__.'::db'.$newname;
 			$reflectClass = new ReflectionClass(__CLASS__);
@@ -1316,8 +1325,7 @@ class DoliDBSqlite3 extends DoliDB
 			if ($arg_count < 0) {
 				$arg_count = $reflectFunction->getNumberOfParameters();
 			}
-			if (!$this->db->createFunction($name, $localname, $arg_count))
-			{
+			if (!$this->db->createFunction($name, $localname, $arg_count)) {
 				$this->error = "unable to create custom function '$name'";
 			}
 		}
@@ -1336,12 +1344,15 @@ class DoliDBSqlite3 extends DoliDB
 	{
 		// phpcs:enable
 		$y = $year;
-		if ($y == 0 && $month == 0) return 0;
+		if ($y == 0 && $month == 0) {
+			return 0;
+		}
 		$num = (365 * $y + 31 * ($month - 1) + $day);
 		if ($month <= 2) {
-			$y--; } else {
+			$y--;
+		} else {
 			$num -= floor(($month * 4 + 23) / 10);
-			}
+		}
 			$temp = floor(($y / 100 + 1) * 3 / 4);
 			return $num + floor($y / 4) - $temp;
 	}
@@ -1398,8 +1409,9 @@ class DoliDBSqlite3 extends DoliDB
 		$calc_year = $year;
 
 		if ($month == 1 && $day <= 7 - $weekday) {
-			if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4)))
+			if (!$week_year && (($first_weekday && $weekday != 0) || (!$first_weekday && $weekday >= 4))) {
 				return 0;
+			}
 			$week_year = 1;
 			$calc_year--;
 			$first_daynr -= ($days = self::calc_days_in_year($calc_year));
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index cef5f74d172..0c47e97aef9 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -1,7 +1,6 @@
 <?php
 
-if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra))
-{
+if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra)) {
 	//print $keyforselet.' - '.$keyforelement.' - '.$keyforaliasextra;
 	dol_print_error('', 'include of file extrafieldsinexport.inc.php was done but var $keyforselect or $keyforelement or $keyforaliasextra was not set');
 	exit;
@@ -12,10 +11,8 @@ $sql = "SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN
 $sql .= " WHERE elementtype = '".$this->db->escape($keyforselect)."' AND type != 'separate' AND entity IN (0, ".$conf->entity.') ORDER BY pos ASC';
 //print $sql;
 $resql = $this->db->query($sql);
-if ($resql)    // This can fail when class is used on old database (during migration for example)
-{
-	while ($obj = $this->db->fetch_object($resql))
-	{
+if ($resql) {    // This can fail when class is used on old database (during migration for example)
+	while ($obj = $this->db->fetch_object($resql)) {
 		$fieldname = $keyforaliasextra.'.'.$obj->name;
 		$fieldlabel = ucfirst($obj->label);
 		$typeFilter = "Text";
@@ -36,8 +33,7 @@ if ($resql)    // This can fail when class is used on old database (during migra
 				$typeFilter = "Boolean";
 				break;
 			case 'select':
-				if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT))
-				{
+				if (!empty($conf->global->EXPORT_LABEL_FOR_SELECT)) {
 					$tmpparam = unserialize($obj->param); // $tmpparam may be array with 'options' = array(key1=>val1, key2=>val2 ...)
 					if ($tmpparam['options'] && is_array($tmpparam['options'])) {
 						$typeFilter = "Select:".$obj->param;
@@ -51,14 +47,14 @@ if ($resql)    // This can fail when class is used on old database (during migra
 					$tmpkeys = array_keys($tmpparam['options']);
 					$tmp = array_shift($tmpkeys);
 				}
-				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+					$typeFilter = "List:".$tmp;
+				}
 				break;
 		}
-		if ($obj->type != 'separate')
-		{
+		if ($obj->type != 'separate') {
 			// If not a computed field
-			if (empty($obj->fieldcomputed))
-			{
+			if (empty($obj->fieldcomputed)) {
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
 				$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
 				$this->export_entities_array[$r][$fieldname] = $keyforelement;
diff --git a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
index 5f7f7e1214d..da8ec04baa1 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
@@ -115,25 +115,25 @@ function OpenFolder( folderPath )
 
 function GetUrlParam( paramName )
 {
-    var oRegex = new RegExp( '[\?&]' + paramName + '=([^&]+)', 'i' );
-    var oMatch = oRegex.exec( window.top.location.search );
+	var oRegex = new RegExp( '[\?&]' + paramName + '=([^&]+)', 'i' );
+	var oMatch = oRegex.exec( window.top.location.search );
 
-    if ( oMatch && oMatch.length > 1 )
-        return decodeURIComponent( oMatch[1] );
-    else
-        return '' ;
+	if ( oMatch && oMatch.length > 1 )
+		return decodeURIComponent( oMatch[1] );
+	else
+		return '' ;
 }
 
 // Note fileUrl must be already "URL encoded"
 function OpenFile( fileUrl )
 {
-    funcNum = GetUrlParam('CKEditorFuncNum');
-    //window.top.opener.CKEDITOR.tools.callFunction(funcNum, encodeURI( fileUrl ).replace( '#', '%23' ));
+	funcNum = GetUrlParam('CKEditorFuncNum');
+	//window.top.opener.CKEDITOR.tools.callFunction(funcNum, encodeURI( fileUrl ).replace( '#', '%23' ));
 	window.top.opener.CKEDITOR.tools.callFunction(funcNum, fileUrl.replace( '#', '%23' ));
 
-    ///////////////////////////////////
-    window.top.close();
-    window.top.opener.focus();
+	///////////////////////////////////
+	window.top.close();
+	window.top.opener.focus();
 }
 
 function LoadResources( resourceType, folderPath )
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
index 648ab675cfa..fa158c61ee7 100644
--- a/htdocs/core/filemanagerdol/connectors/php/basexml.php
+++ b/htdocs/core/filemanagerdol/connectors/php/basexml.php
@@ -90,11 +90,11 @@ function CreateXmlFooter()
  */
 function SendError($number, $text)
 {
-	if ($_GET['Command'] == 'FileUpload')
+	if ($_GET['Command'] == 'FileUpload') {
 		SendUploadResults($number, "", "", $text);
+	}
 
-	if (isset($GLOBALS['HeaderSent']) && $GLOBALS['HeaderSent'])
-	{
+	if (isset($GLOBALS['HeaderSent']) && $GLOBALS['HeaderSent']) {
 		SendErrorNode($number, $text);
 		CreateXmlFooter();
 	} else {
@@ -123,7 +123,9 @@ function SendError($number, $text)
  */
 function SendErrorNode($number, $text)
 {
-	if ($text)
+	if ($text) {
 		echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
-	else echo '<Error number="'.$number.'" />';
+	} else {
+		echo '<Error number="'.$number.'" />';
+	}
 }
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
index cc6afb4e0e4..b4fb1224f4c 100644
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ b/htdocs/core/filemanagerdol/connectors/php/commands.php
@@ -39,12 +39,11 @@ function GetFolders($resourceType, $currentFolder)
 
 	$oCurrentFolder = @opendir($sServerDir);
 
-	if ($oCurrentFolder !== false)
-	{
-		while ($sFile = readdir($oCurrentFolder))
-		{
-			if ($sFile != '.' && $sFile != '..' && is_dir($sServerDir.$sFile))
+	if ($oCurrentFolder !== false) {
+		while ($sFile = readdir($oCurrentFolder)) {
+			if ($sFile != '.' && $sFile != '..' && is_dir($sServerDir.$sFile)) {
 				$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
+			}
 		}
 		closedir($oCurrentFolder);
 	}
@@ -53,8 +52,9 @@ function GetFolders($resourceType, $currentFolder)
 	echo "<Folders>";
 
 	natcasesort($aFolders);
-	foreach ($aFolders as $sFolder)
+	foreach ($aFolders as $sFolder) {
 		echo $sFolder;
+	}
 
 	// Close the "Folders" node.
 	echo "</Folders>";
@@ -78,24 +78,21 @@ function GetFoldersAndFiles($resourceType, $currentFolder)
 
 	$oCurrentFolder = @opendir($sServerDir);
 
-	if ($oCurrentFolder !== false)
-	{
-		while ($sFile = readdir($oCurrentFolder))
-		{
-			if ($sFile != '.' && $sFile != '..')
-			{
-				if (is_dir($sServerDir.$sFile))
+	if ($oCurrentFolder !== false) {
+		while ($sFile = readdir($oCurrentFolder)) {
+			if ($sFile != '.' && $sFile != '..') {
+				if (is_dir($sServerDir.$sFile)) {
 					$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
-				else {
+				} else {
 					$iFileSize = @filesize($sServerDir.$sFile);
 					if (!$iFileSize) {
 						$iFileSize = 0;
 					}
-					if ($iFileSize > 0)
-					{
+					if ($iFileSize > 0) {
 						$iFileSize = round($iFileSize / 1024);
-						if ($iFileSize < 1)
+						if ($iFileSize < 1) {
 							$iFileSize = 1;
+						}
 					}
 
 					$aFiles[] = '<File name="'.ConvertToXmlAttribute($sFile).'" size="'.$iFileSize.'" />';
@@ -109,8 +106,9 @@ function GetFoldersAndFiles($resourceType, $currentFolder)
 	natcasesort($aFolders);
 	echo '<Folders>';
 
-	foreach ($aFolders as $sFolder)
+	foreach ($aFolders as $sFolder) {
 		echo $sFolder;
+	}
 
 	echo '</Folders>';
 
@@ -118,8 +116,9 @@ function GetFoldersAndFiles($resourceType, $currentFolder)
 	natcasesort($aFiles);
 	echo '<Files>';
 
-	foreach ($aFiles as $sFiles)
+	foreach ($aFiles as $sFiles) {
 		echo $sFiles;
+	}
 
 	echo '</Files>';
 }
@@ -139,39 +138,40 @@ function CreateFolder($resourceType, $currentFolder)
 	$sErrorNumber = '0';
 	$sErrorMsg = '';
 
-	if (isset($_GET['NewFolderName']))
-	{
+	if (isset($_GET['NewFolderName'])) {
 		$sNewFolderName = $_GET['NewFolderName'];
 		$sNewFolderName = SanitizeFolderName($sNewFolderName);
 
-		if (strpos($sNewFolderName, '..') !== false)
+		if (strpos($sNewFolderName, '..') !== false) {
 			$sErrorNumber = '102'; // Invalid folder name.
-		else {
+		} else {
 			// Map the virtual path to the local server path of the current folder.
 			$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
 
-			if (is_writable($sServerDir))
-			{
+			if (is_writable($sServerDir)) {
 				$sServerDir .= $sNewFolderName;
 
 				$sErrorMsg = CreateServerFolder($sServerDir);
 
-				switch ($sErrorMsg)
-				{
+				switch ($sErrorMsg) {
 					case '':
 						$sErrorNumber = '0';
 						break;
-					case 'Invalid argument' :
-					case 'No such file or directory' :
+					case 'Invalid argument':
+					case 'No such file or directory':
 						$sErrorNumber = '102'; // Path too long.
 						break;
 					default:
 						$sErrorNumber = '110';
 						break;
 				}
-			} else $sErrorNumber = '103';
+			} else {
+				$sErrorNumber = '103';
+			}
 		}
-	} else $sErrorNumber = '102';
+	} else {
+		$sErrorNumber = '102';
+	}
 
 	// Create the "Error" node.
 	echo '<Error number="'.$sErrorNumber.'" />';
@@ -198,8 +198,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 
 	if (isset($_FILES['NewFile']) && !is_null($_FILES['NewFile']['tmp_name'])
 	   // This is for the QuickUpload tab box
-		or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name'])))
-	{
+		or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name']))) {
 		global $Config;
 
 		$oFile = isset($_FILES['NewFile']) ? $_FILES['NewFile'] : $_FILES['upload'];
@@ -217,50 +216,40 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 		$sExtension = substr($sFileName, (strrpos($sFileName, '.') + 1));
 		$sExtension = strtolower($sExtension);
 
-		if (isset($Config['SecureImageUploads']))
-		{
-			if (($isImageValid = IsImageValid($oFile['tmp_name'], $sExtension)) === false)
-			{
+		if (isset($Config['SecureImageUploads'])) {
+			if (($isImageValid = IsImageValid($oFile['tmp_name'], $sExtension)) === false) {
 				$sErrorNumber = '202';
 			}
 		}
 
-		if (isset($Config['HtmlExtensions']))
-		{
+		if (isset($Config['HtmlExtensions'])) {
 			if (!IsHtmlExtension($sExtension, $Config['HtmlExtensions']) &&
-				($detectHtml = DetectHtml($oFile['tmp_name'])) === true)
-			{
+				($detectHtml = DetectHtml($oFile['tmp_name'])) === true) {
 				$sErrorNumber = '202';
 			}
 		}
 
 		// Check if it is an allowed extension.
-		if (!$sErrorNumber && IsAllowedExt($sExtension, $resourceType))
-		{
+		if (!$sErrorNumber && IsAllowedExt($sExtension, $resourceType)) {
 			$iCounter = 0;
 
-			while (true)
-			{
+			while (true) {
 				$sFilePath = $sServerDir.$sFileName;
 
-				if (is_file($sFilePath))
-				{
+				if (is_file($sFilePath)) {
 					$iCounter++;
 					$sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
 					$sErrorNumber = '201';
 				} else {
 					move_uploaded_file($oFile['tmp_name'], $sFilePath);
 
-					if (is_file($sFilePath))
-					{
-						if (isset($Config['ChmodOnUpload']) && !$Config['ChmodOnUpload'])
-						{
+					if (is_file($sFilePath)) {
+						if (isset($Config['ChmodOnUpload']) && !$Config['ChmodOnUpload']) {
 							break;
 						}
 
 						$permissions = '0777';
-						if (isset($Config['ChmodOnUpload']) && $Config['ChmodOnUpload'])
-						{
+						if (isset($Config['ChmodOnUpload']) && $Config['ChmodOnUpload']) {
 							$permissions = (string) $Config['ChmodOnUpload'];
 						}
 						$permissionsdec = octdec($permissions);
@@ -274,21 +263,22 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 				}
 			}
 
-			if (file_exists($sFilePath))
-			{
+			if (file_exists($sFilePath)) {
 				//previous checks failed, try once again
-				if (isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false)
-				{
+				if (isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false) {
 					@unlink($sFilePath);
 					$sErrorNumber = '202';
-				} elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true)
-				{
+				} elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true) {
 					@unlink($sFilePath);
 					$sErrorNumber = '202';
 				}
 			}
-		} else $sErrorNumber = '202';
-	} else $sErrorNumber = '202';
+		} else {
+			$sErrorNumber = '202';
+		}
+	} else {
+		$sErrorNumber = '202';
+	}
 
 
 	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
@@ -297,8 +287,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
 
 	// @CHANGE
 	//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
-	if ($CKEcallback == '')
-	{
+	if ($CKEcallback == '') {
 		// this line already exists so wrap the if block around it
 		SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
 	} else {
diff --git a/htdocs/core/filemanagerdol/connectors/php/config.php b/htdocs/core/filemanagerdol/connectors/php/config.php
index fb282834f1a..73c222841cc 100644
--- a/htdocs/core/filemanagerdol/connectors/php/config.php
+++ b/htdocs/core/filemanagerdol/connectors/php/config.php
@@ -34,7 +34,9 @@ define('NOTOKENRENEWAL', 1); // Disables token renewal
 require_once '../../../../main.inc.php';
 $uri = preg_replace('/^http(s?):\/\//i', '', $dolibarr_main_url_root);
 $pos = strstr($uri, '/'); // $pos contient alors url sans nom domaine
-if ($pos == '/') $pos = ''; // si $pos vaut /, on le met a ''
+if ($pos == '/') {
+	$pos = ''; // si $pos vaut /, on le met a ''
+}
 define('DOL_URL_ROOT', $pos);
 $entity = ((!empty($_SESSION['dol_entity']) && $_SESSION['dol_entity'] > 1) ? $_SESSION['dol_entity'] : null);
 
@@ -81,14 +83,18 @@ $Config['HtmlExtensions'] = array("html", "htm", "xml", "xsd", "txt", "js");
 // Set to 0 to disable this feature.
 // Note: not needed on Windows-based servers.
 $newmask = '0644';
-if (!empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
+if (!empty($conf->global->MAIN_UMASK)) {
+	$newmask = $conf->global->MAIN_UMASK;
+}
 $Config['ChmodOnUpload'] = $newmask;
 
 // See comments above.
 // Used when creating folders that does not exist.
 $newmask = '0755';
 $dirmaskdec = octdec($newmask);
-if (!empty($conf->global->MAIN_UMASK)) $dirmaskdec = octdec($conf->global->MAIN_UMASK);
+if (!empty($conf->global->MAIN_UMASK)) {
+	$dirmaskdec = octdec($conf->global->MAIN_UMASK);
+}
 $dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
 $newmask = decoct($dirmaskdec);
 
@@ -130,14 +136,14 @@ $Config['ChmodOnFolderCreate'] = $newmask;
 		Attention: The above 'QuickUploadPath' must point to the same directory.
 		Attention: It must end with a slash: '/'
 
-	 	NOTE: by default, QuickUploadPath and QuickUploadAbsolutePath point to
-	 	"userfiles" directory to maintain backwards compatibility with older versions of FCKeditor.
-	 	This is fine, but you in some cases you will be not able to browse uploaded files using file browser.
-	 	Example: if you click on "image button", select "Upload" tab and send image
-	 	to the server, image will appear in FCKeditor correctly, but because it is placed
-	 	directly in /userfiles/ directory, you'll be not able to see it in built-in file browser.
-	 	The more expected behaviour would be to send images directly to "image" subfolder.
-	 	To achieve that, simply change
+		 NOTE: by default, QuickUploadPath and QuickUploadAbsolutePath point to
+		 "userfiles" directory to maintain backwards compatibility with older versions of FCKeditor.
+		 This is fine, but you in some cases you will be not able to browse uploaded files using file browser.
+		 Example: if you click on "image button", select "Upload" tab and send image
+		 to the server, image will appear in FCKeditor correctly, but because it is placed
+		 directly in /userfiles/ directory, you'll be not able to see it in built-in file browser.
+		 The more expected behaviour would be to send images directly to "image" subfolder.
+		 To achieve that, simply change
 			$Config['QuickUploadPath']['Image']			= $Config['UserFilesPath'] ;
 			$Config['QuickUploadAbsolutePath']['Image']	= $Config['UserFilesAbsolutePath'] ;
 		into:
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php
index 6d67734d3bc..bdb1e77084c 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.php
@@ -30,8 +30,9 @@ require 'io.php';
 require 'basexml.php';
 require 'commands.php';
 
-if (!$Config['Enabled'])
+if (!$Config['Enabled']) {
 	SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file');
+}
 
 DoResponse();
 
@@ -45,8 +46,9 @@ function DoResponse()
 	if (!isset($_GET)) {
 		global $_GET;
 	}
-	if (!isset($_GET['Command']) || !isset($_GET['Type']) || !isset($_GET['CurrentFolder']))
+	if (!isset($_GET['Command']) || !isset($_GET['Type']) || !isset($_GET['CurrentFolder'])) {
 		return;
+	}
 
 	// Get the main request informaiton.
 	$sCommand = $_GET['Command'];
@@ -54,17 +56,16 @@ function DoResponse()
 	$sCurrentFolder = GetCurrentFolder();
 
 	// Check if it is an allowed command
-	if (!IsAllowedCommand($sCommand))
-	{
+	if (!IsAllowedCommand($sCommand)) {
 		SendError(1, 'The "'.$sCommand.'" command isn\'t allowed');
 	}
 	// Check if it is an allowed type.
-	if (!IsAllowedType($sResourceType))
+	if (!IsAllowedType($sResourceType)) {
 		SendError(1, 'Invalid type specified');
+	}
 
 	// File Upload doesn't have to Return XML, so it must be intercepted before anything.
-	if ($sCommand == 'FileUpload')
-	{
+	if ($sCommand == 'FileUpload') {
 		FileUpload($sResourceType, $sCurrentFolder, $sCommand);
 		return;
 	}
@@ -72,15 +73,14 @@ function DoResponse()
 	CreateXmlHeader($sCommand, $sResourceType, $sCurrentFolder);
 
 	// Execute the required command.
-	switch ($sCommand)
-	{
-		case 'GetFolders' :
+	switch ($sCommand) {
+		case 'GetFolders':
 			GetFolders($sResourceType, $sCurrentFolder);
 			break;
-		case 'GetFoldersAndFiles' :
+		case 'GetFoldersAndFiles':
 			GetFoldersAndFiles($sResourceType, $sCurrentFolder);
 			break;
-		case 'CreateFolder' :
+		case 'CreateFolder':
 			CreateFolder($sResourceType, $sCurrentFolder);
 			break;
 	}
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
index 5ad0cd1b25e..c9fce179799 100644
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ b/htdocs/core/filemanagerdol/connectors/php/io.php
@@ -44,9 +44,11 @@ function GetResourceTypePath($resourceType, $sCommand)
 {
 	global $Config;
 
-	if ($sCommand == "QuickUpload")
+	if ($sCommand == "QuickUpload") {
 		return $Config['QuickUploadPath'][$resourceType];
-	else return $Config['FileTypesPath'][$resourceType];
+	} else {
+		return $Config['FileTypesPath'][$resourceType];
+	}
 }
 
 /**
@@ -59,16 +61,17 @@ function GetResourceTypePath($resourceType, $sCommand)
 function GetResourceTypeDirectory($resourceType, $sCommand)
 {
 	global $Config;
-	if ($sCommand == "QuickUpload")
-	{
-		if (strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0)
+	if ($sCommand == "QuickUpload") {
+		if (strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0) {
 			return $Config['QuickUploadAbsolutePath'][$resourceType];
+		}
 
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
 	} else {
-		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0)
+		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0) {
 			return $Config['FileTypesAbsolutePath'][$resourceType];
+		}
 
 		// Map the "UserFiles" path to a local directory.
 		return Server_MapPath($Config['FileTypesPath'][$resourceType]);
@@ -113,8 +116,9 @@ function ServerMapFolder($resourceType, $folderPath, $sCommand)
 
 	// Ensure that the directory exists.
 	$sErrorMsg = CreateServerFolder($sResourceTypePath);
-	if ($sErrorMsg != '')
+	if ($sErrorMsg != '') {
 		SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
+	}
 
 	// Return the resource type directory combined with the required path.
 	return CombinePaths($sResourceTypePath, $folderPath);
@@ -145,26 +149,24 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 	$sParent = GetParentFolder($folderPath);
 
 	// Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
-	while (strpos($folderPath, '//') !== false)
-	{
+	while (strpos($folderPath, '//') !== false) {
 		$folderPath = str_replace('//', '/', $folderPath);
 	}
 
 	// Check if the parent exists, or create it.
-	if (!empty($sParent) && !file_exists($sParent))
-	{
+	if (!empty($sParent) && !file_exists($sParent)) {
 		//prevents agains infinite loop when we can't create root folder
 		if (!is_null($lastFolder) && $lastFolder === $sParent) {
 			return "Can't create $folderPath directory";
 		}
 
 		$sErrorMsg = CreateServerFolder($sParent, $folderPath);
-		if ($sErrorMsg != '')
+		if ($sErrorMsg != '') {
 			return $sErrorMsg;
+		}
 	}
 
-	if (!file_exists($folderPath))
-	{
+	if (!file_exists($folderPath)) {
 		// Turn off all error reporting.
 		error_reporting(0);
 
@@ -172,13 +174,11 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		// Enable error tracking to catch the error.
 		ini_set('track_errors', '1');
 
-		if (isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate'])
-		{
+		if (isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate']) {
 			mkdir($folderPath);
 		} else {
 			$permissions = '0777';
-			if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate'])
-			{
+			if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate']) {
 				$permissions = (string) $Config['ChmodOnFolderCreate'];
 			}
 			$permissionsdec = octdec($permissions);
@@ -197,7 +197,9 @@ function CreateServerFolder($folderPath, $lastFolder = null)
 		ini_restore('error_reporting');
 
 		return $sErrorMsg;
-	} else return '';
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -223,8 +225,9 @@ function GetRootPath()
 
 	// This can check only that this script isn't run from a virtual dir
 	// But it avoids the problems that arise if it isn't checked
-	if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath))
+	if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath)) {
 		SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
+	}
 
 	return substr($sRealPath, 0, $position);
 }
@@ -261,11 +264,13 @@ function IsAllowedExt($sExtension, $resourceType)
 	$arAllowed = $Config['AllowedExtensions'][$resourceType];
 	$arDenied = $Config['DeniedExtensions'][$resourceType];
 
-	if (count($arAllowed) > 0 && !in_array($sExtension, $arAllowed))
+	if (count($arAllowed) > 0 && !in_array($sExtension, $arAllowed)) {
 		return false;
+	}
 
-	if (count($arDenied) > 0 && in_array($sExtension, $arDenied))
+	if (count($arDenied) > 0 && in_array($sExtension, $arDenied)) {
 		return false;
+	}
 
 	return true;
 }
@@ -279,8 +284,9 @@ function IsAllowedExt($sExtension, $resourceType)
 function IsAllowedType($resourceType)
 {
 	global $Config;
-	if (!in_array($resourceType, $Config['ConfigAllowedTypes']))
+	if (!in_array($resourceType, $Config['ConfigAllowedTypes'])) {
 		return false;
+	}
 
 	return true;
 }
@@ -295,8 +301,9 @@ function IsAllowedCommand($sCommand)
 {
 	global $Config;
 
-	if (!in_array($sCommand, $Config['ConfigAllowedCommands']))
+	if (!in_array($sCommand, $Config['ConfigAllowedCommands'])) {
 		return false;
+	}
 
 	return true;
 }
@@ -314,10 +321,12 @@ function GetCurrentFolder()
 	$sCurrentFolder = isset($_GET['CurrentFolder']) ? GETPOST('CurrentFolder', '', 1) : '/';
 
 	// Check the current folder syntax (must begin and start with a slash).
-	if (!preg_match('|/$|', $sCurrentFolder))
+	if (!preg_match('|/$|', $sCurrentFolder)) {
 		$sCurrentFolder .= '/';
-	if (strpos($sCurrentFolder, '/') !== 0)
+	}
+	if (strpos($sCurrentFolder, '/') !== 0) {
 		$sCurrentFolder = '/'.$sCurrentFolder;
+	}
 
 	// Ensure the folder path has no double-slashes
 	while (strpos($sCurrentFolder, '//') !== false) {
@@ -325,11 +334,13 @@ function GetCurrentFolder()
 	}
 
 	// Check for invalid folder paths (..)
-	if (strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\"))
+	if (strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\")) {
 		SendError(102, '');
+	}
 
-	if (preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder))
+	if (preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder)) {
 		SendError(102, '');
+	}
 
 	return $sCurrentFolder;
 }
@@ -363,8 +374,9 @@ function SanitizeFileName($sNewFileName)
 	$sNewFileName = stripslashes($sNewFileName);
 
 	// Replace dots in the name with underscores (only one dot can be there... security issue).
-	if ($Config['ForceSingleExtension'])
+	if ($Config['ForceSingleExtension']) {
 		$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
+	}
 
 	// Remove \ / | : ? * " < >
 	$sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName);
diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php
index b1f97d10395..bd9b9218155 100644
--- a/htdocs/core/filemanagerdol/connectors/php/upload.php
+++ b/htdocs/core/filemanagerdol/connectors/php/upload.php
@@ -41,8 +41,9 @@ function SendError($number, $text)
 
 
 // Check if this uploader has been enabled.
-if (!$Config['Enabled'])
+if (!$Config['Enabled']) {
 	SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
+}
 
 $sCommand = 'QuickUpload';
 
@@ -52,12 +53,14 @@ $sType = isset($_GET['Type']) ? $_GET['Type'] : 'File';
 $sCurrentFolder = "/";
 
 // Is enabled the upload?
-if (!IsAllowedCommand($sCommand))
+if (!IsAllowedCommand($sCommand)) {
 	SendUploadResults('1', '', '', 'The ""'.$sCommand.'"" command isn\'t allowed');
+}
 
 // Check if it is an allowed type.
-if (!IsAllowedType($sType))
+if (!IsAllowedType($sType)) {
 	SendUploadResults(1, '', '', 'Invalid type specified');
+}
 
 
 // @CHANGE
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index beec251f40e..262fd773ff4 100644
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -78,15 +78,13 @@ function FindBadUtf8($string)
  */
 function ConvertToXmlAttribute($value)
 {
-	if (defined('PHP_OS'))
-	{
+	if (defined('PHP_OS')) {
 		$os = PHP_OS;
 	} else {
 		$os = php_uname();
 	}
 
-	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value))
-	{
+	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value)) {
 		return (utf8_encode(htmlspecialchars($value)));
 	} else {
 		return (htmlspecialchars($value));
@@ -102,13 +100,11 @@ function ConvertToXmlAttribute($value)
  */
 function IsHtmlExtension($ext, $formExtensions)
 {
-	if (!$formExtensions || !is_array($formExtensions))
-	{
+	if (!$formExtensions || !is_array($formExtensions)) {
 		return false;
 	}
 	$lcaseHtmlExtensions = array();
-	foreach ($formExtensions as $key => $val)
-	{
+	foreach ($formExtensions as $key => $val) {
 		$lcaseHtmlExtensions[$key] = strtolower($val);
 	}
 	return in_array($ext, $lcaseHtmlExtensions);
@@ -127,8 +123,7 @@ function DetectHtml($filePath)
 	$fp = @fopen($filePath, 'rb');
 
 	//open_basedir restriction, see #1906
-	if ($fp === false || !flock($fp, LOCK_SH))
-	{
+	if ($fp === false || !flock($fp, LOCK_SH)) {
 		return -1;
 	}
 
@@ -138,45 +133,38 @@ function DetectHtml($filePath)
 
 	$chunk = strtolower($chunk);
 
-	if (!$chunk)
-	{
+	if (!$chunk) {
 		return false;
 	}
 
 	$chunk = trim($chunk);
 
-	if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk))
-	{
+	if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk)) {
 		return true;
 	}
 
 	$tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
 
-	foreach ($tags as $tag)
-	{
-		if (false !== strpos($chunk, $tag))
-		{
+	foreach ($tags as $tag) {
+		if (false !== strpos($chunk, $tag)) {
 			return true;
 		}
 	}
 
 	//type = javascript
-	if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk))
-	{
+	if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
 		return true;
 	}
 
 	//href = javascript
 	//src = javascript
 	//data = javascript
-	if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
-	{
+	if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
 		return true;
 	}
 
 	//url(javascript
-	if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk))
-	{
+	if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
 		return true;
 	}
 
diff --git a/htdocs/core/get_info.php b/htdocs/core/get_info.php
index a91d5a6afec..4927be6a005 100644
--- a/htdocs/core/get_info.php
+++ b/htdocs/core/get_info.php
@@ -27,14 +27,22 @@
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+}
 
 $langs->load("main");
 
@@ -62,23 +70,27 @@ print '<div style="padding: 20px;">';
 
 // Define link to login card
 $appli = constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-{
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 	$appli = $conf->global->MAIN_APPLICATION_TITLE;
-	if (preg_match('/\d\.\d/', $appli))
-	{
-		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-	} else $appli .= " ".DOL_VERSION;
-} else $appli .= " ".DOL_VERSION;
+	if (preg_match('/\d\.\d/', $appli)) {
+		if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+			$appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+		}
+	} else {
+		$appli .= " ".DOL_VERSION;
+	}
+} else {
+	$appli .= " ".DOL_VERSION;
+}
 
-if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+	$appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+}
 
 $logouttext = '';
-if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-{
+if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 	//$logouthtmltext=$appli.'<br>';
-	if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
-	{
+	if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {
 		$logouthtmltext .= $langs->trans("Logout").'<br>';
 
 		$logouttext .= '<a href="'.DOL_URL_ROOT.'/user/logout.php">';
@@ -109,11 +121,15 @@ $toprightmenu .= '<div class="login_block_other">';
 // Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
 $parameters = array();
 $result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
-if (is_numeric($result))
-{
-	if (empty($result)) $toprightmenu .= $hookmanager->resPrint; // add
-	else $toprightmenu = $hookmanager->resPrint; // replace
-} else $toprightmenu .= $result; // For backward compatibility
+if (is_numeric($result)) {
+	if (empty($result)) {
+		$toprightmenu .= $hookmanager->resPrint; // add
+	} else {
+		$toprightmenu = $hookmanager->resPrint; // replace
+	}
+} else {
+	$toprightmenu .= $result; // For backward compatibility
+}
 
 if (!isset($form) || !is_object($form)) {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -121,8 +137,7 @@ if (!isset($form) || !is_object($form)) {
 }
 
 // Link to module builder
-if (!empty($conf->modulebuilder->enabled))
-{
+if (!empty($conf->modulebuilder->enabled)) {
 	$text = '<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="modulebuilder">';
 	//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 	$text .= '<span class="fa fa-bug atoplogin"></span>';
@@ -192,7 +207,9 @@ if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPT
 */
 
 // Logout link
-if (GETPOST('withlogout', 'int')) $toprightmenu .= $form->textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
+if (GETPOST('withlogout', 'int')) {
+	$toprightmenu .= $form->textwithtooltip('', $logouthtmltext, 2, 1, $logouttext, 'login_block_elem', 2);
+}
 
 $toprightmenu .= '</div>';
 
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index c64006439bc..d45b6f2f350 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -27,24 +27,50 @@
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', 1);
-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', 1);
+}
 
-if (!defined('DISABLE_JQUERY_TABLEDND'))   define('DISABLE_JQUERY_TABLEDND', 1);
-if (!defined('DISABLE_JQUERY_JNOTIFY'))    define('DISABLE_JQUERY_JNOTIFY', 1);
-if (!defined('DISABLE_JQUERY_FLOT'))       define('DISABLE_JQUERY_FLOT', 1);
-if (!defined('DISABLE_JQUERY_JEDITABLE'))  define('DISABLE_JQUERY_JEDITABLE', 1);
-if (!defined('DISABLE_CKEDITOR'))          define('DISABLE_CKEDITOR', 1);
-if (!defined('DISABLE_DATE_PICKER'))       define('DISABLE_DATE_PICKER', 1);
-if (!defined('DISABLE_SELECT2'))           define('DISABLE_SELECT2', 1);
+if (!defined('DISABLE_JQUERY_TABLEDND')) {
+	define('DISABLE_JQUERY_TABLEDND', 1);
+}
+if (!defined('DISABLE_JQUERY_JNOTIFY')) {
+	define('DISABLE_JQUERY_JNOTIFY', 1);
+}
+if (!defined('DISABLE_JQUERY_FLOT')) {
+	define('DISABLE_JQUERY_FLOT', 1);
+}
+if (!defined('DISABLE_JQUERY_JEDITABLE')) {
+	define('DISABLE_JQUERY_JEDITABLE', 1);
+}
+if (!defined('DISABLE_CKEDITOR')) {
+	define('DISABLE_CKEDITOR', 1);
+}
+if (!defined('DISABLE_DATE_PICKER')) {
+	define('DISABLE_DATE_PICKER', 1);
+}
+if (!defined('DISABLE_SELECT2')) {
+	define('DISABLE_SELECT2', 1);
+}
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+}
 
 $langs->load("main");
 $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
@@ -174,8 +200,7 @@ $(document).ready(function(){
 ';
 
 
-if (empty($user->socid))	// If internal user or not defined
-{
+if (empty($user->socid)) {	// If internal user or not defined
 	$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
 } else // If external user
 {
@@ -184,18 +209,19 @@ if (empty($user->socid))	// If internal user or not defined
 
 // Load the menu manager (only if not already done)
 $file_menu = $conf->standard_menu;
-if (GETPOST('menu', 'aZ09')) $file_menu = GETPOST('menu', 'aZ09'); // example: menu=eldy_menu.php
-if (!class_exists('MenuManager'))
-{
+if (GETPOST('menu', 'aZ09')) {
+	$file_menu = GETPOST('menu', 'aZ09'); // example: menu=eldy_menu.php
+}
+if (!class_exists('MenuManager')) {
 	$menufound = 0;
 	$dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
-	foreach ($dirmenus as $dirmenu)
-	{
+	foreach ($dirmenus as $dirmenu) {
 		$menufound = dol_include_once($dirmenu."standard/".$file_menu);
-		if ($menufound) break;
+		if ($menufound) {
+			break;
+		}
 	}
-	if (!$menufound)	// If failed to include, we try with standard
-	{
+	if (!$menufound) {	// If failed to include, we try with standard
 		dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
 		$file_menu = 'eldy_menu.php';
 		include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
diff --git a/htdocs/core/js/lib_gravatar.js.php b/htdocs/core/js/lib_gravatar.js.php
index 59a1e5fddb5..887eed12b0a 100644
--- a/htdocs/core/js/lib_gravatar.js.php
+++ b/htdocs/core/js/lib_gravatar.js.php
@@ -24,14 +24,28 @@
 
 //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB', '1');
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1');	// Not disabled cause need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 session_cache_limiter('public');
 
@@ -40,133 +54,136 @@ require_once '../../main.inc.php';
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 ?>
 
 function get_avatar_from_service(service, userid, size) {
-    // this return the url that redirects to the according user image/avatar/profile picture
-    // implemented services: google profiles, facebook, gravatar, twitter, tumblr, default fallback
-    // for google   use get_avatar_from_service('google', profile-name or user-id , size-in-px )
-    // for facebook use get_avatar_from_service('facebook', vanity url or user-id , size-in-px or size-as-word )
-    // for gravatar use get_avatar_from_service('gravatar', md5 hash email@adress, size-in-px )
-    // for twitter  use get_avatar_from_service('twitter', username, size-in-px or size-as-word )
-    // for tumblr   use get_avatar_from_service('tumblr', blog-url, size-in-px )
-    // everything else will go to the fallback
-    // google and gravatar scale the avatar to any site, others will guided to the next best version
-    var url = '';
+	// this return the url that redirects to the according user image/avatar/profile picture
+	// implemented services: google profiles, facebook, gravatar, twitter, tumblr, default fallback
+	// for google   use get_avatar_from_service('google', profile-name or user-id , size-in-px )
+	// for facebook use get_avatar_from_service('facebook', vanity url or user-id , size-in-px or size-as-word )
+	// for gravatar use get_avatar_from_service('gravatar', md5 hash email@adress, size-in-px )
+	// for twitter  use get_avatar_from_service('twitter', username, size-in-px or size-as-word )
+	// for tumblr   use get_avatar_from_service('tumblr', blog-url, size-in-px )
+	// everything else will go to the fallback
+	// google and gravatar scale the avatar to any site, others will guided to the next best version
+	var url = '';
 
-    switch (service) {
+	switch (service) {
 
-    case "google":
-        // see http://googlesystem.blogspot.com/2011/03/unedited-google-profile-pictures.html (couldn't find a better link)
-        // available sizes: all, google rescales for you
-        url = "http://profiles.google.com/s2/photos/profile/" + userid + "?sz=" + size;
-        break;
+	case "google":
+		// see http://googlesystem.blogspot.com/2011/03/unedited-google-profile-pictures.html (couldn't find a better link)
+		// available sizes: all, google rescales for you
+		url = "http://profiles.google.com/s2/photos/profile/" + userid + "?sz=" + size;
+		break;
 
-    case "facebook":
-        // see https://developers.facebook.com/docs/reference/api/
-        // available sizes: square (50x50), small (50xH) , normal (100xH), large (200xH)
-        var sizeparam = '';
-        if (isNumberOrNot(size)) {
-            if (size >= 200) {
-                sizeparam = 'large'
-            };
-            if (size >= 100 && size < 200) {
-                sizeparam = 'normal'
-            };
-            if (size >= 50 && size < 100) {
-                sizeparam = 'small'
-            };
-            if (size < 50) {
-                sizeparam = 'square'
-            };
-        } else {
-            sizeparam = size;
-        }
-        url = "https://graph.facebook.com/" + userid + "/picture?type=" + sizeparam;
-        break;
+	case "facebook":
+		// see https://developers.facebook.com/docs/reference/api/
+		// available sizes: square (50x50), small (50xH) , normal (100xH), large (200xH)
+		var sizeparam = '';
+		if (isNumberOrNot(size)) {
+			if (size >= 200) {
+				sizeparam = 'large'
+			};
+			if (size >= 100 && size < 200) {
+				sizeparam = 'normal'
+			};
+			if (size >= 50 && size < 100) {
+				sizeparam = 'small'
+			};
+			if (size < 50) {
+				sizeparam = 'square'
+			};
+		} else {
+			sizeparam = size;
+		}
+		url = "https://graph.facebook.com/" + userid + "/picture?type=" + sizeparam;
+		break;
 
-    case "gravatar":
-        // see http://en.gravatar.com/site/implement/images/
-        // available sizes: all, gravatar rescales for you
-        url = "http://www.gravatar.com/avatar/" + userid + "?s=" + size
-        break;
+	case "gravatar":
+		// see http://en.gravatar.com/site/implement/images/
+		// available sizes: all, gravatar rescales for you
+		url = "http://www.gravatar.com/avatar/" + userid + "?s=" + size
+		break;
 
-    case "twitter":
-        // see https://dev.twitter.com/docs/api/1/get/users/profile_image/%3Ascreen_name
-        // available sizes: bigger (73x73), normal (48x48), mini (24x24), no param will give you full size
-        var sizeparam = '';
-        if (isNumberOrNot(size)) {
-            if (size >= 73) {
-                sizeparam = 'bigger'
-            };
-            if (size >= 48 && size < 73) {
-                sizeparam = 'normal'
-            };
-            if (size < 48) {
-                sizeparam = 'mini'
-            };
-        } else {
-            sizeparam = size;
-        }
+	case "twitter":
+		// see https://dev.twitter.com/docs/api/1/get/users/profile_image/%3Ascreen_name
+		// available sizes: bigger (73x73), normal (48x48), mini (24x24), no param will give you full size
+		var sizeparam = '';
+		if (isNumberOrNot(size)) {
+			if (size >= 73) {
+				sizeparam = 'bigger'
+			};
+			if (size >= 48 && size < 73) {
+				sizeparam = 'normal'
+			};
+			if (size < 48) {
+				sizeparam = 'mini'
+			};
+		} else {
+			sizeparam = size;
+		}
 
-        url = "http://api.twitter.com/1/users/profile_image?screen_name=" + userid + "&size=" + sizeparam;
-        break;
+		url = "http://api.twitter.com/1/users/profile_image?screen_name=" + userid + "&size=" + sizeparam;
+		break;
 
-    case "tumblr":
-        // see http://www.tumblr.com/docs/en/api/v2#blog-avatar
-        //TODO do something smarter with the ranges
-        // available sizes: 16, 24, 30, 40, 48, 64, 96, 128, 512
-        var sizeparam = '';
-        if (size >= 512) {
-            sizeparam = 512
-        };
-        if (size >= 128 && size < 512) {
-            sizeparam = 128
-        };
-        if (size >= 96 && size < 128) {
-            sizeparam = 96
-        };
-        if (size >= 64 && size < 96) {
-            sizeparam = 64
-        };
-        if (size >= 48 && size < 64) {
-            sizeparam = 48
-        };
-        if (size >= 40 && size < 48) {
-            sizeparam = 40
-        };
-        if (size >= 30 && size < 40) {
-            sizeparam = 30
-        };
-        if (size >= 24 && size < 30) {
-            sizeparam = 24
-        };
-        if (size < 24) {
-            sizeparam = 16
-        };
+	case "tumblr":
+		// see http://www.tumblr.com/docs/en/api/v2#blog-avatar
+		//TODO do something smarter with the ranges
+		// available sizes: 16, 24, 30, 40, 48, 64, 96, 128, 512
+		var sizeparam = '';
+		if (size >= 512) {
+			sizeparam = 512
+		};
+		if (size >= 128 && size < 512) {
+			sizeparam = 128
+		};
+		if (size >= 96 && size < 128) {
+			sizeparam = 96
+		};
+		if (size >= 64 && size < 96) {
+			sizeparam = 64
+		};
+		if (size >= 48 && size < 64) {
+			sizeparam = 48
+		};
+		if (size >= 40 && size < 48) {
+			sizeparam = 40
+		};
+		if (size >= 30 && size < 40) {
+			sizeparam = 30
+		};
+		if (size >= 24 && size < 30) {
+			sizeparam = 24
+		};
+		if (size < 24) {
+			sizeparam = 16
+		};
 
-        url = "http://api.tumblr.com/v2/blog/" + userid + "/avatar/" + sizeparam;
-        break;
+		url = "http://api.tumblr.com/v2/blog/" + userid + "/avatar/" + sizeparam;
+		break;
 
-    default:
-        // http://www.iconfinder.com/icondetails/23741/128/avatar_devil_evil_green_monster_vampire_icon
-        // find your own
-        url = "http://i.imgur.com/RLiDK.png"; // 48x48
-    }
+	default:
+		// http://www.iconfinder.com/icondetails/23741/128/avatar_devil_evil_green_monster_vampire_icon
+		// find your own
+		url = "http://i.imgur.com/RLiDK.png"; // 48x48
+	}
 
 
-    return url;
+	return url;
 }
 
 
 // helper methods
 
 function isNumberOrNot(n) {
-    // see http://stackoverflow.com/questions/18082/validate-numbers-in-javascript-isnumeric
-    return !isNaN(parseFloat(n)) && isFinite(n);
+	// see http://stackoverflow.com/questions/18082/validate-numbers-in-javascript-isnumeric
+	return !isNaN(parseFloat(n)) && isFinite(n);
 }
 
 // End of lib_gravatar.js.php
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index ee95a13208f..83646ab4f5e 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -24,13 +24,27 @@
  * 				JQuery (providing object $) and JQuery-UI (providing $datepicker) libraries must be loaded before this file.
  */
 
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 session_cache_limiter('public');
 
@@ -39,8 +53,11 @@ require_once '../../main.inc.php';
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 
 
@@ -142,7 +159,7 @@ jQuery(function($){
 		firstDay: <?php echo (isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'); ?>,
 		isRTL: <?php echo ($langs->trans("DIRECTION") == 'rtl' ? 'true' : 'false'); ?>,
 		showMonthAfterYear: false,  	/* TODO add specific to country	*/
- 		yearSuffix: ''			/* TODO add specific to country */
+		 yearSuffix: ''			/* TODO add specific to country */
 	};
 	$.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']);
 });
@@ -331,32 +348,32 @@ function getDateFromFormat(val,format)
 		}
 
 		// alert('substr='+substr);
-        if (substr == "yyyy") year=getIntegerInString(val,d,4,4);
-        if (substr == "yy")   year=""+(getIntegerInString(val,d,2,2)-0+1900);
-        if (substr == "MM" ||substr == "M")
-        {
-            month=getIntegerInString(val,d,1,2);
-            if (month) d -= 2- month.length;
-        }
-        if (substr == "dd")
-        {
-            day=getIntegerInString(val,d,1,2);
-            if (day) d -= 2- day.length;
-        }
-        if (substr == "HH" ||substr == "hh" )
-        {
-            hour=getIntegerInString(val,d,1,2);
-            if (dhouray) d -= 2- hour.length;
-        }
-        if (substr == "mm"){
-            minute=getIntegerInString(val,d,1,2);
-            if (minute) d -= 2- minute.length;
-        }
-        if (substr == "ss")
-        {
-            seconde=getIntegerInString(val,d,1,2);
-            if (seconde) d -= 2- seconde.length;
-        }
+		if (substr == "yyyy") year=getIntegerInString(val,d,4,4);
+		if (substr == "yy")   year=""+(getIntegerInString(val,d,2,2)-0+1900);
+		if (substr == "MM" ||substr == "M")
+		{
+			month=getIntegerInString(val,d,1,2);
+			if (month) d -= 2- month.length;
+		}
+		if (substr == "dd")
+		{
+			day=getIntegerInString(val,d,1,2);
+			if (day) d -= 2- day.length;
+		}
+		if (substr == "HH" ||substr == "hh" )
+		{
+			hour=getIntegerInString(val,d,1,2);
+			if (dhouray) d -= 2- hour.length;
+		}
+		if (substr == "mm"){
+			minute=getIntegerInString(val,d,1,2);
+			if (minute) d -= 2- minute.length;
+		}
+		if (substr == "ss")
+		{
+			seconde=getIntegerInString(val,d,1,2);
+			if (seconde) d -= 2- seconde.length;
+		}
 
 		i+=substr.length;
 		d+=substr.length;
@@ -439,10 +456,10 @@ function htmlEntityDecodeJs(inp){
 	if (inp)
 	{
 	  for(var r in replacements){
-	    inp = inp.replace(new RegExp(r,'g'),replacements[r]);
+		inp = inp.replace(new RegExp(r,'g'),replacements[r]);
 	  }
 	  return inp.replace(/&#(\d+);/g, function(match, dec) {
-	    return String.fromCharCode(dec);
+		return String.fromCharCode(dec);
 	  });
 	}
 	else { return ''; }
@@ -458,8 +475,8 @@ function htmlEntityDecodeJs(inp){
  * ==================================================================
  */
  function ac_delay(funct,delay) {
- 	// delay before start of action
-  	setTimeout(funct,delay);
+	 // delay before start of action
+	  setTimeout(funct,delay);
 }
 
 
@@ -520,9 +537,9 @@ function hideMessage(fieldId,message) {
  * Used by button to set on/off.
  * Call url then make complementary action (like show/hide, enable/disable or set another option).
  *
- * @param	string	url			Url
+ * @param	string	url			Url (warning: as any url called in ajax mode, the url called here must not renew the token)
  * @param	string	code		Code
- * @param	string	intput		Input
+ * @param	string	intput		Array of complementary actions to do if success
  * @param	int		entity		Entity
  * @param	int		strict		Strict
  * @param   int     forcereload Force reload
@@ -536,7 +553,7 @@ function setConstant(url, code, input, entity, strict, forcereload, userid, toke
 		entity: entity,
 		token: token
 	},
-	function() {
+	function() {	/* handler for success of post */
 		console.log("url request success forcereload="+forcereload);
 		$("#set_" + code).hide();
 		$("#del_" + code).show();
@@ -594,9 +611,9 @@ function setConstant(url, code, input, entity, strict, forcereload, userid, toke
  * Used by button to set on/off
  * Call url then make complementary action (like show/hide, enable/disable or set another option).
  *
- * @param	string	url			Url
+ * @param	string	url			Url (warning: as any url called in ajax mode, the url called here must not renew the token)
  * @param	string	code		Code
- * @param	string	intput		Input
+ * @param	string	intput		Array of complementary actions to do if success
  * @param	int		entity		Entity
  * @param	int		strict		Strict
  * @param   int     forcereload Force reload
@@ -661,12 +678,13 @@ function delConstant(url, code, input, entity, strict, forcereload, userid, toke
 }
 
 /*
- * Used by button to set on/off
+ * Call the setConstant or delConstant but with a confirmation before.
+ * Used by button to set on/off.
  *
  * @param	string	action		Action
  * @param	string	url			Url
  * @param	string	code		Code
- * @param	string	intput		Input
+ * @param	string	intput		Array of complementary actions to do if success
  * @param	string	box			Box
  * @param	int		entity		Entity
  * @param	int		yesButton	yesButton
@@ -735,105 +753,105 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 		options: {
 			minLengthToAutocomplete: 0
 		},
-        _create: function() {
-        	var savMinLengthToAutocomplete = this.options.minLengthToAutocomplete;
-            var self = this,
-                select = this.element.hide(),
-                selected = select.children( ":selected" ),
-                value = selected.val() ? selected.text() : "";
-            var input = this.input = $( "<input>" )
-                .insertAfter( select )
-                .val( value )
-                .attr('id', 'inputautocomplete'+select.attr('id'))
-                .autocomplete({
-                    delay: 0,
-                    minLength: this.options.minLengthToAutocomplete,
-                    source: function( request, response ) {
-                        var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
-                        response( select.children( "option:enabled" ).map(function() {
-                            var text = $( this ).text();
-                            if ( this.value && ( !request.term || matcher.test(text) ) )
-                                return {
-                                    label: text.replace(
-                                        new RegExp(
-                                            "(?![^&;]+;)(?!<[^<>]*)(" +
-                                            $.ui.autocomplete.escapeRegex(request.term) +
-                                            ")(?![^<>]*>)(?![^&;]+;)", "gi"
-                                        ), "<strong>$1</strong>" ),
-                                    value: text,
-                                    option: this
-                                };
-                        }) );
-                    },
-                    select: function( event, ui ) {
-                        ui.item.option.selected = true;
-                        self._trigger( "selected", event, {
-                            item: ui.item.option
-                        });
-                    },
-                    change: function( event, ui ) {
-                        if ( !ui.item ) {
-                            var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ),
-                                valid = false;
-                            select.children( "option" ).each(function() {
-                                if ( $( this ).text().match( matcher ) ) {
-                                    this.selected = valid = true;
-                                    return false;
-                                }
-                            });
-                            if ( !valid ) {
-                                // remove invalid value, as it didnt match anything
-                            	$( this ).val( "" );
-                                select.val( "" );
-                                input.data("ui-autocomplete").term = "";
-                                return false;
-                            }
-                        }
-                    }
-                })
-                .addClass( "ui-widget ui-widget-content ui-corner-left dolibarrcombobox" );
+		_create: function() {
+			var savMinLengthToAutocomplete = this.options.minLengthToAutocomplete;
+			var self = this,
+				select = this.element.hide(),
+				selected = select.children( ":selected" ),
+				value = selected.val() ? selected.text() : "";
+			var input = this.input = $( "<input>" )
+				.insertAfter( select )
+				.val( value )
+				.attr('id', 'inputautocomplete'+select.attr('id'))
+				.autocomplete({
+					delay: 0,
+					minLength: this.options.minLengthToAutocomplete,
+					source: function( request, response ) {
+						var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
+						response( select.children( "option:enabled" ).map(function() {
+							var text = $( this ).text();
+							if ( this.value && ( !request.term || matcher.test(text) ) )
+								return {
+									label: text.replace(
+										new RegExp(
+											"(?![^&;]+;)(?!<[^<>]*)(" +
+											$.ui.autocomplete.escapeRegex(request.term) +
+											")(?![^<>]*>)(?![^&;]+;)", "gi"
+										), "<strong>$1</strong>" ),
+									value: text,
+									option: this
+								};
+						}) );
+					},
+					select: function( event, ui ) {
+						ui.item.option.selected = true;
+						self._trigger( "selected", event, {
+							item: ui.item.option
+						});
+					},
+					change: function( event, ui ) {
+						if ( !ui.item ) {
+							var matcher = new RegExp( "^" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "$", "i" ),
+								valid = false;
+							select.children( "option" ).each(function() {
+								if ( $( this ).text().match( matcher ) ) {
+									this.selected = valid = true;
+									return false;
+								}
+							});
+							if ( !valid ) {
+								// remove invalid value, as it didnt match anything
+								$( this ).val( "" );
+								select.val( "" );
+								input.data("ui-autocomplete").term = "";
+								return false;
+							}
+						}
+					}
+				})
+				.addClass( "ui-widget ui-widget-content ui-corner-left dolibarrcombobox" );
 
-            input.data("ui-autocomplete")._renderItem = function( ul, item ) {
-                return $("<li>")
-                    .data( "ui-autocomplete-item", item ) // jQuery UI > 1.10.0
-                    .append( "<a>" + item.label + "</a>" )
-                    .appendTo( ul );
-            };
+			input.data("ui-autocomplete")._renderItem = function( ul, item ) {
+				return $("<li>")
+					.data( "ui-autocomplete-item", item ) // jQuery UI > 1.10.0
+					.append( "<a>" + item.label + "</a>" )
+					.appendTo( ul );
+			};
 
-            this.button = $( "<button type=\'button\'>&nbsp;</button>" )
-                .attr( "tabIndex", -1 )
-                .attr( "title", "Show All Items" )
-                .insertAfter( input )
-                .button({
-                    icons: {
-                        primary: "ui-icon-triangle-1-s"
-                    },
-                    text: false
-                })
-                .removeClass( "ui-corner-all" )
-                .addClass( "ui-corner-right ui-button-icon" )
-                .click(function() {
-                    // close if already visible
-                    if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
-                        input.autocomplete( "close" );
-                        return;
-                    }
+			this.button = $( "<button type=\'button\'>&nbsp;</button>" )
+				.attr( "tabIndex", -1 )
+				.attr( "title", "Show All Items" )
+				.insertAfter( input )
+				.button({
+					icons: {
+						primary: "ui-icon-triangle-1-s"
+					},
+					text: false
+				})
+				.removeClass( "ui-corner-all" )
+				.addClass( "ui-corner-right ui-button-icon" )
+				.click(function() {
+					// close if already visible
+					if ( input.autocomplete( "widget" ).is( ":visible" ) ) {
+						input.autocomplete( "close" );
+						return;
+					}
 
-                    // pass empty string as value to search for, displaying all results
-                    input.autocomplete({ minLength: 0 });
-                    input.autocomplete( "search", "" );
-                    input.autocomplete({ minLength: savMinLengthToAutocomplete });
-                    input.focus();
-                });
-        },
+					// pass empty string as value to search for, displaying all results
+					input.autocomplete({ minLength: 0 });
+					input.autocomplete( "search", "" );
+					input.autocomplete({ minLength: savMinLengthToAutocomplete });
+					input.focus();
+				});
+		},
 
-        destroy: function() {
-            this.input.remove();
-            this.button.remove();
-            this.element.show();
-            $.Widget.prototype.destroy.call( this );
-        }
-    });
+		destroy: function() {
+			this.input.remove();
+			this.button.remove();
+			this.element.show();
+			$.Widget.prototype.destroy.call( this );
+		}
+	});
 })( jQuery );
 
 
@@ -946,7 +964,7 @@ function document_preview(file, type, title)
 		if (mode == 'image' && showOriginalSizeButton)
 		{
 			optionsbuttons = {
-			    "<?php echo dol_escape_js($langs->transnoentitiesnoconv("OriginalSize")); ?>": function() { console.log("Click on original size"); jQuery(".ui-dialog-content.ui-widget-content > object").css({ "max-height": "none" }); },
+				"<?php echo dol_escape_js($langs->transnoentitiesnoconv("OriginalSize")); ?>": function() { console.log("Click on original size"); jQuery(".ui-dialog-content.ui-widget-content > object").css({ "max-height": "none" }); },
 				"<?php echo dol_escape_js($langs->transnoentitiesnoconv("CloseWindow")); ?>": function() { $( this ).dialog( "close" ); }
 				};
 		}
@@ -978,10 +996,10 @@ function document_preview(file, type, title)
  */
 function getParameterByName(name, valueifnotfound)
 {
-    name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-        results = regex.exec(location.search);
-    return results === null ? valueifnotfound : decodeURIComponent(results[1].replace(/\+/g, " "));
+	name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+	var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+		results = regex.exec(location.search);
+	return results === null ? valueifnotfound : decodeURIComponent(results[1].replace(/\+/g, " "));
 }
 
 
@@ -1074,7 +1092,9 @@ function price2numjs(amount) {
 	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
 		$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
 	}
-	if ($thousand == 'Space') $thousand = ' ';
+	if ($thousand == 'Space') {
+		$thousand = ' ';
+	}
 	print "var dec='".dol_escape_js($dec)."'; var thousand='".dol_escape_js($thousand)."';\n"; // Set var in javascript
 	?>
 
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index d404e09b578..f25c218f5d8 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -19,19 +19,32 @@
  * Library javascript to enable Browser notifications
  */
 
-if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1');
-if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN')) define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
+if (!defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
 
 require_once '../../main.inc.php';
 
 if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/index.php'
-	|| preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER'])))
-{
+	|| preg_match('/getmenu_div\.php/', $_SERVER['HTTP_REFERER']))) {
 	global $langs, $conf;
 
 	top_httphead('text/javascript; charset=UTF-8');
@@ -45,44 +58,44 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
 	/* Check if permission ok */
 	if (Notification.permission !== "granted") {
 		console.log("Ask Notification.permission");
-        Notification.requestPermission()
-    }
+		Notification.requestPermission()
+	}
 
 	/* Launch timer */
-   	// We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
-    //var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
-    var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
-    if (login != '') {
-    	setTimeout(first_execution, time_first_execution * 1000);
-        time_js_next_test = nowtime + time_first_execution;
-    	console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
-    } //first run auto check
+	   // We set a delay before launching first test so next check will arrive after the time_auto_update compared to previous one.
+	//var time_first_execution = (time_auto_update + (time_js_next_test - nowtime)) * 1000;	//need milliseconds
+	var time_first_execution = <?php echo max(3, empty($conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION) ? 0 : $conf->global->MAIN_BROWSER_NOTIFICATION_CHECK_FIRST_EXECUTION); ?>;
+	if (login != '') {
+		setTimeout(first_execution, time_first_execution * 1000);
+		time_js_next_test = nowtime + time_first_execution;
+		console.log("Launch browser notif check: setTimeout is set to launch 'first_execution' function after a wait of time_first_execution="+time_first_execution+". nowtime (time php page generation) = "+nowtime+" time_js_next_check = "+time_js_next_test);
+	} //first run auto check
 
 
-    function first_execution() {
-    	console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update);
-        check_events();	//one check before setting the new time for other checks
-        setInterval(check_events, time_auto_update * 1000); // Set new time to run next check events
-    }
+	function first_execution() {
+		console.log("Call first_execution then set repeat time to time_auto_update = MAIN_BROWSER_NOTIFICATION_FREQUENCY = "+time_auto_update);
+		check_events();	//one check before setting the new time for other checks
+		setInterval(check_events, time_auto_update * 1000); // Set new time to run next check events
+	}
 
-    function check_events() {
-    	if (Notification.permission === "granted")
-    	{
-    	    time_js_next_test += time_auto_update;
-    		console.log("Call ajax to check_events with time_js_next_test = "+time_js_next_test);
+	function check_events() {
+		if (Notification.permission === "granted")
+		{
+			time_js_next_test += time_auto_update;
+			console.log("Call ajax to check_events with time_js_next_test = "+time_js_next_test);
 
-            $.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php'; ?>", {
-                type: "post",   // Usually post or get
-                async: true,
-                data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
-                dataType: "json",
-                success: function (result) {
-                	//console.log(result);
-                    var arrayofpastreminders = Object.values(result.pastreminders);
-                    if (arrayofpastreminders && arrayofpastreminders.length > 0) {
-	                    console.log("Retrieved "+arrayofpastreminders.length+" reminders to do.");
-                    	var audio = null;
-                        <?php
+			$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php'; ?>", {
+				type: "post",   // Usually post or get
+				async: true,
+				data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
+				dataType: "json",
+				success: function (result) {
+					//console.log(result);
+					var arrayofpastreminders = Object.values(result.pastreminders);
+					if (arrayofpastreminders && arrayofpastreminders.length > 0) {
+						console.log("Retrieved "+arrayofpastreminders.length+" reminders to do.");
+						var audio = null;
+						<?php
 						if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
 							print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav\');';
 						}
@@ -90,70 +103,70 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
 						var listofreminderids = '';
 						var noti = []
 
-                        $.each(arrayofpastreminders, function (index, value) {
-                        	console.log(value);
-                            var url = "notdefined";
-                            var title = "Not defined";
-                            var body = value.label;
-                            if (value.type == 'agenda' && value.location != null && value.location != '') {
-                                body += '\n' + value.location;
-                            }
+						$.each(arrayofpastreminders, function (index, value) {
+							console.log(value);
+							var url = "notdefined";
+							var title = "Not defined";
+							var body = value.label;
+							if (value.type == 'agenda' && value.location != null && value.location != '') {
+								body += '\n' + value.location;
+							}
 
-                            if (value.type == 'agenda' && (value.event_date_start_formated != null || value.event_date_start_formated['event_date_start'] != '')) {
-                                body += '\n' + value.event_date_start_formated;
-                            }
+							if (value.type == 'agenda' && (value.event_date_start_formated != null || value.event_date_start_formated['event_date_start'] != '')) {
+								body += '\n' + value.event_date_start_formated;
+							}
 
-                            if (value.type == 'agenda')
-                            {
-                             	url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
-                                title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>';
-                            }
-                            var extra = {
-                                icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
-                                //image: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
-                                body: body,
-                                tag: value.id_agenda,
-                                requireInteraction: true
-                            };
+							if (value.type == 'agenda')
+							{
+								 url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
+								title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>';
+							}
+							var extra = {
+								icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
+								//image: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',
+								body: body,
+								tag: value.id_agenda,
+								requireInteraction: true
+							};
 
-                            // We release the notify
-                            console.log("Send notification on browser");
-                            noti[index] = new Notification(title, extra);
-                            if (index==0 && audio)
-                            {
-                            	audio.play();
-                            }
+							// We release the notify
+							console.log("Send notification on browser");
+							noti[index] = new Notification(title, extra);
+							if (index==0 && audio)
+							{
+								audio.play();
+							}
 
-                            if (noti[index]) {
-	                            noti[index].onclick = function (event) {
-	                                console.log("A click on notification on browser has been done");
-	                                event.preventDefault(); // prevent the browser from focusing the Notification's tab
-	                                window.focus();
-	                                window.open(url, '_blank');
-	                                noti[index].close();
-	                            };
+							if (noti[index]) {
+								noti[index].onclick = function (event) {
+									console.log("A click on notification on browser has been done");
+									event.preventDefault(); // prevent the browser from focusing the Notification's tab
+									window.focus();
+									window.open(url, '_blank');
+									noti[index].close();
+								};
 
-	                            listofreminderids = (listofreminderids == '' ? '' : listofreminderids + ',') + value.id_reminder
-	                        }
-                        });
+								listofreminderids = (listofreminderids == '' ? '' : listofreminderids + ',') + value.id_reminder
+							}
+						});
 
-                        // Update status of all notifications we sent on browser (listofreminderids)
-                        console.log("Flag notification as done for listofreminderids="+listofreminderids);
+						// Update status of all notifications we sent on browser (listofreminderids)
+						console.log("Flag notification as done for listofreminderids="+listofreminderids);
 						$.ajax("<?php print DOL_URL_ROOT.'/core/ajax/check_notifications.php?action=stopreminder&listofreminderids='; ?>"+listofreminderids, {
-			                type: "post",   // Usually post or get
-			                async: true,
-			                data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
-			            });
-                    } else {
-                    	console.log("No reminder to do found, next search at "+time_js_next_test);
-                    }
-                }
-            });
-        }
-        else
-        {
-        	console.log("Cancel check_events. Useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
-        }
-    }
-    <?php
+							type: "post",   // Usually post or get
+							async: true,
+							data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
+						});
+					} else {
+						console.log("No reminder to do found, next search at "+time_js_next_test);
+					}
+				}
+			});
+		}
+		else
+		{
+			console.log("Cancel check_events. Useless because javascript Notification.permission is "+Notification.permission+" (blocked manualy or web site is not https).");
+		}
+	}
+	<?php
 }
diff --git a/htdocs/core/js/timepicker.js.php b/htdocs/core/js/timepicker.js.php
index 158c755935f..11b65e729b5 100644
--- a/htdocs/core/js/timepicker.js.php
+++ b/htdocs/core/js/timepicker.js.php
@@ -21,13 +21,27 @@
  * \brief      File that include javascript functions for timepicker
  */
 
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 session_cache_limiter('public');
 
@@ -36,8 +50,11 @@ require_once '../../main.inc.php';
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 ?>
 
 // For JQuery Timepicker
@@ -61,4 +78,6 @@ jQuery(function($){
 });
 
 <?php
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}
diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php
index 20ffa3f52b6..c697b93e5bb 100644
--- a/htdocs/core/lib/accounting.lib.php
+++ b/htdocs/core/lib/accounting.lib.php
@@ -94,9 +94,13 @@ function length_accountg($account)
 {
 	global $conf;
 
-	if ($account < 0 || is_empty($account)) return '';
+	if ($account < 0 || is_empty($account)) {
+		return '';
+	}
 
-	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $account;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+		return $account;
+	}
 
 	$g = $conf->global->ACCOUNTING_LENGTH_GACCOUNT;
 	if (!is_empty($g)) {
@@ -129,9 +133,13 @@ function length_accounta($accounta)
 {
 	global $conf;
 
-	if ($accounta < 0 || is_empty($accounta)) return '';
+	if ($accounta < 0 || is_empty($accounta)) {
+		return '';
+	}
 
-	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) return $accounta;
+	if (!empty($conf->global->ACCOUNTING_MANAGE_ZERO)) {
+		return $accounta;
+	}
 
 	$a = $conf->global->ACCOUNTING_LENGTH_AACCOUNT;
 	if (!is_empty($a)) {
@@ -177,7 +185,9 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 
 	print "\n\n<!-- start banner journal -->\n";
 
-	if (!is_empty($varlink)) $varlink = '?'.$varlink;
+	if (!is_empty($varlink)) {
+		$varlink = '?'.$varlink;
+	}
 
 	$head = array();
 	$h = 0;
@@ -190,8 +200,7 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 
 	print dol_get_fiche_head($head, 'journal');
 
-	foreach ($moreparam as $key => $value)
-	{
+	foreach ($moreparam as $key => $value) {
 		print '<input type="hidden" name="'.$key.'" value="'.$value.'">';
 	}
 	print '<table width="100%" class="border">';
@@ -205,14 +214,18 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 	print '</tr>';
 
 	// Calculation mode
-	if ($calcmode)
-	{
+	if ($calcmode) {
 		print '<tr>';
 		print '<td width="110">'.$langs->trans("CalculationMode").'</td>';
-		if (!$variante) print '<td colspan="3">';
-		else print '<td>';
+		if (!$variante) {
+			print '<td colspan="3">';
+		} else {
+			print '<td>';
+		}
 		print $calcmode;
-		if ($variante) print '</td><td colspan="2">'.$variante;
+		if ($variante) {
+			print '</td><td colspan="2">'.$variante;
+		}
 		print '</td>';
 		print '</tr>';
 	}
@@ -220,10 +233,17 @@ function journalHead($nom, $variante, $period, $periodlink, $description, $build
 	// Ligne de la periode d'analyse du rapport
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportPeriod").'</td>';
-	if (!$periodlink) print '<td colspan="3">';
-	else print '<td>';
-	if ($period) print $period;
-	if ($periodlink) print '</td><td colspan="2">'.$periodlink;
+	if (!$periodlink) {
+		print '<td colspan="3">';
+	} else {
+		print '<td>';
+	}
+	if ($period) {
+		print $period;
+	}
+	if ($periodlink) {
+		print '</td><td colspan="2">'.$periodlink;
+	}
 	print '</td>';
 	print '</tr>';
 
@@ -270,8 +290,7 @@ function getDefaultDatesForTransfer()
 			$year_start = dol_print_date(dol_now(), '%Y');
 			$year_end = $year_start + 1;
 			$month_end = $month_start - 1;
-			if ($month_end < 1)
-			{
+			if ($month_end < 1) {
 				$month_end = 12;
 				$year_end--;
 			}
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index ce9ffb31697..9810f032ffa 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -1438,15 +1438,15 @@ function complete_elementList_with_modules(&$elementList)
 							$dirmod[$i] = $dir;
 							//print "x".$modName." ".$orders[$i]."\n<br>";
 
-                            if (!empty($objMod->module_parts['contactelement'])) {
-                            	if (is_array($objMod->module_parts['contactelement'])) {
+							if (!empty($objMod->module_parts['contactelement'])) {
+								if (is_array($objMod->module_parts['contactelement'])) {
 									foreach ($objMod->module_parts['contactelement'] as $elem => $title) {
 										$elementList[$elem] = $langs->trans($title);
 									}
 								} else {
 									$elementList[$objMod->name] = $langs->trans($objMod->name);
 								}
-                            }
+							}
 
 							$j++;
 							$i++;
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index c30d0c3d392..939e6514c13 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -69,14 +69,12 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	}
 	print '<input type="hidden" name="search_showbirthday" value="'.$showbirthday.'">';
 
-	if ($canedit)
-	{
+	if ($canedit) {
 		print '<div class="divsearchfield">';
 		// Type
 		print '<span class="fas fa-square inline-block fawidth30" style=" color: #ddd;" title="'.$langs->trans("Type").'"></span>';
 		$multiselect = 0;
-		if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE))     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
-		{
+		if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) {     // We use an option here because it adds bugs when used on agenda page "peruser" and "list"
 			$multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE));
 		}
 		print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500');
@@ -92,8 +90,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'maxwidth500');
 		print '</div>';
 
-		if ($conf->resource->enabled)
-		{
+		if ($conf->resource->enabled) {
 			include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
 			$formresource = new FormResource($db);
 
@@ -105,16 +102,14 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		}
 	}
 
-	if (!empty($conf->societe->enabled) && $user->rights->societe->lire)
-	{
+	if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 		print '<div class="divsearchfield">';
 		print img_picto($langs->trans("ThirdParty"), 'company', 'class="fawidth30 inline-block"');
 		print $form->select_company($socid, 'search_socid', '', '&nbsp;', 0, 0, null, 0, 'minwidth100 maxwidth500');
 		print '</div>';
 	}
 
-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire)
-	{
+	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 		$formproject = new FormProjets($db);
 
@@ -124,8 +119,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 		print '</div>';
 	}
 
-	if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"]))
-	{
+	if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"])) {
 		// Status
 		print '<div class="divsearchfield">';
 		print img_picto($langs->trans("Status"), 'setup', 'class="fawidth30 inline-block"');
@@ -165,17 +159,22 @@ function show_array_actions_to_do($max = 5)
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 	$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 	$sql .= " ORDER BY a.datep DESC, a.id DESC";
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
@@ -189,8 +188,7 @@ function show_array_actions_to_do($max = 5)
 		$staticaction = new ActionComm($db);
 		$customerstatic = new Client($db);
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 
@@ -204,8 +202,7 @@ function show_array_actions_to_do($max = 5)
 			// print '<td>'.dol_trunc($obj->label,22).'</td>';
 
 			print '<td>';
-			if ($obj->socid > 0)
-			{
+			if ($obj->socid > 0) {
 				$customerstatic->id = $obj->socid;
 				$customerstatic->name = $obj->name;
 				//$customerstatic->name_alias = $obj->name_alias;
@@ -225,11 +222,21 @@ function show_array_actions_to_do($max = 5)
 			// Date
 			print '<td width="100" class="right tddate">'.dol_print_date($datep, 'day').'&nbsp;';
 			$late = 0;
-			if ($obj->percent == 0 && $datep && $datep < time()) $late = 1;
-			if ($obj->percent == 0 && !$datep && $datep2 && $datep2 < time()) $late = 1;
-			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) $late = 1;
-			if ($obj->percent > 0 && $obj->percent < 100 && !$datep2 && $datep && $datep < time()) $late = 1;
-			if ($late) print img_warning($langs->trans("Late"));
+			if ($obj->percent == 0 && $datep && $datep < time()) {
+				$late = 1;
+			}
+			if ($obj->percent == 0 && !$datep && $datep2 && $datep2 < time()) {
+				$late = 1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && $datep2 && $datep2 < time()) {
+				$late = 1;
+			}
+			if ($obj->percent > 0 && $obj->percent < 100 && !$datep2 && $datep && $datep < time()) {
+				$late = 1;
+			}
+			if ($late) {
+				print img_warning($langs->trans("Late"));
+			}
 			print "</td>";
 
 			// Statut
@@ -268,17 +275,22 @@ function show_array_last_actions_done($max = 5)
 	$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a LEFT JOIN ";
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 	$sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 	$sql .= " ORDER BY a.datep2 DESC";
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
@@ -292,8 +304,7 @@ function show_array_last_actions_done($max = 5)
 		$staticaction = new ActionComm($db);
 		$customerstatic = new Societe($db);
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 
@@ -307,8 +318,7 @@ function show_array_last_actions_done($max = 5)
 			//print '<td>'.dol_trunc($obj->label,24).'</td>';
 
 			print '<td>';
-			if ($obj->socid > 0)
-			{
+			if ($obj->socid > 0) {
 				$customerstatic->id = $obj->socid;
 				$customerstatic->name = $obj->name;
 				//$customerstatic->name_alias = $obj->name_alias;
@@ -411,8 +421,7 @@ function actions_prepare_head($object)
 	$h++;
 
 	// Tab to link resources
-	if ($conf->resource->enabled)
-	{
+	if ($conf->resource->enabled) {
 		include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 		$resource = new DolResource($db);
 
@@ -420,7 +429,9 @@ function actions_prepare_head($object)
 		$listofresourcelinked = $resource->getElementResources($object->element, $object->id);
 		$nbResources = (is_array($listofresourcelinked) ?count($listofresourcelinked) : 0);
 		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResources > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
+		if ($nbResources > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbResources).'</span>' : '');
+		}
 		$head[$h][2] = 'resources';
 		$h++;
 	}
@@ -433,7 +444,9 @@ function actions_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/comm/action/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>' : '');
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -484,8 +497,7 @@ function calendars_prepare_head($param)
 	$h++;
 
 	//if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	if (!empty($conf->global->AGENDA_SHOW_PERTYPE))
-	{
+	if (!empty($conf->global->AGENDA_SHOW_PERTYPE)) {
 		$head[$h][0] = DOL_URL_ROOT.'/comm/action/pertype.php'.($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("ViewPerType");
 		$head[$h][2] = 'cardpertype';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 8e71f8255e8..658d7816001 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -46,13 +46,19 @@
  */
 function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLength = 2, $autoselect = 0, $ajaxoptions = array(), $moreparams = '')
 {
-	if (empty($minLength)) $minLength = 1;
+	if (empty($minLength)) {
+		$minLength = 1;
+	}
 
 	$dataforrenderITem = 'ui-autocomplete';
 	$dataforitem = 'ui-autocomplete-item';
 	// Allow two constant to use other values for backward compatibility
-	if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) $dataforrenderITem = constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');
-	if (defined('JS_QUERY_AUTOCOMPLETE_ITEM'))       $dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM');
+	if (defined('JS_QUERY_AUTOCOMPLETE_RENDERITEM')) {
+		$dataforrenderITem = constant('JS_QUERY_AUTOCOMPLETE_RENDERITEM');
+	}
+	if (defined('JS_QUERY_AUTOCOMPLETE_ITEM')) {
+		$dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM');
+	}
 
 	// Input search_htmlname is original field
 	// Input htmlname is a second input field used when using ajax autocomplete.
@@ -413,14 +419,26 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 	global $conf;
 
 	// select2 can be disabled for smartphones
-	if (!empty($conf->browser->layout) && $conf->browser->layout == 'phone' && !empty($conf->global->MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE)) return '';
+	if (!empty($conf->browser->layout) && $conf->browser->layout == 'phone' && !empty($conf->global->MAIN_DISALLOW_SELECT2_WITH_SMARTPHONE)) {
+		return '';
+	}
 
-	if (!empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) return '';
-	if (empty($conf->use_javascript_ajax)) return '';
-	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) return '';
-	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) return '';
+	if (!empty($conf->global->MAIN_DISABLE_AJAX_COMBOX)) {
+		return '';
+	}
+	if (empty($conf->use_javascript_ajax)) {
+		return '';
+	}
+	if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+		return '';
+	}
+	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+		return '';
+	}
 
-	if (empty($minLengthToAutocomplete)) $minLengthToAutocomplete = 0;
+	if (empty($minLengthToAutocomplete)) {
+		$minLengthToAutocomplete = 0;
+	}
 
 	$tmpplugin = 'select2';
 	$msg = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id = '.$htmlname.' -->
@@ -450,11 +468,12 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
 					},
 					dropdownCssClass: \'ui-dialog\'
 				})';
-	if ($forcefocus) $msg .= '.select2(\'focus\')';
+	if ($forcefocus) {
+		$msg .= '.select2(\'focus\')';
+	}
 	$msg .= ';'."\n";
 
-	if (is_array($events) && count($events))    // If an array of js events to do were provided.
-	{
+	if (is_array($events) && count($events)) {    // If an array of js events to do were provided.
 		$msg .= '
 			jQuery("#'.$htmlname.'").change(function () {
 				var obj = '.json_encode($events).';
@@ -516,13 +535,13 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
  * 	On/off button for constant
  *
  * 	@param	string	$code					Name of constant
- * 	@param	array	$input					Array of options. ("disabled"|"enabled'|'set'|'del') => CSS element to switch, 'alert' => message to show, ... Example: array('disabled'=>array(0=>'cssid'))
- * 	@param	int		$entity					Entity to set. Use current entity if null.
+ * 	@param	array	$input					Array of complementary actions to do if success ("disabled"|"enabled'|'set'|'del') => CSS element to switch, 'alert' => message to show, ... Example: array('disabled'=>array(0=>'cssid'))
+ * 	@param	int		$entity					Entity. Current entity is used if null.
  *  @param	int		$revertonoff			Revert on/off
  *  @param	int		$strict					Use only "disabled" with delConstant and "enabled" with setConstant
  *  @param	int		$forcereload			Force to reload page if we click/change value (this is supported only when there is no 'alert' option in input)
  *  @param	string	$marginleftonlyshort	1 = Add a short left margin on picto, 2 = Add a larger left margin on picto, 0 = No left margin. Works for fontawesome picto only.
- *  @param	int		$forcenoajax			1=Force to use a ahref link instead of ajax code.
+ *  @param	int		$forcenoajax			1 = Force to use a ahref link instead of ajax code.
  * 	@return	string
  */
 function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2, $forcenoajax = 0)
@@ -530,12 +549,16 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 	global $conf, $langs, $user;
 
 	$entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity);
-	if (!isset($input)) $input = array();
+	if (!isset($input)) {
+		$input = array();
+	}
 
-	if (empty($conf->use_javascript_ajax) || $forcenoajax)
-	{
-		if (empty($conf->global->$code)) print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-		else print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+	if (empty($conf->use_javascript_ajax) || $forcenoajax) {
+		if (empty($conf->global->$code)) {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+		} else {
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&token='.newToken().'&entity='.$entity.'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+		}
 	} else {
 		$out = "\n<!-- Ajax code to switch constant ".$code." -->".'
 		<script>
diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php
index 96355704c96..840aca1339a 100644
--- a/htdocs/core/lib/asset.lib.php
+++ b/htdocs/core/lib/asset.lib.php
@@ -102,16 +102,24 @@ function asset_prepare_head(Asset $object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$nbNote = 0;
-	if (!empty($object->note_private)) $nbNote++;
-	if (!empty($object->note_public)) $nbNote++;
+	if (!empty($object->note_private)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_public)) {
+		$nbNote++;
+	}
 	$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	if ($nbNote > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	}
 	$head[$h][2] = 'note';
 	$h++;
 
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 7df82942613..6eac92e69bc 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -66,8 +66,7 @@ function bank_prepare_head(Account $object)
 	$head[$h][2] = 'graph';
 	$h++;
 
-	if ($object->courant != Account::TYPE_CASH)
-	{
+	if ($object->courant != Account::TYPE_CASH) {
 		$nbReceipts = 0;
 
 		// List of all standing receipts
@@ -76,16 +75,19 @@ function bank_prepare_head(Account $object)
 		$sql .= " WHERE b.fk_account = ".$object->id;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $nbReceipts = $obj->nb;
+			if ($obj) {
+				$nbReceipts = $obj->nb;
+			}
 			$db->free($resql);
 		}
 
 		$head[$h][0] = DOL_URL_ROOT."/compta/bank/releve.php?account=".$object->id;
 		$head[$h][1] = $langs->trans("AccountStatements");
-		if (($nbReceipts) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbReceipts).'</span>';
+		if (($nbReceipts) > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbReceipts).'</span>';
+		}
 		$head[$h][2] = 'statement';
 		$h++;
 	}
@@ -98,7 +100,9 @@ function bank_prepare_head(Account $object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT."/compta/bank/document.php?account=".$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -109,9 +113,9 @@ function bank_prepare_head(Account $object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank');
 
 	/*$head[$h][0] = DOL_URL_ROOT . "/compta/bank/info.php?id=" . $object->id;
-    $head[$h][1] = $langs->trans("Info");
-    $head[$h][2] = 'info';
-    $h++;*/
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;*/
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'bank', 'remove');
 
@@ -185,7 +189,9 @@ function account_statement_prepare_head($object, $num)
 
 	$head[$h][0] = DOL_URL_ROOT."/compta/bank/account_statement_document.php?account=".$object->id."&num=".$num;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
@@ -228,7 +234,9 @@ function various_payment_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/various_payment/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -271,8 +279,11 @@ function checkIbanForAccount($account)
 	$iban = new IBAN($account->iban);
 	$check = $iban->Verify();
 
-	if ($check) return true;
-	else return false;
+	if ($check) {
+		return true;
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -288,10 +299,12 @@ function checkBanForAccount($account)
 	// For compatibility between
 	// account of type CompanyBankAccount class (we use number, cle_rib)
 	// account of type Account class (we use num_compte, cle)
-	if (empty($account->number))
+	if (empty($account->number)) {
 		$account->number = $account->num_compte;
-	if (empty($account->cle))
+	}
+	if (empty($account->cle)) {
 		$account->cle = $account->cle_rib;
+	}
 
 	dol_syslog("bank.lib::checkBanForAccount account->code_banque=".$account->code_banque." account->code_guichet=".$account->code_guichet." account->number=".$account->number." account->cle=".$account->cle." account->iban=".$account->iban." country_code=".$country_code, LOG_DEBUG);
 
@@ -330,11 +343,13 @@ function checkBanForAccount($account)
 		return false;
 	}
 	if ($country_code == 'AU') {  // Australian
-		if (strlen($account->code_banque) > 7)
+		if (strlen($account->code_banque) > 7) {
 			return false; // Sould be 6 but can be 123-456
-		elseif (strlen($account->code_banque) < 6)
+		} elseif (strlen($account->code_banque) < 6) {
 			return false; // Sould be 6
-		else return true;
+		} else {
+			return true;
+		}
 	}
 
 	// No particular rule
@@ -385,10 +400,12 @@ function checkES($IentOfi, $InumCta)
 
 	$key = 11 - $sum % 11;
 
-	if ($key == 10)
+	if ($key == 10) {
 		$key = 1;
-	if ($key == 11)
+	}
+	if ($key == 11) {
 		$key = 0;
+	}
 
 	$keycontrol = $key;
 
@@ -400,10 +417,12 @@ function checkES($IentOfi, $InumCta)
 
 	$key = 11 - $sum % 11;
 
-	if ($key == 10)
+	if ($key == 10) {
 		$key = 1;
-	if ($key == 11)
+	}
+	if ($key == 11) {
 		$key = 0;
+	}
 
 	$keycontrol .= $key;
 	return $keycontrol;
diff --git a/htdocs/core/lib/barcode.lib.php b/htdocs/core/lib/barcode.lib.php
index 0447927ec4d..cbf56136978 100644
--- a/htdocs/core/lib/barcode.lib.php
+++ b/htdocs/core/lib/barcode.lib.php
@@ -35,11 +35,17 @@ $text_color = array(0, 0, 0);
 /* ******************************************************************** */
 /*                          FONT FILE                                   */
 /* ******************************************************************** */
-if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc = constant('DOL_DEFAULT_TTF_BOLD');
+if (defined('DOL_DEFAULT_TTF_BOLD')) {
+	$font_loc = constant('DOL_DEFAULT_TTF_BOLD');
+}
 // Automatic-Detection of Font if running Windows
 // @CHANGE LDR
-if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc = $_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
-if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
+if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) {
+	$font_loc = $_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
+}
+if (empty($font_loc)) {
+	die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');
+}
 
 
 /* ******************************************************************** */
@@ -50,8 +56,11 @@ if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path t
 * genbarcode is needed to render encodings other than EAN-12/EAN-13/ISBN
 */
 
-if (defined('PHP-BARCODE_PATH_COMMAND')) $genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');
-else $genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+if (defined('PHP-BARCODE_PATH_COMMAND')) {
+	$genbarcode_loc = constant('PHP-BARCODE_PATH_COMMAND');
+} else {
+	$genbarcode_loc = $conf->global->GENBARCODE_LOCATION;
+}
 
 
 
@@ -70,15 +79,19 @@ function barcode_print($code, $encoding = "ANY", $scale = 2, $mode = "png")
 	dol_syslog("barcode.lib.php::barcode_print $code $encoding $scale $mode");
 
 	$bars = barcode_encode($code, $encoding);
-	if (!$bars || !empty($bars['error']))
-	{
+	if (!$bars || !empty($bars['error'])) {
 		// Return error message instead of array
-		if (empty($bars['error'])) $error = 'Bad Value '.$code.' for encoding '.$encoding;
-		else $error = $bars['error'];
+		if (empty($bars['error'])) {
+			$error = 'Bad Value '.$code.' for encoding '.$encoding;
+		} else {
+			$error = $bars['error'];
+		}
 		dol_syslog('barcode.lib.php::barcode_print '.$error, LOG_ERR);
 		return $error;
 	}
-	if (!$mode) $mode = "png";
+	if (!$mode) {
+		$mode = "png";
+	}
 	//if (preg_match("/^(text|txt|plain)$/i",$mode)) print barcode_outtext($bars['text'],$bars['bars']);
 	//elseif (preg_match("/^(html|htm)$/i",$mode)) print barcode_outhtml($bars['text'],$bars['bars'], $scale,0, 0);
 	//else
@@ -112,8 +125,7 @@ function barcode_encode($code, $encoding)
 {
 	global $genbarcode_loc;
 
-	if (
-	(preg_match("/^ean$/i", $encoding))
+	if ((preg_match("/^ean$/i", $encoding))
 
 	|| (($encoding) && (preg_match("/^isbn$/i", $encoding))
 	&& ((strlen($code) == 9 || strlen($code) == 10) ||
@@ -122,13 +134,11 @@ function barcode_encode($code, $encoding)
 
 	|| ((!isset($encoding) || !$encoding || (preg_match("/^ANY$/i", $encoding)))
 	&& (preg_match("/^[0-9]{12,13}$/", $code)))
-	)
-	{
+	) {
 		/* use built-in EAN-Encoder */
 		dol_syslog("barcode.lib.php::barcode_encode Use barcode_encode_ean");
 		$bars = barcode_encode_ean($code, $encoding);
-	} elseif (file_exists($genbarcode_loc))	// For example C39
-	{
+	} elseif (file_exists($genbarcode_loc)) {	// For example C39
 		/* use genbarcode */
 		dol_syslog("barcode.lib.php::barcode_encode Use genbarcode ".$genbarcode_loc." code=".$code." encoding=".$encoding);
 		$bars = barcode_encode_genbarcode($code, $encoding);
@@ -159,9 +169,12 @@ function barcode_gen_ean_sum($ean)
 {
 	$even = true; $esum = 0; $osum = 0;
 	$ln = strlen($ean) - 1;
-	for ($i = $ln; $i >= 0; $i--)
-	{
-		if ($even) $esum += $ean[$i]; else $osum += $ean[$i];
+	for ($i = $ln; $i >= 0; $i--) {
+		if ($even) {
+			$esum += $ean[$i];
+		} else {
+			$osum += $ean[$i];
+		}
 		$even = !$even;
 	}
 	return (10 - ((3 * $esum + $osum) % 10)) % 10;
@@ -181,18 +194,19 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
 	$guards = array("9a1a", "1a1a1", "a1a");
 
 	$ean = trim($ean);
-	if (preg_match("/[^0-9]/i", $ean))
-	{
+	if (preg_match("/[^0-9]/i", $ean)) {
 		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (not a numeric)");
 	}
 	$encoding = strtoupper($encoding);
-	if ($encoding == "ISBN")
-	{
-		if (!preg_match("/^978/", $ean)) $ean = "978".$ean;
+	if ($encoding == "ISBN") {
+		if (!preg_match("/^978/", $ean)) {
+			$ean = "978".$ean;
+		}
 	}
-	if (preg_match("/^978/", $ean)) $encoding = "ISBN";
-	if (strlen($ean) < 12 || strlen($ean) > 13)
-	{
+	if (preg_match("/^978/", $ean)) {
+		$encoding = "ISBN";
+	}
+	if (strlen($ean) < 12 || strlen($ean) > 13) {
 		return array("error"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)", "text"=>"Invalid encoding/code. encoding=".$encoding." code=".$ean." (must have 12/13 numbers)");
 	}
 
@@ -200,24 +214,34 @@ function barcode_encode_ean($ean, $encoding = "EAN-13")
 	$eansum = barcode_gen_ean_sum($ean);
 	$ean .= $eansum;
 	$line = $guards[0];
-	for ($i = 1; $i < 13; $i++)
-	{
+	for ($i = 1; $i < 13; $i++) {
 		$str = $digits[$ean[$i]];
-		if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) $line .= strrev($str); else $line .= $str;
-		if ($i == 6) $line .= $guards[1];
+		if ($i < 7 && $mirror[$ean[0]][$i - 1] == 1) {
+			$line .= strrev($str);
+		} else {
+			$line .= $str;
+		}
+		if ($i == 6) {
+			$line .= $guards[1];
+		}
 	}
 	$line .= $guards[2];
 
 	/* create text */
 	$pos = 0;
 	$text = "";
-	for ($a = 0; $a < 13; $a++)
-	{
-		if ($a > 0) $text .= " ";
+	for ($a = 0; $a < 13; $a++) {
+		if ($a > 0) {
+			$text .= " ";
+		}
 		$text .= "$pos:12:{$ean[$a]}";
-		if ($a == 0) $pos += 12;
-		elseif ($a == 6) $pos += 12;
-		else $pos += 7;
+		if ($a == 0) {
+			$pos += 12;
+		} elseif ($a == 6) {
+			$pos += 12;
+		} else {
+			$pos += 7;
+		}
 	}
 
 	return array(
@@ -240,8 +264,12 @@ function barcode_encode_genbarcode($code, $encoding)
 	global $genbarcode_loc;
 
 	// Clean parameters
-	if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) $code = substr($code, 0, 12);
-	if (!$encoding) $encoding = "ANY";
+	if (preg_match("/^ean$/i", $encoding) && strlen($code) == 13) {
+		$code = substr($code, 0, 12);
+	}
+	if (!$encoding) {
+		$encoding = "ANY";
+	}
 	$encoding = preg_replace("/[\\\|]/", "_", $encoding);
 	$code = preg_replace("/[\\\|]/", "_", $code);
 
@@ -254,8 +282,7 @@ function barcode_encode_genbarcode($code, $encoding)
 
 	dol_syslog("Run command ".$fullcommandclear);
 	$fp = popen($fullcommandclear, "r");
-	if ($fp)
-	{
+	if ($fp) {
 		$bars = fgets($fp, 1024);
 		$text = fgets($fp, 1024);
 		$encoding = fgets($fp, 1024);
@@ -272,14 +299,19 @@ function barcode_encode_genbarcode($code, $encoding)
 		"error" => ""
 	);
 	//var_dump($ret);
-	if (preg_match('/permission denied/i', $ret['bars']))
-	{
+	if (preg_match('/permission denied/i', $ret['bars'])) {
 		$ret['error'] = $ret['bars']; $ret['bars'] = '';
 		return $ret;
 	}
-	if (!$ret['bars']) return false;
-	if (!$ret['text']) return false;
-	if (!$ret['encoding']) return false;
+	if (!$ret['bars']) {
+		return false;
+	}
+	if (!$ret['text']) {
+		return false;
+	}
+	if (!$ret['encoding']) {
+		return false;
+	}
 	return $ret;
 }
 
@@ -305,27 +337,29 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
 	//var_dump($font_loc);
 
 	/* set defaults */
-	if ($scale < 1) $scale = 2;
+	if ($scale < 1) {
+		$scale = 2;
+	}
 	$total_y = (int) $total_y;
-	if ($total_y < 1) $total_y = (int) $scale * 60;
-	if (!$space)
-	$space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);
+	if ($total_y < 1) {
+		$total_y = (int) $scale * 60;
+	}
+	if (!$space) {
+		$space = array('top'=>2 * $scale, 'bottom'=>2 * $scale, 'left'=>2 * $scale, 'right'=>2 * $scale);
+	}
 
 	/* count total width */
 	$xpos = 0;
 	$width = true;
 	$ln = strlen($bars);
-	for ($i = 0; $i < $ln; $i++)
-	{
+	for ($i = 0; $i < $ln; $i++) {
 		$val = strtolower($bars[$i]);
-		if ($width)
-		{
+		if ($width) {
 			$xpos += $val * $scale;
 			$width = false;
 			continue;
 		}
-		if (preg_match("/[a-z]/", $val))
-		{
+		if (preg_match("/[a-z]/", $val)) {
 			/* tall bar */
 			$val = ord($val) - ord('a') + 1;
 		}
@@ -336,8 +370,7 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
 	/* allocate the image */
 	$total_x = ($xpos) + $space['right'] + $space['right'];
 	$xpos = $space['left'];
-	if (!function_exists("imagecreate"))
-	{
+	if (!function_exists("imagecreate")) {
 		print "You don't have the gd2 extension enabled<br>\n";
 		return "";
 	}
@@ -352,21 +385,20 @@ function barcode_outimage($text, $bars, $scale = 1, $mode = "png", $total_y = 0,
 	/* paint the bars */
 	$width = true;
 	$ln = strlen($bars);
-	for ($i = 0; $i < $ln; $i++)
-	{
+	for ($i = 0; $i < $ln; $i++) {
 		$val = strtolower($bars[$i]);
-		if ($width)
-		{
+		if ($width) {
 			$xpos += $val * $scale;
 			$width = false;
 			continue;
 		}
-		if (preg_match("/[a-z]/", $val))
-		{
+		if (preg_match("/[a-z]/", $val)) {
 			/* tall bar */
 			$val = ord($val) - ord('a') + 1;
 			$h = $height2;
-		} else $h = $height;
+		} else {
+			$h = $height;
+		}
 		imagefilledrectangle($im, $xpos, $space['top'], $xpos + ($val * $scale) - 1, $h, $col_bar);
 		$xpos += $val * $scale;
 		$width = true;
diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
index f6942cb5265..8ff1dbb97ae 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -49,8 +49,7 @@ function categories_prepare_head(Categorie $object, $type)
 	$head[$h][2] = 'photos';
 	$h++;
 
-	if (!empty($conf->global->MAIN_MULTILANGS))
-	{
+	if (!empty($conf->global->MAIN_MULTILANGS)) {
 		$head[$h][0] = DOL_URL_ROOT.'/categories/traduction.php?id='.$object->id.'&amp;type='.$type;
 		$head[$h][1] = $langs->trans("Translation");
 		$head[$h][2] = 'translation';
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 310f34a86fb..c6cd0998326 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -518,8 +518,11 @@ function getCountry($searchkey, $withcode = '', $dbtouse = 0, $outputlangs = '',
 			$label = ((!empty($obj->label) && $obj->label != '-') ? $obj->label : '');
 			if (is_object($outputlangs)) {
 				$outputlangs->load("dict");
-				if ($entconv) $label = ($obj->code && ($outputlangs->trans("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->trans("Country".$obj->code) : $label;
-				else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->transnoentitiesnoconv("Country".$obj->code) : $label;
+				if ($entconv) {
+					$label = ($obj->code && ($outputlangs->trans("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->trans("Country".$obj->code) : $label;
+				} else {
+					$label = ($obj->code && ($outputlangs->transnoentitiesnoconv("Country".$obj->code) != "Country".$obj->code)) ? $outputlangs->transnoentitiesnoconv("Country".$obj->code) : $label;
+				}
 			}
 			if ($withcode == 1) {
 				$result = $label ? "$obj->code - $label" : "$obj->code";
@@ -580,8 +583,11 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
 			$label = ((!empty($obj->name) && $obj->name != '-') ? $obj->name : '');
 			if (is_object($outputlangs)) {
 				$outputlangs->load("dict");
-				if ($entconv) $label = ($obj->code && ($outputlangs->trans("State".$obj->code) != "State".$obj->code)) ? $outputlangs->trans("State".$obj->code) : $label;
-				else $label = ($obj->code && ($outputlangs->transnoentitiesnoconv("State".$obj->code) != "State".$obj->code)) ? $outputlangs->transnoentitiesnoconv("State".$obj->code) : $label;
+				if ($entconv) {
+					$label = ($obj->code && ($outputlangs->trans("State".$obj->code) != "State".$obj->code)) ? $outputlangs->trans("State".$obj->code) : $label;
+				} else {
+					$label = ($obj->code && ($outputlangs->transnoentitiesnoconv("State".$obj->code) != "State".$obj->code)) ? $outputlangs->transnoentitiesnoconv("State".$obj->code) : $label;
+				}
 			}
 
 			if ($withcode == 1) {
@@ -612,7 +618,9 @@ function getState($id, $withcode = '', $dbtouse = 0, $withregion = 0, $outputlan
 		} else {
 			return $langs->transnoentitiesnoconv("NotDefined");
 		}
-	} else dol_print_error($dbtouse, '');
+	} else {
+		dol_print_error($dbtouse, '');
+	}
 }
 
 /**
@@ -671,7 +679,9 @@ function getFormeJuridiqueLabel($code)
 {
 	global $db, $langs;
 
-	if (!$code) return '';
+	if (!$code) {
+		return '';
+	}
 
 	$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."c_forme_juridique";
 	$sql .= " WHERE code='".$db->escape($code)."'";
@@ -756,7 +766,9 @@ function getCountriesInEEC()
  */
 function isInEEC($object)
 {
-	if (empty($object->country_code)) return false;
+	if (empty($object->country_code)) {
+		return false;
+	}
 
 	$country_code_in_EEC = getCountriesInEEC();
 
@@ -855,11 +867,15 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 						print '</td>';
 						// Opp status
 						print '<td class="center">';
-						if ($obj->opp_status_code) print $langs->trans("OppStatus".$obj->opp_status_code);
+						if ($obj->opp_status_code) {
+							print $langs->trans("OppStatus".$obj->opp_status_code);
+						}
 						print '</td>';
 						// Opp percent
 						print '<td class="right">';
-						if ($obj->opp_percent) print price($obj->opp_percent, 1, '', 1, 0).'%';
+						if ($obj->opp_percent) {
+							print price($obj->opp_percent, 1, '', 1, 0).'%';
+						}
 						print '</td>';
 						// Status
 						print '<td class="right">'.$projecttmp->getLibStatut(5).'</td>';
@@ -910,7 +926,9 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 	$search_status = GETPOST("search_status", 'int');
-	if ($search_status == '') $search_status = 1; // always display active customer first
+	if ($search_status == '') {
+		$search_status = 1; // always display active customer first
+	}
 
 	$search_name    = GETPOST("search_name", 'alpha');
 	$search_address = GETPOST("search_address", 'alpha');
@@ -943,8 +961,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		}
 	}
 
-	if (!$sortorder) $sortorder = "ASC";
-	if (!$sortfield) $sortfield = "t.lastname";
+	if (!$sortorder) {
+		$sortorder = "ASC";
+	}
+	if (!$sortfield) {
+		$sortfield = "t.lastname";
+	}
 
 	if (!empty($conf->clicktodial->enabled)) {
 		$user->fetch_clicktodial(); // lecture des infos de clicktodial du user
@@ -1006,8 +1028,8 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		$search_array_options = array();
 
 		foreach ($contactstatic->fields as $key => $val) {
-   			$search[$key] = '';
-   		}
+			$search[$key] = '';
+		}
 	}
 
 	$contactstatic->fields = dol_sort_array($contactstatic->fields, 'position');
@@ -1040,12 +1062,24 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	print "\n".'<table class="tagtable liste">'."\n";
 
 	$param = "socid=".urlencode($object->id);
-	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
-	if (count($search_roles) > 0) $param .= implode('&search_roles[]=', $search_roles);
-	if ($search_name != '')   $param .= '&search_name='.urlencode($search_name);
-	if ($search_poste != '')     $param .= '&search_poste='.urlencode($search_poste);
-	if ($search_address != '')     $param .= '&search_address='.urlencode($search_address);
-	if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+	if ($search_status != '') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if (count($search_roles) > 0) {
+		$param .= implode('&search_roles[]=', $search_roles);
+	}
+	if ($search_name != '') {
+		$param .= '&search_name='.urlencode($search_name);
+	}
+	if ($search_poste != '') {
+		$param .= '&search_poste='.urlencode($search_poste);
+	}
+	if ($search_address != '') {
+		$param .= '&search_address='.urlencode($search_address);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 
 	// Add $param from extra fields
 	$extrafieldsobjectkey = $contactstatic->table_element;
@@ -1056,9 +1090,15 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as ef on (t.rowid = ef.fk_object)";
 	$sql .= " WHERE t.fk_soc = ".$object->id;
-	if ($search_status != '' && $search_status != '-1') $sql .= " AND t.statut = ".$db->escape($search_status);
-	if ($search_name)    $sql .= natural_search(array('t.lastname', 't.firstname'), $search_name);
-	if ($search_poste)   $sql .= natural_search('t.poste', $search_poste);
+	if ($search_status != '' && $search_status != '-1') {
+		$sql .= " AND t.statut = ".$db->escape($search_status);
+	}
+	if ($search_name) {
+		$sql .= natural_search(array('t.lastname', 't.firstname'), $search_name);
+	}
+	if ($search_poste) {
+		$sql .= natural_search('t.poste', $search_poste);
+	}
 	if ($search_address) {
 		$sql .= natural_search($searchAddressPhoneDBFields, $search_address);
 	}
@@ -1068,12 +1108,17 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	// Add where from extra fields
 	$extrafieldsobjectkey = $contactstatic->table_element;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-	if ($sortfield == "t.name") $sql .= " ORDER BY t.lastname $sortorder, t.firstname $sortorder";
-	else $sql .= " ORDER BY $sortfield $sortorder";
+	if ($sortfield == "t.name") {
+		$sql .= " ORDER BY t.lastname $sortorder, t.firstname $sortorder";
+	} else {
+		$sql .= " ORDER BY $sortfield $sortorder";
+	}
 
 	dol_syslog('core/lib/company.lib.php :: show_contacts', LOG_DEBUG);
 	$result = $db->query($sql);
-	if (!$result) dol_print_error($db);
+	if (!$result) {
+		dol_print_error($db);
+	}
 
 	$num = $db->num_rows($result);
 
@@ -1082,9 +1127,15 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	print '<tr class="liste_titre">';
 	foreach ($contactstatic->fields as $key => $val) {
 		$align = '';
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
-		if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
-		if ($key == 'status' || $key == 'statut') $align .= ($align ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$align .= ($align ? ' ' : '').'center';
+		}
+		if (in_array($val['type'], array('timestamp'))) {
+			$align .= ($align ? ' ' : '').'nowrap';
+		}
+		if ($key == 'status' || $key == 'statut') {
+			$align .= ($align ? ' ' : '').'center';
+		}
 		if (!empty($arrayfields['t.'.$key]['checked']) || !empty($arrayfields['sc.'.$key]['checked'])) {
 			print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
 			if (in_array($key, array('statut'))) {
@@ -1117,11 +1168,21 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	print '<tr class="liste_titre">';
 	foreach ($contactstatic->fields as $key => $val) {
 		$align = '';
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $align .= ($align ? ' ' : '').'center';
-		if (in_array($val['type'], array('timestamp'))) $align .= ($align ? ' ' : '').'nowrap';
-		if ($key == 'status' || $key == 'statut') $align .= ($align ? ' ' : '').'center';
-		if (!empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
-		if ($key == 'role') $align .= ($align ? ' ' : '').'left';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$align .= ($align ? ' ' : '').'center';
+		}
+		if (in_array($val['type'], array('timestamp'))) {
+			$align .= ($align ? ' ' : '').'nowrap';
+		}
+		if ($key == 'status' || $key == 'statut') {
+			$align .= ($align ? ' ' : '').'center';
+		}
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
+		}
+		if ($key == 'role') {
+			$align .= ($align ? ' ' : '').'left';
+		}
 		if (!empty($arrayfields['sc.'.$key]['checked'])) {
 			print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
 		}
@@ -1200,7 +1261,9 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			// Job position
 			if (!empty($arrayfields['t.poste']['checked'])) {
 				print '<td>';
-				if ($obj->poste) print $obj->poste;
+				if ($obj->poste) {
+					print $obj->poste;
+				}
 				print '</td>';
 			}
 
@@ -1251,7 +1314,11 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 		}
 	} else {
 		$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("None").'</td></tr>';
 	}
 	print "\n</table>\n";
@@ -1281,8 +1348,11 @@ function show_actions_todo($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 	$out = show_actions_done($conf, $langs, $db, $filterobj, $objcon, 1, $actioncode, 'todo');
 
-	if ($noprint) return $out;
-	else print $out;
+	if ($noprint) {
+		return $out;
+	} else {
+		print $out;
+	}
 }
 
 /**
@@ -1331,7 +1401,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 	dol_include_once('/comm/action/class/actioncomm.class.php');
 
 	// Check parameters
-	if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter');
+	if (!is_object($filterobj) && !is_object($objcon)) {
+		dol_print_error('', 'BadParameter');
+	}
 
 	$out = '';
 	$histo = array();
@@ -1396,89 +1468,121 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			$sql .= " AND r.element_type = '".$db->escape($objcon->table_element)."' AND r.fk_element = ".$objcon->id;
 		}
 
-		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')))  $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
+		if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur'))) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON a.fk_contact = sp.rowid";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."element_resources as er";
 			$sql .= " ON er.resource_type = 'dolresource'";
 			$sql .= " AND er.element_id = a.id";
 			$sql .= " AND er.resource_id = ".$filterobj->id;
 		} elseif (is_object($filterobj) && get_class($filterobj) == 'Project') {
 			/* Nothing */
-		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql .= ", ".MAIN_DB_PREFIX."adherent as m";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql .= ", ".MAIN_DB_PREFIX."product as o";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql .= ", ".MAIN_DB_PREFIX."ticket as o";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') $sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') $sql .= ", ".MAIN_DB_PREFIX."contrat as o";
-		elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) $sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
+			$sql .= ", ".MAIN_DB_PREFIX."adherent as m";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
+			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
+			$sql .= ", ".MAIN_DB_PREFIX."product as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
+			$sql .= ", ".MAIN_DB_PREFIX."ticket as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
+			$sql .= ", ".MAIN_DB_PREFIX."bom_bom as o";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
+			$sql .= ", ".MAIN_DB_PREFIX."contrat as o";
+		} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) {
+			$sql .= ", ".MAIN_DB_PREFIX.$filterobj->table_element." as o";
+		}
 
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 		if ($force_filter_contact === false) {
-			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) $sql .= " AND a.fk_soc = ".$filterobj->id;
-			elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') { /* Nothing */ }
-			elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) $sql .= " AND a.fk_project = ".$filterobj->id;
-			elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
+			if (is_object($filterobj) && in_array(get_class($filterobj), array('Societe', 'Client', 'Fournisseur')) && $filterobj->id) {
+				$sql .= " AND a.fk_soc = ".$filterobj->id;
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Dolresource') {
+				/* Nothing */
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Project' && $filterobj->id) {
+				$sql .= " AND a.fk_project = ".$filterobj->id;
+			} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
 				$sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && is_array($filterobj->fields) && is_array($filterobj->fields['rowid']) && is_array($filterobj->fields['ref']) && $filterobj->table_element && $filterobj->element) {
 				// Generic case
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = '".$db->escape($filterobj->element).($module ? '@'.$module : '')."'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			}
 		}
 
 		if (!empty($tms_start) && !empty($tms_end)) {
 			$sql .= " AND ((a.datep BETWEEN '".$db->idate($tms_start)."' AND '".$db->idate($tms_end)."') OR (a.datep2 BETWEEN '".$db->idate($tms_start)."' AND '".$db->idate($tms_end)."'))";
-		}
-		elseif (empty($tms_start) && !empty($tms_end)) {
+		} elseif (empty($tms_start) && !empty($tms_end)) {
 			$sql .= " AND ((a.datep <= '".$db->idate($tms_end)."') OR (a.datep2 <= '".$db->idate($tms_end)."'))";
-		}
-		elseif (!empty($tms_start) && empty($tms_end)) {
+		} elseif (!empty($tms_start) && empty($tms_end)) {
 			$sql .= " AND ((a.datep >= '".$db->idate($tms_start)."') OR (a.datep2 >= '".$db->idate($tms_start)."'))";
 		}
 
 		if (is_array($actioncode) && !empty($actioncode)) {
 			$sql .= ' AND (';
 			foreach ($actioncode as $key => $code) {
-				if ($key != 0) $sql .= "OR (";
-				if (!empty($code)) addEventTypeSQL($sql, $code, $donetodo, $now, $filters, "");
-				if ($key != 0) $sql .= ")";
+				if ($key != 0) {
+					$sql .= "OR (";
+				}
+				if (!empty($code)) {
+					addEventTypeSQL($sql, $code, $donetodo, $now, $filters, "");
+				}
+				if ($key != 0) {
+					$sql .= ")";
+				}
 			}
 			$sql .= ')';
+		} elseif (!empty($actioncode)) {
+			addEventTypeSQL($sql, $actioncode, $donetodo, $now, $filters);
 		}
-		elseif (!empty($actioncode)) addEventTypeSQL($sql, $actioncode, $donetodo, $now, $filters);
 
 		if (is_array($actioncode)) {
 			foreach ($actioncode as $code) {
 				$sql2 = addMailingEventTypeSQL($code, $objcon, $filterobj);
 				if (!empty($sql2)) {
-					if (!empty($sql)) $sql = $sql." UNION ".$sql2;
-					elseif (empty($sql)) $sql = $sql2;
+					if (!empty($sql)) {
+						$sql = $sql." UNION ".$sql2;
+					} elseif (empty($sql)) {
+						$sql = $sql2;
+					}
 					break;
 				}
 			}
-		}
-		else {
+		} else {
 			$sql2 = addMailingEventTypeSQL($actioncode, $objcon, $filterobj);
 			if (!empty($sql) && !empty($sql2)) {
 				$sql = $sql." UNION ".$sql2;
-			}
-			elseif (empty($sql) && !empty($sql2)) {
+			} elseif (empty($sql) && !empty($sql2)) {
 				$sql = $sql2;
 			}
 		}
@@ -1508,7 +1612,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 					//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
 					//elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
 					$tododone = '';
-					if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && (!empty($obj->datep) && $obj->datep > $now))) $tododone = 'todo';
+					if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && (!empty($obj->datep) && $obj->datep > $now))) {
+						$tododone = 'todo';
+					}
 
 					$histo[$numaction] = array(
 						'type'=>$obj->type,
@@ -1588,7 +1694,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		} else {
 			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
 		}
-		if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
+		if ($filterobj && get_class($filterobj) == 'Societe') {
+			$out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
+		}
 
 		$out .= "\n";
 
@@ -1621,12 +1729,16 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$out .= '<tr class="liste_titre">';
 		if ($donetodo) {
 			$tmp = '';
-			if (get_class($filterobj) == 'Societe') $tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&socid='.$filterobj->id.'&status=done">';
+			if (get_class($filterobj) == 'Societe') {
+				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&socid='.$filterobj->id.'&status=done">';
+			}
 			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
 			$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
 			$tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
 			//$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
-			if (get_class($filterobj) == 'Societe') $tmp .= '</a>';
+			if (get_class($filterobj) == 'Societe') {
+				$tmp .= '</a>';
+			}
 			$out .= getTitleFieldOfList($tmp);
 		}
 		$out .= getTitleFieldOfList($langs->trans("Ref"), 0, $_SERVER["PHP_SELF"], 'a.id', '', $param, '', $sortfield, $sortorder);
@@ -1693,25 +1805,38 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 				if ($actionstatic->type_picto) {
 					$imgpicto .= img_picto('', $actionstatic->type_picto);
-				}
-				else {
-					if ($actionstatic->type_code == 'AC_RDV')       $imgpicto .= img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actionstatic->type_code == 'AC_TEL')   $imgpicto .= img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actionstatic->type_code == 'AC_FAX')   $imgpicto .= img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actionstatic->type_code == 'AC_EMAIL' || $actionstatic->type_code == 'AC_EMAIL_IN') $imgpicto .= img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actionstatic->type_code == 'AC_INT')   $imgpicto .= img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
-					elseif ($actionstatic->type_code == 'AC_OTH' && $actionstatic->code == 'TICKET_MSG') $imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
-					elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) $imgpicto .= img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+				} else {
+					if ($actionstatic->type_code == 'AC_RDV') {
+						$imgpicto .= img_picto('', 'object_group', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actionstatic->type_code == 'AC_TEL') {
+						$imgpicto .= img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actionstatic->type_code == 'AC_FAX') {
+						$imgpicto .= img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actionstatic->type_code == 'AC_EMAIL' || $actionstatic->type_code == 'AC_EMAIL_IN') {
+						$imgpicto .= img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actionstatic->type_code == 'AC_INT') {
+						$imgpicto .= img_picto('', 'object_intervention', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif ($actionstatic->type_code == 'AC_OTH' && $actionstatic->code == 'TICKET_MSG') {
+						$imgpicto = img_picto('', 'object_conversation', '', false, 0, 0, '', 'paddingright').' ';
+					} elseif (!preg_match('/_AUTO/', $actionstatic->type_code)) {
+						$imgpicto .= img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').' ';
+					}
 				}
 			}
 			$out .= $imgpicto;
 			$labeltype = $actionstatic->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 ($actionstatic->type_code == 'AC_OTH' && $actionstatic->code == 'TICKET_MSG') {
 				$labeltype = $langs->trans("Message");
 			} else {
-				if (!empty($arraylist[$labeltype])) $labeltype = $arraylist[$labeltype];
-				if ($actionstatic->type_code == 'AC_OTH_AUTO' && ($actionstatic->type_code != $actionstatic->code) && $labeltype && !empty($arraylist[$actionstatic->code])) $labeltype .= ' - '.$arraylist[$actionstatic->code]; // Use code in priority on type_code
+				if (!empty($arraylist[$labeltype])) {
+					$labeltype = $arraylist[$labeltype];
+				}
+				if ($actionstatic->type_code == 'AC_OTH_AUTO' && ($actionstatic->type_code != $actionstatic->code) && $labeltype && !empty($arraylist[$actionstatic->code])) {
+					$labeltype .= ' - '.$arraylist[$actionstatic->code]; // Use code in priority on type_code
+				}
 			}
 			$out .= dol_trunc($labeltype, 28);
 			$out .= '</td>';
@@ -1740,15 +1865,28 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 			if ($histo[$key]['dateend'] && $histo[$key]['dateend'] != $histo[$key]['datestart']) {
 				$tmpa = dol_getdate($histo[$key]['datestart'], true);
 				$tmpb = dol_getdate($histo[$key]['dateend'], true);
-				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) $out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');
-				else $out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');
+				if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year']) {
+					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'hour', 'tzuserrel');
+				} else {
+					$out .= '-'.dol_print_date($histo[$key]['dateend'], 'dayhour', 'tzuserrel');
+				}
 			}
 			$late = 0;
-			if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-			if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1;
-			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-			if ($late) $out .= img_warning($langs->trans("Late")).' ';
+			if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($late) {
+				$out .= img_warning($langs->trans("Late")).' ';
+			}
 			$out .= "</td>\n";
 
 			// Title of event
@@ -1784,14 +1922,16 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 				foreach ($histo[$key]['socpeopleassigned'] as $cid => $value) {
 					$result = $contact->fetch($cid);
 
-					if ($result < 0)
+					if ($result < 0) {
 						dol_print_error($db, $contact->error);
+					}
 
 					if ($result > 0) {
 						$out .= $contact->getNomUrl(1, '', 16);
 						if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
-							if (!empty($contact->phone_pro))
+							if (!empty($contact->phone_pro)) {
 								$out .= '('.dol_print_phone($contact->phone_pro).')';
+							}
 						}
 						$out .= '<div class="paddingright"></div>';
 					}
@@ -1816,8 +1956,11 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$out .= '</form>';
 	}
 
-	if ($noprint) return $out;
-	else print $out;
+	if ($noprint) {
+		return $out;
+	} else {
+		print $out;
+	}
 }
 
 /**
@@ -1917,22 +2060,35 @@ function addEventTypeSQL(&$sql, $actioncode, $donetodo, $now, $filters, $sqlANDO
 	// Condition on actioncode
 
 	if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " $sqlANDOR c.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " $sqlANDOR c.type = 'systemauto'";
-		else {
-			if ($actioncode == 'AC_OTH') $sql .= " $sqlANDOR c.type != 'systemauto'";
-			elseif ($actioncode == 'AC_OTH_AUTO') $sql .= " $sqlANDOR c.type = 'systemauto'";
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " $sqlANDOR c.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " $sqlANDOR c.type = 'systemauto'";
+		} else {
+			if ($actioncode == 'AC_OTH') {
+				$sql .= " $sqlANDOR c.type != 'systemauto'";
+			} elseif ($actioncode == 'AC_OTH_AUTO') {
+				$sql .= " $sqlANDOR c.type = 'systemauto'";
+			}
+		}
+	} else {
+		if ($actioncode == 'AC_NON_AUTO') {
+			$sql .= " $sqlANDOR c.type != 'systemauto'";
+		} elseif ($actioncode == 'AC_ALL_AUTO') {
+			$sql .= " $sqlANDOR c.type = 'systemauto'";
+		} else {
+			$sql .= " $sqlANDOR c.code = '".$db->escape($actioncode)."'";
 		}
 	}
-	else {
-		if ($actioncode == 'AC_NON_AUTO') $sql .= " $sqlANDOR c.type != 'systemauto'";
-		elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " $sqlANDOR c.type = 'systemauto'";
-		else $sql .= " $sqlANDOR c.code = '".$db->escape($actioncode)."'";
-	}
 
-	if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
-	elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
-	if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']);
+	if ($donetodo == 'todo') {
+		$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
+	} elseif ($donetodo == 'done') {
+		$sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
+	}
+	if (is_array($filters) && $filters['search_agenda_label']) {
+		$sql .= natural_search('a.label', $filters['search_agenda_label']);
+	}
 
 	return $sql;
 }
@@ -1957,11 +2113,17 @@ function addMailingEventTypeSQL($actioncode, $objcon, $filterobj)
 		$sql2 .= ", '' as fk_element, '' as elementtype, '' as contact_id";
 		$sql2 .= ", 'AC_EMAILING' as acode, '' as alabel, '' as apicto";
 		$sql2 .= ", u.rowid as user_id, u.login as user_login, u.photo as user_photo, u.firstname as user_firstname, u.lastname as user_lastname"; // User that valid action
-		if (is_object($filterobj) && get_class($filterobj) == 'Societe') $sql2 .= ", '' as lastname, '' as firstname";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') $sql2 .= ", '' as lastname, '' as firstname";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') $sql2 .= ", '' as ref";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Product') $sql2 .= ", '' as ref";
-		elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') $sql2 .= ", '' as ref";
+		if (is_object($filterobj) && get_class($filterobj) == 'Societe') {
+			$sql2 .= ", '' as lastname, '' as firstname";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
+			$sql2 .= ", '' as lastname, '' as firstname";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
+			$sql2 .= ", '' as ref";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
+			$sql2 .= ", '' as ref";
+		} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
+			$sql2 .= ", '' as ref";
+		}
 		$sql2 .= " FROM ".MAIN_DB_PREFIX."mailing as m, ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."user as u";
 		$sql2 .= " WHERE mc.email = '".$db->escape($objcon->email)."'"; // Search is done on email.
 		$sql2 .= " AND mc.statut = 1";
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 7f7ea22e254..efb29e5148a 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -43,8 +43,7 @@ function contact_prepare_head(Contact $object)
 	$tab++;
 
 	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
-	{
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
 		$langs->load("ldap");
 
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/ldap.php?id='.$object->id;
@@ -59,8 +58,7 @@ function contact_prepare_head(Contact $object)
 	$tab++;
 
 	// Related items
-	if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-	{
+	if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
 		$head[$tab][1] = $langs->trans("Referers");
 		$head[$tab][2] = 'consumption';
@@ -78,7 +76,9 @@ function contact_prepare_head(Contact $object)
 		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/note.php?id='.$object->id;
 		$head[$tab][1] = $langs->trans("Note");
-		if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$tab][2] = 'note';
 		$tab++;
 	}
@@ -90,15 +90,16 @@ function contact_prepare_head(Contact $object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/contact/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$tab][2] = 'documents';
 	$tab++;
 
 	// Agenda / Events
 	$head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;
 	$head[$tab][1] .= $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$tab][1] .= '/';
 		$head[$tab][1] .= $langs->trans("Agenda");
 	}
@@ -107,7 +108,7 @@ function contact_prepare_head(Contact $object)
 
 	// Log
 	/*
-    $head[$tab][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id;
+	$head[$tab][0] = DOL_URL_ROOT.'/contact/info.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Info");
 	$head[$tab][2] = 'info';
 	$tab++;*/
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index 10f8d37a3c8..885ddec7255 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -40,12 +40,13 @@ function contract_prepare_head(Contrat $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/contrat/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -56,14 +57,19 @@ function contract_prepare_head(Contrat $object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'contract');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/contrat/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -75,14 +81,15 @@ function contract_prepare_head(Contrat $object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id;
 	$head[$h][1] .= $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index 9702c8ab1dc..4207e6c3b4f 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -108,7 +108,9 @@ function dol_print_cron_urls()
 	print '<br>';
 
 	$logintouse = 'firstadmin';
-	if ($user->admin) $logintouse = $user->login;
+	if ($user->admin) {
+		$logintouse = $user->login;
+	}
 
 	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
 
@@ -117,14 +119,16 @@ function dol_print_cron_urls()
 	print '<br>';
 
 	// Add note
-	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON))
-	{
+	if (empty($conf->global->CRON_DISABLE_TUTORIAL_CRON)) {
 		$linuxlike = 1;
-		if (preg_match('/^win/i', PHP_OS)) $linuxlike = 0;
-		if (preg_match('/^mac/i', PHP_OS)) $linuxlike = 0;
+		if (preg_match('/^win/i', PHP_OS)) {
+			$linuxlike = 0;
+		}
+		if (preg_match('/^mac/i', PHP_OS)) {
+			$linuxlike = 0;
+		}
 		print $langs->trans("Note").': ';
-		if ($linuxlike)
-		{
+		if ($linuxlike) {
 			print $langs->trans("CronExplainHowToRunUnix");
 			print '<br>';
 			print '<textarea class="quatrevingtpercent">*/5 * * * * pathtoscript/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' &gt; '.DOL_DATA_ROOT.'/cron_run_jobs.php.log</textarea><br>';
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index b632bf44110..b57117ffb79 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -82,13 +82,16 @@ function getServerTimeZoneString()
  */
 function getServerTimeZoneInt($refgmtdate = 'now')
 {
-	if (method_exists('DateTimeZone', 'getOffset'))
-	{
+	if (method_exists('DateTimeZone', 'getOffset')) {
 		// Method 1 (include daylight)
 		$gmtnow = dol_now('gmt'); $yearref = dol_print_date($gmtnow, '%Y'); $monthref = dol_print_date($gmtnow, '%m'); $dayref = dol_print_date($gmtnow, '%d');
-		if ($refgmtdate == 'now') $newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;
-		elseif ($refgmtdate == 'summer') $newrefgmtdate = $yearref.'-08-01';
-		else $newrefgmtdate = $yearref.'-01-01';
+		if ($refgmtdate == 'now') {
+			$newrefgmtdate = $yearref.'-'.$monthref.'-'.$dayref;
+		} elseif ($refgmtdate == 'summer') {
+			$newrefgmtdate = $yearref.'-08-01';
+		} else {
+			$newrefgmtdate = $yearref.'-01-01';
+		}
 		$newrefgmtdate .= 'T00:00:00+00:00';
 		$localtz = new DateTimeZone(getServerTimeZoneString());
 		$localdt = new DateTime($newrefgmtdate, $localtz);
@@ -115,26 +118,49 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit)
 {
 	global $conf;
 
-	if ($duration_value == 0)  return $time;
-	if ($duration_unit == 'i') return $time + (60 * $duration_value);
-	if ($duration_unit == 'h') return $time + (3600 * $duration_value);
-	if ($duration_unit == 'w') return $time + (3600 * 24 * 7 * $duration_value);
+	if ($duration_value == 0) {
+		return $time;
+	}
+	if ($duration_unit == 'i') {
+		return $time + (60 * $duration_value);
+	}
+	if ($duration_unit == 'h') {
+		return $time + (3600 * $duration_value);
+	}
+	if ($duration_unit == 'w') {
+		return $time + (3600 * 24 * 7 * $duration_value);
+	}
 
 	$deltastring = 'P';
 
-	if ($duration_value > 0) { $deltastring .= abs($duration_value); $sub = false; }
-	if ($duration_value < 0) { $deltastring .= abs($duration_value); $sub = true; }
-	if ($duration_unit == 'd') { $deltastring .= "D"; }
-	if ($duration_unit == 'm') { $deltastring .= "M"; }
-	if ($duration_unit == 'y') { $deltastring .= "Y"; }
+	if ($duration_value > 0) {
+		$deltastring .= abs($duration_value); $sub = false;
+	}
+	if ($duration_value < 0) {
+		$deltastring .= abs($duration_value); $sub = true;
+	}
+	if ($duration_unit == 'd') {
+		$deltastring .= "D";
+	}
+	if ($duration_unit == 'm') {
+		$deltastring .= "M";
+	}
+	if ($duration_unit == 'y') {
+		$deltastring .= "Y";
+	}
 
 	$date = new DateTime();
-	if (!empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) $date->setTimezone(new DateTimeZone('UTC'));
+	if (!empty($conf->global->MAIN_DATE_IN_MEMORY_ARE_GMT)) {
+		$date->setTimezone(new DateTimeZone('UTC'));
+	}
 	$date->setTimestamp($time);
 	$interval = new DateInterval($deltastring);
 
-	if ($sub) $date->sub($interval);
-	else $date->add($interval);
+	if ($sub) {
+		$date->sub($interval);
+	} else {
+		$date->add($interval);
+	}
 
 	return $date->getTimestamp();
 }
@@ -181,87 +207,81 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 {
 	global $langs;
 
-	if (empty($lengthOfDay))  $lengthOfDay = 86400; // 1 day = 24 hours
-	if (empty($lengthOfWeek)) $lengthOfWeek = 7; // 1 week = 7 days
+	if (empty($lengthOfDay)) {
+		$lengthOfDay = 86400; // 1 day = 24 hours
+	}
+	if (empty($lengthOfWeek)) {
+		$lengthOfWeek = 7; // 1 week = 7 days
+	}
 
-	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec')
-	{
-		if ((int) $iSecond === 0) return '0'; // This is to avoid having 0 return a 12:00 AM for en_US
+	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec') {
+		if ((int) $iSecond === 0) {
+			return '0'; // This is to avoid having 0 return a 12:00 AM for en_US
+		}
 
 		$sTime = '';
 		$sDay = 0;
 		$sWeek = 0;
 
-		if ($iSecond >= $lengthOfDay)
-		{
-			for ($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay)
-			{
+		if ($iSecond >= $lengthOfDay) {
+			for ($i = $iSecond; $i >= $lengthOfDay; $i -= $lengthOfDay) {
 				$sDay++;
 				$iSecond -= $lengthOfDay;
 			}
 			$dayTranslate = $langs->trans("Day");
-			if ($iSecond >= ($lengthOfDay * 2)) $dayTranslate = $langs->trans("Days");
+			if ($iSecond >= ($lengthOfDay * 2)) {
+				$dayTranslate = $langs->trans("Days");
+			}
 		}
 
-		if ($lengthOfWeek < 7)
-		{
-			if ($sDay)
-			{
-				if ($sDay >= $lengthOfWeek)
-				{
+		if ($lengthOfWeek < 7) {
+			if ($sDay) {
+				if ($sDay >= $lengthOfWeek) {
 					$sWeek = (int) (($sDay - $sDay % $lengthOfWeek) / $lengthOfWeek);
 					$sDay = $sDay % $lengthOfWeek;
 					$weekTranslate = $langs->trans("DurationWeek");
-					if ($sWeek >= 2) $weekTranslate = $langs->trans("DurationWeeks");
+					if ($sWeek >= 2) {
+						$weekTranslate = $langs->trans("DurationWeeks");
+					}
 					$sTime .= $sWeek.' '.$weekTranslate.' ';
 				}
 			}
 		}
-		if ($sDay > 0)
-		{
+		if ($sDay > 0) {
 			$dayTranslate = $langs->trans("Day");
-			if ($sDay > 1) $dayTranslate = $langs->trans("Days");
+			if ($sDay > 1) {
+				$dayTranslate = $langs->trans("Days");
+			}
 			$sTime .= $sDay.' '.$dayTranslate.' ';
 		}
 
-		if ($format == 'all')
-		{
-			if ($iSecond || empty($sDay))
-			{
+		if ($format == 'all') {
+			if ($iSecond || empty($sDay)) {
 				$sTime .= dol_print_date($iSecond, 'hourduration', true);
 			}
-		} elseif ($format == 'allhourminsec')
-		{
+		} elseif ($format == 'allhourminsec') {
 			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
-		} elseif ($format == 'allhourmin')
-		{
+		} elseif ($format == 'allhourmin') {
 			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
-		} elseif ($format == 'allhour')
-		{
+		} elseif ($format == 'allhour') {
 			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
 		}
-	} elseif ($format == 'hour')	// only hour part
-	{
+	} elseif ($format == 'hour') {	// only hour part
 		$sTime = dol_print_date($iSecond, '%H', true);
-	} elseif ($format == 'fullhour')
-	{
+	} elseif ($format == 'fullhour') {
 		if (!empty($iSecond)) {
 			$iSecond = $iSecond / 3600;
 		} else {
 			$iSecond = 0;
 		}
 		$sTime = $iSecond;
-	} elseif ($format == 'min')	// only min part
-	{
+	} elseif ($format == 'min') {	// only min part
 		$sTime = dol_print_date($iSecond, '%M', true);
-	} elseif ($format == 'sec')	// only sec part
-	{
+	} elseif ($format == 'sec') {	// only sec part
 		$sTime = dol_print_date($iSecond, '%S', true);
-	} elseif ($format == 'month')	// only month part
-	{
+	} elseif ($format == 'month') {	// only month part
 		$sTime = dol_print_date($iSecond, '%m', true);
-	} elseif ($format == 'year')	// only year part
-	{
+	} elseif ($format == 'year') {	// only year part
 		$sTime = dol_print_date($iSecond, '%Y', true);
 	}
 	return trim($sTime);
@@ -289,7 +309,9 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
 		} elseif ($year_date > 0 && !empty($day_date)) {
 			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_mktime(0, 0, 0, $month_date, $day_date, $year_date));
 			$sqldate .= "' AND '".$db->idate(dol_mktime(23, 59, 59, $month_date, $day_date, $year_date))."'";
-		} else $sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
+		} else {
+			$sqldate .= ($excludefirstand ? "" : " AND ")." date_format( ".$datefield.", '%c') = '".$db->escape($month_date)."'";
+		}
 	} elseif ($year_date > 0) {
 		$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, 1, false));
 		$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, 12, false))."'";
@@ -320,8 +342,7 @@ function dol_stringtotime($string, $gm = 1)
 {
 	$reg = array();
 	// Convert date with format DD/MM/YYY HH:MM:SS. This part of code should not be used.
-	if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg))
-	{
+	if (preg_match('/^([0-9]+)\/([0-9]+)\/([0-9]+)\s?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $string, $reg)) {
 		dol_syslog("dol_stringtotime call to function with deprecated parameter format", LOG_WARNING);
 		// Date est au format 'DD/MM/YY' ou 'DD/MM/YY HH:MM:SS'
 		// Date est au format 'DD/MM/YYYY' ou 'DD/MM/YYYY HH:MM:SS'
@@ -331,15 +352,17 @@ function dol_stringtotime($string, $gm = 1)
 		$shour = $reg[4];
 		$smin = $reg[5];
 		$ssec = $reg[6];
-		if ($syear < 50) $syear += 1900;
-		if ($syear >= 50 && $syear < 100) $syear += 2000;
+		if ($syear < 50) {
+			$syear += 1900;
+		}
+		if ($syear >= 50 && $syear < 100) {
+			$syear += 2000;
+		}
 		$string = sprintf("%04d%02d%02d%02d%02d%02d", $syear, $smonth, $sday, $shour, $smin, $ssec);
-	} elseif (
-		   preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
+	} elseif (preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z$/i', $string, $reg)	// Convert date with format YYYY-MM-DDTHH:MM:SSZ (RFC3339)
 		|| preg_match('/^([0-9]{4})-([0-9]{2})-([0-9]{2}) ([0-9]{2}):([0-9]{2}):([0-9]{2})$/i', $string, $reg)	// Convert date with format YYYY-MM-DD HH:MM:SS
-   		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ
-	)
-	{
+		|| preg_match('/^([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z$/i', $string, $reg)		// Convert date with format YYYYMMDDTHHMMSSZ
+	) {
 		$syear = $reg[1];
 		$smonth = $reg[2];
 		$sday = $reg[3];
@@ -397,8 +420,7 @@ function dol_get_next_day($day, $month, $year)
  */
 function dol_get_prev_month($month, $year)
 {
-	if ($month == 1)
-	{
+	if ($month == 1) {
 		$prev_month = 12;
 		$prev_year  = $year - 1;
 	} else {
@@ -417,8 +439,7 @@ function dol_get_prev_month($month, $year)
  */
 function dol_get_next_month($month, $year)
 {
-	if ($month == 12)
-	{
+	if ($month == 12) {
 		$next_month = 1;
 		$next_year  = $year + 1;
 	} else {
@@ -480,7 +501,9 @@ function dol_get_next_week($day, $week, $month, $year)
  */
 function dol_get_first_day($year, $month = 1, $gm = false)
 {
-	if ($year > 9999) return '';
+	if ($year > 9999) {
+		return '';
+	}
 	return dol_mktime(0, 0, 0, $month, 1, $year, $gm);
 }
 
@@ -497,9 +520,10 @@ function dol_get_first_day($year, $month = 1, $gm = false)
  */
 function dol_get_last_day($year, $month = 12, $gm = false)
 {
-	if ($year > 9999) return '';
-	if ($month == 12)
-	{
+	if ($year > 9999) {
+		return '';
+	}
+	if ($month == 12) {
 		$month = 1;
 		$year += 1;
 	} else {
@@ -560,8 +584,10 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 
 	//Calculate days = offset from current day
 	$days = $start_week - $tmparray['wday'];
- 	if ($days >= 1) $days = 7 - $days;
- 	$days = abs($days);
+	if ($days >= 1) {
+		$days = 7 - $days;
+	}
+	$days = abs($days);
 	$seconds = $days * 24 * 60 * 60;
 	//print 'start_week='.$start_week.' tmparray[wday]='.$tmparray['wday'].' day offset='.$days.' seconds offset='.$seconds.'<br>';
 
@@ -570,13 +596,11 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 	$tmpday = date("d", $tmpdaytms);
 
 	//Check first day of week is in same month than current day or not
-	if ($tmpday > $day)
-	{
+	if ($tmpday > $day) {
 		$prev_month = $month - 1;
 		$prev_year = $year;
 
-		if ($prev_month == 0)
-		{
+		if ($prev_month == 0) {
 			$prev_month = 12;
 			$prev_year  = $year - 1;
 		}
@@ -594,13 +618,11 @@ function dol_get_first_day_week($day, $month, $year, $gm = false)
 	$prev_day = $tmparray['mday'];
 
 	//Check prev day of week is in same month than first day or not
-	if ($prev_day > $tmpday)
-	{
+	if ($prev_day > $tmpday) {
 		$prev_month = $month - 1;
 		$prev_year = $year;
 
-		if ($prev_month == 0)
-		{
+		if ($prev_month == 0) {
 			$prev_month = 12;
 			$prev_year  = $year - 1;
 		}
@@ -647,19 +669,26 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 	$nbFerie = 0;
 
 	// Check to ensure we use correct parameters
-	if ((($timestampEnd - $timestampStart) % 86400) != 0) return 'Error Dates must use same hours and must be GMT dates';
+	if ((($timestampEnd - $timestampStart) % 86400) != 0) {
+		return 'Error Dates must use same hours and must be GMT dates';
+	}
 
-	if (empty($country_code)) $country_code = $mysoc->country_code;
+	if (empty($country_code)) {
+		$country_code = $mysoc->country_code;
+	}
 
-	if ($includesaturday < 0) $includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
-	if ($includesunday < 0)   $includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
+	if ($includesaturday < 0) {
+		$includesaturday = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY : 1);
+	}
+	if ($includesunday < 0) {
+		$includesunday   = (isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY) ? $conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY : 1);
+	}
 
 	$country_id = dol_getIdFromCode($db, $country_code, 'c_country', 'code', 'rowid');
 
 	$i = 0;
 	while ((($lastday == 0 && $timestampStart < $timestampEnd) || ($lastday && $timestampStart <= $timestampEnd))
-		&& ($i < 50000))		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
-	{
+		&& ($i < 50000)) {		// Loop end when equals (Test on i is a security loop to avoid infinite loop)
 		$ferie = false;
 		$specialdayrule = array();
 
@@ -676,24 +705,29 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 		$sql .= " WHERE active = 1 and fk_country IN (0".($country_id > 0 ? ", ".$country_id : 0).")";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_rows = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_rows)
-			{
+			while ($i < $num_rows) {
 				$obj = $db->fetch_object($resql);
 
-				if (!empty($obj->dayrule) && $obj->dayrule != 'date')		// For example 'easter', '...'
-				{
+				if (!empty($obj->dayrule) && $obj->dayrule != 'date') {		// For example 'easter', '...'
 					$specialdayrule[$obj->dayrule] = $obj->dayrule;
 				} else {
 					$match = 1;
-					if (!empty($obj->year) && $obj->year != $annee) $match = 0;
-					if ($obj->month != $mois) $match = 0;
-					if ($obj->day != $jour) $match = 0;
+					if (!empty($obj->year) && $obj->year != $annee) {
+						$match = 0;
+					}
+					if ($obj->month != $mois) {
+						$match = 0;
+					}
+					if ($obj->day != $jour) {
+						$match = 0;
+					}
 
-					if ($match) $ferie = true;
+					if ($match) {
+						$ferie = true;
+					}
 				}
 
 				$i++;
@@ -707,18 +741,18 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 
 		if (!$ferie) {
 			// Special dayrules
-			if (in_array('easter', $specialdayrule))
-			{
+			if (in_array('easter', $specialdayrule)) {
 				// Calculation for easter date
 				$date_paques = getGMTEasterDatetime($annee);
 				$jour_paques = gmdate("d", $date_paques);
 				$mois_paques = gmdate("m", $date_paques);
-				if ($jour_paques == $jour && $mois_paques == $mois) $ferie = true;
+				if ($jour_paques == $jour && $mois_paques == $mois) {
+					$ferie = true;
+				}
 				// Easter (sunday)
 			}
 
-			if (in_array('eastermonday', $specialdayrule))
-			{
+			if (in_array('eastermonday', $specialdayrule)) {
 				// Calculation for the monday of easter date
 				$date_paques = getGMTEasterDatetime($annee);
 				$date_lundi_paques = mktime(
@@ -731,12 +765,13 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				);
 				$jour_lundi_paques = gmdate("d", $date_lundi_paques);
 				$mois_lundi_paques = gmdate("m", $date_lundi_paques);
-				if ($jour_lundi_paques == $jour && $mois_lundi_paques == $mois) $ferie = true;
+				if ($jour_lundi_paques == $jour && $mois_lundi_paques == $mois) {
+					$ferie = true;
+				}
 				// Easter (monday)
 			}
 
-			if (in_array('ascension', $specialdayrule))
-			{
+			if (in_array('ascension', $specialdayrule)) {
 				// Calcul du jour de l'ascension (39 days after easter day)
 				$date_paques = getGMTEasterDatetime($annee);
 				$date_ascension = mktime(
@@ -749,12 +784,13 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				);
 				$jour_ascension = gmdate("d", $date_ascension);
 				$mois_ascension = gmdate("m", $date_ascension);
-				if ($jour_ascension == $jour && $mois_ascension == $mois) $ferie = true;
+				if ($jour_ascension == $jour && $mois_ascension == $mois) {
+					$ferie = true;
+				}
 				// Ascension (thursday)
 			}
 
-			if (in_array('pentecote', $specialdayrule))
-			{
+			if (in_array('pentecote', $specialdayrule)) {
 				// Calculation of "Pentecote" (49 days after easter day)
 				$date_paques = getGMTEasterDatetime($annee);
 				$date_pentecote = mktime(
@@ -767,11 +803,12 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				);
 				$jour_pentecote = gmdate("d", $date_pentecote);
 				$mois_pentecote = gmdate("m", $date_pentecote);
-				if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
+				if ($jour_pentecote == $jour && $mois_pentecote == $mois) {
+					$ferie = true;
+				}
 				// "Pentecote" (sunday)
 			}
-			if (in_array('pentecotemonday', $specialdayrule))
-			{
+			if (in_array('pentecotemonday', $specialdayrule)) {
 				// Calculation of "Pentecote" (49 days after easter day)
 				$date_paques = getGMTEasterDatetime($annee);
 				$date_pentecote = mktime(
@@ -781,15 +818,16 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 					gmdate("m", $date_paques),
 					gmdate("d", $date_paques) + 50,
 					gmdate("Y", $date_paques)
-					);
+				);
 				$jour_pentecote = gmdate("d", $date_pentecote);
 				$mois_pentecote = gmdate("m", $date_pentecote);
-				if ($jour_pentecote == $jour && $mois_pentecote == $mois) $ferie = true;
+				if ($jour_pentecote == $jour && $mois_pentecote == $mois) {
+					$ferie = true;
+				}
 				// "Pentecote" (monday)
 			}
 
-			if (in_array('viernessanto', $specialdayrule))
-			{
+			if (in_array('viernessanto', $specialdayrule)) {
 				// Viernes Santo
 				$date_paques = getGMTEasterDatetime($annee);
 				$date_viernes = mktime(
@@ -802,12 +840,13 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				);
 				$jour_viernes = gmdate("d", $date_viernes);
 				$mois_viernes = gmdate("m", $date_viernes);
-				if ($jour_viernes == $jour && $mois_viernes == $mois) $ferie = true;
+				if ($jour_viernes == $jour && $mois_viernes == $mois) {
+					$ferie = true;
+				}
 				//Viernes Santo
 			}
 
-			if (in_array('fronleichnam', $specialdayrule))
-			{
+			if (in_array('fronleichnam', $specialdayrule)) {
 				// Fronleichnam (60 days after easter sunday)
 				$date_paques = getGMTEasterDatetime($annee);
 				$date_fronleichnam = mktime(
@@ -817,10 +856,12 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 					gmdate("m", $date_paques),
 					gmdate("d", $date_paques) + 60,
 					gmdate("Y", $date_paques)
-					);
+				);
 				$jour_fronleichnam = gmdate("d", $date_fronleichnam);
 				$mois_fronleichnam = gmdate("m", $date_fronleichnam);
-				if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) $ferie = true;
+				if ($jour_fronleichnam == $jour && $mois_fronleichnam == $mois) {
+					$ferie = true;
+				}
 				// Fronleichnam
 			}
 		}
@@ -828,24 +869,27 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 
 		// If we have to include saturday and sunday
 		if (!$ferie) {
-			if ($includesaturday || $includesunday)
-			{
+			if ($includesaturday || $includesunday) {
 				$jour_julien = unixtojd($timestampStart);
 				$jour_semaine = jddayofweek($jour_julien, 0);
-				if ($includesaturday)					//Saturday (6) and Sunday (0)
-				{
-					if ($jour_semaine == 6) $ferie = true;
+				if ($includesaturday) {					//Saturday (6) and Sunday (0)
+					if ($jour_semaine == 6) {
+						$ferie = true;
+					}
 				}
-				if ($includesunday)						//Saturday (6) and Sunday (0)
-				{
-					if ($jour_semaine == 0) $ferie = true;
+				if ($includesunday) {						//Saturday (6) and Sunday (0)
+					if ($jour_semaine == 0) {
+						$ferie = true;
+					}
 				}
 			}
 		}
 		//print "ferie=".$ferie."\n";
 
 		// We increase the counter of non working day
-		if ($ferie) $nbFerie++;
+		if ($ferie) {
+			$nbFerie++;
+		}
 
 		// Increase number of days (on go up into loop)
 		$timestampStart = dol_time_plus_duree($timestampStart, 1, 'd');
@@ -870,10 +914,8 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
  */
 function num_between_day($timestampStart, $timestampEnd, $lastday = 0)
 {
-	if ($timestampStart < $timestampEnd)
-	{
-		if ($lastday == 1)
-		{
+	if ($timestampStart < $timestampEnd) {
+		if ($lastday == 1) {
 			$bit = 0;
 		} else {
 			$bit = 1;
@@ -900,34 +942,44 @@ function num_open_day($timestampStart, $timestampEnd, $inhour = 0, $lastday = 0,
 {
 	global $langs, $mysoc;
 
-	if (empty($country_code)) $country_code = $mysoc->country_code;
+	if (empty($country_code)) {
+		$country_code = $mysoc->country_code;
+	}
 
 	dol_syslog('num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday.' country_code='.$country_code);
 
 	// Check parameters
-	if (!is_int($timestampStart) && !is_float($timestampStart)) return 'ErrorBadParameter_num_open_day';
-	if (!is_int($timestampEnd) && !is_float($timestampEnd)) return 'ErrorBadParameter_num_open_day';
+	if (!is_int($timestampStart) && !is_float($timestampStart)) {
+		return 'ErrorBadParameter_num_open_day';
+	}
+	if (!is_int($timestampEnd) && !is_float($timestampEnd)) {
+		return 'ErrorBadParameter_num_open_day';
+	}
 
 	//print 'num_open_day timestampStart='.$timestampStart.' timestampEnd='.$timestampEnd.' bit='.$lastday;
-	if ($timestampStart < $timestampEnd)
-	{
+	if ($timestampStart < $timestampEnd) {
 		$numdays = num_between_day($timestampStart, $timestampEnd, $lastday);
 
 		$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
 		$nbOpenDay = ($numdays - $numholidays);
-		if ($inhour == 1 && $nbOpenDay <= 3) $nbOpenDay = ($nbOpenDay * 24);
+		if ($inhour == 1 && $nbOpenDay <= 3) {
+			$nbOpenDay = ($nbOpenDay * 24);
+		}
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
-	} elseif ($timestampStart == $timestampEnd)
-	{
+	} elseif ($timestampStart == $timestampEnd) {
 		$numholidays = 0;
 		if ($lastday) {
 			$numholidays = num_public_holiday($timestampStart, $timestampEnd, $country_code, $lastday);
-			if ($numholidays == 1) return 0;
+			if ($numholidays == 1) {
+				return 0;
+			}
 		}
 
 		$nbOpenDay = $lastday;
 
-		if ($inhour == 1) $nbOpenDay = ($nbOpenDay * 24);
+		if ($inhour == 1) {
+			$nbOpenDay = ($nbOpenDay * 24);
+		}
 		return $nbOpenDay - (($inhour == 1 ? 12 : 0.5) * abs($halfday));
 	} else {
 		return $langs->trans("Error");
@@ -961,8 +1013,7 @@ function monthArray($outputlangs, $short = 0)
 		12 => $outputlangs->trans("Month12")
 	);
 
-	if (!empty($short))
-	{
+	if (!empty($short)) {
 		$montharray = array(
 			1  => $outputlangs->trans("MonthShort01"),
 			2  => $outputlangs->trans("MonthShort02"),
@@ -1009,7 +1060,9 @@ function getFirstDayOfEachWeek($TWeek, $year)
 {
 	$TFirstDayOfWeek = array();
 	foreach ($TWeek as $weekNb) {
-		if (in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') $year++; //Si on a la 1re semaine et la semaine 52 c'est qu'on change d'année
+		if (in_array('01', $TWeek) && in_array('52', $TWeek) && $weekNb == '01') {
+			$year++; //Si on a la 1re semaine et la semaine 52 c'est qu'on change d'année
+		}
 		$TFirstDayOfWeek[$weekNb] = date('d', strtotime($year.'W'.$weekNb));
 	}
 	return $TFirstDayOfWeek;
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 4e9768b2a44..97eaa7d0b9e 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -48,18 +48,25 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 	$ref_supplier = (!empty($line->ref_supplier) ? $line->ref_supplier : (!empty($line->ref_fourn) ? $line->ref_fourn : '')); // TODO Not yet saved for supplier invoices, only supplier orders
 	$note = (!empty($line->note) ? $line->note : '');
 
-	if ($issupplierline) $prodser = new ProductFournisseur($db);
-	else $prodser = new Product($db);
+	if ($issupplierline) {
+		$prodser = new ProductFournisseur($db);
+	} else {
+		$prodser = new Product($db);
+	}
 
-	if ($idprod)
-	{
+	if ($idprod) {
 		$prodser->fetch($idprod);
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
-		{
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label)     $label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note)        $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
+		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang)) {
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["label"]) && $label == $prodser->label) {
+				$label = $prodser->multilangs[$outputlangs->defaultlang]["label"];
+			}
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && $desc == $prodser->description) {
+				$desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
+			}
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && $note == $prodser->note) {
+				$note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
+			}
 		}
 	}
 
@@ -67,36 +74,34 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 	$libelleproduitservice = $label;
 
 	// Description long of product line
-	if ($desc && ($desc != $label))
-	{
-		if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except)
-		{
+	if ($desc && ($desc != $label)) {
+		if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
-		} elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
-		{
+		} elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
-			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
-		} elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
-		{
+			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+				$libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
+			}
+		} elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
-		} elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except)
-		{
+		} elseif ($desc == '(EXCESS PAID)' && $line->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
 		} else {
-			if ($idprod)
-			{
-				if (empty($hidedesc)) $libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
+			if ($idprod) {
+				if (empty($hidedesc)) {
+					$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
+				}
 			} else {
 				$libelleproduitservice = dol_concatdesc($libelleproduitservice, $desc);
 			}
@@ -104,27 +109,25 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 	}
 
 	// If line linked to a product
-	if ($idprod)
-	{
+	if ($idprod) {
 		// On ajoute la ref
-		if ($prodser->ref)
-		{
+		if ($prodser->ref) {
 			$prefix_prodserv = "";
 			$ref_prodserv = "";
-			if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS))   // In standard mode, we do not show this
-			{
-				if ($prodser->isService())
-				{
+			if (!empty($conf->global->PRODUCT_ADD_TYPE_IN_DOCUMENTS)) {   // In standard mode, we do not show this
+				if ($prodser->isService()) {
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Service")." ";
 				} else {
 					$prefix_prodserv = $outputlangs->transnoentitiesnoconv("Product")." ";
 				}
 			}
 
-			if (empty($hideref))
-			{
-				if ($issupplierline) $ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref
-				else $ref_prodserv = $prodser->ref; // Show local ref only
+			if (empty($hideref)) {
+				if ($issupplierline) {
+					$ref_prodserv = $prodser->ref.' ('.$outputlangs->trans("SupplierRef").' '.$ref_supplier.')'; // Show local ref and supplier ref
+				} else {
+					$ref_prodserv = $prodser->ref; // Show local ref only
+				}
 
 				$ref_prodserv .= " - ";
 			}
@@ -133,20 +136,16 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 		}
 	}
 
-	if (!empty($line->date_start) || !empty($line->date_end))
-	{
+	if (!empty($line->date_start) || !empty($line->date_end)) {
 		$format = 'day';
 		// Show duration if exists
-		if ($line->date_start && $line->date_end)
-		{
+		if ($line->date_start && $line->date_end) {
 			$period = '('.$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($line->date_start, $format, false, $outputlangs), dol_print_date($line->date_end, $format, false, $outputlangs)).')';
 		}
-		if ($line->date_start && !$line->date_end)
-		{
+		if ($line->date_start && !$line->date_end) {
 			$period = '('.$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($line->date_start, $format, false, $outputlangs)).')';
 		}
-		if (!$line->date_start && $line->date_end)
-		{
+		if (!$line->date_start && $line->date_end) {
 			$period = '('.$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($line->date_end, $format, false, $outputlangs)).')';
 		}
 		//print '>'.$outputlangs->charset_output.','.$period;
diff --git a/htdocs/core/lib/doleditor.lib.php b/htdocs/core/lib/doleditor.lib.php
index 1ad17280f22..79f38a8990a 100644
--- a/htdocs/core/lib/doleditor.lib.php
+++ b/htdocs/core/lib/doleditor.lib.php
@@ -41,10 +41,8 @@ function show_skin($fuser, $edit = 0)
 	$formother = new FormOther($db);
 
 	$dirskins = array('/includes/ckeditor/ckeditor/skins');
-	if (!empty($conf->modules_parts['theme']))		// Using this feature slow down application
-	{
-		foreach ($conf->modules_parts['theme'] as $reldir)
-		{
+	if (!empty($conf->modules_parts['theme'])) {		// Using this feature slow down application
+		foreach ($conf->modules_parts['theme'] as $reldir) {
 			$dirskins = array_merge($dirskins, (array) ($reldir.'theme'));
 		}
 	}
@@ -52,8 +50,11 @@ function show_skin($fuser, $edit = 0)
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
 	$selected_theme = '';
-	if (empty($conf->global->FCKEDITOR_SKIN)) $selected_theme = 'moono-lisa';
-	else $selected_theme = $conf->global->FCKEDITOR_SKIN;
+	if (empty($conf->global->FCKEDITOR_SKIN)) {
+		$selected_theme = 'moono-lisa';
+	} else {
+		$selected_theme = $conf->global->FCKEDITOR_SKIN;
+	}
 
 	$colspan = 2;
 
@@ -63,23 +64,22 @@ function show_skin($fuser, $edit = 0)
 	$var = false;
 
 	// Title
-   	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';
-   	print '<th class="right">';
-   	$url = 'http://ckeditor.com/addons/skins/all';
-   	/*print '<a href="'.$url.'" target="_blank">';
-   	print $langs->trans('DownloadMoreSkins');
-   	print '</a>';*/
-   	print '</th></tr>';
+	print '<tr class="liste_titre"><th width="35%">'.$langs->trans("DefaultSkin").'</th>';
+	print '<th class="right">';
+	$url = 'http://ckeditor.com/addons/skins/all';
+	/*print '<a href="'.$url.'" target="_blank">';
+	   print $langs->trans('DownloadMoreSkins');
+	   print '</a>';*/
+	print '</th></tr>';
 
 	print '<tr class="oddeven">';
-   	print '<td>'.$langs->trans("ThemeDir").'</td>';
-   	print '<td>';
-   	foreach ($dirskins as $dirskin)
-   	{
-   		echo '"'.$dirskin.'" ';
-   	}
-   	print '</td>';
-   	print '</tr>';
+	print '<td>'.$langs->trans("ThemeDir").'</td>';
+	print '<td>';
+	foreach ($dirskins as $dirskin) {
+		echo '"'.$dirskin.'" ';
+	}
+	print '</td>';
+	print '</tr>';
 
 	//
 	print '<tr class="oddeven"><td colspan="'.$colspan.'">';
@@ -87,29 +87,27 @@ function show_skin($fuser, $edit = 0)
 	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
 
 	$i = 0;
-	foreach ($dirskins as $dir)
-	{
+	foreach ($dirskins as $dir) {
 		//print $dirroot.$dir;exit;
 		$dirskin = dol_buildpath($dir, 0); // This include loop on $conf->file->dol_document_root
 		$urltheme = dol_buildpath($dir, 1);
 
-		if (is_dir($dirskin))
-		{
+		if (is_dir($dirskin)) {
 			$handle = opendir($dirskin);
-			if (is_resource($handle))
-			{
-				while (($subdir = readdir($handle)) !== false)
-				{
+			if (is_resource($handle)) {
+				while (($subdir = readdir($handle)) !== false) {
 					if (is_dir($dirskin."/".$subdir) && substr($subdir, 0, 1) <> '.'
-							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir))
-					{
+							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
 						// Disable not stable themes (dir ends with _exp or _dev)
-						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
-						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
+						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) {
+							continue;
+						}
+						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) {
+							continue;
+						}
 
 						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
-						if ($subdir == $selected_theme)
-						{
+						if ($subdir == $selected_theme) {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" checked name="fckeditor_skin" value="'.$subdir.'"> <b>'.$subdir.'</b>';
 						} else {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" '.$bc[$var].' style="border: 0px;" name="fckeditor_skin" value="'.$subdir.'"> '.$subdir;
diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php
index c39229d1e23..e60b7ee3bc6 100644
--- a/htdocs/core/lib/donation.lib.php
+++ b/htdocs/core/lib/donation.lib.php
@@ -85,16 +85,24 @@ function donation_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/don/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$nbNote = 0;
-	if (!empty($object->note_private)) $nbNote++;
-	if (!empty($object->note_public)) $nbNote++;
+	if (!empty($object->note_private)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_public)) {
+		$nbNote++;
+	}
 	$head[$h][0] = DOL_URL_ROOT.'/don/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	if ($nbNote > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	}
 	$head[$h][2] = 'note';
 	$h++;
 
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 2c1edc5e675..97eeffd4337 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -44,8 +44,7 @@ function ecm_prepare_dasboard_head($object)
 	$head[$h][2] = 'index';
 	$h++;
 
-	if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
-	{
+	if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/index_auto.php';
 		$head[$h][1] = $langs->trans("ECMSectionsAuto").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
 		$head[$h][2] = 'index_auto';
@@ -78,8 +77,7 @@ function ecm_prepare_head($object, $module = 'ecm', $section = '')
 	$h = 0;
 	$head = array();
 
-	if ($module == 'ecm')
-	{
+	if ($module == 'ecm') {
 		$head[$h][0] = DOL_URL_ROOT.'/ecm/dir_card.php?section='.$object->id;
 		$head[$h][1] = $langs->trans("Directory");
 		$head[$h][2] = 'card';
@@ -115,9 +113,15 @@ function ecm_file_prepare_head($object)
 	$head[$h][0] = DOL_URL_ROOT.'/ecm/file_note.php?section='.$object->section_id.'&urlfile='.urlencode($object->label);
 	$head[$h][1] = $langs->trans("Notes");
 	$nbNote = 0;
-	if (!empty($object->note_private)) $nbNote++;
-	if (!empty($object->note_public)) $nbNote++;
-	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	if (!empty($object->note_private)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_public)) {
+		$nbNote++;
+	}
+	if ($nbNote > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	}
 	$head[$h][2] = 'note';
 	$h++;
 
diff --git a/htdocs/core/lib/emailing.lib.php b/htdocs/core/lib/emailing.lib.php
index 86f11a7a271..3dbc277cca2 100644
--- a/htdocs/core/lib/emailing.lib.php
+++ b/htdocs/core/lib/emailing.lib.php
@@ -39,17 +39,17 @@ function emailing_prepare_head(Mailing $object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient))
-	{
+	if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->mailing->mailing_advance->recipient)) {
 		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/cibles.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("MailRecipients");
-		if ($object->nbemail > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$object->nbemail.'</span>';
+		if ($object->nbemail > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$object->nbemail.'</span>';
+		}
 		$head[$h][2] = 'targets';
 		$h++;
 	}
 
-	if (!empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR))
-	{
+	if (!empty($conf->global->EMAILING_USE_ADVANCED_SELECTOR)) {
 		$head[$h][0] = DOL_URL_ROOT."/comm/mailing/advtargetemailing.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("MailAdvTargetRecipients");
 		$head[$h][2] = 'advtargets';
diff --git a/htdocs/core/lib/expedition.lib.php b/htdocs/core/lib/expedition.lib.php
index 92c58d7b5db..99118197174 100644
--- a/htdocs/core/lib/expedition.lib.php
+++ b/htdocs/core/lib/expedition.lib.php
@@ -35,7 +35,9 @@
 function expedition_prepare_head(Expedition $object)
 {
 	global $langs, $conf, $user;
-	if (!empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (!empty($conf->expedition->enabled)) {
+		$langs->load("sendings");
+	}
 	$langs->load("orders");
 
 	$h = 0;
@@ -51,8 +53,7 @@ function expedition_prepare_head(Expedition $object)
 	$hselected = $h;
 	$h++;
 
-	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY))
-	{
+	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/delivery.php";
 		$head[$h][1] = $langs->trans("Receivings");
 		$h++;
@@ -84,8 +85,7 @@ function expedition_admin_prepare_head()
 	$h++;
 
 
-	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/expedition.php";
 		$head[$h][1] = $langs->trans("Shipment");
 		$head[$h][2] = 'shipment';
@@ -93,40 +93,35 @@ function expedition_admin_prepare_head()
 	}
 
 
-	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/expedition_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFields");
 		$head[$h][2] = 'attributes_shipment';
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
-	{
+	if (!empty($conf->global->MAIN_SUBMODULE_EXPEDITION)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/expeditiondet_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFieldsLines");
 		$head[$h][2] = 'attributeslines_shipment';
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY))
-	{
+	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/delivery.php";
 		$head[$h][1] = $langs->trans("Receivings");
 		$head[$h][2] = 'receivings';
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY))
-	{
+	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/delivery_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFields");
 		$head[$h][2] = 'attributes_receivings';
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY))
-	{
+	if (!empty($conf->global->MAIN_SUBMODULE_DELIVERY)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/deliverydet_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFieldsLines");
 		$head[$h][2] = 'attributeslines_receivings';
diff --git a/htdocs/core/lib/expensereport.lib.php b/htdocs/core/lib/expensereport.lib.php
index b77082804ba..8e27ef12466 100644
--- a/htdocs/core/lib/expensereport.lib.php
+++ b/htdocs/core/lib/expensereport.lib.php
@@ -52,18 +52,25 @@ function expensereport_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expensereport/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/expensereport/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -133,16 +140,14 @@ function expensereport_admin_prepare_head()
 	$head[$h][2] = 'expensereport';
 	$h++;
 
-	if (!empty($conf->global->MAIN_USE_EXPENSE_RULE))
-	{
+	if (!empty($conf->global->MAIN_USE_EXPENSE_RULE)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_rules.php";
 		$head[$h][1] = $langs->trans("ExpenseReportsRules");
 		$head[$h][2] = 'expenserules';
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
-	{
+	if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/expensereport_ik.php";
 		$head[$h][1] = $langs->trans("ExpenseReportsIk");
 		$head[$h][2] = 'expenseik';
@@ -163,8 +168,8 @@ function expensereport_admin_prepare_head()
 	/*
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/admin/fichinterdet_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
-    $head[$h][2] = 'attributesdet';
-    $h++;
+	$head[$h][2] = 'attributesdet';
+	$h++;
 	*/
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'expensereport_admin', 'remove');
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index bbc10f0b756..fec64f931dc 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -46,12 +46,13 @@ function fichinter_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/fichinter/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('InterventionContact');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -63,15 +64,14 @@ function fichinter_prepare_head($object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention');
 
 	// Tab to link resources
-	if ($conf->resource->enabled)
-	{
+	if ($conf->resource->enabled) {
 		require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 		$objectres = new Dolresource($db);
 		$linked_resources = $objectres->getElementResources('fichinter', $object->id);
 		$nbResource = (is_array($linked_resources) ?count($linked_resources) : 0);
 		// if (is_array($objectres->available_resources))
 		// {
-	 	// 	foreach ($objectres->available_resources as $modresources => $resources)
+		// 	foreach ($objectres->available_resources as $modresources => $resources)
 		// 	{
 		// 		$resources=(array) $resources;  // To be sure $resources is an array
 		// 		foreach($resources as $resource_obj)
@@ -81,21 +81,28 @@ function fichinter_prepare_head($object)
 		// 	}
 		// }
 
-   		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
 		$head[$h][1] = $langs->trans("Resources");
-		if ($nbResource > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbResource.'</span>';
+		if ($nbResource > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbResource.'</span>';
+		}
 		$head[$h][2] = 'resource';
 		$h++;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/fichinter/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -107,7 +114,9 @@ function fichinter_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fichinter/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 14701d57256..bde5408eb65 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -75,8 +75,7 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 	$reshook = 0;
 	$file_list = array();
 
-	if (is_object($hookmanager) && !$nohook)
-	{
+	if (is_object($hookmanager) && !$nohook) {
 		$hookmanager->resArray = array();
 
 		$hookmanager->initHooks(array('fileslib'));
@@ -97,51 +96,52 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 	}
 
 	// $hookmanager->resArray may contain array stacked by other modules
-	if (empty($reshook))
-	{
-		if (!is_dir($newpath)) return array();
+	if (empty($reshook)) {
+		if (!is_dir($newpath)) {
+			return array();
+		}
 
-		if ($dir = opendir($newpath))
-		{
+		if ($dir = opendir($newpath)) {
 			$filedate = '';
 			$filesize = '';
 
-			while (false !== ($file = readdir($dir)))        // $file is always a basename (into directory $newpath)
-			{
-				if (!utf8_check($file)) $file = utf8_encode($file); // To be sure data is stored in utf8 in memory
+			while (false !== ($file = readdir($dir))) {        // $file is always a basename (into directory $newpath)
+				if (!utf8_check($file)) {
+					$file = utf8_encode($file); // To be sure data is stored in utf8 in memory
+				}
 				$fullpathfile = ($newpath ? $newpath.'/' : '').$file;
 
 				$qualified = 1;
 
 				// Define excludefilterarray
 				$excludefilterarray = array('^\.');
-				if (is_array($excludefilter))
-				{
+				if (is_array($excludefilter)) {
 					$excludefilterarray = array_merge($excludefilterarray, $excludefilter);
-				} elseif ($excludefilter) $excludefilterarray[] = $excludefilter;
+				} elseif ($excludefilter) {
+					$excludefilterarray[] = $excludefilter;
+				}
 				// Check if file is qualified
-				foreach ($excludefilterarray as $filt)
-				{
+				foreach ($excludefilterarray as $filt) {
 					if (preg_match('/'.$filt.'/i', $file) || preg_match('/'.$filt.'/i', $fullpathfile)) {
 						$qualified = 0; break;
 					}
 				}
 				//print $fullpathfile.' '.$file.' '.$qualified.'<br>';
 
-				if ($qualified)
-				{
+				if ($qualified) {
 					$isdir = is_dir(dol_osencode($path."/".$file));
 					// Check whether this is a file or directory and whether we're interested in that type
-					if ($isdir && (($types == "directories") || ($types == "all") || $recursive))
-					{
+					if ($isdir && (($types == "directories") || ($types == "all") || $recursive)) {
 						// Add entry into file_list array
-						if (($types == "directories") || ($types == "all"))
-						{
-							if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
-							if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);
+						if (($types == "directories") || ($types == "all")) {
+							if ($loaddate || $sortcriteria == 'date') {
+								$filedate = dol_filemtime($path."/".$file);
+							}
+							if ($loadsize || $sortcriteria == 'size') {
+								$filesize = dol_filesize($path."/".$file);
+							}
 
-							if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into all $path, only into $file part
-							{
+							if (!$filter || preg_match('/'.$filter.'/i', $file)) {	// We do not search key $filter into all $path, only into $file part
 								$reg = array();
 								preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
 								$level1name = (isset($reg[1]) ? $reg[1] : '');
@@ -159,22 +159,22 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 						}
 
 						// if we're in a directory and we want recursive behavior, call this function again
-						if ($recursive)
-						{
-							if (empty($donotfollowsymlinks) || !is_link($path."/".$file))
-							{
+						if ($recursive) {
+							if (empty($donotfollowsymlinks) || !is_link($path."/".$file)) {
 								//var_dump('eee '. $path."/".$file. ' '.is_dir($path."/".$file).' '.is_link($path."/".$file));
 								$file_list = array_merge($file_list, dol_dir_list($path."/".$file, $types, $recursive, $filter, $excludefilter, $sortcriteria, $sortorder, $mode, $nohook, ($relativename != '' ? $relativename.'/' : '').$file, $donotfollowsymlinks));
 							}
 						}
-					} elseif (!$isdir && (($types == "files") || ($types == "all")))
-					{
+					} elseif (!$isdir && (($types == "files") || ($types == "all"))) {
 						// Add file into file_list array
-						if ($loaddate || $sortcriteria == 'date') $filedate = dol_filemtime($path."/".$file);
-						if ($loadsize || $sortcriteria == 'size') $filesize = dol_filesize($path."/".$file);
+						if ($loaddate || $sortcriteria == 'date') {
+							$filedate = dol_filemtime($path."/".$file);
+						}
+						if ($loadsize || $sortcriteria == 'size') {
+							$filesize = dol_filesize($path."/".$file);
+						}
 
-						if (!$filter || preg_match('/'.$filter.'/i', $file))	// We do not search key $filter into $path, only into $file
-						{
+						if (!$filter || preg_match('/'.$filter.'/i', $file)) {	// We do not search key $filter into $path, only into $file
 							preg_match('/([^\/]+)\/[^\/]+$/', $path.'/'.$file, $reg);
 							$level1name = (isset($reg[1]) ? $reg[1] : '');
 							$file_list[] = array(
@@ -194,14 +194,15 @@ function dol_dir_list($path, $types = "all", $recursive = 0, $filter = "", $excl
 			closedir($dir);
 
 			// Obtain a list of columns
-			if (!empty($sortcriteria) && $sortorder)
-			{
+			if (!empty($sortcriteria) && $sortorder) {
 				$file_list = dol_sort_array($file_list, $sortcriteria, ($sortorder == SORT_ASC ? 'asc' : 'desc'));
 			}
 		}
 	}
 
-	if (is_object($hookmanager) && is_array($hookmanager->resArray)) $file_list = array_merge($file_list, $hookmanager->resArray);
+	if (is_object($hookmanager) && is_array($hookmanager->resArray)) {
+		$file_list = array_merge($file_list, $hookmanager->resArray);
+	}
 
 	return $file_list;
 }
@@ -226,7 +227,9 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 
 	$sql = " SELECT rowid, label, entity, filename, filepath, fullpath_orig, keywords, cover, gen_or_uploaded, extraparams,";
 	$sql .= " date_c, tms as date_m, fk_user_c, fk_user_m, acl, position, share";
-	if ($mode) $sql .= ", description";
+	if ($mode) {
+		$sql .= ", description";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql .= " WHERE entity = ".$conf->entity;
 	if (preg_match('/%$/', $path)) {
@@ -236,16 +239,13 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$file_list = array();
 		$num = $db->num_rows($resql);
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$reg = array();
 				preg_match('/([^\/]+)\/[^\/]+$/', DOL_DATA_ROOT.'/'.$obj->filepath.'/'.$obj->filename, $reg);
 				$level1name = (isset($reg[1]) ? $reg[1] : '');
@@ -271,15 +271,15 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 		}
 
 		// Obtain a list of columns
-		if (!empty($sortcriteria))
-		{
+		if (!empty($sortcriteria)) {
 			$myarray = array();
-			foreach ($file_list as $key => $row)
-			{
+			foreach ($file_list as $key => $row) {
 				$myarray[$key] = (isset($row[$sortcriteria]) ? $row[$sortcriteria] : '');
 			}
 			// Sort the data
-			if ($sortorder) array_multisort($myarray, $sortorder, $file_list);
+			if ($sortorder) {
+				array_multisort($myarray, $sortorder, $file_list);
+			}
 		}
 
 		return $file_list;
@@ -308,10 +308,12 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 	global $modulepart;
 	if ($modulepart == 'produit' && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 		global $object;
-		if (!empty($object->id))
-		{
-			if (!empty($conf->product->enabled)) $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
-			else $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
+		if (!empty($object->id)) {
+			if (!empty($conf->product->enabled)) {
+				$upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
+			} else {
+				$upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";
+			}
 
 			$relativedirold = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $upload_dirold);
 			$relativedirold = preg_replace('/^[\\/]/', '', $relativedirold);
@@ -325,15 +327,12 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 	var_dump($filearrayindatabase);*/
 
 	// Complete filearray with properties found into $filearrayindatabase
-	foreach ($filearray as $key => $val)
-	{
+	foreach ($filearray as $key => $val) {
 		$tmpfilename = preg_replace('/\.noexe$/', '', $filearray[$key]['name']);
 		$found = 0;
 		// Search if it exists into $filearrayindatabase
-		foreach ($filearrayindatabase as $key2 => $val2)
-		{
-			if (($filearrayindatabase[$key2]['path'] == $filearray[$key]['path']) && ($filearrayindatabase[$key2]['name'] == $tmpfilename))
-			{
+		foreach ($filearrayindatabase as $key2 => $val2) {
+			if (($filearrayindatabase[$key2]['path'] == $filearray[$key]['path']) && ($filearrayindatabase[$key2]['name'] == $tmpfilename)) {
 				$filearray[$key]['position_name'] = ($filearrayindatabase[$key2]['position'] ? $filearrayindatabase[$key2]['position'] : '0').'_'.$filearrayindatabase[$key2]['name'];
 				$filearray[$key]['position'] = $filearrayindatabase[$key2]['position'];
 				$filearray[$key]['cover'] = $filearrayindatabase[$key2]['cover'];
@@ -346,16 +345,14 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 			}
 		}
 
-		if (!$found)    // This happen in transition toward version 6, or if files were added manually into os dir.
-		{
+		if (!$found) {    // This happen in transition toward version 6, or if files were added manually into os dir.
 			$filearray[$key]['position'] = '999999'; // File not indexed are at end. So if we add a file, it will not replace an existing position
 			$filearray[$key]['cover'] = 0;
 			$filearray[$key]['acl'] = '';
 
 			$rel_filename = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filearray[$key]['fullname']);
 
-			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filename))     // If not a tmp file
-			{
+			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filename)) {     // If not a tmp file
 				dol_syslog("list_of_documents We found a file called '".$filearray[$key]['name']."' not indexed into database. We add it");
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 				$ecmfile = new EcmFiles($db);
@@ -374,8 +371,7 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 				$ecmfile->description = ''; // indexed content
 				$ecmfile->keyword = ''; // keyword content
 				$result = $ecmfile->create($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				} else {
 					$filearray[$key]['rowid'] = $result;
@@ -403,21 +399,28 @@ function dol_compare_file($a, $b)
 
 	$sortorder = strtoupper($sortorder);
 
-	if ($sortorder == 'ASC') { $retup = -1; $retdown = 1; } else { $retup = 1; $retdown = -1; }
+	if ($sortorder == 'ASC') {
+		$retup = -1; $retdown = 1;
+	} else {
+		$retup = 1; $retdown = -1;
+	}
 
-	if ($sortfield == 'name')
-	{
-		if ($a->name == $b->name) return 0;
+	if ($sortfield == 'name') {
+		if ($a->name == $b->name) {
+			return 0;
+		}
 		return ($a->name < $b->name) ? $retup : $retdown;
 	}
-	if ($sortfield == 'date')
-	{
-		if ($a->date == $b->date) return 0;
+	if ($sortfield == 'date') {
+		if ($a->date == $b->date) {
+			return 0;
+		}
 		return ($a->date < $b->date) ? $retup : $retdown;
 	}
-	if ($sortfield == 'size')
-	{
-		if ($a->size == $b->size) return 0;
+	if ($sortfield == 'size') {
+		if ($a->size == $b->size) {
+			return 0;
+		}
 		return ($a->size < $b->size) ? $retup : $retdown;
 	}
 }
@@ -432,8 +435,11 @@ function dol_compare_file($a, $b)
 function dol_is_dir($folder)
 {
 	$newfolder = dol_osencode($folder);
-	if (is_dir($newfolder)) return true;
-	else return false;
+	if (is_dir($newfolder)) {
+		return true;
+	} else {
+		return false;
+	}
 }
 
 /**
@@ -444,7 +450,9 @@ function dol_is_dir($folder)
  */
 function dol_is_dir_empty($dir)
 {
-	if (!is_readable($dir)) return false;
+	if (!is_readable($dir)) {
+		return false;
+	}
 	return (count(scandir($dir)) == 2);
 }
 
@@ -481,9 +489,10 @@ function dol_is_link($pathoffile)
 function dol_is_url($url)
 {
 	$tmpprot = array('file', 'http', 'https', 'ftp', 'zlib', 'data', 'ssh', 'ssh2', 'ogg', 'expect');
-	foreach ($tmpprot as $prot)
-	{
-		if (preg_match('/^'.$prot.':/i', $url)) return true;
+	foreach ($tmpprot as $prot) {
+		if (preg_match('/^'.$prot.':/i', $url)) {
+			return true;
+		}
 	}
 	return false;
 }
@@ -497,21 +506,26 @@ function dol_is_url($url)
 function dol_dir_is_emtpy($folder)
 {
 	$newfolder = dol_osencode($folder);
-	if (is_dir($newfolder))
-	{
+	if (is_dir($newfolder)) {
 		$handle = opendir($newfolder);
 		$folder_content = '';
-		while ((gettype($name = readdir($handle)) != "boolean"))
-		{
+		while ((gettype($name = readdir($handle)) != "boolean")) {
 			$name_array[] = $name;
 		}
-		foreach ($name_array as $temp) $folder_content .= $temp;
+		foreach ($name_array as $temp) {
+			$folder_content .= $temp;
+		}
 
 		closedir($handle);
 
-		if ($folder_content == "...") return true;
-		else return false;
-	} else return true; // Dir does not exists
+		if ($folder_content == "...") {
+			return true;
+		} else {
+			return false;
+		}
+	} else {
+		return true; // Dir does not exists
+	}
 }
 
 /**
@@ -528,13 +542,13 @@ function dol_count_nb_of_line($file)
 	$newfile = dol_osencode($file);
 	//print 'x'.$file;
 	$fp = fopen($newfile, 'r');
-	if ($fp)
-	{
-		while (!feof($fp))
-		{
+	if ($fp) {
+		while (!feof($fp)) {
 			$line = fgets($fp);
 			// We increase count only if read was success. We need test because feof return true only after fgets so we do n+1 fgets for a file with n lines.
-			if (!$line === false) $nb++;
+			if (!$line === false) {
+				$nb++;
+			}
 		}
 		fclose($fp);
 	} else {
@@ -588,11 +602,17 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
 
 	dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." indexdatabase=".$indexdatabase." arrayreplacementisregex=".$arrayreplacementisregex);
 
-	if (empty($srcfile)) return -1;
-	if (empty($destfile)) $destfile = $srcfile;
+	if (empty($srcfile)) {
+		return -1;
+	}
+	if (empty($destfile)) {
+		$destfile = $srcfile;
+	}
 
 	$destexists = dol_is_file($destfile);
-	if (($destfile != $srcfile) && $destexists) return 0;
+	if (($destfile != $srcfile) && $destexists) {
+		return 0;
+	}
 
 	$tmpdestfile = $destfile.'.tmp';
 
@@ -601,13 +621,11 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
 	$newpathofdestfile = dol_osencode($destfile);
 	$newdirdestfile = dirname($newpathofdestfile);
 
-	if ($destexists && !is_writable($newpathofdestfile))
-	{
+	if ($destexists && !is_writable($newpathofdestfile)) {
 		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
 		return -1;
 	}
-	if (!is_writable($newdirdestfile))
-	{
+	if (!is_writable($newdirdestfile)) {
 		dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
 		return -2;
 	}
@@ -617,12 +635,10 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
 	// Create $newpathoftmpdestfile from $newpathofsrcfile
 	$content = file_get_contents($newpathofsrcfile, 'r');
 
-	if (empty($arrayreplacementisregex))
-	{
+	if (empty($arrayreplacementisregex)) {
 		$content = make_substitutions($content, $arrayreplacement, null);
 	} else {
-		foreach ($arrayreplacement as $key => $value)
-		{
+		foreach ($arrayreplacement as $key => $value) {
 			$content = preg_replace($key, $value, $content);
 		}
 	}
@@ -632,14 +648,14 @@ function dolReplaceInFile($srcfile, $arrayreplacement, $destfile = '', $newmask
 
 	// Rename
 	$result = dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile) ? 1 : 0), 0, $indexdatabase);
-	if (!$result)
-	{
+	if (!$result) {
 		dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
-	{
+	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) {
+		$newmask = $conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {	// This should no happen
 		dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
 		$newmask = '0664';
 	}
@@ -666,36 +682,38 @@ function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1)
 
 	dol_syslog("files.lib.php::dol_copy srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+		return -1;
+	}
 
 	$destexists = dol_is_file($destfile);
-	if (!$overwriteifexists && $destexists) return 0;
+	if (!$overwriteifexists && $destexists) {
+		return 0;
+	}
 
 	$newpathofsrcfile = dol_osencode($srcfile);
 	$newpathofdestfile = dol_osencode($destfile);
 	$newdirdestfile = dirname($newpathofdestfile);
 
-	if ($destexists && !is_writable($newpathofdestfile))
-	{
+	if ($destexists && !is_writable($newpathofdestfile)) {
 		dol_syslog("files.lib.php::dol_copy failed Permission denied to overwrite target file", LOG_WARNING);
 		return -1;
 	}
-	if (!is_writable($newdirdestfile))
-	{
+	if (!is_writable($newdirdestfile)) {
 		dol_syslog("files.lib.php::dol_copy failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
 		return -2;
 	}
 	// Copy with overwriting if exists
 	$result = @copy($newpathofsrcfile, $newpathofdestfile);
 	//$result=copy($newpathofsrcfile, $newpathofdestfile);	// To see errors, remove @
-	if (!$result)
-	{
+	if (!$result) {
 		dol_syslog("files.lib.php::dol_copy failed to copy", LOG_WARNING);
 		return -3;
 	}
-	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $newmask = $conf->global->MAIN_UMASK;
-	if (empty($newmask))	// This should no happen
-	{
+	if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) {
+		$newmask = $conf->global->MAIN_UMASK;
+	}
+	if (empty($newmask)) {	// This should no happen
 		dol_syslog("Warning: dol_copy called with empty value for newmask and no default value defined", LOG_WARNING);
 		$newmask = '0664';
 	}
@@ -725,17 +743,20 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 
 	dol_syslog("files.lib.php::dolCopyDir srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask." overwriteifexists=".$overwriteifexists);
 
-	if (empty($srcfile) || empty($destfile)) return -1;
+	if (empty($srcfile) || empty($destfile)) {
+		return -1;
+	}
 
 	$destexists = dol_is_dir($destfile);
 	//if (! $overwriteifexists && $destexists) return 0;	// The overwriteifexists is for files only, so propagated to dol_copy only.
 
-	if (!$destexists)
-	{
+	if (!$destexists) {
 		// We must set mask just before creating dir, becaause it can be set differently by dol_copy
 		umask(0);
 		$dirmaskdec = octdec($newmask);
-		if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) $dirmaskdec = octdec($conf->global->MAIN_UMASK);
+		if (empty($newmask) && !empty($conf->global->MAIN_UMASK)) {
+			$dirmaskdec = octdec($conf->global->MAIN_UMASK);
+		}
 		$dirmaskdec |= octdec('0200'); // Set w bit required to be able to create content for recursive subdirs files
 		dol_mkdir($destfile, '', decoct($dirmaskdec));
 	}
@@ -744,22 +765,16 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 	$osdestfile = dol_osencode($destfile);
 
 	// Recursive function to copy all subdirectories and contents:
-	if (is_dir($ossrcfile))
-	{
+	if (is_dir($ossrcfile)) {
 		$dir_handle = opendir($ossrcfile);
-		while ($file = readdir($dir_handle))
-		{
-			if ($file != "." && $file != ".." && !is_link($ossrcfile."/".$file))
-			{
-				if (is_dir($ossrcfile."/".$file))
-				{
+		while ($file = readdir($dir_handle)) {
+			if ($file != "." && $file != ".." && !is_link($ossrcfile."/".$file)) {
+				if (is_dir($ossrcfile."/".$file)) {
 					if (empty($excludesubdir) || ($excludesubdir == 2 && strlen($file) == 2)) {
 						$newfile = $file;
 						// Replace destination filename with a new one
-						if (is_array($arrayreplacement))
-						{
-							foreach ($arrayreplacement as $key => $val)
-							{
+						if (is_array($arrayreplacement)) {
+							foreach ($arrayreplacement as $key => $val) {
 								$newfile = str_replace($key, $val, $newfile);
 							}
 						}
@@ -769,23 +784,22 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 				} else {
 					$newfile = $file;
 					// Replace destination filename with a new one
-					if (is_array($arrayreplacement))
-					{
-						foreach ($arrayreplacement as $key => $val)
-						{
+					if (is_array($arrayreplacement)) {
+						foreach ($arrayreplacement as $key => $val) {
 							$newfile = str_replace($key, $val, $newfile);
 						}
 					}
 					$tmpresult = dol_copy($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists);
 				}
 				// Set result
-				if ($result > 0 && $tmpresult >= 0)
-				{
+				if ($result > 0 && $tmpresult >= 0) {
 					// Do nothing, so we don't set result to 0 if tmpresult is 0 and result was success in a previous pass
 				} else {
 					$result = $tmpresult;
 				}
-				if ($result < 0) break;
+				if ($result < 0) {
+					break;
+				}
 			}
 		}
 		closedir($dir_handle);
@@ -823,49 +837,43 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 	$srcexists = dol_is_file($srcfile);
 	$destexists = dol_is_file($destfile);
 
-	if (!$srcexists)
-	{
+	if (!$srcexists) {
 		dol_syslog("files.lib.php::dol_move srcfile does not exists. we ignore the move request.");
 		return false;
 	}
 
-	if ($overwriteifexists || !$destexists)
-	{
+	if ($overwriteifexists || !$destexists) {
 		$newpathofsrcfile = dol_osencode($srcfile);
 		$newpathofdestfile = dol_osencode($destfile);
 
 		// Check virus
 		$testvirusarray = array();
-		if ($testvirus)
-		{
+		if ($testvirus) {
 			$testvirusarray = dolCheckVirus($newpathofsrcfile);
-			if (count($testvirusarray))
-			{
+			if (count($testvirusarray)) {
 				dol_syslog("files.lib.php::dol_move canceled because a virus was found into source file. we ignore the move request.", LOG_WARNING);
 				return false;
 			}
 		}
 
 		$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-		if (!$result)
-		{
-			if ($destexists)
-			{
+		if (!$result) {
+			if ($destexists) {
 				dol_syslog("files.lib.php::dol_move Failed. We try to delete target first and move after.", LOG_WARNING);
 				// We force delete and try again. Rename function sometimes fails to replace dest file with some windows NTFS partitions.
 				dol_delete_file($destfile);
 				$result = @rename($newpathofsrcfile, $newpathofdestfile); // To see errors, remove @
-			} else dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
+			} else {
+				dol_syslog("files.lib.php::dol_move Failed.", LOG_WARNING);
+			}
 		}
 
 		// Move ok
-		if ($result && $indexdatabase)
-		{
+		if ($result && $indexdatabase) {
 			// Rename entry into ecm database
 			$rel_filetorenamebefore = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $srcfile);
 			$rel_filetorenameafter = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $destfile);
-			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter))     // If not a tmp file
-			{
+			if (!preg_match('/([\\/]temp[\\/]|[\\/]thumbs|\.meta$)/', $rel_filetorenameafter)) {     // If not a tmp file
 				$rel_filetorenamebefore = preg_replace('/^[\\/]/', '', $rel_filetorenamebefore);
 				$rel_filetorenameafter = preg_replace('/^[\\/]/', '', $rel_filetorenameafter);
 				//var_dump($rel_filetorenamebefore.' - '.$rel_filetorenameafter);exit;
@@ -875,15 +883,13 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 
 				$ecmfiletarget = new EcmFiles($db);
 				$resultecmtarget = $ecmfiletarget->fetch(0, '', $rel_filetorenameafter);
-				if ($resultecmtarget > 0)   // An entry for target name already exists for target, we delete it, a new one will be created.
-				{
+				if ($resultecmtarget > 0) {   // An entry for target name already exists for target, we delete it, a new one will be created.
 					$ecmfiletarget->delete($user);
 				}
 
 				$ecmfile = new EcmFiles($db);
 				$resultecm = $ecmfile->fetch(0, '', $rel_filetorenamebefore);
-				if ($resultecm > 0)   // If an entry was found for src file, we use it to move entry
-				{
+				if ($resultecm > 0) {   // If an entry was found for src file, we use it to move entry
 					$filename = basename($rel_filetorenameafter);
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
@@ -893,8 +899,7 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 					$ecmfile->filename = $filename;
 
 					$resultecm = $ecmfile->update($user);
-				} elseif ($resultecm == 0)   // If no entry were found for src files, create/update target file
-				{
+				} elseif ($resultecm == 0) {   // If no entry were found for src files, create/update target file
 					$filename = basename($rel_filetorenameafter);
 					$rel_dir = dirname($rel_filetorenameafter);
 					$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
@@ -908,21 +913,24 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 					$ecmfile->description = ''; // indexed content
 					$ecmfile->keyword = ''; // keyword content
 					$resultecm = $ecmfile->create($user);
-					if ($resultecm < 0)
-					{
+					if ($resultecm < 0) {
 						setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 					}
-				} elseif ($resultecm < 0)
-				{
+				} elseif ($resultecm < 0) {
 					setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 				}
 
-				if ($resultecm > 0) $result = true;
-				else $result = false;
+				if ($resultecm > 0) {
+					$result = true;
+				} else {
+					$result = false;
+				}
 			}
 		}
 
-		if (empty($newmask)) $newmask = empty($conf->global->MAIN_UMASK) ? '0755' : $conf->global->MAIN_UMASK;
+		if (empty($newmask)) {
+			$newmask = empty($conf->global->MAIN_UMASK) ? '0755' : $conf->global->MAIN_UMASK;
+		}
 		$newmaskdec = octdec($newmask);
 		// Currently method is restricted to files (dol_delete_files previously used is for files, and mask usage if for files too)
 		// to allow mask usage for dir, we shoul introduce a new param "isdir" to 1 to complete newmask like this
@@ -959,15 +967,13 @@ function dolCheckVirus($src_file)
 {
 	global $conf;
 
-	if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
-	{
+	if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 		if (!class_exists('AntiVir')) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/antivir.class.php';
 		}
 		$antivir = new AntiVir($db);
 		$result = $antivir->dol_avscan_file($src_file);
-		if ($result < 0)	// If virus or error, we stop here
-		{
+		if ($result < 0) {	// If virus or error, we stop here
 			$reterrors = $antivir->errors;
 			return $reterrors;
 		}
@@ -1005,21 +1011,17 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 	$file_name = $dest_file;
 	$successcode = 1;
 
-	if (empty($nohook))
-	{
+	if (empty($nohook)) {
 		$reshook = $hookmanager->initHooks(array('fileslib'));
 
 		$parameters = array('dest_file' => $dest_file, 'src_file' => $src_file, 'file_name' => $file_name, 'varfiles' => $varfiles, 'allowoverwrite' => $allowoverwrite);
 		$reshook = $hookmanager->executeHooks('moveUploadedFile', $parameters, $object);
 	}
 
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		// If an upload error has been reported
-		if ($uploaderrorcode)
-		{
-			switch ($uploaderrorcode)
-			{
+		if ($uploaderrorcode) {
+			switch ($uploaderrorcode) {
 				case UPLOAD_ERR_INI_SIZE:	// 1
 					return 'ErrorFileSizeTooLarge';
 				case UPLOAD_ERR_FORM_SIZE:	// 2
@@ -1038,11 +1040,9 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		}
 
 		// If we need to make a virus scan
-		if (empty($disablevirusscan) && file_exists($src_file))
-		{
+		if (empty($disablevirusscan) && file_exists($src_file)) {
 			$checkvirusarray = dolCheckVirus($src_file);
-			if (count($checkvirusarray))
-			{
+			if (count($checkvirusarray)) {
 				dol_syslog('Files.lib::dol_move_uploaded_file File "'.$src_file.'" (target name "'.$dest_file.'") KO with antivirus: errors='.join(',', $checkvirusarray), LOG_WARNING);
 				return 'ErrorFileIsInfectedWithAVirus: '.join(',', $checkvirusarray);
 			}
@@ -1051,11 +1051,12 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		// Security:
 		// Disallow file with some extensions. We rename them.
 		// Because if we put the documents directory into a directory inside web root (very bad), this allows to execute on demand arbitrary code.
-		if (isAFileWithExecutableContent($dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED))
-		{
+		if (isAFileWithExecutableContent($dest_file) && empty($conf->global->MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED)) {
 			// $upload_dir ends with a slash, so be must be sure the medias dir to compare to ends with slash too.
 			$publicmediasdirwithslash = $conf->medias->multidir_output[$conf->entity];
-			if (!preg_match('/\/$/', $publicmediasdirwithslash)) $publicmediasdirwithslash .= '/';
+			if (!preg_match('/\/$/', $publicmediasdirwithslash)) {
+				$publicmediasdirwithslash .= '/';
+			}
 
 			if (strpos($upload_dir, $publicmediasdirwithslash) !== 0) {	// We never add .noexe on files into media directory
 				$file_name .= '.noexe';
@@ -1065,16 +1066,14 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 
 		// Security:
 		// We refuse cache files/dirs, upload using .. and pipes into filenames.
-		if (preg_match('/^\./', basename($src_file)) || preg_match('/\.\./', $src_file) || preg_match('/[<>|]/', $src_file))
-		{
+		if (preg_match('/^\./', basename($src_file)) || preg_match('/\.\./', $src_file) || preg_match('/[<>|]/', $src_file)) {
 			dol_syslog("Refused to deliver file ".$src_file, LOG_WARNING);
 			return -1;
 		}
 
 		// Security:
 		// We refuse cache files/dirs, upload using .. and pipes into filenames.
-		if (preg_match('/^\./', basename($dest_file)) || preg_match('/\.\./', $dest_file) || preg_match('/[<>|]/', $dest_file))
-		{
+		if (preg_match('/^\./', basename($dest_file)) || preg_match('/\.\./', $dest_file) || preg_match('/[<>|]/', $dest_file)) {
 			dol_syslog("Refused to deliver file ".$dest_file, LOG_WARNING);
 			return -2;
 		}
@@ -1082,7 +1081,9 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 
 	if ($reshook < 0) {	// At least one blocking error returned by one hook
 		$errmsg = join(',', $hookmanager->errors);
-		if (empty($errmsg)) $errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		if (empty($errmsg)) {
+			$errmsg = 'ErrorReturnedBySomeHooks'; // Should not occurs. Added if hook is bugged and does not set ->errors when there is error.
+		}
 		return $errmsg;
 	} elseif (empty($reshook)) {
 		// The file functions must be in OS filesystem encoding.
@@ -1090,17 +1091,14 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 		$file_name_osencoded = dol_osencode($file_name);
 
 		// Check if destination dir is writable
-		if (!is_writable(dirname($file_name_osencoded)))
-		{
+		if (!is_writable(dirname($file_name_osencoded))) {
 			dol_syslog("Files.lib::dol_move_uploaded_file Dir ".dirname($file_name_osencoded)." is not writable. Return 'ErrorDirNotWritable'", LOG_WARNING);
 			return 'ErrorDirNotWritable';
 		}
 
 		// Check if destination file already exists
-		if (!$allowoverwrite)
-		{
-			if (file_exists($file_name_osencoded))
-			{
+		if (!$allowoverwrite) {
+			if (file_exists($file_name_osencoded)) {
 				dol_syslog("Files.lib::dol_move_uploaded_file File ".$file_name." already exists. Return 'ErrorFileAlreadyExists'", LOG_WARNING);
 				return 'ErrorFileAlreadyExists';
 			}
@@ -1113,9 +1111,10 @@ function dol_move_uploaded_file($src_file, $dest_file, $allowoverwrite, $disable
 
 		// Move file
 		$return = move_uploaded_file($src_file_osencoded, $file_name_osencoded);
-		if ($return)
-		{
-			if (!empty($conf->global->MAIN_UMASK)) @chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+		if ($return) {
+			if (!empty($conf->global->MAIN_UMASK)) {
+				@chmod($file_name_osencoded, octdec($conf->global->MAIN_UMASK));
+			}
 			dol_syslog("Files.lib::dol_move_uploaded_file Success to move ".$src_file." to ".$file_name." - Umask=".$conf->global->MAIN_UMASK, LOG_DEBUG);
 			return $successcode; // Success
 		} else {
@@ -1153,15 +1152,13 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 
 	// Security:
 	// We refuse transversal using .. and pipes into filenames.
-	if ((!$allowdotdot && preg_match('/\.\./', $file)) || preg_match('/[<>|]/', $file))
-	{
+	if ((!$allowdotdot && preg_match('/\.\./', $file)) || preg_match('/[<>|]/', $file)) {
 		dol_syslog("Refused to delete file ".$file, LOG_WARNING);
 		return false;
 	}
 
 	$reshook = 0;
-	if (empty($nohook))
-	{
+	if (empty($nohook)) {
 		$hookmanager->initHooks(array('fileslib'));
 
 		$parameters = array(
@@ -1173,45 +1170,46 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 		$reshook = $hookmanager->executeHooks('deleteFile', $parameters, $object);
 	}
 
-	if (empty($nohook) && $reshook != 0) // reshook = 0 to do standard actions, 1 = ok and replace, -1 = ko
-	{
+	if (empty($nohook) && $reshook != 0) { // reshook = 0 to do standard actions, 1 = ok and replace, -1 = ko
 		dol_syslog("reshook=".$reshook);
-		if ($reshook < 0) return false;
+		if ($reshook < 0) {
+			return false;
+		}
 		return true;
 	} else {
 		$file_osencoded = dol_osencode($file); // New filename encoded in OS filesystem encoding charset
-		if (empty($disableglob) && !empty($file_osencoded))
-		{
+		if (empty($disableglob) && !empty($file_osencoded)) {
 			$ok = true;
 			$globencoded = str_replace('[', '\[', $file_osencoded);
 			$globencoded = str_replace(']', '\]', $globencoded);
 			$listofdir = glob($globencoded);
-			if (!empty($listofdir) && is_array($listofdir))
-			{
-				foreach ($listofdir as $filename)
-				{
-					if ($nophperrors) $ok = @unlink($filename);
-					else $ok = unlink($filename);
+			if (!empty($listofdir) && is_array($listofdir)) {
+				foreach ($listofdir as $filename) {
+					if ($nophperrors) {
+						$ok = @unlink($filename);
+					} else {
+						$ok = unlink($filename);
+					}
 
 					// If it fails and it is because of the missing write permission on parent dir
 					if (!$ok && file_exists(dirname($filename)) && !(fileperms(dirname($filename)) & 0200)) {
 						dol_syslog("Error in deletion, but parent directory exists with no permission to write, we try to change permission on parent directory and retry...", LOG_DEBUG);
 						@chmod(dirname($filename), fileperms(dirname($filename)) | 0200);
 						// Now we retry deletion
-						if ($nophperrors) $ok = @unlink($filename);
-						else $ok = unlink($filename);
+						if ($nophperrors) {
+							$ok = @unlink($filename);
+						} else {
+							$ok = unlink($filename);
+						}
 					}
 
-					if ($ok)
-					{
+					if ($ok) {
 						dol_syslog("Removed file ".$filename, LOG_DEBUG);
 
 						// Delete entry into ecm database
 						$rel_filetodelete = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filename);
-						if (!preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete))     // If not a tmp file
-						{
-							if (is_object($db) && $indexdatabase)		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
-							{
+						if (!preg_match('/(\/temp\/|\/thumbs\/|\.meta$)/', $rel_filetodelete)) {     // If not a tmp file
+							if (is_object($db) && $indexdatabase) {		// $db may not be defined when lib is in a context with define('NOREQUIREDB',1)
 								$rel_filetodelete = preg_replace('/^[\\/]/', '', $rel_filetodelete);
 								$rel_filetodelete = preg_replace('/\.noexe$/', '', $rel_filetodelete);
 
@@ -1219,12 +1217,10 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 								include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 								$ecmfile = new EcmFiles($db);
 								$result = $ecmfile->fetch(0, '', $rel_filetodelete);
-								if ($result >= 0 && $ecmfile->id > 0)
-								{
+								if ($result >= 0 && $ecmfile->id > 0) {
 									$result = $ecmfile->delete($user);
 								}
-								if ($result < 0)
-								{
+								if ($result < 0) {
 									setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 								}
 							}
@@ -1240,10 +1236,16 @@ function dol_delete_file($file, $disableglob = 0, $nophperrors = 0, $nohook = 0,
 			}
 		} else {
 			$ok = false;
-			if ($nophperrors) $ok = @unlink($file_osencoded);
-			else $ok = unlink($file_osencoded);
-			if ($ok) dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
-			else dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			if ($nophperrors) {
+				$ok = @unlink($file_osencoded);
+			} else {
+				$ok = unlink($file_osencoded);
+			}
+			if ($ok) {
+				dol_syslog("Removed file ".$file_osencoded, LOG_DEBUG);
+			} else {
+				dol_syslog("Failed to remove file ".$file_osencoded, LOG_WARNING);
+			}
 		}
 
 		return $ok;
@@ -1263,8 +1265,7 @@ function dol_delete_dir($dir, $nophperrors = 0)
 {
 	// Security:
 	// We refuse transversal using .. and pipes into filenames.
-	if (preg_match('/\.\./', $dir) || preg_match('/[<>|]/', $dir))
-	{
+	if (preg_match('/\.\./', $dir) || preg_match('/[<>|]/', $dir)) {
 		dol_syslog("Refused to delete dir ".$dir, LOG_WARNING);
 		return false;
 	}
@@ -1286,35 +1287,35 @@ function dol_delete_dir($dir, $nophperrors = 0)
 function dol_delete_dir_recursive($dir, $count = 0, $nophperrors = 0, $onlysub = 0, &$countdeleted = 0)
 {
 	dol_syslog("functions.lib:dol_delete_dir_recursive ".$dir, LOG_DEBUG);
-	if (dol_is_dir($dir))
-	{
+	if (dol_is_dir($dir)) {
 		$dir_osencoded = dol_osencode($dir);
-		if ($handle = opendir("$dir_osencoded"))
-		{
-			while (false !== ($item = readdir($handle)))
-			{
-				if (!utf8_check($item)) $item = utf8_encode($item); // should be useless
+		if ($handle = opendir("$dir_osencoded")) {
+			while (false !== ($item = readdir($handle))) {
+				if (!utf8_check($item)) {
+					$item = utf8_encode($item); // should be useless
+				}
 
-				if ($item != "." && $item != "..")
-				{
-					if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item")))
-					{
+				if ($item != "." && $item != "..") {
+					if (is_dir(dol_osencode("$dir/$item")) && !is_link(dol_osencode("$dir/$item"))) {
 						$count = dol_delete_dir_recursive("$dir/$item", $count, $nophperrors, 0, $countdeleted);
 					} else {
 						$result = dol_delete_file("$dir/$item", 1, $nophperrors);
 						$count++;
-						if ($result) $countdeleted++;
+						if ($result) {
+							$countdeleted++;
+						}
 						//else print 'Error on '.$item."\n";
 					}
 				}
 			}
 			closedir($handle);
 
-			if (empty($onlysub))
-			{
+			if (empty($onlysub)) {
 				$result = dol_delete_dir($dir, $nophperrors);
 				$count++;
-				if ($result) $countdeleted++;
+				if ($result) {
+					$countdeleted++;
+				}
 				//else print 'Error on '.$dir."\n";
 			}
 		}
@@ -1339,15 +1340,25 @@ function dol_delete_preview($object)
 	// Define parent dir of elements
 	$element = $object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->commande->dir_output;
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->facture->dir_output;
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+		$dir = $conf->fournisseur->commande->dir_output;
+	} elseif ($object->element == 'invoice_supplier') {
+		$dir = $conf->fournisseur->facture->dir_output;
+	} elseif ($object->element == 'project') {
+		$dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+		$dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+		$dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+		$dir = $conf->ficheinter->dir_output;
+	} else {
+		$dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
+	}
 
-	if (empty($dir)) return 'ErrorObjectNoSupportedByFunction';
+	if (empty($dir)) {
+		return 'ErrorObjectNoSupportedByFunction';
+	}
 
 	$refsan = dol_sanitizeFileName($object->ref);
 	$dir = $dir."/".$refsan;
@@ -1356,40 +1367,31 @@ function dol_delete_preview($object)
 	$filepreviewold = $dir."/".$refsan.".pdf.png";
 
 	// For new preview files
-	if (file_exists($filepreviewnew) && is_writable($filepreviewnew))
-	{
-		if (!dol_delete_file($filepreviewnew, 1))
-		{
+	if (file_exists($filepreviewnew) && is_writable($filepreviewnew)) {
+		if (!dol_delete_file($filepreviewnew, 1)) {
 			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewnew);
 			return 0;
 		}
 	}
-	if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis))
-	{
-		if (!dol_delete_file($filepreviewnewbis, 1))
-		{
+	if (file_exists($filepreviewnewbis) && is_writable($filepreviewnewbis)) {
+		if (!dol_delete_file($filepreviewnewbis, 1)) {
 			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewnewbis);
 			return 0;
 		}
 	}
 	// For old preview files
-	if (file_exists($filepreviewold) && is_writable($filepreviewold))
-	{
-		if (!dol_delete_file($filepreviewold, 1))
-		{
+	if (file_exists($filepreviewold) && is_writable($filepreviewold)) {
+		if (!dol_delete_file($filepreviewold, 1)) {
 			$object->error = $langs->trans("ErrorFailedToDeleteFile", $filepreviewold);
 			return 0;
 		}
 	} else {
 		$multiple = $filepreviewold.".";
-		for ($i = 0; $i < 20; $i++)
-		{
+		for ($i = 0; $i < 20; $i++) {
 			$preview = $multiple.$i;
 
-			if (file_exists($preview) && is_writable($preview))
-			{
-				if (!dol_delete_file($preview, 1))
-				{
+			if (file_exists($preview) && is_writable($preview)) {
+				if (!dol_delete_file($preview, 1)) {
 					$object->error = $langs->trans("ErrorFailedToOpenFile", $preview);
 					return 0;
 				}
@@ -1413,34 +1415,41 @@ function dol_meta_create($object)
 	global $conf;
 
 	// Create meta file
-	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) return 0; // By default, no metafile.
+	if (empty($conf->global->MAIN_DOC_CREATE_METAFILE)) {
+		return 0; // By default, no metafile.
+	}
 
 	// Define parent dir of elements
 	$element = $object->element;
 
-	if ($object->element == 'order_supplier')		$dir = $conf->fournisseur->dir_output.'/commande';
-	elseif ($object->element == 'invoice_supplier')	$dir = $conf->fournisseur->dir_output.'/facture';
-	elseif ($object->element == 'project')			$dir = $conf->projet->dir_output;
-	elseif ($object->element == 'shipping')			$dir = $conf->expedition->dir_output.'/sending';
-	elseif ($object->element == 'delivery')			$dir = $conf->expedition->dir_output.'/receipt';
-	elseif ($object->element == 'fichinter')		$dir = $conf->ficheinter->dir_output;
-	else $dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
+	if ($object->element == 'order_supplier') {
+		$dir = $conf->fournisseur->dir_output.'/commande';
+	} elseif ($object->element == 'invoice_supplier') {
+		$dir = $conf->fournisseur->dir_output.'/facture';
+	} elseif ($object->element == 'project') {
+		$dir = $conf->projet->dir_output;
+	} elseif ($object->element == 'shipping') {
+		$dir = $conf->expedition->dir_output.'/sending';
+	} elseif ($object->element == 'delivery') {
+		$dir = $conf->expedition->dir_output.'/receipt';
+	} elseif ($object->element == 'fichinter') {
+		$dir = $conf->ficheinter->dir_output;
+	} else {
+		$dir = empty($conf->$element->dir_output) ? '' : $conf->$element->dir_output;
+	}
 
-	if ($dir)
-	{
+	if ($dir) {
 		$object->fetch_thirdparty();
 
 		$objectref = dol_sanitizeFileName($object->ref);
 		$dir = $dir."/".$objectref;
 		$file = $dir."/".$objectref.".meta";
 
-		if (!is_dir($dir))
-		{
+		if (!is_dir($dir)) {
 			dol_mkdir($dir);
 		}
 
-		if (is_dir($dir))
-		{
+		if (is_dir($dir)) {
 			$nblines = count($object->lines);
 			$client = $object->thirdparty->name." ".$object->thirdparty->address." ".$object->thirdparty->zip." ".$object->thirdparty->town;
 			$meta = "REFERENCE=\"".$object->ref."\"
@@ -1450,8 +1459,7 @@ function dol_meta_create($object)
 			AMOUNT_EXCL_TAX=\"" . $object->total_ht."\"
 			AMOUNT=\"" . $object->total_ttc."\"\n";
 
-			for ($i = 0; $i < $nblines; $i++)
-			{
+			for ($i = 0; $i < $nblines; $i++) {
 				//Pour les articles
 				$meta .= "ITEM_".$i."_QUANTITY=\"".$object->lines[$i]->qty."\"
 				ITEM_" . $i."_AMOUNT_WO_TAX=\"".$object->lines[$i]->total_ht."\"
@@ -1464,8 +1472,9 @@ function dol_meta_create($object)
 		$fp = fopen($file, "w");
 		fputs($fp, $meta);
 		fclose($fp);
-		if (!empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 			return 1;
 	} else {
@@ -1491,11 +1500,9 @@ function dol_init_file_process($pathtoscan = '', $trackid = '')
 	$listofnames = array();
 	$listofmimes = array();
 
-	if ($pathtoscan)
-	{
+	if ($pathtoscan) {
 		$listoffiles = dol_dir_list($pathtoscan, 'files');
-		foreach ($listoffiles as $key => $val)
-		{
+		foreach ($listoffiles as $key => $val) {
 			$listofpaths[] = $val['fullname'];
 			$listofnames[] = $val['name'];
 			$listofmimes[] = dol_mimetype($val['name']);
@@ -1531,34 +1538,30 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 
 	$res = 0;
 
-	if (!empty($_FILES[$varfiles])) // For view $_FILES[$varfiles]['error']
-	{
+	if (!empty($_FILES[$varfiles])) { // For view $_FILES[$varfiles]['error']
 		dol_syslog('dol_add_file_process upload_dir='.$upload_dir.' allowoverwrite='.$allowoverwrite.' donotupdatesession='.$donotupdatesession.' savingdocmask='.$savingdocmask, LOG_DEBUG);
 
-		if (dol_mkdir($upload_dir) >= 0)
-		{
+		if (dol_mkdir($upload_dir) >= 0) {
 			$TFile = $_FILES[$varfiles];
-			if (!is_array($TFile['name']))
-			{
-				foreach ($TFile as $key => &$val)
-				{
+			if (!is_array($TFile['name'])) {
+				foreach ($TFile as $key => &$val) {
 					$val = array($val);
 				}
 			}
 
 			$nbfile = count($TFile['name']);
 			$nbok = 0;
-			for ($i = 0; $i < $nbfile; $i++)
-			{
-				if (empty($TFile['name'][$i])) continue; // For example, when submitting a form with no file name
+			for ($i = 0; $i < $nbfile; $i++) {
+				if (empty($TFile['name'][$i])) {
+					continue; // For example, when submitting a form with no file name
+				}
 
 				// Define $destfull (path to file including filename) and $destfile (only filename)
 				$destfull = $upload_dir."/".$TFile['name'][$i];
 				$destfile = $TFile['name'][$i];
 				$destfilewithoutext = preg_replace('/\.[^\.]+$/', '', $destfile);
 
-				if ($savingdocmask && strpos($savingdocmask, $destfilewithoutext) !== 0)
-				{
+				if ($savingdocmask && strpos($savingdocmask, $destfilewithoutext) !== 0) {
 					$destfull = $upload_dir."/".preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
 					$destfile = preg_replace('/__file__/', $TFile['name'][$i], $savingdocmask);
 				}
@@ -1585,17 +1588,14 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 				// Move file from temp directory to final directory. A .noexe may also be appended on file name.
 				$resupload = dol_move_uploaded_file($TFile['tmp_name'][$i], $destfull, $allowoverwrite, 0, $TFile['error'][$i], 0, $varfiles, $upload_dir);
 
-				if (is_numeric($resupload) && $resupload > 0)   // $resupload can be 'ErrorFileAlreadyExists'
-				{
+				if (is_numeric($resupload) && $resupload > 0) {   // $resupload can be 'ErrorFileAlreadyExists'
 					global $maxwidthsmall, $maxheightsmall, $maxwidthmini, $maxheightmini;
 
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 					// Generate thumbs.
-					if ($generatethumbs)
-					{
-						if (image_format_supported($destfull) == 1)
-						{
+					if ($generatethumbs) {
+						if (image_format_supported($destfull) == 1) {
 							// Create thumbs
 							// We can't use $object->addThumbs here because there is no $object known
 
@@ -1608,8 +1608,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					}
 
 					// Update session
-					if (empty($donotupdatesession))
-					{
+					if (empty($donotupdatesession)) {
 						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 						$formmail = new FormMail($db);
 						$formmail->trackid = $trackid;
@@ -1617,11 +1616,9 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					}
 
 					// Update index table of files (llx_ecm_files)
-					if ($donotupdatesession == 1)
-					{
+					if ($donotupdatesession == 1) {
 						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0, $object);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							if ($allowoverwrite) {
 								// Do not show error message. We can have an error due to DB_ERROR_RECORD_ALREADY_EXISTS
 							} else {
@@ -1633,11 +1630,9 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					$nbok++;
 				} else {
 					$langs->load("errors");
-					if ($resupload < 0)	// Unknown error
-					{
+					if ($resupload < 0) {	// Unknown error
 						setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
-					} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
-					{
+					} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {	// Files infected by a virus
 						setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 					} else // Known error
 					{
@@ -1645,8 +1640,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					}
 				}
 			}
-			if ($nbok > 0)
-			{
+			if ($nbok > 0) {
 				$res = 1;
 				setEventMessages($langs->trans("FileTransferComplete"), null, 'mesgs');
 			}
@@ -1697,25 +1691,30 @@ function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletef
 	$listofnames = array();
 	$listofmimes = array();
 	$keytoavoidconflict = empty($trackid) ? '' : '-'.$trackid;
-	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) $listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
-	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) $listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
-	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) $listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+	if (!empty($_SESSION["listofpaths".$keytoavoidconflict])) {
+		$listofpaths = explode(';', $_SESSION["listofpaths".$keytoavoidconflict]);
+	}
+	if (!empty($_SESSION["listofnames".$keytoavoidconflict])) {
+		$listofnames = explode(';', $_SESSION["listofnames".$keytoavoidconflict]);
+	}
+	if (!empty($_SESSION["listofmimes".$keytoavoidconflict])) {
+		$listofmimes = explode(';', $_SESSION["listofmimes".$keytoavoidconflict]);
+	}
 
-	if ($keytodelete >= 0)
-	{
+	if ($keytodelete >= 0) {
 		$pathtodelete = $listofpaths[$keytodelete];
 		$filetodelete = $listofnames[$keytodelete];
-		if (empty($donotdeletefile)) $result = dol_delete_file($pathtodelete, 1); // The delete of ecm database is inside the function dol_delete_file
-		else $result = 0;
-		if ($result >= 0)
-		{
-			if (empty($donotdeletefile))
-			{
+		if (empty($donotdeletefile)) {
+			$result = dol_delete_file($pathtodelete, 1); // The delete of ecm database is inside the function dol_delete_file
+		} else {
+			$result = 0;
+		}
+		if ($result >= 0) {
+			if (empty($donotdeletefile)) {
 				$langs->load("other");
 				setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
 			}
-			if (empty($donotupdatesession))
-			{
+			if (empty($donotupdatesession)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 				$formmail = new FormMail($db);
 				$formmail->trackid = $trackid;
@@ -1747,8 +1746,7 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 
 	$rel_dir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $dir);
 
-	if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir))     // If not a tmp dir
-	{
+	if (!preg_match('/[\\/]temp[\\/]|[\\/]thumbs|\.meta$/', $rel_dir)) {     // If not a tmp dir
 		$filename = basename(preg_replace('/\.noexe$/', '', $file));
 		$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 		$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
@@ -1768,15 +1766,13 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 			$ecmfile->src_object_type = $object->table_element;
 		}
 
-		if ($setsharekey)
-		{
+		if ($setsharekey) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$ecmfile->share = getRandomPassword(true);
 		}
 
 		$result = $ecmfile->create($user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			dol_syslog($ecmfile->error);
 		}
 	}
@@ -1798,8 +1794,7 @@ function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
 
 	$error = 0;
 
-	if (empty($dir))
-	{
+	if (empty($dir)) {
 		dol_syslog("deleteFilesIntoDatabaseIndex: dir parameter can't be empty", LOG_ERR);
 		return -1;
 	}
@@ -1812,17 +1807,19 @@ function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
 	$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
 	$rel_dir = preg_replace('/^[\\/]/', '', $rel_dir);
 
-	if (!$error)
-	{
+	if (!$error) {
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'ecm_files';
 		$sql .= ' WHERE entity = '.$conf->entity;
 		$sql .= " AND filepath = '".$db->escape($rel_dir)."'";
-		if ($file) $sql .= " AND filename = '".$db->escape($file)."'";
-		if ($mode) $sql .= " AND gen_or_uploaded = '".$db->escape($mode)."'";
+		if ($file) {
+			$sql .= " AND filename = '".$db->escape($file)."'";
+		}
+		if ($mode) {
+			$sql .= " AND gen_or_uploaded = '".$db->escape($mode)."'";
+		}
 
 		$resql = $db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$error++;
 			dol_syslog(__METHOD__.' '.$db->lasterror(), LOG_ERR);
 		}
@@ -1852,8 +1849,7 @@ function deleteFilesIntoDatabaseIndex($dir, $file, $mode = 'uploaded')
 function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = '')
 {
 	global $langs;
-	if (class_exists('Imagick'))
-	{
+	if (class_exists('Imagick')) {
 		$image = new Imagick();
 		try {
 			$filetoconvert = $fileinput.(($page != '') ? '['.$page.']' : '');
@@ -1864,28 +1860,29 @@ function dol_convert_file($fileinput, $ext = 'png', $fileoutput = '', $page = ''
 			dol_syslog("Failed to read image using Imagick (Try to install package 'apt-get install php-imagick ghostscript' and check there is no policy to disable ".$ext." convertion in /etc/ImageMagick*/policy.xml): ".$e->getMessage(), LOG_WARNING);
 			return 0;
 		}
-		if ($ret)
-		{
+		if ($ret) {
 			$ret = $image->setImageFormat($ext);
-			if ($ret)
-			{
-				if (empty($fileoutput)) $fileoutput = $fileinput.".".$ext;
+			if ($ret) {
+				if (empty($fileoutput)) {
+					$fileoutput = $fileinput.".".$ext;
+				}
 
 				$count = $image->getNumberImages();
 
-				if (!dol_is_file($fileoutput) || is_writeable($fileoutput))
-				{
+				if (!dol_is_file($fileoutput) || is_writeable($fileoutput)) {
 					try {
 						$ret = $image->writeImages($fileoutput, true);
-					} catch (Exception $e)
-					{
+					} catch (Exception $e) {
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				} else {
 					dol_syslog("Warning: Failed to write cache preview file '.$fileoutput.'. Check permission on file/dir", LOG_ERR);
 				}
-				if ($ret) return $count;
-				else return -3;
+				if ($ret) {
+					return $count;
+				} else {
+					return -3;
+				}
 			} else {
 				return -2;
 			}
@@ -1918,10 +1915,12 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 		dol_syslog("dol_compress_file mode=".$mode." inputfile=".$inputfile." outputfile=".$outputfile);
 
 		$data = implode("", file(dol_osencode($inputfile)));
-		if ($mode == 'gz') { $foundhandler = 1; $compressdata = gzencode($data, 9); } elseif ($mode == 'bz') { $foundhandler = 1; $compressdata = bzcompress($data, 9); } elseif ($mode == 'zip')
-		{
-			if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
-			{
+		if ($mode == 'gz') {
+			$foundhandler = 1; $compressdata = gzencode($data, 9);
+		} elseif ($mode == 'bz') {
+			$foundhandler = 1; $compressdata = bzcompress($data, 9);
+		} elseif ($mode == 'zip') {
+			if (class_exists('ZipArchive') && !empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS)) {
 				$foundhandler = 1;
 
 				$rootPath = realpath($inputfile);
@@ -1944,13 +1943,11 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 				$files = new RecursiveIteratorIterator(
 					new RecursiveDirectoryIterator($rootPath),
 					RecursiveIteratorIterator::LEAVES_ONLY
-					);
+				);
 
-				foreach ($files as $name => $file)
-				{
+				foreach ($files as $name => $file) {
 					// Skip directories (they would be added automatically)
-					if (!$file->isDir())
-					{
+					if (!$file->isDir()) {
 						// Get real and relative path for current file
 						$filePath = $file->getRealPath();
 						$relativePath = substr($filePath, strlen($rootPath) + 1);
@@ -1967,21 +1964,18 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 				return 1;
 			}
 
-			if (defined('ODTPHP_PATHTOPCLZIP'))
-			{
+			if (defined('ODTPHP_PATHTOPCLZIP')) {
 				$foundhandler = 1;
 
 				include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
 				$archive = new PclZip($outputfile);
 				$result = $archive->add($inputfile, PCLZIP_OPT_REMOVE_PATH, dirname($inputfile));
 
-				if ($result === 0)
-				{
+				if ($result === 0) {
 					global $errormsg;
 					$errormsg = $archive->errorInfo(true);
 
-					if ($archive->errorCode() == PCLZIP_ERR_WRITE_OPEN_FAIL)
-					{
+					if ($archive->errorCode() == PCLZIP_ERR_WRITE_OPEN_FAIL) {
 						$errorstring = "PCLZIP_ERR_WRITE_OPEN_FAIL";
 						dol_syslog("dol_compress_file error - archive->errorCode() = PCLZIP_ERR_WRITE_OPEN_FAIL", LOG_ERR);
 						return -4;
@@ -1997,8 +1991,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			}
 		}
 
-		if ($foundhandler)
-		{
+		if ($foundhandler) {
 			$fp = fopen($outputfile, "w");
 			fwrite($fp, $compressdata);
 			fclose($fp);
@@ -2011,8 +2004,7 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
 			$errormsg = $errorstring;
 			return -2;
 		}
-	} catch (Exception $e)
-	{
+	} catch (Exception $e) {
 		global $langs, $errormsg;
 		$langs->load("errors");
 		$errormsg = $langs->trans("ErrorFailedToWriteInDir");
@@ -2034,8 +2026,7 @@ function dol_uncompress($inputfile, $outputdir)
 {
 	global $conf, $langs;
 
-	if (defined('ODTPHP_PATHTOPCLZIP') && empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_UNCOMPRESS))
-	{
+	if (defined('ODTPHP_PATHTOPCLZIP') && empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_UNCOMPRESS)) {
 		dol_syslog("Constant ODTPHP_PATHTOPCLZIP for pclzip library is set to ".ODTPHP_PATHTOPCLZIP.", so we use Pclzip to unzip into ".$outputdir);
 		include_once ODTPHP_PATHTOPCLZIP.'/pclzip.lib.php';
 		$archive = new PclZip($inputfile);
@@ -2043,14 +2034,13 @@ function dol_uncompress($inputfile, $outputdir)
 		// Extract into outputdir, but only files that match the regex '/^((?!\.\.).)*$/' that means "does not include .."
 		$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir, PCLZIP_OPT_BY_PREG, '/^((?!\.\.).)*$/');
 
-		if (!is_array($result) && $result <= 0) return array('error'=>$archive->errorInfo(true));
-		else {
+		if (!is_array($result) && $result <= 0) {
+			return array('error'=>$archive->errorInfo(true));
+		} else {
 			$ok = 1; $errmsg = '';
 			// Loop on each file to check result for unzipping file
-			foreach ($result as $key => $val)
-			{
-				if ($val['status'] == 'path_creation_fail')
-				{
+			foreach ($result as $key => $val) {
+				if ($val['status'] == 'path_creation_fail') {
 					$langs->load("errors");
 					$ok = 0;
 					$errmsg = $langs->trans("ErrorFailToCreateDir", $val['filename']);
@@ -2058,18 +2048,19 @@ function dol_uncompress($inputfile, $outputdir)
 				}
 			}
 
-			if ($ok) return array();
-			else return array('error'=>$errmsg);
+			if ($ok) {
+				return array();
+			} else {
+				return array('error'=>$errmsg);
+			}
 		}
 	}
 
-	if (class_exists('ZipArchive'))	// Must install php-zip to have it
-	{
+	if (class_exists('ZipArchive')) {	// Must install php-zip to have it
 		dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
 		$zip = new ZipArchive;
 		$res = $zip->open($inputfile);
-		if ($res === true)
-		{
+		if ($res === true) {
 			//$zip->extractTo($outputdir.'/');
 			// We must extract one file at time so we can check that file name does not contains '..' to avoid transversal path of zip built for example using
 			// python3 path_traversal_archiver.py <Created_file_name> test.zip -l 10 -p tmp/
@@ -2110,8 +2101,7 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 
 	dol_syslog("Try to zip dir ".$inputdir." into ".$outputfile." mode=".$mode);
 
-	if (!dol_is_dir(dirname($outputfile)) || !is_writable(dirname($outputfile)))
-	{
+	if (!dol_is_dir(dirname($outputfile)) || !is_writable(dirname($outputfile))) {
 		global $langs, $errormsg;
 		$langs->load("errors");
 		$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputfile);
@@ -2119,8 +2109,11 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 	}
 
 	try {
-		if ($mode == 'gz') { $foundhandler = 0; } elseif ($mode == 'bz') { $foundhandler = 0; } elseif ($mode == 'zip')
-		{
+		if ($mode == 'gz') {
+			$foundhandler = 0;
+		} elseif ($mode == 'bz') {
+			$foundhandler = 0;
+		} elseif ($mode == 'zip') {
 			/*if (defined('ODTPHP_PATHTOPCLZIP'))
 			 {
 			 $foundhandler=0;        // TODO implement this
@@ -2133,15 +2126,13 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 			 }
 			 else*/
 			//if (class_exists('ZipArchive') && ! empty($conf->global->MAIN_USE_ZIPARCHIVE_FOR_ZIP_COMPRESS))
-			if (class_exists('ZipArchive'))
-			{
+			if (class_exists('ZipArchive')) {
 				$foundhandler = 1;
 
 				// Initialize archive object
 				$zip = new ZipArchive();
 				$result = $zip->open($outputfile, ZipArchive::CREATE | ZipArchive::OVERWRITE);
-				if (!$result)
-				{
+				if (!$result) {
 					global $langs, $errormsg;
 					$langs->load("errors");
 					$errormsg = $langs->trans("ErrorFailedToWriteInFile", $outputfile);
@@ -2153,19 +2144,16 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 				$files = new RecursiveIteratorIterator(
 					new RecursiveDirectoryIterator($inputdir),
 					RecursiveIteratorIterator::LEAVES_ONLY
-					);
+				);
 
-				foreach ($files as $name => $file)
-				{
+				foreach ($files as $name => $file) {
 					// Skip directories (they would be added automatically)
-					if (!$file->isDir())
-					{
+					if (!$file->isDir()) {
 						// Get real and relative path for current file
 						$filePath = $file->getRealPath();
 						$relativePath = ($rootdirinzip ? $rootdirinzip.'/' : '').substr($filePath, strlen($inputdir) + 1);
 
-						if (empty($excludefiles) || !preg_match($excludefiles, $filePath))
-						{
+						if (empty($excludefiles) || !preg_match($excludefiles, $filePath)) {
 							// Add current file to archive
 							$zip->addFile($filePath, $relativePath);
 						}
@@ -2179,15 +2167,13 @@ function dol_compress_dir($inputdir, $outputfile, $mode = "zip", $excludefiles =
 			}
 		}
 
-		if (!$foundhandler)
-		{
+		if (!$foundhandler) {
 			dol_syslog("Try to zip with format ".$mode." with no handler for this format", LOG_ERR);
 			return -2;
 		} else {
 			return 0;
 		}
-	} catch (Exception $e)
-	{
+	} catch (Exception $e) {
 		global $langs, $errormsg;
 		$langs->load("errors");
 		dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
@@ -2232,16 +2218,24 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	global $conf, $db, $user;
 	global $dolibarr_main_data_root, $dolibarr_main_document_root_alt;
 
-	if (!is_object($fuser)) $fuser = $user;
+	if (!is_object($fuser)) {
+		$fuser = $user;
+	}
 
-	if (empty($modulepart)) return 'ErrorBadParameter';
-	if (empty($entity))
-	{
-		if (empty($conf->multicompany->enabled)) $entity = 1;
-		else $entity = 0;
+	if (empty($modulepart)) {
+		return 'ErrorBadParameter';
+	}
+	if (empty($entity)) {
+		if (empty($conf->multicompany->enabled)) {
+			$entity = 1;
+		} else {
+			$entity = 0;
+		}
 	}
 	// Fix modulepart
-	if ($modulepart == 'users') $modulepart = 'user';
+	if ($modulepart == 'users') {
+		$modulepart = 'user';
+	}
 
 	dol_syslog('dol_check_secure_access_document modulepart='.$modulepart.' original_file='.$original_file.' entity='.$entity);
 
@@ -2251,39 +2245,37 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	$ret = array();
 
 	// Find the subdirectory name as the reference. For exemple original_file='10/myfile.pdf' -> refname='10'
-	if (empty($refname)) $refname = basename(dirname($original_file)."/");
+	if (empty($refname)) {
+		$refname = basename(dirname($original_file)."/");
+	}
 
 	// Define possible keys to use for permission check
 	$lire = 'lire'; $read = 'read'; $download = 'download';
-	if ($mode == 'write')
-	{
+	if ($mode == 'write') {
 		$lire = 'creer'; $read = 'write'; $download = 'upload';
 	}
 
 	// Wrapping for miscellaneous medias files
-	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root))
-	{
-		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+	if ($modulepart == 'medias' && !empty($dolibarr_main_data_root)) {
+		if (empty($entity) || empty($conf->medias->multidir_output[$entity])) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
 		$accessallowed = 1;
 		$original_file = $conf->medias->multidir_output[$entity].'/'.$original_file;
 	} // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
-	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root))
-	{
+	elseif ($modulepart == 'logs' && !empty($dolibarr_main_data_root)) {
 		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/'.$original_file;
 	} // Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
-	elseif ($modulepart == 'doctemplates' && !empty($dolibarr_main_data_root))
-	{
+	elseif ($modulepart == 'doctemplates' && !empty($dolibarr_main_data_root)) {
 		$accessallowed = $user->admin;
 		$original_file = $dolibarr_main_data_root.'/doctemplates/'.$original_file;
 	} // Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
-	elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root))
-	{
+	elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root)) {
 		$accessallowed = ($fuser->rights->website->write && preg_match('/\.jpg$/i', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/doctemplates/websites/'.$original_file;
 	} // Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
-	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root))
-	{
+	elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root)) {
 		// Dir for custom dirs
 		$tmp = explode(',', $dolibarr_main_document_root_alt);
 		$dirins = $tmp[0];
@@ -2291,520 +2283,479 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$accessallowed = ($user->admin && preg_match('/^module_.*\.zip$/', basename($original_file)));
 		$original_file = $dirins.'/'.$original_file;
 	} // Wrapping for some images
-	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output))
-	{
+	elseif ($modulepart == 'mycompany' && !empty($conf->mycompany->dir_output)) {
 		$accessallowed = 1;
 		$original_file = $conf->mycompany->dir_output.'/'.$original_file;
 	} // Wrapping for users photos
-	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output))
-	{
+	elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output)) {
 		$accessallowed = 1;
 		$original_file = $conf->user->dir_output.'/'.$original_file;
 	} // Wrapping for members photos
-	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output))
-	{
+	elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output)) {
 		$accessallowed = 1;
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	} // Wrapping pour les apercu factures
-	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity]))
-	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity])) {
+		if ($fuser->rights->facture->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
 	} // Wrapping pour les apercu propal
-	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity]))
-	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'apercupropal' && !empty($conf->propal->multidir_output[$entity])) {
+		if ($fuser->rights->propale->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
 	} // Wrapping pour les apercu commande
-	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->multidir_output[$entity]))
-	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'apercucommande' && !empty($conf->commande->multidir_output[$entity])) {
+		if ($fuser->rights->commande->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
 	} // Wrapping pour les apercu intervention
-	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output))
-	{
-		if ($fuser->rights->ficheinter->{$lire}) $accessallowed = 1;
+	elseif (($modulepart == 'apercufichinter' || $modulepart == 'apercuficheinter') && !empty($conf->ficheinter->dir_output)) {
+		if ($fuser->rights->ficheinter->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 	} // Wrapping pour les apercu conat
-	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->multidir_output[$entity]))
-	{
-		if ($fuser->rights->contrat->{$lire}) $accessallowed = 1;
+	elseif (($modulepart == 'apercucontract') && !empty($conf->contrat->multidir_output[$entity])) {
+		if ($fuser->rights->contrat->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->contrat->multidir_output[$entity].'/'.$original_file;
 	} // Wrapping pour les apercu supplier proposal
-	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output))
-	{
-		if ($fuser->rights->supplier_proposal->{$lire}) $accessallowed = 1;
+	elseif (($modulepart == 'apercusupplier_proposal' || $modulepart == 'apercusupplier_proposal') && !empty($conf->supplier_proposal->dir_output)) {
+		if ($fuser->rights->supplier_proposal->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->supplier_proposal->dir_output.'/'.$original_file;
 	} // Wrapping pour les apercu supplier order
-	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output))
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
+	elseif (($modulepart == 'apercusupplier_order' || $modulepart == 'apercusupplier_order') && !empty($conf->fournisseur->commande->dir_output)) {
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 	} // Wrapping pour les apercu supplier invoice
-	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output))
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
+	elseif (($modulepart == 'apercusupplier_invoice' || $modulepart == 'apercusupplier_invoice') && !empty($conf->fournisseur->facture->dir_output)) {
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 	} // Wrapping pour les apercu supplier invoice
-	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output))
-	{
-		if ($fuser->rights->expensereport->{$lire}) $accessallowed = 1;
+	elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output)) {
+		if ($fuser->rights->expensereport->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
 	} // Wrapping pour les images des stats propales
-	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity]))
-	{
-		if ($fuser->rights->propale->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'propalstats' && !empty($conf->propal->multidir_temp[$entity])) {
+		if ($fuser->rights->propale->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->propal->multidir_temp[$entity].'/'.$original_file;
 	} // Wrapping pour les images des stats commandes
-	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp))
-	{
-		if ($fuser->rights->commande->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'orderstats' && !empty($conf->commande->dir_temp)) {
+		if ($fuser->rights->commande->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->commande->dir_temp.'/'.$original_file;
-	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output))
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire}) $accessallowed = 1;
+	} elseif ($modulepart == 'orderstatssupplier' && !empty($conf->fournisseur->dir_output)) {
+		if ($fuser->rights->fournisseur->commande->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->fournisseur->commande->dir_temp.'/'.$original_file;
 	} // Wrapping pour les images des stats factures
-	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp))
-	{
-		if ($fuser->rights->facture->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'billstats' && !empty($conf->facture->dir_temp)) {
+		if ($fuser->rights->facture->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->facture->dir_temp.'/'.$original_file;
-	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output))
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire}) $accessallowed = 1;
+	} elseif ($modulepart == 'billstatssupplier' && !empty($conf->fournisseur->dir_output)) {
+		if ($fuser->rights->fournisseur->facture->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->fournisseur->facture->dir_temp.'/'.$original_file;
 	} // Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp))
-	{
-		if ($fuser->rights->expedition->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'expeditionstats' && !empty($conf->expedition->dir_temp)) {
+		if ($fuser->rights->expedition->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->expedition->dir_temp.'/'.$original_file;
 	} // Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp))
-	{
-		if ($fuser->rights->deplacement->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'tripsexpensesstats' && !empty($conf->deplacement->dir_temp)) {
+		if ($fuser->rights->deplacement->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->deplacement->dir_temp.'/'.$original_file;
 	} // Wrapping pour les images des stats expeditions
-	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp))
-	{
-		if ($fuser->rights->adherent->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'memberstats' && !empty($conf->adherent->dir_temp)) {
+		if ($fuser->rights->adherent->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->adherent->dir_temp.'/'.$original_file;
 	} // Wrapping pour les images des stats produits
-	elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp))
-	{
-		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) $accessallowed = 1;
+	elseif (preg_match('/^productstats_/i', $modulepart) && !empty($conf->product->dir_temp)) {
+		if ($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = (!empty($conf->product->multidir_temp[$entity]) ? $conf->product->multidir_temp[$entity] : $conf->service->multidir_temp[$entity]).'/'.$original_file;
 	} // Wrapping for taxes
-	elseif (in_array($modulepart, array('tax', 'tax-vat')) && !empty($conf->tax->dir_output))
-	{
-		if ($fuser->rights->tax->charges->{$lire}) $accessallowed = 1;
+	elseif (in_array($modulepart, array('tax', 'tax-vat')) && !empty($conf->tax->dir_output)) {
+		if ($fuser->rights->tax->charges->{$lire}) {
+			$accessallowed = 1;
+		}
 		$modulepartsuffix = str_replace('tax-', '', $modulepart);
 		$original_file = $conf->tax->dir_output.'/'.($modulepartsuffix != 'tax' ? $modulepartsuffix.'/' : '').$original_file;
 	} // Wrapping for events
-	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
-	{
-		if ($fuser->rights->agenda->myactions->{$read}) $accessallowed = 1;
+	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {
+		if ($fuser->rights->agenda->myactions->{$read}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	} // Wrapping for categories
-	elseif ($modulepart == 'category' && !empty($conf->categorie->multidir_output[$entity]))
-	{
-		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->categorie->{$lire}) $accessallowed = 1;
+	elseif ($modulepart == 'category' && !empty($conf->categorie->multidir_output[$entity])) {
+		if (empty($entity) || empty($conf->categorie->multidir_output[$entity])) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if ($fuser->rights->categorie->{$lire}) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->categorie->multidir_output[$entity].'/'.$original_file;
 	} // Wrapping pour les prelevements
-	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output))
-	{
-		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i', $original_file)) $accessallowed = 1;
+	elseif ($modulepart == 'prelevement' && !empty($conf->prelevement->dir_output)) {
+		if ($fuser->rights->prelevement->bons->{$lire} || preg_match('/^specimen/i', $original_file)) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->prelevement->dir_output.'/'.$original_file;
 	} // Wrapping pour les graph energie
-	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp))
-	{
+	elseif ($modulepart == 'graph_stock' && !empty($conf->stock->dir_temp)) {
 		$accessallowed = 1;
 		$original_file = $conf->stock->dir_temp.'/'.$original_file;
 	} // Wrapping pour les graph fournisseurs
-	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp))
-	{
+	elseif ($modulepart == 'graph_fourn' && !empty($conf->fournisseur->dir_temp)) {
 		$accessallowed = 1;
 		$original_file = $conf->fournisseur->dir_temp.'/'.$original_file;
 	} // Wrapping pour les graph des produits
-	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp))
-	{
+	elseif ($modulepart == 'graph_product' && !empty($conf->product->dir_temp)) {
 		$accessallowed = 1;
 		$original_file = $conf->product->multidir_temp[$entity].'/'.$original_file;
 	} // Wrapping pour les code barre
-	elseif ($modulepart == 'barcode')
-	{
+	elseif ($modulepart == 'barcode') {
 		$accessallowed = 1;
 		// If viewimage is called for barcode, we try to output an image on the fly, with no build of file on disk.
 		//$original_file=$conf->barcode->dir_temp.'/'.$original_file;
 		$original_file = '';
 	} // Wrapping pour les icones de background des mailings
-	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp))
-	{
+	elseif ($modulepart == 'iconmailing' && !empty($conf->mailing->dir_temp)) {
 		$accessallowed = 1;
 		$original_file = $conf->mailing->dir_temp.'/'.$original_file;
 	} // Wrapping pour le scanner
-	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
-	{
+	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp)) {
 		$accessallowed = 1;
 		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	} // Wrapping pour les images fckeditor
-	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output))
-	{
+	elseif ($modulepart == 'fckeditor' && !empty($conf->fckeditor->dir_output)) {
 		$accessallowed = 1;
 		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
 	} // Wrapping for users
-	elseif ($modulepart == 'user' && !empty($conf->user->dir_output))
-	{
+	elseif ($modulepart == 'user' && !empty($conf->user->dir_output)) {
 		$canreaduser = (!empty($fuser->admin) || $fuser->rights->user->user->{$lire});
-		if ($fuser->id == (int) $refname) { $canreaduser = 1; } // A user can always read its own card
-		if ($canreaduser || preg_match('/^specimen/i', $original_file))
-		{
+		if ($fuser->id == (int) $refname) {
+			$canreaduser = 1;
+		} // A user can always read its own card
+		if ($canreaduser || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->user->dir_output.'/'.$original_file;
 	} // Wrapping for third parties
-	elseif (($modulepart == 'company' || $modulepart == 'societe' || $modulepart == 'thirdparty') && !empty($conf->societe->multidir_output[$entity]))
-	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif (($modulepart == 'company' || $modulepart == 'societe' || $modulepart == 'thirdparty') && !empty($conf->societe->multidir_output[$entity])) {
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if ($fuser->rights->societe->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->societe->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT rowid as fk_soc FROM ".MAIN_DB_PREFIX."societe WHERE rowid='".$db->escape($refname)."' AND entity IN (".getEntity('societe').")";
 	} // Wrapping for contact
-	elseif ($modulepart == 'contact' && !empty($conf->societe->multidir_output[$entity]))
-	{
-		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if ($fuser->rights->societe->{$lire})
-		{
+	elseif ($modulepart == 'contact' && !empty($conf->societe->multidir_output[$entity])) {
+		if (empty($entity) || empty($conf->societe->multidir_output[$entity])) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if ($fuser->rights->societe->{$lire}) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->societe->multidir_output[$entity].'/contact/'.$original_file;
 	} // Wrapping for invoices
-	elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->multidir_output[$entity]))
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif (($modulepart == 'facture' || $modulepart == 'invoice') && !empty($conf->facture->multidir_output[$entity])) {
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('invoice').")";
 	} // Wrapping for mass actions
-	elseif ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity]))
-	{
-		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'massfilesarea_proposals' && !empty($conf->propal->multidir_output[$entity])) {
+		if ($fuser->rights->propal->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	} elseif ($modulepart == 'massfilesarea_orders')
-	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'massfilesarea_orders') {
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	} elseif ($modulepart == 'massfilesarea_sendings')
-	{
-		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'massfilesarea_sendings') {
+		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output.'/sending/temp/massgeneration/'.$user->id.'/'.$original_file;
-	} elseif ($modulepart == 'massfilesarea_invoices')
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'massfilesarea_invoices') {
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->facture->multidir_output[$entity].'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	} elseif ($modulepart == 'massfilesarea_expensereport')
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'massfilesarea_expensereport') {
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expensereport->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	} elseif ($modulepart == 'massfilesarea_interventions')
-	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'massfilesarea_interventions') {
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	} elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output))
-	{
-		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'massfilesarea_supplier_proposal' && !empty($conf->supplier_proposal->dir_output)) {
+		if ($fuser->rights->supplier_proposal->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->supplier_proposal->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	} elseif ($modulepart == 'massfilesarea_supplier_order')
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'massfilesarea_supplier_order') {
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	} elseif ($modulepart == 'massfilesarea_supplier_invoice')
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'massfilesarea_supplier_invoice') {
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
-	} elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output))
-	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'massfilesarea_contract' && !empty($conf->contrat->dir_output)) {
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->contrat->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 	} // Wrapping for interventions
-	elseif (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output))
-	{
-		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif (($modulepart == 'fichinter' || $modulepart == 'ficheinter') && !empty($conf->ficheinter->dir_output)) {
+		if ($fuser->rights->ficheinter->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->ficheinter->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	} // Wrapping pour les deplacements et notes de frais
-	elseif ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output))
-	{
-		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'deplacement' && !empty($conf->deplacement->dir_output)) {
+		if ($fuser->rights->deplacement->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->deplacement->dir_output.'/'.$original_file;
 		//$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."fichinter WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	} // Wrapping pour les propales
-	elseif (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity]))
-	{
-		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif (($modulepart == 'propal' || $modulepart == 'propale') && !empty($conf->propal->multidir_output[$entity])) {
+		if ($fuser->rights->propale->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->propal->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."propal WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('propal').")";
 	} // Wrapping pour les commandes
-	elseif (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->multidir_output[$entity]))
-	{
-		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif (($modulepart == 'commande' || $modulepart == 'order') && !empty($conf->commande->multidir_output[$entity])) {
+		if ($fuser->rights->commande->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('order').")";
 	} // Wrapping pour les projets
-	elseif ($modulepart == 'project' && !empty($conf->projet->dir_output))
-	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'project' && !empty($conf->projet->dir_output)) {
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	} elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output))
-	{
-		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	} elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output)) {
+		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->projet->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	} // Wrapping pour les commandes fournisseurs
-	elseif (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output))
-	{
-		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output)) {
+		if ($fuser->rights->fournisseur->commande->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->commande->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	} // Wrapping pour les factures fournisseurs
-	elseif (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output))
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif (($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') && !empty($conf->fournisseur->facture->dir_output)) {
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."facture_fourn WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	} // Wrapping pour les rapport de paiements
-	elseif ($modulepart == 'supplier_payment')
-	{
-		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'supplier_payment') {
+		if ($fuser->rights->fournisseur->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->fournisseur->payment->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."paiementfournisseur WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 	} // Wrapping pour les rapport de paiements
-	elseif ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output))
-	{
-		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'facture_paiement' && !empty($conf->facture->dir_output)) {
+		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
-		if ($fuser->societe_id > 0) $original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
-		else $original_file = $conf->facture->dir_output.'/payments/'.$original_file;
+		if ($fuser->societe_id > 0) {
+			$original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
+		} else {
+			$original_file = $conf->facture->dir_output.'/payments/'.$original_file;
+		}
 	} // Wrapping for accounting exports
-	elseif ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output))
-	{
-		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'export_compta' && !empty($conf->accounting->dir_output)) {
+		if ($fuser->rights->accounting->bind->write || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->accounting->dir_output.'/'.$original_file;
 	} // Wrapping pour les expedition
-	elseif (($modulepart == 'expedition' || $modulepart == 'shipment') && !empty($conf->expedition->dir_output))
-	{
-		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif (($modulepart == 'expedition' || $modulepart == 'shipment') && !empty($conf->expedition->dir_output)) {
+		if ($fuser->rights->expedition->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/sending/".$original_file;
 	} // Delivery Note Wrapping
-	elseif (($modulepart == 'livraison' || $modulepart == 'delivery') && !empty($conf->expedition->dir_output))
-	{
-		if ($fuser->rights->expedition->delivery->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif (($modulepart == 'livraison' || $modulepart == 'delivery') && !empty($conf->expedition->dir_output)) {
+		if ($fuser->rights->expedition->delivery->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->expedition->dir_output."/receipt/".$original_file;
 	} // Wrapping pour les actions
-	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output))
-	{
-		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'actions' && !empty($conf->agenda->dir_output)) {
+		if ($fuser->rights->agenda->myactions->{$read} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_output.'/'.$original_file;
 	} // Wrapping pour les actions
-	elseif ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp))
-	{
-		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'actionsreport' && !empty($conf->agenda->dir_temp)) {
+		if ($fuser->rights->agenda->allactions->{$read} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->agenda->dir_temp."/".$original_file;
 	} // Wrapping pour les produits et services
-	elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service')
-	{
-		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'product' || $modulepart == 'produit' || $modulepart == 'service' || $modulepart == 'produit|service') {
+		if (empty($entity) || (empty($conf->product->multidir_output[$entity]) && empty($conf->service->multidir_output[$entity]))) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if (($fuser->rights->produit->{$lire} || $fuser->rights->service->{$lire}) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
-		if (!empty($conf->product->enabled)) $original_file = $conf->product->multidir_output[$entity].'/'.$original_file;
-		elseif (!empty($conf->service->enabled)) $original_file = $conf->service->multidir_output[$entity].'/'.$original_file;
+		if (!empty($conf->product->enabled)) {
+			$original_file = $conf->product->multidir_output[$entity].'/'.$original_file;
+		} elseif (!empty($conf->service->enabled)) {
+			$original_file = $conf->service->multidir_output[$entity].'/'.$original_file;
+		}
 	} // Wrapping pour les lots produits
-	elseif ($modulepart == 'product_batch' || $modulepart == 'produitlot')
-	{
-		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'product_batch' || $modulepart == 'produitlot') {
+		if (empty($entity) || (empty($conf->productbatch->multidir_output[$entity]))) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if (($fuser->rights->produit->{$lire} ) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
-		if (!empty($conf->productbatch->enabled)) $original_file = $conf->productbatch->multidir_output[$entity].'/'.$original_file;
+		if (!empty($conf->productbatch->enabled)) {
+			$original_file = $conf->productbatch->multidir_output[$entity].'/'.$original_file;
+		}
 	} // Wrapping for stock movements
-	elseif ($modulepart == 'movement' || $modulepart == 'mouvement')
-	{
-		if (empty($entity) || empty($conf->stock->multidir_output[$entity])) return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
-		if (($fuser->rights->stock->{$lire} || $fuser->rights->stock->movement->{$lire} || $fuser->rights->stock->mouvement->{$lire}) || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'movement' || $modulepart == 'mouvement') {
+		if (empty($entity) || empty($conf->stock->multidir_output[$entity])) {
+			return array('accessallowed'=>0, 'error'=>'Value entity must be provided');
+		}
+		if (($fuser->rights->stock->{$lire} || $fuser->rights->stock->movement->{$lire} || $fuser->rights->stock->mouvement->{$lire}) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
-		if (!empty($conf->stock->enabled)) $original_file = $conf->stock->multidir_output[$entity].'/movement/'.$original_file;
+		if (!empty($conf->stock->enabled)) {
+			$original_file = $conf->stock->multidir_output[$entity].'/movement/'.$original_file;
+		}
 	} // Wrapping pour les contrats
-	elseif ($modulepart == 'contract' && !empty($conf->contrat->multidir_output[$entity]))
-	{
-		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'contract' && !empty($conf->contrat->multidir_output[$entity])) {
+		if ($fuser->rights->contrat->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->contrat->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."contrat WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('contract').")";
 	} // Wrapping pour les dons
-	elseif ($modulepart == 'donation' && !empty($conf->don->dir_output))
-	{
-		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'donation' && !empty($conf->don->dir_output)) {
+		if ($fuser->rights->don->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->don->dir_output.'/'.$original_file;
 	} // Wrapping pour les dons
-	elseif ($modulepart == 'dolresource' && !empty($conf->resource->dir_output))
-	{
-		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'dolresource' && !empty($conf->resource->dir_output)) {
+		if ($fuser->rights->resource->{$read} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->resource->dir_output.'/'.$original_file;
 	} // Wrapping pour les remises de cheques
-	elseif ($modulepart == 'remisecheque' && !empty($conf->bank->dir_output))
-	{
-		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'remisecheque' && !empty($conf->bank->dir_output)) {
+		if ($fuser->rights->banque->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 
 		$original_file = $conf->bank->dir_output.'/checkdeposits/'.$original_file; // original_file should contains relative path so include the get_exdir result
 	} // Wrapping for bank
-	elseif (($modulepart == 'banque' || $modulepart == 'bank') && !empty($conf->bank->dir_output))
-	{
-		if ($fuser->rights->banque->{$lire})
-		{
+	elseif (($modulepart == 'banque' || $modulepart == 'bank') && !empty($conf->bank->dir_output)) {
+		if ($fuser->rights->banque->{$lire}) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->bank->dir_output.'/'.$original_file;
 	} // Wrapping for export module
-	elseif ($modulepart == 'export' && !empty($conf->export->dir_temp))
-	{
+	elseif ($modulepart == 'export' && !empty($conf->export->dir_temp)) {
 		// Aucun test necessaire car on force le rep de download sur
 		// le rep export qui est propre a l'utilisateur
 		$accessallowed = 1;
 		$original_file = $conf->export->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	} // Wrapping for import module
-	elseif ($modulepart == 'import' && !empty($conf->import->dir_temp))
-	{
+	elseif ($modulepart == 'import' && !empty($conf->import->dir_temp)) {
 		$accessallowed = 1;
 		$original_file = $conf->import->dir_temp.'/'.$original_file;
 	} // Wrapping pour l'editeur wysiwyg
-	elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output))
-	{
+	elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output)) {
 		$accessallowed = 1;
 		$original_file = $conf->fckeditor->dir_output.'/'.$original_file;
 	} // Wrapping for backups
-	elseif ($modulepart == 'systemtools' && !empty($conf->admin->dir_output))
-	{
-		if ($fuser->admin) $accessallowed = 1;
+	elseif ($modulepart == 'systemtools' && !empty($conf->admin->dir_output)) {
+		if ($fuser->admin) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->admin->dir_output.'/'.$original_file;
 	} // Wrapping for upload file test
-	elseif ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp))
-	{
-		if ($fuser->admin) $accessallowed = 1;
+	elseif ($modulepart == 'admin_temp' && !empty($conf->admin->dir_temp)) {
+		if ($fuser->admin) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->admin->dir_temp.'/'.$original_file;
 	} // Wrapping pour BitTorrent
-	elseif ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output))
-	{
+	elseif ($modulepart == 'bittorrent' && !empty($conf->bittorrent->dir_output)) {
 		$accessallowed = 1;
 		$dir = 'files';
-		if (dol_mimetype($original_file) == 'application/x-bittorrent') $dir = 'torrents';
+		if (dol_mimetype($original_file) == 'application/x-bittorrent') {
+			$dir = 'torrents';
+		}
 		$original_file = $conf->bittorrent->dir_output.'/'.$dir.'/'.$original_file;
 	} // Wrapping pour Foundation module
-	elseif ($modulepart == 'member' && !empty($conf->adherent->dir_output))
-	{
-		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file))
-		{
+	elseif ($modulepart == 'member' && !empty($conf->adherent->dir_output)) {
+		if ($fuser->rights->adherent->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	} // Wrapping for Scanner
-	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp))
-	{
+	elseif ($modulepart == 'scanner_user_temp' && !empty($conf->scanner->dir_temp)) {
 		$accessallowed = 1;
 		$original_file = $conf->scanner->dir_temp.'/'.$fuser->id.'/'.$original_file;
 	} // GENERIC Wrapping
@@ -2816,8 +2767,12 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 	else {
 		//var_dump($modulepart);
 		//var_dump($original_file);
-		if (preg_match('/^specimen/i', $original_file))	$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.
-		if ($fuser->admin) $accessallowed = 1; // If user is admin
+		if (preg_match('/^specimen/i', $original_file)) {
+			$accessallowed = 1; // If link to a file called specimen. Test must be done before changing $original_file int full path.
+		}
+		if ($fuser->admin) {
+			$accessallowed = 1; // If user is admin
+		}
 		$tmpmodulepart = explode('-', $modulepart);
 		if (!empty($tmpmodulepart[1])) {
 				$modulepart = $tmpmodulepart[0];
@@ -2826,48 +2781,44 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 
 		// Define $accessallowed
 		$reg = array();
-		if (preg_match('/^([a-z]+)_user_temp$/i', $modulepart, $reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
-			{
+		if (preg_match('/^([a-z]+)_user_temp$/i', $modulepart, $reg)) {
+			if (empty($conf->{$reg[1]}->dir_temp)) {	// modulepart not supported
 				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+				$accessallowed = 1;
+			}
 			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$fuser->id.'/'.$original_file;
-		} elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_temp))	// modulepart not supported
-			{
+		} elseif (preg_match('/^([a-z]+)_temp$/i', $modulepart, $reg)) {
+			if (empty($conf->{$reg[1]}->dir_temp)) {	// modulepart not supported
 				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+				$accessallowed = 1;
+			}
 			$original_file = $conf->{$reg[1]}->dir_temp.'/'.$original_file;
-		} elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
-			{
+		} elseif (preg_match('/^([a-z]+)_user$/i', $modulepart, $reg)) {
+			if (empty($conf->{$reg[1]}->dir_output)) {	// modulepart not supported
 				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) $accessallowed = 1;
+			if ($fuser->rights->{$reg[1]}->{$lire} || $fuser->rights->{$reg[1]}->{$read} || ($fuser->rights->{$reg[1]}->{$download})) {
+				$accessallowed = 1;
+			}
 			$original_file = $conf->{$reg[1]}->dir_output.'/'.$fuser->id.'/'.$original_file;
-		} elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg))
-		{
-			if (empty($conf->{$reg[1]}->dir_output))	// modulepart not supported
-			{
+		} elseif (preg_match('/^massfilesarea_([a-z]+)$/i', $modulepart, $reg)) {
+			if (empty($conf->{$reg[1]}->dir_output)) {	// modulepart not supported
 				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.')');
 				exit;
 			}
-			if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file))
-			{
+			if ($fuser->rights->{$reg[1]}->{$lire} || preg_match('/^specimen/i', $original_file)) {
 				$accessallowed = 1;
 			}
 			$original_file = $conf->{$reg[1]}->dir_output.'/temp/massgeneration/'.$user->id.'/'.$original_file;
 		} else {
-			if (empty($conf->$modulepart->dir_output))	// modulepart not supported
-			{
+			if (empty($conf->$modulepart->dir_output)) {	// modulepart not supported
 				dol_print_error('', 'Error call dol_check_secure_access_document with not supported value for modulepart parameter ('.$modulepart.'). The module for this modulepart value may not be activated.');
 				exit;
 			}
@@ -2876,9 +2827,13 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 			$partsofdirinoriginalfile = explode('/', $original_file);
 			if (!empty($partsofdirinoriginalfile[1])) {	// If original_file is xxx/filename (xxx is a part we will use)
 				$partofdirinoriginalfile = $partsofdirinoriginalfile[0];
-				if ($partofdirinoriginalfile && !empty($fuser->rights->$modulepart->$partofdirinoriginalfile) && ($fuser->rights->$modulepart->$partofdirinoriginalfile->{$lire} || $fuser->rights->$modulepart->$partofdirinoriginalfile->{$read})) $accessallowed = 1;
+				if ($partofdirinoriginalfile && !empty($fuser->rights->$modulepart->$partofdirinoriginalfile) && ($fuser->rights->$modulepart->$partofdirinoriginalfile->{$lire} || $fuser->rights->$modulepart->$partofdirinoriginalfile->{$read})) {
+					$accessallowed = 1;
+				}
+			}
+			if (!empty($fuser->rights->$modulepart->{$lire}) || !empty($fuser->rights->$modulepart->{$read})) {
+				$accessallowed = 1;
 			}
-			if (!empty($fuser->rights->$modulepart->{$lire}) || !empty($fuser->rights->$modulepart->{$read})) $accessallowed = 1;
 
 			if (is_array($conf->$modulepart->multidir_output) && !empty($conf->$modulepart->multidir_output[$entity])) {
 				$original_file = $conf->$modulepart->multidir_output[$entity].'/'.$original_file;
@@ -2889,19 +2844,16 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 
 		// For modules who wants to manage different levels of permissions for documents
 		$subPermCategoryConstName = strtoupper($modulepart).'_SUBPERMCATEGORY_FOR_DOCUMENTS';
-		if (!empty($conf->global->$subPermCategoryConstName))
-		{
+		if (!empty($conf->global->$subPermCategoryConstName)) {
 			$subPermCategory = $conf->global->$subPermCategoryConstName;
-			if (!empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download})))
-			{
+			if (!empty($subPermCategory) && (($fuser->rights->$modulepart->$subPermCategory->{$lire}) || ($fuser->rights->$modulepart->$subPermCategory->{$read}) || ($fuser->rights->$modulepart->$subPermCategory->{$download}))) {
 				$accessallowed = 1;
 			}
 		}
 
 		// Define $sqlprotectagainstexternals for modules who want to protect access using a SQL query.
 		$sqlProtectConstName = strtoupper($modulepart).'_SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS';
-		if (!empty($conf->global->$sqlProtectConstName))	// If module want to define its own $sqlprotectagainstexternals
-		{
+		if (!empty($conf->global->$sqlProtectConstName)) {	// If module want to define its own $sqlprotectagainstexternals
 			// Example: mymodule__SQLPROTECTAGAINSTEXTERNALS_FOR_DOCUMENTS = "SELECT fk_soc FROM ".MAIN_DB_PREFIX.$modulepart." WHERE ref='".$db->escape($refname)."' AND entity=".$conf->entity;
 			eval('$sqlprotectagainstexternals = "'.$conf->global->$sqlProtectConstName.'";');
 		}
@@ -2926,7 +2878,9 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
  */
 function dol_filecache($directory, $filename, $object)
 {
-	if (!dol_is_dir($directory)) dol_mkdir($directory);
+	if (!dol_is_dir($directory)) {
+		dol_mkdir($directory);
+	}
 	$cachefile = $directory.$filename;
 	file_put_contents($cachefile, serialize($object), LOCK_EX);
 	@chmod($cachefile, 0644);
@@ -2980,8 +2934,7 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre
 
 	$exclude = 'install';
 
-	foreach ($dir->md5file as $file)    // $file is a simpleXMLElement
-	{
+	foreach ($dir->md5file as $file) {    // $file is a simpleXMLElement
 		$filename = $path.$file['name'];
 		$file_list['insignature'][] = $filename;
 		$expectedsize = (empty($file['size']) ? '' : $file['size']);
@@ -2989,24 +2942,23 @@ function getFilesUpdated(&$file_list, SimpleXMLElement $dir, $path = '', $pathre
 
 		//if (preg_match('#'.$exclude.'#', $filename)) continue;
 
-		if (!file_exists($pathref.'/'.$filename))
-		{
+		if (!file_exists($pathref.'/'.$filename)) {
 			$file_list['missing'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize);
 		} else {
 			$md5_local = md5_file($pathref.'/'.$filename);
 
-			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php')	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
-			{
+			if ($conffile == '/etc/dolibarr/conf.php' && $filename == '/filefunc.inc.php') {	// For install with deb or rpm, we ignore test on filefunc.inc.php that was modified by package
 				$checksumconcat[] = $expectedmd5;
 			} else {
-				if ($md5_local != $expectedmd5) $file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize, 'md5'=>(string) $md5_local);
+				if ($md5_local != $expectedmd5) {
+					$file_list['updated'][] = array('filename'=>$filename, 'expectedmd5'=>$expectedmd5, 'expectedsize'=>$expectedsize, 'md5'=>(string) $md5_local);
+				}
 				$checksumconcat[] = $md5_local;
 			}
 		}
 	}
 
-	foreach ($dir->dir as $subdir)			// $subdir['name'] is  '' or '/accountancy/admin' for example
-	{
+	foreach ($dir->dir as $subdir) {			// $subdir['name'] is  '' or '/accountancy/admin' for example
 		getFilesUpdated($file_list, $subdir, $path.$subdir['name'].'/', $pathref, $checksumconcat);
 	}
 
diff --git a/htdocs/core/lib/format_cards.lib.php b/htdocs/core/lib/format_cards.lib.php
index d8e5f17f8e0..89a6a33126a 100644
--- a/htdocs/core/lib/format_cards.lib.php
+++ b/htdocs/core/lib/format_cards.lib.php
@@ -34,10 +34,8 @@ global $_Avery_Labels;
 
 $sql = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards WHERE active=1 ORDER BY code ASC";
 $resql = $db->query($sql);
-if ($resql)
-{
-	while ($row = $db->fetch_array($resql))
-	{
+if ($resql) {
+	while ($row = $db->fetch_array($resql)) {
 		$_Avery_Labels[$row['code']]['name'] = $row['name'];
 		$_Avery_Labels[$row['code']]['paper-size'] = $row['paper_size'];
 		$_Avery_Labels[$row['code']]['orientation'] = $row['orientation'];
@@ -60,7 +58,6 @@ if ($resql)
 }
 
 // We add characteristics to the name
-foreach ($_Avery_Labels as $key => $val)
-{
+foreach ($_Avery_Labels as $key => $val) {
 	$_Avery_Labels[$key]['name'] .= ' ('.$_Avery_Labels[$key]['paper-size'].' - '.$_Avery_Labels[$key]['NX'].'x'.$_Avery_Labels[$key]['NY'].')';
 }
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 7ebe1d290b7..68910357269 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -43,34 +43,38 @@ function facturefourn_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
 
 	//if ($fac->mode_reglement_code == 'PRE')
-	if (!empty($conf->paymentbybanktransfer->enabled))
-	{
+	if (!empty($conf->paymentbybanktransfer->enabled)) {
 		$nbStandingOrders = 0;
 		$sql = "SELECT COUNT(pfd.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 		$sql .= " WHERE pfd.fk_facture_fourn = ".$object->id;
 		$sql .= " AND pfd.ext_payment_id IS NULL";
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $nbStandingOrders = $obj->nb;
+			if ($obj) {
+				$nbStandingOrders = $obj->nb;
+			}
+		} else {
+			dol_print_error($db);
 		}
-		else dol_print_error($db);
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id.'&type=bank-transfer';
 		$head[$h][1] = $langs->trans('BankTransfer');
-		if ($nbStandingOrders > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
+		if ($nbStandingOrders > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
+		}
 		$head[$h][2] = 'standingorders';
 		$h++;
 	}
@@ -81,14 +85,19 @@ function facturefourn_prepare_head($object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_invoice');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/note.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -100,7 +109,9 @@ function facturefourn_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -133,18 +144,18 @@ function ordersupplier_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
 
-	if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
-	{
+	if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
 		$langs->load("stocks");
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("OrderDispatch");
@@ -158,14 +169,19 @@ function ordersupplier_prepare_head($object)
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_order');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -177,14 +193,15 @@ function ordersupplier_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/info.php?id='.$object->id;
 	$head[$h][1] .= $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 5457a6859e3..e4f04bde0a2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -85,17 +85,22 @@ function getEntity($element, $shared = 1, $currentobject = null)
 
 	// fix different element names (France to English)
 	switch ($element) {
-		case 'contrat':			$element = 'contract'; break; // "/contrat/class/contrat.class.php"
-		case 'order_supplier':	$element = 'supplier_order'; break; // "/fourn/class/fournisseur.commande.class.php"
+		case 'contrat':
+			$element = 'contract';
+			break; // "/contrat/class/contrat.class.php"
+		case 'order_supplier':
+			$element = 'supplier_order';
+			break; // "/fourn/class/fournisseur.commande.class.php"
 	}
 
-	if (is_object($mc))
-	{
+	if (is_object($mc)) {
 		return $mc->getEntity($element, $shared, $currentobject);
 	} else {
 		$out = '';
 		$addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');
-		if (in_array($element, $addzero)) $out .= '0,';
+		if (in_array($element, $addzero)) {
+			$out .= '0,';
+		}
 		$out .= ((int) $conf->entity);
 		return $out;
 	}
@@ -111,8 +116,7 @@ function setEntity($currentobject)
 {
 	global $conf, $mc;
 
-	if (is_object($mc) && method_exists($mc, 'setEntity'))
-	{
+	if (is_object($mc) && method_exists($mc, 'setEntity')) {
 		return $mc->setEntity($currentobject);
 	} else {
 		return ((is_object($currentobject) && $currentobject->id > 0 && $currentobject->entity > 0) ? $currentobject->entity : $conf->entity);
@@ -185,15 +189,43 @@ function getBrowserInfo($user_agent)
 	}
 
 	// OS
-	if (preg_match('/linux/i', $user_agent)) { $os = 'linux'; } elseif (preg_match('/macintosh/i', $user_agent)) { $os = 'macintosh'; } elseif (preg_match('/windows/i', $user_agent)) { $os = 'windows'; }
+	if (preg_match('/linux/i', $user_agent)) {
+		$os = 'linux';
+	} elseif (preg_match('/macintosh/i', $user_agent)) {
+		$os = 'macintosh';
+	} elseif (preg_match('/windows/i', $user_agent)) {
+		$os = 'windows';
+	}
 
 	// Name
 	$reg = array();
-	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'firefox'; $version = $reg[2]; } elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'edge'; $version = $reg[2]; } elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) { $name = 'chrome'; $version = $reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string
-	elseif (preg_match('/chrome/i', $user_agent, $reg)) { $name = 'chrome'; } elseif (preg_match('/iceweasel/i', $user_agent)) { $name = 'iceweasel'; } elseif (preg_match('/epiphany/i', $user_agent)) { $name = 'epiphany'; } elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'safari'; $version = $reg[2]; } // Safari is often present in string for mobile but its not.
-	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) { $name = 'opera'; $version = $reg[2]; } elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end
-	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) { $name = 'ie'; $version = end($reg); } // MS products at end
-	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) { $name = 'lynxlinks'; $version = $reg[4]; }
+	if (preg_match('/firefox(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
+		$name = 'firefox'; $version = $reg[2];
+	} elseif (preg_match('/edge(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
+		$name = 'edge'; $version = $reg[2];
+	} elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $user_agent, $reg)) {
+		$name = 'chrome'; $version = $reg[2];
+	} // we can have 'chrome (Mozilla...) chrome x.y' in one string
+	elseif (preg_match('/chrome/i', $user_agent, $reg)) {
+		$name = 'chrome';
+	} elseif (preg_match('/iceweasel/i', $user_agent)) {
+		$name = 'iceweasel';
+	} elseif (preg_match('/epiphany/i', $user_agent)) {
+		$name = 'epiphany';
+	} elseif (preg_match('/safari(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
+		$name = 'safari'; $version = $reg[2];
+	} // Safari is often present in string for mobile but its not.
+	elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $user_agent, $reg)) {
+		$name = 'opera'; $version = $reg[2];
+	} elseif (preg_match('/(MSIE\s([0-9]+\.[0-9]))|.*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) {
+		$name = 'ie'; $version = end($reg);
+	} // MS products at end
+	elseif (preg_match('/(Windows NT\s([0-9]+\.[0-9])).*(Trident\/[0-9]+.[0-9];.*rv:([0-9]+\.[0-9]+))/i', $user_agent, $reg)) {
+		$name = 'ie'; $version = end($reg);
+	} // MS products at end
+	elseif (preg_match('/l(i|y)n(x|ks)(\(|\/|\s)*([\d\.]+)/i', $user_agent, $reg)) {
+		$name = 'lynxlinks'; $version = $reg[4];
+	}
 
 	if ($tablet) {
 		$layout = 'tablet';
@@ -222,7 +254,9 @@ function dol_shutdown()
 {
 	global $conf, $user, $langs, $db;
 	$disconnectdone = false; $depth = 0;
-	if (is_object($db) && !empty($db->connected)) { $depth = $db->transaction_opened; $disconnectdone = $db->close(); }
+	if (is_object($db) && !empty($db->connected)) {
+		$depth = $db->transaction_opened; $disconnectdone = $db->close();
+	}
 	dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ?LOG_WARNING:LOG_INFO));
 }
 
@@ -238,7 +272,9 @@ function GETPOSTISSET($paramname)
 
 	$relativepathstring = $_SERVER["PHP_SELF"];
 	// Clean $relativepathstring
-	if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+	if (constant('DOL_URL_ROOT')) {
+		$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+	}
 	$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 	$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 	//var_dump($relativepathstring);
@@ -246,17 +282,12 @@ function GETPOSTISSET($paramname)
 
 	// Code for search criteria persistence.
 	// Retrieve values if restore_lastsearch_values
-	if (!empty($_GET['restore_lastsearch_values']))        // Use $_GET here and not GETPOST
-	{
-		if (!empty($_SESSION['lastsearch_values_'.$relativepathstring]))	// If there is saved values
-		{
+	if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not GETPOST
+		if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) {	// If there is saved values
 			$tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
-			if (is_array($tmp))
-			{
-				foreach ($tmp as $key => $val)
-				{
-					if ($key == $paramname)	// We are on the requested parameter
-					{
+			if (is_array($tmp)) {
+				foreach ($tmp as $key => $val) {
+					if ($key == $paramname) {	// We are on the requested parameter
 						$isset = true;
 						break;
 					}
@@ -264,14 +295,11 @@ function GETPOSTISSET($paramname)
 			}
 		}
 		// If there is saved contextpage, page or limit
-		if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))
-		{
+		if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {
 			$isset = true;
-		} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
-		{
+		} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {
 			$isset = true;
-		} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
-		{
+		} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {
 			$isset = true;
 		}
 	} else {
@@ -311,25 +339,33 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 {
 	global $mysoc, $user, $conf;
 
-	if (empty($paramname)) return 'BadFirstParameterForGETPOST';
-	if (empty($check))
-	{
+	if (empty($paramname)) {
+		return 'BadFirstParameterForGETPOST';
+	}
+	if (empty($check)) {
 		dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);
 		// Enable this line to know who call the GETPOST with '' $check parameter.
 		//var_dump(debug_backtrace()[0]);
 	}
 
-	if (empty($method)) $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
-	elseif ($method == 1) $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
-	elseif ($method == 2) $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
-	elseif ($method == 3) $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
-	else return 'BadThirdParameterForGETPOST';
+	if (empty($method)) {
+		$out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+	} elseif ($method == 1) {
+		$out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+	} elseif ($method == 2) {
+		$out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+	} elseif ($method == 3) {
+		$out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+	} else {
+		return 'BadThirdParameterForGETPOST';
+	}
 
-	if (empty($method) || $method == 3 || $method == 4)
-	{
+	if (empty($method) || $method == 3 || $method == 4) {
 		$relativepathstring = $_SERVER["PHP_SELF"];
 		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+		if (constant('DOL_URL_ROOT')) {
+			$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+		}
 		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 		//var_dump($relativepathstring);
@@ -337,17 +373,12 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 
 		// Code for search criteria persistence.
 		// Retrieve values if restore_lastsearch_values
-		if (!empty($_GET['restore_lastsearch_values']))        // Use $_GET here and not GETPOST
-		{
-			if (!empty($_SESSION['lastsearch_values_'.$relativepathstring]))	// If there is saved values
-			{
+		if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not GETPOST
+			if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) {	// If there is saved values
 				$tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);
-				if (is_array($tmp))
-				{
-					foreach ($tmp as $key => $val)
-					{
-						if ($key == $paramname)	// We are on the requested parameter
-						{
+				if (is_array($tmp)) {
+					foreach ($tmp as $key => $val) {
+						if ($key == $paramname) {	// We are on the requested parameter
 							$out = $val;
 							break;
 						}
@@ -355,57 +386,48 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 				}
 			}
 			// If there is saved contextpage, page or limit
-			if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring]))
-			{
+			if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {
 				$out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];
-			} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring]))
-			{
+			} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {
 				$out = $_SESSION['lastsearch_page_'.$relativepathstring];
-			} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring]))
-			{
+			} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {
 				$out = $_SESSION['lastsearch_limit_'.$relativepathstring];
 			}
 		} // Else, retrieve default values if we are not doing a sort
-		elseif (!isset($_GET['sortfield']))	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
-		{
-			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
-			{
+		elseif (!isset($_GET['sortfield'])) {	// If we did a click on a field to sort, we do no apply default values. Same if option MAIN_ENABLE_DEFAULT_VALUES is not set
+			if (!empty($_GET['action']) && $_GET['action'] == 'create' && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) {
 				// Search default value from $object->field
 				global $object;
-				if (is_object($object) && isset($object->fields[$paramname]['default']))
-				{
+				if (is_object($object) && isset($object->fields[$paramname]['default'])) {
 					$out = $object->fields[$paramname]['default'];
 				}
 			}
-			if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
-			{
-				if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
-				{
+			if (!empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES)) {
+				if (!empty($_GET['action']) && (preg_match('/^create/', $_GET['action']) || preg_match('/^presend/', $_GET['action'])) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) {
 					// Now search in setup to overwrite default values
-					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
-					{
-						if (isset($user->default_values[$relativepathstring]['createform']))
-						{
-							foreach ($user->default_values[$relativepathstring]['createform'] as $defkey => $defval)
-							{
+					if (!empty($user->default_values)) {		// $user->default_values defined from menu 'Setup - Default values'
+						if (isset($user->default_values[$relativepathstring]['createform'])) {
+							foreach ($user->default_values[$relativepathstring]['createform'] as $defkey => $defval) {
 								$qualified = 0;
-								if ($defkey != '_noquery_')
-								{
+								if ($defkey != '_noquery_') {
 									$tmpqueryarraytohave = explode('&', $defkey);
 									$tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
 									$foundintru = 0;
-									foreach ($tmpqueryarraytohave as $tmpquerytohave)
-									{
-										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;
+									foreach ($tmpqueryarraytohave as $tmpquerytohave) {
+										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+											$foundintru = 1;
+										}
+									}
+									if (!$foundintru) {
+										$qualified = 1;
 									}
-									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								} else $qualified = 1;
+								} else {
+									$qualified = 1;
+								}
 
-								if ($qualified)
-								{
-									if (isset($user->default_values[$relativepathstring]['createform'][$defkey][$paramname]))
-									{
+								if ($qualified) {
+									if (isset($user->default_values[$relativepathstring]['createform'][$defkey][$paramname])) {
 										$out = $user->default_values[$relativepathstring]['createform'][$defkey][$paramname];
 										break;
 									}
@@ -414,43 +436,40 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 						}
 					}
 				} // Management of default search_filters and sort order
-				elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname]))
-				{
-					if (!empty($user->default_values))		// $user->default_values defined from menu 'Setup - Default values'
-					{
+				elseif (!empty($paramname) && !isset($_GET[$paramname]) && !isset($_POST[$paramname])) {
+					if (!empty($user->default_values)) {		// $user->default_values defined from menu 'Setup - Default values'
 						//var_dump($user->default_values[$relativepathstring]);
-						if ($paramname == 'sortfield' || $paramname == 'sortorder')			// Sorted on which fields ? ASC or DESC ?
-						{
-							if (isset($user->default_values[$relativepathstring]['sortorder']))	// Even if paramname is sortfield, data are stored into ['sortorder...']
-							{
-								foreach ($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval)
-								{
+						if ($paramname == 'sortfield' || $paramname == 'sortorder') {			// Sorted on which fields ? ASC or DESC ?
+							if (isset($user->default_values[$relativepathstring]['sortorder'])) {	// Even if paramname is sortfield, data are stored into ['sortorder...']
+								foreach ($user->default_values[$relativepathstring]['sortorder'] as $defkey => $defval) {
 									$qualified = 0;
-									if ($defkey != '_noquery_')
-									{
+									if ($defkey != '_noquery_') {
 										$tmpqueryarraytohave = explode('&', $defkey);
 										$tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
 										$foundintru = 0;
-										foreach ($tmpqueryarraytohave as $tmpquerytohave)
-										{
-											if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;
+										foreach ($tmpqueryarraytohave as $tmpquerytohave) {
+											if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+												$foundintru = 1;
+											}
+										}
+										if (!$foundintru) {
+											$qualified = 1;
 										}
-										if (!$foundintru) $qualified = 1;
 										//var_dump($defkey.'-'.$qualified);
-									} else $qualified = 1;
+									} else {
+										$qualified = 1;
+									}
 
-									if ($qualified)
-									{
+									if ($qualified) {
 										$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
-										foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val)
-										{
-											if ($out) $out .= ', ';
-											if ($paramname == 'sortfield')
-											{
+										foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {
+											if ($out) {
+												$out .= ', ';
+											}
+											if ($paramname == 'sortfield') {
 												$out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);
 											}
-											if ($paramname == 'sortorder')
-											{
+											if ($paramname == 'sortorder') {
 												$out .= dol_string_nospecial($val, '', $forbidden_chars_to_replace);
 											}
 										}
@@ -458,32 +477,31 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 									}
 								}
 							}
-						} elseif (isset($user->default_values[$relativepathstring]['filters']))
-						{
-							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval)	// $defkey is a querystring like 'a=b&c=d', $defval is key of user
-							{
+						} elseif (isset($user->default_values[$relativepathstring]['filters'])) {
+							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval) {	// $defkey is a querystring like 'a=b&c=d', $defval is key of user
 								$qualified = 0;
-								if ($defkey != '_noquery_')
-								{
+								if ($defkey != '_noquery_') {
 									$tmpqueryarraytohave = explode('&', $defkey);
 									$tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
 									$foundintru = 0;
-									foreach ($tmpqueryarraytohave as $tmpquerytohave)
-									{
-										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) $foundintru = 1;
+									foreach ($tmpqueryarraytohave as $tmpquerytohave) {
+										if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+											$foundintru = 1;
+										}
+									}
+									if (!$foundintru) {
+										$qualified = 1;
 									}
-									if (!$foundintru) $qualified = 1;
 									//var_dump($defkey.'-'.$qualified);
-								} else $qualified = 1;
+								} else {
+									$qualified = 1;
+								}
 
-								if ($qualified)
-								{
+								if ($qualified) {
 									// We must keep $_POST and $_GET here
-									if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all']))
-									{
+									if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {
 										// We made a search from quick search menu, do we still use default filter ?
-										if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH))
-										{
+										if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH)) {
 											$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,
 											$out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);
 										}
@@ -504,12 +522,10 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 	// Substitution variables for GETPOST (used to get final url with variable parameters or final default value with variable parameters)
 	// Example of variables: __DAY__, __MONTH__, __YEAR__, __MYCOMPANY_COUNTRY_ID__, __USER_ID__, ...
 	// We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.
-	if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace))
-	{
+	if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {
 		$reg = array();
 		$maxloop = 20; $loopnb = 0; // Protection against infinite loop
-		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop))    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
-		{
+		while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.
 			$loopnb++; $newout = '';
 
 			if ($reg[1] == 'DAY') {
@@ -574,8 +590,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 				$out[$outkey] = checkVal($outval, $tmpcheck, $filter, $options);
 			}
 		}
-	}
-	else {
+	} else {
 		$out = checkVal($out, $check, $filter, $options);
 	}
 
@@ -587,18 +602,15 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 
 	// Code for search criteria persistence.
 	// Save data into session if key start with 'search_' or is 'smonth', 'syear', 'month', 'year'
-	if (empty($method) || $method == 3 || $method == 4)
-	{
-		if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield')))
-		{
+	if (empty($method) || $method == 3 || $method == 4) {
+		if (preg_match('/^search_/', $paramname) || in_array($paramname, array('sortorder', 'sortfield'))) {
 			//var_dump($paramname.' - '.$out.' '.$user->default_values[$relativepathstring]['filters'][$paramname]);
 
 			// We save search key only if $out not empty that means:
 			// - posted value not empty, or
 			// - if posted value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
 
-			if ($out != '')		// $out = '0' or 'abc', it is a search criteria to keep
-			{
+			if ($out != '') {		// $out = '0' or 'abc', it is a search criteria to keep
 				$user->lastsearch_values_tmp[$relativepathstring][$paramname] = $out;
 			}
 		}
@@ -636,15 +648,18 @@ function GETPOSTINT($paramname, $method = 0, $filter = null, $options = null, $n
 function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)
 {
 	// Check is done after replacement
-	switch ($check)
-	{
+	switch ($check) {
 		case 'none':
 			break;
 		case 'int':    // Check param is a numeric value (integer but also float or hexadecimal)
-			if (!is_numeric($out)) { $out = ''; }
+			if (!is_numeric($out)) {
+				$out = '';
+			}
 			break;
 		case 'intcomma':
-			if (preg_match('/[^0-9,-]+/i', $out)) $out = '';
+			if (preg_match('/[^0-9,-]+/i', $out)) {
+				$out = '';
+			}
 			break;
 		case 'san_alpha':
 			$out = filter_var($out, FILTER_SANITIZE_STRING);
@@ -653,24 +668,27 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			$out = filter_var($out, FILTER_SANITIZE_EMAIL);
 			break;
 		case 'aZ':
-			if (!is_array($out))
-			{
+			if (!is_array($out)) {
 				$out = trim($out);
-				if (preg_match('/[^a-z]+/i', $out)) $out = '';
+				if (preg_match('/[^a-z]+/i', $out)) {
+					$out = '';
+				}
 			}
 			break;
 		case 'aZ09':
-			if (!is_array($out))
-			{
+			if (!is_array($out)) {
 				$out = trim($out);
-				if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) $out = '';
+				if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+					$out = '';
+				}
 			}
 			break;
 		case 'aZ09comma':		// great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh
-			if (!is_array($out))
-			{
+			if (!is_array($out)) {
 				$out = trim($out);
-				if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) $out = '';
+				if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+					$out = '';
+				}
 			}
 			break;
 		case 'nohtml':		// No html
@@ -699,7 +717,9 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			$out = dol_string_onlythesehtmltags($out, 0, 1, 1);
 			break;
 		case 'custom':
-			if (empty($filter)) return 'BadFourthParameterForGETPOST';
+			if (empty($filter)) {
+				return 'BadFourthParameterForGETPOST';
+			}
 			$out = filter_var($out, $filter, $options);
 			break;
 	}
@@ -709,8 +729,7 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 
 
 
-if (!function_exists('dol_getprefix'))
-{
+if (!function_exists('dol_getprefix')) {
 	/**
 	 *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
 	 *  The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir
@@ -722,18 +741,21 @@ if (!function_exists('dol_getprefix'))
 	function dol_getprefix($mode = '')
 	{
 		// If prefix is for email (we need to have $conf alreayd loaded for this case)
-		if ($mode == 'email')
-		{
+		if ($mode == 'email') {
 			global $conf;
 
-			if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID))	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
-			{
-				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
-				elseif (isset($_SERVER["SERVER_NAME"])) return $_SERVER["SERVER_NAME"];
+			if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) {	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
+				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {
+					return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+				} elseif (isset($_SERVER["SERVER_NAME"])) {
+					return $_SERVER["SERVER_NAME"];
+				}
 			}
 
 			// The recommended value (may be not defined for old versions)
-			if (!empty($conf->file->instance_unique_id)) return $conf->file->instance_unique_id;
+			if (!empty($conf->file->instance_unique_id)) {
+				return $conf->file->instance_unique_id;
+			}
 
 			// For backward compatibility
 			return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');
@@ -802,27 +824,23 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 
 	$path = preg_replace('/^\//', '', $path);
 
-	if (empty($type))	// For a filesystem path
-	{
+	if (empty($type)) {	// For a filesystem path
 		$res = DOL_DOCUMENT_ROOT.'/'.$path; // Standard default path
-		if (is_array($conf->file->dol_document_root))
-		{
-			foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array("main"=>"/home/main/htdocs", "alt0"=>"/home/dirmod/htdocs", ...)
-			{
-				if ($key == 'main')
-				{
+		if (is_array($conf->file->dol_document_root)) {
+			foreach ($conf->file->dol_document_root as $key => $dirroot) {	// ex: array("main"=>"/home/main/htdocs", "alt0"=>"/home/dirmod/htdocs", ...)
+				if ($key == 'main') {
 					continue;
 				}
-				if (file_exists($dirroot.'/'.$path))
-				{
+				if (file_exists($dirroot.'/'.$path)) {
 					$res = $dirroot.'/'.$path;
 					return $res;
 				}
 			}
 		}
-		if ($returnemptyifnotfound)								// Not found into alternate dir
-		{
-			if ($returnemptyifnotfound == 1 || !file_exists($res)) return '';
+		if ($returnemptyifnotfound) {								// Not found into alternate dir
+			if ($returnemptyifnotfound == 1 || !file_exists($res)) {
+				return '';
+			}
 		}
 	} else // For an url path
 	{
@@ -831,16 +849,19 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 		// works only for some web server and some setup. This is bugged when
 		// using proxy, rewriting, virtual path, etc...
 		$res = '';
-		if ($type == 1) $res = DOL_URL_ROOT.'/'.$path; // Standard value
-		if ($type == 2) $res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value
-		if ($type == 3) $res = DOL_URL_ROOT.'/'.$path;
+		if ($type == 1) {
+			$res = DOL_URL_ROOT.'/'.$path; // Standard value
+		}
+		if ($type == 2) {
+			$res = DOL_MAIN_URL_ROOT.'/'.$path; // Standard value
+		}
+		if ($type == 3) {
+			$res = DOL_URL_ROOT.'/'.$path;
+		}
 
-		foreach ($conf->file->dol_document_root as $key => $dirroot)	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
-		{
-			if ($key == 'main')
-			{
-				if ($type == 3)
-				{
+		foreach ($conf->file->dol_document_root as $key => $dirroot) {	// ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)
+			if ($key == 'main') {
+				if ($type == 3) {
 					global $dolibarr_main_url_root;
 
 					// Define $urlwithroot
@@ -853,21 +874,16 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
 				continue;
 			}
 			preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'
-			if (!empty($regs[1]))
-			{
+			if (!empty($regs[1])) {
 				//print $key.'-'.$dirroot.'/'.$path.'-'.$conf->file->dol_url_root[$type].'<br>'."\n";
-				if (file_exists($dirroot.'/'.$regs[1]))
-				{
-					if ($type == 1)
-					{
+				if (file_exists($dirroot.'/'.$regs[1])) {
+					if ($type == 1) {
 						$res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;
 					}
-					if ($type == 2)
-					{
+					if ($type == 2) {
 						$res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;
 					}
-					if ($type == 3)
-					{
+					if ($type == 3) {
 						global $dolibarr_main_url_root;
 
 						// Define $urlwithroot
@@ -898,8 +914,7 @@ function dol_buildpath($path, $type = 0, $returnemptyifnotfound = 0)
  */
 function dol_clone($object, $native = 0)
 {
-	if (empty($native))
-	{
+	if (empty($native)) {
 		$myclone = unserialize(serialize($object));
 	} else {
 		$myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep the reference (refering to the same target/variable)
@@ -920,9 +935,14 @@ function dol_clone($object, $native = 0)
 function dol_size($size, $type = '')
 {
 	global $conf;
-	if (empty($conf->dol_optimize_smallscreen)) return $size;
-	if ($type == 'width' && $size > 250) return 250;
-	else return 10;
+	if (empty($conf->dol_optimize_smallscreen)) {
+		return $size;
+	}
+	if ($type == 'width' && $size > 250) {
+		return 250;
+	} else {
+		return 10;
+	}
 }
 
 
@@ -972,8 +992,7 @@ function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1)
  */
 function dol_string_unaccent($str)
 {
-	if (utf8_check($str))
-	{
+	if (utf8_check($str)) {
 		// See http://www.utf8-chartable.de/
 		$string = rawurlencode($str);
 		$replacements = array(
@@ -1030,7 +1049,9 @@ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')
 {
 	$forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName
 	$forbidden_chars_to_remove = array();
-	if (is_array($badcharstoreplace)) $forbidden_chars_to_replace = $badcharstoreplace;
+	if (is_array($badcharstoreplace)) {
+		$forbidden_chars_to_replace = $badcharstoreplace;
+	}
 	//$forbidden_chars_to_remove=array("(",")");
 
 	return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));
@@ -1073,9 +1094,18 @@ function dol_escape_js($stringtoescape, $mode = 0, $noescapebackslashn = 0)
 	// escape quotes and backslashes, newlines, etc.
 	$substitjs = array("&#039;"=>"\\'", "\r"=>'\\r');
 	//$substitjs['</']='<\/';	// We removed this. Should be useless.
-	if (empty($noescapebackslashn)) { $substitjs["\n"] = '\\n'; $substitjs['\\'] = '\\\\'; }
-	if (empty($mode)) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\'"; } elseif ($mode == 1) $substitjs["'"] = "\\'";
-	elseif ($mode == 2) { $substitjs['"'] = '\\"'; } elseif ($mode == 3) { $substitjs["'"] = "\\'"; $substitjs['"'] = "\\\""; }
+	if (empty($noescapebackslashn)) {
+		$substitjs["\n"] = '\\n'; $substitjs['\\'] = '\\\\';
+	}
+	if (empty($mode)) {
+		$substitjs["'"] = "\\'"; $substitjs['"'] = "\\'";
+	} elseif ($mode == 1) {
+		$substitjs["'"] = "\\'";
+	} elseif ($mode == 2) {
+		$substitjs['"'] = '\\"';
+	} elseif ($mode == 3) {
+		$substitjs["'"] = "\\'"; $substitjs['"'] = "\\\"";
+	}
 	return strtr($stringtoescape, $substitjs);
 }
 
@@ -1103,7 +1133,9 @@ function dol_escape_json($stringtoescape)
  */
 function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $keepmoretags = '', $escapeonlyhtmltags = 0)
 {
-	if ($keepmoretags == 'common') $keepmoretags = 'html,body,a,b,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
+	if ($keepmoretags == 'common') {
+		$keepmoretags = 'html,body,a,b,em,i,u,ul,li,br,div,img,font,p,span,strong,table,tr,td,th,tbody';
+	}
 	// TODO Implement $keepmoretags
 
 	// escape quotes and backslashes, newlines, etc.
@@ -1112,8 +1144,12 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $keepmoreta
 	} else {
 		$tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');
 	}
-	if (!$keepb) $tmp = strtr($tmp, array("<b>"=>'', '</b>'=>''));
-	if (!$keepn) $tmp = strtr($tmp, array("\r"=>'\\r', "\n"=>'\\n'));
+	if (!$keepb) {
+		$tmp = strtr($tmp, array("<b>"=>'', '</b>'=>''));
+	}
+	if (!$keepn) {
+		$tmp = strtr($tmp, array("\r"=>'\\r', "\n"=>'\\n'));
+	}
 	if ($escapeonlyhtmltags) {
 		return htmlspecialchars($tmp, ENT_COMPAT, 'UTF-8');
 	} else {
@@ -1211,46 +1247,47 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 	global $conf, $user, $debugbar;
 
 	// If syslog module enabled
-	if (empty($conf->syslog->enabled)) return;
+	if (empty($conf->syslog->enabled)) {
+		return;
+	}
 
 	// Check if we are into execution of code of a website
 	if (defined('USEEXTERNALSERVER') && !defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 		global $website, $websitekey;
-		if (is_object($website) && !empty($website->ref)) $suffixinfilename .= '_website_'.$website->ref;
-		elseif (!empty($websitekey)) $suffixinfilename .= '_website_'.$websitekey;
+		if (is_object($website) && !empty($website->ref)) {
+			$suffixinfilename .= '_website_'.$website->ref;
+		} elseif (!empty($websitekey)) {
+			$suffixinfilename .= '_website_'.$websitekey;
+		}
 	}
 
-	if ($ident < 0)
-	{
-		foreach ($conf->loghandlers as $loghandlerinstance)
-		{
+	if ($ident < 0) {
+		foreach ($conf->loghandlers as $loghandlerinstance) {
 			$loghandlerinstance->setIdent($ident);
 		}
 	}
 
-	if (!empty($message))
-	{
+	if (!empty($message)) {
 		// Test log level
 		$logLevels = array(LOG_EMERG=>'EMERG', LOG_ALERT=>'ALERT', LOG_CRIT=>'CRITICAL', LOG_ERR=>'ERR', LOG_WARNING=>'WARN', LOG_NOTICE=>'NOTICE', LOG_INFO=>'INFO', LOG_DEBUG=>'DEBUG');
-		if (!array_key_exists($level, $logLevels))
-		{
+		if (!array_key_exists($level, $logLevels)) {
 			throw new Exception('Incorrect log level');
 		}
-		if ($level > $conf->global->SYSLOG_LEVEL) return;
+		if ($level > $conf->global->SYSLOG_LEVEL) {
+			return;
+		}
 
 		$message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log
 
 		// If adding log inside HTML page is required
 		if ((!empty($_REQUEST['logtohtml']) && !empty($conf->global->MAIN_ENABLE_LOG_TO_HTML))
-			|| (!empty($user->rights->debugbar->read) && is_object($debugbar)))
-		{
+			|| (!empty($user->rights->debugbar->read) && is_object($debugbar))) {
 			$conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$logLevels[$level]." ".$message;
 		}
 
 		//TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output
 		// If html log tag enabled and url parameter log defined, we show output log on HTML comments
-		if (!empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"]))
-		{
+		if (!empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) {
 			print "\n\n<!-- Log start\n";
 			print $message."\n";
 			print "Log end -->\n";
@@ -1268,27 +1305,35 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 		if (!empty($remoteip)) {
 			$data['ip'] = $remoteip;
 			// This is when server run behind a reverse proxy
-			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != $remoteip) $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].' -> '.$data['ip'];
-			elseif (!empty($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != $remoteip) $data['ip'] = $_SERVER['HTTP_CLIENT_IP'].' -> '.$data['ip'];
+			if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']) && $_SERVER['HTTP_X_FORWARDED_FOR'] != $remoteip) {
+				$data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].' -> '.$data['ip'];
+			} elseif (!empty($_SERVER['HTTP_CLIENT_IP']) && $_SERVER['HTTP_CLIENT_IP'] != $remoteip) {
+				$data['ip'] = $_SERVER['HTTP_CLIENT_IP'].' -> '.$data['ip'];
+			}
 		} // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)
-		elseif (!empty($_SERVER['SERVER_ADDR'])) $data['ip'] = $_SERVER['SERVER_ADDR'];
+		elseif (!empty($_SERVER['SERVER_ADDR'])) {
+			$data['ip'] = $_SERVER['SERVER_ADDR'];
+		}
 		// This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).
-		elseif (!empty($_SERVER['COMPUTERNAME'])) $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);
+		elseif (!empty($_SERVER['COMPUTERNAME'])) {
+			$data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);
+		}
 		// This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).
-		elseif (!empty($_SERVER['LOGNAME'])) $data['ip'] = '???@'.$_SERVER['LOGNAME'];
+		elseif (!empty($_SERVER['LOGNAME'])) {
+			$data['ip'] = '???@'.$_SERVER['LOGNAME'];
+		}
 		// Loop on each log handler and send output
-		foreach ($conf->loghandlers as $loghandlerinstance)
-		{
-			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) continue;
+		foreach ($conf->loghandlers as $loghandlerinstance) {
+			if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+				continue;
+			}
 			$loghandlerinstance->export($data, $suffixinfilename);
 		}
 		unset($data);
 	}
 
-	if ($ident > 0)
-	{
-		foreach ($conf->loghandlers as $loghandlerinstance)
-		{
+	if ($ident > 0) {
+		foreach ($conf->loghandlers as $loghandlerinstance) {
 			$loghandlerinstance->setIdent($ident);
 		}
 	}
@@ -1375,7 +1420,9 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 
 	// Show title
 	$showtitle = 1;
-	if (!empty($conf->dol_optimize_smallscreen)) $showtitle = 0;
+	if (!empty($conf->dol_optimize_smallscreen)) {
+		$showtitle = 0;
+	}
 
 	$out = "\n".'<!-- dol_fiche_head - dol_get_fiche_head -->';
 
@@ -1384,14 +1431,17 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	}
 
 	// Show right part
-	if ($morehtmlright) $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.
+	if ($morehtmlright) {
+		$out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.
+	}
 
 	// Show title
-	if (!empty($title) && $showtitle && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
+	if (!empty($title) && $showtitle && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		$limittitle = 30;
 		$out .= '<a class="tabTitle">';
-		if ($picto) $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
+		if ($picto) {
+			$out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath, 0, 0, '', 'imgTabTitle').' ';
+		}
 		$out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';
 		$out .= '</a>';
 	}
@@ -1400,10 +1450,11 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 
 	// Define max of key (max may be higher than sizeof because of hole due to module disabling some tabs).
 	$maxkey = -1;
-	if (is_array($links) && !empty($links))
-	{
+	if (is_array($links) && !empty($links)) {
 		$keys = array_keys($links);
-		if (count($keys)) $maxkey = max($keys);
+		if (count($keys)) {
+			$maxkey = max($keys);
+		}
 	}
 
 	// Show tabs
@@ -1411,44 +1462,41 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 	if (empty($limittoshow)) {
 		$limittoshow = (empty($conf->global->MAIN_MAXTABS_IN_CARD) ? 99 : $conf->global->MAIN_MAXTABS_IN_CARD);
 	}
-	if (!empty($conf->dol_optimize_smallscreen)) $limittoshow = 2;
+	if (!empty($conf->dol_optimize_smallscreen)) {
+		$limittoshow = 2;
+	}
 
 	$displaytab = 0;
 	$nbintab = 0;
 	$popuptab = 0;
 	$outmore = '';
-	for ($i = 0; $i <= $maxkey; $i++)
-	{
+	for ($i = 0; $i <= $maxkey; $i++) {
 		if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {
 			// If active tab is already present
-			if ($i >= $limittoshow) $limittoshow--;
+			if ($i >= $limittoshow) {
+				$limittoshow--;
+			}
 		}
 	}
 
-	for ($i = 0; $i <= $maxkey; $i++)
-	{
+	for ($i = 0; $i <= $maxkey; $i++) {
 		if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {
 			$isactive = true;
 		} else {
 			$isactive = false;
 		}
 
-		if ($i < $limittoshow || $isactive)
-		{
+		if ($i < $limittoshow || $isactive) {
 			$out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';
-			if (isset($links[$i][2]) && $links[$i][2] == 'image')
-			{
-				if (!empty($links[$i][0]))
-				{
+			if (isset($links[$i][2]) && $links[$i][2] == 'image') {
+				if (!empty($links[$i][0])) {
 					$out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
 				} else {
 					$out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
 				}
-			} elseif (!empty($links[$i][1]))
-			{
+			} elseif (!empty($links[$i][1])) {
 				//print "x $i $active ".$links[$i][2]." z";
-				if ($isactive)
-				{
+				if ($isactive) {
 					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 					$out .= $links[$i][1];
 					$out .= '</a>'."\n";
@@ -1461,19 +1509,18 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 			$out .= '</div>';
 		} else {
 			// The popup with the other tabs
-			if (!$popuptab)
-			{
+			if (!$popuptab) {
 				$popuptab = 1;
 				$outmore .= '<div class="popuptabset wordwrap">'; // The css used to hide/show popup
 			}
 			$outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';
-			if (isset($links[$i][2]) && $links[$i][2] == 'image')
-			{
-				if (!empty($links[$i][0]))
+			if (isset($links[$i][2]) && $links[$i][2] == 'image') {
+				if (!empty($links[$i][0])) {
 					$outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";
-				else $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
-			} elseif (!empty($links[$i][1]))
-			{
+				} else {
+					$outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";
+				}
+			} elseif (!empty($links[$i][1])) {
 				$outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';
 				$outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.
 				$outmore .= '</a>'."\n";
@@ -1484,16 +1531,19 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		}
 		$displaytab = $i;
 	}
-	if ($popuptab) $outmore .= '</div>';
+	if ($popuptab) {
+		$outmore .= '</div>';
+	}
 
-	if ($popuptab)	// If there is some tabs not shown
-	{
+	if ($popuptab) {	// If there is some tabs not shown
 		$left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
 		$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
 		$widthofpopup = 200;
 
 		$tabsname = $moretabssuffix;
-		if (empty($tabsname)) { $tabsname = str_replace("@", "", $picto); }
+		if (empty($tabsname)) {
+			$tabsname = str_replace("@", "", $picto);
+		}
 		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
 		$out .= '<a href="#" class="tab moretab inline-block tabunactive">'.$langs->trans("More").'... ('.$nbintab.')</a>'; // Do not use "reposition" class in the "More".
 		$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
@@ -1520,12 +1570,13 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$out .= "</div>\n";
 	}
 
-	if (!$notab || $notab == -1 || $notab == -2) $out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : ' tabBarWithBottom')).'">'."\n";
+	if (!$notab || $notab == -1 || $notab == -2) {
+		$out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ($notab == -2 ? ' tabBarNoTop' : ' tabBarWithBottom')).'">'."\n";
+	}
 
 	$parameters = array('tabname' => $active, 'out' => $out);
 	$reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"
-	if ($reshook > 0)
-	{
+	if ($reshook > 0) {
 		$out = $hookmanager->resPrint;
 	}
 
@@ -1552,8 +1603,11 @@ function dol_fiche_end($notab = 0)
  */
 function dol_get_fiche_end($notab = 0)
 {
-	if (!$notab || $notab == -1) return "\n</div>\n";
-	else return '';
+	if (!$notab || $notab == -1) {
+		return "\n</div>\n";
+	} else {
+		return '';
+	}
 }
 
 /**
@@ -1585,35 +1639,67 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	$showimage = 1;
 	$entity = (empty($object->entity) ? $conf->entity : $object->entity);
 	$showbarcode = empty($conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) $showbarcode = 0;
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+		$showbarcode = 0;
+	}
 	$modulepart = 'unknown';
 
-	if ($object->element == 'societe')         $modulepart = 'societe';
-	if ($object->element == 'contact')         $modulepart = 'contact';
-	if ($object->element == 'member')          $modulepart = 'memberphoto';
-	if ($object->element == 'user')            $modulepart = 'userphoto';
-	if ($object->element == 'product')         $modulepart = 'product';
-	if ($object->element == 'ticket')          $modulepart = 'ticket';
-
-	if (class_exists("Imagick"))
-	{
-		if ($object->element == 'propal')            $modulepart = 'propal';
-		if ($object->element == 'commande')          $modulepart = 'commande';
-		if ($object->element == 'facture')           $modulepart = 'facture';
-		if ($object->element == 'fichinter')         $modulepart = 'ficheinter';
-		if ($object->element == 'contrat')           $modulepart = 'contract';
-		if ($object->element == 'supplier_proposal') $modulepart = 'supplier_proposal';
-		if ($object->element == 'order_supplier')    $modulepart = 'supplier_order';
-		if ($object->element == 'invoice_supplier')  $modulepart = 'supplier_invoice';
-		if ($object->element == 'expensereport')     $modulepart = 'expensereport';
+	if ($object->element == 'societe') {
+		$modulepart = 'societe';
+	}
+	if ($object->element == 'contact') {
+		$modulepart = 'contact';
+	}
+	if ($object->element == 'member') {
+		$modulepart = 'memberphoto';
+	}
+	if ($object->element == 'user') {
+		$modulepart = 'userphoto';
+	}
+	if ($object->element == 'product') {
+		$modulepart = 'product';
+	}
+	if ($object->element == 'ticket') {
+		$modulepart = 'ticket';
 	}
 
-	if ($object->element == 'product')
-	{
+	if (class_exists("Imagick")) {
+		if ($object->element == 'propal') {
+			$modulepart = 'propal';
+		}
+		if ($object->element == 'commande') {
+			$modulepart = 'commande';
+		}
+		if ($object->element == 'facture') {
+			$modulepart = 'facture';
+		}
+		if ($object->element == 'fichinter') {
+			$modulepart = 'ficheinter';
+		}
+		if ($object->element == 'contrat') {
+			$modulepart = 'contract';
+		}
+		if ($object->element == 'supplier_proposal') {
+			$modulepart = 'supplier_proposal';
+		}
+		if ($object->element == 'order_supplier') {
+			$modulepart = 'supplier_order';
+		}
+		if ($object->element == 'invoice_supplier') {
+			$modulepart = 'supplier_invoice';
+		}
+		if ($object->element == 'expensereport') {
+			$modulepart = 'expensereport';
+		}
+	}
+
+	if ($object->element == 'product') {
 		$width = 80; $cssclass = 'photoref';
 		$showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
-		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
+		if ($conf->browser->layout == 'phone') {
+			$maxvisiblephotos = 1;
+		}
 		if ($showimage) {
 			$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
 		} else {
@@ -1629,20 +1715,19 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		$width = 80; $cssclass = 'photoref';
 		$showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
 		$maxvisiblephotos = (isset($conf->global->TICKET_MAX_VISIBLE_PHOTO) ? $conf->global->TICKET_MAX_VISIBLE_PHOTO : 2);
-		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
+		if ($conf->browser->layout == 'phone') {
+			$maxvisiblephotos = 1;
+		}
 
-		if ($showimage)
-		{
+		if ($showimage) {
 			$showphoto = $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0);
-			if ($object->nbphoto > 0)
-			{
+			if ($object->nbphoto > 0) {
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$showphoto.'</div>';
 			} else {
 				$showimage = 0;
 			}
 		}
-		if (!$showimage)
-		{
+		if (!$showimage) {
 			if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
@@ -1655,24 +1740,22 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			}
 		}
 	} else {
-		if ($showimage)
-		{
-			if ($modulepart != 'unknown')
-			{
+		if ($showimage) {
+			if ($modulepart != 'unknown') {
 				$phototoshow = '';
 				// Check if a preview file is available
-				if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick"))
-				{
+				if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick")) {
 					$objectref = dol_sanitizeFileName($object->ref);
 					$dir_output = (empty($conf->$modulepart->multidir_output[$entity]) ? $conf->$modulepart->dir_output : $conf->$modulepart->multidir_output[$entity])."/";
-					if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice')))
-					{
+					if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) {
 						$subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);
 						$subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end
 					} else {
 						$subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);
 					}
-					if (empty($subdir)) $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
+					if (empty($subdir)) {
+						$subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path
+					}
 
 					$filepath = $dir_output.$subdir."/";
 
@@ -1686,27 +1769,26 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 					$pdfexists = file_exists($filepdf);
 
 					// If PDF file exists
-					if ($pdfexists)
-					{
+					if ($pdfexists) {
 						// Conversion du PDF en image png si fichier png non existant
-						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
-						{
-							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
-							{
+						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
+							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 								include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 								$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
-								if ($ret < 0) $error++;
+								if ($ret < 0) {
+									$error++;
+								}
 							}
 						}
 					}
 
-					if ($pdfexists && !$error)
-					{
+					if ($pdfexists && !$error) {
 						$heightforphotref = 80;
-						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
+						if (!empty($conf->dol_optimize_smallscreen)) {
+							$heightforphotref = 60;
+						}
 						// If the preview file is found
-						if (file_exists($fileimage))
-						{
+						if (file_exists($fileimage)) {
 							$phototoshow = '<div class="photoref">';
 							$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
 							$phototoshow .= '</div>';
@@ -1723,18 +1805,18 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 				}
 			}
 
-			if (!$phototoshow)      // Show No photo link (picto of object)
-			{
+			if (!$phototoshow) {      // Show No photo link (picto of object)
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
-				if ($object->element == 'action')
-				{
+				if ($object->element == 'action') {
 					$width = 80;
 					$cssclass = 'photorefcenter';
 					$nophoto = img_picto('No photo', 'title_agenda');
 				} else {
 					$width = 14; $cssclass = 'photorefcenter';
 					$picto = $object->picto;
-					if ($object->element == 'project' && !$object->public) $picto = 'project'; // instead of projectpub
+					if ($object->element == 'project' && !$object->public) {
+						$picto = 'project'; // instead of projectpub
+					}
 					$nophoto = img_picto('No photo', 'object_'.$picto);
 				}
 				$morehtmlleft .= '<!-- No photo to show -->';
@@ -1747,18 +1829,17 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		}
 	}
 
-	if ($showbarcode) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+	if ($showbarcode) {
+		$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';
+	}
 
-	if ($object->element == 'societe')
-	{
-		if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE))
-		{
-		   	$morehtmlstatus .= ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
+	if ($object->element == 'societe') {
+		if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
+			$morehtmlstatus .= ajax_object_onoff($object, 'status', 'status', 'InActivity', 'ActivityCeased');
 		} else {
 			$morehtmlstatus .= $object->getLibStatut(6);
 		}
-	} elseif ($object->element == 'product')
-	{
+	} elseif ($object->element == 'product') {
 		//$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Sell").') ';
 		if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 			$morehtmlstatus .= ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
@@ -1774,32 +1855,44 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		}
 	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan', 'tva'))) {
 		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
+			$tmptxt = $object->getLibStatut(5, $object->totalpaye);
+		}
 		$morehtmlstatus .= $tmptxt;
 	} elseif ($object->element == 'contrat' || $object->element == 'contract') {
-		if ($object->statut == 0) $morehtmlstatus .= $object->getLibStatut(5);
-		else $morehtmlstatus .= $object->getLibStatut(4);
+		if ($object->statut == 0) {
+			$morehtmlstatus .= $object->getLibStatut(5);
+		} else {
+			$morehtmlstatus .= $object->getLibStatut(4);
+		}
 	} elseif ($object->element == 'facturerec') {
-		if ($object->frequency == 0) $morehtmlstatus .= $object->getLibStatut(2);
-		else $morehtmlstatus .= $object->getLibStatut(5);
+		if ($object->frequency == 0) {
+			$morehtmlstatus .= $object->getLibStatut(2);
+		} else {
+			$morehtmlstatus .= $object->getLibStatut(5);
+		}
 	} elseif ($object->element == 'project_task') {
 		$object->fk_statut = 1;
-		if ($object->progress > 0) $object->fk_statut = 2;
-		if ($object->progress >= 100) $object->fk_statut = 3;
+		if ($object->progress > 0) {
+			$object->fk_statut = 2;
+		}
+		if ($object->progress >= 100) {
+			$object->fk_statut = 3;
+		}
 		$tmptxt = $object->getLibStatut(5);
 		$morehtmlstatus .= $tmptxt; // No status on task
 	} else { // Generic case
 		$tmptxt = $object->getLibStatut(6);
-		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) $tmptxt = $object->getLibStatut(5);
+		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
+			$tmptxt = $object->getLibStatut(5);
+		}
 		$morehtmlstatus .= $tmptxt;
 	}
 
 	// Add if object was dispatched "into accountancy"
-	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'paiementcharge', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various')))
-	{
+	if (!empty($conf->accounting->enabled) && in_array($object->element, array('bank', 'paiementcharge', 'facture', 'invoice', 'invoice_supplier', 'expensereport', 'payment_various'))) {
 		// Note: For 'chargesociales', 'salaries'... this is the payments that are dispatched (so element = 'bank')
-		if (method_exists($object, 'getVentilExportCompta'))
-		{
+		if (method_exists($object, 'getVentilExportCompta')) {
 			$accounted = $object->getVentilExportCompta();
 			$langs->load("accountancy");
 			$morehtmlstatus .= '</div><div class="statusref statusrefbis"><span class="opacitymedium">'.($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted")).'</span>';
@@ -1807,16 +1900,18 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 	}
 
 	// Add alias for thirdparty
-	if (!empty($object->name_alias)) $morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';
-
-	// Add label
-	if (in_array($object->element, array('product', 'bank_account', 'project_task')))
-	{
-		if (!empty($object->label)) $morehtmlref .= '<div class="refidno">'.$object->label.'</div>';
+	if (!empty($object->name_alias)) {
+		$morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';
 	}
 
-	if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files')))
-	{
+	// Add label
+	if (in_array($object->element, array('product', 'bank_account', 'project_task'))) {
+		if (!empty($object->label)) {
+			$morehtmlref .= '<div class="refidno">'.$object->label.'</div>';
+		}
+	}
+
+	if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files'))) {
 		$moreaddress = $object->getBannerAddress('refaddress', $object);
 		if ($moreaddress) {
 			$morehtmlref .= '<div class="refidno">';
@@ -1824,8 +1919,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			$morehtmlref .= '</div>';
 		}
 	}
-	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && ($conf->global->MAIN_SHOW_TECHNICAL_ID == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id))
-	{
+	if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && ($conf->global->MAIN_SHOW_TECHNICAL_ID == '1' || preg_match('/'.preg_quote($object->element, '/').'/i', $conf->global->MAIN_SHOW_TECHNICAL_ID)) && !empty($object->id)) {
 		$morehtmlref .= '<div style="clear: both;"></div>';
 		$morehtmlref .= '<div class="refidno">';
 		$morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;
@@ -1851,11 +1945,15 @@ function fieldLabel($langkey, $fieldkey, $fieldrequired = 0)
 {
 	global $langs;
 	$ret = '';
-	if ($fieldrequired) $ret .= '<span class="fieldrequired">';
+	if ($fieldrequired) {
+		$ret .= '<span class="fieldrequired">';
+	}
 	$ret .= '<label for="'.$fieldkey.'">';
 	$ret .= $langs->trans($langkey);
 	$ret .= '</label>';
-	if ($fieldrequired) $ret .= '</span>';
+	if ($fieldrequired) {
+		$ret .= '</span>';
+	}
 	return $ret;
 }
 
@@ -1870,7 +1968,9 @@ function dol_bc($var, $moreclass = '')
 {
 	global $bc;
 	$ret = ' '.$bc[$var];
-	if ($moreclass) $ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);
+	if ($moreclass) {
+		$ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);
+	}
 	return $ret;
 }
 
@@ -1906,14 +2006,18 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		if (!empty($object->state))	{
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret ? ", " : '').$object->zip;
+		if ($object->zip) {
+			$ret .= ($ret ? ", " : '').$object->zip;
+		}
 	} elseif (isset($object->country_code) && in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
 		$ret .= ($ret ? $sep : '').$town;
 		if (!empty($object->state)) {
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
-		if ($object->zip) $ret .= ($ret ? $sep : '').$object->zip;
+		if ($object->zip) {
+			$ret .= ($ret ? $sep : '').$object->zip;
+		}
 	} elseif (isset($object->country_code) && in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country
 		$ret .= ($ret ? $sep : '').$object->zip;
 		$town = ($extralangcode ? $object->array_languages['town'][$extralangcode] : $object->town);
@@ -1934,7 +2038,9 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 			$ret .= ($ret ? ", " : '').$object->state;
 		}
 	}
-	if (!is_object($outputlangs)) $outputlangs = $langs;
+	if (!is_object($outputlangs)) {
+		$outputlangs = $langs;
+	}
 	if ($withcountry) {
 		$langs->load("dict");
 		$ret .= (empty($object->country_code) ? '' : ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)));
@@ -1957,7 +2063,9 @@ function dol_strftime($fmt, $ts = false, $is_gmt = false)
 {
 	if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
 		return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);
-	} else return 'Error date into a not supported range';
+	} else {
+		return 'Error date into a not supported range';
+	}
 }
 
 /**
@@ -1992,19 +2100,15 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 	// Clean parameters
 	$to_gmt = false;
 	$offsettz = $offsetdst = 0;
-	if ($tzoutput)
-	{
+	if ($tzoutput) {
 		$to_gmt = true; // For backward compatibility
-		if (is_string($tzoutput))
-		{
-			if ($tzoutput == 'tzserver')
-			{
+		if (is_string($tzoutput)) {
+			if ($tzoutput == 'tzserver') {
 				$to_gmt = false;
 				$offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'
 				$offsettz = 0;
 				$offsetdst = 0;
-			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel')
-			{
+			} elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {
 				$to_gmt = true;
 				$offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'
 				$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore
@@ -2012,54 +2116,77 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 			}
 		}
 	}
-	if (!is_object($outputlangs)) $outputlangs = $langs;
-	if (!$format) $format = 'daytextshort';
+	if (!is_object($outputlangs)) {
+		$outputlangs = $langs;
+	}
+	if (!$format) {
+		$format = 'daytextshort';
+	}
 
 	// Do we have to reduce the length of date (year on 2 chars) to save space.
 	// Note: dayinputnoreduce is same than day but no reduction of year length will be done
 	$reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;	// Test on original $format param.
 	$format = preg_replace('/inputnoreduce/', '', $format);	// so format 'dayinputnoreduce' is processed like day
 	$formatwithoutreduce = preg_replace('/reduceformat/', '', $format);
-	if ($formatwithoutreduce != $format) { $format = $formatwithoutreduce; $reduceformat = 1; }  // so format 'dayreduceformat' is processed like day
+	if ($formatwithoutreduce != $format) {
+		$format = $formatwithoutreduce; $reduceformat = 1;
+	}  // so format 'dayreduceformat' is processed like day
 
 	// Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.
 	// TODO Add format daysmallyear and dayhoursmallyear
-	if ($format == 'day') $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
-	elseif ($format == 'hour')			$format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
-	elseif ($format == 'hourduration')	$format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
-	elseif ($format == 'daytext')			 $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
-	elseif ($format == 'daytextshort')	$format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
-	elseif ($format == 'dayhour')			 $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
-	elseif ($format == 'dayhoursec')		 $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
-	elseif ($format == 'dayhourtext')		 $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
-	elseif ($format == 'dayhourtextshort') $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
+	if ($format == 'day') {
+		$format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
+	} elseif ($format == 'hour') {
+		$format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
+	} elseif ($format == 'hourduration') {
+		$format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
+	} elseif ($format == 'daytext') {
+		$format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
+	} elseif ($format == 'daytextshort') {
+		$format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
+	} elseif ($format == 'dayhour') {
+		$format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
+	} elseif ($format == 'dayhoursec') {
+		$format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
+	} elseif ($format == 'dayhourtext') {
+		$format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
+	} elseif ($format == 'dayhourtextshort') {
+		$format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
+	}
 	// Format not sensitive to language
-	elseif ($format == 'dayhourlog')		 $format = '%Y%m%d%H%M%S';
-	elseif ($format == 'dayhourldap')		 $format = '%Y%m%d%H%M%SZ';
-	elseif ($format == 'dayhourxcard')	$format = '%Y%m%dT%H%M%SZ';
-	elseif ($format == 'dayxcard')	 	$format = '%Y%m%d';
-	elseif ($format == 'dayrfc')			 $format = '%Y-%m-%d'; // DATE_RFC3339
-	elseif ($format == 'dayhourrfc')		 $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339
-	elseif ($format == 'standard')		$format = '%Y-%m-%d %H:%M:%S';
+	elseif ($format == 'dayhourlog') {
+		$format = '%Y%m%d%H%M%S';
+	} elseif ($format == 'dayhourldap') {
+		$format = '%Y%m%d%H%M%SZ';
+	} elseif ($format == 'dayhourxcard') {
+		$format = '%Y%m%dT%H%M%SZ';
+	} elseif ($format == 'dayxcard') {
+		$format = '%Y%m%d';
+	} elseif ($format == 'dayrfc') {
+		$format = '%Y-%m-%d'; // DATE_RFC3339
+	} elseif ($format == 'dayhourrfc') {
+		$format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339
+	} elseif ($format == 'standard') {
+		$format = '%Y-%m-%d %H:%M:%S';
+	}
 
-	if ($reduceformat)
-	{
+	if ($reduceformat) {
 		$format = str_replace('%Y', '%y', $format);
 		$format = str_replace('yyyy', 'yy', $format);
 	}
 
 	// If date undefined or "", we return ""
-	if (dol_strlen($time) == 0) return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)
+	if (dol_strlen($time) == 0) {
+		return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)
+	}
 
 	// Clean format
-	if (preg_match('/%b/i', $format))		// There is some text to translate
-	{
+	if (preg_match('/%b/i', $format)) {		// There is some text to translate
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format = str_replace('%b', '__b__', $format);
 		$format = str_replace('%B', '__B__', $format);
 	}
-	if (preg_match('/%a/i', $format))		// There is some text to translate
-	{
+	if (preg_match('/%a/i', $format)) {		// There is some text to translate
 		// We inhibate translation to text made by strftime functions. We will use trans instead later.
 		$format = str_replace('%a', '__a__', $format);
 		$format = str_replace('%A', '__A__', $format);
@@ -2068,12 +2195,10 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 
 	// Analyze date
 	$reg = array();
-	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg))	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
-	{
+	if (preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) {	// Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000
 		dol_print_error("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"]);
 		return '';
-	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg))    // Still available to solve problems in extrafields of type date
-	{
+	} elseif (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg)) {    // Still available to solve problems in extrafields of type date
 		// This part of code should not be used.
 		dol_syslog("Functions.lib::dol_print_date function called with a bad value from page ".$_SERVER["PHP_SELF"], LOG_WARNING);
 		//if (function_exists('debug_print_backtrace')) debug_print_backtrace();
@@ -2089,23 +2214,22 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		$ret = adodb_strftime($format, $time + $offsettz + $offsetdst, $to_gmt);
 	} else {
 		// Date is a timestamps
-		if ($time < 100000000000)	// Protection against bad date values
-		{
+		if ($time < 100000000000) {	// Protection against bad date values
 			$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 			$ret = adodb_strftime($format, $timetouse, $to_gmt);
-		} else $ret = 'Bad value '.$time.' for date';
+		} else {
+			$ret = 'Bad value '.$time.' for date';
+		}
 	}
 
-	if (preg_match('/__b__/i', $format))
-	{
+	if (preg_match('/__b__/i', $format)) {
 		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 		// Here ret is string in PHP setup language (strftime was used). Now we convert to $outputlangs.
 		$month = adodb_strftime('%m', $timetouse);
 		$month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.
-		if ($encodetooutput)
-		{
+		if ($encodetooutput) {
 			$monthtext = $outputlangs->transnoentities('Month'.$month);
 			$monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);
 		} else {
@@ -2118,8 +2242,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 		//print 'x'.$outputlangs->charset_output.'-'.$ret.'x';
 		//return $ret;
 	}
-	if (preg_match('/__a__/i', $format))
-	{
+	if (preg_match('/__a__/i', $format)) {
 		$timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
 
 		$w = adodb_strftime('%w', $timetouse); // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.
@@ -2160,7 +2283,9 @@ function dol_getdate($timestamp, $fast = false, $forcetimezone = '')
 		//$datetimeobj = new DateTime('@'.$timestamp);
 		$datetimeobj = new DateTime();
 		$datetimeobj->setTimestamp($timestamp); // Use local PHP server timezone
-		if ($forcetimezone) $datetimeobj->setTimezone(new DateTimeZone($forcetimezone)); //  (add timezone relative to the date entered)
+		if ($forcetimezone) {
+			$datetimeobj->setTimezone(new DateTimeZone($forcetimezone)); //  (add timezone relative to the date entered)
+		}
 		$arrayinfo = array(
 			'year'=>((int) date_format($datetimeobj, 'Y')),
 			'mon'=>((int) date_format($datetimeobj, 'm')),
@@ -2175,11 +2300,14 @@ function dol_getdate($timestamp, $fast = false, $forcetimezone = '')
 	} else {
 		// PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows
 		$usealternatemethod = false;
-		if ($timestamp <= 0) $usealternatemethod = true; // <= 1970
-		if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038
+		if ($timestamp <= 0) {
+			$usealternatemethod = true; // <= 1970
+		}
+		if ($timestamp >= 2145913200) {
+			$usealternatemethod = true; // >= 2038
+		}
 
-		if ($usealternatemethod)
-		{
+		if ($usealternatemethod) {
 			$arrayinfo = adodb_getdate($timestamp, $fast);
 		} else {
 			$arrayinfo = getdate($timestamp);
@@ -2221,43 +2349,55 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto',
 	}
 
 	// Clean parameters
-	if ($hour == -1 || empty($hour)) $hour = 0;
-	if ($minute == -1 || empty($minute)) $minute = 0;
-	if ($second == -1 || empty($second)) $second = 0;
-
-	// Check parameters
-	if ($check)
-	{
-		if (!$month || !$day)  return '';
-		if ($day > 31) return '';
-		if ($month > 12) return '';
-		if ($hour < 0 || $hour > 24) return '';
-		if ($minute < 0 || $minute > 60) return '';
-		if ($second < 0 || $second > 60) return '';
+	if ($hour == -1 || empty($hour)) {
+		$hour = 0;
+	}
+	if ($minute == -1 || empty($minute)) {
+		$minute = 0;
+	}
+	if ($second == -1 || empty($second)) {
+		$second = 0;
 	}
 
-	if (empty($gm) || ($gm === 'server' || $gm === 'tzserver'))
-	{
+	// Check parameters
+	if ($check) {
+		if (!$month || !$day) {
+			return '';
+		}
+		if ($day > 31) {
+			return '';
+		}
+		if ($month > 12) {
+			return '';
+		}
+		if ($hour < 0 || $hour > 24) {
+			return '';
+		}
+		if ($minute < 0 || $minute > 60) {
+			return '';
+		}
+		if ($second < 0 || $second > 60) {
+			return '';
+		}
+	}
+
+	if (empty($gm) || ($gm === 'server' || $gm === 'tzserver')) {
 		$default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'
 		$localtz = new DateTimeZone($default_timezone);
-	} elseif ($gm === 'user' || $gm === 'tzuser' || $gm === 'tzuserrel')
-	{
+	} elseif ($gm === 'user' || $gm === 'tzuser' || $gm === 'tzuserrel') {
 		// We use dol_tz_string first because it is more reliable.
 		$default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'
 		try {
 			$localtz = new DateTimeZone($default_timezone);
-		} catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);
 			$default_timezone = @date_default_timezone_get();
 		}
-	} elseif (strrpos($gm, "tz,") !== false)
-	{
+	} elseif (strrpos($gm, "tz,") !== false) {
 		$timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'
 		try {
 			$localtz = new DateTimeZone($timezone);
-		} catch (Exception $e)
-		{
+		} catch (Exception $e) {
 			dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);
 		}
 	}
@@ -2294,9 +2434,9 @@ function dol_now($mode = 'auto')
 		$mode = 'gmt';
 	}
 
-	if ($mode == 'gmt') $ret = time(); // Time for now at greenwich.
-	elseif ($mode == 'tzserver')		// Time for now with PHP server timezone added
-	{
+	if ($mode == 'gmt') {
+		$ret = time(); // Time for now at greenwich.
+	} elseif ($mode == 'tzserver') {		// Time for now with PHP server timezone added
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		$tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time
 		$ret = (int) (dol_now('gmt') + ($tzsecond * 3600));
@@ -2306,8 +2446,7 @@ function dol_now($mode = 'auto')
 		$tzsecond=getParentCompanyTimeZoneInt();    // Contains tz+dayling saving time
 		$ret=dol_now('gmt')+($tzsecond*3600);
 	}*/
-	elseif ($mode == 'tzuser' || $mode == 'tzuserrel')				// Time for now with user timezone added
-	{
+	elseif ($mode == 'tzuser' || $mode == 'tzuserrel') {				// Time for now with user timezone added
 		//print 'time: '.time();
 		$offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;
 		$offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60;
@@ -2331,11 +2470,12 @@ function dol_print_size($size, $shortvalue = 0, $shortunit = 0)
 	global $conf, $langs;
 	$level = 1024;
 
-	if (!empty($conf->dol_optimize_smallscreen)) $shortunit = 1;
+	if (!empty($conf->dol_optimize_smallscreen)) {
+		$shortunit = 1;
+	}
 
 	// Set value text
-	if (empty($shortvalue) || $size < ($level * 10))
-	{
+	if (empty($shortvalue) || $size < ($level * 10)) {
 		$ret = $size;
 		$textunitshort = $langs->trans("b");
 		$textunitlong = $langs->trans("Bytes");
@@ -2345,7 +2485,11 @@ function dol_print_size($size, $shortvalue = 0, $shortunit = 0)
 		$textunitlong = $langs->trans("KiloBytes");
 	}
 	// Use long or short text unit
-	if (empty($shortunit)) { $ret .= ' '.$textunitlong; } else { $ret .= ' '.$textunitshort; }
+	if (empty($shortunit)) {
+		$ret .= ' '.$textunitlong;
+	} else {
+		$ret .= ' '.$textunitshort;
+	}
 
 	return $ret;
 }
@@ -2363,15 +2507,23 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)
 {
 	global $langs;
 
-	if (empty($url)) return '';
+	if (empty($url)) {
+		return '';
+	}
 
 	$link = '<a href="';
-	if (!preg_match('/^http/i', $url)) $link .= 'http://';
+	if (!preg_match('/^http/i', $url)) {
+		$link .= 'http://';
+	}
 	$link .= $url;
 	$link .= '"';
-	if ($target) $link .= ' target="'.$target.'"';
+	if ($target) {
+		$link .= ' target="'.$target.'"';
+	}
 	$link .= '>';
-	if (!preg_match('/^http/i', $url)) $link .= 'http://';
+	if (!preg_match('/^http/i', $url)) {
+		$link .= 'http://';
+	}
 	$link .= dol_trunc($url, $max);
 	$link .= '</a>';
 	return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ?img_picto($langs->trans("Url"), 'globe').' ' : '').$link.'</div>';
@@ -2395,33 +2547,39 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 
 	$newemail = dol_escape_htmltag($email);
 
-	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) $withpicto = 0;
+	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpicto) {
+		$withpicto = 0;
+	}
 
-	if (empty($email)) return '&nbsp;';
+	if (empty($email)) {
+		return '&nbsp;';
+	}
 
-	if (!empty($addlink))
-	{
+	if (!empty($addlink)) {
 		$newemail = '<a style="text-overflow: ellipsis;" href="';
-		if (!preg_match('/^mailto:/i', $email)) $newemail .= 'mailto:';
+		if (!preg_match('/^mailto:/i', $email)) {
+			$newemail .= 'mailto:';
+		}
 		$newemail .= $email;
 		$newemail .= '">';
 		$newemail .= dol_trunc($email, $max);
 		$newemail .= '</a>';
-		if ($showinvalid && !isValidEmail($email))
-		{
+		if ($showinvalid && !isValidEmail($email)) {
 			$langs->load("errors");
 			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email));
 		}
 
-		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
-		{
+		if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
 			$type = 'AC_EMAIL'; $link = '';
-			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
-			if ($link) $newemail = '<div>'.$newemail.' '.$link.'</div>';
+			if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+				$link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+			}
+			if ($link) {
+				$newemail = '<div>'.$newemail.' '.$link.'</div>';
+			}
 		}
 	} else {
-		if ($showinvalid && !isValidEmail($email))
-		{
+		if ($showinvalid && !isValidEmail($email)) {
 			$langs->load("errors");
 			$newemail .= img_warning($langs->trans("ErrorBadEMail", $email));
 		}
@@ -2559,272 +2717,205 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 
 	// Clean phone parameter
 	$phone = preg_replace("/[\s.-]/", "", trim($phone));
-	if (empty($phone)) { return ''; }
-	if (!empty($conf->global->MAIN_PHONE_SEPAR)) $separ = $conf->global->MAIN_PHONE_SEPAR;
-	if (empty($countrycode)) $countrycode = $mysoc->country_code;
+	if (empty($phone)) {
+		return '';
+	}
+	if (!empty($conf->global->MAIN_PHONE_SEPAR)) {
+		$separ = $conf->global->MAIN_PHONE_SEPAR;
+	}
+	if (empty($countrycode)) {
+		$countrycode = $mysoc->country_code;
+	}
 
 	// Short format for small screens
-	if ($conf->dol_optimize_smallscreen) $separ = '';
+	if ($conf->dol_optimize_smallscreen) {
+		$separ = '';
+	}
 
 	$newphone = $phone;
-	if (strtoupper($countrycode) == "FR")
-	{
+	if (strtoupper($countrycode) == "FR") {
 		// France
 		if (dol_strlen($phone) == 10) {
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);
-		} elseif (dol_strlen($phone) == 7)
-		{
+		} elseif (dol_strlen($phone) == 7) {
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);
-		} elseif (dol_strlen($phone) == 9)
-		{
+		} elseif (dol_strlen($phone) == 9) {
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);
-		} elseif (dol_strlen($phone) == 11)
-		{
+		} elseif (dol_strlen($phone) == 11) {
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		} elseif (dol_strlen($phone) == 12)
-		{
+		} elseif (dol_strlen($phone) == 12) {
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	} elseif (strtoupper($countrycode) == "CA")
-	{
+	} elseif (strtoupper($countrycode) == "CA") {
 		if (dol_strlen($phone) == 10) {
 			$newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);
 		}
-	} elseif (strtoupper($countrycode) == "PT")
-	{//Portugal
-		if (dol_strlen($phone) == 13)
-		{//ex: +351_ABC_DEF_GHI
+	} elseif (strtoupper($countrycode) == "PT") {//Portugal
+		if (dol_strlen($phone) == 13) {//ex: +351_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	} elseif (strtoupper($countrycode) == "SR")
-	{//Suriname
-		if (dol_strlen($phone) == 10)
-		{//ex: +597_ABC_DEF
+	} elseif (strtoupper($countrycode) == "SR") {//Suriname
+		if (dol_strlen($phone) == 10) {//ex: +597_ABC_DEF
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);
-		} elseif (dol_strlen($phone) == 11)
-		{//ex: +597_ABC_DEFG
+		} elseif (dol_strlen($phone) == 11) {//ex: +597_ABC_DEFG
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);
 		}
-	} elseif (strtoupper($countrycode) == "DE")
-	{//Allemagne
-		if (dol_strlen($phone) == 14)
-		{//ex:  +49_ABCD_EFGH_IJK
+	} elseif (strtoupper($countrycode) == "DE") {//Allemagne
+		if (dol_strlen($phone) == 14) {//ex:  +49_ABCD_EFGH_IJK
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);
-		} elseif (dol_strlen($phone) == 13)
-		{//ex: +49_ABC_DEFG_HIJ
+		} elseif (dol_strlen($phone) == 13) {//ex: +49_ABC_DEFG_HIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);
 		}
-	} elseif (strtoupper($countrycode) == "ES")
-	{//Espagne
-		if (dol_strlen($phone) == 12)
-		{//ex:  +34_ABC_DEF_GHI
+	} elseif (strtoupper($countrycode) == "ES") {//Espagne
+		if (dol_strlen($phone) == 12) {//ex:  +34_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	} elseif (strtoupper($countrycode) == "BF")
-	{// Burkina Faso
-		if (dol_strlen($phone) == 12)
-		{//ex :  +22 A BC_DE_FG_HI
+	} elseif (strtoupper($countrycode) == "BF") {// Burkina Faso
+		if (dol_strlen($phone) == 12) {//ex :  +22 A BC_DE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	} elseif (strtoupper($countrycode) == "RO")
-	{// Roumanie
-		if (dol_strlen($phone) == 12)
-		{//ex :  +40 AB_CDE_FG_HI
+	} elseif (strtoupper($countrycode) == "RO") {// Roumanie
+		if (dol_strlen($phone) == 12) {//ex :  +40 AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	} elseif (strtoupper($countrycode) == "TR")
-	{//Turquie
-		if (dol_strlen($phone) == 13)
-		{//ex :  +90 ABC_DEF_GHIJ
+	} elseif (strtoupper($countrycode) == "TR") {//Turquie
+		if (dol_strlen($phone) == 13) {//ex :  +90 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
-	} elseif (strtoupper($countrycode) == "US")
-	{//Etat-Unis
-		if (dol_strlen($phone) == 12)
-		{//ex: +1 ABC_DEF_GHIJ
+	} elseif (strtoupper($countrycode) == "US") {//Etat-Unis
+		if (dol_strlen($phone) == 12) {//ex: +1 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
-	} elseif (strtoupper($countrycode) == "MX")
-	{//Mexique
-		if (dol_strlen($phone) == 12)
-		{//ex: +52 ABCD_EFG_HI
+	} elseif (strtoupper($countrycode) == "MX") {//Mexique
+		if (dol_strlen($phone) == 12) {//ex: +52 ABCD_EFG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
-		} elseif (dol_strlen($phone) == 11)
-		{//ex: +52 AB_CD_EF_GH
+		} elseif (dol_strlen($phone) == 11) {//ex: +52 AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		} elseif (dol_strlen($phone) == 13)
-		{//ex: +52 ABC_DEF_GHIJ
+		} elseif (dol_strlen($phone) == 13) {//ex: +52 ABC_DEF_GHIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);
 		}
-	} elseif (strtoupper($countrycode) == "ML")
-	{//Mali
-		if (dol_strlen($phone) == 12)
-		{//ex: +223 AB_CD_EF_GH
+	} elseif (strtoupper($countrycode) == "ML") {//Mali
+		if (dol_strlen($phone) == 12) {//ex: +223 AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	} elseif (strtoupper($countrycode) == "TH")
-	{//Thaïlande
-		if (dol_strlen($phone) == 11)
-		{//ex: +66_ABC_DE_FGH
+	} elseif (strtoupper($countrycode) == "TH") {//Thaïlande
+		if (dol_strlen($phone) == 11) {//ex: +66_ABC_DE_FGH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
-		} elseif (dol_strlen($phone) == 12)
-		{//ex: +66_A_BCD_EF_GHI
+		} elseif (dol_strlen($phone) == 12) {//ex: +66_A_BCD_EF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);
 		}
-	} elseif (strtoupper($countrycode) == "MU")
-	{
+	} elseif (strtoupper($countrycode) == "MU") {
 		//Maurice
-		if (dol_strlen($phone) == 11)
-		{//ex: +230_ABC_DE_FG
+		if (dol_strlen($phone) == 11) {//ex: +230_ABC_DE_FG
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
-		} elseif (dol_strlen($phone) == 12)
-		{//ex: +230_ABCD_EF_GH
+		} elseif (dol_strlen($phone) == 12) {//ex: +230_ABCD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	} elseif (strtoupper($countrycode) == "ZA")
-	{//Afrique du sud
-		if (dol_strlen($phone) == 12)
-		{//ex: +27_AB_CDE_FG_HI
+	} elseif (strtoupper($countrycode) == "ZA") {//Afrique du sud
+		if (dol_strlen($phone) == 12) {//ex: +27_AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	} elseif (strtoupper($countrycode) == "SY")
-	{//Syrie
-		if (dol_strlen($phone) == 12)
-		{//ex: +963_AB_CD_EF_GH
+	} elseif (strtoupper($countrycode) == "SY") {//Syrie
+		if (dol_strlen($phone) == 12) {//ex: +963_AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
-		} elseif (dol_strlen($phone) == 13)
-		{//ex: +963_AB_CD_EF_GHI
+		} elseif (dol_strlen($phone) == 13) {//ex: +963_AB_CD_EF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
-	} elseif (strtoupper($countrycode) == "AE")
-	{//Emirats Arabes Unis
-		if (dol_strlen($phone) == 12)
-		{//ex: +971_ABC_DEF_GH
+	} elseif (strtoupper($countrycode) == "AE") {//Emirats Arabes Unis
+		if (dol_strlen($phone) == 12) {//ex: +971_ABC_DEF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);
-		} elseif (dol_strlen($phone) == 13)
-		{//ex: +971_ABC_DEF_GHI
+		} elseif (dol_strlen($phone) == 13) {//ex: +971_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
-		} elseif (dol_strlen($phone) == 14)
-		{//ex: +971_ABC_DEF_GHIK
+		} elseif (dol_strlen($phone) == 14) {//ex: +971_ABC_DEF_GHIK
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);
 		}
-	} elseif (strtoupper($countrycode) == "DZ")
-	{//Algérie
-		if (dol_strlen($phone) == 13)
-		{//ex: +213_ABC_DEF_GHI
+	} elseif (strtoupper($countrycode) == "DZ") {//Algérie
+		if (dol_strlen($phone) == 13) {//ex: +213_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	} elseif (strtoupper($countrycode) == "BE")
-	{//Belgique
-		if (dol_strlen($phone) == 11)
-		{//ex: +32_ABC_DE_FGH
+	} elseif (strtoupper($countrycode) == "BE") {//Belgique
+		if (dol_strlen($phone) == 11) {//ex: +32_ABC_DE_FGH
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);
-		} elseif (dol_strlen($phone) == 12)
-		{//ex: +32_ABC_DEF_GHI
+		} elseif (dol_strlen($phone) == 12) {//ex: +32_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	} elseif (strtoupper($countrycode) == "PF")
-	{//Polynésie française
-		if (dol_strlen($phone) == 12)
-		{//ex: +689_AB_CD_EF_GH
+	} elseif (strtoupper($countrycode) == "PF") {//Polynésie française
+		if (dol_strlen($phone) == 12) {//ex: +689_AB_CD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
 		}
-	} elseif (strtoupper($countrycode) == "CO")
-	{//Colombie
-		if (dol_strlen($phone) == 13)
-		{//ex: +57_ABC_DEF_GH_IJ
+	} elseif (strtoupper($countrycode) == "CO") {//Colombie
+		if (dol_strlen($phone) == 13) {//ex: +57_ABC_DEF_GH_IJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	} elseif (strtoupper($countrycode) == "JO")
-	{//Jordanie
-		if (dol_strlen($phone) == 12)
-		{//ex: +962_A_BCD_EF_GH
+	} elseif (strtoupper($countrycode) == "JO") {//Jordanie
+		if (dol_strlen($phone) == 12) {//ex: +962_A_BCD_EF_GH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);
 		}
-	} elseif (strtoupper($countrycode) == "JM")
-	{//Jamaïque
-		if (dol_strlen($newphone) == 12)
-		{//ex: +1867_ABC_DEFG
+	} elseif (strtoupper($countrycode) == "JM") {//Jamaïque
+		if (dol_strlen($newphone) == 12) {//ex: +1867_ABC_DEFG
 			$newphone = substr($newphone, 0, 5).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
-	} elseif (strtoupper($countrycode) == "MG")
-	{//Madagascar
-		if (dol_strlen($phone) == 13)
-		{//ex: +261_AB_CD_EF_GHI
+	} elseif (strtoupper($countrycode) == "MG") {//Madagascar
+		if (dol_strlen($phone) == 13) {//ex: +261_AB_CD_EF_GHI
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
 		}
-	} elseif (strtoupper($countrycode) == "GB")
-	{//Royaume uni
-		if (dol_strlen($phone) == 13)
-		{//ex: +44_ABCD_EFG_HIJ
+	} elseif (strtoupper($countrycode) == "GB") {//Royaume uni
+		if (dol_strlen($phone) == 13) {//ex: +44_ABCD_EFG_HIJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);
 		}
-	} elseif (strtoupper($countrycode) == "CH")
-	{//Suisse
-		if (dol_strlen($phone) == 12)
-		{//ex: +41_AB_CDE_FG_HI
+	} elseif (strtoupper($countrycode) == "CH") {//Suisse
+		if (dol_strlen($phone) == 12) {//ex: +41_AB_CDE_FG_HI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
-		} elseif (dol_strlen($phone) == 15)
-		{// +41_AB_CDE_FGH_IJKL
+		} elseif (dol_strlen($phone) == 15) {// +41_AB_CDE_FGH_IJKL
 			$newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);
 		}
-	} elseif (strtoupper($countrycode) == "TN")
-	{//Tunisie
-		if (dol_strlen($phone) == 12)
-		{//ex: +216_AB_CDE_FGH
+	} elseif (strtoupper($countrycode) == "TN") {//Tunisie
+		if (dol_strlen($phone) == 12) {//ex: +216_AB_CDE_FGH
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
 		}
-	} elseif (strtoupper($countrycode) == "GF")
-	{//Guyane francaise
-		if (dol_strlen($phone) == 13)
-		{//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
+	} elseif (strtoupper($countrycode) == "GF") {//Guyane francaise
+		if (dol_strlen($phone) == 13) {//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	} elseif (strtoupper($countrycode) == "GP")
-	{//Guadeloupe
-		if (dol_strlen($phone) == 13)
-		{//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
+	} elseif (strtoupper($countrycode) == "GP") {//Guadeloupe
+		if (dol_strlen($phone) == 13) {//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	} elseif (strtoupper($countrycode) == "MQ")
-	{//Martinique
-		if (dol_strlen($phone) == 13)
-		{//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
+	} elseif (strtoupper($countrycode) == "MQ") {//Martinique
+		if (dol_strlen($phone) == 13) {//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)
 			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	} elseif (strtoupper($countrycode) == "IT")
-	{//Italie
-		if (dol_strlen($phone) == 12)
-		{//ex: +39_ABC_DEF_GHI
+	} elseif (strtoupper($countrycode) == "IT") {//Italie
+		if (dol_strlen($phone) == 12) {//ex: +39_ABC_DEF_GHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);
-		} elseif (dol_strlen($phone) == 13)
-		{//ex: +39_ABC_DEF_GH_IJ
+		} elseif (dol_strlen($phone) == 13) {//ex: +39_ABC_DEF_GH_IJ
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
 		}
-	} elseif (strtoupper($countrycode) == "AU")
-	{
+	} elseif (strtoupper($countrycode) == "AU") {
 		//Australie
-		if (dol_strlen($phone) == 12)
-		{
+		if (dol_strlen($phone) == 12) {
 			//ex: +61_A_BCDE_FGHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);
 		}
 	}
-	if (!empty($addlink))	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
-	{
-		if ($conf->browser->layout == 'phone' || (!empty($conf->clicktodial->enabled) && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS)))	// If phone or option for, we use link of phone
-		{
+	if (!empty($addlink)) {	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
+		if ($conf->browser->layout == 'phone' || (!empty($conf->clicktodial->enabled) && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) {	// If phone or option for, we use link of phone
 			$newphoneform = $newphone;
 			$newphone = '<a href="tel:'.$phone.'"';
 			$newphone .= '>'.$newphoneform.'</a>';
-		} elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL')		// If click to dial, we use click to dial url
-		{
-			if (empty($user->clicktodial_loaded)) $user->fetch_clicktodial();
+		} elseif (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') {		// If click to dial, we use click to dial url
+			if (empty($user->clicktodial_loaded)) {
+				$user->fetch_clicktodial();
+			}
 
 			// Define urlmask
 			$urlmask = 'ErrorClickToDialModuleNotConfigured';
-			if (!empty($conf->global->CLICKTODIAL_URL)) $urlmask = $conf->global->CLICKTODIAL_URL;
-			if (!empty($user->clicktodial_url)) $urlmask = $user->clicktodial_url;
+			if (!empty($conf->global->CLICKTODIAL_URL)) {
+				$urlmask = $conf->global->CLICKTODIAL_URL;
+			}
+			if (!empty($user->clicktodial_url)) {
+				$urlmask = $user->clicktodial_url;
+			}
 
 			$clicktodial_poste = (!empty($user->clicktodial_poste) ?urlencode($user->clicktodial_poste) : '');
 			$clicktodial_login = (!empty($user->clicktodial_login) ?urlencode($user->clicktodial_login) : '');
@@ -2839,22 +2930,28 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			$url = make_substitutions($url, $substitarray);
 			$newphonesav = $newphone;
 			$newphone = '<a href="'.$url.'"';
-			if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) $newphone .= ' target="_blank"';
+			if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+				$newphone .= ' target="_blank"';
+			}
 			$newphone .= '>'.$newphonesav.'</a>';
 		}
 
 		//if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
-		if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
-		{
+		if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
 			$type = 'AC_TEL'; $link = '';
-			if ($addlink == 'AC_FAX') $type = 'AC_FAX';
-			if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
-			if ($link) $newphone = '<div>'.$newphone.' '.$link.'</div>';
+			if ($addlink == 'AC_FAX') {
+				$type = 'AC_FAX';
+			}
+			if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) {
+				$link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';
+			}
+			if ($link) {
+				$newphone = '<div>'.$newphone.' '.$link.'</div>';
+			}
 		}
 	}
 
-	if (empty($titlealt))
-	{
+	if (empty($titlealt)) {
 		$titlealt = ($withpicto == 'fax' ? $langs->trans("Fax") : $langs->trans("Phone"));
 	}
 	$rep = '';
@@ -2864,8 +2961,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		$reshook = $hookmanager->executeHooks('printPhone', $parameters, $phone);
 		$rep .= $hookmanager->resPrint;
 	}
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		$picto = '';
 		if ($withpicto) {
 			if ($withpicto == 'fax') {
@@ -2878,11 +2974,17 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 				$picto = '';
 			}
 		}
-		if ($adddivfloat) $rep .= '<div class="nospan float" style="margin-right: 10px">';
-		else $rep .= '<span style="margin-right: 10px;">';
+		if ($adddivfloat) {
+			$rep .= '<div class="nospan float" style="margin-right: 10px">';
+		} else {
+			$rep .= '<span style="margin-right: 10px;">';
+		}
 		$rep .= ($withpicto ?img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;
-		if ($adddivfloat) $rep .= '</div>';
-		else $rep .= '</span>';
+		if ($adddivfloat) {
+			$rep .= '</div>';
+		} else {
+			$rep .= '</span>';
+		}
 	}
 
 	return $rep;
@@ -2901,17 +3003,18 @@ function dol_print_ip($ip, $mode = 0)
 
 	$ret = '';
 
-	if (empty($mode)) $ret .= $ip;
+	if (empty($mode)) {
+		$ret .= $ip;
+	}
 
-	if ($mode != 2)
-	{
+	if ($mode != 2) {
 		$countrycode = dolGetCountryCodeFromIp($ip);
-		if ($countrycode)	// If success, countrycode is us, fr, ...
-		{
-			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png'))
-			{
+		if ($countrycode) {	// If success, countrycode is us, fr, ...
+			if (file_exists(DOL_DOCUMENT_ROOT.'/theme/common/flags/'.$countrycode.'.png')) {
 				$ret .= ' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"), DOL_URL_ROOT.'/theme/common/flags/'.$countrycode.'.png', '', 1);
-			} else $ret .= ' ('.$countrycode.')';
+			} else {
+				$ret .= ' ('.$countrycode.')';
+			}
 		} else {
 			// Nothing
 		}
@@ -2959,8 +3062,7 @@ function isHTTPS()
 	$isSecure = false;
 	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
 		$isSecure = true;
-	}
-	elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+	} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
 		$isSecure = true;
 	}
 	return $isSecure;
@@ -2978,8 +3080,7 @@ function dolGetCountryCodeFromIp($ip)
 
 	$countrycode = '';
 
-	if (!empty($conf->geoipmaxmind->enabled))
-	{
+	if (!empty($conf->geoipmaxmind->enabled)) {
 		$datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
 		//$ip='24.24.24.24';
 		//$datafile='/usr/share/GeoIP/GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)
@@ -3005,8 +3106,7 @@ function dol_user_country()
 
 	//$ret=$user->xxx;
 	$ret = '';
-	if (!empty($conf->geoipmaxmind->enabled))
-	{
+	if (!empty($conf->geoipmaxmind->enabled)) {
 		$ip = getUserRemoteIP();
 		$datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
 		//$ip='24.24.24.24';
@@ -3037,40 +3137,54 @@ function dol_print_address($address, $htmlid, $element, $id, $noprint = 0, $char
 
 	$out = '';
 
-	if ($address)
-	{
+	if ($address) {
 		if ($hookmanager) {
 			$parameters = array('element' => $element, 'id' => $id);
 			$reshook = $hookmanager->executeHooks('printAddress', $parameters, $address);
 			$out .= $hookmanager->resPrint;
 		}
-		if (empty($reshook))
-		{
-			if (empty($charfornl)) $out .= nl2br($address);
-			else $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+		if (empty($reshook)) {
+			if (empty($charfornl)) {
+				$out .= nl2br($address);
+			} else {
+				$out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+			}
 
 			// TODO Remove this block, we can add this using the hook now
 			$showgmap = $showomap = 0;
-			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) $showgmap = 1;
-			if ($element == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) $showgmap = 1;
-			if ($element == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) $showgmap = 1;
-			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) $showomap = 1;
-			if ($element == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) $showomap = 1;
-			if ($element == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) $showomap = 1;
-			if ($showgmap)
-			{
+			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) {
+				$showgmap = 1;
+			}
+			if ($element == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+				$showgmap = 1;
+			}
+			if ($element == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+				$showgmap = 1;
+			}
+			if (($element == 'thirdparty' || $element == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+				$showomap = 1;
+			}
+			if ($element == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+				$showomap = 1;
+			}
+			if ($element == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+				$showomap = 1;
+			}
+			if ($showgmap) {
 				$url = dol_buildpath('/google/gmaps.php?mode='.$element.'&id='.$id, 1);
 				$out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
 			}
-			if ($showomap)
-			{
+			if ($showomap) {
 				$url = dol_buildpath('/openstreetmap/maps.php?mode='.$element.'&id='.$id, 1);
 				$out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';
 			}
 		}
 	}
-	if ($noprint) return $out;
-	else print $out;
+	if ($noprint) {
+		return $out;
+	} else {
+		print $out;
+	}
 }
 
 
@@ -3084,8 +3198,12 @@ function dol_print_address($address, $htmlid, $element, $id, $noprint = 0, $char
  */
 function isValidEmail($address, $acceptsupervisorkey = 0)
 {
-	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') return true;
-	if (filter_var($address, FILTER_VALIDATE_EMAIL)) return true;
+	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+		return true;
+	}
+	if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+		return true;
+	}
 
 	return false;
 }
@@ -3100,19 +3218,20 @@ function isValidEmail($address, $acceptsupervisorkey = 0)
  */
 function isValidMXRecord($domain)
 {
-	if (function_exists('idn_to_ascii') && function_exists('checkdnsrr'))
-	{
-		if (!checkdnsrr(idn_to_ascii($domain), 'MX'))
-		{
+	if (function_exists('idn_to_ascii') && function_exists('checkdnsrr')) {
+		if (!checkdnsrr(idn_to_ascii($domain), 'MX')) {
 			return 0;
 		}
-		if (function_exists('getmxrr'))
-		{
+		if (function_exists('getmxrr')) {
 			$mxhosts = array();
 			$weight = array();
 			getmxrr(idn_to_ascii($domain), $mxhosts, $weight);
-			if (count($mxhosts) > 1) return 1;
-			if (count($mxhosts) == 1 && !empty($mxhosts[0])) return 1;
+			if (count($mxhosts) > 1) {
+				return 1;
+			}
+			if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+				return 1;
+			}
 
 			return 0;
 		}
@@ -3142,8 +3261,11 @@ function isValidPhone($phone)
  */
 function dol_strlen($string, $stringencoding = 'UTF-8')
 {
-	if (function_exists('mb_strlen')) return mb_strlen($string, $stringencoding);
-	else return strlen($string);
+	if (function_exists('mb_strlen')) {
+		return mb_strlen($string, $stringencoding);
+	} else {
+		return strlen($string);
+	}
 }
 
 /**
@@ -3160,20 +3282,19 @@ function dol_substr($string, $start, $length, $stringencoding = '', $trunconbyte
 {
 	global $langs;
 
-	if (empty($stringencoding)) $stringencoding = $langs->charset_output;
+	if (empty($stringencoding)) {
+		$stringencoding = $langs->charset_output;
+	}
 
 	$ret = '';
-	if (empty($trunconbytes))
-	{
-		if (function_exists('mb_substr'))
-		{
+	if (empty($trunconbytes)) {
+		if (function_exists('mb_substr')) {
 			$ret = mb_substr($string, $start, $length, $stringencoding);
 		} else {
 			$ret = substr($string, $start, $length);
 		}
 	} else {
-		if (function_exists('mb_strcut'))
-		{
+		if (function_exists('mb_strcut')) {
 			$ret = mb_strcut($string, $start, $length, $stringencoding);
 		} else {
 			$ret = substr($string, $start, $length);
@@ -3208,7 +3329,9 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 		$stringencoding = 'UTF-8';
 	}
 	// reduce for small screen
-	if ($conf->dol_optimize_smallscreen == 1 && $display == 1) $size = round($size / 3);
+	if ($conf->dol_optimize_smallscreen == 1 && $display == 1) {
+		$size = round($size / 3);
+	}
 
 	// We go always here
 	if ($trunc == 'right') {
@@ -3324,8 +3447,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'shapes', 'supplier_proposal', 'supplier_order', 'supplier_invoice', 'user-cog',
 				'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
 				'eventorganization', 'object_eventorganization'
-			)
-		)) {
+			))) {
 			$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 
 			$fakey = $pictowithouttext;
@@ -3389,7 +3511,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			} elseif (in_array($pictowithouttext, array('1uparrow', '1downarrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected'))) {
 				$convertarray = array('1uparrow'=>'caret-up', '1downarrow'=>'caret-down', '1leftarrow'=>'caret-left', '1rightarrow'=>'caret-right', '1uparrow_selected'=>'caret-up', '1downarrow_selected'=>'caret-down', '1leftarrow_selected'=>'caret-left', '1rightarrow_selected'=>'caret-right');
 				$fakey = 'fa-'.$convertarray[$pictowithouttext];
-				if (preg_match('/selected/', $pictowithouttext)) $facolor = '#888';
+				if (preg_match('/selected/', $pictowithouttext)) {
+					$facolor = '#888';
+				}
 				$marginleftonlyshort = 1;
 			} elseif (!empty($arrayconvpictotofa[$pictowithouttext])) {
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
@@ -3542,8 +3666,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
  */
 function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)
 {
-	if (strpos($picto, '^') === 0) return img_picto($titlealt, str_replace('^', '', $picto), $moreatt, $pictoisfullpath, $srconly, $notitle);
-	else return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
+	if (strpos($picto, '^') === 0) {
+		return img_picto($titlealt, str_replace('^', '', $picto), $moreatt, $pictoisfullpath, $srconly, $notitle);
+	} else {
+		return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);
+	}
 }
 
 /**
@@ -3588,17 +3715,21 @@ function img_picto_common($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0
 {
 	global $conf;
 
-	if (!preg_match('/(\.png|\.gif)$/i', $picto)) $picto .= '.png';
+	if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+		$picto .= '.png';
+	}
 
-	if ($pictoisfullpath) $path = $picto;
-	else {
+	if ($pictoisfullpath) {
+		$path = $picto;
+	} else {
 		$path = DOL_URL_ROOT.'/theme/common/'.$picto;
 
-		if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS))
-		{
+		if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {
 			$themepath = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/img/'.$picto;
 
-			if (file_exists($themepath)) $path = $themepath;
+			if (file_exists($themepath)) {
+				$path = $themepath;
+			}
 		}
 	}
 
@@ -3621,8 +3752,7 @@ function img_action($titlealt, $numaction, $picto = '')
 {
 	global $langs;
 
-	if (empty($titlealt) || $titlealt == 'default')
-	{
+	if (empty($titlealt) || $titlealt == 'default') {
 		if ($numaction == '-1' || $numaction == 'ST_NO') {
 			$numaction = -1;
 			$titlealt = $langs->transnoentitiesnoconv('ChangeDoNotContact');
@@ -3643,7 +3773,9 @@ function img_action($titlealt, $numaction, $picto = '')
 			$numaction = 0;
 		}
 	}
-	if (!is_numeric($numaction)) $numaction = 0;
+	if (!is_numeric($numaction)) {
+		$numaction = 0;
+	}
 
 	return img_picto($titlealt, !empty($picto) ? $picto : 'stcomm'.$numaction.'.png');
 }
@@ -3659,7 +3791,9 @@ function img_pdf($titlealt = 'default', $size = 3)
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Show');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Show');
+	}
 
 	return img_picto($titlealt, 'pdf'.$size.'.png');
 }
@@ -3675,7 +3809,9 @@ function img_edit_add($titlealt = 'default', $other = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Add');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Add');
+	}
 
 	return img_picto($titlealt, 'edit_add.png', $other);
 }
@@ -3690,7 +3826,9 @@ function img_edit_remove($titlealt = 'default', $other = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Remove');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Remove');
+	}
 
 	return img_picto($titlealt, 'edit_remove.png', $other);
 }
@@ -3707,7 +3845,9 @@ function img_edit($titlealt = 'default', $float = 0, $other = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Modify');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Modify');
+	}
 
 	return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right').'"' : "").($other ? ' '.$other : ''));
 }
@@ -3724,7 +3864,9 @@ function img_view($titlealt = 'default', $float = 0, $other = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('View');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('View');
+	}
 
 	$moreatt = ($float ? 'style="float: right" ' : '').$other;
 
@@ -3743,7 +3885,9 @@ function img_delete($titlealt = 'default', $other = 'class="pictodelete"', $more
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Delete');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Delete');
+	}
 
 	return img_picto($titlealt, 'delete.png', $other, false, 0, 0, '', $morecss);
 }
@@ -3758,7 +3902,9 @@ function img_delete($titlealt = 'default', $other = 'class="pictodelete"', $more
 function img_printer($titlealt = "default", $other = '')
 {
 	global $langs;
-	if ($titlealt == "default") $titlealt = $langs->trans("Print");
+	if ($titlealt == "default") {
+		$titlealt = $langs->trans("Print");
+	}
 	return img_picto($titlealt, 'printer.png', $other);
 }
 
@@ -3773,7 +3919,9 @@ function img_split($titlealt = 'default', $other = 'class="pictosplit"')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Split');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Split');
+	}
 
 	return img_picto($titlealt, 'split.png', $other);
 }
@@ -3789,10 +3937,12 @@ function img_help($usehelpcursor = 1, $usealttitle = 1)
 {
 	global $langs;
 
-	if ($usealttitle)
-	{
-		if (is_string($usealttitle)) $usealttitle = dol_escape_htmltag($usealttitle);
-		else $usealttitle = $langs->trans('Info');
+	if ($usealttitle) {
+		if (is_string($usealttitle)) {
+			$usealttitle = dol_escape_htmltag($usealttitle);
+		} else {
+			$usealttitle = $langs->trans('Info');
+		}
 	}
 
 	return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')).'"');
@@ -3808,7 +3958,9 @@ function img_info($titlealt = 'default')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Informations');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Informations');
+	}
 
 	return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');
 }
@@ -3825,7 +3977,9 @@ function img_warning($titlealt = 'default', $moreatt = '', $morecss = 'pictowarn
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Warning');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Warning');
+	}
 
 	//return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';
 	return img_picto($titlealt, 'warning.png', 'class="'.$morecss.'"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt) : ''));
@@ -3841,7 +3995,9 @@ function img_error($titlealt = 'default')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Error');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Error');
+	}
 
 	return img_picto($titlealt, 'error.png');
 }
@@ -3857,7 +4013,9 @@ function img_next($titlealt = 'default', $moreatt = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Next');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Next');
+	}
 
 	//return img_picto($titlealt, 'next.png', $moreatt);
 	return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
@@ -3874,7 +4032,9 @@ function img_previous($titlealt = 'default', $moreatt = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Previous');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Previous');
+	}
 
 	//return img_picto($titlealt, 'previous.png', $moreatt);
 	return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';
@@ -3892,7 +4052,9 @@ function img_down($titlealt = 'default', $selected = 0, $moreclass = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Down');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Down');
+	}
 
 	return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass ? " ".$moreclass : "").'"');
 }
@@ -3909,7 +4071,9 @@ function img_up($titlealt = 'default', $selected = 0, $moreclass = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Up');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Up');
+	}
 
 	return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass ? " ".$moreclass : "").'"');
 }
@@ -3945,7 +4109,9 @@ function img_right($titlealt = 'default', $selected = 0, $moreatt = '')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Right');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Right');
+	}
 
 	return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);
 }
@@ -3961,9 +4127,13 @@ function img_allow($allow, $titlealt = 'default')
 {
 	global $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Active');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Active');
+	}
 
-	if ($allow == 1) return img_picto($titlealt, 'tick.png');
+	if ($allow == 1) {
+		return img_picto($titlealt, 'tick.png');
+	}
 
 	return '-';
 }
@@ -3977,7 +4147,9 @@ function img_allow($allow, $titlealt = 'default')
  */
 function img_credit_card($brand, $morecss = null)
 {
-	if (is_null($morecss)) $morecss = 'fa-2x';
+	if (is_null($morecss)) {
+		$morecss = 'fa-2x';
+	}
 
 	if ($brand == 'visa' || $brand == 'Visa') {
 		$brand = 'cc-visa';
@@ -4014,7 +4186,9 @@ function img_mime($file, $titlealt = '', $morecss = '')
 	$mimeimg = dol_mimetype($file, '', 2);
 	$mimefa = dol_mimetype($file, '', 4);
 
-	if (empty($titlealt)) $titlealt = 'Mime type: '.$mimetype;
+	if (empty($titlealt)) {
+		$titlealt = 'Mime type: '.$mimetype;
+	}
 
 	//return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');
 	return '<i class="fa fa-'.$mimefa.' paddingright"'.($titlealt ? ' title="'.$titlealt.'"' : '').'></i>';
@@ -4032,7 +4206,9 @@ function img_search($titlealt = 'default', $other = '')
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Search');
+	}
 
 	$img = img_picto($titlealt, 'search.png', $other, false, 1);
 
@@ -4053,7 +4229,9 @@ function img_searchclear($titlealt = 'default', $other = '')
 {
 	global $conf, $langs;
 
-	if ($titlealt == 'default') $titlealt = $langs->trans('Search');
+	if ($titlealt == 'default') {
+		$titlealt = $langs->trans('Search');
+	}
 
 	$img = img_picto($titlealt, 'searchclear.png', $other, false, 1);
 
@@ -4078,11 +4256,12 @@ function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss
 {
 	global $conf, $langs;
 
-	if ($infoonimgalt)
-	{
+	if ($infoonimgalt) {
 		$result = img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');
 	} else {
-		if (empty($conf->use_javascript_ajax)) $textfordropdown = '';
+		if (empty($conf->use_javascript_ajax)) {
+			$textfordropdown = '';
+		}
 
 		$class = (empty($admin) ? 'undefined' : ($admin == '1' ? 'info' : $admin));
 		$result = ($nodiv ? '' : '<div class="'.$class.' hideonsmartphone'.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');
@@ -4126,8 +4305,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 	$syslog = '';
 
 	// If error occurs before the $lang object was loaded
-	if (!$langs)
-	{
+	if (!$langs) {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 		$langs = new Translate('', $conf);
 		$langs->load("main");
@@ -4136,22 +4314,23 @@ function dol_print_error($db = '', $error = '', $errors = null)
 	// Load translation files required by the error messages
 	$langs->loadLangs(array('main', 'errors'));
 
-	if ($_SERVER['DOCUMENT_ROOT'])    // Mode web
-	{
+	if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web
 		$out .= $langs->trans("DolibarrHasDetectedError").".<br>\n";
-		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $out .= "You use an experimental or develop level of features, so please do NOT report any bugs or vulnerability, except if problem is confirmed after moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+			$out .= "You use an experimental or develop level of features, so please do NOT report any bugs or vulnerability, except if problem is confirmed after moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+		}
 		$out .= $langs->trans("InformationToHelpDiagnose").":<br>\n";
 
 		$out .= "<b>".$langs->trans("Date").":</b> ".dol_print_date(time(), 'dayhourlog')."<br>\n";
 		$out .= "<b>".$langs->trans("Dolibarr").":</b> ".DOL_VERSION." - https://www.dolibarr.org<br>\n";
-		if (isset($conf->global->MAIN_FEATURES_LEVEL)) $out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".dol_htmlentities($conf->global->MAIN_FEATURES_LEVEL, ENT_COMPAT)."<br>\n";
-		if (function_exists("phpversion"))
-		{
+		if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
+			$out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".dol_htmlentities($conf->global->MAIN_FEATURES_LEVEL, ENT_COMPAT)."<br>\n";
+		}
+		if (function_exists("phpversion")) {
 			$out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";
 		}
 		$out .= "<b>".$langs->trans("Server").":</b> ".(isset($_SERVER["SERVER_SOFTWARE"]) ? dol_htmlentities($_SERVER["SERVER_SOFTWARE"], ENT_COMPAT) : '')."<br>\n";
-		if (function_exists("php_uname"))
-		{
+		if (function_exists("php_uname")) {
 			$out .= "<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";
 		}
 		$out .= "<b>".$langs->trans("UserAgent").":</b> ".(isset($_SERVER["HTTP_USER_AGENT"]) ? dol_htmlentities($_SERVER["HTTP_USER_AGENT"], ENT_COMPAT) : '')."<br>\n";
@@ -4168,15 +4347,12 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		$syslog .= "pid=".dol_getmypid();
 	}
 
-	if (!empty($conf->modules))
-	{
+	if (!empty($conf->modules)) {
 		$out .= "<b>".$langs->trans("Modules").":</b> ".join(', ', $conf->modules)."<br>\n";
 	}
 
-	if (is_object($db))
-	{
-		if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
-		{
+	if (is_object($db)) {
+		if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web
 			$out .= "<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";
 			$out .= "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror() ? dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
 			$out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ? dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";
@@ -4194,21 +4370,25 @@ function dol_print_error($db = '', $error = '', $errors = null)
 		$syslog .= ", db_error=".$db->lasterror();
 	}
 
-	if ($error || $errors)
-	{
+	if ($error || $errors) {
 		$langs->load("errors");
 
 		// Merge all into $errors array
-		if (is_array($error) && is_array($errors)) $errors = array_merge($error, $errors);
-		elseif (is_array($error)) $errors = $error;
-		elseif (is_array($errors)) $errors = array_merge(array($error), $errors);
-		else $errors = array_merge(array($error));
+		if (is_array($error) && is_array($errors)) {
+			$errors = array_merge($error, $errors);
+		} elseif (is_array($error)) {
+			$errors = $error;
+		} elseif (is_array($errors)) {
+			$errors = array_merge(array($error), $errors);
+		} else {
+			$errors = array_merge(array($error));
+		}
 
-		foreach ($errors as $msg)
-		{
-			if (empty($msg)) continue;
-			if ($_SERVER['DOCUMENT_ROOT'])  // Mode web
-			{
+		foreach ($errors as $msg) {
+			if (empty($msg)) {
+				continue;
+			}
+			if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web
 				$out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";
 			} else // Mode CLI
 			{
@@ -4217,8 +4397,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 			$syslog .= ", msg=".$msg;
 		}
 	}
-	if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file'))
-	{
+	if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file')) {
 		xdebug_print_function_stack();
 		$out .= '<b>XDebug informations:</b>'."<br>\n";
 		$out .= 'File: '.xdebug_call_file()."<br>\n";
@@ -4235,7 +4414,9 @@ function dol_print_error($db = '', $error = '', $errors = null)
 	if (empty($dolibarr_main_prod)) {
 		print $out;
 	} else {
-		if (empty($langs->defaultlang)) $langs->setDefaultLang();
+		if (empty($langs->defaultlang)) {
+			$langs->setDefaultLang();
+		}
 		$langs->loadLangs(array("main", "errors")); // Reload main because language may have been set only on previous line so we have to reload files we need.
 		// This should not happen, except if there is a bug somewhere. Enabled and check log in such case.
 		print 'This website or feature is currently temporarly not available or failed after a technical error.<br><br>This may be due to a maintenance operation. Current status of operation are on next line...<br><br>'."\n";
@@ -4261,18 +4442,20 @@ function dol_print_error_email($prefixcode, $errormessage = '', $errormessages =
 {
 	global $langs, $conf;
 
-	if (empty($email)) $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+	if (empty($email)) {
+		$email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+	}
 
 	$langs->load("errors");
 	$now = dol_now();
 
 	print '<br><div class="center login_main_message"><div class="'.$morecss.'">';
 	print $langs->trans("ErrorContactEMail", $email, $prefixcode.dol_print_date($now, '%Y%m%d%H%M%S'));
-	if ($errormessage) print '<br><br>'.$errormessage;
-	if (is_array($errormessages) && count($errormessages))
-	{
-		foreach ($errormessages as $mesgtoshow)
-		{
+	if ($errormessage) {
+		print '<br><br>'.$errormessage;
+	}
+	if (is_array($errormessages) && count($errormessages)) {
+		foreach ($errormessages as $mesgtoshow) {
 			print '<br><br>'.$mesgtoshow;
 		}
 	}
@@ -4323,14 +4506,18 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	global $conf, $langs, $form;
 	//print "$name, $file, $field, $begin, $options, $moreattrib, $sortfield, $sortorder<br>\n";
 
-	if ($moreattrib == 'class="right"') $prefix .= 'right '; // For backward compatibility
+	if ($moreattrib == 'class="right"') {
+		$prefix .= 'right '; // For backward compatibility
+	}
 
 	$sortorder = strtoupper($sortorder);
 	$out = '';
 	$sortimg = '';
 
 	$tag = 'th';
-	if ($thead == 2) $tag = 'div';
+	if ($thead == 2) {
+		$tag = 'div';
+	}
 
 	$tmpsortfield = explode(',', $sortfield);
 	$sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'
@@ -4353,18 +4540,17 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 	$out .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
 	$out .= '>';
 
-	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
-	{
+	if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field
 		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
 		$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
 		$options = preg_replace('/&+/i', '&', $options);
-		if (!preg_match('/^&/', $options)) $options = '&'.$options;
+		if (!preg_match('/^&/', $options)) {
+			$options = '&'.$options;
+		}
 
 		$sortordertouseinlink = '';
-		if ($field1 != $sortfield1) // We are on another field than current sorted field
-		{
-			if (preg_match('/^DESC/i', $sortorder))
-			{
+		if ($field1 != $sortfield1) { // We are on another field than current sorted field
+			if (preg_match('/^DESC/i', $sortorder)) {
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
 			} else // We reverse the var $sortordertouseinlink
 			{
@@ -4372,8 +4558,7 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 			}
 		} else // We are on field that is the first current sorting criteria
 		{
-			if (preg_match('/^ASC/i', $sortorder))	// We reverse the var $sortordertouseinlink
-			{
+			if (preg_match('/^ASC/i', $sortorder)) {	// We reverse the var $sortordertouseinlink
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
 			} else {
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
@@ -4389,23 +4574,23 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		// You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 		$tmptooltip = explode(':', $tooltip);
 		$out .= $form->textwithpicto($langs->trans($name), $langs->trans($tmptooltip[0]), 1, 'help', '', 0, 3, (empty($tmptooltip[1]) ? '' : 'extra_'.str_replace('.', '_', $field).'_'.$tmptooltip[1]));
+	} else {
+		$out .= $langs->trans($name);
 	}
-	else $out .= $langs->trans($name);
 
-	if (empty($thead) && $field && empty($disablesortlink))    // If this is a sort field
-	{
+	if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field
 		$out .= '</a>';
 	}
 
-	if (empty($thead) && $field)    // If this is a sort field
-	{
+	if (empty($thead) && $field) {    // If this is a sort field
 		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
 		$options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);
 		$options = preg_replace('/&+/i', '&', $options);
-		if (!preg_match('/^&/', $options)) $options = '&'.$options;
+		if (!preg_match('/^&/', $options)) {
+			$options = '&'.$options;
+		}
 
-		if (!$sortorder || $field1 != $sortfield1)
-		{
+		if (!$sortorder || $field1 != $sortfield1) {
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 			//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
 		} else {
@@ -4479,21 +4664,23 @@ function load_fiche_titre($titre, $morehtmlright = '', $picto = 'generic', $pict
 
 	$return = '';
 
-	if ($picto == 'setup') $picto = 'generic';
+	if ($picto == 'setup') {
+		$picto = 'generic';
+	}
 
 	$return .= "\n";
 	$return .= '<table '.($id ? 'id="'.$id.'" ' : '').'class="centpercent notopnoleftnoright table-fiche-title'.($morecssontable ? ' '.$morecssontable : '').'">'; // maring bottom must be same than into print_barre_list
 	$return .= '<tr class="titre">';
-	if ($picto) $return .= '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';
+	if ($picto) {
+		$return .= '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';
+	}
 	$return .= '<td class="nobordernopadding valignmiddle col-title">';
 	$return .= '<div class="titre inline-block">'.$titre.'</div>';
 	$return .= '</td>';
-	if (dol_strlen($morehtmlcenter))
-	{
+	if (dol_strlen($morehtmlcenter)) {
 		$return .= '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';
 	}
-	if (dol_strlen($morehtmlright))
-	{
+	if (dol_strlen($morehtmlright)) {
 		$return .= '<td class="nobordernopadding titre_right wordbreakimp right valignmiddle">'.$morehtmlright.'</td>';
 	}
 	$return .= '</tr></table>'."\n";
@@ -4532,11 +4719,16 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 	$savtotalnboflines = $totalnboflines;
 	$totalnboflines = abs((int) $totalnboflines);
 
-	if ($picto == 'setup') $picto = 'title_setup.png';
-	if (($conf->browser->name == 'ie') && $picto == 'generic') $picto = 'title.gif';
-	if ($limit < 0) $limit = $conf->liste_limit;
-	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0)))
-	{
+	if ($picto == 'setup') {
+		$picto = 'title_setup.png';
+	}
+	if (($conf->browser->name == 'ie') && $picto == 'generic') {
+		$picto = 'title.gif';
+	}
+	if ($limit < 0) {
+		$limit = $conf->liste_limit;
+	}
+	if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {
 		$nextpage = 1;
 	} else {
 		$nextpage = 0;
@@ -4549,57 +4741,67 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 
 	// Left
 
-	if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
+	if ($picto && $titre) {
+		print '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
+	}
 	print '<td class="nobordernopadding valignmiddle col-title">';
 	print '<div class="titre inline-block">'.$titre;
-	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '<span class="opacitymedium colorblack paddingleft">('.$totalnboflines.')</span>';
+	if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+		print '<span class="opacitymedium colorblack paddingleft">('.$totalnboflines.')</span>';
+	}
 	print '</div></td>';
 
 	// Center
-	if ($morehtmlcenter)
-	{
+	if ($morehtmlcenter) {
 		print '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';
 	}
 
 	// Right
 	print '<td class="nobordernopadding valignmiddle right">';
 	print '<input type="hidden" name="pageplusoneold" value="'.((int) $page + 1).'">';
-	if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);
-	if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);
+	if ($sortfield) {
+		$options .= "&sortfield=".urlencode($sortfield);
+	}
+	if ($sortorder) {
+		$options .= "&sortorder=".urlencode($sortorder);
+	}
 	// Show navigation bar
 	$pagelist = '';
-	if ($savlimit != 0 && ($page > 0 || $num > $limit))
-	{
-		if ($totalnboflines)	// If we know total nb of lines
-		{
+	if ($savlimit != 0 && ($page > 0 || $num > $limit)) {
+		if ($totalnboflines) {	// If we know total nb of lines
 			// Define nb of extra page links before and after selected page + ... + first or last
 			$maxnbofpage = (empty($conf->dol_optimize_smallscreen) ? 4 : 0);
 
-			if ($limit > 0) $nbpages = ceil($totalnboflines / $limit);
-			else $nbpages = 1;
+			if ($limit > 0) {
+				$nbpages = ceil($totalnboflines / $limit);
+			} else {
+				$nbpages = 1;
+			}
 			$cpt = ($page - $maxnbofpage);
-			if ($cpt < 0) { $cpt = 0; }
+			if ($cpt < 0) {
+				$cpt = 0;
+			}
 
-			if ($cpt >= 1)
-			{
+			if ($cpt >= 1) {
 				if (empty($pagenavastextinput)) {
 					$pagelist .= '<li class="pagination"><a href="'.$file.'?page=0'.$options.'">1</a></li>';
-					if ($cpt > 2) $pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
-					elseif ($cpt == 2) $pagelist .= '<li class="pagination"><a href="'.$file.'?page=1'.$options.'">2</a></li>';
+					if ($cpt > 2) {
+						$pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
+					} elseif ($cpt == 2) {
+						$pagelist .= '<li class="pagination"><a href="'.$file.'?page=1'.$options.'">2</a></li>';
+					}
 				}
 			}
 
 			do {
 				if ($pagenavastextinput) {
-					if ($cpt == $page)
-					{
+					if ($cpt == $page) {
 						$pagelist .= '<li class="pagination"><input type="text" class="width25 center pageplusone" name="pageplusone" value="'.($page + 1).'"></li>';
 						$pagelist .= '/';
 						//if (($cpt + 1) < $nbpages) $pagelist .= '/';
 					}
 				} else {
-					if ($cpt == $page)
-					{
+					if ($cpt == $page) {
 						$pagelist .= '<li class="pagination"><span class="active">'.($page + 1).'</span></li>';
 					} else {
 						$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';
@@ -4609,10 +4811,12 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 			} while ($cpt < $nbpages && $cpt <= ($page + $maxnbofpage));
 
 			if (empty($pagenavastextinput)) {
-				if ($cpt < $nbpages)
-				{
-					if ($cpt < $nbpages - 2) $pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
-					elseif ($cpt == $nbpages - 2) $pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';
+				if ($cpt < $nbpages) {
+					if ($cpt < $nbpages - 2) {
+						$pagelist .= '<li class="pagination"><span class="inactive">...</span></li>';
+					} elseif ($cpt == $nbpages - 2) {
+						$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';
+					}
 					$pagelist .= '<li class="pagination"><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';
 				}
 			} else {
@@ -4661,45 +4865,45 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
 	global $conf, $langs;
 
 	print '<div class="pagination"><ul>';
-	if ($beforearrows)
-	{
+	if ($beforearrows) {
 		print '<li class="paginationbeforearrows">';
 		print $beforearrows;
 		print '</li>';
 	}
-	if ((int) $limit > 0 && empty($hideselectlimit))
-	{
+	if ((int) $limit > 0 && empty($hideselectlimit)) {
 		$pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000,25000:25000';
 		//$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported
 		//$pagesizechoices.=',2:2';
-		if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
+		if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) {
+			$pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
+		}
 
 		print '<li class="pagination">';
 		print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';
 		$tmpchoice = explode(',', $pagesizechoices);
 		$tmpkey = $limit.':'.$limit;
-		if (!in_array($tmpkey, $tmpchoice)) $tmpchoice[] = $tmpkey;
+		if (!in_array($tmpkey, $tmpchoice)) {
+			$tmpchoice[] = $tmpkey;
+		}
 		$tmpkey = $conf->liste_limit.':'.$conf->liste_limit;
-		if (!in_array($tmpkey, $tmpchoice)) $tmpchoice[] = $tmpkey;
+		if (!in_array($tmpkey, $tmpchoice)) {
+			$tmpchoice[] = $tmpkey;
+		}
 		asort($tmpchoice, SORT_NUMERIC);
-		foreach ($tmpchoice as $val)
-		{
+		foreach ($tmpchoice as $val) {
 			$selected = '';
 			$tmp = explode(':', $val);
 			$key = $tmp[0];
 			$val = $tmp[1];
-			if ($key != '' && $val != '')
-			{
-				if ((int) $key == (int) $limit)
-				{
+			if ($key != '' && $val != '') {
+				if ((int) $key == (int) $limit) {
 					$selected = ' selected="selected"';
 				}
 				print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";
 			}
 		}
 		print '</select>';
-		if ($conf->use_javascript_ajax)
-		{
+		if ($conf->use_javascript_ajax) {
 			print '<!-- JS CODE TO ENABLE select limit to launch submit of page -->
             		<script>
                 	jQuery(document).ready(function () {
@@ -4713,22 +4917,18 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
 		}
 		print '</li>';
 	}
-	if ($page > 0)
-	{
+	if ($page > 0) {
 		print '<li class="pagination paginationpage paginationpageleft"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';
 	}
-	if ($betweenarrows)
-	{
+	if ($betweenarrows) {
 		print '<!--<div class="betweenarrows nowraponall inline-block">-->';
 		print $betweenarrows;
 		print '<!--</div>-->';
 	}
-	if ($nextpage > 0)
-	{
+	if ($nextpage > 0) {
 		print '<li class="pagination paginationpage paginationpageright"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';
 	}
-	if ($afterarrows)
-	{
+	if ($afterarrows) {
 		print '<li class="paginationafterarrows">';
 		print $afterarrows;
 		print '</li>';
@@ -4751,29 +4951,29 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)
 {
 	$morelabel = '';
 
-	if (preg_match('/%/', $rate))
-	{
+	if (preg_match('/%/', $rate)) {
 		$rate = str_replace('%', '', $rate);
 		$addpercent = true;
 	}
-	if (preg_match('/\((.*)\)/', $rate, $reg))
-	{
+	if (preg_match('/\((.*)\)/', $rate, $reg)) {
 		$morelabel = ' ('.$reg[1].')';
 		$rate = preg_replace('/\s*'.preg_quote($morelabel, '/').'/', '', $rate);
 	}
-	if (preg_match('/\*/', $rate))
-	{
+	if (preg_match('/\*/', $rate)) {
 		$rate = str_replace('*', '', $rate);
 		$info_bits |= 1;
 	}
 
 	// If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()
-	if (!preg_match('/\//', $rate)) $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');
-	else {
+	if (!preg_match('/\//', $rate)) {
+		$ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');
+	} else {
 		// TODO Split on / and output with a price2num to have clean numbers without ton of 000.
 		$ret = $rate.($addpercent ? '%' : '');
 	}
-	if (($info_bits & 1) && $usestarfornpr >= 0) $ret .= ' *';
+	if (($info_bits & 1) && $usestarfornpr >= 0) {
+		$ret .= ' *';
+	}
 	$ret .= $morelabel;
 	return $ret;
 }
@@ -4799,21 +4999,34 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 	global $langs, $conf;
 
 	// Clean parameters
-	if (empty($amount)) $amount = 0; // To have a numeric value if amount not defined or = ''
+	if (empty($amount)) {
+		$amount = 0; // To have a numeric value if amount not defined or = ''
+	}
 	$amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
-	if ($rounding < 0) $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+	if ($rounding < 0) {
+		$rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+	}
 	$nbdecimal = $rounding;
 
 	// Output separators by default (french)
 	$dec = ','; $thousand = ' ';
 
 	// If $outlangs not forced, we use use language
-	if (!is_object($outlangs)) $outlangs = $langs;
+	if (!is_object($outlangs)) {
+		$outlangs = $langs;
+	}
 
-	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand = '';
-	elseif ($thousand == 'Space') $thousand = ' ';
+	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+		$dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+	}
+	if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+		$thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+	}
+	if ($thousand == 'None') {
+		$thousand = '';
+	} elseif ($thousand == 'Space') {
+		$thousand = ' ';
+	}
 	//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	//print "amount=".$amount."-";
@@ -4826,38 +5039,39 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 	$end = '';
 
 	// We increase nbdecimal if there is more decimal than asked (to not loose information)
-	if (dol_strlen($decpart) > $nbdecimal) $nbdecimal = dol_strlen($decpart);
+	if (dol_strlen($decpart) > $nbdecimal) {
+		$nbdecimal = dol_strlen($decpart);
+	}
 	// Si on depasse max
-	if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN)
-	{
+	if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN) {
 		$nbdecimal = $conf->global->MAIN_MAX_DECIMALS_SHOWN;
-		if (preg_match('/\.\.\./i', $conf->global->MAIN_MAX_DECIMALS_SHOWN))
-		{
+		if (preg_match('/\.\.\./i', $conf->global->MAIN_MAX_DECIMALS_SHOWN)) {
 			// Si un affichage est tronque, on montre des ...
 			$end = '...';
 		}
 	}
 
 	// If force rounding
-	if ($forcerounding >= 0) $nbdecimal = $forcerounding;
+	if ($forcerounding >= 0) {
+		$nbdecimal = $forcerounding;
+	}
 
 	// Format number
 	$output = number_format($amount, $nbdecimal, $dec, $thousand);
-	if ($form)
-	{
+	if ($form) {
 		$output = preg_replace('/\s/', '&nbsp;', $output);
 		$output = preg_replace('/\'/', '&#039;', $output);
 	}
 	// Add symbol of currency if requested
 	$cursymbolbefore = $cursymbolafter = '';
-	if ($currency_code)
-	{
-		if ($currency_code == 'auto') $currency_code = $conf->currency;
+	if ($currency_code) {
+		if ($currency_code == 'auto') {
+			$currency_code = $conf->currency;
+		}
 
 		$listofcurrenciesbefore = array('AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD');
 		$listoflanguagesbefore = array('nl_NL');
-		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore))
-		{
+		if (in_array($currency_code, $listofcurrenciesbefore) || in_array($outlangs->defaultlang, $listoflanguagesbefore)) {
 			$cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
 		} else {
 			$tmpcur = $outlangs->getCurrencySymbol($currency_code);
@@ -4898,10 +5112,17 @@ function price2num($amount, $rounding = '', $option = 0)
 	// Numbers must be '1234.56'
 	// Decimal delimiter for PHP and database SQL requests must be '.'
 	$dec = ','; $thousand = ' ';
-	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")  $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
-	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
-	if ($thousand == 'None') $thousand = '';
-	elseif ($thousand == 'Space') $thousand = ' ';
+	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+		$dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+	}
+	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+		$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+	}
+	if ($thousand == 'None') {
+		$thousand = '';
+	} elseif ($thousand == 'Space') {
+		$thousand = ' ';
+	}
 	//print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
 	// Convert value to universal number format (no thousand separator, '.' as decimal separator)
@@ -4918,8 +5139,7 @@ function price2num($amount, $rounding = '', $option = 0)
 		// Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number
 		// to format defined by LC_NUMERIC after a calculation and we want source format to be like defined by Dolibarr setup.
 		// So if number was already a good number, it is converted into local Dolibarr setup.
-		if (is_numeric($amount))
-		{
+		if (is_numeric($amount)) {
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
 			$temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000
 			$temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1
@@ -4938,34 +5158,32 @@ function price2num($amount, $rounding = '', $option = 0)
 	}
 
 	// Now, make a rounding if required
-	if ($rounding)
-	{
+	if ($rounding) {
 		$nbofdectoround = '';
 		if ($rounding == 'MU') {
 			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
-		}
-		elseif ($rounding == 'MT') {
+		} elseif ($rounding == 'MT') {
 			$nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
-		}
-		elseif ($rounding == 'MS') {
+		} elseif ($rounding == 'MS') {
 			$nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
-		}
-		elseif ($rounding == 'CU') {
+		} elseif ($rounding == 'CU') {
 			$nbofdectoround = max($conf->global->MAIN_MAX_DECIMALS_UNIT, 8);	// TODO Use param of currency
-		}
-		elseif ($rounding == 'CT') {
+		} elseif ($rounding == 'CT') {
 			$nbofdectoround = max($conf->global->MAIN_MAX_DECIMALS_TOT, 8);		// TODO Use param of currency
+		} elseif (is_numeric($rounding)) {
+			$nbofdectoround = (int) $rounding;
 		}
-		elseif (is_numeric($rounding))  $nbofdectoround = (int) $rounding;
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
-		if (dol_strlen($nbofdectoround)) $amount = round(is_string($amount) ? (float) $amount : $amount, $nbofdectoround); // $nbofdectoround can be 0.
-		else return 'ErrorBadParameterProvidedToFunction';
+		if (dol_strlen($nbofdectoround)) {
+			$amount = round(is_string($amount) ? (float) $amount : $amount, $nbofdectoround); // $nbofdectoround can be 0.
+		} else {
+			return 'ErrorBadParameterProvidedToFunction';
+		}
 		//print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';
 
 		// Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number
 		// to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.
-		if (is_numeric($amount))
-		{
+		if (is_numeric($amount)) {
 			// We put in temps value of decimal ("0.00001"). Works with 0 and 2.0E-5 and 9999.10
 			$temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000
 			$temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1
@@ -4976,7 +5194,9 @@ function price2num($amount, $rounding = '', $option = 0)
 
 		// Always make replace because each math function (like round) replace
 		// with local values and we want a number that has a SQL string format x.y
-		if ($thousand != ',' && $thousand != '.') $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+		if ($thousand != ',' && $thousand != '.') {
+			$amount = str_replace(',', '.', $amount); // To accept 2 notations for french users
+		}
 		$amount = str_replace(' ', '', $amount); // To avoid spaces
 		$amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .
 		$amount = str_replace($dec, '.', $amount);
@@ -5000,20 +5220,16 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 
-	if (($forceunitoutput == 'no' && $dimension < 1 / 10000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -6))
-	{
+	if (($forceunitoutput == 'no' && $dimension < 1 / 10000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) {
 		$dimension = $dimension * 1000000;
 		$unit = $unit - 6;
-	} elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3))
-	{
+	} elseif (($forceunitoutput == 'no' && $dimension < 1 / 10 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == -3)) {
 		$dimension = $dimension * 1000;
 		$unit = $unit - 3;
-	} elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6))
-	{
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 6)) {
 		$dimension = $dimension / 1000000;
 		$unit = $unit + 6;
-	} elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3))
-	{
+	} elseif (($forceunitoutput == 'no' && $dimension > 100000 && $unit < 90) || (is_numeric($forceunitoutput) && $forceunitoutput == 3)) {
 		$dimension = $dimension / 1000;
 		$unit = $unit + 3;
 	}
@@ -5021,13 +5237,13 @@ function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round
 	/* TODO
 	if ($unit < 90 && $type == 'weight' && is_numeric($forceunitoutput) && (($forceunitoutput == 98) || ($forceunitoutput == 99))
 	{
-	    $dimension = // convert dimension from standard unit into ounce or pound
-	    $unit = $forceunitoutput;
+		$dimension = // convert dimension from standard unit into ounce or pound
+		$unit = $forceunitoutput;
 	}
 	if ($unit > 90 && $type == 'weight' && is_numeric($forceunitoutput) && $forceunitoutput < 90)
 	{
-	    $dimension = // convert dimension from standard unit into ounce or pound
-	    $unit = $forceunitoutput;
+		$dimension = // convert dimension from standard unit into ounce or pound
+		$unit = $forceunitoutput;
 	}*/
 
 	$ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuringUnitString(0, $type, $unit);
@@ -5052,7 +5268,9 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 {
 	global $db, $conf, $mysoc;
 
-	if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) $thirdparty_seller = $mysoc;
+	if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+		$thirdparty_seller = $mysoc;
+	}
 
 	dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '')."/country_code=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);
 
@@ -5071,26 +5289,42 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 	// Some test to guess with no need to make database access
 	if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax
 		if ($local == 1) {
-			if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") return 0;
+			if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
+				return 0;
+			}
 			if ($thirdparty_seller->id == $mysoc->id) {
-				if (!$thirdparty_buyer->localtax1_assuj) return 0;
+				if (!$thirdparty_buyer->localtax1_assuj) {
+					return 0;
+				}
 			} else {
-				if (!$thirdparty_seller->localtax1_assuj) return 0;
+				if (!$thirdparty_seller->localtax1_assuj) {
+					return 0;
+				}
 			}
 		}
 
 		if ($local == 2) {
 			//if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;
-			if (!$mysoc->localtax2_assuj) return 0; // If main vat is 0, IRPF may be different than 0.
+			if (!$mysoc->localtax2_assuj) {
+				return 0; // If main vat is 0, IRPF may be different than 0.
+			}
 			if ($thirdparty_seller->id == $mysoc->id) {
-				if (!$thirdparty_buyer->localtax2_assuj) return 0;
+				if (!$thirdparty_buyer->localtax2_assuj) {
+					return 0;
+				}
 			} else {
-				if (!$thirdparty_seller->localtax2_assuj) return 0;
+				if (!$thirdparty_seller->localtax2_assuj) {
+					return 0;
+				}
 			}
 		}
 	} else {
-		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) return 0;
-		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) return 0;
+		if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+			return 0;
+		}
+		if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
+			return 0;
+		}
 	}
 
 	// For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.
@@ -5099,12 +5333,10 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 	}
 
 	// Search local taxes
-	if (!empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY))
-	{
+	if (!empty($conf->global->MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY)) {
 		if ($local == 1) {
 			if ($thirdparty_seller != $mysoc) {
-				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
-				{
+				if (!isOnlyOneLocalTax($local)) {  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
 					return $thirdparty_seller->localtax1_value;
 				}
 			} else { // i am the seller
@@ -5115,9 +5347,8 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 		}
 		if ($local == 2) {
 			if ($thirdparty_seller != $mysoc) {
-				if (!isOnlyOneLocalTax($local))  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
-				// TODO We should also return value defined on thirdparty only if defined
-				{
+				if (!isOnlyOneLocalTax($local)) {  // TODO We should provide $vatrate to search on correct line and not always on line with highest vat rate
+					// TODO We should also return value defined on thirdparty only if defined
 					return $thirdparty_seller->localtax2_value;
 				}
 			} else { // i am the seller
@@ -5132,21 +5363,26 @@ function get_localtax($vatrate, $local, $thirdparty_buyer = "", $thirdparty_sell
 
 	// By default, search value of local tax on line of common tax
 	$sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-   	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-   	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($thirdparty_seller->country_code)."'";
-   	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-   	if (!empty($vatratecode)) $sql .= " AND t.code ='".$db->escape($vatratecode)."'"; // If we have the code, we use it in priority
-   	else $sql .= " AND t.recuperableonly = '".$db->escape($vatnpr)."'";
-   	dol_syslog("get_localtax", LOG_DEBUG);
-   	$resql = $db->query($sql);
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+	$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($thirdparty_seller->country_code)."'";
+	$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
+	if (!empty($vatratecode)) {
+		$sql .= " AND t.code ='".$db->escape($vatratecode)."'"; // If we have the code, we use it in priority
+	} else {
+		$sql .= " AND t.recuperableonly = '".$db->escape($vatnpr)."'";
+	}
+	dol_syslog("get_localtax", LOG_DEBUG);
+	$resql = $db->query($sql);
 
-   	if ($resql)
-   	{
-   		$obj = $db->fetch_object($resql);
-   		if ($obj) {
-	   		if ($local == 1) return $obj->localtax1;
-   			elseif ($local == 2) return $obj->localtax2;
-   		}
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		if ($obj) {
+			if ($local == 1) {
+				return $obj->localtax1;
+			} elseif ($local == 2) {
+				return $obj->localtax2;
+			}
+		}
 	}
 
 	return 0;
@@ -5191,11 +5427,13 @@ function get_localtax_by_third($local)
 	$sql .= "  )";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($local == 1) return $obj->localtax1;
-		elseif ($local == 2) return $obj->localtax2;
+		if ($local == 1) {
+			return $obj->localtax1;
+		} elseif ($local == 2) {
+			return $obj->localtax2;
+		}
 	}
 
 	return 0;
@@ -5229,8 +5467,7 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 		$vatratecleaned = $vatrate;
 		$vatratecode = '';
 		$reg = array();
-		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg))      // If vat is "xx (yy)"
-		{
+		if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"
 			$vatratecleaned = $reg[1];
 			$vatratecode = $reg[2];
 		}
@@ -5240,13 +5477,16 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 		else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($seller->country_code)."'";*/
 		$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($seller->country_code)."'";
 		$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql .= " AND t.code = '".$db->escape($vatratecode)."'";
+		if ($vatratecode) {
+			$sql .= " AND t.code = '".$db->escape($vatratecode)."'";
+		}
 	}
 
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj) return array(
+		if ($obj) {
+			return array(
 			'rowid'=>$obj->rowid,
 			'code'=>$obj->code,
 			'rate'=>$obj->rate,
@@ -5257,9 +5497,13 @@ function getTaxesFromId($vatrate, $buyer = null, $seller = null, $firstparamisid
 			'npr'=>$obj->npr,
 			'accountancy_code_sell'=>$obj->accountancy_code_sell,
 			'accountancy_code_buy'=>$obj->accountancy_code_buy
-		);
-		else return array();
-	} else dol_print_error($db);
+			);
+		} else {
+			return array();
+		}
+	} else {
+		dol_print_error($db);
+	}
 
 	return array();
 }
@@ -5301,10 +5545,15 @@ function getLocalTaxesFromRate($vatrate, $local, $buyer, $seller, $firstparamisi
 		}
 
 		$sql .= ", ".MAIN_DB_PREFIX."c_country as c";
-		if ($mysoc->country_code == 'ES') $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($buyer->country_code)."'"; // local tax in spain use the buyer country ??
-		else $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape(empty($seller->country_code) ? $mysoc->country_code : $seller->country_code)."'";
+		if ($mysoc->country_code == 'ES') {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($buyer->country_code)."'"; // local tax in spain use the buyer country ??
+		} else {
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape(empty($seller->country_code) ? $mysoc->country_code : $seller->country_code)."'";
+		}
 		$sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";
-		if ($vatratecode) $sql .= " AND t.code = '".$db->escape($vatratecode)."'";
+		if ($vatratecode) {
+			$sql .= " AND t.code = '".$db->escape($vatratecode)."'";
+		}
 	}
 
 	$resql = $db->query($sql);
@@ -5346,22 +5595,23 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 	$ret = 0;
 	$found = 0;
 
-	if ($idprod > 0)
-	{
+	if ($idprod > 0) {
 		// Load product
 		$product = new Product($db);
 		$result = $product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
-		{
-			if ($idprodfournprice > 0)     // We want vat for product for a "supplier" object
-			{
+		if ($mysoc->country_code == $thirdparty_seller->country_code) { // If selling country is ours
+			if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object
 				$product->get_buyprice($idprodfournprice, 0, 0, 0);
 				$ret = $product->vatrate_supplier;
-				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
+				if ($product->default_vat_code) {
+					$ret .= ' ('.$product->default_vat_code.')';
+				}
 			} else {
 				$ret = $product->tva_tx; // Default vat of product we defined
-				if ($product->default_vat_code) $ret .= ' ('.$product->default_vat_code.')';
+				if ($product->default_vat_code) {
+					$ret .= ' ('.$product->default_vat_code.')';
+				}
 			}
 			$found = 1;
 		} else {
@@ -5370,10 +5620,8 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 		}
 	}
 
-	if (!$found)
-	{
-		if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS))
-		{
+	if (!$found) {
+		if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {
 			// If vat of product for the country not found or not defined, we return the first higher vat of country.
 			$sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -5382,17 +5630,21 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr
 			$sql .= $db->plimit(1);
 
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if ($obj)
-				{
+				if ($obj) {
 					$ret = $obj->vat_rate;
-					if ($obj->default_vat_code) $ret .= ' ('.$obj->default_vat_code.')';
+					if ($obj->default_vat_code) {
+						$ret .= ' ('.$obj->default_vat_code.')';
+					}
 				}
 				$db->free($sql);
-			} else dol_print_error($db);
-		} else $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
+			} else {
+				dol_print_error($db);
+			}
+		} else {
+			$ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails
+		}
 	}
 
 	dol_syslog("get_product_vat_for_country: ret=".$ret);
@@ -5419,14 +5671,12 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 	$ret = 0;
 	$found = 0;
 
-	if ($idprod > 0)
-	{
+	if ($idprod > 0) {
 		// Load product
 		$product = new Product($db);
 		$result = $product->fetch($idprod);
 
-		if ($mysoc->country_code == $thirdparty_seller->country_code) // If selling country is ours
-		{
+		if ($mysoc->country_code == $thirdparty_seller->country_code) { // If selling country is ours
 			/* Not defined yet, so we don't use this
 			if ($local==1) $ret=$product->localtax1_tx;
 			elseif ($local==2) $ret=$product->localtax2_tx;
@@ -5437,8 +5687,7 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 		}
 	}
 
-	if (!$found)
-	{
+	if (!$found) {
 		// If vat of product for the country not found or not defined, we return higher vat of country.
 		$sql = "SELECT taux as vat_rate, localtax1, localtax2";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
@@ -5447,15 +5696,18 @@ function get_product_localtax_for_country($idprod, $local, $thirdparty_seller)
 		$sql .= $db->plimit(1);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
-				if ($local == 1) $ret = $obj->localtax1;
-				elseif ($local == 2) $ret = $obj->localtax2;
+			if ($obj) {
+				if ($local == 1) {
+					$ret = $obj->localtax1;
+				} elseif ($local == 2) {
+					$ret = $obj->localtax2;
+				}
 			}
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	dol_syslog("get_product_localtax_for_country: ret=".$ret);
@@ -5497,18 +5749,15 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 
 	// If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)
 	// we use the buyer VAT.
-	if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC))
-	{
-		if ($seller_in_cee && $buyer_in_cee && !$thirdparty_buyer->isACompany())
-		{
+	if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {
+		if ($seller_in_cee && $buyer_in_cee && !$thirdparty_buyer->isACompany()) {
 			//print 'VATRULE 0';
 			return get_product_vat_for_country($idprod, $thirdparty_buyer, $idprodfournprice);
 		}
 	}
 
 	// If seller does not use VAT
-	if (!$seller_use_vat)
-	{
+	if (!$seller_use_vat) {
 		//print 'VATRULE 1';
 		return 0;
 	}
@@ -5517,8 +5766,7 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 
 	// Si le (pays vendeur = pays acheteur) alors la TVA par defaut=TVA du produit vendu. Fin de regle.
 	if (($seller_country_code == $buyer_country_code)
-	|| (in_array($seller_country_code, array('FR,MC')) && in_array($buyer_country_code, array('FR', 'MC')))) // Warning ->country_code not always defined
-	{
+	|| (in_array($seller_country_code, array('FR,MC')) && in_array($buyer_country_code, array('FR', 'MC')))) { // Warning ->country_code not always defined
 		//print 'VATRULE 2';
 		return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
 	}
@@ -5528,11 +5776,9 @@ function get_default_tva(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 
 	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = entreprise) alors TVA par defaut=0. Fin de regle
 	// Si (vendeur et acheteur dans Communaute europeenne) et (acheteur = particulier) alors TVA par defaut=TVA du produit vendu. Fin de regle
-	if (($seller_in_cee && $buyer_in_cee))
-	{
+	if (($seller_in_cee && $buyer_in_cee)) {
 		$isacompany = $thirdparty_buyer->isACompany();
-		if ($isacompany)
-		{
+		if ($isacompany) {
 			if (!empty($conf->global->MAIN_USE_VAT_OF_PRODUCT_FOR_COMPANIES_IN_EEC_WITH_INVALID_VAT_ID) && !isValidVATID($thirdparty_buyer)) {
 				//print 'VATRULE 6';
 				return get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournprice);
@@ -5571,16 +5817,14 @@ function get_default_npr(Societe $thirdparty_seller, Societe $thirdparty_buyer,
 {
 	global $db;
 
-	if ($idprodfournprice > 0)
-	{
+	if ($idprodfournprice > 0) {
 		if (!class_exists('ProductFournisseur')) {
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		}
 		$prodprice = new ProductFournisseur($db);
 		$prodprice->fetch_product_fournisseur_price($idprodfournprice);
 		return $prodprice->fourn_tva_npr;
-	} elseif ($idprod > 0)
-	{
+	} elseif ($idprod > 0) {
 		if (!class_exists('Product')) {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		}
@@ -5609,28 +5853,38 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id
 {
 	global $mysoc;
 
-	if (!is_object($thirdparty_seller)) return -1;
-	if (!is_object($thirdparty_buyer)) return -1;
-
-	if ($local == 1) // Localtax 1
-	{
-		if ($mysoc->country_code == 'ES')
-		{
-			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) return 0;
-		} else {
-			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
-			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) return 0;
-			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') return 0;
-		}
-	} elseif ($local == 2) //I Localtax 2
-	{
-		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
-		if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) return 0;
-		if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') return 0;
+	if (!is_object($thirdparty_seller)) {
+		return -1;
+	}
+	if (!is_object($thirdparty_buyer)) {
+		return -1;
 	}
 
-	if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code)
-	{
+	if ($local == 1) { // Localtax 1
+		if ($mysoc->country_code == 'ES') {
+			if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+				return 0;
+			}
+		} else {
+			// Si vendeur non assujeti a Localtax1, localtax1 par default=0
+			if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+				return 0;
+			}
+			if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+				return 0;
+			}
+		}
+	} elseif ($local == 2) { //I Localtax 2
+		// Si vendeur non assujeti a Localtax2, localtax2 par default=0
+		if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {
+			return 0;
+		}
+		if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+			return 0;
+		}
+	}
+
+	if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {
 		return get_product_localtax_for_country($idprod, $local, $thirdparty_seller);
 	}
 
@@ -5649,25 +5903,40 @@ function yn($yesno, $case = 1, $color = 0)
 {
 	global $langs;
 	$result = 'unknown'; $classname = '';
-	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') 	// A mettre avant test sur no a cause du == 0
-	{
+	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') { 	// A mettre avant test sur no a cause du == 0
 		$result = $langs->trans('yes');
-		if ($case == 1 || $case == 3) $result = $langs->trans("Yes");
-		if ($case == 2) $result = '<input type="checkbox" value="1" checked disabled>';
-		if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
+		if ($case == 1 || $case == 3) {
+			$result = $langs->trans("Yes");
+		}
+		if ($case == 2) {
+			$result = '<input type="checkbox" value="1" checked disabled>';
+		}
+		if ($case == 3) {
+			$result = '<input type="checkbox" value="1" checked disabled> '.$result;
+		}
 
 		$classname = 'ok';
-	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false')
-	{
+	} elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {
 		$result = $langs->trans("no");
-		if ($case == 1 || $case == 3) $result = $langs->trans("No");
-		if ($case == 2) $result = '<input type="checkbox" value="0" disabled>';
-		if ($case == 3) $result = '<input type="checkbox" value="0" disabled> '.$result;
+		if ($case == 1 || $case == 3) {
+			$result = $langs->trans("No");
+		}
+		if ($case == 2) {
+			$result = '<input type="checkbox" value="0" disabled>';
+		}
+		if ($case == 3) {
+			$result = '<input type="checkbox" value="0" disabled> '.$result;
+		}
 
-		if ($color == 2) $classname = 'ok';
-		else $classname = 'error';
+		if ($color == 2) {
+			$classname = 'ok';
+		} else {
+			$classname = 'error';
+		}
+	}
+	if ($color) {
+		return '<font class="'.$classname.'">'.$result.'</font>';
 	}
-	if ($color) return '<font class="'.$classname.'">'.$result.'</font>';
 	return $result;
 }
 
@@ -5690,20 +5959,33 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '
 {
 	global $conf;
 
-	if (empty($modulepart) && !empty($object->module)) $modulepart = $object->module;
+	if (empty($modulepart) && !empty($object->module)) {
+		$modulepart = $object->module;
+	}
 
 	$path = '';
 
 	$arrayforoldpath = array('cheque', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');
-	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) $arrayforoldpath[] = 'product';
+	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+		$arrayforoldpath[] = 'product';
+	}
 	if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {
 		// This part should be removed once all code is using "get_exdir" to forge path, with parameter $object and $modulepart provided.
-		if (empty($alpha)) $num = preg_replace('/([^0-9])/i', '', $num);
-		else $num = preg_replace('/^.*\-/i', '', $num);
+		if (empty($alpha)) {
+			$num = preg_replace('/([^0-9])/i', '', $num);
+		} else {
+			$num = preg_replace('/^.*\-/i', '', $num);
+		}
 		$num = substr("000".$num, -$level);
-		if ($level == 1) $path = substr($num, 0, 1);
-		if ($level == 2) $path = substr($num, 1, 1).'/'.substr($num, 0, 1);
-		if ($level == 3) $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
+		if ($level == 1) {
+			$path = substr($num, 0, 1);
+		}
+		if ($level == 2) {
+			$path = substr($num, 1, 1).'/'.substr($num, 0, 1);
+		}
+		if ($level == 3) {
+			$path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);
+		}
 	} else {
 		// We will enhance here a common way of forging path for document storage.
 		// In a future, we may distribute directories on several levels depending on setup and object.
@@ -5712,7 +5994,9 @@ function get_exdir($num, $level, $alpha, $withoutslash, $object, $modulepart = '
 		$path = dol_sanitizeFileName(empty($object->ref) ? (string) $object->id : $object->ref);
 	}
 
-	if (empty($withoutslash) && !empty($path)) $path .= '/';
+	if (empty($withoutslash) && !empty($path)) {
+		$path .= '/';
+	}
 
 	return $path;
 }
@@ -5732,7 +6016,9 @@ function dol_mkdir($dir, $dataroot = '', $newmask = null)
 	dol_syslog("functions.lib::dol_mkdir: dir=".$dir, LOG_INFO);
 
 	$dir_osencoded = dol_osencode($dir);
-	if (@is_dir($dir_osencoded)) return 0;
+	if (@is_dir($dir_osencoded)) {
+		return 0;
+	}
 
 	$nberr = 0;
 	$nbcreated = 0;
@@ -5746,19 +6032,21 @@ function dol_mkdir($dir, $dataroot = '', $newmask = null)
 
 	$cdir = explode("/", $dir);
 	$num = count($cdir);
-	for ($i = 0; $i < $num; $i++)
-	{
-		if ($i > 0) $ccdir .= '/'.$cdir[$i];
-		else $ccdir .= $cdir[$i];
-		if (preg_match("/^.:$/", $ccdir, $regs)) continue; // Si chemin Windows incomplet, on poursuit par rep suivant
+	for ($i = 0; $i < $num; $i++) {
+		if ($i > 0) {
+			$ccdir .= '/'.$cdir[$i];
+		} else {
+			$ccdir .= $cdir[$i];
+		}
+		if (preg_match("/^.:$/", $ccdir, $regs)) {
+			continue; // Si chemin Windows incomplet, on poursuit par rep suivant
+		}
 
 		// Attention, le is_dir() peut echouer bien que le rep existe.
 		// (ex selon config de open_basedir)
-		if ($ccdir)
-		{
+		if ($ccdir) {
 			$ccdir_osencoded = dol_osencode($ccdir);
-			if (!@is_dir($ccdir_osencoded))
-			{
+			if (!@is_dir($ccdir_osencoded)) {
 				dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);
 
 				umask(0);
@@ -5767,8 +6055,7 @@ function dol_mkdir($dir, $dataroot = '', $newmask = null)
 					$dirmaskdec = empty($conf->global->MAIN_UMASK) ? octdec('0755') : octdec($conf->global->MAIN_UMASK);
 				}
 				$dirmaskdec |= octdec('0111'); // Set x bit required for directories
-				if (!@mkdir($ccdir_osencoded, $dirmaskdec))
-				{
+				if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {
 					// Si le is_dir a renvoye une fausse info, alors on passe ici.
 					dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);
 					$nberr++;
@@ -5815,7 +6102,9 @@ function picto_required()
  */
 function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0, $removedoublespaces = 1)
 {
-	if ($removelinefeed == 2) $stringtoclean = preg_replace('/<br[^>]*>(\n|\r)+/ims', '<br>', $stringtoclean);
+	if ($removelinefeed == 2) {
+		$stringtoclean = preg_replace('/<br[^>]*>(\n|\r)+/ims', '<br>', $stringtoclean);
+	}
 	$temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);
 
 	// We remove entities BEFORE stripping (in case of an open separator char that is entity encoded and not the closing other, the strip will fails)
@@ -5837,7 +6126,9 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
 	$temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
 
 	// Remove also carriage returns
-	if ($removelinefeed == 1) $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+	if ($removelinefeed == 1) {
+		$temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+	}
 
 	// And double quotes
 	if ($removedoublespaces) {
@@ -5873,6 +6164,8 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 	$allowed_tags_string = join("><", $allowed_tags);
 	$allowed_tags_string = '<'.$allowed_tags_string.'>';
 
+	$stringtoclean = str_replace('<!DOCTYPE html>', '__!DOCTYPE_HTML__', $stringtoclean);	// Replace DOCTYPE to avoid to have it removed by the strip_tags
+
 	$stringtoclean = dol_string_nounprintableascii($stringtoclean, 0);
 	$stringtoclean = preg_replace('/&colon;/i', ':', $stringtoclean);
 
@@ -5895,6 +6188,8 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 		$temp = preg_replace('/javascript\s*:/i', '', $temp);
 	}
 
+	$temp = str_replace('__!DOCTYPE_HTML__', '<!DOCTYPE html>', $temp);	// Restore the DOCTYPE
+
 	return $temp;
 }
 
@@ -5912,8 +6207,7 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 function dol_string_neverthesehtmltags($stringtoclean, $disallowed_tags = array('textarea'), $cleanalsosomestyles = 0)
 {
 	$temp = $stringtoclean;
-	foreach ($disallowed_tags as $tagtoremove)
-	{
+	foreach ($disallowed_tags as $tagtoremove) {
 		$temp = preg_replace('/<\/?'.$tagtoremove.'>/', '', $temp);
 		$temp = preg_replace('/<\/?'.$tagtoremove.'\s+[^>]*>/', '', $temp);
 	}
@@ -5937,10 +6231,8 @@ function dol_string_neverthesehtmltags($stringtoclean, $disallowed_tags = array(
  */
 function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 {
-	if ($nboflines == 1)
-	{
-		if (dol_textishtml($text))
-		{
+	if ($nboflines == 1) {
+		if (dol_textishtml($text)) {
 			$firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters
 			$firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters
 		} else {
@@ -5949,8 +6241,7 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 		return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');
 	} else {
 		$ishtml = 0;
-		if (dol_textishtml($text))
-		{
+		if (dol_textishtml($text)) {
 			$text = preg_replace('/\n/', '', $text);
 			$ishtml = 1;
 			$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
@@ -5959,17 +6250,23 @@ function dolGetFirstLineOfText($text, $nboflines = 1, $charset = 'UTF-8')
 		}
 
 		$text = strtr($text, $repTable);
-		if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-		else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
+		if ($charset == 'UTF-8') {
+			$pattern = '/(<br[^>]*>)/Uu';
+		} // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
+		else {
+			$pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
+		}
 		$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 		$firstline = '';
 		$i = 0;
 		$nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator
-		while (($i < $nba) && ($i < ($nboflines * 2)))
-		{
-			if ($i % 2 == 0) $firstline .= $a[$i];
-			elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) $firstline .= ($ishtml ? "<br>\n" : "\n");
+		while (($i < $nba) && ($i < ($nboflines * 2))) {
+			if ($i % 2 == 0) {
+				$firstline .= $a[$i];
+			} elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+				$firstline .= ($ishtml ? "<br>\n" : "\n");
+			}
 			$i++;
 		}
 		unset($a);
@@ -6019,15 +6316,18 @@ function dol_nl2br($stringtoencode, $nl2brmode = 0, $forxml = false)
 function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UTF-8', $removelasteolbr = 1)
 {
 	$newstring = $stringtoencode;
-	if (dol_textishtml($stringtoencode))	// Check if text is already HTML or not
-	{
+	if (dol_textishtml($stringtoencode)) {	// Check if text is already HTML or not
 		$newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.
-		if ($removelasteolbr) $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)
+		if ($removelasteolbr) {
+			$newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)
+		}
 		$newstring = strtr($newstring, array('&'=>'__and__', '<'=>'__lt__', '>'=>'__gt__', '"'=>'__dquot__'));
 		$newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding
 		$newstring = strtr($newstring, array('__and__'=>'&', '__lt__'=>'<', '__gt__'=>'>', '__dquot__'=>'"'));
 	} else {
-		if ($removelasteolbr) $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
+		if ($removelasteolbr) {
+			$newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)
+		}
 		$newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);
 	}
 	// Other substitutions that htmlentities does not do
@@ -6076,9 +6376,13 @@ function dol_htmlcleanlastbr($stringtodecode)
 function dol_html_entity_decode($a, $b, $c = 'UTF-8', $keepsomeentities = 0)
 {
 	$newstring = $a;
-	if ($keepsomeentities) $newstring = strtr($newstring, array('&amp;'=>'__andamp__', '&lt;'=>'__andlt__', '&gt;'=>'__andgt__', '"'=>'__dquot__'));
+	if ($keepsomeentities) {
+		$newstring = strtr($newstring, array('&amp;'=>'__andamp__', '&lt;'=>'__andlt__', '&gt;'=>'__andgt__', '"'=>'__dquot__'));
+	}
 	$newstring = html_entity_decode($newstring, $b, $c);
-	if ($keepsomeentities) $newstring = strtr($newstring, array('__andamp__'=>'&amp;', '__andlt__'=>'&lt;', '__andgt__'=>'&gt;', '__dquot__'=>'"'));
+	if ($keepsomeentities) {
+		$newstring = strtr($newstring, array('__andamp__'=>'&amp;', '__andlt__'=>'&lt;', '__andgt__'=>'&gt;', '__dquot__'=>'"'));
+	}
 	return $newstring;
 }
 
@@ -6111,15 +6415,20 @@ function dol_string_is_good_iso($s, $clean = 0)
 	$len = dol_strlen($s);
 	$out = '';
 	$ok = 1;
-	for ($scursor = 0; $scursor < $len; $scursor++)
-	{
+	for ($scursor = 0; $scursor < $len; $scursor++) {
 		$ordchar = ord($s[$scursor]);
 		//print $scursor.'-'.$ordchar.'<br>';
-		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) { $ok = 0; break; } elseif ($ordchar > 126 && $ordchar < 160) { $ok = 0; break; } elseif ($clean) {
+		if ($ordchar < 32 && $ordchar != 13 && $ordchar != 10) {
+			$ok = 0; break;
+		} elseif ($ordchar > 126 && $ordchar < 160) {
+			$ok = 0; break;
+		} elseif ($clean) {
 			$out .= $s[$scursor];
 		}
 	}
-	if ($clean) return $out;
+	if ($clean) {
+		return $out;
+	}
 	return $ok;
 }
 
@@ -6133,7 +6442,9 @@ function dol_string_is_good_iso($s, $clean = 0)
  */
 function dol_nboflines($s, $maxchar = 0)
 {
-	if ($s == '') return 0;
+	if ($s == '') {
+		return 0;
+	}
 	$arraystring = explode("\n", $s);
 	$nb = count($arraystring);
 
@@ -6153,25 +6464,27 @@ function dol_nboflines($s, $maxchar = 0)
 function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')
 {
 	$repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");
-	if (dol_textishtml($text)) $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+	if (dol_textishtml($text)) {
+		$repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+	}
 
 	$text = strtr($text, $repTable);
-	if ($charset == 'UTF-8') { $pattern = '/(<br[^>]*>)/Uu'; } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
-	else $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
+	if ($charset == 'UTF-8') {
+		$pattern = '/(<br[^>]*>)/Uu';
+	} // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support
+	else {
+		$pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.
+	}
 	$a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
 	$nblines = (int) floor((count($a) + 1) / 2);
 	// count possible auto line breaks
-	if ($maxlinesize)
-	{
-		foreach ($a as $line)
-		{
-			if (dol_strlen($line) > $maxlinesize)
-			{
+	if ($maxlinesize) {
+		foreach ($a as $line) {
+			if (dol_strlen($line) > $maxlinesize) {
 				//$line_dec = html_entity_decode(strip_tags($line));
 				$line_dec = html_entity_decode($line);
-				if (dol_strlen($line_dec) > $maxlinesize)
-				{
+				if (dol_strlen($line_dec) > $maxlinesize) {
 					$line_dec = wordwrap($line_dec, $maxlinesize, '\n', true);
 					$nblines += substr_count($line_dec, '\n');
 				}
@@ -6193,27 +6506,45 @@ function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')
  */
 function dol_textishtml($msg, $option = 0)
 {
-	if ($option == 1)
-	{
-		if (preg_match('/<html/i', $msg))				return true;
-		elseif (preg_match('/<body/i', $msg))			return true;
-		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
-		elseif (preg_match('/<br/i', $msg))				return true;
+	if ($option == 1) {
+		if (preg_match('/<html/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<body/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<\/textarea/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<br/i', $msg)) {
+			return true;
+		}
 		return false;
 	} else {
-		if (preg_match('/<html/i', $msg))				return true;
-		elseif (preg_match('/<body/i', $msg))			return true;
-		elseif (preg_match('/<\/textarea/i', $msg))	  return true;
-		elseif (preg_match('/<(b|em|i|u)>/i', $msg))		return true;
-		elseif (preg_match('/<br\/>/i', $msg))	  return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) 	  return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) return true;
-		elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) return true;
-		elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) return true; // must accept <img src="http://example.com/aaa.png" />
-		elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) return true; // must accept <a href="http://example.com/aaa.png" />
-		elseif (preg_match('/<h[0-9]>/i', $msg))			return true;
-		elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))	return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
-		elseif (preg_match('/&#[0-9]{2,3};/i', $msg))	return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
+		if (preg_match('/<html/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<body/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<\/textarea/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<br\/>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+			return true; // must accept <img src="http://example.com/aaa.png" />
+		} elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+			return true; // must accept <a href="http://example.com/aaa.png" />
+		} elseif (preg_match('/<h[0-9]>/i', $msg)) {
+			return true;
+		} elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+			return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
+		} elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+			return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
+		}
 
 		return false;
 	}
@@ -6235,8 +6566,7 @@ function dol_textishtml($msg, $option = 0)
  */
 function dol_concatdesc($text1, $text2, $forxml = false, $invert = false)
 {
-	if (!empty($invert))
-	{
+	if (!empty($invert)) {
 			$tmp = $text1;
 			$text1 = $text2;
 			$text2 = $tmp;
@@ -6267,15 +6597,13 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 
 	$substitutionarray = array();
 
-	if (empty($exclude) || !in_array('user', $exclude))
-	{
+	if (empty($exclude) || !in_array('user', $exclude)) {
 		// Add SIGNATURE into substitutionarray first, so, when we will make the substitution,
 		// this will include signature content first and then replace var found into content of signature
 		$signature = $user->signature;
 		$substitutionarray = array_merge($substitutionarray, array(
 			'__USER_SIGNATURE__' => (string) (($signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? ($onlykey == 2 ? dol_trunc(dol_string_nohtmltag($signature), 30) : $signature) : '')
-		)
-			);
+		));
 
 		if (is_object($user)) {
 			$substitutionarray = array_merge($substitutionarray, array(
@@ -6287,12 +6615,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				'__USER_FULLNAME__' => (string) $user->getFullName($outputlangs),
 				'__USER_SUPERVISOR_ID__' => (string) ($user->fk_user ? $user->fk_user : '0'),
 				'__USER_REMOTE_IP__' => (string) getUserRemoteIP()
-				)
-			);
+				));
 		}
 	}
-	if ((empty($exclude) || !in_array('mycompany', $exclude)) && is_object($mysoc))
-	{
+	if ((empty($exclude) || !in_array('mycompany', $exclude)) && is_object($mysoc)) {
 		$substitutionarray = array_merge($substitutionarray, array(
 			'__MYCOMPANY_NAME__'    => $mysoc->name,
 			'__MYCOMPANY_EMAIL__'   => $mysoc->email,
@@ -6314,10 +6640,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		));
 	}
 
-	if (($onlykey || is_object($object)) && (empty($exclude) || !in_array('object', $exclude)))
-	{
-		if ($onlykey)
-		{
+	if (($onlykey || is_object($object)) && (empty($exclude) || !in_array('object', $exclude))) {
+		if ($onlykey) {
 			$substitutionarray['__ID__'] = '__ID__';
 			$substitutionarray['__REF__'] = '__REF__';
 			$substitutionarray['__REF_CLIENT__'] = '__REF_CLIENT__';
@@ -6326,8 +6650,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__NOTE_PRIVATE__'] = '__NOTE_PRIVATE__';
 			$substitutionarray['__EXTRAFIELD_XXX__'] = '__EXTRAFIELD_XXX__';
 
-			if (!empty($conf->societe->enabled))	// Most objects are concerned
-			{
+			if (!empty($conf->societe->enabled)) {	// Most objects are concerned
 				$substitutionarray['__THIRDPARTY_ID__'] = '__THIRDPARTY_ID__';
 				$substitutionarray['__THIRDPARTY_NAME__'] = '__THIRDPARTY_NAME__';
 				$substitutionarray['__THIRDPARTY_NAME_ALIAS__'] = '__THIRDPARTY_NAME_ALIAS__';
@@ -6349,8 +6672,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__THIRDPARTY_NOTE_PUBLIC__'] = '__THIRDPARTY_NOTE_PUBLIC__';
 				$substitutionarray['__THIRDPARTY_NOTE_PRIVATE__'] = '__THIRDPARTY_NOTE_PRIVATE__';
 			}
-			if (!empty($conf->adherent->enabled) && (!is_object($object) || $object->element == 'adherent'))
-			{
+			if (!empty($conf->adherent->enabled) && (!is_object($object) || $object->element == 'adherent')) {
 				$substitutionarray['__MEMBER_ID__'] = '__MEMBER_ID__';
 				$substitutionarray['__MEMBER_CIVILITY__'] = '__MEMBER_CIVILITY__';
 				$substitutionarray['__MEMBER_FIRSTNAME__'] = '__MEMBER_FIRSTNAME__';
@@ -6358,22 +6680,19 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				/*$substitutionarray['__MEMBER_NOTE_PUBLIC__'] = '__MEMBER_NOTE_PUBLIC__';
 				$substitutionarray['__MEMBER_NOTE_PRIVATE__'] = '__MEMBER_NOTE_PRIVATE__';*/
 			}
-			if (!empty($conf->recruitment->enabled) && (!is_object($object) || $object->element == 'candidature'))
-			{
+			if (!empty($conf->recruitment->enabled) && (!is_object($object) || $object->element == 'candidature')) {
 				$substitutionarray['__CANDIDATE_FULLNAME__'] = '__CANDIDATE_FULLNAME__';
 				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = '__CANDIDATE_FIRSTNAME__';
 				$substitutionarray['__CANDIDATE_LASTNAME__'] = '__CANDIDATE_LASTNAME__';
 			}
-			if (!empty($conf->projet->enabled))		// Most objects
-			{
+			if (!empty($conf->projet->enabled)) {		// Most objects
 				$substitutionarray['__PROJECT_ID__'] = '__PROJECT_ID__';
 				$substitutionarray['__PROJECT_REF__'] = '__PROJECT_REF__';
 				$substitutionarray['__PROJECT_NAME__'] = '__PROJECT_NAME__';
 				/*$substitutionarray['__PROJECT_NOTE_PUBLIC__'] = '__PROJECT_NOTE_PUBLIC__';
 				$substitutionarray['__PROJECT_NOTE_PRIVATE__'] = '__PROJECT_NOTE_PRIVATE__';*/
 			}
-			if (!empty($conf->contrat->enabled) && (!is_object($object) || $object->element == 'contract'))
-			{
+			if (!empty($conf->contrat->enabled) && (!is_object($object) || $object->element == 'contract')) {
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = 'Highest date planned for a service start';
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = 'Highest date and hour planned for service start';
 				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = 'Lowest data for planned expiration of service';
@@ -6391,13 +6710,11 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = 'Direct download url of an order';
 			$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = 'Direct download url of an invoice';
 
-			if (!empty($conf->expedition->enabled) && (!is_object($object) || $object->element == 'shipping'))
-			{
+			if (!empty($conf->expedition->enabled) && (!is_object($object) || $object->element == 'shipping')) {
 				$substitutionarray['__SHIPPINGTRACKNUM__'] = 'Shipping tracking number';
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = 'Shipping tracking url';
 			}
-			if (!empty($conf->reception->enabled) && (!is_object($object) || $object->element == 'reception'))
-			{
+			if (!empty($conf->reception->enabled) && (!is_object($object) || $object->element == 'reception')) {
 				$substitutionarray['__RECEPTIONTRACKNUM__'] = 'Shippin tracking number of shipment';
 				$substitutionarray['__RECEPTIONTRACKNUMURL__'] = 'Shipping tracking url';
 			}
@@ -6426,15 +6743,18 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__SUPPLIER_ORDER_DATE_DELIVERY__'] = (isset($object->date_livraison) ? dol_print_date($object->date_livraison, 'day', 0, $outputlangs) : '');
 			$substitutionarray['__SUPPLIER_ORDER_DELAY_DELIVERY__'] = (isset($object->availability_code) ? ($outputlangs->transnoentities("AvailabilityType".$object->availability_code) != ('AvailabilityType'.$object->availability_code) ? $outputlangs->transnoentities("AvailabilityType".$object->availability_code) : $outputlangs->convToOutputCharset(isset($object->availability) ? $object->availability : '')) : '');
 
-			if (is_object($object) && ($object->element == 'adherent' || $object->element == 'member') && $object->id > 0)
-			{
+			if (is_object($object) && ($object->element == 'adherent' || $object->element == 'member') && $object->id > 0) {
 				$birthday = (empty($object->birth) ? '' : dol_print_date($object->birth, 'day'));
 
 				$substitutionarray['__MEMBER_ID__'] = (isset($object->id) ? $object->id : '');
-				if (method_exists($object, 'getCivilityLabel')) $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+				if (method_exists($object, 'getCivilityLabel')) {
+					$substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+				}
 				$substitutionarray['__MEMBER_FIRSTNAME__'] = (isset($object->firstname) ? $object->firstname : '');
 				$substitutionarray['__MEMBER_LASTNAME__'] = (isset($object->lastname) ? $object->lastname : '');
-				if (method_exists($object, 'getFullName')) $substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs);
+				if (method_exists($object, 'getFullName')) {
+					$substitutionarray['__MEMBER_FULLNAME__'] = $object->getFullName($outputlangs);
+				}
 				$substitutionarray['__MEMBER_COMPANY__'] = (isset($object->societe) ? $object->societe : '');
 				$substitutionarray['__MEMBER_ADDRESS__'] = (isset($object->address) ? $object->address : '');
 				$substitutionarray['__MEMBER_ZIP__'] = (isset($object->zip) ? $object->zip : '');
@@ -6511,38 +6831,36 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__CANDIDATE_LASTNAME__'] = $object->lastname;
 			}
 
-			if (is_object($object->project))
-			{
+			if (is_object($object->project)) {
 				$substitutionarray['__PROJECT_ID__'] = (is_object($object->project) ? $object->project->id : '');
 				$substitutionarray['__PROJECT_REF__'] = (is_object($object->project) ? $object->project->ref : '');
 				$substitutionarray['__PROJECT_NAME__'] = (is_object($object->project) ? $object->project->title : '');
 			}
-			if (is_object($object->projet))	// Deprecated, for backward compatibility
-			{
+			if (is_object($object->projet)) {	// Deprecated, for backward compatibility
 				$substitutionarray['__PROJECT_ID__'] = (is_object($object->projet) ? $object->projet->id : '');
 				$substitutionarray['__PROJECT_REF__'] = (is_object($object->projet) ? $object->projet->ref : '');
 				$substitutionarray['__PROJECT_NAME__'] = (is_object($object->projet) ? $object->projet->title : '');
 			}
 
-			if (is_object($object) && $object->element == 'shipping')
-			{
+			if (is_object($object) && $object->element == 'shipping') {
 				$substitutionarray['__SHIPPINGTRACKNUM__'] = $object->tracking_number;
 				$substitutionarray['__SHIPPINGTRACKNUMURL__'] = $object->tracking_url;
 			}
-			if (is_object($object) && $object->element == 'reception')
-			{
+			if (is_object($object) && $object->element == 'reception') {
 				$substitutionarray['__RECEPTIONTRACKNUM__'] = $object->tracking_number;
 				$substitutionarray['__RECEPTIONTRACKNUMURL__'] = $object->tracking_url;
 			}
 
-			if (is_object($object) && $object->element == 'contrat' && $object->id > 0 && is_array($object->lines))
-			{
+			if (is_object($object) && $object->element == 'contrat' && $object->id > 0 && is_array($object->lines)) {
 				$dateplannedstart = '';
 				$datenextexpiration = '';
-				foreach ($object->lines as $line)
-				{
-					if ($line->date_ouverture_prevue > $dateplannedstart) $dateplannedstart = $line->date_ouverture_prevue;
-					if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) $datenextexpiration = $line->date_fin_prevue;
+				foreach ($object->lines as $line) {
+					if ($line->date_ouverture_prevue > $dateplannedstart) {
+						$dateplannedstart = $line->date_ouverture_prevue;
+					}
+					if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+						$datenextexpiration = $line->date_fin_prevue;
+					}
 				}
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');
 				$substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');
@@ -6551,15 +6869,14 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			}
 
 			// Create dynamic tags for __EXTRAFIELD_FIELD__
-			if ($object->table_element && $object->id > 0)
-			{
-				if (!is_object($extrafields)) $extrafields = new ExtraFields($db);
+			if ($object->table_element && $object->id > 0) {
+				if (!is_object($extrafields)) {
+					$extrafields = new ExtraFields($db);
+				}
 				$extrafields->fetch_name_optionals_label($object->table_element, true);
 
-				if ($object->fetch_optionals() > 0)
-				{
-					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
-					{
+				if ($object->fetch_optionals() > 0) {
+					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
 						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
 							$substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];
 							if ($extrafields->attributes[$object->table_element]['type'][$key] == 'date') {
@@ -6580,60 +6897,76 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 
 			// Complete substitution array with the url to make online payment
 			$paymenturl = '';
-			if (empty($substitutionarray['__REF__']))
-			{
+			if (empty($substitutionarray['__REF__'])) {
 				$paymenturl = '';
 			} else {
 				// Set the online payment url link into __ONLINE_PAYMENT_URL__ key
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 				$outputlangs->loadLangs(array('paypal', 'other'));
 				$typeforonlinepayment = 'free';
-				if (is_object($object) && $object->element == 'commande') $typeforonlinepayment = 'order';
-				if (is_object($object) && $object->element == 'facture')  $typeforonlinepayment = 'invoice';
-				if (is_object($object) && $object->element == 'member')   $typeforonlinepayment = 'member';
-				if (is_object($object) && $object->element == 'contrat')  $typeforonlinepayment = 'contract';
+				if (is_object($object) && $object->element == 'commande') {
+					$typeforonlinepayment = 'order';
+				}
+				if (is_object($object) && $object->element == 'facture') {
+					$typeforonlinepayment = 'invoice';
+				}
+				if (is_object($object) && $object->element == 'member') {
+					$typeforonlinepayment = 'member';
+				}
+				if (is_object($object) && $object->element == 'contrat') {
+					$typeforonlinepayment = 'contract';
+				}
 				$url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);
 				$paymenturl = $url;
 			}
 
-			if ($object->id > 0)
-			{
+			if ($object->id > 0) {
 				$substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = ($paymenturl ?str_replace('\n', "\n", $outputlangs->trans("PredefinedMailContentLink", $paymenturl)) : '');
 				$substitutionarray['__ONLINE_PAYMENT_URL__'] = $paymenturl;
 
-				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal')
-				{
+				if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);
-				} else $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
-				if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande')
-				{
+				} else {
+					$substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+				}
+				if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);
-				} else $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
-				if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture')
-				{
+				} else {
+					$substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+				}
+				if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);
-				} else $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
-				if (!empty($conf->global->CONTRACT_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'contrat')
-				{
+				} else {
+					$substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+				}
+				if (!empty($conf->global->CONTRACT_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'contrat') {
 					$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = $object->getLastMainDocLink($object->element);
-				} else $substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = '';
+				} else {
+					$substitutionarray['__DIRECTDOWNLOAD_URL_CONTRACT__'] = '';
+				}
 
-				if (is_object($object) && $object->element == 'propal') $substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;
-				if (is_object($object) && $object->element == 'commande') $substitutionarray['__URL_ORDER__'] = DOL_MAIN_URL_ROOT."/commande/card.php?id=".$object->id;
-				if (is_object($object) && $object->element == 'facture') $substitutionarray['__URL_INVOICE__'] = DOL_MAIN_URL_ROOT."/compta/facture/card.php?id=".$object->id;
-				if (is_object($object) && $object->element == 'contrat') $substitutionarray['__URL_CONTRACT__'] = DOL_MAIN_URL_ROOT."/contrat/card.php?id=".$object->id;
+				if (is_object($object) && $object->element == 'propal') {
+					$substitutionarray['__URL_PROPOSAL__'] = DOL_MAIN_URL_ROOT."/comm/propal/card.php?id=".$object->id;
+				}
+				if (is_object($object) && $object->element == 'commande') {
+					$substitutionarray['__URL_ORDER__'] = DOL_MAIN_URL_ROOT."/commande/card.php?id=".$object->id;
+				}
+				if (is_object($object) && $object->element == 'facture') {
+					$substitutionarray['__URL_INVOICE__'] = DOL_MAIN_URL_ROOT."/compta/facture/card.php?id=".$object->id;
+				}
+				if (is_object($object) && $object->element == 'contrat') {
+					$substitutionarray['__URL_CONTRACT__'] = DOL_MAIN_URL_ROOT."/contrat/card.php?id=".$object->id;
+				}
 			}
 
-			if (is_object($object) && $object->element == 'action')
-			{
+			if (is_object($object) && $object->element == 'action') {
 				$substitutionarray['__EVENT_LABEL__'] = $object->label;
 				$substitutionarray['__EVENT_DATE__'] = dol_print_date($object->datep, '%A %d %b %Y');
 				$substitutionarray['__EVENT_TIME__'] = dol_print_date($object->datep, '%H:%M:%S');
 			}
 		}
 	}
-	if (empty($exclude) || !in_array('objectamount', $exclude))
-	{
+	if (empty($exclude) || !in_array('objectamount', $exclude)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functionsnumtoword.lib.php';
 
 		$substitutionarray['__DATE_YMD__']        = is_object($object) ? (isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : null) : '';
@@ -6646,14 +6979,22 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';
 		$substitutionarray['__AMOUNT_VAT_TEXT__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, '', true) : dol_convertToWord($object->total_tva, $outputlangs, '', true)) : '';
 		$substitutionarray['__AMOUNT_VAT_TEXTCURRENCY__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, $conf->currency, true) : dol_convertToWord($object->total_tva, $outputlangs, $conf->currency, true)) : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';
+		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+			$substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';
+		}
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+			$substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';
+		}
 
 		$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object) ? ($object->total_ttc ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? ($object->total_ht ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
 		$substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object) ? (isset($object->total_vat) ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : ($object->total_tva ? price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency) : null)) : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(1)) $substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
-		if ($onlykey != 2 || $mysoc->useLocalTax(2)) $substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
+		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+			$substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
+		}
+		if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+			$substitutionarray['__AMOUNT_TAX3_FORMATED__']     = is_object($object) ? ($object->total_localtax2 ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : null) : '';
+		}
 
 		$substitutionarray['__AMOUNT_MULTICURRENCY__']          = (is_object($object) && isset($object->multicurrency_total_ttc)) ? $object->multicurrency_total_ttc : '';
 		$substitutionarray['__AMOUNT_MULTICURRENCY_TEXT__']     = (is_object($object) && isset($object->multicurrency_total_ttc)) ? dol_convertToWord($object->multicurrency_total_ttc, $outputlangs, '', true) : '';
@@ -6661,8 +7002,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		// TODO Add other keys for foreign multicurrency
 
 		// For backward compatibility
-		if ($onlykey != 2)
-		{
+		if ($onlykey != 2) {
 			$substitutionarray['__TOTAL_TTC__']    = is_object($object) ? $object->total_ttc : '';
 			$substitutionarray['__TOTAL_HT__']     = is_object($object) ? $object->total_ht : '';
 			$substitutionarray['__TOTAL_VAT__']    = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';
@@ -6670,8 +7010,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 	}
 
 	//var_dump($substitutionarray['__AMOUNT_FORMATED__']);
-	if (empty($exclude) || !in_array('date', $exclude))
-	{
+	if (empty($exclude) || !in_array('date', $exclude)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 		$tmp = dol_getdate(dol_now(), true);
@@ -6701,12 +7040,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		));
 	}
 
-	if (!empty($conf->multicompany->enabled))
-	{
+	if (!empty($conf->multicompany->enabled)) {
 		$substitutionarray = array_merge($substitutionarray, array('__ENTITY_ID__' => $conf->entity));
 	}
-	if (empty($exclude) || !in_array('system', $exclude))
-	{
+	if (empty($exclude) || !in_array('system', $exclude)) {
 		$substitutionarray['__DOL_MAIN_URL_ROOT__'] = DOL_MAIN_URL_ROOT;
 		$substitutionarray['__(AnyTranslationKey)__'] = $outputlangs->trans('TranslationOfKey');
 		$substitutionarray['__(AnyTranslationKey|langfile)__'] = $outputlangs->trans('TranslationOfKey').' (load also language file before)';
@@ -6734,22 +7071,28 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null)
 {
 	global $conf, $langs;
 
-	if (!is_array($substitutionarray)) return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+	if (!is_array($substitutionarray)) {
+		return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+	}
 
-	if (empty($outputlangs)) $outputlangs = $langs;
+	if (empty($outputlangs)) {
+		$outputlangs = $langs;
+	}
 
 	// Make substitution for language keys: __(AnyTranslationKey)__ or __(AnyTranslationKey|langfile)__
-	if (is_object($outputlangs))
-	{
+	if (is_object($outputlangs)) {
 		$reg = array();
-		while (preg_match('/__\(([^\)]+)\)__/', $text, $reg))
-		{
+		while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {
 			$msgishtml = 0;
-			if (dol_textishtml($text, 1)) $msgishtml = 1;
+			if (dol_textishtml($text, 1)) {
+				$msgishtml = 1;
+			}
 
 			// If key is __(TranslationKey|langfile)__, then force load of langfile.lang
 			$tmp = explode('|', $reg[1]);
-			if (!empty($tmp[1])) $outputlangs->load($tmp[1]);
+			if (!empty($tmp[1])) {
+				$outputlangs->load($tmp[1]);
+			}
 
 			$text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ?dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);
 		}
@@ -6758,23 +7101,30 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null)
 	// Make substitution for constant keys.
 	// Must be after the substitution of translation, so if the text of translation contains a string __[xxx]__, it is also converted.
 	$reg = array();
-	while (preg_match('/__\[([^\]]+)\]__/', $text, $reg))
-	{
+	while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {
 		$msgishtml = 0;
-		if (dol_textishtml($text, 1)) $msgishtml = 1;
+		if (dol_textishtml($text, 1)) {
+			$msgishtml = 1;
+		}
 
 		$keyfound = $reg[1];
-		if (isASecretKey($keyfound)) $newval = '*****forbidden*****';
-		else $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+		if (isASecretKey($keyfound)) {
+			$newval = '*****forbidden*****';
+		} else {
+			$newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+		}
 		$text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ?dol_htmlentitiesbr($newval) : $newval, $text);
 	}
 
 	// Make substitition for array $substitutionarray
-	foreach ($substitutionarray as $key => $value)
-	{
-		if (!isset($value)) continue; // If value is null, it same than not having substitution key at all into array, we do not replace.
+	foreach ($substitutionarray as $key => $value) {
+		if (!isset($value)) {
+			continue; // If value is null, it same than not having substitution key at all into array, we do not replace.
+		}
 
-		if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) $value = ''; // Protection
+		if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+			$value = ''; // Protection
+		}
 
 		$text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example
 	}
@@ -6816,19 +7166,18 @@ function complete_substitutions_array(&$substitutionarray, $outputlangs, $object
 	// Check if there is external substitution to do, requested by plugins
 	$dirsubstitutions = array_merge(array(), (array) $conf->modules_parts['substitutions']);
 
-	foreach ($dirsubstitutions as $reldir)
-	{
+	foreach ($dirsubstitutions as $reldir) {
 		$dir = dol_buildpath($reldir, 0);
 
 		// Check if directory exists
-		if (!dol_is_dir($dir)) continue;
+		if (!dol_is_dir($dir)) {
+			continue;
+		}
 
 		$substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');
-		foreach ($substitfiles as $substitfile)
-		{
+		foreach ($substitfiles as $substitfile) {
 			$reg = array();
-			if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg))
-			{
+			if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg)) {
 				$module = $reg[1];
 
 				dol_syslog("Library ".$substitfile['name']." found into ".$dir);
@@ -6882,18 +7231,17 @@ function get_date_range($date_start, $date_end, $format = '', $outputlangs = '',
 
 	$out = '';
 
-	if (!is_object($outputlangs)) $outputlangs = $langs;
+	if (!is_object($outputlangs)) {
+		$outputlangs = $langs;
+	}
 
-	if ($date_start && $date_end)
-	{
+	if ($date_start && $date_end) {
 		$out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');
 	}
-	if ($date_start && !$date_end)
-	{
+	if ($date_start && !$date_end) {
 		$out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)).($withparenthesis ? ')' : '');
 	}
-	if (!$date_start && $date_end)
-	{
+	if (!$date_start && $date_end) {
 		$out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');
 	}
 
@@ -6914,10 +7262,14 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
 
 	$ret = '';
 	// If order not defined, we use the setup
-	if ($nameorder < 0) $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+	if ($nameorder < 0) {
+		$nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+	}
 	if ($nameorder == 1) {
 		$ret .= $firstname;
-		if ($firstname && $lastname) $ret .= ' ';
+		if ($firstname && $lastname) {
+			$ret .= ' ';
+		}
 		$ret .= $lastname;
 	} elseif ($nameorder == 2 || $nameorder == 3) {
 		$ret .= $firstname;
@@ -6930,7 +7282,9 @@ function dolGetFirstLastname($firstname, $lastname, $nameorder = -1)
 			$ret .= $firstname;
 		}
 		if ($nameorder == 0) {
-			if ($firstname && $lastname) $ret .= ' ';
+			if ($firstname && $lastname) {
+				$ret .= ' ';
+			}
 			$ret .= $firstname;
 		}
 	}
@@ -6953,12 +7307,15 @@ function setEventMessage($mesgs, $style = 'mesgs')
 	//dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function
 	if (!is_array($mesgs)) {
 		// If mesgs is a string
-		if ($mesgs) $_SESSION['dol_events'][$style][] = $mesgs;
+		if ($mesgs) {
+			$_SESSION['dol_events'][$style][] = $mesgs;
+		}
 	} else {
 		// If mesgs is an array
-		foreach ($mesgs as $mesg)
-		{
-			if ($mesg) $_SESSION['dol_events'][$style][] = $mesg;
+		foreach ($mesgs as $mesg) {
+			if ($mesg) {
+				$_SESSION['dol_events'][$style][] = $mesg;
+			}
 		}
 	}
 }
@@ -6976,22 +7333,24 @@ function setEventMessage($mesgs, $style = 'mesgs')
  */
 function setEventMessages($mesg, $mesgs, $style = 'mesgs', $messagekey = '')
 {
-	if (empty($mesg) && empty($mesgs))
-	{
+	if (empty($mesg) && empty($mesgs)) {
 		dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);
 	} else {
-		if ($messagekey)
-		{
+		if ($messagekey) {
 			// Complete message with a js link to set a cookie "DOLHIDEMESSAGE".$messagekey;
 			// TODO
 			$mesg .= '';
 		}
-		if (empty($messagekey) || empty($_COOKIE["DOLHIDEMESSAGE".$messagekey]))
-		{
-			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
-			if (empty($mesgs)) setEventMessage($mesg, $style);
-			else {
-				if (!empty($mesg) && !in_array($mesg, $mesgs)) setEventMessage($mesg, $style); // Add message string if not already into array
+		if (empty($messagekey) || empty($_COOKIE["DOLHIDEMESSAGE".$messagekey])) {
+			if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+				dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');
+			}
+			if (empty($mesgs)) {
+				setEventMessage($mesg, $style);
+			} else {
+				if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+					setEventMessage($mesg, $style); // Add message string if not already into array
+				}
 				setEventMessage($mesgs, $style);
 			}
 		}
@@ -7011,19 +7370,25 @@ function dol_htmloutput_events($disabledoutputofmessages = 0)
 {
 	// Show mesgs
 	if (isset($_SESSION['dol_events']['mesgs'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+		}
 		unset($_SESSION['dol_events']['mesgs']);
 	}
 
 	// Show errors
 	if (isset($_SESSION['dol_events']['errors'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+		}
 		unset($_SESSION['dol_events']['errors']);
 	}
 
 	// Show warnings
 	if (isset($_SESSION['dol_events']['warnings'])) {
-		if (empty($disabledoutputofmessages)) dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+		if (empty($disabledoutputofmessages)) {
+			dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+		}
 		unset($_SESSION['dol_events']['warnings']);
 	}
 }
@@ -7051,27 +7416,24 @@ function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $
 	$divstart = $divend = '';
 
 	// If inline message with no format, we add it.
-	if ((empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out))
-	{
+	if ((empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {
 		$divstart = '<div class="'.$style.' clearboth">';
 		$divend = '</div>';
 	}
 
-	if ((is_array($mesgarray) && count($mesgarray)) || $mesgstring)
-	{
+	if ((is_array($mesgarray) && count($mesgarray)) || $mesgstring) {
 		$langs->load("errors");
 		$out .= $divstart;
-		if (is_array($mesgarray) && count($mesgarray))
-		{
-			foreach ($mesgarray as $message)
-			{
+		if (is_array($mesgarray) && count($mesgarray)) {
+			foreach ($mesgarray as $message) {
 				$ret++;
 				$out .= $langs->trans($message);
-				if ($ret < count($mesgarray)) $out .= "<br>\n";
+				if ($ret < count($mesgarray)) {
+					$out .= "<br>\n";
+				}
 			}
 		}
-		if ($mesgstring)
-		{
+		if ($mesgstring) {
 			$langs->load("errors");
 			$ret++;
 			$out .= $langs->trans($mesgstring);
@@ -7079,10 +7441,8 @@ function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $
 		$out .= $divend;
 	}
 
-	if ($out)
-	{
-		if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded))
-		{
+	if ($out) {
+		if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) {
 			$return = '<script>
 					$(document).ready(function() {
 						var block = '.(!empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'
@@ -7136,36 +7496,43 @@ function get_htmloutput_errors($mesgstring = '', $mesgarray = array(), $keepembe
  */
 function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)
 {
-	if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) return;
+	if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+		return;
+	}
 
 	$iserror = 0;
 	$iswarning = 0;
-	if (is_array($mesgarray))
-	{
-		foreach ($mesgarray as $val)
-		{
-			if ($val && preg_match('/class="error"/i', $val)) { $iserror++; break; }
-			if ($val && preg_match('/class="warning"/i', $val)) { $iswarning++; break; }
+	if (is_array($mesgarray)) {
+		foreach ($mesgarray as $val) {
+			if ($val && preg_match('/class="error"/i', $val)) {
+				$iserror++; break;
+			}
+			if ($val && preg_match('/class="warning"/i', $val)) {
+				$iswarning++; break;
+			}
 		}
-	} elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) $iserror++;
-	elseif ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) $iswarning++;
-	if ($style == 'error') $iserror++;
-	if ($style == 'warning') $iswarning++;
+	} elseif ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+		$iserror++;
+	} elseif ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+		$iswarning++;
+	}
+	if ($style == 'error') {
+		$iserror++;
+	}
+	if ($style == 'warning') {
+		$iswarning++;
+	}
 
-	if ($iserror || $iswarning)
-	{
+	if ($iserror || $iswarning) {
 		// Remove div from texts
 		$mesgstring = preg_replace('/<\/div><div class="(error|warning)">/', '<br>', $mesgstring);
 		$mesgstring = preg_replace('/<div class="(error|warning)">/', '', $mesgstring);
 		$mesgstring = preg_replace('/<\/div>/', '', $mesgstring);
 		// Remove div from texts array
-		if (is_array($mesgarray))
-		{
+		if (is_array($mesgarray)) {
 			$newmesgarray = array();
-			foreach ($mesgarray as $val)
-			{
-				if (is_string($val))
-				{
+			foreach ($mesgarray as $val) {
+				if (is_string($val)) {
 					$tmpmesgstring = preg_replace('/<\/div><div class="(error|warning)">/', '<br>', $val);
 					$tmpmesgstring = preg_replace('/<div class="(error|warning)">/', '', $tmpmesgstring);
 					$tmpmesgstring = preg_replace('/<\/div>/', '', $tmpmesgstring);
@@ -7177,7 +7544,9 @@ function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'o
 			$mesgarray = $newmesgarray;
 		}
 		print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);
-	} else print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+	} else {
+		print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+	}
 }
 
 /**
@@ -7214,14 +7583,11 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 	// Clean parameters
 	$order = strtolower($order);
 
-	if (is_array($array))
-	{
+	if (is_array($array)) {
 		$sizearray = count($array);
-		if ($sizearray > 0)
-		{
+		if ($sizearray > 0) {
 			$temp = array();
-			foreach (array_keys($array) as $key)
-			{
+			foreach (array_keys($array) as $key) {
 				if (is_object($array[$key])) {
 					$temp[$key] = empty($array[$key]->$index) ? 0 : $array[$key]->$index;
 				} else {
@@ -7241,13 +7607,14 @@ function dol_sort_array(&$array, $index, $order = 'asc', $natsort = 0, $case_sen
 				} else {
 					natcasesort($temp);	// natecasesort is not sensible to case
 				}
-				if ($order != 'asc') $temp = array_reverse($temp, true);
+				if ($order != 'asc') {
+					$temp = array_reverse($temp, true);
+				}
 			}
 
 			$sorted = array();
 
-			foreach (array_keys($temp) as $key)
-			{
+			foreach (array_keys($temp) as $key) {
 				(is_numeric($key) && empty($keepindex)) ? $sorted[] = $array[$key] : $sorted[$key] = $array[$key];
 			}
 
@@ -7271,16 +7638,25 @@ function utf8_check($str)
 	// We must use here a binary strlen function (so not dol_strlen)
 	$strLength = dol_strlen($str);
 	for ($i = 0; $i < $strLength; $i++) {
-		if (ord($str[$i]) < 0x80) continue; // 0bbbbbbb
-		elseif ((ord($str[$i]) & 0xE0) == 0xC0) $n = 1; // 110bbbbb
-		elseif ((ord($str[$i]) & 0xF0) == 0xE0) $n = 2; // 1110bbbb
-		elseif ((ord($str[$i]) & 0xF8) == 0xF0) $n = 3; // 11110bbb
-		elseif ((ord($str[$i]) & 0xFC) == 0xF8) $n = 4; // 111110bb
-		elseif ((ord($str[$i]) & 0xFE) == 0xFC) $n = 5; // 1111110b
-		else return false; // Does not match any model
+		if (ord($str[$i]) < 0x80) {
+			continue; // 0bbbbbbb
+		} elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+			$n = 1; // 110bbbbb
+		} elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+			$n = 2; // 1110bbbb
+		} elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+			$n = 3; // 11110bbb
+		} elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+			$n = 4; // 111110bb
+		} elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+			$n = 5; // 1111110b
+		} else {
+			return false; // Does not match any model
+		}
 		for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
-			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))
-			return false;
+			if ((++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+				return false;
+			}
 		}
 	}
 	return true;
@@ -7296,9 +7672,13 @@ function ascii_check($str)
 {
 	if (function_exists('mb_check_encoding')) {
 		//if (mb_detect_encoding($str, 'ASCII', true) return false;
-		if (!mb_check_encoding($str, 'ASCII')) return false;
+		if (!mb_check_encoding($str, 'ASCII')) {
+			return false;
+		}
 	} else {
-		if (preg_match('/[^\x00-\x7f]/', $str)) return false; // Contains a byte > 7f
+		if (preg_match('/[^\x00-\x7f]/', $str)) {
+			return false; // Contains a byte > 7f
+		}
 	}
 
 	return true;
@@ -7317,11 +7697,19 @@ function dol_osencode($str)
 	global $conf;
 
 	$tmp = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0
-	if (empty($tmp) && !empty($_SERVER["WINDIR"])) $tmp = 'iso-8859-1'; // By default for windows
-	if (empty($tmp)) $tmp = 'utf-8'; // By default for other
-	if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+	if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+		$tmp = 'iso-8859-1'; // By default for windows
+	}
+	if (empty($tmp)) {
+		$tmp = 'utf-8'; // By default for other
+	}
+	if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) {
+		$tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+	}
 
-	if ($tmp == 'iso-8859-1') return utf8_decode($str);
+	if ($tmp == 'iso-8859-1') {
+		return utf8_decode($str);
+	}
 	return $str;
 }
 
@@ -7344,11 +7732,12 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 	global $cache_codes;
 
 	// If key empty
-	if ($key == '') return '';
+	if ($key == '') {
+		return '';
+	}
 
 	// Check in cache
-	if (isset($cache_codes[$tablename][$key][$fieldid]))	// Can be defined to 0 or ''
-	{
+	if (isset($cache_codes[$tablename][$key][$fieldid])) {	// Can be defined to 0 or ''
 		return $cache_codes[$tablename][$key][$fieldid]; // Found in cache
 	}
 
@@ -7357,15 +7746,18 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
 	$sql = "SELECT ".$fieldid." as valuetoget";
 	$sql .= " FROM ".MAIN_DB_PREFIX.$tablename;
 	$sql .= " WHERE ".$fieldkey." = '".$db->escape($key)."'";
-	if (!empty($entityfilter))
+	if (!empty($entityfilter)) {
 		$sql .= " AND entity IN (".getEntity($tablename).")";
+	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj) $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
-		else $cache_codes[$tablename][$key][$fieldid] = '';
+		if ($obj) {
+			$cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+		} else {
+			$cache_codes[$tablename][$key][$fieldid] = '';
+		}
 		$db->free($resql);
 		return $cache_codes[$tablename][$key][$fieldid];
 	} else {
@@ -7387,8 +7779,7 @@ function verifCond($strRights)
 
 	//print $strRights."<br>\n";
 	$rights = true;
-	if ($strRights != '')
-	{
+	if ($strRights != '') {
 		$str = 'if(!('.$strRights.')) { $rights = false; }';
 		dol_eval($str); // The dol_eval must contains all the global $xxx used into a condition
 	}
@@ -7418,11 +7809,17 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 
 	//print $s."<br>\n";
 	if ($returnvalue) {
-		if ($hideerrors) return @eval('return '.$s.';');
-		else return eval('return '.$s.';');
+		if ($hideerrors) {
+			return @eval('return '.$s.';');
+		} else {
+			return eval('return '.$s.';');
+		}
 	} else {
-		if ($hideerrors) @eval($s);
-		else eval($s);
+		if ($hideerrors) {
+			@eval($s);
+		} else {
+			eval($s);
+		}
 	}
 }
 
@@ -7446,10 +7843,11 @@ function dol_validElement($element)
  */
 function picto_from_langcode($codelang, $moreatt = '')
 {
-	if (empty($codelang)) return '';
+	if (empty($codelang)) {
+		return '';
+	}
 
-	if ($codelang == 'auto')
-	{
+	if ($codelang == 'auto') {
 		return '<span class="fa fa-globe"></span>';
 	}
 
@@ -7469,8 +7867,9 @@ function picto_from_langcode($codelang, $moreatt = '')
 		'SX' => 'unknown'
 	);
 
-	if (isset($langtocountryflag[$codelang])) $flagImage = $langtocountryflag[$codelang];
-	else {
+	if (isset($langtocountryflag[$codelang])) {
+		$flagImage = $langtocountryflag[$codelang];
+	} else {
 		$tmparray = explode('_', $codelang);
 		$flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];
 	}
@@ -7489,14 +7888,23 @@ function getLanguageCodeFromCountryCode($countrycode)
 {
 	global $mysoc;
 
-	if (empty($countrycode)) return null;
+	if (empty($countrycode)) {
+		return null;
+	}
 
-	if (strtoupper($countrycode) == 'MQ') return 'fr_CA';
-	if (strtoupper($countrycode) == 'SE') return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country
-	if (strtoupper($countrycode) == 'CH')
-	{
-		if ($mysoc->country_code == 'FR') return 'fr_CH';
-		if ($mysoc->country_code == 'DE') return 'de_CH';
+	if (strtoupper($countrycode) == 'MQ') {
+		return 'fr_CA';
+	}
+	if (strtoupper($countrycode) == 'SE') {
+		return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country
+	}
+	if (strtoupper($countrycode) == 'CH') {
+		if ($mysoc->country_code == 'FR') {
+			return 'fr_CH';
+		}
+		if ($mysoc->country_code == 'DE') {
+			return 'de_CH';
+		}
 	}
 
 	// Locale list taken from:
@@ -7674,16 +8082,15 @@ function getLanguageCodeFromCountryCode($countrycode)
 	);
 
 	$buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);
-	if (in_array($buildprimarykeytotest, $locales)) return strtolower($countrycode).'_'.strtoupper($countrycode);
+	if (in_array($buildprimarykeytotest, $locales)) {
+		return strtolower($countrycode).'_'.strtoupper($countrycode);
+	}
 
-	if (function_exists('locale_get_primary_language') && function_exists('locale_get_region'))    // Need extension php-intl
-	{
-		foreach ($locales as $locale)
-		{
+	if (function_exists('locale_get_primary_language') && function_exists('locale_get_region')) {    // Need extension php-intl
+		foreach ($locales as $locale) {
 			$locale_language = locale_get_primary_language($locale);
 			$locale_region = locale_get_region($locale);
-			if (strtoupper($countrycode) == $locale_region)
-			{
+			if (strtoupper($countrycode) == $locale_region) {
 				//var_dump($locale.'-'.$locale_language.'-'.$locale_region);
 				return strtolower($locale_language).'_'.strtoupper($locale_region);
 			}
@@ -7728,61 +8135,64 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 {
 	global $hookmanager;
 
-	if (isset($conf->modules_parts['tabs'][$type]) && is_array($conf->modules_parts['tabs'][$type]))
-	{
-		foreach ($conf->modules_parts['tabs'][$type] as $value)
-		{
+	if (isset($conf->modules_parts['tabs'][$type]) && is_array($conf->modules_parts['tabs'][$type])) {
+		foreach ($conf->modules_parts['tabs'][$type] as $value) {
 			$values = explode(':', $value);
 
-			if ($mode == 'add' && !preg_match('/^\-/', $values[1]))
-			{
-				if (count($values) == 6)       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
-				{
-					if ($values[0] != $type) continue;
+			if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {
+				if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
+					if ($values[0] != $type) {
+						continue;
+					}
 
-					if (verifCond($values[4]))
-					{
-						if ($values[3]) $langs->load($values[3]);
-						if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg))
-						{
+					if (verifCond($values[4])) {
+						if ($values[3]) {
+							$langs->load($values[3]);
+						}
+						if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {
 							$substitutionarray = array();
 							complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 							$label = make_substitutions($reg[1], $substitutionarray);
-						} else $label = $langs->trans($values[2]);
+						} else {
+							$label = $langs->trans($values[2]);
+						}
 
 						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);
 						$head[$h][1] = $label;
 						$head[$h][2] = str_replace('+', '', $values[1]);
 						$h++;
 					}
-				} elseif (count($values) == 5)       // deprecated
-				{
+				} elseif (count($values) == 5) {       // deprecated
 					dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);
 
-					if ($values[0] != $type) continue;
-					if ($values[3]) $langs->load($values[3]);
-					if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg))
-					{
+					if ($values[0] != $type) {
+						continue;
+					}
+					if ($values[3]) {
+						$langs->load($values[3]);
+					}
+					if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {
 						$substitutionarray = array();
 						complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 						$label = make_substitutions($reg[1], $substitutionarray);
-					} else $label = $langs->trans($values[2]);
+					} else {
+						$label = $langs->trans($values[2]);
+					}
 
 					$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);
 					$head[$h][1] = $label;
 					$head[$h][2] = str_replace('+', '', $values[1]);
 					$h++;
 				}
-			} elseif ($mode == 'remove' && preg_match('/^\-/', $values[1]))
-			{
-				if ($values[0] != $type) continue;
+			} elseif ($mode == 'remove' && preg_match('/^\-/', $values[1])) {
+				if ($values[0] != $type) {
+					continue;
+				}
 				$tabname = str_replace('-', '', $values[1]);
-				foreach ($head as $key => $val)
-				{
+				foreach ($head as $key => $val) {
 					$condition = (!empty($values[3]) ? verifCond($values[3]) : 1);
 					//var_dump($key.' - '.$tabname.' - '.$head[$key][2].' - '.$values[3].' - '.$condition);
-					if ($head[$key][2] == $tabname && $condition)
-					{
+					if ($head[$key][2] == $tabname && $condition) {
 						unset($head[$key]);
 						break;
 					}
@@ -7792,12 +8202,10 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 	}
 
 	// No need to make a return $head. Var is modified as a reference
-	if (!empty($hookmanager))
-	{
+	if (!empty($hookmanager)) {
 		$parameters = array('object' => $object, 'mode' => $mode, 'head' => $head);
 		$reshook = $hookmanager->executeHooks('completeTabsHead', $parameters);
-		if ($reshook > 0)
-		{
+		if ($reshook > 0) {
 			$head = $hookmanager->resArray;
 			$h = count($head);
 		}
@@ -7821,8 +8229,11 @@ function printCommonFooter($zone = 'private')
 	global $action;
 	global $micro_start_time;
 
-	if ($zone == 'private') print "\n".'<!-- Common footer for private page -->'."\n";
-	else print "\n".'<!-- Common footer for public page -->'."\n";
+	if ($zone == 'private') {
+		print "\n".'<!-- Common footer for private page -->'."\n";
+	} else {
+		print "\n".'<!-- Common footer for public page -->'."\n";
+	}
 
 	// A div to store page_y POST parameter so we can read it using javascript
 	print "\n<!-- A div to store page_y POST parameter -->\n";
@@ -7830,18 +8241,17 @@ function printCommonFooter($zone = 'private')
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks
-	if (empty($reshook))
-	{
-		if (!empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER."\n";
+	if (empty($reshook)) {
+		if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+			print $conf->global->MAIN_HTML_FOOTER."\n";
+		}
 
 		print "\n";
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			print '<script>'."\n";
 			print 'jQuery(document).ready(function() {'."\n";
 
-			if ($zone == 'private' && empty($conf->dol_use_jmobile))
-			{
+			if ($zone == 'private' && empty($conf->dol_use_jmobile)) {
 				print "\n";
 				print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */'."\n";
 				print 'jQuery("li.menuhider").click(function(event) {';
@@ -7852,38 +8262,39 @@ function printCommonFooter($zone = 'private')
 			}
 
 			// Management of focus and mandatory for fields
-			if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"]))))
-			{
+			if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"])))) {
 				print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */'."\n";
 				$relativepathstring = $_SERVER["PHP_SELF"];
 				// Clean $relativepathstring
-				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+				if (constant('DOL_URL_ROOT')) {
+					$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+				}
 				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 				//$tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));
-				if (!empty($user->default_values[$relativepathstring]['focus']))
-				{
-					foreach ($user->default_values[$relativepathstring]['focus'] as $defkey => $defval)
-					{
+				if (!empty($user->default_values[$relativepathstring]['focus'])) {
+					foreach ($user->default_values[$relativepathstring]['focus'] as $defkey => $defval) {
 						$qualified = 0;
-						if ($defkey != '_noquery_')
-						{
+						if ($defkey != '_noquery_') {
 							$tmpqueryarraytohave = explode('&', $defkey);
 							$foundintru = 0;
-							foreach ($tmpqueryarraytohave as $tmpquerytohave)
-							{
+							foreach ($tmpqueryarraytohave as $tmpquerytohave) {
 								$tmpquerytohaveparam = explode('=', $tmpquerytohave);
 								//print "console.log('".$tmpquerytohaveparam[0]." ".$tmpquerytohaveparam[1]." ".GETPOST($tmpquerytohaveparam[0])."');";
-								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) $foundintru = 1;
+								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) {
+									$foundintru = 1;
+								}
+							}
+							if (!$foundintru) {
+								$qualified = 1;
 							}
-							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						} else $qualified = 1;
+						} else {
+							$qualified = 1;
+						}
 
-						if ($qualified)
-						{
-							foreach ($defval as $paramkey => $paramval)
-							{
+						if ($qualified) {
+							foreach ($defval as $paramkey => $paramval) {
 								// Set focus on field
 								print 'jQuery("input[name=\''.$paramkey.'\']").focus();'."\n";
 								print 'jQuery("textarea[name=\''.$paramkey.'\']").focus();'."\n";
@@ -7892,29 +8303,29 @@ function printCommonFooter($zone = 'private')
 						}
 					}
 				}
-				if (!empty($user->default_values[$relativepathstring]['mandatory']))
-				{
-					foreach ($user->default_values[$relativepathstring]['mandatory'] as $defkey => $defval)
-					{
+				if (!empty($user->default_values[$relativepathstring]['mandatory'])) {
+					foreach ($user->default_values[$relativepathstring]['mandatory'] as $defkey => $defval) {
 						$qualified = 0;
-						if ($defkey != '_noquery_')
-						{
+						if ($defkey != '_noquery_') {
 							$tmpqueryarraytohave = explode('&', $defkey);
 							$foundintru = 0;
-							foreach ($tmpqueryarraytohave as $tmpquerytohave)
-							{
+							foreach ($tmpqueryarraytohave as $tmpquerytohave) {
 								$tmpquerytohaveparam = explode('=', $tmpquerytohave);
 								//print "console.log('".$tmpquerytohaveparam[0]." ".$tmpquerytohaveparam[1]." ".GETPOST($tmpquerytohaveparam[0])."');";
-								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) $foundintru = 1;
+								if (!GETPOSTISSET($tmpquerytohaveparam[0]) || ($tmpquerytohaveparam[1] != GETPOST($tmpquerytohaveparam[0]))) {
+									$foundintru = 1;
+								}
+							}
+							if (!$foundintru) {
+								$qualified = 1;
 							}
-							if (!$foundintru) $qualified = 1;
 							//var_dump($defkey.'-'.$qualified);
-						} else $qualified = 1;
+						} else {
+							$qualified = 1;
+						}
 
-						if ($qualified)
-						{
-							foreach ($defval as $paramkey => $paramval)
-							{
+						if ($qualified) {
+							foreach ($defval as $paramkey => $paramval) {
 								// Add property 'required' on input
 								print 'jQuery("input[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";
 								print 'jQuery("textarea[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";
@@ -7931,15 +8342,15 @@ function printCommonFooter($zone = 'private')
 			print '});'."\n";
 
 			// End of tuning
-			if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']) || !empty($conf->global->MAIN_SHOW_TUNING_INFO))
-			{
+			if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']) || !empty($conf->global->MAIN_SHOW_TUNING_INFO)) {
 				print "\n";
 				print "/* JS CODE TO ENABLE to add memory info */\n";
 				print 'window.console && console.log("';
-				if (!empty($conf->global->MEMCACHED_SERVER)) print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
+				if (!empty($conf->global->MEMCACHED_SERVER)) {
+					print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';
+				}
 				print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');
-				if (!empty($micro_start_time))   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
-				{
+				if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.
 					$micro_end_time = microtime(true);
 					print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';
 				}
@@ -7950,8 +8361,7 @@ function printCommonFooter($zone = 'private')
 				if (function_exists("memory_get_peak_usage")) {
 					print ' - Real mem peak: '.memory_get_peak_usage(true);
 				}
-				if (function_exists("zend_loader_file_encoded"))
-				{
+				if (function_exists("zend_loader_file_encoded")) {
 					print ' - Zend encoded file: '.(zend_loader_file_encoded() ? 'yes' : 'no');
 				}
 				print '");'."\n";
@@ -7961,8 +8371,7 @@ function printCommonFooter($zone = 'private')
 
 			// Google Analytics
 			// TODO Add a hook here
-			if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
-			{
+			if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
 				$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
 				foreach ($tmptagarray as $tmptag) {
 					print "\n";
@@ -7983,25 +8392,21 @@ function printCommonFooter($zone = 'private')
 		}
 
 		// Add Xdebug coverage of code
-		if (defined('XDEBUGCOVERAGE'))
-		{
+		if (defined('XDEBUGCOVERAGE')) {
 			print_r(xdebug_get_code_coverage());
 		}
 
 		// Add DebugBar data
-		if (!empty($user->rights->debugbar->read) && is_object($debugbar))
-		{
+		if (!empty($user->rights->debugbar->read) && is_object($debugbar)) {
 			$debugbar['time']->stopMeasure('pageaftermaster');
 			print '<!-- Output debugbar data -->'."\n";
 			$renderer = $debugbar->getRenderer();
 			print $debugbar->getRenderer()->render();
-		} elseif (count($conf->logbuffer))    // If there is some logs in buffer to show
-		{
+		} elseif (count($conf->logbuffer)) {    // If there is some logs in buffer to show
 			print "\n";
 			print "<!-- Start of log output\n";
 			//print '<div class="hidden">'."\n";
-			foreach ($conf->logbuffer as $logline)
-			{
+			foreach ($conf->logbuffer as $logline) {
 				print $logline."<br>\n";
 			}
 			//print '</div>'."\n";
@@ -8021,8 +8426,7 @@ function printCommonFooter($zone = 'private')
  */
 function dolExplodeIntoArray($string, $delimiter = ';', $kv = '=')
 {
-	if ($a = explode($delimiter, $string))
-	{
+	if ($a = explode($delimiter, $string)) {
 		$ka = array();
 		foreach ($a as $s) { // each part
 			if ($s) {
@@ -8091,12 +8495,10 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 
 	$value = trim($value);
 
-	if ($mode == 0)
-	{
+	if ($mode == 0) {
 		$value = preg_replace('/\*/', '%', $value); // Replace * with %
 	}
-	if ($mode == 1)
-	{
+	if ($mode == 1) {
 		$value = preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do
 	}
 
@@ -8104,56 +8506,49 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 
 	$crits = explode(' ', $value);
 	$res = '';
-	if (!is_array($fields)) $fields = array($fields);
+	if (!is_array($fields)) {
+		$fields = array($fields);
+	}
 
 	$j = 0;
-	foreach ($crits as $crit)
-	{
+	foreach ($crits as $crit) {
 		$crit = trim($crit);
 		$i = 0; $i2 = 0;
 		$newres = '';
-		foreach ($fields as $field)
-		{
-			if ($mode == 1)
-			{
+		foreach ($fields as $field) {
+			if ($mode == 1) {
 				$operator = '=';
 				$newcrit = preg_replace('/([<>=]+)/', '', $crit);
 
 				$reg = array();
 				preg_match('/([<>=]+)/', $crit, $reg);
-				if ($reg[1])
-				{
+				if ($reg[1]) {
 					$operator = $reg[1];
 				}
-				if ($newcrit != '')
-				{
+				if ($newcrit != '') {
 					$numnewcrit = price2num($newcrit);
-					if (is_numeric($numnewcrit))
-					{
+					if (is_numeric($numnewcrit)) {
 						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$db->sanitize($numnewcrit); // should be a numeric
 					} else {
 						$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
 					}
 					$i2++; // a criteria was added to string
 				}
-			} elseif ($mode == 2 || $mode == -2)
-			{
+			} elseif ($mode == 2 || $mode == -2) {
 				$crit = preg_replace('/[^0-9,]/', '', $crit); // ID are always integer
 				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '');
 				$newres .= $crit ? "IN (".$db->sanitize($db->escape($crit)).")" : "IN (0)";
-				if ($mode == -2) $newres .= ' OR '.$field.' IS NULL';
+				if ($mode == -2) {
+					$newres .= ' OR '.$field.' IS NULL';
+				}
 				$i2++; // a criteria was added to string
-			} elseif ($mode == 3 || $mode == -3)
-			{
+			} elseif ($mode == 3 || $mode == -3) {
 				$tmparray = explode(',', $crit);
-				if (count($tmparray))
-				{
+				if (count($tmparray)) {
 					$listofcodes = '';
-					foreach ($tmparray as $val)
-					{
+					foreach ($tmparray as $val) {
 						$val = trim($val);
-						if ($val)
-						{
+						if ($val) {
 							$listofcodes .= ($listofcodes ? ',' : '');
 							$listofcodes .= "'".$db->escape($val)."'";
 						}
@@ -8161,18 +8556,16 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes, 1).")";
 					$i2++; // a criteria was added to string
 				}
-				if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';
-			} elseif ($mode == 4)
-			{
+				if ($mode == -3) {
+					$newres .= ' OR '.$field.' IS NULL';
+				}
+			} elseif ($mode == 4) {
 				$tmparray = explode(',', $crit);
-				if (count($tmparray))
-				{
+				if (count($tmparray)) {
 					$listofcodes = '';
-					foreach ($tmparray as $val)
-					{
+					foreach ($tmparray as $val) {
 						$val = trim($val);
-						if ($val)
-						{
+						if ($val) {
 							$newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape($val).',%\'';
 							$newres .= ' OR '.$field.' = \''.$db->escape($val).'\'';
 							$newres .= ' OR '.$field.' LIKE \'%,'.$db->escape($val).'\'';
@@ -8186,14 +8579,14 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 			{
 				$tmpcrits = explode('|', $crit);
 				$i3 = 0;
-				foreach ($tmpcrits as $tmpcrit)
-				{
-					if ($tmpcrit !== '0' && empty($tmpcrit)) continue;
+				foreach ($tmpcrits as $tmpcrit) {
+					if ($tmpcrit !== '0' && empty($tmpcrit)) {
+						continue;
+					}
 
 					$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
 
-					if (preg_match('/\.(id|rowid)$/', $field))	// Special case for rowid that is sometimes a ref so used as a search field
-					{
+					if (preg_match('/\.(id|rowid)$/', $field)) {	// Special case for rowid that is sometimes a ref so used as a search field
 						$newres .= $field." = ".(is_numeric(trim($tmpcrit)) ?trim($tmpcrit) : '0');
 					} else {
 						$newres .= $field." LIKE '";
@@ -8201,13 +8594,11 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 						$tmpcrit = trim($tmpcrit);
 						$tmpcrit2 = $tmpcrit;
 						$tmpbefore = '%'; $tmpafter = '%';
-						if (preg_match('/^[\^\$]/', $tmpcrit))
-						{
+						if (preg_match('/^[\^\$]/', $tmpcrit)) {
 							$tmpbefore = '';
 							$tmpcrit2 = preg_replace('/^[\^\$]/', '', $tmpcrit2);
 						}
-						if (preg_match('/[\^\$]$/', $tmpcrit))
-						{
+						if (preg_match('/[\^\$]$/', $tmpcrit)) {
 							$tmpafter = '';
 							$tmpcrit2 = preg_replace('/[\^\$]$/', '', $tmpcrit2);
 						}
@@ -8215,8 +8606,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 						$newres .= $db->escape($tmpcrit2);
 						$newres .= $tmpafter;
 						$newres .= "'";
-						if ($tmpcrit2 == '')
-						{
+						if ($tmpcrit2 == '') {
 							$newres .= ' OR '.$field." IS NULL";
 						}
 					}
@@ -8227,7 +8617,9 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 			}
 			$i++;
 		}
-		if ($newres) $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');
+		if ($newres) {
+			$res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');
+		}
 		$j++;
 	}
 	$res = ($nofirstand ? "" : " AND ")."(".$res.")";
@@ -8248,8 +8640,7 @@ function showDirectDownloadLink($object)
 	$out = '';
 	$url = $object->getLastMainDocLink($object->element);
 
-	if ($url)
-	{
+	if ($url) {
 		$out .= img_picto($langs->trans("PublicDownloadLinkdesc"), 'globe').' '.$langs->trans("DirectDownloadLink").'<br>';
 		$out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';
 		$out .= ajax_autoselect("directdownloadlink", 0);
@@ -8268,22 +8659,40 @@ function showDirectDownloadLink($object)
 function getImageFileNameForSize($file, $extName, $extImgTarget = '')
 {
 	$dirName = dirname($file);
-	if ($dirName == '.') $dirName = '';
+	if ($dirName == '.') {
+		$dirName = '';
+	}
 
 	$fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp|\.webp)$/i', '', $file); // We remove extension, whatever is its case
 	$fileName = basename($fileName);
 
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
-	if (empty($extImgTarget)) $extImgTarget = (preg_match('/\.webp$/i', $file) ? '.webp' : '');
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+	}
+	if (empty($extImgTarget)) {
+		$extImgTarget = (preg_match('/\.webp$/i', $file) ? '.webp' : '');
+	}
 
-	if (!$extImgTarget) return $file;
+	if (!$extImgTarget) {
+		return $file;
+	}
 
 	$subdir = '';
-	if ($extName) $subdir = 'thumbs/';
+	if ($extName) {
+		$subdir = 'thumbs/';
+	}
 
 	return ($dirName ? $dirName.'/' : '').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb
 }
@@ -8302,19 +8711,26 @@ function getAdvancedPreviewUrl($modulepart, $relativepath, $alldata = 0, $param
 {
 	global $conf, $langs;
 
-	if (empty($conf->use_javascript_ajax)) return '';
+	if (empty($conf->use_javascript_ajax)) {
+		return '';
+	}
 
 	$isAllowedForPreview = dolIsAllowedForPreview($relativepath);
 
-	if ($alldata == 1)
-	{
-		if ($isAllowedForPreview) return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime'=>dol_mimetype($relativepath));
-		else return array();
+	if ($alldata == 1) {
+		if ($isAllowedForPreview) {
+			return array('target'=>'_blank', 'css'=>'documentpreview', 'url'=>DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime'=>dol_mimetype($relativepath));
+		} else {
+			return array();
+		}
 	}
 
 	// old behavior, return a string
-	if ($isAllowedForPreview) return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
-	else return '';
+	if ($isAllowedForPreview) {
+		return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';
+	} else {
+		return '';
+	}
 }
 
 
@@ -8333,7 +8749,9 @@ function ajax_autoselect($htmlname, $addlink = '')
 				    jQuery("'.((strpos($htmlname, '.') === 0 ? '' : '#').$htmlname).'").click(function() { jQuery(this).select(); } );
 				});
 		    </script>';
-	if ($addlink) $out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	if ($addlink) {
+		$out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';
+	}
 	return $out;
 }
 
@@ -8349,15 +8767,21 @@ function dolIsAllowedForPreview($file)
 	global $conf;
 
 	// Check .noexe extension in filename
-	if (preg_match('/\.noexe$/i', $file)) return 0;
+	if (preg_match('/\.noexe$/i', $file)) {
+		return 0;
+	}
 
 	// Check mime types
 	$mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'webp');
-	if (!empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) $mime_preview[] = 'svg+xml';
+	if (!empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) {
+		$mime_preview[] = 'svg+xml';
+	}
 	//$mime_preview[]='vnd.oasis.opendocument.presentation';
 	//$mime_preview[]='archive';
 	$num_mime = array_search(dol_mimetype($file, '', 1), $mime_preview);
-	if ($num_mime !== false) return 1;
+	if ($num_mime !== false) {
+		return 1;
+	}
 
 	// By default, not allowed for preview
 	return 0;
@@ -8383,102 +8807,224 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
 	$tmpfile = preg_replace('/\.noexe$/', '', $file);
 
 	// Plain text files
-	if (preg_match('/\.txt$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
-	if (preg_match('/\.rtx$/i', $tmpfile)) { $mime = 'text/richtext'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
-	if (preg_match('/\.csv$/i', $tmpfile)) { $mime = 'text/csv'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
-	if (preg_match('/\.tsv$/i', $tmpfile)) { $mime = 'text/tab-separated-values'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
-	if (preg_match('/\.(cf|conf|log)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
-	if (preg_match('/\.ini$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'ini'; $famime = 'file-text-o'; }
-	if (preg_match('/\.md$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o'; }
-	if (preg_match('/\.css$/i', $tmpfile)) { $mime = 'text/css'; $imgmime = 'css.png'; $srclang = 'css'; $famime = 'file-text-o'; }
-	if (preg_match('/\.lang$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'lang'; $famime = 'file-text-o'; }
+	if (preg_match('/\.txt$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.rtx$/i', $tmpfile)) {
+		$mime = 'text/richtext'; $imgmime = 'text.png'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.csv$/i', $tmpfile)) {
+		$mime = 'text/csv'; $imgmime = 'text.png'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.tsv$/i', $tmpfile)) {
+		$mime = 'text/tab-separated-values'; $imgmime = 'text.png'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.(cf|conf|log)$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.ini$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'ini'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.md$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'md'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.css$/i', $tmpfile)) {
+		$mime = 'text/css'; $imgmime = 'css.png'; $srclang = 'css'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.lang$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'lang'; $famime = 'file-text-o';
+	}
 	// Certificate files
-	if (preg_match('/\.(crt|cer|key|pub)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o'; }
+	if (preg_match('/\.(crt|cer|key|pub)$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $famime = 'file-text-o';
+	}
 	// XML based (HTML/XML/XAML)
-	if (preg_match('/\.(html|htm|shtml)$/i', $tmpfile)) { $mime = 'text/html'; $imgmime = 'html.png'; $srclang = 'html'; $famime = 'file-text-o'; }
-	if (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xml'; $famime = 'file-text-o'; }
-	if (preg_match('/\.xaml$/i', $tmpfile)) { $mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o'; }
+	if (preg_match('/\.(html|htm|shtml)$/i', $tmpfile)) {
+		$mime = 'text/html'; $imgmime = 'html.png'; $srclang = 'html'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.(xml|xhtml)$/i', $tmpfile)) {
+		$mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xml'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.xaml$/i', $tmpfile)) {
+		$mime = 'text/xml'; $imgmime = 'other.png'; $srclang = 'xaml'; $famime = 'file-text-o';
+	}
 	// Languages
-	if (preg_match('/\.bas$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'bas'; $famime = 'file-code-o'; }
-	if (preg_match('/\.(c)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'c'; $famime = 'file-code-o'; }
-	if (preg_match('/\.(cpp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cpp'; $famime = 'file-code-o'; }
-	if (preg_match('/\.cs$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o'; }
-	if (preg_match('/\.(h)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'h'; $famime = 'file-code-o'; }
-	if (preg_match('/\.(java|jsp)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'java'; $famime = 'file-code-o'; }
-	if (preg_match('/\.php([0-9]{1})?$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; }
-	if (preg_match('/\.phtml$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o'; }
-	if (preg_match('/\.(pl|pm)$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'pl.png'; $srclang = 'perl'; $famime = 'file-code-o'; }
-	if (preg_match('/\.sql$/i', $tmpfile)) { $mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'sql'; $famime = 'file-code-o'; }
-	if (preg_match('/\.js$/i', $tmpfile)) { $mime = 'text/x-javascript'; $imgmime = 'jscript.png'; $srclang = 'js'; $famime = 'file-code-o'; }
+	if (preg_match('/\.bas$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'bas'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.(c)$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'c'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.(cpp)$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cpp'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.cs$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'cs'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.(h)$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'h'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.(java|jsp)$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'java'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.php([0-9]{1})?$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.phtml$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'php.png'; $srclang = 'php'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.(pl|pm)$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'pl.png'; $srclang = 'perl'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.sql$/i', $tmpfile)) {
+		$mime = 'text/plain'; $imgmime = 'text.png'; $srclang = 'sql'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.js$/i', $tmpfile)) {
+		$mime = 'text/x-javascript'; $imgmime = 'jscript.png'; $srclang = 'js'; $famime = 'file-code-o';
+	}
 	// Open office
-	if (preg_match('/\.odp$/i', $tmpfile)) { $mime = 'application/vnd.oasis.opendocument.presentation'; $imgmime = 'ooffice.png'; $famime = 'file-powerpoint-o'; }
-	if (preg_match('/\.ods$/i', $tmpfile)) { $mime = 'application/vnd.oasis.opendocument.spreadsheet'; $imgmime = 'ooffice.png'; $famime = 'file-excel-o'; }
-	if (preg_match('/\.odt$/i', $tmpfile)) { $mime = 'application/vnd.oasis.opendocument.text'; $imgmime = 'ooffice.png'; $famime = 'file-word-o'; }
+	if (preg_match('/\.odp$/i', $tmpfile)) {
+		$mime = 'application/vnd.oasis.opendocument.presentation'; $imgmime = 'ooffice.png'; $famime = 'file-powerpoint-o';
+	}
+	if (preg_match('/\.ods$/i', $tmpfile)) {
+		$mime = 'application/vnd.oasis.opendocument.spreadsheet'; $imgmime = 'ooffice.png'; $famime = 'file-excel-o';
+	}
+	if (preg_match('/\.odt$/i', $tmpfile)) {
+		$mime = 'application/vnd.oasis.opendocument.text'; $imgmime = 'ooffice.png'; $famime = 'file-word-o';
+	}
 	// MS Office
-	if (preg_match('/\.mdb$/i', $tmpfile)) { $mime = 'application/msaccess'; $imgmime = 'mdb.png'; $famime = 'file-o'; }
-	if (preg_match('/\.doc(x|m)?$/i', $tmpfile)) { $mime = 'application/msword'; $imgmime = 'doc.png'; $famime = 'file-word-o'; }
-	if (preg_match('/\.dot(x|m)?$/i', $tmpfile)) { $mime = 'application/msword'; $imgmime = 'doc.png'; $famime = 'file-word-o'; }
-	if (preg_match('/\.xlt(x)?$/i', $tmpfile)) { $mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }
-	if (preg_match('/\.xla(m)?$/i', $tmpfile)) { $mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }
-	if (preg_match('/\.xls$/i', $tmpfile)) { $mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }
-	if (preg_match('/\.xls(b|m|x)$/i', $tmpfile)) { $mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; $imgmime = 'xls.png'; $famime = 'file-excel-o'; }
-	if (preg_match('/\.pps(m|x)?$/i', $tmpfile)) { $mime = 'application/vnd.ms-powerpoint'; $imgmime = 'ppt.png'; $famime = 'file-powerpoint-o'; }
-	if (preg_match('/\.ppt(m|x)?$/i', $tmpfile)) { $mime = 'application/x-mspowerpoint'; $imgmime = 'ppt.png'; $famime = 'file-powerpoint-o'; }
+	if (preg_match('/\.mdb$/i', $tmpfile)) {
+		$mime = 'application/msaccess'; $imgmime = 'mdb.png'; $famime = 'file-o';
+	}
+	if (preg_match('/\.doc(x|m)?$/i', $tmpfile)) {
+		$mime = 'application/msword'; $imgmime = 'doc.png'; $famime = 'file-word-o';
+	}
+	if (preg_match('/\.dot(x|m)?$/i', $tmpfile)) {
+		$mime = 'application/msword'; $imgmime = 'doc.png'; $famime = 'file-word-o';
+	}
+	if (preg_match('/\.xlt(x)?$/i', $tmpfile)) {
+		$mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o';
+	}
+	if (preg_match('/\.xla(m)?$/i', $tmpfile)) {
+		$mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o';
+	}
+	if (preg_match('/\.xls$/i', $tmpfile)) {
+		$mime = 'application/vnd.ms-excel'; $imgmime = 'xls.png'; $famime = 'file-excel-o';
+	}
+	if (preg_match('/\.xls(b|m|x)$/i', $tmpfile)) {
+		$mime = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'; $imgmime = 'xls.png'; $famime = 'file-excel-o';
+	}
+	if (preg_match('/\.pps(m|x)?$/i', $tmpfile)) {
+		$mime = 'application/vnd.ms-powerpoint'; $imgmime = 'ppt.png'; $famime = 'file-powerpoint-o';
+	}
+	if (preg_match('/\.ppt(m|x)?$/i', $tmpfile)) {
+		$mime = 'application/x-mspowerpoint'; $imgmime = 'ppt.png'; $famime = 'file-powerpoint-o';
+	}
 	// Other
-	if (preg_match('/\.pdf$/i', $tmpfile)) { $mime = 'application/pdf'; $imgmime = 'pdf.png'; $famime = 'file-pdf-o'; }
+	if (preg_match('/\.pdf$/i', $tmpfile)) {
+		$mime = 'application/pdf'; $imgmime = 'pdf.png'; $famime = 'file-pdf-o';
+	}
 	// Scripts
-	if (preg_match('/\.bat$/i', $tmpfile)) { $mime = 'text/x-bat'; $imgmime = 'script.png'; $srclang = 'dos'; $famime = 'file-code-o'; }
-	if (preg_match('/\.sh$/i', $tmpfile)) { $mime = 'text/x-sh'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o'; }
-	if (preg_match('/\.ksh$/i', $tmpfile)) { $mime = 'text/x-ksh'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o'; }
-	if (preg_match('/\.bash$/i', $tmpfile)) { $mime = 'text/x-bash'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o'; }
+	if (preg_match('/\.bat$/i', $tmpfile)) {
+		$mime = 'text/x-bat'; $imgmime = 'script.png'; $srclang = 'dos'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.sh$/i', $tmpfile)) {
+		$mime = 'text/x-sh'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.ksh$/i', $tmpfile)) {
+		$mime = 'text/x-ksh'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o';
+	}
+	if (preg_match('/\.bash$/i', $tmpfile)) {
+		$mime = 'text/x-bash'; $imgmime = 'script.png'; $srclang = 'bash'; $famime = 'file-code-o';
+	}
 	// Images
-	if (preg_match('/\.ico$/i', $tmpfile)) { $mime = 'image/x-icon'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
-	if (preg_match('/\.(jpg|jpeg)$/i', $tmpfile)) { $mime = 'image/jpeg'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
-	if (preg_match('/\.png$/i', $tmpfile)) { $mime = 'image/png'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
-	if (preg_match('/\.gif$/i', $tmpfile)) { $mime = 'image/gif'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
-	if (preg_match('/\.bmp$/i', $tmpfile)) { $mime = 'image/bmp'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
-	if (preg_match('/\.(tif|tiff)$/i', $tmpfile)) { $mime = 'image/tiff'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
-	if (preg_match('/\.svg$/i', $tmpfile)) { $mime = 'image/svg+xml'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
-	if (preg_match('/\.webp$/i', $tmpfile)) { $mime = 'image/webp'; $imgmime = 'image.png'; $famime = 'file-image-o'; }
+	if (preg_match('/\.ico$/i', $tmpfile)) {
+		$mime = 'image/x-icon'; $imgmime = 'image.png'; $famime = 'file-image-o';
+	}
+	if (preg_match('/\.(jpg|jpeg)$/i', $tmpfile)) {
+		$mime = 'image/jpeg'; $imgmime = 'image.png'; $famime = 'file-image-o';
+	}
+	if (preg_match('/\.png$/i', $tmpfile)) {
+		$mime = 'image/png'; $imgmime = 'image.png'; $famime = 'file-image-o';
+	}
+	if (preg_match('/\.gif$/i', $tmpfile)) {
+		$mime = 'image/gif'; $imgmime = 'image.png'; $famime = 'file-image-o';
+	}
+	if (preg_match('/\.bmp$/i', $tmpfile)) {
+		$mime = 'image/bmp'; $imgmime = 'image.png'; $famime = 'file-image-o';
+	}
+	if (preg_match('/\.(tif|tiff)$/i', $tmpfile)) {
+		$mime = 'image/tiff'; $imgmime = 'image.png'; $famime = 'file-image-o';
+	}
+	if (preg_match('/\.svg$/i', $tmpfile)) {
+		$mime = 'image/svg+xml'; $imgmime = 'image.png'; $famime = 'file-image-o';
+	}
+	if (preg_match('/\.webp$/i', $tmpfile)) {
+		$mime = 'image/webp'; $imgmime = 'image.png'; $famime = 'file-image-o';
+	}
 	// Calendar
-	if (preg_match('/\.vcs$/i', $tmpfile)) { $mime = 'text/calendar'; $imgmime = 'other.png'; $famime = 'file-text-o'; }
-	if (preg_match('/\.ics$/i', $tmpfile)) { $mime = 'text/calendar'; $imgmime = 'other.png'; $famime = 'file-text-o'; }
+	if (preg_match('/\.vcs$/i', $tmpfile)) {
+		$mime = 'text/calendar'; $imgmime = 'other.png'; $famime = 'file-text-o';
+	}
+	if (preg_match('/\.ics$/i', $tmpfile)) {
+		$mime = 'text/calendar'; $imgmime = 'other.png'; $famime = 'file-text-o';
+	}
 	// Other
-	if (preg_match('/\.torrent$/i', $tmpfile)) { $mime = 'application/x-bittorrent'; $imgmime = 'other.png'; $famime = 'file-o'; }
+	if (preg_match('/\.torrent$/i', $tmpfile)) {
+		$mime = 'application/x-bittorrent'; $imgmime = 'other.png'; $famime = 'file-o';
+	}
 	// Audio
-	if (preg_match('/\.(mp3|ogg|au|wav|wma|mid)$/i', $tmpfile)) { $mime = 'audio'; $imgmime = 'audio.png'; $famime = 'file-audio-o'; }
+	if (preg_match('/\.(mp3|ogg|au|wav|wma|mid)$/i', $tmpfile)) {
+		$mime = 'audio'; $imgmime = 'audio.png'; $famime = 'file-audio-o';
+	}
 	// Video
-	if (preg_match('/\.ogv$/i', $tmpfile)) { $mime = 'video/ogg'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
-	if (preg_match('/\.webm$/i', $tmpfile)) { $mime = 'video/webm'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
-	if (preg_match('/\.avi$/i', $tmpfile)) { $mime = 'video/x-msvideo'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
-	if (preg_match('/\.divx$/i', $tmpfile)) { $mime = 'video/divx'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
-	if (preg_match('/\.xvid$/i', $tmpfile)) { $mime = 'video/xvid'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
-	if (preg_match('/\.(wmv|mpg|mpeg)$/i', $tmpfile)) { $mime = 'video'; $imgmime = 'video.png'; $famime = 'file-video-o'; }
+	if (preg_match('/\.ogv$/i', $tmpfile)) {
+		$mime = 'video/ogg'; $imgmime = 'video.png'; $famime = 'file-video-o';
+	}
+	if (preg_match('/\.webm$/i', $tmpfile)) {
+		$mime = 'video/webm'; $imgmime = 'video.png'; $famime = 'file-video-o';
+	}
+	if (preg_match('/\.avi$/i', $tmpfile)) {
+		$mime = 'video/x-msvideo'; $imgmime = 'video.png'; $famime = 'file-video-o';
+	}
+	if (preg_match('/\.divx$/i', $tmpfile)) {
+		$mime = 'video/divx'; $imgmime = 'video.png'; $famime = 'file-video-o';
+	}
+	if (preg_match('/\.xvid$/i', $tmpfile)) {
+		$mime = 'video/xvid'; $imgmime = 'video.png'; $famime = 'file-video-o';
+	}
+	if (preg_match('/\.(wmv|mpg|mpeg)$/i', $tmpfile)) {
+		$mime = 'video'; $imgmime = 'video.png'; $famime = 'file-video-o';
+	}
 	// Archive
-	if (preg_match('/\.(zip|rar|gz|tgz|z|cab|bz2|7z|tar|lzh)$/i', $tmpfile)) { $mime = 'archive'; $imgmime = 'archive.png'; $famime = 'file-archive-o'; }    // application/xxx where zzz is zip, ...
+	if (preg_match('/\.(zip|rar|gz|tgz|z|cab|bz2|7z|tar|lzh)$/i', $tmpfile)) {
+		$mime = 'archive'; $imgmime = 'archive.png'; $famime = 'file-archive-o';
+	}    // application/xxx where zzz is zip, ...
 	// Exe
-	if (preg_match('/\.(exe|com)$/i', $tmpfile)) { $mime = 'application/octet-stream'; $imgmime = 'other.png'; $famime = 'file-o'; }
+	if (preg_match('/\.(exe|com)$/i', $tmpfile)) {
+		$mime = 'application/octet-stream'; $imgmime = 'other.png'; $famime = 'file-o';
+	}
 	// Lib
-	if (preg_match('/\.(dll|lib|o|so|a)$/i', $tmpfile)) { $mime = 'library'; $imgmime = 'library.png'; $famime = 'file-o'; }
+	if (preg_match('/\.(dll|lib|o|so|a)$/i', $tmpfile)) {
+		$mime = 'library'; $imgmime = 'library.png'; $famime = 'file-o';
+	}
 	// Err
-	if (preg_match('/\.err$/i', $tmpfile)) { $mime = 'error'; $imgmime = 'error.png'; $famime = 'file-text-o'; }
+	if (preg_match('/\.err$/i', $tmpfile)) {
+		$mime = 'error'; $imgmime = 'error.png'; $famime = 'file-text-o';
+	}
 
 	// Return string
-	if ($mode == 1)
-	{
+	if ($mode == 1) {
 		$tmp = explode('/', $mime);
 		return (!empty($tmp[1]) ? $tmp[1] : $tmp[0]);
 	}
-	if ($mode == 2)
-	{
+	if ($mode == 2) {
 		return $imgmime;
 	}
-	if ($mode == 3)
-	{
+	if ($mode == 3) {
 		return $srclang;
 	}
-	if ($mode == 4)
-	{
+	if ($mode == 4) {
 		return $famime;
 	}
 	return $mime;
@@ -8498,17 +9044,16 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
 {
 	global $dictvalues, $db, $langs;
 
-	if (!isset($dictvalues[$tablename]))
-	{
+	if (!isset($dictvalues[$tablename])) {
 		$dictvalues[$tablename] = array();
 		$sql = 'SELECT * FROM '.$tablename.' WHERE 1'; // Here select * is allowed as it is generic code and we don't have list of fields
-		if ($checkentity) $sql .= ' AND entity IN (0,'.getEntity($tablename).')';
+		if ($checkentity) {
+			$sql .= ' AND entity IN (0,'.getEntity($tablename).')';
+		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $db->fetch_object($resql)) {
 				$dictvalues[$tablename][$obj->{$rowidfield}] = $obj;
 			}
 		} else {
@@ -8516,10 +9061,13 @@ function getDictvalue($tablename, $field, $id, $checkentity = false, $rowidfield
 		}
 	}
 
-	if (!empty($dictvalues[$tablename][$id])) return $dictvalues[$tablename][$id]->{$field}; // Found
-	else // Not found
+	if (!empty($dictvalues[$tablename][$id])) {
+		return $dictvalues[$tablename][$id]->{$field}; // Found
+	} else // Not found
 	{
-		if ($id > 0) return $id;
+		if ($id > 0) {
+			return $id;
+		}
 		return '';
 	}
 }
@@ -8534,12 +9082,10 @@ function colorIsLight($stringcolor)
 {
 	$stringcolor = str_replace('#', '', $stringcolor);
 	$res = -1;
-	if (!empty($stringcolor))
-	{
+	if (!empty($stringcolor)) {
 		$res = 0;
 		$tmp = explode(',', $stringcolor);
-		if (count($tmp) > 1)   // This is a comma RGB ('255','255','255')
-		{
+		if (count($tmp) > 1) {   // This is a comma RGB ('255','255','255')
 			$r = $tmp[0];
 			$g = $tmp[1];
 			$b = $tmp[2];
@@ -8552,7 +9098,9 @@ function colorIsLight($stringcolor)
 			$b = hexdec($hexb);
 		}
 		$bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm
-		if ($bright > 0.6) $res = 1;
+		if ($bright > 0.6) {
+			$res = 1;
+		}
 	}
 	return $res;
 }
@@ -8571,22 +9119,30 @@ function isVisibleToUserType($type_user, &$menuentry, &$listofmodulesforexternal
 
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-	if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition
-	if ($type_user && $menuentry['module'])
-	{
+	if (empty($menuentry['enabled'])) {
+		return 0; // Entry disabled by condition
+	}
+	if ($type_user && $menuentry['module']) {
 		$tmploops = explode('|', $menuentry['module']);
 		$found = 0;
-		foreach ($tmploops as $tmploop)
-		{
+		foreach ($tmploops as $tmploop) {
 			if (in_array($tmploop, $listofmodulesforexternal)) {
 				$found++; break;
 			}
 		}
-		if (!$found) return 0; // Entry is for menus all excluded to external users
+		if (!$found) {
+			return 0; // Entry is for menus all excluded to external users
+		}
+	}
+	if (!$menuentry['perms'] && $type_user) {
+		return 0; // No permissions and user is external
+	}
+	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+		return 0; // No permissions and option to hide when not allowed, even for internal user, is on
+	}
+	if (!$menuentry['perms']) {
+		return 2; // No permissions and user is external
 	}
-	if (!$menuentry['perms'] && $type_user) return 0; // No permissions and user is external
-	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0; // No permissions and option to hide when not allowed, even for internal user, is on
-	if (!$menuentry['perms']) return 2; // No permissions and user is external
 	return 1;
 }
 
@@ -8636,7 +9192,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
 
 	// Override attr
 	if (!empty($params['attr']) && is_array($params['attr'])) {
-		foreach ($params['attr']as $key => $value) {
+		foreach ($params['attr'] as $key => $value) {
 			if ($key == 'class') {
 				$attr['class'] .= ' '.$value;
 			} elseif ($key == 'classOverride') {
@@ -8700,11 +9256,14 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 		$htmlLabelShort = (in_array($displayMode, array(1, 2, 5)) ? '<span class="hideonsmartphone">' : '').(!empty($html) ? $html : (!empty($statusLabelShort) ? $statusLabelShort : $statusLabel)).(in_array($displayMode, array(1, 2, 5)) ? '</span>' : '');
 
 		// For small screen, we always use the short label instead of long label.
-		if (!empty($conf->dol_optimize_smallscreen))
-		{
-			if ($displayMode == 0) $displayMode = 1;
-			elseif ($displayMode == 4) $displayMode = 2;
-			elseif ($displayMode == 6) $displayMode = 5;
+		if (!empty($conf->dol_optimize_smallscreen)) {
+			if ($displayMode == 0) {
+				$displayMode = 1;
+			} elseif ($displayMode == 4) {
+				$displayMode = 2;
+			} elseif ($displayMode == 6) {
+				$displayMode = 5;
+			}
 		}
 
 		// For backward compatibility. Image's filename are still in French, so we use this array to convert
@@ -8853,10 +9412,14 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 	}
 
 	$class = 'btnTitle';
-	if (in_array($iconClass, array('fa fa-plus-circle', 'fa fa-comment-dots'))) $class .= ' btnTitlePlus';
+	if (in_array($iconClass, array('fa fa-plus-circle', 'fa fa-comment-dots'))) {
+		$class .= ' btnTitlePlus';
+	}
 	$useclassfortooltip = 1;
 
-	if (!empty($params['morecss'])) $class .= ' '.$params['morecss'];
+	if (!empty($params['morecss'])) {
+		$class .= ' '.$params['morecss'];
+	}
 
 	$attr = array(
 		'class' => $class,
@@ -9042,9 +9605,15 @@ function getElementProperties($element_type)
 		$subelement = 'product';
 	}
 
-	if (empty($classfile)) $classfile = strtolower($subelement);
-	if (empty($classname)) $classname = ucfirst($subelement);
-	if (empty($classpath)) $classpath = $module.'/class';
+	if (empty($classfile)) {
+		$classfile = strtolower($subelement);
+	}
+	if (empty($classname)) {
+		$classname = ucfirst($subelement);
+	}
+	if (empty($classpath)) {
+		$classpath = $module.'/class';
+	}
 
 	$element_properties = array(
 		'module' => $module,
@@ -9071,14 +9640,12 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
 	global $conf, $db;
 
 	$element_prop = getElementProperties($element_type);
-	if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled)
-	{
+	if (is_array($element_prop) && $conf->{$element_prop['module']}->enabled) {
 		dol_include_once('/'.$element_prop['classpath'].'/'.$element_prop['classfile'].'.class.php');
 
 		$objecttmp = new $element_prop['classname']($db);
 		$ret = $objecttmp->fetch($element_id, $element_ref);
-		if ($ret >= 0)
-		{
+		if ($ret >= 0) {
 			return $objecttmp;
 		}
 	}
@@ -9093,8 +9660,7 @@ function fetchObjectByElement($element_id, $element_type, $element_ref = '')
  */
 function isAFileWithExecutableContent($filename)
 {
-	if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename))
-	{
+	if (preg_match('/\.(htm|html|js|phar|php|php\d+|phtml|pht|pl|py|cgi|ksh|sh|shtml|bash|bat|cmd|wpk|exe|dmg)$/i', $filename)) {
 		return true;
 	}
 
@@ -9226,16 +9792,14 @@ function addSummaryTableLine($tableColumnCount, $num, $nbofloop = 0, $total = 0,
 		return;
 	}
 
-	if ($nbofloop === 0)
-	{
+	if ($nbofloop === 0) {
 		// don't show a summary line
 		return;
 	}
 
 	if ($num === 0) {
 		$colspan = $tableColumnCount;
-	}
-	elseif ($num > $nbofloop) {
+	} elseif ($num > $nbofloop) {
 		$colspan = $tableColumnCount;
 	} else {
 		$colspan = $tableColumnCount - 1;
@@ -9275,12 +9839,18 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
 
 	if ($method == -1) {
 		$method = 0;
-		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_FREAD)) $method = 1;
-		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_STREAM_COPY)) $method = 2;
+		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_FREAD)) {
+			$method = 1;
+		}
+		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_STREAM_COPY)) {
+			$method = 2;
+		}
 	}
 
 	// Be sure we don't have output buffering enabled to have readfile working correctly
-	while (ob_get_level()) ob_end_flush();
+	while (ob_get_level()) {
+		ob_end_flush();
+	}
 
 	// Solution 0
 	if ($method == 0) {
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index fcac069183e..feb96859544 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -83,8 +83,7 @@ function dolGetModulesDirs($subdir = '')
 
 	$modulesdir = array();
 
-	foreach ($conf->file->dol_document_root as $type => $dirroot)
-	{
+	foreach ($conf->file->dol_document_root as $type => $dirroot) {
 		// Default core/modules dir
 		if ($type === 'main') {
 			$modulesdir[$dirroot.'/core/modules'.$subdir.'/'] = $dirroot.'/core/modules'.$subdir.'/';
@@ -92,16 +91,14 @@ function dolGetModulesDirs($subdir = '')
 
 		// Scan dir from external modules
 		$handle = @opendir($dirroot);
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (preg_match('/disabled/', $file)) continue; // We discard module if it contains disabled into name.
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match('/disabled/', $file)) {
+					continue; // We discard module if it contains disabled into name.
+				}
 
-				if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes')
-				{
-					if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/'))
-					{
+				if (is_dir($dirroot.'/'.$file) && substr($file, 0, 1) <> '.' && substr($file, 0, 3) <> 'CVS' && $file != 'includes') {
+					if (is_dir($dirroot.'/'.$file.'/core/modules'.$subdir.'/')) {
 						$modulesdir[$dirroot.'/'.$file.'/core/modules'.$subdir.'/'] = $dirroot.'/'.$file.'/core/modules'.$subdir.'/';
 					}
 				}
@@ -128,8 +125,12 @@ function dol_getDefaultFormat(Translate $outputlangs = null)
 		$outputlangs = $langs;
 	}
 
-	if ($outputlangs->defaultlang == 'ca_CA') $selected = 'CAP4'; // Canada
-	if ($outputlangs->defaultlang == 'en_US') $selected = 'USLetter'; // US
+	if ($outputlangs->defaultlang == 'ca_CA') {
+		$selected = 'CAP4'; // Canada
+	}
+	if ($outputlangs->defaultlang == 'en_US') {
+		$selected = 'USLetter'; // US
+	}
 	return $selected;
 }
 
@@ -146,35 +147,47 @@ function dol_print_file($langs, $filename, $searchalt = 0)
 	global $conf;
 
 	// Test if file is in lang directory
-	foreach ($langs->dir as $searchdir)
-	{
+	foreach ($langs->dir as $searchdir) {
 		$formfile = ($searchdir."/langs/".$langs->defaultlang."/".$filename);
 		dol_syslog('functions2::dol_print_file search file '.$formfile, LOG_DEBUG);
-		if (is_readable($formfile))
-		{
+		if (is_readable($formfile)) {
 			$content = file_get_contents($formfile);
 			$isutf8 = utf8_check($content);
-			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-			elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-			else print $content;
+			if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') {
+				print utf8_encode($content);
+			} elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+				print utf8_decode($content);
+			} else {
+				print $content;
+			}
 			return true;
-		} else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+		} else {
+			dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+		}
 
 		if ($searchalt) {
 			// Test si fichier dans repertoire de la langue alternative
-			if ($langs->defaultlang != "en_US") $formfilealt = $searchdir."/langs/en_US/".$filename;
-			else $formfilealt = $searchdir."/langs/fr_FR/".$filename;
+			if ($langs->defaultlang != "en_US") {
+				$formfilealt = $searchdir."/langs/en_US/".$filename;
+			} else {
+				$formfilealt = $searchdir."/langs/fr_FR/".$filename;
+			}
 			dol_syslog('functions2::dol_print_file search alt file '.$formfilealt, LOG_DEBUG);
 			//print 'getcwd='.getcwd().' htmlfilealt='.$formfilealt.' X '.file_exists(getcwd().'/'.$formfilealt);
-			if (is_readable($formfilealt))
-			{
+			if (is_readable($formfilealt)) {
 				$content = file_get_contents($formfilealt);
 				$isutf8 = utf8_check($content);
-				if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') print utf8_encode($content);
-				elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') print utf8_decode($content);
-				else print $content;
+				if (!$isutf8 && $conf->file->character_set_client == 'UTF-8') {
+					print utf8_encode($content);
+				} elseif ($isutf8 && $conf->file->character_set_client == 'ISO-8859-1') {
+					print utf8_decode($content);
+				} else {
+					print $content;
+				}
 				return true;
-			} else dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+			} else {
+				dol_syslog('functions2::dol_print_file not found', LOG_DEBUG);
+			}
 		}
 	}
 
@@ -204,268 +217,437 @@ function dol_print_object_info($object, $usetable = 0)
 	$deltadateforuser = round($deltadateforclient - $deltadateforserver);
 	//print "x".$deltadateforserver." - ".$deltadateforclient." - ".$deltadateforuser;
 
-	if ($usetable) print '<table class="border tableforfield centpercent">';
+	if ($usetable) {
+		print '<table class="border tableforfield centpercent">';
+	}
 
 	// Import key
-	if (!empty($object->import_key))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->import_key)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("ImportedWithSet");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		print $object->import_key;
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
 	// User creation (old method using already loaded object and not id is kept for backward compatibility)
-	if (!empty($object->user_creation) || !empty($object->user_creation_id))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->user_creation) || !empty($object->user_creation_id)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("CreatedBy");
-		if ($usetable) print '</td><td>';
-		else print ': ';
-		if (is_object($object->user_creation))
-		{
-			if ($object->user_creation->id) print $object->user_creation->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
+		if (is_object($object->user_creation)) {
+			if ($object->user_creation->id) {
+				print $object->user_creation->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_creation_id ? $object->user_creation_id : $object->user_creation);
-			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
 		}
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
 	}
 
 	// Date creation
-	if (!empty($object->date_creation))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->date_creation)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("DateCreation");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		print dol_print_date($object->date_creation, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation, "dayhour", "tzuserrel").' &nbsp;'.$langs->trans("ClientHour");
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($deltadateforuser) {
+			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation, "dayhour", "tzuserrel").' &nbsp;'.$langs->trans("ClientHour");
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
 	// User change (old method using already loaded object and not id is kept for backward compatibility)
-	if (!empty($object->user_modification) || !empty($object->user_modification_id))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->user_modification) || !empty($object->user_modification_id)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("ModifiedBy");
-		if ($usetable) print '</td><td>';
-		else print ': ';
-		if (is_object($object->user_modification))
-		{
-			if ($object->user_modification->id) print $object->user_modification->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
+		if (is_object($object->user_modification)) {
+			if ($object->user_modification->id) {
+				print $object->user_modification->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_modification_id ? $object->user_modification_id : $object->user_modification);
-			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
 		}
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
 	}
 
 	// Date change
-	if (!empty($object->date_modification))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->date_modification)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("DateLastModification");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		print dol_print_date($object->date_modification, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification, "dayhour", "tzuserrel").' &nbsp;'.$langs->trans("ClientHour");
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($deltadateforuser) {
+			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification, "dayhour", "tzuserrel").' &nbsp;'.$langs->trans("ClientHour");
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
 	// User validation (old method using already loaded object and not id is kept for backward compatibility)
-	if (!empty($object->user_validation) || !empty($object->user_validation_id))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->user_validation) || !empty($object->user_validation_id)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("ValidatedBy");
-		if ($usetable) print '</td><td>';
-		else print ': ';
-		if (is_object($object->user_validation))
-		{
-			if ($object->user_validation->id) print $object->user_validation->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
+		if (is_object($object->user_validation)) {
+			if ($object->user_validation->id) {
+				print $object->user_validation->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_validation_id ? $object->user_validation_id : $object->user_validation);
-			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
 		}
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
 	}
 
 	// Date validation
-	if (!empty($object->date_validation))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->date_validation)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("DateValidation");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		print dol_print_date($object->date_validation, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($deltadateforuser) {
+			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
 	// User approve (old method using already loaded object and not id is kept for backward compatibility)
-	if (!empty($object->user_approve) || !empty($object->user_approve_id))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->user_approve) || !empty($object->user_approve_id)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("ApprovedBy");
-		if ($usetable) print '</td><td>';
-		else print ': ';
-		if (is_object($object->user_approve))
-		{
-			if ($object->user_approve->id) print $object->user_approve->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
+		if (is_object($object->user_approve)) {
+			if ($object->user_approve->id) {
+				print $object->user_approve->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_approve_id ? $object->user_approve_id : $object->user_approve);
-			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
 		}
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
 	}
 
 	// Date approve
-	if (!empty($object->date_approve))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->date_approve)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("DateApprove");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		print dol_print_date($object->date_approve, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($deltadateforuser) {
+			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
 	// User approve
-	if (!empty($object->user_approve_id2))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->user_approve_id2)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("ApprovedBy");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		$userstatic = new User($db);
 		$userstatic->fetch($object->user_approve_id2);
-		if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
-		else print $langs->trans("Unknown");
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($userstatic->id) {
+			print $userstatic->getNomUrl(-1, '', 0, 0, 0);
+		} else {
+			print $langs->trans("Unknown");
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
 	// Date approve
-	if (!empty($object->date_approve2))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->date_approve2)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("DateApprove2");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		print dol_print_date($object->date_approve2, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($deltadateforuser) {
+			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
 	// User close
-	if (!empty($object->user_cloture) || !empty($object->user_closing))
-	{
-		if (isset($object->user_cloture) && !empty($object->user_cloture)) $object->user_closing = $object->user_cloture;
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->user_cloture) || !empty($object->user_closing)) {
+		if (isset($object->user_cloture) && !empty($object->user_cloture)) {
+			$object->user_closing = $object->user_cloture;
+		}
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("ClosedBy");
-		if ($usetable) print '</td><td>';
-		else print ': ';
-		if (is_object($object->user_closing))
-		{
-			if ($object->user_closing->id) print $object->user_closing->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
+		if (is_object($object->user_closing)) {
+			if ($object->user_closing->id) {
+				print $object->user_closing->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_closing);
-			if ($userstatic->id) print $userstatic->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
 		}
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
 	}
 
 	// Date close
-	if (!empty($object->date_cloture) || !empty($object->date_closing))
-	{
-		if (isset($object->date_cloture) && !empty($object->date_cloture)) $object->date_closing = $object->date_cloture;
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->date_cloture) || !empty($object->date_closing)) {
+		if (isset($object->date_cloture) && !empty($object->date_cloture)) {
+			$object->date_closing = $object->date_cloture;
+		}
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("DateClosing");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		print dol_print_date($object->date_closing, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_closing, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($deltadateforuser) {
+			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_closing, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
 	// User conciliate
-	if (!empty($object->user_rappro))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->user_rappro)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("ConciliatedBy");
-		if ($usetable) print '</td><td>';
-		else print ': ';
-		if (is_object($object->user_rappro))
-		{
-			if ($object->user_rappro->id) print $object->user_rappro->getNomUrl(-1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
+		if (is_object($object->user_rappro)) {
+			if ($object->user_rappro->id) {
+				print $object->user_rappro->getNomUrl(-1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
 		} else {
 			$userstatic = new User($db);
 			$userstatic->fetch($object->user_rappro);
-			if ($userstatic->id) print $userstatic->getNomUrl(1, '', 0, 0, 0);
-			else print $langs->trans("Unknown");
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(1, '', 0, 0, 0);
+			} else {
+				print $langs->trans("Unknown");
+			}
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
 		}
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
 	}
 
 	// Date conciliate
-	if (!empty($object->date_rappro))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->date_rappro)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("DateConciliating");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		print dol_print_date($object->date_rappro, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($deltadateforuser) {
+			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
 	// Date send
-	if (!empty($object->date_envoi))
-	{
-		if ($usetable) print '<tr><td class="titlefield">';
+	if (!empty($object->date_envoi)) {
+		if ($usetable) {
+			print '<tr><td class="titlefield">';
+		}
 		print $langs->trans("DateLastSend");
-		if ($usetable) print '</td><td>';
-		else print ': ';
+		if ($usetable) {
+			print '</td><td>';
+		} else {
+			print ': ';
+		}
 		print dol_print_date($object->date_envoi, 'dayhour', 'tzserver');
-		if ($deltadateforuser) print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
-		if ($usetable) print '</td></tr>';
-		else print '<br>';
+		if ($deltadateforuser) {
+			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+		}
+		if ($usetable) {
+			print '</td></tr>';
+		} else {
+			print '<br>';
+		}
 	}
 
-	if ($usetable) print '</table>';
+	if ($usetable) {
+		print '</table>';
+	}
 }
 
 
@@ -514,10 +696,14 @@ function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0
 	$urlregex = '';
 
 	// SCHEME
-	if ($http) $urlregex .= "^(http:\/\/|https:\/\/)";
+	if ($http) {
+		$urlregex .= "^(http:\/\/|https:\/\/)";
+	}
 
 	// USER AND PASS
-	if ($pass) $urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+	if ($pass) {
+		$urlregex .= "([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)";
+	}
 
 	// HOSTNAME OR IP
 	//$urlregex .= "[a-z0-9+\$_-]+(\.[a-z0-9+\$_-]+)*";  // x allowed (ex. http://localhost, http://routerlogin)
@@ -526,17 +712,24 @@ function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0
 	//use only one of the above
 
 	// PORT
-	if ($port) $urlregex .= "(\:[0-9]{2,5})";
+	if ($port) {
+		$urlregex .= "(\:[0-9]{2,5})";
+	}
 	// PATH
-	if ($path) $urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+	if ($path) {
+		$urlregex .= "(\/([a-z0-9+\$_-]\.?)+)*\/";
+	}
 	// GET Query
-	if ($query) $urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+	if ($query) {
+		$urlregex .= "(\?[a-z+&\$_.-][a-z0-9;:@\/&%=+\$_.-]*)";
+	}
 	// ANCHOR
-	if ($anchor) $urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+	if ($anchor) {
+		$urlregex .= "(#[a-z_.-][a-z0-9+\$_.-]*)$";
+	}
 
 	// check
-	if (preg_match('/'.$urlregex.'/i', $url))
-	{
+	if (preg_match('/'.$urlregex.'/i', $url)) {
 		$ValidUrl = 1;
 	}
 	//print $urlregex.' - '.$url.' - '.$ValidUrl;
@@ -552,16 +745,14 @@ function isValidUrl($url, $http = 0, $pass = 0, $port = 0, $path = 0, $query = 0
  */
 function isValidVATID($company)
 {
-	if ($company->isInEEC())    // Syntax check rules for EEC countries
-	{
+	if ($company->isInEEC()) {    // Syntax check rules for EEC countries
 		/* Disabled because some companies can have an address in Irland and a vat number in France.
-        $vatprefix = $company->country_code;
-        if ($vatprefix == 'GR') $vatprefix = '(EL|GR)';
-        elseif ($vatprefix == 'MC') $vatprefix = 'FR';	// Monaco is using french VAT numbers
-        else $vatprefix = preg_quote($vatprefix, '/');*/
+		$vatprefix = $company->country_code;
+		if ($vatprefix == 'GR') $vatprefix = '(EL|GR)';
+		elseif ($vatprefix == 'MC') $vatprefix = 'FR';	// Monaco is using french VAT numbers
+		else $vatprefix = preg_quote($vatprefix, '/');*/
 		$vatprefix = '[a-zA-Z][a-zA-Z]';
-		if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra)))
-		{
+		if (!preg_match('/^'.$vatprefix.'[a-zA-Z0-9\-\.]{5,14}$/i', str_replace(' ', '', $company->tva_intra))) {
 			return 0;
 		}
 	}
@@ -582,8 +773,7 @@ function clean_url($url, $http = 1)
 	// To include the minus sign in a char class, we must not escape it but put it at the end of the class
 	// Also, there's no need of escape a dot sign in a class
 	$regs = array();
-	if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs))
-	{
+	if (preg_match('/^(https?:[\\/]+)?([0-9A-Z.-]+\.[A-Z]{2,4})(:[0-9]+)?/i', $url, $regs)) {
 		$proto = $regs[1];
 		$domain = $regs[2];
 		$port = isset($regs[3]) ? $regs[3] : '';
@@ -593,10 +783,8 @@ function clean_url($url, $http = 1)
 
 		// Si http: defini on supprime le http (Si https on ne supprime pas)
 		$newproto = $proto;
-		if ($http == 0)
-		{
-			if (preg_match('/^http:[\\/]+/i', $url))
-			{
+		if ($http == 0) {
+			if (preg_match('/^http:[\\/]+/i', $url)) {
 				$url = preg_replace('/^http:[\\/]+/i', '', $url);
 				$newproto = '';
 			}
@@ -606,7 +794,9 @@ function clean_url($url, $http = 1)
 		$CleanUrl = preg_replace('/^'.preg_quote($proto.$domain, '/').'/i', $newproto.strtolower($domain), $url);
 
 		return $CleanUrl;
-	} else return $url;
+	} else {
+		return $url;
+	}
 }
 
 
@@ -624,7 +814,9 @@ function clean_url($url, $http = 1)
  */
 function dolObfuscateEmail($mail, $replace = "*", $nbreplace = 8, $nbdisplaymail = 4, $nbdisplaydomain = 3, $displaytld = true)
 {
-	if (!isValidEmail($mail))return '';
+	if (!isValidEmail($mail)) {
+		return '';
+	}
 	$tab = explode('@', $mail);
 	$tab2 = explode('.', $tab[1]);
 	$string_replace = '';
@@ -633,8 +825,7 @@ function dolObfuscateEmail($mail, $replace = "*", $nbreplace = 8, $nbdisplaymail
 	$mail_tld = '';
 
 	$nbofelem = count($tab2);
-	for ($i = 1; $i < $nbofelem && $displaytld; $i++)
-	{
+	for ($i = 1; $i < $nbofelem && $displaytld; $i++) {
 		$mail_tld .= '.'.$tab2[$i];
 	}
 
@@ -686,7 +877,9 @@ function array2tr($data, $troptions = '', $tdoptions = '')
 function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '', $tdoptions = '')
 {
 	$text = '';
-	if ($tableMarkup) $text = '<table '.$tableoptions.'>';
+	if ($tableMarkup) {
+		$text = '<table '.$tableoptions.'>';
+	}
 	foreach ($data as $key => $item) {
 		if (is_array($item)) {
 			$text .= array2tr($item, $troptions, $tdoptions);
@@ -697,7 +890,9 @@ function array2table($data, $tableMarkup = 1, $tableoptions = '', $troptions = '
 			$text .= '</tr>';
 		}
 	}
-	if ($tableMarkup) $text .= '</table>';
+	if ($tableMarkup) {
+		$text .= '</table>';
+	}
 	return $text;
 }
 
@@ -721,15 +916,23 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 {
 	global $conf, $user;
 
-	if (!is_object($objsoc)) $valueforccc = $objsoc;
-	elseif ($table == "commande_fournisseur" || $table == "facture_fourn") $valueforccc = dol_string_unaccent($objsoc->code_fournisseur);
-	else $valueforccc = dol_string_unaccent($objsoc->code_client);
+	if (!is_object($objsoc)) {
+		$valueforccc = $objsoc;
+	} elseif ($table == "commande_fournisseur" || $table == "facture_fourn") {
+		$valueforccc = dol_string_unaccent($objsoc->code_fournisseur);
+	} else {
+		$valueforccc = dol_string_unaccent($objsoc->code_client);
+	}
 
 	$sharetable = $table;
-	if ($table == 'facture' || $table == 'invoice') $sharetable = 'invoicenumber'; // for getEntity function
+	if ($table == 'facture' || $table == 'invoice') {
+		$sharetable = 'invoicenumber'; // for getEntity function
+	}
 
 	// Clean parameters
-	if ($date == '') $date = dol_now(); // We use local year and month of PHP server to search numbers
+	if ($date == '') {
+		$date = dol_now(); // We use local year and month of PHP server to search numbers
+	}
 	// but we should use local year and month of user
 
 	// For debugging
@@ -742,8 +945,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$hasglobalcounter = false;
 	$reg = array();
 	// Extract value for mask counter, mask raz and mask offset
-	if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg))
-	{
+	if (preg_match('/\{(0+)([@\+][0-9\-\+\=]+)?([@\+][0-9\-\+\=]+)?\}/i', $mask, $reg)) {
 		$masktri = $reg[1].(!empty($reg[2]) ? $reg[2] : '').(!empty($reg[3]) ? $reg[3] : '');
 		$maskcounter = $reg[1];
 		$hasglobalcounter = true;
@@ -756,12 +958,13 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$maskraz = -1;
 	$maskoffset = 0;
 	$resetEveryMonth = false;
-	if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) return 'ErrorCounterMustHaveMoreThan3Digits';
+	if (dol_strlen($maskcounter) < 3 && empty($conf->global->MAIN_COUNTER_WITH_LESS_3_DIGITS)) {
+		return 'ErrorCounterMustHaveMoreThan3Digits';
+	}
 
 	// Extract value for third party mask counter
 	$regClientRef = array();
-	if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
-	{
+	if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef)) {
 		$maskrefclient = $regClientRef[1].$regClientRef[2];
 		$maskrefclient_maskclientcode = $regClientRef[1];
 		$maskrefclient_maskcounter = $regClientRef[2];
@@ -769,19 +972,21 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$maskrefclient_clientcode = substr($valueforccc, 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code where n is length in mask
 		$maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
 		$maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
-		if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-	} else $maskrefclient = '';
+		if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+			return 'ErrorCounterMustHaveMoreThan3Digits';
+		}
+	} else {
+		$maskrefclient = '';
+	}
 
 	// fail if there is neither a global nor a third party counter
-	if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
-	{
+	if (!$hasglobalcounter && ($maskrefclient_maskcounter == '')) {
 		return 'ErrorBadMask';
 	}
 
 	// Extract value for third party type
 	$regType = array();
-	if (preg_match('/\{(t+)\}/i', $mask, $regType))
-	{
+	if (preg_match('/\{(t+)\}/i', $mask, $regType)) {
 		$masktype = $regType[1];
 		$masktype_value = substr(preg_replace('/^TE_/', '', $objsoc->typent_code), 0, dol_strlen($regType[1])); // get n first characters of thirdpaty typent_code (where n is length in mask)
 		$masktype_value = str_pad($masktype_value, dol_strlen($regType[1]), "#", STR_PAD_RIGHT); // we fill on right with # to have same number of char than into mask
@@ -791,10 +996,12 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	}
 
 	// Extract value for user
-    $regType = array();
+	$regType = array();
 	if (preg_match('/\{(u+)\}/i', $mask, $regType)) {
 		$lastname = 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX';
-		if (is_object($objuser)) $lastname = $objuser->lastname;
+		if (is_object($objuser)) {
+			$lastname = $objuser->lastname;
+		}
 
 		$maskuser = $regType[1];
 		$maskuser_value = substr($lastname, 0, dol_strlen($regType[1])); // get n first characters of user firstname (where n is length in mask)
@@ -809,15 +1016,13 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$maskpersonew = array();
 	$tmpmask = $mask;
 	$regKey = array();
-	while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey))
-	{
+	while (preg_match('/\{([A-Z]+)\-([1-9])\}/', $tmpmask, $regKey)) {
 		$maskperso[$regKey[1]] = '{'.$regKey[1].'-'.$regKey[2].'}';
 		$maskpersonew[$regKey[1]] = str_pad('', $regKey[2], '_', STR_PAD_RIGHT);
 		$tmpmask = preg_replace('/\{'.$regKey[1].'\-'.$regKey[2].'\}/i', $maskpersonew[$regKey[1]], $tmpmask);
 	}
 
-	if (strstr($mask, 'user_extra_'))
-	{
+	if (strstr($mask, 'user_extra_')) {
 		$start = "{user_extra_";
 		$end = "\}";
 		$extra = get_string_between($mask, "user_extra_", "}");
@@ -831,8 +1036,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$maskwithonlyymcode = preg_replace('/\{(c+)(0*)\}/i', $maskrefclient, $maskwithonlyymcode);
 	$maskwithonlyymcode = preg_replace('/\{(t+)\}/i', $masktype_value, $maskwithonlyymcode);
 	$maskwithonlyymcode = preg_replace('/\{(u+)\}/i', $maskuser_value, $maskwithonlyymcode);
-	foreach ($maskperso as $key => $val)
-	{
+	foreach ($maskperso as $key => $val) {
 		$maskwithonlyymcode = preg_replace('/'.preg_quote($val, '/').'/i', $maskpersonew[$key], $maskwithonlyymcode);
 	}
 	$maskwithnocode = $maskwithonlyymcode;
@@ -846,8 +1050,12 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	//var_dump($reg);
 
 	// If an offset is asked
-	if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
-	if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
+	if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) {
+		$maskoffset = preg_replace('/^\+/', '', $reg[2]);
+	}
+	if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) {
+		$maskoffset = preg_replace('/^\+/', '', $reg[3]);
+	}
 
 	// Define $sqlwhere
 	$sqlwhere = '';
@@ -855,14 +1063,19 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$yearoffsettype = false; // false: no reset, 0,-,=,+: reset at offset SOCIETE_FISCAL_MONTH_START, x=reset at offset x
 
 	// If a restore to zero after a month is asked we check if there is already a value for this year.
-	if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))	$yearoffsettype = preg_replace('/^@/', '', $reg[2]);
-	if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))	$yearoffsettype = preg_replace('/^@/', '', $reg[3]);
+	if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) {
+		$yearoffsettype = preg_replace('/^@/', '', $reg[2]);
+	}
+	if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) {
+		$yearoffsettype = preg_replace('/^@/', '', $reg[3]);
+	}
 
 	//print "yearoffset=".$yearoffset." yearoffsettype=".$yearoffsettype;
-	if (is_numeric($yearoffsettype) && $yearoffsettype >= 1)
+	if (is_numeric($yearoffsettype) && $yearoffsettype >= 1) {
 		$maskraz = $yearoffsettype; // For backward compatibility
-	elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1))
+	} elseif ($yearoffsettype === '0' || (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $conf->global->SOCIETE_FISCAL_MONTH_START > 1)) {
 		$maskraz = $conf->global->SOCIETE_FISCAL_MONTH_START;
+	}
 	//print "maskraz=".$maskraz;	// -1=no reset
 
 	if ($maskraz > 0) {   // A reset is required
@@ -870,27 +1083,44 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$maskraz = date('m', $date);
 			$resetEveryMonth = true;
 		}
-		if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+		if ($maskraz > 12) {
+			return 'ErrorBadMaskBadRazMonth';
+		}
 
 		// Define posy, posm and reg
-		if ($maskraz > 1)	// if reset is not first month, we need month and year into mask
-		{
-			if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } else return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+		if ($maskraz > 1) {	// if reset is not first month, we need month and year into mask
+			if (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) {
+				$posy = 2; $posm = 3;
+			} elseif (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) {
+				$posy = 3; $posm = 2;
+			} else {
+				return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+			}
 
-			if (dol_strlen($reg[$posy]) < 2) return 'ErrorCantUseRazWithYearOnOneDigit';
+			if (dol_strlen($reg[$posy]) < 2) {
+				return 'ErrorCantUseRazWithYearOnOneDigit';
+			}
 		} else // if reset is for a specific month in year, we need year
 		{
-			if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 3; $posm = 2; } elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 3; } elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) { $posy = 2; $posm = 0; } else return 'ErrorCantUseRazIfNoYearInMask';
+			if (preg_match('/^(.*)\{(m+)\}\{(y+)\}/i', $maskwithonlyymcode, $reg)) {
+				$posy = 3; $posm = 2;
+			} elseif (preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) {
+				$posy = 2; $posm = 3;
+			} elseif (preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) {
+				$posy = 2; $posm = 0;
+			} else {
+				return 'ErrorCantUseRazIfNoYearInMask';
+			}
 		}
 		// Define length
 		$yearlen = $posy ?dol_strlen($reg[$posy]) : 0;
 		$monthlen = $posm ?dol_strlen($reg[$posm]) : 0;
 		// Define pos
-	   	$yearpos = (dol_strlen($reg[1]) + 1);
+		$yearpos = (dol_strlen($reg[1]) + 1);
 		$monthpos = ($yearpos + $yearlen);
 		if ($posy == 3 && $posm == 2) {		// if month is before year
-		  	$monthpos = (dol_strlen($reg[1]) + 1);
-		   	$yearpos = ($monthpos + $monthlen);
+			$monthpos = (dol_strlen($reg[1]) + 1);
+			$yearpos = ($monthpos + $monthlen);
 		}
 		//print "xxx ".$maskwithonlyymcode." maskraz=".$maskraz." posy=".$posy." yearlen=".$yearlen." yearpos=".$yearpos." posm=".$posm." monthlen=".$monthlen." monthpos=".$monthpos." yearoffsettype=".$yearoffsettype." resetEveryMonth=".$resetEveryMonth."\n";
 
@@ -898,8 +1128,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$monthcomp = $maskraz;
 		$yearcomp = 0;
 
-		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// $yearoffsettype is - or +
-		{
+		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') {	// $yearoffsettype is - or +
 			$currentyear = date("Y", $date);
 			$fiscaldate = dol_mktime('0', '0', '0', $maskraz, '1', $currentyear);
 			$newyeardate = dol_mktime('0', '0', '0', '1', '1', $currentyear);
@@ -907,22 +1136,33 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			//echo 'currentyear='.$currentyear.' date='.dol_print_date($date, 'day').' fiscaldate='.dol_print_date($fiscaldate, 'day').'<br>';
 
 			// If after or equal of current fiscal date
-			if ($date >= $fiscaldate)
-			{
+			if ($date >= $fiscaldate) {
 				// If before of next new year date
-				if ($date < $nextnewyeardate && $yearoffsettype == '+') $yearoffset = 1;
+				if ($date < $nextnewyeardate && $yearoffsettype == '+') {
+					$yearoffset = 1;
+				}
 			} // If after or equal of current new year date
-			elseif ($date >= $newyeardate && $yearoffsettype == '-') $yearoffset = -1;
+			elseif ($date >= $newyeardate && $yearoffsettype == '-') {
+				$yearoffset = -1;
+			}
 		} // For backward compatibility
-		elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) { $yearoffset = -1; }	// If current month lower that month of return to zero, year is previous year
+		elseif (date("m", $date) < $maskraz && empty($resetEveryMonth)) {
+			$yearoffset = -1;
+		}	// If current month lower that month of return to zero, year is previous year
 
-		if ($yearlen == 4) $yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);
-		elseif ($yearlen == 2) $yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);
-		elseif ($yearlen == 1) $yearcomp = substr(date("y", $date), 2, 1) + $yearoffset;
-		if ($monthcomp > 1 && empty($resetEveryMonth))	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
-		{
-			if ($yearlen == 4) $yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);
-			elseif ($yearlen == 2) $yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);
+		if ($yearlen == 4) {
+			$yearcomp = sprintf("%04d", date("Y", $date) + $yearoffset);
+		} elseif ($yearlen == 2) {
+			$yearcomp = sprintf("%02d", date("y", $date) + $yearoffset);
+		} elseif ($yearlen == 1) {
+			$yearcomp = substr(date("y", $date), 2, 1) + $yearoffset;
+		}
+		if ($monthcomp > 1 && empty($resetEveryMonth)) {	// Test with month is useless if monthcomp = 0 or 1 (0 is same as 1) (regis: $monthcomp can't equal 0)
+			if ($yearlen == 4) {
+				$yearcomp1 = sprintf("%04d", date("Y", $date) + $yearoffset + 1);
+			} elseif ($yearlen == 2) {
+				$yearcomp1 = sprintf("%02d", date("y", $date) + $yearoffset + 1);
+			}
 
 			$sqlwhere .= "(";
 			$sqlwhere .= " (SUBSTRING(".$field.", ".$yearpos.", ".$yearlen.") = '".$db->escape($yearcomp)."'";
@@ -947,7 +1187,9 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	} else {
 		$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
-	if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
+	if ($posnumstart < 0) {
+		return 'ErrorBadMaskFailedToLocatePosOfSequence';
+	}
 	$sqlstring = 'SUBSTRING('.$field.', '.($posnumstart + 1).', '.dol_strlen($maskcounter).')';
 
 	// Define $maskLike
@@ -961,11 +1203,16 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
 	$maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
 	$maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), str_pad("", dol_strlen($maskcounter), "_"), $maskLike);
-	if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
-	if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
-	if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
-	foreach ($maskperso as $key => $val)
-	{
+	if ($maskrefclient) {
+		$maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
+	}
+	if ($masktype) {
+		$maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
+	}
+	if ($maskuser) {
+		$maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
+	}
+	foreach ($maskperso as $key => $val) {
 		$maskLike = str_replace(dol_string_nospecial($maskperso[$key]), $maskpersonew[$key], $maskLike);
 	}
 
@@ -975,32 +1222,39 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 	$sql .= " FROM ".MAIN_DB_PREFIX.$table;
 	$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike)."'";
 	$sql .= " AND ".$field." NOT LIKE '(PROV%)'";
-	if ($bentityon) // only if entity enable
+	if ($bentityon) { // only if entity enable
 		$sql .= " AND entity IN (".getEntity($sharetable).")";
-	elseif (!empty($forceentity))
+	} elseif (!empty($forceentity)) {
 		$sql .= " AND entity IN (".$forceentity.")";
-	if ($where) $sql .= $where;
-	if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
+	}
+	if ($where) {
+		$sql .= $where;
+	}
+	if ($sqlwhere) {
+		$sql .= ' AND '.$sqlwhere;
+	}
 
 	//print $sql.'<br>';
 	dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$counter = $obj->val;
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 
 	// Check if we must force counter to maskoffset
-	if (empty($counter)) $counter = $maskoffset;
-	elseif (preg_match('/[^0-9]/i', $counter))
-	{
+	if (empty($counter)) {
+		$counter = $maskoffset;
+	} elseif (preg_match('/[^0-9]/i', $counter)) {
 		$counter = 0;
 		dol_syslog("Error, the last counter found is '".$counter."' so is not a numeric value. We will restart to 1.", LOG_ERR);
-	} elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) $counter = $maskoffset;
+	} elseif ($counter < $maskoffset && empty($conf->global->MAIN_NUMBERING_OFFSET_ONLY_FOR_FIRST)) {
+		$counter = $maskoffset;
+	}
 
-	if ($mode == 'last')	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
-	{
+	if ($mode == 'last') {	// We found value for counter = last counter value. Now need to get corresponding ref of invoice.
 		$counterpadded = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
 
 		// Define $maskLike
@@ -1013,47 +1267,61 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$maskLike = preg_replace('/\{mm\}/i', '__', $maskLike);
 		$maskLike = preg_replace('/\{dd\}/i', '__', $maskLike);
 		$maskLike = str_replace(dol_string_nospecial('{'.$masktri.'}'), $counterpadded, $maskLike);
-		if ($maskrefclient) $maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
-		if ($masktype) $maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
-		if ($maskuser) $maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
+		if ($maskrefclient) {
+			$maskLike = str_replace(dol_string_nospecial('{'.$maskrefclient.'}'), str_pad("", dol_strlen($maskrefclient), "_"), $maskLike);
+		}
+		if ($masktype) {
+			$maskLike = str_replace(dol_string_nospecial('{'.$masktype.'}'), $masktype_value, $maskLike);
+		}
+		if ($maskuser) {
+			$maskLike = str_replace(dol_string_nospecial('{'.$maskuser.'}'), $maskuser_value, $maskLike);
+		}
 
 		$ref = '';
 		$sql = "SELECT ".$field." as ref";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$table;
 		$sql .= " WHERE ".$field." LIKE '".$db->escape($maskLike)."'";
 		$sql .= " AND ".$field." NOT LIKE '%PROV%'";
-		if ($bentityon) // only if entity enable
+		if ($bentityon) { // only if entity enable
 			$sql .= " AND entity IN (".getEntity($sharetable).")";
-		elseif (!empty($forceentity))
+		} elseif (!empty($forceentity)) {
 			$sql .= " AND entity IN (".$forceentity.")";
-		if ($where) $sql .= $where;
-		if ($sqlwhere) $sql .= ' AND '.$sqlwhere;
+		}
+		if ($where) {
+			$sql .= $where;
+		}
+		if ($sqlwhere) {
+			$sql .= ' AND '.$sqlwhere;
+		}
 
 		dol_syslog("functions2::get_next_value mode=".$mode."", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $ref = $obj->ref;
-		} else dol_print_error($db);
+			if ($obj) {
+				$ref = $obj->ref;
+			}
+		} else {
+			dol_print_error($db);
+		}
 
 		$numFinal = $ref;
 	} elseif ($mode == 'next') {
 		$counter++;
 
 		// If value for $counter has a length higher than $maskcounter chars
-		if ($counter >= pow(10, dol_strlen($maskcounter)))
-		{
+		if ($counter >= pow(10, dol_strlen($maskcounter))) {
 			$counter = 'ErrorMaxNumberReachForThisMask';
 		}
 
-		if (!empty($maskrefclient_maskcounter))
-		{
+		if (!empty($maskrefclient_maskcounter)) {
 			//print "maskrefclient_maskcounter=".$maskrefclient_maskcounter." maskwithnocode=".$maskwithnocode." maskrefclient=".$maskrefclient."\n<br>";
 
 			// Define $sqlstring
 			$maskrefclient_posnumstart = strpos($maskwithnocode, $maskrefclient_maskcounter, strpos($maskwithnocode, $maskrefclient)); // Pos of counter in final string (from 0 to ...)
-			if ($maskrefclient_posnumstart <= 0) return 'ErrorBadMask';
+			if ($maskrefclient_posnumstart <= 0) {
+				return 'ErrorBadMask';
+			}
 			$maskrefclient_sqlstring = 'SUBSTRING('.$field.', '.($maskrefclient_posnumstart + 1).', '.dol_strlen($maskrefclient_maskcounter).')';
 			//print "x".$sqlstring;
 
@@ -1075,23 +1343,31 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 			$maskrefclient_sql .= " FROM ".MAIN_DB_PREFIX.$table;
 			//$sql.= " WHERE ".$field." not like '(%'";
 			$maskrefclient_sql .= " WHERE ".$field." LIKE '".$db->escape($maskrefclient_maskLike)."'";
-			if ($bentityon) // only if entity enable
+			if ($bentityon) { // only if entity enable
 				$maskrefclient_sql .= " AND entity IN (".getEntity($sharetable).")";
-			elseif (!empty($forceentity))
+			} elseif (!empty($forceentity)) {
 				$sql .= " AND entity IN (".$forceentity.")";
-			if ($where) $maskrefclient_sql .= $where; //use the same optional where as general mask
-			if ($sqlwhere) $maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask
+			}
+			if ($where) {
+				$maskrefclient_sql .= $where; //use the same optional where as general mask
+			}
+			if ($sqlwhere) {
+				$maskrefclient_sql .= ' AND '.$sqlwhere; //use the same sqlwhere as general mask
+			}
 			$maskrefclient_sql .= ' AND (SUBSTRING('.$field.', '.(strpos($maskwithnocode, $maskrefclient) + 1).', '.dol_strlen($maskrefclient_maskclientcode).")='".$db->escape($maskrefclient_clientcode)."')";
 
 			dol_syslog("functions2::get_next_value maskrefclient", LOG_DEBUG);
 			$maskrefclient_resql = $db->query($maskrefclient_sql);
-			if ($maskrefclient_resql)
-			{
+			if ($maskrefclient_resql) {
 				$maskrefclient_obj = $db->fetch_object($maskrefclient_resql);
 				$maskrefclient_counter = $maskrefclient_obj->val;
-			} else dol_print_error($db);
+			} else {
+				dol_print_error($db);
+			}
 
-			if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) $maskrefclient_counter = $maskrefclient_maskoffset;
+			if (empty($maskrefclient_counter) || preg_match('/[^0-9]/i', $maskrefclient_counter)) {
+				$maskrefclient_counter = $maskrefclient_maskoffset;
+			}
 			$maskrefclient_counter++;
 		}
 
@@ -1099,8 +1375,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$numFinal = $mask;
 
 		// We replace special codes except refclient
-		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=')	// yearoffsettype is - or +, so we don't want current year
-		{
+		if (!empty($yearoffsettype) && !is_numeric($yearoffsettype) && $yearoffsettype != '=') {	// yearoffsettype is - or +, so we don't want current year
 			$numFinal = preg_replace('/\{yyyy\}/i', date("Y", $date) + $yearoffset, $numFinal);
 			$numFinal = preg_replace('/\{yy\}/i', date("y", $date) + $yearoffset, $numFinal);
 			$numFinal = preg_replace('/\{y\}/i', substr(date("y", $date), 1, 1) + $yearoffset, $numFinal);
@@ -1120,8 +1395,7 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		$numFinal = str_replace($maskbefore, $maskafter, $numFinal);
 
 		// Now we replace the refclient
-		if ($maskrefclient)
-		{
+		if ($maskrefclient) {
 			//print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n<br>";exit;
 			$maskrefclient_maskbefore = '{'.$maskrefclient.'}';
 			$maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);
@@ -1129,16 +1403,14 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		}
 
 		// Now we replace the type
-		if ($masktype)
-		{
+		if ($masktype) {
 			$masktype_maskbefore = '{'.$masktype.'}';
 			$masktype_maskafter = $masktype_value;
 			$numFinal = str_replace($masktype_maskbefore, $masktype_maskafter, $numFinal);
 		}
 
 		// Now we replace the user
-		if ($maskuser)
-		{
+		if ($maskuser) {
 			$maskuser_maskbefore = '{'.$maskuser.'}';
 			$maskuser_maskafter = $maskuser_value;
 			$numFinal = str_replace($maskuser_maskbefore, $maskuser_maskafter, $numFinal);
@@ -1161,7 +1433,9 @@ function get_string_between($string, $start, $end)
 {
 	$string = " ".$string;
 	 $ini = strpos($string, $start);
-	 if ($ini == 0) return "";
+	if ($ini == 0) {
+		return "";
+	}
 	 $ini += strlen($start);
 	 $len = strpos($string, $end, $ini) - $ini;
 	 return substr($string, $ini, $len);
@@ -1192,12 +1466,13 @@ function check_value($mask, $value)
 	}
 	$maskraz = -1;
 	$maskoffset = 0;
-	if (dol_strlen($maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
+	if (dol_strlen($maskcounter) < 3) {
+		return 'ErrorCounterMustHaveMoreThan3Digits';
+	}
 
 	// Extract value for third party mask counter
 	$regClientRef = array();
-	if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef))
-	{
+	if (preg_match('/\{(c+)(0*)\}/i', $mask, $regClientRef)) {
 		$maskrefclient = $regClientRef[1].$regClientRef[2];
 		$maskrefclient_maskclientcode = $regClientRef[1];
 		$maskrefclient_maskcounter = $regClientRef[2];
@@ -1205,12 +1480,15 @@ function check_value($mask, $value)
 		$maskrefclient_clientcode = substr('', 0, dol_strlen($maskrefclient_maskclientcode)); //get n first characters of client code to form maskrefclient_clientcode
 		$maskrefclient_clientcode = str_pad($maskrefclient_clientcode, dol_strlen($maskrefclient_maskclientcode), "#", STR_PAD_RIGHT); //padding maskrefclient_clientcode for having exactly n characters in maskrefclient_clientcode
 		$maskrefclient_clientcode = dol_string_nospecial($maskrefclient_clientcode); //sanitize maskrefclient_clientcode for sql insert and sql select like
-		if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) return 'ErrorCounterMustHaveMoreThan3Digits';
-	} else $maskrefclient = '';
+		if (dol_strlen($maskrefclient_maskcounter) > 0 && dol_strlen($maskrefclient_maskcounter) < 3) {
+			return 'ErrorCounterMustHaveMoreThan3Digits';
+		}
+	} else {
+		$maskrefclient = '';
+	}
 
 	// fail if there is neither a global nor a third party counter
-	if (!$hasglobalcounter && ($maskrefclient_maskcounter == ''))
-	{
+	if (!$hasglobalcounter && ($maskrefclient_maskcounter == '')) {
 		return 'ErrorBadMask';
 	}
 
@@ -1228,46 +1506,62 @@ function check_value($mask, $value)
 	//print "maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode."\n<br>";
 
 	// If an offset is asked
-	if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) $maskoffset = preg_replace('/^\+/', '', $reg[2]);
-	if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) $maskoffset = preg_replace('/^\+/', '', $reg[3]);
+	if (!empty($reg[2]) && preg_match('/^\+/', $reg[2])) {
+		$maskoffset = preg_replace('/^\+/', '', $reg[2]);
+	}
+	if (!empty($reg[3]) && preg_match('/^\+/', $reg[3])) {
+		$maskoffset = preg_replace('/^\+/', '', $reg[3]);
+	}
 
 	// Define $sqlwhere
 
 	// If a restore to zero after a month is asked we check if there is already a value for this year.
-	if (!empty($reg[2]) && preg_match('/^@/', $reg[2]))  $maskraz = preg_replace('/^@/', '', $reg[2]);
-	if (!empty($reg[3]) && preg_match('/^@/', $reg[3]))  $maskraz = preg_replace('/^@/', '', $reg[3]);
-	if ($maskraz >= 0)
-	{
+	if (!empty($reg[2]) && preg_match('/^@/', $reg[2])) {
+		$maskraz = preg_replace('/^@/', '', $reg[2]);
+	}
+	if (!empty($reg[3]) && preg_match('/^@/', $reg[3])) {
+		$maskraz = preg_replace('/^@/', '', $reg[3]);
+	}
+	if ($maskraz >= 0) {
 		if ($maskraz == 99) {
 			$maskraz = date('m');
 			$resetEveryMonth = true;
 		}
-		if ($maskraz > 12) return 'ErrorBadMaskBadRazMonth';
+		if ($maskraz > 12) {
+			return 'ErrorBadMaskBadRazMonth';
+		}
 
 		// Define reg
-		if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
-		if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) return 'ErrorCantUseRazIfNoYearInMask';
+		if ($maskraz > 1 && !preg_match('/^(.*)\{(y+)\}\{(m+)\}/i', $maskwithonlyymcode, $reg)) {
+			return 'ErrorCantUseRazInStartedYearIfNoYearMonthInMask';
+		}
+		if ($maskraz <= 1 && !preg_match('/^(.*)\{(y+)\}/i', $maskwithonlyymcode, $reg)) {
+			return 'ErrorCantUseRazIfNoYearInMask';
+		}
 		//print "x".$maskwithonlyymcode." ".$maskraz;
 	}
 	//print "masktri=".$masktri." maskcounter=".$maskcounter." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskraz=".$maskraz." maskoffset=".$maskoffset."<br>\n";
 
 	if (function_exists('mb_strrpos')) {
 		$posnumstart = mb_strrpos($maskwithnocode, $maskcounter, 0, 'UTF-8');
-	}
-	else {
+	} else {
 		$posnumstart = strrpos($maskwithnocode, $maskcounter);
 	}	// Pos of counter in final string (from 0 to ...)
-	if ($posnumstart < 0) return 'ErrorBadMaskFailedToLocatePosOfSequence';
+	if ($posnumstart < 0) {
+		return 'ErrorBadMaskFailedToLocatePosOfSequence';
+	}
 
 	// Check we have a number in $value at position ($posnumstart+1).', '.dol_strlen($maskcounter)
 	// TODO
 
-    // Check length
-    $len = dol_strlen($maskwithnocode);
-    if (dol_strlen($value) != $len) $result = -1;
+	// Check length
+	$len = dol_strlen($maskwithnocode);
+	if (dol_strlen($value) != $len) {
+		$result = -1;
+	}
 
-    dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);
-    return $result;
+	dol_syslog("functions2::check_value result=".$result, LOG_DEBUG);
+	return $result;
 }
 
 /**
@@ -1281,10 +1575,18 @@ function check_value($mask, $value)
 function binhex($bin, $pad = false, $upper = false)
 {
 	$last = dol_strlen($bin) - 1;
-	for ($i = 0; $i <= $last; $i++) { $x += $bin[$last - $i] * pow(2, $i); }
+	for ($i = 0; $i <= $last; $i++) {
+		$x += $bin[$last - $i] * pow(2, $i);
+	}
 	$x = dechex($x);
-	if ($pad) { while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) { $x = "0$x"; } }
-	if ($upper) { $x = strtoupper($x); }
+	if ($pad) {
+		while (dol_strlen($x) < intval(dol_strlen($bin)) / 4) {
+			$x = "0$x";
+		}
+	}
+	if ($upper) {
+		$x = strtoupper($x);
+	}
 	return $x;
 }
 
@@ -1298,8 +1600,7 @@ function hexbin($hexa)
 {
 	$bin = '';
 	$strLength = dol_strlen($hexa);
-	for ($i = 0; $i < $strLength; $i++)
-	{
+	for ($i = 0; $i < $strLength; $i++) {
 		$bin .= str_pad(decbin(hexdec($hexa[$i])), 4, '0', STR_PAD_LEFT);
 	}
 	return $bin;
@@ -1315,8 +1616,7 @@ function numero_semaine($time)
 {
 	$stime = strftime('%Y-%m-%d', $time);
 
-	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg))
-	{
+	if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/i', $stime, $reg)) {
 		// Date est au format 'YYYY-MM-DD' ou 'YYYY-MM-DD HH:MM:SS'
 		$annee = $reg[1];
 		$mois = $reg[2];
@@ -1324,31 +1624,29 @@ function numero_semaine($time)
 	}
 
 	/*
-     * Norme ISO-8601:
-     * - La semaine 1 de toute annee est celle qui contient le 4 janvier ou que la semaine 1 de toute annee est celle qui contient le 1er jeudi de janvier.
-     * - La majorite des annees ont 52 semaines mais les annees qui commence un jeudi et les annees bissextiles commencant un mercredi en possede 53.
-     * - Le 1er jour de la semaine est le Lundi
-     */
+	 * Norme ISO-8601:
+	 * - La semaine 1 de toute annee est celle qui contient le 4 janvier ou que la semaine 1 de toute annee est celle qui contient le 1er jeudi de janvier.
+	 * - La majorite des annees ont 52 semaines mais les annees qui commence un jeudi et les annees bissextiles commencant un mercredi en possede 53.
+	 * - Le 1er jour de la semaine est le Lundi
+	 */
 
 	// Definition du Jeudi de la semaine
-	if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) // Dimanche
-	$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;
-	elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) // du Lundi au Mercredi
-	$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
-	elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) // du Vendredi au Samedi
-	$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
-	else // Jeudi
-	$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);
+	if (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) == 0) { // Dimanche
+		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - 3 * 24 * 60 * 60;
+	} elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) < 4) { // du Lundi au Mercredi
+		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) + (4 - date("w", mktime(12, 0, 0, $mois, $jour, $annee))) * 24 * 60 * 60;
+	} elseif (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) > 4) { // du Vendredi au Samedi
+		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee) - (date("w", mktime(12, 0, 0, $mois, $jour, $annee)) - 4) * 24 * 60 * 60;
+	} else { // Jeudi
+		$jeudiSemaine = mktime(12, 0, 0, $mois, $jour, $annee);
+	}
 
 	// Definition du premier Jeudi de l'annee
-	if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) // Dimanche
-	{
+	if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 0) { // Dimanche
 		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + 4 * 24 * 60 * 60;
-	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) // du Lundi au Mercredi
-	{
+	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) < 4) { // du Lundi au Mercredi
 		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (4 - date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)))) * 24 * 60 * 60;
-	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) // du Vendredi au Samedi
-	{
+	} elseif (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) > 4) { // du Vendredi au Samedi
 		$premierJeudiAnnee = mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine)) + (7 - (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) - 4)) * 24 * 60 * 60;
 	} else // Jeudi
 	{
@@ -1365,11 +1663,9 @@ function numero_semaine($time)
 	) + 1;
 
 	// Cas particulier de la semaine 53
-	if ($numeroSemaine == 53)
-	{
+	if ($numeroSemaine == 53) {
 		// Les annees qui commence un Jeudi et les annees bissextiles commencant un Mercredi en possede 53
-		if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365))
-		{
+		if (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 4 || (date("w", mktime(12, 0, 0, 1, 1, date("Y", $jeudiSemaine))) == 3 && date("z", mktime(12, 0, 0, 12, 31, date("Y", $jeudiSemaine))) == 365)) {
 			$numeroSemaine = 53;
 		} else {
 			$numeroSemaine = 1;
@@ -1392,20 +1688,17 @@ function numero_semaine($time)
 function weight_convert($weight, &$from_unit, $to_unit)
 {
 	/* Pour convertire 320 gr en Kg appeler
-     *  $f = -3
-     *  weigh_convert(320, $f, 0) retournera 0.32
-     *
-     */
-	while ($from_unit <> $to_unit)
-	{
-		if ($from_unit > $to_unit)
-		{
+	 *  $f = -3
+	 *  weigh_convert(320, $f, 0) retournera 0.32
+	 *
+	 */
+	while ($from_unit <> $to_unit) {
+		if ($from_unit > $to_unit) {
 			$weight = $weight * 10;
 			$from_unit = $from_unit - 1;
 			$weight = weight_convert($weight, $from_unit, $to_unit);
 		}
-		if ($from_unit < $to_unit)
-		{
+		if ($from_unit < $to_unit) {
 			$weight = $weight / 10;
 			$from_unit = $from_unit + 1;
 			$weight = weight_convert($weight, $from_unit, $to_unit);
@@ -1429,7 +1722,9 @@ function weight_convert($weight, &$from_unit, $to_unit)
 function dol_set_user_param($db, $conf, &$user, $tab)
 {
 	// Verification parametres
-	if (count($tab) < 1) return -1;
+	if (count($tab) < 1) {
+		return -1;
+	}
 
 	$db->begin();
 
@@ -1439,9 +1734,10 @@ function dol_set_user_param($db, $conf, &$user, $tab)
 	$sql .= " AND entity = ".$conf->entity;
 	$sql .= " AND param in (";
 	$i = 0;
-	foreach ($tab as $key => $value)
-	{
-		if ($i > 0) $sql .= ',';
+	foreach ($tab as $key => $value) {
+		if ($i > 0) {
+			$sql .= ',';
+		}
 		$sql .= "'".$db->escape($key)."'";
 		$i++;
 	}
@@ -1449,26 +1745,22 @@ function dol_set_user_param($db, $conf, &$user, $tab)
 	dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		$db->rollback();
 		return -1;
 	}
 
-	foreach ($tab as $key => $value)
-	{
+	foreach ($tab as $key => $value) {
 		// Set new parameters
-		if ($value)
-		{
+		if ($value) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_param(fk_user,entity,param,value)";
 			$sql .= " VALUES (".$user->id.",".$conf->entity.",";
 			$sql .= " '".$db->escape($key)."','".$db->escape($value)."')";
 
 			dol_syslog("functions2.lib::dol_set_user_param", LOG_DEBUG);
 			$result = $db->query($sql);
-			if (!$result)
-			{
+			if (!$result) {
 				dol_print_error($db);
 				$db->rollback();
 				return -1;
@@ -1494,8 +1786,7 @@ function dol_set_user_param($db, $conf, &$user, $tab)
 function dol_print_reduction($reduction, $langs)
 {
 	$string = '';
-	if ($reduction == 100)
-	{
+	if ($reduction == 100) {
 		$string = $langs->transnoentities("Offered");
 	} else {
 		$string = vatrate($reduction, true);
@@ -1513,8 +1804,11 @@ function dol_print_reduction($reduction, $langs)
  */
 function version_os($option = '')
 {
-	if ($option == 'smr') $osversion = php_uname('s').' '.php_uname('m').' '.php_uname('r');
-	else $osversion = php_uname();
+	if ($option == 'smr') {
+		$osversion = php_uname('s').' '.php_uname('m').' '.php_uname('r');
+	} else {
+		$osversion = php_uname();
+	}
 	return $osversion;
 }
 
@@ -1573,20 +1867,17 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
 
 	dol_syslog('/core/lib/function2.lib.php::getListOfModels', LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$found = 1;
 
 			$obj = $db->fetch_object($resql);
 
 			// If this generation module needs to scan a directory, then description field is filled
 			// with the constant that contains list of directories to scan (COMPANY_ADDON_PDF_ODT_PATH, ...).
-			if (!empty($obj->description))	// A list of directories to scan is defined
-			{
+			if (!empty($obj->description)) {	// A list of directories to scan is defined
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 				$const = $obj->description;
@@ -1597,23 +1888,23 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
 
 				// Now we add models found in directories scanned
 				$listofdir = explode(',', $dirtoscan);
-				foreach ($listofdir as $key=>$tmpdir)
-				{
+				foreach ($listofdir as $key => $tmpdir) {
 					$tmpdir = trim($tmpdir);
 					$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
-					if (!$tmpdir) { unset($listofdir[$key]); continue; }
-					if (is_dir($tmpdir))
-					{
+					if (!$tmpdir) {
+						unset($listofdir[$key]); continue;
+					}
+					if (is_dir($tmpdir)) {
 						// all type of template is allowed
 						$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '', '', 'name', SORT_ASC, 0);
-						if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+						if (count($tmpfiles)) {
+							$listoffiles = array_merge($listoffiles, $tmpfiles);
+						}
 					}
 				}
 
-				if (count($listoffiles))
-				{
-					foreach ($listoffiles as $record)
-					{
+				if (count($listoffiles)) {
+					foreach ($listoffiles as $record) {
 						$max = ($maxfilenamelength ? $maxfilenamelength : 28);
 						$liste[$obj->id.':'.$record['fullname']] = dol_trunc($record['name'], $max, 'middle');
 					}
@@ -1621,12 +1912,10 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
 					$liste[0] = $obj->label.': '.$langs->trans("None");
 				}
 			} else {
-				if ($type == 'member' && $obj->doc_template_name == 'standard')   // Special case, if member template, we add variant per format
-				{
+				if ($type == 'member' && $obj->doc_template_name == 'standard') {   // Special case, if member template, we add variant per format
 					global $_Avery_Labels;
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/format_cards.lib.php';
-					foreach ($_Avery_Labels as $key => $val)
-					{
+					foreach ($_Avery_Labels as $key => $val) {
 						$liste[$obj->id.':'.$key] = ($obj->label ? $obj->label : $obj->doc_template_name).' '.$val['name'];
 					}
 				} else {
@@ -1641,8 +1930,11 @@ function getListOfModels($db, $type, $maxfilenamelength = 0)
 		return -1;
 	}
 
-	if ($found) return $liste;
-	else return 0;
+	if ($found) {
+		return $liste;
+	} else {
+		return 0;
+	}
 }
 
 /**
@@ -1657,10 +1949,14 @@ function is_ip($ip)
 	// First we test if it is a valid IPv4
 	if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
 		// Then we test if it is a private range
-		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) return 2;
+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE)) {
+			return 2;
+		}
 
 		// Then we test if it is a reserved range
-		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) return 0;
+		if (!filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE)) {
+			return 0;
+		}
 
 		return 1;
 	}
@@ -1715,8 +2011,7 @@ function getSoapParams()
 	$timeout = (empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT); // Connection timeout
 	$response_timeout = (empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT); // Response timeout
 	//print extension_loaded('soap');
-	if ($proxyuse)
-	{
+	if ($proxyuse) {
 		$params = array('connection_timeout'=>$timeout,
 					  'response_timeout'=>$response_timeout,
 					  'proxy_use'      => 1,
@@ -1761,12 +2056,10 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 	if (preg_match('/^([^@]+)@([^@]+)$/i', $objecttype, $regs)) {
 		$myobject = $regs[1];
 		$module = $regs[2];
-	}
-	else {
+	} else {
 		// Parse $objecttype (ex: project_task)
 		$module = $myobject = $objecttype;
-		if (preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs))
-		{
+		if (preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {
 			$module = $regs[1];
 			$myobject = $regs[2];
 		}
@@ -1829,6 +2122,11 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$module = 'mrp';
 		$myobject = 'mo';
 	}
+	elseif ($objecttype == 'productlot') {
+		$classpath = 'product/stock/class';
+		$module = 'stock';
+		$myobject = 'productlot';
+	}
 
 	// Generic case for $classfile and $classname
 	$classfile = strtolower($myobject); $classname = ucfirst($myobject);
@@ -1844,26 +2142,21 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classname = 'CommandeFournisseur';
 		$classpath = 'fourn/class';
 		$module = 'fournisseur';
-	}
-	elseif ($objecttype == 'supplier_proposal') {
+	} elseif ($objecttype == 'supplier_proposal') {
 		$classfile = 'supplier_proposal';
 		$classname = 'SupplierProposal';
 		$classpath = 'supplier_proposal/class';
 		$module = 'supplier_proposal';
-	}
-	elseif ($objecttype == 'stock') {
+	} elseif ($objecttype == 'stock') {
 		$classpath = 'product/stock/class';
 		$classfile = 'entrepot';
 		$classname = 'Entrepot';
 	}
 
-	if (!empty($conf->$module->enabled))
-	{
+	if (!empty($conf->$module->enabled)) {
 		$res = dol_include_once('/'.$classpath.'/'.$classfile.'.class.php');
-		if ($res)
-		{
-			if (class_exists($classname))
-			{
+		if ($res) {
+			if (class_exists($classname)) {
 				$object = new $classname($db);
 				$res = $object->fetch($objectid);
 				if ($res > 0) {
@@ -1872,7 +2165,9 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 					$ret = $langs->trans('Deleted');
 				}
 				unset($object);
-			} else dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+			} else {
+				dol_syslog("Class with classname ".$classname." is unknown even after the include", LOG_ERR);
+			}
 		}
 	}
 	return $ret;
@@ -1896,33 +2191,30 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 	// Get list of all id in array listofid and all parents in array listofparentid
 	$sql = 'SELECT rowid, '.$fieldfkparent.' as parent_id FROM '.MAIN_DB_PREFIX.$tabletocleantree;
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 			$listofid[] = $obj->rowid;
-			if ($obj->parent_id > 0) $listofparentid[$obj->rowid] = $obj->parent_id;
+			if ($obj->parent_id > 0) {
+				$listofparentid[$obj->rowid] = $obj->parent_id;
+			}
 			$i++;
 		}
 	} else {
 		dol_print_error($db);
 	}
 
-	if (count($listofid))
-	{
+	if (count($listofid)) {
 		print 'Code requested to clean tree (may be to solve data corruption), so we check/clean orphelins and loops.'."<br>\n";
 
 		// Check loops on each other
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree." SET ".$fieldfkparent." = 0 WHERE ".$fieldfkparent." = rowid"; // So we update only records linked to themself
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nb = $db->affected_rows($sql);
-			if ($nb > 0)
-			{
+			if ($nb > 0) {
 				print '<br>Some record that were parent of themself were cleaned.';
 			}
 
@@ -1932,17 +2224,14 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 
 		// Check other loops
 		$listofidtoclean = array();
-		foreach ($listofparentid as $id => $pid)
-		{
+		foreach ($listofparentid as $id => $pid) {
 			// Check depth
 			//print 'Analyse record id='.$id.' with parent '.$pid.'<br>';
 
 			$cursor = $id; $arrayidparsed = array(); // We start from child $id
-			while ($cursor > 0)
-			{
+			while ($cursor > 0) {
 				$arrayidparsed[$cursor] = 1;
-				if ($arrayidparsed[$listofparentid[$cursor]])	// We detect a loop. A record with a parent that was already into child
-				{
+				if ($arrayidparsed[$listofparentid[$cursor]]) {	// We detect a loop. A record with a parent that was already into child
 					print 'Found a loop between id '.$id.' - '.$cursor.'<br>';
 					unset($arrayidparsed);
 					$listofidtoclean[$cursor] = $id;
@@ -1951,18 +2240,18 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 				$cursor = $listofparentid[$cursor];
 			}
 
-			if (count($listofidtoclean)) break;
+			if (count($listofidtoclean)) {
+				break;
+			}
 		}
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX.$tabletocleantree;
 		$sql .= " SET ".$fieldfkparent." = 0";
 		$sql .= " WHERE rowid IN (".join(',', $listofidtoclean).")"; // So we update only records detected wrong
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nb = $db->affected_rows($sql);
-			if ($nb > 0)
-			{
+			if ($nb > 0) {
 				// Removed orphelins records
 				print '<br>Some records were detected to have parent that is a child, we set them as root record for id: ';
 				print join(',', $listofidtoclean);
@@ -1977,11 +2266,9 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
 		$sql .= " SET ".$fieldfkparent." = 0";
 		$sql .= " WHERE ".$fieldfkparent." NOT IN (".join(',', $listofid).")"; // So we update only records linked to a non existing parent
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$nb = $db->affected_rows($sql);
-			if ($nb > 0)
-			{
+			if ($nb > 0) {
 				// Removed orphelins records
 				print '<br>Some orphelins were found and modified to be parent so records are visible again for id: ';
 				print join(',', $listofid);
@@ -2008,8 +2295,12 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
  */
 function colorArrayToHex($arraycolor, $colorifnotfound = '888888')
 {
-	if (!is_array($arraycolor)) return $colorifnotfound;
-	if (empty($arraycolor)) return $colorifnotfound;
+	if (!is_array($arraycolor)) {
+		return $colorifnotfound;
+	}
+	if (empty($arraycolor)) {
+		return $colorifnotfound;
+	}
 	return sprintf("%02s", dechex($arraycolor[0])).sprintf("%02s", dechex($arraycolor[1])).sprintf("%02s", dechex($arraycolor[2]));
 }
 
@@ -2025,13 +2316,16 @@ function colorArrayToHex($arraycolor, $colorifnotfound = '888888')
  */
 function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))
 {
-	if (is_array($stringcolor)) return $stringcolor; // If already into correct output format, we return as is
+	if (is_array($stringcolor)) {
+		return $stringcolor; // If already into correct output format, we return as is
+	}
 	$reg = array();
 	$tmp = preg_match('/^#?([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])$/', $stringcolor, $reg);
-	if (!$tmp)
-	{
+	if (!$tmp) {
 		$tmp = explode(',', $stringcolor);
-		if (count($tmp) < 3) return $colorifnotfound;
+		if (count($tmp) < 3) {
+			return $colorifnotfound;
+		}
 		return $tmp;
 	}
 	return array(hexdec($reg[1]), hexdec($reg[2]), hexdec($reg[3]));
@@ -2044,10 +2338,11 @@ function colorStringToArray($stringcolor, $colorifnotfound = array(88, 88, 88))
  */
 function colorValidateHex($color, $allow_white = true)
 {
-	if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) return false;
+	if (!$allow_white && ($color === '#fff' || $color === '#ffffff')) {
+		return false;
+	}
 
-	if (preg_match('/^#[a-f0-9]{6}$/i', $color)) //hex color is valid
-	{
+	if (preg_match('/^#[a-f0-9]{6}$/i', $color)) { //hex color is valid
 		return true;
 	}
 	return false;
@@ -2064,7 +2359,9 @@ function colorValidateHex($color, $allow_white = true)
  */
 function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 {
-	if (empty($ratio)) $ratio = 0; // To avoid null
+	if (empty($ratio)) {
+		$ratio = 0; // To avoid null
+	}
 
 	// Steps should be between -255 and 255. Negative = darker, positive = lighter
 	$ratio = max(-100, min(100, $ratio));
@@ -2081,17 +2378,23 @@ function colorAgressiveness($hex, $ratio = -50, $brightness = 0)
 
 	foreach ($color_parts as $color) {
 		$color = hexdec($color); // Convert to decimal
-		if ($ratio > 0)	// We increase aggressivity
-		{
-			if ($color > 127) $color += ((255 - $color) * ($ratio / 100));
-			if ($color < 128) $color -= ($color * ($ratio / 100));
+		if ($ratio > 0) {	// We increase aggressivity
+			if ($color > 127) {
+				$color += ((255 - $color) * ($ratio / 100));
+			}
+			if ($color < 128) {
+				$color -= ($color * ($ratio / 100));
+			}
 		} else // We decrease agressiveness
 		{
-			if ($color > 128) $color -= (($color - 128) * (abs($ratio) / 100));
-			if ($color < 127) $color += ((128 - $color) * (abs($ratio) / 100));
+			if ($color > 128) {
+				$color -= (($color - 128) * (abs($ratio) / 100));
+			}
+			if ($color < 127) {
+				$color += ((128 - $color) * (abs($ratio) / 100));
+			}
 		}
-		if ($brightness > 0)
-		{
+		if ($brightness > 0) {
 			$color = ($color * (100 + abs($brightness)) / 100);
 		} else {
 			$color = ($color * (100 - abs($brightness)) / 100);
@@ -2228,7 +2531,9 @@ function cartesianArray(array $input)
 function getModuleDirForApiClass($moduleobject)
 {
 	$moduledirforclass = $moduleobject;
-	if ($moduledirforclass != 'api') $moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);
+	if ($moduledirforclass != 'api') {
+		$moduledirforclass = preg_replace('/api$/i', '', $moduledirforclass);
+	}
 
 	if ($moduleobject == 'contracts') {
 		$moduledirforclass = 'contrat';
@@ -2298,8 +2603,7 @@ function randomColor($min = 0, $max = 255)
 }
 
 
-if (!function_exists('dolEscapeXML'))
-{
+if (!function_exists('dolEscapeXML')) {
 	/**
 	 * Encode string for xml usage
 	 *
@@ -2325,25 +2629,40 @@ function autoOrManual($automaticmanual, $case = 1, $color = 0)
 {
 	global $langs;
 	$result = 'unknown'; $classname = '';
-	if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') 	// A mettre avant test sur no a cause du == 0
-	{
+	if ($automaticmanual == 1 || strtolower($automaticmanual) == 'automatic' || strtolower($automaticmanual) == 'true') { 	// A mettre avant test sur no a cause du == 0
 		$result = $langs->trans('automatic');
-		if ($case == 1 || $case == 3) $result = $langs->trans("Automatic");
-		if ($case == 2) $result = '<input type="checkbox" value="1" checked disabled>';
-		if ($case == 3) $result = '<input type="checkbox" value="1" checked disabled> '.$result;
+		if ($case == 1 || $case == 3) {
+			$result = $langs->trans("Automatic");
+		}
+		if ($case == 2) {
+			$result = '<input type="checkbox" value="1" checked disabled>';
+		}
+		if ($case == 3) {
+			$result = '<input type="checkbox" value="1" checked disabled> '.$result;
+		}
 
 		$classname = 'ok';
-	} elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false')
-	{
+	} elseif ($automaticmanual == 0 || strtolower($automaticmanual) == 'manual' || strtolower($automaticmanual) == 'false') {
 		$result = $langs->trans("manual");
-		if ($case == 1 || $case == 3) $result = $langs->trans("Manual");
-		if ($case == 2) $result = '<input type="checkbox" value="0" disabled>';
-		if ($case == 3) $result = '<input type="checkbox" value="0" disabled> '.$result;
+		if ($case == 1 || $case == 3) {
+			$result = $langs->trans("Manual");
+		}
+		if ($case == 2) {
+			$result = '<input type="checkbox" value="0" disabled>';
+		}
+		if ($case == 3) {
+			$result = '<input type="checkbox" value="0" disabled> '.$result;
+		}
 
-		if ($color == 2) $classname = 'ok';
-		else $classname = 'error';
+		if ($color == 2) {
+			$classname = 'ok';
+		} else {
+			$classname = 'error';
+		}
+	}
+	if ($color) {
+		return '<font class="'.$classname.'">'.$result.'</font>';
 	}
-	if ($color) return '<font class="'.$classname.'">'.$result.'</font>';
 	return $result;
 }
 
@@ -2378,7 +2697,9 @@ function price2fec($amount)
 	global $conf;
 
 	// Clean parameters
-	if (empty($amount)) $amount = 0; // To have a numeric value if amount not defined or = ''
+	if (empty($amount)) {
+		$amount = 0; // To have a numeric value if amount not defined or = ''
+	}
 	$amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
 
 	// Output decimal number by default
@@ -2402,9 +2723,15 @@ function price2fec($amount)
  */
 function phpSyntaxError($code)
 {
-	if (!defined("CR")) define("CR", "\r");
-	if (!defined("LF")) define("LF", "\n");
-	if (!defined("CRLF")) define("CRLF", "\r\n");
+	if (!defined("CR")) {
+		define("CR", "\r");
+	}
+	if (!defined("LF")) {
+		define("LF", "\n");
+	}
+	if (!defined("CRLF")) {
+		define("CRLF", "\r\n");
+	}
 
 	$braces = 0;
 	$inString = 0;
@@ -2413,27 +2740,39 @@ function phpSyntaxError($code)
 			switch ($token[0]) {
 				case T_CURLY_OPEN:
 				case T_DOLLAR_OPEN_CURLY_BRACES:
-				case T_START_HEREDOC: ++$inString; break;
-				case T_END_HEREDOC:   --$inString; break;
+				case T_START_HEREDOC:
+					++$inString;
+					break;
+				case T_END_HEREDOC:
+					--$inString;
+					break;
 			}
 		} elseif ($inString & 1) {
 			switch ($token) {
 				case '`':
 				case '\'':
-				case '"': --$inString; break;
+				case '"':
+					--$inString;
+					break;
 			}
 		} else {
 			switch ($token) {
 				case '`':
 				case '\'':
-				case '"': ++$inString; break;
-				case '{': ++$braces; break;
+				case '"':
+					++$inString;
+					break;
+				case '{':
+					++$braces;
+					break;
 				case '}':
 					if ($inString) {
 						--$inString;
 					} else {
 						--$braces;
-						if ($braces < 0) break 2;
+						if ($braces < 0) {
+							break 2;
+						}
 					}
 					break;
 			}
@@ -2458,7 +2797,9 @@ function phpSyntaxError($code)
 			$code = $code[2] <= $braces
 			? array($code[1], $code[2])
 			: array('unexpected $end'.substr($code[1], 14), $braces);
-		} else $code = array('syntax error', 0);
+		} else {
+			$code = array('syntax error', 0);
+		}
 	} else {
 		ob_end_clean();
 		$code = false;
diff --git a/htdocs/core/lib/functions_ch.lib.php b/htdocs/core/lib/functions_ch.lib.php
index 04e74837853..cb683ceec1f 100644
--- a/htdocs/core/lib/functions_ch.lib.php
+++ b/htdocs/core/lib/functions_ch.lib.php
@@ -158,8 +158,7 @@ function dol_ch_controle_bvrb($bvrb)
 
 	// Make control
 	$report = 0;
-	while (dol_strlen($bv) > 1)
-	{
+	while (dol_strlen($bv) > 1) {
 		$match = substr($bv, 0, 1);
 		$report = $tableau[$report][$match];
 		$bv = substr($bv, 1);
diff --git a/htdocs/core/lib/functionsnumtoword.lib.php b/htdocs/core/lib/functionsnumtoword.lib.php
index 930c6d06a9e..6de1e69de1f 100644
--- a/htdocs/core/lib/functionsnumtoword.lib.php
+++ b/htdocs/core/lib/functionsnumtoword.lib.php
@@ -142,10 +142,14 @@ function dol_convertToWord($num, $langs, $currency = '', $centimes = false)
 		$decimalpart = empty($TNum[1]) ? '' : preg_replace('/0+$/', '', $TNum[1]);
 
 		if ($decimalpart) {
-			if (!empty($currency)) $concatWords .= ' '.$langs->transnoentities('and');
+			if (!empty($currency)) {
+				$concatWords .= ' '.$langs->transnoentities('and');
+			}
 
 			$concatWords .= ' '.dol_convertToWord($decimalpart, $langs, '', true);
-			if (!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');
+			if (!empty($currency)) {
+				$concatWords .= ' '.$langs->transnoentities('centimes');
+			}
 		}
 		return $concatWords;
 	}
@@ -164,7 +168,9 @@ function dol_convertToWord($num, $langs, $currency = '', $centimes = false)
 function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 {
 	// If the number is negative convert to positive and return -1 if it is too long
-	if ($numero < 0) $numero *= -1;
+	if ($numero < 0) {
+		$numero *= -1;
+	}
 	if ($numero >= 1000000000001) {
 		return -1;
 	}
@@ -172,8 +178,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 	// Get 2 decimals to cents, another functions round or truncate
 	$strnumber = number_format($numero, 10);
 	$len = strlen($strnumber);
-	for ($i = 0; $i < $len; $i++)
-	{
+	for ($i = 0; $i < $len; $i++) {
 		if ($strnumber[$i] == '.') {
 			$parte_decimal = $strnumber[$i + 1].$strnumber[$i + 2];
 			break;
@@ -182,8 +187,7 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 
 	/*In dolibarr 3.6.2 (my current version) doesn't have $langs->default and
 	in case exist why ask $lang like a parameter?*/
-	if (((is_object($langs) && $langs->default == 'es_MX') || (!is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency')
-	{
+	if (((is_object($langs) && $langs->default == 'es_MX') || (!is_object($langs) && $langs == 'es_MX')) && $numorcurrency == 'currency') {
 		if ($numero >= 1 && $numero < 2) {
 			return ("UN PESO ".$parte_decimal." / 100 M.N.");
 		} elseif ($numero >= 0 && $numero < 1) {
@@ -213,9 +217,11 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 				$udMILLON = (int) ($numero / 1000000);
 				$numero = $numero - $udMILLON * 1000000;
 				$entexto .= hundreds2text($CdMILLON, $DdMILLON, $udMILLON);
-				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON == 1)
+				if (!$CdMMillon && !$DdMMillon && !$UdMMillon && !$CdMILLON && !$DdMILLON && $udMILLON == 1) {
 					$entexto .= " MILL&OacuteN ";
-				else $entexto .= " MILLONES ";
+				} else {
+					$entexto .= " MILLONES ";
+				}
 			}
 			if ($number >= 1000) {
 				$cdm = (int) ($numero / 100000);
@@ -225,16 +231,18 @@ function dolNumberToWord($numero, $langs, $numorcurrency = 'number')
 				$udm = (int) ($numero / 1000);
 				$numero = $numero - $udm * 1000;
 				$entexto .= hundreds2text($cdm, $ddm, $udm);
-				if ($cdm || $ddm || $udm)
+				if ($cdm || $ddm || $udm) {
 					$entexto .= " MIL ";
+				}
 			}
 			$c = (int) ($numero / 100);
 			$numero = $numero - $c * 100;
 			$d = (int) ($numero / 10);
 			$u = (int) $numero - $d * 10;
 			$entexto .= hundreds2text($c, $d, $u);
-			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number > 1000000)
+			if (!$cdm && !$ddm && !$udm && !$c && !$d && !$u && $number > 1000000) {
 				$entexto .= " DE";
+			}
 			$entexto .= " PESOS ".$parte_decimal." / 100 M.N.";
 		}
 		return $entexto;
@@ -264,7 +272,9 @@ function hundreds2text($hundreds, $tens, $units)
 		$entexto .= $centenas[$hundreds - 1];
 	}
 	if ($tens > 2) {
-		if ($hundreds != 0) $entexto .= " ";
+		if ($hundreds != 0) {
+			$entexto .= " ";
+		}
 		$entexto .= $decenas[$tens - 1];
 		if ($units != 0) {
 			$entexto .= " Y ";
@@ -272,16 +282,22 @@ function hundreds2text($hundreds, $tens, $units)
 		}
 		return $entexto;
 	} elseif ($tens == 2) {
-		if ($hundreds != 0) $entexto .= " ";
+		if ($hundreds != 0) {
+			$entexto .= " ";
+		}
 		$entexto .= " ".$veintis[$units];
 		return $entexto;
 	} elseif ($tens == 1) {
-		if ($hundreds != 0) $entexto .= " ";
+		if ($hundreds != 0) {
+			$entexto .= " ";
+		}
 		$entexto .= $diecis[$units];
 		return $entexto;
 	}
 	if ($units != 0) {
-		if ($hundreds != 0 || $tens != 0) $entexto .= " ";
+		if ($hundreds != 0 || $tens != 0) {
+			$entexto .= " ";
+		}
 		$entexto .= $unidades[$units - 1];
 	}
 	return $entexto;
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 7e93623f3c1..d624e2e0ace 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -51,9 +51,9 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	$ch = curl_init();
 
 	/*print $API_Endpoint."-".$API_version."-".$PAYPAL_API_USER."-".$PAYPAL_API_PASSWORD."-".$PAYPAL_API_SIGNATURE."<br>";
-     print $USE_PROXY."-".$gv_ApiErrorURL."<br>";
-     print $nvpStr;
-     exit;*/
+	 print $USE_PROXY."-".$gv_ApiErrorURL."<br>";
+	 print $nvpStr;
+	 exit;*/
 	curl_setopt($ch, CURLOPT_VERBOSE, 1);
 	curl_setopt($ch, CURLOPT_USERAGENT, 'Dolibarr geturl function');
 
@@ -61,12 +61,16 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	// We force value to false so we will manage redirection ourself later.
 	@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
 
-	if (is_array($addheaders) && count($addheaders)) curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
+	if (is_array($addheaders) && count($addheaders)) {
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $addheaders);
+	}
 	curl_setopt($ch, CURLINFO_HEADER_OUT, true); // To be able to retrieve request header and log it
 
 	// By default use tls decied by PHP.
 	// You can force, if supported a version like TLSv1 or TLSv1.2
-	if (!empty($conf->global->MAIN_CURL_SSLVERSION)) curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+	if (!empty($conf->global->MAIN_CURL_SSLVERSION)) {
+		curl_setopt($ch, CURLOPT_SSLVERSION, $conf->global->MAIN_CURL_SSLVERSION);
+	}
 	//curl_setopt($ch, CURLOPT_SSLVERSION, 6); for tls 1.2
 
 	// Turning off the server and peer verification(TrustManager Concept).
@@ -77,8 +81,12 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	$protocols = 0;
 	if (is_array($allowedschemes)) {
 		foreach ($allowedschemes as $allowedscheme) {
-			if ($allowedscheme == 'http') $protocols |= CURLPROTO_HTTP;
-			if ($allowedscheme == 'https') $protocols |= CURLPROTO_HTTPS;
+			if ($allowedscheme == 'http') {
+				$protocols |= CURLPROTO_HTTP;
+			}
+			if ($allowedscheme == 'https') {
+				$protocols |= CURLPROTO_HTTPS;
+			}
 		}
 		curl_setopt($ch, CURLOPT_PROTOCOLS, $protocols);
 		curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, $protocols);
@@ -98,8 +106,9 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	} elseif ($postorget == 'PUT') {
 		$array_param = null;
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT'); // HTTP request is 'PUT'
-		if (!is_array($param)) parse_str($param, $array_param);
-		else {
+		if (!is_array($param)) {
+			parse_str($param, $array_param);
+		} else {
 			dol_syslog("parameter param must be a string", LOG_WARNING);
 			$array_param = $param;
 		}
@@ -121,7 +130,9 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 		dol_syslog("getURLContent set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
 		//curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
 		curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
-		if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
+		if ($PROXY_USER) {
+			curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
+		}
 	}
 
 	$newUrl = $url;
@@ -130,7 +141,9 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	$response = '';
 
 	do {
-		if ($maxRedirection < 1) break;
+		if ($maxRedirection < 1) {
+			break;
+		}
 
 		curl_setopt($ch, CURLOPT_URL, $newUrl);
 
@@ -185,8 +198,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 		} else {
 			$http_code = 0;
 		}
-	}
-	while ($http_code);
+	} while ($http_code);
 
 	$request = curl_getinfo($ch, CURLINFO_HEADER_OUT); // Reading of request must be done after sending request
 
@@ -263,7 +275,9 @@ function getRootURLFromURL($url)
 	$prefix = '';
 	$tmpurl = $url;
 	$reg = null;
-	if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) $prefix = $reg[1];
+	if (preg_match('/^(https?:\/\/)/i', $tmpurl, $reg)) {
+		$prefix = $reg[1];
+	}
 	$tmpurl = preg_replace('/^https?:\/\//i', '', $tmpurl); // Remove http(s)://
 	$tmpurl = preg_replace('/\/.*$/i', '', $tmpurl); // Remove part after domain
 
diff --git a/htdocs/core/lib/holiday.lib.php b/htdocs/core/lib/holiday.lib.php
index 7b9c5d46da2..4f6da9f6d51 100644
--- a/htdocs/core/lib/holiday.lib.php
+++ b/htdocs/core/lib/holiday.lib.php
@@ -47,7 +47,9 @@ function holiday_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/holiday/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index bd392760cc5..ed7d5b1efcc 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -47,23 +47,41 @@ function image_format_supported($file, $acceptsvg = 0)
 
 	// Case filename is not a format image
 	$reg = array();
-	if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) return -1;
+	if (!preg_match('/('.$regeximgext.')$/i', $file, $reg)) {
+		return -1;
+	}
 
 	// Case filename is a format image but not supported by this PHP
 	$imgfonction = '';
-	if (strtolower($reg[1]) == '.gif')  $imgfonction = 'imagecreatefromgif';
-	if (strtolower($reg[1]) == '.jpg')  $imgfonction = 'imagecreatefromjpeg';
-	if (strtolower($reg[1]) == '.jpeg') $imgfonction = 'imagecreatefromjpeg';
-	if (strtolower($reg[1]) == '.png')  $imgfonction = 'imagecreatefrompng';
-	if (strtolower($reg[1]) == '.bmp')  $imgfonction = 'imagecreatefromwbmp';
-	if (strtolower($reg[1]) == '.webp')  $imgfonction = 'imagecreatefromwebp';
-	if (strtolower($reg[1]) == '.xpm')  $imgfonction = 'imagecreatefromxpm';
-	if (strtolower($reg[1]) == '.xbm')  $imgfonction = 'imagecreatefromxbm';
-	if (strtolower($reg[1]) == '.svg')  $imgfonction = 'imagecreatefromsvg'; // Never available
-	if ($imgfonction)
-	{
-		if (!function_exists($imgfonction))
-		{
+	if (strtolower($reg[1]) == '.gif') {
+		$imgfonction = 'imagecreatefromgif';
+	}
+	if (strtolower($reg[1]) == '.jpg') {
+		$imgfonction = 'imagecreatefromjpeg';
+	}
+	if (strtolower($reg[1]) == '.jpeg') {
+		$imgfonction = 'imagecreatefromjpeg';
+	}
+	if (strtolower($reg[1]) == '.png') {
+		$imgfonction = 'imagecreatefrompng';
+	}
+	if (strtolower($reg[1]) == '.bmp') {
+		$imgfonction = 'imagecreatefromwbmp';
+	}
+	if (strtolower($reg[1]) == '.webp') {
+		$imgfonction = 'imagecreatefromwebp';
+	}
+	if (strtolower($reg[1]) == '.xpm') {
+		$imgfonction = 'imagecreatefromxpm';
+	}
+	if (strtolower($reg[1]) == '.xbm') {
+		$imgfonction = 'imagecreatefromxbm';
+	}
+	if (strtolower($reg[1]) == '.svg') {
+		$imgfonction = 'imagecreatefromsvg'; // Never available
+	}
+	if ($imgfonction) {
+		if (!function_exists($imgfonction)) {
 			// Fonctions of conversion not available in this PHP
 			return 0;
 		}
@@ -87,16 +105,16 @@ function dol_getImageSize($file, $url = false)
 {
 	$ret = array();
 
-	if (image_format_supported($file) < 0) return $ret;
+	if (image_format_supported($file) < 0) {
+		return $ret;
+	}
 
 	$filetoread = $file;
-	if (!$url)
-	{
+	if (!$url) {
 		$filetoread = realpath(dol_osencode($file)); // Chemin canonique absolu de l'image
 	}
 
-	if ($filetoread)
-	{
+	if ($filetoread) {
 		$infoImg = getimagesize($filetoread); // Recuperation des infos de l'image
 		$ret['width'] = $infoImg[0]; // Largeur de l'image
 		$ret['height'] = $infoImg[1]; // Hauteur de l'image
@@ -129,25 +147,19 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	$file = trim($file);
 
 	// Check parameters
-	if (!$file)
-	{
+	if (!$file) {
 		// Si le fichier n'a pas ete indique
 		return 'Bad parameter file';
-	} elseif (!file_exists($file))
-	{
+	} elseif (!file_exists($file)) {
 		// Si le fichier passe en parametre n'existe pas
 		return $langs->trans("ErrorFileNotFound", $file);
-	} elseif (image_format_supported($file) < 0)
-	{
+	} elseif (image_format_supported($file) < 0) {
 		return 'This filename '.$file.' does not seem to be an image filename.';
-	} elseif (!is_numeric($newWidth) && !is_numeric($newHeight))
-	{
+	} elseif (!is_numeric($newWidth) && !is_numeric($newHeight)) {
 		return 'Wrong value for parameter newWidth or newHeight';
-	} elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0)
-	{
+	} elseif ($mode == 0 && $newWidth <= 0 && $newHeight <= 0) {
 		return 'At least newHeight or newWidth must be defined for resizing';
-	} elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0))
-	{
+	} elseif ($mode == 1 && ($newWidth <= 0 || $newHeight <= 0)) {
 		return 'Both newHeight or newWidth must be defined for croping';
 	}
 
@@ -157,21 +169,17 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	$imgWidth = $infoImg[0]; // Largeur de l'image
 	$imgHeight = $infoImg[1]; // Hauteur de l'image
 
-	if ($mode == 0)	// If resize, we check parameters
-	{
-		if ($newWidth <= 0)
-		{
+	if ($mode == 0) {	// If resize, we check parameters
+		if ($newWidth <= 0) {
 			$newWidth = intval(($newHeight / $imgHeight) * $imgWidth); // Keep ratio
 		}
-		if ($newHeight <= 0)
-		{
+		if ($newHeight <= 0) {
 			$newHeight = intval(($newWidth / $imgWidth) * $imgHeight); // Keep ratio
 		}
 	}
 
 	$imgfonction = '';
-	switch ($infoImg[2])
-	{
+	switch ($infoImg[2]) {
 		case 1:	// IMG_GIF
 			$imgfonction = 'imagecreatefromgif';
 			break;
@@ -188,18 +196,15 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 			$imgfonction = 'imagecreatefromwebp';
 			break;
 	}
-	if ($imgfonction)
-	{
-		if (!function_exists($imgfonction))
-		{
+	if ($imgfonction) {
+		if (!function_exists($imgfonction)) {
 			// Fonctions de conversion non presente dans ce PHP
 			return 'Resize not possible. This PHP does not support GD functions '.$imgfonction;
 		}
 	}
 
 	// Initialisation des variables selon l'extension de l'image
-	switch ($infoImg[2])
-	{
+	switch ($infoImg[2]) {
 		case 1:	// Gif
 			$img = imagecreatefromgif($filetoread);
 			$extImg = '.gif'; // File name extension of image
@@ -228,8 +233,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	}
 
 	// Create empty image
-	if ($infoImg[2] == 1)
-	{
+	if ($infoImg[2] == 1) {
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($newWidth, $newHeight);
 	} else {
@@ -237,20 +241,17 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	}
 
 	// Activate antialiasing for better quality
-	if (function_exists('imageantialias'))
-	{
+	if (function_exists('imageantialias')) {
 		imageantialias($imgThumb, true);
 	}
 
 	// This is to keep transparent alpha channel if exists (PHP >= 4.2)
-	if (function_exists('imagesavealpha'))
-	{
+	if (function_exists('imagesavealpha')) {
 		imagesavealpha($imgThumb, true);
 	}
 
 	// Initialisation des variables selon l'extension de l'image
-	switch ($infoImg[2])
-	{
+	switch ($infoImg[2]) {
 		case 1:	// Gif
 			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
 			imagecolortransparent($imgThumb, $trans_colour);
@@ -269,7 +270,9 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 			$trans_colour = imagecolorallocatealpha($imgThumb, 255, 255, 255, 127);
 			break;
 	}
-	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
+	if (function_exists("imagefill")) {
+		imagefill($imgThumb, 0, 0, $trans_colour);
+	}
 
 	dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as $extImg, newquality=$newquality");
 	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
@@ -282,8 +285,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	//fclose($fp);
 
 	// Create image on disk
-	switch ($infoImg[2])
-	{
+	switch ($infoImg[2]) {
 		case 1:	// Gif
 			imagegif($imgThumb, $imgThumbName);
 			break;
@@ -302,7 +304,9 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	}
 
 	// Set permissions on file
-	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) {
+		@chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	}
 
 	// Free memory. This does not delete image.
 	imagedestroy($img);
@@ -359,8 +363,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
 						break;
 				}
 				if ($deg) {
-					if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case
-					{
+					if ($infoImg[2] === 'IMAGETYPE_PNG') { // In fact there is no exif on PNG but just in case
 						imagealphablending($img, false);
 						imagesavealpha($img, true);
 						$img = imagerotate($img, $deg, imageColorAllocateAlpha($img, 0, 0, 0, 127));
@@ -378,8 +381,7 @@ function correctExifImageOrientation($fileSource, $fileDest, $quality = 95)
 					// Create image on disk
 					$image = false;
 
-					switch ($infoImg[2])
-					{
+					switch ($infoImg[2]) {
 						case IMAGETYPE_GIF:	    // 1
 							$image = imagegif($img, $fileDest);
 							break;
@@ -434,17 +436,14 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	$file = trim($file);
 
 	// Check parameters
-	if (!$file)
-	{
+	if (!$file) {
 		// Si le fichier n'a pas ete indique
 		return 'ErrorBadParameters';
-	} elseif (!file_exists($file))
-	{
+	} elseif (!file_exists($file)) {
 		// Si le fichier passe en parametre n'existe pas
 		dol_syslog($langs->trans("ErrorFileNotFound", $file), LOG_ERR);
 		return $langs->trans("ErrorFileNotFound", $file);
-	} elseif (image_format_supported($file) < 0)
-	{
+	} elseif (image_format_supported($file) < 0) {
 		dol_syslog('This file '.$file.' does not seem to be an image format file name.', LOG_WARNING);
 		return 'ErrorBadImageFormat';
 	} elseif (!is_numeric($maxWidth) || empty($maxWidth) || $maxWidth < -1) {
@@ -471,20 +470,22 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		}
 	}
 
-	if ($maxWidth == -1) $maxWidth = $infoImg[0]; // If size is -1, we keep unchanged
-	if ($maxHeight == -1) $maxHeight = $infoImg[1]; // If size is -1, we keep unchanged
+	if ($maxWidth == -1) {
+		$maxWidth = $infoImg[0]; // If size is -1, we keep unchanged
+	}
+	if ($maxHeight == -1) {
+		$maxHeight = $infoImg[1]; // If size is -1, we keep unchanged
+	}
 
 	// Si l'image est plus petite que la largeur et la hauteur max, on ne cree pas de vignette
-	if ($infoImg[0] < $maxWidth && $infoImg[1] < $maxHeight)
-	{
+	if ($infoImg[0] < $maxWidth && $infoImg[1] < $maxHeight) {
 		// On cree toujours les vignettes
 		dol_syslog("File size is smaller than thumb size", LOG_DEBUG);
 		//return 'Le fichier '.$file.' ne necessite pas de creation de vignette';
 	}
 
 	$imgfonction = '';
-	switch ($infoImg[2])
-	{
+	switch ($infoImg[2]) {
 		case IMAGETYPE_GIF:	    // 1
 			$imgfonction = 'imagecreatefromgif';
 			break;
@@ -501,10 +502,8 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			$imgfonction = 'imagecreatefromwbmp';
 			break;
 	}
-	if ($imgfonction)
-	{
-		if (!function_exists($imgfonction))
-		{
+	if ($imgfonction) {
+		if (!function_exists($imgfonction)) {
 			// Fonctions de conversion non presente dans ce PHP
 			return 'Error: Creation of thumbs not possible. This PHP does not support GD function '.$imgfonction;
 		}
@@ -516,8 +515,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 
 	// Initialisation des variables selon l'extension de l'image
 	$img = null;
-	switch ($infoImg[2])
-	{
+	switch ($infoImg[2]) {
 		case IMAGETYPE_GIF:	    // 1
 			$img = imagecreatefromgif($filetoread);
 			$extImg = '.gif'; // Extension de l'image
@@ -540,16 +538,14 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			break;
 	}
 
-	if (!is_resource($img))
-	{
+	if (!is_resource($img)) {
 		dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
 		return 0;
 	}
 
 	$exifAngle = false;
 	if ($ort && !empty($conf->global->MAIN_USE_EXIF_ROTATION)) {
-		switch ($ort)
-		{
+		switch ($ort) {
 			case 3: // 180 rotate left
 				$exifAngle = 180;
 				break;
@@ -568,12 +564,10 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 		}
 	}
 
-	if ($exifAngle)
-	{
+	if ($exifAngle) {
 		$rotated = false;
 
-		if ($infoImg[2] === 'IMAGETYPE_PNG') // In fact there is no exif on PNG but just in case
-		{
+		if ($infoImg[2] === 'IMAGETYPE_PNG') { // In fact there is no exif on PNG but just in case
 			imagealphablending($img, false);
 			imagesavealpha($img, true);
 			$rotated = imagerotate($img, $exifAngle, imageColorAllocateAlpha($img, 0, 0, 0, 127));
@@ -592,15 +586,18 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	}
 
 	// Initialisation des dimensions de la vignette si elles sont superieures a l'original
-	if ($maxWidth > $imgWidth) { $maxWidth = $imgWidth; }
-	if ($maxHeight > $imgHeight) { $maxHeight = $imgHeight; }
+	if ($maxWidth > $imgWidth) {
+		$maxWidth = $imgWidth;
+	}
+	if ($maxHeight > $imgHeight) {
+		$maxHeight = $imgHeight;
+	}
 
 	$whFact = $maxWidth / $maxHeight; // Facteur largeur/hauteur des dimensions max de la vignette
 	$imgWhFact = $imgWidth / $imgHeight; // Facteur largeur/hauteur de l'original
 
 	// Fixe les dimensions de la vignette
-	if ($whFact < $imgWhFact)
-	{
+	if ($whFact < $imgWhFact) {
 		// Si largeur determinante
 		$thumbWidth  = $maxWidth;
 		$thumbHeight = $thumbWidth / $imgWhFact;
@@ -613,11 +610,12 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	$thumbWidth = round($thumbWidth);
 
 	// Define target format
-	if (empty($targetformat)) $targetformat = $infoImg[2];
+	if (empty($targetformat)) {
+		$targetformat = $infoImg[2];
+	}
 
 	// Create empty image
-	if ($targetformat == IMAGETYPE_GIF)
-	{
+	if ($targetformat == IMAGETYPE_GIF) {
 		// Compatibilite image GIF
 		$imgThumb = imagecreate($thumbWidth, $thumbHeight);
 	} else {
@@ -625,21 +623,18 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	}
 
 	// Activate antialiasing for better quality
-	if (function_exists('imageantialias'))
-	{
+	if (function_exists('imageantialias')) {
 		imageantialias($imgThumb, true);
 	}
 
 	// This is to keep transparent alpha channel if exists (PHP >= 4.2)
-	if (function_exists('imagesavealpha'))
-	{
+	if (function_exists('imagesavealpha')) {
 		imagesavealpha($imgThumb, true);
 	}
 
 	// Initialisation des variables selon l'extension de l'image
 	// $targetformat is 0 by default, in such case, we keep original extension
-	switch ($targetformat)
-	{
+	switch ($targetformat) {
 		case IMAGETYPE_GIF:	    // 1
 			$trans_colour = imagecolorallocate($imgThumb, 255, 255, 255); // On procede autrement pour le format GIF
 			imagecolortransparent($imgThumb, $trans_colour);
@@ -669,7 +664,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			$newquality = 'NU';
 			break;
 	}
-	if (function_exists("imagefill")) imagefill($imgThumb, 0, 0, $trans_colour);
+	if (function_exists("imagefill")) {
+		imagefill($imgThumb, 0, 0, $trans_colour);
+	}
 
 	dol_syslog("vignette: convert image from ($imgWidth x $imgHeight) to ($thumbWidth x $thumbHeight) as $extImg, newquality=$newquality");
 	//imagecopyresized($imgThumb, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
@@ -686,8 +683,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	//fclose($fp);
 
 	// Create image on disk
-	switch ($targetformat)
-	{
+	switch ($targetformat) {
 		case IMAGETYPE_GIF:	    // 1
 			imagegif($imgThumb, $imgThumbName);
 			break;
@@ -706,7 +702,9 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 	}
 
 	// Set permissions on file
-	if (!empty($conf->global->MAIN_UMASK)) @chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	if (!empty($conf->global->MAIN_UMASK)) {
+		@chmod($imgThumbName, octdec($conf->global->MAIN_UMASK));
+	}
 
 	// Free memory. This does not delete image.
 	imagedestroy($img);
diff --git a/htdocs/core/lib/import.lib.php b/htdocs/core/lib/import.lib.php
index 385dee32a86..a9663795988 100644
--- a/htdocs/core/lib/import.lib.php
+++ b/htdocs/core/lib/import.lib.php
@@ -36,13 +36,14 @@ function import_prepare_head($param, $maxstep = 0)
 {
 	global $langs;
 
-	if (empty($maxstep)) $maxstep = 6;
+	if (empty($maxstep)) {
+		$maxstep = 6;
+	}
 
 	$h = 0;
 	$head = array();
 	$i = 1;
-	while ($i <= $maxstep)
-	{
+	while ($i <= $maxstep) {
 		if ($i < 6) {
 			$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
 		} else {
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index eda1a901986..89e7f8c8e55 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -45,32 +45,37 @@ function facture_prepare_head($object)
 	$head[$h][2] = 'compta';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/contact.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
 
-	if (!empty($conf->prelevement->enabled))
-	{
+	if (!empty($conf->prelevement->enabled)) {
 		$nbStandingOrders = 0;
 		$sql = "SELECT COUNT(pfd.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
 		$sql .= " WHERE pfd.fk_facture = ".$object->id;
 		$sql .= " AND pfd.ext_payment_id IS NULL";
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $nbStandingOrders = $obj->nb;
-		} else dol_print_error($db);
+			if ($obj) {
+				$nbStandingOrders = $obj->nb;
+			}
+		} else {
+			dol_print_error($db);
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('StandingOrders');
-		if ($nbStandingOrders > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
+		if ($nbStandingOrders > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbStandingOrders.'</span>';
+		}
 		$head[$h][2] = 'standingorders';
 		$h++;
 	}
@@ -81,14 +86,19 @@ function facture_prepare_head($object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/compta/facture/note.php?facid='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -100,7 +110,9 @@ function facture_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/document.php?facid='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index f38292cb50d..ca5fc61b60a 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -53,85 +53,106 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
 	$sqlwhere = '';
 	$sqlorder = '';
-	if (in_array('all', $filter))
-	{
+	if (in_array('all', $filter)) {
 		$sqlorder = " ORDER BY f.ref ASC";
 	}
-	if (in_array('date', $filter))
-	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+	if (in_array('date', $filter)) {
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= " f.fk_statut > 0";
 		$sqlwhere .= " AND f.datef >= '".$db->idate($dateafterdate)."'";
 		$sqlwhere .= " AND f.datef <= '".$db->idate($datebeforedate)."'";
 		$sqlorder = " ORDER BY f.datef ASC";
 	}
-	if (in_array('nopayment', $filter))
-	{
+	if (in_array('nopayment', $filter)) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON f.rowid = pf.fk_facture";
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= " f.fk_statut > 0";
 		$sqlwhere .= " AND pf.fk_paiement IS NULL";
 	}
-	if (in_array('payments', $filter) || in_array('bank', $filter))
-	{
+	if (in_array('payments', $filter) || in_array('bank', $filter)) {
 		$sql .= ", ".MAIN_DB_PREFIX."paiement_facture as pf, ".MAIN_DB_PREFIX."paiement as p";
-		if (in_array('bank', $filter)) $sql .= ", ".MAIN_DB_PREFIX."bank as b";
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+		if (in_array('bank', $filter)) {
+			$sql .= ", ".MAIN_DB_PREFIX."bank as b";
+		}
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= " f.fk_statut > 0";
 		$sqlwhere .= " AND f.rowid = pf.fk_facture";
 		$sqlwhere .= " AND pf.fk_paiement = p.rowid";
-		if (in_array('payments', $filter))
-		{
+		if (in_array('payments', $filter)) {
 			$sqlwhere .= " AND p.datep >= '".$db->idate($paymentdateafter)."'";
 			$sqlwhere .= " AND p.datep <= '".$db->idate($paymentdatebefore)."'";
 		}
-		if (in_array('bank', $filter))
-		{
+		if (in_array('bank', $filter)) {
 			$sqlwhere .= " AND p.fk_bank = b.rowid";
 			$sqlwhere .= " AND b.fk_account = ".$paymentbankid;
 		}
 		$sqlorder = " ORDER BY p.datep ASC";
 	}
-	if (in_array('nodeposit', $filter))
-	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+	if (in_array('nodeposit', $filter)) {
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' type <> 3';
 	}
-	if (in_array('noreplacement', $filter))
-	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+	if (in_array('noreplacement', $filter)) {
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' type <> 1';
 	}
-	if (in_array('nocreditnote', $filter))
-	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+	if (in_array('nocreditnote', $filter)) {
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' type <> 2';
 	}
-	if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid))
-	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+	if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid)) {
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' f.fk_soc NOT IN ('.join(',', $thirdpartiesid).')';
 	}
-	if (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid))
-	{
-		if (empty($sqlwhere)) $sqlwhere = ' WHERE ';
-		else $sqlwhere .= " AND";
+	if (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid)) {
+		if (empty($sqlwhere)) {
+			$sqlwhere = ' WHERE ';
+		} else {
+			$sqlwhere .= " AND";
+		}
 		$sqlwhere .= ' f.fk_soc IN ('.join(',', $thirdpartiesid).')';
 	}
-	if ($sqlwhere) $sql .= $sqlwhere;
-	if ($sqlorder) $sql .= $sqlorder;
+	if ($sqlwhere) {
+		$sql .= $sqlwhere;
+	}
+	if ($sqlorder) {
+		$sql .= $sqlorder;
+	}
 
 	//print $sql; exit;
 	dol_syslog("scripts/invoices/rebuild_merge.php:", LOG_DEBUG);
 
-	if ($usestdout) print '--- start'."\n";
+	if ($usestdout) {
+		print '--- start'."\n";
+	}
 
 	// Start of transaction
 	//$db->begin();
@@ -141,54 +162,53 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 	$files = array(); // liste les fichiers
 
 	dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
-	if ($resql = $db->query($sql))
-	{
+	if ($resql = $db->query($sql)) {
 		$num = $db->num_rows($resql);
 		$cpt = 0;
 		$oldemail = '';
 		$message = '';
 		$total = '';
 
-		if ($num)
-		{
+		if ($num) {
 			// First loop on each resultset to build PDF
 			// -----------------------------------------
 
-			while ($cpt < $num)
-			{
+			while ($cpt < $num) {
 				$obj = $db->fetch_object($resql);
 
 				$fac = new Facture($db);
 				$result = $fac->fetch($obj->rowid);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$outputlangs = $langs;
-					if (!empty($newlangid))
-					{
-						if ($outputlangs->defaultlang != $newlangid)
-						{
+					if (!empty($newlangid)) {
+						if ($outputlangs->defaultlang != $newlangid) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlangid);
 						}
 					}
 					$filename = $conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
-					if ($regenerate || !dol_is_file($filename))
-					{
-						if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+					if ($regenerate || !dol_is_file($filename)) {
+						if ($usestdout) {
+							print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+						}
 						$result = $fac->generateDocument($regenerate ? $regenerate : $fac->model_pdf, $outputlangs);
 					} else {
-						if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
+						if ($usestdout) {
+							print "PDF for invoice ".$obj->ref." already exists\n";
+						}
 					}
 
 					// Add file into files array
 					$files[] = $filename;
 				}
 
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$error++;
-					if ($usestdout) print "Error: Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid)."\n";
-					else dol_syslog("Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid), LOG_ERR);
+					if ($usestdout) {
+						print "Error: Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid)."\n";
+					} else {
+						dol_syslog("Failed to build PDF for invoice ".($fac->ref ? $fac->ref : ' id '.$obj->rowid), LOG_ERR);
+					}
 				}
 
 				$cpt++;
@@ -201,8 +221,11 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 			$page_hauteur = $formatarray['height'];
 			$format = array($page_largeur, $page_hauteur);
 
-			if ($usestdout) print "Using output PDF format ".join('x', $format)."\n";
-			else dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR);
+			if ($usestdout) {
+				print "Using output PDF format ".join('x', $format)."\n";
+			} else {
+				dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR);
+			}
 
 
 			// Now, build a merged files with all files in $files array
@@ -210,26 +233,28 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 
 			// Create empty PDF
 			$pdf = pdf_getInstance($format);
-			if (class_exists('TCPDF'))
-			{
+			if (class_exists('TCPDF')) {
 				$pdf->setPrintHeader(false);
 				$pdf->setPrintFooter(false);
 			}
 			$pdf->SetFont(pdf_getPDFFont($langs));
 
-			if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
+			if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) {
+				$pdf->SetCompression(false);
+			}
 			//$pdf->SetCompression(false);
 
 			// Add all others
-			foreach ($files as $file)
-			{
-				if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
-				else dol_syslog("Merge PDF file for invoice ".$file);
+			foreach ($files as $file) {
+				if ($usestdout) {
+					print "Merge PDF file for invoice ".$file."\n";
+				} else {
+					dol_syslog("Merge PDF file for invoice ".$file);
+				}
 
 				// Charge un document PDF depuis un fichier.
 				$pagecount = $pdf->setSourceFile($file);
-				for ($i = 1; $i <= $pagecount; $i++)
-				{
+				for ($i = 1; $i <= $pagecount; $i++) {
 					 $tplidx = $pdf->importPage($i);
 					 $s = $pdf->getTemplatesize($tplidx);
 					 $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
@@ -242,27 +267,36 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 
 			// Save merged file
 			$filename = $fileprefix;
-			if (empty($filename)) $filename = 'mergedpdf';
-			if (!empty($filesuffix)) $filename .= '_'.$filesuffix;
+			if (empty($filename)) {
+				$filename = 'mergedpdf';
+			}
+			if (!empty($filesuffix)) {
+				$filename .= '_'.$filesuffix;
+			}
 			$file = $diroutputpdf.'/'.$filename.'.pdf';
 
-			if (!$error && $pagecount)
-			{
+			if (!$error && $pagecount) {
 				$pdf->Output($file, 'F');
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 			}
 
-			if ($usestdout)
-			{
-				if (!$error) print "Merged PDF has been built in ".$file."\n";
-				else print "Can't build PDF ".$file."\n";
+			if ($usestdout) {
+				if (!$error) {
+					print "Merged PDF has been built in ".$file."\n";
+				} else {
+					print "Can't build PDF ".$file."\n";
+				}
 			}
 
 			$result = 1;
 		} else {
-			if ($usestdout) print "No invoices found for criteria.\n";
-			else dol_syslog("No invoices found for criteria");
+			if ($usestdout) {
+				print "No invoices found for criteria.\n";
+			} else {
+				dol_syslog("No invoices found for criteria");
+			}
 			$result = 0;
 		}
 	} else {
@@ -271,6 +305,9 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 		$error++;
 	}
 
-	if ($error) return -1;
-	else return $result;
+	if ($error) {
+		return -1;
+	} else {
+		return $result;
+	}
 }
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index cd48bbcb3c7..fe50503ed99 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -23,8 +23,7 @@
  * 		\ingroup	core
  */
 
-if (!function_exists('json_encode'))
-{
+if (!function_exists('json_encode')) {
 	/**
 	 * Implement json_encode for PHP that does not have module enabled.
 	 *
@@ -50,26 +49,32 @@ function dol_json_encode($elements)
 	dol_syslog("For better performance, enable the native json in your PHP", LOG_WARNING);
 
 	$num = 0;
-	if (is_object($elements))	// Count number of properties for an object
-	{
-		foreach ($elements as $key => $value) $num++;
+	if (is_object($elements)) {	// Count number of properties for an object
+		foreach ($elements as $key => $value) {
+			$num++;
+		}
 	} else {
 		$num = count($elements);
 	}
 	//var_dump($num);
 
 	// determine type
-	if (is_numeric(key($elements)) && key($elements) == 0)
-	{
+	if (is_numeric(key($elements)) && key($elements) == 0) {
 		// indexed (list)
 		$keysofelements = array_keys($elements); // Elements array mus have key that does not start with 0 and end with num-1, so we will use this later.
 		$output = '[';
-		for ($i = 0, $last = ($num - 1); $i < $num; $i++)
-		{
-			if (!isset($elements[$keysofelements[$i]])) continue;
-			if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) $output .= json_encode($elements[$keysofelements[$i]]);
-			else $output .= _val($elements[$keysofelements[$i]]);
-			if ($i !== $last) $output .= ',';
+		for ($i = 0, $last = ($num - 1); $i < $num; $i++) {
+			if (!isset($elements[$keysofelements[$i]])) {
+				continue;
+			}
+			if (is_array($elements[$keysofelements[$i]]) || is_object($elements[$keysofelements[$i]])) {
+				$output .= json_encode($elements[$keysofelements[$i]]);
+			} else {
+				$output .= _val($elements[$keysofelements[$i]]);
+			}
+			if ($i !== $last) {
+				$output .= ',';
+			}
 		}
 		$output .= ']';
 	} else {
@@ -78,14 +83,22 @@ function dol_json_encode($elements)
 		$last = $num - 1;
 		$i = 0;
 		$tmpelements = array();
-		if (is_array($elements)) $tmpelements = $elements;
-		if (is_object($elements)) $tmpelements = get_object_vars($elements);
-		foreach ($tmpelements as $key => $value)
-		{
+		if (is_array($elements)) {
+			$tmpelements = $elements;
+		}
+		if (is_object($elements)) {
+			$tmpelements = get_object_vars($elements);
+		}
+		foreach ($tmpelements as $key => $value) {
 			$output .= '"'.$key.'":';
-			if (is_array($value)) $output .= json_encode($value);
-			else $output .= _val($value);
-			if ($i !== $last) $output .= ',';
+			if (is_array($value)) {
+				$output .= json_encode($value);
+			} else {
+				$output .= _val($value);
+			}
+			if ($i !== $last) {
+				$output .= ',';
+			}
 			++$i;
 		}
 		$output .= '}';
@@ -109,9 +122,9 @@ function _val($val)
 		$strlen_var = strlen($val);
 
 		/*
-	     * Iterate over every character in the string,
-	     * escaping with a slash or encoding to UTF-8 where necessary
-	     */
+		 * Iterate over every character in the string,
+		 * escaping with a slash or encoding to UTF-8 where necessary
+		 */
 		for ($c = 0; $c < $strlen_var; ++$c) {
 			$ord_var_c = ord($val[$c]);
 
@@ -192,14 +205,18 @@ function _val($val)
 		}
 
 		return '"'.$ascii.'"';
-	} elseif (is_int($val)) return sprintf('%d', $val);
-	elseif (is_float($val)) return sprintf('%F', $val);
-	elseif (is_bool($val)) return ($val ? 'true' : 'false');
-	else return 'null';
+	} elseif (is_int($val)) {
+		return sprintf('%d', $val);
+	} elseif (is_float($val)) {
+		return sprintf('%F', $val);
+	} elseif (is_bool($val)) {
+		return ($val ? 'true' : 'false');
+	} else {
+		return 'null';
+	}
 }
 
-if (!function_exists('json_decode'))
-{
+if (!function_exists('json_decode')) {
 	/**
 	 * Implement json_decode for PHP that does not support it
 	 *
@@ -230,16 +247,23 @@ function dol_json_decode($json, $assoc = false)
 
 	$out = '';
 	$strLength = strlen($json); // Must stay strlen and not dol_strlen because we want technical length, not visible length
-	for ($i = 0; $i < $strLength; $i++)
-	{
-		if (!$comment)
-		{
-			if (($json[$i] == '{') || ($json[$i] == '[')) $out .= 'array(';
-			elseif (($json[$i] == '}') || ($json[$i] == ']')) $out .= ')';
-			elseif ($json[$i] == ':') $out .= ' => ';
-			else $out .= $json[$i];
-		} else $out .= $json[$i];
-		if ($json[$i] == '"' && $json[($i - 1)] != "\\") $comment = !$comment;
+	for ($i = 0; $i < $strLength; $i++) {
+		if (!$comment) {
+			if (($json[$i] == '{') || ($json[$i] == '[')) {
+				$out .= 'array(';
+			} elseif (($json[$i] == '}') || ($json[$i] == ']')) {
+				$out .= ')';
+			} elseif ($json[$i] == ':') {
+				$out .= ' => ';
+			} else {
+				$out .= $json[$i];
+			}
+		} else {
+			$out .= $json[$i];
+		}
+		if ($json[$i] == '"' && $json[($i - 1)] != "\\") {
+			$comment = !$comment;
+		}
 	}
 
 	$out = _unval($out);
@@ -256,17 +280,16 @@ function dol_json_decode($json, $assoc = false)
 	}
 
 	// Return an object
-	if (!$assoc)
-	{
-		if (!empty($array))
-		{
+	if (!$assoc) {
+		if (!empty($array)) {
 			$object = false;
 			if (count($array) > 0) {
 				$object = (object) array();
 			}
-			foreach ($array as $key => $value)
-			{
-				if ($key) $object->{$key} = $value;
+			foreach ($array as $key => $value) {
+				if ($key) {
+					$object->{$key} = $value;
+				}
 			}
 
 			return $object;
@@ -287,8 +310,7 @@ function dol_json_decode($json, $assoc = false)
 function _unval($val)
 {
 	$reg = array();
-	while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg))
-	{
+	while (preg_match('/\\\u([0-9A-F]{2})([0-9A-F]{2})/i', $val, $reg)) {
 		// single, escaped unicode character
 		$utf16 = chr(hexdec($reg[1])).chr(hexdec($reg[2]));
 		$utf8  = utf162utf8($utf16);
@@ -320,18 +342,18 @@ function utf162utf8($utf16)
 		case ((0x7F & $bytes) == $bytes):
 			// this case should never be reached, because we are in ASCII range
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return chr($bytes);
+			return chr($bytes);
 
 		case (0x07FF & $bytes) == $bytes:
 			// return a 2-byte UTF-8 character
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return chr(0xC0 | (($bytes >> 6) & 0x1F))
+			return chr(0xC0 | (($bytes >> 6) & 0x1F))
 		. chr(0x80 | ($bytes & 0x3F));
 
 		case (0xFFFF & $bytes) == $bytes:
 			// return a 3-byte UTF-8 character
 			// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-		return chr(0xE0 | (($bytes >> 12) & 0x0F))
+			return chr(0xE0 | (($bytes >> 12) & 0x0F))
 		. chr(0x80 | (($bytes >> 6) & 0x3F))
 		. chr(0x80 | ($bytes & 0x3F));
 	}
diff --git a/htdocs/core/lib/ldap.lib.php b/htdocs/core/lib/ldap.lib.php
index 640152d5999..9d6e0193108 100644
--- a/htdocs/core/lib/ldap.lib.php
+++ b/htdocs/core/lib/ldap.lib.php
@@ -43,40 +43,35 @@ function ldap_prepare_head()
 	$head[$h][2] = 'ldap';
 	$h++;
 
-	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-	{
+	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_users.php";
 		$head[$h][1] = $langs->trans("LDAPUsersSynchro");
 		$head[$h][2] = 'users';
 		$h++;
 	}
 
-	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE))
-	{
+	if (!empty($conf->global->LDAP_SYNCHRO_ACTIVE)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_groups.php";
 		$head[$h][1] = $langs->trans("LDAPGroupsSynchro");
 		$head[$h][2] = 'groups';
 		$h++;
 	}
 
-	if (!empty($conf->societe->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE))
-	{
+	if (!empty($conf->societe->enabled) && !empty($conf->global->LDAP_CONTACT_ACTIVE)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_contacts.php";
 		$head[$h][1] = $langs->trans("LDAPContactsSynchro");
 		$head[$h][2] = 'contacts';
 		$h++;
 	}
 
-	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))
-	{
+	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members.php";
 		$head[$h][1] = $langs->trans("LDAPMembersSynchro");
 		$head[$h][2] = 'members';
 		$h++;
 	}
 
-	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-	{
+	if (!empty($conf->adherent->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE)) {
 		$head[$h][0] = DOL_URL_ROOT."/admin/ldap_members_types.php";
 		$head[$h][1] = $langs->trans("LDAPMembersTypesSynchro");
 		$head[$h][2] = 'memberstypes';
@@ -111,14 +106,11 @@ function show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass)
 	//print 'key='.$key.' dn='.$dn.' objectclass='.$objectclass;
 
 	print '<br>';
-	if (!function_exists("ldap_connect"))
-	{
+	if (!function_exists("ldap_connect")) {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPFunctionsNotAvailableOnPHP').'">'.$butlabel.'</a>';
-	} elseif (empty($conf->global->LDAP_SERVER_HOST))
-	{
+	} elseif (empty($conf->global->LDAP_SERVER_HOST)) {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('LDAPSetupNotComplete').'">'.$butlabel.'</a>';
-	} elseif (empty($key) || empty($dn) || empty($objectclass))
-	{
+	} elseif (empty($key) || empty($dn) || empty($objectclass)) {
 		$langs->load("errors");
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('ErrorLDAPSetupNotComplete').'">'.$butlabel.'</a>';
 	} else {
@@ -144,39 +136,54 @@ function show_ldap_content($result, $level, $count, $var, $hide = 0, $subcount =
 	global $bc, $conf;
 
 	$count--;
-	if ($count == 0) return -1; // To stop loop
-	if (!is_array($result)) return -1;
+	if ($count == 0) {
+		return -1; // To stop loop
+	}
+	if (!is_array($result)) {
+		return -1;
+	}
 
-	foreach ($result as $key => $val)
-	{
-		if ("$key" == "objectclass") continue;
-		if ("$key" == "count") continue;
-		if ("$key" == "dn") continue;
-		if ("$val" == "objectclass") continue;
+	foreach ($result as $key => $val) {
+		if ("$key" == "objectclass") {
+			continue;
+		}
+		if ("$key" == "count") {
+			continue;
+		}
+		if ("$key" == "dn") {
+			continue;
+		}
+		if ("$val" == "objectclass") {
+			continue;
+		}
 
 		$lastkey[$level] = $key;
 
-		if (is_array($val))
-		{
+		if (is_array($val)) {
 			$hide = 0;
-			if (!is_numeric($key))
-			{
+			if (!is_numeric($key)) {
 				print '<tr class="oddeven">';
 				print '<td>';
 				print $key;
 				print '</td><td>';
-				if (strtolower($key) == 'userpassword') $hide = 1;
+				if (strtolower($key) == 'userpassword') {
+					$hide = 1;
+				}
 			}
 			show_ldap_content($val, $level + 1, $count, $var, $hide, $val["count"]);
-		} elseif ($subcount)
-		{
+		} elseif ($subcount) {
 			$subcount--;
 			$newstring = dol_htmlentitiesbr($val);
-			if ($hide) print preg_replace('/./i', '*', $newstring);
-			else print $newstring;
+			if ($hide) {
+				print preg_replace('/./i', '*', $newstring);
+			} else {
+				print $newstring;
+			}
 			print '<br>';
 		}
-		if ("$val" != $lastkey[$level] && !$subcount) print '</td></tr>';
+		if ("$val" != $lastkey[$level] && !$subcount) {
+			print '</td></tr>';
+		}
 	}
 	return 1;
 }
diff --git a/htdocs/core/lib/loan.lib.php b/htdocs/core/lib/loan.lib.php
index 3a34d3e57c4..c86d0ecce13 100644
--- a/htdocs/core/lib/loan.lib.php
+++ b/htdocs/core/lib/loan.lib.php
@@ -60,7 +60,9 @@ function loan_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/loan/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$tab][2] = 'documents';
 	$tab++;
 
@@ -68,7 +70,9 @@ function loan_prepare_head($object)
 		$nbNote = (empty($object->note_private) ? 0 : 1) + (empty($object->note_public) ? 0 : 1);
 		$head[$tab][0] = DOL_URL_ROOT."/loan/note.php?id=".$object->id;
 		$head[$tab][1] = $langs->trans("Notes");
-		if ($nbNote > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$tab][2] = 'note';
 		$tab++;
 	}
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index 50330686805..93378d77390 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -43,8 +43,7 @@ function member_prepare_head(Adherent $object)
 	$h++;
 
 	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
-	{
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
 		$langs->load("ldap");
 
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/ldap.php?id='.$object->id;
@@ -53,13 +52,14 @@ function member_prepare_head(Adherent $object)
 		$h++;
 	}
 
-	if (!empty($user->rights->adherent->cotisation->lire))
-	{
+	if (!empty($user->rights->adherent->cotisation->lire)) {
 		$nbSubscription = is_array($object->subscriptions) ?count($object->subscriptions) : 0;
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/subscription.php?rowid='.$object->id;
 		$head[$h][1] = $langs->trans("Subscriptions");
 		$head[$h][2] = 'subscription';
-		if ($nbSubscription > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbSubscription.'</span>';
+		if ($nbSubscription > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbSubscription.'</span>';
+		}
 		$h++;
 	}
 
@@ -70,13 +70,21 @@ function member_prepare_head(Adherent $object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'member');
 
 	$nbNote = 0;
-	if (!empty($object->note)) $nbNote++;
-	if (!empty($object->note_private)) $nbNote++;
-	if (!empty($object->note_public)) $nbNote++;
+	if (!empty($object->note)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_private)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_public)) {
+		$nbNote++;
+	}
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/note.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Note");
 	$head[$h][2] = 'note';
-	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	if ($nbNote > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	}
 	$h++;
 
 	// Attachments
@@ -87,17 +95,17 @@ function member_prepare_head(Adherent $object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
 	// Show agenda tab
-	if (!empty($conf->agenda->enabled))
-	{
+	if (!empty($conf->agenda->enabled)) {
 		$head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("Events");
-		if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-		{
+		if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 			$head[$h][1] .= '/';
 			$head[$h][1] .= $langs->trans("Agenda");
 		}
@@ -129,8 +137,7 @@ function member_type_prepare_head(AdherentType $object)
 	$h++;
 
 	// Multilangs
-	if (!empty($conf->global->MAIN_MULTILANGS))
-	{
+	if (!empty($conf->global->MAIN_MULTILANGS)) {
 		$head[$h][0] = DOL_URL_ROOT."/adherents/type_translation.php?rowid=".$object->id;
 		$head[$h][1] = $langs->trans("Translation");
 		$head[$h][2] = 'translation';
@@ -138,8 +145,7 @@ function member_type_prepare_head(AdherentType $object)
 	}
 
 	if ((!empty($conf->ldap->enabled) && !empty($conf->global->LDAP_MEMBER_TYPE_ACTIVE))
-		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin)))
-	{
+		&& (empty($conf->global->MAIN_DISABLE_LDAP_TAB) || !empty($user->admin))) {
 		$langs->load("ldap");
 
 		$head[$h][0] = DOL_URL_ROOT.'/adherents/type_ldap.php?rowid='.$object->id;
diff --git a/htdocs/core/lib/memory.lib.php b/htdocs/core/lib/memory.lib.php
index 484b3933e42..ce603415009 100644
--- a/htdocs/core/lib/memory.lib.php
+++ b/htdocs/core/lib/memory.lib.php
@@ -71,7 +71,9 @@ function dol_setcache($memoryid, $data, $expire = 0)
 	$result = 0;
 
 	if (strpos($memoryid, 'count_') === 0) {	// The memoryid key start with 'count_...'
-		if (empty($conf->global->MAIN_CACHE_COUNT)) return 0;
+		if (empty($conf->global->MAIN_CACHE_COUNT)) {
+			return 0;
+		}
 	}
 
 	if (!empty($conf->memcached->enabled) &&  class_exists('Memcached')) {
@@ -81,7 +83,9 @@ function dol_setcache($memoryid, $data, $expire = 0)
 			$dolmemcache = new Memcached();
 			$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
 			$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-			if (!$result) return -1;
+			if (!$result) {
+				return -1;
+			}
 		}
 
 		$memoryid = session_name() . '_' . $memoryid;
@@ -100,7 +104,9 @@ function dol_setcache($memoryid, $data, $expire = 0)
 			$dolmemcache = new Memcache();
 			$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
 			$result = $dolmemcache->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-			if (!$result) return -1;
+			if (!$result) {
+				return -1;
+			}
 		}
 
 		$memoryid = session_name() . '_' . $memoryid;
@@ -131,7 +137,9 @@ function dol_getcache($memoryid)
 	global $conf;
 
 	if (strpos($memoryid, 'count_') === 0) {	// The memoryid key start with 'count_...'
-		if (empty($conf->global->MAIN_CACHE_COUNT)) return null;
+		if (empty($conf->global->MAIN_CACHE_COUNT)) {
+			return null;
+		}
 	}
 
 	// Using a memcached server
@@ -141,7 +149,9 @@ function dol_getcache($memoryid)
 			$m = new Memcached();
 			$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
 			$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-			if (!$result) return -1;
+			if (!$result) {
+				return -1;
+			}
 		}
 
 		$memoryid = session_name() . '_' . $memoryid;
@@ -164,7 +174,9 @@ function dol_getcache($memoryid)
 			$m = new Memcache();
 			$tmparray = explode(':', $conf->global->MEMCACHED_SERVER);
 			$result = $m->addServer($tmparray[0], $tmparray[1] ? $tmparray[1] : 11211);
-			if (!$result) return -1;
+			if (!$result) {
+				return -1;
+			}
 		}
 
 		$memoryid = session_name() . '_' . $memoryid;
@@ -235,9 +247,13 @@ function dol_setshmop($memoryid, $data, $expire)
 	global $shmkeys, $shmoffset;
 
 	//print 'dol_setshmop memoryid='.$memoryid."<br>\n";
-	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_write")) return 0;
+	if (empty($shmkeys[$memoryid]) || !function_exists("shmop_write")) {
+		return 0;
+	}
 	$shmkey = dol_getshmopaddress($memoryid);
-	if (empty($shmkey)) return 0;	// No key reserved for this memoryid, we can't cache this memoryid
+	if (empty($shmkey)) {
+		return 0;	// No key reserved for this memoryid, we can't cache this memoryid
+	}
 
 	$newdata = serialize($data);
 	$size = strlen($newdata);
@@ -273,14 +289,19 @@ function dol_getshmop($memoryid)
 		return null;
 	}
 	$shmkey = dol_getshmopaddress($memoryid);
-	if (empty($shmkey)) return null;		// No key reserved for this memoryid, we can't cache this memoryid
+	if (empty($shmkey)) {
+		return null;		// No key reserved for this memoryid, we can't cache this memoryid
+	}
 
 	//print 'dol_getshmop memoryid='.$memoryid." shmkey=".$shmkey."<br>\n";
 	$handle = @shmop_open($shmkey, 'a', 0, 0);
 	if ($handle) {
 		$size = trim(shmop_read($handle, 0, 6));
-		if ($size) $data = unserialize(shmop_read($handle, 6, $size));
-		else return -1;
+		if ($size) {
+			$data = unserialize(shmop_read($handle, 6, $size));
+		} else {
+			return -1;
+		}
 		shmop_close($handle);
 	} else {
 		return null;	// Can't open existing block, so we suppose it was not created, so nothing were cached yet for the memoryid
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index ff14ec56e18..0c6029ebb00 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -41,31 +41,30 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 {
 	global $db, $langs;
 
-	if (empty($objectname)) return -1;
-	if (empty($readdir)) $readdir = $destdir;
+	if (empty($objectname)) {
+		return -1;
+	}
+	if (empty($readdir)) {
+		$readdir = $destdir;
+	}
 
-	if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval']))
-	{
+	if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
 		dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
 		return -1;
 	}
 
 	// Check parameters
-	if (count($addfieldentry) > 0)
-	{
-		if (empty($addfieldentry['name']))
-		{
+	if (count($addfieldentry) > 0) {
+		if (empty($addfieldentry['name'])) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Name")), null, 'errors');
 			return -2;
 		}
-		if (empty($addfieldentry['label']))
-		{
+		if (empty($addfieldentry['label'])) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Label")), null, 'errors');
 			return -2;
 		}
 		if (!preg_match('/^(integer|price|sellist|varchar|double|text|html|duration)/', $addfieldentry['type'])
-			&& !preg_match('/^(boolean|real|date|datetime|timestamp)$/', $addfieldentry['type']))
-		{
+			&& !preg_match('/^(boolean|real|date|datetime|timestamp)$/', $addfieldentry['type'])) {
 			setEventMessages($langs->trans('BadValueForType', $objectname), null, 'errors');
 			return -2;
 		}
@@ -73,8 +72,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 
 	$pathoffiletoeditsrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
 	$pathoffiletoedittarget = $destdir.'/class/'.strtolower($objectname).'.class.php'.($readdir != $destdir ? '.new' : '');
-	if (!dol_is_file($pathoffiletoeditsrc))
-	{
+	if (!dol_is_file($pathoffiletoeditsrc)) {
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
 		return -3;
@@ -85,8 +83,11 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 
 	try {
 		include_once $pathoffiletoeditsrc;
-		if (class_exists($objectname)) $object = new $objectname($db);
-		else return -4;
+		if (class_exists($objectname)) {
+			$object = new $objectname($db);
+		} else {
+			return -4;
+		}
 
 		// Backup old file
 		dol_copy($pathoffiletoedittarget, $pathoffiletoedittarget.'.back', $newmask, 1);
@@ -95,17 +96,14 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 		$contentclass = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
 		// Update ->fields (add or remove entries)
-		if (count($object->fields))
-		{
-			if (is_array($addfieldentry) && count($addfieldentry))
-			{
+		if (count($object->fields)) {
+			if (is_array($addfieldentry) && count($addfieldentry)) {
 				$name = $addfieldentry['name'];
 				unset($addfieldentry['name']);
 
 				$object->fields[$name] = $addfieldentry;
 			}
-			if (!empty($delfieldentry))
-			{
+			if (!empty($delfieldentry)) {
 				$name = $delfieldentry;
 				unset($object->fields[$name]);
 			}
@@ -120,40 +118,62 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 		$texttoinsert .= "\t".' */'."\n";
 		$texttoinsert .= "\t".'public $fields=array('."\n";
 
-		if (count($object->fields))
-		{
-			foreach ($object->fields as $key => $val)
-			{
+		if (count($object->fields)) {
+			foreach ($object->fields as $key => $val) {
 				$i++;
 				$texttoinsert .= "\t\t'".$key."' => array('type'=>'".$val['type']."', 'label'=>'".$val['label']."',";
 				$texttoinsert .= " 'enabled'=>'".($val['enabled'] !== '' ? $val['enabled'] : 1)."',";
 				$texttoinsert .= " 'position'=>".($val['position'] !== '' ? $val['position'] : 50).",";
 				$texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 : $val['notnull']).",";
 				$texttoinsert .= " 'visible'=>".($val['visible'] !== '' ? $val['visible'] : -1).",";
-				if ($val['noteditable'])    $texttoinsert .= " 'noteditable'=>'".$val['noteditable']."',";
-				if ($val['default'] || $val['default'] === '0')        $texttoinsert .= " 'default'=>'".$val['default']."',";
-				if ($val['index'])          $texttoinsert .= " 'index'=>".$val['index'].",";
-				if ($val['foreignkey'])     $texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
-				if ($val['searchall'])      $texttoinsert .= " 'searchall'=>".$val['searchall'].",";
-				if ($val['isameasure'])     $texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
-				if ($val['css'])            $texttoinsert .= " 'css'=>'".$val['css']."',";
-				if ($val['help'])           $texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
-				if ($val['showoncombobox']) $texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
-				if ($val['disabled'])       $texttoinsert .= " 'disabled'=>'".$val['disabled']."',";
-				if ($val['autofocusoncreate']) $texttoinsert .= " 'autofocusoncreate'=>'".$val['autofocusoncreate']."',";
-				if ($val['arrayofkeyval'])
-				{
+				if ($val['noteditable']) {
+					$texttoinsert .= " 'noteditable'=>'".$val['noteditable']."',";
+				}
+				if ($val['default'] || $val['default'] === '0') {
+					$texttoinsert .= " 'default'=>'".$val['default']."',";
+				}
+				if ($val['index']) {
+					$texttoinsert .= " 'index'=>".$val['index'].",";
+				}
+				if ($val['foreignkey']) {
+					$texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
+				}
+				if ($val['searchall']) {
+					$texttoinsert .= " 'searchall'=>".$val['searchall'].",";
+				}
+				if ($val['isameasure']) {
+					$texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
+				}
+				if ($val['css']) {
+					$texttoinsert .= " 'css'=>'".$val['css']."',";
+				}
+				if ($val['help']) {
+					$texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
+				}
+				if ($val['showoncombobox']) {
+					$texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
+				}
+				if ($val['disabled']) {
+					$texttoinsert .= " 'disabled'=>'".$val['disabled']."',";
+				}
+				if ($val['autofocusoncreate']) {
+					$texttoinsert .= " 'autofocusoncreate'=>'".$val['autofocusoncreate']."',";
+				}
+				if ($val['arrayofkeyval']) {
 					$texttoinsert .= " 'arrayofkeyval'=>array(";
 					$i = 0;
-					foreach ($val['arrayofkeyval'] as $key2 => $val2)
-					{
-						if ($i) $texttoinsert .= ", ";
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						if ($i) {
+							$texttoinsert .= ", ";
+						}
 						$texttoinsert .= "'".$key2."'=>'".$val2."'";
 						$i++;
 					}
 					$texttoinsert .= "),";
 				}
-				if ($val['comment'])        $texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
+				if ($val['comment']) {
+					$texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
+				}
 
 				$texttoinsert .= "),\n";
 			}
@@ -162,12 +182,10 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 		$texttoinsert .= "\t".');'."\n";
 		//print ($texttoinsert);exit;
 
-		if (count($object->fields))
-		{
+		if (count($object->fields)) {
 			//$typetotypephp=array('integer'=>'integer', 'duration'=>'integer', 'varchar'=>'string');
 
-			foreach ($object->fields as $key => $val)
-			{
+			foreach ($object->fields as $key => $val) {
 				$i++;
 				//$typephp=$typetotypephp[$val['type']];
 				$texttoinsert .= "\t".'public $'.$key.";";
@@ -192,8 +210,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 
 		return $object;
-	} catch (Exception $e)
-	{
+	} catch (Exception $e) {
 		print $e->getMessage();
 		return -5;
 	}
@@ -218,8 +235,12 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 
 	$error = 0;
 
-	if (empty($objectname)) return -1;
-	if (empty($readdir)) $readdir = $destdir;
+	if (empty($objectname)) {
+		return -1;
+	}
+	if (empty($readdir)) {
+		$readdir = $destdir;
+	}
 
 	$pathoffiletoclasssrc = $readdir.'/class/'.strtolower($objectname).'.class.php';
 
@@ -232,8 +253,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 		$pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
 	}
 
-	if (!dol_is_file($pathoffiletoeditsrc))
-	{
+	if (!dol_is_file($pathoffiletoeditsrc)) {
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
 		return -1;
@@ -241,14 +261,15 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 
 	// Load object from myobject.class.php
 	try {
-		if (!is_object($object))
-		{
+		if (!is_object($object)) {
 			include_once $pathoffiletoclasssrc;
-			if (class_exists($objectname)) $object = new $objectname($db);
-			else return -1;
+			if (class_exists($objectname)) {
+				$object = new $objectname($db);
+			} else {
+				return -1;
+			}
 		}
-	} catch (Exception $e)
-	{
+	} catch (Exception $e) {
 		print $e->getMessage();
 	}
 
@@ -259,31 +280,41 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 
 	$i = 0;
 	$texttoinsert = '-- BEGIN MODULEBUILDER FIELDS'."\n";
-	if (count($object->fields))
-	{
-		foreach ($object->fields as $key => $val)
-		{
+	if (count($object->fields)) {
+		foreach ($object->fields as $key => $val) {
 			$i++;
 
 			$type = $val['type'];
 			$type = preg_replace('/:.*$/', '', $type); // For case type = 'integer:Societe:societe/class/societe.class.php'
 
-			if ($type == 'html') $type = 'text'; // html modulebuilder type is a text type in database
-			elseif ($type == 'price') $type = 'double'; // html modulebuilder type is a text type in database
-			elseif (in_array($type, array('link', 'sellist', 'duration'))) $type = 'integer';
+			if ($type == 'html') {
+				$type = 'text'; // html modulebuilder type is a text type in database
+			} elseif ($type == 'price') {
+				$type = 'double'; // html modulebuilder type is a text type in database
+			} elseif (in_array($type, array('link', 'sellist', 'duration'))) {
+				$type = 'integer';
+			}
 			$texttoinsert .= "\t".$key." ".$type;
-			if ($key == 'rowid')  $texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
-			if ($key == 'entity') $texttoinsert .= ' DEFAULT 1';
-			else {
-				if ($val['default'] != '')
-				{
-					if (preg_match('/^null$/i', $val['default'])) $texttoinsert .= " DEFAULT NULL";
-					elseif (preg_match('/varchar/', $type)) $texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";
-					else $texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');
+			if ($key == 'rowid') {
+				$texttoinsert .= ' AUTO_INCREMENT PRIMARY KEY';
+			}
+			if ($key == 'entity') {
+				$texttoinsert .= ' DEFAULT 1';
+			} else {
+				if ($val['default'] != '') {
+					if (preg_match('/^null$/i', $val['default'])) {
+						$texttoinsert .= " DEFAULT NULL";
+					} elseif (preg_match('/varchar/', $type)) {
+						$texttoinsert .= " DEFAULT '".$db->escape($val['default'])."'";
+					} else {
+						$texttoinsert .= (($val['default'] > 0) ? ' DEFAULT '.$val['default'] : '');
+					}
 				}
 			}
 			$texttoinsert .= (($val['notnull'] > 0) ? ' NOT NULL' : '');
-			if ($i < count($object->fields)) $texttoinsert .= ", ";
+			if ($i < count($object->fields)) {
+				$texttoinsert .= ", ";
+			}
 			$texttoinsert .= "\n";
 		}
 	}
@@ -292,8 +323,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	$contentsql = preg_replace('/-- BEGIN MODULEBUILDER FIELDS.*END MODULEBUILDER FIELDS/ims', $texttoinsert, $contentsql);
 
 	$result = file_put_contents($pathoffiletoedittarget, $contentsql);
-	if ($result)
-	{
+	if ($result) {
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 	} else {
 		$error++;
@@ -312,21 +342,16 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 
 	$i = 0;
 	$texttoinsert = '-- BEGIN MODULEBUILDER INDEXES'."\n";
-	if (count($object->fields))
-	{
-		foreach ($object->fields as $key => $val)
-		{
+	if (count($object->fields)) {
+		foreach ($object->fields as $key => $val) {
 			$i++;
-			if (!empty($val['index']))
-			{
+			if (!empty($val['index'])) {
 				$texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD INDEX idx_".strtolower($module).'_'.strtolower($objectname)."_".$key." (".$key.");";
 				$texttoinsert .= "\n";
 			}
-			if (!empty($val['foreignkey']))
-			{
+			if (!empty($val['foreignkey'])) {
 				$tmp = explode('.', $val['foreignkey']);
-				if (!empty($tmp[0]) && !empty($tmp[1]))
-				{
+				if (!empty($tmp[0]) && !empty($tmp[1])) {
 					$texttoinsert .= "ALTER TABLE llx_".strtolower($module).'_'.strtolower($objectname)." ADD CONSTRAINT llx_".strtolower($module).'_'.strtolower($objectname)."_".$key." FOREIGN KEY (".$key.") REFERENCES llx_".preg_replace('/^llx_/', '', $tmp[0])."(".$tmp[1].");";
 					$texttoinsert .= "\n";
 				}
@@ -340,8 +365,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	dol_mkdir(dirname($pathoffiletoedittarget));
 
 	$result2 = file_put_contents($pathoffiletoedittarget, $contentsql);
-	if ($result)
-	{
+	if ($result) {
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 	} else {
 		$error++;
diff --git a/htdocs/core/lib/multicurrency.lib.php b/htdocs/core/lib/multicurrency.lib.php
index a3f7d56ec90..e77a9ee8081 100644
--- a/htdocs/core/lib/multicurrency.lib.php
+++ b/htdocs/core/lib/multicurrency.lib.php
@@ -65,8 +65,7 @@ function multicurrencyLimitPrepareHead($aCurrencies)
 	$i = 0;
 	$head = array();
 
-	foreach ($aCurrencies as $currency)
-	{
+	foreach ($aCurrencies as $currency) {
 		$head[$i][0] = $_SERVER['PHP_SELF'].'?currencycode='.$currency;
 		$head[$i][1] = $langs->trans("Currency".$currency).' ('.$langs->getCurrencySymbol($currency).')';
 		$head[$i][2] = $currency;
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index a006aad8964..48356868143 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -27,8 +27,7 @@
 $supportedoauth2array = array(
 	'OAUTH_GOOGLE_NAME'=>'google',
 );
-if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-{
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = 'stripetest';
 	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = 'stripelive';
 }
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 9bd92a2c79b..9e7d4f8d55a 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -34,43 +34,58 @@
 function commande_prepare_head(Commande $object)
 {
 	global $db, $langs, $conf, $user;
-	if (!empty($conf->expedition->enabled)) $langs->load("sendings");
+	if (!empty($conf->expedition->enabled)) {
+		$langs->load("sendings");
+	}
 	$langs->load("orders");
 
 	$h = 0;
 	$head = array();
 
-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
-	{
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 		$head[$h][0] = DOL_URL_ROOT.'/commande/card.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("CustomerOrder");
 		$head[$h][2] = 'order';
 		$h++;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/commande/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
 
 	if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
-	|| ($conf->delivery_note->enabled && $user->rights->expedition->delivery->lire))
-	{
+	|| ($conf->delivery_note->enabled && $user->rights->expedition->delivery->lire)) {
 		$nbShipments = $object->getNbOfShipments(); $nbReceiption = 0;
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
 		$text = '';
-		if ($conf->expedition_bon->enabled) $text .= $langs->trans("Shipments");
-		if ($conf->expedition_bon->enabled && $conf->delivery_note->enabled) $text .= ' - ';
-		if ($conf->delivery_note->enabled)  $text .= $langs->trans("Receivings");
-		if ($nbShipments > 0 || $nbReceiption > 0) $text .= '<span class="badge marginleftonlyshort">'.($nbShipments ? $nbShipments : 0);
-		if ($conf->expedition_bon->enabled && $conf->delivery_note->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= ' - ';
-		if ($conf->expedition_bon->enabled && $conf->delivery_note->enabled && ($nbShipments > 0 || $nbReceiption > 0)) $text .= ($nbReceiption ? $nbReceiption : 0);
-		if ($nbShipments > 0 || $nbReceiption > 0) $text .= '</span>';
+		if ($conf->expedition_bon->enabled) {
+			$text .= $langs->trans("Shipments");
+		}
+		if ($conf->expedition_bon->enabled && $conf->delivery_note->enabled) {
+			$text .= ' - ';
+		}
+		if ($conf->delivery_note->enabled) {
+			$text .= $langs->trans("Receivings");
+		}
+		if ($nbShipments > 0 || $nbReceiption > 0) {
+			$text .= '<span class="badge marginleftonlyshort">'.($nbShipments ? $nbShipments : 0);
+		}
+		if ($conf->expedition_bon->enabled && $conf->delivery_note->enabled && ($nbShipments > 0 || $nbReceiption > 0)) {
+			$text .= ' - ';
+		}
+		if ($conf->expedition_bon->enabled && $conf->delivery_note->enabled && ($nbShipments > 0 || $nbReceiption > 0)) {
+			$text .= ($nbReceiption ? $nbReceiption : 0);
+		}
+		if ($nbShipments > 0 || $nbReceiption > 0) {
+			$text .= '</span>';
+		}
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
@@ -82,14 +97,19 @@ function commande_prepare_head(Commande $object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'order');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/commande/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -101,7 +121,9 @@ function commande_prepare_head(Commande $object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/commande/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
diff --git a/htdocs/core/lib/parsemd.lib.php b/htdocs/core/lib/parsemd.lib.php
index ef0de8c1298..72903dd9e76 100644
--- a/htdocs/core/lib/parsemd.lib.php
+++ b/htdocs/core/lib/parsemd.lib.php
@@ -31,17 +31,14 @@
  */
 function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
 {
-	if (is_array($replaceimagepath))
-	{
-		foreach ($replaceimagepath as $key => $val)
-		{
+	if (is_array($replaceimagepath)) {
+		foreach ($replaceimagepath as $key => $val) {
 			$keytoreplace = ']('.$key;
 			$valafter = ']('.$val;
 			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
 		}
 	}
-	if ($parser == 'parsedown')
-	{
+	if ($parser == 'parsedown') {
 		include_once DOL_DOCUMENT_ROOT.'/includes/parsedown/Parsedown.php';
 		$Parsedown = new Parsedown();
 		$content = $Parsedown->text($content);
@@ -63,10 +60,8 @@ function dolMd2Html($content, $parser = 'parsedown', $replaceimagepath = null)
  */
 function dolMd2Asciidoc($content, $parser = 'dolibarr', $replaceimagepath = null)
 {
-	if (is_array($replaceimagepath))
-	{
-		foreach ($replaceimagepath as $key => $val)
-		{
+	if (is_array($replaceimagepath)) {
+		foreach ($replaceimagepath as $key => $val) {
 			$keytoreplace = ']('.$key;
 			$valafter = ']('.$val;
 			$content = preg_replace('/'.preg_quote($keytoreplace, '/').'/m', $valafter, $content);
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 601dad3275d..835986f5f83 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -137,18 +137,15 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
 
 	$validpaymentmethod = array();
 
-	if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled))
-	{
+	if ((empty($paymentmethod) || $paymentmethod == 'paypal') && !empty($conf->paypal->enabled)) {
 		$langs->load("paypal");
 		$validpaymentmethod['paypal'] = 'valid';
 	}
-	if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled))
-	{
+	if ((empty($paymentmethod) || $paymentmethod == 'paybox') && !empty($conf->paybox->enabled)) {
 		$langs->load("paybox");
 		$validpaymentmethod['paybox'] = 'valid';
 	}
-	if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled))
-	{
+	if ((empty($paymentmethod) || $paymentmethod == 'stripe') && !empty($conf->stripe->enabled)) {
 		$langs->load("stripe");
 		$validpaymentmethod['stripe'] = 'valid';
 	}
@@ -205,102 +202,142 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 	$urltouse = DOL_MAIN_URL_ROOT;
-	if ($localorexternal) $urltouse = $urlwithroot;
+	if ($localorexternal) {
+		$urltouse = $urlwithroot;
+	}
 
-	if ($type == 'free')
-	{
+	if ($type == 'free') {
 		$out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else $out .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else {
+				$out .= '&securekey='.dol_hash($conf->global->PAYMENT_SECURITY_TOKEN, 2);
+			}
 		}
 		//if ($mode) $out.='&noidempotency=1';
-	} elseif ($type == 'order')
-	{
+	} elseif ($type == 'order') {
 		$out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'order_ref';
-		if ($mode == 0) $out .= urlencode($ref);
+		if ($mode == 1) {
+			$out .= 'order_ref';
+		}
+		if ($mode == 0) {
+			$out .= urlencode($ref);
+		}
 		$out .= ($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else {
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				if ($mode == 1) {
+					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+				}
+				if ($mode == 0) {
+					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				}
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	} elseif ($type == 'invoice')
-	{
+	} elseif ($type == 'invoice') {
 		$out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'invoice_ref';
-		if ($mode == 0) $out .= urlencode($ref);
+		if ($mode == 1) {
+			$out .= 'invoice_ref';
+		}
+		if ($mode == 0) {
+			$out .= urlencode($ref);
+		}
 		$out .= ($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else {
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				if ($mode == 1) {
+					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+				}
+				if ($mode == 0) {
+					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				}
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	} elseif ($type == 'contractline')
-	{
+	} elseif ($type == 'contractline') {
 		$out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'contractline_ref';
-		if ($mode == 0) $out .= urlencode($ref);
+		if ($mode == 1) {
+			$out .= 'contractline_ref';
+		}
+		if ($mode == 0) {
+			$out .= urlencode($ref);
+		}
 		$out .= ($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else {
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				if ($mode == 1) {
+					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+				}
+				if ($mode == 0) {
+					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				}
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
-	} elseif ($type == 'member' || $type == 'membersubscription')
-	{
+	} elseif ($type == 'member' || $type == 'membersubscription') {
 		$out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'member_ref';
-		if ($mode == 0) $out .= urlencode($ref);
+		if ($mode == 1) {
+			$out .= 'member_ref';
+		}
+		if ($mode == 0) {
+			$out .= urlencode($ref);
+		}
 		$out .= ($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else {
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				if ($mode == 1) {
+					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+				}
+				if ($mode == 0) {
+					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				}
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
-	if ($type == 'donation')
-	{
+	if ($type == 'donation') {
 		$out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'donation_ref';
-		if ($mode == 0) $out .= urlencode($ref);
+		if ($mode == 1) {
+			$out .= 'donation_ref';
+		}
+		if ($mode == 0) {
+			$out .= urlencode($ref);
+		}
 		$out .= ($mode ? '</font>' : '');
-		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
-		{
-			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
-			else {
+		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
+			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
+				$out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
+			} else {
 				$out .= '&securekey='.($mode ? '<font color="#666666">' : '');
-				if ($mode == 1) $out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
-				if ($mode == 0) $out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				if ($mode == 1) {
+					$out .= "hash('".$conf->global->PAYMENT_SECURITY_TOKEN."' + '".$type."' + donation_ref)";
+				}
+				if ($mode == 0) {
+					$out .= dol_hash($conf->global->PAYMENT_SECURITY_TOKEN.$type.$ref, 2);
+				}
 				$out .= ($mode ? '</font>' : '');
 			}
 		}
 	}
 
 	// For multicompany
-	if (!empty($out) && !empty($conf->multicompany->enabled)) $out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
+	if (!empty($out) && !empty($conf->multicompany->enabled)) {
+		$out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
+	}
 
 	return $out;
 }
@@ -323,78 +360,86 @@ function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0,
 
 	// Juridical status
 	$line1 = "";
-	if ($fromcompany->forme_juridique_code)
-	{
+	if ($fromcompany->forme_juridique_code) {
 		$line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
 	}
 	// Capital
-	if ($fromcompany->capital)
-	{
+	if ($fromcompany->capital) {
 		$line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
 	}
 	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
-	{
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2)) {
 		$field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
 	}
 	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
+	if ($fromcompany->idprof2) {
 		$field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
 	}
 
 	// Second line of company infos
 	$line2 = "";
 	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
+	if ($fromcompany->idprof3) {
 		$field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
 	}
 	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
+	if ($fromcompany->idprof4) {
 		$field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
 	}
 	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
+	if ($fromcompany->tva_intra != '') {
 		$line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
 	}
 
 	print '<br>';
 
 	print '<div class="center">'."\n";
-	if ($addformmessage)
-	{
+	if ($addformmessage) {
 		print '<!-- object = '.$object->element.' -->';
 		print '<br>';
 
 		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-		elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+		if (!empty($conf->global->$parammessageform)) {
+			print $langs->transnoentities($conf->global->$parammessageform);
+		} elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) {
+			print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+		}
 
 		// Add other message if VAT exists
-		if ($object->total_vat != 0 || $object->total_tva != 0)
-		{
+		if ($object->total_vat != 0 || $object->total_tva != 0) {
 			$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-			if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-			elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+			if (!empty($conf->global->$parammessageform)) {
+				print $langs->transnoentities($conf->global->$parammessageform);
+			} elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) {
+				print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+			}
 		}
 	}
 
 	print '<font style="font-size: 10px;"><br><hr>'."\n";
 	print $fromcompany->name.'<br>';
 	print $line1;
-	if (strlen($line1.$line2) > 50) print '<br>';
-	else print ' - ';
+	if (strlen($line1.$line2) > 50) {
+		print '<br>';
+	} else {
+		print ' - ';
+	}
 	print $line2;
 	print '</font></div>'."\n";
 }
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 613a68b56d8..08559c3ebd6 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -51,8 +51,7 @@ function pdf_getFormat(Translate $outputlangs = null, $mode = 'setup')
 	// Default value if setup was not done and/or entry into c_paper_format not defined
 	$width = 210; $height = 297; $unit = 'mm';
 
-	if ($mode == 'auto' || empty($conf->global->MAIN_PDF_FORMAT) || $conf->global->MAIN_PDF_FORMAT == 'auto')
-	{
+	if ($mode == 'auto' || empty($conf->global->MAIN_PDF_FORMAT) || $conf->global->MAIN_PDF_FORMAT == 'auto') {
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		$pdfformat = dol_getDefaultFormat($outputlangs);
 	} else {
@@ -62,11 +61,9 @@ function pdf_getFormat(Translate $outputlangs = null, $mode = 'setup')
 	$sql = "SELECT code, label, width, height, unit FROM ".MAIN_DB_PREFIX."c_paper_format";
 	$sql .= " WHERE code = '".$db->escape($pdfformat)."'";
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj)
-		{
+		if ($obj) {
 			$width = (int) $obj->width;
 			$height = (int) $obj->height;
 			$unit = $obj->unit;
@@ -90,8 +87,7 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 	global $conf;
 
 	// Define constant for TCPDF
-	if (!defined('K_TCPDF_EXTERNAL_CONFIG'))
-	{
+	if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
 		define('K_TCPDF_EXTERNAL_CONFIG', 1); // this avoid using tcpdf_config file
 		define('K_PATH_CACHE', DOL_DATA_ROOT.'/admin/temp/');
 		define('K_PATH_URL_CACHE', DOL_DATA_ROOT.'/admin/temp/');
@@ -133,21 +129,27 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 	require_once TCPDF_PATH.'tcpdf.php';
 
 	// We need to instantiate tcpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
-	if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
+	if (empty($conf->global->MAIN_DISABLE_TCPDI)) {
+		require_once TCPDI_PATH.'tcpdi.php';
+	}
 
 	//$arrayformat=pdf_getFormat();
 	//$format=array($arrayformat['width'],$arrayformat['height']);
 	//$metric=$arrayformat['unit'];
 
 	$pdfa = false; // PDF-1.3
-	if (!empty($conf->global->PDF_USE_1A)) $pdfa = true; // PDF1/A
+	if (!empty($conf->global->PDF_USE_1A)) {
+		$pdfa = true; // PDF1/A
+	}
 
-	if (class_exists('TCPDI')) $pdf = new TCPDI($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);
-	else $pdf = new TCPDF($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);
+	if (class_exists('TCPDI')) {
+		$pdf = new TCPDI($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);
+	} else {
+		$pdf = new TCPDF($pagetype, $metric, $format, true, 'UTF-8', false, $pdfa);
+	}
 
 	// Protection and encryption of pdf
-	if (!empty($conf->global->PDF_SECURITY_ENCRYPTION))
-	{
+	if (!empty($conf->global->PDF_SECURITY_ENCRYPTION)) {
 		/* Permission supported by TCPDF
 		- print : Print the document;
 		- modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';
@@ -223,13 +225,13 @@ function pdf_getPDFFont($outputlangs)
 {
 	global $conf;
 
-	if (!empty($conf->global->MAIN_PDF_FORCE_FONT)) return $conf->global->MAIN_PDF_FORCE_FONT;
+	if (!empty($conf->global->MAIN_PDF_FORCE_FONT)) {
+		return $conf->global->MAIN_PDF_FORCE_FONT;
+	}
 
 	$font = 'Helvetica'; // By default, for FPDI, or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
-	{
-		if ($outputlangs->trans('FONTFORPDF') != 'FONTFORPDF')
-		{
+	if (class_exists('TCPDF')) {  // If TCPDF on, we can use an UTF8 one like DejaVuSans if required (slower)
+		if ($outputlangs->trans('FONTFORPDF') != 'FONTFORPDF') {
 			$font = $outputlangs->trans('FONTFORPDF');
 		}
 	}
@@ -247,14 +249,14 @@ function pdf_getPDFFontSize($outputlangs)
 	global $conf;
 
 	$size = 10; // By default, for FPDI or ISO language on TCPDF
-	if (class_exists('TCPDF'))  // If TCPDF on, we can use an UTF8 font like DejaVuSans if required (slower)
-	{
-		if ($outputlangs->trans('FONTSIZEFORPDF') != 'FONTSIZEFORPDF')
-		{
+	if (class_exists('TCPDF')) {  // If TCPDF on, we can use an UTF8 font like DejaVuSans if required (slower)
+		if ($outputlangs->trans('FONTSIZEFORPDF') != 'FONTSIZEFORPDF') {
 			$size = (int) $outputlangs->trans('FONTSIZEFORPDF');
 		}
 	}
-	if (!empty($conf->global->MAIN_PDF_FORCE_FONT_SIZE)) $size = $conf->global->MAIN_PDF_FORCE_FONT_SIZE;
+	if (!empty($conf->global->MAIN_PDF_FORCE_FONT_SIZE)) {
+		$size = $conf->global->MAIN_PDF_FORCE_FONT_SIZE;
+	}
 
 	return $size;
 }
@@ -274,10 +276,11 @@ function pdf_getHeightForLogo($logo, $url = false)
 	$maxwidth = 130;
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 	$tmp = dol_getImageSize($logo, $url);
-	if ($tmp['height'])
-	{
+	if ($tmp['height']) {
 		$width = round($height * $tmp['width'] / $tmp['height']);
-		if ($width > $maxwidth) $height = $height * $maxwidth / $width;
+		if ($width > $maxwidth) {
+			$height = $height * $maxwidth / $width;
+		}
 	}
 	//print $tmp['width'].' '.$tmp['height'].' '.$width; exit;
 	return $height;
@@ -377,82 +380,103 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 {
 	global $conf, $hookmanager;
 
-	if ($mode == 'source' && !is_object($sourcecompany)) return -1;
-	if ($mode == 'target' && !is_object($targetcompany)) return -1;
+	if ($mode == 'source' && !is_object($sourcecompany)) {
+		return -1;
+	}
+	if ($mode == 'target' && !is_object($targetcompany)) {
+		return -1;
+	}
 
-	if (!empty($sourcecompany->state_id) && empty($sourcecompany->state))             $sourcecompany->state = getState($sourcecompany->state_id);
-	if (!empty($targetcompany->state_id) && empty($targetcompany->state))             $targetcompany->state = getState($targetcompany->state_id);
+	if (!empty($sourcecompany->state_id) && empty($sourcecompany->state)) {
+		$sourcecompany->state = getState($sourcecompany->state_id);
+	}
+	if (!empty($targetcompany->state_id) && empty($targetcompany->state)) {
+		$targetcompany->state = getState($targetcompany->state_id);
+	}
 
 	$reshook = 0;
 	$stringaddress = '';
-	if (is_object($hookmanager))
-	{
+	if (is_object($hookmanager)) {
 		$parameters = array('sourcecompany' => &$sourcecompany, 'targetcompany' => &$targetcompany, 'targetcontact' => &$targetcontact, 'outputlangs' => $outputlangs, 'mode' => $mode, 'usecontact' => $usecontact);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_build_address', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		$stringaddress .= $hookmanager->resPrint;
 	}
-	if (empty($reshook))
-	{
-		if ($mode == 'source')
-		{
+	if (empty($reshook)) {
+		if ($mode == 'source') {
 			$withCountry = 0;
-			if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) $withCountry = 1;
+			if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+				$withCountry = 1;
+			}
 
 			$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($sourcecompany, $withCountry, "\n", $outputlangs))."\n";
 
-			if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS))
-			{
+			if (empty($conf->global->MAIN_PDF_DISABLESOURCEDETAILS)) {
 				// Phone
-				if ($sourcecompany->phone) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+				if ($sourcecompany->phone) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("PhoneShort").": ".$outputlangs->convToOutputCharset($sourcecompany->phone);
+				}
 				// Fax
-				if ($sourcecompany->fax) $stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+				if ($sourcecompany->fax) {
+					$stringaddress .= ($stringaddress ? ($sourcecompany->phone ? " - " : "\n") : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($sourcecompany->fax);
+				}
 				// EMail
-				if ($sourcecompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+				if ($sourcecompany->email) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($sourcecompany->email);
+				}
 				// Web
-				if ($sourcecompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+				if ($sourcecompany->url) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($sourcecompany->url);
+				}
 			}
 			// Intra VAT
-			if (!empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS))
-			{
-				if ($sourcecompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+			if (!empty($conf->global->MAIN_TVAINTRA_IN_SOURCE_ADDRESS)) {
+				if ($sourcecompany->tva_intra) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($sourcecompany->tva_intra);
+				}
 			}
 			// Professionnal Ids
 			$reg = array();
-			if (!empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof1))
-			{
+			if (!empty($conf->global->MAIN_PROFID1_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof1)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId1", $sourcecompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof1);
 			}
-			if (!empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof2))
-			{
+			if (!empty($conf->global->MAIN_PROFID2_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof2)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId2", $sourcecompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof2);
 			}
-			if (!empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof3))
-			{
+			if (!empty($conf->global->MAIN_PROFID3_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof3)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId3", $sourcecompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof3);
 			}
-			if (!empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof4))
-			{
+			if (!empty($conf->global->MAIN_PROFID4_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof4)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId4", $sourcecompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof4);
 			}
-			if (!empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof5))
-			{
+			if (!empty($conf->global->MAIN_PROFID5_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof5)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId5", $sourcecompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof5);
 			}
-			if (!empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof6))
-			{
+			if (!empty($conf->global->MAIN_PROFID6_IN_SOURCE_ADDRESS) && !empty($sourcecompany->idprof6)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId6", $sourcecompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
 			}
 			if (!empty($conf->global->PDF_ADD_MORE_AFTER_SOURCE_ADDRESS)) {
@@ -460,10 +484,8 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 			}
 		}
 
-		if ($mode == 'target' || preg_match('/targetwithdetails/', $mode))
-		{
-			if ($usecontact)
-			{
+		if ($mode == 'target' || preg_match('/targetwithdetails/', $mode)) {
+			if ($usecontact) {
 				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));
 
 				if (!empty($targetcontact->address)) {
@@ -472,8 +494,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 					$companytouseforaddress = $targetcompany;
 
 					// Contact on a thirdparty that is a different thirdparty than the thirdparty of object
-					if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id)
-					{
+					if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id) {
 						$targetcontact->fetch_thirdparty();
 						$companytouseforaddress = $targetcontact->thirdparty;
 					}
@@ -487,118 +508,142 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
 				}
 
-				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
-				{
+				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode)) {
 					// Phone
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
-					{
-						if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
-						if (!empty($targetcontact->phone_pro)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
-						if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) $stringaddress .= " / ";
-						if (!empty($targetcontact->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
+						if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) {
+							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+						}
+						if (!empty($targetcontact->phone_pro)) {
+							$stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+						}
+						if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) {
+							$stringaddress .= " / ";
+						}
+						if (!empty($targetcontact->phone_mobile)) {
+							$stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+						}
 					}
 					// Fax
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
-					{
-						if ($targetcontact->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
+						if ($targetcontact->fax) {
+							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+						}
 					}
 					// EMail
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
-					{
-						if ($targetcontact->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
+						if ($targetcontact->email) {
+							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+						}
 					}
 					// Web
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
-					{
-						if ($targetcontact->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
+						if ($targetcontact->url) {
+							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+						}
 					}
 				}
 			} else {
 				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
 				// Country
-				if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+				if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+				}
 
-				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode))
-				{
+				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode)) {
 					// Phone
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode))
-					{
-						if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
-						if (!empty($targetcompany->phone)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
-						if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) $stringaddress .= " / ";
-						if (!empty($targetcompany->phone_mobile)) $stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
+						if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) {
+							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+						}
+						if (!empty($targetcompany->phone)) {
+							$stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+						}
+						if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) {
+							$stringaddress .= " / ";
+						}
+						if (!empty($targetcompany->phone_mobile)) {
+							$stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
+						}
 					}
 					// Fax
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode))
-					{
-						if ($targetcompany->fax) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
+						if ($targetcompany->fax) {
+							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+						}
 					}
 					// EMail
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode))
-					{
-						if ($targetcompany->email) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
+						if ($targetcompany->email) {
+							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+						}
 					}
 					// Web
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode))
-					{
-						if ($targetcompany->url) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
+						if ($targetcompany->url) {
+							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+						}
 					}
 				}
 			}
 
 			// Intra VAT
-			if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS))
-			{
-				if ($targetcompany->tva_intra) $stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+			if (empty($conf->global->MAIN_TVAINTRA_NOT_IN_ADDRESS)) {
+				if ($targetcompany->tva_intra) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
+				}
 			}
 
 			// Professionnal Ids
-			if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1))
-			{
+			if (!empty($conf->global->MAIN_PROFID1_IN_ADDRESS) && !empty($targetcompany->idprof1)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId1", $targetcompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof1);
 			}
-			if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2))
-			{
+			if (!empty($conf->global->MAIN_PROFID2_IN_ADDRESS) && !empty($targetcompany->idprof2)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId2", $targetcompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof2);
 			}
-			if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3))
-			{
+			if (!empty($conf->global->MAIN_PROFID3_IN_ADDRESS) && !empty($targetcompany->idprof3)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId3", $targetcompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof3);
 			}
-			if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4))
-			{
+			if (!empty($conf->global->MAIN_PROFID4_IN_ADDRESS) && !empty($targetcompany->idprof4)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId4", $targetcompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof4);
 			}
-			if (!empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && !empty($targetcompany->idprof5))
-			{
+			if (!empty($conf->global->MAIN_PROFID5_IN_ADDRESS) && !empty($targetcompany->idprof5)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId5", $targetcompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof5);
 			}
-			if (!empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && !empty($targetcompany->idprof6))
-			{
+			if (!empty($conf->global->MAIN_PROFID6_IN_ADDRESS) && !empty($targetcompany->idprof6)) {
 				$tmp = $outputlangs->transcountrynoentities("ProfId6", $targetcompany->country_code);
-				if (preg_match('/\((.+)\)/', $tmp, $reg)) $tmp = $reg[1];
+				if (preg_match('/\((.+)\)/', $tmp, $reg)) {
+					$tmp = $reg[1];
+				}
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($targetcompany->idprof6);
 			}
 
 			// Public note
-			if (!empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS))
-			{
-				if ($mode == 'source' && !empty($sourcecompany->note_public))
-				{
+			if (!empty($conf->global->MAIN_PUBLIC_NOTE_IN_ADDRESS)) {
+				if ($mode == 'source' && !empty($sourcecompany->note_public)) {
 					$stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($sourcecompany->note_public);
 				}
-				if (($mode == 'target' || preg_match('/targetwithdetails/', $mode)) && !empty($targetcompany->note_public))
-				{
+				if (($mode == 'target' || preg_match('/targetwithdetails/', $mode)) && !empty($targetcompany->note_public)) {
 					$stringaddress .= ($stringaddress ? "\n" : '').dol_string_nohtmltag($targetcompany->note_public);
 				}
 			}
@@ -622,8 +667,7 @@ function pdf_pagehead(&$pdf, $outputlangs, $page_height)
 	global $conf;
 
 	// Add a background image on document
-	if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF))		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
-	{
+	if (!empty($conf->global->MAIN_USE_BACKGROUND_ON_PDF)) {		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
 		$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
 		$pdf->Image($conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_USE_BACKGROUND_ON_PDF, (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_X) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_X : 0), (isset($conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y) ? $conf->global->MAIN_USE_BACKGROUND_ON_PDF_Y : 0), 0, $page_height);
 		$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
@@ -665,10 +709,15 @@ function pdf_watermark(&$pdf, $outputlangs, $h, $w, $unit, $text)
 	global $langs, $mysoc, $user;
 
 	// Print Draft Watermark
-	if ($unit == 'pt') $k = 1;
-	elseif ($unit == 'mm') $k = 72 / 25.4;
-	elseif ($unit == 'cm') $k = 72 / 2.54;
-	elseif ($unit == 'in') $k = 72;
+	if ($unit == 'pt') {
+		$k = 1;
+	} elseif ($unit == 'mm') {
+		$k = 72 / 25.4;
+	} elseif ($unit == 'cm') {
+		$k = 72 / 2.54;
+	} elseif ($unit == 'in') {
+		$k = 72;
+	}
 
 	// Make substitution
 	$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, null);
@@ -719,8 +768,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 	$diffsizecontent = (empty($conf->global->PDF_DIFFSIZE_CONTENT) ? 4 : $conf->global->PDF_DIFFSIZE_CONTENT);
 	$pdf->SetXY($curx, $cury);
 
-	if (empty($onlynumber))
-	{
+	if (empty($onlynumber)) {
 		$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByTransferOnThisBankAccount').':', 0, 'L', 0);
 		$cury += 4;
@@ -730,36 +778,36 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 
 	// Use correct name of bank id according to country
 	$bickey = "BICNumber";
-	if ($account->getCountryCode() == 'IN') $bickey = "SWIFT";
+	if ($account->getCountryCode() == 'IN') {
+		$bickey = "SWIFT";
+	}
 
 	// Get format of bank account according to its country
 	$usedetailedbban = $account->useDetailedBBAN();
 
 	//$onlynumber=0; $usedetailedbban=1; // For tests
-	if ($usedetailedbban)
-	{
+	if ($usedetailedbban) {
 		$savcurx = $curx;
 
-		if (empty($onlynumber))
-		{
+		if (empty($onlynumber)) {
 			$pdf->SetFont('', '', $default_font_size - $diffsizecontent);
 			$pdf->SetXY($curx, $cury);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Bank").': '.$outputlangs->convToOutputCharset($account->bank), 0, 'L', 0);
 			$cury += 3;
 		}
 
-		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN))    // Note that some countries still need bank number, BIC/IBAN not enougth for them
-		{
+		if (empty($conf->global->PDF_BANK_HIDE_NUMBER_SHOW_ONLY_BICIBAN)) {    // Note that some countries still need bank number, BIC/IBAN not enougth for them
 			// Note:
 			// bank = code_banque (FR), sort code (GB, IR. Example: 12-34-56)
 			// desk = code guichet (FR), used only when $usedetailedbban = 1
 			// number = account number
 			// key = check control key used only when $usedetailedbban = 1
-			if (empty($onlynumber)) $pdf->line($curx + 1, $cury + 1, $curx + 1, $cury + 6);
+			if (empty($onlynumber)) {
+				$pdf->line($curx + 1, $cury + 1, $curx + 1, $cury + 6);
+			}
 
 
-			foreach ($account->getFieldsToShow() as $val)
-			{
+			foreach ($account->getFieldsToShow() as $val) {
 				$pdf->SetXY($curx, $cury + 4);
 				$pdf->SetFont('', '', $default_font_size - 3);
 
@@ -812,7 +860,9 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("BankAccountNumber").': '.$outputlangs->convToOutputCharset($account->number), 0, 'L', 0);
 		$cury += 3;
 
-		if ($diffsizecontent <= 2) $cury += 1;
+		if ($diffsizecontent <= 2) {
+			$cury += 1;
+		}
 	}
 
 	$pdf->SetFont('', '', $default_font_size - $diffsizecontent);
@@ -840,17 +890,17 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 	// Use correct name of bank id according to country
 	$ibankey = FormBank::getIBANLabel($account);
 
-	if (!empty($account->iban))
-	{
+	if (!empty($account->iban)) {
 		//Remove whitespaces to ensure we are dealing with the format we expect
 		$ibanDisplay_temp = str_replace(' ', '', $outputlangs->convToOutputCharset($account->iban));
 		$ibanDisplay = "";
 
 		$nbIbanDisplay_temp = dol_strlen($ibanDisplay_temp);
-		for ($i = 0; $i < $nbIbanDisplay_temp; $i++)
-		{
+		for ($i = 0; $i < $nbIbanDisplay_temp; $i++) {
 			$ibanDisplay .= $ibanDisplay_temp[$i];
-			if ($i % 4 == 3 && $i > 0)	$ibanDisplay .= " ";
+			if ($i % 4 == 3 && $i > 0) {
+				$ibanDisplay .= " ";
+			}
 		}
 
 		$pdf->SetFont('', 'B', $default_font_size - 3);
@@ -859,8 +909,7 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
 		$cury += 3;
 	}
 
-	if (!empty($account->bic))
-	{
+	if (!empty($account->bic)) {
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 		$pdf->SetXY($curx, $cury);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities($bickey).': '.$outputlangs->convToOutputCharset($account->bic), 0, 'L', 0);
@@ -894,8 +943,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	$dims = $pdf->getPageDimensions();
 
 	// Line of free text
-	if (empty($hidefreetext) && !empty($conf->global->$paramfreetext))
-	{
+	if (empty($hidefreetext) && !empty($conf->global->$paramfreetext)) {
 		$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 		// More substitution keys
 		$substitutionarray['__FROM_NAME__'] = $fromcompany->name;
@@ -915,124 +963,118 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	// First line of company infos
 	$line1 = ""; $line2 = ""; $line3 = ""; $line4 = "";
 
-	if ($showdetails == 1 || $showdetails == 3)
-	{
+	if ($showdetails == 1 || $showdetails == 3) {
 		// Company name
-		if ($fromcompany->name)
-		{
+		if ($fromcompany->name) {
 			$line1 .= ($line1 ? " - " : "").$outputlangs->transnoentities("RegisteredOffice").": ".$fromcompany->name;
 		}
 		// Address
-		if ($fromcompany->address)
-		{
+		if ($fromcompany->address) {
 			$line1 .= ($line1 ? " - " : "").str_replace("\n", ", ", $fromcompany->address);
 		}
 		// Zip code
-		if ($fromcompany->zip)
-		{
+		if ($fromcompany->zip) {
 			$line1 .= ($line1 ? " - " : "").$fromcompany->zip;
 		}
 		// Town
-		if ($fromcompany->town)
-		{
+		if ($fromcompany->town) {
 			$line1 .= ($line1 ? " " : "").$fromcompany->town;
 		}
 		// Country
-		if ($fromcompany->country)
-		{
+		if ($fromcompany->country) {
 			$line1 .= ($line1 ? ", " : "").$fromcompany->country;
 		}
 		// Phone
-		if ($fromcompany->phone)
-		{
+		if ($fromcompany->phone) {
 			$line2 .= ($line2 ? " - " : "").$outputlangs->transnoentities("Phone").": ".$fromcompany->phone;
 		}
 		// Fax
-		if ($fromcompany->fax)
-		{
+		if ($fromcompany->fax) {
 			$line2 .= ($line2 ? " - " : "").$outputlangs->transnoentities("Fax").": ".$fromcompany->fax;
 		}
 
 		// URL
-		if ($fromcompany->url)
-		{
+		if ($fromcompany->url) {
 			$line2 .= ($line2 ? " - " : "").$fromcompany->url;
 		}
 		// Email
-		if ($fromcompany->email)
-		{
+		if ($fromcompany->email) {
 			$line2 .= ($line2 ? " - " : "").$fromcompany->email;
 		}
 	}
-	if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE'))
-	{
+	if ($showdetails == 2 || $showdetails == 3 || ($fromcompany->country_code == 'DE')) {
 		// Managers
-		if ($fromcompany->managers)
-		{
+		if ($fromcompany->managers) {
 			$line2 .= ($line2 ? " - " : "").$fromcompany->managers;
 		}
 	}
 
 	// Line 3 of company infos
 	// Juridical status
-	if ($fromcompany->forme_juridique_code)
-	{
+	if ($fromcompany->forme_juridique_code) {
 		$line3 .= ($line3 ? " - " : "").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
 	}
 	// Capital
-	if ($fromcompany->capital)
-	{
+	if ($fromcompany->capital) {
 		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
-		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) $line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
-		else $line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", $tmpamounttoshow, $outputlangs);
+		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) {
+			$line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
+		} else {
+			$line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", $tmpamounttoshow, $outputlangs);
+		}
 	}
 	// Prof Id 1
-	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
-	{
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2)) {
 		$field = $outputlangs->transcountrynoentities("ProfId1", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line3 .= ($line3 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof1);
 	}
 	// Prof Id 2
-	if ($fromcompany->idprof2)
-	{
+	if ($fromcompany->idprof2) {
 		$field = $outputlangs->transcountrynoentities("ProfId2", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line3 .= ($line3 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof2);
 	}
 
 	// Line 4 of company infos
 	// Prof Id 3
-	if ($fromcompany->idprof3)
-	{
+	if ($fromcompany->idprof3) {
 		$field = $outputlangs->transcountrynoentities("ProfId3", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof3);
 	}
 	// Prof Id 4
-	if ($fromcompany->idprof4)
-	{
+	if ($fromcompany->idprof4) {
 		$field = $outputlangs->transcountrynoentities("ProfId4", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof4);
 	}
 	// Prof Id 5
-	if ($fromcompany->idprof5)
-	{
+	if ($fromcompany->idprof5) {
 		$field = $outputlangs->transcountrynoentities("ProfId5", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
 	}
 	// Prof Id 6
-	if ($fromcompany->idprof6)
-	{
+	if ($fromcompany->idprof6) {
 		$field = $outputlangs->transcountrynoentities("ProfId6", $fromcompany->country_code);
-		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		if (preg_match('/\((.*)\)/i', $field, $reg)) {
+			$field = $reg[1];
+		}
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
 	}
 	// IntraCommunautary VAT
-	if ($fromcompany->tva_intra != '')
-	{
+	if ($fromcompany->tva_intra != '') {
 		$line4 .= ($line4 ? " - " : "").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
 	}
 
@@ -1041,11 +1083,9 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 
 	// The start of the bottom of this page footer is positioned according to # of lines
 	$freetextheight = 0;
-	if ($line)	// Free text
-	{
+	if ($line) {	// Free text
 		//$line="sample text<br>\nfd<strong>sf</strong>sdf<br>\nghfghg<br>";
-		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
-		{
+		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
 			$width = 20000; $align = 'L'; // By default, ask a manual break: We use a large value 20000, to not have automatic wrap. This make user understand, he need to add CR on its text.
 			if (!empty($conf->global->MAIN_USE_AUTOWRAP_ON_FREETEXT)) {
 				$width = 200; $align = 'C';
@@ -1060,11 +1100,9 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	$marginwithfooter = $marge_basse + $freetextheight + (!empty($line1) ? 3 : 0) + (!empty($line2) ? 3 : 0) + (!empty($line3) ? 3 : 0) + (!empty($line4) ? 3 : 0);
 	$posy = $marginwithfooter + 0;
 
-	if ($line)	// Free text
-	{
+	if ($line) {	// Free text
 		$pdf->SetXY($dims['lm'], -$posy);
-		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))   // by default
-		{
+		if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {   // by default
 			$pdf->MultiCell(0, 3, $line, 0, $align, 0);
 		} else {
 			$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
@@ -1076,8 +1114,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 	$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);
 	$posy--;
 
-	if (!empty($line1))
-	{
+	if (!empty($line1)) {
 		$pdf->SetFont('', 'B', 7);
 		$pdf->SetXY($dims['lm'], -$posy);
 		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line1, 0, 'C', 0);
@@ -1085,8 +1122,7 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$pdf->SetFont('', '', 7);
 	}
 
-	if (!empty($line2))
-	{
+	if (!empty($line2)) {
 		$pdf->SetFont('', 'B', 7);
 		$pdf->SetXY($dims['lm'], -$posy);
 		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line2, 0, 'C', 0);
@@ -1094,22 +1130,19 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$pdf->SetFont('', '', 7);
 	}
 
-	if (!empty($line3))
-	{
+	if (!empty($line3)) {
 		$pdf->SetXY($dims['lm'], -$posy);
 		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line3, 0, 'C', 0);
 	}
 
-	if (!empty($line4))
-	{
+	if (!empty($line4)) {
 		$posy -= 3;
 		$pdf->SetXY($dims['lm'], -$posy);
 		$pdf->MultiCell($dims['wk'] - $dims['rm'] - $dims['lm'], 2, $line4, 0, 'C', 0);
 	}
 
 	// Show page nb only on iso languages (so default Helvetica font)
-	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica')
-	{
+	if (strtolower(pdf_getPDFFont($outputlangs)) == 'helvetica') {
 		$pdf->SetXY($dims['wk'] - $dims['rm'] - 15, -$posy);
 		//print 'xxx'.$pdf->PageNo().'-'.$pdf->getAliasNbPages().'-'.$pdf->getAliasNumPage();exit;
 		$pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
@@ -1135,13 +1168,10 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 function pdf_writeLinkedObjects(&$pdf, $object, $outputlangs, $posx, $posy, $w, $h, $align, $default_font_size)
 {
 	$linkedobjects = pdf_getLinkedObjects($object, $outputlangs);
-	if (!empty($linkedobjects))
-	{
-		foreach ($linkedobjects as $linkedobject)
-		{
+	if (!empty($linkedobjects)) {
+		foreach ($linkedobjects as $linkedobject) {
 			$reftoshow = $linkedobject["ref_title"].' : '.$linkedobject["ref_value"];
-			if (!empty($linkedobject["date_value"]))
-			{
+			if (!empty($linkedobject["date_value"])) {
 				$reftoshow .= ' / '.$linkedobject["date_value"];
 			}
 
@@ -1178,18 +1208,20 @@ function pdf_writelinedesc(&$pdf, $object, $i, $outputlangs, $w, $h, $posx, $pos
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = empty($object->lines[$i]->special_code) ? '' : $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('pdf'=>$pdf, 'i'=>$i, 'outputlangs'=>$outputlangs, 'w'=>$w, 'h'=>$h, 'posx'=>$posx, 'posy'=>$posy, 'hideref'=>$hideref, 'hidedesc'=>$hidedesc, 'issupplierline'=>$issupplierline, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_writelinedesc', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		$labelproductservice = pdf_getlinedesc($object, $i, $outputlangs, $hideref, $hidedesc, $issupplierline);
 
 		//var_dump($labelproductservice);exit;
@@ -1229,8 +1261,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	$note = (!empty($object->lines[$i]->note) ? $object->lines[$i]->note : '');
 	$dbatch = (!empty($object->lines[$i]->detail_batch) ? $object->lines[$i]->detail_batch : false);
 
-	if ($issupplierline)
-	{
+	if ($issupplierline) {
 		include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 		$prodser = new ProductFournisseur($db);
 	} else {
@@ -1238,16 +1269,14 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		$prodser = new Product($db);
 
 		if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-		    include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+			include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
 		}
 	}
 
-	if ($idprod)
-	{
+	if ($idprod) {
 		$prodser->fetch($idprod);
 		// If a predefined product and multilang and on other lang, we renamed label with label translated
-		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang))
-		{
+		if (!empty($conf->global->MAIN_MULTILANGS) && ($outputlangs->defaultlang != $langs->defaultlang)) {
 			$translatealsoifmodified = (!empty($conf->global->MAIN_MULTILANG_TRANSLATE_EVEN_IF_MODIFIED)); // By default if value was modified manually, we keep it (no translation because we don't have it)
 
 			// TODO Instead of making a compare to see if param was modified, check that content contains reference translation. If yes, add the added part to the new translation
@@ -1269,11 +1298,15 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			} else {
 				$textwasmodified = ($desc == $prodser->description);
 			}
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified))  $desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["description"]) && ($textwasmodified || $translatealsoifmodified)) {
+				$desc = $prodser->multilangs[$outputlangs->defaultlang]["description"];
+			}
 
 			// Set note
 			$textwasmodified = ($note == $prodser->note);
-			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified))  $note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
+			if (!empty($prodser->multilangs[$outputlangs->defaultlang]["note"]) && ($textwasmodified || $translatealsoifmodified)) {
+				$note = $prodser->multilangs[$outputlangs->defaultlang]["note"];
+			}
 		}
 	} elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
 		if ($object->type == $object::TYPE_DEPOSIT) {
@@ -1299,34 +1332,30 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 	}
 
 	// Description long of product line
-	if (!empty($desc) && ($desc != $label))
-	{
-		if ($libelleproduitservice && empty($hidedesc))
-		{
+	if (!empty($desc) && ($desc != $label)) {
+		if ($libelleproduitservice && empty($hidedesc)) {
 			$libelleproduitservice .= '__N__';
 		}
 
-		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except)
-		{
+		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
-		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except)
-		{
+		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
 			// Add date of deposit
-			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
-		} elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except)
-		{
+			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
+				$libelleproduitservice .= ' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
+			}
+		} elseif ($desc == '(EXCESS RECEIVED)' && $object->lines[$i]->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessReceived", $discount->ref_facture_source);
-		} elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except)
-		{
+		} elseif ($desc == '(EXCESS PAID)' && $object->lines[$i]->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromExcessPaid", $discount->ref_invoice_supplier_source);
@@ -1371,7 +1400,9 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		if ($issupplierline) {
 			if (empty($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES)) {  // Common case
 				$ref_prodserv = $prodser->ref; // Show local ref
-				if ($ref_supplier) $ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');
+				if ($ref_supplier) {
+					$ref_prodserv .= ($prodser->ref ? ' (' : '').$outputlangs->transnoentitiesnoconv("SupplierRef").' '.$ref_supplier.($prodser->ref ? ')' : '');
+				}
 			} elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 1) {
 				$ref_prodserv = $ref_supplier;
 			} elseif ($conf->global->PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES == 2) {
@@ -1381,69 +1412,68 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			$ref_prodserv = $prodser->ref; // Show local ref only
 
 			if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
-                $productCustomerPriceStatic = new Productcustomerprice($db);
-			    $filter = array('fk_product' => $idprod, 'fk_soc' => $object->socid);
+				$productCustomerPriceStatic = new Productcustomerprice($db);
+				$filter = array('fk_product' => $idprod, 'fk_soc' => $object->socid);
 
-			    $nbCustomerPrices = $productCustomerPriceStatic->fetch_all('', '', 1, 0, $filter);
+				$nbCustomerPrices = $productCustomerPriceStatic->fetch_all('', '', 1, 0, $filter);
 
-			    if ($nbCustomerPrices > 0) {
-			        $productCustomerPrice = $productCustomerPriceStatic->lines[0];
+				if ($nbCustomerPrices > 0) {
+					$productCustomerPrice = $productCustomerPriceStatic->lines[0];
 
-			        if (! empty($productCustomerPrice->ref_customer)) {
-			            switch ($conf->global->PRODUIT_CUSTOMER_PRICES_PDF_REF_MODE) {
-			                case 1:
-			                    $ref_prodserv = $productCustomerPrice->ref_customer;
-			                    break;
+					if (! empty($productCustomerPrice->ref_customer)) {
+						switch ($conf->global->PRODUIT_CUSTOMER_PRICES_PDF_REF_MODE) {
+							case 1:
+								$ref_prodserv = $productCustomerPrice->ref_customer;
+								break;
 
-			                case 2:
-			                    $ref_prodserv = $productCustomerPrice->ref_customer . ' (' . $outputlangs->transnoentitiesnoconv('InternalRef') . ' ' . $ref_prodserv . ')';
-			                    break;
+							case 2:
+								$ref_prodserv = $productCustomerPrice->ref_customer . ' (' . $outputlangs->transnoentitiesnoconv('InternalRef') . ' ' . $ref_prodserv . ')';
+								break;
 
-			                default:
-			                    $ref_prodserv = $ref_prodserv . ' (' . $outputlangs->transnoentitiesnoconv('RefCustomer') . ' ' . $productCustomerPrice->ref_customer . ')';
-			            }
-			        }
-			    }
+							default:
+								$ref_prodserv = $ref_prodserv . ' (' . $outputlangs->transnoentitiesnoconv('RefCustomer') . ' ' . $productCustomerPrice->ref_customer . ')';
+						}
+					}
+				}
 			}
 		}
 
-		if (!empty($libelleproduitservice) && !empty($ref_prodserv)) $ref_prodserv .= " - ";
+		if (!empty($libelleproduitservice) && !empty($ref_prodserv)) {
+			$ref_prodserv .= " - ";
+		}
 	}
 
-	if (!empty($ref_prodserv) && !empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) { $ref_prodserv = '<b>'.$ref_prodserv.'</b>'; }
+	if (!empty($ref_prodserv) && !empty($conf->global->PDF_BOLD_PRODUCT_REF_AND_PERIOD)) {
+		$ref_prodserv = '<b>'.$ref_prodserv.'</b>';
+	}
 	$libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;
 
 	// Add an additional description for the category products
-	if (!empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && !empty($conf->categorie->enabled))
-	{
+	if (!empty($conf->global->CATEGORY_ADD_DESC_INTO_DOC) && $idprod && !empty($conf->categorie->enabled)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$categstatic = new Categorie($db);
 		// recovering the list of all the categories linked to product
 		$tblcateg = $categstatic->containing($idprod, Categorie::TYPE_PRODUCT);
-		foreach ($tblcateg as $cate)
-		{
+		foreach ($tblcateg as $cate) {
 			// Adding the descriptions if they are filled
 			$desccateg = $cate->description;
-			if ($desccateg)
+			if ($desccateg) {
 				$libelleproduitservice .= '__N__'.$desccateg;
+			}
 		}
 	}
 
-	if (!empty($object->lines[$i]->date_start) || !empty($object->lines[$i]->date_end))
-	{
+	if (!empty($object->lines[$i]->date_start) || !empty($object->lines[$i]->date_end)) {
 		$format = 'day';
 		$period = '';
 		// Show duration if exists
-		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end)
-		{
+		if ($object->lines[$i]->date_start && $object->lines[$i]->date_end) {
 			$period = '('.$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs), dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
 		}
-		if ($object->lines[$i]->date_start && !$object->lines[$i]->date_end)
-		{
+		if ($object->lines[$i]->date_start && !$object->lines[$i]->date_end) {
 			$period = '('.$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($object->lines[$i]->date_start, $format, false, $outputlangs)).')';
 		}
-		if (!$object->lines[$i]->date_start && $object->lines[$i]->date_end)
-		{
+		if (!$object->lines[$i]->date_start && $object->lines[$i]->date_end) {
 			$period = '('.$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($object->lines[$i]->date_end, $format, false, $outputlangs)).')';
 		}
 		//print '>'.$outputlangs->charset_output.','.$period;
@@ -1455,23 +1485,30 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		//print $libelleproduitservice;
 	}
 
-	if ($dbatch)
-	{
+	if ($dbatch) {
 		$format = 'day';
-		foreach ($dbatch as $detail)
-		{
+		foreach ($dbatch as $detail) {
 			$dte = array();
-			if ($detail->eatby) $dte[] = $outputlangs->transnoentitiesnoconv('printEatby', dol_print_date($detail->eatby, $format, false, $outputlangs));
-			if ($detail->sellby) $dte[] = $outputlangs->transnoentitiesnoconv('printSellby', dol_print_date($detail->sellby, $format, false, $outputlangs));
-			if ($detail->batch) $dte[] = $outputlangs->transnoentitiesnoconv('printBatch', $detail->batch);
+			if ($detail->eatby) {
+				$dte[] = $outputlangs->transnoentitiesnoconv('printEatby', dol_print_date($detail->eatby, $format, false, $outputlangs));
+			}
+			if ($detail->sellby) {
+				$dte[] = $outputlangs->transnoentitiesnoconv('printSellby', dol_print_date($detail->sellby, $format, false, $outputlangs));
+			}
+			if ($detail->batch) {
+				$dte[] = $outputlangs->transnoentitiesnoconv('printBatch', $detail->batch);
+			}
 			$dte[] = $outputlangs->transnoentitiesnoconv('printQty', $detail->qty);
 			$libelleproduitservice .= "__N__  ".implode(" - ", $dte);
 		}
 	}
 
 	// Now we convert \n into br
-	if (dol_textishtml($libelleproduitservice)) $libelleproduitservice = preg_replace('/__N__/', '<br>', $libelleproduitservice);
-	else $libelleproduitservice = preg_replace('/__N__/', "\n", $libelleproduitservice);
+	if (dol_textishtml($libelleproduitservice)) {
+		$libelleproduitservice = preg_replace('/__N__/', '<br>', $libelleproduitservice);
+	} else {
+		$libelleproduitservice = preg_replace('/__N__/', "\n", $libelleproduitservice);
+	}
 	$libelleproduitservice = dol_htmlentitiesbr($libelleproduitservice, 1);
 
 	return $libelleproduitservice;
@@ -1493,17 +1530,17 @@ function pdf_getlinenum($object, $i, $outputlangs, $hidedetails = 0)
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlinenum', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		$result .= $hookmanager->resPrint;
 	}
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		$result .= dol_htmlentitiesbr($object->lines[$i]->num);
 	}
 	return $result;
@@ -1526,17 +1563,17 @@ function pdf_getlineref($object, $i, $outputlangs, $hidedetails = 0)
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		$result .= $hookmanager->resPrint;
 	}
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		$result .= dol_htmlentitiesbr($object->lines[$i]->product_ref);
 	}
 	return $result;
@@ -1558,17 +1595,17 @@ function pdf_getlineref_supplier($object, $i, $outputlangs, $hidedetails = 0)
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineref_supplier', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		$result .= $hookmanager->resPrint;
 	}
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		$result .= dol_htmlentitiesbr($object->lines[$i]->ref_supplier);
 	}
 	return $result;
@@ -1590,38 +1627,41 @@ function pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails = 0)
 	$result = '';
 	$reshook = 0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduce this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlinevatrate', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1)
-		{
+	if (empty($reshook)) {
+		if (empty($hidedetails) || $hidedetails > 1) {
 			$tmpresult = '';
 
 			$tmpresult .= vatrate($object->lines[$i]->tva_tx, 0, $object->lines[$i]->info_bits, -1);
-			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX))
-			{
-				if ($object->lines[$i]->total_localtax1 != 0)
-				{
-					if (preg_replace('/[\s0%]/', '', $tmpresult)) $tmpresult .= '/';
-					else $tmpresult = '';
+			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_SECOND_TAX)) {
+				if ($object->lines[$i]->total_localtax1 != 0) {
+					if (preg_replace('/[\s0%]/', '', $tmpresult)) {
+						$tmpresult .= '/';
+					} else {
+						$tmpresult = '';
+					}
 					$tmpresult .= vatrate(abs($object->lines[$i]->localtax1_tx), 0);
 				}
 			}
-			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX))
-			{
-				if ($object->lines[$i]->total_localtax2 != 0)
-				{
-					if (preg_replace('/[\s0%]/', '', $tmpresult)) $tmpresult .= '/';
-					else $tmpresult = '';
+			if (empty($conf->global->MAIN_PDF_MAIN_HIDE_THIRD_TAX)) {
+				if ($object->lines[$i]->total_localtax2 != 0) {
+					if (preg_replace('/[\s0%]/', '', $tmpresult)) {
+						$tmpresult .= '/';
+					} else {
+						$tmpresult = '';
+					}
 					$tmpresult .= vatrate(abs($object->lines[$i]->localtax2_tx), 0);
 				}
 			}
@@ -1647,25 +1687,28 @@ function pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails = 0)
 	global $conf, $hookmanager;
 
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		$sign = -1;
+	}
 
 	$result = '';
 	$reshook = 0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupexcltax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1)
-		{
+	if (empty($reshook)) {
+		if (empty($hidedetails) || $hidedetails > 1) {
 			$subprice = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_subprice : $object->lines[$i]->subprice);
 			$result .= price($sign * $subprice, 0, $outputlangs);
 		}
@@ -1687,24 +1730,30 @@ function pdf_getlineupwithtax($object, $i, $outputlangs, $hidedetails = 0)
 	global $hookmanager, $conf;
 
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		$sign = -1;
+	}
 
 	$result = '';
 	$reshook = 0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineupwithtax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice) * ($object->lines[$i]->tva_tx) / 100), 0, $outputlangs);
+	if (empty($reshook)) {
+		if (empty($hidedetails) || $hidedetails > 1) {
+			$result .= price($sign * (($object->lines[$i]->subprice) + ($object->lines[$i]->subprice) * ($object->lines[$i]->tva_tx) / 100), 0, $outputlangs);
+		}
 	}
 	return $result;
 }
@@ -1725,20 +1774,26 @@ function pdf_getlineqty($object, $i, $outputlangs, $hidedetails = 0)
 	$result = '';
 	$reshook = 0;
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result = $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result = $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-		if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty;
+	if (empty($reshook)) {
+		if ($object->lines[$i]->special_code == 3) {
+			return '';
+		}
+		if (empty($hidedetails) || $hidedetails > 1) {
+			$result .= $object->lines[$i]->qty;
+		}
 	}
 	return $result;
 }
@@ -1759,20 +1814,26 @@ function pdf_getlineqty_asked($object, $i, $outputlangs, $hidedetails = 0)
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_asked', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-		if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_asked;
+	if (empty($reshook)) {
+		if ($object->lines[$i]->special_code == 3) {
+			return '';
+		}
+		if (empty($hidedetails) || $hidedetails > 1) {
+			$result .= $object->lines[$i]->qty_asked;
+		}
 	}
 	return $result;
 }
@@ -1793,20 +1854,26 @@ function pdf_getlineqty_shipped($object, $i, $outputlangs, $hidedetails = 0)
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_shipped', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-		if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result .= $object->lines[$i]->qty_shipped;
+	if (empty($reshook)) {
+		if ($object->lines[$i]->special_code == 3) {
+			return '';
+		}
+		if (empty($hidedetails) || $hidedetails > 1) {
+			$result .= $object->lines[$i]->qty_shipped;
+		}
 	}
 	return $result;
 }
@@ -1827,20 +1894,26 @@ function pdf_getlineqty_keeptoship($object, $i, $outputlangs, $hidedetails = 0)
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineqty_keeptoship', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-		if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result .= ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+	if (empty($reshook)) {
+		if ($object->lines[$i]->special_code == 3) {
+			return '';
+		}
+		if (empty($hidedetails) || $hidedetails > 1) {
+			$result .= ($object->lines[$i]->qty_asked - $object->lines[$i]->qty_shipped);
+		}
 	}
 	return $result;
 }
@@ -1862,8 +1935,7 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
 		if (!empty($object->lines[$i]->fk_parent_line)) {
 			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
@@ -1877,11 +1949,14 @@ function pdf_getlineunit($object, $i, $outputlangs, $hidedetails = 0, $hookmanag
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineunit', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-		if (empty($hidedetails) || $hidedetails > 1) $result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+	if (empty($reshook)) {
+		if (empty($hidedetails) || $hidedetails > 1) {
+			$result .= $langs->transnoentitiesnoconv($object->lines[$i]->getLabelOfUnit('short'));
+		}
 	}
 	return $result;
 }
@@ -1905,20 +1980,26 @@ function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineremisepercent', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-		if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1) $result .= dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);
+	if (empty($reshook)) {
+		if ($object->lines[$i]->special_code == 3) {
+			return '';
+		}
+		if (empty($hidedetails) || $hidedetails > 1) {
+			$result .= dol_print_reduction($object->lines[$i]->remise_percent, $outputlangs);
+		}
 	}
 	return $result;
 }
@@ -1935,37 +2016,42 @@ function pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails = 0)
  */
 function pdf_getlineprogress($object, $i, $outputlangs, $hidedetails = 0, $hookmanager = null)
 {
-	if (empty($hookmanager)) global $hookmanager;
+	if (empty($hookmanager)) {
+		global $hookmanager;
+	}
 	global $conf;
 
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i' => $i, 'outputlangs' => $outputlangs, 'hidedetails' => $hidedetails, 'special_code' => $special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlineprogress', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) return $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			return $hookmanager->resPrint;
+		}
 	}
-	if (empty($reshook))
-	{
-			if ($object->lines[$i]->special_code == 3) return '';
-		if (empty($hidedetails) || $hidedetails > 1)
-		{
-			if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF)
-			{
+	if (empty($reshook)) {
+		if ($object->lines[$i]->special_code == 3) {
+			return '';
+		}
+		if (empty($hidedetails) || $hidedetails > 1) {
+			if ($conf->global->SITUATION_DISPLAY_DIFF_ON_PDF) {
 				$prev_progress = 0;
-				if (method_exists($object, 'get_prev_progress'))
-				{
-			 		$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+				if (method_exists($object, 'get_prev_progress')) {
+					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 				}
-			 	$result = ($object->lines[$i]->situation_percent - $prev_progress).'%';
-			} else $result = $object->lines[$i]->situation_percent.'%';
-	  	}
+				$result = ($object->lines[$i]->situation_percent - $prev_progress).'%';
+			} else {
+				$result = $object->lines[$i]->situation_percent.'%';
+			}
+		}
 	}
 	return $result;
 }
@@ -1984,37 +2070,36 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
 	global $conf, $hookmanager;
 
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		$sign = -1;
+	}
 
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code, 'sign'=>$sign);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalexcltax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if ($object->lines[$i]->special_code == 3)
-		{
-			$result .= $outputlangs->transnoentities("Option");
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
 		}
-		elseif (empty($hidedetails) || $hidedetails > 1)
-		{
+	}
+	if (empty($reshook)) {
+		if ($object->lines[$i]->special_code == 3) {
+			$result .= $outputlangs->transnoentities("Option");
+		} elseif (empty($hidedetails) || $hidedetails > 1) {
 			$total_ht = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
-			if (!empty($object->lines[$i]->situation_percent) && $object->lines[$i]->situation_percent > 0)
-			{
+			if (!empty($object->lines[$i]->situation_percent) && $object->lines[$i]->situation_percent > 0) {
 				// TODO Remove this. The total should be saved correctly in database instead of being modified here.
 				$prev_progress = 0;
 				$progress = 1;
-				if (method_exists($object->lines[$i], 'get_prev_progress'))
-				{
+				if (method_exists($object->lines[$i], 'get_prev_progress')) {
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
 				}
@@ -2041,37 +2126,36 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 	global $hookmanager, $conf;
 
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		$sign = -1;
+	}
 
 	$reshook = 0;
 	$result = '';
 	//if (is_object($hookmanager) && ( (isset($object->lines[$i]->product_type) && $object->lines[$i]->product_type == 9 && ! empty($object->lines[$i]->special_code)) || ! empty($object->lines[$i]->fk_parent_line) ) )
-	if (is_object($hookmanager))   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
-	{
+	if (is_object($hookmanager)) {   // Old code is commented on preceding line. Reproduct this test in the pdf_xxx function if you don't want your hook to run
 		$special_code = $object->lines[$i]->special_code;
-		if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		if (!empty($object->lines[$i]->fk_parent_line)) {
+			$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+		}
 		$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 		$action = '';
 		$reshook = $hookmanager->executeHooks('pdf_getlinetotalwithtax', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-		if (!empty($hookmanager->resPrint)) $result .= $hookmanager->resPrint;
-	}
-	if (empty($reshook))
-	{
-		if ($object->lines[$i]->special_code == 3)
-		{
-			$result .= $outputlangs->transnoentities("Option");
+		if (!empty($hookmanager->resPrint)) {
+			$result .= $hookmanager->resPrint;
 		}
-		elseif (empty($hidedetails) || $hidedetails > 1)
-		{
+	}
+	if (empty($reshook)) {
+		if ($object->lines[$i]->special_code == 3) {
+			$result .= $outputlangs->transnoentities("Option");
+		} elseif (empty($hidedetails) || $hidedetails > 1) {
 			$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);
-			if ($object->lines[$i]->situation_percent > 0)
-			{
+			if ($object->lines[$i]->situation_percent > 0) {
 				// TODO Remove this. The total should be saved correctly in database instead of being modified here.
 				$prev_progress = 0;
 				$progress = 1;
-				if (method_exists($object->lines[$i], 'get_prev_progress'))
-				{
+				if (method_exists($object->lines[$i], 'get_prev_progress')) {
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
 					$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
 				}
@@ -2101,26 +2185,22 @@ function pdf_getTotalQty($object, $type, $outputlangs)
 	$nblines = count($object->lines);
 
 	// Loop on each lines
-	for ($i = 0; $i < $nblines; $i++)
-	{
-		if ($object->lines[$i]->special_code != 3)
-		{
-			if ($type == 'all')
-			{
+	for ($i = 0; $i < $nblines; $i++) {
+		if ($object->lines[$i]->special_code != 3) {
+			if ($type == 'all') {
 				$total += $object->lines[$i]->qty;
-			} elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line)))
-			{
+			} elseif ($type == 9 && is_object($hookmanager) && (($object->lines[$i]->product_type == 9 && !empty($object->lines[$i]->special_code)) || !empty($object->lines[$i]->fk_parent_line))) {
 				$special_code = $object->lines[$i]->special_code;
-				if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+				if (!empty($object->lines[$i]->fk_parent_line)) {
+					$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+				}
 				$parameters = array('i'=>$i, 'outputlangs'=>$outputlangs, 'hidedetails'=>$hidedetails, 'special_code'=>$special_code);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('pdf_getTotalQty', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 				return $hookmanager->resPrint;
-			} elseif ($type == 0 && $object->lines[$i]->product_type == 0)
-			{
+			} elseif ($type == 0 && $object->lines[$i]->product_type == 0) {
 				$total += $object->lines[$i]->qty;
-			} elseif ($type == 1 && $object->lines[$i]->product_type == 1)
-			{
+			} elseif ($type == 1 && $object->lines[$i]->product_type == 1) {
 				$total += $object->lines[$i]->qty;
 			}
 		}
@@ -2145,81 +2225,73 @@ function pdf_getLinkedObjects($object, $outputlangs)
 
 	$object->fetchObjectLinked();
 
-	foreach ($object->linkedObjects as $objecttype => $objects)
-	{
-		if ($objecttype == 'facture')
-		{
+	foreach ($object->linkedObjects as $objecttype => $objects) {
+		if ($objecttype == 'facture') {
 			// For invoice, we don't want to have a reference line on document. Image we are using recuring invoice, we will have a line longer than document width.
-		} elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal')
-		{
+		} elseif ($objecttype == 'propal' || $objecttype == 'supplier_proposal') {
 			$outputlangs->load('propal');
 
-			foreach ($objects as $elementobject)
-			{
+			foreach ($objects as $elementobject) {
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefProposal");
 				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DatePropal");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
-		} elseif ($objecttype == 'commande' || $objecttype == 'supplier_order')
-		{
+		} elseif ($objecttype == 'commande' || $objecttype == 'supplier_order') {
 			$outputlangs->load('orders');
-			foreach ($objects as $elementobject)
-			{
+			foreach ($objects as $elementobject) {
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
 				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
-		} elseif ($objecttype == 'contrat')
-		{
+		} elseif ($objecttype == 'contrat') {
 			$outputlangs->load('contracts');
-			foreach ($objects as $elementobject)
-			{
+			foreach ($objects as $elementobject) {
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefContract");
 				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateContract");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date_contrat, 'day', '', $outputlangs);
 			}
-		} elseif ($objecttype == 'fichinter')
-		{
+		} elseif ($objecttype == 'fichinter') {
 			$outputlangs->load('interventions');
-			foreach ($objects as $elementobject)
-			{
+			foreach ($objects as $elementobject) {
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("InterRef");
 				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref);
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("InterDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->datec, 'day', '', $outputlangs);
 			}
-		} elseif ($objecttype == 'shipping')
-		{
+		} elseif ($objecttype == 'shipping') {
 			$outputlangs->loadLangs(array("orders", "sendings"));
 
-			foreach ($objects as $x => $elementobject)
-			{
+			foreach ($objects as $x => $elementobject) {
 				$order = null;
 				// We concat this record info into fields xxx_value. title is overwrote.
-				if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
-				{
+				if (empty($object->linkedObjects['commande']) && $object->element != 'commande') {	// There is not already a link to order and object is not the order, so we show also info with order
 					$elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
 					if (!empty($elementobject->linkedObjectsIds['commande'])) {
 						include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 						$order = new Commande($db);
 						$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
-						if ($ret < 1) { $order = null; }
+						if ($ret < 1) {
+							$order = null;
+						}
 					}
 				}
-				if (!is_object($order))
-				{
+				if (!is_object($order)) {
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
-					if (!empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] .= ' / ';
+					if (!empty($linkedobjects[$objecttype]['ref_value'])) {
+						$linkedobjects[$objecttype]['ref_value'] .= ' / ';
+					}
 					$linkedobjects[$objecttype]['ref_value'] .= $outputlangs->transnoentities($elementobject->ref);
 					//$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("DateShipment");
 					//if (! empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'].=' / ';
 					//$linkedobjects[$objecttype]['date_value'].= dol_print_date($elementobject->date_delivery,'day','',$outputlangs);
 				} else {
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder").' / '.$outputlangs->transnoentities("RefSending");
-					if (empty($linkedobjects[$objecttype]['ref_value'])) $linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
+					if (empty($linkedobjects[$objecttype]['ref_value'])) {
+						$linkedobjects[$objecttype]['ref_value'] = $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : '');
+					}
 					$linkedobjects[$objecttype]['ref_value'] .= ' / '.$outputlangs->transnoentities($elementobject->ref);
 					//$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate") . ($elementobject->date_delivery ? ' / ' . $outputlangs->transnoentities("DateShipment") : '');
 					//if (empty($linkedobjects[$objecttype]['date_value'])) $linkedobjects[$objecttype]['date_value'] = dol_print_date($order->date,'day','',$outputlangs);
@@ -2230,12 +2302,13 @@ function pdf_getLinkedObjects($object, $outputlangs)
 	}
 
 	// For add external linked objects
-	if (is_object($hookmanager))
-	{
+	if (is_object($hookmanager)) {
 		$parameters = array('linkedobjects' => $linkedobjects, 'outputlangs'=>$outputlangs);
 		$action = '';
 		$hookmanager->executeHooks('pdf_getLinkedObjects', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-		if (!empty($hookmanager->resArray)) $linkedobjects = $hookmanager->resArray;
+		if (!empty($hookmanager->resArray)) {
+			$linkedobjects = $hookmanager->resArray;
+		}
 	}
 
 	return $linkedobjects;
@@ -2256,11 +2329,9 @@ function pdf_getSizeForImage($realpath)
 	$maxheight = (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT) ? 32 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_HEIGHT);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 	$tmp = dol_getImageSize($realpath);
-	if ($tmp['height'])
-	{
+	if ($tmp['height']) {
 		$width = (int) round($maxheight * $tmp['width'] / $tmp['height']); // I try to use maxheight
-		if ($width > $maxwidth)	// Pb with maxheight, so i use maxwidth
-		{
+		if ($width > $maxwidth) {	// Pb with maxheight, so i use maxwidth
 			$width = $maxwidth;
 			$height = (int) round($maxwidth * $tmp['height'] / $tmp['width']);
 		} else // No pb with maxheight
@@ -2284,15 +2355,17 @@ function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails =
 {
 	global $conf, $hookmanager;
 	$sign = 1;
-	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
-	if ($object->lines[$i]->special_code == 3)
-	{
+	if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+		$sign = -1;
+	}
+	if ($object->lines[$i]->special_code == 3) {
 		return $outputlangs->transnoentities("Option");
 	} else {
-		if (is_object($hookmanager))
-		{
+		if (is_object($hookmanager)) {
 			$special_code = $object->lines[$i]->special_code;
-			if (!empty($object->lines[$i]->fk_parent_line)) $special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+			if (!empty($object->lines[$i]->fk_parent_line)) {
+				$special_code = $object->getSpecialCode($object->lines[$i]->fk_parent_line);
+			}
 
 			$parameters = array(
 				'i'=>$i,
@@ -2303,13 +2376,14 @@ function pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, $hidedetails =
 
 			$action = '';
 
-			if ($hookmanager->executeHooks('getlinetotalremise', $parameters, $object, $action) > 0)
-			{
+			if ($hookmanager->executeHooks('getlinetotalremise', $parameters, $object, $action) > 0) {
 				return $hookmanager->resPrint; // Note that $action and $object may have been modified by some hooks
 			}
 		}
 
-		if (empty($hidedetails) || $hidedetails > 1) return $sign * (($object->lines[$i]->subprice * $object->lines[$i]->qty) - $object->lines[$i]->total_ht);
+		if (empty($hidedetails) || $hidedetails > 1) {
+			return $sign * (($object->lines[$i]->subprice * $object->lines[$i]->qty) - $object->lines[$i]->total_ht);
+		}
 	}
 	return '';
 }
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index 75bf914b964..bc81ee2bfbd 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -85,14 +85,22 @@ function prelevement_prepare_head(BonPrelevement $object)
 function prelevement_check_config($type = 'direct-debit')
 {
 	global $conf, $db;
-	if ($type == 'bank-transfer'){
-		if (empty($conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT)) return -1;
+	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 {
-		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;
 }
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 98311d093cd..3a73f47a6a0 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -90,13 +90,15 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	$result = array();
 
 	// Clean parameters
-	if (empty($info_bits)) $info_bits = 0;
-	if (empty($txtva)) $txtva = 0;
-	if (empty($seller) || !is_object($seller))
-	{
+	if (empty($info_bits)) {
+		$info_bits = 0;
+	}
+	if (empty($txtva)) {
+		$txtva = 0;
+	}
+	if (empty($seller) || !is_object($seller)) {
 		dol_syslog("Price.lib::calcul_price_total Warning: function is called with parameter seller that is missing", LOG_WARNING);
-		if (!is_object($mysoc))	// mysoc may be not defined (during migration process)
-		{
+		if (!is_object($mysoc)) {	// mysoc may be not defined (during migration process)
 			$mysoc = new Societe($db);
 			$mysoc->setMysoc($conf);
 		}
@@ -116,11 +118,19 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 
 	$countryid = $seller->country_id;
 
-	if (is_numeric($uselocaltax1_rate)) $uselocaltax1_rate = (float) $uselocaltax1_rate;
-	if (is_numeric($uselocaltax2_rate)) $uselocaltax2_rate = (float) $uselocaltax2_rate;
+	if (is_numeric($uselocaltax1_rate)) {
+		$uselocaltax1_rate = (float) $uselocaltax1_rate;
+	}
+	if (is_numeric($uselocaltax2_rate)) {
+		$uselocaltax2_rate = (float) $uselocaltax2_rate;
+	}
 
-	if ($uselocaltax1_rate < 0) $uselocaltax1_rate = $seller->localtax1_assuj;
-	if ($uselocaltax2_rate < 0) $uselocaltax2_rate = $seller->localtax2_assuj;
+	if ($uselocaltax1_rate < 0) {
+		$uselocaltax1_rate = $seller->localtax1_assuj;
+	}
+	if ($uselocaltax2_rate < 0) {
+		$uselocaltax2_rate = $seller->localtax2_assuj;
+	}
 
 	//var_dump($uselocaltax1_rate.' - '.$uselocaltax2_rate);
 	dol_syslog('Price.lib::calcul_price_total qty='.$qty.' pu='.$pu.' remise_percent_ligne='.$remise_percent_ligne.' txtva='.$txtva.' uselocaltax1_rate='.$uselocaltax1_rate.' uselocaltax2_rate='.$uselocaltax2_rate.' remise_percent_global='.$remise_percent_global.' price_base_type='.$price_base_type.' type='.$type.' progress='.$progress);
@@ -144,33 +154,37 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 		$sql .= " WHERE cv.taux = ".$txtva;
 		$sql .= " AND cv.fk_pays = ".$countryid;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$localtax1_rate = (float) $obj->localtax1;		// Use float to force to get first numeric value when value is x:y:z
 				$localtax2_rate = (float) $obj->localtax2;		// Use float to force to get first numeric value when value is -19:-15:-9
 				$localtax1_type = $obj->localtax1_type;
 				$localtax2_type = $obj->localtax2_type;
 				//var_dump($localtax1_rate.' '.$localtax2_rate.' '.$localtax1_type.' '.$localtax2_type);
 			}
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 	}
 
 	// pu calculation from pu_devise if pu empty
 	if (empty($pu) && !empty($pu_devise)) {
-		if (!empty($multicurrency_tx)) $pu = $pu_devise / $multicurrency_tx;
-		else {
+		if (!empty($multicurrency_tx)) {
+			$pu = $pu_devise / $multicurrency_tx;
+		} else {
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (multicurrency_tx empty when pu_devise not) ', LOG_ERR);
 			return array();
 		}
 	}
-	if ($pu === '') $pu = 0;
+	if ($pu === '') {
+		$pu = 0;
+	}
 	// pu_devise calculation from pu
 	if (empty($pu_devise) && !empty($multicurrency_tx)) {
-		if (is_numeric($pu) && is_numeric($multicurrency_tx)) $pu_devise = $pu * $multicurrency_tx;
-		else {
+		if (is_numeric($pu) && is_numeric($multicurrency_tx)) {
+			$pu_devise = $pu * $multicurrency_tx;
+		} else {
 			dol_syslog('Price.lib::calcul_price_total function called with bad parameters combination (pu or multicurrency_tx are not numeric)', LOG_ERR);
 			return array();
 		}
@@ -182,13 +196,14 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	$tot_avec_remise       = $tot_avec_remise_ligne * (1 - ($remise_percent_global / 100));
 
 	// initialize result array
-	for ($i = 0; $i <= 15; $i++) $result[$i] = 0;
+	for ($i = 0; $i <= 15; $i++) {
+		$result[$i] = 0;
+	}
 
 	// if there's some localtax including vat, we calculate localtaxes (we will add later)
 
 	// if input unit price is 'HT', we need to have the totals with main VAT for a correct calculation
-	if ($price_base_type != 'TTC')
-	{
+	if ($price_base_type != 'TTC') {
 		$tot_sans_remise_wt = price2num($tot_sans_remise * (1 + ($txtva / 100)), 'MU');
 		$tot_avec_remise_wt = price2num($tot_avec_remise * (1 + ($txtva / 100)), 'MU');
 		$pu_wt = price2num($pu * (1 + ($txtva / 100)), 'MU');
@@ -207,22 +222,26 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$apply_tax = true;
 			break;
 		case '4':     // localtax on product
-			if ($type == 0) $apply_tax = true;
+			if ($type == 0) {
+				$apply_tax = true;
+			}
 			break;
 		case '6':     // localtax on service
-			if ($type == 1) $apply_tax = true;
+			if ($type == 1) {
+				$apply_tax = true;
+			}
 			break;
 	}
 
 	if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
-  		$localtaxes[0] += $result[14];
+		$result[14] = price2num(($tot_sans_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_sans_remise_wt, 'MT');
+		$localtaxes[0] += $result[14];
 
-  		$result[9] = price2num(($tot_avec_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
-  		$localtaxes[1] += $result[9];
+		$result[9] = price2num(($tot_avec_remise_wt * (1 + ($localtax1_rate / 100))) - $tot_avec_remise_wt, 'MT');
+		$localtaxes[1] += $result[9];
 
-  		$result[11] = price2num(($pu_wt * (1 + ($localtax1_rate / 100))) - $pu_wt, 'MU');
-  		$localtaxes[2] += $result[11];
+		$result[11] = price2num(($pu_wt * (1 + ($localtax1_rate / 100))) - $pu_wt, 'MU');
+		$localtaxes[2] += $result[11];
 	}
 
 	$apply_tax = false;
@@ -231,26 +250,29 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$apply_tax = true;
 			break;
 		case '4':     // localtax on product
-			if ($type == 0) $apply_tax = true;
+			if ($type == 0) {
+				$apply_tax = true;
+			}
 			break;
 		case '6':     // localtax on service
-			if ($type == 1) $apply_tax = true;
+			if ($type == 1) {
+				$apply_tax = true;
+			}
 			break;
 	}
 	if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
-  		$localtaxes[0] += $result[15];
+		$result[15] = price2num(($tot_sans_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_sans_remise_wt, 'MT');
+		$localtaxes[0] += $result[15];
 
-  		$result[10] = price2num(($tot_avec_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
-  		$localtaxes[1] += $result[10];
+		$result[10] = price2num(($tot_avec_remise_wt * (1 + ($localtax2_rate / 100))) - $tot_avec_remise_wt, 'MT');
+		$localtaxes[1] += $result[10];
 
-  		$result[12] = price2num(($pu_wt * (1 + ($localtax2_rate / 100))) - $pu_wt, 'MU');
-  		$localtaxes[2] += $result[12];
+		$result[12] = price2num(($pu_wt * (1 + ($localtax2_rate / 100))) - $pu_wt, 'MU');
+		$localtaxes[2] += $result[12];
 	}
 
 	//dol_syslog("price.lib::calcul_price_total $qty, $pu, $remise_percent_ligne, $txtva, $price_base_type $info_bits");
-	if ($price_base_type == 'HT')
-	{
+	if ($price_base_type == 'HT') {
 		// We work to define prices using the price without tax
 		$result[6] = price2num($tot_sans_remise, 'MT');
 		$result[8] = price2num($tot_sans_remise * (1 + ((($info_bits & 1) ? 0 : $txtva) / 100)) + $localtaxes[0], 'MT'); // Selon TVA NPR ou non
@@ -287,8 +309,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	// if there's some localtax without vat, we calculate localtaxes (we will add them at end)
 
 	//If input unit price is 'TTC', we need to have the totals without main VAT for a correct calculation
-	if ($price_base_type == 'TTC')
-	{
+	if ($price_base_type == 'TTC') {
 		$tot_sans_remise = price2num($tot_sans_remise / (1 + ($txtva / 100)), 'MU');
 		$tot_avec_remise = price2num($tot_avec_remise / (1 + ($txtva / 100)), 'MU');
 		$pu = price2num($pu / (1 + ($txtva / 100)), 'MU');
@@ -300,21 +321,25 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$apply_tax = true;
 			break;
 		case '3':     // localtax on product
-			if ($type == 0) $apply_tax = true;
+			if ($type == 0) {
+				$apply_tax = true;
+			}
 			break;
 		case '5':     // localtax on service
-			if ($type == 1) $apply_tax = true;
+			if ($type == 1) {
+				$apply_tax = true;
+			}
 			break;
 	}
 	if ($uselocaltax1_rate && $apply_tax) {
-  		$result[14] = price2num(($tot_sans_remise * (1 + ($localtax1_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax1 for total_ht_without_discount
-  		$result[8] += $result[14]; // total_ttc_without_discount + tax1
+		$result[14] = price2num(($tot_sans_remise * (1 + ($localtax1_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax1 for total_ht_without_discount
+		$result[8] += $result[14]; // total_ttc_without_discount + tax1
 
-  		$result[9] = price2num(($tot_avec_remise * (1 + ($localtax1_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax1 for total_ht
-  		$result[2] += $result[9]; // total_ttc + tax1
+		$result[9] = price2num(($tot_avec_remise * (1 + ($localtax1_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax1 for total_ht
+		$result[2] += $result[9]; // total_ttc + tax1
 
-  		$result[11] = price2num(($pu * (1 + ($localtax1_rate / 100))) - $pu, 'MU'); // amount tax1 for pu_ht
-  		$result[5] += $result[11]; // pu_ht + tax1
+		$result[11] = price2num(($pu * (1 + ($localtax1_rate / 100))) - $pu, 'MU'); // amount tax1 for pu_ht
+		$result[5] += $result[11]; // pu_ht + tax1
 	}
 
 	$apply_tax = false;
@@ -323,28 +348,30 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 			$apply_tax = true;
 			break;
 		case '3':     // localtax on product
-			if ($type == 0) $apply_tax = true;
+			if ($type == 0) {
+				$apply_tax = true;
+			}
 			break;
 		case '5':     // localtax on service
-			if ($type == 1) $apply_tax = true;
+			if ($type == 1) {
+				$apply_tax = true;
+			}
 			break;
 	}
 	if ($uselocaltax2_rate && $apply_tax) {
-  		$result[15] = price2num(($tot_sans_remise * (1 + ($localtax2_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax2 for total_ht_without_discount
-  		$result[8] += $result[15]; // total_ttc_without_discount + tax2
+		$result[15] = price2num(($tot_sans_remise * (1 + ($localtax2_rate / 100))) - $tot_sans_remise, 'MT'); // amount tax2 for total_ht_without_discount
+		$result[8] += $result[15]; // total_ttc_without_discount + tax2
 
-  		$result[10] = price2num(($tot_avec_remise * (1 + ($localtax2_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax2 for total_ht
-  		$result[2] += $result[10]; // total_ttc + tax2
+		$result[10] = price2num(($tot_avec_remise * (1 + ($localtax2_rate / 100))) - $tot_avec_remise, 'MT'); // amount tax2 for total_ht
+		$result[2] += $result[10]; // total_ttc + tax2
 
-  		$result[12] = price2num(($pu * (1 + ($localtax2_rate / 100))) - $pu, 'MU'); // amount tax2 for pu_ht
-  		$result[5] += $result[12]; // pu_ht + tax2
+		$result[12] = price2num(($pu * (1 + ($localtax2_rate / 100))) - $pu, 'MU'); // amount tax2 for pu_ht
+		$result[5] += $result[12]; // pu_ht + tax2
 	}
 
 	// If rounding is not using base 10 (rare)
-	if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT))
-	{
-		if ($price_base_type == 'HT')
-		{
+	if (!empty($conf->global->MAIN_ROUNDING_RULE_TOT)) {
+		if ($price_base_type == 'HT') {
 			$result[0] = round($result[0] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[1] = round($result[1] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
 			$result[9] = round($result[9] / $conf->global->MAIN_ROUNDING_RULE_TOT, 0) * $conf->global->MAIN_ROUNDING_RULE_TOT;
@@ -360,8 +387,7 @@ function calcul_price_total($qty, $pu, $remise_percent_ligne, $txtva, $uselocalt
 	}
 
 	// Multicurrency
-	if ($multicurrency_tx != 1)
-	{
+	if ($multicurrency_tx != 1) {
 		if ($multicurrency_code) {
 			$savMAIN_MAX_DECIMALS_UNIT = $conf->global->MAIN_MAX_DECIMALS_UNIT;
 			$savMAIN_MAX_DECIMALS_TOT = $conf->global->MAIN_MAX_DECIMALS_TOT;
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 9ce8d84d7e3..d5d52761140 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -38,7 +38,9 @@ function product_prepare_head($object)
 	$langs->load("products");
 
 	$label = $langs->trans('Product');
-	if ($object->isService()) $label = $langs->trans('Service');
+	if ($object->isService()) {
+		$label = $langs->trans('Service');
+	}
 
 	$h = 0;
 	$head = array();
@@ -48,20 +50,17 @@ function product_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (!empty($object->status))
-	{
+	if (!empty($object->status)) {
 		$head[$h][0] = DOL_URL_ROOT."/product/price.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("SellingPrices");
 		$head[$h][2] = 'price';
 		$h++;
 	}
 
-	if (!empty($object->status_buy) || (!empty($conf->margin->enabled) && !empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
-	{
+	if (!empty($object->status_buy) || (!empty($conf->margin->enabled) && !empty($object->status))) {   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
 		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->lire)
 		|| (!empty($conf->margin->enabled) && $user->rights->margin->liretous)
-		)
-		{
+		) {
 			$head[$h][0] = DOL_URL_ROOT."/product/fournisseurs.php?id=".$object->id;
 			$head[$h][1] = $langs->trans("BuyingPrices");
 			$head[$h][2] = 'suppliers';
@@ -70,8 +69,7 @@ function product_prepare_head($object)
 	}
 
 	// Multilangs
-	if (!empty($conf->global->MAIN_MULTILANGS))
-	{
+	if (!empty($conf->global->MAIN_MULTILANGS)) {
 		$head[$h][0] = DOL_URL_ROOT."/product/traduction.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("Translation");
 		$head[$h][2] = 'translation';
@@ -79,13 +77,14 @@ function product_prepare_head($object)
 	}
 
 	// Sub products
-	if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
-	{
+	if (!empty($conf->global->PRODUIT_SOUSPRODUITS)) {
 		$head[$h][0] = DOL_URL_ROOT."/product/composition/card.php?id=".$object->id;
 		$head[$h][1] = $langs->trans('AssociatedProducts');
 
 		$nbFatherAndChild = $object->hasFatherOrChild();
-		if ($nbFatherAndChild > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFatherAndChild.'</span>';
+		if ($nbFatherAndChild > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFatherAndChild.'</span>';
+		}
 		$head[$h][2] = 'subproduct';
 		$h++;
 	}
@@ -97,22 +96,21 @@ function product_prepare_head($object)
 
 		$prodcomb = new ProductCombination($db);
 
-		if ($prodcomb->fetchByFkProductChild($object->id) <= 0)
-		{
+		if ($prodcomb->fetchByFkProductChild($object->id) <= 0) {
 			$head[$h][0] = DOL_URL_ROOT."/variants/combinations.php?id=".$object->id;
 			$head[$h][1] = $langs->trans('ProductCombinations');
 			$head[$h][2] = 'combinations';
 			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
-			if ($nbVariant > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbVariant.'</span>';
+			if ($nbVariant > 0) {
+				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbVariant.'</span>';
+			}
 		}
 
 		$h++;
 	}
 
-	if ($object->isProduct() || ($object->isService() && !empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
-	{
-		if (!empty($conf->stock->enabled) && $user->rights->stock->lire)
-		{
+	if ($object->isProduct() || ($object->isService() && !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {    // If physical product we can stock (or service with option)
+		if (!empty($conf->stock->enabled) && $user->rights->stock->lire) {
 			$head[$h][0] = DOL_URL_ROOT."/product/stock/product.php?id=".$object->id;
 			$head[$h][1] = $langs->trans("Stock");
 			$head[$h][2] = 'stock';
@@ -121,17 +119,14 @@ function product_prepare_head($object)
 	}
 
 	// Tab to link resources
-	if (!empty($conf->resource->enabled))
-	{
-		if ($object->isProduct() && !empty($conf->global->RESOURCE_ON_PRODUCTS))
-		{
+	if (!empty($conf->resource->enabled)) {
+		if ($object->isProduct() && !empty($conf->global->RESOURCE_ON_PRODUCTS)) {
 			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=product&ref='.$object->ref;
 			$head[$h][1] = $langs->trans("Resources");
 			$head[$h][2] = 'resources';
 			$h++;
 		}
-		if ($object->isService() && !empty($conf->global->RESOURCE_ON_SERVICES))
-		{
+		if ($object->isService() && !empty($conf->global->RESOURCE_ON_SERVICES)) {
 			$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=service&ref='.$object->ref;
 			$head[$h][1] = $langs->trans("Resources");
 			$head[$h][2] = 'resources';
@@ -156,14 +151,19 @@ function product_prepare_head($object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product');
 
 	// Notes
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/product/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -171,18 +171,28 @@ function product_prepare_head($object)
 	// Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-	if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) {
+		$upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	}
+	if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) {
+		$upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+	}
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-		if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
-		if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
+		if (!empty($conf->product->enabled) && ($object->type == Product::TYPE_PRODUCT)) {
+			$upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
+		}
+		if (!empty($conf->service->enabled) && ($object->type == Product::TYPE_SERVICE)) {
+			$upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id, 2, 0, 0, $object, 'product').$object->id.'/photos';
+		}
 		$nbFiles += count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	}
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/product/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -191,8 +201,7 @@ function product_prepare_head($object)
 	// Log
 	$head[$h][0] = DOL_URL_ROOT.'/product/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
@@ -231,7 +240,9 @@ function productlot_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT."/product/stock/productlot_document.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -245,11 +256,11 @@ function productlot_prepare_head($object)
 
 	// Log
 	/*
-    $head[$h][0] = DOL_URL_ROOT.'/product/info.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Info");
-    $head[$h][2] = 'info';
-    $h++;
-    */
+	$head[$h][0] = DOL_URL_ROOT.'/product/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
+	*/
 
 	return $head;
 }
@@ -273,8 +284,7 @@ function product_admin_prepare_head()
 	$head[$h][2] = 'general';
 	$h++;
 
-	if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL))
-	{
+	if (!empty($conf->global->PRODUIT_MULTIPRICES) && !empty($conf->global->PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL)) {
 		$head[$h] = array(
 			0 => DOL_URL_ROOT."/product/admin/price_rules.php",
 			1 => $langs->trans('MultipriceRules'),
@@ -358,14 +368,15 @@ function show_stats_for_company($product, $socid)
 	print '</tr>';
 
 	// Customer proposals
-	if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
-	{
+	if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
 		$nblines++;
 		$ret = $product->load_stats_propale($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+			dol_print_error($db);
+		}
 		$langs->load("propal");
 		print '<tr><td>';
-		print '<a href="propal.php?id='.$product->id.'">'.img_object('', 'propal').' '.$langs->trans("Proposals").'</a>';
+		print '<a href="propal.php?id='.$product->id.'">'.img_object('', 'propal', 'class="paddingright"').$langs->trans("Proposals").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_propale['customers'];
 		print '</td><td class="right">';
@@ -376,14 +387,15 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Supplier proposals
-	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire)
-	{
+	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
 		$nblines++;
 		$ret = $product->load_stats_proposal_supplier($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("propal");
+		if ($ret < 0) {
+			dol_print_error($db);
+		}
+		$langs->load("supplier_proposal");
 		print '<tr><td>';
-		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('', 'supplier_proposal').' '.$langs->trans("SupplierProposals").'</a>';
+		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('', 'supplier_proposal', 'class="paddingright"').$langs->trans("SupplierProposals").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_proposal_supplier['suppliers'];
 		print '</td><td class="right">';
@@ -394,14 +406,15 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Customer orders
-	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
-	{
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 		$nblines++;
 		$ret = $product->load_stats_commande($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+			dol_print_error($db);
+		}
 		$langs->load("orders");
 		print '<tr><td>';
-		print '<a href="commande.php?id='.$product->id.'">'.img_object('', 'order').' '.$langs->trans("CustomersOrders").'</a>';
+		print '<a href="commande.php?id='.$product->id.'">'.img_object('', 'order', 'class="paddingright"').$langs->trans("CustomersOrders").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_commande['customers'];
 		print '</td><td class="right">';
@@ -412,14 +425,15 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Supplier orders
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire)
-	{
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && $user->rights->fournisseur->commande->lire) {
 		$nblines++;
 		$ret = $product->load_stats_commande_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+			dol_print_error($db);
+		}
 		$langs->load("orders");
 		print '<tr><td>';
-		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_order').' '.$langs->trans("SuppliersOrders").'</a>';
+		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_order', 'class="paddingright"').$langs->trans("SuppliersOrders").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_commande_fournisseur['suppliers'];
 		print '</td><td class="right">';
@@ -430,11 +444,12 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Customer invoices
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-	{
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
 		$nblines++;
 		$ret = $product->load_stats_facture($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+			dol_print_error($db);
+		}
 		$langs->load("bills");
 		print '<tr><td>';
 		print '<a href="facture.php?id='.$product->id.'">'.img_object('', 'bill').' '.$langs->trans("CustomersInvoices").'</a>';
@@ -448,14 +463,15 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Supplier invoices
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
-	{
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 		$nblines++;
 		$ret = $product->load_stats_facture_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+			dol_print_error($db);
+		}
 		$langs->load("bills");
 		print '<tr><td>';
-		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_invoice').' '.$langs->trans("SuppliersInvoices").'</a>';
+		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('', 'supplier_invoice', 'class="paddingright"').$langs->trans("SuppliersInvoices").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_facture_fournisseur['suppliers'];
 		print '</td><td class="right">';
@@ -467,14 +483,15 @@ function show_stats_for_company($product, $socid)
 	}
 
 	// Contracts
-	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire)
-	{
+	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
 		$nblines++;
 		$ret = $product->load_stats_contrat($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+			dol_print_error($db);
+		}
 		$langs->load("contracts");
 		print '<tr><td>';
-		print '<a href="contrat.php?id='.$product->id.'">'.img_object('', 'contract').' '.$langs->trans("Contracts").'</a>';
+		print '<a href="contrat.php?id='.$product->id.'">'.img_object('', 'contract', 'class="paddingright"').$langs->trans("Contracts").'</a>';
 		print '</td><td class="right">';
 		print $product->stats_contrat['customers'];
 		print '</td><td class="right">';
@@ -486,8 +503,7 @@ function show_stats_for_company($product, $socid)
 	}
 
 	// BOM
-	if (!empty($conf->bom->enabled) && $user->rights->bom->read)
-	{
+	if (!empty($conf->bom->enabled) && $user->rights->bom->read) {
 		$nblines++;
 		$ret = $product->load_stats_bom($socid);
 		if ($ret < 0) {
@@ -496,22 +512,21 @@ function show_stats_for_company($product, $socid)
 		$langs->load("mrp");
 
 		print '<tr><td>';
-		print '<a href="bom.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("BOM").'</a>';
+		print '<a href="bom.php?id='.$product->id.'">'.img_object('', 'bom', 'class="paddingright"').$langs->trans("BOM").'</a>';
 		print '</td><td class="right">';
 
 		print '</td><td class="right">';
-		print $form->textwithpicto($product->stats_bom['nb_toproduce'], $langs->trans("QtyToProduce"));
-		print $form->textwithpicto($product->stats_bom['nb_toconsume'], $langs->trans("ToConsume"));
+		print $form->textwithpicto($product->stats_bom['nb_toconsume'], $langs->trans("RowMaterial"));
+		print $form->textwithpicto($product->stats_bom['nb_toproduce'], $langs->trans("Finished"));
 		print '</td><td class="right">';
-		print $form->textwithpicto($product->stats_bom['qty_toproduce'], $langs->trans("QtyToProduce"));
-		print $form->textwithpicto($product->stats_bom['qty_toconsume'], $langs->trans("ToConsume"));
+		print $form->textwithpicto($product->stats_bom['qty_toconsume'], $langs->trans("RowMaterial"));
+		print $form->textwithpicto($product->stats_bom['qty_toproduce'], $langs->trans("Finished"));
 		print '</td>';
 		print '</tr>';
 	}
 
 	// MO
-	if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
-	{
+	if (!empty($conf->mrp->enabled) && $user->rights->mrp->read) {
 		$nblines++;
 		$ret = $product->load_stats_mo($socid);
 		if ($ret < 0) {
@@ -519,7 +534,7 @@ function show_stats_for_company($product, $socid)
 		}
 		$langs->load("mrp");
 		print '<tr><td>';
-		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>';
+		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp', 'class="paddingright"').$langs->trans("MO").'</a>';
 		print '</td><td class="right">';
 		print $form->textwithpicto($product->stats_mo['customers_toconsume'], $langs->trans("ToConsume"));
 		print $form->textwithpicto($product->stats_mo['customers_consumed'], $langs->trans("QtyAlreadyConsumed"));
@@ -579,19 +594,16 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 		$outputlangs = $langs;
 	}
 
-	if (empty($measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label]))
-	{
+	if (empty($measuring_unit_cache[$unit.'_'.$measuring_style.'_'.$scale.'_'.$use_short_label])) {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 		$measuringUnits = new CUnits($db);
 
-		if ($measuring_style == '' && $scale == '')
-		{
+		if ($measuring_style == '' && $scale == '') {
 			$arrayforfilter = array(
 				't.rowid' => $unit,
 				't.active' => 1
 			);
-		} elseif ($scale !== '')
-		{
+		} elseif ($scale !== '') {
 			$arrayforfilter = array(
 				't.scale' => $scale,
 				't.unit_type' => $measuring_style,
@@ -610,8 +622,11 @@ function measuringUnitString($unit, $measuring_style = '', $scale = '', $use_sho
 			return -1;
 		} else {
 			if (is_array($measuringUnits->records) && count($measuringUnits->records) > 0) {
-				if ($use_short_label) $labeltoreturn = $measuringUnits->records[key($measuringUnits->records)]->short_label;
-				else $labeltoreturn = $outputlangs->transnoentitiesnoconv($measuringUnits->records[key($measuringUnits->records)]->label);
+				if ($use_short_label) {
+					$labeltoreturn = $measuringUnits->records[key($measuringUnits->records)]->short_label;
+				} else {
+					$labeltoreturn = $outputlangs->transnoentitiesnoconv($measuringUnits->records[key($measuringUnits->records)]->label);
+				}
 			} else {
 				$labeltoreturn = '';
 			}
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index d710f69b2d4..1222fa120fe 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -203,6 +203,19 @@ function project_prepare_head(Project $project)
 		$h++;
 	}
 
+	if ($conf->eventorganization->enabled) {
+		$langs->load('eventorganization');
+		//TODO : Count
+		$nbConfOrBooth = 1;
+		$head[$h][0] = DOL_URL_ROOT . '/projet/event.php?id=' . $project->id;
+		$head[$h][1] = $langs->trans("ConferenceOrBoothTab");
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbConfOrBooth . '</span>';
+		}
+		$head[$h][2] = 'eventorganisation';
+		$h++;
+	}
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
@@ -309,7 +322,9 @@ function task_prepare_head($object)
 	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/contact.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TaskRessourceLinks");
-	if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+	if ($nbContact > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+	}
 	$head[$h][2] = 'task_contact';
 	$h++;
 
@@ -321,15 +336,20 @@ function task_prepare_head($object)
 	$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 	$sql .= " WHERE t.fk_task =".$object->id;
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		if ($obj) $nbTimeSpent = 1;
-	} else dol_print_error($db);
+		if ($obj) {
+			$nbTimeSpent = 1;
+		}
+	} else {
+		dol_print_error($db);
+	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 	$head[$h][1] = $langs->trans("TimeSpent");
-	if ($nbTimeSpent > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
+	if ($nbTimeSpent > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
+	}
 	$head[$h][2] = 'task_time';
 	$h++;
 
@@ -339,14 +359,19 @@ function task_prepare_head($object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'task');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/note.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'task_notes';
 		$h++;
 	}
@@ -358,17 +383,20 @@ function task_prepare_head($object)
 	$nbFiles = count(dol_dir_list($filesdir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'task_document';
 	$h++;
 
 	// Manage discussion
-	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK))
-	{
+	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_TASK)) {
 		$nbComments = $object->getNbComments();
 		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/comment.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
 		$head[$h][1] = $langs->trans("CommentLink");
-		if ($nbComments > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbComments.'</span>';
+		if ($nbComments > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbComments.'</span>';
+		}
 		$head[$h][2] = 'task_comment';
 		$h++;
 	}
@@ -395,26 +423,25 @@ function project_timesheet_prepare_head($mode, $fuser = null)
 
 	$param = '';
 	$param .= ($mode ? '&mode='.$mode : '');
-	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) $param .= '&search_usertoprocessid='.$fuser->id;
+	if (is_object($fuser) && $fuser->id > 0 && $fuser->id != $user->id) {
+		$param .= '&search_usertoprocessid='.$fuser->id;
+	}
 
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERMONTH))
-	{
+	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERMONTH)) {
 		$head[$h][0] = DOL_URL_ROOT."/projet/activity/permonth.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerMonth");
 		$head[$h][2] = 'inputpermonth';
 		$h++;
 	}
 
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK))
-	{
+	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERWEEK)) {
 		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perweek.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerWeek");
 		$head[$h][2] = 'inputperweek';
 		$h++;
 	}
 
-	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME))
-	{
+	if (empty($conf->global->PROJECT_DISABLE_TIMESHEET_PERTIME)) {
 		$head[$h][0] = DOL_URL_ROOT."/projet/activity/perday.php".($param ? '?'.$param : '');
 		$head[$h][1] = $langs->trans("InputPerDay");
 		$head[$h][2] = 'inputperday';
@@ -467,6 +494,15 @@ function project_admin_prepare_head()
 	$head[$h][2] = 'attributes_task';
 	$h++;
 
+	if (! empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		$langs->load("members");
+
+		$head[$h][0] = DOL_URL_ROOT.'/projet/admin/website.php';
+		$head[$h][1] = $langs->trans("BlankSubscriptionForm");
+		$head[$h][2] = 'website';
+		$h++;
+	}
+
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'project_admin', 'remove');
 
 	return $head;
@@ -500,7 +536,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 	$projectsArrayId = explode(',', $projectsListId);
 	if ($filterprogresscalc !== '') {
-		foreach ($lines as $key=>$line) {
+		foreach ($lines as $key => $line) {
 			if (!empty($line->planned_workload) && !empty($line->duration)) {
 				$filterprogresscalc = str_replace(' = ', ' == ', $filterprogresscalc);
 				if (!eval($filterprogresscalc)) {
@@ -515,8 +551,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 	// We declare counter as global because we want to edit them into recursive call
 	global $total_projectlinesa_spent, $total_projectlinesa_planned, $total_projectlinesa_spent_if_planned, $total_projectlinesa_declared_if_planned, $total_projectlinesa_tobill, $total_projectlinesa_billed;
 
-	if ($level == 0)
-	{
+	if ($level == 0) {
 		$total_projectlinesa_spent = 0;
 		$total_projectlinesa_planned = 0;
 		$total_projectlinesa_spent_if_planned = 0;
@@ -525,31 +560,28 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		$total_projectlinesa_billed = 0;
 	}
 
-	for ($i = 0; $i < $numlines; $i++)
-	{
-		if ($parent == 0 && $level >= 0) $level = 0; // if $level = -1, we dont' use sublevel recursion, we show all lines
+	for ($i = 0; $i < $numlines; $i++) {
+		if ($parent == 0 && $level >= 0) {
+			$level = 0; // if $level = -1, we dont' use sublevel recursion, we show all lines
+		}
 
 		// Process line
 		// print "i:".$i."-".$lines[$i]->fk_project.'<br>';
 
-		if ($lines[$i]->fk_parent == $parent || $level < 0)       // if $level = -1, we dont' use sublevel recursion, we show all lines
-		{
+		if ($lines[$i]->fk_parent == $parent || $level < 0) {       // if $level = -1, we dont' use sublevel recursion, we show all lines
 			// Show task line.
 			$showline = 1;
 			$showlineingray = 0;
 
 			// If there is filters to use
-			if (is_array($taskrole))
-			{
+			if (is_array($taskrole)) {
 				// If task not legitimate to show, search if a legitimate task exists later in tree
-				if (!isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent)
-				{
+				if (!isset($taskrole[$lines[$i]->id]) && $lines[$i]->id != $lines[$i]->fk_parent) {
 					// So search if task has a subtask legitimate to show
 					$foundtaskforuserdeeper = 0;
 					searchTaskInChild($foundtaskforuserdeeper, $lines[$i]->id, $lines, $taskrole);
 					//print '$foundtaskforuserpeeper='.$foundtaskforuserdeeper.'<br>';
-					if ($foundtaskforuserdeeper > 0)
-					{
+					if ($foundtaskforuserdeeper > 0) {
 						$showlineingray = 1; // We will show line but in gray
 					} else {
 						$showline = 0; // No reason to show line
@@ -558,11 +590,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 			} else {
 				// Caller did not ask to filter on tasks of a specific user (this probably means he want also tasks of all users, into public project
 				// or into all other projects if user has permission to).
-				if (empty($user->rights->projet->all->lire))
-				{
+				if (empty($user->rights->projet->all->lire)) {
 					// User is not allowed on this project and project is not public, so we hide line
-					if (!in_array($lines[$i]->fk_project, $projectsArrayId))
-					{
+					if (!in_array($lines[$i]->fk_project, $projectsArrayId)) {
 						// Note that having a user assigned to a task into a project user has no permission on, should not be possible
 						// because assignement on task can be done only on contact of project.
 						// If assignement was done and after, was removed from contact of project, then we can hide the line.
@@ -571,11 +601,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				}
 			}
 
-			if ($showline)
-			{
+			if ($showline) {
 				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {
 					$var = !$var;
 					$lastprojectid = $lines[$i]->fk_project;
 				}
@@ -602,13 +630,15 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				$taskstatic->duration_effective = $lines[$i]->duration;
 
 
-				if ($showproject)
-				{
+				if ($showproject) {
 					// Project ref
 					print "<td>";
 					//if ($showlineingray) print '<i>';
-					if ($lines[$i]->public || in_array($lines[$i]->fk_project, $projectsArrayId) || !empty($user->rights->projet->all->lire)) print $projectstatic->getNomUrl(1);
-					else print $projectstatic->getNomUrl(1, 'nolink');
+					if ($lines[$i]->public || in_array($lines[$i]->fk_project, $projectsArrayId) || !empty($user->rights->projet->all->lire)) {
+						print $projectstatic->getNomUrl(1);
+					} else {
+						print $projectstatic->getNomUrl(1, 'nolink');
+					}
 					//if ($showlineingray) print '</i>';
 					print "</td>";
 
@@ -633,8 +663,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				// Title of task
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) {
 					print "<td>";
-					if ($showlineingray)
+					if ($showlineingray) {
 						print '<i>';
+					}
 					//else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$lines[$i]->id.'&withproject=1">';
 					for ($k = 0; $k < $level; $k++) {
 						print '<div class="marginleftonly">';
@@ -643,8 +674,9 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					for ($k = 0; $k < $level; $k++) {
 						print '</div>';
 					}
-					if ($showlineingray)
+					if ($showlineingray) {
 						print '</i>';
+					}
 					//else print '</a>';
 					print "</td>\n";
 				}
@@ -666,15 +698,20 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) {
 					print '<td class="center">';
 					print dol_print_date($lines[$i]->date_end, 'dayhour');
-					if ($taskstatic->hasDelay())
+					if ($taskstatic->hasDelay()) {
 						print img_warning($langs->trans("Late"));
+					}
 					print '</td>';
 				}
 
 				$plannedworkloadoutputformat = 'allhourmin';
 				$timespentoutputformat = 'allhourmin';
-				if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-				if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+				if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) {
+					$plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+				}
+				if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
+					$timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+				}
 
 				// Planned Workload (in working hours)
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.planned_workload']['checked'])) {
@@ -693,15 +730,21 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				// Time spent
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.duration_effective']['checked'])) {
 					print '<td class="right">';
-					if ($showlineingray)
+					if ($showlineingray) {
 						print '<i>';
-					else print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject ? '' : '&withproject=1').'">';
-					if ($lines[$i]->duration)
+					} else {
+						print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.($showproject ? '' : '&withproject=1').'">';
+					}
+					if ($lines[$i]->duration) {
 						print convertSecondToTime($lines[$i]->duration, $timespentoutputformat);
-					else print '--:--';
-					if ($showlineingray)
+					} else {
+						print '--:--';
+					}
+					if ($showlineingray) {
 						print '</i>';
-					else print '</a>';
+					} else {
+						print '</a>';
+					}
 					print '</td>';
 				}
 
@@ -709,9 +752,11 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
 					print '<td class="right">';
 					if ($lines[$i]->planned_workload || $lines[$i]->duration) {
-						if ($lines[$i]->planned_workload)
+						if ($lines[$i]->planned_workload) {
 							print round(100 * $lines[$i]->duration / $lines[$i]->planned_workload, 2).' %';
-						else print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
+						} else {
+							print '<span class="opacitymedium">'.$langs->trans('WorkloadNotDefined').'</span>';
+						}
 					}
 					print '</td>';
 				}
@@ -734,8 +779,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					print '</td>';
 				}
 
-				if ($showbilltime)
-				{
+				if ($showbilltime) {
 					// Time not billed
 					if (count($arrayfields) > 0 && !empty($arrayfields['t.tobill']['checked'])) {
 						print '<td class="right">';
@@ -762,18 +806,19 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				}
 
 				// Contacts of task
-				if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
-				{
+				if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
 					print '<td>';
-					foreach (array('internal', 'external') as $source)
-					{
+					foreach (array('internal', 'external') as $source) {
 						$tab = $lines[$i]->liste_contact(-1, $source);
 						$num = count($tab);
 						if (!empty($num)) {
 							foreach ($tab as $contacttask) {
 								//var_dump($contacttask);
-								if ($source == 'internal') $c = new User($db);
-								else $c = new Contact($db);
+								if ($source == 'internal') {
+									$c = new User($db);
+								} else {
+									$c = new Contact($db);
+								}
 								$c->fetch($contacttask['id']);
 								print $c->getNomUrl(1).' ('.$contacttask['libelle'].')<br>';
 							}
@@ -796,19 +841,26 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				print "</tr>\n";
 
-				if (!$showlineingray) $inc++;
+				if (!$showlineingray) {
+					$inc++;
+				}
 
-				if ($level >= 0)    // Call sublevels
-				{
+				if ($level >= 0) {    // Call sublevels
 					$level++;
-					if ($lines[$i]->id) projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick, $projectidfortotallink, $filterprogresscalc, $showbilltime, $arrayfields);
+					if ($lines[$i]->id) {
+						projectLinesa($inc, $lines[$i]->id, $lines, $level, $var, $showproject, $taskrole, $projectsListId, $addordertick, $projectidfortotallink, $filterprogresscalc, $showbilltime, $arrayfields);
+					}
 					$level--;
 				}
 
 				$total_projectlinesa_spent += $lines[$i]->duration;
 				$total_projectlinesa_planned += $lines[$i]->planned_workload;
-				if ($lines[$i]->planned_workload) $total_projectlinesa_spent_if_planned += $lines[$i]->duration;
-				if ($lines[$i]->planned_workload) $total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;
+				if ($lines[$i]->planned_workload) {
+					$total_projectlinesa_spent_if_planned += $lines[$i]->duration;
+				}
+				if ($lines[$i]->planned_workload) {
+					$total_projectlinesa_declared_if_planned += $lines[$i]->planned_workload * $lines[$i]->progress / 100;
+				}
 			}
 		} else {
 			//$level--;
@@ -816,14 +868,21 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 	}
 
 	if (($total_projectlinesa_planned > 0 || $total_projectlinesa_spent > 0 || $total_projectlinesa_tobill > 0 || $total_projectlinesa_billed > 0)
-		&& $level <= 0)
-	{
+		&& $level <= 0) {
 		print '<tr class="liste_total nodrag nodrop">';
 		print '<td class="liste_total">'.$langs->trans("Total").'</td>';
-		if ($showproject) print '<td></td><td></td>';
-		if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) print '<td></td>';
-		if (count($arrayfields) > 0 && !empty($arrayfields['t.dateo']['checked'])) print '<td></td>';
-		if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) print '<td></td>';
+		if ($showproject) {
+			print '<td></td><td></td>';
+		}
+		if (count($arrayfields) > 0 && !empty($arrayfields['t.label']['checked'])) {
+			print '<td></td>';
+		}
+		if (count($arrayfields) > 0 && !empty($arrayfields['t.dateo']['checked'])) {
+			print '<td></td>';
+		}
+		if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) {
+			print '<td></td>';
+		}
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.planned_workload']['checked'])) {
 			print '<td class="nowrap liste_total right">';
 			print convertSecondToTime($total_projectlinesa_planned, 'allhourmin');
@@ -831,11 +890,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		}
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.duration_effective']['checked'])) {
 			print '<td class="nowrap liste_total right">';
-			if ($projectidfortotallink > 0)
+			if ($projectidfortotallink > 0) {
 				print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?projectid='.$projectidfortotallink.($showproject ? '' : '&withproject=1').'">';
+			}
 			print convertSecondToTime($total_projectlinesa_spent, 'allhourmin');
-			if ($projectidfortotallink > 0)
+			if ($projectidfortotallink > 0) {
 				print '</a>';
+			}
 			print '</td>';
 		}
 
@@ -864,14 +925,16 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_calculated']['checked'])) {
 			print '<td class="nowrap liste_total right">';
-			if ($total_projectlinesa_planned)
+			if ($total_projectlinesa_planned) {
 				print $totalCalculatedProgress.' %';
+			}
 			print '</td>';
 		}
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.progress']['checked'])) {
 			print '<td class="nowrap liste_total right">';
-			if ($total_projectlinesa_planned)
+			if ($total_projectlinesa_planned) {
 				print '<span class="'.$badgeClass.'" >'.$totalAverageDeclaredProgress.' %</span>';
+			}
 			print '</td>';
 		}
 
@@ -889,8 +952,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 			print '</td>';
 		}
 
-		if ($showbilltime)
-		{
+		if ($showbilltime) {
 			if (count($arrayfields) > 0 && !empty($arrayfields['t.tobill']['checked'])) {
 				print '<td class="nowrap liste_total right">';
 				print convertSecondToTime($total_projectlinesa_tobill, 'allhourmin');
@@ -903,8 +965,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 			}
 		}
 		// Contacts of task
-		if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST))
-		{
+		if (!empty($conf->global->PROJECT_SHOW_CONTACTS_IN_LIST)) {
 			print '<td></td>';
 		}
 		print '<td class=""></td>';
@@ -945,45 +1006,40 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 	$numlines = count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0; $i < $numlines; $i++)
-		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
+	if ($parent == 0) { // Always and only if at first level
+		for ($i = 0; $i < $numlines; $i++) {
+			if ($lines[$i]->fk_task_parent) {
+				$lineswithoutlevel0[] = $lines[$i];
+			}
 		}
 	}
 
-	if (empty($oldprojectforbreak))
-	{
+	if (empty($oldprojectforbreak)) {
 		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break
 	}
 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	for ($i = 0; $i < $numlines; $i++)
-	{
-		if ($parent == 0) $level = 0;
+	for ($i = 0; $i < $numlines; $i++) {
+		if ($parent == 0) {
+			$level = 0;
+		}
 
 		//if ($lines[$i]->fk_task_parent == $parent)
 		//{
 		// If we want all or we have a role on task, we show it
-		if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
-		{
+		if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {
 			//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 			// Break on a new project
-			if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-			{
+			if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {
 				$lastprojectid = $lines[$i]->fk_project;
-				if ($preselectedday)
-				{
+				if ($preselectedday) {
 					$projectstatic->id = $lines[$i]->fk_project;
 				}
 			}
 
-			if (empty($workloadforid[$projectstatic->id]))
-			{
-				if ($preselectedday)
-				{
+			if (empty($workloadforid[$projectstatic->id])) {
+				if ($preselectedday) {
 					$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
 					$workloadforid[$projectstatic->id] = 1;
 				}
@@ -1005,13 +1061,11 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 			$thirdpartystatic->name = $lines[$i]->thirdparty_name;
 			$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
-			if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-			{
+			if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {
 				print '<tr class="oddeven trforbreak nobold">'."\n";
 				print '<td colspan="11">';
 				print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
-				if ($projectstatic->title)
-				{
+				if ($projectstatic->title) {
 					print ' - ';
 					print $projectstatic->title;
 				}
@@ -1019,7 +1073,9 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 				print '</tr>';
 			}
 
-			if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+			if ($oldprojectforbreak != -1) {
+				$oldprojectforbreak = $projectstatic->id;
+			}
 
 			print '<tr class="oddeven">'."\n";
 
@@ -1032,8 +1088,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 
 			// Project
 			print "<td>";
-			if ($oldprojectforbreak == -1)
-			{
+			if ($oldprojectforbreak == -1) {
 				print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				print '<br>'.$projectstatic->title;
 			}
@@ -1041,17 +1096,23 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 
 			// Thirdparty
 			print '<td class="tdoverflowmax100">';
-			if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+			if ($thirdpartystatic->id > 0) {
+				print $thirdpartystatic->getNomUrl(1, 'project', 10);
+			}
 			print '</td>';
 
 			// Ref
 			print '<td>';
 			print '<!-- Task id = '.$lines[$i]->id.' -->';
-			for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
+			for ($k = 0; $k < $level; $k++) {
+				print "&nbsp;&nbsp;&nbsp;";
+			}
 			print $taskstatic->getNomUrl(1, 'withproject', 'time');
 			// Label task
 			print '<br>';
-			for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
+			for ($k = 0; $k < $level; $k++) {
+				print "&nbsp;&nbsp;&nbsp;";
+			}
 			print $taskstatic->label;
 			//print "<br>";
 			//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
@@ -1068,14 +1129,12 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 			//var_dump($lines[$i]);
 			//var_dump($projectsrole[$lines[$i]->fk_project]);
 			// If at least one role for project
-			if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-			{
+			if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer) {
 				$disabledproject = 0;
 				$disabledtask = 0;
 			}
 			// If $restricteditformytask is on and I have no role on task, i disable edit
-			if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-			{
+			if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {
 				$disabledtask = 1;
 			}
 
@@ -1085,9 +1144,13 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 			print '</td>';
 
 			$cssonholiday = '';
-			if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
-			elseif (!$isavailable[$preselectedday]['morning'])   $cssonholiday .= 'onholidaymorning ';
-			elseif (!$isavailable[$preselectedday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
+			if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon']) {
+				$cssonholiday .= 'onholidayallday ';
+			} elseif (!$isavailable[$preselectedday]['morning']) {
+				$cssonholiday .= 'onholidaymorning ';
+			} elseif (!$isavailable[$preselectedday]['afternoon']) {
+				$cssonholiday .= 'onholidayafternoon ';
+			}
 
 			// Duration
 			print '<td class="duration'.($cssonholiday ? ' '.$cssonholiday : '').' center">';
@@ -1096,7 +1159,9 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 			$totalforeachline[$preselectedday] += $lines[$i]->timespent_duration;
 
 			$alreadyspent = '';
-			if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
+			if ($dayWorkLoad > 0) {
+				$alreadyspent = convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
+			}
 
 			print convertSecondToTime($lines[$i]->timespent_duration, 'allhourmin');
 
@@ -1174,54 +1239,47 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 	$numlines = count($lines);
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0; $i < $numlines; $i++)
-		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
+	if ($parent == 0) { // Always and only if at first level
+		for ($i = 0; $i < $numlines; $i++) {
+			if ($lines[$i]->fk_task_parent) {
+				$lineswithoutlevel0[] = $lines[$i];
+			}
 		}
 	}
 
-	if (empty($oldprojectforbreak))
-	{
+	if (empty($oldprojectforbreak)) {
 		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 to start break , -1 no break
 	}
 
 	//dol_syslog('projectLinesPerDay inc='.$inc.' preselectedday='.$preselectedday.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
-	for ($i = 0; $i < $numlines; $i++)
-	{
-		if ($parent == 0) $level = 0;
+	for ($i = 0; $i < $numlines; $i++) {
+		if ($parent == 0) {
+			$level = 0;
+		}
 
-		if ($lines[$i]->fk_task_parent == $parent)
-		{
+		if ($lines[$i]->fk_task_parent == $parent) {
 			$obj = &$lines[$i]; // To display extrafields
 
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
-			{
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {
 				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
-				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases
-				{
+				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id])) {	// we have no role on task and we request to hide such cases
 					continue;
 				}
 
 				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {
 					$lastprojectid = $lines[$i]->fk_project;
-					if ($preselectedday)
-					{
+					if ($preselectedday) {
 						$projectstatic->id = $lines[$i]->fk_project;
 					}
 				}
 
-				if (empty($workloadforid[$projectstatic->id]))
-				{
-					if ($preselectedday)
-					{
+				if (empty($workloadforid[$projectstatic->id])) {
+					if ($preselectedday) {
 						$projectstatic->loadTimeSpent($preselectedday, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
-		   				$workloadforid[$projectstatic->id] = 1;
+						$workloadforid[$projectstatic->id] = 1;
 					}
 				}
 
@@ -1241,91 +1299,98 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				$thirdpartystatic->name = $lines[$i]->thirdparty_name;
 				$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-				{
+				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {
 					$addcolspan = 0;
-					if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
-					if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
-					foreach ($arrayfields as $key => $val)
-					{
-						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+					if (!empty($arrayfields['t.planned_workload']['checked'])) {
+						$addcolspan++;
+					}
+					if (!empty($arrayfields['t.progress']['checked'])) {
+						$addcolspan++;
+					}
+					foreach ($arrayfields as $key => $val) {
+						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') {
+							$addcolspan++;
+						}
 					}
 
 					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(7 + $addcolspan).'">';
 					print $projectstatic->getNomUrl(1, '', 0, '<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
-					if ($projectstatic->title)
-					{
+					if ($thirdpartystatic->id > 0) {
+						print ' - '.$thirdpartystatic->getNomUrl(1);
+					}
+					if ($projectstatic->title) {
 						print ' - ';
 						print '<span class="secondary">'.$projectstatic->title.'</span>';
 					}
 					/*
-                    $colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
-                    print '<table class="">';
+					$colspan=5+(empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)?0:2);
+					print '<table class="">';
 
-                    print '<tr class="liste_titre">';
+					print '<tr class="liste_titre">';
 
-                    // PROJECT fields
-                    if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
-                    if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-                    if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
-                    if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-                    if (! empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
+					// PROJECT fields
+					if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
+					if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (! empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
 
-                    $extrafieldsobjectkey='projet';
-                    $extrafieldsobjectprefix='efp.';
-                    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+					$extrafieldsobjectkey='projet';
+					$extrafieldsobjectprefix='efp.';
+					include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
-                    print '</tr>';
-                    print '<tr>';
+					print '</tr>';
+					print '<tr>';
 
-                    // PROJECT fields
-                    if (! empty($arrayfields['p.fk_opp_status']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        $code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');
-                        if ($code) print $langs->trans("OppStatus".$code);
-                        print "</td>\n";
-                    }
-                    if (! empty($arrayfields['p.opp_amount']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
-                        print "</td>\n";
-                    }
-                    if (! empty($arrayfields['p.opp_percent']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';
-                        print "</td>\n";
-                    }
-                    if (! empty($arrayfields['p.budget_amount']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
-                        print "</td>\n";
-                    }
-                    if (! empty($arrayfields['p.usage_bill_time']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        print yn($lines[$i]->usage_bill_time);
-                        print "</td>\n";
-                    }
+					// PROJECT fields
+					if (! empty($arrayfields['p.fk_opp_status']['checked']))
+					{
+						print '<td class="nowrap">';
+						$code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');
+						if ($code) print $langs->trans("OppStatus".$code);
+						print "</td>\n";
+					}
+					if (! empty($arrayfields['p.opp_amount']['checked']))
+					{
+						print '<td class="nowrap">';
+						print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+						print "</td>\n";
+					}
+					if (! empty($arrayfields['p.opp_percent']['checked']))
+					{
+						print '<td class="nowrap">';
+						print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';
+						print "</td>\n";
+					}
+					if (! empty($arrayfields['p.budget_amount']['checked']))
+					{
+						print '<td class="nowrap">';
+						print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+						print "</td>\n";
+					}
+					if (! empty($arrayfields['p.usage_bill_time']['checked']))
+					{
+						print '<td class="nowrap">';
+						print yn($lines[$i]->usage_bill_time);
+						print "</td>\n";
+					}
 
-                    $extrafieldsobjectkey='projet';
-                    $extrafieldsobjectprefix='efp.';
-                    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+					$extrafieldsobjectkey='projet';
+					$extrafieldsobjectprefix='efp.';
+					include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-                    print '</tr>';
-                    print '</table>';
+					print '</tr>';
+					print '</table>';
 
 					*/
 					print '</td>';
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+					$oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven" data-taskid="'.$lines[$i]->id.'">'."\n";
 
@@ -1337,30 +1402,36 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				*/
 
 				// Project
-				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
-				{
+				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 					print "<td>";
-					if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					if ($oldprojectforbreak == -1) {
+						print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					}
 					print "</td>";
 				}
 
 				// Thirdparty
-				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
-				{
+				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 					print '<td class="tdoverflowmax100">';
-					if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project', 10);
+					if ($thirdpartystatic->id > 0) {
+						print $thirdpartystatic->getNomUrl(1, 'project', 10);
+					}
 					print '</td>';
 				}
 
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0; $k < $level; $k++) print '<div class="marginleftonly">';
+				for ($k = 0; $k < $level; $k++) {
+					print '<div class="marginleftonly">';
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
 				print '<span class="opacitymedium">'.$taskstatic->label.'</a>';
-				for ($k = 0; $k < $level; $k++) print "</div>";
+				for ($k = 0; $k < $level; $k++) {
+					print "</div>";
+				}
 				print "</td>\n";
 
 				// TASK extrafields
@@ -1369,17 +1440,18 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
 				// Planned Workload
-				if (!empty($arrayfields['t.planned_workload']['checked']))
-				{
+				if (!empty($arrayfields['t.planned_workload']['checked'])) {
 					print '<td class="leftborder plannedworkload right">';
-					if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
-					else print '--:--';
+					if ($lines[$i]->planned_workload) {
+						print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
+					} else {
+						print '--:--';
+					}
 					print '</td>';
 				}
 
 				// Progress declared %
-				if (!empty($arrayfields['t.progress']['checked']))
-				{
+				if (!empty($arrayfields['t.progress']['checked'])) {
 					print '<td class="right">';
 					print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
 					print '</td>';
@@ -1388,19 +1460,23 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				// Time spent by everybody
 				print '<td class="right">';
 				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
-				if ($lines[$i]->duration)
-				{
+				if ($lines[$i]->duration) {
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				} else print '--:--';
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				// Time spent by user
 				print '<td class="right">';
 				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
-				else print '--:--';
+				if ($tmptimespent['total_duration']) {
+					print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				$disabledproject = 1; $disabledtask = 1;
@@ -1408,14 +1484,12 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-				{
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer) {
 					$disabledproject = 0;
 					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-				{
+				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {
 					$disabledtask = 1;
 				}
 
@@ -1426,9 +1500,13 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				print '</td>';
 
 				$cssonholiday = '';
-				if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
-				elseif (!$isavailable[$preselectedday]['morning'])   $cssonholiday .= 'onholidaymorning ';
-				elseif (!$isavailable[$preselectedday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
+				if (!$isavailable[$preselectedday]['morning'] && !$isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday .= 'onholidayallday ';
+				} elseif (!$isavailable[$preselectedday]['morning']) {
+					$cssonholiday .= 'onholidaymorning ';
+				} elseif (!$isavailable[$preselectedday]['afternoon']) {
+					$cssonholiday .= 'onholidayafternoon ';
+				}
 
 				global $daytoparse;
 				$tmparray = dol_getdate($daytoparse, true); // detail of current day
@@ -1436,8 +1514,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				$idw = ($tmparray['wday'] - (empty($conf->global->MAIN_START_WEEK) ? 0 : 1));
 				global $numstartworkingday, $numendworkingday;
 				$cssweekend = '';
-				if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
-				{
+				if ((($idw + 1) < $numstartworkingday) || (($idw + 1) > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
 					$cssweekend = 'weekend';
 				}
 
@@ -1447,7 +1524,9 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				$totalforeachday[$preselectedday] += $dayWorkLoad;
 
 				$alreadyspent = '';
-				if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+				if ($dayWorkLoad > 0) {
+					$alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+				}
 
 				$idw = 0;
 
@@ -1477,14 +1556,16 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 				// Warning
 				print '<td class="right">';
-   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
-   				elseif ($disabledtask)
-   				{
-   					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+				if ((!$lines[$i]->public) && $disabledproject) {
+					print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
+				} elseif ($disabledtask) {
+					$titleassigntask = $langs->trans("AssignTaskToMe");
+					if ($fuser->id != $user->id) {
+						$titleassigntask = $langs->trans("AssignTaskToUser", '...');
+					}
 
-   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
-   				}
+					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+				}
 				print '</td>';
 
 				print "</tr>\n";
@@ -1492,15 +1573,13 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 
 			$inc++;
 			$level++;
-			if ($lines[$i]->id > 0)
-			{
+			if ($lines[$i]->id > 0) {
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
 				//var_dump($totalforeachday);
 				$ret = projectLinesPerDay($inc, $lines[$i]->id, $fuser, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $preselectedday, $isavailable, $oldprojectforbreak, $arrayfields, $extrafields);
 				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
 				//var_dump($ret);
-				foreach ($ret as $key => $val)
-				{
+				foreach ($ret as $key => $val) {
 					$totalforeachday[$key] += $val;
 				}
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
@@ -1548,50 +1627,45 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 	$lineswithoutlevel0 = array();
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0; $i < $numlines; $i++)
-		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
+	if ($parent == 0) { // Always and only if at first level
+		for ($i = 0; $i < $numlines; $i++) {
+			if ($lines[$i]->fk_task_parent) {
+				$lineswithoutlevel0[] = $lines[$i];
+			}
 		}
 	}
 
 	//dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 
-	if (empty($oldprojectforbreak))
-	{
+	if (empty($oldprojectforbreak)) {
 		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
-	for ($i = 0; $i < $numlines; $i++)
-	{
-		if ($parent == 0) $level = 0;
+	for ($i = 0; $i < $numlines; $i++) {
+		if ($parent == 0) {
+			$level = 0;
+		}
 
-		if ($lines[$i]->fk_task_parent == $parent)
-		{
+		if ($lines[$i]->fk_task_parent == $parent) {
 			$obj = &$lines[$i]; // To display extrafields
 
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
-			{
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {
 				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
-				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id]))	// we have no role on task and we request to hide such cases
-				{
+				if ($restricteditformytask == 2 && empty($tasksrole[$lines[$i]->id])) {	// we have no role on task and we request to hide such cases
 					continue;
 				}
 
 				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {
 					$lastprojectid = $lines[$i]->fk_project;
 					$projectstatic->id = $lines[$i]->fk_project;
 				}
 
 				//var_dump('--- '.$level.' '.$firstdaytoshow.' '.$fuser->id.' '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
 				//var_dump($projectstatic->weekWorkLoadPerTask);
-				if (empty($workloadforid[$projectstatic->id]))
-				{
+				if (empty($workloadforid[$projectstatic->id])) {
 					$projectstatic->loadTimeSpent($firstdaytoshow, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
 					$workloadforid[$projectstatic->id] = 1;
 				}
@@ -1615,22 +1689,27 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				$thirdpartystatic->name = $lines[$i]->thirdparty_name;
 				$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-				{
+				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {
 					$addcolspan = 0;
-					if (!empty($arrayfields['t.planned_workload']['checked'])) $addcolspan++;
-					if (!empty($arrayfields['t.progress']['checked'])) $addcolspan++;
-					foreach ($arrayfields as $key => $val)
-					{
-						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
+					if (!empty($arrayfields['t.planned_workload']['checked'])) {
+						$addcolspan++;
+					}
+					if (!empty($arrayfields['t.progress']['checked'])) {
+						$addcolspan++;
+					}
+					foreach ($arrayfields as $key => $val) {
+						if ($val['checked'] && substr($key, 0, 5) == 'efpt.') {
+							$addcolspan++;
+						}
 					}
 
 					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(11 + $addcolspan).'">';
 					print $projectstatic->getNomUrl(1, '', 0, '<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
-					if ($projectstatic->title)
-					{
+					if ($thirdpartystatic->id > 0) {
+						print ' - '.$thirdpartystatic->getNomUrl(1);
+					}
+					if ($projectstatic->title) {
 						print ' - ';
 						print '<span class="secondary">'.$projectstatic->title.'</span>';
 					}
@@ -1641,65 +1720,67 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 					print '<tr class="liste_titre">';
 
 					// PROJECT fields
-                    if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
-                    if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-                    if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
-                    if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
-                    if (! empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (! empty($arrayfields['p.fk_opp_status']['checked'])) print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
+					if (! empty($arrayfields['p.opp_amount']['checked']))    print_liste_field_titre($arrayfields['p.opp_amount']['label'], $_SERVER["PHP_SELF"], 'p.opp_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (! empty($arrayfields['p.opp_percent']['checked']))   print_liste_field_titre($arrayfields['p.opp_percent']['label'], $_SERVER["PHP_SELF"], 'p.opp_percent', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (! empty($arrayfields['p.budget_amount']['checked'])) print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
+					if (! empty($arrayfields['p.usage_bill_time']['checked']))     print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
 
-                    $extrafieldsobjectkey='projet';
-                    $extrafieldsobjectprefix='efp.';
-                    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+					$extrafieldsobjectkey='projet';
+					$extrafieldsobjectprefix='efp.';
+					include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 
-                    print '</tr>';
-                    print '<tr>';
+					print '</tr>';
+					print '<tr>';
 
-                    // PROJECT fields
-                    if (! empty($arrayfields['p.fk_opp_status']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        $code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');
-                        if ($code) print $langs->trans("OppStatus".$code);
-                        print "</td>\n";
-                    }
-                    if (! empty($arrayfields['p.opp_amount']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
-                        print "</td>\n";
-                    }
-                    if (! empty($arrayfields['p.opp_percent']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';
-                        print "</td>\n";
-                    }
-                    if (! empty($arrayfields['p.budget_amount']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
-                        print "</td>\n";
-                    }
-                    if (! empty($arrayfields['p.usage_bill_time']['checked']))
-                    {
-                        print '<td class="nowrap">';
-                        print yn($lines[$i]->usage_bill_time);
-                        print "</td>\n";
-                    }
+					// PROJECT fields
+					if (! empty($arrayfields['p.fk_opp_status']['checked']))
+					{
+						print '<td class="nowrap">';
+						$code = dol_getIdFromCode($db, $lines[$i]->fk_opp_status, 'c_lead_status', 'rowid', 'code');
+						if ($code) print $langs->trans("OppStatus".$code);
+						print "</td>\n";
+					}
+					if (! empty($arrayfields['p.opp_amount']['checked']))
+					{
+						print '<td class="nowrap">';
+						print price($lines[$i]->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+						print "</td>\n";
+					}
+					if (! empty($arrayfields['p.opp_percent']['checked']))
+					{
+						print '<td class="nowrap">';
+						print price($lines[$i]->opp_percent, 0, $langs, 1, 0).' %';
+						print "</td>\n";
+					}
+					if (! empty($arrayfields['p.budget_amount']['checked']))
+					{
+						print '<td class="nowrap">';
+						print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+						print "</td>\n";
+					}
+					if (! empty($arrayfields['p.usage_bill_time']['checked']))
+					{
+						print '<td class="nowrap">';
+						print yn($lines[$i]->usage_bill_time);
+						print "</td>\n";
+					}
 
-                    $extrafieldsobjectkey='projet';
-                    $extrafieldsobjectprefix='efp.';
-                    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+					$extrafieldsobjectkey='projet';
+					$extrafieldsobjectprefix='efp.';
+					include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-                    print '</tr>';
-                    print '</table>';
+					print '</tr>';
+					print '</table>';
 					*/
 
 					print '</td>';
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+					$oldprojectforbreak = $projectstatic->id;
+				}
 
 				print '<tr class="oddeven" data-taskid="'.$lines[$i]->id.'">'."\n";
 
@@ -1711,30 +1792,36 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				*/
 
 				// Project
-				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
-				{
+				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 					print '<td class="nowrap">';
-					if ($oldprojectforbreak == -1) print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					if ($oldprojectforbreak == -1) {
+						print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
+					}
 					print "</td>";
 				}
 
 				// Thirdparty
-				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT))
-				{
+				if (!empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT)) {
 					print '<td class="tdoverflowmax100">';
-					if ($thirdpartystatic->id > 0) print $thirdpartystatic->getNomUrl(1, 'project');
+					if ($thirdpartystatic->id > 0) {
+						print $thirdpartystatic->getNomUrl(1, 'project');
+					}
 					print '</td>';
 				}
 
 				// Ref
 				print '<td class="nowrap">';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0; $k < $level; $k++) print '<div class="marginleftonly">';
+				for ($k = 0; $k < $level; $k++) {
+					print '<div class="marginleftonly">';
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
 				print '<span class="opacitymedium">'.$taskstatic->label.'</span>';
-				for ($k = 0; $k < $level; $k++) print "</div>";
+				for ($k = 0; $k < $level; $k++) {
+					print "</div>";
+				}
 				print "</td>\n";
 
 				// TASK extrafields
@@ -1743,16 +1830,17 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
 				// Planned Workload
-				if (!empty($arrayfields['t.planned_workload']['checked']))
-				{
+				if (!empty($arrayfields['t.planned_workload']['checked'])) {
 					print '<td class="leftborder plannedworkload right">';
-					if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
-					else print '--:--';
+					if ($lines[$i]->planned_workload) {
+						print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
+					} else {
+						print '--:--';
+					}
 					print '</td>';
 				}
 
-				if (!empty($arrayfields['t.progress']['checked']))
-				{
+				if (!empty($arrayfields['t.progress']['checked'])) {
 					// Progress declared %
 					print '<td class="right">';
 					print $formother->select_percent($lines[$i]->progress, $lines[$i]->id.'progress');
@@ -1762,19 +1850,23 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				// Time spent by everybody
 				print '<td class="right">';
 				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
-				if ($lines[$i]->duration)
-				{
+				if ($lines[$i]->duration) {
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				} else print '--:--';
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				// Time spent by user
 				print '<td class="right">';
 				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
-				else print '--:--';
+				if ($tmptimespent['total_duration']) {
+					print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				$disabledproject = 1; $disabledtask = 1;
@@ -1782,14 +1874,12 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-				{
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer) {
 					$disabledproject = 0;
 					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-				{
+				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {
 					$disabledtask = 1;
 				}
 
@@ -1797,57 +1887,62 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 
 				// Fields to show current time
 				$tableCell = ''; $modeinput = 'hours';
-				for ($idw = 0; $idw < 7; $idw++)
-				{
+				for ($idw = 0; $idw < 7; $idw++) {
 					$tmpday = dol_time_plus_duree($firstdaytoshow, $idw, 'd');
 
 					$cssonholiday = '';
-					if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon'])   $cssonholiday .= 'onholidayallday ';
-					elseif (!$isavailable[$tmpday]['morning'])   $cssonholiday .= 'onholidaymorning ';
-					elseif (!$isavailable[$tmpday]['afternoon']) $cssonholiday .= 'onholidayafternoon ';
+					if (!$isavailable[$tmpday]['morning'] && !$isavailable[$tmpday]['afternoon']) {
+						$cssonholiday .= 'onholidayallday ';
+					} elseif (!$isavailable[$tmpday]['morning']) {
+						$cssonholiday .= 'onholidaymorning ';
+					} elseif (!$isavailable[$tmpday]['afternoon']) {
+						$cssonholiday .= 'onholidayafternoon ';
+					}
 
 					$tmparray = dol_getdate($tmpday);
 					$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$tmpday][$lines[$i]->id];
 					$totalforeachday[$tmpday] += $dayWorkLoad;
 
 					$alreadyspent = '';
-					if ($dayWorkLoad > 0) $alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+					if ($dayWorkLoad > 0) {
+						$alreadyspent = convertSecondToTime($dayWorkLoad, 'allhourmin');
+					}
 					$alttitle = $langs->trans("AddHereTimeSpentForDay", $tmparray['day'], $tmparray['mon']);
 
 					global $numstartworkingday, $numendworkingday;
 					$cssweekend = '';
-					if (($idw + 1 < $numstartworkingday) || ($idw + 1 > $numendworkingday))	// This is a day is not inside the setup of working days, so we use a week-end css.
-					{
+					if (($idw + 1 < $numstartworkingday) || ($idw + 1 > $numendworkingday)) {	// This is a day is not inside the setup of working days, so we use a week-end css.
 						$cssweekend = 'weekend';
 					}
 
 					$tableCell = '<td class="center hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
 					//$tableCell .= 'idw='.$idw.' '.$conf->global->MAIN_START_WEEK.' '.$numstartworkingday.'-'.$numendworkingday;
 					$placeholder = '';
-					if ($alreadyspent)
-					{
+					if ($alreadyspent) {
 						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
 						//$placeholder=' placeholder="00:00"';
-					 	//$tableCell.='+';
+						//$tableCell.='+';
 					}
-				  	$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
+					$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="" cols="2"  maxlength="5"';
 					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
-				   	$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
-				   	$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
-				   	$tableCell .= '</td>';
+					$tableCell .= ' onkeyup="updateTotal('.$idw.',\''.$modeinput.'\')"';
+					$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$idw.',\''.$modeinput.'\')" />';
+					$tableCell .= '</td>';
 					print $tableCell;
 				}
 
 				// Warning
 				print '<td class="right">';
-   				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
-   				elseif ($disabledtask)
-   				{
-   					$titleassigntask = $langs->trans("AssignTaskToMe");
-   					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+				if ((!$lines[$i]->public) && $disabledproject) {
+					print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
+				} elseif ($disabledtask) {
+					$titleassigntask = $langs->trans("AssignTaskToMe");
+					if ($fuser->id != $user->id) {
+						$titleassigntask = $langs->trans("AssignTaskToUser", '...');
+					}
 
-   					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
-   				}
+					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
+				}
 				print '</td>';
 
 				print "</tr>\n";
@@ -1856,15 +1951,13 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 			// Call to show task with a lower level (task under the current task)
 			$inc++;
 			$level++;
-			if ($lines[$i]->id > 0)
-			{
+			if ($lines[$i]->id > 0) {
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
 				//var_dump($totalforeachday);
 				$ret = projectLinesPerWeek($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak, $arrayfields, $extrafields);
 				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
 				//var_dump($ret);
-				foreach ($ret as $key => $val)
-				{
+				foreach ($ret as $key => $val) {
 					$totalforeachday[$key] += $val;
 				}
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
@@ -1910,43 +2003,39 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 	$lineswithoutlevel0 = array();
 
 	// Create a smaller array with sublevels only to be used later. This increase dramatically performances.
-	if ($parent == 0) // Always and only if at first level
-	{
-		for ($i = 0; $i < $numlines; $i++)
-		{
-			if ($lines[$i]->fk_task_parent) $lineswithoutlevel0[] = $lines[$i];
+	if ($parent == 0) { // Always and only if at first level
+		for ($i = 0; $i < $numlines; $i++) {
+			if ($lines[$i]->fk_task_parent) {
+				$lineswithoutlevel0[] = $lines[$i];
+			}
 		}
 	}
 
 	//dol_syslog('projectLinesPerWeek inc='.$inc.' firstdaytoshow='.$firstdaytoshow.' task parent id='.$parent.' level='.$level." count(lines)=".$numlines." count(lineswithoutlevel0)=".count($lineswithoutlevel0));
 
-	if (empty($oldprojectforbreak))
-	{
+	if (empty($oldprojectforbreak)) {
 		$oldprojectforbreak = (empty($conf->global->PROJECT_TIMESHEET_DISABLEBREAK_ON_PROJECT) ? 0 : -1); // 0 = start break, -1 = never break
 	}
 
-	for ($i = 0; $i < $numlines; $i++)
-	{
-		if ($parent == 0) $level = 0;
+	for ($i = 0; $i < $numlines; $i++) {
+		if ($parent == 0) {
+			$level = 0;
+		}
 
-		if ($lines[$i]->fk_task_parent == $parent)
-		{
+		if ($lines[$i]->fk_task_parent == $parent) {
 			// If we want all or we have a role on task, we show it
-			if (empty($mine) || !empty($tasksrole[$lines[$i]->id]))
-			{
+			if (empty($mine) || !empty($tasksrole[$lines[$i]->id])) {
 				//dol_syslog("projectLinesPerWeek Found line ".$i.", a qualified task (i have role or want to show all tasks) with id=".$lines[$i]->id." project id=".$lines[$i]->fk_project);
 
 				// Break on a new project
-				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid)
-				{
+				if ($parent == 0 && $lines[$i]->fk_project != $lastprojectid) {
 					$lastprojectid = $lines[$i]->fk_project;
 					$projectstatic->id = $lines[$i]->fk_project;
 				}
 
 				//var_dump('--- '.$level.' '.$firstdaytoshow.' '.$fuser->id.' '.$projectstatic->id.' '.$workloadforid[$projectstatic->id]);
 				//var_dump($projectstatic->weekWorkLoadPerTask);
-				if (empty($workloadforid[$projectstatic->id]))
-				{
+				if (empty($workloadforid[$projectstatic->id])) {
 					$projectstatic->loadTimeSpentMonth($firstdaytoshow, 0, $fuser->id); // Load time spent from table projet_task_time for the project into this->weekWorkLoad and this->weekWorkLoadPerTask for all days of a week
 					$workloadforid[$projectstatic->id] = 1;
 				}
@@ -1970,14 +2059,14 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				$thirdpartystatic->name = $lines[$i]->thirdparty_name;
 				$thirdpartystatic->email = $lines[$i]->thirdparty_email;
 
-				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
-				{
+				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id)) {
 					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(6 + count($TWeek)).'">';
 					print $projectstatic->getNomUrl(1, '', 0, '<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
-					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
-					if ($projectstatic->title)
-					{
+					if ($thirdpartystatic->id > 0) {
+						print ' - '.$thirdpartystatic->getNomUrl(1);
+					}
+					if ($projectstatic->title) {
 						print ' - ';
 						print '<span class="secondary">'.$projectstatic->title.'</span>';
 					}
@@ -1985,7 +2074,9 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 					print '</tr>';
 				}
 
-				if ($oldprojectforbreak != -1) $oldprojectforbreak = $projectstatic->id;
+				if ($oldprojectforbreak != -1) {
+					$oldprojectforbreak = $projectstatic->id;
+				}
 				print '<tr class="oddeven" data-taskid="'.$lines[$i]->id.'">'."\n";
 
 				// User
@@ -2008,18 +2099,25 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				// Ref
 				print '<td class="nowrap">';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0; $k < $level; $k++) print '<div class="marginleftonly">';
+				for ($k = 0; $k < $level; $k++) {
+					print '<div class="marginleftonly">';
+				}
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
 				print '<span class="opacitymedium">'.$taskstatic->label.'</span>';
-				for ($k = 0; $k < $level; $k++) print "</div>";
+				for ($k = 0; $k < $level; $k++) {
+					print "</div>";
+				}
 				print "</td>\n";
 
 				// Planned Workload
 				print '<td class="leftborder plannedworkload right">';
-				if ($lines[$i]->planned_workload) print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
-				else print '--:--';
+				if ($lines[$i]->planned_workload) {
+					print convertSecondToTime($lines[$i]->planned_workload, 'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print '</td>';
 
 				// Progress declared %
@@ -2030,19 +2128,23 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				// Time spent by everybody
 				print '<td class="right">';
 				// $lines[$i]->duration is a denormalised field = summ of time spent by everybody for task. What we need is time consummed by user
-				if ($lines[$i]->duration)
-				{
+				if ($lines[$i]->duration) {
 					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$lines[$i]->id.'">';
 					print convertSecondToTime($lines[$i]->duration, 'allhourmin');
 					print '</a>';
-				} else print '--:--';
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				// Time spent by user
 				print '<td class="right">';
 				$tmptimespent = $taskstatic->getSummaryOfTimeSpent($fuser->id);
-				if ($tmptimespent['total_duration']) print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
-				else print '--:--';
+				if ($tmptimespent['total_duration']) {
+					print convertSecondToTime($tmptimespent['total_duration'], 'allhourmin');
+				} else {
+					print '--:--';
+				}
 				print "</td>\n";
 
 				$disabledproject = 1; $disabledtask = 1;
@@ -2050,14 +2152,12 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				//var_dump($lines[$i]);
 				//var_dump($projectsrole[$lines[$i]->fk_project]);
 				// If at least one role for project
-				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer)
-				{
+				if ($lines[$i]->public || !empty($projectsrole[$lines[$i]->fk_project]) || $user->rights->projet->all->creer) {
 					$disabledproject = 0;
 					$disabledtask = 0;
 				}
 				// If $restricteditformytask is on and I have no role on task, i disable edit
-				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id]))
-				{
+				if ($restricteditformytask && empty($tasksrole[$lines[$i]->id])) {
 					$disabledtask = 1;
 				}
 
@@ -2070,20 +2170,20 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				foreach ($TFirstDay as &$fday) {
 					$fday--;
 				}
-				foreach ($TWeek as $weekNb)
-				{
+				foreach ($TWeek as $weekNb) {
 					$weekWorkLoad = $projectstatic->monthWorkLoadPerTask[$weekNb][$lines[$i]->id];
 					$totalforeachweek[$weekNb] += $weekWorkLoad;
 
 					$alreadyspent = '';
-					if ($weekWorkLoad > 0) $alreadyspent = convertSecondToTime($weekWorkLoad, 'allhourmin');
+					if ($weekWorkLoad > 0) {
+						$alreadyspent = convertSecondToTime($weekWorkLoad, 'allhourmin');
+					}
 					$alttitle = $langs->trans("AddHereTimeSpentForWeek", $weekNb);
 
 
 					$tableCell = '<td class="center hide weekend">';
 					$placeholder = '';
-					if ($alreadyspent)
-					{
+					if ($alreadyspent) {
 						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$weekNb.']" value="'.$alreadyspent.'"></span>';
 						//$placeholder=' placeholder="00:00"';
 						//$tableCell.='+';
@@ -2099,11 +2199,13 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 
 				// Warning
 				print '<td class="right">';
-				if ((!$lines[$i]->public) && $disabledproject) print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
-				elseif ($disabledtask)
-				{
+				if ((!$lines[$i]->public) && $disabledproject) {
+					print $form->textwithpicto('', $langs->trans("UserIsNotContactOfProject"));
+				} elseif ($disabledtask) {
 					$titleassigntask = $langs->trans("AssignTaskToMe");
-					if ($fuser->id != $user->id) $titleassigntask = $langs->trans("AssignTaskToUser", '...');
+					if ($fuser->id != $user->id) {
+						$titleassigntask = $langs->trans("AssignTaskToUser", '...');
+					}
 
 					print $form->textwithpicto('', $langs->trans("TaskIsNotAssignedToUser", $titleassigntask));
 				}
@@ -2115,15 +2217,13 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 			// Call to show task with a lower level (task under the current task)
 			$inc++;
 			$level++;
-			if ($lines[$i]->id > 0)
-			{
+			if ($lines[$i]->id > 0) {
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level);
 				//var_dump($totalforeachday);
 				$ret = projectLinesPerMonth($inc, $firstdaytoshow, $fuser, $lines[$i]->id, ($parent == 0 ? $lineswithoutlevel0 : $lines), $level, $projectsrole, $tasksrole, $mine, $restricteditformytask, $isavailable, $oldprojectforbreak, $TWeek);
 				//var_dump('ret with parent='.$lines[$i]->id.' level='.$level);
 				//var_dump($ret);
-				foreach ($ret as $key => $val)
-				{
+				foreach ($ret as $key => $val) {
 					$totalforeachweek[$key] += $val;
 				}
 				//var_dump('totalforeachday after taskid='.$lines[$i]->id.' and previous one on level '.$level.' + subtasks');
@@ -2152,14 +2252,11 @@ function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
 {
 	//print 'Search in line with parent id = '.$parent.'<br>';
 	$numlines = count($lines);
-	for ($i = 0; $i < $numlines; $i++)
-	{
+	for ($i = 0; $i < $numlines; $i++) {
 		// Process line $lines[$i]
-		if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent)
-		{
+		if ($lines[$i]->fk_parent == $parent && $lines[$i]->id != $lines[$i]->fk_parent) {
 			// If task is legitimate to show, no more need to search deeper
-			if (isset($taskrole[$lines[$i]->id]))
-			{
+			if (isset($taskrole[$lines[$i]->id])) {
 				//print 'Found a legitimate task id='.$lines[$i]->id.'<br>';
 				$inc++;
 				return $inc;
@@ -2168,7 +2265,9 @@ function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
 			searchTaskInChild($inc, $lines[$i]->id, $lines, $taskrole);
 			//print 'Found inc='.$inc.'<br>';
 
-			if ($inc > 0) return $inc;
+			if ($inc > 0) {
+				return $inc;
+			}
 		}
 	}
 
@@ -2219,7 +2318,9 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	$project_year_filter = 0;
 
 	$title = $langs->trans("Projects");
-	if (strcmp($status, '') && $status >= 0) $title = $langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$status]);
+	if (strcmp($status, '') && $status >= 0) {
+		$title = $langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$status]);
+	}
 
 	$arrayidtypeofcontact = array();
 
@@ -2227,8 +2328,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	print '<table class="noborder centpercent">';
 
 	$sql = " FROM ".MAIN_DB_PREFIX."projet as p";
-	if ($mytasks)
-	{
+	if ($mytasks) {
 		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 		$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc";
@@ -2237,27 +2337,24 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	}
 	$sql .= " WHERE p.entity IN (".getEntity('project').")";
 	$sql .= " AND p.rowid IN (".$projectsListId.")";
-	if ($socid) $sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
-	if ($mytasks)
-	{
+	if ($socid) {
+		$sql .= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
+	}
+	if ($mytasks) {
 		$sql .= " AND p.rowid = t.fk_projet";
 		$sql .= " AND ec.element_id = t.rowid";
 		$sql .= " AND ec.fk_socpeople = ".$user->id;
 		$sql .= " AND ec.fk_c_type_contact = ctc.rowid"; // Replace the 2 lines with ec.fk_c_type_contact in $arrayidtypeofcontact
 		$sql .= " AND ctc.element = 'project_task'";
 	}
-	if ($status >= 0)
-	{
+	if ($status >= 0) {
 		$sql .= " AND p.fk_statut = ".(int) $status;
 	}
-	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
-	{
+	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE)) {
 		$project_year_filter = GETPOST("project_year_filter");
 		//Check if empty or invalid year. Wildcard ignores the sql check
-		if ($project_year_filter != "*")
-		{
-			if (empty($project_year_filter) || !ctype_digit($project_year_filter))
-			{
+		if ($project_year_filter != "*") {
+			if (empty($project_year_filter) || !ctype_digit($project_year_filter)) {
 				$project_year_filter = date("Y");
 			}
 			$sql .= " AND (p.dateo IS NULL OR p.dateo <= ".$db->idate(dol_get_last_day($project_year_filter, 12, false)).")";
@@ -2270,18 +2367,20 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	$sql1 = "SELECT p.rowid as projectid";
 	$sql1 .= $sql;
 	$resql = $db->query($sql1);
-	if ($resql)
-	{
+	if ($resql) {
 		$i = 0;
 		$num = $db->num_rows($resql);
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 			$arrayidofprojects[$objp->projectid] = $objp->projectid;
 			$i++;
 		}
-	} else dol_print_error($db);
-	if (empty($arrayidofprojects)) $arrayidofprojects[0] = -1;
+	} else {
+		dol_print_error($db);
+	}
+	if (empty($arrayidofprojects)) {
+		$arrayidofprojects[0] = -1;
+	}
 
 	// Get list of project with calculation on tasks
 	$sql2 = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_soc,";
@@ -2301,8 +2400,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	$sql2 .= " ORDER BY p.title, p.ref";
 
 	$resql = $db->query($sql2);
-	if ($resql)
-	{
+	if ($resql) {
 		$total_task = 0;
 		$total_opp_amount = 0;
 		$ponderated_opp_amount = 0;
@@ -2313,25 +2411,30 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 		print '<tr class="liste_titre">';
 		print_liste_field_titre($title.'<span class="badge marginleftonlyshort">'.$num.'</span>', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
 		print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
-			if (!in_array('prospectionstatus', $hiddenfields)) print_liste_field_titre("OpportunityStatus", "", "", "", "", '', $sortfield, $sortorder, 'right ');
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+			if (!in_array('prospectionstatus', $hiddenfields)) {
+				print_liste_field_titre("OpportunityStatus", "", "", "", "", '', $sortfield, $sortorder, 'right ');
+			}
 			print_liste_field_titre("OpportunityAmount", "", "", "", "", 'align="right"', $sortfield, $sortorder);
 			//print_liste_field_titre('OpportunityWeightedAmount', '', '', '', '', 'align="right"', $sortfield, $sortorder);
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 			print_liste_field_titre("Tasks", "", "", "", "", 'align="right"', $sortfield, $sortorder);
-			if (!in_array('plannedworkload', $hiddenfields))  print_liste_field_titre("PlannedWorkload", "", "", "", "", '', $sortfield, $sortorder, 'right ');
-			if (!in_array('declaredprogress', $hiddenfields)) print_liste_field_titre("ProgressDeclared", "", "", "", "", '', $sortfield, $sortorder, 'right ');
+			if (!in_array('plannedworkload', $hiddenfields)) {
+				print_liste_field_titre("PlannedWorkload", "", "", "", "", '', $sortfield, $sortorder, 'right ');
+			}
+			if (!in_array('declaredprogress', $hiddenfields)) {
+				print_liste_field_titre("ProgressDeclared", "", "", "", "", '', $sortfield, $sortorder, 'right ');
+			}
+		}
+		if (!in_array('projectstatus', $hiddenfields)) {
+			print_liste_field_titre("Status", "", "", "", "", '', $sortfield, $sortorder, 'right ');
 		}
-		if (!in_array('projectstatus', $hiddenfields)) print_liste_field_titre("Status", "", "", "", "", '', $sortfield, $sortorder, 'right ');
 		print "</tr>\n";
 
 		$total_plannedworkload = 0;
 		$total_declaredprogressworkload = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 
 			$projectstatic->id = $objp->projectid;
@@ -2340,8 +2443,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 
 			// Check is user has read permission on project
 			$userAccess = $projectstatic->restrictedProjectArea($user);
-			if ($userAccess >= 0)
-			{
+			if ($userAccess >= 0) {
 				$projectstatic->ref = $objp->ref;
 				$projectstatic->status = $objp->status;
 				$projectstatic->title = $objp->title;
@@ -2352,12 +2454,13 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 
 				print '<td class="tdoverflowmax150">';
 				print $projectstatic->getNomUrl(1, '', 0, '', '-', 0, -1, 'nowraponall');
-				if (!in_array('projectlabel', $hiddenfields)) print '<br><span class="opacitymedium">'.dol_trunc($objp->title, 24).'</span>';
+				if (!in_array('projectlabel', $hiddenfields)) {
+					print '<br><span class="opacitymedium">'.dol_trunc($objp->title, 24).'</span>';
+				}
 				print '</td>';
 
 				print '<td class="nowraponall tdoverflowmax100">';
-				if ($objp->fk_soc > 0)
-				{
+				if ($objp->fk_soc > 0) {
 					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->socname;
 					//$thirdpartystatic->name_alias = $objp->name_alias;
@@ -2374,8 +2477,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 				}
 				print '</td>';
 
-				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-				{
+				if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 					if (!in_array('prospectionstatus', $hiddenfields)) {
 						print '<td class="center tdoverflowmax75">';
 						// Because color of prospection status has no meaning yet, it is used if hidden constant is set
@@ -2409,22 +2511,21 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 						$alttext = $langs->trans("OpportunityWeightedAmount").' '.price($opp_weighted_amount, 0, '', 1, -1, 0, $conf->currency);
 						$ponderated_opp_amount += price2num($opp_weighted_amount);
 					}
-					if ($objp->opp_amount) print '<span title="'.$alttext.'">'.price($objp->opp_amount, 0, '', 1, -1, 0, $conf->currency).'</span>';
+					if ($objp->opp_amount) {
+						print '<span title="'.$alttext.'">'.price($objp->opp_amount, 0, '', 1, -1, 0, $conf->currency).'</span>';
+					}
 					print '</td>';
 				}
 
-				if (empty($conf->global->PROJECT_HIDE_TASKS))
-				{
+				if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 					print '<td class="right">'.$objp->nb.'</td>';
 
 					$plannedworkload = $objp->planned_workload;
 					$total_plannedworkload += $plannedworkload;
-					if (!in_array('plannedworkload', $hiddenfields))
-					{
+					if (!in_array('plannedworkload', $hiddenfields)) {
 						print '<td class="right">'.($plannedworkload ?convertSecondToTime($plannedworkload) : '').'</td>';
 					}
-					if (!in_array('declaredprogress', $hiddenfields))
-					{
+					if (!in_array('declaredprogress', $hiddenfields)) {
 						$declaredprogressworkload = $objp->declared_progess_workload;
 						$total_declaredprogressworkload += $declaredprogressworkload;
 						print '<td class="right">';
@@ -2451,8 +2552,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 
 		print '<tr class="liste_total">';
 		print '<td>'.$langs->trans("Total")."</td><td></td>";
-		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			if (!in_array('prospectionstatus', $hiddenfields)) {
 				print '<td class="liste_total"></td>';
 			}
@@ -2461,11 +2561,14 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 			print $form->textwithpicto(price($total_opp_amount, 0, '', 1, -1, 0, $conf->currency), $langs->trans("OpportunityPonderatedAmountDesc").' : '.price($ponderated_opp_amount, 0, '', 1, -1, 0, $conf->currency));
 			print '</td>';
 		}
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 			print '<td class="liste_total right">'.$total_task.'</td>';
-			if (!in_array('plannedworkload', $hiddenfields))  print '<td class="liste_total right">'.($total_plannedworkload ?convertSecondToTime($total_plannedworkload) : '').'</td>';
-			if (!in_array('declaredprogress', $hiddenfields)) print '<td class="liste_total right">'.($total_plannedworkload ?round(100 * $total_declaredprogressworkload / $total_plannedworkload, 0).'%' : '').'</td>';
+			if (!in_array('plannedworkload', $hiddenfields)) {
+				print '<td class="liste_total right">'.($total_plannedworkload ?convertSecondToTime($total_plannedworkload) : '').'</td>';
+			}
+			if (!in_array('declaredprogress', $hiddenfields)) {
+				print '<td class="liste_total right">'.($total_plannedworkload ?round(100 * $total_declaredprogressworkload / $total_plannedworkload, 0).'%' : '').'</td>';
+			}
 		}
 		if (!in_array('projectstatus', $hiddenfields)) {
 			print '<td class="liste_total"></td>';
@@ -2480,8 +2583,7 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 	print "</table>";
 	print '</div>';
 
-	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE))
-	{
+	if (!empty($conf->global->PROJECT_LIMIT_YEAR_RANGE)) {
 		//Add the year filter input
 		print '<form method="get" action="'.$_SERVER["PHP_SELF"].'">';
 		print '<table width="100%">';
@@ -2510,8 +2612,12 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 	$plannedworkloadoutputformat = 'allhourmin';
 	$timespentoutputformat = 'allhourmin';
-	if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) $plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
-	if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) $timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+	if (!empty($conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT)) {
+		$plannedworkloadoutputformat = $conf->global->PROJECT_PLANNED_WORKLOAD_FORMAT;
+	}
+	if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
+		$timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
+	}
 
 	if (empty($task->progress) && !empty($hideOnProgressNull)) {
 		return '';
@@ -2550,8 +2656,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 	$out .= '<div class="progress-group">';
 
-	if ($label !== false)
-	{
+	if ($label !== false) {
 		$out .= '    <span class="progress-text">';
 
 		if ($label !== true) {
@@ -2563,21 +2668,25 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 	}
 
 
-	if ($progressNumber !== false)
-	{
+	if ($progressNumber !== false) {
 		$out .= '    <span class="progress-number">';
 		if ($progressNumber !== true) {
 			$out .= $progressNumber; // replace label by param
 		} else {
-			if ($task->hasDelay()) $out .= img_warning($langs->trans("Late")).' ';
+			if ($task->hasDelay()) {
+				$out .= img_warning($langs->trans("Late")).' ';
+			}
 
 			$url = DOL_URL_ROOT.'/projet/tasks/time.php?id='.$task->id;
 
 			$out .= !empty($diff) ? $diff.' ' : '';
 			$out .= '<a href="'.$url.'" >';
 			$out .= '<b title="'.$langs->trans('TimeSpent').'" >';
-			if ($task->duration_effective) $out .= convertSecondToTime($task->duration_effective, $timespentoutputformat);
-			else $out .= '--:--';
+			if ($task->duration_effective) {
+				$out .= convertSecondToTime($task->duration_effective, $timespentoutputformat);
+			} else {
+				$out .= '--:--';
+			}
 			$out .= '</b>';
 			$out .= '</a>';
 
@@ -2585,8 +2694,11 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 
 			$out .= '<a href="'.$url.'" >';
 			$out .= '<span title="'.$langs->trans('PlannedWorkload').'" >';
-			if ($task->planned_workload) $out .= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
-			else $out .= '--:--';
+			if ($task->planned_workload) {
+				$out .= convertSecondToTime($task->planned_workload, $plannedworkloadoutputformat);
+			} else {
+				$out .= '--:--';
+			}
 			$out .= '</a>';
 		}
 		$out .= '    </span>';
@@ -2629,8 +2741,7 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
 
 	$out = '';
 	$badgeClass = '';
-	if ($task->progress != '')
-	{
+	if ($task->progress != '') {
 		// TODO : manage 100%
 
 		// define color according to time spend vs workload
@@ -2648,10 +2759,14 @@ function getTaskProgressBadge($task, $label = '', $tooltip = '')
 				}
 			} elseif (doubleval($progressCalculated) > doubleval($task->progress)) { // warning if close at 10%
 				$badgeClass .= 'badge-warning';
-				if (empty($tooltip)) $tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
+				if (empty($tooltip)) {
+					$tooltip = $task->progress.'% < '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
+				}
 			} else {
 				$badgeClass .= 'badge-success';
-				if (empty($tooltip)) $tooltip = $task->progress.'% >= '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
+				if (empty($tooltip)) {
+					$tooltip = $task->progress.'% >= '.$langs->trans("TimeConsumed").' '.$progressCalculated.'%';
+				}
 			}
 		}
 	}
diff --git a/htdocs/core/lib/propal.lib.php b/htdocs/core/lib/propal.lib.php
index bd3a30151da..3ddd3ab1b2b 100644
--- a/htdocs/core/lib/propal.lib.php
+++ b/htdocs/core/lib/propal.lib.php
@@ -43,24 +43,28 @@ function propal_prepare_head($object)
 	$h++;
 
 	if ((empty($conf->commande->enabled) && ((!empty($conf->expedition->enabled) && !empty($conf->expedition_bon->enabled) && $user->rights->expedition->lire)
-		|| (!empty($conf->expedition->enabled) && !empty($conf->delivery_note->enabled) && $user->rights->expedition->delivery->lire))))
-	{
+		|| (!empty($conf->expedition->enabled) && !empty($conf->delivery_note->enabled) && $user->rights->expedition->delivery->lire)))) {
 		$langs->load("sendings");
 		$text = '';
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/propal.php?id='.$object->id;
-		if ($conf->expedition_bon->enabled) $text = $langs->trans("Shipment");
-		if ($conf->delivery_note->enabled)  $text .= '/'.$langs->trans("Receivings");
+		if ($conf->expedition_bon->enabled) {
+			$text = $langs->trans("Shipment");
+		}
+		if ($conf->delivery_note->enabled) {
+			$text .= '/'.$langs->trans("Receivings");
+		}
 		$head[$h][1] = $text;
 		$head[$h][2] = 'shipping';
 		$h++;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -71,14 +75,19 @@ function propal_prepare_head($object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'propal');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/comm/propal/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -90,7 +99,9 @@ function propal_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/comm/propal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
diff --git a/htdocs/core/lib/receiptprinter.lib.php b/htdocs/core/lib/receiptprinter.lib.php
index e5589f30707..7bbfbc66387 100644
--- a/htdocs/core/lib/receiptprinter.lib.php
+++ b/htdocs/core/lib/receiptprinter.lib.php
@@ -47,8 +47,7 @@ function receiptprinteradmin_prepare_head($mode)
 	$head[$h][2] = 'template';
 	$h++;
 
-	if ($mode == 'test')
-	{
+	if ($mode == 'test') {
 		$head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=test";
 		$head[$h][1] = $langs->trans("TargetedPrinter");
 		$head[$h][2] = 'test';
diff --git a/htdocs/core/lib/reception.lib.php b/htdocs/core/lib/reception.lib.php
index f36295e31f3..42355497286 100644
--- a/htdocs/core/lib/reception.lib.php
+++ b/htdocs/core/lib/reception.lib.php
@@ -47,18 +47,18 @@ function reception_prepare_head(Reception $object)
 	$head[$h][2] = 'reception';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$objectsrc = $object;
-		if ($object->origin == 'commande' && $object->origin_id > 0)
-		{
+		if ($object->origin == 'commande' && $object->origin_id > 0) {
 			$objectsrc = new Commande($db);
 			$objectsrc->fetch($object->origin_id);
 		}
 		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT."/reception/contact.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -70,11 +70,17 @@ function reception_prepare_head(Reception $object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'reception');
 
 	$nbNote = 0;
-	if (!empty($object->note_private)) $nbNote++;
-	if (!empty($object->note_public)) $nbNote++;
+	if (!empty($object->note_private)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_public)) {
+		$nbNote++;
+	}
 	$head[$h][0] = DOL_URL_ROOT."/reception/note.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	if ($nbNote > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	}
 	$head[$h][2] = 'note';
 	$h++;
 
@@ -103,16 +109,14 @@ function reception_admin_prepare_head()
 
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'reception_admin');
 
-	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
-	{
+	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/reception_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFields");
 		$head[$h][2] = 'attributes_reception';
 		$h++;
 	}
 
-	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION))
-	{
+	if (!empty($conf->global->MAIN_SUBMODULE_RECEPTION)) {
 		$head[$h][0] = DOL_URL_ROOT.'/admin/commande_fournisseur_dispatch_extrafields.php';
 		$head[$h][1] = $langs->trans("ExtraFieldsLines");
 		$head[$h][2] = 'attributeslines_reception';
diff --git a/htdocs/core/lib/report.lib.php b/htdocs/core/lib/report.lib.php
index b23acd76a5b..a4279d27a95 100644
--- a/htdocs/core/lib/report.lib.php
+++ b/htdocs/core/lib/report.lib.php
@@ -44,7 +44,9 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 
 	print "\n\n<!-- start banner of report -->\n";
 
-	if (!empty($varlink)) $varlink = '?'.$varlink;
+	if (!empty($varlink)) {
+		$varlink = '?'.$varlink;
+	}
 
 	$head = array();
 
@@ -58,8 +60,7 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 
 	print dol_get_fiche_head($head, 'report');
 
-	foreach ($moreparam as $key => $value)
-	{
+	foreach ($moreparam as $key => $value) {
 		 print '<input type="hidden" name="'.$key.'" value="'.$value.'">'."\n";
 	}
 
@@ -73,17 +74,20 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 	print '<td>';
 	print $reportname;
 	print '</td>';
-	if ($variante) print '<td></td>';
+	if ($variante) {
+		print '<td></td>';
+	}
 	print '</tr>'."\n";
 
 	// Calculation mode
-	if ($calcmode)
-	{
+	if ($calcmode) {
 		print '<tr>';
 		print '<td width="150">'.$langs->trans("CalculationMode").'</td>';
 		print '<td>';
 		print $calcmode;
-		if ($variante) print '<td></td>';
+		if ($variante) {
+			print '<td></td>';
+		}
 		print '</td>';
 		print '</tr>'."\n";
 	}
@@ -92,8 +96,12 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportPeriod").'</td>';
 	print '<td>';
-	if ($period) print $period;
-	if ($variante) print '<td class="nowraponall">'.$periodlink.'</td>';
+	if ($period) {
+		print $period;
+	}
+	if ($variante) {
+		print '<td class="nowraponall">'.$periodlink.'</td>';
+	}
 	print '</td>';
 	print '</tr>'."\n";
 
@@ -101,7 +109,9 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 	print '<tr>';
 	print '<td>'.$langs->trans("ReportDescription").'</td>';
 	print '<td>'.$description.'</td>';
-	if ($variante) print '<td></td>';
+	if ($variante) {
+		print '<td></td>';
+	}
 	print '</tr>'."\n";
 
 	// Ligne d'export
@@ -110,7 +120,9 @@ function report_header($reportname, $notused, $period, $periodlink, $description
 	print '<td>';
 	print dol_print_date($builddate, 'dayhour');
 	print '</td>';
-	if ($variante) print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+	if ($variante) {
+		print '<td>'.($exportlink ? $langs->trans("Export").': '.$exportlink : '').'</td>';
+	}
 	print '</tr>'."\n";
 
 	print '</table>'."\n";
diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
index a4ba796078f..29cd8a5b089 100644
--- a/htdocs/core/lib/resource.lib.php
+++ b/htdocs/core/lib/resource.lib.php
@@ -40,12 +40,13 @@ function resource_prepare_head($object)
 	$head[$h][2] = 'resource';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY))) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -56,14 +57,19 @@ function resource_prepare_head($object)
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'resource');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/resource/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -73,14 +79,15 @@ function resource_prepare_head($object)
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$head[$h][0] = DOL_URL_ROOT.'/resource/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if ($nbFiles > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';
+	if ($nbFiles > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbFiles.'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/resource/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
diff --git a/htdocs/core/lib/salaries.lib.php b/htdocs/core/lib/salaries.lib.php
index f4662f43991..c52246203e2 100644
--- a/htdocs/core/lib/salaries.lib.php
+++ b/htdocs/core/lib/salaries.lib.php
@@ -50,7 +50,9 @@ function salaries_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/salaries/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 9d18dd1dd85..6b95187e5df 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -37,21 +37,17 @@
  */
 function dol_encode($chain, $key = '1')
 {
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
-	{
+	if (is_numeric($key) && $key == '1') {	// rule 1 is offset of 17 for char
 		$output_tab = array();
 		$strlength = dol_strlen($chain);
-		for ($i = 0; $i < $strlength; $i++)
-		{
+		for ($i = 0; $i < $strlength; $i++) {
 			$output_tab[$i] = chr(ord(substr($chain, $i, 1)) + 17);
 		}
 		$chain = implode("", $output_tab);
-	} elseif ($key)
-	{
+	} elseif ($key) {
 		$result = '';
 		$strlength = dol_strlen($chain);
-		for ($i = 0; $i < $strlength; $i++)
-		{
+		for ($i = 0; $i < $strlength; $i++) {
 			$keychar = substr($key, ($i % strlen($key)) - 1, 1);
 			$result .= chr(ord(substr($chain, $i, 1)) + (ord($keychar) - 65));
 		}
@@ -74,22 +70,18 @@ function dol_decode($chain, $key = '1')
 {
 	$chain = base64_decode($chain);
 
-	if (is_numeric($key) && $key == '1')	// rule 1 is offset of 17 for char
-	{
+	if (is_numeric($key) && $key == '1') {	// rule 1 is offset of 17 for char
 		$output_tab = array();
 		$strlength = dol_strlen($chain);
-		for ($i = 0; $i < $strlength; $i++)
-		{
+		for ($i = 0; $i < $strlength; $i++) {
 			$output_tab[$i] = chr(ord(substr($chain, $i, 1)) - 17);
 		}
 
 		$chain = implode("", $output_tab);
-	} elseif ($key)
-	{
+	} elseif ($key) {
 		$result = '';
 		$strlength = dol_strlen($chain);
-		for ($i = 0; $i < $strlength; $i++)
-		{
+		for ($i = 0; $i < $strlength; $i++) {
 			$keychar = substr($key, ($i % strlen($key)) - 1, 1);
 			$result .= chr(ord(substr($chain, $i, 1)) - (ord($keychar) - 65));
 		}
@@ -115,21 +107,30 @@ function dol_hash($chain, $type = '0')
 	global $conf;
 
 	// No need to add salt for password_hash
-	if (($type == '0' || $type == 'auto') && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash'))
-	{
+	if (($type == '0' || $type == 'auto') && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_hash')) {
 		return password_hash($chain, PASSWORD_DEFAULT);
 	}
 
 	// Salt value
-	if (!empty($conf->global->MAIN_SECURITY_SALT) && $type != '4' && $type !== 'md5openldap') $chain = $conf->global->MAIN_SECURITY_SALT.$chain;
+	if (!empty($conf->global->MAIN_SECURITY_SALT) && $type != '4' && $type !== 'md5openldap') {
+		$chain = $conf->global->MAIN_SECURITY_SALT.$chain;
+	}
 
-	if ($type == '1' || $type == 'sha1') return sha1($chain);
-	elseif ($type == '2' || $type == 'sha1md5') return sha1(md5($chain));
-	elseif ($type == '3' || $type == 'md5') return md5($chain);
-	elseif ($type == '4' || $type == 'md5openldap') return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
-	elseif ($type == '5') return hash('sha256', $chain);
-	elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') return sha1($chain);
-	elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') return sha1(md5($chain));
+	if ($type == '1' || $type == 'sha1') {
+		return sha1($chain);
+	} elseif ($type == '2' || $type == 'sha1md5') {
+		return sha1(md5($chain));
+	} elseif ($type == '3' || $type == 'md5') {
+		return md5($chain);
+	} elseif ($type == '4' || $type == 'md5openldap') {
+		return '{md5}'.base64_encode(mhash(MHASH_MD5, $chain)); // For OpenLdap with md5 (based on an unencrypted password in base)
+	} elseif ($type == '5') {
+		return hash('sha256', $chain);
+	} elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1') {
+		return sha1($chain);
+	} elseif (!empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'sha1md5') {
+		return sha1(md5($chain));
+	}
 
 	// No particular encoding defined, use default
 	return md5($chain);
@@ -151,9 +152,13 @@ function dol_verifyHash($chain, $hash, $type = '0')
 	global $conf;
 
 	if ($type == '0' && !empty($conf->global->MAIN_SECURITY_HASH_ALGO) && $conf->global->MAIN_SECURITY_HASH_ALGO == 'password_hash' && function_exists('password_verify')) {
-		if ($hash[0] == '$') return password_verify($chain, $hash);
-		elseif (strlen($hash) == 32) return dol_verifyHash($chain, $hash, '3'); // md5
-		elseif (strlen($hash) == 40) return dol_verifyHash($chain, $hash, '2'); // sha1md5
+		if ($hash[0] == '$') {
+			return password_verify($chain, $hash);
+		} elseif (strlen($hash) == 32) {
+			return dol_verifyHash($chain, $hash, '3'); // md5
+		} elseif (strlen($hash) == 40) {
+			return dol_verifyHash($chain, $hash, '2'); // sha1md5
+		}
 
 		return false;
 	}
@@ -192,34 +197,57 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 
 	// Fix syntax of $features param
 	$originalfeatures = $features;
-	if ($features == 'facturerec') $features = 'facture';
-	if ($features == 'mo') $features = 'mrp';
-	if ($features == 'member') $features = 'adherent';
-	if ($features == 'subscription') { $features = 'adherent'; $feature2 = 'cotisation'; };
-	if ($features == 'websitepage') { $features = 'website'; $tableandshare = 'website_page'; $parentfortableentity = 'fk_website@website'; }
-	if ($features == 'project') $features = 'projet';
-	if ($features == 'product') $features = 'produit';
+	if ($features == 'facturerec') {
+		$features = 'facture';
+	}
+	if ($features == 'mo') {
+		$features = 'mrp';
+	}
+	if ($features == 'member') {
+		$features = 'adherent';
+	}
+	if ($features == 'subscription') {
+		$features = 'adherent'; $feature2 = 'cotisation';
+	};
+	if ($features == 'websitepage') {
+		$features = 'website'; $tableandshare = 'website_page'; $parentfortableentity = 'fk_website@website';
+	}
+	if ($features == 'project') {
+		$features = 'projet';
+	}
+	if ($features == 'product') {
+		$features = 'produit';
+	}
 
 	// Get more permissions checks from hooks
 	$parameters = array('features'=>$features, 'originalfeatures'=>$originalfeatures, 'objectid'=>$objectid, 'dbt_select'=>$dbt_select, 'idtype'=>$dbt_select, 'isdraft'=>$isdraft);
 	$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
 
 	if (isset($hookmanager->resArray['result'])) {
-		if ($hookmanager->resArray['result'] == 0) accessforbidden(); // Module returns 0, so access forbidden
+		if ($hookmanager->resArray['result'] == 0) {
+			accessforbidden(); // Module returns 0, so access forbidden
+		}
 	}
 	if ($reshook > 0) {		// No other test done.
 		return 1;
 	}
 
-	if ($dbt_select != 'rowid' && $dbt_select != 'id') $objectid = "'".$objectid."'";
+	if ($dbt_select != 'rowid' && $dbt_select != 'id') {
+		$objectid = "'".$objectid."'";
+	}
 
 	// Features/modules to check
 	$featuresarray = array($features);
-	if (preg_match('/&/', $features)) $featuresarray = explode("&", $features);
-	elseif (preg_match('/\|/', $features)) $featuresarray = explode("|", $features);
+	if (preg_match('/&/', $features)) {
+		$featuresarray = explode("&", $features);
+	} elseif (preg_match('/\|/', $features)) {
+		$featuresarray = explode("|", $features);
+	}
 
 	// More subfeatures to check
-	if (!empty($feature2)) $feature2 = explode("|", $feature2);
+	if (!empty($feature2)) {
+		$feature2 = explode("|", $feature2);
+	}
 
 	$listofmodules = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
 
@@ -227,33 +255,59 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	$readok = 1; $nbko = 0;
 	foreach ($featuresarray as $feature) {	// first we check nb of test ko
 		$featureforlistofmodule = $feature;
-		if ($featureforlistofmodule == 'produit') $featureforlistofmodule = 'product';
+		if ($featureforlistofmodule == 'produit') {
+			$featureforlistofmodule = 'product';
+		}
 		if (!empty($user->socid) && !empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && !in_array($featureforlistofmodule, $listofmodules)) {	// If limits on modules for external users, module must be into list of modules for external users
 			$readok = 0; $nbko++;
 			continue;
 		}
 
 		if ($feature == 'societe') {
-			if (!$user->rights->societe->lire && !$user->rights->fournisseur->lire) { $readok = 0; $nbko++; }
+			if (!$user->rights->societe->lire && !$user->rights->fournisseur->lire) {
+				$readok = 0; $nbko++;
+			}
 		} elseif ($feature == 'contact') {
-			if (!$user->rights->societe->contact->lire) { $readok = 0; $nbko++; }
+			if (!$user->rights->societe->contact->lire) {
+				$readok = 0; $nbko++;
+			}
 		} elseif ($feature == 'produit|service') {
-			if (!$user->rights->produit->lire && !$user->rights->service->lire) { $readok = 0; $nbko++; }
+			if (!$user->rights->produit->lire && !$user->rights->service->lire) {
+				$readok = 0; $nbko++;
+			}
 		} elseif ($feature == 'prelevement') {
-			if (!$user->rights->prelevement->bons->lire) { $readok = 0; $nbko++; }
+			if (!$user->rights->prelevement->bons->lire) {
+				$readok = 0; $nbko++;
+			}
 		} elseif ($feature == 'cheque') {
-			if (!$user->rights->banque->cheque) { $readok = 0; $nbko++; }
+			if (!$user->rights->banque->cheque) {
+				$readok = 0; $nbko++;
+			}
 		} elseif ($feature == 'projet') {
-			if (!$user->rights->projet->lire && !$user->rights->projet->all->lire) { $readok = 0; $nbko++; }
+			if (!$user->rights->projet->lire && !$user->rights->projet->all->lire) {
+				$readok = 0; $nbko++;
+			}
 		} elseif ($feature == 'payment') {
-			if (!$user->rights->facture->lire) { $readok = 0; $nbko++; }
+			if (!$user->rights->facture->lire) {
+				$readok = 0; $nbko++;
+			}
 		} elseif ($feature == 'payment_supplier') {
-			if (!$user->rights->fournisseur->facture->lire) { $readok = 0; $nbko++; }
+			if (!$user->rights->fournisseur->facture->lire) {
+				$readok = 0; $nbko++;
+			}
 		} elseif (!empty($feature2)) { 													// This is for permissions on 2 levels
 			$tmpreadok = 1;
 			foreach ($feature2 as $subfeature) {
-				if ($subfeature == 'user' && $user->id == $objectid) continue; // A user can always read its own card
-				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok = 0; } elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok = 0; } else { $tmpreadok = 1; break; } // Break is to bypass second test if the first is ok
+				if ($subfeature == 'user' && $user->id == $objectid) {
+					continue; // A user can always read its own card
+				}
+				if (!empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) {
+					$tmpreadok = 0;
+				} elseif (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) {
+					$tmpreadok = 0;
+				} else {
+					$tmpreadok = 1; break;
+				} // Break is to bypass second test if the first is ok
 			}
 			if (!$tmpreadok) {	// We found a test on feature that is ko
 				$readok = 0; // All tests are ko (we manage here the and, the or will be managed later using $nbko).
@@ -262,14 +316,20 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		} elseif (!empty($feature) && ($feature != 'user' && $feature != 'usergroup')) {		// This is permissions on 1 level
 			if (empty($user->rights->$feature->lire)
 				&& empty($user->rights->$feature->read)
-				&& empty($user->rights->$feature->run)) { $readok = 0; $nbko++; }
+				&& empty($user->rights->$feature->run)) {
+				$readok = 0; $nbko++;
+			}
 		}
 	}
 
 	// If a or and at least one ok
-	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $readok = 1;
+	if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+		$readok = 1;
+	}
 
-	if (!$readok) accessforbidden();
+	if (!$readok) {
+		accessforbidden();
+	}
 	//print "Read access is ok";
 
 	// Check write permission from module (we need to know write permission to create but also to delete drafts record or to upload files)
@@ -277,30 +337,48 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	$wemustcheckpermissionforcreate = (GETPOST('sendit', 'alpha') || GETPOST('linkit', 'alpha') || GETPOST('action', 'aZ09') == 'create' || GETPOST('action', 'aZ09') == 'update');
 	$wemustcheckpermissionfordeletedraft = ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete');
 
-	if ($wemustcheckpermissionforcreate || $wemustcheckpermissionfordeletedraft)
-	{
-		foreach ($featuresarray as $feature)
-		{
+	if ($wemustcheckpermissionforcreate || $wemustcheckpermissionfordeletedraft) {
+		foreach ($featuresarray as $feature) {
 			if ($feature == 'contact') {
-				if (!$user->rights->societe->contact->creer) { $createok = 0; $nbko++; }
+				if (!$user->rights->societe->contact->creer) {
+					$createok = 0; $nbko++;
+				}
 			} elseif ($feature == 'produit|service') {
-				if (!$user->rights->produit->creer && !$user->rights->service->creer) { $createok = 0; $nbko++; }
+				if (!$user->rights->produit->creer && !$user->rights->service->creer) {
+					$createok = 0; $nbko++;
+				}
 			} elseif ($feature == 'prelevement') {
-				if (!$user->rights->prelevement->bons->creer) { $createok = 0; $nbko++; }
+				if (!$user->rights->prelevement->bons->creer) {
+					$createok = 0; $nbko++;
+				}
 			} elseif ($feature == 'commande_fournisseur') {
-				if (!$user->rights->fournisseur->commande->creer) { $createok = 0; $nbko++; }
+				if (!$user->rights->fournisseur->commande->creer) {
+					$createok = 0; $nbko++;
+				}
 			} elseif ($feature == 'banque') {
-				if (!$user->rights->banque->modifier) { $createok = 0; $nbko++; }
+				if (!$user->rights->banque->modifier) {
+					$createok = 0; $nbko++;
+				}
 			} elseif ($feature == 'cheque') {
-				if (!$user->rights->banque->cheque) { $createok = 0; $nbko++; }
+				if (!$user->rights->banque->cheque) {
+					$createok = 0; $nbko++;
+				}
 			} elseif ($feature == 'import') {
-				if (!$user->rights->import->run) { $createok = 0; $nbko++; }
+				if (!$user->rights->import->run) {
+					$createok = 0; $nbko++;
+				}
 			} elseif ($feature == 'ecm') {
-				if (!$user->rights->ecm->upload) { $createok = 0; $nbko++; }
+				if (!$user->rights->ecm->upload) {
+					$createok = 0; $nbko++;
+				}
 			} elseif (!empty($feature2)) {														// This is for permissions on one level
 				foreach ($feature2 as $subfeature) {
-					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->creer) continue; // User can edit its own card
-					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->password) continue; // User can edit its own password
+					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->creer) {
+						continue; // User can edit its own card
+					}
+					if ($subfeature == 'user' && $user->id == $objectid && $user->rights->user->self->password) {
+						continue; // User can edit its own password
+					}
 
 					if (empty($user->rights->$feature->$subfeature->creer)
 					&& empty($user->rights->$feature->$subfeature->write)
@@ -325,82 +403,101 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $createok = 1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+			$createok = 1;
+		}
 
-		if ($wemustcheckpermissionforcreate && !$createok) accessforbidden();
+		if ($wemustcheckpermissionforcreate && !$createok) {
+			accessforbidden();
+		}
 		//print "Write access is ok";
 	}
 
 	// Check create user permission
 	$createuserok = 1;
-	if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes')
-	{
-		if (!$user->rights->user->user->creer) $createuserok = 0;
+	if (GETPOST('action', 'aZ09') == 'confirm_create_user' && GETPOST("confirm", 'aZ09') == 'yes') {
+		if (!$user->rights->user->user->creer) {
+			$createuserok = 0;
+		}
 
-		if (!$createuserok) accessforbidden();
+		if (!$createuserok) {
+			accessforbidden();
+		}
 		//print "Create user access is ok";
 	}
 
 	// Check delete permission from module
 	$deleteok = 1; $nbko = 0;
-	if ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete')
-	{
-		foreach ($featuresarray as $feature)
-		{
-			if ($feature == 'contact')
-			{
-				if (!$user->rights->societe->contact->supprimer) $deleteok = 0;
-			} elseif ($feature == 'produit|service')
-			{
-				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) $deleteok = 0;
-			} elseif ($feature == 'commande_fournisseur')
-			{
-				if (!$user->rights->fournisseur->commande->supprimer) $deleteok = 0;
-			} elseif ($feature == 'banque')
-			{
-				if (!$user->rights->banque->modifier) $deleteok = 0;
-			} elseif ($feature == 'cheque')
-			{
-				if (!$user->rights->banque->cheque) $deleteok = 0;
-			} elseif ($feature == 'ecm')
-			{
-				if (!$user->rights->ecm->upload) $deleteok = 0;
-			} elseif ($feature == 'ftp')
-			{
-				if (!$user->rights->ftp->write) $deleteok = 0;
-			} elseif ($feature == 'salaries')
-			{
-				if (!$user->rights->salaries->delete) $deleteok = 0;
-			} elseif ($feature == 'salaries')
-			{
-				if (!$user->rights->salaries->delete) $deleteok = 0;
-			} elseif (!empty($feature2))							// This is for permissions on 2 levels
-			{
-				foreach ($feature2 as $subfeature)
-				{
-					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) $deleteok = 0;
-					else { $deleteok = 1; break; } // For bypass the second test if the first is ok
+	if ((GETPOST("action", "aZ09") == 'confirm_delete' && GETPOST("confirm", "aZ09") == 'yes') || GETPOST("action", "aZ09") == 'delete') {
+		foreach ($featuresarray as $feature) {
+			if ($feature == 'contact') {
+				if (!$user->rights->societe->contact->supprimer) {
+					$deleteok = 0;
 				}
-			} elseif (!empty($feature))							// This is used for permissions on 1 level
-			{
+			} elseif ($feature == 'produit|service') {
+				if (!$user->rights->produit->supprimer && !$user->rights->service->supprimer) {
+					$deleteok = 0;
+				}
+			} elseif ($feature == 'commande_fournisseur') {
+				if (!$user->rights->fournisseur->commande->supprimer) {
+					$deleteok = 0;
+				}
+			} elseif ($feature == 'banque') {
+				if (!$user->rights->banque->modifier) {
+					$deleteok = 0;
+				}
+			} elseif ($feature == 'cheque') {
+				if (!$user->rights->banque->cheque) {
+					$deleteok = 0;
+				}
+			} elseif ($feature == 'ecm') {
+				if (!$user->rights->ecm->upload) {
+					$deleteok = 0;
+				}
+			} elseif ($feature == 'ftp') {
+				if (!$user->rights->ftp->write) {
+					$deleteok = 0;
+				}
+			} elseif ($feature == 'salaries') {
+				if (!$user->rights->salaries->delete) {
+					$deleteok = 0;
+				}
+			} elseif ($feature == 'salaries') {
+				if (!$user->rights->salaries->delete) {
+					$deleteok = 0;
+				}
+			} elseif (!empty($feature2)) {							// This is for permissions on 2 levels
+				foreach ($feature2 as $subfeature) {
+					if (empty($user->rights->$feature->$subfeature->supprimer) && empty($user->rights->$feature->$subfeature->delete)) {
+						$deleteok = 0;
+					} else {
+						$deleteok = 1; break;
+					} // For bypass the second test if the first is ok
+				}
+			} elseif (!empty($feature)) {							// This is used for permissions on 1 level
 				//print '<br>feature='.$feature.' creer='.$user->rights->$feature->supprimer.' write='.$user->rights->$feature->delete;
 				if (empty($user->rights->$feature->supprimer)
 					&& empty($user->rights->$feature->delete)
-					&& empty($user->rights->$feature->run)) $deleteok = 0;
+					&& empty($user->rights->$feature->run)) {
+					$deleteok = 0;
+				}
 			}
 		}
 
 		// If a or and at least one ok
-		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) $deleteok = 1;
+		if (preg_match('/\|/', $features) && $nbko < count($featuresarray)) {
+			$deleteok = 1;
+		}
 
-		if (!$deleteok && !($isdraft && $createok)) accessforbidden();
+		if (!$deleteok && !($isdraft && $createok)) {
+			accessforbidden();
+		}
 		//print "Delete access is ok";
 	}
 
 	// If we have a particular object to check permissions on, we check this object
 	// is linked to a company allowed to $user.
-	if (!empty($objectid) && $objectid > 0)
-	{
+	if (!empty($objectid) && $objectid > 0) {
 		$ok = checkUserAccessToObject($user, $featuresarray, $objectid, $tableandshare, $feature2, $dbt_keyfield, $dbt_select, $parentfortableentity);
 		$params = array('objectid' => $objectid, 'features' => join(',', $featuresarray), 'features2' => $feature2);
 		return $ok ? 1 : accessforbidden('', 1, 1, 0, $params);
@@ -437,14 +534,19 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 	$dbtablename = (!empty($params[0]) ? $params[0] : '');
 	$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename);
 
-	foreach ($featuresarray as $feature)
-	{
+	foreach ($featuresarray as $feature) {
 		$sql = '';
 
 		// For backward compatibility
-		if ($feature == 'member')  $feature = 'adherent';
-		if ($feature == 'project') $feature = 'projet';
-		if ($feature == 'task')    $feature = 'projet_task';
+		if ($feature == 'member') {
+			$feature = 'adherent';
+		}
+		if ($feature == 'project') {
+			$feature = 'projet';
+		}
+		if ($feature == 'task') {
+			$feature = 'projet_task';
+		}
 
 		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'payment', 'payment_supplier', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'website'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe'); // Test for societe object
@@ -455,15 +557,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 		//$checkdefault = 'all other not already defined'; // Test on entity + link to third party on field $dbt_keyfield. Not allowed if link is empty (Ex: invoice, orders...).
 
 		// If dbtablename not defined, we use same name for table than module name
-		if (empty($dbtablename))
-		{
+		if (empty($dbtablename)) {
 			$dbtablename = $feature;
 			$sharedelement = (!empty($params[1]) ? $params[1] : $dbtablename); // We change dbtablename, so we set sharedelement too.
 		}
 
 		// Check permission for object on entity only
-		if (in_array($feature, $check))
-		{
+		if (in_array($feature, $check)) {
 			$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 			if (($feature == 'user' || $feature == 'usergroup') && !empty($conf->multicompany->enabled)) {	// Special for multicompany
@@ -496,7 +596,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 		} elseif (in_array($feature, $checksoc)) {	// We check feature = checksoc
 			if ($user->socid > 0) {
 				// If external user: Check permission for external users
-				if ($user->socid <> $objectid) return false;
+				if ($user->socid <> $objectid) {
+					return false;
+				}
 			} elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {
 				// If internal user: Check permission for internal users that are restricted on their objects
 				$sql = "SELECT COUNT(sc.fk_soc) as nb";
@@ -513,18 +615,15 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " WHERE s.rowid IN (".$objectid.")";
 				$sql .= " AND s.entity IN (".getEntity($sharedelement, 1).")";
 			}
-		} elseif (in_array($feature, $checkother))	// Test on entity + link to thirdparty. Allowed if link is empty (Ex: contacts...).
-		{
+		} elseif (in_array($feature, $checkother)) {	// Test on entity + link to thirdparty. Allowed if link is empty (Ex: contacts...).
 			// If external user: Check permission for external users
-			if ($user->socid > 0)
-			{
+			if ($user->socid > 0) {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.fk_soc = ".$user->socid;
 			} // If internal user: Check permission for internal users that are restricted on their objects
-			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir))
-			{
+			elseif (!empty($conf->societe->enabled) && ($user->rights->societe->lire && !$user->rights->societe->client->voir)) {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON dbt.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -532,15 +631,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " AND (dbt.fk_soc IS NULL OR sc.fk_soc IS NOT NULL)"; // Contact not linked to a company or to a company of user
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			} // If multicompany and internal users with all permissions, check user is in correct entity
-			elseif (!empty($conf->multicompany->enabled))
-			{
+			elseif (!empty($conf->multicompany->enabled)) {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
-			if ($feature == 'agenda')// Also check owner or attendee for users without allactions->read
-			{
+			if ($feature == 'agenda') {// Also check owner or attendee for users without allactions->read
 				if ($objectid > 0 && empty($user->rights->agenda->allactions->read)) {
 					require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 					$action = new ActionComm($db);
@@ -551,13 +648,14 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				}
 			}
 		} elseif (in_array($feature, $checkproject)) {
-			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
-			{
+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$projectstatic = new Project($db);
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
-				if (!in_array($objectid, $tmparray)) return false;
+				if (!in_array($objectid, $tmparray)) {
+					return false;
+				}
 			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
@@ -565,8 +663,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$sql .= " AND dbt.entity IN (".getEntity($sharedelement, 1).")";
 			}
 		} elseif (in_array($feature, $checktask)) {
-			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire))
-			{
+			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {
 				$task = new Task($db);
 				$task->fetch($objectid);
 
@@ -574,7 +671,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 				$projectstatic = new Project($db);
 				$tmps = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, 0);
 				$tmparray = explode(',', $tmps);
-				if (!in_array($task->fk_project, $tmparray)) return false;
+				if (!in_array($task->fk_project, $tmparray)) {
+					return false;
+				}
 			} else {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
@@ -584,7 +683,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 		} elseif (!in_array($feature, $nocheck)) {		// By default (case of $checkdefault), we check on object entity + link to third party on field $dbt_keyfield
 			// If external user: Check permission for external users
 			if ($user->socid > 0) {
-				if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
+				if (empty($dbt_keyfield)) {
+					dol_print_error('', 'Param dbt_keyfield is required but not defined');
+				}
 				$sql = "SELECT COUNT(dbt.".$dbt_keyfield.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.rowid IN (".$objectid.")";
@@ -592,7 +693,9 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 			} elseif (!empty($conf->societe->enabled) && !$user->rights->societe->client->voir) {
 				// If internal user: Check permission for internal users that are restricted on their objects
 				if ($feature != 'ticket') {
-					if (empty($dbt_keyfield)) dol_print_error('', 'Param dbt_keyfield is required but not defined');
+					if (empty($dbt_keyfield)) {
+						dol_print_error('', 'Param dbt_keyfield is required but not defined');
+					}
 					$sql = "SELECT COUNT(sc.fk_soc) as nb";
 					$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -610,8 +713,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 					$sql .= " AND (sc.fk_user = ".$user->id." OR sc.fk_user IS NULL)";
 				}
 			} // If multicompany and internal users with all permissions, check user is in correct entity
-			elseif (!empty($conf->multicompany->enabled))
-			{
+			elseif (!empty($conf->multicompany->enabled)) {
 				$sql = "SELECT COUNT(dbt.".$dbt_select.") as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX.$dbtablename." as dbt";
 				$sql .= " WHERE dbt.".$dbt_select." IN (".$objectid.")";
@@ -619,13 +721,13 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 			}
 		}
 
-		if ($sql)
-		{
+		if ($sql) {
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if (!$obj || $obj->nb < count(explode(',', $objectid))) return false;
+				if (!$obj || $obj->nb < count(explode(',', $objectid))) {
+					return false;
+				}
 			} else {
 				return false;
 			}
@@ -649,8 +751,7 @@ function checkUserAccessToObject($user, $featuresarray, $objectid = 0, $tableand
 function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $showonlymessage = 0, $params = null)
 {
 	global $conf, $db, $user, $langs, $hookmanager;
-	if (!is_object($langs))
-	{
+	if (!is_object($langs)) {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 		$langs = new Translate('', $conf);
 		$langs->setDefaultLang();
@@ -658,21 +759,24 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 
 	$langs->load("errors");
 
-	if ($printheader)
-	{
-		if (function_exists("llxHeader")) llxHeader('');
-		elseif (function_exists("llxHeaderVierge")) llxHeaderVierge('');
+	if ($printheader) {
+		if (function_exists("llxHeader")) {
+			llxHeader('');
+		} elseif (function_exists("llxHeaderVierge")) {
+			llxHeaderVierge('');
+		}
 	}
 	print '<div class="error">';
-	if (!$message) print $langs->trans("ErrorForbidden");
-	else print $message;
+	if (!$message) {
+		print $langs->trans("ErrorForbidden");
+	} else {
+		print $message;
+	}
 	print '</div>';
 	print '<br>';
-	if (empty($showonlymessage))
-	{
+	if (empty($showonlymessage)) {
 		global $action, $object;
-		if (empty($hookmanager))
-		{
+		if (empty($hookmanager)) {
 			$hookmanager = new HookManager($db);
 			// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 			$hookmanager->initHooks(array('main'));
@@ -680,10 +784,8 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 		$parameters = array('message'=>$message, 'params'=>$params);
 		$reshook = $hookmanager->executeHooks('getAccessForbiddenMessage', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 		print $hookmanager->resPrint;
-		if (empty($reshook))
-		{
-			if ($user->login)
-			{
+		if (empty($reshook)) {
+			if ($user->login) {
 				print $langs->trans("CurrentLogin").': <font class="error">'.$user->login.'</font><br>';
 				print $langs->trans("ErrorForbidden2", $langs->transnoentitiesnoconv("Home"), $langs->transnoentitiesnoconv("Users"));
 			} else {
@@ -691,6 +793,8 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 			}
 		}
 	}
-	if ($printfooter && function_exists("llxFooter")) llxFooter();
+	if ($printfooter && function_exists("llxFooter")) {
+		llxFooter();
+	}
 	exit(0);
 }
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 3527d132cde..9181b3dd07d 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -35,8 +35,12 @@
 function dol_getwebuser($mode)
 {
 	$t = '?';
-	if ($mode == 'user')  $t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty
-	if ($mode == 'group') $t = getenv('APACHE_RUN_GROUP');
+	if ($mode == 'user') {
+		$t = getenv('APACHE_RUN_USER'); // $_ENV['APACHE_RUN_USER'] is empty
+	}
+	if ($mode == 'group') {
+		$t = getenv('APACHE_RUN_GROUP');
+	}
 	return $t;
 }
 
@@ -56,44 +60,44 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
 	//global $dolauthmode;    // To return authentication finally used
 
 	// Check parameters
-	if ($entitytotest == '') $entitytotest = 1;
+	if ($entitytotest == '') {
+		$entitytotest = 1;
+	}
 
 	dol_syslog("checkLoginPassEntity usertotest=".$usertotest." entitytotest=".$entitytotest." authmode=".join(',', $authmode));
 	$login = '';
 
 	// Validation of login/pass/entity with standard modules
-	if (empty($login))
-	{
+	if (empty($login)) {
 		$test = true;
-		foreach ($authmode as $mode)
-		{
-			if ($test && $mode && !$login)
-			{
+		foreach ($authmode as $mode) {
+			if ($test && $mode && !$login) {
 				// Validation of login/pass/entity for mode $mode
 				$mode = trim($mode);
 				$authfile = 'functions_'.$mode.'.php';
 				$fullauthfile = '';
 
 				$dirlogin = array_merge(array("/core/login"), (array) $conf->modules_parts['login']);
-				foreach ($dirlogin as $reldir)
-				{
+				foreach ($dirlogin as $reldir) {
 					$dir = dol_buildpath($reldir, 0);
 					$newdir = dol_osencode($dir);
 
 					// Check if file found (do not use dol_is_file to avoid loading files.lib.php)
 					$tmpnewauthfile = $newdir.(preg_match('/\/$/', $newdir) ? '' : '/').$authfile;
-					if (is_file($tmpnewauthfile)) $fullauthfile = $tmpnewauthfile;
+					if (is_file($tmpnewauthfile)) {
+						$fullauthfile = $tmpnewauthfile;
+					}
 				}
 
 				$result = false;
-				if ($fullauthfile) $result = include_once $fullauthfile;
-				if ($fullauthfile && $result)
-				{
+				if ($fullauthfile) {
+					$result = include_once $fullauthfile;
+				}
+				if ($fullauthfile && $result) {
 					// Call function to check user/password
 					$function = 'check_user_password_'.$mode;
 					$login = call_user_func($function, $usertotest, $passwordtotest, $entitytotest, $context);
-					if ($login && $login != '--bad-login-validity--')	// Login is successfull
-					{
+					if ($login && $login != '--bad-login-validity--') {	// Login is successfull
 						$test = false; // To stop once at first login success
 						$conf->authmode = $mode; // This properties is defined only when logged to say what mode was successfully used
 						$dol_tz = GETPOST('tz');
@@ -117,8 +121,7 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
 }
 
 
-if (!function_exists('dol_loginfunction'))
-{
+if (!function_exists('dol_loginfunction')) {
 	/**
 	 * Show Dolibarr default login page.
 	 * Part of this code is also duplicated into main.inc.php::top_htmlhead
@@ -147,7 +150,9 @@ if (!function_exists('dol_loginfunction'))
 		// Title
 		$appli = constant('DOL_APPLICATION_TITLE');
 		$title = $appli.' '.constant('DOL_VERSION');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $title = $conf->global->MAIN_APPLICATION_TITLE;
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+			$title = $conf->global->MAIN_APPLICATION_TITLE;
+		}
 		$titletruedolibarrversion = constant('DOL_VERSION'); // $title used by login template after the @ to inform of true Dolibarr version
 
 		// Note: $conf->css looks like '/theme/eldy/style.css.php'
@@ -169,13 +174,13 @@ if (!function_exists('dol_loginfunction'))
 		*/
 
 		// Select templates dir
-		if (!empty($conf->modules_parts['tpl']))	// Using this feature slow down application
-		{
+		if (!empty($conf->modules_parts['tpl'])) {	// Using this feature slow down application
 			$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl/'));
-			foreach ($dirtpls as $reldir)
-			{
+			foreach ($dirtpls as $reldir) {
 				$tmp = dol_buildpath($reldir.'login.tpl.php');
-				if (file_exists($tmp)) { $template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp); break; }
+				if (file_exists($tmp)) {
+					$template_dir = preg_replace('/login\.tpl\.php$/', '', $tmp); break;
+				}
 			}
 		} else {
 			$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
@@ -184,18 +189,25 @@ if (!function_exists('dol_loginfunction'))
 		// Set cookie for timeout management
 		$prefix = dol_getprefix('');
 		$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
-		if (!empty($conf->global->MAIN_SESSION_TIMEOUT)) setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, (empty($dolibarr_main_force_https) ? false : true), true);
+		if (!empty($conf->global->MAIN_SESSION_TIMEOUT)) {
+			setcookie($sessiontimeout, $conf->global->MAIN_SESSION_TIMEOUT, 0, "/", null, (empty($dolibarr_main_force_https) ? false : true), true);
+		}
 
-		if (GETPOST('urlfrom', 'alpha')) $_SESSION["urlfrom"] = GETPOST('urlfrom', 'alpha');
-		else unset($_SESSION["urlfrom"]);
+		if (GETPOST('urlfrom', 'alpha')) {
+			$_SESSION["urlfrom"] = GETPOST('urlfrom', 'alpha');
+		} else {
+			unset($_SESSION["urlfrom"]);
+		}
 
-		if (!GETPOST("username", 'alpha')) $focus_element = 'username';
-		else $focus_element = 'password';
+		if (!GETPOST("username", 'alpha')) {
+			$focus_element = 'username';
+		} else {
+			$focus_element = 'password';
+		}
 
 		$demologin = '';
 		$demopassword = '';
-		if (!empty($dolibarr_main_demo))
-		{
+		if (!empty($dolibarr_main_demo)) {
 			$tab = explode(',', $dolibarr_main_demo);
 			$demologin = $tab[0];
 			$demopassword = $tab[1];
@@ -233,8 +245,7 @@ if (!function_exists('dol_loginfunction'))
 		// Security graphical code
 		$captcha = 0;
 		$captcha_refresh = '';
-		if (function_exists("imagecreatefrompng") && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA))
-		{
+		if (function_exists("imagecreatefrompng") && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
 			$captcha = 1;
 			$captcha_refresh = img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"');
 		}
@@ -242,23 +253,19 @@ if (!function_exists('dol_loginfunction'))
 		// Extra link
 		$forgetpasslink = 0;
 		$helpcenterlink = 0;
-		if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
-		{
-			if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK))
-			{
+		if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK) || empty($conf->global->MAIN_HELPCENTER_DISABLELINK)) {
+			if (empty($conf->global->MAIN_SECURITY_DISABLEFORGETPASSLINK)) {
 				$forgetpasslink = 1;
 			}
 
-			if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK))
-			{
+			if (empty($conf->global->MAIN_HELPCENTER_DISABLELINK)) {
 				$helpcenterlink = 1;
 			}
 		}
 
 		// Home message
 		$main_home = '';
-		if (!empty($conf->global->MAIN_HOME))
-		{
+		if (!empty($conf->global->MAIN_HOME)) {
 			$substitutionarray = getCommonSubstitutionArray($langs);
 			complete_substitutions_array($substitutionarray, $langs);
 			$texttoshow = make_substitutions($conf->global->MAIN_HOME, $substitutionarray, $langs);
@@ -273,11 +280,17 @@ if (!function_exists('dol_loginfunction'))
 		$dol_loginmesg = (!empty($_SESSION["dol_loginmesg"]) ? $_SESSION["dol_loginmesg"] : '');
 
 		$favicon = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png';
-		if (!empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
-		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
+		if (!empty($mysoc->logo_squarred_mini)) {
+			$favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
+		}
+		if (!empty($conf->global->MAIN_FAVICON_URL)) {
+			$favicon = $conf->global->MAIN_FAVICON_URL;
+		}
 
 		$jquerytheme = 'base';
-		if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+		if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) {
+			$jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+		}
 
 		// Set dol_hide_topmenu, dol_hide_leftmenu, dol_optimize_smallscreen, dol_no_mouse_hover
 		$dol_hide_topmenu = GETPOST('dol_hide_topmenu', 'int');
@@ -307,18 +320,22 @@ if (!function_exists('dol_loginfunction'))
 function makesalt($type = CRYPT_SALT_LENGTH)
 {
 	dol_syslog("makesalt type=".$type);
-	switch ($type)
-	{
+	switch ($type) {
 		case 12:	// 8 + 4
-			$saltlen = 8; $saltprefix = '$1$'; $saltsuffix = '$'; break;
+			$saltlen = 8; $saltprefix = '$1$'; $saltsuffix = '$';
+			break;
 		case 8:		// 8 (Pour compatibilite, ne devrait pas etre utilise)
-			$saltlen = 8; $saltprefix = '$1$'; $saltsuffix = '$'; break;
+			$saltlen = 8; $saltprefix = '$1$'; $saltsuffix = '$';
+			break;
 		case 2:		// 2
 		default: 	// by default, fall back on Standard DES (should work everywhere)
-			$saltlen = 2; $saltprefix = ''; $saltsuffix = ''; break;
+			$saltlen = 2; $saltprefix = ''; $saltsuffix = '';
+			break;
 	}
 	$salt = '';
-	while (dol_strlen($salt) < $saltlen) $salt .= chr(mt_rand(64, 126));
+	while (dol_strlen($salt) < $saltlen) {
+		$salt .= chr(mt_rand(64, 126));
+	}
 
 	$result = $saltprefix.$salt.$saltsuffix;
 	dol_syslog("makesalt return=".$result);
@@ -338,33 +355,27 @@ function encodedecode_dbpassconf($level = 0)
 	$passwd = '';
 	$passwd_crypted = '';
 
-	if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php', 'r'))
-	{
-		while (!feof($fp))
-		{
+	if ($fp = fopen(DOL_DOCUMENT_ROOT.'/conf/conf.php', 'r')) {
+		while (!feof($fp)) {
 			$buffer = fgets($fp, 4096);
 
 			$lineofpass = 0;
 
-			if (preg_match('/^[^#]*dolibarr_main_db_encrypted_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))	// Old way to save crypted value
-			{
+			if (preg_match('/^[^#]*dolibarr_main_db_encrypted_pass[\s]*=[\s]*(.*)/i', $buffer, $reg)) {	// Old way to save crypted value
 				$val = trim($reg[1]); // This also remove CR/LF
 				$val = preg_replace('/^["\']/', '', $val);
 				$val = preg_replace('/["\'][\s;]*$/', '', $val);
-				if (!empty($val))
-				{
+				if (!empty($val)) {
 					$passwd_crypted = $val;
 					$val = dol_decode($val);
 					$passwd = $val;
 					$lineofpass = 1;
 				}
-			} elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg))
-			{
+			} elseif (preg_match('/^[^#]*dolibarr_main_db_pass[\s]*=[\s]*(.*)/i', $buffer, $reg)) {
 				$val = trim($reg[1]); // This also remove CR/LF
 				$val = preg_replace('/^["\']/', '', $val);
 				$val = preg_replace('/["\'][\s;]*$/', '', $val);
-				if (preg_match('/crypted:/i', $buffer))
-				{
+				if (preg_match('/crypted:/i', $buffer)) {
 					$val = preg_replace('/crypted:/i', '', $val);
 					$passwd_crypted = $val;
 					$val = dol_decode($val);
@@ -378,15 +389,12 @@ function encodedecode_dbpassconf($level = 0)
 			}
 
 			// Output line
-			if ($lineofpass)
-			{
+			if ($lineofpass) {
 				// Add value at end of file
-				if ($level == 0)
-				{
+				if ($level == 0) {
 					$config .= '$dolibarr_main_db_pass=\''.$passwd.'\';'."\n";
 				}
-				if ($level == 1)
-				{
+				if ($level == 1) {
 					$config .= '$dolibarr_main_db_pass=\'crypted:'.$passwd_crypted.'\';'."\n";
 				}
 
@@ -400,8 +408,7 @@ function encodedecode_dbpassconf($level = 0)
 
 		// Write new conf file
 		$file = DOL_DOCUMENT_ROOT.'/conf/conf.php';
-		if ($fp = @fopen($file, 'w'))
-		{
+		if ($fp = @fopen($file, 'w')) {
 			fputs($fp, $config);
 			fflush($fp);
 			fclose($fp);
@@ -436,8 +443,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 	global $db, $conf, $langs, $user;
 
 	$generated_password = '';
-	if ($generic)
-	{
+	if ($generic) {
 		$lowercase = "qwertyuiopasdfghjklzxcvbnm";
 		$uppercase = "ASDFGHJKLZXCVBNMQWERTYUIOP";
 		$numbers = "1234567890";
@@ -445,8 +451,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		$nbofchar = round($length / 3);
 		$nbofcharlast = ($length - 2 * $nbofchar);
 		//var_dump($nbofchar.'-'.$nbofcharlast);
-		if (function_exists('random_int'))	// Cryptographic random
-		{
+		if (function_exists('random_int')) {	// Cryptographic random
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
 				$tmp = random_int(0, $max);
@@ -484,8 +489,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 
 			$generated_password = str_shuffle($randomCode);
 		}
-	} elseif (!empty($conf->global->USER_PASSWORD_GENERATED))
-	{
+	} elseif (!empty($conf->global->USER_PASSWORD_GENERATED)) {
 		$nomclass = "modGeneratePass".ucfirst($conf->global->USER_PASSWORD_GENERATED);
 		$nomfichier = $nomclass.".class.php";
 		//print DOL_DOCUMENT_ROOT."/core/modules/security/generate/".$nomclass;
@@ -496,8 +500,7 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 	}
 
 	// Do we have to discard some alphabetic characters ?
-	if (is_array($replaceambiguouschars) && count($replaceambiguouschars) > 0)
-	{
+	if (is_array($replaceambiguouschars) && count($replaceambiguouschars) > 0) {
 		$numbers = "ABCDEF";
 		$max = strlen($numbers) - 1;
 		if (function_exists('random_int')) {	// Cryptographic random
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index 0bb0db6afd1..15e7286ab08 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -47,12 +47,10 @@ function shipping_prepare_head($object)
 	$head[$h][2] = 'shipping';
 	$h++;
 
-	if ($conf->delivery_note->enabled && $user->rights->expedition->delivery->lire)
-	{
+	if ($conf->delivery_note->enabled && $user->rights->expedition->delivery->lire) {
 		// delivery link
 		$object->fetchObjectLinked($object->id, $object->element);
-		if (is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0)        // If there is a delivery
-		{
+		if (is_array($object->linkedObjectsIds['delivery']) && count($object->linkedObjectsIds['delivery']) > 0) {        // If there is a delivery
 			// Take first one element of array
 			$tmp = reset($object->linkedObjectsIds['delivery']);
 
@@ -63,18 +61,18 @@ function shipping_prepare_head($object)
 		}
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$objectsrc = $object;
-		if ($object->origin == 'commande' && $object->origin_id > 0)
-		{
+		if ($object->origin == 'commande' && $object->origin_id > 0) {
 			$objectsrc = new Commande($db);
 			$objectsrc->fetch($object->origin_id);
 		}
 		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -86,16 +84,24 @@ function shipping_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$nbNote = 0;
-	if (!empty($object->note_private)) $nbNote++;
-	if (!empty($object->note_public)) $nbNote++;
+	if (!empty($object->note_private)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_public)) {
+		$nbNote++;
+	}
 	$head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$object->id;
 	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	if ($nbNote > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	}
 	$head[$h][2] = 'note';
 	$h++;
 
@@ -127,8 +133,7 @@ function delivery_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	if ($conf->expedition_bon->enabled && $user->rights->expedition->lire)
-	{
+	if ($conf->expedition_bon->enabled && $user->rights->expedition->lire) {
 		$head[$h][0] = DOL_URL_ROOT."/expedition/card.php?id=".$object->origin_id;
 		$head[$h][1] = $langs->trans("SendingCard");
 		$head[$h][2] = 'shipping';
@@ -157,18 +162,18 @@ function delivery_prepare_head($object)
 		$tmpobject = $object;
 	}
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$objectsrc = $tmpobject;
-		if ($tmpobject->origin == 'commande' && $tmpobject->origin_id > 0)
-		{
+		if ($tmpobject->origin == 'commande' && $tmpobject->origin_id > 0) {
 			$objectsrc = new Commande($db);
 			$objectsrc->fetch($tmpobject->origin_id);
 		}
 		$nbContact = count($objectsrc->liste_contact(-1, 'internal')) + count($objectsrc->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT."/expedition/contact.php?id=".$tmpobject->id;
 		$head[$h][1] = $langs->trans("ContactsAddresses");
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -180,16 +185,24 @@ function delivery_prepare_head($object)
 	$nbLinks = Link::count($db, $tmpobject->element, $tmpobject->id);
 	$head[$h][0] = DOL_URL_ROOT.'/expedition/document.php?id='.$tmpobject->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
 	$nbNote = 0;
-	if (!empty($tmpobject->note_private)) $nbNote++;
-	if (!empty($tmpobject->note_public)) $nbNote++;
+	if (!empty($tmpobject->note_private)) {
+		$nbNote++;
+	}
+	if (!empty($tmpobject->note_public)) {
+		$nbNote++;
+	}
 	$head[$h][0] = DOL_URL_ROOT."/expedition/note.php?id=".$tmpobject->id;
 	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	if ($nbNote > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+	}
 	$head[$h][2] = 'note';
 	$h++;
 
@@ -236,21 +249,24 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 	$sql .= " AND obj.fk_".$origin." = ".$origin_id;
 	$sql .= " AND obj.rowid = ed.fk_origin_line";
 	$sql .= " AND ed.fk_expedition = e.rowid";
-	if ($filter) $sql .= $filter;
+	if ($filter) {
+		$sql .= $filter;
+	}
 
 	$sql .= " ORDER BY obj.fk_product";
 
 	dol_syslog("show_list_sending_receive", LOG_DEBUG);
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
-		if ($num)
-		{
-			if ($filter) print load_fiche_titre($langs->trans("OtherSendingsForSameOrder"));
-			else print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder"));
+		if ($num) {
+			if ($filter) {
+				print load_fiche_titre($langs->trans("OtherSendingsForSameOrder"));
+			} else {
+				print load_fiche_titre($langs->trans("SendingsAndReceivingForSameOrder"));
+			}
 
 			print '<table class="liste centpercent">';
 			print '<tr class="liste_titre">';
@@ -260,26 +276,23 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 			print '<td class="center">'.$langs->trans("DateCreation").'</td>';
 			print '<td class="center">'.$langs->trans("DateDeliveryPlanned").'</td>';
 			print '<td class="center">'.$langs->trans("QtyPreparedOrShipped").'</td>';
-			if (!empty($conf->stock->enabled))
-			{
+			if (!empty($conf->stock->enabled)) {
 				print '<td>'.$langs->trans("Warehouse").'</td>';
 			}
 			/*TODO Add link to expeditiondet_batch
 			if (! empty($conf->productbatch->enabled))
 			{
-			    print '<td>';
-			    print '</td>';
+				print '<td>';
+				print '</td>';
 			}*/
-			if (!empty($conf->delivery_note->enabled))
-			{
+			if (!empty($conf->delivery_note->enabled)) {
 				print '<td>'.$langs->trans("DeliveryOrder").'</td>';
 				//print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
 				print '<td class="right">'.$langs->trans("DeliveryDate").'</td>';
 			}
 			print "</tr>\n";
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
@@ -290,11 +303,9 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 				print '</td>';
 
 				// Description
-				if ($objp->fk_product > 0)
-				{
+				if ($objp->fk_product > 0) {
 					// Define output language
-					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-					{
+					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 						$object = new $origin($db);
 						$object->fetch($origin_id);
 						$object->fetch_thirdparty();
@@ -305,10 +316,13 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 
 						$outputlangs = $langs;
 						$newlang = '';
-						if (empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
-						if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
-						if (!empty($newlang))
-						{
+						if (empty($newlang) && !empty($_REQUEST['lang_id'])) {
+							$newlang = $_REQUEST['lang_id'];
+						}
+						if (empty($newlang)) {
+							$newlang = $object->thirdparty->default_lang;
+						}
+						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
 						}
@@ -334,16 +348,18 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 					print_date_range($objp->date_start, $objp->date_end);
 
 					// Add description in form
-					if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-					{
+					if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 						print (!empty($objp->description) && $objp->description != $objp->product) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
 					}
 
 					print '</td>';
 				} else {
 					print "<td>";
-					if ($objp->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
-					else $text = img_object($langs->trans('Product'), 'product');
+					if ($objp->fk_product_type == 1) {
+						$text = img_object($langs->trans('Service'), 'service');
+					} else {
+						$text = img_object($langs->trans('Product'), 'product');
+					}
 
 					if (!empty($objp->label)) {
 						$text .= ' <strong>'.$objp->label.'</strong>';
@@ -369,11 +385,9 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 				print '<td class="center">'.$objp->qty_shipped.'</td>';
 
 				// Warehouse
-				if (!empty($conf->stock->enabled))
-				{
+				if (!empty($conf->stock->enabled)) {
 					print '<td>';
-					if ($objp->warehouse_id > 0)
-					{
+					if ($objp->warehouse_id > 0) {
 						$warehousestatic->fetch($objp->warehouse_id);
 						print $warehousestatic->getNomUrl(1);
 					}
@@ -384,47 +398,47 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 				/*TODO Add link to expeditiondet_batch
 				if (! empty($conf->productbatch->enabled))
 				{
-				    var_dump($objp->edrowid);
-				    $lines[$i]->detail_batch
-				    if (isset($lines[$i]->detail_batch))
-				    {
-				        print '<td>';
-				        if ($lines[$i]->product_tobatch)
-				        {
-				            $detail = '';
-				            foreach ($lines[$i]->detail_batch as $dbatch)
-				            {
+					var_dump($objp->edrowid);
+					$lines[$i]->detail_batch
+					if (isset($lines[$i]->detail_batch))
+					{
+						print '<td>';
+						if ($lines[$i]->product_tobatch)
+						{
+							$detail = '';
+							foreach ($lines[$i]->detail_batch as $dbatch)
+							{
 								$detail.= $langs->trans("Batch").': '.$dbatch->batch;
 								$detail.= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby,"day");
 								$detail.= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby,"day");
 								$detail.= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
 								$detail.= '<br>';
-				            }
-				            print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
-				        }
-				        else
-				        {
-				            print $langs->trans("NA");
-				        }
-				        print '</td>';
-				    } else {
-				        print '<td></td>';
-				    }
+							}
+							print $form->textwithtooltip(img_picto('', 'object_barcode').' '.$langs->trans("DetailBatchNumber"),$detail);
+						}
+						else
+						{
+							print $langs->trans("NA");
+						}
+						print '</td>';
+					} else {
+						print '<td></td>';
+					}
 				}*/
 
 				// Informations on receipt
-				if (!empty($conf->delivery_note->enabled))
-				{
+				if (!empty($conf->delivery_note->enabled)) {
 					include_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
 					$expedition->id = $objp->sendingid;
 					$expedition->fetchObjectLinked($expedition->id, $expedition->element);
 					//var_dump($expedition->linkedObjects);
 
 					$receiving = '';
-					if (!empty($expedition->linkedObjects['delivery'])) $receiving = reset($expedition->linkedObjects['delivery']); // Take first link
+					if (!empty($expedition->linkedObjects['delivery'])) {
+						$receiving = reset($expedition->linkedObjects['delivery']); // Take first link
+					}
 
-					if (!empty($receiving))
-					{
+					if (!empty($receiving)) {
 						// $expedition->fk_origin_line = id of det line of order
 						// $receiving->fk_origin_line = id of det line of order
 						// $receiving->origin may be 'shipping'
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 14ca70926d3..8b49b01ae35 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -56,18 +56,24 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 	$ref = str_replace(' ', '', $ref);
 	$out = '';
 
-	if ($type == 'proposal')
-	{
+	if ($type == 'proposal') {
 		$out = DOL_MAIN_URL_ROOT.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '<font color="#666666">' : '');
-		if ($mode == 1) $out .= 'proposal_ref';
-		if ($mode == 0) $out .= urlencode($ref);
+		if ($mode == 1) {
+			$out .= 'proposal_ref';
+		}
+		if ($mode == 0) {
+			$out .= urlencode($ref);
+		}
 		$out .= ($mode ? '</font>' : '');
-		if ($mode == 1) $out .= '&hashp=<font color="#666666">hash_of_file</font>';
-		else {
+		if ($mode == 1) {
+			$out .= '&hashp=<font color="#666666">hash_of_file</font>';
+		} else {
 			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 			$propaltmp = new Propal($db);
 			$res = $propaltmp->fetch(0, $ref);
-			if ($res <= 0) return 'FailedToGetProposal';
+			if ($res <= 0) {
+				return 'FailedToGetProposal';
+			}
 
 			include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 			$ecmfile = new EcmFiles($db);
@@ -75,8 +81,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 			$ecmfile->fetch(0, '', $propaltmp->last_main_doc);
 
 			$hashp = $ecmfile->share;
-			if (empty($hashp))
-			{
+			if (empty($hashp)) {
 				$out = $langs->trans("FeatureOnlineSignDisabled");
 				return $out;
 			} else {
@@ -86,7 +91,9 @@ function getOnlineSignatureUrl($mode, $type, $ref = '')
 	}
 
 	// For multicompany
-	if (!empty($out)) $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	if (!empty($out)) {
+		$out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	}
 
 	return $out;
 }
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index 2d6768010fb..2e58e6c8082 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -39,8 +39,7 @@ function stock_prepare_head($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (!empty($user->rights->stock->mouvement->lire))
-	{
+	if (!empty($user->rights->stock->mouvement->lire)) {
 		$head[$h][0] = DOL_URL_ROOT.'/product/stock/movement_list.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("StockMovements");
 		$head[$h][2] = 'movements';
diff --git a/htdocs/core/lib/supplier_proposal.lib.php b/htdocs/core/lib/supplier_proposal.lib.php
index ec782350c9d..a7720bd9ef4 100644
--- a/htdocs/core/lib/supplier_proposal.lib.php
+++ b/htdocs/core/lib/supplier_proposal.lib.php
@@ -44,12 +44,13 @@ function supplier_proposal_prepare_head($object)
 	$head[$h][2] = 'comm';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/contact.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -60,14 +61,19 @@ function supplier_proposal_prepare_head($object)
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'supplier_proposal');
 
-	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -79,7 +85,9 @@ function supplier_proposal_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/supplier_proposal/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index dfddc95d733..db1623387c1 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -54,8 +54,7 @@ function takepos_admin_prepare_head()
 	$h++;
 
 	$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
-	for ($i = 1; $i <= $numterminals; $i++)
-	{
+	for ($i = 1; $i <= $numterminals; $i++) {
 		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/terminal.php?terminal='.$i;
 		$head[$h][1] = $langs->trans("Terminal")." ".$i;
 		$head[$h][2] = 'terminal'.$i;
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 36ce55f7c85..e2257369865 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -59,7 +59,9 @@ function tax_prepare_head(ChargeSociales $object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -93,14 +95,12 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 	global $conf;
 
 	// If we use date_start and date_end, we must not use $y, $m, $q
-	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
-	{
+	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q))) {
 		dol_print_error('', 'Bad value of input parameter for tax_by_rate');
 	}
 
 	$list = array();
-	if ($direction == 'sell')
-	{
+	if ($direction == 'sell') {
 		$invoicetable = 'facture';
 		$invoicedettable = 'facturedet';
 		$fk_facture = 'fk_facture';
@@ -110,8 +110,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$paymenttable = 'paiement';
 		$paymentfacturetable = 'paiement_facture';
 		$invoicefieldref = 'ref';
-	} elseif ($direction == 'buy')
-	{
+	} elseif ($direction == 'buy') {
 		$invoicetable = 'facture_fourn';
 		$invoicedettable = 'facture_fourn_det';
 		$fk_facture = 'fk_facture_fourn';
@@ -138,8 +137,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 	// Define sql request
 	$sql = '';
 	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
-	{
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')) {
 		// Count on delivery date (use invoice date as delivery is unknown)
 		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
 		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -153,24 +151,31 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
 		$sql .= " AND f.rowid = d.".$fk_facture;
 		$sql .= " AND s.rowid = f.fk_soc";
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = 0"; // Limit to products
 		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		}
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
 	} else {
 		// Count on payments date
@@ -189,49 +194,64 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
 		$sql .= " AND f.rowid = d.".$fk_facture;
 		$sql .= " AND s.rowid = f.fk_soc";
 		$sql .= " AND pf.".$fk_facture2." = f.rowid";
 		$sql .= " AND pa.rowid = pf.".$fk_payment;
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = 0"; // Limit to products
 		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		}
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
 	}
 
-	if (!$sql) return -1;
-	if ($sql == 'TODO') return -2;
-	if ($sql != 'TODO')
-	{
+	if (!$sql) {
+		return -1;
+	}
+	if ($sql == 'TODO') {
+		return -2;
+	}
+	if ($sql != 'TODO') {
 		dol_syslog("Tax.lib.php::tax_by_thirdparty", LOG_DEBUG);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$company_id = -1;
 			$oldrowid = '';
-			while ($assoc = $db->fetch_array($resql))
-			{
-				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
-				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
-				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
-				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
+			while ($assoc = $db->fetch_array($resql)) {
+				if (!isset($list[$assoc['company_id']]['totalht'])) {
+					$list[$assoc['company_id']]['totalht'] = 0;
+				}
+				if (!isset($list[$assoc['company_id']]['vat'])) {
+					$list[$assoc['company_id']]['vat'] = 0;
+				}
+				if (!isset($list[$assoc['company_id']]['localtax1'])) {
+					$list[$assoc['company_id']]['localtax1'] = 0;
+				}
+				if (!isset($list[$assoc['company_id']]['localtax2'])) {
+					$list[$assoc['company_id']]['localtax2'] = 0;
+				}
 
-				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-				{
+				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid
 					$oldrowid = $assoc['rowid'];
 					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
 					$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
@@ -280,8 +300,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 	// Define sql request
 	$sql = '';
 	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-	{
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
 		// Count on invoice date
 		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
 		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -295,24 +314,31 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
 		$sql .= " AND f.rowid = d.".$fk_facture;
 		$sql .= " AND s.rowid = f.fk_soc";
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = 1"; // Limit to services
 		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		}
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
 	} else {
 		// Count on payments date
@@ -331,52 +357,64 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
 		$sql .= " AND f.rowid = d.".$fk_facture;
 		$sql .= " AND s.rowid = f.fk_soc";
 		$sql .= " AND pf.".$fk_facture2." = f.rowid";
 		$sql .= " AND pa.rowid = pf.".$fk_payment;
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = 1"; // Limit to services
 		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		}
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
 	}
 
-	if (!$sql)
-	{
+	if (!$sql) {
 		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
 		return -1; // -1 = Not accountancy module enabled
 	}
-	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-	if ($sql != 'TODO')
-	{
+	if ($sql == 'TODO') {
+		return -2; // -2 = Feature not yet available
+	}
+	if ($sql != 'TODO') {
 		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$company_id = -1;
 			$oldrowid = '';
-			while ($assoc = $db->fetch_array($resql))
-			{
-				if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
-				if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
-				if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
-				if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
+			while ($assoc = $db->fetch_array($resql)) {
+				if (!isset($list[$assoc['company_id']]['totalht'])) {
+					$list[$assoc['company_id']]['totalht'] = 0;
+				}
+				if (!isset($list[$assoc['company_id']]['vat'])) {
+					$list[$assoc['company_id']]['vat'] = 0;
+				}
+				if (!isset($list[$assoc['company_id']]['localtax1'])) {
+					$list[$assoc['company_id']]['localtax1'] = 0;
+				}
+				if (!isset($list[$assoc['company_id']]['localtax2'])) {
+					$list[$assoc['company_id']]['localtax2'] = 0;
+				}
 
-				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-				{
+				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid
 					$oldrowid = $assoc['rowid'];
 					$list[$assoc['company_id']]['totalht']  += $assoc['total_ht'];
 					$list[$assoc['company_id']]['vat']      += $assoc['total_vat'];
@@ -422,8 +460,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 
 	// CASE OF EXPENSE REPORT
 
-	if ($direction == 'buy')		// buy only for expense reports
-	{
+	if ($direction == 'buy') {		// buy only for expense reports
 		// Define sql request
 		$sql = '';
 
@@ -438,45 +475,54 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
 		$sql .= " WHERE e.entity = ".$conf->entity;
 		$sql .= " AND e.fk_statut in (6)";
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = -1";
 		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		}
 		$sql .= " ORDER BY e.rowid";
 
-		if (!$sql)
-		{
+		if (!$sql) {
 			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
 			return -1; // -1 = Not accountancy module enabled
 		}
-		if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-		if ($sql != 'TODO')
-		{
+		if ($sql == 'TODO') {
+			return -2; // -2 = Feature not yet available
+		}
+		if ($sql != 'TODO') {
 			dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$company_id = -1;
 				$oldrowid = '';
-				while ($assoc = $db->fetch_array($resql))
-				{
-					if (!isset($list[$assoc['company_id']]['totalht']))  $list[$assoc['company_id']]['totalht'] = 0;
-					if (!isset($list[$assoc['company_id']]['vat']))      $list[$assoc['company_id']]['vat'] = 0;
-					if (!isset($list[$assoc['company_id']]['localtax1']))      $list[$assoc['company_id']]['localtax1'] = 0;
-					if (!isset($list[$assoc['company_id']]['localtax2']))      $list[$assoc['company_id']]['localtax2'] = 0;
+				while ($assoc = $db->fetch_array($resql)) {
+					if (!isset($list[$assoc['company_id']]['totalht'])) {
+						$list[$assoc['company_id']]['totalht'] = 0;
+					}
+					if (!isset($list[$assoc['company_id']]['vat'])) {
+						$list[$assoc['company_id']]['vat'] = 0;
+					}
+					if (!isset($list[$assoc['company_id']]['localtax1'])) {
+						$list[$assoc['company_id']]['localtax1'] = 0;
+					}
+					if (!isset($list[$assoc['company_id']]['localtax2'])) {
+						$list[$assoc['company_id']]['localtax2'] = 0;
+					}
 
-					if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-					{
+					if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid
 						$oldrowid = $assoc['rowid'];
 						$list[$assoc['company_id']]['totalht'] += $assoc['total_ht'];
 						$list[$assoc['company_id']]['vat'] += $assoc['total_vat'];
@@ -545,15 +591,13 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 	global $conf;
 
 	// If we use date_start and date_end, we must not use $y, $m, $q
-	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q)))
-	{
+	if (($date_start || $date_end) && (!empty($y) || !empty($m) || !empty($q))) {
 		dol_print_error('', 'Bad value of input parameter for tax_by_rate');
 	}
 
 	$list = array();
 
-	if ($direction == 'sell')
-	{
+	if ($direction == 'sell') {
 		$invoicetable = 'facture';
 		$invoicedettable = 'facturedet';
 		$fk_facture = 'fk_facture';
@@ -590,8 +634,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 	// Define sql request
 	$sql = '';
 	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
-		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice'))
-	{
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')) {
 		// Count on delivery date (use invoice date as delivery is unknown)
 		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
 		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -605,24 +648,31 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
 		$sql .= " AND f.rowid = d.".$fk_facture;
 		$sql .= " AND s.rowid = f.fk_soc";
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = 0"; // Limit to products
 		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		}
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
 	} else {
 		// Count on payments date
@@ -641,50 +691,65 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
 		$sql .= " AND f.rowid = d.".$fk_facture;
 		$sql .= " AND s.rowid = f.fk_soc";
 		$sql .= " AND pf.".$fk_facture2." = f.rowid";
 		$sql .= " AND pa.rowid = pf.".$fk_payment;
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = 0"; // Limit to products
 		$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		}
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
 	}
 
-	if (!$sql) return -1;
-	if ($sql == 'TODO') return -2;
-	if ($sql != 'TODO')
-	{
+	if (!$sql) {
+		return -1;
+	}
+	if ($sql == 'TODO') {
+		return -2;
+	}
+	if ($sql != 'TODO') {
 		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$rate = -1;
 			$oldrowid = '';
-			while ($assoc = $db->fetch_array($resql))
-			{
+			while ($assoc = $db->fetch_array($resql)) {
 				// Code to avoid warnings when array entry not defined
-				if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
-				if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
-				if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
-				if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
+				if (!isset($list[$assoc['rate']]['totalht'])) {
+					$list[$assoc['rate']]['totalht'] = 0;
+				}
+				if (!isset($list[$assoc['rate']]['vat'])) {
+					$list[$assoc['rate']]['vat'] = 0;
+				}
+				if (!isset($list[$assoc['rate']]['localtax1'])) {
+					$list[$assoc['rate']]['localtax1'] = 0;
+				}
+				if (!isset($list[$assoc['rate']]['localtax2'])) {
+					$list[$assoc['rate']]['localtax2'] = 0;
+				}
 
-				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-				{
+				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid
 					$oldrowid = $assoc['rowid'];
 					$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
 					$list[$assoc['rate']]['vat']       += $assoc['total_vat'];
@@ -732,8 +797,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 	// Define sql request
 	$sql = '';
 	if (($direction == 'sell' && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')
-		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice'))
-	{
+		|| ($direction == 'buy' && $conf->global->TAX_MODE_BUY_SERVICE == 'invoice')) {
 		// Count on invoice date
 		$sql = "SELECT d.rowid, d.product_type as dtype, d.".$fk_facture." as facid, d.$f_rate as rate, d.total_ht as total_ht, d.total_ttc as total_ttc, d.".$total_tva." as total_vat, d.description as descr,";
 		$sql .= " d.".$total_localtax1." as total_localtax1, d.".$total_localtax2." as total_localtax2, ";
@@ -747,24 +811,31 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Validated or paid (partially or completely)
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
 		$sql .= " AND f.rowid = d.".$fk_facture;
 		$sql .= " AND s.rowid = f.fk_soc";
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND f.datef >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND f.datef <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(f.datef,'%m') > ".(($q - 1) * 3)." AND date_format(f.datef,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = 1"; // Limit to services
 		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		}
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture;
 	} else {
 		// Count on payments date
@@ -783,53 +854,65 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p on d.fk_product = p.rowid";
 		$sql .= " WHERE f.entity IN (".getEntity($invoicetable).")";
 		$sql .= " AND f.fk_statut in (1,2)"; // Paid (partially or completely)
-		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) $sql .= " AND f.type IN (0,1,2,5)";
-		else $sql .= " AND f.type IN (0,1,2,3,5)";
+		if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+			$sql .= " AND f.type IN (0,1,2,5)";
+		} else {
+			$sql .= " AND f.type IN (0,1,2,3,5)";
+		}
 		$sql .= " AND f.rowid = d.".$fk_facture;
 		$sql .= " AND s.rowid = f.fk_soc";
 		$sql .= " AND pf.".$fk_facture2." = f.rowid";
 		$sql .= " AND pa.rowid = pf.".$fk_payment;
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND pa.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND pa.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(pa.datep,'%m') > ".(($q - 1) * 3)." AND date_format(pa.datep,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = 1"; // Limit to services
 		$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+		}
 		$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
 	}
 
-	if (!$sql)
-	{
+	if (!$sql) {
 		dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
 		return -1; // -1 = Not accountancy module enabled
 	}
-	if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-	if ($sql != 'TODO')
-	{
+	if ($sql == 'TODO') {
+		return -2; // -2 = Feature not yet available
+	}
+	if ($sql != 'TODO') {
 		dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$rate = -1;
 			$oldrowid = '';
-			while ($assoc = $db->fetch_array($resql))
-			{
+			while ($assoc = $db->fetch_array($resql)) {
 				// Code to avoid warnings when array entry not defined
-				if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
-				if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
-				if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
-				if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
+				if (!isset($list[$assoc['rate']]['totalht'])) {
+					$list[$assoc['rate']]['totalht'] = 0;
+				}
+				if (!isset($list[$assoc['rate']]['vat'])) {
+					$list[$assoc['rate']]['vat'] = 0;
+				}
+				if (!isset($list[$assoc['rate']]['localtax1'])) {
+					$list[$assoc['rate']]['localtax1'] = 0;
+				}
+				if (!isset($list[$assoc['rate']]['localtax2'])) {
+					$list[$assoc['rate']]['localtax2'] = 0;
+				}
 
-				if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-				{
+				if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid
 					$oldrowid = $assoc['rowid'];
 					$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
 					$list[$assoc['rate']]['vat']       += $assoc['total_vat'];
@@ -874,8 +957,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 
 	// CASE OF EXPENSE REPORT
 
-	if ($direction == 'buy')		// buy only for expense reports
-	{
+	if ($direction == 'buy') {		// buy only for expense reports
 		// Define sql request
 		$sql = '';
 
@@ -890,46 +972,55 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."payment_expensereport as p ON p.fk_expensereport = e.rowid ";
 		$sql .= " WHERE e.entity = ".$conf->entity;
 		$sql .= " AND e.fk_statut in (6)";
-		if ($y && $m)
-		{
+		if ($y && $m) {
 			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, $m, false))."'";
 			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, $m, false))."'";
-		} elseif ($y)
-		{
+		} elseif ($y) {
 			$sql .= " AND p.datep >= '".$db->idate(dol_get_first_day($y, 1, false))."'";
 			$sql .= " AND p.datep <= '".$db->idate(dol_get_last_day($y, 12, false))."'";
 		}
-		if ($q) $sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
-		if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		if ($q) {
+			$sql .= " AND (date_format(p.datep,'%m') > ".(($q - 1) * 3)." AND date_format(p.datep,'%m') <= ".($q * 3).")";
+		}
+		if ($date_start && $date_end) {
+			$sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+		}
 		$sql .= " AND (d.product_type = -1";
 		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) {
+			$sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		}
 		$sql .= " ORDER BY e.rowid";
 
-		if (!$sql)
-		{
+		if (!$sql) {
 			dol_syslog("Tax.lib.php::tax_by_rate no accountancy module enabled".$sql, LOG_ERR);
 			return -1; // -1 = Not accountancy module enabled
 		}
-		if ($sql == 'TODO') return -2; // -2 = Feature not yet available
-		if ($sql != 'TODO')
-		{
+		if ($sql == 'TODO') {
+			return -2; // -2 = Feature not yet available
+		}
+		if ($sql != 'TODO') {
 			dol_syslog("Tax.lib.php::tax_by_rate", LOG_DEBUG);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$rate = -1;
 				$oldrowid = '';
-				while ($assoc = $db->fetch_array($resql))
-				{
+				while ($assoc = $db->fetch_array($resql)) {
 					// Code to avoid warnings when array entry not defined
-					if (!isset($list[$assoc['rate']]['totalht']))   $list[$assoc['rate']]['totalht'] = 0;
-					if (!isset($list[$assoc['rate']]['vat']))       $list[$assoc['rate']]['vat'] = 0;
-					if (!isset($list[$assoc['rate']]['localtax1'])) $list[$assoc['rate']]['localtax1'] = 0;
-					if (!isset($list[$assoc['rate']]['localtax2'])) $list[$assoc['rate']]['localtax2'] = 0;
+					if (!isset($list[$assoc['rate']]['totalht'])) {
+						$list[$assoc['rate']]['totalht'] = 0;
+					}
+					if (!isset($list[$assoc['rate']]['vat'])) {
+						$list[$assoc['rate']]['vat'] = 0;
+					}
+					if (!isset($list[$assoc['rate']]['localtax1'])) {
+						$list[$assoc['rate']]['localtax1'] = 0;
+					}
+					if (!isset($list[$assoc['rate']]['localtax2'])) {
+						$list[$assoc['rate']]['localtax2'] = 0;
+					}
 
-					if ($assoc['rowid'] != $oldrowid)       // Si rupture sur d.rowid
-					{
+					if ($assoc['rowid'] != $oldrowid) {       // Si rupture sur d.rowid
 						$oldrowid = $assoc['rowid'];
 						$list[$assoc['rate']]['totalht']   += $assoc['total_ht'];
 						$list[$assoc['rate']]['vat'] += $assoc['total_vat'];
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index c90892d603c..c7f3e0612ce 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -88,7 +88,9 @@ function ticket_prepare_head($object)
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
-		if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		if ($nbContact > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
+		}
 		$head[$h][2] = 'contact';
 		$h++;
 	}
@@ -124,8 +126,7 @@ function ticket_prepare_head($object)
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
 	}
 	$head[$h][1] = $langs->trans('Events');
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
@@ -150,8 +151,7 @@ function showDirectPublicLink($object)
 	require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	$email = CMailFile::getValidAddress($object->origin_email, 2);
 	$url = '';
-	if ($email)
-	{
+	if ($email) {
 		$url = dol_buildpath('/public/ticket/view.php', 3).'?track_id='.$object->track_id.'&email='.$email;
 	}
 
@@ -278,7 +278,9 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 	dol_include_once('/comm/action/class/actioncomm.class.php');
 
 	// Check parameters
-	if (!is_object($filterobj) && !is_object($objcon)) dol_print_error('', 'BadParameter');
+	if (!is_object($filterobj) && !is_object($objcon)) {
+		dol_print_error('', 'BadParameter');
+	}
 
 	$out = '';
 	$histo = array();
@@ -294,8 +296,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 	}
 	$sortfield_new = implode(',', $sortfield_new_list);
 
-	if (!empty($conf->agenda->enabled))
-	{
+	if (!empty($conf->agenda->enabled)) {
 		// Recherche histo sur actioncomm
 		if (is_object($objcon) && $objcon->id > 0) {
 			$sql = "SELECT DISTINCT a.id, a.label as label,";
@@ -365,22 +366,34 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				$sql .= " AND a.fk_project = ".$filterobj->id;
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Adherent') {
 				$sql .= " AND a.fk_element = m.rowid AND a.elementtype = 'member'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'CommandeFournisseur') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'order_supplier'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Product') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'product'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Ticket') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'ticket'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'BOM') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'bom'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			} elseif (is_object($filterobj) && get_class($filterobj) == 'Contrat') {
 				$sql .= " AND a.fk_element = o.rowid AND a.elementtype = 'contract'";
-				if ($filterobj->id) $sql .= " AND a.fk_element = ".$filterobj->id;
+				if ($filterobj->id) {
+					$sql .= " AND a.fk_element = ".$filterobj->id;
+				}
 			}
 		}
 
@@ -399,20 +412,28 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 					}
 				}
 			} else {
-				if ($actioncode == 'AC_NON_AUTO') $sql .= " AND c.type != 'systemauto'";
-				elseif ($actioncode == 'AC_ALL_AUTO') $sql .= " AND c.type = 'systemauto'";
-				else $sql .= " AND c.code = '".$db->escape($actioncode)."'";
+				if ($actioncode == 'AC_NON_AUTO') {
+					$sql .= " AND c.type != 'systemauto'";
+				} elseif ($actioncode == 'AC_ALL_AUTO') {
+					$sql .= " AND c.type = 'systemauto'";
+				} else {
+					$sql .= " AND c.code = '".$db->escape($actioncode)."'";
+				}
 			}
 		}
-		if ($donetodo == 'todo') $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
-		elseif ($donetodo == 'done') $sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
-		if (is_array($filters) && $filters['search_agenda_label']) $sql .= natural_search('a.label', $filters['search_agenda_label']);
+		if ($donetodo == 'todo') {
+			$sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
+		} elseif ($donetodo == 'done') {
+			$sql .= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
+		}
+		if (is_array($filters) && $filters['search_agenda_label']) {
+			$sql .= natural_search('a.label', $filters['search_agenda_label']);
+		}
 	}
 
 	// Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.
 	if (!empty($conf->mailing->enabled) && !empty($objcon->email)
-		&& (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING'))
-	{
+		&& (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) {
 		$langs->load("mails");
 
 		$sql2 = "SELECT m.rowid as id, m.titre as label, mc.date_envoi as dp, mc.date_envoi as dp2, '100' as percent, 'mailing' as type";
@@ -467,7 +488,9 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
 				//elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
 				$tododone = '';
-				if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';
+				if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) {
+					$tododone = 'todo';
+				}
 
 				$histo[$numaction] = array(
 					'type'=>$obj->type,
@@ -549,7 +572,9 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		} else {
 			$out .= '<input type="hidden" name="id" value="'.$filterobj->id.'" />';
 		}
-		if ($filterobj && get_class($filterobj) == 'Societe') $out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
+		if ($filterobj && get_class($filterobj) == 'Societe') {
+			$out .= '<input type="hidden" name="socid" value="'.$filterobj->id.'" />';
+		}
 
 		$out .= "\n";
 
@@ -591,12 +616,16 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 		if ($donetodo) {
 			$tmp = '';
-			if (get_class($filterobj) == 'Societe') $tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&socid='.$filterobj->id.'&status=done">';
+			if (get_class($filterobj) == 'Societe') {
+				$tmp .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?action=show_list&socid='.$filterobj->id.'&status=done">';
+			}
 			$tmp .= ($donetodo != 'done' ? $langs->trans("ActionsToDoShort") : '');
 			$tmp .= ($donetodo != 'done' && $donetodo != 'todo' ? ' / ' : '');
 			$tmp .= ($donetodo != 'todo' ? $langs->trans("ActionsDoneShort") : '');
 			//$out.=$langs->trans("ActionsToDoShort").' / '.$langs->trans("ActionsDoneShort");
-			if (get_class($filterobj) == 'Societe') $tmp .= '</a>';
+			if (get_class($filterobj) == 'Societe') {
+				$tmp .= '</a>';
+			}
 			$out .= getTitleFieldOfList($tmp);
 		}
 
@@ -607,8 +636,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 		$actualCycleDate = false;
 
-		foreach ($histo as $key=>$value)
-		{
+		foreach ($histo as $key => $value) {
 			$actionstatic->fetch($histo[$key]['id']); // TODO Do we need this, we already have a lot of data of line into $histo
 
 			$actionstatic->type_picto = $histo[$key]['apicto'];
@@ -652,8 +680,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 			//}
 
 			if ($user->rights->agenda->allactions->create ||
-				(($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create))
-			{
+				(($actionstatic->authorid == $user->id || $actionstatic->userownerid == $user->id) && $user->rights->agenda->myactions->create)) {
 				$out .= '<a class="timeline-btn" href="'.DOL_MAIN_URL_ROOT.'/comm/action/card.php?action=edit&id='.$actionstatic->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
 			}
 
@@ -671,11 +698,21 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				}
 			}
 			$late = 0;
-			if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-			if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) $late = 1;
-			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) $late = 1;
-			if ($late) $out .= img_warning($langs->trans("Late")).' ';
+			if ($histo[$key]['percent'] == 0 && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($histo[$key]['percent'] == 0 && !$histo[$key]['datestart'] && $histo[$key]['dateend'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && $histo[$key]['dateend'] && $histo[$key]['dateend'] < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($histo[$key]['percent'] > 0 && $histo[$key]['percent'] < 100 && !$histo[$key]['dateend'] && $histo[$key]['datestart'] && $histo[$key]['datestart'] < ($now - $delay_warning)) {
+				$late = 1;
+			}
+			if ($late) {
+				$out .= img_warning($langs->trans("Late")).' ';
+			}
 			$out .= "</span>\n";
 
 			// Ref
@@ -683,8 +720,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 
 			// Author of event
 			$out .= '<span class="messaging-author">';
-			if ($histo[$key]['userid'] > 0)
-			{
+			if ($histo[$key]['userid'] > 0) {
 				if (!isset($userGetNomUrlCache[$histo[$key]['userid']])) { // is in cache ?
 					$userstatic->fetch($histo[$key]['userid']);
 					$userGetNomUrlCache[$histo[$key]['userid']] = $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, 'firstelselast', '');
@@ -723,8 +759,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 			if (!empty($histo[$key]['message'])
 				&& $actionstatic->code != 'AC_TICKET_CREATE'
 				&& $actionstatic->code != 'AC_TICKET_MODIFY'
-			)
-			{
+			) {
 				$out .= '<div class="timeline-body">';
 				$out .= $histo[$key]['message'];
 				$out .= '</div>';
@@ -748,8 +783,9 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 						$contactList .= !empty($contactList) ? ', ' : '';
 						$contactList .= $contact->getNomUrl(1);
 						if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
-							if (!empty($contact->phone_pro))
+							if (!empty($contact->phone_pro)) {
 								$contactList .= '('.dol_print_phone($contact->phone_pro).')';
+							}
 						}
 					}
 				}
@@ -759,24 +795,24 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 				$contact = new Contact($db);
 				$result = $contact->fetch($histo[$key]['contact_id']);
 
-				if ($result < 0)
+				if ($result < 0) {
 					dol_print_error($db, $contact->error);
+				}
 
 				if ($result > 0) {
 					$footer .= $contact->getNomUrl(1);
 					if (isset($histo[$key]['acode']) && $histo[$key]['acode'] == 'AC_TEL') {
-						if (!empty($contact->phone_pro))
+						if (!empty($contact->phone_pro)) {
 							$footer .= '('.dol_print_phone($contact->phone_pro).')';
+						}
 					}
 				}
 			}
 
 			$documents = getTicketActionCommEcmList($actionstatic);
-			if (!empty($documents))
-			{
+			if (!empty($documents)) {
 				$footer .= '<div class="timeline-documents-container">';
-				foreach ($documents as $doc)
-				{
+				foreach ($documents as $doc) {
 					$footer .= '<span id="document_'.$doc->id.'" class="timeline-documents" ';
 					$footer .= ' data-id="'.$doc->id.'" ';
 					$footer .= ' data-path="'.$doc->filepath.'"';
@@ -819,8 +855,11 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		$out .= "</ul>\n";
 	}
 
-	if ($noprint) return $out;
-	else print $out;
+	if ($noprint) {
+		return $out;
+	} else {
+		print $out;
+	}
 }
 
 /**
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 9df0f8d9ddf..a20170e3a95 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -38,8 +38,7 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
 	$pos = 1;
 
 	// Loop on each pos, because we will output an img for each pos
-	while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0)
-	{
+	while ($pos <= $fulltree[$key]['level'] && $fulltree[$key]['level'] > 0) {
 		// Process for column $pos
 
 		$atleastoneofthislevelafter = 0;
@@ -47,41 +46,41 @@ function tree_showpad(&$fulltree, $key, $silent = 0)
 		$nbofdocinsub = 0;
 		$found = 0;
 		//print 'x'.$key;
-		foreach ($fulltree as $key2 => $val2)
-		{
+		foreach ($fulltree as $key2 => $val2) {
 			//print "x".$pos." ".$key2." ".$found." ".$fulltree[$key2]['level'];
-			if ($found == 1) // We are after the entry to show
-			{
-				if ($fulltree[$key2]['level'] > $pos)
-				{
+			if ($found == 1) { // We are after the entry to show
+				if ($fulltree[$key2]['level'] > $pos) {
 					$nbofdirinsub++;
-					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) $nbofdocinsub += $fulltree[$key2]['cachenbofdoc'];
+					if (isset($fulltree[$key2]['cachenbofdoc']) && $fulltree[$key2]['cachenbofdoc'] > 0) {
+						$nbofdocinsub += $fulltree[$key2]['cachenbofdoc'];
+					}
 				}
-				if ($fulltree[$key2]['level'] == $pos)
-				{
+				if ($fulltree[$key2]['level'] == $pos) {
 					$atleastoneofthislevelafter = 1;
 				}
-				if ($fulltree[$key2]['level'] <= $pos)
-				{
+				if ($fulltree[$key2]['level'] <= $pos) {
 					break;
 				}
 			}
-			if ($key2 == $key)    // We found ourself, so now every lower level will be counted
-			{
+			if ($key2 == $key) {    // We found ourself, so now every lower level will be counted
 				$found = 1;
 			}
 		}
 		//print $atleastoneofthislevelafter;
 
-		if (!$silent)
-		{
-			if ($atleastoneofthislevelafter)
-			{
-				if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branch.gif');
-				else print img_picto_common('', 'treemenu/line.gif');
+		if (!$silent) {
+			if ($atleastoneofthislevelafter) {
+				if ($fulltree[$key]['level'] == $pos) {
+					print img_picto_common('', 'treemenu/branch.gif');
+				} else {
+					print img_picto_common('', 'treemenu/line.gif');
+				}
 			} else {
-				if ($fulltree[$key]['level'] == $pos) print img_picto_common('', 'treemenu/branchbottom.gif');
-				else print img_picto_common('', 'treemenu/linebottom.gif');
+				if ($fulltree[$key]['level'] == $pos) {
+					print img_picto_common('', 'treemenu/branchbottom.gif');
+				} else {
+					print img_picto_common('', 'treemenu/linebottom.gif');
+				}
 			}
 		}
 		$pos++;
@@ -116,10 +115,11 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 {
 	global $tree_recur_alreadyadded, $menu_handler_to_search;
 
-	if ($rang == 0 && empty($donoresetalreadyloaded)) $tree_recur_alreadyadded = array();
+	if ($rang == 0 && empty($donoresetalreadyloaded)) {
+		$tree_recur_alreadyadded = array();
+	}
 
-	if ($rang == 0)
-	{
+	if ($rang == 0) {
 		// Test also done with jstree and dynatree (not able to have <a> inside label)
 		print '<script type="text/javascript" language="javascript">
 		$(document).ready(function(){
@@ -138,25 +138,20 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 		print '<ul id="'.$iddivjstree.'">';
 	}
 
-	if ($rang > 50)
-	{
+	if ($rang > 50) {
 		return; // Protect against infinite loop. Max 50 depth
 	}
 
 	//ballayage du tableau
 	$sizeoftab = count($tab);
 	$ulprinted = 0;
-	for ($x = 0; $x < $sizeoftab; $x++)
-	{
+	for ($x = 0; $x < $sizeoftab; $x++) {
 		//var_dump($tab[$x]);exit;
 		// If an element has $pere for parent
-		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
-		{
+		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid']) {
 			//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-			if (empty($ulprinted) && !empty($pere['rowid']))
-			{
-				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-				{
+			if (empty($ulprinted) && !empty($pere['rowid'])) {
+				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']])) {
 					  dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
 					  continue;
 				}
@@ -164,8 +159,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
 			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
-			if ($showfk)
-			{
+			if ($showfk) {
 				print '<table class="nobordernopadding centpercent"><tr><td>';
 				print '<strong> &nbsp; ';
 				print $tab[$x]['title'];
@@ -183,10 +177,8 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			print '</li>';
 		} elseif (!empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu']) {
 			//print 'rang='.$rang.'-x='.$x." rowid=".$tab[$x]['rowid']." tab[x]['fk_leftmenu'] = ".$tab[$x]['fk_leftmenu']." leftmenu pere = ".$pere['leftmenu']."<br>\n";
-			if (empty($ulprinted) && !empty($pere['rowid']))
-			{
-				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']]))
-				{
+			if (empty($ulprinted) && !empty($pere['rowid'])) {
+				if (!empty($tree_recur_alreadyadded[$tab[$x]['rowid']])) {
 					dol_syslog('Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.', LOG_WARNING);
 					//print 'Error, record with id '.$tab[$x]['rowid'].' seems to be a child of record with id '.$pere['rowid'].' but it was already output. Complete field "leftmenu" and "mainmenu" on ALL records to avoid ambiguity.';
 					continue;
@@ -195,8 +187,7 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 				print '<ul'.(empty($pere['rowid']) ? ' id="treeData"' : '').'>'; $ulprinted++;
 			}
 			print "\n".'<li '.(!empty($tab[$x]['statut']) ? ' class="liuseractive"' : 'class="liuserdisabled"').'>';
-			if ($showfk)
-			{
+			if ($showfk) {
 				print '<table class="nobordernopadding centpercent"><tr><td>';
 				print '<strong> &nbsp; <a href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&menuId='.$tab[$x]['rowid'].$moreparam.'">';
 				print $tab[$x]['title'];
@@ -216,7 +207,11 @@ function tree_recur($tab, $pere, $rang, $iddivjstree = 'iddivjstree', $donoreset
 			print '</li>';
 		}
 	}
-	if (!empty($ulprinted) && !empty($pere['rowid'])) { print '</ul>'."\n"; }
+	if (!empty($ulprinted) && !empty($pere['rowid'])) {
+		print '</ul>'."\n";
+	}
 
-	if ($rang == 0) print '</ul>';
+	if ($rang == 0) {
+		print '</ul>';
+	}
 }
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 0cf23e0593f..e12a0d9c8a7 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -72,7 +72,9 @@ function user_prepare_head($object)
 	$h++;
 
 	if (!empty($conf->agenda->enabled)) {
-		if (empty($conf->global->AGENDA_EXT_NB)) $conf->global->AGENDA_EXT_NB = 5;
+		if (empty($conf->global->AGENDA_EXT_NB)) {
+			$conf->global->AGENDA_EXT_NB = 5;
+		}
 		$MAXAGENDA = $conf->global->AGENDA_EXT_NB;
 
 		$i = 1;
@@ -85,7 +87,9 @@ function user_prepare_head($object)
 			$color = 'AGENDA_EXT_COLOR_'.$object->id.'_'.$key;
 			$i++;
 
-			if (!empty($object->conf->$name)) $nbagenda++;
+			if (!empty($object->conf->$name)) {
+				$nbagenda++;
+			}
 		}
 
 		$head[$h][0] = DOL_URL_ROOT.'/user/agenda_extsites.php?id='.$object->id;
@@ -123,7 +127,9 @@ function user_prepare_head($object)
 		$langs->load("mails");
 		$head[$h][0] = DOL_URL_ROOT.'/user/notify/card.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("NotificationsAuto");
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'notify';
 		$h++;
 	}
@@ -150,10 +156,14 @@ function user_prepare_head($object)
 	if (empty($user->socid)) {
 		// Notes
 		$nbNote = 0;
-		if (!empty($object->note)) $nbNote++;
+		if (!empty($object->note)) {
+			$nbNote++;
+		}
 		$head[$h][0] = DOL_URL_ROOT.'/user/note.php?id='.$object->id;
 		$head[$h][1] = $langs->trans("Note");
-		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		if ($nbNote > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
+		}
 		$head[$h][2] = 'note';
 		$h++;
 
@@ -165,7 +175,9 @@ function user_prepare_head($object)
 		$nbLinks = Link::count($db, $object->element, $object->id);
 		$head[$h][0] = DOL_URL_ROOT.'/user/document.php?userid='.$object->id;
 		$head[$h][1] = $langs->trans("Documents");
-		if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+		if (($nbFiles + $nbLinks) > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+		}
 		$head[$h][2] = 'document';
 		$h++;
 
@@ -300,19 +312,30 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// Now dir_themes=array('/themes') or dir_themes=array('/theme','/mymodule/theme')
 
 	$selected_theme = '';
-	if (empty($foruserprofile)) $selected_theme = $conf->global->MAIN_THEME;
-	else $selected_theme = ((is_object($fuser) && !empty($fuser->conf->MAIN_THEME)) ? $fuser->conf->MAIN_THEME : '');
+	if (empty($foruserprofile)) {
+		$selected_theme = $conf->global->MAIN_THEME;
+	} else {
+		$selected_theme = ((is_object($fuser) && !empty($fuser->conf->MAIN_THEME)) ? $fuser->conf->MAIN_THEME : '');
+	}
 
 	$hoverdisabled = '';
-	if (empty($foruserprofile)) $hoverdisabled = (isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
-	else $hoverdisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0') : '');
+	if (empty($foruserprofile)) {
+		$hoverdisabled = (isset($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '0');
+	} else {
+		$hoverdisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_HOVER) || $fuser->conf->THEME_ELDY_USE_HOVER == '0') : '');
+	}
 
 	$checkeddisabled = '';
-	if (empty($foruserprofile)) $checkeddisabled = (isset($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '0');
-	else $checkeddisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0') : '');
+	if (empty($foruserprofile)) {
+		$checkeddisabled = (isset($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '0');
+	} else {
+		$checkeddisabled = (is_object($fuser) ? (empty($fuser->conf->THEME_ELDY_USE_CHECKED) || $fuser->conf->THEME_ELDY_USE_CHECKED == '0') : '');
+	}
 
 	$colspan = 2;
-	if ($foruserprofile) $colspan = 4;
+	if ($foruserprofile) {
+		$colspan = 4;
+	}
 
 	$thumbsbyrow = 6;
 	print '<div class="div-table-responsive-no-min">';
@@ -364,16 +387,25 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 					if (is_dir($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
 							&& substr($subdir, 0, 3) <> 'CVS' && !preg_match('/common|phones/i', $subdir)) {
 						// Disable not stable themes (dir ends with _exp or _dev)
-						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
-						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
+						if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) {
+							continue;
+						}
+						if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) {
+							continue;
+						}
 
 						print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
 						$file = $dirtheme."/".$subdir."/thumb.png";
 						$url = $urltheme."/".$subdir."/thumb.png";
-						if (!file_exists($file)) $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+						if (!file_exists($file)) {
+							$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+						}
 						print '<a href="'.$_SERVER["PHP_SELF"].($edit ? '?action=edit&theme=' : '?theme=').$subdir.(GETPOST('optioncss', 'alpha', 1) ? '&optioncss='.GETPOST('optioncss', 'alpha', 1) : '').($fuser ? '&id='.$fuser->id : '').'" style="font-weight: normal;" alt="'.$langs->trans("Preview").'">';
-						if ($subdir == $conf->global->MAIN_THEME) $title = $langs->trans("ThemeCurrentlyActive");
-						else $title = $langs->trans("ShowPreview");
+						if ($subdir == $conf->global->MAIN_THEME) {
+							$title = $langs->trans("ThemeCurrentlyActive");
+						} else {
+							$title = $langs->trans("ShowPreview");
+						}
 						print '<img class="img-skinthumb shadow" src="'.$url.'" alt="'.$title.'" title="'.$title.'" style="border: none; margin-bottom: 5px;">';
 						print '</a><br>';
 						if ($subdir == $selected_theme) {
@@ -434,25 +466,25 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TopMenuDisableImages
 	if ($foruserprofile) {
 		/*
-         print '<tr class="oddeven">';
-         print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
-         print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';
-         print '<td class="left" class="nowrap" width="20%"><input name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");
-         print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
-         print '> '.$langs->trans("UsePersonalValue").'</td>';
-         print '<td>';
-         if ($edit)
-         {
-         print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','',1).' ';
-         }
-         else
-         {
-         $color = colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),'');
-         if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-         else print '';
-         }
-         if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-         print '</td>';*/
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+		 print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';
+		 print '<td class="left" class="nowrap" width="20%"><input name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");
+		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
+		 print '> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td>';
+		 if ($edit)
+		 {
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','',1).' ';
+		 }
+		 else
+		 {
+		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),'');
+		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+		 else print '';
+		 }
+		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		 print '</td>';*/
 	} else {
 		$default = $langs->trans('No');
 		print '<tr class="oddeven">';
@@ -473,37 +505,40 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// Background color THEME_ELDY_BACKBODY
 	if ($foruserprofile) {
 		/*
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
-        print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
-        print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
-        print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
-        print '> '.$langs->trans("UsePersonalValue").'</td>';
-        print '<td>';
-	    if ($edit)
-	    {
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
+		print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+		print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
+		print '> '.$langs->trans("UsePersonalValue").'</td>';
+		print '<td>';
+		if ($edit)
+		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';
-	    }
-	   	else
-	   	{
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+		}
+		   else
+		   {
+			   $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
 			if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print '';
-	   	}
-    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    print '</td>';*/
+		   }
+		if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		print '</td>';*/
 	} else {
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("BackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		//var_dump($conf->global->THEME_ELDY_BACKBODY);
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKBODY) ? $conf->global->THEME_ELDY_BACKBODY : ''), array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKBODY) ? $conf->global->THEME_ELDY_BACKBODY : ''), array()), ''), 'THEME_ELDY_BACKBODY', '', 1, '', '', 'colorbackbody').' ';
 		} else {
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
-	   	}
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				print $langs->trans("Default");
+			}
+		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>ffffff</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 		print '</td>';
@@ -513,25 +548,25 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// TopMenuBackgroundColor
 	if ($foruserprofile) {
 		/*
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
-        print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
-        print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
-        print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
-        print '> '.$langs->trans("UsePersonalValue").'</td>';
-        print '<td>';
-	    if ($edit)
-	    {
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
+		print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+		print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
+		print '> '.$langs->trans("UsePersonalValue").'</td>';
+		print '<td>';
+		if ($edit)
+		{
 			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','',1).' ';
-	    }
-	   	else
-	   	{
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
+		}
+		   else
+		   {
+			   $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
 			if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
 			else print '';
-	   	}
-    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    print '</td>';*/
+		   }
+		if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		print '</td>';*/
 	} else {
 		$default = (empty($colorbackhmenu1) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbackhmenu1)));
 
@@ -539,12 +574,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $conf->global->THEME_ELDY_TOPMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $conf->global->THEME_ELDY_TOPMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_TOPMENU_BACK1', '', 1, '', '', 'colorbackhmenu1').' ';
 		} else {
-	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
-	   	}
+			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				print $langs->trans("Default");
+			}
+		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 		print '</td>';
@@ -580,11 +618,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("LeftMenuBackgroundColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $conf->global->THEME_ELDY_VERMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_VERMENU_BACK1) ? $conf->global->THEME_ELDY_VERMENU_BACK1 : ''), array()), ''), 'THEME_ELDY_VERMENU_BACK1', '', 1, '', '', 'colorbackvmenu1').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				print $langs->trans("Default");
+			}
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -601,7 +642,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("TextTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $conf->global->THEME_ELDY_TEXTTITLENOTAB : ''), array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLENOTAB) ? $conf->global->THEME_ELDY_TEXTTITLENOTAB : ''), array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', '', 1, '', '', 'colortexttitlenotab').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
@@ -621,10 +662,10 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKTITLE1) ? $conf->global->THEME_ELDY_BACKTITLE1 : ''), array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BACKTITLE1) ? $conf->global->THEME_ELDY_BACKTITLE1 : ''), array()), ''), 'THEME_ELDY_BACKTITLE1', '', 1, '', '', 'colorbacktitle1').' ';
 		} else {
-	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
-	   	}
+			print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
+		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> '; // $colorbacktitle1 in CSS
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
 		print '</td>';
@@ -641,7 +682,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleTextColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLE) ? $conf->global->THEME_ELDY_TEXTTITLE : ''), array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLE) ? $conf->global->THEME_ELDY_TEXTTITLE : ''), array()), ''), 'THEME_ELDY_TEXTTITLE', '', 1, '', '', 'colortexttitle').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
@@ -661,7 +702,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableTitleTextlinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $conf->global->THEME_ELDY_TEXTTITLELINK : ''), array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $conf->global->THEME_ELDY_TEXTTITLELINK : ''), array()), ''), 'THEME_ELDY_TEXTTITLELINK', '', 1, '', '', 'colortexttitlelink').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
@@ -682,11 +723,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $conf->global->THEME_ELDY_LINEIMPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklinepair2').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $conf->global->THEME_ELDY_LINEIMPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklinepair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				print $langs->trans("Default");
+			}
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -703,11 +747,14 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEPAIR1) ? $conf->global->THEME_ELDY_LINEPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklineimpair2').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEPAIR1) ? $conf->global->THEME_ELDY_LINEPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklineimpair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else print $langs->trans("Default");
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
+				print $langs->trans("Default");
+			}
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -718,25 +765,25 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// Text LinkColor
 	if ($foruserprofile) {
 		/*
-	     print '<tr class="oddeven">';
-	     print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
-	     print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTLINK:$langs->trans("Default")).'</td>';
-	     print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTLINK" id="check_THEME_ELDY_TEXTLINK" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");
-	     print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
-	     print '> '.$langs->trans("UsePersonalValue").'</td>';
-	     print '<td>';
-	     if ($edit)
-	     {
-	     print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','',1).' ';
-	     }
-	     else
-	     {
-	     $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
-	     if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-	     else print '';
-	     }
-	    	if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	    	print '</td>';*/
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
+		 print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TEXTLINK:$langs->trans("Default")).'</td>';
+		 print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_TEXTLINK" id="check_THEME_ELDY_TEXTLINK" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TEXTLINK)?" checked":"");
+		 print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"';	// Disabled for demo
+		 print '> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td>';
+		 if ($edit)
+		 {
+		 print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),''),'THEME_ELDY_TEXTLINK','',1).' ';
+		 }
+		 else
+		 {
+		 $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK,array()),'');
+		 if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+		 else print '';
+		 }
+			if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+			print '</td>';*/
 	} else {
 		$default = (empty($colortextlink) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colortextlink)));
 
@@ -744,11 +791,12 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("LinkColor").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-		    print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTLINK) ? $conf->global->THEME_ELDY_TEXTLINK : ''), array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTLINK) ? $conf->global->THEME_ELDY_TEXTLINK : ''), array()), ''), 'THEME_ELDY_TEXTLINK', '', 1, '', '', 'colortextlink').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
-			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-			else {
+			if ($color) {
+				print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+			} else {
 				//print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
 				//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
 				print $langs->trans("Default");
@@ -763,15 +811,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// Use Hover
 	if ($foruserprofile) {
 		/* Must first change option to choose color of highlight instead of yes or no.
-	     print '<tr class="oddeven">';
-	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
-	     print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
-	     print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-	     print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
-	     print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	     print '</td>';
-	     print '</tr>';
-	     */
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
+		 print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
+		 print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+		 print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		 print '</td>';
+		 print '</tr>';
+		 */
 	} else {
 		$default = (empty($colorbacklinepairhover) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairhover)));
 
@@ -781,16 +829,27 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit) {
-		    if (!empty($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
-			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
+			if (!empty($conf->global->THEME_ELDY_USE_HOVER) && $conf->global->THEME_ELDY_USE_HOVER == '1') {
+				$color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
+			} else {
+				$color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
+			}
 			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', '', 1, '', '', 'colorbacklinepairhover').' ';
 		} else {
-			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
-			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
+			if ($conf->global->THEME_ELDY_USE_HOVER == '1') {
+				$color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
+			} else {
+				$color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_HOVER) ? $conf->global->THEME_ELDY_USE_HOVER : ''), array()), '');
+			}
 			if ($color) {
-				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-				else print $langs->trans("Default");
-			} else print $langs->trans("Default");
+				if ($color != colorArrayToHex(colorStringToArray($colorbacklinepairhover))) {
+					print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+				} else {
+					print $langs->trans("Default");
+				}
+			} else {
+				print $langs->trans("Default");
+			}
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -800,15 +859,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	// Use Checked
 	if ($foruserprofile) {
 		/* Must first change option to choose color of highlight instead of yes or no.
-	     print '<tr class="oddeven">';
-	     print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
-	     print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
-	     print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
-	     print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
-	     print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
-	     print '</td>';
-	     print '</tr>';
-	     */
+		 print '<tr class="oddeven">';
+		 print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
+		 print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
+		 print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
+		 print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
+		 print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+		 print '</td>';
+		 print '</tr>';
+		 */
 	} else {
 		$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
 
@@ -818,16 +877,27 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		//print '<input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
 		//print ' &nbsp; ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		if ($edit) {
-		    if (!empty($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
-			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
+			if (!empty($conf->global->THEME_ELDY_USE_CHECKED) && $conf->global->THEME_ELDY_USE_CHECKED == '1') {
+				$color = 'e6edf0';
+			} else {
+				$color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
+			}
 			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', '', 1, '', '', 'colorbacklinepairchecked').' ';
 		} else {
-			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
-			else $color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
+			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') {
+				$color = 'e6edf0';
+			} else {
+				$color = colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_USE_CHECKED) ? $conf->global->THEME_ELDY_USE_CHECKED : ''), array()), '');
+			}
 			if ($color) {
-				if ($color != 'e6edf0') print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
-				else print $langs->trans("Default");
-			} else print $langs->trans("Default");
+				if ($color != 'e6edf0') {
+					print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+				} else {
+					print $langs->trans("Default");
+				}
+			} else {
+				print $langs->trans("Default");
+			}
 		}
 		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
@@ -843,40 +913,42 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		//print ajax_constantonoff("MAIN_OPTIMIZEFORTEXTBROWSER", array(), null, 0, 0, 1, 0);
-   		if ($edit) {
-   			print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
-   		} else {
-   			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-   				print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
-   			} else {
-   				print yn(1);
-   				if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) print ' ('.$langs->trans("ForcedByGlobalSetup").')';
-   			}
-   		}
-   		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
+		if ($edit) {
+			print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
+		} else {
+			if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				print yn($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER);
+			} else {
+				print yn(1);
+				if (empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+					print ' ('.$langs->trans("ForcedByGlobalSetup").')';
+				}
+			}
+		}
+		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
 		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
 		print '</td>';
 		print '</tr>';
 	} else {
 		/*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
-	    $default=$langs->trans('No');
-	    print '<tr class="oddeven">';
-	    print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
-	    print '<td colspan="'.($colspan-1).'">';
-	    if ($edit)
-	    {
-	        print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
-	    }
-	    else
-	    {
-	        print yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
-	    }
-	    print ' &nbsp; wspan class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
-	    print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
-	    print '</span>';
-	    print '</td>';
-	    print '</tr>';
-	    */
+		$default=$langs->trans('No');
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
+		print '<td colspan="'.($colspan-1).'">';
+		if ($edit)
+		{
+			print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
+		}
+		else
+		{
+			print yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
+		}
+		print ' &nbsp; wspan class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
+		print $form->textwithpicto('', $langs->trans("MAIN_OPTIMIZEFORTEXTBROWSERDesc"));
+		print '</span>';
+		print '</td>';
+		print '</tr>';
+		*/
 	}
 
 
diff --git a/htdocs/core/lib/vat.lib.php b/htdocs/core/lib/vat.lib.php
index abe7d3c7993..19359c9321e 100644
--- a/htdocs/core/lib/vat.lib.php
+++ b/htdocs/core/lib/vat.lib.php
@@ -55,7 +55,9 @@ function vat_prepare_head($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$tab][0] = DOL_URL_ROOT.'/compta/tva/document.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Documents");
-	if (($nbFiles + $nbLinks) > 0) $head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$tab][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$tab][2] = 'documents';
 	$tab++;
 
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index bc232f2cf15..2eb44c517f7 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -35,24 +35,22 @@ function dolStripPhpCode($str, $replacewith = '')
 
 	//split on each opening tag
 	$parts = explode('<?php', $str);
-	if (!empty($parts))
-	{
+	if (!empty($parts)) {
 		$i = 0;
-		foreach ($parts as $part)
-		{
-			if ($i == 0) 	// The first part is never php code
-			{
+		foreach ($parts as $part) {
+			if ($i == 0) { 	// The first part is never php code
 				$i++;
 				$newstr .= $part;
 				continue;
 			}
 			// The second part is the php code. We split on closing tag
 			$partlings = explode('?>', $part);
-			if (!empty($partlings))
-			{
+			if (!empty($partlings)) {
 				//$phppart = $partlings[0];
 				//remove content before closing tag
-				if (count($partlings) > 1) $partlings[0] = ''; // Todo why a count > 1 and not >= 1 ?
+				if (count($partlings) > 1) {
+					$partlings[0] = ''; // Todo why a count > 1 and not >= 1 ?
+				}
 				//append to out string
 				//$newstr .= '<span class="phptag" class="tooltip" title="'.dol_escape_htmltag(dolGetFirstLineOfText($phppart).'...').'">'.$replacewith.'<!-- '.$phppart.' --></span>'.implode('', $partlings);
 				//$newstr .= '<span>'.$replacewith.'<!-- '.$phppart.' --></span>'.implode('', $partlings);
@@ -77,21 +75,17 @@ function dolKeepOnlyPhpCode($str)
 
 	//split on each opening tag
 	$parts = explode('<?php', $str);
-	if (!empty($parts))
-	{
+	if (!empty($parts)) {
 		$i = 0;
-		foreach ($parts as $part)
-		{
-			if ($i == 0) 	// The first part is never php code
-			{
+		foreach ($parts as $part) {
+			if ($i == 0) { 	// The first part is never php code
 				$i++;
 				continue;
 			}
 			$newstr .= '<?php';
 			//split on closing tag
 			$partlings = explode('?>', $part, 2);
-			if (!empty($partlings))
-			{
+			if (!empty($partlings)) {
 				$newstr .= $partlings[0].'?>';
 			} else {
 				$newstr .= $part.'?>';
@@ -122,28 +116,40 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0, $c
 
 	// Replace php code. Note $content may come from database and does not contains body tags.
 	$replacewith = '...php...';
-	if ($removephppart) $replacewith = '';
+	if ($removephppart) {
+		$replacewith = '';
+	}
 	$content = preg_replace('/value="<\?php((?!\?>).)*\?>\n*/ims', 'value="'.$replacewith.'"', $content);
 
 	$replacewith = '"callto=#';
-	if ($removephppart) $replacewith = '';
+	if ($removephppart) {
+		$replacewith = '';
+	}
 	$content = preg_replace('/"callto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	$replacewith = '"mailto=#';
-	if ($removephppart) $replacewith = '';
+	if ($removephppart) {
+		$replacewith = '';
+	}
 	$content = preg_replace('/"mailto:<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	$replacewith = 'src="php';
-	if ($removephppart) $replacewith = '';
+	if ($removephppart) {
+		$replacewith = '';
+	}
 	$content = preg_replace('/src="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	$replacewith = 'href="php';
-	if ($removephppart) $replacewith = '';
+	if ($removephppart) {
+		$replacewith = '';
+	}
 	$content = preg_replace('/href="<\?php((?!\?>).)*\?>\n*/ims', $replacewith, $content);
 
 	//$replacewith='<span class="phptag">...php...</span>';
 	$replacewith = '...php...';
-	if ($removephppart) $replacewith = '';
+	if ($removephppart) {
+		$replacewith = '';
+	}
 	//$content = preg_replace('/<\?php((?!\?toremove>).)*\?toremove>\n*/ims', $replacewith, $content);
 	/*if ($content === null) {
 		if (preg_last_error() == PREG_JIT_STACKLIMIT_ERROR) $content = 'preg_replace error (when removing php tags) PREG_JIT_STACKLIMIT_ERROR';
@@ -231,17 +237,14 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-	if (defined('USEDOLIBARREDITOR'))		// REPLACEMENT OF LINKS When page called from Dolibarr editor
-	{
+	if (defined('USEDOLIBARREDITOR')) {		// REPLACEMENT OF LINKS When page called from Dolibarr editor
 		// We remove the <head> part of content
-		if ($contenttype == 'html')
-		{
+		if ($contenttype == 'html') {
 			$content = preg_replace('/<head>.*<\/head>/ims', '', $content);
 			$content = preg_replace('/^.*<body(\s[^>]*)*>/ims', '', $content);
 			$content = preg_replace('/<\/body(\s[^>]*)*>.*$/ims', '', $content);
 		}
-	} elseif (defined('USEDOLIBARRSERVER'))	// REPLACEMENT OF LINKS When page called from Dolibarr server
-	{
+	} elseif (defined('USEDOLIBARRSERVER')) {	// REPLACEMENT OF LINKS When page called from Dolibarr server
 		$content = str_replace('<link rel="stylesheet" href="/styles.css', '<link rel="stylesheet" href="styles.css', $content);
 
 		// Protect the link styles.css.php to any replacement that we make after.
@@ -309,8 +312,7 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 		// <img alt="" src="/dolibarr_dev/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
 		// become
 		// <img alt="" src="'.$urlwithroot.'/medias/image/ldestailleur_166x166.jpg" style="height:166px; width:166px" />
-		if (!$symlinktomediaexists)
-		{
+		if (!$symlinktomediaexists) {
 			// <img src="image.png... => <img src="medias/image.png...
 			$content = preg_replace('/(<img[^>]*src=")\/?image\//', '\1/wrapper.php?modulepart=medias&file=medias/image/', $content, -1, $nbrep);
 			$content = preg_replace('/(url\(["\']?)\/?image\//', '\1/wrapper.php?modulepart=medias&file=medias/image/', $content, -1, $nbrep);
@@ -413,13 +415,11 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 	$result = 0;
 
 	// We make redirect using the alternative alias, we must find the real $containerref
-	if ($containeraliasalt)
-	{
+	if ($containeraliasalt) {
 		include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 		$tmpwebsitepage = new WebsitePage($db);
 		$result = $tmpwebsitepage->fetch(0, $website->id, '', $containeraliasalt);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$containerref = $tmpwebsitepage->pageurl;
 		} else {
 			print "Error, page contains a redirect to the alternative alias '".$containeraliasalt."' that does not exists in web site (".$website->id." / ".$website->ref.")";
@@ -427,8 +427,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		}
 	}
 
-	if (defined('USEDOLIBARREDITOR'))
-	{
+	if (defined('USEDOLIBARREDITOR')) {
 		/*print '<div class="margintoponly marginleftonly">';
 		print "This page contains dynamic code that make a redirect to '".$containerref."' in your current context. Redirect has been canceled as it is not supported in edition mode.";
 		print '</div>';*/
@@ -437,24 +436,19 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		return;
 	}
 
-	if (defined('USEDOLIBARRSERVER'))	// When page called from Dolibarr server
-	{
+	if (defined('USEDOLIBARRSERVER')) {	// When page called from Dolibarr server
 		// Check new container exists
-		if (!$containeraliasalt)	// If containeraliasalt set, we already did the test
-		{
+		if (!$containeraliasalt) {	// If containeraliasalt set, we already did the test
 			include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 			$tmpwebsitepage = new WebsitePage($db);
 			$result = $tmpwebsitepage->fetch(0, $website->id, $containerref);
 			unset($tmpwebsitepage);
 		}
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$currenturi = $_SERVER["REQUEST_URI"];
 			$regtmp = array();
-			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp))
-			{
-				if ($regtmp[0] == $containerref)
-				{
+			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp)) {
+				if ($regtmp[0] == $containerref) {
 					print "Error, page with uri '.$currenturi.' try a redirect to the same alias page '".$containerref."' in web site '".$website->ref."'";
 					exit;
 				} else {
@@ -469,8 +463,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		$newurl = '/'.$containerref.'.php';
 	}
 
-	if ($newurl)
-	{
+	if ($newurl) {
 		if ($permanent) {
 			header("Status: 301 Moved Permanently", false, 301);
 		}
@@ -498,14 +491,17 @@ function includeContainer($containerref)
 
 	$MAXLEVEL = 20;
 
-	if (!preg_match('/\.php$/i', $containerref)) $containerref .= '.php';
+	if (!preg_match('/\.php$/i', $containerref)) {
+		$containerref .= '.php';
+	}
 
 	$fullpathfile = DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;
 
-	if (empty($includehtmlcontentopened)) $includehtmlcontentopened = 0;
+	if (empty($includehtmlcontentopened)) {
+		$includehtmlcontentopened = 0;
+	}
 	$includehtmlcontentopened++;
-	if ($includehtmlcontentopened > $MAXLEVEL)
-	{
+	if ($includehtmlcontentopened > $MAXLEVEL) {
 		print 'ERROR: RECURSIVE CONTENT LEVEL. Depth of recursive call is more than the limit of '.$MAXLEVEL.".\n";
 		return;
 	}
@@ -524,8 +520,7 @@ function includeContainer($containerref)
 	print "\n".'<!-- include '.$websitekey.'/'.$containerref.(is_object($websitepage) ? ' parent id='.$websitepage->id : '').' level = '.$includehtmlcontentopened.' -->'."\n";
 	print preg_replace(array('/^.*<body[^>]*>/ims', '/<\/body>.*$/ims'), array('', ''), $tmpoutput);
 
-	if (!$res)
-	{
+	if (!$res) {
 		print 'ERROR: FAILED TO INCLUDE PAGE '.$containerref.".\n";
 	}
 
@@ -546,8 +541,7 @@ function getStructuredData($type, $data = array())
 
 	$type = strtolower($type);
 
-	if ($type == 'software')
-	{
+	if ($type == 'software') {
 		$ret = '<!-- Add structured data for entry in a software annuary -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
 		$ret .= '{
@@ -572,8 +566,7 @@ function getStructuredData($type, $data = array())
 			}
 		}'."\n";
 		$ret .= '</script>'."\n";
-	} elseif ($type == 'organization')
-	{
+	} elseif ($type == 'organization') {
 		$companyname = $mysoc->name;
 		$url = $mysoc->url;
 
@@ -603,16 +596,16 @@ function getStructuredData($type, $data = array())
 					$ret .= '"https://www.'.$key.'.com/'.dol_escape_json($value).'"';
 				}
 				$i++;
-				if ($i < count($mysoc->socialnetworks)) $ret .= ', ';
+				if ($i < count($mysoc->socialnetworks)) {
+					$ret .= ', ';
+				}
 			}
 			$ret .= ']'."\n";
 		}
 		$ret .= '}'."\n";
 		$ret .= '</script>'."\n";
-	} elseif ($type == 'blogpost')
-	{
-		if (!empty($websitepage->author_alias))
-		{
+	} elseif ($type == 'blogpost') {
+		if (!empty($websitepage->author_alias)) {
 			//include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 			//$tmpuser = new User($db);
 			//$restmpuser = $tmpuser->fetch($websitepage->fk_user_creat);
@@ -664,7 +657,9 @@ function getStructuredData($type, $data = array())
 				foreach ($arrayofkeywords as $keyword) {
 					$ret .= '"'.dol_escape_json($keyword).'"';
 					$i++;
-					if ($i < count($arrayofkeywords)) $ret .= ', ';
+					if ($i < count($arrayofkeywords)) {
+						$ret .= ', ';
+					}
 				}
 				$ret .= '],'."\n";
 			}
@@ -672,8 +667,7 @@ function getStructuredData($type, $data = array())
 			$ret .= "\n".'}'."\n";
 			$ret .= '</script>'."\n";
 		}
-	} elseif ($type == 'product')
-	{
+	} elseif ($type == 'product') {
 		$ret = '<!-- Add structured data for product -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
 		$ret .= '{
@@ -708,8 +702,7 @@ function getStructuredData($type, $data = array())
 				}
 			}'."\n";
 		$ret .= '</script>'."\n";
-	} elseif ($type == 'qa')
-	{
+	} elseif ($type == 'qa') {
 		$ret = '<!-- Add structured data for QA -->'."\n";
 		$ret .= '<script type="application/ld+json">'."\n";
 		$ret .= '{
@@ -790,8 +783,7 @@ function getSocialNetworkSharingLinks()
 		$out .= '</div>'."\n";
 
 		$out .= "\n</div>\n";
-	}
-	else {
+	} else {
 		$out .= '<!-- virtual host not defined in CMS. No way to add sharing buttons -->'."\n";
 	}
 	$out .= '<!-- section end for social network sharing of page -->'."\n";
@@ -821,10 +813,11 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 	$error = 0;
 	$arrayresult = array('code'=>'', 'list'=>array());
 
-	if (!is_object($weblangs)) $weblangs = $langs;
+	if (!is_object($weblangs)) {
+		$weblangs = $langs;
+	}
 
-	if (empty($searchstring) && empty($type) && empty($langcode) && empty($otherfilters))
-	{
+	if (empty($searchstring) && empty($type) && empty($langcode) && empty($otherfilters)) {
 		$error++;
 		$arrayresult['code'] = 'KO';
 		$arrayresult['message'] = $weblangs->trans("EmptySearchString");
@@ -848,8 +841,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 	$searchdone = 0;
 	$found = 0;
 
-	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo)))
-	{
+	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo))) {
 		$sql = 'SELECT wp.rowid FROM '.MAIN_DB_PREFIX.'website_page as wp';
 		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
 			$sql .= ', '.MAIN_DB_PREFIX.'categorie_website_page as cwp';
@@ -871,13 +863,11 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		}
 		$sql .= " AND (";
 		$searchalgo = '';
-		if (preg_match('/meta/', $algo))
-		{
+		if (preg_match('/meta/', $algo)) {
 			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escape($searchstring)."%' OR wp.description LIKE '%".$db->escape($searchstring)."%'";
 			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escape($searchstring).",%' OR wp.keywords LIKE '% ".$db->escape($searchstring)."%'"; // TODO Use a better way to scan keywords
 		}
-		if (preg_match('/content/', $algo))
-		{
+		if (preg_match('/content/', $algo)) {
 			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escape($searchstring)."%'";
 		}
 		$sql .= $searchalgo;
@@ -889,16 +879,15 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		$sql .= $db->plimit($max);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
-			while (($obj = $db->fetch_object($resql)) && ($i < $max || $max == 0))
-			{
-				if ($obj->rowid > 0)
-				{
+			while (($obj = $db->fetch_object($resql)) && ($i < $max || $max == 0)) {
+				if ($obj->rowid > 0) {
 					$tmpwebsitepage = new WebsitePage($db);
 					$tmpwebsitepage->fetch($obj->rowid);
-					if ($tmpwebsitepage->id > 0) $arrayresult['list'][$obj->rowid] = $tmpwebsitepage;
+					if ($tmpwebsitepage->id > 0) {
+						$arrayresult['list'][$obj->rowid] = $tmpwebsitepage;
+					}
 					$found++;
 				}
 				$i++;
@@ -912,8 +901,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		$searchdone = 1;
 	}
 
-	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/sitefiles/', $algo)))
-	{
+	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/sitefiles/', $algo))) {
 		global $dolibarr_main_data_root;
 
 		$pathofwebsite = $dolibarr_main_data_root.'/website/'.$website->ref;
@@ -926,39 +914,32 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		$filereadme = $pathofwebsite.'/README.md';
 
 		$filecontent = file_get_contents($filehtmlheader);
-		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent))
-		{
+		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {
 			$arrayresult['list'][] = array('type'=>'website_htmlheadercontent');
 		}
 
 		$filecontent = file_get_contents($filecss);
-		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent))
-		{
+		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {
 			$arrayresult['list'][] = array('type'=>'website_csscontent');
 		}
 
 		$filecontent = file_get_contents($filejs);
-		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent))
-		{
+		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {
 			$arrayresult['list'][] = array('type'=>'website_jscontent');
 		}
 
 		$filerobot = file_get_contents($filerobot);
-		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent))
-		{
+		if ((empty($max) || ($found < $max)) && preg_match('/'.preg_quote($searchstring, '/').'/', $filecontent)) {
 			$arrayresult['list'][] = array('type'=>'website_robotcontent');
 		}
 
 		$searchdone = 1;
 	}
 
-	if (!$error)
-	{
-		if ($searchdone)
-		{
+	if (!$error) {
+		if ($searchdone) {
 			$arrayresult['code'] = 'OK';
-			if (empty($arrayresult['list']))
-			{
+			if (empty($arrayresult['list'])) {
 				$arrayresult['code'] = 'KO';
 				$arrayresult['message'] = $weblangs->trans("NoRecordFound");
 			}
@@ -996,19 +977,21 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 
 	$alreadygrabbed = array();
 
-	if (preg_match('/\/$/', $urltograb)) $urltograb .= '.';
+	if (preg_match('/\/$/', $urltograb)) {
+		$urltograb .= '.';
+	}
 	$urltograb = dirname($urltograb); // So urltograb is now http://www.nltechno.com or http://www.nltechno.com/dir1
 
 	// Search X in "img...src=X"
 	$regs = array();
 	preg_match_all('/<img([^\.\/]+)src="([^>"]+)"([^>]*)>/i', $tmp, $regs);
 
-	foreach ($regs[0] as $key => $val)
-	{
-		if (preg_match('/^data:image/i', $regs[2][$key])) continue; // We do nothing for such images
+	foreach ($regs[0] as $key => $val) {
+		if (preg_match('/^data:image/i', $regs[2][$key])) {
+			continue; // We do nothing for such images
+		}
 
-		if (preg_match('/^\//', $regs[2][$key]))
-		{
+		if (preg_match('/^\//', $regs[2][$key])) {
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 		} else {
@@ -1017,12 +1000,13 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 
 		$linkwithoutdomain = $regs[2][$key];
 		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages = '';
+		if ($grabimagesinto == 'root') {
+			$dirforimages = '';
+		}
 
 		// Define $filetosave and $filename
 		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key]) ? '' : '/').$regs[2][$key];
-		if (preg_match('/^http/', $regs[2][$key]))
-		{
+		if (preg_match('/^http/', $regs[2][$key])) {
 			$urltograbbis = $regs[2][$key];
 			$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
 			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
@@ -1037,18 +1021,14 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		//var_dump($filename);
 		//exit;
 
-		if (empty($alreadygrabbed[$urltograbbis]))
-		{
-			if ($grabimages)
-			{
+		if (empty($alreadygrabbed[$urltograbbis])) {
+			if ($grabimages) {
 				$tmpgeturl = getURLContent($urltograbbis);
-				if ($tmpgeturl['curl_error_no'])
-				{
+				if ($tmpgeturl['curl_error_no']) {
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action = 'create';
-				} elseif ($tmpgeturl['http_code'] != '200')
-				{
+				} elseif ($tmpgeturl['http_code'] != '200') {
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
@@ -1060,14 +1040,14 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					$fp = fopen($filetosave, "w");
 					fputs($fp, $tmpgeturl['content']);
 					fclose($fp);
-					if (!empty($conf->global->MAIN_UMASK))
+					if (!empty($conf->global->MAIN_UMASK)) {
 						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					}
 				}
 			}
 		}
 
-		if ($modifylinks)
-		{
+		if ($modifylinks) {
 			$tmp = preg_replace('/'.preg_quote($regs[0][$key], '/').'/i', '<img'.$regs[1][$key].'src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.$filename.'"'.$regs[3][$key].'>', $tmp);
 		}
 	}
@@ -1075,12 +1055,12 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 	// Search X in "background...url(X)"
 	preg_match_all('/background([^\.\/\(;]+)url\([\"\']?([^\)\"\']*)[\"\']?\)/i', $tmp, $regs);
 
-	foreach ($regs[0] as $key => $val)
-	{
-		if (preg_match('/^data:image/i', $regs[2][$key])) continue; // We do nothing for such images
+	foreach ($regs[0] as $key => $val) {
+		if (preg_match('/^data:image/i', $regs[2][$key])) {
+			continue; // We do nothing for such images
+		}
 
-		if (preg_match('/^\//', $regs[2][$key]))
-		{
+		if (preg_match('/^\//', $regs[2][$key])) {
 			$urltograbdirrootwithoutslash = getRootURLFromURL($urltograb);
 			$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
 		} else {
@@ -1090,12 +1070,13 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		$linkwithoutdomain = $regs[2][$key];
 
 		$dirforimages = '/'.$objectpage->pageurl;
-		if ($grabimagesinto == 'root') $dirforimages = '';
+		if ($grabimagesinto == 'root') {
+			$dirforimages = '';
+		}
 
 		$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $regs[2][$key]) ? '' : '/').$regs[2][$key];
 
-		if (preg_match('/^http/', $regs[2][$key]))
-		{
+		if (preg_match('/^http/', $regs[2][$key])) {
 			$urltograbbis = $regs[2][$key];
 			$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
 			$filetosave = $conf->medias->multidir_output[$conf->entity].'/image/'.$object->ref.$dirforimages.(preg_match('/^\//', $linkwithoutdomain) ? '' : '/').$linkwithoutdomain;
@@ -1111,18 +1092,14 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 		//var_dump($filename);
 		//exit;
 
-		if (empty($alreadygrabbed[$urltograbbis]))
-		{
-			if ($grabimages)
-			{
+		if (empty($alreadygrabbed[$urltograbbis])) {
+			if ($grabimages) {
 				$tmpgeturl = getURLContent($urltograbbis);
-				if ($tmpgeturl['curl_error_no'])
-				{
+				if ($tmpgeturl['curl_error_no']) {
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 					$action = 'create';
-				} elseif ($tmpgeturl['http_code'] != '200')
-				{
+				} elseif ($tmpgeturl['http_code'] != '200') {
 					$error++;
 					setEventMessages('Error getting '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 					$action = 'create';
@@ -1134,14 +1111,14 @@ function getAllImages($object, $objectpage, $urltograb, &$tmp, &$action, $modify
 					$fp = fopen($filetosave, "w");
 					fputs($fp, $tmpgeturl['content']);
 					fclose($fp);
-					if (!empty($conf->global->MAIN_UMASK))
+					if (!empty($conf->global->MAIN_UMASK)) {
 						@chmod($filetosave, octdec($conf->global->MAIN_UMASK));
+					}
 				}
 			}
 		}
 
-		if ($modifylinks)
-		{
+		if ($modifylinks) {
 			$tmp = preg_replace('/'.preg_quote($regs[0][$key], '/').'/i', 'background'.$regs[1][$key].'url("'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file='.$filename.'")', $tmp);
 		}
 	}
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 380a7c0dc12..a01aa02b468 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -45,8 +45,9 @@ function dolSaveMasterFile($filemaster)
 	$mastercontent .= "}\n";
 	$mastercontent .= '?>'."\n";
 	$result = file_put_contents($filemaster, $mastercontent);
-	if (!empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
+	}
 
 		return $result;
 }
@@ -152,8 +153,12 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 	dol_delete_file($filetpl);
 
 	$shortlangcode = '';
-	if ($objectpage->lang) $shortlangcode = substr($objectpage->lang, 0, 2); // en_US or en-US -> en
-	if (empty($shortlangcode)) $shortlangcode = substr($object->lang, 0, 2); // en_US or en-US -> en
+	if ($objectpage->lang) {
+		$shortlangcode = substr($objectpage->lang, 0, 2); // en_US or en-US -> en
+	}
+	if (empty($shortlangcode)) {
+		$shortlangcode = substr($object->lang, 0, 2); // en_US or en-US -> en
+	}
 
 	$tplcontent = '';
 	$tplcontent .= "<?php // BEGIN PHP\n";
@@ -166,8 +171,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 	$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
 	$tplcontent .= "ob_start();\n";
 	$tplcontent .= "// END PHP ?>\n";
-	if (!empty($conf->global->WEBSITE_FORCE_DOCTYPE_HTML5))
-	{
+	if (!empty($conf->global->WEBSITE_FORCE_DOCTYPE_HTML5)) {
 		$tplcontent .= "<!DOCTYPE html>\n";
 	}
 	$tplcontent .= '<html'.($shortlangcode ? ' lang="'.$shortlangcode.'"' : '').'>'."\n";
@@ -199,8 +203,12 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 			$tmppage->fetch($translationof);
 			if ($tmppage->id > 0) {
 				$tmpshortlangcode = '';
-				if ($tmppage->lang) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en
-				if (empty($tmpshortlangcode)) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
+				if ($tmppage->lang) {
+					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $tmppage->lang); // en_US or en-US -> en
+				}
+				if (empty($tmpshortlangcode)) {
+					$tmpshortlangcode = preg_replace('/[_-].*$/', '', $object->lang); // en_US or en-US -> en
+				}
 				if ($tmpshortlangcode != $shortlangcode) {
 					$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="'.($object->fk_default_home == $tmppage->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2)) ? '/'.$tmpshortlangcode : '').'/'.$tmppage->pageurl.'.php').'" />'."\n";
 				}
@@ -209,15 +217,14 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 		// Add "has translation pages"
 		$sql = 'SELECT rowid as id, lang, pageurl from '.MAIN_DB_PREFIX.'website_page where fk_page IN ('.$objectpage->id.($translationof ? ", ".$translationof : "").")";
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_rows = $db->num_rows($resql);
-			if ($num_rows > 0)
-			{
-				while ($obj = $db->fetch_object($resql))
-				{
+			if ($num_rows > 0) {
+				while ($obj = $db->fetch_object($resql)) {
 					$tmpshortlangcode = '';
-					if ($obj->lang) $tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang); // en_US or en-US -> en
+					if ($obj->lang) {
+						$tmpshortlangcode = preg_replace('/[_-].*$/', '', $obj->lang); // en_US or en-US -> en
+					}
 					if ($tmpshortlangcode != $shortlangcode) {
 						$tplcontent .= '<link rel="alternate" hreflang="'.$tmpshortlangcode.'" href="'.($object->fk_default_home == $obj->id ? '/' : (($tmpshortlangcode != substr($object->lang, 0, 2) ? '/'.$tmpshortlangcode : '')).'/'.$obj->pageurl.'.php').'" />'."\n";
 					}
@@ -333,8 +340,9 @@ function dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent)
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtmlheader, $htmlheadercontent);
-	if (!empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($filehtmlheader, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -354,8 +362,9 @@ function dolSaveCssFile($filecss, $csscontent)
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filecss, $csscontent);
-	if (!empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($filecss, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -375,8 +384,9 @@ function dolSaveJsFile($filejs, $jscontent)
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filejs, $jscontent);
-	if (!empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($filejs, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -396,8 +406,9 @@ function dolSaveRobotFile($filerobot, $robotcontent)
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filerobot, $robotcontent);
-	if (!empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($filerobot, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -417,8 +428,9 @@ function dolSaveHtaccessFile($filehtaccess, $htaccess)
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($filehtaccess, $htaccess);
-	if (!empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($filehtaccess, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -438,8 +450,9 @@ function dolSaveManifestJson($file, $content)
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($file, $content);
-	if (!empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($file, octdec($conf->global->MAIN_UMASK));
+	}
 
 	return $result;
 }
@@ -459,8 +472,9 @@ function dolSaveReadme($file, $content)
 
 	dol_mkdir($pathofwebsite);
 	$result = file_put_contents($file, $content);
-	if (!empty($conf->global->MAIN_UMASK))
+	if (!empty($conf->global->MAIN_UMASK)) {
 		@chmod($file, octdec($conf->global->MAIN_UMASK));
+	}
 
 		return $result;
 }
@@ -477,10 +491,8 @@ function showWebsiteTemplates(Website $website)
 	global $conf, $langs, $db, $form;
 
 	$dirthemes = array('/doctemplates/websites');
-	if (!empty($conf->modules_parts['websitetemplates']))		// Using this feature slow down application
-	{
-		foreach ($conf->modules_parts['websitetemplates'] as $reldir)
-		{
+	if (!empty($conf->modules_parts['websitetemplates'])) {		// Using this feature slow down application
+		foreach ($conf->modules_parts['websitetemplates'] as $reldir) {
 			$dirthemes = array_merge($dirthemes, (array) ($reldir.'doctemplates/websites'));
 		}
 	}
@@ -509,32 +521,33 @@ function showWebsiteTemplates(Website $website)
 
 	if (count($dirthemes)) {
 		$i = 0;
-		foreach ($dirthemes as $dir)
-		{
+		foreach ($dirthemes as $dir) {
 			//print $dirroot.$dir;exit;
 			$dirtheme = DOL_DATA_ROOT.$dir; // This include loop on $conf->file->dol_document_root
-			if (is_dir($dirtheme))
-			{
+			if (is_dir($dirtheme)) {
 				$handle = opendir($dirtheme);
-				if (is_resource($handle))
-				{
-					while (($subdir = readdir($handle)) !== false)
-					{
+				if (is_resource($handle)) {
+					while (($subdir = readdir($handle)) !== false) {
 						if (is_file($dirtheme."/".$subdir) && substr($subdir, 0, 1) <> '.'
-							&& substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir))
-						{
+							&& substr($subdir, 0, 3) <> 'CVS' && preg_match('/\.zip$/i', $subdir)) {
 							$subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
 
 							// Disable not stable themes (dir ends with _exp or _dev)
-							if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) continue;
-							if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) continue;
+							if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) {
+								continue;
+							}
+							if ($conf->global->MAIN_FEATURES_LEVEL < 1 && preg_match('/_exp$/i', $subdir)) {
+								continue;
+							}
 
 							print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
 
 							$file = $dirtheme."/".$subdirwithoutzip.".jpg";
 							$url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
 
-							if (!file_exists($file)) $url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+							if (!file_exists($file)) {
+								$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
+							}
 
 							$originalfile = basename($file);
 							$entity = $conf->entity;
@@ -544,8 +557,11 @@ function showWebsiteTemplates(Website $website)
 
 							$ret = '';
 							$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 1, '&entity='.$entity);
-							if (!empty($urladvanced)) $ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';
-							else $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+							if (!empty($urladvanced)) {
+								$ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';
+							} else {
+								$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
+							}
 							print $ret;
 							print '<img class="img-skinthumb shadow" src="'.$url.'" border="0" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
 							print '</a>';
diff --git a/htdocs/core/lib/ws.lib.php b/htdocs/core/lib/ws.lib.php
index 2545c8e5973..14d7162358b 100644
--- a/htdocs/core/lib/ws.lib.php
+++ b/htdocs/core/lib/ws.lib.php
@@ -39,53 +39,49 @@ function check_authentication($authentication, &$error, &$errorcode, &$errorlabe
 
 	$fuser = new User($db);
 
-	if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY))
-	{
+	if (!$error && ($authentication['dolibarrkey'] != $conf->global->WEBSERVICES_KEY)) {
 		$error++;
 		$errorcode = 'BAD_VALUE_FOR_SECURITY_KEY'; $errorlabel = 'Value provided into dolibarrkey entry field does not match security key defined in Webservice module setup';
 	}
 
-	if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity']))
-	{
+	if (!$error && !empty($authentication['entity']) && !is_numeric($authentication['entity'])) {
 		$error++;
 		$errorcode = 'BAD_PARAMETERS'; $errorlabel = "The entity parameter must be empty (or filled with numeric id of instance if multicompany module is used).";
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $fuser->fetch('', $authentication['login'], '', 0);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$error++;
 			$errorcode = 'ERROR_FETCH_USER'; $errorlabel = 'A technical error occurred during fetch of user';
-		} elseif ($result == 0)
-		{
+		} elseif ($result == 0) {
 			$error++;
 			$errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
 		}
 
-		if (!$error && $fuser->statut == 0)
-		{
+		if (!$error && $fuser->statut == 0) {
 			$error++;
 			$errorcode = 'ERROR_USER_DISABLED'; $errorlabel = 'This user has been locked or disabled';
 		}
 
 		// Validation of login
-		if (!$error)
-		{
+		if (!$error) {
 			$fuser->getrights(); // Load permission of user
 
 			// Authentication mode
-			if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
+			if (empty($dolibarr_main_authentication)) {
+				$dolibarr_main_authentication = 'http,dolibarr';
+			}
 			// Authentication mode: forceuser
-			if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
+			if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+				$dolibarr_auto_user = 'auto';
+			}
 			// Set authmode
 			$authmode = explode(',', $dolibarr_main_authentication);
 
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$login = checkLoginPassEntity($authentication['login'], $authentication['password'], $authentication['entity'], $authmode, 'ws');
-			if (empty($login))
-			{
+			if (empty($login)) {
 				$error++;
 				$errorcode = 'BAD_CREDENTIALS'; $errorlabel = 'Bad value for login or password';
 			}
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index e7252ac2171..fcd1660985b 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -38,8 +38,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 
 	dol_syslog("xcal.lib.php::build_calfile Build cal file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile))
-	{
+	if (empty($outputfile)) {
 		// -1 = error
 		return -1;
 	}
@@ -47,15 +46,13 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 	// Note: A cal file is an UTF8 encoded file
 	$calfileh = fopen($outputfile, "w");
 
-	if ($calfileh)
-	{
+	if ($calfileh) {
 		include_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
 
 		$now      = dol_now();
 		$encoding = "";
 
-		if ($format === "vcal")
-		{
+		if ($format === "vcal") {
 			$encoding = "ENCODING=QUOTED-PRINTABLE:";
 		}
 
@@ -72,8 +69,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 		fwrite($calfileh, "X-WR-CALDESC:".$encoding.format_cal($format, $desc)."\n");
 		//fwrite($calfileh,"X-WR-TIMEZONE:Europe/Paris\n");
 
-		if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE) && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60)
-		{
+		if (!empty($conf->global->MAIN_AGENDA_EXPORT_CACHE) && $conf->global->MAIN_AGENDA_EXPORT_CACHE > 60) {
 			$hh = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "hour");
 			$mm = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "min");
 			$ss = convertSecondToTime($conf->global->MAIN_AGENDA_EXPORT_CACHE, "sec");
@@ -81,8 +77,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 			fwrite($calfileh, "X-PUBLISHED-TTL: P".$hh."H".$mm."M".$ss."S\n");
 		}
 
-		foreach ($events_array as $key => $event)
-		{
+		foreach ($events_array as $key => $event) {
 			// See http://fr.wikipedia.org/wiki/ICalendar for format
 			// See http://www.ietf.org/rfc/rfc2445.txt for RFC
 
@@ -147,28 +142,22 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 			END:VEVENT
 			*/
 
-			if ($type === "event")
-			{
+			if ($type === "event") {
 				fwrite($calfileh, "BEGIN:VEVENT\n");
 				fwrite($calfileh, "UID:".$uid."\n");
 
-				if (!empty($email))
-				{
+				if (!empty($email)) {
 					fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
 					fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
 				}
 
-				if (!empty($url))
-				{
+				if (!empty($url)) {
 					fwrite($calfileh, "URL:".$url."\n");
 				}
 
-				if (is_array($assignedUsers))
-				{
-					foreach ($assignedUsers as $assignedUser)
-					{
-						if ($assignedUser->email === $email)
-						{
+				if (is_array($assignedUsers)) {
+					foreach ($assignedUsers as $assignedUser) {
+						if ($assignedUser->email === $email) {
 							continue;
 						}
 
@@ -176,32 +165,27 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 					}
 				}
 
-				if ($created)
-				{
+				if ($created) {
 					fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");
 				}
 
-				if ($modified)
-				{
+				if ($modified) {
 					fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");
 				}
 
 				fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
 				fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
 
-				if (!empty($location))
-				{
+				if (!empty($location)) {
 					fwrite($calfileh, "LOCATION:".$encoding.$location."\n");
 				}
 
-				if ($fulldayevent)
-				{
+				if ($fulldayevent) {
 					fwrite($calfileh, "X-FUNAMBOL-ALLDAY:1\n");
 				}
 
 				// see https://docs.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-oxcical/0f262da6-c5fd-459e-9f18-145eba86b5d2
-				if ($fulldayevent)
-				{
+				if ($fulldayevent) {
 					fwrite($calfileh, "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE\n");
 				}
 
@@ -213,8 +197,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 				$prefix     = "";
 				$startdatef = dol_print_date($startdate, "dayhourxcard", true);
 
-				if ($fulldayevent)
-				{
+				if ($fulldayevent) {
 					// Local time
 					$prefix     = ";VALUE=DATE";
 					$startdatef = dol_print_date($startdate, "dayxcard", false);
@@ -223,15 +206,12 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 				fwrite($calfileh, "DTSTART".$prefix.":".$startdatef."\n");
 
 				// End date
-				if ($fulldayevent)
-				{
-					if (empty($enddate))
-					{
+				if ($fulldayevent) {
+					if (empty($enddate)) {
 						$enddate = dol_time_plus_duree($startdate, 1, "d");
 					}
 				} else {
-					if (empty($enddate))
-					{
+					if (empty($enddate)) {
 						$enddate = $startdate + $duration;
 					}
 				}
@@ -239,8 +219,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 				$prefix   = "";
 				$enddatef = dol_print_date($enddate, "dayhourxcard", true);
 
-				if ($fulldayevent)
-				{
+				if ($fulldayevent) {
 					$prefix   = ";VALUE=DATE";
 					$enddatef = dol_print_date($enddate + 1, "dayxcard", false);
 
@@ -251,13 +230,11 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 				fwrite($calfileh, "DTEND".$prefix.":".$enddatef."\n");
 				fwrite($calfileh, "STATUS:CONFIRMED\n");
 
-				if (!empty($transparency))
-				{
+				if (!empty($transparency)) {
 					fwrite($calfileh, "TRANSP:".$transparency."\n");
 				}
 
-				if (!empty($category))
-				{
+				if (!empty($category)) {
 					fwrite($calfileh, "CATEGORIES:".$encoding.$category."\n");
 				}
 
@@ -265,29 +242,24 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 			}
 
 			// Output the vCard/iCal VJOURNAL object
-			if ($type === "journal")
-			{
+			if ($type === "journal") {
 				fwrite($calfileh, "BEGIN:VJOURNAL\n");
 				fwrite($calfileh, "UID:".$uid."\n");
 
-				if (!empty($email))
-				{
+				if (!empty($email)) {
 					fwrite($calfileh, "ORGANIZER:MAILTO:".$email."\n");
 					fwrite($calfileh, "CONTACT:MAILTO:".$email."\n");
 				}
 
-				if (!empty($url))
-				{
+				if (!empty($url)) {
 					fwrite($calfileh, "URL:".$url."\n");
 				}
 
-				if ($created)
-				{
+				if ($created) {
 					fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");
 				}
 
-				if ($modified)
-				{
+				if ($modified) {
 					fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");
 				}
 
@@ -309,8 +281,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 
 		fclose($calfileh);
 
-		if (!empty($conf->global->MAIN_UMASK))
-		{
+		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 	} else {
@@ -340,16 +311,14 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 
 	dol_syslog("xcal.lib.php::build_rssfile Build rss file ".$outputfile." to format ".$format);
 
-	if (empty($outputfile))
-	{
+	if (empty($outputfile)) {
 		 // -1 = error
 		return -1;
 	}
 
 	$fichier = fopen($outputfile, "w");
 
-	if ($fichier)
-	{
+	if ($fichier) {
 		$date = date("r");
 
 		// Print header
@@ -361,15 +330,17 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 
 		fwrite($fichier, "<channel>\n");
 		fwrite($fichier, "<title>".$title."</title>\n");
-		if ($langcode) fwrite($fichier, "<language>".$langcode."</language>\n");
+		if ($langcode) {
+			fwrite($fichier, "<language>".$langcode."</language>\n");
+		}
 
 		/*
-        fwrite($fichier, "<description><![CDATA[".$desc.".]]></description>"."\n".
-                // "<language>fr</language>"."\n".
-                "<copyright>Dolibarr</copyright>"."\n".
-                "<lastBuildDate>".$date."</lastBuildDate>"."\n".
-                "<generator>Dolibarr</generator>"."\n");
-        */
+		fwrite($fichier, "<description><![CDATA[".$desc.".]]></description>"."\n".
+				// "<language>fr</language>"."\n".
+				"<copyright>Dolibarr</copyright>"."\n".
+				"<lastBuildDate>".$date."</lastBuildDate>"."\n".
+				"<generator>Dolibarr</generator>"."\n");
+		*/
 
 		if (empty($url)) {
 			// Define $urlwithroot
@@ -382,19 +353,16 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 
 		fwrite($fichier, "<link><![CDATA[".$url."]]></link>\n");
 
-		foreach ($events_array as $key => $event)
-		{
+		foreach ($events_array as $key => $event) {
 			$eventqualified = true;
 
-			if ($filter)
-			{
+			if ($filter) {
 				// TODO Add a filter
 
 				$eventqualified = false;
 			}
 
-			if ($eventqualified)
-			{
+			if ($eventqualified) {
 				if (is_object($event) && get_class($event) == 'WebsitePage') {
 					// Convert object into an array
 					$tmpevent = array();
@@ -417,11 +385,11 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 				$category = $event["category"];
 
 				/* No place inside a RSS
-                $priority     = $event["priority"];
-                $fulldayevent = $event["fulldayevent"];
-                $location     = $event["location"];
-                $email        = $event["email"];
-                */
+				$priority     = $event["priority"];
+				$fulldayevent = $event["fulldayevent"];
+				$location     = $event["location"];
+				$email        = $event["email"];
+				*/
 
 				$description = dol_string_nohtmltag(preg_replace("/<br[\s\/]?>/i", "\n", $event["desc"]), 0);
 
@@ -432,8 +400,9 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
 				fwrite($fichier, "<description><![CDATA[");
 
-				if ($description)
+				if ($description) {
 					fwrite($fichier, $description);
+				}
 				// else
 				//     fwrite($fichier, "NoDesc");
 
@@ -451,8 +420,7 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 
 		fclose($fichier);
 
-		if (!empty($conf->global->MAIN_UMASK))
-		{
+		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 	}
@@ -471,13 +439,11 @@ function format_cal($format, $string)
 
 	$newstring = $string;
 
-	if ($format === "vcal")
-	{
+	if ($format === "vcal") {
 		$newstring = quotedPrintEncode($newstring);
 	}
 
-	if ($format === "ical")
-	{
+	if ($format === "ical") {
 		// Replace new lines chars by "\n"
 		$newstring = preg_replace("/\r\n/i", "\\n", $newstring);
 		$newstring = preg_replace("/\n\r/i", "\\n", $newstring);
@@ -503,17 +469,14 @@ function calEncode($line)
 	$newpara = "";
 
 	// If mb_ functions exists, it"s better to use them
-	if (function_exists("mb_strlen"))
-	{
+	if (function_exists("mb_strlen")) {
 		$strlength = mb_strlen($line, "UTF-8");
 
-		for ($j = 0; $j < $strlength; $j++)
-		{
+		for ($j = 0; $j < $strlength; $j++) {
 			// Take char at position $j
 			$char = mb_substr($line, $j, 1, "UTF-8");
 
-			if ((mb_strlen($newpara, "UTF-8") + mb_strlen($char, "UTF-8")) >= 75)
-			{
+			if ((mb_strlen($newpara, "UTF-8") + mb_strlen($char, "UTF-8")) >= 75) {
 				// CRLF + Space for cal
 				$out .= $newpara."\r\n ";
 
@@ -527,13 +490,11 @@ function calEncode($line)
 	} else {
 		$strlength = dol_strlen($line);
 
-		for ($j = 0; $j < $strlength; $j++)
-		{
+		for ($j = 0; $j < $strlength; $j++) {
 			// Take char at position $j
 			$char = substr($line, $j, 1);
 
-			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75)
-			{
+			if ((dol_strlen($newpara) + dol_strlen($char)) >= 75) {
 				// CRLF + Space for cal
 				$out .= $newpara."\r\n ";
 
@@ -562,32 +523,29 @@ function quotedPrintEncode($str, $forcal = 0)
 	$lines = preg_split("/\r\n/", $str);
 	$out   = "";
 
-	foreach ($lines as $line)
-	{
+	foreach ($lines as $line) {
 		$newpara = "";
 
 		// Do not use dol_strlen here, we need number of bytes
 		$strlength = strlen($line);
 
-		for ($j = 0; $j < $strlength; $j++)
-		{
+		for ($j = 0; $j < $strlength; $j++) {
 			$char  = substr($line, $j, 1);
 			$ascii = ord($char);
 
-			if ($ascii < 32 || $ascii === 61 || $ascii > 126)
-			{
+			if ($ascii < 32 || $ascii === 61 || $ascii > 126) {
 				$char = "=".strtoupper(sprintf("%02X", $ascii));
 			}
 
 			// Do not use dol_strlen here, we need number of bytes
-			if ((strlen($newpara) + strlen($char)) >= 76)
-			{
+			if ((strlen($newpara) + strlen($char)) >= 76) {
 				// New line with carray-return (CR) and line-feed (LF)
 				$out .= $newpara."=\r\n";
 
 				// extra space for cal
-				if ($forcal)
+				if ($forcal) {
 					$out .= " ";
+				}
 
 				$newpara = "";
 			}
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index a6f9323f99b..eeaba6f84b8 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -39,12 +39,13 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 
 	// Force master entity in transversal mode
 	$entity = $entitytotest;
-	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;
+	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		$entity = 1;
+	}
 
 	$login = '';
 
-	if (!empty($usertotest))
-	{
+	if (!empty($usertotest)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 		dol_syslog("functions_dolibarr::check_user_password_dolibarr usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
 
@@ -57,7 +58,9 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 		$sql = 'SELECT rowid, login, entity, pass, pass_crypted, datestartvalidity, dateendvalidity';
 		$sql .= ' FROM '.$table;
 		$sql .= ' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
-		if (preg_match('/@/', $usertotest)) $sql .= ' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		if (preg_match('/@/', $usertotest)) {
+			$sql .= ' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		}
 		$sql .= ') AND '.$entitycol." IN (0,".($entity ? $entity : 1).")";
 		$sql .= ' AND statut = 1';
 		// Note: Test on validity is done later
@@ -66,11 +69,9 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 		$sql .= ' ORDER BY entity DESC';
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$now = dol_now();
 				if ($obj->datestartvalidity && $db->jdate($obj->datestartvalidity) > $now) {
 					// Load translation files required by the page
@@ -93,34 +94,33 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 
 				// Check crypted password
 				$cryptType = '';
-				if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType = $conf->global->DATABASE_PWD_ENCRYPTED;
+				if (!empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
+					$cryptType = $conf->global->DATABASE_PWD_ENCRYPTED;
+				}
 
 				// By default, we use default setup for encryption rule
-				if (!in_array($cryptType, array('auto'))) $cryptType = 'auto';
+				if (!in_array($cryptType, array('auto'))) {
+					$cryptType = 'auto';
+				}
 				// Check crypted password according to crypt algorithm
-				if ($cryptType == 'auto')
-				{
-					if (dol_verifyHash($passtyped, $passcrypted, '0'))
-					{
+				if ($cryptType == 'auto') {
+					if (dol_verifyHash($passtyped, $passcrypted, '0')) {
 						$passok = true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - ".$cryptType." of pass is ok");
 					}
 				}
 
 				// For compatibility with very old versions
-				if (!$passok)
-				{
+				if (!$passok) {
 					if ((!$passcrypted || $passtyped)
-						&& ($passclear && ($passtyped == $passclear)))
-					{
+						&& ($passclear && ($passtyped == $passclear))) {
 						$passok = true;
 						dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ok - found pass in database");
 					}
 				}
 
 				// Password ok ?
-				if ($passok)
-				{
+				if ($passok) {
 					$login = $obj->login;
 				} else {
 					sleep(2); // Anti brut force protection
@@ -133,15 +133,14 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 				}
 
 				// We must check entity
-				if ($passok && !empty($conf->multicompany->enabled))	// We must check entity
-				{
+				if ($passok && !empty($conf->multicompany->enabled)) {	// We must check entity
 					global $mc;
 
-					if (!isset($mc)) $conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
-					else {
+					if (!isset($mc)) {
+						$conf->multicompany->enabled = false; // Global not available, disable $conf->multicompany->enabled for safety
+					} else {
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
-						if ($ret < 0)
-						{
+						if ($ret < 0) {
 							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO entity '".$entitytotest."' not allowed for user '".$obj->rowid."'", LOG_NOTICE);
 							$login = ''; // force authentication failure
 						}
diff --git a/htdocs/core/login/functions_forceuser.php b/htdocs/core/login/functions_forceuser.php
index 91040f98f8c..427e9c52e7e 100644
--- a/htdocs/core/login/functions_forceuser.php
+++ b/htdocs/core/login/functions_forceuser.php
@@ -40,9 +40,13 @@ function check_user_password_forceuser($usertotest, $passwordtotest, $entitytote
 	dol_syslog("functions_forceuser::check_user_password_forceuser");
 
 	$login = $dolibarr_auto_user;
-	if (empty($login)) $login = 'auto';
+	if (empty($login)) {
+		$login = 'auto';
+	}
 
-	if ($_SESSION["dol_loginmesg"]) $login = '';
+	if ($_SESSION["dol_loginmesg"]) {
+		$login = '';
+	}
 
 	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);
 	return $login;
diff --git a/htdocs/core/login/functions_googleoauth.php b/htdocs/core/login/functions_googleoauth.php
index b5e56c74d74..0fce5d50587 100644
--- a/htdocs/core/login/functions_googleoauth.php
+++ b/htdocs/core/login/functions_googleoauth.php
@@ -48,26 +48,25 @@ function check_user_password_googleoauth($usertotest, $passwordtotest, $entityto
 	$login = '';
 
 	// Get identity from user and redirect browser to Google OAuth Server
-	if (GETPOSTISSET('username'))
-	{
+	if (GETPOSTISSET('username')) {
 		/*$openid = new SimpleOpenID();
-        $openid->SetIdentity($_POST['username']);
-        $protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
-        $openid->SetTrustRoot($protocol . $_SERVER["HTTP_HOST"]);
-        $openid->SetRequiredFields(array('email','fullname'));
-        $_SESSION['dol_entity'] = $_POST["entity"];
-        //$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
-        if ($openid->sendDiscoveryRequestToGetXRDS())
-        {
-            $openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script
-            $openid->Redirect();     // This will redirect user to OpenID Server
-        }
-        else
-        {
-            $error = $openid->GetError();
-            return false;
-        }
-        return false;*/
+		$openid->SetIdentity($_POST['username']);
+		$protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
+		$openid->SetTrustRoot($protocol . $_SERVER["HTTP_HOST"]);
+		$openid->SetRequiredFields(array('email','fullname'));
+		$_SESSION['dol_entity'] = $_POST["entity"];
+		//$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
+		if ($openid->sendDiscoveryRequestToGetXRDS())
+		{
+			$openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script
+			$openid->Redirect();     // This will redirect user to OpenID Server
+		}
+		else
+		{
+			$error = $openid->GetError();
+			return false;
+		}
+		return false;*/
 	}
 
 
diff --git a/htdocs/core/login/functions_http.php b/htdocs/core/login/functions_http.php
index 7b2eebb0426..92b5af438d8 100644
--- a/htdocs/core/login/functions_http.php
+++ b/htdocs/core/login/functions_http.php
@@ -38,8 +38,7 @@ function check_user_password_http($usertotest, $passwordtotest, $entitytotest)
 	dol_syslog("functions_http::check_user_password_http _SERVER[REMOTE_USER]=".(empty($_SERVER["REMOTE_USER"]) ? '' : $_SERVER["REMOTE_USER"]));
 
 	$login = '';
-	if (!empty($_SERVER["REMOTE_USER"]))
-	{
+	if (!empty($_SERVER["REMOTE_USER"])) {
 		$login = $_SERVER["REMOTE_USER"];
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index c62c6add140..9de95be506b 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -45,13 +45,14 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 	// Force master entity in transversal mode
 	$entity = $entitytotest;
-	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity = 1;
+	if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+		$entity = 1;
+	}
 
 	$login = '';
 	$resultFetchUser = '';
 
-	if (!function_exists("ldap_connect"))
-	{
+	if (!function_exists("ldap_connect")) {
 		dol_syslog("functions_ldap::check_user_password_ldap Authentication KO failed to connect to LDAP. LDAP functions are disabled on this PHP", LOG_ERR);
 		sleep(1);
 
@@ -62,8 +63,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		return;
 	}
 
-	if ($usertotest)
-	{
+	if ($usertotest) {
 		dol_syslog("functions_ldap::check_user_password_ldap usertotest=".$usertotest." passwordtotest=".preg_replace('/./', '*', $passwordtotest)." entitytotest=".$entitytotest);
 
 		// If test username/password asked, we define $test=false and $login var if ok, set $_SESSION["dol_loginmesg"] if ko
@@ -78,7 +78,9 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		$ldapadminpass = $dolibarr_main_auth_ldap_admin_pass;
 		$ldapdebug = (empty($dolibarr_main_auth_ldap_debug) || $dolibarr_main_auth_ldap_debug == "false" ? false : true);
 
-		if ($ldapdebug) print "DEBUG: Logging LDAP steps<br>\n";
+		if ($ldapdebug) {
+			print "DEBUG: Logging LDAP steps<br>\n";
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/ldap.class.php';
 		$ldap = new Ldap();
@@ -89,8 +91,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		$ldap->searchUser = $ldapadminlogin;
 		$ldap->searchPassword = $ldapadminpass;
 
-		if ($ldapdebug)
-		{
+		if ($ldapdebug) {
 			dol_syslog("functions_ldap::check_user_password_ldap Server:".join(',', $ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType);
 			dol_syslog("functions_ldap::check_user_password_ldap uid/samacountname=".$ldapuserattr.", dn=".$ldapdn.", Admin:".$ldap->searchUser.", Pass:".$ldap->searchPassword);
 			print "DEBUG: Server:".join(',', $ldap->server).", Port:".$ldap->serverPort.", Protocol:".$ldap->ldapProtocolVersion.", Type:".$ldap->serverType."<br>\n";
@@ -109,17 +110,16 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 
 		// If admin login provided
 		// Code to get user in LDAP from an admin connection (may differ from user connection, done later)
-		if ($ldapadminlogin)
-		{
+		if ($ldapadminlogin) {
 			$result = $ldap->connect_bind();
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$resultFetchLdapUser = $ldap->fetch($usertotest, $userSearchFilter);
 				//dol_syslog('functions_ldap::check_user_password_ldap resultFetchLdapUser='.$resultFetchLdapUser);
-				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) // If ok but password need to be reset
-				{
+				if ($resultFetchLdapUser > 0 && $ldap->pwdlastset == 0) { // If ok but password need to be reset
 					dol_syslog('functions_ldap::check_user_password_ldap '.$usertotest.' must change password next logon');
-					if ($ldapdebug) print "DEBUG: User ".$usertotest." must change password<br>\n";
+					if ($ldapdebug) {
+						print "DEBUG: User ".$usertotest." must change password<br>\n";
+					}
 					$ldap->close();
 					sleep(1);
 					$langs->load('ldap');
@@ -127,7 +127,9 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					return '';
 				}
 			} else {
-				 if ($ldapdebug) print "DEBUG: ".$ldap->error."<br>\n";
+				if ($ldapdebug) {
+					print "DEBUG: ".$ldap->error."<br>\n";
+				}
 			}
 			$ldap->close();
 		}
@@ -138,16 +140,16 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 		$ldap->searchUser = $ldapuserattr."=".$usertotest.",".$ldapdn; // Default dn (will work if LDAP accept a dn with login value inside)
 		// But if LDAP need a dn with name like "cn=Jhon Bloggs,ou=People,dc=foo,dc=com", previous part must have been executed to have
 		// dn detected into ldapUserDN.
-		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) $ldap->searchUser = $ldap->ldapUserDN;
+		if ($resultFetchLdapUser && !empty($ldap->ldapUserDN)) {
+			$ldap->searchUser = $ldap->ldapUserDN;
+		}
 		$ldap->searchPassword = $passwordtotest;
 
 		// Test with this->seachUser and this->searchPassword
 		//print $resultFetchLdapUser."-".$ldap->ldapUserDN."-".$ldap->searchUser.'-'.$ldap->searchPassword;exit;
 		$result = $ldap->connect_bind();
-		if ($result > 0)
-		{
-			if ($result == 2)	// Connection is ok for user/pass into LDAP
-			{
+		if ($result > 0) {
+			if ($result == 2) {	// Connection is ok for user/pass into LDAP
 				$login = $usertotest;
 				if (!empty($conf->global->LDAP_FIELD_LOGIN)) {
 					$login = $ldap->login;
@@ -176,35 +178,41 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 				}
 
 				// ldap2dolibarr synchronisation
-				if ($login && !empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')	// ldap2dolibarr synchronisation
-				{
+				if ($login && !empty($conf->ldap->enabled) && $conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {	// ldap2dolibarr synchronisation
 					dol_syslog("functions_ldap::check_user_password_ldap Sync ldap2dolibarr");
 
 					// On charge les attributs du user ldap
-					if ($ldapdebug) print "DEBUG: login ldap = ".$login."<br>\n";
+					if ($ldapdebug) {
+						print "DEBUG: login ldap = ".$login."<br>\n";
+					}
 					$resultFetchLdapUser = $ldap->fetch($login, $userSearchFilter);
 
-					if ($ldapdebug) print "DEBUG: UACF = ".join(',', $ldap->uacf)."<br>\n";
-					if ($ldapdebug) print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset, 'day')."<br>\n";
-					if ($ldapdebug) print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime, 'day')."<br>\n";
+					if ($ldapdebug) {
+						print "DEBUG: UACF = ".join(',', $ldap->uacf)."<br>\n";
+					}
+					if ($ldapdebug) {
+						print "DEBUG: pwdLastSet = ".dol_print_date($ldap->pwdlastset, 'day')."<br>\n";
+					}
+					if ($ldapdebug) {
+						print "DEBUG: badPasswordTime = ".dol_print_date($ldap->badpwdtime, 'day')."<br>\n";
+					}
 
 					// On recherche le user dolibarr en fonction de son SID ldap (only for Active Directory)
 					$sid = null;
-					if ($conf->global->LDAP_SERVER_TYPE == "activedirectory")
-					{
+					if ($conf->global->LDAP_SERVER_TYPE == "activedirectory") {
 						$sid = $ldap->getObjectSid($login);
-						if ($ldapdebug) print "DEBUG: sid = ".$sid."<br>\n";
+						if ($ldapdebug) {
+							print "DEBUG: sid = ".$sid."<br>\n";
+						}
 					}
 
 					$usertmp = new User($db);
 					$resultFetchUser = $usertmp->fetch('', $login, $sid);
-					if ($resultFetchUser > 0)
-					{
+					if ($resultFetchUser > 0) {
 						dol_syslog("functions_ldap::check_user_password_ldap Sync user found user id=".$usertmp->id);
 						// On verifie si le login a change et on met a jour les attributs dolibarr
 
-						if ($usertmp->login != $ldap->login && $ldap->login)
-						{
+						if ($usertmp->login != $ldap->login && $ldap->login) {
 							$usertmp->login = $ldap->login;
 							$usertmp->update($usertmp);
 							// TODO Que faire si update echoue car on update avec un login deja existant.
@@ -216,23 +224,20 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 					unset($usertmp);
 				}
 
-				if (!empty($conf->multicompany->enabled))	// We must check entity (even if sync is not active)
-				{
+				if (!empty($conf->multicompany->enabled)) {	// We must check entity (even if sync is not active)
 					global $mc;
 
 					$usertmp = new User($db);
 					$usertmp->fetch('', $login);
 					$ret = $mc->checkRight($usertmp->id, $entitytotest);
-					if ($ret < 0)
-					{
+					if ($ret < 0) {
 						dol_syslog("functions_ldap::check_user_password_ldap Authentication KO entity '".$entitytotest."' not allowed for user '".$usertmp->id."'", LOG_NOTICE);
 						$login = ''; // force authentication failure
 					}
 					unset($usertmp);
 				}
 			}
-			if ($result == 1)
-			{
+			if ($result == 1) {
 				dol_syslog("functions_ldap::check_user_password_ldap Authentication KO bad user/password for '".$usertotest."'", LOG_NOTICE);
 				sleep(1);
 
@@ -243,16 +248,15 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 			}
 		} else {
 			/* Login failed. Return false, together with the error code and text from
-             ** the LDAP server. The common error codes and reasons are listed below :
-             ** (for iPlanet, other servers may differ)
-             ** 19 - Account locked out (too many invalid login attempts)
-             ** 32 - User does not exist
-             ** 49 - Wrong password
-             ** 53 - Account inactive (manually locked out by administrator)
-             */
+			 ** the LDAP server. The common error codes and reasons are listed below :
+			 ** (for iPlanet, other servers may differ)
+			 ** 19 - Account locked out (too many invalid login attempts)
+			 ** 32 - User does not exist
+			 ** 49 - Wrong password
+			 ** 53 - Account inactive (manually locked out by administrator)
+			 */
 			dol_syslog("functions_ldap::check_user_password_ldap Authentication KO failed to connect to LDAP for '".$usertotest."'", LOG_NOTICE);
-			if (is_resource($ldap->connection))    // If connection ok but bind ko
-			{
+			if (is_resource($ldap->connection)) {    // If connection ok but bind ko
 				$ldap->ldapErrorCode = ldap_errno($ldap->connection);
 				$ldap->ldapErrorText = ldap_error($ldap->connection);
 				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
diff --git a/htdocs/core/login/functions_openid.php b/htdocs/core/login/functions_openid.php
index f0191da53c0..c06b10f109d 100644
--- a/htdocs/core/login/functions_openid.php
+++ b/htdocs/core/login/functions_openid.php
@@ -43,8 +43,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 	$login = '';
 
 	// Get identity from user and redirect browser to OpenID Server
-	if (GETPOSISSET('username'))
-	{
+	if (GETPOSISSET('username')) {
 		$openid = new SimpleOpenID();
 		$openid->SetIdentity($_POST['username']);
 		$protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
@@ -52,8 +51,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 		$openid->SetRequiredFields(array('email', 'fullname'));
 		$_SESSION['dol_entity'] = $_POST["entity"];
 		//$openid->SetOptionalFields(array('dob','gender','postcode','country','language','timezone'));
-		if ($openid->sendDiscoveryRequestToGetXRDS())
-		{
+		if ($openid->sendDiscoveryRequestToGetXRDS()) {
 			$openid->SetApprovedURL($protocol.$_SERVER["HTTP_HOST"].$_SERVER["SCRIPT_NAME"]); // Send Response from OpenID server to this script
 			$openid->Redirect(); // This will redirect user to OpenID Server
 		} else {
@@ -63,13 +61,11 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 		return false;
 	}
 	// Perform HTTP Request to OpenID server to validate key
-	elseif ($_GET['openid_mode'] == 'id_res')
-	{
+	elseif ($_GET['openid_mode'] == 'id_res') {
 		$openid = new SimpleOpenID();
 		$openid->SetIdentity($_GET['openid_identity']);
 		$openid_validation_result = $openid->ValidateWithServer();
-		if ($openid_validation_result === true)
-		{
+		if ($openid_validation_result === true) {
 			// OK HERE KEY IS VALID
 
 			$sql = "SELECT login, entity, datestartvalidity, dateendvalidity";
@@ -79,11 +75,9 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 
 			dol_syslog("functions_openid::check_user_password_openid", LOG_DEBUG);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if ($obj)
-				{
+				if ($obj) {
 					$now = dol_now();
 					if ($obj->datestartvalidity && $db->jdate($obj->datestartvalidity) > $now) {
 						// Load translation files required by the page
@@ -101,8 +95,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 					$login = $obj->login;
 				}
 			}
-		} elseif ($openid->IsError() === true)
-		{
+		} elseif ($openid->IsError() === true) {
 			// ON THE WAY, WE GOT SOME ERROR
 			$_SESSION["dol_loginmesg"] = $openid->GetError();
 			return false;
@@ -111,8 +104,7 @@ function check_user_password_openid($usertotest, $passwordtotest, $entitytotest)
 			//echo "INVALID AUTHORIZATION";
 			return false;
 		}
-	} elseif ($_GET['openid_mode'] == 'cancel')
-	{
+	} elseif ($_GET['openid_mode'] == 'cancel') {
 		// User Canceled your Request
 		//echo "USER CANCELED REQUEST";
 		return false;
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index b50ff9594c0..155a5f55ce0 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -54,14 +54,15 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 
 	$substitarray = getCommonSubstitutionArray($langs, 0, null, null);
 
-	if (empty($noout)) print_start_menu_array_auguria();
+	if (empty($noout)) {
+		print_start_menu_array_auguria();
+	}
 
 	global $usemenuhider;
 	$usemenuhider = 1;
 
 	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
-	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
+	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		$showmode = 1;
 		$classname = 'class="tmenu menuhider"';
 		$idsel = 'menu';
@@ -70,8 +71,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	}
 
 	$num = count($newTabMenu);
-	for ($i = 0; $i < $num; $i++)
-	{
+	for ($i = 0; $i < $num; $i++) {
 		$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
 
 		$shorturl = '';
@@ -82,19 +82,16 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 
 			$url = $shorturl = $newTabMenu[$i]['url'];
 
-			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url']))
-			{
+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) {
 				$tmp = explode('?', $newTabMenu[$i]['url'], 2);
 				$url = $shorturl = $tmp[0];
 				$param = (isset($tmp[1]) ? $tmp[1] : '');
 
 				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url']))
-				{
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($newTabMenu[$i]['url'])) {
 					$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
 				}
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url']))
-				{
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($newTabMenu[$i]['url'])) {
 					$param .= ($param ? '&' : '').'leftmenu=';
 				}
 				//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
@@ -102,21 +99,29 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 				//$shorturl = $shorturl.($param?'?'.$param:'');
 				$shorturl = $url;
 
-				if (DOL_URL_ROOT) $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
+				if (DOL_URL_ROOT) {
+					$shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);
+				}
 			}
 
 			// TODO Find a generic solution
-			if (preg_match('/search_project_user=__search_project_user__/', $shorturl))
-			{
+			if (preg_match('/search_project_user=__search_project_user__/', $shorturl)) {
 				$search_project_user = GETPOST('search_project_user', 'int');
-				if ($search_project_user) $shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
-				else $shorturl = preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+				if ($search_project_user) {
+					$shorturl = preg_replace('/search_project_user=__search_project_user__/', 'search_project_user='.$search_project_user, $shorturl);
+				} else {
+					$shorturl = preg_replace('/search_project_user=__search_project_user__/', '', $shorturl);
+				}
 			}
 
 			// Define the class (top menu selected or not)
-			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) $classname = 'class="tmenusel"';
-			elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) $classname = 'class="tmenusel"';
-			else $classname = 'class="tmenu"';
+			if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) {
+				$classname = 'class="tmenusel"';
+			} elseif (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) {
+				$classname = 'class="tmenusel"';
+			} else {
+				$classname = 'class="tmenu"';
+			}
 		} elseif ($showmode == 2) {
 			$classname = 'class="tmenu"';
 		} else {
@@ -131,8 +136,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 
 	// Output menu entries
 	// Show logo company
-	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
+	if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		//$mysoc->logo_mini=(empty($conf->global->MAIN_INFO_SOCIETE_LOGO_MINI)?'':$conf->global->MAIN_INFO_SOCIETE_LOGO_MINI);
 		$mysoc->logo_squarred_mini = (empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI) ? '' : $conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI);
 
@@ -141,8 +145,7 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 			$logoContainerAdditionalClass = '';
 		}
 
-		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini))
-		{
+		if (!empty($mysoc->logo_squarred_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
 			$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
 		}
 		/*elseif (! empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini))
@@ -206,8 +209,7 @@ function print_start_menu_array_auguria()
  */
 function print_start_menu_entry_auguria($idsel, $classname, $showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';
 		//print '<div class="tmenuleft tmenusep"></div>';
 		print '<div class="tmenucenter">';
@@ -257,8 +259,7 @@ function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $cla
  */
 function print_end_menu_entry_auguria($showmode)
 {
-	if ($showmode)
-	{
+	if ($showmode) {
 		print '</div></li>';
 	}
 	print "\n";
@@ -305,8 +306,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	global $usemenuhider;
 	$usemenuhider = 0;
 
-	if (is_array($moredata) && !empty($moredata['searchform']))	// searchform can contains select2 code or link to show old search form or link to switch on search page
-	{
+	if (is_array($moredata) && !empty($moredata['searchform'])) {	// searchform can contains select2 code or link to show old search form or link to switch on search page
 		print "\n";
 		print "<!-- Begin SearchForm -->\n";
 		print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";
@@ -315,8 +315,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		print "<!-- End SearchForm -->\n";
 	}
 
-	if (is_array($moredata) && !empty($moredata['bookmarks']))
-	{
+	if (is_array($moredata) && !empty($moredata['bookmarks'])) {
 		print "\n";
 		print "<!-- Begin Bookmarks -->\n";
 		print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";
@@ -332,8 +331,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->socid ? 1 : 0), 'auguria', $tabMenu);
 
 	// We update newmenu for special dynamic menus
-	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank')	// Entry for each bank account
-	{
+	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank') {	// Entry for each bank account
 		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
 
 		$sql = "SELECT rowid, label, courant, rappro, courant";
@@ -343,29 +341,29 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		$sql .= " ORDER BY label";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$numr = $db->num_rows($resql);
 			$i = 0;
 
-			if ($numr > 0) 	$newmenu->add('/compta/bank/list.php', $langs->trans("BankAccounts"), 0, $user->rights->banque->lire);
+			if ($numr > 0) {
+				$newmenu->add('/compta/bank/list.php', $langs->trans("BankAccounts"), 0, $user->rights->banque->lire);
+			}
 
-			while ($i < $numr)
-			{
+			while ($i < $numr) {
 				$objp = $db->fetch_object($resql);
 				$newmenu->add('/compta/bank/card.php?id='.$objp->rowid, $objp->label, 1, $user->rights->banque->lire);
-				if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos))  // If not cash account and not closed and can be reconciliate
-				{
+				if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos)) {  // If not cash account and not closed and can be reconciliate
 					$newmenu->add('/compta/bank/bankentries_list.php?id='.$objp->rowid, $langs->trans("Conciliate"), 2, $user->rights->banque->consolidate);
 				}
 				$i++;
 			}
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 		$db->free($resql);
 	}
 
-	if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') 	// Entry in accountancy journal for each bank account
-	{
+	if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') { 	// Entry in accountancy journal for each bank account
 		$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy', 10);
 
 		// Multi journal
@@ -376,39 +374,49 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		$sql .= " ORDER BY label DESC";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$numr = $db->num_rows($resql);
 			$i = 0;
 
-			if ($numr > 0)
-			{
-				while ($i < $numr)
-				{
+			if ($numr > 0) {
+				while ($i < $numr) {
 					$objp = $db->fetch_object($resql);
 
 					$nature = '';
 
 					// Must match array $sourceList defined into journals_list.php
-					if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) $nature = "sells";
+					if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
+						$nature = "sells";
+					}
 					if ($objp->nature == 3
 						&& (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled))
-						&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES))
+						&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
 						$nature = "purchases";
-					if ($objp->nature == 4 && !empty($conf->banque->enabled)) $nature = "bank";
-					if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) $nature = "expensereports";
-					if ($objp->nature == 1) $nature = "various";
-					if ($objp->nature == 8) $nature = "inventory";
-					if ($objp->nature == 9) $nature = "hasnew";
-
-					// To enable when page exists
-					if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL))
-					{
-						if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') $nature = '';
+					}
+					if ($objp->nature == 4 && !empty($conf->banque->enabled)) {
+						$nature = "bank";
+					}
+					if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
+						$nature = "expensereports";
+					}
+					if ($objp->nature == 1) {
+						$nature = "various";
+					}
+					if ($objp->nature == 8) {
+						$nature = "inventory";
+					}
+					if ($objp->nature == 9) {
+						$nature = "hasnew";
 					}
 
-					if ($nature)
-					{
+					// To enable when page exists
+					if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {
+						if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
+							$nature = '';
+						}
+					}
+
+					if ($nature) {
 						$langs->load('accountancy');
 						$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
 						$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
@@ -419,20 +427,19 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				// Should not happend. Entries are added
 				$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
 			}
-		} else dol_print_error($db);
+		} else {
+			dol_print_error($db);
+		}
 		$db->free($resql);
 	}
 
-	if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp')	// Entry for FTP
-	{
+	if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') {	// Entry for FTP
 		$MAXFTP = 20;
 		$i = 1;
-		while ($i <= $MAXFTP)
-		{
+		while ($i <= $MAXFTP) {
 			$paramkey = 'FTP_NAME_'.$i;
 			//print $paramkey;
-			if (!empty($conf->global->$paramkey))
-			{
+			if (!empty($conf->global->$paramkey)) {
 				$link = "/ftp/index.php?idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;
 
 				$newmenu->add($link, dol_trunc($conf->global->$paramkey, 24));
@@ -446,34 +453,39 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	//var_dump($menu_array_before);exit;
 	//var_dump($menu_array_after);exit;
 	$menu_array = $newmenu->liste;
-	if (is_array($menu_array_before)) $menu_array = array_merge($menu_array_before, $menu_array);
-	if (is_array($menu_array_after))  $menu_array = array_merge($menu_array, $menu_array_after);
+	if (is_array($menu_array_before)) {
+		$menu_array = array_merge($menu_array_before, $menu_array);
+	}
+	if (is_array($menu_array_after)) {
+		$menu_array = array_merge($menu_array, $menu_array_after);
+	}
 	//var_dump($menu_array);exit;
-	if (!is_array($menu_array)) return 0;
+	if (!is_array($menu_array)) {
+		return 0;
+	}
 
 	// Show menu
 	$invert = empty($conf->global->MAIN_MENU_INVERT) ? "" : "invert";
-	if (empty($noout))
-	{
+	if (empty($noout)) {
 		$altok = 0; $blockvmenuopened = false; $lastlevel0 = '';
 		$num = count($menu_array);
-		for ($i = 0; $i < $num; $i++)     // Loop on each menu entry
-		{
+		for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry
 			$showmenu = true;
-			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) 	$showmenu = false;
+			if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
+				$showmenu = false;
+			}
 
 			// Begin of new left menu block
-			if (empty($menu_array[$i]['level']) && $showmenu)
-			{
+			if (empty($menu_array[$i]['level']) && $showmenu) {
 				$altok++;
 				$blockvmenuopened = true;
 				$lastopened = true;
-				for ($j = ($i + 1); $j < $num; $j++)
-				{
-					if (empty($menu_array[$j]['level'])) $lastopened = false;
+				for ($j = ($i + 1); $j < $num; $j++) {
+					if (empty($menu_array[$j]['level'])) {
+						$lastopened = false;
+					}
 				}
-				if ($altok % 2 == 0)
-				{
+				if ($altok % 2 == 0) {
 					print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
 				} else {
 					print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";
@@ -483,10 +495,8 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 			// Add tabulation
 			$tabstring = '';
 			$tabul = ($menu_array[$i]['level'] - 1);
-			if ($tabul > 0)
-			{
-				for ($j = 0; $j < $tabul; $j++)
-				{
+			if ($tabul > 0) {
+				for ($j = 0; $j < $tabul; $j++) {
 					$tabstring .= '&nbsp;&nbsp;&nbsp;';
 				}
 			}
@@ -496,19 +506,16 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 			$menu_array[$i]['url'] = make_substitutions($menu_array[$i]['url'], $substitarray);
 
 			$url = $shorturl = $shorturlwithoutparam = $menu_array[$i]['url'];
-			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url']))
-			{
+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url'])) {
 				$tmp = explode('?', $menu_array[$i]['url'], 2);
 				$url = $shorturl = $tmp[0];
 				$param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link
 
 				// Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu']))
-				{
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu'])) {
 					$param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';
 				}
-				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu']))
-				{
+				if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu'])) {
 					$param .= ($param ? '&' : '').'leftmenu=';
 				}
 				//$url.="idmenu=".$menu_array[$i]['rowid'];    // Already done by menuLoad
@@ -521,64 +528,77 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 			print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";
 
 			// Menu level 0
-			if ($menu_array[$i]['level'] == 0)
-			{
-				if ($menu_array[$i]['enabled'])     // Enabled so visible
-				{
+			if ($menu_array[$i]['level'] == 0) {
+				if ($menu_array[$i]['enabled']) {     // Enabled so visible
 					print '<div class="menu_titre">'.$tabstring;
-					if ($shorturlwithoutparam) print '<a class="vmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vmenu">';
+					if ($shorturlwithoutparam) {
+						print '<a class="vmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
+					} else {
+						print '<span class="vmenu">';
+					}
 					print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '').$menu_array[$i]['titre'];
-					if ($shorturlwithoutparam) print '</a>';
-					else print '</span>';
+					if ($shorturlwithoutparam) {
+						print '</a>';
+					} else {
+						print '</span>';
+					}
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
-				} elseif ($showmenu)                 // Not enabled but visible (so greyed)
-				{
+				} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
 					print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";
 					$lastlevel0 = 'greyed';
 				} else {
 					$lastlevel0 = 'hidden';
 				}
-				if ($showmenu)
-				{
+				if ($showmenu) {
 					print '<div class="menu_top"></div>'."\n";
 				}
 			}
 
 			// Menu level > 0
-			if ($menu_array[$i]['level'] > 0)
-			{
+			if ($menu_array[$i]['level'] > 0) {
 				$cssmenu = '';
-				if ($menu_array[$i]['url']) $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
+				if ($menu_array[$i]['url']) {
+					$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
+				}
 
-				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled')     // Enabled so visible, except if parent was not enabled.
-				{
+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {     // Enabled so visible, except if parent was not enabled.
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
-					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
+					if ($shorturlwithoutparam) {
+						print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
+					} else {
+						print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
+					}
 					print $menu_array[$i]['titre'];
-					if ($shorturlwithoutparam) print '</a>';
-					else print '</span>';
+					if ($shorturlwithoutparam) {
+						print '</a>';
+					} else {
+						print '</span>';
+					}
 					// If title is not pure text and contains a table, no carriage return added
-					if (!strstr($menu_array[$i]['titre'], '<table')) print '<br>';
+					if (!strstr($menu_array[$i]['titre'], '<table')) {
+						print '<br>';
+					}
 					print '</div>'."\n";
-				} elseif ($showmenu && $lastlevel0 == 'enabled')       // Not enabled but visible (so greyed), except if parent was not enabled.
-				{
+				} elseif ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";
 				}
 			}
 
 			// If next is a new block or if there is nothing after
-			if (empty($menu_array[$i + 1]['level']))               // End menu block
-			{
-				if ($showmenu)
+			if (empty($menu_array[$i + 1]['level'])) {               // End menu block
+				if ($showmenu) {
 					print '<div class="menu_end"></div>'."\n";
-				if ($blockvmenuopened) { print '</div>'."\n"; $blockvmenuopened = false; }
+				}
+				if ($blockvmenuopened) {
+					print '</div>'."\n"; $blockvmenuopened = false;
+				}
 			}
 		}
 
-		if ($altok) print '<div class="blockvmenuend"></div>'; // End menu block
+		if ($altok) {
+			print '<div class="blockvmenuend"></div>'; // End menu block
+		}
 	}
 
 	return count($menu_array);
@@ -599,21 +619,29 @@ function dol_auguria_showmenu($type_user, &$menuentry, &$listofmodulesforexterna
 
 	//print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];
 	//print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);
-	if (empty($menuentry['enabled'])) return 0; // Entry disabled by condition
-	if ($type_user && $menuentry['module'])
-	{
+	if (empty($menuentry['enabled'])) {
+		return 0; // Entry disabled by condition
+	}
+	if ($type_user && $menuentry['module']) {
 		$tmploops = explode('|', $menuentry['module']);
 		$found = 0;
-		foreach ($tmploops as $tmploop)
-		{
+		foreach ($tmploops as $tmploop) {
 			if (in_array($tmploop, $listofmodulesforexternal)) {
 				$found++; break;
 			}
 		}
-		if (!$found) return 0; // Entry is for menus all excluded to external users
+		if (!$found) {
+			return 0; // Entry is for menus all excluded to external users
+		}
+	}
+	if (!$menuentry['perms'] && $type_user) {
+		return 0; // No permissions and user is external
+	}
+	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+		return 0; // No permissions and option to hide when not allowed, even for internal user, is on
+	}
+	if (!$menuentry['perms']) {
+		return 2; // No permissions and user is external
 	}
-	if (!$menuentry['perms'] && $type_user) return 0; // No permissions and user is external
-	if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))	return 0; // No permissions and option to hide when not allowed, even for internal user, is on
-	if (!$menuentry['perms']) return 2; // No permissions and user is external
 	return 1;
 }
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index c80810656db..77725be2ae7 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -56,24 +56,27 @@ class MenuManager
 	}
 
 
-   	/**
-   	 * Load this->tabMenu
-   	 *
-   	 * @param	string	$forcemainmenu		To force mainmenu to load
-   	 * @param	string	$forceleftmenu		To force leftmenu to load
-   	 * @return	void
-   	 */
-   	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
-   	{
+	/**
+	 * Load this->tabMenu
+	 *
+	 * @param	string	$forcemainmenu		To force mainmenu to load
+	 * @param	string	$forceleftmenu		To force leftmenu to load
+	 * @return	void
+	 */
+	public function loadMenu($forcemainmenu = '', $forceleftmenu = '')
+	{
 		global $conf, $user, $langs;
 
-   		// On sauve en session le menu principal choisi
-		if (GETPOSTISSET("mainmenu")) $_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
-		if (GETPOSTISSET("idmenu"))   $_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+		// On sauve en session le menu principal choisi
+		if (GETPOSTISSET("mainmenu")) {
+			$_SESSION["mainmenu"] = GETPOST("mainmenu", 'aZ09');
+		}
+		if (GETPOSTISSET("idmenu")) {
+			$_SESSION["idmenu"] = GETPOST("idmenu", 'int');
+		}
 
 		// Read mainmenu and leftmenu that define which menu to show
-		if (GETPOSTISSET("mainmenu"))
-		{
+		if (GETPOSTISSET("mainmenu")) {
 			// On sauve en session le menu principal choisi
 			$mainmenu = GETPOST("mainmenu", 'aZ09');
 			$_SESSION["mainmenu"] = $mainmenu;
@@ -82,16 +85,16 @@ class MenuManager
 			// On va le chercher en session si non defini par le lien
 			$mainmenu = isset($_SESSION["mainmenu"]) ? $_SESSION["mainmenu"] : '';
 		}
-		if (!empty($forcemainmenu)) $mainmenu = $forcemainmenu;
+		if (!empty($forcemainmenu)) {
+			$mainmenu = $forcemainmenu;
+		}
 
-		if (GETPOSTISSET("leftmenu"))
-		{
+		if (GETPOSTISSET("leftmenu")) {
 			// On sauve en session le menu principal choisi
 			$leftmenu = GETPOST("leftmenu", 'aZ09');
 			$_SESSION["leftmenu"] = $leftmenu;
 
-			if ($_SESSION["leftmenuopened"] == $leftmenu)	// To collapse
-			{
+			if ($_SESSION["leftmenuopened"] == $leftmenu) {	// To collapse
 				//$leftmenu="";
 				$_SESSION["leftmenuopened"] = "";
 			} else {
@@ -101,7 +104,9 @@ class MenuManager
 			// On va le chercher en session si non defini par le lien
 			$leftmenu = isset($_SESSION["leftmenu"]) ? $_SESSION["leftmenu"] : '';
 		}
-		if (!empty($forceleftmenu)) $leftmenu = $forceleftmenu;
+		if (!empty($forceleftmenu)) {
+			$leftmenu = $forceleftmenu;
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';
 		$tabMenu = array();
@@ -111,7 +116,7 @@ class MenuManager
 		//var_dump($tabMenu);
 
 		//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
-   	}
+	}
 
 
 	/**
@@ -128,8 +133,7 @@ class MenuManager
 
 		require_once DOL_DOCUMENT_ROOT.'/core/menus/standard/auguria.lib.php';
 
-		if ($this->type_user == 1)
-		{
+		if ($this->type_user == 1) {
 			$conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED = 1;
 			$conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED = 1;
 		}
@@ -137,36 +141,39 @@ class MenuManager
 		require_once DOL_DOCUMENT_ROOT.'/core/class/menu.class.php';
 		$this->menu = new Menu();
 
-		if (empty($conf->global->MAIN_MENU_INVERT))
-		{
-			if ($mode == 'top')  print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
-			if ($mode == 'left') print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
+		if (empty($conf->global->MAIN_MENU_INVERT)) {
+			if ($mode == 'top') {
+				print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			}
+			if ($mode == 'left') {
+				print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0, '', '', $moredata);
+			}
 		} else {
 			$conf->global->MAIN_SHOW_LOGO = 0;
-			if ($mode == 'top')  print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
-			if ($mode == 'left') print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			if ($mode == 'top') {
+				print_left_auguria_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $this->menu, 0);
+			}
+			if ($mode == 'left') {
+				print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 0, $mode);
+			}
 		}
 
-		if ($mode == 'topnb')
-		{
+		if ($mode == 'topnb') {
 			print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
 			return $this->menu->getNbOfVisibleMenuEntries();
 		}
 
-		if ($mode == 'jmobile')     // Used to get menu in xml ul/li
-		{
+		if ($mode == 'jmobile') {     // Used to get menu in xml ul/li
 			print_auguria_menu($this->db, $this->atarget, $this->type_user, $this->tabMenu, $this->menu, 1, $mode);
 
 			// $this->menu->liste is top menu
 			//var_dump($this->menu->liste);exit;
 			$lastlevel = array();
 			print '<!-- Generate menu list from menu handler '.$this->name.' -->'."\n";
-			foreach ($this->menu->liste as $key => $val)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-			{
+			foreach ($this->menu->liste as $key => $val) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 				print '<ul class="ulmenu" data-inset="true">';
 				print '<li class="lilevel0">';
-				if ($val['enabled'] == 1)
-				{
+				if ($val['enabled'] == 1) {
 					$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
 					$substitarray['__USERID__'] = $user->id; // For backward compatibility
 					$val['url'] = make_substitutions($val['url'], $substitarray);
@@ -177,7 +184,9 @@ class MenuManager
 					print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+						print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					}
 
 					print $val['titre'];
 					print '</a>'."\n";
@@ -195,27 +204,27 @@ class MenuManager
 					//var_dump($canonnexturl);
 					print '<ul>'."\n";
 					if (($canonrelurl != $canonnexturl && !in_array($val['mainmenu'], array('tools')))
-						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false))
-					{
+						|| (strpos($canonrelurl, '/product/index.php') !== false || strpos($canonrelurl, '/compta/bank/list.php') !== false)) {
 						// We add sub entry
 						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
-						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard")  // No translation
-						{
-							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) print $langs->trans("Access");
-							else print $langs->trans("Dashboard");
-						} else print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation
+							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab'))) {
+								print $langs->trans("Access");
+							} else {
+								print $langs->trans("Dashboard");
+							}
+						} else {
+							print $langs->trans(ucfirst($val['mainmenu'])."Dashboard");
+						}
 						print '</a>';
 						print '</li>'."\n";
 					}
 
-					if ($val['level'] == 0)
-					{
-						if ($val['enabled'])
-						{
+					if ($val['level'] == 0) {
+						if ($val['enabled']) {
 							$lastlevel[0] = 'enabled';
-						} elseif ($showmenu)                 // Not enabled but visible (so greyed)
-						{
+						} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
 							$lastlevel[0] = 'greyed';
 						} else {
 							$lastlevel[0] = 'hidden';
@@ -223,52 +232,52 @@ class MenuManager
 					}
 
 					$lastlevel2 = array();
-					foreach ($submenu->liste as $key2 => $val2)		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
-					{
+					foreach ($submenu->liste as $key2 => $val2) {		// $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
 						$showmenu = true;
-						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) $showmenu = false;
+						if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($val2['enabled'])) {
+							$showmenu = false;
+						}
 
 						// If at least one parent is not enabled, we do not show any menu of all children
-						if ($val2['level'] > 0)
-						{
+						if ($val2['level'] > 0) {
 							$levelcursor = $val2['level'] - 1;
-							while ($levelcursor >= 0)
-							{
-								if ($lastlevel2[$levelcursor] != 'enabled') $showmenu = false;
+							while ($levelcursor >= 0) {
+								if ($lastlevel2[$levelcursor] != 'enabled') {
+									$showmenu = false;
+								}
 								$levelcursor--;
 							}
 						}
 
-						if ($showmenu)		// Visible (option to hide when not allowed is off or allowed)
-	   					{
-	   						$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
-	   						$substitarray['__USERID__'] = $user->id; // For backward compatibility
-	   						$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
+						if ($showmenu) {		// Visible (option to hide when not allowed is off or allowed)
+							$substitarray = array('__LOGIN__' => $user->login, '__USER_ID__' => $user->id, '__USER_SUPERVISOR_ID__' => $user->fk_user);
+							$substitarray['__USERID__'] = $user->id; // For backward compatibility
+							$val2['url'] = make_substitutions($val2['url'], $substitarray); // Make also substitution of __(XXX)__ and __[XXX]__
 
-	   						if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url']))
-	   						{
-	   							$relurl2 = dol_buildpath($val2['url'], 1);
-	   						} else {
-	   							$relurl2 = $val2['url'];
-	   						}
+							if (!preg_match("/^(http:\/\/|https:\/\/)/i", $val2['url'])) {
+								$relurl2 = dol_buildpath($val2['url'], 1);
+							} else {
+								$relurl2 = $val2['url'];
+							}
 							$canonurl2 = preg_replace('/\?.*$/', '', $val2['url']);
 							//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
-							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) $relurl2 = '';
+							if (in_array($canonurl2, array('/admin/index.php', '/admin/tools/index.php', '/core/tools.php'))) {
+								$relurl2 = '';
+							}
 
 							$disabled = '';
-							if (!$val2['enabled'])
-							{
+							if (!$val2['enabled']) {
 								$disabled = " vsmenudisabled";
 							}
 
 							print str_pad('', $val2['level'] + 1);
 							print '<li class="lilevel'.($val2['level'] + 1);
-							if ($val2['level'] == 0) print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							if ($val2['level'] == 0) {
+								print ' ui-btn-icon-right ui-btn'; // ui-btn to highlight on clic
+							}
 							print $disabled.'">'; // ui-btn to highlight on clic
-							if ($relurl2)
-							{
-								if ($val2['enabled'])	// Allowed
-								{
+							if ($relurl2) {
+								if ($val2['enabled']) {	// Allowed
 									print '<a href="'.$relurl2.'"';
 									//print ' data-ajax="false"';
 									print '>';
@@ -279,28 +288,27 @@ class MenuManager
 									$lastlevel2[$val2['level']] = 'greyed';
 								}
 							} else {
-								if ($val2['enabled'])	// Allowed
-								{
+								if ($val2['enabled']) {	// Allowed
 									$lastlevel2[$val2['level']] = 'enabled';
 								} else {
 									$lastlevel2[$val2['level']] = 'greyed';
 								}
 							}
 							print $val2['titre'];
-							if ($relurl2)
-							{
-								if ($val2['enabled'])	// Allowed
+							if ($relurl2) {
+								if ($val2['enabled']) {	// Allowed
 									print '</a>';
-								else print '</a>';
+								} else {
+									print '</a>';
+								}
 							}
 							print '</li>'."\n";
-	   					}
+						}
 					}
 					//var_dump($submenu);
 					print '</ul>';
 				}
-				if ($val['enabled'] == 2)
-				{
+				if ($val['enabled'] == 2) {
 					print '<font class="vsmenudisabled">'.$val['titre'].'</font>';
 				}
 				print '</li>';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index f3078516080..d72bb610012 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -416,8 +416,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		// Execute addons requests
 		$num = count($array_sql);
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			if (!$err) {
 				$val = $array_sql[$i];
 				$sql = $val;
@@ -515,8 +514,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		// Run complementary sql requests
 		$num = count($array_sql);
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			if (!$err) {
 				dol_syslog(get_class($this)."::_remove", LOG_DEBUG);
 				$result = $this->db->query($array_sql[$i]);
@@ -555,9 +553,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		} else {
 			// If module name translation using it's unique id does not exist, we try to use its name to find translation
 			if (is_array($this->langfiles)) {
-				foreach ($this->langfiles as $val)
-				{
-					if ($val) { $langs->load($val);
+				foreach ($this->langfiles as $val) {
+					if ($val) {
+						$langs->load($val);
 					}
 				}
 			}
@@ -589,9 +587,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		} else {
 			// If module description translation does not exist using its unique id, we can use its name to find translation
 			if (is_array($this->langfiles)) {
-				foreach ($this->langfiles as $val)
-				{
-					if ($val) { $langs->load($val);
+				foreach ($this->langfiles as $val) {
+					if ($val) {
+						$langs->load($val);
 					}
 				}
 			}
@@ -623,8 +621,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$content='';
 		$pathoffile = $this->getDescLongReadmeFound();
 
-		if ($pathoffile)     // Mostly for external modules
-		{
+		if ($pathoffile) {     // Mostly for external modules
 			$content = file_get_contents($pathoffile);
 
 			if ((float) DOL_VERSION >= 6.0) {
@@ -646,9 +643,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			// Mostly for internal modules
 			if (!empty($this->descriptionlong)) {
 				if (is_array($this->langfiles)) {
-					foreach ($this->langfiles as $val)
-					{
-						if ($val) { $langs->load($val);
+					foreach ($this->langfiles as $val) {
+						if ($val) {
+							$langs->load($val);
 						}
 					}
 				}
@@ -723,8 +720,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			}
 		}
 
-		if ($filefound)     // Mostly for external modules
-		{
+		if ($filefound) {     // Mostly for external modules
 			$content = file_get_contents($pathoffile);
 
 			if ((float) DOL_VERSION >= 6.0) {
@@ -888,8 +884,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$err++;
 		} else {
 			$obj = $this->db->fetch_object($resql);
@@ -919,8 +914,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		dol_syslog(get_class($this)."::getLastActiveDate", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$err++;
 		} else {
 			$obj = $this->db->fetch_object($resql);
@@ -973,7 +967,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		dol_syslog(get_class($this)."::_active insert activation constant", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $err++;
+		if (!$resql) {
+			$err++;
 		}
 
 		return $err;
@@ -1032,8 +1027,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 		$ok = 1;
-		foreach ($conf->file->dol_document_root as $dirroot)
-		{
+		foreach ($conf->file->dol_document_root as $dirroot) {
 			if ($ok) {
 				$dir = $dirroot.$reldir;
 				$ok = 0;
@@ -1044,16 +1038,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 					// Run llx_mytable.sql files, then llx_mytable_*.sql
 					$files = array();
-					while (($file = readdir($handle)) !== false)
-					{
+					while (($file = readdir($handle)) !== false) {
 						$files[] = $file;
 					}
 					sort($files);
-					foreach ($files as $file)
-					{
+					foreach ($files as $file) {
 						if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
 							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-							if ($result <= 0) { $error++;
+							if ($result <= 0) {
+								$error++;
 							}
 						}
 					}
@@ -1062,16 +1055,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 					// Run llx_mytable.key.sql files (Must be done after llx_mytable.sql) then then llx_mytable_*.key.sql
 					$files = array();
-					while (($file = readdir($handle)) !== false)
-					{
+					while (($file = readdir($handle)) !== false) {
 						$files[] = $file;
 					}
 					sort($files);
-					foreach ($files as $file)
-					{
+					foreach ($files as $file) {
 						if (preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
 							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-							if ($result <= 0) { $error++;
+							if ($result <= 0) {
+								$error++;
 							}
 						}
 					}
@@ -1080,16 +1072,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 					// Run data_xxx.sql files (Must be done after llx_mytable.key.sql)
 					$files = array();
-					while (($file = readdir($handle)) !== false)
-					{
+					while (($file = readdir($handle)) !== false) {
 							   $files[] = $file;
 					}
 					sort($files);
-					foreach ($files as $file)
-					{
+					foreach ($files as $file) {
 						if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'data') {
 							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-							if ($result <= 0) { $error++;
+							if ($result <= 0) {
+								$error++;
 							}
 						}
 					}
@@ -1098,16 +1089,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 					// Run update_xxx.sql files
 					$files = array();
-					while (($file = readdir($handle)) !== false)
-					{
+					while (($file = readdir($handle)) !== false) {
 							   $files[] = $file;
 					}
 					sort($files);
-					foreach ($files as $file)
-					{
+					foreach ($files as $file) {
 						if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 6) == 'update') {
 							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-							if ($result <= 0) { $error++;
+							if ($result <= 0) {
+								$error++;
 							}
 						}
 					}
@@ -1150,22 +1140,24 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 			$pos_name = InfoBox::getListOfPagesForBoxes();
 
-			foreach ($this->boxes as $key => $value)
-			{
+			foreach ($this->boxes as $key => $value) {
 				$file  = isset($this->boxes[$key]['file']) ? $this->boxes[$key]['file'] : '';
 				$note  = isset($this->boxes[$key]['note']) ? $this->boxes[$key]['note'] : '';
 				$enabledbydefaulton = isset($this->boxes[$key]['enabledbydefaulton']) ? $this->boxes[$key]['enabledbydefaulton'] : 'Home';
 
-				if (empty($file)) { $file  = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
+				if (empty($file)) {
+					$file  = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
 				}
-				if (empty($note)) { $note  = isset($this->boxes[$key][2]) ? $this->boxes[$key][2] : ''; // For backward compatibility
+				if (empty($note)) {
+					$note  = isset($this->boxes[$key][2]) ? $this->boxes[$key][2] : ''; // For backward compatibility
 				}
 
 				// Search if boxes def already present
 				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
 				$sql .= " AND entity = ".$conf->entity;
-				if ($note) { $sql .= " AND note ='".$this->db->escape($note)."'";
+				if ($note) {
+					$sql .= " AND note ='".$this->db->escape($note)."'";
 				}
 
 				$result = $this->db->query($sql);
@@ -1183,16 +1175,17 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 							dol_syslog(get_class($this)."::insert_boxes", LOG_DEBUG);
 							$resql = $this->db->query($sql);
-							if (!$resql) { $err++;
+							if (!$resql) {
+								$err++;
 							}
 						}
 						if (!$err && !preg_match('/newboxdefonly/', $option)) {
 							$lastid = $this->db->last_insert_id(MAIN_DB_PREFIX."boxes_def", "rowid");
 
-							foreach ($pos_name as $key2 => $val2)
-							{
+							foreach ($pos_name as $key2 => $val2) {
 									//print 'key2='.$key2.'-val2='.$val2."<br>\n";
-								if ($enabledbydefaulton && $val2 != $enabledbydefaulton) { continue; // Not enabled by default onto this page.
+								if ($enabledbydefaulton && $val2 != $enabledbydefaulton) {
+									continue; // Not enabled by default onto this page.
 								}
 
 								$sql = "INSERT INTO ".MAIN_DB_PREFIX."boxes (box_id,position,box_order,fk_user,entity)";
@@ -1200,7 +1193,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 								dol_syslog(get_class($this)."::insert_boxes onto page ".$key2."=".$val2."", LOG_DEBUG);
 								$resql = $this->db->query($sql);
-								if (!$resql) { $err++;
+								if (!$resql) {
+									$err++;
 								}
 							}
 						}
@@ -1238,8 +1232,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$err = 0;
 
 		if (is_array($this->boxes)) {
-			foreach ($this->boxes as $key => $value)
-			{
+			foreach ($this->boxes as $key => $value) {
 				//$titre = $this->boxes[$key][0];
 				$file = $this->boxes[$key]['file'];
 				//$note  = $this->boxes[$key][2];
@@ -1316,8 +1309,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		if (is_array($this->cronjobs)) {
 			dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
 
-			foreach ($this->cronjobs as $key => $value)
-			{
+			foreach ($this->cronjobs as $key => $value) {
 				$entity = isset($this->cronjobs[$key]['entity']) ? $this->cronjobs[$key]['entity'] : $conf->entity;
 				$label  = isset($this->cronjobs[$key]['label']) ? $this->cronjobs[$key]['label'] : '';
 				$jobtype = isset($this->cronjobs[$key]['jobtype']) ? $this->cronjobs[$key]['jobtype'] : '';
@@ -1362,10 +1354,18 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 						if (!$err) {
 							$sql = "INSERT INTO ".MAIN_DB_PREFIX."cronjob (module_name, datec, datestart, dateend, label, jobtype, classesname, objectname, methodename, command, params, note,";
-							if (is_int($frequency)) { $sql .= ' frequency,'; }
-							if (is_int($unitfrequency)) { $sql .= ' unitfrequency,'; }
-							if (is_int($priority)) { $sql .= ' priority,'; }
-							if (is_int($status)) { $sql .= ' status,'; }
+							if (is_int($frequency)) {
+								$sql .= ' frequency,';
+							}
+							if (is_int($unitfrequency)) {
+								$sql .= ' unitfrequency,';
+							}
+							if (is_int($priority)) {
+								$sql .= ' priority,';
+							}
+							if (is_int($status)) {
+								$sql .= ' status,';
+							}
 							$sql .= " entity, test)";
 							$sql .= " VALUES (";
 							$sql .= "'".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."', ";
@@ -1380,20 +1380,25 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 							$sql .= ($command ? "'".$this->db->escape($command)."'" : "null").",";
 							$sql .= ($parameters ? "'".$this->db->escape($parameters)."'" : "null").",";
 							$sql .= ($comment ? "'".$this->db->escape($comment)."'" : "null").",";
-							if (is_int($frequency)) { $sql .= "'".$this->db->escape($frequency)."', ";
+							if (is_int($frequency)) {
+								$sql .= "'".$this->db->escape($frequency)."', ";
 							}
-							if (is_int($unitfrequency)) { $sql .= "'".$this->db->escape($unitfrequency)."', ";
+							if (is_int($unitfrequency)) {
+								$sql .= "'".$this->db->escape($unitfrequency)."', ";
 							}
-							if (is_int($priority)) {$sql .= "'".$this->db->escape($priority)."', ";
+							if (is_int($priority)) {
+								$sql .= "'".$this->db->escape($priority)."', ";
 							}
-							if (is_int($status)) { $sql .= "'".$this->db->escape($status)."', ";
+							if (is_int($status)) {
+								$sql .= "'".$this->db->escape($status)."', ";
 							}
 							$sql .= $entity.",";
 							$sql .= "'".$this->db->escape($test)."'";
 							$sql .= ")";
 
 							$resql = $this->db->query($sql);
-							if (!$resql) { $err++;
+							if (!$resql) {
+								$err++;
 							}
 						}
 
@@ -1490,9 +1495,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			dol_syslog(get_class($this)."::insert_tabs", LOG_DEBUG);
 
 			$i = 0;
-			foreach ($this->tabs as $key => $value)
-			{
-				if (is_array($value) && count($value) == 0) { continue; // Discard empty arrays
+			foreach ($this->tabs as $key => $value) {
+				if (is_array($value) && count($value) == 0) {
+					continue; // Discard empty arrays
 				}
 
 				$entity = $conf->entity;
@@ -1500,7 +1505,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 				if (is_array($value)) {
 					$newvalue = $value['data'];
-					if (isset($value['entity'])) { $entity = $value['entity'];
+					if (isset($value['entity'])) {
+						$entity = $value['entity'];
 					}
 				}
 
@@ -1552,13 +1558,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		$err = 0;
 
-		if (empty($this->const)) { return 0;
+		if (empty($this->const)) {
+			return 0;
 		}
 
 		dol_syslog(get_class($this)."::insert_const", LOG_DEBUG);
 
-		foreach ($this->const as $key => $value)
-		{
+		foreach ($this->const as $key => $value) {
 			$name      = $this->const[$key][0];
 			$type      = $this->const[$key][1];
 			$val       = $this->const[$key][2];
@@ -1567,9 +1573,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$entity    = (!empty($this->const[$key][5]) && $this->const[$key][5] != 'current') ? 0 : $conf->entity;
 
 			// Clean
-			if (empty($visible)) { $visible = '0';
+			if (empty($visible)) {
+				$visible = '0';
 			}
-			if (empty($val) && $val != '0') { $val = '';
+			if (empty($val) && $val != '0') {
+				$val = '';
 			}
 
 			$sql = "SELECT count(*)";
@@ -1581,8 +1589,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			if ($result) {
 				$row = $this->db->fetch_row($result);
 
-				if ($row[0] == 0)   // If not found
-				{
+				if ($row[0] == 0) {   // If not found
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."const (name,type,value,note,visible,entity)";
 					$sql .= " VALUES (";
 					$sql .= $this->db->encrypt($name, 1);
@@ -1620,11 +1627,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		$err = 0;
 
-		if (empty($this->const)) { return 0;
+		if (empty($this->const)) {
+			return 0;
 		}
 
-		foreach ($this->const as $key => $value)
-		{
+		foreach ($this->const as $key => $value) {
 			$name = $this->const[$key][0];
 			$deleteonunactive = (!empty($this->const[$key][6])) ? 1 : 0;
 
@@ -1674,8 +1681,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$obj = $this->db->fetch_object($resql);
 			if ($obj !== null && !empty($obj->value) && !empty($this->rights)) {
 				// If the module is active
-				foreach ($this->rights as $key => $value)
-				{
+				foreach ($this->rights as $key => $value) {
 					$r_id       = $this->rights[$key][0];
 					$r_desc     = $this->rights[$key][1];
 					$r_type     = isset($this->rights[$key][2]) ? $this->rights[$key][2] : '';
@@ -1684,7 +1690,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					$r_subperms = isset($this->rights[$key][5]) ? $this->rights[$key][5] : '';
 					$r_modul = empty($this->rights_class) ?strtolower($this->name) : $this->rights_class;
 
-					if (empty($r_type)) { $r_type = 'w'; }
+					if (empty($r_type)) {
+						$r_type = 'w';
+					}
 
 					// Search if perm already present
 					$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
@@ -1720,7 +1728,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 									$this->error = $this->db->lasterror();
 									$err++;
 									break;
-								} else { dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
+								} else {
+									dol_syslog(get_class($this)."::insert_permissions record already exists", LOG_INFO);
 								}
 							}
 
@@ -1741,8 +1750,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 						if ($resqlseladmin) {
 							$num = $this->db->num_rows($resqlseladmin);
 							$i = 0;
-							while ($i < $num)
-							{
+							while ($i < $num) {
 								  $obj2 = $this->db->fetch_object($resqlseladmin);
 								  dol_syslog(get_class($this)."::insert_permissions Add permission to user id=".$obj2->rowid);
 
@@ -1761,8 +1769,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					}
 				}
 
-				if ($reinitadminperms && !empty($user->admin))  // Reload permission for current user if defined
-				{
+				if ($reinitadminperms && !empty($user->admin)) {  // Reload permission for current user if defined
 					// We reload permissions
 					$user->clearrights();
 					$user->getrights();
@@ -1827,8 +1834,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		$this->db->begin();
 
-		foreach ($this->menu as $key => $value)
-		{
+		foreach ($this->menu as $key => $value) {
 			$menu = new Menubase($this->db);
 			$menu->menu_handler = 'all';
 
@@ -1840,8 +1846,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			} else {
 				$foundparent = 0;
 				$fk_parent = $this->menu[$key]['fk_menu'];
-				if (preg_match('/^r=/', $fk_parent))    // old deprecated method
-				{
+				if (preg_match('/^r=/', $fk_parent)) {    // old deprecated method
 					$fk_parent = str_replace('r=', '', $fk_parent);
 					if (isset($this->menu[$fk_parent]['rowid'])) {
 						$menu->fk_menu = $this->menu[$fk_parent]['rowid'];
@@ -1946,11 +1951,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$err = 0;
 
 		if (isset($this->dirs) && is_array($this->dirs)) {
-			foreach ($this->dirs as $key => $value)
-			{
+			foreach ($this->dirs as $key => $value) {
 				$addtodatabase = 0;
 
-				if (!is_array($value)) { $dir = $value; // Default simple mode
+				if (!is_array($value)) {
+					$dir = $value; // Default simple mode
 				} else {
 					$constname = $this->const_name."_DIR_";
 					$dir       = $this->dirs[$key][1];
@@ -1958,17 +1963,21 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					$subname   = empty($this->dirs[$key][3]) ? '' : strtoupper($this->dirs[$key][3]); // Add submodule name (ex: $conf->module->submodule->dir_output)
 					$forcename = empty($this->dirs[$key][4]) ? '' : strtoupper($this->dirs[$key][4]); // Change the module name if different
 
-					if (!empty($forcename)) { $constname = 'MAIN_MODULE_'.$forcename."_DIR_";
+					if (!empty($forcename)) {
+						$constname = 'MAIN_MODULE_'.$forcename."_DIR_";
 					}
-					if (!empty($subname)) {   $constname = $constname.$subname."_";
+					if (!empty($subname)) {
+						$constname = $constname.$subname."_";
 					}
 
 					$name = $constname.strtoupper($this->dirs[$key][0]);
 				}
 
 				// Define directory full path ($dir must start with "/")
-				if (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || $conf->entity == 1) { $fulldir = DOL_DATA_ROOT.$dir;
-				} else { $fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir;
+				if (empty($conf->global->MAIN_MODULE_MULTICOMPANY) || $conf->entity == 1) {
+					$fulldir = DOL_DATA_ROOT.$dir;
+				} else {
+					$fulldir = DOL_DATA_ROOT."/".$conf->entity.$dir;
 				}
 				// Create dir if it does not exists
 				if (!empty($fulldir) && !file_exists($fulldir)) {
@@ -1982,7 +1991,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				// Define the constant in database if requested (not the default mode)
 				if (!empty($addtodatabase)) {
 					$result = $this->insert_dirs($name, $dir);
-					if ($result) { $err++;
+					if ($result) {
+						$err++;
 					}
 				}
 			}
@@ -2074,9 +2084,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$error = 0;
 
 		if (is_array($this->module_parts) && !empty($this->module_parts)) {
-			foreach ($this->module_parts as $key => $value)
-			{
-				if (is_array($value) && count($value) == 0) { continue; // Discard empty arrays
+			foreach ($this->module_parts as $key => $value) {
+				if (is_array($value) && count($value) == 0) {
+					continue; // Discard empty arrays
 				}
 
 				$entity = $conf->entity; // Reset the current entity
@@ -2088,11 +2098,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 					// Example when $key='hooks', then $value is an array('data'=>array('hookcontext1','hookcontext2'), 'entity'=>X)
 					if (isset($value['data']) && is_array($value['data'])) {
 						$newvalue = json_encode($value['data']);
-						if (isset($value['entity'])) { $entity = $value['entity'];
+						if (isset($value['entity'])) {
+							$entity = $value['entity'];
 						}
 					} elseif (isset($value['data']) && !is_array($value['data'])) {
 						$newvalue = $value['data'];
-						if (isset($value['entity'])) { $entity = $value['entity'];
+						if (isset($value['entity'])) {
+							$entity = $value['entity'];
 						}
 					} else // when hook is declared with syntax 'hook'=>array('hookcontext1','hookcontext2',...)
 					{
@@ -2148,10 +2160,10 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$entity = $conf->entity;
 
 		if (is_array($this->module_parts) && !empty($this->module_parts)) {
-			foreach ($this->module_parts as $key => $value)
-			{
+			foreach ($this->module_parts as $key => $value) {
 				// If entity is defined
-				if (is_array($value) && isset($value['entity'])) { $entity = $value['entity'];
+				if (is_array($value) && isset($value['entity'])) {
+					$entity = $value['entity'];
 				}
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."const";
@@ -2209,8 +2221,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		// Define imginfo
 		$imginfo = "info";
-		if ($this->isCoreOrExternalModule() == 'external')
-		{
+		if ($this->isCoreOrExternalModule() == 'external') {
 			$imginfo = "info_black";
 		}
 
@@ -2218,9 +2229,15 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 		$version = $this->getVersion(0);
 		$versiontrans = '';
-		if (preg_match('/development/i', $version))  $versiontrans .= 'warning';
-		if (preg_match('/experimental/i', $version)) $versiontrans .= 'warning';
-		if (preg_match('/deprecated/i', $version))   $versiontrans .= 'warning';
+		if (preg_match('/development/i', $version)) {
+			$versiontrans .= 'warning';
+		}
+		if (preg_match('/experimental/i', $version)) {
+			$versiontrans .= 'warning';
+		}
+		if (preg_match('/deprecated/i', $version)) {
+			$versiontrans .= 'warning';
+		}
 
 		print '
     	<div class="box-flex-item info-box-module'.(empty($conf->global->$const_name) ? ' info-box-module-disabled' : '').($this->isCoreOrExternalModule() == 'external' ? ' info-box-module-external' : '').'">
@@ -2230,10 +2247,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$alttext = '';
 		//if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
 		//if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
-		if (!empty($this->picto))
-		{
-			if (preg_match('/^\//i', $this->picto)) print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle"', 1);
-			else print img_object($alttext, $this->picto, 'class="inline-block valignmiddle"');
+		if (!empty($this->picto)) {
+			if (preg_match('/^\//i', $this->picto)) {
+				print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle"', 1);
+			} else {
+				print img_object($alttext, $this->picto, 'class="inline-block valignmiddle"');
+			}
 		} else {
 			print img_object($alttext, 'generic', 'class="inline-block valignmiddle"');
 		}
diff --git a/htdocs/core/modules/action/modules_action.php b/htdocs/core/modules/action/modules_action.php
index cb57315322f..ea51eea4745 100644
--- a/htdocs/core/modules/action/modules_action.php
+++ b/htdocs/core/modules/action/modules_action.php
@@ -80,10 +80,8 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 	$srctemplatepath = '';
 
 	// Position modele on the name of fichinter model to use
-	if (!dol_strlen($modele))
-	{
-		if (!empty($conf->global->ACTION_EVENT_ADDON_PDF))
-		{
+	if (!dol_strlen($modele)) {
+		if (!empty($conf->global->ACTION_EVENT_ADDON_PDF)) {
 			$modele = $conf->global->ACTION_EVENT_ADDON_PDF;
 		} else {
 			$modele = 'soleil';
@@ -92,8 +90,7 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $modele, 2);
-	if (!empty($tmp[1]))
-	{
+	if (!empty($tmp[1])) {
 		$modele = $tmp[0];
 		$srctemplatepath = $tmp[1];
 	}
@@ -101,28 +98,28 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
-		foreach (array('doc', 'pdf') as $prefix)
-		{
+	if (is_array($conf->modules_parts['models'])) {
+		$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	}
+	foreach ($dirmodels as $reldir) {
+		foreach (array('doc', 'pdf') as $prefix) {
 			$file = $prefix."_".$modele.".modules.php";
 
 			// On verifie l'emplacement du modele
 			$file = dol_buildpath($reldir."core/modules/action/doc/".$file, 0);
-			if (file_exists($file))
-			{
+			if (file_exists($file)) {
 				$filefound = 1;
 				$classname = $prefix.'_'.$modele;
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+			break;
+		}
 	}
 
 	// Charge le modele
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$obj = new $classname($db);
@@ -130,8 +127,7 @@ function action_create($db, $object, $modele, $outputlangs, $hidedetails = 0, $h
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output = $outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) {
 			$outputlangs->charset_output = $sav_charset_output;
 
 			// We delete old preview
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 43df3d227b9..8b80492685d 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -57,11 +57,11 @@ class CommActionRapport
 
 	public $marge_gauche;
 
-	public	$marge_droite;
+	public $marge_droite;
 
-	public	$marge_haute;
+	public $marge_haute;
 
-	public	$marge_basse;
+	public $marge_basse;
 
 
 	/**
@@ -113,9 +113,13 @@ class CommActionRapport
 		// phpcs:enable
 		global $user, $conf, $langs, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
@@ -123,20 +127,16 @@ class CommActionRapport
 		$dir = $conf->agenda->dir_temp."/";
 		$file = $dir."actions-".$this->month."-".$this->year.".pdf";
 
-		if (!file_exists($dir))
-		{
-			if (dol_mkdir($dir) < 0)
-			{
+		if (!file_exists($dir)) {
+			if (dol_mkdir($dir) < 0) {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 
-		if (file_exists($dir))
-		{
+		if (file_exists($dir)) {
 			// Add pdfgeneration hook
-			if (!is_object($hookmanager))
-			{
+			if (!is_object($hookmanager)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 				$hookmanager = new HookManager($this->db);
 			}
@@ -154,8 +154,7 @@ class CommActionRapport
 			$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
 			$pdf->SetAutoPageBreak(1, 0);
 
-			if (class_exists('TCPDF'))
-			{
+			if (class_exists('TCPDF')) {
 				$pdf->setPrintHeader(false);
 				$pdf->setPrintFooter(false);
 			}
@@ -176,14 +175,15 @@ class CommActionRapport
 
 			$nbpage = $this->_pages($pdf, $outputlangs); // Write content
 
-			if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+			if (method_exists($pdf, 'AliasNbPages')) {
+				$pdf->AliasNbPages();
+			}
 			$pdf->Close();
 
 			$pdf->Output($file, 'F');
 
 			// Add pdfgeneration hook
-			if (!is_object($hookmanager))
-			{
+			if (!is_object($hookmanager)) {
 				include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 				$hookmanager = new HookManager($this->db);
 			}
@@ -191,14 +191,14 @@ class CommActionRapport
 			$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 			global $action;
 			$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0)
-			{
+			if ($reshook < 0) {
 				$this->error = $hookmanager->error;
 				$this->errors = $hookmanager->errors;
 			}
 
-			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));
+			}
 
 			$this->result = array('fullpath'=>$file);
 
@@ -242,14 +242,12 @@ class CommActionRapport
 
 		dol_syslog(get_class($this)."::_page", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			$y0 = $y1 = $y2 = $y3 = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$eventstatic->id = $obj->id;
@@ -260,14 +258,15 @@ class CommActionRapport
 
 				// Calculate height of text
 				$text = '';
-				if (!preg_match('/^'.preg_quote($obj->label, '/').'/', $obj->note)) $text = $obj->label."\n";
+				if (!preg_match('/^'.preg_quote($obj->label, '/').'/', $obj->note)) {
+					$text = $obj->label."\n";
+				}
 				$text .= dolGetFirstLineOfText(dol_string_nohtmltag($obj->note), 2);
 				// Add status to text
 				$text .= "\n";
 				$status = $outputlangs->trans("Status").': '.dol_htmlentitiesbr_decode($eventstatic->getLibStatut(1, 1));
 				$text .= $status;
-				if ($obj->fk_project > 0)
-				{
+				if ($obj->fk_project > 0) {
 					$projectstatic->fetch($obj->fk_project);
 					if ($projectstatic->ref) {
 						$text .= ($status ? ' - ' : '').$outputlangs->transnoentitiesnoconv("Project").": ".dol_htmlentitiesbr_decode($projectstatic->ref);
@@ -279,8 +278,7 @@ class CommActionRapport
 
 				$heightlinemax = max(2 * $height, $nboflines * $height);
 				// Check if there is enough space to print record
-				if ((1 + $y + $heightlinemax) >= ($this->page_hauteur - $this->marge_haute))
-				{
+				if ((1 + $y + $heightlinemax) >= ($this->page_hauteur - $this->marge_haute)) {
 					// We need to break page
 					$pagenb++;
 					$y = $this->_pagehead($pdf, $outputlangs, $pagenb);
@@ -293,9 +291,11 @@ class CommActionRapport
 				$pdf->SetXY($this->marge_gauche, $y);
 				$textdate = dol_print_date($this->db->jdate($obj->dp), "day")."\n".dol_print_date($this->db->jdate($obj->dp), "hour");
 				if ($obj->dp2) {
-					if (dol_print_date($this->db->jdate($obj->dp), "day") != dol_print_date($this->db->jdate($obj->dp2), "day"))
+					if (dol_print_date($this->db->jdate($obj->dp), "day") != dol_print_date($this->db->jdate($obj->dp2), "day")) {
 						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "day")." - ".dol_print_date($this->db->jdate($obj->dp2), "hour");
-					else $textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					} else {
+						$textdate .= " -> ".dol_print_date($this->db->jdate($obj->dp2), "hour");
+					}
 				}
 				$textdate = $outputlangs->trans("ID").' '.$obj->id.' - '.$textdate;
 				$pdf->MultiCell(45 - $this->marge_gauche, $height, $textdate, 0, 'L', 0);
@@ -308,10 +308,13 @@ class CommActionRapport
 
 				// Action code
 				$code = $obj->code;
-				if (empty($conf->global->AGENDA_USE_EVENT_TYPE))
-				{
-					if ($code == 'AC_OTH')      $code = 'AC_MANUAL';
-					if ($code == 'AC_OTH_AUTO') $code = 'AC_AUTO';
+				if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
+					if ($code == 'AC_OTH') {
+						$code = 'AC_MANUAL';
+					}
+					if ($code == 'AC_OTH_AUTO') {
+						$code = 'AC_AUTO';
+					}
 				}
 				$pdf->SetXY(73, $y);
 				$labelactiontype = $outputlangs->transnoentitiesnoconv("Action".$code);
@@ -354,8 +357,7 @@ class CommActionRapport
 		$pdf->SetXY($this->marge_gauche, $this->marge_haute);
 		$pdf->MultiCell(120, 1, $outputlangs->convToOutputCharset($this->title), 0, 'L', 0);
 		// Show page nb only on iso languages (so default Helvetica font)
-		if (pdf_getPDFFont($outputlangs) == 'Helvetica')
-		{
+		if (pdf_getPDFFont($outputlangs) == 'Helvetica') {
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - 40, $this->marge_haute);
 			$pdf->MultiCell(40, 1, $pagenb.'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
 		}
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index e4531140f8f..1bbf2e14cc0 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -78,7 +78,9 @@ class pdf_ban extends ModeleBankAccountDoc
 
 		// Retrieves transmitter
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define column position
 		$this->posxref = $this->marge_gauche + 1;
@@ -102,15 +104,18 @@ class pdf_ban extends ModeleBankAccountDoc
 		// phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->bank->dir_output)
-		{
+		if ($conf->bank->dir_output) {
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
 			// Definition of $dir and $file
@@ -123,20 +128,16 @@ class pdf_ban extends ModeleBankAccountDoc
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -150,11 +151,12 @@ class pdf_ban extends ModeleBankAccountDoc
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
@@ -169,7 +171,9 @@ class pdf_ban extends ModeleBankAccountDoc
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("BAN"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
@@ -187,8 +191,7 @@ class pdf_ban extends ModeleBankAccountDoc
 				$tab_height_newpage = 210;
 
 				// Affiche notes
-				if (!empty($object->note_public))
-				{
+				if (!empty($object->note_public)) {
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->writeHTMLCell(190, 3, $this->posxref - 1, $tab_top - 2, dol_htmlentitiesbr($object->note_public), 0, 1);
 					$nexY = $pdf->GetY();
@@ -214,8 +217,7 @@ class pdf_ban extends ModeleBankAccountDoc
 
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -227,15 +229,16 @@ class pdf_ban extends ModeleBankAccountDoc
 				 * Footer of the page
 				 */
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
 				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -243,14 +246,14 @@ class pdf_ban extends ModeleBankAccountDoc
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -316,10 +319,8 @@ class pdf_ban extends ModeleBankAccountDoc
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($mysoc->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -328,7 +329,9 @@ class pdf_ban extends ModeleBankAccountDoc
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else {
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -351,25 +354,25 @@ class pdf_ban extends ModeleBankAccountDoc
 		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
 		$object->fetchObjectLinked();
 
-	    foreach($object->linkedObjects as $objecttype => $objects)
-	    {
-	        var_dump($objects);exit;
-	    	if ($objecttype == 'commande')
-	    	{
-	    		$outputlangs->load('orders');
-	    		$num=count($objects);
-	    		for ($i=0;$i<$num;$i++)
-	    		{
-	    			$posy+=4;
-	    			$pdf->SetXY($posx,$posy);
-	    			$pdf->SetFont('','', $default_font_size - 1);
-	    			$text=$objects[$i]->ref;
-	    			if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')';
-	    			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
-	    		}
-	    	}
-	    }
-        */
+		foreach($object->linkedObjects as $objecttype => $objects)
+		{
+			var_dump($objects);exit;
+			if ($objecttype == 'commande')
+			{
+				$outputlangs->load('orders');
+				$num=count($objects);
+				for ($i=0;$i<$num;$i++)
+				{
+					$posy+=4;
+					$pdf->SetXY($posx,$posy);
+					$pdf->SetFont('','', $default_font_size - 1);
+					$text=$objects[$i]->ref;
+					if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')';
+					$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
+				}
+			}
+		}
+		*/
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index a07592d339a..f1ebc5bf64f 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -81,7 +81,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 		// Retrieves transmitter
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define column position
 		$this->posxref = $this->marge_gauche;
@@ -106,44 +108,48 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		// phpcs:enable
 		global $conf, $hookmanager, $langs, $user, $mysoc;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "withdrawals", "companies", "projects", "bills"));
 
-		if (!empty($conf->bank->dir_output))
-		{
+		if (!empty($conf->bank->dir_output)) {
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
-				if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
-				else $dir = $conf->bank->dir_output;
+			if ($object->specimen) {
+				if (!empty($moreparams['force_dir_output'])) {
+					$dir = $moreparams['force_dir_output'];
+				} else {
+					$dir = $conf->bank->dir_output;
+				}
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
-				if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
-				else $dir = $conf->bank->dir_output."/".$objectref;
+				if (!empty($moreparams['force_dir_output'])) {
+					$dir = $moreparams['force_dir_output'];
+				} else {
+					$dir = $conf->bank->dir_output."/".$objectref;
+				}
 				$file = $dir."/".$langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref."-".dol_sanitizeFileName($object->rum).".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -157,11 +163,12 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
@@ -176,7 +183,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("SepaMandate"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
@@ -194,8 +203,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$tab_height_newpage = 210;
 
 				// Show notes
-				if (!empty($object->note_public))
-				{
+				if (!empty($object->note_public)) {
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->writeHTMLCell(190, 3, $this->posxref, $tab_top - 2, dol_htmlentitiesbr($object->note_public), 0, 1);
 					$nexY = $pdf->GetY();
@@ -229,7 +237,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$posY += 2;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$ics = '';
-				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;
+				if (!empty($conf->global->PRELEVEMENT_ICS)) {
+					$ics = $conf->global->PRELEVEMENT_ICS;
+				}
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").') : '.$ics, 0, 'L');
 
 				$posY = $pdf->GetY();
@@ -266,11 +276,12 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFillForm"), 0, 'C');
 
 				$thirdparty = new Societe($this->db);
-				if ($object->socid > 0) $thirdparty->fetch($object->socid);
+				if ($object->socid > 0) {
+					$thirdparty->fetch($object->socid);
+				}
 
 				$sepaname = '______________________________________________';
-				if ($thirdparty->id > 0)
-				{
+				if ($thirdparty->id > 0) {
 					$sepaname = $thirdparty->name.($object->account_owner ? ' ('.$object->account_owner.')' : '');
 				}
 				$posY = $pdf->GetY();
@@ -281,7 +292,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $sepaname, 0, 'L');
 
 				$sepavatid = '__________________________________________________';
-				if (!empty($thirdparty->idprof1)) $sepavatid = $thirdparty->idprof1;
+				if (!empty($thirdparty->idprof1)) {
+					$sepavatid = $thirdparty->idprof1;
+				}
 				$posY = $pdf->GetY();
 				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
@@ -290,8 +303,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $sepavatid, 0, 'L');
 
 				$address = '______________________________________________';
-				if ($thirdparty->id > 0)
-				{
+				if ($thirdparty->id > 0) {
 					$address = $thirdparty->getFullAddress();
 				}
 				$posY = $pdf->GetY();
@@ -300,15 +312,16 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("Address").' : ', 0, 'L');
 				$pdf->SetXY(80, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
-				if (preg_match('/_____/', $address))
-				{
+				if (preg_match('/_____/', $address)) {
 					$posY += 6;
 					$pdf->SetXY(80, $posY);
 					$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
 				}
 
 				$ban = '__________________________________________________';
-				if (!empty($object->iban)) $ban = $object->iban;
+				if (!empty($object->iban)) {
+					$ban = $object->iban;
+				}
 				$posY = $pdf->GetY();
 				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
@@ -317,7 +330,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $ban, 0, 'L');
 
 				$bic = '__________________________________________________';
-				if (!empty($object->bic)) $bic = $object->bic;
+				if (!empty($object->bic)) {
+					$bic = $object->bic;
+				}
 				$posY = $pdf->GetY();
 				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
@@ -333,19 +348,22 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'RECUR') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				if ($object->frstrecur == 'RECUR') {
+					$pdf->MultiCell(5, 3, 'X', 0, 'L');
+				}
 				$pdf->SetXY(86, $posY);
 				$txt = $langs->transnoentitiesnoconv("ModeRECUR").'  '.$langs->transnoentitiesnoconv("or");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				$posY += 6;
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				if ($object->frstrecur == 'FRST') {
+					$pdf->MultiCell(5, 3, 'X', 0, 'L');
+				}
 				$pdf->SetXY(86, $posY);
 				$txt = $langs->transnoentitiesnoconv("ModeFRST");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
-				if (empty($object->frstrecur))
-				{
+				if (empty($object->frstrecur)) {
 					$posY += 6;
 					$pdf->SetXY(80, $posY);
 					$txt = '('.$langs->transnoentitiesnoconv("PleaseCheckOne").')';
@@ -359,8 +377,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -381,15 +398,16 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				 * Footer of the page
 				 */
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
 				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -397,14 +415,14 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -552,10 +570,8 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($mysoc->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -564,7 +580,9 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else {
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -576,10 +594,11 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$daterum = '__________________';
-		if (!empty($object->date_rum))
-		{
+		if (!empty($object->date_rum)) {
 			$daterum = dol_print_date($object->date_rum, 'day', false, $outputlangs, true);
-		} else $daterum = dol_print_date($object->datec, 'day', false, $outputlangs, true); // For old record, the date_rum was not saved.
+		} else {
+			$daterum = dol_print_date($object->datec, 'day', false, $outputlangs, true); // For old record, the date_rum was not saved.
+		}
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".$daterum, '', 'R');
 		/*$posy+=6;
 		$pdf->SetXY($posx,$posy);
@@ -592,25 +611,25 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
 		$object->fetchObjectLinked();
 
-	    foreach($object->linkedObjects as $objecttype => $objects)
-	    {
-	        var_dump($objects);exit;
-	    	if ($objecttype == 'commande')
-	    	{
-	    		$outputlangs->load('orders');
-	    		$num=count($objects);
-	    		for ($i=0;$i<$num;$i++)
-	    		{
-	    			$posy+=4;
-	    			$pdf->SetXY($posx,$posy);
-	    			$pdf->SetFont('','', $default_font_size - 1);
-	    			$text=$objects[$i]->ref;
-	    			if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')';
-	    			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
-	    		}
-	    	}
-	    }
-        */
+		foreach($object->linkedObjects as $objecttype => $objects)
+		{
+			var_dump($objects);exit;
+			if ($objecttype == 'commande')
+			{
+				$outputlangs->load('orders');
+				$num=count($objects);
+				for ($i=0;$i<$num;$i++)
+				{
+					$posy+=4;
+					$pdf->SetXY($posx,$posy);
+					$pdf->SetFont('','', $default_font_size - 1);
+					$text=$objects[$i]->ref;
+					if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')';
+					$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
+				}
+			}
+		}
+		*/
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index 34ebc518e56..27e90e94ba1 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -96,15 +96,27 @@ class modPhpbarcode extends ModeleBarCode
 		//print 'genbarcode_loc='.$genbarcode_loc.' encoding='.$encoding;exit;
 
 		$supported = 0;
-		if ($encoding == 'EAN13') $supported = 1;
-		if ($encoding == 'ISBN')  $supported = 1;
+		if ($encoding == 'EAN13') {
+			$supported = 1;
+		}
+		if ($encoding == 'ISBN') {
+			$supported = 1;
+		}
 		// Formats that hangs on Windows (when genbarcode.exe for Windows is called, so they are not
 		// activated on Windows)
 		if (file_exists($genbarcode_loc) && empty($_SERVER["WINDIR"])) {
-			if ($encoding == 'EAN8')  $supported = 1;
-			if ($encoding == 'UPC')   $supported = 1;
-			if ($encoding == 'C39')   $supported = 1;
-			if ($encoding == 'C128')  $supported = 1;
+			if ($encoding == 'EAN8') {
+				$supported = 1;
+			}
+			if ($encoding == 'UPC') {
+				$supported = 1;
+			}
+			if ($encoding == 'C39') {
+				$supported = 1;
+			}
+			if ($encoding == 'C128') {
+				$supported = 1;
+			}
 		}
 		return $supported;
 	}
@@ -125,10 +137,16 @@ class modPhpbarcode extends ModeleBarCode
 		global $conf;
 		global $genbarcode_loc, $bar_color, $bg_color, $text_color, $font_loc;
 
-		if (!$this->encodingIsSupported($encoding)) return -1;
+		if (!$this->encodingIsSupported($encoding)) {
+			return -1;
+		}
 
-		if ($encoding == 'EAN8' || $encoding == 'EAN13') $encoding = 'EAN';
-		if ($encoding == 'C39' || $encoding == 'C128')   $encoding = substr($encoding, 1);
+		if ($encoding == 'EAN8' || $encoding == 'EAN13') {
+			$encoding = 'EAN';
+		}
+		if ($encoding == 'C39' || $encoding == 'C128') {
+			$encoding = substr($encoding, 1);
+		}
 
 		$mode = 'png';
 
@@ -138,12 +156,15 @@ class modPhpbarcode extends ModeleBarCode
 		$_GET["mode"] = $mode;
 
 		dol_syslog(get_class($this)."::buildBarCode $code,$encoding,$scale,$mode");
-		if ($code) $result = barcode_print($code, $encoding, $scale, $mode);
+		if ($code) {
+			$result = barcode_print($code, $encoding, $scale, $mode);
+		}
 
-		if (!is_array($result))
-		{
+		if (!is_array($result)) {
 			$this->error = $result;
-			if (empty($nooutputiferror)) print $this->error;
+			if (empty($nooutputiferror)) {
+				print $this->error;
+			}
 			return -1;
 		}
 
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index d13fe589883..90b7cd4f543 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -110,7 +110,9 @@ class modTcpdfbarcode extends ModeleBarCode
 		global $_GET;
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
-		if (empty($tcpdfEncoding)) return -1;
+		if (empty($tcpdfEncoding)) {
+			return -1;
+		}
 
 		$color = array(0, 0, 0);
 
@@ -159,7 +161,9 @@ class modTcpdfbarcode extends ModeleBarCode
 		$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
-		if (empty($tcpdfEncoding)) return -1;
+		if (empty($tcpdfEncoding)) {
+			return -1;
+		}
 
 		$color = array(0, 0, 0);
 
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index c09239a8d68..944a285b341 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -128,49 +128,46 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	public function getExample($langs, $objproduct = 0)
 	{
 		$examplebarcode = $this->getNextValue($objproduct, '');
-		if (!$examplebarcode)
-		{
+		if (!$examplebarcode) {
 			$examplebarcode = $langs->trans('NotConfigured');
 		}
-		if ($examplebarcode == "ErrorBadMask")
-		{
+		if ($examplebarcode == "ErrorBadMask") {
 			$langs->load("errors");
 			$examplebarcode = $langs->trans($examplebarcode);
 		}
 
 		return $examplebarcode;
 	}
-    /**
-     *  Return literal barcode type code from numerical rowid type of barcode
-     *
+	/**
+	 *  Return literal barcode type code from numerical rowid type of barcode
+	 *
 	 *	@param	Database    $db         Database
-     *  @param  int  		$type       Type of barcode (EAN, ISBN, ...) as rowid
-     *  @return string
-     */
-    public function literalBarcodeType($db, $type = '')
-    {
-        global $conf;
-        $out = '';
+	 *  @param  int  		$type       Type of barcode (EAN, ISBN, ...) as rowid
+	 *  @return string
+	 */
+	public function literalBarcodeType($db, $type = '')
+	{
+		global $conf;
+		$out = '';
 
-        $sql = "SELECT rowid, code, libelle as label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
-        $sql .= " WHERE rowid = '".$db->escape($type)."'";
-        $sql .= " AND entity = ".((int) $conf->entity);
-        $result = $db->query($sql);
-        if ($result) {
-            $num = $db->num_rows($result);
+		$sql = "SELECT rowid, code, libelle as label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+		$sql .= " WHERE rowid = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".((int) $conf->entity);
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
 
-            if ($num > 0) {
-                $obj = $db->fetch_object($result);
-                $out .= $obj->label; //take the label corresponding to the type rowid in the database
-            }
-        }
-        else {
-            dol_print_error($db);
-        }
+			if ($num > 0) {
+				$obj = $db->fetch_object($result);
+				$out .= $obj->label; //take the label corresponding to the type rowid in the database
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 	/**
 	 * Return next value
 	 *
@@ -193,10 +190,11 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 
 		// Get Mask value
 		$mask = '';
-		if (!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) $mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		if (!empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) {
+			$mask = $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
+		}
 
-		if (empty($mask))
-		{
+		if (empty($mask)) {
 			$this->error = 'NotConfigured';
 			return '';
 		}
@@ -207,16 +205,13 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 
 		$numFinal = get_next_value($db, $mask, 'product', $field, $where, '', $now);
 		//Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last  character (* or ?) used in the mask by the key
-		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
-		{
+		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
 			$literaltype = '';
 			$literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type
-			switch ($literaltype)
-			{
+			switch ($literaltype) {
 				case 'EAN13': //EAN13 rowid = 2
-					if (strlen($numFinal)==13)// be sure that the mask length is correct for EAN13
-					{
-							$ean = substr($numFinal, 0, 12); //take first 12 digits
+					if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13
+						$ean = substr($numFinal, 0, 12); //take first 12 digits
 							$eansum = barcode_gen_ean_sum($ean);
 							$ean .= $eansum; //substitute the las character by the key
 							$numFinal = $ean;
@@ -257,25 +252,20 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))
-		{
+		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)) {
 			$result = 0;
-		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK)))
-		{
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK))) {
 			$result = -2;
 		} else {
-			if ($this->verif_syntax($code, $type) >= 0)
-			{
+			if ($this->verif_syntax($code, $type) >= 0) {
 				$is_dispo = $this->verif_dispo($db, $code, $product);
-				if ($is_dispo <> 0)
-				{
+				if ($is_dispo <> 0) {
 					$result = -3;
 				} else {
 					$result = 0;
 				}
 			} else {
-				if (dol_strlen($code) == 0)
-				{
+				if (dol_strlen($code) == 0) {
 					$result = -2;
 				} else {
 					$result = -1;
@@ -302,13 +292,13 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		// phpcs:enable
 		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE barcode = '".$db->escape($code)."'";
-		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
+		if ($product->id > 0) {
+			$sql .= " AND rowid <> ".$product->id;
+		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
+		if ($resql) {
+			if ($db->num_rows($resql) == 0) {
 				return 0;
 			} else {
 				return -1;
@@ -335,8 +325,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 
 		// Get Mask value
 		$mask = empty($conf->global->BARCODE_STANDARD_PRODUCT_MASK) ? '' : $conf->global->BARCODE_STANDARD_PRODUCT_MASK;
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return -1;
 		}
@@ -346,18 +335,17 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		$newcodefortest = $codefortest;
 
 		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
-		if (in_array($typefortest, array('EAN13', 'ISBN')))	// We remove the CRC char not included into mask
-		{
-			if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg))
-			{
-				if (strlen($reg[1]) == 12) $newcodefortest = substr($newcodefortest, 0, 12);
+		if (in_array($typefortest, array('EAN13', 'ISBN'))) {	// We remove the CRC char not included into mask
+			if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg)) {
+				if (strlen($reg[1]) == 12) {
+					$newcodefortest = substr($newcodefortest, 0, 12);
+				}
 				dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
 			}
 		}
 
 		$result = check_value($mask, $newcodefortest);
-		if (is_string($result))
-		{
+		if (is_string($result)) {
 			$this->error = $result;
 			return -1;
 		}
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index 01e532a7e29..99fc8ed366d 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -111,10 +111,18 @@ abstract class ModeleNumRefBarCode
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 
@@ -135,43 +143,56 @@ abstract class ModeleNumRefBarCode
 		$s = '';
 		$s .= $langs->trans("Name").': <b>'.$this->name.'</b><br>';
 		$s .= $langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
-		if ($type != -1) $s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+		if ($type != -1) {
+			$s .= $langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
+		}
 		$s .= '<br>';
 		$s .= '<u>'.$langs->trans("ThisIsModuleRules").':</u><br>';
-		if ($type == 0)
-		{
+		if ($type == 0) {
 			$s .= $langs->trans("RequiredIfProduct").': ';
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+				$s .= '<strike>';
+			}
 			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+				$s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			}
 			$s .= '<br>';
 		}
-		if ($type == 1)
-		{
+		if ($type == 1) {
 			$s .= $langs->trans("RequiredIfService").': ';
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+				$s .= '<strike>';
+			}
 			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+				$s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			}
 			$s .= '<br>';
 		}
-		if ($type == -1)
-		{
+		if ($type == -1) {
 			$s .= $langs->trans("Required").': ';
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '<strike>';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+				$s .= '<strike>';
+			}
 			$s .= yn(!$this->code_null, 1, 2);
-			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) $s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			if (!empty($conf->global->MAIN_BARCODE_CODE_ALWAYS_REQUIRED) && !empty($this->code_null)) {
+				$s .= '</strike> '.yn(1, 1, 2).' ('.$langs->trans("ForcedToByAModule", $langs->transnoentities("yes")).')';
+			}
 			$s .= '<br>';
 		}
 		/*$s.=$langs->trans("CanBeModifiedIfOk").': ';
-        $s.=yn($this->code_modifiable,1,2);
-        $s.='<br>';
-        $s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide,1,2).'<br>';
-        */
+		$s.=yn($this->code_modifiable,1,2);
+		$s.='<br>';
+		$s.=$langs->trans("CanBeModifiedIfKo").': '.yn($this->code_modifiable_invalide,1,2).'<br>';
+		*/
 		$s .= $langs->trans("AutomaticCode").': '.yn($this->code_auto, 1, 2).'<br>';
 		$s .= '<br>';
 
 		$nextval = $this->getNextValue($soc, '');
-		if (empty($nextval)) $nextval = $langs->trans("Undefined");
+		if (empty($nextval)) {
+			$nextval = $langs->trans("Undefined");
+		}
 		$s .= $langs->trans("NextValue").': <b>'.$nextval.'</b><br>';
 
 		return $s;
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 18f2d405acf..af9207eb1c5 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -91,7 +91,9 @@ class doc_generic_bom_odt extends ModelePDFBom
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -122,17 +124,19 @@ class doc_generic_bom_odt extends ModelePDFBom
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->BOM_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -151,8 +155,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->BOM_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->BOM_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -160,14 +163,13 @@ class doc_generic_bom_odt extends ModelePDFBom
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
-   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=boms&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=boms&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
 		}
 
 		$texte .= '</td>';
@@ -200,37 +202,34 @@ class doc_generic_bom_odt extends ModelePDFBom
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->bom->dir_output)
-		{
+		if ($conf->bom->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Bom($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -240,20 +239,19 @@ class doc_generic_bom_odt extends ModelePDFBom
 
 			$dir = $conf->bom->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -263,10 +261,11 @@ class doc_generic_bom_odt extends ModelePDFBom
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -283,22 +282,20 @@ class doc_generic_bom_odt extends ModelePDFBom
 				// If CUSTOMER contact defined on order, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
+				if (!empty($usecontact)) {
 					// On peut utiliser le nom de la societe du contact
 					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-			   			// if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we dont use as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
@@ -317,8 +314,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'BOM_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -334,8 +330,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -350,8 +345,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
@@ -365,7 +359,9 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -374,19 +370,19 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -395,32 +391,26 @@ class doc_generic_bom_odt extends ModelePDFBom
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
+					if ($foundtagforlines) {
 						$linenumber = 0;
-						foreach ($object->lines as $line)
-						{
+						foreach ($object->lines as $line) {
 							$linenumber++;
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -428,8 +418,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -437,12 +426,10 @@ class doc_generic_bom_odt extends ModelePDFBom
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -474,8 +461,9 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php
index 53bd17f1b9d..71bd2788c82 100644
--- a/htdocs/core/modules/bom/mod_bom_advanced.php
+++ b/htdocs/core/modules/bom/mod_bom_advanced.php
@@ -98,18 +98,17 @@ class mod_bom_advanced extends ModeleNumRefboms
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$old_code_type = $mysoc->typent_code;
 		$mysoc->code_client = 'CCCCCCCCCC';
 		$mysoc->typent_code = 'TTTTTTTTTT';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -131,8 +130,7 @@ class mod_bom_advanced extends ModeleNumRefboms
 		// We get cursor rule
 		$mask = $conf->global->BOM_ADVANCED_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/bom/mod_bom_standard.php b/htdocs/core/modules/bom/mod_bom_standard.php
index 7d5486d5c41..dad731758f7 100644
--- a/htdocs/core/modules/bom/mod_bom_standard.php
+++ b/htdocs/core/modules/bom/mod_bom_standard.php
@@ -56,7 +56,7 @@ class mod_bom_standard extends ModeleNumRefboms
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -90,13 +90,13 @@ class mod_bom_standard extends ModeleNumRefboms
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -124,11 +124,13 @@ class mod_bom_standard extends ModeleNumRefboms
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_bom_standard::getNextValue", LOG_DEBUG);
 			return -1;
@@ -138,8 +140,11 @@ class mod_bom_standard extends ModeleNumRefboms
 		$date = $object->date_creation;
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_bom_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/bom/modules_bom.php b/htdocs/core/modules/bom/modules_bom.php
index 54d13971207..84182993756 100644
--- a/htdocs/core/modules/bom/modules_bom.php
+++ b/htdocs/core/modules/bom/modules_bom.php
@@ -142,10 +142,18 @@ abstract class ModeleNumRefBoms
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
index ee00a98b039..5855ec24e55 100644
--- a/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
+++ b/htdocs/core/modules/cheque/doc/pdf_blochet.class.php
@@ -70,7 +70,9 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 
 		// Retrieves transmitter
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define column position
 		$this->line_height = 5;
@@ -93,22 +95,24 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		// phpcs:enable
 		global $user, $conf, $langs, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		$sav_charset_output = $outputlangs->charset_output;
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "products", "compta"));
 
 		$dir = $_dir."/".get_exdir($number, 0, 1, 0, $object, 'checkdeposits');
 
-		if (!is_dir($dir))
-		{
+		if (!is_dir($dir)) {
 			$result = dol_mkdir($dir);
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
@@ -117,8 +121,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$file = $dir."/bordereau-".$number.".pdf";
 
 		// Add pdfgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
@@ -132,11 +135,12 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$heightforinfotot = 50; // Height reserved to output the info and total part
 		$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 		$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+			$heightforfooter += 6;
+		}
 		$pdf->SetAutoPageBreak(1, 0);
 
-		if (class_exists('TCPDF'))
-		{
+		if (class_exists('TCPDF')) {
 			$pdf->setPrintHeader(false);
 			$pdf->setPrintFooter(false);
 		}
@@ -151,7 +155,9 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->transnoentities("CheckReceipt")." ".$number);
-		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+			$pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
@@ -159,12 +165,10 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 
 		// Define nb of page
 		$pages = intval($nboflines / $this->line_per_page);
-		if (($nboflines % $this->line_per_page) > 0)
-		{
+		if (($nboflines % $this->line_per_page) > 0) {
 			$pages++;
 		}
-		if ($pages == 0)
-		{
+		if ($pages == 0) {
 			// force to build at least one page if report has no lines
 			$pages = 1;
 		}
@@ -177,15 +181,16 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 
 		// Pied de page
 		$this->_pagefoot($pdf, '', $outputlangs);
-		if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+		if (method_exists($pdf, 'AliasNbPages')) {
+			$pdf->AliasNbPages();
+		}
 
 		$pdf->Close();
 
 		$pdf->Output($file, 'F');
 
 		// Add pdfgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
@@ -193,14 +198,14 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 		global $action;
 		$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook < 0)
-		{
+		if ($reshook < 0) {
 			$this->error = $hookmanager->error;
 			$this->errors = $hookmanager->errors;
 		}
 
-		if (!empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		$this->result = array('fullpath'=>$file);
 
@@ -340,20 +345,21 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		$yp = 0;
 		$lineinpage = 0;
 		$num = count($this->lines);
-		for ($j = 0; $j < $num; $j++)
-		{
+		for ($j = 0; $j < $num; $j++) {
 			// Dynamic max line heigh calculation
 			$dynamic_line_height = array();
 			$dynamic_line_height[] = $pdf->getStringHeight(60, $outputlangs->convToOutputCharset($this->lines[$j]->bank_chq));
 			$dynamic_line_height[] = $pdf->getStringHeight(80, $outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq));
 			$max_line_height = max($dynamic_line_height);
 			// Calculate number of line used function of estimated line size
-			if ($max_line_height > $this->line_height) $nb_lines = floor($max_line_height / $this->line_height) + 1;
-			else $nb_lines = 1;
+			if ($max_line_height > $this->line_height) {
+				$nb_lines = floor($max_line_height / $this->line_height) + 1;
+			} else {
+				$nb_lines = 1;
+			}
 
 			// Add page break if we do not have space to add current line
-			if ($lineinpage >= ($this->line_per_page - 1))
-			{
+			if ($lineinpage >= ($this->line_per_page - 1)) {
 				$lineinpage = 0; $yp = 0;
 
 				// New page
@@ -407,8 +413,7 @@ class BordereauChequeBlochet extends ModeleChequeReceipts
 		complete_substitutions_array($substitutionarray, $outputlangs, $object);
 		$newfreetext = '';
 		$paramfreetext = 'BANK_CHEQUERECEIPT_FREE_TEXT';
-		if (!empty($conf->global->$paramfreetext))
-		{
+		if (!empty($conf->global->$paramfreetext)) {
 			$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 		}
 
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
index d03b597b4e0..6e9f03ad927 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_mint.php
@@ -53,7 +53,7 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -87,13 +87,13 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$payyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm))
-		{
+		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -121,11 +121,13 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -135,8 +137,11 @@ class mod_chequereceipt_mint extends ModeleNumRefChequeReceipts
 		$date = $object->date_bordereau;
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
index 6af1a89baca..36a2b30e6e0 100644
--- a/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
+++ b/htdocs/core/modules/cheque/mod_chequereceipt_thyme.php
@@ -96,11 +96,10 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 
 		$old_code_client = $mysoc->code_client;
 		$mysoc->code_client = 'CCCCCCCCCC';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -122,8 +121,7 @@ class mod_chequereceipt_thyme extends ModeleNumRefChequeReceipts
 		// We get cursor rule
 		$mask = $conf->global->CHEQUERECEIPTS_THYME_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/cheque/modules_chequereceipts.php b/htdocs/core/modules/cheque/modules_chequereceipts.php
index bc552aec070..dfdf0fbe363 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -109,10 +109,18 @@ abstract class ModeleNumRefChequeReceipts
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
@@ -173,10 +181,8 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/cheque/doc/";
 
 	// Positionne modele sur le nom du modele a utiliser
-	if (!dol_strlen($modele))
-	{
-		if (!empty($conf->global->CHEQUERECEIPT_ADDON_PDF))
-		{
+	if (!dol_strlen($modele)) {
+		if (!empty($conf->global->CHEQUERECEIPT_ADDON_PDF)) {
 			$modele = $conf->global->CHEQUERECEIPT_ADDON_PDF;
 		} else {
 			//print $langs->trans("Error")." ".$langs->trans("Error_FACTURE_ADDON_PDF_NotDefined");
@@ -187,8 +193,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 
 	// Charge le modele
 	$file = "pdf_".$modele.".modules.php";
-	if (file_exists($dir.$file))
-	{
+	if (file_exists($dir.$file)) {
 		$classname = "pdf_".$modele;
 		require_once $dir.$file;
 
@@ -197,8 +202,7 @@ function chequereceipt_pdf_create($db, $id, $message, $modele, $outputlangs)
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output = $outputlangs->charset_output;
-		if ($obj->write_file($id, $outputlangs) > 0)
-		{
+		if ($obj->write_file($id, $outputlangs) > 0) {
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		} else {
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 45ea3dc6816..1138801a078 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -98,7 +98,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -129,17 +131,19 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->COMMANDE_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -158,8 +162,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->COMMANDE_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->COMMANDE_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -167,14 +170,13 @@ class doc_generic_order_odt extends ModelePDFCommandes
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
-			foreach ($listoffiles as $file)    				{
+			foreach ($listoffiles as $file) {
 				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+			}
+			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
@@ -212,37 +214,34 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->commande->dir_output)
-		{
+		if ($conf->commande->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Commande($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -252,20 +251,19 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 			$dir = $conf->commande->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -275,10 +273,11 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -295,16 +294,14 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				// If CUSTOMER contact defined on order, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
+				if (!empty($usecontact)) {
 					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
@@ -332,8 +329,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'ORDER_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -349,8 +345,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -365,8 +360,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
@@ -380,7 +374,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -389,19 +385,19 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -410,32 +406,26 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
+					if ($foundtagforlines) {
 						$linenumber = 0;
-						foreach ($object->lines as $line)
-						{
+						foreach ($object->lines as $line) {
 							$linenumber++;
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -443,8 +433,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -452,12 +441,10 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -489,8 +476,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 8d17f9759fb..ffd18c77cc6 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -167,12 +167,13 @@ class pdf_einstein extends ModelePDFCommandes
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->posxtva = 101;
 			$this->posxup = 118;
 			$this->posxqty = 135;
@@ -185,10 +186,11 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva = $this->posxup;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->posxtva = $this->posxup;
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
@@ -222,9 +224,13 @@ class pdf_einstein extends ModelePDFCommandes
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
@@ -239,15 +245,13 @@ class pdf_einstein extends ModelePDFCommandes
 
 		$nblines = count($object->lines);
 
-		if ($conf->commande->multidir_output[$conf->entity])
-		{
+		if ($conf->commande->multidir_output[$conf->entity]) {
 			$object->fetch_thirdparty();
 
 			$deja_regle = 0;
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -256,20 +260,16 @@ class pdf_einstein extends ModelePDFCommandes
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -286,17 +286,17 @@ class pdf_einstein extends ModelePDFCommandes
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -310,20 +310,19 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfOrderTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
-				if (empty($this->atleastonediscount))
-				{
+				if (empty($this->atleastonediscount)) {
 					$delta = ($this->postotalht - $this->posxdiscount);
 					$this->posxpicture += $delta;
 					$this->posxtva += $delta;
@@ -336,7 +335,9 @@ class pdf_einstein extends ModelePDFCommandes
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, (is_object($outputlangsbis) ? $outputlangsbis : null));
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -349,11 +350,9 @@ class pdf_einstein extends ModelePDFCommandes
 
 				// Incoterm
 				$height_incoterms = 0;
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -371,15 +370,15 @@ class pdf_einstein extends ModelePDFCommandes
 
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 				// Extrafields in note
@@ -388,8 +387,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_top -= 2;
 
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
@@ -414,8 +412,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
@@ -432,8 +429,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->startTransaction();
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -441,21 +437,25 @@ class pdf_einstein extends ModelePDFCommandes
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -478,8 +478,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-					{
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva - 5, $curY);
 						$pdf->MultiCell($this->posxup - $this->posxtva + 4, 3, $vat_rate, 0, 'R');
@@ -496,8 +495,7 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS))
-					{
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -505,8 +503,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 					// Discount on line
 					$pdf->SetXY($this->posxdiscount, $curY);
-					if ($object->lines[$i]->remise_percent)
-					{
+					if ($object->lines[$i]->remise_percent) {
 						$pdf->SetXY($this->posxdiscount - 2, $curY);
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht - $this->posxdiscount + 2, 3, $remise_percent, 0, 'R');
@@ -518,8 +515,11 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collection of totals by value of vat in $this->vat["rate"] = total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
@@ -528,34 +528,44 @@ class pdf_einstein extends ModelePDFCommandes
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
+					if ($localtax1_type && $localtax1ligne != 0) {
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -566,11 +576,9 @@ class pdf_einstein extends ModelePDFCommandes
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -579,12 +587,12 @@ class pdf_einstein extends ModelePDFCommandes
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -592,9 +600,13 @@ class pdf_einstein extends ModelePDFCommandes
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -622,7 +634,9 @@ class pdf_einstein extends ModelePDFCommandes
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -633,14 +647,14 @@ class pdf_einstein extends ModelePDFCommandes
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -691,8 +705,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
-		{
+		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@@ -703,8 +716,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$posxval = 52;
 
 		// Show payments conditions
-		if ($object->cond_reglement_code || $object->cond_reglement)
-		{
+		if ($object->cond_reglement_code || $object->cond_reglement) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -722,33 +734,32 @@ class pdf_einstein extends ModelePDFCommandes
 		// Check a payment mode is defined
 		/* Not used with orders
 		if (empty($object->mode_reglement_code)
-        	&& ! $conf->global->FACTURE_CHQ_NUMBER
-        	&& ! $conf->global->FACTURE_RIB_NUMBER)
+			&& ! $conf->global->FACTURE_CHQ_NUMBER
+			&& ! $conf->global->FACTURE_RIB_NUMBER)
 		{
-            $pdf->SetXY($this->marge_gauche, $posy);
-            $pdf->SetTextColor(200,0,0);
-            $pdf->SetFont('','B', $default_font_size - 2);
-            $pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
-            $pdf->SetTextColor(0,0,0);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$pdf->SetTextColor(200,0,0);
+			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
+			$pdf->SetTextColor(0,0,0);
 
-            $posy=$pdf->GetY()+1;
-        }
+			$posy=$pdf->GetY()+1;
+		}
 		*/
 		/* TODO
 		else if (! empty($object->availability_code))
 		{
-            $pdf->SetXY($this->marge_gauche, $posy);
-            $pdf->SetTextColor(200,0,0);
-            $pdf->SetFont('','B', $default_font_size - 2);
-            $pdf->MultiCell(80, 3, $outputlangs->transnoentities("AvailabilityPeriod").': '.,0,'L',0);
-            $pdf->SetTextColor(0,0,0);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$pdf->SetTextColor(200,0,0);
+			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->MultiCell(80, 3, $outputlangs->transnoentities("AvailabilityPeriod").': '.,0,'L',0);
+			$pdf->SetTextColor(0,0,0);
 
-            $posy=$pdf->GetY()+1;
+			$posy=$pdf->GetY()+1;
 		}*/
 
 		// Show planed date of delivery
-		if (!empty($object->delivery_date))
-		{
+		if (!empty($object->delivery_date)) {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -779,7 +790,7 @@ class pdf_einstein extends ModelePDFCommandes
 		// Show payment mode
 		if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
-		   	&& $object->mode_reglement_code != 'VIR') {
+			&& $object->mode_reglement_code != 'VIR') {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentMode").':';
@@ -794,15 +805,12 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 
 		// Show payment mode CHQ
-		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-		{
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 			// Si mode reglement non force ou si force a CHQ
-			if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-			{
+			if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
 				$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-				if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-				{
+				if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
 					$account = new Account($this->db);
 					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
@@ -811,23 +819,20 @@ class pdf_einstein extends ModelePDFCommandes
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 					$posy = $pdf->GetY() + 1;
 
-					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-					{
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 						$posy = $pdf->GetY() + 2;
 					}
 				}
-				if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-				{
+				if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 					$posy = $pdf->GetY() + 1;
 
-					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-					{
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -838,12 +843,12 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 
 		// If payment mode not forced or forced to VIR, show payment with BAN
-		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-		{
-			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
-			{
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
 				$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-				if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				if ($object->fk_bank > 0) {
+					$bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				}
 				$account = new Account($this->db);
 				$account->fetch($bankid);
 
@@ -892,8 +897,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 		// Total table
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -916,31 +920,27 @@ class pdf_einstein extends ModelePDFCommandes
 		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -954,25 +954,23 @@ class pdf_einstein extends ModelePDFCommandes
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -988,18 +986,15 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 				//}
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($this->tva as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1016,22 +1011,20 @@ class pdf_einstein extends ModelePDFCommandes
 				//Local tax 1 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1045,27 +1038,25 @@ class pdf_einstein extends ModelePDFCommandes
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
 						// retrieve global local tax
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1102,10 +1093,11 @@ class pdf_einstein extends ModelePDFCommandes
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
-		if ($deja_regle > 0)
-		{
+		if ($deja_regle > 0) {
 			// Already paid + Deposits
 			$index++;
 
@@ -1152,7 +1144,9 @@ class pdf_einstein extends ModelePDFCommandes
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1161,8 +1155,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
 				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
@@ -1172,7 +1165,9 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -1181,34 +1176,29 @@ class pdf_einstein extends ModelePDFCommandes
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
 				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
 		}
 
 		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 		}
 
 		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
@@ -1222,21 +1212,17 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 
 		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
+		if (empty($hidetop)) {
+			if ($this->atleastonediscount) {
 				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
 
-		if ($this->atleastonediscount)
-		{
+		if ($this->atleastonediscount) {
 			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
 		}
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
 			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 		}
@@ -1268,8 +1254,7 @@ class pdf_einstein extends ModelePDFCommandes
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
@@ -1284,20 +1269,18 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
-		{
-			if ($this->emetteur->logo)
-			{
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+			if ($this->emetteur->logo) {
 				$logodir = $conf->mycompany->dir_output;
-				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
-				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
-				{
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
-				if (is_readable($logo))
-				{
+				if (is_readable($logo)) {
 					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
@@ -1328,19 +1311,16 @@ class pdf_einstein extends ModelePDFCommandes
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if ($object->ref_client)
-		{
+		if ($object->ref_client) {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1348,11 +1328,9 @@ class pdf_einstein extends ModelePDFCommandes
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1365,8 +1343,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client))
-		{
+		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1374,11 +1351,9 @@ class pdf_einstein extends ModelePDFCommandes
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -1394,30 +1369,29 @@ class pdf_einstein extends ModelePDFCommandes
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-		 	// Add internal contact of proposal if defined
+			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
+			if (count($arrayidcontact) > 0) {
+				$object->fetch_user($arrayidcontact[0]);
+				$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -1445,8 +1419,7 @@ class pdf_einstein extends ModelePDFCommandes
 			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1464,11 +1437,15 @@ class pdf_einstein extends ModelePDFCommandes
 
 			// Show recipient
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index c7d83ebbaf7..32a5fa18c6f 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -172,7 +172,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
@@ -206,9 +208,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
@@ -231,18 +237,17 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
 		$this->atleastonephoto = false;
-		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE)) {
 			$objphoto = new Product($this->db);
 
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				} else {
@@ -251,22 +256,17 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 
 				$arephoto = false;
-				foreach ($pdir as $midir)
-				{
-					if (!$arephoto)
-					{
+				foreach ($pdir as $midir) {
+					if (!$arephoto) {
 						if ($conf->product->entity != $objphoto->entity) {
 							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
 						} else {
 							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
 						}
 
-						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-						{
-							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-							{
-								if ($obj['photo_vignette'])
-								{
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+								if ($obj['photo_vignette']) {
 									$filename = $obj['photo_vignette'];
 								} else {
 									$filename = $obj['photo'];
@@ -282,21 +282,21 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 				}
 
-				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+				if ($realpath && $arephoto) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
 
 
 
-		if ($conf->commande->multidir_output[$conf->entity])
-		{
+		if ($conf->commande->multidir_output[$conf->entity]) {
 			$object->fetch_thirdparty();
 
 			$deja_regle = 0;
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->commande->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -305,20 +305,16 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -336,15 +332,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -358,15 +352,15 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfOrderTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
@@ -374,7 +368,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -387,11 +383,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// Incoterm
 				$height_incoterms = 0;
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -409,15 +403,15 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 
@@ -428,8 +422,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 
 				$pagenb = $pdf->getPage();
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_top -= 2;
 
 					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
@@ -448,16 +441,19 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pageposafternote = $pdf->getPage();
 					$posyafter = $pdf->GetY();
 
-					if ($pageposafternote > $pageposbeforenote)
-					{
+					if ($pageposafternote > $pageposbeforenote) {
 						$pdf->rollbackTransaction(true);
 
 						// prepare pages to receive notes
 						while ($pagenb < $pageposafternote) {
 							$pdf->AddPage();
 							$pagenb++;
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
@@ -473,8 +469,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 						$posyafter = $pdf->GetY();
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-						{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {	// There is no space left for total+free text
 							$pdf->AddPage('', '', true);
 							$pagenb++;
 							$pageposafternote++;
@@ -511,8 +506,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 						// apply note frame to last page
 						$pdf->setPage($pageposafternote);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$height_note = $posyafter - $tab_top_newpage;
 						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
 					} else // No pagebreak
@@ -523,15 +522,18 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-						{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {
 							// not enough space, need to add page
 							$pdf->AddPage('', '', true);
 							$pagenb++;
 							$pageposafternote++;
 							$pdf->setPage($pageposafternote);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 
 							$posyafter = $tab_top_newpage;
 						}
@@ -557,15 +559,16 @@ class pdf_eratosthene extends ModelePDFCommandes
 				// Loop on each lines
 				$pageposbeforeprintlines = $pdf->getPage();
 				$pagenb = $pageposbeforeprintlines;
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -576,25 +579,26 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$posYAfterImage = 0;
 					$posYAfterDescription = 0;
 
-					if ($this->getColumnStatus('photo'))
-					{
+					if ($this->getColumnStatus('photo')) {
 						// We start with Photo of product line
-						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-						{
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 							$pdf->AddPage('', '', true);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 
-						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-						{
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
 							$posYAfterImage = $curY + $imglinesize['height'];
@@ -602,15 +606,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 					}
 
 					// Description of product line
-					if ($this->getColumnStatus('desc'))
-					{
+					if ($this->getColumnStatus('desc')) {
 						$pdf->startTransaction();
 
 						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
 
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
@@ -619,21 +621,23 @@ class pdf_eratosthene extends ModelePDFCommandes
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
 									//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -660,16 +664,14 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
-					if ($this->getColumnStatus('vat'))
-					{
+					if ($this->getColumnStatus('vat')) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Unit price before discount
-					if ($this->getColumnStatus('subprice'))
-					{
+					if ($this->getColumnStatus('subprice')) {
 						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -677,8 +679,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 					// Quantity
 					// Enough for 6 chars
-					if ($this->getColumnStatus('qty'))
-					{
+					if ($this->getColumnStatus('qty')) {
 						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -686,32 +687,28 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 
 					// Unit
-					if ($this->getColumnStatus('unit'))
-					{
+					if ($this->getColumnStatus('unit')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Discount on line
-					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent)
-					{
+					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent) {
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total excl tax line (HT)
-					if ($this->getColumnStatus('totalexcltax'))
-					{
+					if ($this->getColumnStatus('totalexcltax')) {
 						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total with tax line (TTC)
-					if ($this->getColumnStatus('totalincltax'))
-					{
+					if ($this->getColumnStatus('totalincltax')) {
 						$total_incl_tax = pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'totalincltax', $total_incl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -720,8 +717,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-							if ($this->getColumnStatus($extrafieldColKey))
-							{
+							if ($this->getColumnStatus($extrafieldColKey)) {
 								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
@@ -742,8 +738,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 
 					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
@@ -752,34 +751,44 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
+					if ($localtax1_type && $localtax1ligne != 0) {
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -789,11 +798,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == $pageposbeforeprintlines)
-						{
+						if ($pagenb == $pageposbeforeprintlines) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -802,12 +809,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == $pageposafter)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -815,15 +822,18 @@ class pdf_eratosthene extends ModelePDFCommandes
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == $pageposbeforeprintlines)
-				{
+				if ($pagenb == $pageposbeforeprintlines) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
@@ -846,7 +856,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -857,14 +869,14 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -909,8 +921,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
-		{
+		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@@ -921,8 +932,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$posxval = 52;
 
 		// Show payments conditions
-		if ($object->cond_reglement_code || $object->cond_reglement)
-		{
+		if ($object->cond_reglement_code || $object->cond_reglement) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -940,33 +950,32 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Check a payment mode is defined
 		/* Not used with orders
 		if (empty($object->mode_reglement_code)
-        	&& ! $conf->global->FACTURE_CHQ_NUMBER
-        	&& ! $conf->global->FACTURE_RIB_NUMBER)
+			&& ! $conf->global->FACTURE_CHQ_NUMBER
+			&& ! $conf->global->FACTURE_RIB_NUMBER)
 		{
-            $pdf->SetXY($this->marge_gauche, $posy);
-            $pdf->SetTextColor(200,0,0);
-            $pdf->SetFont('','B', $default_font_size - 2);
-            $pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
-            $pdf->SetTextColor(0,0,0);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$pdf->SetTextColor(200,0,0);
+			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
+			$pdf->SetTextColor(0,0,0);
 
-            $posy=$pdf->GetY()+1;
-        }
+			$posy=$pdf->GetY()+1;
+		}
 		*/
 		/* TODO
 		else if (! empty($object->availability_code))
 		{
-            $pdf->SetXY($this->marge_gauche, $posy);
-            $pdf->SetTextColor(200,0,0);
-            $pdf->SetFont('','B', $default_font_size - 2);
-            $pdf->MultiCell(80, 3, $outputlangs->transnoentities("AvailabilityPeriod").': '.,0,'L',0);
-            $pdf->SetTextColor(0,0,0);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$pdf->SetTextColor(200,0,0);
+			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->MultiCell(80, 3, $outputlangs->transnoentities("AvailabilityPeriod").': '.,0,'L',0);
+			$pdf->SetTextColor(0,0,0);
 
-            $posy=$pdf->GetY()+1;
+			$posy=$pdf->GetY()+1;
 		}*/
 
 		// Show planed date of delivery
-		if (!empty($object->delivery_date))
-		{
+		if (!empty($object->delivery_date)) {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -978,8 +987,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
-		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
-		{
+		} elseif ($object->availability_code || $object->availability) {    // Show availability conditions
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
@@ -997,7 +1005,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Show payment mode
 		if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
-		   	&& $object->mode_reglement_code != 'VIR') {
+			&& $object->mode_reglement_code != 'VIR') {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentMode").':';
@@ -1012,15 +1020,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 		}
 
 		// Show payment mode CHQ
-		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-		{
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 			// Si mode reglement non force ou si force a CHQ
-			if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-			{
+			if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
 				$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-				if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-				{
+				if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
 					$account = new Account($this->db);
 					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
@@ -1029,23 +1034,20 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 					$posy = $pdf->GetY() + 1;
 
-					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-					{
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 						$posy = $pdf->GetY() + 2;
 					}
 				}
-				if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-				{
+				if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 					$posy = $pdf->GetY() + 1;
 
-					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-					{
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -1056,12 +1058,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 		}
 
 		// If payment mode not forced or forced to VIR, show payment with BAN
-		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-		{
-			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
-			{
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
 				$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-				if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				if ($object->fk_bank > 0) {
+					$bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				}
 				$account = new Account($this->db);
 				$account->fetch($bankid);
 
@@ -1108,8 +1110,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		// Total table
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -1131,30 +1132,26 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1168,25 +1165,23 @@ class pdf_eratosthene extends ModelePDFCommandes
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1202,18 +1197,15 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 				//}
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($this->tva as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1230,22 +1222,20 @@ class pdf_eratosthene extends ModelePDFCommandes
 				//Local tax 1 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1259,27 +1249,25 @@ class pdf_eratosthene extends ModelePDFCommandes
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
 						// retrieve global local tax
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1316,10 +1304,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
-		if ($deja_regle > 0)
-		{
+		if ($deja_regle > 0) {
 			// Already paid + Deposits
 			$index++;
 
@@ -1366,7 +1355,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1375,8 +1366,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
 				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
@@ -1431,8 +1421,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
@@ -1447,14 +1436,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
-		{
-			if ($this->emetteur->logo)
-			{
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+			if ($this->emetteur->logo) {
 				$logodir = $conf->mycompany->dir_output;
-				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
-				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
-				{
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
@@ -1491,8 +1479,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == $object::STATUS_DRAFT)
-		{
+		if ($object->statut == $object::STATUS_DRAFT) {
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
@@ -1501,19 +1488,16 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if ($object->ref_client)
-		{
+		if ($object->ref_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1521,11 +1505,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1543,8 +1525,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client))
-		{
+		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1552,11 +1533,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -1572,31 +1551,30 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-		 	// Add internal contact of proposal if defined
+			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
+			if (count($arrayidcontact) > 0) {
+				$object->fetch_user($arrayidcontact[0]);
+				$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
-		 	$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-		 	$posy += $top_shift;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 
 			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -1626,8 +1604,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1645,11 +1622,15 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 			// Show recipient
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1723,22 +1704,22 @@ class pdf_eratosthene extends ModelePDFCommandes
 		);
 
 		/*
-	     * For exemple
-	     $this->cols['theColKey'] = array(
-	     'rank' => $rank, // int : use for ordering columns
-	     'width' => 20, // the column width in mm
-	     'title' => array(
-	     'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	     'label' => ' ', // the final label : used fore final generated text
-	     'align' => 'L', // text alignement :  R,C,L
-	     'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	     ),
-	     'content' => array(
-	     'align' => 'L', // text alignement :  R,C,L
-	     'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	     ),
-	     );
-	     */
+		 * For exemple
+		 $this->cols['theColKey'] = array(
+		 'rank' => $rank, // int : use for ordering columns
+		 'width' => 20, // the column width in mm
+		 'title' => array(
+		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+		 'label' => ' ', // the final label : used fore final generated text
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 'content' => array(
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 );
+		 */
 
 		$rank = 0; // do not use negative rank
 		$this->cols['desc'] = array(
@@ -1774,8 +1755,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE) && !empty($this->atleastonephoto))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE) && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -1790,8 +1770,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			'border-left' => true, // add left line separator
 		);
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$this->cols['vat']['status'] = true;
 		}
 
@@ -1893,11 +1872,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 		);
 
 		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-		if ($reshook < 0)
-		{
+		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		} elseif (empty($reshook))
-		{
+		} elseif (empty($reshook)) {
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 2576533d5b7..315a1f27302 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -56,7 +56,7 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -90,13 +90,13 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -124,11 +124,13 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		$sql .= " AND entity IN (".getEntity('ordernumber', 1, $object).")";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_commande_marbre::getNextValue", LOG_DEBUG);
 			return -1;
@@ -138,8 +140,11 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 		$date = $object->date;
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_commande_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index 7d99facd7d3..4099686c1b6 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -98,18 +98,17 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$old_code_type = $mysoc->typent_code;
 		$mysoc->code_client = 'CCCCCCCCCC';
 		$mysoc->typent_code = 'TTTTTTTTTT';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -131,8 +130,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 		// We get cursor rule
 		$mask = $conf->global->COMMANDE_SAPHIR_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php
index f883a51630a..4f3378a0683 100644
--- a/htdocs/core/modules/commande/modules_commande.php
+++ b/htdocs/core/modules/commande/modules_commande.php
@@ -143,10 +143,18 @@ abstract class ModeleNumRefCommandes
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index bc6274482c4..25cf13f57d9 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -97,7 +97,9 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -128,17 +130,19 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->CONTRACT_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -156,8 +160,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte .= '<br></div></div>';
 
 		// Scan directories
-		if (count($listofdir))
-		{
+		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 		}
 
@@ -197,38 +200,35 @@ class doc_generic_contract_odt extends ModelePDFContract
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->contrat->multidir_output[$object->entity])
-		{
+		if ($conf->contrat->multidir_output[$object->entity]) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Contrat($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -238,20 +238,19 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 			$dir = $conf->contrat->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -262,10 +261,11 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -282,8 +282,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				// If CUSTOMER contact defined on contract, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
@@ -315,7 +314,9 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in order as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$substitutionarray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($substitutionarray, $outputlangs, $object);
@@ -329,8 +330,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'CONTRACT_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $tmparray);
 				}
 
@@ -347,8 +347,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -363,24 +362,23 @@ class doc_generic_contract_odt extends ModelePDFContract
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -390,32 +388,26 @@ class doc_generic_contract_odt extends ModelePDFContract
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
+					if ($foundtagforlines) {
 						$linenumber = 0;
-						foreach ($object->lines as $line)
-						{
+						foreach ($object->lines as $line) {
 							$linenumber++;
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -423,8 +415,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -432,12 +423,10 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -465,8 +454,9 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 877bf19f3a9..439ae2ef338 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -160,7 +160,9 @@ class pdf_strato extends ModelePDFContract
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
@@ -183,20 +185,22 @@ class pdf_strato extends ModelePDFContract
 		// phpcs:enable
 		global $user, $langs, $conf, $hookmanager, $mysoc;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "contracts"));
 
-		if ($conf->contrat->dir_output)
-		{
+		if ($conf->contrat->dir_output) {
 			$object->fetch_thirdparty();
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->contrat->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -205,20 +209,16 @@ class pdf_strato extends ModelePDFContract
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $outputlangs->trans("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -232,18 +232,18 @@ class pdf_strato extends ModelePDFContract
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -257,13 +257,17 @@ class pdf_strato extends ModelePDFContract
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("ContractCard")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -274,8 +278,7 @@ class pdf_strato extends ModelePDFContract
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
 
 				// Display notes
-				if (!empty($object->note_public))
-				{
+				if (!empty($object->note_public)) {
 					$tab_top -= 2;
 
 					$pdf->SetFont('', '', $default_font_size - 1);
@@ -301,14 +304,12 @@ class pdf_strato extends ModelePDFContract
 				$nblines = count($object->lines);
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$objectligne = $object->lines[$i];
 
 					$valide = $objectligne->id ? 1 : 0;
 
-					if ($valide > 0 || $object->specimen)
-					{
+					if ($valide > 0 || $object->specimen) {
 						$curX = $this->posxdesc - 1;
 						$curY = $nexY;
 						$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
@@ -346,33 +347,31 @@ class pdf_strato extends ModelePDFContract
 							$datere = $langs->trans("Unknown");
 						}
 
-                        $txtpredefinedservice = $objectligne->product_ref;
-                        if ($objectligne->product_label)
-                        {
-                        	$txtpredefinedservice .= ' - ';
-                        	$txtpredefinedservice .= $objectligne->product_label;
-                        }
+						$txtpredefinedservice = $objectligne->product_ref;
+						if ($objectligne->product_label) {
+							$txtpredefinedservice .= ' - ';
+							$txtpredefinedservice .= $objectligne->product_label;
+						}
 
 						$desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines)
 						$txt = '';
 						$txt .= $outputlangs->transnoentities("Quantity").' : <strong>'.$objectligne->qty.'</strong> - '.$outputlangs->transnoentities("UnitPrice").' : <strong>'.price($objectligne->subprice).'</strong>'; // Desc (not empty for free lines)
-						if (empty($conf->global->CONTRACT_HIDE_PLANNED_DATE_ON_PDF))
-						{
+						if (empty($conf->global->CONTRACT_HIDE_PLANNED_DATE_ON_PDF)) {
 							$txt .= '<br>';
 							$txt .= $outputlangs->transnoentities("DateStartPlannedShort")." : <strong>".$datei."</strong> - ".$outputlangs->transnoentities("DateEndPlanned")." : <strong>".$datee.'</strong>';
 						}
-						if (empty($conf->global->CONTRACT_HIDE_REAL_DATE_ON_PDF))
-						{
+						if (empty($conf->global->CONTRACT_HIDE_REAL_DATE_ON_PDF)) {
 							$txt .= '<br>';
 							$txt .= $outputlangs->transnoentities("DateStartRealShort")." : <strong>".$daters.'</strong>';
-							if ($objectligne->date_cloture) $txt .= " - ".$outputlangs->transnoentities("DateEndRealShort")." : '<strong>'".$datere.'</strong>';
+							if ($objectligne->date_cloture) {
+								$txt .= " - ".$outputlangs->transnoentities("DateEndRealShort")." : '<strong>'".$datere.'</strong>';
+							}
 						}
 
 						$pdf->startTransaction();
 						$pdf->writeHTMLCell(0, 0, $curX, $curY, dol_concatdesc($txtpredefinedservice, dol_concatdesc($txt, $desc)), 0, 1, 0);
 						$pageposafter = $pdf->getPage();
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
@@ -381,22 +380,26 @@ class pdf_strato extends ModelePDFContract
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
 
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
+									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+										$this->_pagehead($pdf, $object, 0, $outputlangs);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -418,11 +421,9 @@ class pdf_strato extends ModelePDFContract
 						$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 						// Detect if some page were added automatically and output _tableau for past pages
-						while ($pagenb < $pageposafter)
-						{
+						while ($pagenb < $pageposafter) {
 							$pdf->setPage($pagenb);
-							if ($pagenb == 1)
-							{
+							if ($pagenb == 1) {
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
 							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
@@ -433,10 +434,8 @@ class pdf_strato extends ModelePDFContract
 							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 						}
 
-						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-						{
-							if ($pagenb == 1)
-							{
+						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+							if ($pagenb == 1) {
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext, 0, $outputlangs, 0, 1);
 							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter - $heightforfreetext, 0, $outputlangs, 1, 1);
@@ -444,15 +443,16 @@ class pdf_strato extends ModelePDFContract
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							// New page
 							$pdf->AddPage();
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pagenb++;
 						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$this->tabSignature($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, $outputlangs);
 					$bottomlasttab = $this->page_hauteur - $heightforfooter - $heightforfooter + 1;
@@ -463,15 +463,16 @@ class pdf_strato extends ModelePDFContract
 				}
 
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
 				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -479,14 +480,14 @@ class pdf_strato extends ModelePDFContract
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -520,7 +521,9 @@ class pdf_strato extends ModelePDFContract
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 		/*
@@ -547,7 +550,7 @@ class pdf_strato extends ModelePDFContract
 		$pdf->line($this->marge_gauche, $nexY, $this->page_largeur-$this->marge_droite, $nexY);
 
 		$pdf->MultiCell(0, 3, '');		// Set interline to 3. Then writeMultiCell must use 3 also.
-        */
+		*/
 
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height + 3); // Rect takes a length in 3rd parameter and 4th parameter
@@ -602,8 +605,7 @@ class pdf_strato extends ModelePDFContract
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		//Affiche le filigrane brouillon - Print Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->CONTRACT_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->CONTRACT_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->CONTRACT_DRAFT_WATERMARK);
 		}
 
@@ -618,10 +620,8 @@ class pdf_strato extends ModelePDFContract
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -656,22 +656,19 @@ class pdf_strato extends ModelePDFContract
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_contrat, "day", false, $outputlangs, true), '', 'R');
 
-		if ($object->thirdparty->code_client)
-		{
+		if ($object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
 			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'INTERREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$object->fetch_user($arrayidcontact[0]);
 				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
 			}
@@ -681,7 +678,9 @@ class pdf_strato extends ModelePDFContract
 			// Show sender
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -708,8 +707,7 @@ class pdf_strato extends ModelePDFContract
 			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -729,10 +727,14 @@ class pdf_strato extends ModelePDFContract
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/contract/mod_contract_magre.php b/htdocs/core/modules/contract/mod_contract_magre.php
index 226efa0c99e..d696ac06fdd 100644
--- a/htdocs/core/modules/contract/mod_contract_magre.php
+++ b/htdocs/core/modules/contract/mod_contract_magre.php
@@ -101,15 +101,14 @@ class mod_contract_magre extends ModelNumRefContracts
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$mysoc->code_client = 'CCCCCCCCCC';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -130,8 +129,7 @@ class mod_contract_magre extends ModelNumRefContracts
 
 		$mask = $conf->global->CONTRACT_MAGRE_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/contract/mod_contract_olive.php b/htdocs/core/modules/contract/mod_contract_olive.php
index 0c49c63ab4a..9d9551bfa96 100644
--- a/htdocs/core/modules/contract/mod_contract_olive.php
+++ b/htdocs/core/modules/contract/mod_contract_olive.php
@@ -111,11 +111,9 @@ class mod_contract_olive extends ModelNumRefContracts
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED))
-		{
+		if (empty($code) && $this->code_null && empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)) {
 			$result = 0;
-		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED)))
-		{
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_CONTARCT_CODE_ALWAYS_REQUIRED))) {
 			$result = -2;
 		}
 
diff --git a/htdocs/core/modules/contract/mod_contract_serpis.php b/htdocs/core/modules/contract/mod_contract_serpis.php
index de54fff3d76..2506b77e540 100644
--- a/htdocs/core/modules/contract/mod_contract_serpis.php
+++ b/htdocs/core/modules/contract/mod_contract_serpis.php
@@ -67,7 +67,7 @@ class mod_contract_serpis extends ModelNumRefContracts
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -100,13 +100,13 @@ class mod_contract_serpis extends ModelNumRefContracts
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -133,11 +133,13 @@ class mod_contract_serpis extends ModelNumRefContracts
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_contract_serpis::getNextValue", LOG_DEBUG);
 			return -1;
@@ -146,8 +148,11 @@ class mod_contract_serpis extends ModelNumRefContracts
 		$date = $contract->date_contrat;
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_contract_serpis::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php
index 5e39dd7d587..8e296f626fb 100644
--- a/htdocs/core/modules/contract/modules_contract.php
+++ b/htdocs/core/modules/contract/modules_contract.php
@@ -144,10 +144,18 @@ class ModelNumRefContracts
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index f6275386cff..ad197f442dd 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -151,7 +151,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		$this->tva = array();
 		$this->atleastoneratenotnull = 0;
@@ -176,43 +178,40 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "sendings", "deliveries"));
 
-		if ($conf->expedition->dir_output)
-		{
+		if ($conf->expedition->dir_output) {
 			$object->fetch_thirdparty();
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->expedition->dir_output."/receipt";
 				$file = $dir."/SPECIMEN.pdf";
-			}
-			else {
+			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
 				$dir = $conf->expedition->dir_output."/receipt/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -227,46 +226,37 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				// Loop on each lines to detect if there is at least one image to show
 				$realpatharray = array();
 				$this->atleastonephoto = false;
-				if (!empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE))
-				{
+				if (!empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE)) {
 					$objphoto = new Product($this->db);
 
-					for ($i = 0; $i < $nblines; $i++)
-					{
-						if (empty($object->lines[$i]->fk_product)) continue;
+					for ($i = 0; $i < $nblines; $i++) {
+						if (empty($object->lines[$i]->fk_product)) {
+							continue;
+						}
 
 						$objphoto->fetch($object->lines[$i]->fk_product);
 
-						if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-						{
+						if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 							$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 							$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
-						}
-						else {
+						} else {
 							$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
 							$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
 						}
 
 						$arephoto = false;
-						foreach ($pdir as $midir)
-						{
-							if (!$arephoto)
-							{
+						foreach ($pdir as $midir) {
+							if (!$arephoto) {
 								$dir = $conf->product->dir_output.'/'.$midir;
 
-								foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-								{
-									if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-									{
-										if ($obj['photo_vignette'])
-										{
+								foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+									if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+										if ($obj['photo_vignette']) {
 											$filename = $obj['photo_vignette'];
-										}
-										else {
+										} else {
 											$filename = $obj['photo'];
 										}
-									}
-									else {
+									} else {
 										$filename = $obj['photo'];
 									}
 
@@ -277,11 +267,15 @@ class pdf_storm extends ModelePDFDeliveryOrder
 							}
 						}
 
-						if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+						if ($realpath && $arephoto) {
+							$realpatharray[$i] = $realpath;
+						}
 					}
 				}
 
-				if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
+				if (count($realpatharray) == 0) {
+					$this->posxpicture = $this->posxweightvol;
+				}
 
 
 
@@ -291,18 +285,18 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				$heightforinfotot = 30; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -312,8 +306,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				$result = $expedition->fetch($object->origin_id);
 				// Now we get the order that is origin of shipment
 				$commande = new Commande($this->db);
-				if ($expedition->origin == 'commande')
-				{
+				if ($expedition->origin == 'commande') {
 					$commande->fetch($expedition->origin_id);
 				}
 				$object->commande = $commande; // We set order of shipment onto delivery.
@@ -329,14 +322,18 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("DeliveryOrder"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -352,11 +349,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 				// Incoterm
 				$height_incoterms = 0;
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top = 88;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -378,13 +373,11 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 				// Extrafields in note
 				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-				if (!empty($extranote))
-				{
+				if (!empty($extranote)) {
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
-				if (!empty($notetoshow))
-				{
+				if (!empty($notetoshow)) {
 					$tab_top = 88 + $height_incoterms;
 
 					$pdf->SetFont('', '', $default_font_size - 1);
@@ -398,8 +391,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY + 6;
-				}
-				else {
+				} else {
 					$height_note = 0;
 				}
 
@@ -416,8 +408,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				$nexY = $tab_top + $this->tabTitleHeight + 2;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					// Fetch optionals
 					if (empty($object->lines[$i]->array_options)) {
 						$object->lines[$i]->fetch_optionals();
@@ -429,7 +420,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 
 					$pdf->setTopMargin($tab_top_newpage);
@@ -443,27 +436,28 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 					$posYAfterImage = 0;
 					$posYAfterDescription = 0;
-					if ($this->getColumnStatus('photo'))
-					{
+					if ($this->getColumnStatus('photo')) {
 						// We start with Photo of product line
-						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-						{
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 							$pdf->AddPage('', '', true);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 
 
-						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-						{
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
 							$posYAfterImage = $curY + $imglinesize['height'];
@@ -476,29 +470,32 @@ class pdf_storm extends ModelePDFDeliveryOrder
 						$pdf->startTransaction();
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 3, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
-						if ($pageposafter > $pageposbefore)    // There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {    // There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
 							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 							pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->getColumnContentWidth('desc'), 4, $this->getColumnContentXStart('desc'), $curY, $hideref, $hidedesc);
 							$posyafter = $pdf->GetY();
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))    // There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))    // No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {    // There is no space left for total+free text
+								if ($i == ($nblines - 1)) {    // No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
+									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+										$this->_pagehead($pdf, $object, 0, $outputlangs);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -540,8 +537,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-							if ($this->getColumnStatus($extrafieldColKey))
-							{
+							if ($this->getColumnStatus($extrafieldColKey)) {
 								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
@@ -550,8 +546,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -562,47 +557,45 @@ class pdf_storm extends ModelePDFDeliveryOrder
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
-						}
-						else {
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
-						else {
+					}
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else {
+				} else {
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
@@ -613,15 +606,16 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
 
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
 				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -629,20 +623,19 @@ class pdf_storm extends ModelePDFDeliveryOrder
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1; // No error
-			}
-			else {
+			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -702,7 +695,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -711,10 +706,11 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -750,8 +746,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
@@ -765,21 +760,19 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
-			}
-			else {
+			} else {
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
+		} else {
+			$pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
 		}
-		else $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
 
 		$pdf->SetFont('', 'B', $default_font_size + 2);
 		$pdf->SetXY($posx, $posy);
@@ -791,18 +784,15 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		if ($object->date_valid)
-		{
+		if ($object->date_valid) {
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_delivery, "%d %b %Y", false, $outputlangs, true), '', 'R');
-		}
-		else {
+		} else {
 			$pdf->SetTextColor(255, 0, 0);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DeliveryNotValidated"), '', 'R');
 			$pdf->SetTextColor(0, 0, 60);
 		}
 
-		if ($object->thirdparty->code_client)
-		{
+		if ($object->thirdparty->code_client) {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -816,15 +806,16 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		// Show list of linked objects
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -851,7 +842,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			// Client destinataire
 			$posy = 42;
 			$posx = 102;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
@@ -860,8 +853,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			// If SHIPPING contact defined on order, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->commande->getIdContact('external', 'SHIPPING');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -879,10 +871,14 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1002,8 +998,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE) && !empty($this->atleastonephoto))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_DELIVERY_WITH_PICTURE) && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -1068,15 +1063,11 @@ class pdf_storm extends ModelePDFDeliveryOrder
 		);
 
 		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-		if ($reshook < 0)
-		{
+		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		}
-		elseif (empty($reshook))
-		{
+		} elseif (empty($reshook)) {
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-		}
-		else {
+		} else {
 			$this->cols = $hookmanager->resArray;
 		}
 	}
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 41ed6b22554..3f86dc1ac67 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -150,7 +150,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
@@ -161,8 +163,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$this->posxremainingqty = 185;
 		//$this->posxdiscount=162;
 		//$this->postotalht=174;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxcomm -= 20;
 			//$this->posxtva-=20;
 			//$this->posxup-=20;
@@ -194,20 +195,22 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "sendings", "deliveries"));
 
-		if ($conf->expedition->dir_output)
-		{
+		if ($conf->expedition->dir_output) {
 			$object->fetch_thirdparty();
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->expedition->dir_output."/receipt";
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -216,20 +219,16 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -246,18 +245,18 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$heightforinfotot = 30; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -267,8 +266,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$result = $expedition->fetch($object->origin_id);
 				// Now we get the order that is origin of shipment
 				$commande = new Commande($this->db);
-				if ($expedition->origin == 'commande')
-				{
+				if ($expedition->origin == 'commande') {
 					$commande->fetch($expedition->origin_id);
 				}
 				$object->commande = $commande; // We set order of shipment onto delivery.
@@ -284,7 +282,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("DeliveryOrder"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
@@ -292,12 +292,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				// Positionne $this->atleastonediscount si on a au moins une remise
 				for ($i = 0 ; $i < $nblines ; $i++)
 				{
-				 	if ($object->lines[$i]->remise_percent)
-				 	{
-				 		$this->atleastonediscount++;
-				 	}
+					 if ($object->lines[$i]->remise_percent)
+					 {
+						 $this->atleastonediscount++;
+					 }
 				}
- 				if (empty($this->atleastonediscount))
+				 if (empty($this->atleastonediscount))
 				{
 					$this->posxpicture+=($this->postotalht - $this->posxdiscount);
 					$this->posxtva+=($this->postotalht - $this->posxdiscount);
@@ -310,7 +310,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -324,11 +326,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 				// Incoterm
 				$height_incoterms = 0;
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top = 88;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -346,8 +346,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				}
 
 				// Affiche notes
-				if (!empty($object->note_public))
-				{
+				if (!empty($object->note_public)) {
 					$tab_top = 88 + $height_incoterms;
 
 					$pdf->SetFont('', '', $default_font_size - 1);
@@ -370,8 +369,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$nexY = $tab_top + 11;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
@@ -388,29 +386,32 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$pdf->startTransaction();
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxcomm - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxcomm - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 						$posyafter = $pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -469,8 +470,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					 */
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -481,11 +481,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -494,12 +492,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -507,15 +505,18 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -529,7 +530,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
 
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				// Check product remaining to be delivered
 				// TODO doit etre modifie
@@ -550,16 +553,16 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 								  $outputlangs->transnoentities('Qty')
 								  );
 
-    				// Header
-    				$num = count($header);
-   					for($i = 0; $i < $num; $i++)
-   					{
-   						$pdf->Cell($w[$i],7,$header[$i],1,0,'C');
-   					}
+					// Header
+					$num = count($header);
+					   for($i = 0; $i < $num; $i++)
+					   {
+						   $pdf->Cell($w[$i],7,$header[$i],1,0,'C');
+					   }
 
-			    	$pdf->Ln();
+					$pdf->Ln();
 
-			    	// Data
+					// Data
 					foreach($waitingDelivery as $value)
 					{
 						$pdf->Cell($w[0], 6, $value['ref'], 1, 0, 'L');
@@ -597,8 +600,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -606,14 +608,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -677,7 +679,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -688,16 +692,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		// Output Rec
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 10, $this->page_largeur - $this->marge_droite, $tab_top + 10);
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxcomm - $this->posxdesc, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
@@ -743,8 +745,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
@@ -758,10 +759,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -770,7 +769,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
-		} else $pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
+		} else {
+			$pdf->MultiCell(100, 4, $this->emetteur->name, 0, 'L');
+		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 2);
 		$pdf->SetXY($posx, $posy);
@@ -782,8 +783,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		$posy += 5;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		if ($object->date_valid)
-		{
+		if ($object->date_valid) {
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date_delivery, "%d %b %Y", false, $outputlangs, true), '', 'R');
 		} else {
 			$pdf->SetTextColor(255, 0, 0);
@@ -791,8 +791,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			$pdf->SetTextColor(0, 0, 60);
 		}
 
-		if ($object->thirdparty->code_client)
-		{
+		if ($object->thirdparty->code_client) {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -806,15 +805,16 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 		// Show list of linked objects
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -841,7 +841,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			// Client destinataire
 			$posy = 42;
 			$posx = 102;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 			$pdf->SetTextColor(0, 0, 0);
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posx, $posy - 5);
@@ -850,8 +852,7 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 			// If SHIPPING contact defined on order, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->commande->getIdContact('external', 'SHIPPING');
-			if ($arrayidcontact && count($arrayidcontact) > 0)
-			{
+			if ($arrayidcontact && count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -869,10 +870,14 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/delivery/mod_delivery_jade.php b/htdocs/core/modules/delivery/mod_delivery_jade.php
index 822986cffa5..c18b1c98e62 100644
--- a/htdocs/core/modules/delivery/mod_delivery_jade.php
+++ b/htdocs/core/modules/delivery/mod_delivery_jade.php
@@ -103,13 +103,13 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$fayymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($fayymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm))
-		{
+		if ($fayymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -140,18 +140,26 @@ class mod_delivery_jade extends ModeleNumRefDeliveryOrder
 		dol_syslog("mod_delivery_jade::getNextValue", LOG_DEBUG);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			return -1;
 		}
 
 		$date = $object->date_delivery;
-		if (empty($date)) $date = dol_now();
+		if (empty($date)) {
+			$date = dol_now();
+		}
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_delivery_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/delivery/mod_delivery_saphir.php b/htdocs/core/modules/delivery/mod_delivery_saphir.php
index ca0de68a670..ef3e7f7b7c0 100644
--- a/htdocs/core/modules/delivery/mod_delivery_saphir.php
+++ b/htdocs/core/modules/delivery/mod_delivery_saphir.php
@@ -102,15 +102,14 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$mysoc->code_client = 'CCCCCCCCCC';
 		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -133,8 +132,7 @@ class mod_delivery_saphir extends ModeleNumRefDeliveryOrder
 		// On defini critere recherche compteur
 		$mask = $conf->global->DELIVERY_SAPHIR_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/delivery/modules_delivery.php b/htdocs/core/modules/delivery/modules_delivery.php
index a0d2da43494..5bd3bd33866 100644
--- a/htdocs/core/modules/delivery/modules_delivery.php
+++ b/htdocs/core/modules/delivery/modules_delivery.php
@@ -145,10 +145,16 @@ abstract class ModeleNumRefDeliveryOrder
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
-		else return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 }
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index b3480297476..792c8434ba4 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -81,26 +81,25 @@ class html_cerfafr extends ModeleDon
 		$now = dol_now();
 		$id = (!is_object($don) ? $don : '');
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "donations"));
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 
-		if (!empty($conf->don->dir_output))
-		{
+		if (!empty($conf->don->dir_output)) {
 			// Definition of the object don (for upward compatibility)
-			if (!is_object($don))
-			{
+			if (!is_object($don)) {
 				$don = new Don($this->db);
 				$ret = $don->fetch($id);
 				$id = $don->id;
 			}
 
 			// Definition of $dir and $file
-			if (!empty($don->specimen))
-			{
+			if (!empty($don->specimen)) {
 				$dir = $conf->don->dir_output;
 				$file = $dir."/SPECIMEN.html";
 			} else {
@@ -109,26 +108,24 @@ class html_cerfafr extends ModeleDon
 				$file = $dir."/".$donref.".html";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				$formclass = new Form($this->db);
 
 				// This is not the proper way to do it but $formclass->form_modes_reglement
 				// prints the translation instead of returning it
-				if ($don->modepaiementid)
-				{
+				if ($don->modepaiementid) {
 					$formclass->load_cache_types_paiements();
 					$paymentmode = $formclass->cache_types_paiements[$don->modepaiementid]['label'];
-				} else $paymentmode = '';
+				} else {
+					$paymentmode = '';
+				}
 
 				if ($don->modepaymentcode == 'CHQ') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox" disabled="true" checked="checked"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
@@ -197,17 +194,20 @@ class html_cerfafr extends ModeleDon
 				$form = str_replace('__ModePaiement__', $ModePaiement, $form);
 
 				$frencharticle = '';
-				if (preg_match('/fr/i', $outputlangs->defaultlang)) $frencharticle = '<font size="+1">Article 200, 238 bis et 978 du code général des impôts (CGI)</font>';
+				if (preg_match('/fr/i', $outputlangs->defaultlang)) {
+					$frencharticle = '<font size="+1">Article 200, 238 bis et 978 du code général des impôts (CGI)</font>';
+				}
 				$form = str_replace('__FrenchArticle__', $frencharticle, $form);
 
 				$frencheligibility = '';
-				if (preg_match('/fr/i', $outputlangs->defaultlang)) $frencheligibility = 'Le bénéficiaire certifie sur l\'honneur que les dons et versements qu\'il reçoit ouvrent droit à la réduction d\'impôt prévue à l\'article :';
+				if (preg_match('/fr/i', $outputlangs->defaultlang)) {
+					$frencheligibility = 'Le bénéficiaire certifie sur l\'honneur que les dons et versements qu\'il reçoit ouvrent droit à la réduction d\'impôt prévue à l\'article :';
+				}
 				$form = str_replace('__FrenchEligibility__', $frencheligibility, $form);
 
 				$art200 = '';
 				if ($mysoc->country_code == 'FR') {
-					if ($conf->global->DONATION_ART200 >= 1)
-					{
+					if ($conf->global->DONATION_ART200 >= 1) {
 						$art200 = '<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
 					} else {
 						$art200 = '<input type="checkbox" disabled="true">200 du CGI';
@@ -217,8 +217,7 @@ class html_cerfafr extends ModeleDon
 
 				$art238 = '';
 				if ($mysoc->country_code == 'FR') {
-					if ($conf->global->DONATION_ART238 >= 1)
-					{
+					if ($conf->global->DONATION_ART238 >= 1) {
 						$art238 = '<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
 					} else {
 						$art238 = '<input type="checkbox" disabled="true">238 bis du CGI';
@@ -228,8 +227,7 @@ class html_cerfafr extends ModeleDon
 
 				$art978 = '';
 				if ($mysoc->country_code == 'FR') {
-					if ($conf->global->DONATION_ART978 >= 1)
-					{
+					if ($conf->global->DONATION_ART978 >= 1) {
 						$art978 = '<input type="checkbox" disabled="true" checked="checked" >978 du CGI';
 					} else {
 						$art978 = '<input type="checkbox" disabled="true">978 du CGI';
@@ -242,8 +240,9 @@ class html_cerfafr extends ModeleDon
 				$handle = fopen($file, "w");
 				fwrite($handle, $form);
 				fclose($handle);
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -271,10 +270,16 @@ class html_cerfafr extends ModeleDon
 		$unite = array();
 		$dix = array();
 		$cent = array();
-		if (empty($devise1)) $dev1 = 'euros';
-		else $dev1 = $devise1;
-		if (empty($devise2)) $dev2 = 'centimes';
-		else $dev2 = $devise2;
+		if (empty($devise1)) {
+			$dev1 = 'euros';
+		} else {
+			$dev1 = $devise1;
+		}
+		if (empty($devise2)) {
+			$dev2 = 'centimes';
+		} else {
+			$dev2 = $devise2;
+		}
 		$valeur_entiere = intval($montant);
 		$valeur_decimal = intval(round($montant - intval($montant), 2) * 100);
 		$dix_c = intval($valeur_decimal % 100 / 10);
@@ -366,34 +371,46 @@ class html_cerfafr extends ModeleDon
 					$prim[$i] = $chif[$unite[$i] + 10];
 				}
 			}
-			if ($cent[$i] == 1) $trio[$i] = 'cent';
-			elseif ($cent[$i] != 0 || $cent[$i] != '') $trio[$i] = $chif[$cent[$i]].' cents';
+			if ($cent[$i] == 1) {
+				$trio[$i] = 'cent';
+			} elseif ($cent[$i] != 0 || $cent[$i] != '') {
+				$trio[$i] = $chif[$cent[$i]].' cents';
+			}
 		}
 
 
 		$chif2 = array('', 'dix', 'vingt', 'trente', 'quarante', 'cinquante', 'soixante', 'soixante-dix', 'quatre-vingts', 'quatre-vingts dix');
 		$secon_c = $chif2[$dix_c];
-		if ($cent_c == 1) $trio_c = 'cent';
-		elseif ($cent_c != 0 || $cent_c != '') $trio_c = $chif[$cent_c].' cents';
+		if ($cent_c == 1) {
+			$trio_c = 'cent';
+		} elseif ($cent_c != 0 || $cent_c != '') {
+			$trio_c = $chif[$cent_c].' cents';
+		}
 
-		if (($cent[3] == 0 || $cent[3] == '') && ($dix[3] == 0 || $dix[3] == '') && ($unite[3] == 1))
+		if (($cent[3] == 0 || $cent[3] == '') && ($dix[3] == 0 || $dix[3] == '') && ($unite[3] == 1)) {
 			$somme = $trio[3].'  '.$secon[3].' '.$prim[3].' million ';
-		elseif (($cent[3] != 0 && $cent[3] != '') || ($dix[3] != 0 && $dix[3] != '') || ($unite[3] != 0 && $unite[3] != ''))
+		} elseif (($cent[3] != 0 && $cent[3] != '') || ($dix[3] != 0 && $dix[3] != '') || ($unite[3] != 0 && $unite[3] != '')) {
 			$somme = $trio[3].' '.$secon[3].' '.$prim[3].' millions ';
-		else $somme = $trio[3].' '.$secon[3].' '.$prim[3];
+		} else {
+			$somme = $trio[3].' '.$secon[3].' '.$prim[3];
+		}
 
-		if (($cent[2] == 0 || $cent[2] == '') && ($dix[2] == 0 || $dix[2] == '') && ($unite[2] == 1))
+		if (($cent[2] == 0 || $cent[2] == '') && ($dix[2] == 0 || $dix[2] == '') && ($unite[2] == 1)) {
 			$somme = $somme.' mille ';
-		elseif (($cent[2] != 0 && $cent[2] != '') || ($dix[2] != 0 && $dix[2] != '') || ($unite[2] != 0 && $unite[2] != ''))
+		} elseif (($cent[2] != 0 && $cent[2] != '') || ($dix[2] != 0 && $dix[2] != '') || ($unite[2] != 0 && $unite[2] != '')) {
 			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2].' milles ';
-		else $somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2];
+		} else {
+			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2];
+		}
 
 		$somme = $somme.$trio[1].' '.$secon[1].' '.$prim[1];
 
 		$somme = $somme.' '.$dev1.' ';
 
-		if (($cent_c == '0' || $cent_c == '') && ($dix_c == '0' || $dix_c == ''))
+		if (($cent_c == '0' || $cent_c == '') && ($dix_c == '0' || $dix_c == '')) {
 			return $somme.' et z&eacute;ro '.$dev2;
-		else return $somme.$trio_c.' '.$secon_c.' '.$dev2;
+		} else {
+			return $somme.$trio_c.' '.$secon_c.' '.$dev2;
+		}
 	}
 }
diff --git a/htdocs/core/modules/dons/modules_don.php b/htdocs/core/modules/dons/modules_don.php
index 92982d91404..cd332c48fcb 100644
--- a/htdocs/core/modules/dons/modules_don.php
+++ b/htdocs/core/modules/dons/modules_don.php
@@ -139,10 +139,18 @@ abstract class ModeleNumRefDons
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index ecfe7268564..16161e97a65 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -99,7 +99,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -130,17 +132,19 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->EXPEDITION_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -159,22 +163,20 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->EXPEDITION_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->EXPEDITION_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
 			//$texte.=$nbofiles?'</a>':'';
 			$texte .= '</b>';
 		}
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
-   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=shipments/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=shipments/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
@@ -211,38 +213,35 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->expedition->dir_output."/sending")
-		{
+		if ($conf->expedition->dir_output."/sending") {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Expedition($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -252,20 +251,19 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 			$dir = $conf->expedition->dir_output."/sending";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -275,10 +273,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -295,8 +294,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// If SHIPMENT contact defined on invoice, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'SHIPPING');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
@@ -331,8 +329,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'EXPEDITION_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -348,8 +345,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -364,48 +360,47 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
 				// Make substitutions into odt of user info
 				$tmparray = $this->get_substitutionarray_user($user, $outputlangs);
 				//var_dump($tmparray); exit;
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
+						if (preg_match('/logo$/', $key)) { // Image
 							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 				// Make substitutions into odt of mysoc
 				$tmparray = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
 				//var_dump($tmparray); exit;
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key))	// Image
-						{
+						if (preg_match('/logo$/', $key)) {	// Image
 							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -415,38 +410,38 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				} else {
 					$tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
 				}
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key))	// Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) {	// Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
 
 				if ($usecontact && is_object($contactobject)) {
 					$tmparray = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
-					foreach ($tmparray as $key=>$value)
-					{
+					foreach ($tmparray as $key => $value) {
 						try {
-							if (preg_match('/logo$/', $key))	// Image
-							{
-								if (file_exists($value)) $odfHandler->setImage($key, $value);
-								else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							if (preg_match('/logo$/', $key)) {	// Image
+								if (file_exists($value)) {
+									$odfHandler->setImage($key, $value);
+								} else {
+									$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+								}
 							} else // Text
 							{
 								$odfHandler->setVars($key, $value, true, 'UTF-8');
 							}
-						} catch (OdfException $e)
-						{
+						} catch (OdfException $e) {
 							dol_syslog($e->getMessage(), LOG_INFO);
 						}
 					}
@@ -459,19 +454,19 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				// Call the ODTSubstitution hook
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -480,30 +475,24 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
-						foreach ($object->lines as $line)
-						{
+					if ($foundtagforlines) {
+						foreach ($object->lines as $line) {
 							$tmparray = $this->get_substitutionarray_shipment_lines($line, $outputlangs);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -511,8 +500,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -520,12 +508,10 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -555,8 +541,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index 8441597a967..c11fb8e60c9 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -143,7 +143,9 @@ class pdf_espadon extends ModelePdfExpedition
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		$this->tabTitleHeight = 5; // default height
 	}
@@ -167,9 +169,13 @@ class pdf_espadon extends ModelePdfExpedition
 
 		$object->fetch_thirdparty();
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "orders", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
@@ -187,19 +193,18 @@ class pdf_espadon extends ModelePdfExpedition
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
 		$this->atleastonephoto = false;
-		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE)) {
 			$objphoto = new Product($this->db);
 
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
@@ -209,12 +214,9 @@ class pdf_espadon extends ModelePdfExpedition
 
 				$realpath = '';
 
-				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-				{
-					if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-					{
-						if ($obj['photo_vignette'])
-						{
+				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+					if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+						if ($obj['photo_vignette']) {
 							$filename = $obj['photo_vignette'];
 						} else {
 							$filename = $obj['photo'];
@@ -228,17 +230,19 @@ class pdf_espadon extends ModelePdfExpedition
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i] = $realpath;
+				if ($realpath) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxweightvol;
+		}
 
-		if ($conf->expedition->dir_output)
-		{
+		if ($conf->expedition->dir_output) {
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -247,20 +251,16 @@ class pdf_espadon extends ModelePdfExpedition
 				$file = $dir."/".$expref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -277,18 +277,18 @@ class pdf_espadon extends ModelePdfExpedition
 				$heightforinfotot = 8; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -297,20 +297,26 @@ class pdf_espadon extends ModelePdfExpedition
 				$pagenb = 0;
 				$pdf->SetDrawColor(128, 128, 128);
 
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -326,11 +332,9 @@ class pdf_espadon extends ModelePdfExpedition
 
 				// Incoterm
 				$height_incoterms = 0;
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top = 88;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -352,13 +356,11 @@ class pdf_espadon extends ModelePdfExpedition
 
 				// Extrafields in note
 				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-				if (!empty($extranote))
-				{
+				if (!empty($extranote)) {
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
-				if (!empty($notetoshow) || !empty($object->tracking_number))
-				{
+				if (!empty($notetoshow) || !empty($object->tracking_number)) {
 					$tab_top = 88 + $height_incoterms;
 					$tab_top_alt = $tab_top;
 
@@ -369,21 +371,19 @@ class pdf_espadon extends ModelePdfExpedition
 					//$tab_top_alt += 1;
 
 					// Tracking number
-					if (!empty($object->tracking_number))
-					{
+					if (!empty($object->tracking_number)) {
 						$object->getUrlTrackingStatus($object->tracking_number);
-						if (!empty($object->tracking_url))
-						{
-							if ($object->shipping_method_id > 0)
-							{
+						if (!empty($object->tracking_url)) {
+							if ($object->shipping_method_id > 0) {
 								// Get code using getLabelFromKey
 								$code = $outputlangs->getLabelFromKey($this->db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 								$label = '';
-								if ($object->tracking_url != $object->tracking_number) $label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								if ($object->tracking_url != $object->tracking_number) {
+									$label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								}
 								$label .= $outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
 								//var_dump($object->tracking_url != $object->tracking_number);exit;
-								if ($object->tracking_url != $object->tracking_number)
-								{
+								if ($object->tracking_url != $object->tracking_number) {
 									$label .= " : ";
 									$label .= $object->tracking_url;
 								}
@@ -396,8 +396,7 @@ class pdf_espadon extends ModelePdfExpedition
 					}
 
 					// Notes
-					if (!empty($notetoshow))
-					{
+					if (!empty($notetoshow)) {
 						$pdf->SetFont('', '', $default_font_size - 1); // In loop to manage multi-page
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top_alt, dol_htmlentitiesbr($notetoshow), 0, 1);
 					}
@@ -428,15 +427,16 @@ class pdf_espadon extends ModelePdfExpedition
 				$nexY = $tab_top + $this->tabTitleHeight;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -446,27 +446,28 @@ class pdf_espadon extends ModelePdfExpedition
 					$posYAfterImage = 0;
 					$posYAfterDescription = 0;
 
-					if ($this->getColumnStatus('photo'))
-					{
+					if ($this->getColumnStatus('photo')) {
 						// We start with Photo of product line
-						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// If photo too high, we moved completely on new page
-						{
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 							$pdf->AddPage('', '', true);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 
 
-						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-						{
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
 							$posYAfterImage = $curY + $imglinesize['height'];
@@ -474,15 +475,13 @@ class pdf_espadon extends ModelePdfExpedition
 					}
 
 					// Description of product line
-					if ($this->getColumnStatus('desc'))
-					{
+					if ($this->getColumnStatus('desc')) {
 						$pdf->startTransaction();
 
 						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
 						$pageposafter = $pdf->getPage();
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
@@ -490,21 +489,23 @@ class pdf_espadon extends ModelePdfExpedition
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
 							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
 									//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -535,37 +536,31 @@ class pdf_espadon extends ModelePdfExpedition
 					// weight
 
 					$weighttxt = '';
-					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->weight)
-					{
+					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->weight) {
 						$weighttxt = round($object->lines[$i]->weight * $object->lines[$i]->qty_shipped, 5).' '.measuringUnitString(0, "weight", $object->lines[$i]->weight_units, 1);
 					}
 					$voltxt = '';
-					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->volume)
-					{
+					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->volume) {
 						$voltxt = round($object->lines[$i]->volume * $object->lines[$i]->qty_shipped, 5).' '.measuringUnitString(0, "volume", $object->lines[$i]->volume_units ? $object->lines[$i]->volume_units : 0, 1);
 					}
 
 
-					if ($this->getColumnStatus('weight'))
-					{
+					if ($this->getColumnStatus('weight')) {
 						$this->printStdColumnContent($pdf, $curY, 'weight', $weighttxt.(($weighttxt && $voltxt) ? '<br>' : '').$voltxt, array('html'=>1));
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-					if ($this->getColumnStatus('qty_asked'))
-					{
+					if ($this->getColumnStatus('qty_asked')) {
 						$this->printStdColumnContent($pdf, $curY, 'qty_asked', $object->lines[$i]->qty_asked);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-					if ($this->getColumnStatus('qty_shipped'))
-					{
+					if ($this->getColumnStatus('qty_shipped')) {
 						$this->printStdColumnContent($pdf, $curY, 'qty_shipped', $object->lines[$i]->qty_shipped);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-					if ($this->getColumnStatus('subprice'))
-					{
+					if ($this->getColumnStatus('subprice')) {
 						$this->printStdColumnContent($pdf, $curY, 'subprice', price($object->lines[$i]->subprice, 0, $outputlangs));
 						$nexY = max($pdf->GetY(), $nexY);
 					}
@@ -573,8 +568,7 @@ class pdf_espadon extends ModelePdfExpedition
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-							if ($this->getColumnStatus($extrafieldColKey))
-							{
+							if ($this->getColumnStatus($extrafieldColKey)) {
 								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
@@ -583,8 +577,7 @@ class pdf_espadon extends ModelePdfExpedition
 					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -593,11 +586,9 @@ class pdf_espadon extends ModelePdfExpedition
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -606,12 +597,12 @@ class pdf_espadon extends ModelePdfExpedition
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -619,15 +610,18 @@ class pdf_espadon extends ModelePdfExpedition
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -640,7 +634,9 @@ class pdf_espadon extends ModelePdfExpedition
 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -651,14 +647,14 @@ class pdf_espadon extends ModelePdfExpedition
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -704,8 +700,11 @@ class pdf_espadon extends ModelePdfExpedition
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) $largcol2 = ($this->posxqtyordered - $this->posxweightvol);
-		else $largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
+			$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
+		} else {
+			$largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		}
 
 		$useborder = 0;
 		$index = 0;
@@ -720,53 +719,53 @@ class pdf_espadon extends ModelePdfExpedition
 		$totalOrdered = $tmparray['ordered'];
 		$totalToShip = $tmparray['toship'];
 		// Set trueVolume and volume_units not currently stored into database
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
-		{
+		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
 			$object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
 			$object->volume_units = $object->size_units * 3;
 		}
 
-		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
-		if ($totalVolume != '') $totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
-		if ($object->trueWeight) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
-		if ($object->trueVolume) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		if ($totalWeight != '') {
+			$totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		}
+		if ($totalVolume != '') {
+			$totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
+		}
+		if ($object->trueWeight) {
+			$totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+		}
+		if ($object->trueVolume) {
+			$totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		}
 
 
 
 
-		if ($this->getColumnStatus('desc'))
-		{
+		if ($this->getColumnStatus('desc')) {
 			$this->printStdColumnContent($pdf, $tab2_top, 'desc', $outputlangs->transnoentities("Total"));
 		}
 
 
-		if ($this->getColumnStatus('weight'))
-		{
-			if ($totalWeighttoshow)
-			{
+		if ($this->getColumnStatus('weight')) {
+			if ($totalWeighttoshow) {
 				$this->printStdColumnContent($pdf, $tab2_top, 'weight', $totalWeighttoshow);
 				$index++;
 			}
 
-			if ($totalVolumetoshow)
-			{
+			if ($totalVolumetoshow) {
 				$y = $tab2_top + ($tab2_hl * $index);
 				$this->printStdColumnContent($pdf, $y, 'weight', $totalVolumetoshow);
 			}
 		}
 
-		if ($this->getColumnStatus('qty_asked') && $totalOrdered)
-		{
+		if ($this->getColumnStatus('qty_asked') && $totalOrdered) {
 			$this->printStdColumnContent($pdf, $tab2_top, 'qty_asked', $totalOrdered);
 		}
 
-		if ($this->getColumnStatus('qty_shipped') && $totalToShip)
-		{
+		if ($this->getColumnStatus('qty_shipped') && $totalToShip) {
 			$this->printStdColumnContent($pdf, $tab2_top, 'qty_shipped', $totalToShip);
 		}
 
-		if ($this->getColumnStatus('subprice'))
-		{
+		if ($this->getColumnStatus('subprice')) {
 			$this->printStdColumnContent($pdf, $tab2_top, 'subprice', price($object->total_ht, 0, $outputlangs));
 		}
 
@@ -794,7 +793,9 @@ class pdf_espadon extends ModelePdfExpedition
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -803,8 +804,7 @@ class pdf_espadon extends ModelePdfExpedition
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
 			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
 				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
@@ -846,8 +846,7 @@ class pdf_espadon extends ModelePdfExpedition
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
 					pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
 		}
 
@@ -864,10 +863,8 @@ class pdf_espadon extends ModelePdfExpedition
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -882,23 +879,20 @@ class pdf_espadon extends ModelePdfExpedition
 		}
 
 		// Show barcode
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			$posx = 105;
 		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
@@ -923,16 +917,14 @@ class pdf_espadon extends ModelePdfExpedition
 		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("RefSending")." : ".$object->ref, '', 'R');
 
 		// Date planned delivery
-		if (!empty($object->date_delivery))
-		{
+		if (!empty($object->date_delivery)) {
 				$posy += 4;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if (!empty($object->thirdparty->code_client))
-		{
+		if (!empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -948,20 +940,20 @@ class pdf_espadon extends ModelePdfExpedition
 		$origin_id = $object->origin_id;
 
 		// TODO move to external function
-		if (!empty($conf->$origin->enabled))     // commonly $origin='commande'
-		{
+		if (!empty($conf->$origin->enabled)) {     // commonly $origin='commande'
 			$outputlangs->load('orders');
 
 			$classname = ucfirst($origin);
 			$linkedobject = new $classname($this->db);
 			$result = $linkedobject->fetch($origin_id);
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				//$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
 
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$text = $linkedobject->ref;
-				if ($linkedobject->ref_client) $text .= ' ('.$linkedobject->ref_client.')';
+				if ($linkedobject->ref_client) {
+					$text .= ' ('.$linkedobject->ref_client.')';
+				}
 				$Yoff = $Yoff + 8;
 				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w, $Yoff);
 				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), 0, 'R');
@@ -971,25 +963,27 @@ class pdf_espadon extends ModelePdfExpedition
 			}
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-		 	// Add internal contact of origin element if defined
+			// Add internal contact of origin element if defined
 			$arrayidcontact = array();
-			if (!empty($origin) && is_object($object->$origin)) $arrayidcontact = $object->$origin->getIdContact('internal', 'SALESREPFOLL');
-		 	if (is_array($arrayidcontact) && count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user(reset($arrayidcontact));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
+			if (!empty($origin) && is_object($object->$origin)) {
+				$arrayidcontact = $object->$origin->getIdContact('internal', 'SALESREPFOLL');
+			}
+			if (is_array($arrayidcontact) && count($arrayidcontact) > 0) {
+				$object->fetch_user(reset($arrayidcontact));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 
 			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -1020,8 +1014,7 @@ class pdf_espadon extends ModelePdfExpedition
 			// If SHIPPING contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->$origin->getIdContact('external', 'SHIPPING');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1039,10 +1032,14 @@ class pdf_espadon extends ModelePdfExpedition
 
 			// Show recipient
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1111,22 +1108,22 @@ class pdf_espadon extends ModelePdfExpedition
 		);
 
 		/*
-	     * For exemple
-	     $this->cols['theColKey'] = array(
-	     'rank' => $rank, // int : use for ordering columns
-	     'width' => 20, // the column width in mm
-	     'title' => array(
-	     'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	     'label' => ' ', // the final label : used fore final generated text
-	     'align' => 'L', // text alignement :  R,C,L
-	     'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	     ),
-	     'content' => array(
-	     'align' => 'L', // text alignement :  R,C,L
-	     'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	     ),
-	     );
-	     */
+		 * For exemple
+		 $this->cols['theColKey'] = array(
+		 'rank' => $rank, // int : use for ordering columns
+		 'width' => 20, // the column width in mm
+		 'title' => array(
+		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+		 'label' => ' ', // the final label : used fore final generated text
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 'content' => array(
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 );
+		 */
 
 		$rank = 0; // do not use negative rank
 		$this->cols['desc'] = array(
@@ -1160,8 +1157,7 @@ class pdf_espadon extends ModelePdfExpedition
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE) && !empty($this->atleastonephoto))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE) && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -1242,11 +1238,9 @@ class pdf_espadon extends ModelePdfExpedition
 		);
 
 		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-		if ($reshook < 0)
-		{
+		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		} elseif (empty($reshook))
-		{
+		} elseif (empty($reshook)) {
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 144167e8912..af73123b2d5 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -144,7 +144,9 @@ class pdf_merou extends ModelePdfExpedition
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -167,15 +169,18 @@ class pdf_merou extends ModelePdfExpedition
 
 		$object->fetch_thirdparty();
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
 
-		if ($conf->expedition->dir_output)
-		{
+		if ($conf->expedition->dir_output) {
 			$object->fetch_thirdparty();
 
 			$origin = $object->origin;
@@ -186,16 +191,19 @@ class pdf_merou extends ModelePdfExpedition
 			//Create recipient
 			$idcontact = $object->$origin->getIdContact('external', 'SHIPPING');
 			$this->destinataire = new Contact($this->db);
-			if (!empty($idcontact[0])) $this->destinataire->fetch($idcontact[0]);
+			if (!empty($idcontact[0])) {
+				$this->destinataire->fetch($idcontact[0]);
+			}
 
 			//Create deliverer
 			$idcontact = $object->$origin->getIdContact('internal', 'LIVREUR');
 			$this->livreur = new User($this->db);
-			if (!empty($idcontact[0])) $this->livreur->fetch($idcontact[0]);
+			if (!empty($idcontact[0])) {
+				$this->livreur->fetch($idcontact[0]);
+			}
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -204,20 +212,16 @@ class pdf_merou extends ModelePdfExpedition
 				$file = $dir."/".$expref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -233,18 +237,18 @@ class pdf_merou extends ModelePdfExpedition
 				$heightforinfotot = 0; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -253,14 +257,18 @@ class pdf_merou extends ModelePdfExpedition
 				$pagenb = 0;
 				$pdf->SetDrawColor(128, 128, 128);
 
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
@@ -278,8 +286,7 @@ class pdf_merou extends ModelePdfExpedition
 				$tab_height_newpage = $this->page_hauteur - $tab_top_newpage - $heightforfooter;
 
 				// Display notes
-				if (!empty($object->note_public))
-				{
+				if (!empty($object->note_public)) {
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $tab_top, dol_htmlentitiesbr($object->note_public), 0, 1);
 					$nexY = $pdf->GetY();
@@ -306,8 +313,7 @@ class pdf_merou extends ModelePdfExpedition
 
 				$num = count($object->lines);
 				// Loop on each lines
-				for ($i = 0; $i < $num; $i++)
-				{
+				for ($i = 0; $i < $num; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 3);
 					$pdf->SetTextColor(0, 0, 0);
@@ -349,8 +355,7 @@ class pdf_merou extends ModelePdfExpedition
 					$pdf->MultiCell(30, 3, $object->lines[$i]->qty_shipped, 0, 'C', 0);
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -361,11 +366,9 @@ class pdf_merou extends ModelePdfExpedition
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -375,10 +378,8 @@ class pdf_merou extends ModelePdfExpedition
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage - 1, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -391,8 +392,7 @@ class pdf_merou extends ModelePdfExpedition
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -402,15 +402,16 @@ class pdf_merou extends ModelePdfExpedition
 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
 				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -418,14 +419,14 @@ class pdf_merou extends ModelePdfExpedition
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -461,8 +462,7 @@ class pdf_merou extends ModelePdfExpedition
 		// Translations
 		$langs->loadLangs(array("main", "bills", "orders"));
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY(10, $tab_top);
 			$pdf->MultiCell(10, 5, "LS", 0, 'C', 1);
@@ -530,8 +530,7 @@ class pdf_merou extends ModelePdfExpedition
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 			//Affiche le filigrane brouillon - Print Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SENDING_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->SENDING_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SENDING_DRAFT_WATERMARK);
 		}
 
@@ -549,10 +548,8 @@ class pdf_merou extends ModelePdfExpedition
 		//*********************LOGO****************************
 		$pdf->SetXY(11, 7);
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, 10, 5, 0, $height); // width=0 (auto)
 			} else {
@@ -611,8 +608,7 @@ class pdf_merou extends ModelePdfExpedition
 		$pdf->MultiCell(80, 2, $carac_emetteur, 0, 'L');
 
 
-		if ($object->thirdparty->code_client)
-		{
+		if ($object->thirdparty->code_client) {
 			$Yoff += 3;
 			$posy = $Yoff;
 			$pdf->SetXY($Xoff, $posy);
@@ -638,21 +634,17 @@ class pdf_merou extends ModelePdfExpedition
 		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetTextColor(0, 0, 0);
 
-		if (!empty($object->tracking_number))
-		{
+		if (!empty($object->tracking_number)) {
 			$object->getUrlTrackingStatus($object->tracking_number);
-			if (!empty($object->tracking_url))
-			{
-				if ($object->shipping_method_id > 0)
-				{
+			if (!empty($object->tracking_url)) {
+				if ($object->shipping_method_id > 0) {
 					// Get code using getLabelFromKey
 					$code = $outputlangs->getLabelFromKey($this->db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 
 					$label = '';
 					$label .= $outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
 					//var_dump($object->tracking_url != $object->tracking_number);exit;
-					if ($object->tracking_url != $object->tracking_number)
-					{
+					if ($object->tracking_url != $object->tracking_number) {
 						$label .= " : ";
 						$label .= $object->tracking_url;
 					}
@@ -677,8 +669,7 @@ class pdf_merou extends ModelePdfExpedition
 		// If SHIPPING contact defined on order, we use it
 		$usecontact = false;
 		$arrayidcontact = $object->$origin->getIdContact('external', 'SHIPPING');
-		if (count($arrayidcontact) > 0)
-		{
+		if (count($arrayidcontact) > 0) {
 			$usecontact = true;
 			$result = $object->fetch_contact($arrayidcontact[0]);
 		}
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 62213127951..4cf93a31b55 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -144,7 +144,9 @@ class pdf_rouget extends ModelePdfExpedition
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
@@ -161,7 +163,9 @@ class pdf_rouget extends ModelePdfExpedition
 			$this->posxtotalht = $this->page_largeur - $this->marge_droite - 20;
 		}
 
-		if (!empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME)) $this->posxweightvol = $this->posxqtyordered;
+		if (!empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME)) {
+			$this->posxweightvol = $this->posxqtyordered;
+		}
 
 		$this->posxpicture = $this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 
@@ -199,9 +203,13 @@ class pdf_rouget extends ModelePdfExpedition
 
 		$object->fetch_thirdparty();
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
@@ -210,18 +218,17 @@ class pdf_rouget extends ModelePdfExpedition
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE)) {
 			$objphoto = new Product($this->db);
 
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
@@ -234,8 +241,7 @@ class pdf_rouget extends ModelePdfExpedition
 				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
 					if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {
 						// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-						if ($obj['photo_vignette'])
-						{
+						if ($obj['photo_vignette']) {
 							$filename = $obj['photo_vignette'];
 						} else {
 							$filename = $obj['photo'];
@@ -248,17 +254,19 @@ class pdf_rouget extends ModelePdfExpedition
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i] = $realpath;
+				if ($realpath) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxweightvol;
+		}
 
-		if ($conf->expedition->dir_output)
-		{
+		if ($conf->expedition->dir_output) {
 			// Definition de $dir et $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->expedition->dir_output."/sending";
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -267,20 +275,16 @@ class pdf_rouget extends ModelePdfExpedition
 				$file = $dir."/".$expref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -297,18 +301,18 @@ class pdf_rouget extends ModelePdfExpedition
 				$heightforinfotot = 8; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -317,20 +321,26 @@ class pdf_rouget extends ModelePdfExpedition
 				$pagenb = 0;
 				$pdf->SetDrawColor(128, 128, 128);
 
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -344,11 +354,9 @@ class pdf_rouget extends ModelePdfExpedition
 
 				// Incoterm
 				$height_incoterms = 0;
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top = 88;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -365,8 +373,7 @@ class pdf_rouget extends ModelePdfExpedition
 					}
 				}
 
-				if (!empty($object->note_public) || !empty($object->tracking_number))
-				{
+				if (!empty($object->note_public) || !empty($object->tracking_number)) {
 					$tab_top = 88 + $height_incoterms;
 					$tab_top_alt = $tab_top;
 
@@ -375,24 +382,22 @@ class pdf_rouget extends ModelePdfExpedition
 					//$tab_top_alt += 1;
 
 					// Tracking number
-					if (!empty($object->tracking_number))
-					{
+					if (!empty($object->tracking_number)) {
 						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
 						$tab_top_alt = $pdf->GetY();
 
 						$object->getUrlTrackingStatus($object->tracking_number);
-						if (!empty($object->tracking_url))
-						{
-							if ($object->shipping_method_id > 0)
-							{
+						if (!empty($object->tracking_url)) {
+							if ($object->shipping_method_id > 0) {
 								// Get code using getLabelFromKey
 								$code = $outputlangs->getLabelFromKey($this->db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 								$label = '';
-								if ($object->tracking_url != $object->tracking_number) $label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								if ($object->tracking_url != $object->tracking_number) {
+									$label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								}
 								$label .= $outputlangs->trans("SendingMethod").": ".$outputlangs->trans("SendingMethod".strtoupper($code));
 								//var_dump($object->tracking_url != $object->tracking_number);exit;
-								if ($object->tracking_url != $object->tracking_number)
-								{
+								if ($object->tracking_url != $object->tracking_number) {
 									$label .= " : ";
 									$label .= $object->tracking_url;
 								}
@@ -405,8 +410,7 @@ class pdf_rouget extends ModelePdfExpedition
 					}
 
 					// Notes
-					if (!empty($object->note_public))
-					{
+					if (!empty($object->note_public)) {
 						$pdf->SetFont('', '', $default_font_size - 1); // Dans boucle pour gerer multi-page
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top_alt, dol_htmlentitiesbr($object->note_public), 0, 1);
 					}
@@ -429,15 +433,16 @@ class pdf_rouget extends ModelePdfExpedition
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -448,23 +453,27 @@ class pdf_rouget extends ModelePdfExpedition
 					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 						$pdf->AddPage('', '', true);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
 
 						// Allows data in the first page if description is long enough to break in multiples pages
-						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 							$showpricebeforepagebreak = 1;
-						else $showpricebeforepagebreak = 0;
+						} else {
+							$showpricebeforepagebreak = 0;
+						}
 					}
 
-					if (isset($imglinesize['width']) && isset($imglinesize['height']))
-					{
+					if (isset($imglinesize['width']) && isset($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
 						$pdf->Image($realpatharray[$i], $curX + (($this->posxweightvol - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
@@ -478,8 +487,7 @@ class pdf_rouget extends ModelePdfExpedition
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -489,22 +497,26 @@ class pdf_rouget extends ModelePdfExpedition
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -533,36 +545,30 @@ class pdf_rouget extends ModelePdfExpedition
 
 					$pdf->SetXY($this->posxweightvol, $curY);
 					$weighttxt = '';
-					if (empty($object->lines[$i]->fk_product_type) && $object->lines[$i]->weight)
-					{
+					if (empty($object->lines[$i]->fk_product_type) && $object->lines[$i]->weight) {
 						$weighttxt = round($object->lines[$i]->weight * $object->lines[$i]->qty_shipped, 5).' '.measuringUnitString(0, "weight", $object->lines[$i]->weight_units, 1);
 					}
 					$voltxt = '';
-					if (empty($object->lines[$i]->fk_product_type) && $object->lines[$i]->volume)
-					{
+					if (empty($object->lines[$i]->fk_product_type) && $object->lines[$i]->volume) {
 						$voltxt = round($object->lines[$i]->volume * $object->lines[$i]->qty_shipped, 5).' '.measuringUnitString(0, "volume", $object->lines[$i]->volume_units ? $object->lines[$i]->volume_units : 0, 1);
 					}
 
-					if (empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME))
-					{
+					if (empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME)) {
 						$pdf->writeHTMLCell($this->posxqtyordered - $this->posxweightvol + 2, 3, $this->posxweightvol - 1, $curY, $weighttxt.(($weighttxt && $voltxt) ? '<br>' : '').$voltxt, 0, 0, false, true, 'C');
 						//$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
 					}
 
-					if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
-					{
+					if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
 						$pdf->SetXY($this->posxqtyordered, $curY);
 						$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 3, $object->lines[$i]->qty_asked, '', 'C');
 					}
 
-					if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP))
-					{
+					if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP)) {
 						$pdf->SetXY($this->posxqtytoship, $curY);
 						$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 3, $object->lines[$i]->qty_shipped, '', 'C');
 					}
 
-					if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT))
-					{
+					if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT)) {
 						$pdf->SetXY($this->posxpuht, $curY);
 						$pdf->MultiCell(($this->posxtotalht - $this->posxpuht - 1), 3, price($object->lines[$i]->subprice, 0, $outputlangs), '', 'R');
 
@@ -571,11 +577,12 @@ class pdf_rouget extends ModelePdfExpedition
 					}
 
 					$nexY += 3;
-					if ($weighttxt && $voltxt) $nexY += 2;
+					if ($weighttxt && $voltxt) {
+						$nexY += 2;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -584,11 +591,9 @@ class pdf_rouget extends ModelePdfExpedition
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -597,12 +602,12 @@ class pdf_rouget extends ModelePdfExpedition
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -610,15 +615,18 @@ class pdf_rouget extends ModelePdfExpedition
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -631,7 +639,9 @@ class pdf_rouget extends ModelePdfExpedition
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -642,14 +652,14 @@ class pdf_rouget extends ModelePdfExpedition
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -695,8 +705,11 @@ class pdf_rouget extends ModelePdfExpedition
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) $largcol2 = ($this->posxqtyordered - $this->posxweightvol);
-		else $largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
+			$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
+		} else {
+			$largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		}
 
 		$useborder = 0;
 		$index = 0;
@@ -711,35 +724,39 @@ class pdf_rouget extends ModelePdfExpedition
 		$totalOrdered = $tmparray['ordered'];
 		$totalToShip = $tmparray['toship'];
 		// Set trueVolume and volume_units not currently stored into database
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
-		{
+		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
 			$object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
 			$object->volume_units = $object->size_units * 3;
 		}
 
-		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
-		if ($totalVolume != '') $totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
-		if (!empty($object->trueWeight)) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
-		if (!empty($object->trueVolume)) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		if ($totalWeight != '') {
+			$totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		}
+		if ($totalVolume != '') {
+			$totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
+		}
+		if (!empty($object->trueWeight)) {
+			$totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+		}
+		if (!empty($object->trueVolume)) {
+			$totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		}
 
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
 
-		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
-		{
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
 			$pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
 		}
 
-		if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP))
-		{
+		if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP)) {
 			$pdf->SetXY($this->posxqtytoship, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($this->posxpuht - $this->posxqtytoship, $tab2_hl, $totalToShip, 0, 'C', 1);
 		}
 
-		if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT))
-		{
+		if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT)) {
 			$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
 
@@ -747,24 +764,23 @@ class pdf_rouget extends ModelePdfExpedition
 			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
 		}
 
-		if (empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME))
-		{
+		if (empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME)) {
 			// Total Weight
-			if ($totalWeighttoshow)
-			{
+			if ($totalWeighttoshow) {
 				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
 
 				$index++;
 			}
-			if ($totalVolumetoshow)
-			{
+			if ($totalVolumetoshow) {
 				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
 
 				$index++;
 			}
-			if (!$totalWeighttoshow && !$totalVolumetoshow) $index++;
+			if (!$totalWeighttoshow && !$totalVolumetoshow) {
+				$index++;
+			}
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
@@ -791,7 +807,9 @@ class pdf_rouget extends ModelePdfExpedition
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -805,39 +823,32 @@ class pdf_rouget extends ModelePdfExpedition
 		$pdf->SetDrawColor(128, 128, 128);
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqtyordered - $this->posxdesc, 2, $outputlangs->transnoentities("Description"), '', 'L');
 		}
 
-		if (empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME))
-		{
+		if (empty($conf->global->SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME)) {
 			$pdf->line($this->posxweightvol - 1, $tab_top, $this->posxweightvol - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxweightvol - 1, $tab_top + 1);
 				$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 2, $outputlangs->transnoentities("WeightVolShort"), '', 'C');
 			}
 		}
 
-		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED))
-		{
+		if (empty($conf->global->SHIPPING_PDF_HIDE_ORDERED)) {
 			$pdf->line($this->posxqtyordered - 1, $tab_top, $this->posxqtyordered - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxqtyordered - 1, $tab_top + 1);
 				$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"), '', 'C');
 			}
 		}
 
-		if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP))
-		{
+		if (empty($conf->global->SHIPPING_PDF_HIDE_QTYTOSHIP)) {
 			$pdf->line($this->posxqtytoship - 1, $tab_top, $this->posxqtytoship - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxqtytoship, $tab_top + 1);
 				$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 2, $outputlangs->transnoentities("QtyToShip"), '', 'C');
 			}
@@ -845,15 +856,13 @@ class pdf_rouget extends ModelePdfExpedition
 
 		if (!empty($conf->global->SHIPPING_PDF_DISPLAY_AMOUNT_HT)) {
 			$pdf->line($this->posxpuht - 1, $tab_top, $this->posxpuht - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxpuht - 1, $tab_top + 1);
 				$pdf->MultiCell(($this->posxtotalht - $this->posxpuht), 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 			}
 
 			$pdf->line($this->posxtotalht - 1, $tab_top, $this->posxtotalht - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtotalht - 1, $tab_top + 1);
 				$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxtotalht), 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 			}
@@ -881,8 +890,7 @@ class pdf_rouget extends ModelePdfExpedition
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
 					pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
 		}
 
@@ -899,10 +907,8 @@ class pdf_rouget extends ModelePdfExpedition
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -917,23 +923,20 @@ class pdf_rouget extends ModelePdfExpedition
 		}
 
 		// Show barcode
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			$posx = 105;
 		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
@@ -958,16 +961,14 @@ class pdf_rouget extends ModelePdfExpedition
 		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("RefSending")." : ".$object->ref, '', 'R');
 
 		// Date planned delivery
-		if (!empty($object->date_delivery))
-		{
+		if (!empty($object->date_delivery)) {
 				$posy += 4;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if (!empty($object->thirdparty->code_client))
-		{
+		if (!empty($object->thirdparty->code_client)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -983,20 +984,20 @@ class pdf_rouget extends ModelePdfExpedition
 		$origin_id = $object->origin_id;
 
 		// TODO move to external function
-		if (!empty($conf->$origin->enabled))     // commonly $origin='commande'
-		{
+		if (!empty($conf->$origin->enabled)) {     // commonly $origin='commande'
 			$outputlangs->load('orders');
 
 			$classname = ucfirst($origin);
 			$linkedobject = new $classname($this->db);
 			$result = $linkedobject->fetch($origin_id);
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				//$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
 
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$text = $linkedobject->ref;
-				if ($linkedobject->ref_client) $text .= ' ('.$linkedobject->ref_client.')';
+				if ($linkedobject->ref_client) {
+					$text .= ' ('.$linkedobject->ref_client.')';
+				}
 				$Yoff = $Yoff + 8;
 				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w, $Yoff);
 				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), 0, 'R');
@@ -1006,25 +1007,27 @@ class pdf_rouget extends ModelePdfExpedition
 			}
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-		 	// Add internal contact of origin element if defined
+			// Add internal contact of origin element if defined
 			$arrayidcontact = array();
-			if (!empty($origin) && is_object($object->$origin)) $arrayidcontact = $object->$origin->getIdContact('internal', 'SALESREPFOLL');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user(reset($arrayidcontact));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
+			if (!empty($origin) && is_object($object->$origin)) {
+				$arrayidcontact = $object->$origin->getIdContact('internal', 'SALESREPFOLL');
+			}
+			if (count($arrayidcontact) > 0) {
+				$object->fetch_user(reset($arrayidcontact));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 
 			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -1055,8 +1058,7 @@ class pdf_rouget extends ModelePdfExpedition
 			// If SHIPPING contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->$origin->getIdContact('external', 'SHIPPING');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1074,10 +1076,14 @@ class pdf_rouget extends ModelePdfExpedition
 
 			// Show recipient
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index 6e13e4e3186..0303dfde3dc 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -96,18 +96,17 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$old_code_type = $mysoc->typent_code;
 		$mysoc->code_client = 'CCCCCCCCCC';
 		$mysoc->typent_code = 'TTTTTTTTTT';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -128,8 +127,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 
 		$mask = $conf->global->EXPEDITION_RIBERA_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/expedition/mod_expedition_safor.php b/htdocs/core/modules/expedition/mod_expedition_safor.php
index 0edd59642c0..04cc09c2313 100644
--- a/htdocs/core/modules/expedition/mod_expedition_safor.php
+++ b/htdocs/core/modules/expedition/mod_expedition_safor.php
@@ -62,7 +62,7 @@ class mod_expedition_safor extends ModelNumRefExpedition
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -95,13 +95,13 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -128,11 +128,13 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_expedition_safor::getNextValue", LOG_DEBUG);
 			return -1;
@@ -141,8 +143,11 @@ class mod_expedition_safor extends ModelNumRefExpedition
 		$date = time();
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_expedition_safor::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php
index 4305f8336e7..ce210d6a958 100644
--- a/htdocs/core/modules/expedition/modules_expedition.php
+++ b/htdocs/core/modules/expedition/modules_expedition.php
@@ -142,10 +142,18 @@ abstract class ModelNumRefExpedition
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index 8495aba945d..9984a9ccc24 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -165,7 +165,9 @@ class pdf_standard extends ModeleExpenseReport
 		// Get source company
 		$this->emetteur = $mysoc;
 
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxpiece = $this->marge_gauche + 1;
@@ -183,8 +185,7 @@ class pdf_standard extends ModeleExpenseReport
 		//     $this->posxqty-=20;
 		//     $this->postotalttc-=20;
 		// }
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxdate -= 20;
 			$this->posxtype -= 20;
 			$this->posxprojet -= 20;
@@ -218,9 +219,13 @@ class pdf_standard extends ModeleExpenseReport
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "trips", "projects", "dict", "bills", "banks"));
@@ -238,20 +243,16 @@ class pdf_standard extends ModeleExpenseReport
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -266,19 +267,19 @@ class pdf_standard extends ModeleExpenseReport
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 12; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -292,13 +293,17 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Trips"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -312,19 +317,18 @@ class pdf_standard extends ModeleExpenseReport
 
 				// Show notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
@@ -408,16 +412,22 @@ class pdf_standard extends ModeleExpenseReport
 							if ($i == ($nblines - 1)) {
 								// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -450,12 +460,10 @@ class pdf_standard extends ModeleExpenseReport
 					$nexY += ($pdf->getFontSize() * 1.3); // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -464,12 +472,12 @@ class pdf_standard extends ModeleExpenseReport
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -477,9 +485,13 @@ class pdf_standard extends ModeleExpenseReport
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
@@ -503,8 +515,7 @@ class pdf_standard extends ModeleExpenseReport
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - 180, 5, price($object->total_ht), 1, 'R');
 				$pdf->SetFillColor(248, 248, 248);
 
-				if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-				{
+				if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 					// TODO Show vat amout per tax level
 					$posy += 5;
 					$pdf->SetXY(130, $posy);
@@ -530,7 +541,9 @@ class pdf_standard extends ModeleExpenseReport
 
 				// Page footer
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -541,14 +554,14 @@ class pdf_standard extends ModeleExpenseReport
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -676,7 +689,7 @@ class pdf_standard extends ModeleExpenseReport
 
 		// Draft watermark
 		if ($object->fk_statut == 0 && !empty($conf->global->EXPENSEREPORT_DRAFT_WATERMARK)) {
- 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->EXPENSEREPORT_DRAFT_WATERMARK);
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->EXPENSEREPORT_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -706,35 +719,35 @@ class pdf_standard extends ModeleExpenseReport
 
 		$pdf->SetFont('', 'B', $default_font_size + 4);
 		$pdf->SetXY($posx, $posy);
-   		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 6, $langs->trans("ExpenseReport"), 0, 'R');
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-   		// Ref complete
-   		$posy += 8;
-   		$pdf->SetXY($posx, $posy);
-   		$pdf->SetTextColor(0, 0, 60);
-   		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("Ref")." : ".$object->ref, '', 'R');
+		// Ref complete
+		$posy += 8;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("Ref")." : ".$object->ref, '', 'R');
 
-   		// Date start period
-   		$posy += 5;
-   		$pdf->SetXY($posx, $posy);
-   		$pdf->SetTextColor(0, 0, 60);
-   		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateStart")." : ".($object->date_debut > 0 ?dol_print_date($object->date_debut, "day", false, $outputlangs) : ''), '', 'R');
+		// Date start period
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateStart")." : ".($object->date_debut > 0 ?dol_print_date($object->date_debut, "day", false, $outputlangs) : ''), '', 'R');
 
-   		// Date end period
-   		$posy += 5;
-   		$pdf->SetXY($posx, $posy);
-   		$pdf->SetTextColor(0, 0, 60);
-   		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateEnd")." : ".($object->date_fin > 0 ?dol_print_date($object->date_fin, "day", false, $outputlangs) : ''), '', 'R');
+		// Date end period
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities("DateEnd")." : ".($object->date_fin > 0 ?dol_print_date($object->date_fin, "day", false, $outputlangs) : ''), '', 'R');
 
-   		// Status Expense Report
-   		$posy += 6;
-   		$pdf->SetXY($posx, $posy);
-   		$pdf->SetFont('', 'B', $default_font_size + 2);
-   		$pdf->SetTextColor(111, 81, 124);
-   		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities($object->statuts_short[$object->status]), '', 'R');
+		// Status Expense Report
+		$posy += 6;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetTextColor(111, 81, 124);
+		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $posx, 3, $outputlangs->transnoentities($object->statuts_short[$object->status]), '', 'R');
 
 		if ($showaddress) {
 			// Sender properties
@@ -742,10 +755,18 @@ class pdf_standard extends ModeleExpenseReport
 			$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($this->emetteur->address);
 			$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($this->emetteur->zip).' '.$outputlangs->convToOutputCharset($this->emetteur->town);
 			$carac_emetteur .= "\n";
-			if ($this->emetteur->phone) $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($this->emetteur->phone);
-			if ($this->emetteur->fax) $carac_emetteur .= ($carac_emetteur ? ($this->emetteur->tel ? " - " : "\n") : '').$outputlangs->transnoentities("Fax")." : ".$outputlangs->convToOutputCharset($this->emetteur->fax);
-			if ($this->emetteur->email) $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->emetteur->email);
-			if ($this->emetteur->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Web")." : ".$outputlangs->convToOutputCharset($this->emetteur->url);
+			if ($this->emetteur->phone) {
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Phone")." : ".$outputlangs->convToOutputCharset($this->emetteur->phone);
+			}
+			if ($this->emetteur->fax) {
+				$carac_emetteur .= ($carac_emetteur ? ($this->emetteur->tel ? " - " : "\n") : '').$outputlangs->transnoentities("Fax")." : ".$outputlangs->convToOutputCharset($this->emetteur->fax);
+			}
+			if ($this->emetteur->email) {
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($this->emetteur->email);
+			}
+			if ($this->emetteur->url) {
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Web")." : ".$outputlangs->convToOutputCharset($this->emetteur->url);
+			}
 
 			// Receiver Properties
 			$receiver = new User($this->db);
@@ -756,14 +777,20 @@ class pdf_standard extends ModeleExpenseReport
 			$expense_receiver .= ($expense_receiver ? "\n" : '').$outputlangs->convToOutputCharset($receiver->address);
 			$expense_receiver .= ($expense_receiver ? "\n" : '').$outputlangs->convToOutputCharset($receiver->zip).' '.$outputlangs->convToOutputCharset($receiver->town);
 			$expense_receiver .= "\n";
-			if ($receiver->email) $expense_receiver .= ($expense_receiver ? "\n" : '').$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($receiver->email);
-			if ($receiver_account->iban) $expense_receiver .= ($expense_receiver ? "\n" : '').$outputlangs->transnoentities("IBAN")." : ".$outputlangs->convToOutputCharset($receiver_account->iban);
+			if ($receiver->email) {
+				$expense_receiver .= ($expense_receiver ? "\n" : '').$outputlangs->transnoentities("Email")." : ".$outputlangs->convToOutputCharset($receiver->email);
+			}
+			if ($receiver_account->iban) {
+				$expense_receiver .= ($expense_receiver ? "\n" : '').$outputlangs->transnoentities("IBAN")." : ".$outputlangs->convToOutputCharset($receiver_account->iban);
+			}
 
 			// Show sender
 			$posy = 50;
 			$posx = $this->marge_gauche;
 			$hautcadre = 40;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = 118;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = 118;
+			}
 
 			// Show sender frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -795,7 +822,9 @@ class pdf_standard extends ModeleExpenseReport
 			// Show recipient
 			$posy = 50;
 			$posx = 100;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -889,7 +918,9 @@ class pdf_standard extends ModeleExpenseReport
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1043,8 +1074,7 @@ class pdf_standard extends ModeleExpenseReport
 		$sql .= " ORDER BY dp";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$totalpaid = 0;
 			$i = 0;
@@ -1069,8 +1099,7 @@ class pdf_standard extends ModeleExpenseReport
 				$totalpaid += $row->amount;
 				$i++;
 			}
-			if ($num > 0 && $object->paid == 0)
-			{
+			if ($num > 0 && $object->paid == 0) {
 				$y += $tab3_height;
 
 				$pdf->SetXY($tab3_posx + 17, $tab3_top + $y);
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_jade.php b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
index e6e60741628..c80bd693620 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_jade.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_jade.php
@@ -96,13 +96,13 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -122,11 +122,9 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 		global $db, $conf;
 
 		// For backward compatibility and restore old behavior to get ref of expense report
-		if (!empty($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE))
-		{
+		if (!empty($conf->global->EXPENSEREPORT_USE_OLD_NUMBERING_RULE)) {
 			$fuser = null;
-			if ($object->fk_user_author > 0)
-			{
+			if ($object->fk_user_author > 0) {
 				$fuser = new User($db);
 				$fuser->fetch($object->fk_user_author);
 			}
@@ -158,13 +156,14 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 			$user_author_infos = dolGetFirstLastname($fuser->firstname, $fuser->lastname);
 
 			$prefix = "ER";
-			if (!empty($conf->global->EXPENSE_REPORT_PREFIX)) $prefix = $conf->global->EXPENSE_REPORT_PREFIX;
+			if (!empty($conf->global->EXPENSE_REPORT_PREFIX)) {
+				$prefix = $conf->global->EXPENSE_REPORT_PREFIX;
+			}
 			$newref = str_replace(' ', '_', $user_author_infos).$expld_car.$prefix.$newref.$expld_car.dol_print_date($object->date_debut, '%y%m%d');
 
 			$sqlbis = 'UPDATE '.MAIN_DB_PREFIX.'expensereport SET ref_number_int = '.$ref_number_int.' WHERE rowid = '.$object->id;
 			$resqlbis = $db->query($sqlbis);
-			if (!$resqlbis)
-			{
+			if (!$resqlbis) {
 				dol_print_error($resqlbis);
 				exit;
 			}
@@ -181,27 +180,31 @@ class mod_expensereport_jade extends ModeleNumRefExpenseReport
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_expensereport_jade::getNextValue", LOG_DEBUG);
 			return 0;
 		}
 
 		$date = $object->date_valid; // $object->date does not exists
-		if (empty($date))
-		{
+		if (empty($date)) {
 			$this->error = 'Date valid not defined';
 			return 0;
 		}
 
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_expensereport_jade::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index 4899383a97b..195667692f1 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -101,16 +101,15 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 	 */
 	public function getExample()
 	{
-	 	global $db, $conf, $langs, $user;
+		global $db, $conf, $langs, $user;
 
-	 	$exp = new ExpenseReport($db);
-	 	$exp->initAsSpecimen();
-	 	$exp->fk_user_author = $user->id;
+		$exp = new ExpenseReport($db);
+		$exp->initAsSpecimen();
+		$exp->fk_user_author = $user->id;
 
-	 	$numExample = $this->getNextValue($exp);
+		$numExample = $this->getNextValue($exp);
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -131,22 +130,19 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 		// We get cursor rule
 		$mask = $conf->global->EXPENSEREPORT_SAND_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
 
 		$date = $object->date_valid; // $object->date does not exists
-		if (empty($date))
-		{
+		if (empty($date)) {
 			$this->error = 'Date valid not defined';
 			return 0;
 		}
 
 		$fuser = null;
-		if ($object->fk_user_author > 0)
-		{
+		if ($object->fk_user_author > 0) {
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user_author);
 		}
diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php
index 12a6617cf72..c4d74d7b6d2 100644
--- a/htdocs/core/modules/expensereport/modules_expensereport.php
+++ b/htdocs/core/modules/expensereport/modules_expensereport.php
@@ -148,10 +148,16 @@ abstract class ModeleNumRefExpenseReport
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
-		else return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 }
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index 364f8562eb2..2d15f3999d0 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -69,7 +69,9 @@ class ExportCsv extends ModeleExports
 		$this->db = $db;
 
 		$this->separator = ',';
-		if (!empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) $this->separator = $conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		if (!empty($conf->global->EXPORT_CSV_SEPARATOR_TO_USE)) {
+			$this->separator = $conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+		}
 		$this->escape = '"';
 		$this->enclosure = '"';
 
@@ -175,8 +177,7 @@ class ExportCsv extends ModeleExports
 
 		$outputlangs->load("exports");
 		$this->handle = fopen($file, "wt");
-		if (!$this->handle)
-		{
+		if (!$this->handle) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFailToCreateFile", $file);
 			$ret = -1;
@@ -214,15 +215,13 @@ class ExportCsv extends ModeleExports
 		// phpcs:enable
 		global $conf;
 
-		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
-		{
+		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET)) {
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
 		} else {
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
-		foreach ($array_selected_sorted as $code => $value)
-		{
+		foreach ($array_selected_sorted as $code => $value) {
 			$newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
 			$newvalue = $this->csvClean($newvalue, $outputlangs->charset_output);
 
@@ -248,8 +247,7 @@ class ExportCsv extends ModeleExports
 		// phpcs:enable
 		global $conf;
 
-		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET))
-		{
+		if (!empty($conf->global->EXPORT_CSV_FORCE_CHARSET)) {
 			$outputlangs->charset_output = $conf->global->EXPORT_CSV_FORCE_CHARSET;
 		} else {
 			$outputlangs->charset_output = 'ISO-8859-1';
@@ -259,22 +257,27 @@ class ExportCsv extends ModeleExports
 
 		$reg = array();
 
-		foreach ($array_selected_sorted as $code => $value)
-		{
-			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
-			else $alias = substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('', 'Bad value for field with key='.$code.'. Try to redefine export.');
+		foreach ($array_selected_sorted as $code => $value) {
+			if (strpos($code, ' as ') == 0) {
+				$alias = str_replace(array('.', '-', '(', ')'), '_', $code);
+			} else {
+				$alias = substr($code, strpos($code, ' as ') + 4);
+			}
+			if (empty($alias)) {
+				dol_print_error('', 'Bad value for field with key='.$code.'. Try to redefine export.');
+			}
 
 			$newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory	// newvalue is now $outputlangs->charset_output encoded
 			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
 			// Translation newvalue
-			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) $newvalue = $outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) {
+				$newvalue = $outputlangs->transnoentities($reg[1]);
+			}
 
 			$newvalue = $this->csvClean($newvalue, $outputlangs->charset_output);
 
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
-			{
+			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) {
 				$array = unserialize($typefield);
 				$array = $array['options'];
 				$newvalue = $array[$newvalue];
@@ -330,32 +333,29 @@ class ExportCsv extends ModeleExports
 		$addquote = 0;
 
 		// Rule Dolibarr: No HTML
-   		//print $charset.' '.$newvalue."\n";
-   		//$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
-   		$newvalue = dol_htmlcleanlastbr($newvalue);
-   		//print $charset.' '.$newvalue."\n";
+		//print $charset.' '.$newvalue."\n";
+		//$newvalue=dol_string_nohtmltag($newvalue,0,$charset);
+		$newvalue = dol_htmlcleanlastbr($newvalue);
+		//print $charset.' '.$newvalue."\n";
 
 		// Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is on, we can keep record as it is but we must add quotes)
 		$oldvalue = $newvalue;
 		$newvalue = str_replace("\r", '', $newvalue);
 		$newvalue = str_replace("\n", '\n', $newvalue);
-		if (!empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue)
-		{
+		if (!empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue) {
 			// If strict use of CSV rules, we just add quote
 			$newvalue = $oldvalue;
 			$addquote = 1;
 		}
 
 		// Rule 2 CSV: If value contains ", we must escape with ", and add "
-		if (preg_match('/"/', $newvalue))
-		{
+		if (preg_match('/"/', $newvalue)) {
 			$addquote = 1;
 			$newvalue = str_replace('"', '""', $newvalue);
 		}
 
 		// Rule 3 CSV: If value contains separator, we must add "
-		if (preg_match('/'.$this->separator.'/', $newvalue))
-		{
+		if (preg_match('/'.$this->separator.'/', $newvalue)) {
 			$addquote = 1;
 		}
 
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index b93a0a0c8de..ed85493f04f 100644
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -89,8 +89,7 @@ class ExportExcel2007 extends ModeleExports
 
 		$this->disabled = 0;
 
-		if (empty($this->disabled))
-		{
+		if (empty($this->disabled)) {
 			require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
 			$this->label_lib = 'PhpSpreadSheet';
 			$this->version_lib = '1.6.0'; // No way to get info from library
@@ -183,8 +182,7 @@ class ExportExcel2007 extends ModeleExports
 		// phpcs:enable
 		global $user, $conf, $langs;
 
-		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-		{
+		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
 			$outputlangs->charset_output = 'ISO-8859-1'; // Because Excel 5 format is ISO
 		}
 
@@ -199,10 +197,8 @@ class ExportExcel2007 extends ModeleExports
 		require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php';
 		require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
 
-		if ($this->id == 'excel2007')
-		{
-			if (!class_exists('ZipArchive'))	// For Excel2007, PHPSpreadSheet may need ZipArchive
-			{
+		if ($this->id == 'excel2007') {
+			if (!class_exists('ZipArchive')) {	// For Excel2007, PHPSpreadSheet may need ZipArchive
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
 				return -1;
@@ -262,18 +258,17 @@ class ExportExcel2007 extends ModeleExports
 		if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
 			$this->col = 0;
 		}
-		foreach ($array_selected_sorted as $code => $value)
-		{
+		foreach ($array_selected_sorted as $code => $value) {
 			$alias = $array_export_fields_label[$code];
 			//print "dd".$alias;
-			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
-			if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL))
-			{
+			if (empty($alias)) {
+				dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+			}
+			if (!empty($conf->global->MAIN_USE_PHP_WRITEEXCEL)) {
 				$this->worksheet->write($this->row, $this->col, $outputlangs->transnoentities($alias), $formatheader);
 			} else {
 				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, $outputlangs->transnoentities($alias));
-				if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto')))		// Set autowidth for some types
-				{
+				if (!empty($array_types[$code]) && in_array($array_types[$code], array('Date', 'Numeric', 'TextAuto'))) {		// Set autowidth for some types
 					$this->workbook->getActiveSheet()->getColumnDimension($this->column2Letter($this->col + 1))->setAutoSize(true);
 				}
 			}
@@ -306,46 +301,45 @@ class ExportExcel2007 extends ModeleExports
 
 		$reg = array();
 
-		foreach ($array_selected_sorted as $code => $value)
-		{
-			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
-			else $alias = substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+		foreach ($array_selected_sorted as $code => $value) {
+			if (strpos($code, ' as ') == 0) {
+				$alias = str_replace(array('.', '-', '(', ')'), '_', $code);
+			} else {
+				$alias = substr($code, strpos($code, ' as ') + 4);
+			}
+			if (empty($alias)) {
+				dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+			}
 			$newvalue = $objp->$alias;
 
 			$newvalue = $this->excel_clean($newvalue);
 			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
-			{
+			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) {
 				$array = unserialize($typefield);
 				$array = $array['options'];
 				$newvalue = $array[$newvalue];
 			}
 
 			// Traduction newvalue
-			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg))
-			{
+			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) {
 				$newvalue = $outputlangs->transnoentities($reg[1]);
 			} else {
 				$newvalue = $outputlangs->convToOutputCharset($newvalue);
 			}
 
-			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i', $newvalue))
-			{
+			if (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$/i', $newvalue)) {
 				$newvalue = dol_stringtotime($newvalue);
 				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
 				$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
 				$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd');
-			} elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue))
-			{
+			} elseif (preg_match('/^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]$/i', $newvalue)) {
 				$newvalue = dol_stringtotime($newvalue);
 				$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, \PhpOffice\PhpSpreadsheet\Shared\Date::PHPToExcel($newvalue));
 				$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
 				$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('yyyy-mm-dd h:mm:ss');
 			} else {
-				if ($typefield == 'Text' || $typefield == 'TextAuto')
-				{
+				if ($typefield == 'Text' || $typefield == 'TextAuto') {
 					$this->workbook->getActiveSheet()->SetCellValueByColumnAndRow($this->col, $this->row + 1, (string) $newvalue);
 					$coord = $this->workbook->getActiveSheet()->getCellByColumnAndRow($this->col, $this->row + 1)->getCoordinate();
 					$this->workbook->getActiveSheet()->getStyle($coord)->getNumberFormat()->setFormatCode('@');
@@ -422,7 +416,9 @@ class ExportExcel2007 extends ModeleExports
 	{
 
 		$c = intval($c);
-		if ($c <= 0) return '';
+		if ($c <= 0) {
+			return '';
+		}
 
 		while ($c != 0) {
 			$p = ($c - 1) % 26;
@@ -449,11 +445,13 @@ class ExportExcel2007 extends ModeleExports
 			if (!empty($endCell)) {
 				$cellRange = $startCell.':'.$endCell;
 				$this->workbook->getActiveSheet()->mergeCells($startCell.':'.$endCell);
+			} else {
+				$cellRange = $startCell;
 			}
-			else $cellRange = $startCell;
-			if (!empty($this->styleArray)) $this->workbook->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styleArray);
-		}
-		catch (Exception $e) {
+			if (!empty($this->styleArray)) {
+				$this->workbook->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styleArray);
+			}
+		} catch (Exception $e) {
 			$this->error = $e->getMessage();
 			return -1;
 		}
@@ -532,11 +530,15 @@ class ExportExcel2007 extends ModeleExports
 				$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
 				$startRow = $startCell->getRow();
 				foreach ($TDatas as $column => $TRows) {
-					if ($boldTitle) $this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					if ($boldTitle) {
+						$this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					}
 					$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
 					$this->setCellValue($column, $cell->getCoordinate());
 					$rowPos = $startRow;
-					if ($boldTitle) $this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					if ($boldTitle) {
+						$this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					}
 					foreach ($TRows as $row) {
 						$rowPos++;
 						$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $rowPos);
@@ -545,8 +547,7 @@ class ExportExcel2007 extends ModeleExports
 					$startColumn++;
 				}
 			}
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->error = $e->getMessage();
 			return -1;
 		}
@@ -570,16 +571,19 @@ class ExportExcel2007 extends ModeleExports
 				$startRow = $startCell->getRow();
 				foreach ($TDatas as $title => $val) {
 					$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
-					if ($boldTitle) $this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					if ($boldTitle) {
+						$this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					}
 					$this->setCellValue($title, $cell->getCoordinate());
-					if ($boldTitle) $this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					if ($boldTitle) {
+						$this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					}
 					$cell2 = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn + 1, $startRow);
 					$this->setCellValue($val, $cell2->getCoordinate());
 					$startRow++;
 				}
 			}
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->error = $e->getMessage();
 			return -1;
 		}
@@ -615,7 +619,9 @@ class ExportExcel2007 extends ModeleExports
 		try {
 			$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
 			$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
-			if (!empty($offset)) $startColumn += $offset;
+			if (!empty($offset)) {
+				$startColumn += $offset;
+			}
 
 			$startRow = $startCell->getRow();
 			$startCell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
@@ -625,8 +631,7 @@ class ExportExcel2007 extends ModeleExports
 			$endCell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn + ($length - 1), $startRow);
 			$endCoordinate = $endCell->getCoordinate();
 			$this->workbook->getActiveSheet()->mergeCells($startCoordinate.':'.$endCoordinate);
-		}
-		catch (Exception $e) {
+		} catch (Exception $e) {
 			$this->error = $e->getMessage();
 			return -1;
 		}
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index 90e478458f7..c93787a762c 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -169,8 +169,7 @@ class ExportTsv extends ModeleExports
 
 		$outputlangs->load("exports");
 		$this->handle = fopen($file, "wt");
-		if (!$this->handle)
-		{
+		if (!$this->handle) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFailToCreateFile", $file);
 			$ret = -1;
@@ -206,8 +205,7 @@ class ExportTsv extends ModeleExports
 	public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
 	{
 		// phpcs:enable
-		foreach ($array_selected_sorted as $code => $value)
-		{
+		foreach ($array_selected_sorted as $code => $value) {
 			$newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
 			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
 
@@ -234,22 +232,27 @@ class ExportTsv extends ModeleExports
 		global $conf;
 
 		$this->col = 0;
- 		foreach ($array_selected_sorted as $code => $value)
-		{
-			if (strpos($code, ' as ') == 0) $alias = str_replace(array('.', '-', '(', ')'), '_', $code);
-			else $alias = substr($code, strpos($code, ' as ') + 4);
-			if (empty($alias)) dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+		foreach ($array_selected_sorted as $code => $value) {
+			if (strpos($code, ' as ') == 0) {
+				$alias = str_replace(array('.', '-', '(', ')'), '_', $code);
+			} else {
+				$alias = substr($code, strpos($code, ' as ') + 4);
+			}
+			if (empty($alias)) {
+				dol_print_error('', 'Bad value for field with code='.$code.'. Try to redefine export.');
+			}
 
 			$newvalue = $outputlangs->convToOutputCharset($objp->$alias); // objp->$alias must be utf8 encoded as any var in memory // newvalue is now $outputlangs->charset_output encoded
 			$typefield = isset($array_types[$code]) ? $array_types[$code] : '';
 
 			// Translation newvalue
-			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) $newvalue = $outputlangs->transnoentities($reg[1]);
+			if (preg_match('/^\((.*)\)$/i', $newvalue, $reg)) {
+				$newvalue = $outputlangs->transnoentities($reg[1]);
+			}
 
 			$newvalue = $this->tsv_clean($newvalue, $outputlangs->charset_output);
 
-			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7))
-			{
+			if (preg_match('/^Select:/i', $typefield, $reg) && $typefield = substr($typefield, 7)) {
 				$array = unserialize($typefield);
 				$array = $array['options'];
 				$newvalue = $array[$newvalue];
diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php
index 2f345556bdf..685a4bda430 100644
--- a/htdocs/core/modules/export/modules_export.php
+++ b/htdocs/core/modules/export/modules_export.php
@@ -62,12 +62,9 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 
 		// Recherche des fichiers drivers exports disponibles
 		$i = 0;
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg))
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match("/^export_(.*)\.modules\.php$/i", $file, $reg)) {
 					$moduleid = $reg[1];
 
 					// Loading Class
@@ -75,8 +72,7 @@ class ModeleExports extends CommonDocGenerator    // This class can't be abstrac
 					$classname = "Export".ucfirst($moduleid);
 
 					require_once $file;
-					if (class_exists($classname))
-					{
+					if (class_exists($classname)) {
 						$module = new $classname($db);
 
 						// Picto
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 792587f6205..762b9fb89e9 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -98,7 +98,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+		}
 	}
 
 
@@ -129,17 +131,19 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->FACTURE_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -158,22 +162,20 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->FACTURE_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->FACTURE_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
 			//$texte.=$nbofiles?'</a>':'';
 			$texte .= '</b>';
 		}
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
-   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
@@ -210,38 +212,35 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->facture->dir_output)
-		{
+		if ($conf->facture->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Facture($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -251,20 +250,19 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 			$dir = $conf->facture->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -275,10 +273,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -296,8 +295,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// If BILLING contact defined on invoice, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'BILLING');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
@@ -338,8 +336,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'INVOICE_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -355,8 +352,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -371,8 +367,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
@@ -387,7 +382,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_propal, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -397,20 +394,20 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				//var_dump($tmparray); exit;
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
+						if (preg_match('/logo$/', $key)) { // Image
 							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -419,32 +416,26 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
+					if ($foundtagforlines) {
 						$linenumber = 0;
-						foreach ($object->lines as $line)
-						{
+						foreach ($object->lines as $line) {
 							$linenumber++;
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -452,8 +443,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -461,12 +451,10 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -496,8 +484,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 9e336863467..2747ee4e246 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -173,12 +173,13 @@ class pdf_crabe extends ModelePDFFactures
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->posxtva = 101;
 			$this->posxup = 118;
 			$this->posxqty = 135;
@@ -193,10 +194,11 @@ class pdf_crabe extends ModelePDFFactures
 		$this->posxdiscount = 162;
 		$this->posxprogress = 174;
 		$this->postotalht = 174;
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva = $this->posxup;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->posxtva = $this->posxup;
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
@@ -235,9 +237,13 @@ class pdf_crabe extends ModelePDFFactures
 
 		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
@@ -246,11 +252,11 @@ class pdf_crabe extends ModelePDFFactures
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
-		{
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE)) {
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -259,21 +265,23 @@ class pdf_crabe extends ModelePDFFactures
 				$dir = $conf->product->dir_output.'/'.$pdir;
 
 				$realpath = '';
-				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-				{
+				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
 					$filename = $obj['photo'];
 					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
 					$realpath = $dir.$filename;
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i] = $realpath;
+				if ($realpath) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxtva;
+		}
 
-		if ($conf->facture->dir_output)
-		{
+		if ($conf->facture->dir_output) {
 			$object->fetch_thirdparty();
 
 			$deja_regle = $object->getSommePaiement((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
@@ -281,8 +289,7 @@ class pdf_crabe extends ModelePDFFactures
 			$amount_deposits_included = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -290,20 +297,16 @@ class pdf_crabe extends ModelePDFFactures
 				$dir = $conf->facture->dir_output."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -322,21 +325,23 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetAutoPageBreak(1, 0);
 
 				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
-				if ($heightforinfotot > 220) $heightforinfotot = 220;
+				if ($heightforinfotot > 220) {
+					$heightforinfotot = 220;
+				}
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -350,7 +355,9 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				// Set certificate
 				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
@@ -372,15 +379,12 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
-				if (empty($this->atleastonediscount))    // retrieve space not used by discount
-				{
+				if (empty($this->atleastonediscount)) {    // retrieve space not used by discount
 					$delta = ($this->posxprogress - $this->posxdiscount);
 					$this->posxpicture += $delta;
 					$this->posxtva += $delta;
@@ -393,8 +397,7 @@ class pdf_crabe extends ModelePDFFactures
 
 				$progress_width = 0;
 				// Situation invoice handling
-				if ($object->situation_cycle_ref && empty($conf->global->MAIN_PDF_HIDE_SITUATION))
-				{
+				if ($object->situation_cycle_ref && empty($conf->global->MAIN_PDF_HIDE_SITUATION)) {
 					$this->situationinvoice = true;
 					$progress_width = 10;
 					$this->posxpicture -= $progress_width;
@@ -408,7 +411,9 @@ class pdf_crabe extends ModelePDFFactures
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
@@ -420,11 +425,9 @@ class pdf_crabe extends ModelePDFFactures
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -442,15 +445,15 @@ class pdf_crabe extends ModelePDFFactures
 
 				// Display notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 				// Extrafields in note
@@ -458,8 +461,7 @@ class pdf_crabe extends ModelePDFFactures
 				if (!empty($extranote)) {
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_top -= 2;
 
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
@@ -485,15 +487,16 @@ class pdf_crabe extends ModelePDFFactures
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -504,23 +507,27 @@ class pdf_crabe extends ModelePDFFactures
 					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 						$pdf->AddPage('', '', true);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
 
 						// Allows data in the first page if description is long enough to break in multiples pages
-						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 							$showpricebeforepagebreak = 1;
-						else $showpricebeforepagebreak = 0;
+						} else {
+							$showpricebeforepagebreak = 0;
+						}
 					}
 
-					if (isset($imglinesize['width']) && isset($imglinesize['height']))
-					{
+					if (isset($imglinesize['width']) && isset($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
 						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
@@ -533,8 +540,7 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->startTransaction();
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX - $progress_width, 3, $curX, $curY, $hideref, $hidedesc);
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -543,22 +549,26 @@ class pdf_crabe extends ModelePDFFactures
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -580,8 +590,7 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-					{
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva - 5, $curY);
 						$pdf->MultiCell($this->posxup - $this->posxtva + 4, 3, $vat_rate, 0, 'R');
@@ -598,24 +607,21 @@ class pdf_crabe extends ModelePDFFactures
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS))
-					{
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
 
 					// Discount on line
-					if ($object->lines[$i]->remise_percent)
-					{
+					if ($object->lines[$i]->remise_percent) {
 						$pdf->SetXY($this->posxdiscount - 2, $curY);
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->posxprogress - $this->posxdiscount + 2, 3, $remise_percent, 0, 'R');
 					}
 
 					// Situation progress
-					if ($this->situationinvoice)
-					{
+					if ($this->situationinvoice) {
 						$progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxprogress, $curY);
 						$pdf->MultiCell($this->postotalht - $this->posxprogress + 1, 3, $progress, 0, 'R');
@@ -628,16 +634,23 @@ class pdf_crabe extends ModelePDFFactures
 
 
 					$sign = 1;
-					if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+					if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+						$sign = -1;
+					}
 					// Collection of totals by value of VAT in $this->tva["taux"]=total_tva
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
-					{
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) { // Compute progress from previous situation
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						} else {
+							$tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						}
 					} else {
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
-						else $tvaligne = $sign * $object->lines[$i]->total_tva;
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						} else {
+							$tvaligne = $sign * $object->lines[$i]->total_tva;
+						}
 					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -647,36 +660,48 @@ class pdf_crabe extends ModelePDFFactures
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
+					if ($localtax1_type && $localtax1ligne != 0) {
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) {
+						$nexY = $posYAfterImage;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -687,11 +712,9 @@ class pdf_crabe extends ModelePDFFactures
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -700,12 +723,12 @@ class pdf_crabe extends ModelePDFFactures
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -713,15 +736,18 @@ class pdf_crabe extends ModelePDFFactures
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -736,14 +762,15 @@ class pdf_crabe extends ModelePDFFactures
 				$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Display Payments area
-				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-				{
+				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
 					$posy = $this->_tableau_versements($pdf, $object, $posy, $outputlangs, $heightforfooter);
 				}
 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -754,14 +781,14 @@ class pdf_crabe extends ModelePDFFactures
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -795,15 +822,16 @@ class pdf_crabe extends ModelePDFFactures
 		global $conf;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+			$sign = -1;
+		}
 
 		$current_page = $pdf->getPage();
 		$tab3_posx = 120;
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$tab3_posx -= 20;
 		}
 
@@ -823,31 +851,37 @@ class pdf_crabe extends ModelePDFFactures
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			$invoice = new Facture($this->db);
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$y += 3;
-				if ($tab3_top + $y >= ($this->page_hauteur - $heightforfooter))
-				{
+				if ($tab3_top + $y >= ($this->page_hauteur - $heightforfooter)) {
 					$y = 0;
 					$current_page++;
 					$pdf->AddPage('', '', true);
-					if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					if (!empty($tplidx)) {
+						$pdf->useTemplate($tplidx);
+					}
+					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						$this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
 					$pdf->setPage($current_page);
 					$this->_tableau_versements_header($pdf, $object, $outputlangs, $default_font_size, $tab3_posx, $tab3_top + $y - 3, $tab3_width, $tab3_height);
 				}
 
 				$obj = $this->db->fetch_object($resql);
 
-				if ($obj->type == 2) $text = $outputlangs->transnoentities("CreditNote");
-				elseif ($obj->type == 3) $text = $outputlangs->transnoentities("Deposit");
-				elseif ($obj->type == 0) $text = $outputlangs->transnoentities("ExcessReceived");
-				else $text = $outputlangs->transnoentities("UnknownType");
+				if ($obj->type == 2) {
+					$text = $outputlangs->transnoentities("CreditNote");
+				} elseif ($obj->type == 3) {
+					$text = $outputlangs->transnoentities("Deposit");
+				} elseif ($obj->type == 0) {
+					$text = $outputlangs->transnoentities("ExcessReceived");
+				} else {
+					$text = $outputlangs->transnoentities("UnknownType");
+				}
 
 				$invoice->fetch($obj->fk_facture_source);
 
@@ -880,19 +914,21 @@ class pdf_crabe extends ModelePDFFactures
 		$sql .= " ORDER BY p.datep";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
 				$y += 3;
-				if ($tab3_top + $y >= ($this->page_hauteur - $heightforfooter))
-				{
+				if ($tab3_top + $y >= ($this->page_hauteur - $heightforfooter)) {
 					$y = 0;
 					$current_page++;
 					$pdf->AddPage('', '', true);
-					if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					if (!empty($tplidx)) {
+						$pdf->useTemplate($tplidx);
+					}
+					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						$this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
 					$pdf->setPage($current_page);
 					$this->_tableau_versements_header($pdf, $object, $outputlangs, $default_font_size, $tab3_posx, $tab3_top + $y - 3, $tab3_width, $tab3_height);
 				}
@@ -941,7 +977,9 @@ class pdf_crabe extends ModelePDFFactures
 	{
 		// phpcs:enable
 		$title = $outputlangs->transnoentities("PaymentsAlreadyDone");
-		if ($object->type == 2) $title = $outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		if ($object->type == 2) {
+			$title = $outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		}
 
 		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
@@ -983,8 +1021,7 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
-		{
+		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@@ -995,8 +1032,7 @@ class pdf_crabe extends ModelePDFFactures
 		$posxval = 52;
 
 		// Show payments conditions
-		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement))
-		{
+		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -1011,19 +1047,16 @@ class pdf_crabe extends ModelePDFFactures
 			$posy = $pdf->GetY() + 3;
 		}
 
-		if ($object->type != 2)
-		{
+		if ($object->type != 2) {
 			// Check a payment mode is defined
 			if (empty($object->mode_reglement_code)
 			&& empty($conf->global->FACTURE_CHQ_NUMBER)
-			&& empty($conf->global->FACTURE_RIB_NUMBER))
-			{
+			&& empty($conf->global->FACTURE_RIB_NUMBER)) {
 				$this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
 			}
 			// Avoid having any valid PDF with setup that is not complete
 			elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))
-				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank)))
-			{
+				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))) {
 				$outputlangs->load("errors");
 
 				$pdf->SetXY($this->marge_gauche, $posy);
@@ -1039,8 +1072,7 @@ class pdf_crabe extends ModelePDFFactures
 			// Show payment mode
 			if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR')
-			{
+			&& $object->mode_reglement_code != 'VIR') {
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
@@ -1070,15 +1102,12 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			// Show payment mode CHQ
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-			{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// If payment mode unregulated or payment mode forced to CHQ
-				if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-				{
+				if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
 					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
 						$account = new Account($this->db);
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
@@ -1087,23 +1116,20 @@ class pdf_crabe extends ModelePDFFactures
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
-					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -1114,11 +1140,12 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			// If payment mode not forced or forced to VIR, show payment with BAN
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-			{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
 				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
 					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					if ($object->fk_bank > 0) {
+						$bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					}
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
@@ -1154,7 +1181,9 @@ class pdf_crabe extends ModelePDFFactures
 		global $conf, $mysoc;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+			$sign = -1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1164,8 +1193,7 @@ class pdf_crabe extends ModelePDFFactures
 
 		// Total table
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -1188,11 +1216,9 @@ class pdf_crabe extends ModelePDFFactures
 		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
 				// FIXME amount of vat not supported with multicurrency
@@ -1200,22 +1226,20 @@ class pdf_crabe extends ModelePDFFactures
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1229,18 +1253,17 @@ class pdf_crabe extends ModelePDFFactures
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 
@@ -1249,8 +1272,7 @@ class pdf_crabe extends ModelePDFFactures
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1267,18 +1289,15 @@ class pdf_crabe extends ModelePDFFactures
 				//}
 
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($this->tva as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1295,20 +1314,19 @@ class pdf_crabe extends ModelePDFFactures
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
 				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1321,24 +1339,23 @@ class pdf_crabe extends ModelePDFFactures
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
 						//$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1354,8 +1371,7 @@ class pdf_crabe extends ModelePDFFactures
 				//}
 
 				// Revenue stamp
-				if (price2num($object->revenuestamp) != 0)
-				{
+				if (price2num($object->revenuestamp) != 0) {
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp"), $useborder, 'L', 1);
@@ -1375,8 +1391,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->MultiCell($largcol2, $tab2_hl, price($sign * $total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 
 				// Retained warranty
-				if ($object->displayRetainedWarranty())
-				{
+				if ($object->displayRetainedWarranty()) {
 					$pdf->SetTextColor(40, 40, 40);
 					$pdf->SetFillColor(255, 255, 255);
 
@@ -1410,10 +1425,11 @@ class pdf_crabe extends ModelePDFFactures
 		$depositsamount = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
-		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-		{
+		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1422,8 +1438,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
 
 			// Credit note
-			if ($creditnoteamount)
-			{
+			if ($creditnoteamount) {
 				$labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1433,8 +1448,7 @@ class pdf_crabe extends ModelePDFFactures
 			}
 
 			// Escompte
-			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
-			{
+			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT) {
 				$index++;
 				$pdf->SetFillColor(255, 255, 255);
 
@@ -1482,7 +1496,9 @@ class pdf_crabe extends ModelePDFFactures
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1491,14 +1507,15 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -1507,50 +1524,42 @@ class pdf_crabe extends ModelePDFFactures
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE)) {
 			$pdf->line($this->posxpicture - 1, $tab_top, $this->posxpicture - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
 				//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
 			}
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
 				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
 		}
 
 		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 		}
 
 		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
@@ -1558,13 +1567,11 @@ class pdf_crabe extends ModelePDFFactures
 			}
 		}
 
-		if ($this->atleastonediscount)
-		{
+		if ($this->atleastonediscount) {
 			$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
-   				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
-   				$pdf->MultiCell($this->posxprogress - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
+				$pdf->MultiCell($this->posxprogress - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
 
@@ -1577,8 +1584,7 @@ class pdf_crabe extends ModelePDFFactures
 		}
 
 		$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
 			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 		}
@@ -1606,8 +1612,7 @@ class pdf_crabe extends ModelePDFFactures
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == Facture::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
 			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
 		}
 
@@ -1622,20 +1627,18 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
-		{
-			if ($this->emetteur->logo)
-			{
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+			if ($this->emetteur->logo) {
 				$logodir = $conf->mycompany->dir_output;
-				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
-				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
-				{
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
-				if (is_readable($logo))
-				{
+				if (is_readable($logo)) {
 					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
@@ -1654,11 +1657,21 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities("PdfInvoiceTitle");
-		if ($object->type == 1) $title = $outputlangs->transnoentities("InvoiceReplacement");
-		if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir");
-		if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit");
-		if ($object->type == 4) $title = $outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title = $outputlangs->transnoentities("PDFInvoiceSituation");
+		if ($object->type == 1) {
+			$title = $outputlangs->transnoentities("InvoiceReplacement");
+		}
+		if ($object->type == 2) {
+			$title = $outputlangs->transnoentities("InvoiceAvoir");
+		}
+		if ($object->type == 3) {
+			$title = $outputlangs->transnoentities("InvoiceDeposit");
+		}
+		if ($object->type == 4) {
+			$title = $outputlangs->transnoentities("InvoiceProForma");
+		}
+		if ($this->situationinvoice) {
+			$title = $outputlangs->transnoentities("PDFInvoiceSituation");
+		}
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
@@ -1667,8 +1680,7 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == Facture::STATUS_DRAFT)
-		{
+		if ($object->statut == Facture::STATUS_DRAFT) {
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
@@ -1677,19 +1689,16 @@ class pdf_crabe extends ModelePDFFactures
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if ($object->ref_client)
-		{
+		if ($object->ref_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1697,11 +1706,9 @@ class pdf_crabe extends ModelePDFFactures
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1710,8 +1717,7 @@ class pdf_crabe extends ModelePDFFactures
 		}
 
 		$objectidnext = $object->getIdReplacingInvoice('validated');
-		if ($object->type == 0 && $objectidnext)
-		{
+		if ($object->type == 0 && $objectidnext) {
 			$objectreplacing = new Facture($this->db);
 			$objectreplacing->fetch($objectidnext);
 
@@ -1720,8 +1726,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
 		}
-		if ($object->type == 1)
-		{
+		if ($object->type == 1) {
 			$objectreplaced = new Facture($this->db);
 			$objectreplaced->fetch($object->fk_facture_source);
 
@@ -1730,8 +1735,7 @@ class pdf_crabe extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
 		}
-		if ($object->type == 2 && !empty($object->fk_facture_source))
-		{
+		if ($object->type == 2 && !empty($object->fk_facture_source)) {
 			$objectreplaced = new Facture($this->db);
 			$objectreplaced->fetch($object->fk_facture_source);
 
@@ -1746,24 +1750,21 @@ class pdf_crabe extends ModelePDFFactures
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateInvoice")." : ".dol_print_date($object->date, "day", false, $outputlangs), '', 'R');
 
-		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE))
-		{
+		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : ".dol_print_date($object->date_pointoftax, "day", false, $outputlangs), '', 'R');
 		}
 
-		if ($object->type != 2)
-		{
+		if ($object->type != 2) {
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DateDue")." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if ($object->thirdparty->code_client)
-		{
+		if ($object->thirdparty->code_client) {
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1771,11 +1772,9 @@ class pdf_crabe extends ModelePDFFactures
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -1791,13 +1790,11 @@ class pdf_crabe extends ModelePDFFactures
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
@@ -1805,7 +1802,9 @@ class pdf_crabe extends ModelePDFFactures
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 
 			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -1837,8 +1836,7 @@ class pdf_crabe extends ModelePDFFactures
 			// If BILLING contact defined on invoice, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'BILLING');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1856,11 +1854,15 @@ class pdf_crabe extends ModelePDFFactures
 
 			// Show recipient
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index aafbb192bce..49bc90f1d69 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -174,7 +174,9 @@ class pdf_sponge extends ModelePDFFactures
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
@@ -212,9 +214,13 @@ class pdf_sponge extends ModelePDFFactures
 
 		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
@@ -237,18 +243,17 @@ class pdf_sponge extends ModelePDFFactures
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
 		$this->atleastonephoto = false;
-		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE)) {
 			$objphoto = new Product($this->db);
 
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				} else {
@@ -257,22 +262,17 @@ class pdf_sponge extends ModelePDFFactures
 				}
 
 				$arephoto = false;
-				foreach ($pdir as $midir)
-				{
-					if (!$arephoto)
-					{
+				foreach ($pdir as $midir) {
+					if (!$arephoto) {
 						if ($conf->product->entity != $objphoto->entity) {
 							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
 						} else {
 							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
 						}
 
-						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-						{
-							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-							{
-								if ($obj['photo_vignette'])
-								{
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+								if ($obj['photo_vignette']) {
 									$filename = $obj['photo_vignette'];
 								} else {
 									$filename = $obj['photo'];
@@ -288,14 +288,15 @@ class pdf_sponge extends ModelePDFFactures
 					}
 				}
 
-				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+				if ($realpath && $arephoto) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
 
 		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
 
-		if ($conf->facture->multidir_output[$conf->entity])
-		{
+		if ($conf->facture->multidir_output[$conf->entity]) {
 			$object->fetch_thirdparty();
 
 			$deja_regle = $object->getSommePaiement((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
@@ -303,8 +304,7 @@ class pdf_sponge extends ModelePDFFactures
 			$amount_deposits_included = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->facture->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -312,20 +312,16 @@ class pdf_sponge extends ModelePDFFactures
 				$dir = $conf->facture->multidir_output[$object->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -347,16 +343,14 @@ class pdf_sponge extends ModelePDFFactures
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -370,7 +364,9 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				// Set certificate
 				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
@@ -392,24 +388,23 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
 
 
 				// Situation invoice handling
-				if ($object->situation_cycle_ref)
-				{
+				if ($object->situation_cycle_ref) {
 					$this->situationinvoice = true;
 				}
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
@@ -421,17 +416,17 @@ class pdf_sponge extends ModelePDFFactures
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 				$tab_height = 130 - $top_shift;
 				$tab_height_newpage = 150;
-				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+					$tab_height_newpage -= $top_shift;
+				}
 
 				$nexY = $tab_top - 1;
 
 				// Incoterm
 				$height_incoterms = 0;
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -450,15 +445,15 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 
@@ -469,8 +464,7 @@ class pdf_sponge extends ModelePDFFactures
 				}
 
 				$pagenb = $pdf->getPage();
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_top -= 2;
 
 					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
@@ -489,16 +483,19 @@ class pdf_sponge extends ModelePDFFactures
 					$pageposafternote = $pdf->getPage();
 					$posyafter = $pdf->GetY();
 
-					if ($pageposafternote > $pageposbeforenote)
-					{
+					if ($pageposafternote > $pageposbeforenote) {
 						$pdf->rollbackTransaction(true);
 
 						// prepare pages to receive notes
 						while ($pagenb < $pageposafternote) {
 							$pdf->AddPage();
 							$pagenb++;
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
@@ -514,8 +511,7 @@ class pdf_sponge extends ModelePDFFactures
 
 						$posyafter = $pdf->GetY();
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-						{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {	// There is no space left for total+free text
 							$pdf->AddPage('', '', true);
 							$pagenb++;
 							$pageposafternote++;
@@ -552,8 +548,12 @@ class pdf_sponge extends ModelePDFFactures
 
 						// apply note frame to last page
 						$pdf->setPage($pageposafternote);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$height_note = $posyafter - $tab_top_newpage;
 						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
 					} else // No pagebreak
@@ -564,15 +564,18 @@ class pdf_sponge extends ModelePDFFactures
 						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-						{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {
 							// not enough space, need to add page
 							$pdf->AddPage('', '', true);
 							$pagenb++;
 							$pageposafternote++;
 							$pdf->setPage($pageposafternote);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 
 							$posyafter = $tab_top_newpage;
 						}
@@ -597,15 +600,16 @@ class pdf_sponge extends ModelePDFFactures
 				// Loop on each lines
 				$pageposbeforeprintlines = $pdf->getPage();
 				$pagenb = $pageposbeforeprintlines;
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -615,25 +619,26 @@ class pdf_sponge extends ModelePDFFactures
 					$posYAfterImage = 0;
 					$posYAfterDescription = 0;
 
-					if ($this->getColumnStatus('photo'))
-					{
+					if ($this->getColumnStatus('photo')) {
 						// We start with Photo of product line
-						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-						{
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 							$pdf->AddPage('', '', true);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 
-						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-						{
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
 							$posYAfterImage = $curY + $imglinesize['height'];
@@ -641,15 +646,13 @@ class pdf_sponge extends ModelePDFFactures
 					}
 
 					// Description of product line
-					if ($this->getColumnStatus('desc'))
-					{
+					if ($this->getColumnStatus('desc')) {
 						$pdf->startTransaction();
 
 						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
 
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
@@ -659,20 +662,22 @@ class pdf_sponge extends ModelePDFFactures
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
 							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -696,16 +701,14 @@ class pdf_sponge extends ModelePDFFactures
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
-					if ($this->getColumnStatus('vat'))
-					{
+					if ($this->getColumnStatus('vat')) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Unit price before discount
-					if ($this->getColumnStatus('subprice'))
-					{
+					if ($this->getColumnStatus('subprice')) {
 						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -713,48 +716,42 @@ class pdf_sponge extends ModelePDFFactures
 
 					// Quantity
 					// Enough for 6 chars
-					if ($this->getColumnStatus('qty'))
-					{
+					if ($this->getColumnStatus('qty')) {
 						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Situation progress
-					if ($this->getColumnStatus('progress'))
-					{
+					if ($this->getColumnStatus('progress')) {
 						$progress = pdf_getlineprogress($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'progress', $progress);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Unit
-					if ($this->getColumnStatus('unit'))
-					{
+					if ($this->getColumnStatus('unit')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Discount on line
-					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent)
-					{
+					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent) {
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total excl tax line (HT)
-					if ($this->getColumnStatus('totalexcltax'))
-					{
+					if ($this->getColumnStatus('totalexcltax')) {
 						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total with tax line (TTC)
-					if ($this->getColumnStatus('totalincltax'))
-					{
+					if ($this->getColumnStatus('totalincltax')) {
 						$total_incl_tax = pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'totalincltax', $total_incl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -763,8 +760,7 @@ class pdf_sponge extends ModelePDFFactures
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-							if ($this->getColumnStatus($extrafieldColKey))
-							{
+							if ($this->getColumnStatus($extrafieldColKey)) {
 								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
@@ -786,16 +782,23 @@ class pdf_sponge extends ModelePDFFactures
 
 
 					$sign = 1;
-					if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+					if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+						$sign = -1;
+					}
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
 					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
-					{
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) { // Compute progress from previous situation
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						} else {
+							$tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						}
 					} else {
-						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
-						else $tvaligne = $sign * $object->lines[$i]->total_tva;
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						} else {
+							$tvaligne = $sign * $object->lines[$i]->total_tva;
+						}
 					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
@@ -805,16 +808,21 @@ class pdf_sponge extends ModelePDFFactures
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
@@ -828,8 +836,12 @@ class pdf_sponge extends ModelePDFFactures
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
 					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
 					$nexY = max($nexY, $posYAfterImage);
@@ -855,7 +867,9 @@ class pdf_sponge extends ModelePDFFactures
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 
 					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
@@ -867,15 +881,18 @@ class pdf_sponge extends ModelePDFFactures
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == $pageposbeforeprintlines)
-				{
+				if ($pagenb == $pageposbeforeprintlines) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -890,14 +907,15 @@ class pdf_sponge extends ModelePDFFactures
 				$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Display payment area
-				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-				{
+				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
 					$posy = $this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
 				}
 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -908,14 +926,14 @@ class pdf_sponge extends ModelePDFFactures
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 					$this->result = array('fullpath'=>$file);
 
@@ -945,21 +963,24 @@ class pdf_sponge extends ModelePDFFactures
 		global $conf;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+			$sign = -1;
+		}
 
 		$tab3_posx = 120;
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$tab3_posx -= 20;
 		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$title = $outputlangs->transnoentities("PaymentsAlreadyDone");
-		if ($object->type == 2) $title = $outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		if ($object->type == 2) {
+			$title = $outputlangs->transnoentities("PaymentsBackAlreadyDone");
+		}
 
 		$pdf->SetFont('', '', $default_font_size - 3);
 		$pdf->SetXY($tab3_posx, $tab3_top - 4);
@@ -991,20 +1012,23 @@ class pdf_sponge extends ModelePDFFactures
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re, ".MAIN_DB_PREFIX."facture as f";
 		$sql .= " WHERE re.fk_facture_source = f.rowid AND re.fk_facture = ".$object->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			$invoice = new Facture($this->db);
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$y += 3;
 				$obj = $this->db->fetch_object($resql);
 
-				if ($obj->type == 2) $text = $outputlangs->transnoentities("CreditNote");
-				elseif ($obj->type == 3) $text = $outputlangs->transnoentities("Deposit");
-				elseif ($obj->type == 0) $text = $outputlangs->transnoentities("ExcessReceived");
-				else $text = $outputlangs->transnoentities("UnknownType");
+				if ($obj->type == 2) {
+					$text = $outputlangs->transnoentities("CreditNote");
+				} elseif ($obj->type == 3) {
+					$text = $outputlangs->transnoentities("Deposit");
+				} elseif ($obj->type == 0) {
+					$text = $outputlangs->transnoentities("ExcessReceived");
+				} else {
+					$text = $outputlangs->transnoentities("UnknownType");
+				}
 
 				$invoice->fetch($obj->fk_facture_source);
 
@@ -1037,8 +1061,7 @@ class pdf_sponge extends ModelePDFFactures
 		$sql .= " ORDER BY p.datep";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
@@ -1087,8 +1110,7 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
-		{
+		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@@ -1099,8 +1121,7 @@ class pdf_sponge extends ModelePDFFactures
 		$posxval = 52;
 
 		// Show payments conditions
-		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement))
-		{
+		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -1115,19 +1136,16 @@ class pdf_sponge extends ModelePDFFactures
 			$posy = $pdf->GetY() + 3;
 		}
 
-		if ($object->type != 2)
-		{
+		if ($object->type != 2) {
 			// Check a payment mode is defined
 			if (empty($object->mode_reglement_code)
 			&& empty($conf->global->FACTURE_CHQ_NUMBER)
-			&& empty($conf->global->FACTURE_RIB_NUMBER))
-			{
+			&& empty($conf->global->FACTURE_RIB_NUMBER)) {
 				$this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
 			}
 			// Avoid having any valid PDF with setup that is not complete
 			elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))
-				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank)))
-			{
+				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))) {
 				$outputlangs->load("errors");
 
 				$pdf->SetXY($this->marge_gauche, $posy);
@@ -1143,8 +1161,7 @@ class pdf_sponge extends ModelePDFFactures
 			// Show payment mode
 			if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR')
-			{
+			&& $object->mode_reglement_code != 'VIR') {
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
@@ -1173,15 +1190,12 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			// Show payment mode CHQ
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-			{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// If payment mode unregulated or payment mode forced to CHQ
-				if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-				{
+				if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
 					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
 						$account = new Account($this->db);
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
@@ -1190,23 +1204,20 @@ class pdf_sponge extends ModelePDFFactures
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
-					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -1217,11 +1228,12 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			// If payment mode not forced or forced to VIR, show payment with BAN
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-			{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
 				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
 					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					if ($object->fk_bank > 0) {
+						$bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					}
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
@@ -1254,7 +1266,9 @@ class pdf_sponge extends ModelePDFFactures
 		global $conf, $mysoc, $hookmanager;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+			$sign = -1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1272,8 +1286,7 @@ class pdf_sponge extends ModelePDFFactures
 
 		// Total table
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -1291,8 +1304,7 @@ class pdf_sponge extends ModelePDFFactures
 		// overall percentage of advancement
 		$percent = 0;
 		$i = 0;
-		foreach ($object->lines as $line)
-		{
+		foreach ($object->lines as $line) {
 			$percent += $line->situation_percent;
 			$i++;
 		}
@@ -1412,7 +1424,9 @@ class pdf_sponge extends ModelePDFFactures
 		foreach ($object->lines as $i => $line) {
 			$total_line_remise += pdfGetLineTotalDiscountAmount($object, $i, $outputlangs, 2); // TODO: add this methode to core/lib/pdf.lib
 			// Gestion remise sous forme de ligne négative
-			if ($line->total_ht < 0) $total_line_remise += -$line->total_ht;
+			if ($line->total_ht < 0) {
+				$total_line_remise += -$line->total_ht;
+			}
 		}
 		if ($total_line_remise > 0) {
 			if (!empty($conf->global->MAIN_SHOW_AMOUNT_DISCOUNT)) {
@@ -1451,11 +1465,9 @@ class pdf_sponge extends ModelePDFFactures
 		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
 				// FIXME amount of vat not supported with multicurrency
@@ -1463,22 +1475,20 @@ class pdf_sponge extends ModelePDFFactures
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1493,26 +1503,24 @@ class pdf_sponge extends ModelePDFFactures
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1537,8 +1545,7 @@ class pdf_sponge extends ModelePDFFactures
 					}
 
 					if ($sum_pdf_tva != $object->total_tva) { // apply coef to recover the VAT object amount (the good one)
-						if (!empty($sum_pdf_tva))
-						{
+						if (!empty($sum_pdf_tva)) {
 							$coef_fix_tva = $object->total_tva / $sum_pdf_tva;
 						} else {
 							$coef_fix_tva = 1;
@@ -1551,18 +1558,15 @@ class pdf_sponge extends ModelePDFFactures
 					}
 				}
 
-				foreach ($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($this->tva as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1579,22 +1583,20 @@ class pdf_sponge extends ModelePDFFactures
 				//Local tax 1 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1608,27 +1610,25 @@ class pdf_sponge extends ModelePDFFactures
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
 						// retrieve global local tax
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1646,8 +1646,7 @@ class pdf_sponge extends ModelePDFFactures
 
 
 				// Revenue stamp
-				if (price2num($object->revenuestamp) != 0)
-				{
+				if (price2num($object->revenuestamp) != 0) {
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 					$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RevenueStamp").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("RevenueStamp", $mysoc->country_code) : ''), $useborder, 'L', 1);
@@ -1668,8 +1667,7 @@ class pdf_sponge extends ModelePDFFactures
 
 
 				// Retained warranty
-				if ($object->displayRetainedWarranty())
-				{
+				if ($object->displayRetainedWarranty()) {
 					$pdf->SetTextColor(40, 40, 40);
 					$pdf->SetFillColor(255, 255, 255);
 
@@ -1704,10 +1702,11 @@ class pdf_sponge extends ModelePDFFactures
 		$depositsamount = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
-		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-		{
+		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1716,8 +1715,7 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
 
 			// Credit note
-			if ($creditnoteamount)
-			{
+			if ($creditnoteamount) {
 				$labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
 				$labeltouse .= (is_object($outputlangsbis) ? ' / '.($outputlangsbis->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangsbis->transnoentities("CreditNotesOrExcessReceived") : $outputlangsbis->transnoentities("CreditNotes") : '');
 				$index++;
@@ -1793,7 +1791,9 @@ class pdf_sponge extends ModelePDFFactures
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1802,8 +1802,7 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
 				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
@@ -1855,8 +1854,7 @@ class pdf_sponge extends ModelePDFFactures
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
 			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
 		}
 
@@ -1871,14 +1869,13 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
-		{
-			if ($this->emetteur->logo)
-			{
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+			if ($this->emetteur->logo) {
 				$logodir = $conf->mycompany->dir_output;
-				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
-				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
-				{
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
@@ -1902,20 +1899,37 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities("PdfInvoiceTitle");
-		if ($object->type == 1) $title = $outputlangs->transnoentities("InvoiceReplacement");
-		if ($object->type == 2) $title = $outputlangs->transnoentities("InvoiceAvoir");
-		if ($object->type == 3) $title = $outputlangs->transnoentities("InvoiceDeposit");
-		if ($object->type == 4) $title = $outputlangs->transnoentities("InvoiceProForma");
-		if ($this->situationinvoice) $title = $outputlangs->transnoentities("PDFInvoiceSituation");
+		if ($object->type == 1) {
+			$title = $outputlangs->transnoentities("InvoiceReplacement");
+		}
+		if ($object->type == 2) {
+			$title = $outputlangs->transnoentities("InvoiceAvoir");
+		}
+		if ($object->type == 3) {
+			$title = $outputlangs->transnoentities("InvoiceDeposit");
+		}
+		if ($object->type == 4) {
+			$title = $outputlangs->transnoentities("InvoiceProForma");
+		}
+		if ($this->situationinvoice) {
+			$title = $outputlangs->transnoentities("PDFInvoiceSituation");
+		}
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
 			$title .= ' - ';
 			if ($object->type == 0) {
-				if ($this->situationinvoice) $title .= $outputlangsbis->transnoentities("PDFInvoiceSituation");
+				if ($this->situationinvoice) {
+					$title .= $outputlangsbis->transnoentities("PDFInvoiceSituation");
+				}
 				$title .= $outputlangsbis->transnoentities("PdfInvoiceTitle");
-			} elseif ($object->type == 1) $title .= $outputlangsbis->transnoentities("InvoiceReplacement");
-			elseif ($object->type == 2) $title .= $outputlangsbis->transnoentities("InvoiceAvoir");
-			elseif ($object->type == 3) $title .= $outputlangsbis->transnoentities("InvoiceDeposit");
-			elseif ($object->type == 4) $title .= $outputlangsbis->transnoentities("InvoiceProForma");
+			} elseif ($object->type == 1) {
+				$title .= $outputlangsbis->transnoentities("InvoiceReplacement");
+			} elseif ($object->type == 2) {
+				$title .= $outputlangsbis->transnoentities("InvoiceAvoir");
+			} elseif ($object->type == 3) {
+				$title .= $outputlangsbis->transnoentities("InvoiceDeposit");
+			} elseif ($object->type == 4) {
+				$title .= $outputlangsbis->transnoentities("InvoiceProForma");
+			}
 		}
 		$pdf->MultiCell($w, 3, $title, '', 'R');
 
@@ -1925,8 +1939,7 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == $object::STATUS_DRAFT)
-		{
+		if ($object->statut == $object::STATUS_DRAFT) {
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
@@ -1935,19 +1948,16 @@ class pdf_sponge extends ModelePDFFactures
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if ($object->ref_client)
-		{
+		if ($object->ref_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1955,11 +1965,9 @@ class pdf_sponge extends ModelePDFFactures
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1968,8 +1976,7 @@ class pdf_sponge extends ModelePDFFactures
 		}
 
 		$objectidnext = $object->getIdReplacingInvoice('validated');
-		if ($object->type == 0 && $objectidnext)
-		{
+		if ($object->type == 0 && $objectidnext) {
 			$objectreplacing = new Facture($this->db);
 			$objectreplacing->fetch($objectidnext);
 
@@ -1978,8 +1985,7 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementByInvoice").' : '.$outputlangs->convToOutputCharset($objectreplacing->ref), '', 'R');
 		}
-		if ($object->type == 1)
-		{
+		if ($object->type == 1) {
 			$objectreplaced = new Facture($this->db);
 			$objectreplaced->fetch($object->fk_facture_source);
 
@@ -1988,8 +1994,7 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ReplacementInvoice").' : '.$outputlangs->convToOutputCharset($objectreplaced->ref), '', 'R');
 		}
-		if ($object->type == 2 && !empty($object->fk_facture_source))
-		{
+		if ($object->type == 2 && !empty($object->fk_facture_source)) {
 			$objectreplaced = new Facture($this->db);
 			$objectreplaced->fetch($object->fk_facture_source);
 
@@ -2009,16 +2014,14 @@ class pdf_sponge extends ModelePDFFactures
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
-		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE))
-		{
+		if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("DatePointOfTax")." : ".dol_print_date($object->date_pointoftax, "day", false, $outputlangs), '', 'R');
 		}
 
-		if ($object->type != 2)
-		{
+		if ($object->type != 2) {
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -2029,8 +2032,7 @@ class pdf_sponge extends ModelePDFFactures
 			$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date_lim_reglement, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if ($object->thirdparty->code_client)
-		{
+		if ($object->thirdparty->code_client) {
 			$posy += 3;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -2038,11 +2040,9 @@ class pdf_sponge extends ModelePDFFactures
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -2058,13 +2058,11 @@ class pdf_sponge extends ModelePDFFactures
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
@@ -2072,7 +2070,9 @@ class pdf_sponge extends ModelePDFFactures
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 
 			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -2102,8 +2102,7 @@ class pdf_sponge extends ModelePDFFactures
 			// If BILLING contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'BILLING');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -2121,11 +2120,15 @@ class pdf_sponge extends ModelePDFFactures
 
 			// Show recipient
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -2195,22 +2198,22 @@ class pdf_sponge extends ModelePDFFactures
 		);
 
 		/*
-	     * For exemple
-	    $this->cols['theColKey'] = array(
-	        'rank' => $rank, // int : use for ordering columns
-	        'width' => 20, // the column width in mm
-	        'title' => array(
-	            'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	            'label' => ' ', // the final label : used fore final generated text
-	            'align' => 'L', // text alignement :  R,C,L
-	            'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'content' => array(
-	            'align' => 'L', // text alignement :  R,C,L
-	            'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	    );
-	    */
+		 * For exemple
+		$this->cols['theColKey'] = array(
+			'rank' => $rank, // int : use for ordering columns
+			'width' => 20, // the column width in mm
+			'title' => array(
+				'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				'label' => ' ', // the final label : used fore final generated text
+				'align' => 'L', // text alignement :  R,C,L
+				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L', // text alignement :  R,C,L
+				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
+		*/
 
 		$rank = 0; // do not use negative rank
 		$this->cols['desc'] = array(
@@ -2246,8 +2249,7 @@ class pdf_sponge extends ModelePDFFactures
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -2263,8 +2265,7 @@ class pdf_sponge extends ModelePDFFactures
 			'border-left' => true, // add left line separator
 		);
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$this->cols['vat']['status'] = true;
 		}
 
@@ -2312,8 +2313,7 @@ class pdf_sponge extends ModelePDFFactures
 			'border-left' => true, // add left line separator
 		);
 
-		if ($this->situationinvoice)
-		{
+		if ($this->situationinvoice) {
 			$this->cols['progress']['status'] = true;
 		}
 
@@ -2382,11 +2382,9 @@ class pdf_sponge extends ModelePDFFactures
 		);
 
 		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-		if ($reshook < 0)
-		{
+		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		} elseif (empty($reshook))
-		{
+		} elseif (empty($reshook)) {
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index b8c7b941a15..5a6df69babd 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -55,8 +55,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 	 */
 	public function __construct()
 	{
-		if (!empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX))
-		{
+		if (!empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX)) {
 			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX;
 		}
 	}
@@ -105,13 +104,13 @@ class mod_facture_mars extends ModeleNumRefFactures
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$fayymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($fayymm && !preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i', $fayymm))
-		{
+		if ($fayymm && !preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i', $fayymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -127,13 +126,13 @@ class mod_facture_mars extends ModeleNumRefFactures
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$fayymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($fayymm && !preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i', $fayymm))
-		{
+		if ($fayymm && !preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i', $fayymm)) {
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
@@ -154,9 +153,13 @@ class mod_facture_mars extends ModeleNumRefFactures
 		global $db;
 
 		$prefix = $this->prefixinvoice;
-		if ($invoice->type == 1) $prefix = $this->prefixreplacement;
-		elseif ($invoice->type == 2) $prefix = $this->prefixcreditnote;
-		elseif ($invoice->type == 3) $prefix = $this->prefixdeposit;
+		if ($invoice->type == 1) {
+			$prefix = $this->prefixreplacement;
+		} elseif ($invoice->type == 2) {
+			$prefix = $this->prefixcreditnote;
+		} elseif ($invoice->type == 3) {
+			$prefix = $this->prefixdeposit;
+		}
 
 		// First we get the max value
 		$posindice = strlen($prefix) + 6;
@@ -167,19 +170,23 @@ class mod_facture_mars extends ModeleNumRefFactures
 
 		$resql = $db->query($sql);
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			return -1;
 		}
 
-		if ($mode == 'last')
-		{
-			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-			else $num = sprintf("%04s", $max);
+		if ($mode == 'last') {
+			if ($max >= (pow(10, 4) - 1)) {
+				$num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			} else {
+				$num = sprintf("%04s", $max);
+			}
 
 			$ref = '';
 			$sql = "SELECT ref as ref";
@@ -190,24 +197,31 @@ class mod_facture_mars extends ModeleNumRefFactures
 
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if ($obj) $ref = $obj->ref;
-			} else dol_print_error($db);
+				if ($obj) {
+					$ref = $obj->ref;
+				}
+			} else {
+				dol_print_error($db);
+			}
 
 			return $ref;
-		} elseif ($mode == 'next')
-		{
+		} elseif ($mode == 'next') {
 			$date = $invoice->date; // This is invoice date (not creation date)
 			$yymm = strftime("%y%m", $date);
 
-			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-			else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) {
+				$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			} else {
+				$num = sprintf("%04s", $max + 1);
+			}
 
 			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
 			return $prefix.$yymm."-".$num;
-		} else dol_print_error('', 'Bad parameter for getNextValue');
+		} else {
+			dol_print_error('', 'Bad parameter for getNextValue');
+		}
 	}
 
 	/**
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 5273803ea58..70fde36f549 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -120,8 +120,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = 'NotConfigured';
 		}
 		return $numExample;
@@ -143,18 +142,19 @@ class mod_facture_mercure extends ModeleNumRefFactures
 
 		// Get Mask value
 		$mask = '';
-		if (is_object($invoice) && $invoice->type == 1)
-		{
+		if (is_object($invoice) && $invoice->type == 1) {
 			$mask = $conf->global->FACTURE_MERCURE_MASK_REPLACEMENT;
-			if (!$mask)
-			{
+			if (!$mask) {
 				$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
 			}
-		} elseif (is_object($invoice) && $invoice->type == 2) $mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
-		elseif (is_object($invoice) && $invoice->type == 3) $mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
-		else $mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
-		if (!$mask)
-		{
+		} elseif (is_object($invoice) && $invoice->type == 2) {
+			$mask = $conf->global->FACTURE_MERCURE_MASK_CREDIT;
+		} elseif (is_object($invoice) && $invoice->type == 3) {
+			$mask = $conf->global->FACTURE_MERCURE_MASK_DEPOSIT;
+		} else {
+			$mask = $conf->global->FACTURE_MERCURE_MASK_INVOICE;
+		}
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
@@ -167,7 +167,9 @@ class mod_facture_mercure extends ModeleNumRefFactures
 		$entity = getEntity('invoicenumber', 1, $invoice);
 
 		$numFinal = get_next_value($db, $mask, 'facture', 'ref', $where, $objsoc, $invoice->date, $mode, false, null, $entity);
-		if (!preg_match('/([0-9])+/', $numFinal)) $this->error = $numFinal;
+		if (!preg_match('/([0-9])+/', $numFinal)) {
+			$this->error = $numFinal;
+		}
 
 		return  $numFinal;
 	}
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index ae1afbf2ce4..9d844953306 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -65,8 +65,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 */
 	public function __construct()
 	{
-		if (!empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX))
-		{
+		if (!empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX)) {
 			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX;
 		}
 	}
@@ -115,13 +114,13 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$fayymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($fayymm && !preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i', $fayymm))
-		{
+		if ($fayymm && !preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i', $fayymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -137,13 +136,13 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$fayymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($fayymm && !preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i', $fayymm))
-		{
+		if ($fayymm && !preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i', $fayymm)) {
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
@@ -158,13 +157,13 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$fayymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($fayymm && !preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i', $fayymm))
-		{
+		if ($fayymm && !preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i', $fayymm)) {
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
@@ -187,8 +186,11 @@ class mod_facture_terre extends ModeleNumRefFactures
 		dol_syslog(get_class($this)."::getNextValue mode=".$mode, LOG_DEBUG);
 
 		$prefix = $this->prefixinvoice;
-		if ($invoice->type == 2) $prefix = $this->prefixcreditnote;
-		elseif ($invoice->type == 3) $prefix = $this->prefixdeposit;
+		if ($invoice->type == 2) {
+			$prefix = $this->prefixcreditnote;
+		} elseif ($invoice->type == 3) {
+			$prefix = $this->prefixdeposit;
+		}
 
 		// First we get the max value
 		$posindice = strlen($prefix) + 6;
@@ -198,19 +200,23 @@ class mod_facture_terre extends ModeleNumRefFactures
 		$sql .= " AND entity IN (".getEntity('invoicenumber', 1, $invoice).")";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			return -1;
 		}
 
-		if ($mode == 'last')
-		{
-			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-			else $num = sprintf("%04s", $max);
+		if ($mode == 'last') {
+			if ($max >= (pow(10, 4) - 1)) {
+				$num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			} else {
+				$num = sprintf("%04s", $max);
+			}
 
 			$ref = '';
 			$sql = "SELECT ref as ref";
@@ -220,24 +226,31 @@ class mod_facture_terre extends ModeleNumRefFactures
 			$sql .= " ORDER BY ref DESC";
 
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if ($obj) $ref = $obj->ref;
-			} else dol_print_error($db);
+				if ($obj) {
+					$ref = $obj->ref;
+				}
+			} else {
+				dol_print_error($db);
+			}
 
 			return $ref;
-		} elseif ($mode == 'next')
-		{
+		} elseif ($mode == 'next') {
 			$date = $invoice->date; // This is invoice date (not creation date)
 			$yymm = strftime("%y%m", $date);
 
-			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-			else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) {
+				$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			} else {
+				$num = sprintf("%04s", $max + 1);
+			}
 
 			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
 			return $prefix.$yymm."-".$num;
-		} else dol_print_error('', 'Bad parameter for getNextValue');
+		} else {
+			dol_print_error('', 'Bad parameter for getNextValue');
+		}
 	}
 
 	/**
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index 03c65f3595c..b5f8b62d419 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -147,10 +147,16 @@ abstract class ModeleNumRefFactures
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
-		else return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 }
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 844e468a69d..25a30d3ac84 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -152,7 +152,9 @@ class pdf_soleil extends ModelePDFFicheinter
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
@@ -175,20 +177,22 @@ class pdf_soleil extends ModelePDFFicheinter
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "interventions", "dict", "companies"));
 
-		if ($conf->ficheinter->dir_output)
-		{
+		if ($conf->ficheinter->dir_output) {
 			$object->fetch_thirdparty();
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->ficheinter->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -197,20 +201,16 @@ class pdf_soleil extends ModelePDFFicheinter
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -228,18 +228,18 @@ class pdf_soleil extends ModelePDFFicheinter
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -253,13 +253,17 @@ class pdf_soleil extends ModelePDFFicheinter
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("InterventionCard"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -272,8 +276,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 				// Display notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
@@ -308,8 +311,7 @@ class pdf_soleil extends ModelePDFFicheinter
 
 				$pdf->SetXY($this->marge_gauche, $tab_top + 5);
 				$text = $object->description;
-				if ($object->duration > 0)
-				{
+				if ($object->duration > 0) {
 					$totaltime = convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 					$text .= ($text ? ' - ' : '').$langs->trans("Total").": ".$totaltime;
 				}
@@ -324,13 +326,11 @@ class pdf_soleil extends ModelePDFFicheinter
 				$nblines = count($object->lines);
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$objectligne = $object->lines[$i];
 
 					$valide = empty($objectligne->id) ? 0 : $objectligne->fetch($objectligne->id);
-					if ($valide > 0 || $object->specimen)
-					{
+					if ($valide > 0 || $object->specimen) {
 						$curY = $nexY;
 						$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 						$pdf->SetTextColor(0, 0, 0);
@@ -349,8 +349,7 @@ class pdf_soleil extends ModelePDFFicheinter
 							$txt = $outputlangs->transnoentities("Date")." : ".dol_print_date($objectligne->datei, 'day', false, $outputlangs, true);
 						}
 
-						if ($objectligne->duration > 0)
-						{
+						if ($objectligne->duration > 0) {
 							$txt .= " - ".$outputlangs->transnoentities("Duration")." : ".convertSecondToTime($objectligne->duration);
 						}
 						$txt = '<strong>'.dol_htmlentitiesbr($txt, 1, $outputlangs->charset_output).'</strong>';
@@ -359,8 +358,7 @@ class pdf_soleil extends ModelePDFFicheinter
 						$pdf->startTransaction();
 						$pdf->writeHTMLCell(0, 0, $curX, $curY + 1, dol_concatdesc($txt, $desc), 0, 1, 0);
 						$pageposafter = $pdf->getPage();
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
@@ -369,13 +367,15 @@ class pdf_soleil extends ModelePDFFicheinter
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
 							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
+									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+										$this->_pagehead($pdf, $object, 0, $outputlangs);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							}
@@ -398,11 +398,9 @@ class pdf_soleil extends ModelePDFFicheinter
 						$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 						// Detect if some page were added automatically and output _tableau for past pages
-						while ($pagenb < $pageposafter)
-						{
+						while ($pagenb < $pageposafter) {
 							$pdf->setPage($pagenb);
-							if ($pagenb == 1)
-							{
+							if ($pagenb == 1) {
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -411,12 +409,12 @@ class pdf_soleil extends ModelePDFFicheinter
 							$pagenb++;
 							$pdf->setPage($pagenb);
 							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
-						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-						{
-							if ($pagenb == 1)
-							{
+						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+							if ($pagenb == 1) {
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -424,16 +422,19 @@ class pdf_soleil extends ModelePDFFicheinter
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							// New page
 							$pdf->AddPage();
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pagenb++;
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -442,7 +443,9 @@ class pdf_soleil extends ModelePDFFicheinter
 				}
 
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 				$pdf->Output($file, 'F');
@@ -452,14 +455,14 @@ class pdf_soleil extends ModelePDFFicheinter
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -517,13 +520,12 @@ class pdf_soleil extends ModelePDFFicheinter
 		$pdf->line($this->marge_gauche, $nexY, $this->page_largeur-$this->marge_droite, $nexY);
 
 		$pdf->MultiCell(0, 3, '');		// Set interline to 3. Then writeMultiCell must use 3 also.
-        */
+		*/
 
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height + 1, 0, 0); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidebottom))
-		{
+		if (empty($hidebottom)) {
 			$pdf->SetXY(20, 230);
 			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("NameAndSignatureOfInternalContact"), 0, 'L', 0);
 
@@ -559,8 +561,7 @@ class pdf_soleil extends ModelePDFFicheinter
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		//Affiche le filigrane brouillon - Print Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->FICHINTER_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->FICHINTER_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FICHINTER_DRAFT_WATERMARK);
 		}
 
@@ -575,10 +576,8 @@ class pdf_soleil extends ModelePDFFicheinter
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -613,22 +612,19 @@ class pdf_soleil extends ModelePDFFicheinter
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->datec, "day", false, $outputlangs, true), '', 'R');
 
-		if ($object->thirdparty->code_client)
-		{
+		if ($object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
 			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'INTERREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$object->fetch_user($arrayidcontact[0]);
 				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
 			}
@@ -638,7 +634,9 @@ class pdf_soleil extends ModelePDFFicheinter
 			// Show sender
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -665,8 +663,7 @@ class pdf_soleil extends ModelePDFFicheinter
 			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -684,10 +681,14 @@ class pdf_soleil extends ModelePDFFicheinter
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/fichinter/mod_arctic.php b/htdocs/core/modules/fichinter/mod_arctic.php
index 58888a7cb8d..fa5dd49f0fa 100644
--- a/htdocs/core/modules/fichinter/mod_arctic.php
+++ b/htdocs/core/modules/fichinter/mod_arctic.php
@@ -103,15 +103,14 @@ class mod_arctic extends ModeleNumRefFicheinter
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$mysoc->code_client = 'CCCCCCCCCC';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -133,8 +132,7 @@ class mod_arctic extends ModeleNumRefFicheinter
 		// We define the search criteria of the counter
 		$mask = $conf->global->FICHINTER_ARTIC_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/fichinter/mod_pacific.php b/htdocs/core/modules/fichinter/mod_pacific.php
index 5af891f39a2..b4d492e31ce 100644
--- a/htdocs/core/modules/fichinter/mod_pacific.php
+++ b/htdocs/core/modules/fichinter/mod_pacific.php
@@ -64,7 +64,7 @@ class mod_pacific extends ModeleNumRefFicheinter
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 	/**
@@ -98,13 +98,13 @@ class mod_pacific extends ModeleNumRefFicheinter
 		$sql .= " WHERE entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $fayymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$fayymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if (!$fayymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm))
-		{
+		if (!$fayymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $fayymm)) {
 			return true;
 		} else {
 			$langs->load("errors");
@@ -132,19 +132,24 @@ class mod_pacific extends ModeleNumRefFicheinter
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		}
 
 		//$date=time();
 		$date = $object->datec;
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		return $this->prefix.$yymm."-".$num;
 	}
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index b9991a7d14e..ae9ba58726e 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -140,11 +140,17 @@ abstract class ModeleNumRefFicheinter
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
-		else return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 }
 
@@ -173,10 +179,8 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 	$srctemplatepath = '';
 
 	// Positionne modele sur le nom du modele de fichinter a utiliser
-	if (!dol_strlen($modele))
-	{
-		if (!empty($conf->global->FICHEINTER_ADDON_PDF))
-		{
+	if (!dol_strlen($modele)) {
+		if (!empty($conf->global->FICHEINTER_ADDON_PDF)) {
 			$modele = $conf->global->FICHEINTER_ADDON_PDF;
 		} else {
 			$modele = 'soleil';
@@ -185,8 +189,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $modele, 2);
-	if (!empty($tmp[1]))
-	{
+	if (!empty($tmp[1])) {
 		$modele = $tmp[0];
 		$srctemplatepath = $tmp[1];
 	}
@@ -194,28 +197,28 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
-		foreach (array('doc', 'pdf') as $prefix)
-		{
+	if (is_array($conf->modules_parts['models'])) {
+		$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	}
+	foreach ($dirmodels as $reldir) {
+		foreach (array('doc', 'pdf') as $prefix) {
 			$file = $prefix."_".$modele.".modules.php";
 
 			// On verifie l'emplacement du modele
 			$file = dol_buildpath($reldir."core/modules/fichinter/doc/".$file, 0);
-			if (file_exists($file))
-			{
+			if (file_exists($file)) {
 				$filefound = 1;
 				$classname = $prefix.'_'.$modele;
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+			break;
+		}
 	}
 
 	// Charge le modele
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$obj = new $classname($db);
@@ -223,8 +226,7 @@ function fichinter_create($db, $object, $modele, $outputlangs, $hidedetails = 0,
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output = $outputlangs->charset_output;
-		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-		{
+		if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) {
 			$outputlangs->charset_output = $sav_charset_output;
 
 			// We delete old preview
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index bedcfb0cc80..b8cb33f550e 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -101,15 +101,14 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $user;
+		global $conf, $langs, $user;
 
 		$old_login = $user->login;
 		$user->login = 'UUUUUUU';
-	 	$numExample = $this->getNextValue($user, '');
+		$numExample = $this->getNextValue($user, '');
 		$user->login = $old_login;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -130,8 +129,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 
 		$mask = $conf->global->HOLIDAY_IMMACULATE_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/holiday/mod_holiday_madonna.php b/htdocs/core/modules/holiday/mod_holiday_madonna.php
index 5028cad8afc..ddec553216d 100644
--- a/htdocs/core/modules/holiday/mod_holiday_madonna.php
+++ b/htdocs/core/modules/holiday/mod_holiday_madonna.php
@@ -68,7 +68,7 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -101,13 +101,13 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -134,11 +134,13 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
 			return -1;
@@ -147,8 +149,11 @@ class mod_holiday_madonna extends ModelNumRefHolidays
 		$date = $holiday->date_debut;
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/holiday/modules_holiday.php b/htdocs/core/modules/holiday/modules_holiday.php
index afd83c7429e..65b08f4bba8 100644
--- a/htdocs/core/modules/holiday/modules_holiday.php
+++ b/htdocs/core/modules/holiday/modules_holiday.php
@@ -145,10 +145,16 @@ class ModelNumRefHolidays
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
-		else return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 }
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index e7386f0b7e4..f324f268ba3 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -114,7 +114,9 @@ class ImportCsv extends ModeleImports
 		$this->version_lib = DOL_VERSION;
 
 		$this->datatoimport = $datatoimport;
-		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
+		if (preg_match('/^societe_/', $datatoimport)) {
+			$this->thirpartyobject = new Societe($this->db);
+		}
 	}
 
 
@@ -193,8 +195,7 @@ class ImportCsv extends ModeleImports
 		ini_set('auto_detect_line_endings', 1); // For MAC compatibility
 
 		$this->handle = fopen(dol_osencode($file), "r");
-		if (!$this->handle)
-		{
+		if (!$this->handle) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFailToOpenFile", $file);
 			$ret = -1;
@@ -247,19 +248,17 @@ class ImportCsv extends ModeleImports
 		$arrayres = fgetcsv($this->handle, 100000, $this->separator, $this->enclosure, $this->escape);
 
 		// End of file
-		if ($arrayres === false) return false;
+		if ($arrayres === false) {
+			return false;
+		}
 
 		//var_dump($this->handle);
 		//var_dump($arrayres);exit;
 		$newarrayres = array();
-		if ($arrayres && is_array($arrayres))
-		{
-			foreach ($arrayres as $key => $val)
-			{
-				if (!empty($conf->global->IMPORT_CSV_FORCE_CHARSET))	// Forced charset
-				{
-					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8')
-					{
+		if ($arrayres && is_array($arrayres)) {
+			foreach ($arrayres as $key => $val) {
+				if (!empty($conf->global->IMPORT_CSV_FORCE_CHARSET)) {	// Forced charset
+					if (strtolower($conf->global->IMPORT_CSV_FORCE_CHARSET) == 'utf8') {
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					} else {
@@ -268,8 +267,7 @@ class ImportCsv extends ModeleImports
 					}
 				} else // Autodetect format (UTF8 or ISO)
 				{
-					if (utf8_check($val))
-					{
+					if (utf8_check($val)) {
 						$newarrayres[$key]['val'] = $val;
 						$newarrayres[$key]['type'] = (dol_strlen($val) ? 1 : -1); // If empty we considere it's null
 					} else {
@@ -333,8 +331,7 @@ class ImportCsv extends ModeleImports
 
 		//var_dump($sort_array_match_file_to_database);
 
-		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val'])))
-		{
+		if (count($arrayrecord) == 0 || (count($arrayrecord) == 1 && empty($arrayrecord[0]['val']))) {
 			//print 'W';
 			$this->warnings[$warning]['lib'] = $langs->trans('EmptyLine');
 			$this->warnings[$warning]['type'] = 'EMPTY';
@@ -344,8 +341,7 @@ class ImportCsv extends ModeleImports
 			$updatedone = false;
 			$insertdone = false;
 			// For each table to insert, me make a separate insert
-			foreach ($objimport->array_import_tables[0] as $alias => $tablename)
-			{
+			foreach ($objimport->array_import_tables[0] as $alias => $tablename) {
 				// Build sql request
 				$sql = '';
 				$listfields = array();
@@ -354,16 +350,19 @@ class ImportCsv extends ModeleImports
 				$errorforthistable = 0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (!isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
-				{
+				if (!isset($tablewithentity_cache[$tablename])) {	// keep this test with "isset"
 					dol_syslog("Check if table ".$tablename." has an entity field");
 					$resql = $this->db->DDLDescTable($tablename, 'entity');
-					if ($resql)
-					{
+					if ($resql) {
 						$obj = $this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
-						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
-					} else dol_print_error($this->db);
+						if ($obj) {
+							$tablewithentity_cache[$tablename] = 1; // table contains entity field
+						} else {
+							$tablewithentity_cache[$tablename] = 0; // table does not contains entity field
+						}
+					} else {
+						dol_print_error($this->db);
+					}
 				} else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
@@ -375,24 +374,25 @@ class ImportCsv extends ModeleImports
 				}
 
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
-				foreach ($sort_array_match_file_to_database as $key => $val)
-				{
+				foreach ($sort_array_match_file_to_database as $key => $val) {
 					$fieldalias = preg_replace('/\..*$/i', '', $val);
 					$fieldname = preg_replace('/^.*\./i', '', $val);
 
-					if ($alias != $fieldalias) continue; // Not a field of current table
+					if ($alias != $fieldalias) {
+						continue; // Not a field of current table
+					}
 
-					if ($key <= $maxfields)
-					{
+					if ($key <= $maxfields) {
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
 						$newval = '';
-						if ($arrayrecord[($key - 1)]['type'] > 0) $newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
+						if ($arrayrecord[($key - 1)]['type'] > 0) {
+							$newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
+						}
 
 						// Make some tests on $newval
 
 						// Is it a required field ?
-						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == ''))
-						{
+						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == '')) {
 							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
 							$this->errors[$error]['type'] = 'NOTNULL';
 							$errorforthistable++;
@@ -401,17 +401,17 @@ class ImportCsv extends ModeleImports
 						// Test format only if field is not a missing mandatory field (field may be a value or empty but not mandatory)
 						else {
 							// We convert field if required
-							if (!empty($objimport->array_import_convertvalue[0][$val]))
-							{
+							if (!empty($objimport->array_import_convertvalue[0][$val])) {
 								//print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
 								if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
 									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
 									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
-									)
-								{
+									) {
 									// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
 									$isidorref = 'id';
-									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) {
+										$isidorref = 'ref';
+									}
 
 									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
 									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
@@ -420,13 +420,11 @@ class ImportCsv extends ModeleImports
 										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 										$class = $objimport->array_import_convertvalue[0][$val]['class'];
 										$method = $objimport->array_import_convertvalue[0][$val]['method'];
-										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '')
-										{
+										if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] != '') {
 											$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval];
 										} else {
 											$resultload = dol_include_once($file);
-											if (empty($resultload))
-											{
+											if (empty($resultload)) {
 												dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 												break;
 											}
@@ -436,35 +434,37 @@ class ImportCsv extends ModeleImports
 											if ($class == 'AccountingAccount') {
 												//var_dump($arrayrecord[0]['val']);
 												/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
-                                                 $tmpchartofaccount = new AccountancySystem($this->db);
-                                                 $tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
-                                                 var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
-                                                 if ((! ($conf->global->CHARTOFACCOUNTS > 0)) || $tmpchartofaccount->ref != $arrayrecord[0]['val'])
-                                                 {
-                                                 $this->errors[$error]['lib']=$langs->trans('ErrorImportOfChartLimitedToCurrentChart', $tmpchartofaccount->ref);
-                                                 $this->errors[$error]['type']='RESTRICTONCURRENCTCHART';
-                                                 $errorforthistable++;
-                                                 $error++;
-                                                 }*/
+												 $tmpchartofaccount = new AccountancySystem($this->db);
+												 $tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
+												 var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
+												 if ((! ($conf->global->CHARTOFACCOUNTS > 0)) || $tmpchartofaccount->ref != $arrayrecord[0]['val'])
+												 {
+												 $this->errors[$error]['lib']=$langs->trans('ErrorImportOfChartLimitedToCurrentChart', $tmpchartofaccount->ref);
+												 $this->errors[$error]['type']='RESTRICTONCURRENCTCHART';
+												 $errorforthistable++;
+												 $error++;
+												 }*/
 												$param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
 											}
 
 											call_user_func_array(array($classinstance, $method), $param_array);
 											// If not found, try the fetch from label
-											if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel')
-											{
+											if (!($classinstance->id != '') && $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel') {
 												$param_array = array('', '', $newval);
 												call_user_func_array(array($classinstance, $method), $param_array);
 											}
 											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'][$newval] = $classinstance->id;
 											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-											if ($classinstance->id != '')	// id may be 0, it is a found value
-											{
+											if ($classinstance->id != '') {	// id may be 0, it is a found value
 												$newval = $classinstance->id;
 											} else {
-												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-												elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-												else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
+													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+												} else {
+													$this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
+												}
 												$this->errors[$error]['type'] = 'FOREIGNKEY';
 												$errorforthistable++;
 												$error++;
@@ -473,7 +473,9 @@ class ImportCsv extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
 									$isidorref = 'id';
-									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) {
+										$isidorref = 'ref';
+									}
 									$newval = preg_replace('/^(id|ref):/i', '', $newval);
 
 									if ($isidorref == 'ref') {
@@ -495,12 +497,14 @@ class ImportCsv extends ModeleImports
 											$param_array = array('', $newval, $code);
 											call_user_func_array(array($classinstance, $method), $param_array);
 											$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$code][$newval] = $classinstance->id;
-											if ($classinstance->id > 0)    // we found record
-											{
+											if ($classinstance->id > 0) {    // we found record
 												$newval = $classinstance->id;
 											} else {
-												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-												else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												} else {
+													$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+												}
 												$this->errors[$error]['type'] = 'FOREIGNKEY';
 												$errorforthistable++;
 												$error++;
@@ -508,19 +512,19 @@ class ImportCsv extends ModeleImports
 										}
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
-									if (empty($newval)) $newval = '0';
+									if (empty($newval)) {
+										$newval = '0';
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
 									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
 									$units = $objimport->array_import_convertvalue[0][$val]['units'];
-									if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '')
-									{
+									if ($this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] != '') {
 										$newval = $this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval];
 									} else {
 										$resultload = dol_include_once($file);
-										if (empty($resultload))
-										{
+										if (empty($resultload)) {
 											dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method.', units='.$units);
 											break;
 										}
@@ -530,77 +534,88 @@ class ImportCsv extends ModeleImports
 										$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
 										$this->cacheconvert[$file.'_'.$class.'_'.$method.'_'.$units][$newval] = $scaleorid;
 										//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
-										if ($classinstance->id > 0)	// we found record
-										{
+										if ($classinstance->id > 0) {	// we found record
 											$newval = $scaleorid ? $scaleorid : 0;
 										} else {
-											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-											else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+												$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+											} else {
+												$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+											}
 											$this->errors[$error]['type'] = 'FOREIGNKEY';
 											$errorforthistable++;
 											$error++;
 										}
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
-									if (strtolower($newval) == 'auto')
-									{
+									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codeclient(0, 0);
 										$newval = $this->thirpartyobject->code_client;
 										//print 'code_client='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) {
+										$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
-									if (strtolower($newval) == 'auto')
-									{
+									if (strtolower($newval) == 'auto') {
 										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
 										$newval = $this->thirpartyobject->code_fournisseur;
 										//print 'code_fournisseur='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) {
+										$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
-									if (strtolower($newval) == 'auto')
-									{
+									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codecompta('customer');
 										$newval = $this->thirpartyobject->code_compta;
 										//print 'code_compta='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) {
+										$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
-									if (strtolower($newval) == 'auto')
-									{
+									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codecompta('supplier');
 										$newval = $this->thirpartyobject->code_compta_fournisseur;
-										if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+										if (empty($newval)) {
+											$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+										}
 										//print 'code_compta_fournisseur='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) {
+										$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
 									$defaultref = '';
 									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
 									$obj = empty($conf->global->PROJECT_TASK_ADDON) ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php"))
-									{
+									if (!empty($conf->global->PROJECT_TASK_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.".php")) {
 										require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".$conf->global->PROJECT_TASK_ADDON.'.php';
 										$modTask = new $obj;
 										$defaultref = $modTask->getNextValue(null, null);
 									}
-									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+									if (is_numeric($defaultref) && $defaultref <= 0) {
+										$defaultref = '';
+									}
 									$newval = $defaultref;
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
 									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
 									$method = $objimport->array_import_convertvalue[0][$val]['method'];
 									$resultload = dol_include_once($file);
-									if (empty($resultload))
-									{
+									if (empty($resultload)) {
 										dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 										break;
 									}
 									$classinstance = new $class($this->db);
 									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
 									if ($res < 0) {
-										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-										else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+											$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+										} else {
+											$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+										}
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
 										$error++;
@@ -615,37 +630,35 @@ class ImportCsv extends ModeleImports
 							}
 
 							// Test regexp
-							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != ''))
-							{
+							if (!empty($objimport->array_import_regex[0][$val]) && ($newval != '')) {
 								// If test is "Must exist in a field@table or field@table:..."
 								$reg = array();
-								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg))
-								{
+								if (preg_match('/^(.+)@([^:]+)(:.+)?$/', $objimport->array_import_regex[0][$val], $reg)) {
 									$field = $reg[1];
 									$table = $reg[2];
 									$filter = !empty($reg[3]) ?substr($reg[3], 1) : '';
 
 									$cachekey = $field.'@'.$table;
-									if (!empty($filter)) $cachekey .= ':'.$filter;
+									if (!empty($filter)) {
+										$cachekey .= ':'.$filter;
+									}
 
 									// Load content of field@table into cache array
-									if (!is_array($this->cachefieldtable[$cachekey])) // If content of field@table not already loaded into cache
-									{
+									if (!is_array($this->cachefieldtable[$cachekey])) { // If content of field@table not already loaded into cache
 										$sql = "SELECT ".$field." as aliasfield FROM ".$table;
-										if (!empty($filter))
-										{
+										if (!empty($filter)) {
 											$sql .= ' WHERE '.$filter;
 										}
 
 										$resql = $this->db->query($sql);
-										if ($resql)
-										{
+										if ($resql) {
 											$num = $this->db->num_rows($resql);
 											$i = 0;
-											while ($i < $num)
-											{
+											while ($i < $num) {
 												$obj = $this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
+												if ($obj) {
+													$this->cachefieldtable[$cachekey][] = $obj->aliasfield;
+												}
 												$i++;
 											}
 										} else {
@@ -654,10 +667,11 @@ class ImportCsv extends ModeleImports
 									}
 
 									// Now we check cache is not empty (should not) and key is into cache
-									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey]))
-									{
+									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey])) {
 										$tableforerror = $table;
-										if (!empty($filter)) $tableforerror .= ':'.$filter;
+										if (!empty($filter)) {
+											$tableforerror .= ':'.$filter;
+										}
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
@@ -694,26 +708,23 @@ class ImportCsv extends ModeleImports
 				}
 
 				// We add hidden fields (but only if there is at least one field to add into table)
-				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0]))
-				{
+				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
 					// Loop on each hidden fields to add them into listfields/listvalues
-					foreach ($objimport->array_import_fieldshidden[0] as $key => $val)
-					{
-						if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) continue; // Not a field of current table
-						if ($val == 'user->id')
-						{
+					foreach ($objimport->array_import_fieldshidden[0] as $key => $val) {
+						if (!preg_match('/^'.preg_quote($alias, '/').'\./', $key)) {
+							continue; // Not a field of current table
+						}
+						if ($val == 'user->id') {
 							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 							$listvalues[] = $user->id;
-						} elseif (preg_match('/^lastrowid-/', $val))
-						{
+						} elseif (preg_match('/^lastrowid-/', $val)) {
 							$tmp = explode('-', $val);
 							$lastinsertid = (isset($last_insert_id_array[$tmp[1]])) ? $last_insert_id_array[$tmp[1]] : 0;
 							$keyfield = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 							$listfields[] = $keyfield;
 							$listvalues[] = $lastinsertid;
 							//print $key."-".$val."-".$listfields."-".$listvalues."<br>";exit;
-						} elseif (preg_match('/^const-/', $val))
-						{
+						} elseif (preg_match('/^const-/', $val)) {
 							$tmp = explode('-', $val, 2);
 							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 							$listvalues[] = "'".$tmp[1]."'";
@@ -728,11 +739,9 @@ class ImportCsv extends ModeleImports
 
 				// If no error for this $alias/$tablename, we have a complete $listfields and $listvalues that are defined
 				// so we can try to make the insert or update now.
-				if (!$errorforthistable)
-				{
+				if (!$errorforthistable) {
 					//print "$alias/$tablename/$listfields/$listvalues<br>";
-					if (!empty($listfields))
-					{
+					if (!empty($listfields)) {
 						$updatedone = false;
 						$insertdone = false;
 
@@ -780,7 +789,9 @@ class ImportCsv extends ModeleImports
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM '.$tablename;
 
-								if (empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) {
+									$keyfield = 'rowid';
+								}
 								$sqlSelect .= ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$resql = $this->db->query($sqlSelect);
@@ -812,7 +823,9 @@ class ImportCsv extends ModeleImports
 								}
 								$sqlstart .= ' SET '.implode(', ', $set);
 
-								if (empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) {
+									$keyfield = 'rowid';
+								}
 								$sqlend = ' WHERE '.$keyfield.' = '.$lastinsertid;
 
 								$sql = $sqlstart.$sqlend;
@@ -848,11 +861,9 @@ class ImportCsv extends ModeleImports
 							//dol_syslog("import_csv.modules", LOG_DEBUG);
 
 							// Run insert request
-							if ($sql)
-							{
+							if ($sql) {
 								$resql = $this->db->query($sql);
-								if ($resql)
-								{
+								if ($resql) {
 									$last_insert_id_array[$tablename] = $this->db->last_insert_id($tablename); // store the last inserted auto_increment id for each table, so that child tables can be inserted with the appropriate id. This must be done just after the INSERT request, else we risk losing the id (because another sql query will be issued somewhere in Dolibarr).
 									$insertdone = true;
 								} else {
@@ -870,11 +881,17 @@ class ImportCsv extends ModeleImports
 					}*/
 				}
 
-				if ($error) break;
+				if ($error) {
+					break;
+				}
 			}
 
-			if ($updatedone) $this->nbupdate++;
-			if ($insertdone) $this->nbinsert++;
+			if ($updatedone) {
+				$this->nbupdate++;
+			}
+			if ($insertdone) {
+				$this->nbinsert++;
+			}
 		}
 
 		return 1;
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 5b2e339a588..1f5764c810d 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -119,8 +119,7 @@ class ImportXlsx extends ModeleImports
 
 		//if ($this->id == 'excel2007new')
 		{
-		if (!class_exists('ZipArchive'))	// For Excel2007
-			{
+		if (!class_exists('ZipArchive')) {	// For Excel2007
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
 			return -1;
@@ -130,7 +129,9 @@ class ImportXlsx extends ModeleImports
 		$this->version_lib = '1.8.0';
 
 		$this->datatoimport = $datatoimport;
-		if (preg_match('/^societe_/', $datatoimport)) $this->thirpartyobject = new Societe($this->db);
+		if (preg_match('/^societe_/', $datatoimport)) {
+			$this->thirpartyobject = new Societe($this->db);
+		}
 	}
 
 
@@ -308,8 +309,9 @@ class ImportXlsx extends ModeleImports
 		global $conf;
 
 		$rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
-		if ($this->record > $rowcount)
+		if ($this->record > $rowcount) {
 			return false;
+		}
 		$array = array();
 		$xlsx = new Xlsx();
 		$info = $xlsx->listWorksheetinfo($this->file);
@@ -391,15 +393,19 @@ class ImportXlsx extends ModeleImports
 				$errorforthistable = 0;
 
 				// Define $tablewithentity_cache[$tablename] if not already defined
-				if (!isset($tablewithentity_cache[$tablename]))	// keep this test with "isset"
-				{
+				if (!isset($tablewithentity_cache[$tablename])) {	// keep this test with "isset"
 					dol_syslog("Check if table " . $tablename . " has an entity field");
 					$resql = $this->db->DDLDescTable($tablename, 'entity');
 					if ($resql) {
 						$obj = $this->db->fetch_object($resql);
-						if ($obj) $tablewithentity_cache[$tablename] = 1; // table contains entity field
-						else $tablewithentity_cache[$tablename] = 0; // table does not contains entity field
-					} else dol_print_error($this->db);
+						if ($obj) {
+							$tablewithentity_cache[$tablename] = 1; // table contains entity field
+						} else {
+							$tablewithentity_cache[$tablename] = 0; // table does not contains entity field
+						}
+					} else {
+						dol_print_error($this->db);
+					}
 				} else {
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
@@ -415,12 +421,16 @@ class ImportXlsx extends ModeleImports
 					$fieldalias = preg_replace('/\..*$/i', '', $val);
 					$fieldname = preg_replace('/^.*\./i', '', $val);
 
-					if ($alias != $fieldalias) continue; // Not a field of current table
+					if ($alias != $fieldalias) {
+						continue; // Not a field of current table
+					}
 
 					if ($key <= $maxfields) {
 						// Set $newval with value to insert and set $listvalues with sql request part for insert
 						$newval = '';
-						if ($arrayrecord[($key)]['type'] > 0) $newval = $arrayrecord[($key)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
+						if ($arrayrecord[($key)]['type'] > 0) {
+							$newval = $arrayrecord[($key)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
+						}
 
 						// Make some tests on $newval
 
@@ -436,14 +446,15 @@ class ImportXlsx extends ModeleImports
 							// We convert field if required
 							if (!empty($objimport->array_import_convertvalue[0][$val])) {
 								//print 'Must convert '.$newval.' with rule '.join(',',$objimport->array_import_convertvalue[0][$val]).'. ';
-								if (
-									$objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
+								if ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeid'
 									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromref'
 									|| $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeorlabel'
 								) {
 									// New val can be an id or ref. If it start with id: it is forced to id, if it start with ref: it is forced to ref. It not, we try to guess.
 									$isidorref = 'id';
-									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) {
+										$isidorref = 'ref';
+									}
 									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
 									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
 
@@ -465,16 +476,16 @@ class ImportXlsx extends ModeleImports
 											if ($class == 'AccountingAccount') {
 												//var_dump($arrayrecord[0]['val']);
 												/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
-                                                $tmpchartofaccount = new AccountancySystem($this->db);
-                                                $tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
-                                                var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
-                                                if ((! ($conf->global->CHARTOFACCOUNTS > 0)) || $tmpchartofaccount->ref != $arrayrecord[0]['val'])
-                                                {
-                                                    $this->errors[$error]['lib']=$langs->trans('ErrorImportOfChartLimitedToCurrentChart', $tmpchartofaccount->ref);
-                                                    $this->errors[$error]['type']='RESTRICTONCURRENCTCHART';
-                                                    $errorforthistable++;
-                                                    $error++;
-                                                }*/
+												$tmpchartofaccount = new AccountancySystem($this->db);
+												$tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
+												var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
+												if ((! ($conf->global->CHARTOFACCOUNTS > 0)) || $tmpchartofaccount->ref != $arrayrecord[0]['val'])
+												{
+													$this->errors[$error]['lib']=$langs->trans('ErrorImportOfChartLimitedToCurrentChart', $tmpchartofaccount->ref);
+													$this->errors[$error]['type']='RESTRICTONCURRENCTCHART';
+													$errorforthistable++;
+													$error++;
+												}*/
 												$param_array = array('', $newval, 0, $arrayrecord[0]['val']); // Param to fetch parent from account, in chart.
 											}
 											call_user_func_array(array($classinstance, $method), $param_array);
@@ -485,13 +496,16 @@ class ImportXlsx extends ModeleImports
 											}
 											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_'][$newval] = $classinstance->id;
 											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
-											if ($classinstance->id != '')	// id may be 0, it is a found value
-											{
+											if ($classinstance->id != '') {	// id may be 0, it is a found value
 												$newval = $classinstance->id;
 											} else {
-												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-												elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
-												else $this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
+													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+												} else {
+													$this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
+												}
 												$this->errors[$error]['type'] = 'FOREIGNKEY';
 												$errorforthistable++;
 												$error++;
@@ -500,7 +514,9 @@ class ImportXlsx extends ModeleImports
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeandlabel') {
 									$isidorref = 'id';
-									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) $isidorref = 'ref';
+									if (!is_numeric($newval) && $newval != '' && !preg_match('/^id:/i', $newval)) {
+										$isidorref = 'ref';
+									}
 									$newval = preg_replace('/^(id|ref):/i', '', $newval);
 
 									if ($isidorref == 'ref') {
@@ -522,12 +538,14 @@ class ImportXlsx extends ModeleImports
 											$param_array = array('', $newval, $code);
 											call_user_func_array(array($classinstance, $method), $param_array);
 											$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $code][$newval] = $classinstance->id;
-											if ($classinstance->id > 0)    // we found record
-											{
+											if ($classinstance->id > 0) {    // we found record
 												$newval = $classinstance->id;
 											} else {
-												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-												else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												} else {
+													$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+												}
 												$this->errors[$error]['type'] = 'FOREIGNKEY';
 												$errorforthistable++;
 												$error++;
@@ -535,7 +553,9 @@ class ImportXlsx extends ModeleImports
 										}
 									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'zeroifnull') {
-									if (empty($newval)) $newval = '0';
+									if (empty($newval)) {
+										$newval = '0';
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits' || $objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchscalefromcodeunits') {
 									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
 									$class = $objimport->array_import_convertvalue[0][$val]['class'];
@@ -555,12 +575,14 @@ class ImportXlsx extends ModeleImports
 										$scaleorid = (($objimport->array_import_convertvalue[0][$val]['rule'] == 'fetchidfromcodeunits') ? $classinstance->id : $classinstance->scale);
 										$this->cacheconvert[$file . '_' . $class . '_' . $method . '_' . $units][$newval] = $scaleorid;
 										//print 'We have made a '.$class.'->'.$method." to get a value from key '".$newval."' and we got '".$scaleorid."'.";exit;
-										if ($classinstance->id > 0)	// we found record
-										{
+										if ($classinstance->id > 0) {	// we found record
 											$newval = $scaleorid ? $scaleorid : 0;
 										} else {
-											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-											else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+												$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+											} else {
+												$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+											}
 											$this->errors[$error]['type'] = 'FOREIGNKEY';
 											$errorforthistable++;
 											$error++;
@@ -572,29 +594,39 @@ class ImportXlsx extends ModeleImports
 										$newval = $this->thirpartyobject->code_client;
 										//print 'code_client='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) {
+										$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
 									if (strtolower($newval) == 'auto') {
 										$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
 										$newval = $this->thirpartyobject->code_fournisseur;
 										//print 'code_fournisseur='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) {
+										$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codecompta('customer');
 										$newval = $this->thirpartyobject->code_compta;
 										//print 'code_compta='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) {
+										$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
 									if (strtolower($newval) == 'auto') {
 										$this->thirpartyobject->get_codecompta('supplier');
 										$newval = $this->thirpartyobject->code_compta_fournisseur;
-										if (empty($newval)) $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+										if (empty($newval)) {
+											$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+										}
 										//print 'code_compta_fournisseur='.$newval;
 									}
-									if (empty($newval)) $arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
+									if (empty($newval)) {
+										$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
+									}
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getrefifauto') {
 									$defaultref = '';
 									// TODO provide the $modTask (module of generation of ref) as parameter of import_insert function
@@ -604,7 +636,9 @@ class ImportXlsx extends ModeleImports
 										$modTask = new $obj;
 										$defaultref = $modTask->getNextValue(null, null);
 									}
-									if (is_numeric($defaultref) && $defaultref <= 0) $defaultref = '';
+									if (is_numeric($defaultref) && $defaultref <= 0) {
+										$defaultref = '';
+									}
 									$newval = $defaultref;
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'compute') {
 									$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
@@ -618,8 +652,11 @@ class ImportXlsx extends ModeleImports
 									$classinstance = new $class($this->db);
 									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
 									if ($res < 0) {
-										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-										else $this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
+											$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+										} else {
+											$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
+										}
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
 										$error++;
@@ -643,11 +680,12 @@ class ImportXlsx extends ModeleImports
 									$filter = !empty($reg[3]) ? substr($reg[3], 1) : '';
 
 									$cachekey = $field . '@' . $table;
-									if (!empty($filter)) $cachekey .= ':' . $filter;
+									if (!empty($filter)) {
+										$cachekey .= ':' . $filter;
+									}
 
 									// Load content of field@table into cache array
-									if (!is_array($this->cachefieldtable[$cachekey])) // If content of field@table not already loaded into cache
-									{
+									if (!is_array($this->cachefieldtable[$cachekey])) { // If content of field@table not already loaded into cache
 										$sql = "SELECT " . $field . " as aliasfield FROM " . $table;
 										if (!empty($filter)) {
 											$sql .= ' WHERE ' . $filter;
@@ -659,7 +697,9 @@ class ImportXlsx extends ModeleImports
 											$i = 0;
 											while ($i < $num) {
 												$obj = $this->db->fetch_object($resql);
-												if ($obj) $this->cachefieldtable[$cachekey][] = $obj->aliasfield;
+												if ($obj) {
+													$this->cachefieldtable[$cachekey][] = $obj->aliasfield;
+												}
 												$i++;
 											}
 										} else {
@@ -670,7 +710,9 @@ class ImportXlsx extends ModeleImports
 									// Now we check cache is not empty (should not) and key is into cache
 									if (!is_array($this->cachefieldtable[$cachekey]) || !in_array($newval, $this->cachefieldtable[$cachekey])) {
 										$tableforerror = $table;
-										if (!empty($filter)) $tableforerror .= ':' . $filter;
+										if (!empty($filter)) {
+											$tableforerror .= ':' . $filter;
+										}
 										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
@@ -695,9 +737,13 @@ class ImportXlsx extends ModeleImports
 						$listfields[] = $fieldname;
 
 						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key)]['type'] < 0)		 $listvalues[] = ($newval == '0' ? $newval : "null");
-						elseif (empty($newval) && $arrayrecord[($key)]['type'] == 0)	 $listvalues[] = "''";
-						else $listvalues[] = "'" . $this->db->escape($newval) . "'";
+						if (empty($newval) && $arrayrecord[($key)]['type'] < 0) {
+							$listvalues[] = ($newval == '0' ? $newval : "null");
+						} elseif (empty($newval) && $arrayrecord[($key)]['type'] == 0) {
+							$listvalues[] = "''";
+						} else {
+							$listvalues[] = "'" . $this->db->escape($newval) . "'";
+						}
 					}
 					$i++;
 				}
@@ -706,7 +752,9 @@ class ImportXlsx extends ModeleImports
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
 					// Loop on each hidden fields to add them into listfields/listvalues
 					foreach ($objimport->array_import_fieldshidden[0] as $key => $val) {
-						if (!preg_match('/^' . preg_quote($alias, '/') . '\./', $key)) continue; // Not a field of current table
+						if (!preg_match('/^' . preg_quote($alias, '/') . '\./', $key)) {
+							continue; // Not a field of current table
+						}
 						if ($val == 'user->id') {
 							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
 							$listvalues[] = $user->id;
@@ -781,7 +829,9 @@ class ImportXlsx extends ModeleImports
 								// Note: For extrafield tablename, we have in importfieldshidden_array an enty 'extra.fk_object'=>'lastrowid-tableparent' so $keyfield is 'fk_object'
 								$sqlSelect = 'SELECT rowid FROM ' . $tablename;
 
-								if (empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) {
+									$keyfield = 'rowid';
+								}
 								$sqlSelect .= ' WHERE ' . $keyfield . ' = ' . $lastinsertid;
 
 								$resql = $this->db->query($sqlSelect);
@@ -813,7 +863,9 @@ class ImportXlsx extends ModeleImports
 								}
 								$sqlstart .= ' SET ' . implode(', ', $set);
 
-								if (empty($keyfield)) $keyfield = 'rowid';
+								if (empty($keyfield)) {
+									$keyfield = 'rowid';
+								}
 								$sqlend = ' WHERE ' . $keyfield . ' = ' . $lastinsertid;
 
 								$sql = $sqlstart . $sqlend;
@@ -869,11 +921,17 @@ class ImportXlsx extends ModeleImports
 					}*/
 				}
 
-				if ($error) break;
+				if ($error) {
+					break;
+				}
 			}
 
-			if ($updatedone) $this->nbupdate++;
-			if ($insertdone) $this->nbinsert++;
+			if ($updatedone) {
+				$this->nbupdate++;
+			}
+			if ($insertdone) {
+				$this->nbinsert++;
+			}
 		}
 
 		return 1;
diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php
index 27b9a6e9cf4..d875afc5c4f 100644
--- a/htdocs/core/modules/import/modules_import.php
+++ b/htdocs/core/modules/import/modules_import.php
@@ -173,12 +173,9 @@ class ModeleImports
 
 		// Recherche des fichiers drivers imports disponibles
 		$i = 0;
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (preg_match("/^import_(.*)\.modules\.php/i", $file, $reg))
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match("/^import_(.*)\.modules\.php/i", $file, $reg)) {
 					$moduleid = $reg[1];
 
 					// Loading Class
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index 2820ea00ac5..9f434be9498 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -75,8 +75,7 @@ class mailing_advthirdparties extends MailingTargets
 
 		if (($type_of_target == 1) || ($type_of_target == 3)) {
 			// Select the third parties from category
-			if (count($socid) > 0)
-			{
+			if (count($socid) > 0) {
 				$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact";
 				$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields se ON se.fk_object=s.rowid";
 				$sql .= " WHERE s.entity IN (".getEntity('societe').")";
@@ -85,15 +84,13 @@ class mailing_advthirdparties extends MailingTargets
 
 				// Stock recipients emails into targets table
 				$result = $this->db->query($sql);
-				if ($result)
-				{
+				if ($result) {
 					$num = $this->db->num_rows($result);
 					$i = 0;
 
 					dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found", LOG_DEBUG);
 
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($result);
 
 						if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
@@ -123,8 +120,7 @@ class mailing_advthirdparties extends MailingTargets
 
 		if (($type_of_target == 1) || ($type_of_target == 2) || ($type_of_target == 4)) {
 			// Select the third parties from category
-			if (count($socid) > 0 || count($contactid) > 0)
-			{
+			if (count($socid) > 0 || count($contactid) > 0) {
 				$sql = "SELECT socp.rowid as id, socp.email as email, socp.lastname as lastname, socp.firstname as firstname";
 				$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as socp";
 				$sql .= " WHERE socp.entity IN (".getEntity('socpeople').")";
@@ -138,15 +134,13 @@ class mailing_advthirdparties extends MailingTargets
 
 				// Stock recipients emails into targets table
 				$result = $this->db->query($sql);
-				if ($result)
-				{
+				if ($result) {
 					$num = $this->db->num_rows($result);
 					$i = 0;
 
 					dol_syslog(get_class($this)."::add_to_target_spec mailing ".$num." targets found");
 
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($result);
 
 						if (!empty($obj->email) && filter_var($obj->email, FILTER_VALIDATE_EMAIL)) {
@@ -246,25 +240,34 @@ class mailing_advthirdparties extends MailingTargets
 
 		//print $sql;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			if (empty($conf->categorie->enabled)) $num = 0; // Force empty list if category module is not enabled
+			if (empty($conf->categorie->enabled)) {
+				$num = 0; // Force empty list if category module is not enabled
+			}
 
-			if ($num) $s .= '<option value="0">&nbsp;</option>';
-			else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			if ($num) {
+				$s .= '<option value="0">&nbsp;</option>';
+			} else {
+				$s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			}
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$type = '';
-				if ($obj->type == 1) $type = $langs->trans("Supplier");
-				if ($obj->type == 2) $type = $langs->trans("Customer");
+				if ($obj->type == 1) {
+					$type = $langs->trans("Supplier");
+				}
+				if ($obj->type == 2) {
+					$type = $langs->trans("Customer");
+				}
 				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
-				if ($type) $s .= ' ('.$type.')';
+				if ($type) {
+					$s .= ' ('.$type.')';
+				}
 				$s .= '</option>';
 				$i++;
 			}
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index deb1b1e12c6..4bd03593e09 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -143,17 +143,17 @@ class mailing_contacts1 extends MailingTargets
 		$s .= $langs->trans("PostOrFunction").': ';
 		$s .= '<select name="filter_jobposition" class="flat">';
 		$s .= '<option value="all">&nbsp;</option>';
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$s .= '<option value="'.dol_escape_htmltag($obj->poste).'">'.dol_escape_htmltag($obj->poste).' ('.$obj->nb.')</option>';
 				$i++;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 		$s .= '</select>';
 
 		$s .= ' ';
@@ -177,14 +177,11 @@ class mailing_contacts1 extends MailingTargets
 
 		$s .= '<select name="filter_category" class="flat">';
 		$s .= '<option value="all">&nbsp;</option>';
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
@@ -192,7 +189,9 @@ class mailing_contacts1 extends MailingTargets
 			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactWithCategoryFound").'</option>';
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 		$s .= '</select>';
 
 		$s .= '<br>';
@@ -205,23 +204,28 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY label";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num) $s .= '<option value="all">&nbsp;</option>';
-			else $s .= '<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
+			if ($num) {
+				$s .= '<option value="all">&nbsp;</option>';
+			} else {
+				$s .= '<option value="all">'.$langs->trans("ContactsAllShort").'</option>';
+			}
 			$s .= '<option value="prospects">'.$langs->trans("ThirdPartyProspects").'</option>';
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$level = $langs->trans($obj->code);
-				if ($level == $obj->code) $level = $langs->trans($obj->label);
+				if ($level == $obj->code) {
+					$level = $langs->trans($obj->label);
+				}
 				$s .= '<option value="prospectslevel'.$obj->code.'">'.$langs->trans("ThirdPartyProspects").' ('.$langs->trans("ProspectLevelShort").'='.$level.')</option>';
 				$i++;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 		$s .= '<option value="customers">'.$langs->trans("ThirdPartyCustomers").'</option>';
 		//$s.='<option value="customersidprof">'.$langs->trans("ThirdPartyCustomersWithIdProf12",$langs->trans("ProfId1"),$langs->trans("ProfId2")).'</option>';
 		$s .= '<option value="suppliers">'.$langs->trans("ThirdPartySuppliers").'</option>';
@@ -248,14 +252,11 @@ class mailing_contacts1 extends MailingTargets
 
 		$s .= '<select name="filter_category_customer" class="flat">';
 		$s .= '<option value="all">&nbsp;</option>';
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
@@ -263,7 +264,9 @@ class mailing_contacts1 extends MailingTargets
 			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 		$s .= '</select>';
 
 		$s .= ' ';
@@ -287,14 +290,11 @@ class mailing_contacts1 extends MailingTargets
 
 		$s .= '<select name="filter_category_supplier" class="flat">';
 		$s .= '<option value="all">&nbsp;</option>';
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$s .= '<option value="'.$obj->label.'">'.$obj->label.' ('.$obj->nb.')</option>';
 					$i++;
@@ -302,7 +302,9 @@ class mailing_contacts1 extends MailingTargets
 			} else {
 				$s .= '<option value="-1" disabled="disabled">'.$langs->trans("NoContactLinkedToThirdpartieWithCategoryFound").'</option>';
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 		$s .= '</select>';
 
 		return $s;
@@ -348,29 +350,41 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " WHERE active > 0";
 		$sql .= " ORDER BY label";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$prospectlevel[$obj->code] = $obj->label;
 				$i++;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		// Request must return: id, email, fk_contact, lastname, firstname, other
 		$sql = "SELECT sp.rowid as id, sp.email as email, sp.rowid as fk_contact, sp.lastname, sp.firstname, sp.civility as civility_id, sp.poste as jobposition,";
 		$sql .= " s.nom as companyname";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = sp.fk_soc";
-		if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c";
-		if ($filter_category <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
-		if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c2";
-		if ($filter_category_customer <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
-		if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
-		if ($filter_category_supplier <> 'all') $sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
+		if ($filter_category <> 'all') {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie as c";
+		}
+		if ($filter_category <> 'all') {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_contact as cs";
+		}
+		if ($filter_category_customer <> 'all') {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie as c2";
+		}
+		if ($filter_category_customer <> 'all') {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c2s";
+		}
+		if ($filter_category_supplier <> 'all') {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
+		}
+		if ($filter_category_supplier <> 'all') {
+			$sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
+		}
 		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
 		$sql .= " AND sp.email <> ''";
 		$sql .= " AND sp.no_email = 0";
@@ -379,31 +393,54 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
 		// Filter on category
-		if ($filter_category <> 'all') $sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
-		if ($filter_category <> 'all') $sql .= " AND c.label = '".$this->db->escape($filter_category)."'";
-		if ($filter_category_customer <> 'all') $sql .= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
-		if ($filter_category_customer <> 'all') $sql .= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
-		if ($filter_category_supplier <> 'all') $sql .= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
-		if ($filter_category_supplier <> 'all') $sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
+		if ($filter_category <> 'all') {
+			$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
+		}
+		if ($filter_category <> 'all') {
+			$sql .= " AND c.label = '".$this->db->escape($filter_category)."'";
+		}
+		if ($filter_category_customer <> 'all') {
+			$sql .= " AND c2s.fk_categorie = c2.rowid AND c2s.fk_soc = sp.fk_soc";
+		}
+		if ($filter_category_customer <> 'all') {
+			$sql .= " AND c2.label = '".$this->db->escape($filter_category_customer)."'";
+		}
+		if ($filter_category_supplier <> 'all') {
+			$sql .= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
+		}
+		if ($filter_category_supplier <> 'all') {
+			$sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
+		}
 		// Filter on nature
 		$key = $filter;
 		{
 			//print "xx".$key;
-			if ($key == 'prospects') $sql .= " AND s.client=2";
-			foreach ($prospectlevel as $codelevel=>$valuelevel) if ($key == 'prospectslevel'.$codelevel) $sql .= " AND s.fk_prospectlevel='".$this->db->escape($codelevel)."'";
-			if ($key == 'customers') $sql .= " AND s.client=1";
-			if ($key == 'suppliers') $sql .= " AND s.fournisseur=1";
+		if ($key == 'prospects') {
+			$sql .= " AND s.client=2";
 		}
+		foreach ($prospectlevel as $codelevel => $valuelevel) {
+			if ($key == 'prospectslevel'.$codelevel) {
+				$sql .= " AND s.fk_prospectlevel='".$this->db->escape($codelevel)."'";
+			}
+		}
+		if ($key == 'customers') {
+			$sql .= " AND s.client=1";
+		}
+		if ($key == 'suppliers') {
+			$sql .= " AND s.fournisseur=1";
+		}
+			}
 		// Filter on job position
-		$key = $filter_jobposition;
-		if (!empty($key) && $key != 'all') $sql .= " AND sp.poste ='".$this->db->escape($key)."'";
-		$sql .= " ORDER BY sp.email";
+			$key = $filter_jobposition;
+		if (!empty($key) && $key != 'all') {
+			$sql .= " AND sp.poste ='".$this->db->escape($key)."'";
+		}
+			$sql .= " ORDER BY sp.email";
 		//print "wwwwwwx".$sql;
 
 		// Stocke destinataires dans cibles
-		$result = $this->db->query($sql);
-		if ($result)
-		{
+			$result = $this->db->query($sql);
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			$j = 0;
@@ -411,23 +448,21 @@ class mailing_contacts1 extends MailingTargets
 			dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
 
 			$old = '';
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email)
-				{
+				if ($old <> $obj->email) {
 					$cibles[$j] = array(
-							'email' => $obj->email,
-							'fk_contact' => $obj->fk_contact,
-							'lastname' => $obj->lastname,
-							'firstname' => $obj->firstname,
-							'other' =>
-								($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
-								($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
-								($langs->transnoentities("JobPosition").'='.$obj->jobposition),
-							'source_url' => $this->url($obj->id),
-							'source_id' => $obj->id,
-							'source_type' => 'contact'
+						'email' => $obj->email,
+						'fk_contact' => $obj->fk_contact,
+						'lastname' => $obj->lastname,
+						'firstname' => $obj->firstname,
+						'other' =>
+							($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
+							($langs->transnoentities("UserTitle").'='.($obj->civility_id ? $langs->transnoentities("Civility".$obj->civility_id) : '')).';'.
+							($langs->transnoentities("JobPosition").'='.$obj->jobposition),
+						'source_url' => $this->url($obj->id),
+						'source_id' => $obj->id,
+						'source_type' => 'contact'
 					);
 					$old = $obj->email;
 					$j++;
@@ -441,6 +476,6 @@ class mailing_contacts1 extends MailingTargets
 			return -1;
 		}
 
-		return parent::addTargetsToDatabase($mailing_id, $cibles);
+			return parent::addTargetsToDatabase($mailing_id, $cibles);
 	}
 }
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index 6c57baaa4da..bd553e1fd5d 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -20,7 +20,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/mailings/modules_mailings.php';
 // CHANGE THIS: Class name must be called mailing_xxx with xxx=name of your selector
 
 /**
-	    \class      mailing_example
+		\class      mailing_example
 		\brief      Class to manage a list of personalised recipients for mailing feature
 */
 class mailing_example extends MailingTargets
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index d57d4e8061a..34a5bd34a1e 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -138,16 +138,16 @@ class mailing_fraise extends MailingTargets
 		$sql .= " WHERE entity IN (".getEntity('member_type').")";
 		$sql .= " ORDER BY rowid";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
 			$s .= '<option value="0">&nbsp;</option>';
-			if (!$num) $s .= '<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
+			if (!$num) {
+				$s .= '<option value="0" disabled="disabled">'.$langs->trans("NoCategoriesDefined").'</option>';
+			}
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
@@ -175,16 +175,16 @@ class mailing_fraise extends MailingTargets
 
 		//print $sql;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
 			$s .= '<option value="0">&nbsp;</option>';
-			if (!$num) $s .= '<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+			if (!$num) {
+				$s .= '<option value="0" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';
+			}
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
@@ -246,8 +246,7 @@ class mailing_fraise extends MailingTargets
 		$sql .= " a.lastname, a.firstname,";
 		$sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-		if (GETPOST('filter_category'))
-		{
+		if (GETPOST('filter_category')) {
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
 		}
@@ -258,23 +257,34 @@ class mailing_fraise extends MailingTargets
 		if (GETPOST("filter") == '-1') {
 			$sql .= " AND a.statut=-1";
 		}
-		if (GETPOST("filter", 'aZ09') == '1a') $sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
-		if (GETPOST("filter", 'aZ09') == '1b') $sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
-		if (GETPOST("filter", 'aZ09') === '0')  $sql .= " AND a.statut=0";
+		if (GETPOST("filter", 'aZ09') == '1a') {
+			$sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
+		}
+		if (GETPOST("filter", 'aZ09') == '1b') {
+			$sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
+		}
+		if (GETPOST("filter", 'aZ09') === '0') {
+			$sql .= " AND a.statut=0";
+		}
 		// Filter on date
-		if ($dateendsubscriptionafter > 0)  $sql .= " AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
-		if ($dateendsubscriptionbefore > 0) $sql .= " AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
+		if ($dateendsubscriptionafter > 0) {
+			$sql .= " AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
+		}
+		if ($dateendsubscriptionbefore > 0) {
+			$sql .= " AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
+		}
 		$sql .= " AND a.fk_adherent_type = ta.rowid";
 		// Filter on type
-		if (GETPOST('filter_type', 'int') > 0) $sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type', 'int'))."'";
+		if (GETPOST('filter_type', 'int') > 0) {
+			$sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type', 'int'))."'";
+		}
 		$sql .= " ORDER BY a.email";
 		//print $sql;
 
 		// Add targets into table
 		dol_syslog(get_class($this)."::add_to_target", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			$j = 0;
@@ -282,11 +292,9 @@ class mailing_fraise extends MailingTargets
 			dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
 
 			$old = '';
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email)
-				{
+				if ($old <> $obj->email) {
 					$cibles[$j] = array(
 								'email' => $obj->email,
 								'fk_contact' => $obj->fk_contact,
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 5b1530bf02c..728437560bb 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -67,11 +67,17 @@ class MailingTargets // This can't be abstract as it is used for some method
 		$transstring = "MailingModuleDesc".$this->name;
 		$s = '';
 
-		if ($langs->trans($this->name) != $this->name) $s = $langs->trans($this->name);
-		elseif ($langs->trans($transstring) != $transstring) $s = $langs->trans($transstring);
-		else $s = $this->desc;
+		if ($langs->trans($this->name) != $this->name) {
+			$s = $langs->trans($this->name);
+		} elseif ($langs->trans($transstring) != $transstring) {
+			$s = $langs->trans($transstring);
+		} else {
+			$s = $this->desc;
+		}
 
-		if ($this->tooltip && is_object($form)) $s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
+		if ($this->tooltip && is_object($form)) {
+			$s .= ' '.$form->textwithpicto('', $langs->trans($this->tooltip), 1, 1);
+		}
 		return $s;
 	}
 
@@ -94,8 +100,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 	public function getNbOfRecipients($sql)
 	{
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$obj = $this->db->fetch_object($result);
 			return $obj->nb;
 		} else {
@@ -129,15 +134,13 @@ class MailingTargets // This can't be abstract as it is used for some method
 		$sql = "SELECT COUNT(*) nb FROM ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " WHERE fk_mailing = ".$mailing_id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$obj = $this->db->fetch_object($result);
 			$nb = $obj->nb;
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."mailing";
 			$sql .= " SET nbemail = ".$nb." WHERE rowid = ".$mailing_id;
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				dol_syslog($this->db->error());
 				$this->error = $this->db->error();
 				return -1;
@@ -164,15 +167,13 @@ class MailingTargets // This can't be abstract as it is used for some method
 		// Insert emailing targets from array into database
 		$j = 0;
 		$num = count($cibles);
-		foreach ($cibles as $targetarray)
-		{
-			if (!empty($targetarray['email'])) // avoid empty email address
-			{
+		foreach ($cibles as $targetarray) {
+			if (!empty($targetarray['email'])) { // avoid empty email address
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_cibles";
 				$sql .= " (fk_mailing,";
 				$sql .= " fk_contact,";
 				$sql .= " lastname, firstname, email, other, source_url, source_id,";
-	   			$sql .= " tag,";
+				$sql .= " tag,";
 				$sql .= " source_type)";
 				$sql .= " VALUES (".$mailing_id.",";
 				$sql .= (empty($targetarray['fk_contact']) ? '0' : "'".$this->db->escape($targetarray['fk_contact'])."'").",";
@@ -182,16 +183,14 @@ class MailingTargets // This can't be abstract as it is used for some method
 				$sql .= "'".$this->db->escape($targetarray['other'])."',";
 				$sql .= "'".$this->db->escape($targetarray['source_url'])."',";
 				$sql .= (empty($targetarray['source_id']) ? 'null' : "'".$this->db->escape($targetarray['source_id'])."'").",";
-	   			$sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
+				$sql .= "'".$this->db->escape(dol_hash($targetarray['email'].';'.$targetarray['lastname'].';'.$mailing_id.';'.$conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY))."',";
 				$sql .= "'".$this->db->escape($targetarray['source_type'])."')";
 				dol_syslog(__METHOD__, LOG_DEBUG);
 				$result = $this->db->query($sql);
-				if ($result)
-				{
+				if ($result) {
 					$j++;
 				} else {
-					if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS')
-					{
+					if ($this->db->errno() != 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 						// Si erreur autre que doublon
 						dol_syslog($this->db->error().' : '.$targetarray['email']);
 						$this->error = $this->db->error().' : '.$targetarray['email'];
@@ -205,21 +204,21 @@ class MailingTargets // This can't be abstract as it is used for some method
 		dol_syslog(__METHOD__.": mailing ".$j." targets added");
 
 		/*
-        //Update the status to show thirdparty mail that don't want to be contacted anymore'
-        $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-        $sql .= " SET statut=3";
-        $sql .= " WHERE fk_mailing=".$mailing_id." AND email in (SELECT email FROM ".MAIN_DB_PREFIX."societe where fk_stcomm=-1)";
-        $sql .= " AND source_type='thirdparty'";
-        dol_syslog(__METHOD__.": mailing update status to display thirdparty mail that do not want to be contacted");
-        $result=$this->db->query($sql);
+		//Update the status to show thirdparty mail that don't want to be contacted anymore'
+		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " SET statut=3";
+		$sql .= " WHERE fk_mailing=".$mailing_id." AND email in (SELECT email FROM ".MAIN_DB_PREFIX."societe where fk_stcomm=-1)";
+		$sql .= " AND source_type='thirdparty'";
+		dol_syslog(__METHOD__.": mailing update status to display thirdparty mail that do not want to be contacted");
+		$result=$this->db->query($sql);
 
-        //Update the status to show contact mail that don't want to be contacted anymore'
-        $sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
-        $sql .= " SET statut=3";
-        $sql .= " WHERE fk_mailing=".$mailing_id." AND source_type='contact' AND (email in (SELECT sc.email FROM ".MAIN_DB_PREFIX."socpeople AS sc ";
-        $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid=sc.fk_soc WHERE s.fk_stcomm=-1 OR no_email=1))";
-        dol_syslog(__METHOD__.": mailing update status to display contact mail that do not want to be contacted",LOG_DEBUG);
-        $result=$this->db->query($sql);
+		//Update the status to show contact mail that don't want to be contacted anymore'
+		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
+		$sql .= " SET statut=3";
+		$sql .= " WHERE fk_mailing=".$mailing_id." AND source_type='contact' AND (email in (SELECT sc.email FROM ".MAIN_DB_PREFIX."socpeople AS sc ";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe s ON s.rowid=sc.fk_soc WHERE s.fk_stcomm=-1 OR no_email=1))";
+		dol_syslog(__METHOD__.": mailing update status to display contact mail that do not want to be contacted",LOG_DEBUG);
+		$result=$this->db->query($sql);
 		*/
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
@@ -228,8 +227,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 
 		dol_syslog(__METHOD__.":mailing update status to display emails that do not want to be contacted anymore", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			dol_print_error($this->db);
 		}
 
@@ -253,8 +251,7 @@ class MailingTargets // This can't be abstract as it is used for some method
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_cibles";
 		$sql .= " WHERE fk_mailing = ".$mailing_id;
 
-		if (!$this->db->query($sql))
-		{
+		if (!$this->db->query($sql)) {
 			dol_syslog($this->db->error());
 		}
 
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 3f4431f3eb4..03334e62322 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -172,16 +172,23 @@ class mailing_pomme extends MailingTargets
 		$sql .= " WHERE u.email <> ''"; // u.email IS NOT NULL est implicite dans ce test
 		$sql .= " AND u.entity IN (0,".$conf->entity.")";
 		$sql .= " AND u.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$mailing_id.")";
-		if (GETPOSTISSET("filter") && GETPOST("filter") == '1') $sql .= " AND u.statut=1";
-		if (GETPOSTISSET("filter") && GETPOST("filter") == '0') $sql .= " AND u.statut=0";
-		if (GETPOSTISSET("filteremployee") && GETPOSt("filteremployee") == '1') $sql .= " AND u.employee=1";
-		if (GETPOSTISSET("filteremployee") && GETPOST("filteremployee") == '0') $sql .= " AND u.employee=0";
+		if (GETPOSTISSET("filter") && GETPOST("filter") == '1') {
+			$sql .= " AND u.statut=1";
+		}
+		if (GETPOSTISSET("filter") && GETPOST("filter") == '0') {
+			$sql .= " AND u.statut=0";
+		}
+		if (GETPOSTISSET("filteremployee") && GETPOSt("filteremployee") == '1') {
+			$sql .= " AND u.employee=1";
+		}
+		if (GETPOSTISSET("filteremployee") && GETPOST("filteremployee") == '0') {
+			$sql .= " AND u.employee=0";
+		}
 		$sql .= " ORDER BY u.email";
 
 		// Stocke destinataires dans cibles
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			$j = 0;
@@ -189,11 +196,9 @@ class mailing_pomme extends MailingTargets
 			dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
 
 			$old = '';
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email)
-				{
+				if ($old <> $obj->email) {
 					$cibles[$j] = array(
 						'email' => $obj->email,
 						'fk_contact' => $obj->fk_contact,
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 44b9d51bbf3..8b8a57f6628 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -72,8 +72,7 @@ class mailing_thirdparties extends MailingTargets
 
 		$addDescription = "";
 		// Select the third parties from category
-		if (empty($_POST['filter']))
-		{
+		if (empty($_POST['filter'])) {
 			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= " WHERE s.email <> ''";
@@ -84,17 +83,13 @@ class mailing_thirdparties extends MailingTargets
 			if (GETPOSTISSET("filter_client") && GETPOST("filter_client") <> '-1') {
 				$addFilter .= " AND s.client=".((int) GETPOST("filter_client", 'int'));
 				$addDescription = $langs->trans('ProspectCustomer')."=";
-				if ($_POST["filter_client"] == 0)
-				{
+				if ($_POST["filter_client"] == 0) {
 					$addDescription .= $langs->trans('NorProspectNorCustomer');
-				} elseif ($_POST["filter_client"] == 1)
-				{
+				} elseif ($_POST["filter_client"] == 1) {
 					$addDescription .= $langs->trans('Customer');
-				} elseif ($_POST["filter_client"] == 2)
-				{
+				} elseif ($_POST["filter_client"] == 2) {
 					$addDescription .= $langs->trans('Prospect');
-				} elseif ($_POST["filter_client"] == 3)
-				{
+				} elseif ($_POST["filter_client"] == 3) {
 					$addDescription .= $langs->trans('ProspectCustomer');
 				} else {
 					$addDescription .= "Unknown status ".GETPOST("filter_client");
@@ -137,8 +132,7 @@ class mailing_thirdparties extends MailingTargets
 
 		// Stock recipients emails into targets table
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			$j = 0;
@@ -146,14 +140,11 @@ class mailing_thirdparties extends MailingTargets
 			dol_syslog(get_class($this)."::add_to_target mailing ".$num." targets found");
 
 			$old = '';
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email)
-				{
+				if ($old <> $obj->email) {
 					$otherTxt = ($obj->label ? $langs->transnoentities("Category").'='.$obj->label : '');
-					if (strlen($addDescription) > 0 && strlen($otherTxt) > 0)
-					{
+					if (strlen($addDescription) > 0 && strlen($otherTxt) > 0) {
 						$otherTxt .= ";";
 					}
 					$otherTxt .= $addDescription;
@@ -248,25 +239,34 @@ class mailing_thirdparties extends MailingTargets
 
 		//print $sql;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			if (empty($conf->categorie->enabled)) $num = 0; // Force empty list if category module is not enabled
+			if (empty($conf->categorie->enabled)) {
+				$num = 0; // Force empty list if category module is not enabled
+			}
 
-			if ($num) $s .= '<option value="0">&nbsp;</option>';
-			else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			if ($num) {
+				$s .= '<option value="0">&nbsp;</option>';
+			} else {
+				$s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+			}
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				$type = '';
-				if ($obj->type == 1) $type = $langs->trans("Supplier");
-				if ($obj->type == 2) $type = $langs->trans("Customer");
+				if ($obj->type == 1) {
+					$type = $langs->trans("Supplier");
+				}
+				if ($obj->type == 2) {
+					$type = $langs->trans("Customer");
+				}
 				$s .= '<option value="'.$obj->rowid.'">'.dol_trunc($obj->label, 38, 'middle');
-				if ($type) $s .= ' ('.$type.')';
+				if ($type) {
+					$s .= ' ('.$type.')';
+				}
 				$s .= '</option>';
 				$i++;
 			}
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index d6eea141bab..2718a33247b 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -58,17 +58,17 @@ class mailing_thirdparties_services_expired extends MailingTargets
 		// List of services
 		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
-		if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $sql .= " AND fk_product_type = 1"; // By default, only services
+		if (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+			$sql .= " AND fk_product_type = 1"; // By default, only services
+		}
 		$sql .= " ORDER BY ref";
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			dol_syslog("dolibarr_services_expired.modules.php:mailing_dolibarr_services_expired ".$num." services found");
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$i++;
 				$this->arrayofproducts[$i] = $obj->ref;
@@ -95,8 +95,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
 		$j = 0;
 
 		$product = '';
-		if ($key == '0')
-		{
+		if ($key == '0') {
 			$this->error = "Error: You must choose a filter";
 			$this->errors[] = $this->error;
 			return $this->error;
@@ -119,19 +118,16 @@ class mailing_thirdparties_services_expired extends MailingTargets
 
 		// Stocke destinataires dans cibles
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
 
 			dol_syslog(get_class($this)."::add_to_target ".$num." targets found");
 
 			$old = '';
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
-				if ($old <> $obj->email)
-				{
+				if ($old <> $obj->email) {
 					$cibles[$j] = array(
 					'email' => $obj->email,
 					'lastname' => $obj->name, // For thirdparties, lastname must be name
@@ -221,10 +217,12 @@ class mailing_thirdparties_services_expired extends MailingTargets
 
 		$s = $langs->trans("ProductOrService");
 		$s .= '<select name="filter" class="flat">';
-		if (count($this->arrayofproducts)) $s .= '<option value="0">&nbsp;</option>';
-		else $s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
-		foreach ($this->arrayofproducts as $key => $val)
-		{
+		if (count($this->arrayofproducts)) {
+			$s .= '<option value="0">&nbsp;</option>';
+		} else {
+			$s .= '<option value="0">'.$langs->trans("ContactsAllShort").'</option>';
+		}
+		foreach ($this->arrayofproducts as $key => $val) {
 			$s .= '<option value="'.$key.'">'.$val.'</option>';
 		}
 		$s .= '</select>';
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index a31d1c41483..3ece88d4c1d 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -135,23 +135,19 @@ class mailing_xinputfile extends MailingTargets
 
 		$upload_dir = $conf->mailing->dir_temp;
 
-		if (dol_mkdir($upload_dir) >= 0)
-		{
+		if (dol_mkdir($upload_dir) >= 0) {
 			$resupload = dol_move_uploaded_file($_FILES['username']['tmp_name'], $upload_dir."/".$_FILES['username']['name'], 1, 0, $_FILES['username']['error']);
-			if (is_numeric($resupload) && $resupload > 0)
-			{
+			if (is_numeric($resupload) && $resupload > 0) {
 				$cpt = 0;
 
 				$file = $upload_dir."/".$_FILES['username']['name'];
 				$handle = @fopen($file, "r");
-				if ($handle)
-				{
+				if ($handle) {
 					$i = 0;
 					$j = 0;
 
 					$old = '';
-					while (!feof($handle))
-					{
+					while (!feof($handle)) {
 						$cpt++;
 						$buffer = trim(fgets($handle));
 						$tab = explode(';', $buffer, 4);
@@ -159,13 +155,10 @@ class mailing_xinputfile extends MailingTargets
 						$name = $tab[1];
 						$firstname = $tab[2];
 						$other = $tab[3];
-						if (!empty($buffer))
-						{
+						if (!empty($buffer)) {
 							//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
-							if (isValidEMail($email))
-							{
-		   						if ($old <> $email)
-								{
+							if (isValidEMail($email)) {
+								if ($old <> $email) {
 									$cibles[$j] = array(
 													'email' => $email,
 													'lastname' => $name,
@@ -182,15 +175,17 @@ class mailing_xinputfile extends MailingTargets
 								$i++;
 								$langs->load("errors");
 								$msg = $langs->trans("ErrorFoundBadEmailInFile", $i, $cpt, $email);
-								if (!empty($msg)) $this->error = $msg;
-								else $this->error = 'ErrorFoundBadEmailInFile '.$i.' '.$cpt.' '.$email; // We experience case where $langs->trans return an empty string.
+								if (!empty($msg)) {
+									$this->error = $msg;
+								} else {
+									$this->error = 'ErrorFoundBadEmailInFile '.$i.' '.$cpt.' '.$email; // We experience case where $langs->trans return an empty string.
+								}
 							}
 						}
 					}
 					fclose($handle);
 
-					if ($i > 0)
-					{
+					if ($i > 0) {
 						return -$i;
 					}
 				} else {
@@ -201,11 +196,9 @@ class mailing_xinputfile extends MailingTargets
 				dol_syslog(get_class($this)."::add_to_target mailing ".$cpt." targets found");
 			} else {
 				$langs->load("errors");
-				if ($resupload < 0)	// Unknown error
-				{
+				if ($resupload < 0) {	// Unknown error
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
-				} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
-				{
+				} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {	// Files infected by a virus
 					$this->error = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
 				} else // Known error
 				{
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index 9c6748a10c8..b2874b43ca0 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -133,14 +133,12 @@ class mailing_xinputuser extends MailingTargets
 		$other = $tmparray[3];
 
 		$cibles = array();
-		if (!empty($email))
-		{
-			if (isValidEMail($email))
-			{
+		if (!empty($email)) {
+			if (isValidEMail($email)) {
 				$cibles[] = array(
-		   			'email' => $email,
-		   			'lastname' => $lastname,
-		   			'firstname' => $firstname,
+					'email' => $email,
+					'lastname' => $lastname,
+					'firstname' => $firstname,
 					'other' => $other,
 					'source_url' => '',
 					'source_id' => '',
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index e0fccd309ab..8e1737b3e9f 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -94,7 +94,9 @@ class doc_generic_member_odt extends ModelePDFMember
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -125,17 +127,19 @@ class doc_generic_member_odt extends ModelePDFMember
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->MEMBER_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -153,8 +157,7 @@ class doc_generic_member_odt extends ModelePDFMember
 		$texte .= '<br></div></div>';
 
 		// Scan directories
-		if (count($listofdir))
-		{
+		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
@@ -204,15 +207,16 @@ class doc_generic_member_odt extends ModelePDFMember
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
@@ -235,7 +239,9 @@ class doc_generic_member_odt extends ModelePDFMember
 
 			$dir = $conf->adherent->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
 			if (!file_exists($dir)) {
@@ -258,7 +264,9 @@ class doc_generic_member_odt extends ModelePDFMember
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -305,8 +313,7 @@ class doc_generic_member_odt extends ModelePDFMember
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_WARNING);
 					return -1;
@@ -319,7 +326,9 @@ class doc_generic_member_odt extends ModelePDFMember
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($array_member, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -331,12 +340,15 @@ class doc_generic_member_odt extends ModelePDFMember
 					'substitutionarray'=>&$tmparray
 				);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				foreach ($tmparray as $key=>$value) {
+				foreach ($tmparray as $key => $value) {
 					try {
 						if (preg_match('/logo$/', $key)) {
 							// Image
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else {
 							// Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -348,7 +360,7 @@ class doc_generic_member_odt extends ModelePDFMember
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value) {
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e) {
@@ -381,8 +393,9 @@ class doc_generic_member_odt extends ModelePDFMember
 
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 3cecb685f1d..d3fd804a662 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -82,14 +82,11 @@ class pdf_standard extends CommonStickerGenerator
 
 		// Define logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if (!is_readable($logo))
-		{
+		if (!is_readable($logo)) {
 			$logo = '';
-			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-			{
+			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-			{
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
 		}
@@ -100,41 +97,37 @@ class pdf_standard extends CommonStickerGenerator
 
 		// Define photo
 		$dir = $conf->adherent->dir_output;
-		if (!empty($photo))
-		{
+		if (!empty($photo)) {
 			$file = get_exdir(0, 0, 0, 0, $member, 'member').'photos/'.$photo;
 			$photo = $dir.'/'.$file;
-			if (!is_readable($photo)) $photo = '';
+			if (!is_readable($photo)) {
+				$photo = '';
+			}
 		}
 
 		// Define background image
 		$backgroundimage = '';
-		if (!empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND))
-		{
+		if (!empty($conf->global->ADHERENT_CARD_BACKGROUND) && file_exists($conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND)) {
 			$backgroundimage = $conf->adherent->dir_output.'/'.$conf->global->ADHERENT_CARD_BACKGROUND;
 		}
 
 		// Print lines
-		if ($this->code == "CARD")
-		{
+		if ($this->code == "CARD") {
 			$this->Tformat = $this->_Avery_Labels["CARD"];
 			//$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
 			$this->_Croix($pdf, $_PosX, $_PosY, $_PosX + $this->_Width, $_PosY + $this->_Height, 0.1, 10);
 		}
 
 		// Background
-		if ($backgroundimage)
-		{
+		if ($backgroundimage) {
 			$pdf->image($backgroundimage, $_PosX, $_PosY, $this->_Width, $this->_Height);
 		}
 
 		$xleft = 2; $ytop = 2;
 
 		// Top
-		if ($header != '')
-		{
-			if ($this->code == "CARD")
-			{
+		if ($header != '') {
+			if ($this->code == "CARD") {
 				$pdf->SetDrawColor(128, 128, 128);
 				$pdf->Line($_PosX, $_PosY + $this->_Line_Height + 1, $_PosX + $this->_Width, $_PosY + $this->_Line_Height + 1); // Only 1 mm and not ytop for top text
 				$pdf->SetDrawColor(0, 0, 0);
@@ -151,35 +144,42 @@ class pdf_standard extends CommonStickerGenerator
 		$defaultratio = ($maxwidthtouse / $maxheighttouse);
 		$widthtouse = $maxwidthtouse; $heighttouse = 0; // old value for image
 		$tmp = dol_getImageSize($photo, false);
-		if ($tmp['height'])
-		{
+		if ($tmp['height']) {
 			$imgratio = $tmp['width'] / $tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) {
+				$widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio);
+			} else {
+				$heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio);
+			}
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
 		// Center
-		if ($textright == '')	// Only a left part
-		{
+		if ($textright == '') {	// Only a left part
 			// Output left area
-			if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			elseif ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else {
+			if ($textleft == '__LOGO__' && $logo) {
+				$pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} elseif ($textleft == '__PHOTO__' && $photo) {
+				$pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		} elseif ($textleft != '' && $textright != '')	//
-		{
-			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__')
-			{
-				if ($textleft == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-				elseif ($textleft == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+		} elseif ($textleft != '' && $textright != '') {	//
+			if ($textleft == '__LOGO__' || $textleft == '__PHOTO__') {
+				if ($textleft == '__LOGO__' && $logo) {
+					$pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				} elseif ($textleft == '__PHOTO__' && $photo) {
+					$pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				}
 				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			} elseif ($textright == '__LOGO__' || $textright == '__PHOTO__')
-			{
-				if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-				elseif ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} elseif ($textright == '__LOGO__' || $textright == '__PHOTO__') {
+				if ($textright == '__LOGO__' && $logo) {
+					$pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				} elseif ($textright == '__PHOTO__' && $photo) {
+					$pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				}
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			} else // text on halft left and text on half right
@@ -192,19 +192,19 @@ class pdf_standard extends CommonStickerGenerator
 		} else // Only a right part
 		{
 			// Output right area
-			if ($textright == '__LOGO__' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			elseif ($textright == '__PHOTO__' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else {
+			if ($textright == '__LOGO__' && $logo) {
+				$pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} elseif ($textright == '__PHOTO__' && $photo) {
+				$pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
 
 		// Bottom
-		if ($footer != '')
-		{
-			if ($this->code == "CARD")
-			{
+		if ($footer != '') {
+			if ($this->code == "CARD") {
 				$pdf->SetDrawColor(128, 128, 128);
 				$pdf->Line($_PosX, $_PosY + $this->_Height - $this->_Line_Height - 2, $_PosX + $this->_Width, $_PosY + $this->_Height - $this->_Line_Height - 2);
 				$pdf->SetDrawColor(0, 0, 0);
@@ -247,9 +247,10 @@ class pdf_standard extends CommonStickerGenerator
 
 		$this->code = $srctemplatepath;
 
-		if (is_object($object))
-		{
-			if ($object->country == '-') $object->country = '';
+		if (is_object($object)) {
+			if ($object->country == '-') {
+				$object->country = '';
+			}
 
 			$now = dol_now();
 			$year = dol_print_date($now, '%Y');
@@ -287,10 +288,11 @@ class pdf_standard extends CommonStickerGenerator
 			$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
 
 			$nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
-			if ($nb <= 0) $nb = 1; // Protection to avoid empty page
+			if ($nb <= 0) {
+				$nb = 1; // Protection to avoid empty page
+			}
 
-			for ($j = 0; $j < $nb; $j++)
-			{
+			for ($j = 0; $j < $nb; $j++) {
 				$arrayofmembers[] = array(
 					'textleft'=>$textleft,
 					'textheader'=>$textheader,
@@ -309,7 +311,9 @@ class pdf_standard extends CommonStickerGenerator
 		//var_dump($arrayofrecords);exit;
 
 		$this->Tformat = $_Avery_Labels[$this->code];
-		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
+		if (empty($this->Tformat)) {
+			dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit;
+		}
 		$this->type = 'pdf';
 		// standard format or custom
 		if ($this->Tformat['paper-size'] != 'custom') {
@@ -320,15 +324,18 @@ class pdf_standard extends CommonStickerGenerator
 			$this->format = $resolution;
 		}
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "admin", "members"));
 
-		if (empty($mode) || $mode == 'member')
-		{
+		if (empty($mode) || $mode == 'member') {
 			$title = $outputlangs->transnoentities('MembersCards');
 			$keywords = $outputlangs->transnoentities('MembersCards')." ".$outputlangs->transnoentities("Foundation")." ".$outputlangs->convToOutputCharset($mysoc->name);
 		} else {
@@ -337,8 +344,7 @@ class pdf_standard extends CommonStickerGenerator
 		}
 
 		$filename = 'tmp_cards.pdf';
-		if (is_object($object))
-		{
+		if (is_object($object)) {
 			$outputdir = $conf->adherent->dir_output;
 			$dir = $outputdir."/".get_exdir(0, 0, 0, 0, $object, 'member');
 			$file = $dir.'/'.$filename;
@@ -350,10 +356,8 @@ class pdf_standard extends CommonStickerGenerator
 
 		//var_dump($file);exit;
 
-		if (!file_exists($dir))
-		{
-			if (dol_mkdir($dir) < 0)
-			{
+		if (!file_exists($dir)) {
+			if (dol_mkdir($dir) < 0) {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -361,8 +365,7 @@ class pdf_standard extends CommonStickerGenerator
 
 		$pdf = pdf_getInstance($this->format, $this->Tformat['metric'], $this->Tformat['orientation']);
 
-		if (class_exists('TCPDF'))
-		{
+		if (class_exists('TCPDF')) {
 			$pdf->setPrintHeader(false);
 			$pdf->setPrintFooter(false);
 		}
@@ -373,7 +376,9 @@ class pdf_standard extends CommonStickerGenerator
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($keywords);
-		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+			$pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins(0, 0);
 		$pdf->SetAutoPageBreak(false);
@@ -382,8 +387,16 @@ class pdf_standard extends CommonStickerGenerator
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
 		$posX = 1;
 		$posY = 1;
-		if ($posX > 0) $posX--; else $posX = 0;
-		if ($posY > 0) $posY--; else $posY = 0;
+		if ($posX > 0) {
+			$posX--;
+		} else {
+			$posX = 0;
+		}
+		if ($posY > 0) {
+			$posY--;
+		} else {
+			$posY = 0;
+		}
 		$this->_COUNTX = $posX;
 		$this->_COUNTY = $posY;
 		$this->_Set_Format($pdf, $this->Tformat);
@@ -394,8 +407,7 @@ class pdf_standard extends CommonStickerGenerator
 
 
 		// Add each record
-		foreach ($arrayofrecords as $val)
-		{
+		foreach ($arrayofrecords as $val) {
 			// imprime le texte specifique sur la carte
 			$this->Add_PDF_card($pdf, $val['textleft'], $val['textheader'], $val['textfooter'], $langs, $val['textright'], $val['id'], $val['photo']);
 		}
@@ -407,25 +419,32 @@ class pdf_standard extends CommonStickerGenerator
 		// Output to file
 		$pdf->Output($file, 'F');
 
-		if (!empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 
 		$this->result = array('fullpath'=>$file);
 
 		// Output to http stream
-		if (empty($nooutput))
-		{
+		if (empty($nooutput)) {
 			clearstatcache();
 
 			$attachment = true;
-			if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
+			if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) {
+				$attachment = false;
+			}
 			$type = dol_mimetype($filename);
 
 			//if ($encoding)   header('Content-Encoding: '.$encoding);
-			if ($type)		 header('Content-Type: '.$type);
-			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-			else header('Content-Disposition: inline; filename="'.$filename.'"');
+			if ($type) {
+				header('Content-Type: '.$type);
+			}
+			if ($attachment) {
+				header('Content-Disposition: attachment; filename="'.$filename.'"');
+			} else {
+				header('Content-Disposition: inline; filename="'.$filename.'"');
+			}
 
 			// Ajout directives pour resoudre bug IE
 			header('Cache-Control: Public, must-revalidate');
diff --git a/htdocs/core/modules/member/modules_cards.php b/htdocs/core/modules/member/modules_cards.php
index 0f4a04bcaf0..e879bdb3562 100644
--- a/htdocs/core/modules/member/modules_cards.php
+++ b/htdocs/core/modules/member/modules_cards.php
@@ -94,50 +94,51 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 	$srctemplatepath = '';
 
 	// Positionne le modele sur le nom du modele a utiliser
-	if (!dol_strlen($modele))
-	{
-		if (!empty($conf->global->ADHERENT_CARDS_ADDON_PDF))
-		{
+	if (!dol_strlen($modele)) {
+		if (!empty($conf->global->ADHERENT_CARDS_ADDON_PDF)) {
 			$code = $conf->global->ADHERENT_CARDS_ADDON_PDF;
 		} else {
 			$code = $modele;
 		}
-	} else $code = $modele;
+	} else {
+		$code = $modele;
+	}
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $template, 2);
-	if (!empty($tmp[1]))
-	{
+	if (!empty($tmp[1])) {
 		$template = $tmp[0];
 		$srctemplatepath = $tmp[1];
-	} else $srctemplatepath = $code;
+	} else {
+		$srctemplatepath = $code;
+	}
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
-		foreach (array('doc', 'pdf') as $prefix)
-		{
+	if (is_array($conf->modules_parts['models'])) {
+		$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	}
+	foreach ($dirmodels as $reldir) {
+		foreach (array('doc', 'pdf') as $prefix) {
 			$file = $prefix."_".$template.".class.php";
 
 			// On verifie l'emplacement du modele
 			$file = dol_buildpath($reldir."core/modules/member/doc/".$file, 0);
-			if (file_exists($file))
-			{
+			if (file_exists($file)) {
 				$filefound = 1;
 				$classname = $prefix.'_'.$template;
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+			break;
+		}
 	}
 
 
 	// Charge le modele
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$obj = new $classname($db);
@@ -145,8 +146,7 @@ function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $o
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output = $outputlangs->charset_output;
-		if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0)
-		{
+		if ($obj->write_file($arrayofmembers, $outputlangs, $srctemplatepath) > 0) {
 			$outputlangs->charset_output = $sav_charset_output;
 			return 1;
 		} else {
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index ca2dac95b78..1f9c75b66b4 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -341,10 +341,8 @@ class modAdherent extends DolibarrModules
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'adherent' AND entity IN (0,".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
@@ -401,22 +399,22 @@ class modAdherent extends DolibarrModules
 
 		//ODT template
 		/*
-        $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/orders/template_order.odt';
-        $dirodt=DOL_DATA_ROOT.'/doctemplates/orders';
-        $dest=$dirodt.'/template_order.odt';
+		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/orders/template_order.odt';
+		$dirodt=DOL_DATA_ROOT.'/doctemplates/orders';
+		$dest=$dirodt.'/template_order.odt';
 
-        if (file_exists($src) && ! file_exists($dest))
-        {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-            dol_mkdir($dirodt);
-            $result=dol_copy($src,$dest,0,0);
-            if ($result < 0)
-            {
-                $langs->load("errors");
-                $this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
-                return 0;
-            }
-        }*/
+		if (file_exists($src) && ! file_exists($dest))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result=dol_copy($src,$dest,0,0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+				return 0;
+			}
+		}*/
 
 		$sql = array(
 			"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type='member' AND entity = ".$conf->entity,
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index d5167dcd030..91788238419 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -88,12 +88,12 @@ class modAgenda extends DolibarrModules
 		//$this->const[] = array('AGENDA_DEFAULT_FILTER_TYPE', 'chaine', 'AC_NON_AUTO', 'Default filter for type of event on agenda', 0, 'current');
 		$sqlreadactions = "SELECT code, label, description FROM ".MAIN_DB_PREFIX."c_action_trigger ORDER by rang";
 		$resql = $this->db->query($sqlreadactions);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				//if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue;    // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
-				if (preg_match('/^TASK_/', $obj->code)) continue; // We don't track such events by default.
+				if (preg_match('/^TASK_/', $obj->code)) {
+					continue; // We don't track such events by default.
+				}
 				//if (preg_match('/^_MODIFY/',$obj->code)) continue;    // We don't track such events by default.
 				$this->const[] = array('MAIN_AGENDA_ACTIONAUTO_'.$obj->code, "chaine", "1", '', 0, 'current');
 			}
@@ -458,15 +458,23 @@ class modAgenda extends DolibarrModules
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM  '.MAIN_DB_PREFIX.'actioncomm as ac';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_actioncomm as cac on ac.fk_action = cac.id';
-		if (!empty($user) && empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
+		if (!empty($user) && empty($user->rights->agenda->allactions->read)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_resources acr on ac.id = acr.fk_actioncomm';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople as sp on ac.fk_contact = sp.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s on ac.fk_soc = s.rowid';
-		if (!empty($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (!empty($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co on s.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = ac.fk_project";
 		$this->export_sql_end[$r] .= ' WHERE ac.entity IN ('.getEntity('agenda').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND (sc.fk_user = '.(empty($user) ? 0 : $user->id).' OR ac.fk_soc IS NULL)';
-		if (empty($user->rights->agenda->allactions->read)) $this->export_sql_end[$r] .= ' AND acr.fk_element = '.(empty($user) ? 0 : $user->id);
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.(empty($user) ? 0 : $user->id).' OR ac.fk_soc IS NULL)';
+		}
+		if (empty($user->rights->agenda->allactions->read)) {
+			$this->export_sql_end[$r] .= ' AND acr.fk_element = '.(empty($user) ? 0 : $user->id);
+		}
 		$this->export_sql_order[$r] = ' ORDER BY ac.datep';
 	}
 }
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index f578c9084c2..aea29d25357 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -120,8 +120,7 @@ class modApi extends DolibarrModules
 		$this->tabs = array();
 
 		// Dictionaries
-		if (!isset($conf->api->enabled))
-		{
+		if (!isset($conf->api->enabled)) {
 			$conf->api = new stdClass();
 			$conf->api->enabled = 0;
 		}
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index 6ee48388234..5dcb9f6637c 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -105,8 +105,7 @@ class modAsset extends DolibarrModules
 		$this->const = array();
 
 
-		if (!isset($conf->asset) || !isset($conf->asset->enabled))
-		{
+		if (!isset($conf->asset) || !isset($conf->asset->enabled)) {
 			$conf->asset = new stdClass();
 			$conf->asset->enabled = 0;
 		}
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index 11912cf778a..66634f4ad55 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -162,8 +162,7 @@ class modBanque extends DolibarrModules
 			"s.nom"=>"company", "s.code_compta"=>"company", "s.code_compta_fournisseur"=>"company"
 		);
 		$this->export_special_array[$r] = array('-b.amount'=>'NULLIFNEG', 'b.amount'=>'NULLIFNEG');
-		if (empty($conf->fournisseur->enabled) && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || empty($conf->supplier_order->enabled) || empty($conf->supplier_invoice->enabled))
-		{
+		if (empty($conf->fournisseur->enabled) && !empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || empty($conf->supplier_order->enabled) || empty($conf->supplier_invoice->enabled)) {
 			unset($this->export_fields_array[$r]['s.code_compta_fournisseur']);
 			unset($this->export_entities_array[$r]['s.code_compta_fournisseur']);
 		}
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index e36827f2dee..edd6d8c12a9 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -80,14 +80,14 @@ class modBlockedLog extends DolibarrModules
 		// Currently, activation is not automatic because only companies (in France) making invoices to non business customers must
 		// enable this module.
 		/*if (! empty($conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY))
-        {
-            $tmp=explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY);
-            $this->automatic_activation = array();
-            foreach($tmp as $key)
-            {
-                $this->automatic_activation[$key]='BlockedLogActivatedBecauseRequiredByYourCountryLegislation';
-            }
-        }*/
+		{
+			$tmp=explode(',', $conf->global->BLOCKEDLOG_DISABLE_NOT_ALLOWED_FOR_COUNTRY);
+			$this->automatic_activation = array();
+			foreach($tmp as $key)
+			{
+				$this->automatic_activation[$key]='BlockedLogActivatedBecauseRequiredByYourCountryLegislation';
+			}
+		}*/
 		//var_dump($this->automatic_activation);
 
 		$this->always_enabled = (!empty($conf->blockedlog->enabled)
@@ -181,8 +181,7 @@ class modBlockedLog extends DolibarrModules
 
 		$b = new BlockedLog($this->db);
 		$result = $b->setObjectData($object, 'MODULE_SET', 0);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $b->error;
 			$this->errors = $b->erros;
 			return 0;
@@ -225,15 +224,13 @@ class modBlockedLog extends DolibarrModules
 
 		$b = new BlockedLog($this->db);
 		$result = $b->setObjectData($object, 'MODULE_RESET', 0);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $b->error;
 			$this->errors = $b->erros;
 			return 0;
 		}
 
-		if ($b->alreadyUsed(1))
-		{
+		if ($b->alreadyUsed(1)) {
 			$res = $b->create($user, '0000000000'); // If already used for something else than SET or UNSET, we log with error
 		} else {
 			$res = $b->create($user);
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index f79d353edc7..889bcbb8d0e 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -80,19 +80,19 @@ class modBom extends DolibarrModules
 		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
 		$this->module_parts = array(
 			/*
-		    'triggers' => 1,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 1,                                 	// Set this to 1 if module has its own trigger directory (core/triggers)
 			'login' => 0,                                    	// Set this to 1 if module has its own login method file (core/login)
 			'substitutions' => 1,                            	// Set this to 1 if module has its own substitution function file (core/substitutions)
 			'menus' => 0,                                    	// Set this to 1 if module has its own menus handler directory (core/menus)
 			'theme' => 0,                                    	// Set this to 1 if module has its own theme directory (theme)
-		    'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,                                      	// Set this to 1 if module overwrite template dir (core/tpl)
 			'barcode' => 0,                                  	// Set this to 1 if module has its own barcode directory (core/modules/barcode)
 			'models' => 0,                                   	// Set this to 1 if module has its own models directory (core/modules/xxx)
 			'css' => array('/bom/css/bom.css.php'),	// Set this to relative path of css file if module has its own css file
-	 		'js' => array('/bom/js/bom.js.php'),          // Set this to relative path of js file if module must load a js on all pages
+			 'js' => array('/bom/js/bom.js.php'),          // Set this to relative path of js file if module must load a js on all pages
 			'hooks' => array('data'=>array('hookcontext1','hookcontext2'), 'entity'=>'0'), 	// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context 'all'
 			'moduleforexternal' => 0							// Set this to 1 if feature of module are opened to external users
-		    */
+			*/
 		);
 
 		// Data directories to create when module is enabled.
@@ -132,8 +132,7 @@ class modBom extends DolibarrModules
 			'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
 		)*/
 
-		if (!isset($conf->bom) || !isset($conf->bom->enabled))
-		{
+		if (!isset($conf->bom) || !isset($conf->bom->enabled)) {
 			$conf->bom = new stdClass();
 			$conf->bom->enabled = 0;
 		}
@@ -171,19 +170,19 @@ class modBom extends DolibarrModules
 		// Dictionaries
 		$this->dictionaries = array();
 		/* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@bom',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->bom->enabled,$conf->bom->enabled,$conf->bom->enabled)												// Condition to show each dictionary
-        );
-        */
+		$this->dictionaries=array(
+			'langs'=>'mylangfile@bom',
+			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+			'tabcond'=>array($conf->bom->enabled,$conf->bom->enabled,$conf->bom->enabled)												// Condition to show each dictionary
+		);
+		*/
 
 
 		// Boxes/Widgets
@@ -247,7 +246,7 @@ class modBom extends DolibarrModules
 								'perms'=>'1',			                // Use 'perms'=>'$user->rights->bom->level1->level2' if you want your menu with a permission rules
 								'target'=>'',
 								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-        */
+		*/
 		/* END MODULEBUILDER TOPMENU */
 
 		/* BEGIN MODULEBUILDER LEFTMENU BILLOFMATERIALS
@@ -321,7 +320,9 @@ class modBom extends DolibarrModules
 		global $conf, $langs;
 
 		$result = $this->_load_tables('/bom/sql/');
-		if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+		if ($result < 0) {
+			return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+		}
 
 		// Create extrafields
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -343,13 +344,11 @@ class modBom extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/boms';
 		$dest = $dirodt.'/template_bom.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index 0f9d12c1a5d..d5c2e699da2 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -123,22 +123,46 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = $this->rights_class.'_list';
 		$this->export_label[$r] = 'CatListAll';
 		$this->export_icon[$r] = $this->picto;
-        $this->export_enabled[$r] = 'true';
+		$this->export_enabled[$r] = 'true';
 		$this->export_permission[$r] = array(array("categorie", "lire"));
 
 		$typeexample = "";
-		if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $typeexample .= ($typeexample ? " / " : "")."0=Product-Service"; }
-		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) { $typeexample .= ($typeexample ? "/" : "")."1=Supplier"; }
-		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? " / " : "")."2=Customer-Prospect"; }
-		if (!empty($conf->adherent->enabled)) { $typeexample .= ($typeexample ? " / " : "")."3=Member"; }
-		if (!empty($conf->societe->enabled)) { $typeexample .= ($typeexample ? " / " : "")."4=Contact"; }
-		if (!empty($conf->bank->enabled)) { $typeexample .= ($typeexample ? " / " : "")."5=Bank account"; }
-		if (!empty($conf->projet->enabled)) { $typeexample .= ($typeexample ? " / " : "")."6=Project"; }
-		if (!empty($conf->user->enabled)) { $typeexample .= ($typeexample ? " / " : "")."7=User"; }
-		if (!empty($conf->bank->enabled)) { $typeexample .= ($typeexample ? " / " : "")."8=Bank line"; }
-		if (!empty($conf->stock->enabled)) { $typeexample .= ($typeexample ? " / " : "")."9=Warehouse"; }
-		if (!empty($conf->agenda->enabled)) { $typeexample .= ($typeexample ? " / " : "")."10=Agenda event"; }
-		if (!empty($conf->website->enabled)) { $typeexample .= ($typeexample ? " / " : "")."11=Website page"; }
+		if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."0=Product-Service";
+		}
+		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
+			$typeexample .= ($typeexample ? "/" : "")."1=Supplier";
+		}
+		if (!empty($conf->societe->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."2=Customer-Prospect";
+		}
+		if (!empty($conf->adherent->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."3=Member";
+		}
+		if (!empty($conf->societe->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."4=Contact";
+		}
+		if (!empty($conf->bank->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."5=Bank account";
+		}
+		if (!empty($conf->projet->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."6=Project";
+		}
+		if (!empty($conf->user->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."7=User";
+		}
+		if (!empty($conf->bank->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."8=Bank line";
+		}
+		if (!empty($conf->stock->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."9=Warehouse";
+		}
+		if (!empty($conf->agenda->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."10=Agenda event";
+		}
+		if (!empty($conf->website->enabled)) {
+			$typeexample .= ($typeexample ? " / " : "")."11=Website page";
+		}
 
 		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.type'=>"Type", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'pcat.label'=>"ParentCategoryLabel" );
 		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.type'=>"Numeric", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'pcat.label'=>'Text' );
@@ -428,8 +452,7 @@ class modCategorie extends DolibarrModules
 		$this->import_updatekeys_array[$r] = array('ca.label'=>'Label');
 
 		// 0 Products
-		if (!empty($conf->product->enabled))
-		{
+		if (!empty($conf->product->enabled)) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_0_'.Categorie::$MAP_ID_TO_CODE[0];
 			$this->import_label[$r] = "CatProdLinks"; // Translation key
@@ -447,8 +470,7 @@ class modCategorie extends DolibarrModules
 		}
 
 		// 1 Suppliers
-		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-		{
+		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_1_'.Categorie::$MAP_ID_TO_CODE[1];
 			$this->import_label[$r] = "CatSupLinks"; // Translation key
@@ -469,8 +491,7 @@ class modCategorie extends DolibarrModules
 		}
 
 		// 2 Customers
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_2_'.Categorie::$MAP_ID_TO_CODE[2];
 			$this->import_label[$r] = "CatCusLinks"; // Translation key
@@ -491,8 +512,7 @@ class modCategorie extends DolibarrModules
 		}
 
 		// 3 Members
-		if (!empty($conf->adherent->enabled))
-		{
+		if (!empty($conf->adherent->enabled)) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_3_'.Categorie::$MAP_ID_TO_CODE[3];
 			$this->import_label[$r] = "CatMembersLinks"; // Translation key
@@ -510,8 +530,7 @@ class modCategorie extends DolibarrModules
 		}
 
 		// 4 Contacts/Addresses
-		if (!empty($conf->societe->enabled))
-		{
+		if (!empty($conf->societe->enabled)) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_4_'.Categorie::$MAP_ID_TO_CODE[4];
 			$this->import_label[$r] = "CatContactsLinks"; // Translation key
@@ -534,8 +553,7 @@ class modCategorie extends DolibarrModules
 		// 5 Bank accounts, TODO ?
 
 		// 6 Projects
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
 			$this->import_label[$r] = "CatProjectsLinks"; // Translation key
@@ -553,8 +571,7 @@ class modCategorie extends DolibarrModules
 		}
 
 		// 7 Users
-		if (!empty($conf->user->enabled))
-		{
+		if (!empty($conf->user->enabled)) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_7_'.Categorie::$MAP_ID_TO_CODE[7];
 			$this->import_label[$r] = "CatUsersLinks"; // Translation key
diff --git a/htdocs/core/modules/modCollab.class.php b/htdocs/core/modules/modCollab.class.php
index 1f777a4a117..6f6b4730b14 100644
--- a/htdocs/core/modules/modCollab.class.php
+++ b/htdocs/core/modules/modCollab.class.php
@@ -90,22 +90,22 @@ class modCollab extends DolibarrModules
 		$r = 0;
 
 		/*$this->rights[$r][0] = 30001;
-        $this->rights[$r][1] = 'Read website content';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'read';
-        $r++;
+		$this->rights[$r][1] = 'Read website content';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';
+		$r++;
 
-        $this->rights[$r][0] = 30002;
-        $this->rights[$r][1] = 'Create/modify website content';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'write';
-        $r++;
+		$this->rights[$r][0] = 30002;
+		$this->rights[$r][1] = 'Create/modify website content';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'write';
+		$r++;
 
-        $this->rights[$r][0] = 30003;
-        $this->rights[$r][1] = 'Delete website content';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'delete';
-        $r++;*/
+		$this->rights[$r][0] = 30003;
+		$this->rights[$r][1] = 'Delete website content';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'delete';
+		$r++;*/
 
 		// Main menu entries
 		$r = 0;
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 8cc0dedec6c..36a35894636 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -203,8 +203,7 @@ class modCommande extends DolibarrModules
 			'cd.tva_tx'=>"LineVATRate", 'cd.qty'=>"LineQty", 'cd.total_ht'=>"LineTotalHT", 'cd.total_tva'=>"LineTotalVAT", 'cd.total_ttc'=>"LineTotalTTC",
 			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel'
 		);
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -247,7 +246,9 @@ class modCommande extends DolibarrModules
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
@@ -262,7 +263,9 @@ class modCommande extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('commande').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		}
 
 		// Imports
 		//--------
@@ -442,13 +445,11 @@ class modCommande extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/orders';
 		$dest = $dirodt.'/template_order.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index d58e1d8497a..d9d8558e35a 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -230,13 +230,11 @@ class modContrat extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/contracts';
 		$dest = $dirodt.'/template_contract.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index 54d29595982..8c7cb2c4275 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -136,9 +136,9 @@ class modDataPolicy extends DolibarrModules {
 
 		// Some keys to add into the overwriting translation tables
 		/* $this->overwrite_translation = array(
-          'en_US:ParentCompany'=>'Parent company or reseller',
-          'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
-          ) */
+		  'en_US:ParentCompany'=>'Parent company or reseller',
+		  'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
+		  ) */
 
 		if (!isset($conf->datapolicy) || !isset($conf->datapolicy->enabled)) {
 			$conf->datapolicy = new stdClass();
@@ -218,27 +218,27 @@ class modDataPolicy extends DolibarrModules {
 		$extrafields = new ExtraFields($this->db);
 
 		/*
-        // Extrafield contact
-        $result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-        $result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-        $result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-        $result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0);
-        $result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'thirdparty', 0, 0, '', '', 0, '', '0', 0);
+		// Extrafield contact
+		$result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'thirdparty', 0, 0, '', '', 1, '', '3', 0);
+		$result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'thirdparty', 0, 0, '', '', 0, '', '0', 0);
 
-        // Extrafield Tiers
-        $result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-        $result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-        $result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-        $result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'contact', 0, 0, '', '', 1, '', '3', 0);
-        $result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'contact', 0, 0, '', '', 0, '', '0', 0);
+		// Extrafield Tiers
+		$result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'contact', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'contact', 0, 0, '', '', 1, '', '3', 0);
+		$result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'contact', 0, 0, '', '', 0, '', '0', 0);
 
-        // Extrafield Adherent
-        $result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-        $result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-        $result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
-        $result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0);
-        $result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'adherent', 0, 0, '', '', 0, '', '0', 0);
-        */
+		// Extrafield Adherent
+		$result1 = $extrafields->addExtraField('datapolicy_consentement', $langs->trans("DATAPOLICY_consentement"), 'boolean', 101, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_traitement', $langs->trans("DATAPOLICY_opposition_traitement"), 'boolean', 102, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_opposition_prospection', $langs->trans("DATAPOLICY_opposition_prospection"), 'boolean', 103, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0, '', '', 'datapolicy@datapolicy', '$conf->datapolicy->enabled');
+		$result1 = $extrafields->addExtraField('datapolicy_date', $langs->trans("DATAPOLICY_date"), 'date', 104, 3, 'adherent', 0, 0, '', '', 1, '', '3', 0);
+		$result1 = $extrafields->addExtraField('datapolicy_send', $langs->trans("DATAPOLICY_send"), 'date', 105, 3, 'adherent', 0, 0, '', '', 0, '', '0', 0);
+		*/
 
 		$sql = array();
 
diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php
index ff355725e66..d581ce539c2 100644
--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -108,8 +108,7 @@ class modDav extends DolibarrModules
 		);
 
 
-		if (!isset($conf->dav) || !isset($conf->dav->enabled))
-		{
+		if (!isset($conf->dav) || !isset($conf->dav->enabled)) {
 			$conf->dav = new stdClass();
 			$conf->dav->enabled = 0;
 		}
@@ -147,19 +146,19 @@ class modDav extends DolibarrModules
 		// Dictionaries
 		$this->dictionaries = array();
 		/* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@dav',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->dav->enabled,$conf->dav->enabled,$conf->dav->enabled)												// Condition to show each dictionary
-        );
-        */
+		$this->dictionaries=array(
+			'langs'=>'mylangfile@dav',
+			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+			'tabcond'=>array($conf->dav->enabled,$conf->dav->enabled,$conf->dav->enabled)												// Condition to show each dictionary
+		);
+		*/
 
 
 		// Boxes/Widgets
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index 8e7ec7db4c2..860a9c8ab7e 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -129,17 +129,22 @@ class modDeplacement extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'user as u';
 		$this->export_sql_end[$r] .= ', '.MAIN_DB_PREFIX.'deplacement as d';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON d.fk_soc = s.rowid';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' WHERE d.fk_user = u.rowid';
 		$this->export_sql_end[$r] .= ' AND d.entity IN ('.getEntity('deplacement').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND (sc.fk_user = '.(empty($user) ? 0 : $user->id).' OR d.fk_soc IS NULL)';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.(empty($user) ? 0 : $user->id).' OR d.fk_soc IS NULL)';
+		}
 
-		if (!empty($user))   // Not defined during migration process
-		{
+		if (!empty($user)) {   // Not defined during migration process
 			$childids = $user->getAllChildIds();
 			$childids[] = $user->id;
 
-			if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) $this->export_sql_end[$r] .= ' AND d.fk_user IN ('.join(',', $childids).')';
+			if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
+				$this->export_sql_end[$r] .= ' AND d.fk_user IN ('.join(',', $childids).')';
+			}
 		}
 	}
 
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index ac4b55011c9..bb76d2f0c1e 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -108,8 +108,7 @@ class modEmailCollector extends DolibarrModules
 		);
 
 
-		if (!isset($conf->emailcollector) || !isset($conf->emailcollector->enabled))
-		{
+		if (!isset($conf->emailcollector) || !isset($conf->emailcollector->enabled)) {
 			$conf->emailcollector = new stdClass();
 			$conf->emailcollector->enabled = 0;
 		}
@@ -147,19 +146,19 @@ class modEmailCollector extends DolibarrModules
 		// Dictionaries
 		$this->dictionaries = array();
 		/* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@dav',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->dav->enabled,$conf->dav->enabled,$conf->dav->enabled)												// Condition to show each dictionary
-        );
-        */
+		$this->dictionaries=array(
+			'langs'=>'mylangfile@dav',
+			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+			'tabcond'=>array($conf->dav->enabled,$conf->dav->enabled,$conf->dav->enabled)												// Condition to show each dictionary
+		);
+		*/
 
 
 		// Boxes/Widgets
@@ -304,7 +303,9 @@ class modEmailCollector extends DolibarrModules
 				$sql[] = $sqlforexampleFilterA3;
 				$sql[] = $sqlforexampleA4;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".$conf->entity;
 		$tmpresql = $this->db->query($tmpsql);
@@ -346,7 +347,9 @@ class modEmailCollector extends DolibarrModules
 				$sql[] = $sqlforexampleB2;
 				$sql[] = $sqlforexampleB3;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".$conf->entity;
 		$tmpresql = $this->db->query($tmpsql);
@@ -375,7 +378,9 @@ class modEmailCollector extends DolibarrModules
 				$sql[] = $sqlforexampleFilterC3;
 				$sql[] = $sqlforexampleC4;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		$tmpsql = "SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".$conf->entity;
 		$tmpresql = $this->db->query($tmpsql);
@@ -403,7 +408,9 @@ class modEmailCollector extends DolibarrModules
 				$sql[] = $sqlforexampleFilterC3;
 				$sql[] = $sqlforexampleC4;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return $this->_init($sql, $options);
 	}
diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index 2f5d78a4e37..b0527ad30b5 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -256,6 +256,21 @@ class modEventOrganization extends DolibarrModules
 		$this->rights[$r][1] = 'Delete objects of EventOrganization'; // Permission label
 		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
 		$r++;
+		/*$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read objects of EventOrganization - Conference Or Booth'; // Permission label
+		$this->rights[$r][4] = 'conferenceorbooth'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update objects of EventOrganization - Conference Or Booth'; // Permission label
+		$this->rights[$r][4] = 'conferenceorbooth'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete objects of EventOrganization - Conference Or Booth'; // Permission label
+		$this->rights[$r][4] = 'conferenceorbooth'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$r++;*/
 		/* END MODULEBUILDER PERMISSIONS */
 
 		// Main menu entries to add
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index c42cbeb0f8c..6cc31b05c22 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -251,7 +251,9 @@ class modExpedition extends DolibarrModules
 			'ed.rowid'=>'LineId', 'cd.description'=>'Description', 'ed.qty'=>"Qty", 'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
 			'p.weight'=>'ProductWeight', 'p.weight_units'=>'WeightUnits', 'p.volume'=>'ProductVolume', 'p.volume_units'=>'VolumeUnits'
 		);
-		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r] += array('sp.rowid'=>'IdContact', 'sp.lastname'=>'Lastname', 'sp.firstname'=>'Firstname', 'sp.note_public'=>'NotePublic');
+		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
+			$this->export_fields_array[$r] += array('sp.rowid'=>'IdContact', 'sp.lastname'=>'Lastname', 'sp.firstname'=>'Firstname', 'sp.note_public'=>'NotePublic');
+		}
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
 		//	'co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",
@@ -273,10 +275,11 @@ class modExpedition extends DolibarrModules
 			'ed.rowid'=>'shipment_line', 'cd.description'=>'shipment_line', 'ed.qty'=>"shipment_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product',
 			'p.weight'=>'product', 'p.weight_units'=>'product', 'p.volume'=>'product', 'p.volume_units'=>'product'
 		);
-		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r] += array('sp.rowid'=>'contact', 'sp.lastname'=>'contact', 'sp.firstname'=>'contact', 'sp.note_public'=>'contact');
+		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
+			$this->export_entities_array[$r] += array('sp.rowid'=>'contact', 'sp.lastname'=>'contact', 'sp.firstname'=>'contact', 'sp.note_public'=>'contact');
+		}
 		$this->export_dependencies_array[$r] = array('shipment_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT))
-		{
+		if ($idcontacts && !empty($conf->global->SHIPMENT_ADD_CONTACTS_IN_EXPORT)) {
 			$keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
 			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		}
@@ -291,7 +294,9 @@ class modExpedition extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'expedition as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expedition_extrafields as extra ON c.rowid = extra.fk_object,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'expeditiondet as ed';
@@ -306,7 +311,9 @@ class modExpedition extends DolibarrModules
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_expedition AND ed.fk_origin_line = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('expedition').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		}
 	}
 
 
@@ -330,13 +337,11 @@ class modExpedition extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/shipments';
 		$dest = $dirodt.'/template_shipment.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modExternalRss.class.php b/htdocs/core/modules/modExternalRss.class.php
index 05cc62094e6..241207998aa 100644
--- a/htdocs/core/modules/modExternalRss.class.php
+++ b/htdocs/core/modules/modExternalRss.class.php
@@ -98,12 +98,9 @@ class modExternalRss extends DolibarrModules
 		$sql .= " WHERE name like 'EXTERNAL_RSS_TITLE_%'";
 		$sql .= " AND entity = ".$conf->entity;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			while ($obj = $this->db->fetch_object($result))
-			{
-				if (preg_match('/EXTERNAL_RSS_TITLE_([0-9]+)/i', $obj->name, $reg))
-				{
+		if ($result) {
+			while ($obj = $this->db->fetch_object($result)) {
+				if (preg_match('/EXTERNAL_RSS_TITLE_([0-9]+)/i', $obj->name, $reg)) {
 					// Definie la boite si on a trouvee une ancienne configuration
 					//$this->boxes[$reg[1]][0] = "(ExternalRSSInformations)";
 					$this->boxes[$reg[1]]['file'] = "box_external_rss.php";
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index 9212fa1f7ce..51d3377a965 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -228,16 +228,14 @@ class modFacture extends DolibarrModules
 			'fd.product_type'=>"TypeOfLineServiceOrProduct", 'fd.fk_product'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
 			'p.accountancy_code_sell'=>'ProductAccountancySellCode'
 		);
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
 			$this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
-		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS))
-		{
+		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
 			$this->export_fields_array[$r]['f.module_source'] = 'Module';
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
@@ -253,8 +251,7 @@ class modFacture extends DolibarrModules
 			'fd.special_code'=>'Numeric', 'fd.product_type'=>"Numeric", 'fd.fk_product'=>'List:product:label', 'p.ref'=>'Text', 'p.label'=>'Text',
 			'p.accountancy_code_sell'=>'Text'
 		);
-		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS))
-		{
+		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
 			$this->export_TypeFields_array[$r]['f.module_source'] = 'Text';
 			$this->export_TypeFields_array[$r]['f.pos_source'] = 'Text';
 		}
@@ -277,7 +274,9 @@ class modFacture extends DolibarrModules
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as cd on s.fk_departement = cd.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture as f';
@@ -291,7 +290,9 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('invoice').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		}
 		$r++;
 
 
@@ -314,8 +315,7 @@ class modFacture extends DolibarrModules
 			'pt.code'=>'CodePaymentMode', 'pt.libelle'=>'LabelPaymentMode', 'p.note'=>'PaymentNote', 'p.fk_bank'=>'IdTransaction', 'ba.ref'=>'AccountRef'
 		);
 		$this->export_help_array[$r] = array('f.paye'=>'InvoicePaidCompletelyHelp');
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -323,8 +323,7 @@ class modFacture extends DolibarrModules
 			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 			$this->export_examplevalues_array[$r]['f.multicurrency_code'] = 'EUR';
 		}
-		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS))
-		{
+		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
 			$this->export_fields_array[$r]['f.module_source'] = 'POSModule';
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
@@ -338,8 +337,7 @@ class modFacture extends DolibarrModules
 			'pj.ref'=>'Text', 'pj.title'=>'Text', 'p.amount'=>'Numeric', 'pf.amount'=>'Numeric', 'p.rowid'=>'Numeric', 'p.ref'=>'Text', 'p.title'=>'Text', 'p.datep'=>'Date', 'p.num_paiement'=>'Numeric',
 			'p.fk_bank'=>'Numeric', 'p.note'=>'Text', 'pt.code'=>'Text', 'pt.libelle'=>'text', 'ba.ref'=>'Text'
 		);
-		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS))
-		{
+		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
 			$this->export_fields_array[$r]['f.module_source'] = 'POSModule';
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
@@ -356,7 +354,9 @@ class modFacture extends DolibarrModules
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c on s.fk_pays = c.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as cd on s.fk_departement = cd.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture as f';
@@ -371,7 +371,9 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON ba.rowid = b.fk_account';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('invoice').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		}
 		$r++;
 	}
 
@@ -396,13 +398,11 @@ class modFacture extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/invoices';
 		$dest = $dirodt.'/template_invoice.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index eb9b89f3087..040bcfbd5bd 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -206,8 +206,7 @@ class modFournisseur extends DolibarrModules
 		$this->rights[$r][4] = 'commande';
 		$this->rights[$r][5] = 'supprimer';
 
-		if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED))
-		{
+		if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
 			$r++;
 			$this->rights[$r][0] = 1190;
 			$this->rights[$r][1] = 'Approve supplier order (second level)'; // $langs->trans("Permission1190");
@@ -299,8 +298,7 @@ class modFournisseur extends DolibarrModules
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'p.accountancy_code_buy'=>'ProductAccountancyBuyCode', 'project.rowid'=>'ProjectId',
 			'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -332,15 +330,12 @@ class modFournisseur extends DolibarrModules
 		// Add extra fields object
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
-				switch ($obj->type)
-				{
+				switch ($obj->type) {
 					case 'int':
 					case 'double':
 					case 'price':
@@ -360,7 +355,9 @@ class modFournisseur extends DolibarrModules
 							$var = array_keys($tmpparam['options']);
 							$tmp = array_shift($var);
 						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -372,15 +369,12 @@ class modFournisseur extends DolibarrModules
 		// Add extra fields line
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extraline.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
-				switch ($obj->type)
-				{
+				switch ($obj->type) {
 					case 'int':
 					case 'double':
 					case 'price':
@@ -396,8 +390,12 @@ class modFournisseur extends DolibarrModules
 					case 'sellist':
 						$tmp = '';
 						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp = array_shift(array_keys($tmpparam['options']));
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+							$tmp = array_shift(array_keys($tmpparam['options']));
+						}
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -408,7 +406,9 @@ class modFournisseur extends DolibarrModules
 		// End add extra fields line
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
@@ -418,7 +418,9 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture_fourn';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		}
 
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -434,8 +436,7 @@ class modFournisseur extends DolibarrModules
 			'f.fk_statut'=>'InvoiceStatus', 'f.note_public'=>"InvoiceNote", 'p.rowid'=>'PaymentId', 'pf.amount'=>'AmountPayment',
 			'p.datep'=>'DatePayment', 'p.num_paiement'=>'PaymentNumber', 'p.fk_bank'=>'IdTransaction', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -465,15 +466,12 @@ class modFournisseur extends DolibarrModules
 		// Add extra fields object
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
-				switch ($obj->type)
-				{
+				switch ($obj->type) {
 					case 'int':
 					case 'double':
 					case 'price':
@@ -489,8 +487,12 @@ class modFournisseur extends DolibarrModules
 					case 'sellist':
 						$tmp = '';
 						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp = array_shift(array_keys($tmpparam['options']));
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+							$tmp = array_shift(array_keys($tmpparam['options']));
+						}
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -501,7 +503,9 @@ class modFournisseur extends DolibarrModules
 		// End add extra fields object
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
@@ -510,7 +514,9 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn as p ON pf.fk_paiementfourn = p.rowid';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_invoice').')';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		}
 
 		// Order
 		$r++;
@@ -528,16 +534,14 @@ class modFournisseur extends DolibarrModules
 			'fd.total_tva'=>"LineTotalVAT", 'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'RefSupplier', 'fd.fk_product'=>'ProductId',
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
 			$this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
-		if (empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED))
-		{
+		if (empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
 			unset($this->export_fields_array['f.date_approve2']);
 			unset($this->export_fields_array['ua2.login']);
 		}
@@ -560,15 +564,12 @@ class modFournisseur extends DolibarrModules
 		// Add extra fields object
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseur' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
-				switch ($obj->type)
-				{
+				switch ($obj->type) {
 					case 'int':
 					case 'double':
 					case 'price':
@@ -585,8 +586,12 @@ class modFournisseur extends DolibarrModules
 						$tmp = '';
 						$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
 						$tmpkey = array_keys($tmpparam['options']);
-						if ($tmpparam['options'] && is_array($tmpparam['options'])) $tmp = array_shift($tmpkey);
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+							$tmp = array_shift($tmpkey);
+						}
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -598,15 +603,12 @@ class modFournisseur extends DolibarrModules
 		// Add extra fields line
 		$sql = "SELECT name, label, type, param FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande_fournisseurdet' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extraline.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$typeFilter = "Text";
-				switch ($obj->type)
-				{
+				switch ($obj->type) {
 					case 'int':
 					case 'double':
 					case 'price':
@@ -627,7 +629,9 @@ class modFournisseur extends DolibarrModules
 							$tmpparam_param_key = array_keys($tmpparam['options']);
 							$tmp = array_shift($tmpparam_param_key);
 						}
-						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
+						if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+							$typeFilter = "List:".$tmp;
+						}
 						break;
 				}
 				$this->export_fields_array[$r][$fieldname] = $fieldlabel;
@@ -638,7 +642,9 @@ class modFournisseur extends DolibarrModules
 		// End add extra fields line
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'commande_fournisseur as f';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as project on (f.fk_projet = project.rowid)';
@@ -650,7 +656,9 @@ class modFournisseur extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (fd.fk_product = p.rowid)';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_commande';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('supplier_order').')';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
+		}
 
 		//Import Supplier Invoice
 		//--------
@@ -1001,13 +1009,11 @@ class modFournisseur extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/supplier_orders';
 		$dest = $dirodt.'/template_supplier_order.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 79a4280017c..c3bbf2c3faf 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -302,7 +302,7 @@ class modHoliday extends DolibarrModules
 				return 0;
 			}
 		}
-        */
+		*/
 
 		$sql = array(
 		//	"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'holiday' AND entity = ".$conf->entity,
diff --git a/htdocs/core/modules/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index e33dbdd8236..c73eab77c7d 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -79,8 +79,7 @@ class modIncoterm extends DolibarrModules
 		$this->tabs = array();
 
 		// Dictionaries
-		if (!isset($conf->incoterm->enabled))
-		{
+		if (!isset($conf->incoterm->enabled)) {
 			$conf->incoterm = new stdClass();
 			$conf->incoterm->enabled = 0;
 		}
diff --git a/htdocs/core/modules/modIntracommreport.class.php b/htdocs/core/modules/modIntracommreport.class.php
index da1bda58c48..36a4ced8380 100644
--- a/htdocs/core/modules/modIntracommreport.class.php
+++ b/htdocs/core/modules/modIntracommreport.class.php
@@ -86,8 +86,7 @@ class modIntracommreport extends DolibarrModules
 		$this->boxes = array();
 
 		// Dictionaries
-		if (!isset($conf->intracommreport->enabled))
-		{
+		if (!isset($conf->intracommreport->enabled)) {
 			$conf->intracommreport = new stdClass();
 			$conf->intracommreport->enabled = 0;
 		}
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index 46090c4c5d5..c073476efcb 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -142,9 +142,9 @@ class modMrp extends DolibarrModules
 
 		// Some keys to add into the overwriting translation tables
 		/*$this->overwrite_translation = array(
-            'en_US:ParentCompany'=>'Parent company or reseller',
-            'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
-        )*/
+			'en_US:ParentCompany'=>'Parent company or reseller',
+			'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
+		)*/
 
 		if (!isset($conf->mrp) || !isset($conf->mrp->enabled)) {
 			$conf->mrp = new stdClass();
@@ -182,28 +182,28 @@ class modMrp extends DolibarrModules
 		// Dictionaries
 		$this->dictionaries = array();
 		/* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@mrp',
-            // List of tables we want to see into dictonnary editor
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),
-            // Label of tables
-            'tablib'=>array("Table1","Table2","Table3"),
-            // Request to select fields
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
-            // Sort order
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
-            // List of fields (result of select to show dictionary)
-            'tabfield'=>array("code,label","code,label","code,label"),
-            // List of fields (list of fields to edit a record)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),
-            // List of fields (list of fields for insert)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),
-            // Name of columns with primary key (try to always name it 'rowid')
-            'tabrowid'=>array("rowid","rowid","rowid"),
-            // Condition to show each dictionary
-            'tabcond'=>array($conf->mrp->enabled,$conf->mrp->enabled,$conf->mrp->enabled)
-        );
-        */
+		$this->dictionaries=array(
+			'langs'=>'mylangfile@mrp',
+			// List of tables we want to see into dictonnary editor
+			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),
+			// Label of tables
+			'tablib'=>array("Table1","Table2","Table3"),
+			// Request to select fields
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
+			// Sort order
+			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
+			// List of fields (result of select to show dictionary)
+			'tabfield'=>array("code,label","code,label","code,label"),
+			// List of fields (list of fields to edit a record)
+			'tabfieldvalue'=>array("code,label","code,label","code,label"),
+			// List of fields (list of fields for insert)
+			'tabfieldinsert'=>array("code,label","code,label","code,label"),
+			// Name of columns with primary key (try to always name it 'rowid')
+			'tabrowid'=>array("rowid","rowid","rowid"),
+			// Condition to show each dictionary
+			'tabcond'=>array($conf->mrp->enabled,$conf->mrp->enabled,$conf->mrp->enabled)
+		);
+		*/
 
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in mrp/core/boxes that contains a class to show a widget.
@@ -267,40 +267,40 @@ class modMrp extends DolibarrModules
 		$r = 1;
 		/* BEGIN MODULEBUILDER EXPORT MO */
 		/*
-        $langs->load("mrp");
-        $this->export_code[$r]=$this->rights_class.'_'.$r;
-        $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-        $this->export_icon[$r]='mo@mrp';
-        $keyforclass = 'Mo'; $keyforclassfile='/mymobule/class/mo.class.php'; $keyforelement='mo';
-        include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-        $keyforselect='mo'; $keyforaliasextra='extra'; $keyforelement='mo';
-        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-        //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
-        $this->export_sql_start[$r]='SELECT DISTINCT ';
-        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'mo as t';
-        $this->export_sql_end[$r] .=' WHERE 1 = 1';
-        $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
-        $r++; */
+		$langs->load("mrp");
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r]='mo@mrp';
+		$keyforclass = 'Mo'; $keyforclassfile='/mymobule/class/mo.class.php'; $keyforelement='mo';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		$keyforselect='mo'; $keyforaliasextra='extra'; $keyforelement='mo';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'mo as t';
+		$this->export_sql_end[$r] .=' WHERE 1 = 1';
+		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
+		$r++; */
 		/* END MODULEBUILDER EXPORT MO */
 
 		// Imports profiles provided by this module
 		$r = 1;
 		/* BEGIN MODULEBUILDER IMPORT MO */
 		/*
-         $langs->load("mrp");
-         $this->export_code[$r]=$this->rights_class.'_'.$r;
-         $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-         $this->export_icon[$r]='mo@mrp';
-         $keyforclass = 'Mo'; $keyforclassfile='/mymobule/class/mo.class.php'; $keyforelement='mo';
-         include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-         $keyforselect='mo'; $keyforaliasextra='extra'; $keyforelement='mo';
-         include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-         //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
-         $this->export_sql_start[$r]='SELECT DISTINCT ';
-         $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'mo as t';
-         $this->export_sql_end[$r] .=' WHERE 1 = 1';
-         $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
-         $r++; */
+		 $langs->load("mrp");
+		 $this->export_code[$r]=$this->rights_class.'_'.$r;
+		 $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		 $this->export_icon[$r]='mo@mrp';
+		 $keyforclass = 'Mo'; $keyforclassfile='/mymobule/class/mo.class.php'; $keyforelement='mo';
+		 include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		 $keyforselect='mo'; $keyforaliasextra='extra'; $keyforelement='mo';
+		 include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		 //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		 $this->export_sql_start[$r]='SELECT DISTINCT ';
+		 $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'mo as t';
+		 $this->export_sql_end[$r] .=' WHERE 1 = 1';
+		 $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
+		 $r++; */
 		/* END MODULEBUILDER IMPORT MO */
 	}
 
@@ -317,7 +317,9 @@ class modMrp extends DolibarrModules
 		global $conf, $langs;
 
 		$result = $this->_load_tables('/mrp/sql/');
-		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		if ($result < 0) {
+			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		}
 
 		// Create extrafields during init
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -338,13 +340,11 @@ class modMrp extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/mrps';
 		$dest = $dirodt.'/template_mo.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index e20c5c77f9d..f281c99dc37 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -126,28 +126,27 @@ class modMultiCurrency extends DolibarrModules
 		$this->tabs = array();
 
 		// Dictionaries
-		if (!isset($conf->multicurrency->enabled))
-		{
+		if (!isset($conf->multicurrency->enabled)) {
 			$conf->multicurrency = new stdClass();
 			$conf->multicurrency->enabled = 0;
 		}
 		$this->dictionaries = array();
 		/* Example:
-        if (! isset($conf->multicurrency->enabled)) $conf->multicurrency->enabled=0;	// This is to avoid warnings
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@multicurrency',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+		if (! isset($conf->multicurrency->enabled)) $conf->multicurrency->enabled=0;	// This is to avoid warnings
+		$this->dictionaries=array(
+			'langs'=>'mylangfile@multicurrency',
+			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
 			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
 			// Sort order
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->multicurrency->enabled,$conf->multicurrency->enabled,$conf->multicurrency->enabled)												// Condition to show each dictionary
-        );
-        */
+			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
+			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+			'tabcond'=>array($conf->multicurrency->enabled,$conf->multicurrency->enabled,$conf->multicurrency->enabled)												// Condition to show each dictionary
+		);
+		*/
 
 		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
@@ -269,8 +268,7 @@ class modMultiCurrency extends DolibarrModules
 		//$this->_load_tables('/multicurrency/sql/');
 		$res = $this->_init($sql, $options);
 
-		if ($res)
-		{
+		if ($res) {
 			$this->createFirstCurrency();
 		}
 
@@ -302,8 +300,7 @@ class modMultiCurrency extends DolibarrModules
 	{
 		global $conf, $user, $langs;
 
-		if (!MultiCurrency::checkCodeAlreadyExists($conf->currency))
-		{
+		if (!MultiCurrency::checkCodeAlreadyExists($conf->currency)) {
 			$langs->loadCacheCurrencies('');
 
 			$multicurrency = new MultiCurrency($this->db);
@@ -311,7 +308,9 @@ class modMultiCurrency extends DolibarrModules
 			$multicurrency->name = $langs->cache_currencies[$conf->currency]['label'].' ('.$langs->getCurrencySymbol($conf->currency).')';
 			$r = $multicurrency->create($user);
 
-			if ($r > 0)	$multicurrency->addRate(1);
+			if ($r > 0) {
+				$multicurrency->addRate(1);
+			}
 		}
 	}
 }
diff --git a/htdocs/core/modules/modOauth.class.php b/htdocs/core/modules/modOauth.class.php
index 394d1e00655..1faf3455129 100644
--- a/htdocs/core/modules/modOauth.class.php
+++ b/htdocs/core/modules/modOauth.class.php
@@ -95,11 +95,11 @@ class modOauth extends DolibarrModules
 		// $this->rights[$r][5]     Niveau 2 pour nommer permission dans code
 
 		/*$r++;
-        $this->rights[$r][0] = 66000;
-        $this->rights[$r][1] = 'OauthAccess';
-        $this->rights[$r][2] = 'r';
-        $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'read';*/
+		$this->rights[$r][0] = 66000;
+		$this->rights[$r][1] = 'OauthAccess';
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'read';*/
 
 		// Main menu entries
 		$this->menus = array(); // List of menus to add
diff --git a/htdocs/core/modules/modPaypal.class.php b/htdocs/core/modules/modPaypal.class.php
index cdf25d24359..82490dc0c4b 100644
--- a/htdocs/core/modules/modPaypal.class.php
+++ b/htdocs/core/modules/modPaypal.class.php
@@ -108,20 +108,20 @@ class modPaypal extends DolibarrModules
 		$this->menus = array(); // List of menus to add
 		$r = 0;
 		/*$this->menu[$r]=array(
-	        'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-	        'mainmenu'=>'billing',
-	        'leftmenu'=>'customers_bills_payment_paypal',
-	        'type'=>'left',			                // This is a Left menu entry
-	        'titre'=>'PaypalImportPayment',
-	        'url'=>'/paypal/importpayments.php',
-	        'langs'=>'paypal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-	        'position'=>501,
-	        'enabled'=>'$conf->paypal->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-	        'perms'=>'$user->rights->banque->consolidate',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-	        'target'=>'',
-	        'user'=>2
-        );				                // 0=Menu for internal users, 1=external users, 2=both
-        $r++;*/
+			'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'mainmenu'=>'billing',
+			'leftmenu'=>'customers_bills_payment_paypal',
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'PaypalImportPayment',
+			'url'=>'/paypal/importpayments.php',
+			'langs'=>'paypal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>501,
+			'enabled'=>'$conf->paypal->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->banque->consolidate',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2
+		);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;*/
 
 		// Add here entries to declare new menus
 		// Example to declare the Top Menu entry:
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index b4c1dd13e7d..4335913be6f 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -168,7 +168,9 @@ class modProduct extends DolibarrModules
 		*/
 
 		$usenpr = 0;
-		if (is_object($mysoc)) $usenpr = $mysoc->useNPR();
+		if (is_object($mysoc)) {
+			$usenpr = $mysoc->useNPR();
+		}
 
 		// Exports
 		//--------
@@ -196,16 +198,32 @@ class modProduct extends DolibarrModules
 			'p.tva_tx'=>'VATRate',
 			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
 		);
-		if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
-		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice'));
-		if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('e.ref'=>'DefaultWarehouse', 'p.tobatch'=>'ManageLotSerial', 'p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
-		if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+		if (is_object($mysoc) && $usenpr) {
+			$this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
+		}
+		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice'));
+		}
+		if (!empty($conf->stock->enabled)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('e.ref'=>'DefaultWarehouse', 'p.tobatch'=>'ManageLotSerial', 'p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+		}
 		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		if (!empty($conf->fournisseur->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom'=>'Supplier', 'pf.ref_fourn'=>'SupplierRef', 'pf.quantity'=>'QtyMin', 'pf.remise_percent'=>'DiscountQtyMin', 'pf.unitprice'=>'BuyingPrice', 'pf.delivery_time_days'=>'NbDaysToDelivery'));
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)'=>'Categories'));
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) $this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom'=>'Supplier', 'pf.ref_fourn'=>'SupplierRef', 'pf.quantity'=>'QtyMin', 'pf.remise_percent'=>'DiscountQtyMin', 'pf.unitprice'=>'BuyingPrice', 'pf.delivery_time_days'=>'NbDaysToDelivery'));
+		}
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)'=>'Categories'));
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
+		}
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
+		}
 		$this->export_TypeFields_array[$r] = array(
 			'p.ref'=>"Text", 'p.label'=>"Text",
 			'p.fk_product_type'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
@@ -222,35 +240,76 @@ class modProduct extends DolibarrModules
 			'p.tva_tx'=>'Numeric',
 			'p.datec'=>'Date', 'p.tms'=>'Date'
 		);
-		if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('e.ref'=>'Text', 'p.tobatch'=>'Numeric', 'p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
-		if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
-		if (!empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom'=>'Text', 'pf.ref_fourn'=>'Text', 'pf.unitprice'=>'Numeric', 'pf.quantity'=>'Numeric', 'pf.remise_percent'=>'Numeric', 'pf.delivery_time_days'=>'Numeric'));
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang'=>'Text', 'l.label'=>'Text', 'l.description'=>'Text', 'l.note'=>'Text'));
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)"=>'Text'));
+		if (!empty($conf->stock->enabled)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('e.ref'=>'Text', 'p.tobatch'=>'Numeric', 'p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+		}
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom'=>'Text', 'pf.ref_fourn'=>'Text', 'pf.unitprice'=>'Numeric', 'pf.quantity'=>'Numeric', 'pf.remise_percent'=>'Numeric', 'pf.delivery_time_days'=>'Numeric'));
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang'=>'Text', 'l.label'=>'Text', 'l.description'=>'Text', 'l.note'=>'Text'));
+		}
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)"=>'Text'));
+		}
 		$this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)"=>'category'));
-		if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
-		if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
-		if (!empty($conf->fournisseur->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_dependencies_array[$r] = array('category'=>'p.rowid');
-		if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
-		if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
-		if (!empty($conf->fournisseur->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)"=>'category'));
+		}
+		if (!empty($conf->stock->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+		}
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
+		}
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+		}
+		if (!empty($conf->stock->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+		}
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
+		}
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+		}
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
-		if (!empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
-		if (!empty($conf->stock->enabled)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON e.rowid = p.fk_default_warehouse';
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
+		}
+		if (!empty($conf->stock->enabled)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON e.rowid = p.fk_default_warehouse';
+		}
 		$this->export_sql_end[$r] .= ' WHERE p.fk_product_type = 0 AND p.entity IN ('.getEntity('product').')';
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
+		}
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES))
-		{
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			// Exports product multiprice
 			$r++;
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -262,7 +321,9 @@ class modProduct extends DolibarrModules
 				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 				'pr.tva_tx'=>'PriceLevelVATRate',
 				'pr.date_price'=>'DateCreation');
-			if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+			if (is_object($mysoc) && $usenpr) {
+				$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+			}
 			//$this->export_TypeFields_array[$r]=array(
 			//	'p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",
 			//	'p.note'=>"Text",'p.length'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text',
@@ -282,8 +343,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 		}
 
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-		{
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			// Exports product multiprice
 			$r++;
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -297,7 +357,9 @@ class modProduct extends DolibarrModules
 				'pr.tva_tx'=>'PriceVATRate',
 				'pr.default_vat_code'=>'PriceVATCode',
 				'pr.datec'=>'DateCreation');
-			if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+			if (is_object($mysoc) && $usenpr) {
+				$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+			}
 			$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
 				's.nom'=>'company',
 				'pr.price_base_type'=>"product", 'pr.price'=>"product",
@@ -314,8 +376,7 @@ class modProduct extends DolibarrModules
 			$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 		}
 
-		if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
-		{
+		if (!empty($conf->global->PRODUIT_SOUSPRODUITS)) {
 			// Exports virtual products
 			$r++;
 			$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -331,8 +392,12 @@ class modProduct extends DolibarrModules
 				'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC", 'p.tva_tx'=>'VATRate', 'p.tosell'=>"OnSell",
 				'p.tobuy'=>"OnBuy", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
 			);
-			if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
-			if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+			if (!empty($conf->stock->enabled)) {
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+			}
+			if (!empty($conf->barcode->enabled)) {
+				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+			}
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
 			$this->export_TypeFields_array[$r] = array(
 				'p.ref'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.url'=>"Text",
@@ -343,8 +408,12 @@ class modProduct extends DolibarrModules
 				'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
 				'p.datec'=>'Date', 'p.tms'=>'Date'
 			);
-			if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
-			if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+			if (!empty($conf->stock->enabled)) {
+				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+			}
+			if (!empty($conf->barcode->enabled)) {
+				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+			}
 			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
 			$this->export_entities_array[$r] = array(
 				'p.rowid'=>"virtualproduct", 'p.ref'=>"virtualproduct", 'p.label'=>"virtualproduct", 'p.description'=>"virtualproduct", 'p.url'=>"virtualproduct",
@@ -355,8 +424,12 @@ class modProduct extends DolibarrModules
 				'p.price_base_type'=>"virtualproduct", 'p.price'=>"virtualproduct", 'p.price_ttc'=>"virtualproduct", 'p.tva_tx'=>"virtualproduct",
 				'p.tosell'=>"virtualproduct", 'p.tobuy'=>"virtualproduct", 'p.datec'=>"virtualproduct", 'p.tms'=>"virtualproduct"
 			);
-			if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
-			if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
+			if (!empty($conf->stock->enabled)) {
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
+			}
+			if (!empty($conf->barcode->enabled)) {
+				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
+			}
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
 			$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
 			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -524,21 +597,31 @@ class modProduct extends DolibarrModules
 			));
 		}
 
-		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
-		if (is_object($mysoc) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
-		if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
-		if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
-		if (!empty($conf->barcode->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) $this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
+		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
+		}
+		if (is_object($mysoc) && $usenpr) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
+		}
+		if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
+		}
+		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
+		}
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
+		}
 
 		// Add extra fields
 		$import_extrafield_sample = array();
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
@@ -590,17 +673,29 @@ class modProduct extends DolibarrModules
 			'p.finished' => '0 (raw material) / 1 (finished goods), matches field "code" in dictionary table "'.MAIN_DB_PREFIX.'c_product_nature"'
 		);
 		//clauses copied from import_fields_array
-		if (!empty($conf->stock->enabled)) $import_sample = array_merge($import_sample, array(
+		if (!empty($conf->stock->enabled)) {
+			$import_sample = array_merge($import_sample, array(
 				'p.tobatch'=>"0 (don't use) / 1 (use batch/serial number)",
 				'p.seuil_stock_alerte' => '',
 				'p.pmp' => '0',
 				'p.desiredstock' => ''
 			));
-		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $import_sample = array_merge($import_sample, array('p.cost_price'=>'90'));
-		if (is_object($mysoc) && $usenpr) $import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
-		if (is_object($mysoc) && $mysoc->useLocalTax(1)) $import_sample = array_merge($import_sample, array('p.localtax1_tx'=>'', 'p.localtax1_type'=>''));
-		if (is_object($mysoc) && $mysoc->useLocalTax(2)) $import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
-		if (!empty($conf->barcode->enabled)) $import_sample = array_merge($import_sample, array('p.barcode'=>''));
+		}
+		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) {
+			$import_sample = array_merge($import_sample, array('p.cost_price'=>'90'));
+		}
+		if (is_object($mysoc) && $usenpr) {
+			$import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
+		}
+		if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
+			$import_sample = array_merge($import_sample, array('p.localtax1_tx'=>'', 'p.localtax1_type'=>''));
+		}
+		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
+			$import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$import_sample = array_merge($import_sample, array('p.barcode'=>''));
+		}
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$import_sample = array_merge(
 				$import_sample,
@@ -621,10 +716,11 @@ class modProduct extends DolibarrModules
 		}
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
 		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
-		if (!empty($conf->barcode->enabled)) $this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled
+		if (!empty($conf->barcode->enabled)) {
+			$this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled
+		}
 
-		if (!empty($conf->fournisseur->enabled))
-		{
+		if (!empty($conf->fournisseur->enabled)) {
 			// Import suppliers prices (note: this code is duplicated in module Service)
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_supplierprices';
@@ -643,17 +739,22 @@ class modProduct extends DolibarrModules
 				'sp.delivery_time_days' => 'DeliveryDelay',
 				'sp.supplier_reputation' => 'SupplierReputation'
 			);
-			if (is_object($mysoc) && $usenpr)       $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
-			if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
-			if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+			if (is_object($mysoc) && $usenpr) {
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
+			}
+			if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+			}
+			if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+			}
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
 					'sp.price'=>"PriceQtyMinHT*",
 					'sp.unitprice'=>'UnitPriceHT*', // TODO Make this field not required and calculate it from price and qty
 					'sp.remise_percent'=>'DiscountQtyMin'
 			));
 
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
 					'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
 					'sp.multicurrency_code'=>'CurrencyCode',
@@ -671,10 +772,8 @@ class modProduct extends DolibarrModules
 			$import_extrafield_sample = array();
 			$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product_fournisseur_price' AND entity IN (0, ".$conf->entity.")";
 			$resql = $this->db->query($sql);
-			if ($resql)    // This can fail when class is used on old database (during migration for example)
-			{
-				while ($obj = $this->db->fetch_object($resql))
-				{
+			if ($resql) {    // This can fail when class is used on old database (during migration for example)
+				while ($obj = $this->db->fetch_object($resql)) {
 					$fieldname = 'extra.'.$obj->name;
 					$fieldlabel = ucfirst($obj->label);
 					$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
@@ -702,17 +801,22 @@ class modProduct extends DolibarrModules
 				'sp.delivery_time_days' => '5',
 				'sp.supplier_reputation' => 'FAVORITE / NOTTHGOOD / DONOTORDER'
 			);
-			if (is_object($mysoc) && $usenpr) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
-			if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
-			if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+			if (is_object($mysoc) && $usenpr) {
+				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
+			}
+			if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
+				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+			}
+			if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
+				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+			}
 			$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
 				'sp.price' => "50.00",
 				'sp.unitprice' => '10',
 				// TODO Make this field not required and calculate it from price and qty
 				'sp.remise_percent' => '20'
 			));
-			if (!empty($conf->multicurrency->enabled))
-			{
+			if (!empty($conf->multicurrency->enabled)) {
 				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
 					'sp.fk_multicurrency'=>'eg: 2, rowid for code of multicurrency currency',
 					'sp.multicurrency_code'=>'GBP',
@@ -731,8 +835,7 @@ class modProduct extends DolibarrModules
 			$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier');
 		}
 
-		if (!empty($conf->global->PRODUIT_MULTIPRICES))
-		{
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			// Import products multiprices
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_multiprice';
@@ -746,8 +849,12 @@ class modProduct extends DolibarrModules
 				'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
 				'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 				'pr.date_price'=>'DateCreation*');
-			if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) $this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
-			if (is_object($mysoc) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
+			if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+				$this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
+			}
+			if (is_object($mysoc) && $usenpr) {
+				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
+			}
 			$this->import_regex_array[$r] = array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'pr.recuperableonly'=>'^[0|1]$');
 			$this->import_convertvalue_array[$r] = array(
 				'pr.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
@@ -761,8 +868,7 @@ class modProduct extends DolibarrModules
 				'pr.date_price'=>'2020-12-31');
 		}
 
-		if (!empty($conf->global->MAIN_MULTILANGS))
-		{
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			// Import translations of product names and descriptions
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_languages';
diff --git a/htdocs/core/modules/modProductBatch.class.php b/htdocs/core/modules/modProductBatch.class.php
index e82bdbbd638..781948d0f52 100644
--- a/htdocs/core/modules/modProductBatch.class.php
+++ b/htdocs/core/modules/modProductBatch.class.php
@@ -82,8 +82,7 @@ class modProductBatch extends DolibarrModules
 		$this->tabs = array();
 
 		// Dictionaries
-		if (!isset($conf->productbatch->enabled))
-		{
+		if (!isset($conf->productbatch->enabled)) {
 			$conf->productbatch = new stdClass();
 			$conf->productbatch->enabled = 0;
 		}
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 7f2e695b8a4..69a359d6fb9 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -238,13 +238,13 @@ class modProjet extends DolibarrModules
 			'p.datec'=>"DateCreation", 'p.dateo'=>"DateStart", 'p.datee'=>"DateEnd", 'p.fk_statut'=>'ProjectStatus', 'cls.code'=>'OpportunityStatus', 'p.opp_percent'=>'OpportunityProbability', 'p.opp_amount'=>'OpportunityAmount', 'p.description'=>"Description"
 		);
 		// Add multicompany field
-		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
-		{
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			$nbofallowedentities = count(explode(',', getEntity('project'))); // If project are shared, nb will be > 1
-			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r] += array('p.entity'=>'Entity');
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+				$this->export_fields_array[$r] += array('p.entity'=>'Entity');
+			}
 		}
-		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-		{
+		if (empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 			unset($this->export_fields_array[$r]['p.opp_percent']);
 			unset($this->export_fields_array[$r]['p.opp_amount']);
 			unset($this->export_fields_array[$r]['cls.code']);
@@ -283,8 +283,7 @@ class modProjet extends DolibarrModules
 
 
 		// Import list of tasks
-		if (empty($conf->global->PROJECT_HIDE_TASKS))
-		{
+		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
 			$r++;
 			$this->import_code[$r] = 'tasksofprojects';
 			$this->import_label[$r] = 'ImportDatasetTasks';
@@ -295,10 +294,8 @@ class modProjet extends DolibarrModules
 			// Add extra fields
 			$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'projet_task' AND entity IN (0,".$conf->entity.")";
 			$resql = $this->db->query($sql);
-			if ($resql)    // This can fail when class is used on old database (during migration for example)
-			{
-				while ($obj = $this->db->fetch_object($resql))
-				{
+			if ($resql) {    // This can fail when class is used on old database (during migration for example)
+				while ($obj = $this->db->fetch_object($resql)) {
 					$fieldname = 'extra.'.$obj->name;
 					$fieldlabel = ucfirst($obj->label);
 					$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
@@ -337,13 +334,11 @@ class modProjet extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/projects';
 		$dest = $dirodt.'/template_project.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
@@ -355,13 +350,11 @@ class modProjet extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/tasks';
 		$dest = $dirodt.'/template_task_summary.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index af249e3b65c..1003bc5e09c 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -113,8 +113,8 @@ class modPropale extends DolibarrModules
 
 		// Boxes
 		$this->boxes = array(
-		   	0=>array('file'=>'box_graph_propales_permonth.php', 'enabledbydefaulton'=>'Home'),
-		   	1=>array('file'=>'box_propales.php', 'enabledbydefaulton'=>'Home'),
+			0=>array('file'=>'box_graph_propales_permonth.php', 'enabledbydefaulton'=>'Home'),
+			1=>array('file'=>'box_propales.php', 'enabledbydefaulton'=>'Home'),
 		);
 
 		// Permissions
@@ -197,8 +197,7 @@ class modPropale extends DolibarrModules
 			'cd.tva_tx'=>"LineVATRate", 'cd.qty'=>"LineQty", 'cd.total_ht'=>"LineTotalHT", 'cd.total_tva'=>"LineTotalVAT", 'cd.total_ttc'=>"LineTotalTTC",
 			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel'
 		);
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->export_fields_array[$r]['c.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
 			$this->export_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -241,7 +240,9 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s ';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
 
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'propal as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
@@ -254,7 +255,9 @@ class modPropale extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('propal').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		}
 
 		// Imports
 		//--------
@@ -446,13 +449,11 @@ class modPropale extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/proposals';
 		$dest = $dirodt.'/template_proposal.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 8bebf949b6f..54334cdc285 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -186,7 +186,9 @@ class modReception extends DolibarrModules
 			'ed.comment'=>'Description', 'ed.qty'=>"Qty",
 			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'p.weight'=>'ProductWeight', 'p.weight_units'=>'WeightUnits', 'p.volume'=>'ProductVolume', 'p.volume_units'=>'VolumeUnits'
 		);
-		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) $this->export_fields_array[$r] += array('sp.rowid'=>'IdContact', 'sp.lastname'=>'Lastname', 'sp.firstname'=>'Firstname', 'sp.note_public'=>'NotePublic');
+		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) {
+			$this->export_fields_array[$r] += array('sp.rowid'=>'IdContact', 'sp.lastname'=>'Lastname', 'sp.firstname'=>'Firstname', 'sp.note_public'=>'NotePublic');
+		}
 		//$this->export_TypeFields_array[$r]=array('s.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','ed.qty'=>"Text");
 		$this->export_TypeFields_array[$r] = array(
 			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text',
@@ -201,10 +203,11 @@ class modReception extends DolibarrModules
 			'ed.rowid'=>'reception_line', 'ed.comment'=>'reception_line', 'ed.qty'=>"reception_line",
 			'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product', 'p.weight'=>'product', 'p.weight_units'=>'product', 'p.volume'=>'product', 'p.volume_units'=>'product'
 		);
-		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) $this->export_entities_array[$r] += array('sp.rowid'=>'contact', 'sp.lastname'=>'contact', 'sp.firstname'=>'contact', 'sp.note_public'=>'contact');
+		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) {
+			$this->export_entities_array[$r] += array('sp.rowid'=>'contact', 'sp.lastname'=>'contact', 'sp.firstname'=>'contact', 'sp.note_public'=>'contact');
+		}
 		$this->export_dependencies_array[$r] = array('reception_line'=>'ed.rowid', 'product'=>'ed.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT))
-		{
+		if ($idcontacts && !empty($conf->global->RECEPTION_ADD_CONTACTS_IN_EXPORT)) {
 			$keyforselect = 'socpeople'; $keyforelement = 'contact'; $keyforaliasextra = 'extra3';
 			include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		}
@@ -217,7 +220,9 @@ class modReception extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'reception as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'reception_extrafields as extra ON c.rowid = extra.fk_object,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'societe as s';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON s.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch as ed';
@@ -231,7 +236,9 @@ class modReception extends DolibarrModules
 		}
 		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = ed.fk_reception AND ed.fk_commandefourndet = cd.rowid';
 		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('reception').')';
-		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		if (empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
+		}
 	}
 
 
@@ -255,13 +262,11 @@ class modReception extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/reception';
 		$dest = $dirodt.'/template_reception.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php
index 03f2ea2668e..2a3d36c46bb 100644
--- a/htdocs/core/modules/modRecruitment.class.php
+++ b/htdocs/core/modules/modRecruitment.class.php
@@ -404,7 +404,9 @@ class modRecruitment extends DolibarrModules
 		global $conf, $langs;
 
 		$result = $this->_load_tables('/recruitment/sql/');
-		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		if ($result < 0) {
+			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		}
 
 		// Create extrafields during init
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -426,19 +428,19 @@ class modRecruitment extends DolibarrModules
 		$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration'=>1, 'includedocgeneration'=>1);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-			if ($myTmpObjectKey == 'MyObject') continue;
+			if ($myTmpObjectKey == 'MyObject') {
+				continue;
+			}
 			if ($myTmpObjectArray['includerefgeneration']) {
 				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
 				$dirodt = DOL_DATA_ROOT.'/doctemplates/mymodule';
 				$dest = $dirodt.'/template_myobjects.odt';
 
-				if (file_exists($src) && !file_exists($dest))
-				{
+				if (file_exists($src) && !file_exists($dest)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 					dol_mkdir($dirodt);
 					$result = dol_copy($src, $dest, 0, 0);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$langs->load("errors");
 						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 						return 0;
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 5887fac8577..46be038a21c 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -268,10 +268,8 @@ class modResource extends DolibarrModules
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'resource' AND entity IN (0,".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 66a8dc76691..75af0f103f5 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -135,7 +135,9 @@ class modService extends DolibarrModules
 		 */
 
 		$usenpr = 0;
-		if (is_object($mysoc)) $usenpr = $mysoc->useNPR();
+		if (is_object($mysoc)) {
+			$usenpr = $mysoc->useNPR();
+		}
 
 		// Exports
 		//--------
@@ -161,16 +163,32 @@ class modService extends DolibarrModules
 			'p.tva_tx'=>'VATRate',
 			'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
 		);
-		if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
-		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice'));
-		if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
-		if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+		if (is_object($mysoc) && $usenpr) {
+			$this->export_fields_array[$r]['p.recuperableonly'] = 'NPR';
+		}
+		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.cost_price'=>'CostPrice'));
+		}
+		if (!empty($conf->stock->enabled)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+		}
 		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		if (!empty($conf->fournisseur->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom'=>'Supplier', 'pf.ref_fourn'=>'SupplierRef', 'pf.quantity'=>'QtyMin', 'pf.remise_percent'=>'DiscountQtyMin', 'pf.unitprice'=>'BuyingPrice', 'pf.delivery_time_days'=>'NbDaysToDelivery'));
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)'=>'Categories'));
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) $this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('s.nom'=>'Supplier', 'pf.ref_fourn'=>'SupplierRef', 'pf.quantity'=>'QtyMin', 'pf.remise_percent'=>'DiscountQtyMin', 'pf.unitprice'=>'BuyingPrice', 'pf.delivery_time_days'=>'NbDaysToDelivery'));
+		}
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('group_concat(cat.label)'=>'Categories'));
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('l.lang'=>'Language', 'l.label'=>'TranslatedLabel', 'l.description'=>'TranslatedDescription', 'l.note'=>'TranslatedNote'));
+		}
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$this->export_fields_array[$r]['p.fk_unit'] = 'Unit';
+		}
 		$this->export_TypeFields_array[$r] = array(
 			'p.ref'=>"Text", 'p.label'=>"Text",
 			'p.fk_product_type'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
@@ -185,36 +203,74 @@ class modService extends DolibarrModules
 			'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric',
 			'p.datec'=>'Date', 'p.tms'=>'Date'
 		);
-		if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
-		if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
-		if (!empty($conf->fournisseur->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom'=>'Text', 'pf.ref_fourn'=>'Text', 'pf.unitprice'=>'Numeric', 'pf.quantity'=>'Numeric', 'pf.remise_percent'=>'Numeric', 'pf.delivery_time_days'=>'Numeric'));
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang'=>'Text', 'l.label'=>'Text', 'l.description'=>'Text', 'l.note'=>'Text'));
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)"=>'Text'));
+		if (!empty($conf->stock->enabled)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+		}
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('s.nom'=>'Text', 'pf.ref_fourn'=>'Text', 'pf.unitprice'=>'Numeric', 'pf.quantity'=>'Numeric', 'pf.remise_percent'=>'Numeric', 'pf.delivery_time_days'=>'Numeric'));
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('l.lang'=>'Text', 'l.label'=>'Text', 'l.description'=>'Text', 'l.note'=>'Text'));
+		}
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array("group_concat(cat.label)"=>'Text'));
+		}
 		$this->export_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)"=>'category'));
-		if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
-		if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
-		if (!empty($conf->fournisseur->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_dependencies_array[$r] = array('category'=>'p.rowid');
-		if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
-		if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
-		if (!empty($conf->fournisseur->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array("group_concat(cat.label)"=>'category'));
+		}
+		if (!empty($conf->stock->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+		}
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
+		}
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+		}
+		if (!empty($conf->stock->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
+		}
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('s.nom'=>'product_supplier_ref', 'pf.ref_fourn'=>'product_supplier_ref', 'pf.unitprice'=>'product_supplier_ref', 'pf.quantity'=>'product_supplier_ref', 'pf.remise_percent'=>'product_supplier_ref', 'pf.delivery_time_days'=>'product_supplier_ref'));
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('l.lang'=>'translation', 'l.label'=>'translation', 'l.description'=>'translation', 'l.note'=>'translation'));
+		}
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_dependencies_array[$r] = array('category'=>'p.rowid');
+		}
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'product as p';
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
-		if (!empty($conf->global->MAIN_MULTILANGS)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'categorie as cat ON cp.fk_categorie = cat.rowid';
+		}
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_lang as l ON l.fk_product = p.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
-		if (!empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
+		if (!empty($conf->fournisseur->enabled)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
+		}
 		$this->export_sql_end[$r] .= ' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity('product').')';
-		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) $this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
+		if (!empty($conf->global->EXPORTTOOL_CATEGORIES)) {
+			$this->export_sql_order[$r] = ' GROUP BY p.rowid'; // FIXME The group by used a generic value to say "all fields in select except function fields"
+		}
 
-		if (empty($conf->product->enabled))	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
-		{
-			if (!empty($conf->global->PRODUIT_MULTIPRICES))
-			{
+		if (empty($conf->product->enabled)) {	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 				// Exports product multiprice
 				$r++;
 				$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -226,7 +282,9 @@ class modService extends DolibarrModules
 					'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 					'pr.tva_tx'=>'PriceLevelVATRate',
 					'pr.date_price'=>'DateCreation');
-				if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+				if (is_object($mysoc) && $usenpr) {
+					$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+				}
 				//$this->export_TypeFields_array[$r]=array(
 				//	'p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",
 				//	'p.note'=>"Text",'p.length'=>"Numeric",'p.surface'=>"Numeric",'p.volume'=>"Numeric",'p.weight'=>"Numeric",'p.customcode'=>'Text',
@@ -246,8 +304,7 @@ class modService extends DolibarrModules
 				$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 			}
 
-			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
-			{
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				// Exports product multiprice
 				$r++;
 				$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -261,7 +318,9 @@ class modService extends DolibarrModules
 					'pr.tva_tx'=>'PriceVATRate',
 					'pr.default_vat_code'=>'PriceVATCode',
 					'pr.datec'=>'DateCreation');
-				if (is_object($mysoc) && $usenpr) $this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+				if (is_object($mysoc) && $usenpr) {
+					$this->export_fields_array[$r]['pr.recuperableonly'] = 'NPR';
+				}
 				$this->export_entities_array[$r] = array('p.rowid'=>"product", 'p.ref'=>"product",
 					's.nom'=>'company',
 					'pr.price_base_type'=>"product", 'pr.price'=>"product",
@@ -278,8 +337,7 @@ class modService extends DolibarrModules
 				$this->export_sql_end[$r] .= ' WHERE p.entity IN ('.getEntity('product').')'; // For product and service profile
 			}
 
-			if (!empty($conf->global->PRODUIT_SOUSPRODUITS))
-			{
+			if (!empty($conf->global->PRODUIT_SOUSPRODUITS)) {
 				// Exports virtual products
 				$r++;
 				$this->export_code[$r] = $this->rights_class.'_'.$r;
@@ -295,8 +353,12 @@ class modService extends DolibarrModules
 					'p.price_base_type'=>"PriceBase", 'p.price'=>"UnitPriceHT", 'p.price_ttc'=>"UnitPriceTTC", 'p.tva_tx'=>'VATRate', 'p.tosell'=>"OnSell",
 					'p.tobuy'=>"OnBuy", 'p.datec'=>'DateCreation', 'p.tms'=>'DateModification'
 				);
-				if (!empty($conf->stock->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
-				if (!empty($conf->barcode->enabled)) $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+				if (!empty($conf->stock->enabled)) {
+					$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
+				}
+				if (!empty($conf->barcode->enabled)) {
+					$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
+				}
 				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
 				$this->export_TypeFields_array[$r] = array(
 					'p.ref'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.url'=>"Text",
@@ -307,8 +369,12 @@ class modService extends DolibarrModules
 					'p.price_base_type'=>"Text", 'p.price'=>"Numeric", 'p.price_ttc'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean",
 					'p.datec'=>'Date', 'p.tms'=>'Date'
 				);
-				if (!empty($conf->stock->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
-				if (!empty($conf->barcode->enabled)) $this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+				if (!empty($conf->stock->enabled)) {
+					$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
+				}
+				if (!empty($conf->barcode->enabled)) {
+					$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
+				}
 				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
 				$this->export_entities_array[$r] = array(
 					'p.rowid'=>"virtualproduct", 'p.ref'=>"virtualproduct", 'p.label'=>"virtualproduct", 'p.description'=>"virtualproduct", 'p.url'=>"virtualproduct",
@@ -319,8 +385,12 @@ class modService extends DolibarrModules
 					'p.price_base_type'=>"virtualproduct", 'p.price'=>"virtualproduct", 'p.price_ttc'=>"virtualproduct", 'p.tva_tx'=>"virtualproduct",
 					'p.tosell'=>"virtualproduct", 'p.tobuy'=>"virtualproduct", 'p.datec'=>"virtualproduct", 'p.tms'=>"virtualproduct"
 				);
-				if (!empty($conf->stock->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
-				if (!empty($conf->barcode->enabled)) $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
+				if (!empty($conf->stock->enabled)) {
+					$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
+				}
+				if (!empty($conf->barcode->enabled)) {
+					$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
+				}
 				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
 				$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra';
 				include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -454,20 +524,30 @@ class modService extends DolibarrModules
 				'dict' => 'DictionaryCountry'
 			)
 		);
-		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
-		if (is_object($mysoc) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
-		if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
-		if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
-		if (!empty($conf->barcode->enabled)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
-		if (!empty($conf->global->PRODUCT_USE_UNITS)) $this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
+		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.cost_price'=>'CostPrice'));
+		}
+		if (is_object($mysoc) && $usenpr) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.recuperableonly'=>'NPR'));
+		}
+		if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax1_tx'=>'LT1', 'p.localtax1_type'=>'LT1Type'));
+		}
+		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
+		}
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$this->import_fields_array[$r]['p.fk_unit'] = 'Unit';
+		}
 		// Add extra fields
 		$import_extrafield_sample = array();
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity IN (0,".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
@@ -528,25 +608,39 @@ class modService extends DolibarrModules
 			'p.finished' => '0 (raw material) / 1 (finished goods)'
 		);
 		//clauses copied from import_fields_array
-		if (!empty($conf->stock->enabled)) $import_sample = array_merge($import_sample, array(
+		if (!empty($conf->stock->enabled)) {
+			$import_sample = array_merge($import_sample, array(
 			'p.seuil_stock_alerte' => '',
 			'p.pmp' => '0',
 			'p.desiredstock' => ''
-		));
-		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) $import_sample = array_merge($import_sample, array('p.cost_price'=>'90'));
-		if (is_object($mysoc) && $usenpr) $import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
-		if (is_object($mysoc) && $mysoc->useLocalTax(1)) $import_sample = array_merge($import_sample, array('p.localtax1_tx'=>'', 'p.localtax1_type'=>''));
-		if (is_object($mysoc) && $mysoc->useLocalTax(2)) $import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
-		if (!empty($conf->barcode->enabled)) $import_sample = array_merge($import_sample, array('p.barcode'=>''));
+			));
+		}
+		if (!empty($conf->fournisseur->enabled) || !empty($conf->margin->enabled)) {
+			$import_sample = array_merge($import_sample, array('p.cost_price'=>'90'));
+		}
+		if (is_object($mysoc) && $usenpr) {
+			$import_sample = array_merge($import_sample, array('p.recuperableonly'=>'0'));
+		}
+		if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
+			$import_sample = array_merge($import_sample, array('p.localtax1_tx'=>'', 'p.localtax1_type'=>''));
+		}
+		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
+			$import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
+		}
+		if (!empty($conf->barcode->enabled)) {
+			$import_sample = array_merge($import_sample, array('p.barcode'=>''));
+		}
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$import_sample = array_merge(
 				$import_sample,
 				array(
 					'p.fk_unit' => 'use a unit of measure from the dictionary. G/KG/M2/M3 etc....matches field "code" in table "'.MAIN_DB_PREFIX.'c_units"'
 				)
-				);
+			);
 
-			if (!is_array($this->import_convertvalue_array[$r])) $this->import_convertvalue_array[$r] = array();
+			if (!is_array($this->import_convertvalue_array[$r])) {
+				$this->import_convertvalue_array[$r] = array();
+			}
 			$this->import_convertvalue_array[$r] = array_merge($this->import_convertvalue_array[$r], array(
 				'p.fk_unit' => array(
 					'rule' => 'fetchidfromcodeorlabel',
@@ -559,12 +653,12 @@ class modService extends DolibarrModules
 		}
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
 		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
-		if (!empty($conf->barcode->enabled)) $this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled
+		if (!empty($conf->barcode->enabled)) {
+			$this->import_updatekeys_array[$r] = array_merge($this->import_updatekeys_array[$r], array('p.barcode'=>'BarCode')); //only show/allow barcode as update key if Barcode module enabled
+		}
 
-		if (empty($conf->product->enabled))	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
-		{
-			if (!empty($conf->fournisseur->enabled))
-			{
+		if (empty($conf->product->enabled)) {	// We enable next import templates only if module product not already enabled (to avoid duplicate entries)
+			if (!empty($conf->fournisseur->enabled)) {
 				// Import suppliers prices (note: this code is duplicated in module Service)
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_supplierprices';
@@ -583,31 +677,36 @@ class modService extends DolibarrModules
 					'sp.delivery_time_days' => 'DeliveryDelay',
 					'sp.supplier_reputation' => 'SupplierReputation'
 				);
-				if (is_object($mysoc) && $usenpr)       $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
-				if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
-				if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+				if (is_object($mysoc) && $usenpr) {
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.recuperableonly'=>'VATNPR'));
+				}
+				if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+				}
+				if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+				}
 				$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
 					'sp.price'=>"PriceQtyMinHT*",
 					'sp.unitprice'=>'UnitPriceHT*', // TODO Make this field not required and calculate it from price and qty
 					'sp.remise_percent'=>'DiscountQtyMin'
 				));
 
-				if (!empty($conf->multicurrency->enabled))
-				{
+				if (!empty($conf->multicurrency->enabled)) {
 					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array(
-						'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
-						'sp.multicurrency_code'=>'CurrencyCode',
-						'sp.multicurrency_tx'=>'CurrencyRate',
-						'sp.multicurrency_unitprice'=>'CurrencyUnitPrice',
-						'sp.multicurrency_price'=>'CurrencyPrice',
+					'sp.fk_multicurrency'=>'CurrencyCodeId', //ideally this should be automatically obtained from the CurrencyCode on the next line
+					'sp.multicurrency_code'=>'CurrencyCode',
+					'sp.multicurrency_tx'=>'CurrencyRate',
+					'sp.multicurrency_unitprice'=>'CurrencyUnitPrice',
+					'sp.multicurrency_price'=>'CurrencyPrice',
 					));
 				}
 
-				$this->import_convertvalue_array[$r] = array(
+					$this->import_convertvalue_array[$r] = array(
 						'sp.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty'),
 						'sp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
-				);
-				$this->import_examplevalues_array[$r] = array(
+					);
+					$this->import_examplevalues_array[$r] = array(
 					'sp.fk_product' => "PRODUCT_REF or id:123456",
 					'sp.fk_soc' => "My Supplier",
 					'sp.ref_fourn' => "XYZ-F123456",
@@ -619,33 +718,37 @@ class modService extends DolibarrModules
 					'sp.default_vat_code' => '',
 					'sp.delivery_time_days' => '5',
 					'sp.supplier_reputation' => 'FAVORITE / NOTTHGOOD / DONOTORDER'
-				);
-				if (is_object($mysoc) && $usenpr) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
-				if (is_object($mysoc) && $mysoc->useLocalTax(1)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
-				if (is_object($mysoc) && $mysoc->useLocalTax(2)) $this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
-				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
+					);
+					if (is_object($mysoc) && $usenpr) {
+						$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.recuperableonly'=>''));
+					}
+					if (is_object($mysoc) && $mysoc->useLocalTax(1)) {
+						$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax1_tx'=>'LT1', 'sp.localtax1_type'=>'LT1Type'));
+					}
+					if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
+						$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array('sp.localtax2_tx'=>'LT2', 'sp.localtax2_type'=>'LT2Type'));
+					}
+					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
 					'sp.price' => "50.00",
 					'sp.unitprice' => '10',
 					// TODO Make this field not required and calculate it from price and qty
 					'sp.remise_percent' => '20'
-				));
-				if (!empty($conf->multicurrency->enabled))
-				{
+					));
+				if (!empty($conf->multicurrency->enabled)) {
 					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
-						'sp.fk_multicurrency'=>'eg: 2, rowid for code of multicurrency currency',
-						'sp.multicurrency_code'=>'GBP',
-						'sp.multicurrency_tx'=>'1.12345',
-						'sp.multicurrency_unitprice'=>'',
-						// TODO Make this field not required and calculate it from price and qty
-						'sp.multicurrency_price'=>''
+					'sp.fk_multicurrency'=>'eg: 2, rowid for code of multicurrency currency',
+					'sp.multicurrency_code'=>'GBP',
+					'sp.multicurrency_tx'=>'1.12345',
+					'sp.multicurrency_unitprice'=>'',
+					// TODO Make this field not required and calculate it from price and qty
+					'sp.multicurrency_price'=>''
 					));
 				}
 
-				$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier');
+					$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier');
 			}
 
-			if (!empty($conf->global->PRODUIT_MULTIPRICES))
-			{
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 				// Import products multiprices
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_multiprice';
@@ -659,8 +762,12 @@ class modService extends DolibarrModules
 					'pr.price'=>"PriceLevelUnitPriceHT", 'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
 					'pr.price_min'=>"MinPriceLevelUnitPriceHT", 'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
 					'pr.date_price'=>'DateCreation*');
-				if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) $this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
-				if (is_object($mysoc) && $usenpr) $this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
+				if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
+					$this->import_fields_array[$r]['pr.tva_tx'] = 'VATRate';
+				}
+				if (is_object($mysoc) && $usenpr) {
+					$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('pr.recuperableonly'=>'NPR'));
+				}
 				$this->import_regex_array[$r] = array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$', 'pr.recuperableonly'=>'^[0|1]$');
 				$this->import_convertvalue_array[$r] = array(
 					'pr.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
@@ -674,8 +781,7 @@ class modService extends DolibarrModules
 					'pr.date_price'=>'2013-04-10');
 			}
 
-			if (!empty($conf->global->MAIN_MULTILANGS))
-			{
+			if (!empty($conf->global->MAIN_MULTILANGS)) {
 				// Import translations of product names and descriptions
 				$r++;
 				$this->import_code[$r] = $this->rights_class.'_languages';
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 2d32ae3f0c4..42456c4ae80 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -157,7 +157,7 @@ class modSociete extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'thirdparty_supplier_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'read';
-        */
+		*/
 
 		$r++;
 		$this->rights[$r][0] = 122; // id de la permission
@@ -181,7 +181,7 @@ class modSociete extends DolibarrModules
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'thirdparty_supplier_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
 		$this->rights[$r][5] = 'read';
-        */
+		*/
 
 		$r++;
 		$this->rights[$r][0] = 125; // id de la permission
@@ -275,13 +275,18 @@ class modSociete extends DolibarrModules
 			'st.code'=>'ProspectStatus', 'payterm.libelle'=>'PaymentConditions', 'paymode.libelle'=>'PaymentMode',
 			's.outstanding_limit'=>'OutstandingBill', 'pbacc.ref'=>'PaymentBankAccount', 'incoterm.code'=>'IncotermLabel'
 		);
-		if (!empty($conf->global->SOCIETE_USEPREFIX)) $this->export_fields_array[$r]['s.prefix'] = 'Prefix';
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) $this->export_fields_array[$r]['s.price_level'] = 'PriceLevel';
+		if (!empty($conf->global->SOCIETE_USEPREFIX)) {
+			$this->export_fields_array[$r]['s.prefix'] = 'Prefix';
+		}
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$this->export_fields_array[$r]['s.price_level'] = 'PriceLevel';
+		}
 		// Add multicompany field
-		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED))
-		{
+		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			$nbofallowedentities = count(explode(',', getEntity('societe'))); // If project are shared, nb will be > 1
-			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) $this->export_fields_array[$r] += array('s.entity'=>'Entity');
+			if (!empty($conf->multicompany->enabled) && $nbofallowedentities > 1) {
+				$this->export_fields_array[$r] += array('s.entity'=>'Entity');
+			}
 		}
 		$keyforselect = 'societe'; $keyforelement = 'company'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
@@ -377,8 +382,7 @@ class modSociete extends DolibarrModules
 			's.address'=>"company", 's.zip'=>"company", 's.town'=>"company", 's.phone'=>"company", 's.email'=>"company",
 			't.libelle'=>"company"
 		); // We define here only fields that use another picto
-		if (empty($conf->fournisseur->enabled))
-		{
+		if (empty($conf->fournisseur->enabled)) {
 			unset($this->export_fields_array[$r]['s.code_fournisseur']);
 			unset($this->export_entities_array[$r]['s.code_fournisseur']);
 		}
@@ -390,7 +394,9 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'socpeople as c';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON c.fk_soc = s.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extrasoc ON s.rowid = extrasoc.fk_object';
-		if (is_object($user) && empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if (is_object($user) && empty($user->rights->societe->client->voir)) {
+			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_departements as d ON c.fk_departement = d.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_regions as r ON r.code_region = d.fk_region AND r.fk_pays = c.fk_pays';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
@@ -473,12 +479,13 @@ class modSociete extends DolibarrModules
 			's.fk_multicurrency' => 'MulticurrencyUsed',
 			's.multicurrency_code' => 'MulticurrencyCurrency'
 		);
-		if (!empty($conf->global->PRODUIT_MULTIPRICES)) $this->import_fields_array[$r]['s.price_level'] = 'PriceLevel';
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+			$this->import_fields_array[$r]['s.price_level'] = 'PriceLevel';
+		}
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'societe' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
 			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
@@ -654,8 +661,7 @@ class modSociete extends DolibarrModules
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'socpeople' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on an old database (during a migration for example)
-		{
+		if ($resql) {    // This can fail when class is used on an old database (during a migration for example)
 			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
@@ -760,8 +766,10 @@ class modSociete extends DolibarrModules
 		$this->import_examplevalues_array[$r] = array(//field order as per structure of table llx_societe_rib
 			'sr.label' => 'eg. "account1"',
 			'sr.fk_soc' => 'eg. "TPBigCompany"',
-			'sr.datec' => 'date used for creating direct debit UMR formatted as '.dol_print_date(dol_now(),
-					'%Y-%m-%d'),
+			'sr.datec' => 'date used for creating direct debit UMR formatted as '.dol_print_date(
+				dol_now(),
+				'%Y-%m-%d'
+			),
 			'sr.bank' => 'bank name eg: "ING-Direct"',
 			'sr.code_banque' => 'account sort code (GB)/Routing number (US) eg. "8456"',
 			'sr.code_guichet' => "bank code for office/branch",
@@ -814,13 +822,11 @@ class modSociete extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/thirdparties';
 		$dest = $dirodt.'/template_thirdparty.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index 0b390b55dc2..76f5a1910ba 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -148,8 +148,7 @@ class modStock extends DolibarrModules
 		$this->rights[4][4] = 'mouvement';
 		$this->rights[4][5] = 'creer';
 
-		if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
-		{
+		if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 			$this->rights[5][0] = 1011;
 			$this->rights[5][1] = 'inventoryReadPermission'; // Permission label
 			$this->rights[5][3] = 0; // Permission by default for new user (0/1)
@@ -254,8 +253,7 @@ class modStock extends DolibarrModules
 		$this->export_sql_end[$r] .= ' AND e.entity IN ('.getEntity('stock').')';
 
 		// Export stock including batch number
-		if (!empty($conf->productbatch->enabled))
-		{
+		if (!empty($conf->productbatch->enabled)) {
 			$langs->load("productbatch");
 
 			// This request is same than previous but without field ps.stock (real stock in warehouse) and with link to subtable productbatch
@@ -327,8 +325,7 @@ class modStock extends DolibarrModules
 			'p.rowid'=>"product", 'p.ref'=>"product", 'p.fk_product_type'=>"product", 'p.label'=>"product", 'p.description'=>"product", 'p.note'=>"product",
 			'p.price'=>"product", 'p.tva_tx'=>'product', 'p.tosell'=>"product", 'p.tobuy'=>"product", 'p.duration'=>"product", 'p.datec'=>'product', 'p.tms'=>'product'
 		);	// We define here only fields that use another icon that the one defined into export_icon
-		if (!empty($conf->productbatch->enabled))
-		{
+		if (!empty($conf->productbatch->enabled)) {
 			$this->export_fields_array[$r]['sm.batch'] = 'Batch';
 			$this->export_TypeFields_array[$r]['sm.batch'] = 'Text';
 			$this->export_entities_array[$r]['sm.batch'] = 'movement';
@@ -383,9 +380,9 @@ class modStock extends DolibarrModules
 				'e.phone'=>'(+33)(0)123456789',
 				'e.fax'=>'(+33)(0)123456790',
 				'e.statut'=>'1',
-                'e.fk_parent'=>'id or ref of warehouse'
-        );
-        $this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
+				'e.fk_parent'=>'id or ref of warehouse'
+		);
+		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
 
 		// Import stocks
 		$r++;
@@ -401,7 +398,7 @@ class modStock extends DolibarrModules
 			'ps.fk_entrepot'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/stock/class/entrepot.class.php', 'class'=>'Entrepot', 'method'=>'fetch', 'element'=>'ref')
 		  );
 		$this->import_examplevalues_array[$r] = array(
-		    'ps.fk_product'=>"id or ref of product", 'ps.fk_entrepot'=>"id or ref of warehouse", 'ps.reel'=>"10"
+			'ps.fk_product'=>"id or ref of product", 'ps.fk_entrepot'=>"id or ref of warehouse", 'ps.reel'=>"10"
 		);
 		$this->import_updatekeys_array[$r] = array('ps.fk_product'=>'Product', 'ps.fk_entrepot'=>"Warehouse");
 		$this->import_run_sql_after_array[$r] = array(    // Because we may change data that are denormalized, we must update dernormalized data after.
@@ -430,13 +427,11 @@ class modStock extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/stocks';
 		$dest = $dirodt.'/template_warehouse.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modStripe.class.php b/htdocs/core/modules/modStripe.class.php
index a207e0ef03c..2cf80fc9f60 100644
--- a/htdocs/core/modules/modStripe.class.php
+++ b/htdocs/core/modules/modStripe.class.php
@@ -93,20 +93,20 @@ class modStripe extends DolibarrModules
 		// Main menu entries
 		$r = 0;
 		/* $this->menu[$r]=array(
-            'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-	        'mainmenu'=>'billing',
-        	'leftmenu'=>'customers_bills_payment_stripe',
-        	'type'=>'left',			                // This is a Left menu entry
-	        'titre'=>'StripeImportPayment',
-	        'url'=>'/stripe/importpayments.php',
-	        'langs'=>'stripe',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-	        'position'=>500,
-	        'enabled'=>'$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-	        'perms'=>'$user->rights->banque->modifier',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-	        'target'=>'',
-	        'user'=>2
-        );				                // 0=Menu for internal users, 1=external users, 2=both
-        $r++;*/
+			'fk_menu'=>'fk_mainmenu=billing,fk_leftmenu=customers_bills_payment',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'mainmenu'=>'billing',
+			'leftmenu'=>'customers_bills_payment_stripe',
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'StripeImportPayment',
+			'url'=>'/stripe/importpayments.php',
+			'langs'=>'stripe',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>500,
+			'enabled'=>'$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 2',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->banque->modifier',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2
+		);				                // 0=Menu for internal users, 1=external users, 2=both
+		$r++;*/
 
 		$this->menu[$r] = array(
 			'fk_menu'=>'fk_mainmenu=bank',
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index 9fe6df1ae1f..d86e06629f3 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -141,7 +141,7 @@ class modSupplierProposal extends DolibarrModules
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'cloturer';
 
- 		// Main menu entries
+		// Main menu entries
 		$this->menu = array(); // List of menus to add
 		$r = 0;
 	}
@@ -167,13 +167,11 @@ class modSupplierProposal extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/supplier_proposals';
 		$dest = $dirodt.'/template_supplier_proposal.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 8a3d4a73776..a5ab8491643 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -119,8 +119,7 @@ class modTakePos extends DolibarrModules
 		);
 
 
-		if (!isset($conf->takepos) || !isset($conf->takepos->enabled))
-		{
+		if (!isset($conf->takepos) || !isset($conf->takepos->enabled)) {
 			$conf->takepos = new stdClass();
 			$conf->takepos->enabled = 0;
 		}
@@ -158,19 +157,19 @@ class modTakePos extends DolibarrModules
 		// Dictionaries
 		$this->dictionaries = array();
 		/* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@takepos',
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-            'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-            'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-            'tabcond'=>array($conf->takepos->enabled,$conf->takepos->enabled,$conf->takepos->enabled)												// Condition to show each dictionary
-        );
-        */
+		$this->dictionaries=array(
+			'langs'=>'mylangfile@takepos',
+			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
+			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
+			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
+			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
+			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
+			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
+			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
+			'tabcond'=>array($conf->takepos->enabled,$conf->takepos->enabled,$conf->takepos->enabled)												// Condition to show each dictionary
+		);
+		*/
 
 
 		// Boxes/Widgets
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 2c3679c0374..6ba5c4ae972 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -295,13 +295,11 @@ class modTicket extends DolibarrModules
 		$dirodt = DOL_DATA_ROOT.'/doctemplates/tickets';
 		$dest = $dirodt.'/template_order.odt';
 
-		if (file_exists($src) && !file_exists($dest))
-		{
+		if (file_exists($src) && !file_exists($dest)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
 			$result = dol_copy($src, $dest, 0, 0);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index df376a6ee61..af4443be5d1 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -258,8 +258,7 @@ class modUser extends DolibarrModules
 		);
 		$keyforselect = 'user'; $keyforelement = 'user'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		if (empty($conf->adherent->enabled))
-		{
+		if (empty($conf->adherent->enabled)) {
 			unset($this->export_fields_array[$r]['u.fk_member']);
 			unset($this->export_entities_array[$r]['u.fk_member']);
 		}
@@ -294,10 +293,8 @@ class modUser extends DolibarrModules
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'user' AND entity IN (0,".$conf->entity.")";
 		$resql = $this->db->query($sql);
-		if ($resql)    // This can fail when class is used on old database (during migration for example)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {    // This can fail when class is used on old database (during migration for example)
+			while ($obj = $this->db->fetch_object($resql)) {
 				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
 				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index b40bd60f786..22953321fbe 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -96,8 +96,7 @@ class modVariants extends DolibarrModules
 		);
 
 		// Dictionaries
-		if (!isset($conf->mymodule->enabled))
-		{
+		if (!isset($conf->mymodule->enabled)) {
 			$conf->mymodule = new stdClass();
 			$conf->mymodule->enabled = 0;
 		}
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index 295e7ccefa4..a7dfa2fdd82 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -72,10 +72,10 @@ class modWebsite extends DolibarrModules
 		$this->langfiles = array("website");
 
 		// Constants
-	   	$this->const = array();
+		$this->const = array();
 
 		// New pages on tabs
-	   	//$this->tabs[] = array();  					// To add a new tab identified by code tabname1
+		//$this->tabs[] = array();  					// To add a new tab identified by code tabname1
 
 		// Boxes
 		$this->boxes = array();
@@ -159,18 +159,15 @@ class modWebsite extends DolibarrModules
 
 		// Copy flags and octicons directory
 		$dirarray = array('common/flags'=>'flags', 'common/octicons/build/svg'=>'octicons');
-		foreach ($dirarray as $dirfrom => $dirtarget)
-		{
+		foreach ($dirarray as $dirfrom => $dirtarget) {
 			$src = DOL_DOCUMENT_ROOT.'/theme/'.$dirfrom;
 			$dest = DOL_DATA_ROOT.'/medias/image/'.$dirtarget;
 
-			if (is_dir($src))
-			{
+			if (is_dir($src)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 				dol_mkdir($dest);
 				$result = dolCopyDir($src, $dest, 0, 0);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorFailToCopyDir', $src, $dest);
 					return 0;
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index f7655db824a..539fd7a76d2 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -101,44 +101,44 @@ class modWorkflow extends DolibarrModules
 		$r = 0;
 
 		/*
-        $r++;
-        $this->rights[$r][0] = 6001; // id de la permission
-        $this->rights[$r][1] = "Lire les workflow"; // libelle de la permission
-        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-        $this->rights[$r][4] = 'read';
-        */
+		$r++;
+		$this->rights[$r][0] = 6001; // id de la permission
+		$this->rights[$r][1] = "Lire les workflow"; // libelle de la permission
+		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'read';
+		*/
 
 		// Main menu entries
 		$this->menus = array(); // List of menus to add
 		$r = 0;
 		/*
-        $this->menu[$r]=array('fk_menu'=>0,
-                                'type'=>'top',
-                                'titre'=>'Workflow',
-                                'mainmenu'=>'workflow',
-                                'url'=>'/workflow/index.php',
-                                'langs'=>'@workflow',
-                                'position'=>100,
-                                'perms'=>'$user->rights->workflow->read',
-                                'enabled'=>'$conf->workflow->enabled',
-                                'target'=>'',
-                                'user'=>0);
-        $r++;
+		$this->menu[$r]=array('fk_menu'=>0,
+								'type'=>'top',
+								'titre'=>'Workflow',
+								'mainmenu'=>'workflow',
+								'url'=>'/workflow/index.php',
+								'langs'=>'@workflow',
+								'position'=>100,
+								'perms'=>'$user->rights->workflow->read',
+								'enabled'=>'$conf->workflow->enabled',
+								'target'=>'',
+								'user'=>0);
+		$r++;
 
-        $this->menu[$r]=array(  'fk_menu'=>'r=0',
-                                'type'=>'left',
-                                'titre'=>'Workflow',
-                                'mainmenu'=>'workflow',
-                                'url'=>'/workflow/index.php',
-                                'langs'=>'@workflow',
-                                'position'=>101,
-                                'enabled'=>1,
-                                'perms'=>'$user->rights->workflow->read',
-                                'target'=>'',
-                                'user'=>0);
-        $r++;
-        */
+		$this->menu[$r]=array(  'fk_menu'=>'r=0',
+								'type'=>'left',
+								'titre'=>'Workflow',
+								'mainmenu'=>'workflow',
+								'url'=>'/workflow/index.php',
+								'langs'=>'@workflow',
+								'position'=>101,
+								'enabled'=>1,
+								'perms'=>'$user->rights->workflow->read',
+								'target'=>'',
+								'user'=>0);
+		$r++;
+		*/
 	}
 
 
diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
index 797f7c8c5e0..ade029b1233 100755
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -324,26 +324,26 @@ class modWorkstation extends DolibarrModules
 		);
 		*/
 
-        $this->menu[$r++]=array(
-            // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'fk_menu'=>'fk_mainmenu=mrp',
-            // This is a Left menu entry
-            'type'=>'left',
-            'titre'=>$langs->trans('Workstations'),
-            'mainmenu'=>'mrp',
-            'leftmenu'=>'workstation_workstation',
-            'url'=>'',
-            // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'langs'=>'mrp',
-            'position'=>1100+$r,
-            // Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'enabled'=>'$conf->workstation->enabled',
-            // Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
-            'perms'=>'$user->rights->workstation->workstation->read',
-            'target'=>'',
-            // 0=Menu for internal users, 1=external users, 2=both
-            'user'=>2,
-        );
+		$this->menu[$r++]=array(
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=mrp',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>$langs->trans('Workstations'),
+			'mainmenu'=>'mrp',
+			'leftmenu'=>'workstation_workstation',
+			'url'=>'',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'mrp',
+			'position'=>1100+$r,
+			// Define condition to show or hide menu entry. Use '$conf->workstation->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->workstation->enabled',
+			// Use 'perms'=>'$user->rights->workstation->level1->level2' if you want your menu with a permission rules
+			'perms'=>'$user->rights->workstation->workstation->read',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2,
+		);
 		$this->menu[$r++]=array(
 			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'fk_menu'=>'fk_mainmenu=mrp,fk_leftmenu=workstation_workstation',
@@ -451,7 +451,9 @@ class modWorkstation extends DolibarrModules
 		global $conf, $langs;
 
 		$result = $this->_load_tables('/workstation/sql/');
-		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		if ($result < 0) {
+			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		}
 
 		// Create extrafields during init
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -473,19 +475,19 @@ class modWorkstation extends DolibarrModules
 		$myTmpObjects['Workstation'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
 
 		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
-			if ($myTmpObjectKey == 'Workstation') continue;
+			if ($myTmpObjectKey == 'Workstation') {
+				continue;
+			}
 			if ($myTmpObjectArray['includerefgeneration']) {
 				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/workstation/template_workstations.odt';
 				$dirodt = DOL_DATA_ROOT.'/doctemplates/workstation';
 				$dest = $dirodt.'/template_workstations.odt';
 
-				if (file_exists($src) && !file_exists($dest))
-				{
+				if (file_exists($src) && !file_exists($dest)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 					dol_mkdir($dirodt);
 					$result = dol_copy($src, $dest, 0, 0);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$langs->load("errors");
 						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 						return 0;
diff --git a/htdocs/core/modules/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index 09abd0e9dc7..697fa489443 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -146,9 +146,9 @@ class modZapier extends DolibarrModules
 		);
 		// Some keys to add into the overwriting translation tables
 		/*$this->overwrite_translation = array(
-            'en_US:ParentCompany'=>'Parent company or reseller',
-            'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
-        )*/
+			'en_US:ParentCompany'=>'Parent company or reseller',
+			'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
+		)*/
 		if (!isset($conf->zapier) || !isset($conf->zapier->enabled)) {
 			$conf->zapier = new stdClass();
 			$conf->zapier->enabled = 0;
@@ -183,28 +183,28 @@ class modZapier extends DolibarrModules
 		// Dictionaries
 		$this->dictionaries = array();
 		/* Example:
-        $this->dictionaries=array(
-            'langs'=>'mylangfile@zapier',
-            // List of tables we want to see into dictonnary editor
-            'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),
-            // Label of tables
-            'tablib'=>array("Table1","Table2","Table3"),
-            // Request to select fields
-            'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
-            // Sort order
-            'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
-            // List of fields (result of select to show dictionary)
-            'tabfield'=>array("code,label","code,label","code,label"),
-            // List of fields (list of fields to edit a record)
-            'tabfieldvalue'=>array("code,label","code,label","code,label"),
-            // List of fields (list of fields for insert)
-            'tabfieldinsert'=>array("code,label","code,label","code,label"),
-            // Name of columns with primary key (try to always name it 'rowid')
-            'tabrowid'=>array("rowid","rowid","rowid"),
-            // Condition to show each dictionary
-            'tabcond'=>array($conf->zapier->enabled,$conf->zapier->enabled,$conf->zapier->enabled)
-        );
-        */
+		$this->dictionaries=array(
+			'langs'=>'mylangfile@zapier',
+			// List of tables we want to see into dictonnary editor
+			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),
+			// Label of tables
+			'tablib'=>array("Table1","Table2","Table3"),
+			// Request to select fields
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
+			// Sort order
+			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
+			// List of fields (result of select to show dictionary)
+			'tabfield'=>array("code,label","code,label","code,label"),
+			// List of fields (list of fields to edit a record)
+			'tabfieldvalue'=>array("code,label","code,label","code,label"),
+			// List of fields (list of fields for insert)
+			'tabfieldinsert'=>array("code,label","code,label","code,label"),
+			// Name of columns with primary key (try to always name it 'rowid')
+			'tabrowid'=>array("rowid","rowid","rowid"),
+			// Condition to show each dictionary
+			'tabcond'=>array($conf->zapier->enabled,$conf->zapier->enabled,$conf->zapier->enabled)
+		);
+		*/
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in zapier/core/boxes that contains class to show a widget.
 		$this->boxes = array(
@@ -287,35 +287,35 @@ class modZapier extends DolibarrModules
 		// );
 
 		/*
-        $this->menu[$r++]=array(
-            'fk_menu'=>'fk_mainmenu=zapier',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'left',			                // This is a Left menu entry
-            'titre'=>'List MyObject',
-            'mainmenu'=>'zapier',
-            'leftmenu'=>'zapier_myobject_list',
-            'url'=>'/zapier/myobject_list.php',
-            'langs'=>'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position'=>1000+$r,
-            'enabled'=>'$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'perms'=>'1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
-            'target'=>'',
-            'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
-        );
-        $this->menu[$r++]=array(
-            'fk_menu'=>'fk_mainmenu=zapier,fk_leftmenu=zapier',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-            'type'=>'left',			                // This is a Left menu entry
-            'titre'=>'New MyObject',
-            'mainmenu'=>'zapier',
-            'leftmenu'=>'zapier_myobject_new',
-            'url'=>'/zapier/myobject_page.php?action=create',
-            'langs'=>'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-            'position'=>1000+$r,
-            'enabled'=>'$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-            'perms'=>'1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
-            'target'=>'',
-            'user'=>2,                              // 0=Menu for internal users, 1=external users, 2=both
-        );
-        */
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=zapier',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'List MyObject',
+			'mainmenu'=>'zapier',
+			'leftmenu'=>'zapier_myobject_list',
+			'url'=>'/zapier/myobject_list.php',
+			'langs'=>'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=zapier,fk_leftmenu=zapier',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'New MyObject',
+			'mainmenu'=>'zapier',
+			'leftmenu'=>'zapier_myobject_new',
+			'url'=>'/zapier/myobject_page.php?action=create',
+			'langs'=>'zapier@zapier',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->zapier->enabled',  // Define condition to show or hide menu entry. Use '$conf->zapier->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'1',			                // Use 'perms'=>'$user->rights->zapier->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,                              // 0=Menu for internal users, 1=external users, 2=both
+		);
+		*/
 	}
 
 	/**
@@ -329,7 +329,9 @@ class modZapier extends DolibarrModules
 	public function init($options = '')
 	{
 		$result = $this->_load_tables('/zapier/sql/');
-		if ($result < 0) return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+		if ($result < 0) {
+			return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+		}
 
 		// Create extrafields
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 5917cb85042..b84976dd212 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -144,7 +144,9 @@ class pdf_stdandard extends ModelePDFMovement
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define position of columns
 		$this->wref = 15;
@@ -159,10 +161,11 @@ class pdf_stdandard extends ModelePDFMovement
 		$this->posxdiscount = 167;
 		$this->postotalht = 180;
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva = $this->posxup;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->posxtva = $this->posxup;
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
@@ -196,9 +199,13 @@ class pdf_stdandard extends ModelePDFMovement
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
@@ -233,10 +240,16 @@ class pdf_stdandard extends ModelePDFMovement
 		$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 		$sortfield = GETPOST("sortfield", 'alpha');
 		$sortorder = GETPOST("sortorder", 'alpha');
-		if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+		if (empty($page) || $page == -1) {
+			$page = 0;
+		}     // If $page is not defined, or '' or -1
 		$offset = $limit * $page;
-		if (!$sortfield) $sortfield = "m.datem";
-		if (!$sortorder) $sortorder = "DESC";
+		if (!$sortfield) {
+			$sortfield = "m.datem";
+		}
+		if (!$sortorder) {
+			$sortorder = "DESC";
+		}
 
 		$pdluoid = GETPOST('pdluoid', 'int');
 
@@ -264,7 +277,9 @@ class pdf_stdandard extends ModelePDFMovement
 		$sql .= " u.login, u.photo, u.lastname, u.firstname";
 		// Add fields from extrafields
 		if (!empty($extrafields->attributes[$element]['label'])) {
-			foreach ($extrafields->attributes[$element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+			foreach ($extrafields->attributes[$element]['label'] as $key => $val) {
+				$sql .= ($extrafields->attributes[$element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+			}
 		}
 		// Add fields from hooks
 		$parameters = array();
@@ -273,35 +288,65 @@ class pdf_stdandard extends ModelePDFMovement
 		$sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
 		$sql .= " ".MAIN_DB_PREFIX."product as p,";
 		$sql .= " ".MAIN_DB_PREFIX."stock_mouvement as m";
-		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 (m.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 (m.rowid = ef.fk_object)";
+		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON m.fk_user_author = u.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON m.batch = pl.batch AND m.fk_product = pl.fk_product";
 		$sql .= " WHERE m.fk_product = p.rowid";
-		if ($msid > 0) $sql .= " AND m.rowid = ".$msid;
+		if ($msid > 0) {
+			$sql .= " AND m.rowid = ".$msid;
+		}
 		$sql .= " AND m.fk_entrepot = e.rowid";
 		$sql .= " AND e.entity IN (".getEntity('stock').")";
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql .= " AND p.fk_product_type = 0";
-		if ($id > 0) $sql .= " AND e.rowid ='".$id."'";
-		if ($month > 0)
-		{
-			if ($year > 0)
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			$sql .= " AND p.fk_product_type = 0";
+		}
+		if ($id > 0) {
+			$sql .= " AND e.rowid ='".$id."'";
+		}
+		if ($month > 0) {
+			if ($year > 0) {
 				$sql .= " AND m.datem BETWEEN '".$this->db->idate(dol_get_first_day($year, $month, false))."' AND '".$this->db->idate(dol_get_last_day($year, $month, false))."'";
-			else $sql .= " AND date_format(m.datem, '%m') = '$month'";
-		} elseif ($year > 0)
-		{
+			} else {
+				$sql .= " AND date_format(m.datem, '%m') = '$month'";
+			}
+		} elseif ($year > 0) {
 			$sql .= " AND m.datem BETWEEN '".$this->db->idate(dol_get_first_day($year, 1, false))."' AND '".$this->db->idate(dol_get_last_day($year, 12, false))."'";
 		}
-		if ($idproduct > 0) $sql .= " AND p.rowid = ".((int) $idproduct);
-		if (!empty($search_ref))			$sql .= natural_search('m.rowid', $search_ref, 1);
-		if (!empty($search_movement))      $sql .= natural_search('m.label', $search_movement);
-		if (!empty($search_inventorycode)) $sql .= natural_search('m.inventorycode', $search_inventorycode);
-		if (!empty($search_product_ref))   $sql .= natural_search('p.ref', $search_product_ref);
-		if (!empty($search_product))       $sql .= natural_search('p.label', $search_product);
-		if ($search_warehouse > 0)          $sql .= " AND e.rowid = ".((int) $this->db->escape($search_warehouse));
-		if (!empty($search_user))          $sql .= natural_search('u.login', $search_user);
-		if (!empty($search_batch))         $sql .= natural_search('m.batch', $search_batch);
-		if ($search_qty != '')				$sql .= natural_search('m.value', $search_qty, 1);
-		if ($search_type_mouvement > 0)		$sql .= " AND m.type_mouvement = '".$this->db->escape($search_type_mouvement)."'";
+		if ($idproduct > 0) {
+			$sql .= " AND p.rowid = ".((int) $idproduct);
+		}
+		if (!empty($search_ref)) {
+			$sql .= natural_search('m.rowid', $search_ref, 1);
+		}
+		if (!empty($search_movement)) {
+			$sql .= natural_search('m.label', $search_movement);
+		}
+		if (!empty($search_inventorycode)) {
+			$sql .= natural_search('m.inventorycode', $search_inventorycode);
+		}
+		if (!empty($search_product_ref)) {
+			$sql .= natural_search('p.ref', $search_product_ref);
+		}
+		if (!empty($search_product)) {
+			$sql .= natural_search('p.label', $search_product);
+		}
+		if ($search_warehouse > 0) {
+			$sql .= " AND e.rowid = ".((int) $this->db->escape($search_warehouse));
+		}
+		if (!empty($search_user)) {
+			$sql .= natural_search('u.login', $search_user);
+		}
+		if (!empty($search_batch)) {
+			$sql .= natural_search('m.batch', $search_batch);
+		}
+		if ($search_qty != '') {
+			$sql .= natural_search('m.value', $search_qty, 1);
+		}
+		if ($search_type_mouvement > 0) {
+			$sql .= " AND m.type_mouvement = '".$this->db->escape($search_type_mouvement)."'";
+		}
 		// Add where from extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 		// Add where from hooks
@@ -311,45 +356,40 @@ class pdf_stdandard extends ModelePDFMovement
 		$sql .= $this->db->order($sortfield, $sortorder);
 
 		$nbtotalofrecords = '';
-		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-		{
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 			$result = $this->db->query($sql);
 			$nbtotalofrecords = $this->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;
 			}
 		}
 
-		if (empty($search_inventorycode)) $sql .= $this->db->plimit($limit + 1, $offset);
+		if (empty($search_inventorycode)) {
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
 
 
 		$resql = $this->db->query($sql);
 		$nbtotalofrecords = $this->db->num_rows($result);
 
 		/*
-         * END TODO
-         **/
+		 * END TODO
+		 **/
 
 		//$nblines = count($object->lines);
 
-		if ($conf->stock->dir_output)
-		{
-			if ($resql)
-			{
+		if ($conf->stock->dir_output) {
+			if ($resql) {
 				$product = new Product($this->db);
 				$object = new Entrepot($this->db);
 
-				if ($idproduct > 0)
-				{
+				if ($idproduct > 0) {
 					$product->fetch($idproduct);
 				}
-				if ($id > 0 || $ref)
-				{
+				if ($id > 0 || $ref) {
 					$result = $object->fetch($id, $ref);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						dol_print_error($this->db);
 					}
 				}
@@ -360,22 +400,28 @@ class pdf_stdandard extends ModelePDFMovement
 
 				$i = 0;
 				$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-				if ($msid) $texte = $langs->trans('StockMovementForId', $msid);
-				else {
+				if ($msid) {
+					$texte = $langs->trans('StockMovementForId', $msid);
+				} else {
 					$texte = $langs->trans("ListOfStockMovements");
-					if ($id) $texte .= ' ('.$langs->trans("ForThisWarehouse").')';
+					if ($id) {
+						$texte .= ' ('.$langs->trans("ForThisWarehouse").')';
+					}
 				}
 			}
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->stock->dir_output."/movement";
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
-				if (!empty($search_inventorycode)) $objectref .= "_".$id."_".$search_inventorycode;
-				if ($search_type_mouvement) $objectref .= "_".$search_type_mouvement;
+				if (!empty($search_inventorycode)) {
+					$objectref .= "_".$id."_".$search_inventorycode;
+				}
+				if ($search_type_mouvement) {
+					$objectref .= "_".$search_type_mouvement;
+				}
 				$dir = $conf->stock->dir_output."/movement/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
@@ -386,20 +432,16 @@ class pdf_stdandard extends ModelePDFMovement
 
 			$productstatic = new Product($this->db);
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -417,15 +459,13 @@ class pdf_stdandard extends ModelePDFMovement
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -439,14 +479,18 @@ class pdf_stdandard extends ModelePDFMovement
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Stock")." ".$outputlangs->convToOutputCharset($object->label));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -474,18 +518,15 @@ class pdf_stdandard extends ModelePDFMovement
 
 				//dol_syslog('List products', LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 					$nblines = $num;
-					for ($i = 0; $i < $nblines; $i++)
-					{
+					for ($i = 0; $i < $nblines; $i++) {
 						$objp = $this->db->fetch_object($resql);
 
 						// Multilangs
-						if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-						{
+						if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
 							$sql = "SELECT label";
 							$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 							$sql .= " WHERE fk_product=".$objp->rowid;
@@ -493,10 +534,11 @@ class pdf_stdandard extends ModelePDFMovement
 							$sql .= " LIMIT 1";
 
 							$result = $this->db->query($sql);
-							if ($result)
-							{
+							if ($result) {
 								$objtp = $this->db->fetch_object($result);
-								if ($objtp->label != '') $objp->produit = $objtp->label;
+								if ($objtp->label != '') {
+									$objp->produit = $objtp->label;
+								}
 							}
 						}
 
@@ -516,8 +558,7 @@ class pdf_stdandard extends ModelePDFMovement
 						$pdf->startTransaction();
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
@@ -525,22 +566,26 @@ class pdf_stdandard extends ModelePDFMovement
 							pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
+									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+										$this->_pagehead($pdf, $object, 0, $outputlangs);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -639,8 +684,7 @@ class pdf_stdandard extends ModelePDFMovement
 
 						$nexY += 3.5; // Add space between lines
 						// Add line
-						if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-						{
+						if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 							$pdf->setPage($pageposafter);
 							$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 							//$pdf->SetDrawColor(190,190,200);
@@ -651,11 +695,9 @@ class pdf_stdandard extends ModelePDFMovement
 						$nexY += 2; // Add space between lines
 
 						// Detect if some page were added automatically and output _tableau for past pages
-						while ($pagenb < $pageposafter)
-						{
+						while ($pagenb < $pageposafter) {
 							$pdf->setPage($pagenb);
-							if ($pagenb == 1)
-							{
+							if ($pagenb == 1) {
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -664,12 +706,12 @@ class pdf_stdandard extends ModelePDFMovement
 							$pagenb++;
 							$pdf->setPage($pagenb);
 							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
-						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-						{
-							if ($pagenb == 1)
-							{
+						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+							if ($pagenb == 1) {
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -677,9 +719,13 @@ class pdf_stdandard extends ModelePDFMovement
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							// New page
 							$pdf->AddPage();
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pagenb++;
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
 					}
 
@@ -710,8 +756,7 @@ class pdf_stdandard extends ModelePDFMovement
 					dol_print_error($this->db);
 				}
 
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
@@ -741,8 +786,7 @@ class pdf_stdandard extends ModelePDFMovement
 				$tab_top = $tab_top_newpage + 21;
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -760,7 +804,9 @@ class pdf_stdandard extends ModelePDFMovement
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -771,14 +817,14 @@ class pdf_stdandard extends ModelePDFMovement
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -813,7 +859,9 @@ class pdf_stdandard extends ModelePDFMovement
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -822,14 +870,15 @@ class pdf_stdandard extends ModelePDFMovement
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -846,8 +895,7 @@ class pdf_stdandard extends ModelePDFMovement
 		$pdf->SetTextColor(0, 0, 120);
 
 		//Ref mouv
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			//$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line takes a position y in 2nd parameter and 4th parameter
 			$pdf->SetXY($this->posxidref, $tab_top + 1);
 			$pdf->MultiCell($this->posxdatemouv - $this->posxdatemouv - 0.8, 3, $outputlangs->transnoentities("Ref"), '', 'L');
@@ -855,64 +903,56 @@ class pdf_stdandard extends ModelePDFMovement
 
 		//Date mouv
 		//$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxdatemouv, $tab_top + 1);
 			$pdf->MultiCell($this->posxdesc - $this->posxdatemouv, 2, $outputlangs->transnoentities("Date"), '', 'C');
 		}
 
 		//Ref Product
 		//$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxlabel - $this->posxdesc, 2, $outputlangs->transnoentities("Ref. Product"), '', 'C');
 		}
 
 		//Label Product
 		//$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxlabel - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxlabel, 2, $outputlangs->transnoentities("Label"), '', 'C');
 		}
 
 		//Lot/serie Product
 		//$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty, $tab_top + 1);
 			$pdf->MultiCell($this->posxup - $this->posxqty, 2, $outputlangs->transnoentities("Lot/Série"), '', 'C');
 		}
 
 		//Code Inv
 		//$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxup, 2, $outputlangs->transnoentities("Inventory Code"), '', 'C');
 		}
 
 		//Label mouvement
 		//$pdf->line($this->posxunit, $tab_top, $this->posxunit, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxunit, $tab_top + 1);
 			$pdf->MultiCell($this->posxdiscount - $this->posxunit, 2, $outputlangs->transnoentities("Label Mouvement"), '', 'C');
 		}
 
 		//Origin
 		//$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxdiscount + 2, $tab_top + 1);
 			$pdf->MultiCell($this->postotalht - $this->posxdiscount - 0.8, 2, $outputlangs->transnoentities("Origin"), '', 'C');
 		}
 
 		//Qty
 		//$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht + 2, $tab_top + 1);
 			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
@@ -943,14 +983,16 @@ class pdf_stdandard extends ModelePDFMovement
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		if ($object->type == 1) $titlekey = 'ServiceSheet';
-		else $titlekey = 'StockSheet';
+		if ($object->type == 1) {
+			$titlekey = 'ServiceSheet';
+		} else {
+			$titlekey = 'StockSheet';
+		}
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
@@ -964,10 +1006,8 @@ class pdf_stdandard extends ModelePDFMovement
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -1015,8 +1055,7 @@ class pdf_stdandard extends ModelePDFMovement
 		$posy += 4;
 		$pdf->SetXY($posx - 50, $posy);
 		$e = new MouvementStock($this->db);
-		if (!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0)
-		{
+		if (!empty($object->fk_parent) && $e->fetch($object->fk_parent) > 0) {
 			$pdf->MultiCell(150, 3, $e->label, '', 'R');
 		} else {
 			$pdf->MultiCell(150, 3, $outputlangs->transnoentities("None"), '', 'R');
@@ -1051,16 +1090,14 @@ class pdf_stdandard extends ModelePDFMovement
 		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
 		$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
 		$resqlbis = $this->db->query($sql);
-		if ($resqlbis)
-		{
+		if ($resqlbis) {
 			$obj = $this->db->fetch_object($resqlbis);
 			$lastmovementdate = $this->db->jdate($obj->datem);
 		} else {
 			dol_print_error($this->db);
 		}
 
-		if ($lastmovementdate)
-		{
+		if ($lastmovementdate) {
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
 		} else {
 			$toWrite = $outputlangs->transnoentities("None");
@@ -1071,73 +1108,72 @@ class pdf_stdandard extends ModelePDFMovement
 
 
 		/*if ($object->ref_client)
-	    {
-	        $posy+=5;
-	        $pdf->SetXY($posx,$posy);
-	        $pdf->SetTextColor(0,0,60);
-	        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
-	    }*/
+		{
+			$posy+=5;
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetTextColor(0,0,60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+		}*/
 
 		/*$posy+=4;
-	    $pdf->SetXY($posx,$posy);
-	    $pdf->SetTextColor(0,0,60);
-	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
-	    */
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
+		*/
 
 		// Get contact
 		/*
-	    if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-	    {
-	        $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
-	        if (count($arrayidcontact) > 0)
-	        {
-	            $usertmp=new User($this->db);
-	            $usertmp->fetch($arrayidcontact[0]);
-	            $posy+=4;
-	            $pdf->SetXY($posx,$posy);
-	            $pdf->SetTextColor(0,0,60);
-	            $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-	        }
-	    }*/
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
+		{
+			$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp=new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy+=4;
+				$pdf->SetXY($posx,$posy);
+				$pdf->SetTextColor(0,0,60);
+				$pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
+		}*/
 
 		$posy += 2;
 
 		// Show list of linked objects
 		//$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			/*
-	        // Sender properties
-	        $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+			// Sender properties
+			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
-	        // Show sender
-	        $posy=42;
-	        $posx=$this->marge_gauche;
-	        if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-	        $hautcadre=40;
+			// Show sender
+			$posy=42;
+			$posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			$hautcadre=40;
 
-	        // Show sender frame
-	        $pdf->SetTextColor(0,0,0);
-	        $pdf->SetFont('','', $default_font_size - 2);
-	        $pdf->SetXY($posx,$posy-5);
-	        $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
-	        $pdf->SetXY($posx,$posy);
-	        $pdf->SetFillColor(230,230,230);
-	        $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-	        $pdf->SetTextColor(0,0,60);
+			// Show sender frame
+			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetXY($posx,$posy-5);
+			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetFillColor(230,230,230);
+			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0,0,60);
 
-	        // Show sender name
-	        $pdf->SetXY($posx+2,$posy+3);
-	        $pdf->SetFont('','B', $default_font_size);
-	        $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-	        $posy=$pdf->getY();
+			// Show sender name
+			$pdf->SetXY($posx+2,$posy+3);
+			$pdf->SetFont('','B', $default_font_size);
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$posy=$pdf->getY();
 
-	        // Show sender information
-	        $pdf->SetXY($posx+2,$posy);
-	        $pdf->SetFont('','', $default_font_size - 1);
-	        $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-	        */
+			// Show sender information
+			$pdf->SetXY($posx+2,$posy);
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+			*/
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 06e52390451..8053d4f4f45 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -98,7 +98,9 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -129,17 +131,19 @@ class doc_generic_mo_odt extends ModelePDFMo
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->MRP_MO_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -158,8 +162,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->MRP_MO_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->MRP_MO_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -167,14 +170,13 @@ class doc_generic_mo_odt extends ModelePDFMo
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
-   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=mrps&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=mrps&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
 		}
 
 		$texte .= '</td>';
@@ -207,37 +209,34 @@ class doc_generic_mo_odt extends ModelePDFMo
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->mrp->dir_output)
-		{
+		if ($conf->mrp->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new MO($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -247,20 +246,19 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 			$dir = $conf->mrp->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -270,10 +268,11 @@ class doc_generic_mo_odt extends ModelePDFMo
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -290,8 +289,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				// If CUSTOMER contact defined on order, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
@@ -303,7 +301,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
@@ -322,8 +320,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'MRP_MO_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -339,8 +336,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -355,8 +351,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
@@ -370,7 +365,9 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -379,19 +376,19 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -400,32 +397,26 @@ class doc_generic_mo_odt extends ModelePDFMo
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
+					if ($foundtagforlines) {
 						$linenumber = 0;
-						foreach ($object->lines as $line)
-						{
+						foreach ($object->lines as $line) {
 							$linenumber++;
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -433,8 +424,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -442,12 +432,10 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -479,8 +467,9 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/mrp/mod_mo_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
index 610346c67e2..3d70ded1ba2 100644
--- a/htdocs/core/modules/mrp/mod_mo_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -99,18 +99,17 @@ class mod_mo_advanced extends ModeleNumRefMos
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$old_code_type = $mysoc->typent_code;
 		$mysoc->code_client = 'CCCCCCCCCC';
 		$mysoc->typent_code = 'TTTTTTTTTT';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -132,8 +131,7 @@ class mod_mo_advanced extends ModeleNumRefMos
 		// We get cursor rule
 		$mask = $conf->global->MRP_MO_ADVANCED_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/mrp/mod_mo_standard.php b/htdocs/core/modules/mrp/mod_mo_standard.php
index d4b54cb318b..ba7cdccdafa 100644
--- a/htdocs/core/modules/mrp/mod_mo_standard.php
+++ b/htdocs/core/modules/mrp/mod_mo_standard.php
@@ -56,7 +56,7 @@ class mod_mo_standard extends ModeleNumRefMos
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -90,13 +90,13 @@ class mod_mo_standard extends ModeleNumRefMos
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -124,11 +124,13 @@ class mod_mo_standard extends ModeleNumRefMos
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_mo_standard::getNextValue", LOG_DEBUG);
 			return -1;
@@ -138,8 +140,11 @@ class mod_mo_standard extends ModeleNumRefMos
 		$date = $object->date_creation;
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_mo_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/mrp/modules_mo.php b/htdocs/core/modules/mrp/modules_mo.php
index 1ad6382051c..82a1a9f3b56 100644
--- a/htdocs/core/modules/mrp/modules_mo.php
+++ b/htdocs/core/modules/mrp/modules_mo.php
@@ -142,10 +142,18 @@ abstract class ModeleNumRefMos
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index c92cab93aa1..496a2c988fa 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -71,9 +71,10 @@ $credentials = new Credentials(
 );
 
 $requestedpermissionsarray = array();
-if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'user'. 'state' parameter is standard to retrieve some parameters back
-if ($action != 'delete' && empty($requestedpermissionsarray))
-{
+if (GETPOST('state')) {
+	$requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'user'. 'state' parameter is standard to retrieve some parameters back
+}
+if ($action != 'delete' && empty($requestedpermissionsarray)) {
 	print 'Error, parameter state is not defined';
 	exit;
 }
@@ -92,8 +93,7 @@ $langs->load("oauth");
  * Actions
  */
 
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	$storage->clearToken('GitHub');
 
 	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
@@ -102,8 +102,7 @@ if ($action == 'delete')
 	exit();
 }
 
-if (!empty($_GET['code']))     // We are coming from oauth provider page
-{
+if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
@@ -147,8 +146,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 
 	// This may create record into oauth_state before the header redirect.
 	// Creation of record with state in this tables depend on the Provider used (see its constructor).
-	if (GETPOST('state'))
-	{
+	if (GETPOST('state')) {
 		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
 	} else {
 		$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 0b76a8151cf..4f9fded878f 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -71,9 +71,10 @@ $credentials = new Credentials(
 );
 
 $requestedpermissionsarray = array();
-if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to store a hash value and can be used to retrieve some parameters back
-if ($action != 'delete' && empty($requestedpermissionsarray))
-{
+if (GETPOST('state')) {
+	$requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to store a hash value and can be used to retrieve some parameters back
+}
+if ($action != 'delete' && empty($requestedpermissionsarray)) {
 	print 'Error, parameter state is not defined';
 	exit;
 }
@@ -98,8 +99,7 @@ $langs->load("oauth");
  */
 
 
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	$storage->clearToken('Google');
 
 	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
@@ -108,8 +108,7 @@ if ($action == 'delete')
 	exit();
 }
 
-if (!empty($_GET['code']))     // We are coming from oauth provider page
-{
+if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 	dol_syslog("We are coming from the oauth provider page");
 	//llxHeader('',$langs->trans("OAuthSetup"));
 
@@ -145,8 +144,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 
 	// This may create record into oauth_state before the header redirect.
 	// Creation of record with state in this tables depend on the Provider used (see its constructor).
-	if (GETPOST('state'))
-	{
+	if (GETPOST('state')) {
 		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
 	} else {
 		$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index ef0496a8541..77ef3ebde1a 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -71,11 +71,13 @@ $credentials = new Credentials(
 );
 
 $requestedpermissionsarray = array();
-if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+if (GETPOST('state')) {
+	$requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+}
 /*if ($action != 'delete' && empty($requestedpermissionsarray))
 {
-    print 'Error, parameter state is not defined';
-    exit;
+	print 'Error, parameter state is not defined';
+	exit;
 }*/
 //var_dump($requestedpermissionsarray);exit;
 
@@ -96,8 +98,7 @@ $langs->load("oauth");
  */
 
 
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	$storage->clearToken('StripeLive');
 
 	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
@@ -106,8 +107,7 @@ if ($action == 'delete')
 	exit();
 }
 
-if (!empty($_GET['code']))     // We are coming from oauth provider page
-{
+if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
@@ -151,8 +151,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 
 	// This may create record into oauth_state before the header redirect.
 	// Creation of record with state in this tables depend on the Provider used (see its constructor).
-	if (GETPOST('state'))
-	{
+	if (GETPOST('state')) {
 		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
 	} else {
 		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index 46576b0547e..a31f0f43db4 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -71,11 +71,13 @@ $credentials = new Credentials(
 );
 
 $requestedpermissionsarray = array();
-if (GETPOST('state')) $requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+if (GETPOST('state')) {
+	$requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'userinfo_email,userinfo_profile,cloud_print'. 'state' parameter is standard to retrieve some parameters back
+}
 /*if ($action != 'delete' && empty($requestedpermissionsarray))
 {
-    print 'Error, parameter state is not defined';
-    exit;
+	print 'Error, parameter state is not defined';
+	exit;
 }*/
 //var_dump($requestedpermissionsarray);exit;
 
@@ -96,8 +98,7 @@ $langs->load("oauth");
  */
 
 
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	$storage->clearToken('StripeTest');
 
 	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
@@ -106,8 +107,7 @@ if ($action == 'delete')
 	exit();
 }
 
-if (!empty($_GET['code']))     // We are coming from oauth provider page
-{
+if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 	// We should have
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
@@ -151,8 +151,7 @@ if (!empty($_GET['code']))     // We are coming from oauth provider page
 
 	// This may create record into oauth_state before the header redirect.
 	// Creation of record with state in this tables depend on the Provider used (see its constructor).
-	if (GETPOST('state'))
-	{
+	if (GETPOST('state')) {
 		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
 	} else {
 		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
diff --git a/htdocs/core/modules/payment/mod_payment_ant.php b/htdocs/core/modules/payment/mod_payment_ant.php
index b5452f994ee..10926805721 100644
--- a/htdocs/core/modules/payment/mod_payment_ant.php
+++ b/htdocs/core/modules/payment/mod_payment_ant.php
@@ -101,15 +101,14 @@ class mod_payment_ant extends ModeleNumRefPayments
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$mysoc->code_client = 'CCCCCCCCCC';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -131,8 +130,7 @@ class mod_payment_ant extends ModeleNumRefPayments
 		// We get cursor rule
 		$mask = $conf->global->PAYMENT_ANT_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/payment/mod_payment_cicada.php b/htdocs/core/modules/payment/mod_payment_cicada.php
index 9cda63103e0..535fdab38bc 100644
--- a/htdocs/core/modules/payment/mod_payment_cicada.php
+++ b/htdocs/core/modules/payment/mod_payment_cicada.php
@@ -63,7 +63,7 @@ class mod_payment_cicada extends ModeleNumRefPayments
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -97,13 +97,13 @@ class mod_payment_cicada extends ModeleNumRefPayments
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$payyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm))
-		{
+		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -131,11 +131,13 @@ class mod_payment_cicada extends ModeleNumRefPayments
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -145,8 +147,11 @@ class mod_payment_cicada extends ModeleNumRefPayments
 		$date = $object->datepaye;
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/payment/modules_payment.php b/htdocs/core/modules/payment/modules_payment.php
index ffc2ab81184..f19e80dd3d2 100644
--- a/htdocs/core/modules/payment/modules_payment.php
+++ b/htdocs/core/modules/payment/modules_payment.php
@@ -96,10 +96,16 @@ abstract class ModeleNumRefPayments
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
-		else return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 }
diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
index 006156d37bf..41a87cb2704 100644
--- a/htdocs/core/modules/printing/modules_printing.php
+++ b/htdocs/core/modules/printing/modules_printing.php
@@ -90,7 +90,10 @@ class PrintingDriver
 		global $langs;
 		$langs->load("printing");
 		$transstring = "PrintingModuleDesc".$this->name;
-		if ($langs->trans($transstring) != $transstring) return $langs->trans($transstring);
-		else return $this->desc;
+		if ($langs->trans($transstring) != $transstring) {
+			return $langs->trans($transstring);
+		} else {
+			return $this->desc;
+		}
 	}
 }
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 9560af284b7..ace8a5da188 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -173,11 +173,9 @@ class printing_printgcp extends PrintingDriver
 
 					$endoflife = $token->getEndOfLife();
 
-					if ($endoflife == $token::EOL_NEVER_EXPIRES)
-					{
+					if ($endoflife == $token::EOL_NEVER_EXPIRES) {
 						$expiredat = $langs->trans("Never");
-					} elseif ($endoflife == $token::EOL_UNKNOWN)
-					{
+					} elseif ($endoflife == $token::EOL_UNKNOWN) {
 						$expiredat = $langs->trans("Unknown");
 					} else {
 						$expiredat = dol_print_date($endoflife, "dayhour");
@@ -188,12 +186,12 @@ class printing_printgcp extends PrintingDriver
 					$this->conf[] = array('varname'=>'TOKEN_EXPIRE_AT', 'info'=>($expiredat), 'type'=>'info');
 				}
 				/*
-                if ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)) {
-                    $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
-                    $this->conf[] = array('varname'=>'DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
-                } else {
-                    $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
-                }*/
+				if ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)) {
+					$this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
+					$this->conf[] = array('varname'=>'DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
+				} else {
+					$this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
+				}*/
 			} else {
 				$this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
 			}
@@ -225,8 +223,7 @@ class printing_printgcp extends PrintingDriver
 		$html .= '</tr>'."\n";
 		$list = $this->getlistAvailablePrinters();
 		//$html.= '<td><pre>'.print_r($list,true).'</pre></td>';
-		foreach ($list['available'] as $printer_det)
-		{
+		foreach ($list['available'] as $printer_det) {
 			$html .= '<tr class="oddeven">';
 			$html .= '<td>'.$printer_det['name'].'</td>';
 			$html .= '<td>'.$printer_det['displayName'].'</td>';
@@ -237,10 +234,11 @@ class printing_printgcp extends PrintingDriver
 			$html .= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
 			// Defaut
 			$html .= '<td class="center">';
-			if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
-			{
+			if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id']) {
 				$html .= img_picto($langs->trans("Default"), 'on');
-			} else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			} else {
+				$html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			}
 			$html .= '</td>';
 			$html .= '</tr>'."\n";
 		}
@@ -338,15 +336,12 @@ class printing_printgcp extends PrintingDriver
 		// select printer uri for module order, propal,...
 		$sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$this->db->escape($module)."' AND driver='printgcp' AND userid=".$user->id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			if ($obj)
-			{
+			if ($obj) {
 				$printer_id = $obj->printer_id;
 			} else {
-				if (!empty($conf->global->PRINTING_GCP_DEFAULT))
-				{
+				if (!empty($conf->global->PRINTING_GCP_DEFAULT)) {
 					$printer_id = $conf->global->PRINTING_GCP_DEFAULT;
 				} else {
 					$this->errors[] = 'NoDefaultPrinterDefined';
diff --git a/htdocs/core/modules/printing/printipp.modules.php b/htdocs/core/modules/printing/printipp.modules.php
index 5d840cb5ca3..b4d4c89b47f 100644
--- a/htdocs/core/modules/printing/printipp.modules.php
+++ b/htdocs/core/modules/printing/printipp.modules.php
@@ -143,7 +143,9 @@ class printing_printipp extends PrintingDriver
 		$ipp->setUserName($this->userid);
 		// Set default number of copy
 		$ipp->setCopies(1);
-		if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
+		if (!empty($this->user)) {
+			$ipp->setAuthentication($this->user, $this->password);
+		}
 
 		// select printer uri for module order, propal,...
 		$sql = "SELECT rowid,printer_id,copy FROM ".MAIN_DB_PREFIX."printing WHERE module = '".$this->db->escape($module)."' AND driver = 'printipp' AND userid = ".$user->id;
@@ -156,8 +158,7 @@ class printing_printipp extends PrintingDriver
 				// Set number of copy
 				$ipp->setCopies($obj->copy);
 			} else {
-				if (!empty($conf->global->PRINTIPP_URI_DEFAULT))
-				{
+				if (!empty($conf->global->PRINTIPP_URI_DEFAULT)) {
 					dol_syslog("Will use default printer conf->global->PRINTIPP_URI_DEFAULT = ".$conf->global->PRINTIPP_URI_DEFAULT);
 					$ipp->setPrinterURI($conf->global->PRINTIPP_URI_DEFAULT);
 				} else {
@@ -171,7 +172,9 @@ class printing_printipp extends PrintingDriver
 		}
 
 		$fileprint = $conf->{$module}->dir_output;
-		if ($subdir != '') $fileprint .= '/'.$subdir;
+		if ($subdir != '') {
+			$fileprint .= '/'.$subdir;
+		}
 		$fileprint .= '/'.$file;
 		$ipp->setData($fileprint);
 		try {
@@ -180,7 +183,9 @@ class printing_printipp extends PrintingDriver
 			$this->errors[] = $e->getMessage();
 			$error++;
 		}
-		if ($error == 0) $this->errors[] = 'PRINTIPP: Job added';
+		if ($error == 0) {
+			$this->errors[] = 'PRINTIPP: Job added';
+		}
 
 		return $error;
 	}
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index 0b4db8c2619..c09ce7bcbd8 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -80,48 +80,42 @@ class pdf_standardlabel extends CommonStickerGenerator
 
 		// Define logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if (!is_readable($logo))
-		{
+		if (!is_readable($logo)) {
 			$logo = '';
-			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-			{
+			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-			{
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
 		}
 
 		// Define photo
-		if (!empty($photo))
-		{
-			if (!is_readable($photo)) $photo = '';
+		if (!empty($photo)) {
+			if (!is_readable($photo)) {
+				$photo = '';
+			}
 		}
 
 		// Define background image
 		$backgroundimage = '';
 
 		// Print lines
-		if ($this->code == "CARD")
-		{
+		if ($this->code == "CARD") {
 			$this->Tformat = $this->_Avery_Labels["CARD"];
 			//$this->_Pointille($pdf,$_PosX,$_PosY,$_PosX+$this->_Width,$_PosY+$this->_Height,0.3,25);
 			$this->_Croix($pdf, $_PosX, $_PosY, $_PosX + $this->_Width, $_PosY + $this->_Height, 0.1, 10);
 		}
 
 		// Background
-		if ($backgroundimage)
-		{
+		if ($backgroundimage) {
 			$pdf->image($backgroundimage, $_PosX, $_PosY, $this->_Width, $this->_Height);
 		}
 
 		$xleft = 2; $ytop = 2;
 
 		// Top
-		if ($header != '')
-		{
-			if ($this->code == "CARD")
-			{
+		if ($header != '') {
+			if ($this->code == "CARD") {
 				$pdf->SetDrawColor(128, 128, 128);
 				$pdf->Line($_PosX, $_PosY + $this->_Line_Height + 1, $_PosX + $this->_Width, $_PosY + $this->_Line_Height + 1); // Only 1 mm and not ytop for top text
 				$pdf->SetDrawColor(0, 0, 0);
@@ -138,35 +132,42 @@ class pdf_standardlabel extends CommonStickerGenerator
 		$defaultratio = ($maxwidthtouse / $maxheighttouse);
 		$widthtouse = $maxwidthtouse; $heighttouse = 0; // old value for image
 		$tmp = dol_getImageSize($photo, false);
-		if ($tmp['height'])
-		{
+		if ($tmp['height']) {
 			$imgratio = $tmp['width'] / $tmp['height'];
-			if ($imgratio >= $defaultratio) { $widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio); } else { $heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio); }
+			if ($imgratio >= $defaultratio) {
+				$widthtouse = $maxwidthtouse; $heighttouse = round($widthtouse / $imgratio);
+			} else {
+				$heightouse = $maxheighttouse; $widthtouse = round($heightouse * $imgratio);
+			}
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
 		// Center
-		if ($textright == '')	// Only a left part
-		{
+		if ($textright == '') {	// Only a left part
 			// Output left area
-			if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			elseif ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else {
+			if ($textleft == '%LOGO%' && $logo) {
+				$pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} elseif ($textleft == '%PHOTO%' && $photo) {
+				$pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		} elseif ($textleft != '' && $textright != '')	//
-		{
-			if ($textleft == '%LOGO%' || $textleft == '%PHOTO%')
-			{
-				if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-				elseif ($textleft == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+		} elseif ($textleft != '' && $textright != '') {	//
+			if ($textleft == '%LOGO%' || $textleft == '%PHOTO%') {
+				if ($textleft == '%LOGO%' && $logo) {
+					$pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				} elseif ($textleft == '%PHOTO%' && $photo) {
+					$pdf->Image($photo, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				}
 				$pdf->SetXY($_PosX + $xleft + $widthtouse + 1, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft - $xleft - $widthtouse - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			} elseif ($textright == '%LOGO%' || $textright == '%PHOTO%')
-			{
-				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-				elseif ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} elseif ($textright == '%LOGO%' || $textright == '%PHOTO%') {
+				if ($textright == '%LOGO%' && $logo) {
+					$pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				} elseif ($textright == '%PHOTO%' && $photo) {
+					$pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+				}
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $widthtouse - $xleft - $xleft - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			} else // text on halft left and text on half right
@@ -179,19 +180,19 @@ class pdf_standardlabel extends CommonStickerGenerator
 		} else // Only a right part
 		{
 			// Output right area
-			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			elseif ($textright == '%PHOTO%' && $photo) $pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
-			else {
+			if ($textright == '%LOGO%' && $logo) {
+				$pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} elseif ($textright == '%PHOTO%' && $photo) {
+				$pdf->Image($photo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
+			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width - $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 			}
 		}
 
 		// Bottom
-		if ($footer != '')
-		{
-			if ($this->code == "CARD")
-			{
+		if ($footer != '') {
+			if ($this->code == "CARD") {
 				$pdf->SetDrawColor(128, 128, 128);
 				$pdf->Line($_PosX, $_PosY + $this->_Height - $this->_Line_Height - 2, $_PosX + $this->_Width, $_PosY + $this->_Height - $this->_Line_Height - 2);
 				$pdf->SetDrawColor(0, 0, 0);
@@ -237,7 +238,9 @@ class pdf_standardlabel extends CommonStickerGenerator
 
 		$this->code = $srctemplatepath;
 		$this->Tformat = $_Avery_Labels[$this->code];
-		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
+		if (empty($this->Tformat)) {
+			dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit;
+		}
 		$this->type = 'pdf';
 		// standard format or custom
 		if ($this->Tformat['paper-size'] != 'custom') {
@@ -248,9 +251,13 @@ class pdf_standardlabel extends CommonStickerGenerator
 			$this->format = $resolution;
 		}
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "admin"));
@@ -261,10 +268,8 @@ class pdf_standardlabel extends CommonStickerGenerator
 		$dir = (empty($outputdir) ? $conf->adherent->dir_temp : $outputdir);
 		$file = $dir."/".$filename;
 
-		if (!file_exists($dir))
-		{
-			if (dol_mkdir($dir) < 0)
-			{
+		if (!file_exists($dir)) {
+			if (dol_mkdir($dir) < 0) {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -272,8 +277,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 
 		$pdf = pdf_getInstance($this->format, $this->Tformat['metric'], $this->Tformat['orientation']);
 
-		if (class_exists('TCPDF'))
-		{
+		if (class_exists('TCPDF')) {
 			$pdf->setPrintHeader(false);
 			$pdf->setPrintFooter(false);
 		}
@@ -284,7 +288,9 @@ class pdf_standardlabel extends CommonStickerGenerator
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($keywords);
-		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+			$pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins(0, 0);
 		$pdf->SetAutoPageBreak(false);
@@ -293,8 +299,16 @@ class pdf_standardlabel extends CommonStickerGenerator
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
 		$posX = 1;
 		$posY = 1;
-		if ($posX > 0) $posX--; else $posX = 0;
-		if ($posY > 0) $posY--; else $posY = 0;
+		if ($posX > 0) {
+			$posX--;
+		} else {
+			$posX = 0;
+		}
+		if ($posY > 0) {
+			$posY--;
+		} else {
+			$posY = 0;
+		}
 		$this->_COUNTX = $posX;
 		$this->_COUNTY = $posY;
 		$this->_Set_Format($pdf, $this->Tformat);
@@ -305,8 +319,7 @@ class pdf_standardlabel extends CommonStickerGenerator
 
 
 		// Add each record
-		foreach ($arrayofrecords as $val)
-		{
+		foreach ($arrayofrecords as $val) {
 			// imprime le texte specifique sur la carte
 			$this->Add_PDF_label($pdf, $val['textleft'], $val['textheader'], $val['textfooter'], $langs, $val['textright'], $val['photo']);
 		}
@@ -318,8 +331,9 @@ class pdf_standardlabel extends CommonStickerGenerator
 		// Output to file
 		$pdf->Output($file, 'F');
 
-		if (!empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		$this->result = array('fullpath'=>$file);
 
diff --git a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
index e4f46d269e2..1be4e6d8432 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php
@@ -120,14 +120,11 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 
 		// Define logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if (!is_readable($logo))
-		{
+		if (!is_readable($logo)) {
 			$logo = '';
-			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small))
-			{
+			if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
 				$logo = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
-			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo))
-			{
+			} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
 				$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 			}
 		}
@@ -136,8 +133,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		$ytop = 2;
 
 		// Top
-		if ($header != '')
-		{
+		if ($header != '') {
 			$pdf->SetXY($_PosX + $xleft, $_PosY + 1); // Only 1 mm and not ytop for top text
 			$pdf->Cell($this->_Width - 2 * $xleft, $this->_Line_Height, $outputlangs->convToOutputCharset($header), 0, 1, 'C');
 		}
@@ -158,54 +154,50 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
 
 		// Center
-		if ($textright == '')	// Only a left part
-		{
+		if ($textright == '') {	// Only a left part
 			// Output left area
-			if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, 0, $logoHeight);
-			elseif ($code && !empty($encoding))
-			{
+			if ($textleft == '%LOGO%' && $logo) {
+				$pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, 0, $logoHeight);
+			} elseif ($code && !empty($encoding)) {
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
 			}
-		} elseif ($textleft != '' && $textright != '')	// left and right part
-		{
+		} elseif ($textleft != '' && $textright != '') {	// left and right part
 			$logoHeight = $heighttouse / 2;
 			$logoWidth = $widthtouse / 2;
-			if (($textleft == '%LOGO%' || $textleft == '%PHOTO%' || $textleft == '%BARCODE%') && !strstr($textright, '%'))	 // left part logo/barcode right part text
-			{
-				if ($textleft == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $logoWidth, 0);
-				elseif ($code && !empty($encoding))
-				{
+			if (($textleft == '%LOGO%' || $textleft == '%PHOTO%' || $textleft == '%BARCODE%') && !strstr($textright, '%')) {	 // left part logo/barcode right part text
+				if ($textleft == '%LOGO%' && $logo) {
+					$pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, $logoWidth, 0);
+				} elseif ($code && !empty($encoding)) {
 					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft, $_PosY + $ytop, $widthtouse / 2, $heighttouse);
 				}
 				$pdf->SetXY($_PosX + ($widthtouse / 2), $_PosY + $ytop);
 				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
-			} elseif (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) // right part logo/barcode left part text
-			{
-				if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + ($widthtouse / 2), $_PosY + $ytop, $logoWidth, 0);
-				elseif ($code && !empty($encoding))
-				{
+			} elseif (($textright == '%LOGO%' || $textright == '%PHOTO%' || $textright == '%BARCODE%') && !strstr($textleft, '%')) { // right part logo/barcode left part text
+				if ($textright == '%LOGO%' && $logo) {
+					$pdf->Image($logo, $_PosX + ($widthtouse / 2), $_PosY + $ytop, $logoWidth, 0);
+				} elseif ($code && !empty($encoding)) {
 					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + ($widthtouse / 2), $_PosY + $ytop, $widthtouse / 2, $heighttouse);
 				}
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
 				$pdf->MultiCell($widthtouse / 2, $this->_Line_Height, $outputlangs->convToOutputCharset($textleft), 0, 'L');
-			} elseif ($textleft == '%LOGO%')	 // left part logo right part text/barcode
-			{
-				if ($logo) $pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, 0, $logoHeight);
-				if ($code && !empty($encoding))
-				{
+			} elseif ($textleft == '%LOGO%') {	 // left part logo right part text/barcode
+				if ($logo) {
+					$pdf->Image($logo, $_PosX + $xleft, $_PosY + $ytop, 0, $logoHeight);
+				}
+				if ($code && !empty($encoding)) {
 					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft + $logoWidth + 1, $_PosY + $ytop, $widthtouse - $logoWidth - 1, $heighttouse);
 				} else {
 					$pdf->SetXY($_PosX + $xleft + $logoWidth + 1, $_PosY + $ytop);
 					$pdf->MultiCell($widthtouse - $logoWidth - 1, $this->_Line_Height, $outputlangs->convToOutputCharset($textright), 0, 'R');
 				}
-			} elseif ($textright == '%LOGO%')  // right part logo left part text/barcode
-			{
-				if ($logo) $pdf->Image($logo, $_PosX + $xleft + $widthtouse - $logoWidth + 1, $_PosY + $ytop, 0, $logoHeight);
-				if ($code && !empty($encoding))
-				{
+			} elseif ($textright == '%LOGO%') {  // right part logo left part text/barcode
+				if ($logo) {
+					$pdf->Image($logo, $_PosX + $xleft + $widthtouse - $logoWidth + 1, $_PosY + $ytop, 0, $logoHeight);
+				}
+				if ($code && !empty($encoding)) {
 					$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $xleft, $_PosY + $ytop, $widthtouse - $logoWidth - 1, $heighttouse);
 				} else {
 					$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
@@ -221,9 +213,9 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		} else // Only a right part
 		{
 			// Output right area
-			if ($textright == '%LOGO%' && $logo) $pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, 0, $logoHeight);
-			elseif ($code && !empty($encoding))
-			{
+			if ($textright == '%LOGO%' && $logo) {
+				$pdf->Image($logo, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, 0, $logoHeight);
+			} elseif ($code && !empty($encoding)) {
 				$this->writeBarcode($pdf, $code, $encoding, $is2d, $_PosX + $this->_Width - $widthtouse - $xleft, $_PosY + $ytop, $widthtouse, $heighttouse);
 			} else {
 				$pdf->SetXY($_PosX + $xleft, $_PosY + $ytop);
@@ -232,8 +224,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		}
 
 		// Bottom
-		if ($footer != '')
-		{
+		if ($footer != '') {
 			$pdf->SetXY($_PosX, $_PosY + $this->_Height - $this->_Line_Height - 1);
 			$pdf->Cell($this->_Width, $this->_Line_Height, $outputlangs->convToOutputCharset($footer), 0, 1, 'C');
 		}
@@ -275,7 +266,9 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 
 		$this->code = $srctemplatepath;
 		$this->Tformat = $_Avery_Labels[$this->code];
-		if (empty($this->Tformat)) { dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit; }
+		if (empty($this->Tformat)) {
+			dol_print_error('', 'ErrorBadTypeForCard'.$this->code); exit;
+		}
 		$this->type = 'pdf';
 		// standard format or custom
 		if ($this->Tformat['paper-size'] != 'custom') {
@@ -286,9 +279,13 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 			$this->format = $resolution;
 		}
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "admin"));
@@ -299,10 +296,8 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		$dir = (empty($outputdir) ? $conf->adherent->dir_temp : $outputdir);
 		$file = $dir."/".$filename;
 
-		if (!file_exists($dir))
-		{
-			if (dol_mkdir($dir) < 0)
-			{
+		if (!file_exists($dir)) {
+			if (dol_mkdir($dir) < 0) {
 				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
@@ -310,8 +305,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 
 		$pdf = pdf_getInstance($this->format, $this->Tformat['metric'], $this->Tformat['orientation']);
 
-		if (class_exists('TCPDF'))
-		{
+		if (class_exists('TCPDF')) {
 			$pdf->setPrintHeader(false);
 			$pdf->setPrintFooter(false);
 		}
@@ -322,7 +316,9 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($keywords);
-		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+			$pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins(0, 0);
 		$pdf->SetAutoPageBreak(false);
@@ -331,8 +327,16 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		// Permet de commencer l'impression de l'etiquette desiree dans le cas ou la page a deja servie
 		$posX = 1;
 		$posY = 1;
-		if ($posX > 0) $posX--; else $posX = 0;
-		if ($posY > 0) $posY--; else $posY = 0;
+		if ($posX > 0) {
+			$posX--;
+		} else {
+			$posX = 0;
+		}
+		if ($posY > 0) {
+			$posY--;
+		} else {
+			$posY = 0;
+		}
 		$this->_COUNTX = $posX;
 		$this->_COUNTY = $posY;
 		$this->_Set_Format($pdf, $this->Tformat);
@@ -343,8 +347,7 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 
 
 		// Add each record
-		foreach ($arrayofrecords as $val)
-		{
+		foreach ($arrayofrecords as $val) {
 			// imprime le texte specifique sur la carte
 			$this->addSticker($pdf, $outputlangs, $val);
 		}
@@ -356,8 +359,9 @@ class pdf_tcpdflabel extends CommonStickerGenerator
 		// Output to file
 		$pdf->Output($file, 'F');
 
-		if (!empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 
 		$this->result = array('fullpath'=>$file);
diff --git a/htdocs/core/modules/printsheet/modules_labels.php b/htdocs/core/modules/printsheet/modules_labels.php
index 9106c8f4eac..9365f19f783 100644
--- a/htdocs/core/modules/printsheet/modules_labels.php
+++ b/htdocs/core/modules/printsheet/modules_labels.php
@@ -95,51 +95,52 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 	$srctemplatepath = '';
 
 	// Positionne le modele sur le nom du modele a utiliser
-	if (!dol_strlen($modele))
-	{
-		if (!empty($conf->global->ADHERENT_ETIQUETTE_TYPE))
-		{
+	if (!dol_strlen($modele)) {
+		if (!empty($conf->global->ADHERENT_ETIQUETTE_TYPE)) {
 			$code = $conf->global->ADHERENT_ETIQUETTE_TYPE;
 		} else {
 			$code = $modele;
 		}
-	} else $code = $modele;
+	} else {
+		$code = $modele;
+	}
 
 	// If selected modele is a filename template (then $modele="modelname:filename")
 	$tmp = explode(':', $template, 2);
-	if (!empty($tmp[1]))
-	{
+	if (!empty($tmp[1])) {
 		$template = $tmp[0];
 		$srctemplatepath = $tmp[1];
-	} else $srctemplatepath = $code;
+	} else {
+		$srctemplatepath = $code;
+	}
 
 	dol_syslog("modele=".$modele." outputdir=".$outputdir." template=".$template." code=".$code." srctemplatepath=".$srctemplatepath." filename=".$filename, LOG_DEBUG);
 
 	// Search template files
 	$file = ''; $classname = ''; $filefound = 0;
 	$dirmodels = array('/');
-	if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
-	foreach ($dirmodels as $reldir)
-	{
-		foreach (array('doc', 'pdf') as $prefix)
-		{
+	if (is_array($conf->modules_parts['models'])) {
+		$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+	}
+	foreach ($dirmodels as $reldir) {
+		foreach (array('doc', 'pdf') as $prefix) {
 			$file = $prefix."_".$template.".class.php";
 
 			// On verifie l'emplacement du modele
 			$file = dol_buildpath($reldir."core/modules/printsheet/doc/".$file, 0);
-			if (file_exists($file))
-			{
+			if (file_exists($file)) {
 				$filefound = 1;
 				$classname = $prefix.'_'.$template;
 				break;
 			}
 		}
-		if ($filefound) break;
+		if ($filefound) {
+			break;
+		}
 	}
 
 	// Charge le modele
-	if ($filefound)
-	{
+	if ($filefound) {
 		require_once $file;
 
 		$obj = new $classname($db);
@@ -147,8 +148,7 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 		// We save charset_output to restore it because write_file can change it if needed for
 		// output format that does not support UTF8.
 		$sav_charset_output = $outputlangs->charset_output;
-		if ($obj->write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir, $filename) > 0)
-		{
+		if ($obj->write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir, $filename) > 0) {
 			$outputlangs->charset_output = $sav_charset_output;
 
 			$fullpath = $obj->result['fullpath'];
@@ -157,13 +157,20 @@ function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outp
 			clearstatcache();
 
 			$attachment = true;
-			if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) $attachment = false;
+			if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS)) {
+				$attachment = false;
+			}
 			$type = dol_mimetype($filename);
 
 			//if ($encoding)   header('Content-Encoding: '.$encoding);
-			if ($type)		 header('Content-Type: '.$type);
-			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-			else header('Content-Disposition: inline; filename="'.$filename.'"');
+			if ($type) {
+				header('Content-Type: '.$type);
+			}
+			if ($attachment) {
+				header('Content-Disposition: attachment; filename="'.$filename.'"');
+			} else {
+				header('Content-Disposition: inline; filename="'.$filename.'"');
+			}
 
 			// Ajout directives pour resoudre bug IE
 			header('Cache-Control: Public, must-revalidate');
diff --git a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
index ef5e97997f9..8970cbeea79 100644
--- a/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
+++ b/htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php
@@ -96,7 +96,9 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -120,8 +122,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="PRODUCT_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
+		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
 			$texte .= '<input type="hidden" name="param2" value="PRODUCT_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="PRODUCT_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="PRODUCT_ADDON_PDF_ODT_CLOSED">';
@@ -133,17 +134,19 @@ class doc_generic_product_odt extends ModelePDFProduct
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PRODUCT_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -161,8 +164,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		$texte .= '<br></div></div>';
 
 		// Scan directories
-		if (count($listofdir))
-		{
+		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
 			/*if ($conf->global->MAIN_PRODUCT_CHOOSE_ODT_DOCUMENT > 0)
@@ -221,38 +223,35 @@ class doc_generic_product_odt extends ModelePDFProduct
 		// phpcs:enable
 		global $product, $langs, $conf, $mysoc, $hookmanager, $user;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->product->dir_output)
-		{
+		if ($conf->product->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Product($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -263,20 +262,19 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 			$dir = $conf->product->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -287,10 +285,11 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -307,8 +306,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				// If CUSTOMER contact defined on product, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
@@ -342,8 +340,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'product_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -359,8 +356,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -376,8 +372,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
@@ -391,7 +386,9 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -400,19 +397,19 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -420,22 +417,18 @@ class doc_generic_product_odt extends ModelePDFProduct
 				try {
 					$listlines = $odfHandler->setSegment('supplierprices');
 					if (!empty($object->supplierprices)) {
-						foreach ($object->supplierprices as $supplierprice)
-						{
+						foreach ($object->supplierprices as $supplierprice) {
 							$array_lines = $this->get_substitutionarray_each_var_object($supplierprice, $outputlangs);
 							complete_substitutions_array($array_lines, $outputlangs, $object, $supplierprice, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$array_lines, 'line'=>$supplierprice);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($array_lines as $key => $val)
-							{
+							foreach ($array_lines as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -443,8 +436,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -452,12 +444,10 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -487,8 +477,9 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index cf3c1c057da..72eaae364a5 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -144,7 +144,9 @@ class pdf_standard extends ModelePDFProduct
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -165,9 +167,13 @@ class pdf_standard extends ModelePDFProduct
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
@@ -178,11 +184,9 @@ class pdf_standard extends ModelePDFProduct
 			$nblines = 0;
 		}
 
-		if ($conf->product->dir_output)
-		{
+		if ($conf->product->dir_output) {
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->product->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -195,20 +199,16 @@ class pdf_standard extends ModelePDFProduct
 			$supplierprices = $productFournisseur->list_product_fournisseur_price($object->id);
 			$object->supplierprices = $supplierprices;
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -225,17 +225,17 @@ class pdf_standard extends ModelePDFProduct
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -249,14 +249,18 @@ class pdf_standard extends ModelePDFProduct
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -281,48 +285,45 @@ class pdf_standard extends ModelePDFProduct
 				$nexY += 5;
 
 				$outputlangs->load("other");
-				if ($object->weight)
-				{
+				if ($object->weight) {
 					$texttoshow = $langs->trans("Weight").': '.dol_htmlentitiesbr($object->weight);
-					if (isset($object->weight_units)) $texttoshow .= ' '.measuring_units_string($object->weight_units, 'weight', 0, 0, $outputlangs);
+					if (isset($object->weight_units)) {
+						$texttoshow .= ' '.measuring_units_string($object->weight_units, 'weight', 0, 0, $outputlangs);
+					}
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
-				if ($object->weight)
-				{
+				if ($object->weight) {
 					$texttoshow = $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?');
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
-				if ($object->surface)
-				{
+				if ($object->surface) {
 					$texttoshow = $langs->trans("Area").': '.dol_htmlentitiesbr($object->surface);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
 					$nexY = $pdf->GetY();
 				}
-				if ($object->volume)
-				{
+				if ($object->volume) {
 					$texttoshow = $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume);
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
-	   				$nexY = $pdf->GetY();
+					$nexY = $pdf->GetY();
 				}
 
 				// Show notes
 				// TODO There is no public note on product yet
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
@@ -478,7 +479,7 @@ class pdf_standard extends ModelePDFProduct
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
-				    // retrieve global local tax
+					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -548,14 +549,16 @@ class pdf_standard extends ModelePDFProduct
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
-                */
+				*/
 
 				// Affiche zone infos
 				//$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -566,14 +569,14 @@ class pdf_standard extends ModelePDFProduct
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -608,7 +611,9 @@ class pdf_standard extends ModelePDFProduct
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -617,14 +622,15 @@ class pdf_standard extends ModelePDFProduct
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -633,34 +639,29 @@ class pdf_standard extends ModelePDFProduct
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
 				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
 		}
 
 		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 		}
 
 		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
@@ -674,21 +675,17 @@ class pdf_standard extends ModelePDFProduct
 		}
 
 		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
+		if (empty($hidetop)) {
+			if ($this->atleastonediscount) {
 				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
 
-		if ($this->atleastonediscount)
-		{
+		if ($this->atleastonediscount) {
 			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
 		}
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
 			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 		}
@@ -714,14 +711,16 @@ class pdf_standard extends ModelePDFProduct
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		if ($object->type == 1) $titlekey = 'ServiceSheet';
-		else $titlekey = 'ProductSheet';
+		if ($object->type == 1) {
+			$titlekey = 'ServiceSheet';
+		} else {
+			$titlekey = 'ProductSheet';
+		}
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
@@ -735,10 +734,8 @@ class pdf_standard extends ModelePDFProduct
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -769,73 +766,72 @@ class pdf_standard extends ModelePDFProduct
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		/*if ($object->ref_client)
-	    {
-	        $posy+=5;
-	        $pdf->SetXY($posx,$posy);
-	        $pdf->SetTextColor(0,0,60);
-	        $pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
-	    }*/
+		{
+			$posy+=5;
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetTextColor(0,0,60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : " . $outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+		}*/
 
 		/*$posy+=4;
-	    $pdf->SetXY($posx,$posy);
-	    $pdf->SetTextColor(0,0,60);
-	    $pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
-	    */
+		$pdf->SetXY($posx,$posy);
+		$pdf->SetTextColor(0,0,60);
+		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : " . dol_print_date($object->date,"%d %b %Y",false,$outputlangs,true), '', 'R');
+		*/
 
 		// Get contact
 		/*
-	    if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-	    {
-	        $arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
-	        if (count($arrayidcontact) > 0)
-	        {
-	            $usertmp=new User($this->db);
-	            $usertmp->fetch($arrayidcontact[0]);
-	            $posy+=4;
-	            $pdf->SetXY($posx,$posy);
-	            $pdf->SetTextColor(0,0,60);
-	            $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-	        }
-	    }*/
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
+		{
+			$arrayidcontact=$object->getIdContact('internal','SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp=new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy+=4;
+				$pdf->SetXY($posx,$posy);
+				$pdf->SetTextColor(0,0,60);
+				$pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
+		}*/
 
 		$posy += 2;
 
 		// Show list of linked objects
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			/*
-	        // Sender properties
-	        $carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+			// Sender properties
+			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
-	        // Show sender
-	        $posy=42;
-	        $posx=$this->marge_gauche;
-	        if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
-	        $hautcadre=40;
+			// Show sender
+			$posy=42;
+			$posx=$this->marge_gauche;
+			if (! empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx=$this->page_largeur-$this->marge_droite-80;
+			$hautcadre=40;
 
-	        // Show sender frame
-	        $pdf->SetTextColor(0,0,0);
-	        $pdf->SetFont('','', $default_font_size - 2);
-	        $pdf->SetXY($posx,$posy-5);
-	        $pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
-	        $pdf->SetXY($posx,$posy);
-	        $pdf->SetFillColor(230,230,230);
-	        $pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
-	        $pdf->SetTextColor(0,0,60);
+			// Show sender frame
+			$pdf->SetTextColor(0,0,0);
+			$pdf->SetFont('','', $default_font_size - 2);
+			$pdf->SetXY($posx,$posy-5);
+			$pdf->MultiCell(66,5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx,$posy);
+			$pdf->SetFillColor(230,230,230);
+			$pdf->MultiCell(82, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0,0,60);
 
-	        // Show sender name
-	        $pdf->SetXY($posx+2,$posy+3);
-	        $pdf->SetFont('','B', $default_font_size);
-	        $pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
-	        $posy=$pdf->getY();
+			// Show sender name
+			$pdf->SetXY($posx+2,$posy+3);
+			$pdf->SetFont('','B', $default_font_size);
+			$pdf->MultiCell(80, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$posy=$pdf->getY();
 
-	        // Show sender information
-	        $pdf->SetXY($posx+2,$posy);
-	        $pdf->SetFont('','', $default_font_size - 1);
-	        $pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
-	        */
+			// Show sender information
+			$pdf->SetXY($posx+2,$posy);
+			$pdf->SetFont('','', $default_font_size - 1);
+			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
+			*/
 		}
 
 		$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 2580000ca7a..24d9c0690c8 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -144,35 +144,33 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 */
 	public function getExample($langs, $objproduct = 0, $type = -1)
 	{
-		if ($type == 0 || $type == -1)
-		{
+		if ($type == 0 || $type == -1) {
 			$exampleproduct = $this->getNextValue($objproduct, 0);
-			if (!$exampleproduct)
-			{
+			if (!$exampleproduct) {
 				$exampleproduct = $langs->trans('NotConfigured');
 			}
-			if ($exampleproduct == "ErrorBadMask")
-			{
+			if ($exampleproduct == "ErrorBadMask") {
 				$langs->load("errors");
 				$exampleproduct = $langs->trans($exampleproduct);
 			}
 		}
-		if ($type == 1 || $type == -1)
-		{
+		if ($type == 1 || $type == -1) {
 			$exampleservice = $this->getNextValue($objproduct, 1);
-			if (!$exampleservice)
-			{
+			if (!$exampleservice) {
 				$exampleservice = $langs->trans('NotConfigured');
 			}
-			if ($exampleservice == "ErrorBadMask")
-			{
+			if ($exampleservice == "ErrorBadMask") {
 				$langs->load("errors");
 				$exampleservice = $langs->trans($exampleservice);
 			}
 		}
 
-		if ($type == 0) return $exampleproduct;
-		if ($type == 1) return $exampleservice;
+		if ($type == 0) {
+			return $exampleproduct;
+		}
+		if ($type == 1) {
+			return $exampleservice;
+		}
 		return $exampleproduct.'<br>'.$exampleservice;
 	}
 
@@ -191,32 +189,31 @@ class mod_codeproduct_elephant extends ModeleProductCode
 
 		// Get Mask value
 		$mask = '';
-		if ($type == 0 && !empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT))
+		if ($type == 0 && !empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT)) {
 			$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-		elseif ($type == 1 && !empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE))
+		} elseif ($type == 1 && !empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE)) {
 			$mask = $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+		}
 
-		if (empty($mask))
-		{
+		if (empty($mask)) {
 			$this->error = 'NotConfigured';
 			return '';
 		}
 
 		$field = ''; $where = '';
-		if ($type == 0)
-		{
+		if ($type == 0) {
 			$field = 'ref';
 			//$where = ' AND client in (1,2)';
-		} elseif ($type == 1)
-		{
+		} elseif ($type == 1) {
 			$field = 'ref';
 			//$where = ' AND fournisseur = 1';
-		} else return -1;
+		} else {
+			return -1;
+		}
 
 		$now = dol_now();
 
-		if (!empty($conf->global->PRODUCT_ELEPHANT_ADD_WHERE))
-		{
+		if (!empty($conf->global->PRODUCT_ELEPHANT_ADD_WHERE)) {
 			$where = ' AND ('.dol_string_nospecial(dol_string_unaccent($conf->global->PRODUCT_ELEPHANT_ADD_WHERE), '_', array(',', '@', '"', "|", ";", ":")).')';
 		}
 
@@ -238,10 +235,14 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		global $conf;
 
 		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-		if (preg_match('/\{pre\}/i', $mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) {
+			return 1;
+		}
 
 		$mask = $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
-		if (preg_match('/\{pre\}/i', $mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) {
+			return 1;
+		}
 
 		return 0;
 	}
@@ -270,26 +271,26 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-		{
+		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 			$result = 0;
-		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
-		{
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))) {
 			$result = -2;
 		} else {
 			// Get Mask value
 			$mask = '';
-			if ($type == 0) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
-			if ($type == 1) $mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
-			if (!$mask)
-			{
+			if ($type == 0) {
+				$mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_PRODUCT;
+			}
+			if ($type == 1) {
+				$mask = empty($conf->global->PRODUCT_ELEPHANT_MASK_SERVICE) ? '' : $conf->global->PRODUCT_ELEPHANT_MASK_SERVICE;
+			}
+			if (!$mask) {
 				$this->error = 'NotConfigured';
 				return -5;
 			}
 
 			$result = check_value($mask, $code);
-			if (is_string($result))
-			{
+			if (is_string($result)) {
 				$this->error = $result;
 				return -5;
 			}
@@ -314,13 +315,13 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		// phpcs:enable
 		$sql = "SELECT ref FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE ref = '".$db->escape($code)."'";
-		if ($product->id > 0) $sql .= " AND rowid <> ".$product->id;
+		if ($product->id > 0) {
+			$sql .= " AND rowid <> ".$product->id;
+		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
+		if ($resql) {
+			if ($db->num_rows($resql) == 0) {
 				return 0;
 			} else {
 				return -1;
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index 49a3e65f9b0..f7578d696f6 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -131,11 +131,9 @@ class mod_codeproduct_leopard extends ModeleProductCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-		{
+		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 			$result = 0;
-		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
-		{
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))) {
 			$result = -2;
 		}
 
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index bfd35e70095..960bf21ef69 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -37,16 +37,36 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (!empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (!empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (!empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+}
+if (!empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+}
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+}
+if (!empty($conf->contrat->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+}
+if (!empty($conf->ficheinter->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+}
+if (!empty($conf->deplacement->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+}
+if (!empty($conf->agenda->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+}
 
 
 /**
@@ -113,7 +133,9 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->pays_code) $this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+		if (!$this->emetteur->pays_code) {
+			$this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+		}
 	}
 
 
@@ -400,17 +422,19 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PROJECT_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -429,8 +453,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->PROJECT_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->PROJECT_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= $nbofiles;
@@ -438,14 +461,13 @@ class doc_generic_project_odt extends ModelePDFProjects
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
-   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=projects/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=projects/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
 		}
 
 		$texte .= '</td>';
@@ -475,38 +497,35 @@ class doc_generic_project_odt extends ModelePDFProjects
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output)
-		{
+		if ($conf->projet->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Project($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -516,20 +535,19 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 			$dir = $conf->projet->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -539,10 +557,11 @@ class doc_generic_project_odt extends ModelePDFProjects
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -558,16 +577,14 @@ class doc_generic_project_odt extends ModelePDFProjects
 				// If PROJECTLEADER contact defined on project, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'PROJECTLEADER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
+				if (!empty($usecontact)) {
 					// if we have a PROJECTLEADER contact and we dont use it as recipient we store the contact object for later use
 					$contactobject = $object->contact;
 				}
@@ -618,7 +635,9 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_project_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_project_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_project_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_project_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -627,19 +646,19 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -652,24 +671,22 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 					// Security check
 					$socid = 0;
-					if (!empty($object->fk_soc)) $socid = $object->fk_soc;
+					if (!empty($object->fk_soc)) {
+						$socid = $object->fk_soc;
+					}
 
 					$tasksarray = $taskstatic->getTasksArray(0, 0, $object->id, $socid, 0);
 
 
-					foreach ($tasksarray as $task)
-					{
+					foreach ($tasksarray as $task) {
 						$tmparray = $this->get_substitutionarray_tasks($task, $outputlangs);
 						//complete_substitutions_array($tmparray, $outputlangs, $object, $task, "completesubstitutionarray_lines");
-						foreach ($tmparray as $key => $val)
-						{
+						foreach ($tmparray as $key => $val) {
 							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							} catch (OdfException $e)
-							{
+							} catch (OdfException $e) {
 								dol_syslog($e->getMessage(), LOG_INFO);
-							} catch (SegmentException $e)
-							{
+							} catch (SegmentException $e) {
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
 						}
@@ -682,17 +699,14 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$contact_arrray = array();
 						foreach ($sourcearray as $source) {
 							$contact_temp = $taskobj->liste_contact(-1, $source);
-							if ((is_array($contact_temp) && count($contact_temp) > 0))
-							{
+							if ((is_array($contact_temp) && count($contact_temp) > 0)) {
 								$contact_arrray = array_merge($contact_arrray, $contact_temp);
 							}
 						}
-						if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-						{
+						if ((is_array($contact_arrray) && count($contact_arrray) > 0)) {
 							$listlinestaskres = $listlines->__get('tasksressources');
 
-							foreach ($contact_arrray as $contact)
-							{
+							foreach ($contact_arrray as $contact) {
 								if ($contact['source'] == 'internal') {
 									$objectdetail = new User($this->db);
 									$objectdetail->fetch($contact['id']);
@@ -709,15 +723,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 								$tmparray = $this->get_substitutionarray_tasksressource($contact, $outputlangs);
 
-								foreach ($tmparray as $key => $val)
-								{
+								foreach ($tmparray as $key => $val) {
 									try {
 										$listlinestaskres->setVars($key, $val, true, 'UTF-8');
-									} catch (OdfException $e)
-									{
+									} catch (OdfException $e) {
 										dol_syslog($e->getMessage(), LOG_INFO);
-									} catch (SegmentException $e)
-									{
+									} catch (SegmentException $e) {
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
 								}
@@ -735,8 +746,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$sql .= " ORDER BY t.task_date DESC";
 
 						$resql = $this->db->query($sql);
-						if ($resql)
-						{
+						if ($resql) {
 							$num = $this->db->num_rows($resql);
 							$i = 0;
 							$tasks = array();
@@ -756,22 +766,18 @@ class doc_generic_project_odt extends ModelePDFProjects
 								$row['amountttc'] = '';
 								$row['thm'] = '';
 								$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
-								foreach ($tmparray as $key => $val)
-								{
+								foreach ($tmparray as $key => $val) {
 									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									} catch (OdfException $e)
-									{
+									} catch (OdfException $e) {
 										dol_syslog($e->getMessage(), LOG_INFO);
-									} catch (SegmentException $e)
-									{
+									} catch (SegmentException $e) {
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
 								}
 								$listlinestasktime->merge();
 							}
-							while ($i < $num)
-							{
+							while ($i < $num) {
 								$row = $this->db->fetch_array($resql);
 								if (!empty($row['fk_user'])) {
 									$objectdetail = new User($this->db);
@@ -793,15 +799,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 								$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
 
-								foreach ($tmparray as $key => $val)
-								{
+								foreach ($tmparray as $key => $val) {
 									try {
 										$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-									} catch (OdfException $e)
-									{
+									} catch (OdfException $e) {
 										dol_syslog($e->getMessage(), LOG_INFO);
-									} catch (SegmentException $e)
-									{
+									} catch (SegmentException $e) {
 										dol_syslog($e->getMessage(), LOG_INFO);
 									}
 								}
@@ -819,19 +822,15 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
-						foreach ($filearray as $filedetail)
-						{
+						foreach ($filearray as $filedetail) {
 							$tmparray = $this->get_substitutionarray_task_file($filedetail, $outputlangs);
 							//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -840,12 +839,10 @@ class doc_generic_project_odt extends ModelePDFProjects
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$ExceptionTrace = $e->getTrace();
 					// no segment defined on ODT is not an error
-					if ($ExceptionTrace[0]['function'] != 'setSegment')
-					{
+					if ($ExceptionTrace[0]['function'] != 'setSegment') {
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 						return -1;
@@ -859,28 +856,23 @@ class doc_generic_project_odt extends ModelePDFProjects
 					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
 					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
-					foreach ($filearray as $filedetail)
-					{
+					foreach ($filearray as $filedetail) {
 						//dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
 						$tmparray = $this->get_substitutionarray_project_file($filedetail, $outputlangs);
 
-						foreach ($tmparray as $key => $val)
-						{
+						foreach ($tmparray as $key => $val) {
 							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							} catch (OdfException $e)
-							{
+							} catch (OdfException $e) {
 								dol_syslog($e->getMessage(), LOG_INFO);
-							} catch (SegmentException $e)
-							{
+							} catch (SegmentException $e) {
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
 						}
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -891,18 +883,15 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$contact_arrray = array();
 				foreach ($sourcearray as $source) {
 					$contact_temp = $object->liste_contact(-1, $source);
-					if ((is_array($contact_temp) && count($contact_temp) > 0))
-					{
+					if ((is_array($contact_temp) && count($contact_temp) > 0)) {
 						$contact_arrray = array_merge($contact_arrray, $contact_temp);
 					}
 				}
-				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-				{
+				if ((is_array($contact_arrray) && count($contact_arrray) > 0)) {
 					try {
 						$listlines = $odfHandler->setSegment('projectcontacts');
 
-						foreach ($contact_arrray as $contact)
-						{
+						foreach ($contact_arrray as $contact) {
 							if ($contact['source'] == 'internal') {
 								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
@@ -918,23 +907,19 @@ class doc_generic_project_odt extends ModelePDFProjects
 							$contact['fullname'] = $objectdetail->getFullName($outputlangs, 1);
 
 							$tmparray = $this->get_substitutionarray_project_contacts($contact, $outputlangs);
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 						return -1;
@@ -1057,22 +1042,18 @@ class doc_generic_project_odt extends ModelePDFProjects
 				try {
 					$listlines = $odfHandler->setSegment('projectrefs');
 
-					foreach ($listofreferent as $keyref => $valueref)
-					{
+					foreach ($listofreferent as $keyref => $valueref) {
 						$title = $valueref['title'];
 						$tablename = $valueref['table'];
 						$classname = $valueref['class'];
 						$qualified = $valueref['test'];
-						if ($qualified)
-						{
+						if ($qualified) {
 							$elementarray = $object->get_element_list($keyref, $tablename);
-							if (count($elementarray) > 0 && is_array($elementarray))
-							{
+							if (count($elementarray) > 0 && is_array($elementarray)) {
 								$total_ht = 0;
 								$total_ttc = 0;
 								$num = count($elementarray);
-								for ($i = 0; $i < $num; $i++)
-								{
+								for ($i = 0; $i < $num; $i++) {
 									$ref_array = array();
 									$ref_array['type'] = $langs->trans($classname);
 
@@ -1085,8 +1066,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 									//Date object
 									$dateref = $element->date;
-									if (empty($dateref)) $dateref = $element->datep;
-									if (empty($dateref)) $dateref = $element->date_contrat;
+									if (empty($dateref)) {
+										$dateref = $element->datep;
+									}
+									if (empty($dateref)) {
+										$dateref = $element->date_contrat;
+									}
 									$ref_array['date'] = $dateref;
 
 									//Soc object
@@ -1114,15 +1099,12 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 									$tmparray = $this->get_substitutionarray_project_reference($ref_array, $outputlangs);
 
-									foreach ($tmparray as $key => $val)
-									{
+									foreach ($tmparray as $key => $val) {
 										try {
 											$listlines->setVars($key, $val, true, 'UTF-8');
-										} catch (OdfException $e)
-										{
+										} catch (OdfException $e) {
 											dol_syslog($e->getMessage(), LOG_INFO);
-										} catch (SegmentException $e)
-										{
+										} catch (SegmentException $e) {
 											dol_syslog($e->getMessage(), LOG_INFO);
 										}
 									}
@@ -1140,8 +1122,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e) {
@@ -1174,8 +1155,9 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 431e7b6e85c..446de761418 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -150,7 +150,9 @@ class pdf_baleine extends ModelePDFProjects
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define position of columns
 		$this->posxref = $this->marge_gauche + 1;
@@ -159,8 +161,7 @@ class pdf_baleine extends ModelePDFProjects
 		$this->posxprogress = $this->marge_gauche + 137;
 		$this->posxdatestart = $this->marge_gauche + 147;
 		$this->posxdateend = $this->marge_gauche + 169;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxref -= 20;
 			$this->posxlabel -= 20;
 			$this->posxworkload -= 20;
@@ -184,36 +185,37 @@ class pdf_baleine extends ModelePDFProjects
 		// phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output)
-		{
+		if ($conf->projet->dir_output) {
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
 			$objectref = dol_sanitizeFileName($object->ref);
 			$dir = $conf->projet->dir_output;
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".pdf";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -230,17 +232,17 @@ class pdf_baleine extends ModelePDFProjects
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -249,8 +251,7 @@ class pdf_baleine extends ModelePDFProjects
 				$task = new Task($this->db);
 				$tasksarray = $task->getTasksArray(0, 0, $object->id);
 
-				if (!$object->id > 0)  // Special case when used with object = specimen, we may return all lines
-				{
+				if (!$object->id > 0) {  // Special case when used with object = specimen, we may return all lines
 					$tasksarray = array_slice($tasksarray, 0, min(5, count($tasksarray)));
 				}
 
@@ -266,13 +267,17 @@ class pdf_baleine extends ModelePDFProjects
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Project"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -286,8 +291,7 @@ class pdf_baleine extends ModelePDFProjects
 
 				// Show public note
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
@@ -316,8 +320,7 @@ class pdf_baleine extends ModelePDFProjects
 				$nexY = $tab_top + $heightoftitleline + 1;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
@@ -341,8 +344,7 @@ class pdf_baleine extends ModelePDFProjects
 					$pdf->SetXY($this->posxlabel, $curY);
 					$pdf->MultiCell($this->posxworkload - $this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -353,33 +355,40 @@ class pdf_baleine extends ModelePDFProjects
 						$pdf->MultiCell($this->posxworkload - $this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 
 							$forcedesconsamepage = 1;
-							if ($forcedesconsamepage)
-							{
+							if ($forcedesconsamepage) {
 								$pdf->rollbackTransaction(true);
 								$pageposafter = $pageposbefore;
 								$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 								$pdf->MultiCell(0, 3, ''); // Set interline to 3
@@ -434,8 +443,7 @@ class pdf_baleine extends ModelePDFProjects
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdateend, 3, $dateend, 0, 'C');
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -446,11 +454,9 @@ class pdf_baleine extends ModelePDFProjects
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -459,12 +465,12 @@ class pdf_baleine extends ModelePDFProjects
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -472,21 +478,29 @@ class pdf_baleine extends ModelePDFProjects
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				}
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Footer of the page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -497,14 +511,14 @@ class pdf_baleine extends ModelePDFProjects
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -600,10 +614,8 @@ class pdf_baleine extends ModelePDFProjects
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($mysoc->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -612,7 +624,9 @@ class pdf_baleine extends ModelePDFProjects
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else {
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -629,8 +643,7 @@ class pdf_baleine extends ModelePDFProjects
 		$pdf->SetXY($posx, $posy);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : ".dol_print_date($object->date_end, 'day', false, $outputlangs, true), '', 'R');
 
-		if (is_object($object->thirdparty))
-		{
+		if (is_object($object->thirdparty)) {
 			$posy += 6;
 			$pdf->SetXY($posx, $posy);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : ".$object->thirdparty->getFullName($outputlangs), '', 'R');
@@ -642,25 +655,25 @@ class pdf_baleine extends ModelePDFProjects
 		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
 		$object->fetchObjectLinked();
 
-	    foreach($object->linkedObjects as $objecttype => $objects)
-	    {
-	        var_dump($objects);exit;
-	    	if ($objecttype == 'commande')
-	    	{
-	    		$outputlangs->load('orders');
-	    		$num=count($objects);
-	    		for ($i=0;$i<$num;$i++)
-	    		{
-	    			$posy+=4;
-	    			$pdf->SetXY($posx,$posy);
-	    			$pdf->SetFont('','', $default_font_size - 1);
-	    			$text=$objects[$i]->ref;
-	    			if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')';
-	    			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
-	    		}
-	    	}
-	    }
-        */
+		foreach($object->linkedObjects as $objecttype => $objects)
+		{
+			var_dump($objects);exit;
+			if ($objecttype == 'commande')
+			{
+				$outputlangs->load('orders');
+				$num=count($objects);
+				for ($i=0;$i<$num;$i++)
+				{
+					$posy+=4;
+					$pdf->SetXY($posx,$posy);
+					$pdf->SetFont('','', $default_font_size - 1);
+					$text=$objects[$i]->ref;
+					if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')';
+					$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
+				}
+			}
+		}
+		*/
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 80862ba32d8..dbb4e28d03a 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -178,7 +178,9 @@ class pdf_beluga extends ModelePDFProjects
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define position of columns
 		if ($this->orientation == 'L' || $this->orientation == 'Landscape') {
@@ -196,8 +198,7 @@ class pdf_beluga extends ModelePDFProjects
 			$this->posxamountttc = $this->marge_gauche + 135;
 			$this->posxstatut = $this->marge_gauche + 165;
 		}
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxref -= 20;
 			$this->posxdate -= 20;
 			$this->posxsociete -= 20;
@@ -223,36 +224,37 @@ class pdf_beluga extends ModelePDFProjects
 
 		$formproject = new FormProjets($this->db);
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output)
-		{
+		if ($conf->projet->dir_output) {
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
 			$objectref = dol_sanitizeFileName($object->ref);
 			$dir = $conf->projet->dir_output;
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".pdf";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -269,17 +271,17 @@ class pdf_beluga extends ModelePDFProjects
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -306,13 +308,17 @@ class pdf_beluga extends ModelePDFProjects
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Project"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage($this->orientation);
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -326,8 +332,7 @@ class pdf_beluga extends ModelePDFProjects
 
 				// Show public note
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
@@ -460,8 +465,7 @@ class pdf_beluga extends ModelePDFProjects
 					$listofreferent = array_merge($listofreferent, $hookmanager->resArray);
 				}
 
-				foreach ($listofreferent as $key => $value)
-				{
+				foreach ($listofreferent as $key => $value) {
 					$title = $value['title'];
 					$classname = $value['class'];
 					$tablename = $value['table'];
@@ -471,14 +475,15 @@ class pdf_beluga extends ModelePDFProjects
 					$projectField = isset($value['project_field']) ? $value['project_field'] : 'fk_projet';
 					$langs->load($langstoload);
 
-					if (!$qualified) continue;
+					if (!$qualified) {
+						continue;
+					}
 
 					//var_dump("$key, $tablename, $datefieldname, $dates, $datee");
 					$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, $projectField);
 
 					$num = count($elementarray);
-					if ($num >= 0)
-					{
+					if ($num >= 0) {
 						$nexY = $pdf->GetY() + 5;
 
 						$curY = $nexY;
@@ -497,7 +502,9 @@ class pdf_beluga extends ModelePDFProjects
 						$pdf->MultiCell($this->posxsociety - $this->posxdate, 3, $outputlangs->transnoentities("Date"), 1, 'C');
 						$pdf->SetXY($this->posxsociety, $curY);
 						$titlethirdparty = $outputlangs->transnoentities("ThirdParty");
-						if ($classname == 'ExpenseReport') $titlethirdparty = $langs->trans("User");
+						if ($classname == 'ExpenseReport') {
+							$titlethirdparty = $langs->trans("User");
+						}
 						$pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $titlethirdparty, 1, 'L');
 						if (empty($value['disableamount'])) {
 							$pdf->SetXY($this->posxamountht, $curY);
@@ -511,8 +518,7 @@ class pdf_beluga extends ModelePDFProjects
 						$pdf->SetXY($this->posxstatut, $curY);
 						$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxstatut, 3, $outputlangs->transnoentities("Status"), 1, 'R');
 
-						if (is_array($elementarray) && count($elementarray) > 0)
-						{
+						if (is_array($elementarray) && count($elementarray) > 0) {
 							$nexY = $pdf->GetY();
 
 							$total_ht = 0;
@@ -520,8 +526,7 @@ class pdf_beluga extends ModelePDFProjects
 							$num = count($elementarray);
 
 							// Loop on each lines
-							for ($i = 0; $i < $num; $i++)
-							{
+							for ($i = 0; $i < $num; $i++) {
 								$curY = $nexY;
 								$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 								$pdf->SetTextColor(0, 0, 0);
@@ -532,13 +537,12 @@ class pdf_beluga extends ModelePDFProjects
 
 								// Description of line
 								$idofelement = $elementarray[$i];
-							 	if ($classname == 'ExpenseReport')
-							   	{
-							   		// We get id of expense report
-							   		$expensereportline = new ExpenseReportLine($this->db);
-							   		$expensereportline->fetch($idofelement);
-							   		$idofelement = $expensereportline->fk_expensereport;
-							   	}
+								if ($classname == 'ExpenseReport') {
+									// We get id of expense report
+									$expensereportline = new ExpenseReportLine($this->db);
+									$expensereportline->fetch($idofelement);
+									$idofelement = $expensereportline->fk_expensereport;
+								}
 
 								$element = new $classname($this->db);
 								$element->fetch($idofelement);
@@ -547,8 +551,9 @@ class pdf_beluga extends ModelePDFProjects
 
 								$qualifiedfortotal = true;
 								if ($key == 'invoice') {
-									if ($element->close_code == 'replaced')
+									if ($element->close_code == 'replaced') {
 										$qualifiedfortotal = false; // Replacement invoice
+									}
 								}
 
 								$showpricebeforepagebreak = 1;
@@ -558,8 +563,7 @@ class pdf_beluga extends ModelePDFProjects
 								$pdf->SetXY($this->posxref, $curY);
 								$pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
 								$pageposafter = $pdf->getPage();
-								if ($pageposafter > $pageposbefore)	// There is a pagebreak
-								{
+								if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 									$pdf->rollbackTransaction(true);
 									$pageposafter = $pageposbefore;
 									//print $pageposafter.'-'.$pageposbefore;exit;
@@ -570,33 +574,40 @@ class pdf_beluga extends ModelePDFProjects
 									$pdf->MultiCell($this->posxdate - $this->posxref, 3, $element->ref, 1, 'L');
 									$pageposafter = $pdf->getPage();
 									$posyafter = $pdf->GetY();
-									if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-									{
-										if ($i == ($num - 1))	// No more lines, and no space left to show total, so we create a new page
-										{
+									if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+										if ($i == ($num - 1)) {	// No more lines, and no space left to show total, so we create a new page
 											$pdf->AddPage($this->orientation, '', true);
-											if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-											if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+											if (!empty($tplidx)) {
+												$pdf->useTemplate($tplidx);
+											}
+											if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+												$this->_pagehead($pdf, $object, 0, $outputlangs);
+											}
 											$pdf->setPage($pageposafter + 1);
 										}
 									} else {
 										// We found a page break
 
 										// Allows data in the first page if description is long enough to break in multiples pages
-										if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+										if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 											$showpricebeforepagebreak = 1;
-										else $showpricebeforepagebreak = 0;
+										} else {
+											$showpricebeforepagebreak = 0;
+										}
 
 										$forcedesconsamepage = 1;
-										if ($forcedesconsamepage)
-										{
+										if ($forcedesconsamepage) {
 											$pdf->rollbackTransaction(true);
 											$pageposafter = $pageposbefore;
 											$pdf->setPageOrientation($this->orientation, 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 											$pdf->AddPage($this->orientation, '', true);
-											if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-											if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+											if (!empty($tplidx)) {
+												$pdf->useTemplate($tplidx);
+											}
+											if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+												$this->_pagehead($pdf, $object, 0, $outputlangs);
+											}
 											$pdf->setPage($pageposafter + 1);
 											$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 											$pdf->MultiCell(0, 3, ''); // Set interline to 3
@@ -635,24 +646,26 @@ class pdf_beluga extends ModelePDFProjects
 								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 								// Date
-								if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order')
+								if ($tablename == 'commande_fournisseur' || $tablename == 'supplier_order') {
 									$date = $element->date_commande;
-								else {
+								} else {
 									$date = $element->date;
-									if (empty($date))
+									if (empty($date)) {
 										$date = $element->datep;
-									if (empty($date))
+									}
+									if (empty($date)) {
 										$date = $element->date_contrat;
-									if (empty($date))
+									}
+									if (empty($date)) {
 										$date = $element->datev; // Fiche inter
+									}
 								}
 
 								$pdf->SetXY($this->posxdate, $curY);
 								$pdf->MultiCell($this->posxsociety - $this->posxdate, 3, dol_print_date($date, 'day'), 1, 'C');
 
 								$pdf->SetXY($this->posxsociety, $curY);
-								if ($classname == 'ExpenseReport')
-								{
+								if ($classname == 'ExpenseReport') {
 									$fuser = new User($this->db);
 									$fuser->fetch($element->fk_user_author);
 									$pdf->MultiCell($this->posxamountht - $this->posxsociety, 3, $fuser->getFullName($outputlangs), 1, 'L');
@@ -668,8 +681,7 @@ class pdf_beluga extends ModelePDFProjects
 									$pdf->MultiCell($this->posxstatut - $this->posxamountttc, 3, (isset($element->total_ttc) ? price($element->total_ttc) : ''), 1, 'R');
 								} else {
 									$pdf->SetXY($this->posxamountht, $curY);
-									if ($key == 'agenda')
-									{
+									if ($key == 'agenda') {
 										$textforamount = dol_trunc($element->label, 26);
 										$pdf->MultiCell($this->posxstatut - $this->posxamountht, 3, $textforamount, 1, 'L');
 									} else {
@@ -714,20 +726,23 @@ class pdf_beluga extends ModelePDFProjects
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation($this->orientation, 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -738,14 +753,14 @@ class pdf_beluga extends ModelePDFProjects
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -839,10 +854,8 @@ class pdf_beluga extends ModelePDFProjects
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($mysoc->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -851,7 +864,9 @@ class pdf_beluga extends ModelePDFProjects
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else {
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -868,8 +883,7 @@ class pdf_beluga extends ModelePDFProjects
 		$pdf->SetXY($posx, $posy);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : ".dol_print_date($object->date_end, 'day', false, $outputlangs, true), '', 'R');
 
-		if (is_object($object->thirdparty))
-		{
+		if (is_object($object->thirdparty)) {
 			$posy += 6;
 			$pdf->SetXY($posx, $posy);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : ".$object->thirdparty->getFullName($outputlangs), '', 'R');
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index e6fe76cba16..b2d90af0da2 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -149,7 +149,9 @@ class pdf_timespent extends ModelePDFProjects
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define position of columns
 		$this->posxref = $this->marge_gauche + 1;
@@ -159,8 +161,7 @@ class pdf_timespent extends ModelePDFProjects
 		//$this->posxprogress=$this->marge_gauche+140;
 		$this->posxuser = $this->marge_gauche + 147;
 		//$this->posxdateend = $this->marge_gauche + 169;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxref -= 20;
 			$this->posxlabel -= 20;
 			$this->posxtimespent -= 20;
@@ -184,36 +185,37 @@ class pdf_timespent extends ModelePDFProjects
 		// phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output)
-		{
+		if ($conf->projet->dir_output) {
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
 			$objectref = dol_sanitizeFileName($object->ref);
 			$dir = $conf->projet->dir_output;
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".pdf";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -230,17 +232,17 @@ class pdf_timespent extends ModelePDFProjects
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -249,8 +251,7 @@ class pdf_timespent extends ModelePDFProjects
 				$task = new Task($this->db);
 				$tasksarray = $task->getTasksArray(0, 0, $object->id);
 
-				if (!$object->id > 0)  // Special case when used with object = specimen, we may return all lines
-				{
+				if (!$object->id > 0) {  // Special case when used with object = specimen, we may return all lines
 					$tasksarray = array_slice($tasksarray, 0, min(5, count($tasksarray)));
 				}
 
@@ -266,13 +267,17 @@ class pdf_timespent extends ModelePDFProjects
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Project"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -286,8 +291,7 @@ class pdf_timespent extends ModelePDFProjects
 
 				// Show public note
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
@@ -320,8 +324,7 @@ class pdf_timespent extends ModelePDFProjects
 				// TODO We should loop on record of times spent grouped by user instead of lines of tasks
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
@@ -345,8 +348,7 @@ class pdf_timespent extends ModelePDFProjects
 					$pdf->SetXY($this->posxlabel, $curY);
 					$pdf->MultiCell($this->posxtimespent - $this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -357,33 +359,40 @@ class pdf_timespent extends ModelePDFProjects
 						$pdf->MultiCell($this->posxtimespent - $this->posxlabel, 3, $outputlangs->convToOutputCharset($libelleline), 0, 'L');
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 
 							$forcedesconsamepage = 1;
-							if ($forcedesconsamepage)
-							{
+							if ($forcedesconsamepage) {
 								$pdf->rollbackTransaction(true);
 								$pageposafter = $pageposbefore;
 								$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 								$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 								$pdf->MultiCell(0, 3, ''); // Set interline to 3
@@ -439,8 +448,7 @@ class pdf_timespent extends ModelePDFProjects
 					*/
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -451,11 +459,9 @@ class pdf_timespent extends ModelePDFProjects
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -464,12 +470,12 @@ class pdf_timespent extends ModelePDFProjects
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -477,21 +483,29 @@ class pdf_timespent extends ModelePDFProjects
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+				}
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
 				// Footer of the page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -502,14 +516,14 @@ class pdf_timespent extends ModelePDFProjects
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -600,10 +614,8 @@ class pdf_timespent extends ModelePDFProjects
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($mysoc->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -612,7 +624,9 @@ class pdf_timespent extends ModelePDFProjects
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
-		} else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		} else {
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+		}
 
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 		$pdf->SetXY($posx, $posy);
@@ -629,8 +643,7 @@ class pdf_timespent extends ModelePDFProjects
 		$pdf->SetXY($posx, $posy);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : ".dol_print_date($object->date_end, 'day', false, $outputlangs, true), '', 'R');
 
-		if (is_object($object->thirdparty))
-		{
+		if (is_object($object->thirdparty)) {
 			$posy += 6;
 			$pdf->SetXY($posx, $posy);
 			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("ThirdParty")." : ".$object->thirdparty->getFullName($outputlangs), '', 'R');
@@ -642,25 +655,25 @@ class pdf_timespent extends ModelePDFProjects
 		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
 		$object->fetchObjectLinked();
 
-	    foreach($object->linkedObjects as $objecttype => $objects)
-	    {
-	        var_dump($objects);exit;
-	    	if ($objecttype == 'commande')
-	    	{
-	    		$outputlangs->load('orders');
-	    		$num=count($objects);
-	    		for ($i=0;$i<$num;$i++)
-	    		{
-	    			$posy+=4;
-	    			$pdf->SetXY($posx,$posy);
-	    			$pdf->SetFont('','', $default_font_size - 1);
-	    			$text=$objects[$i]->ref;
-	    			if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')';
-	    			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
-	    		}
-	    	}
-	    }
-        */
+		foreach($object->linkedObjects as $objecttype => $objects)
+		{
+			var_dump($objects);exit;
+			if ($objecttype == 'commande')
+			{
+				$outputlangs->load('orders');
+				$num=count($objects);
+				for ($i=0;$i<$num;$i++)
+				{
+					$posy+=4;
+					$pdf->SetXY($posx,$posy);
+					$pdf->SetFont('','', $default_font_size - 1);
+					$text=$objects[$i]->ref;
+					if ($objects[$i]->ref_client) $text.=' ('.$objects[$i]->ref_client.')';
+					$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), '', 'R');
+				}
+			}
+		}
+		*/
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 0c77ccc198d..1fb88f5454c 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -65,7 +65,7 @@ class mod_project_simple extends ModeleNumRefProjects
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -98,13 +98,13 @@ class mod_project_simple extends ModeleNumRefProjects
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			return true;
 		} else {
 			$langs->load("errors");
@@ -133,11 +133,13 @@ class mod_project_simple extends ModeleNumRefProjects
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_project_simple::getNextValue", LOG_DEBUG);
 			return -1;
@@ -148,8 +150,11 @@ class mod_project_simple extends ModeleNumRefProjects
 		//$yymm = strftime("%y%m",time());
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_project_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index 7c7ed786d92..3ab4079c1b7 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -109,8 +109,7 @@ class mod_project_universal extends ModeleNumRefProjects
 		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -132,8 +131,7 @@ class mod_project_universal extends ModeleNumRefProjects
 		// On defini critere recherche compteur
 		$mask = $conf->global->PROJECT_UNIVERSAL_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php
index c2d546348ff..dc3f19d72fd 100644
--- a/htdocs/core/modules/project/modules_project.php
+++ b/htdocs/core/modules/project/modules_project.php
@@ -195,10 +195,16 @@ abstract class ModeleNumRefProjects
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
-		else return $langs->trans("NotAvailable");
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		} else {
+			return $langs->trans("NotAvailable");
+		}
 	}
 }
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index 4ff95328029..3f321c6f022 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -38,16 +38,36 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->propal->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-if (!empty($conf->facture->enabled))     require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
-if (!empty($conf->commande->enabled))    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (!empty($conf->fournisseur->enabled)) require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->contrat->enabled))     require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->ficheinter->enabled))  require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (!empty($conf->deplacement->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
-if (!empty($conf->agenda->enabled))      require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+}
+if (!empty($conf->facture->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+}
+if (!empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (!empty($conf->fournisseur->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+}
+if (!empty($conf->fournisseur->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+}
+if (!empty($conf->contrat->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+}
+if (!empty($conf->ficheinter->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+}
+if (!empty($conf->deplacement->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
+}
+if (!empty($conf->agenda->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+}
 
 
 /**
@@ -114,7 +134,9 @@ class doc_generic_task_odt extends ModelePDFTask
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->pays_code) $this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+		if (!$this->emetteur->pays_code) {
+			$this->emetteur->pays_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+		}
 	}
 
 
@@ -148,8 +170,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 
 		// Retrieve extrafields
-		if (is_array($object->array_options) && count($object->array_options))
-		{
+		if (is_array($object->array_options) && count($object->array_options)) {
 			$object->fetch_optionals();
 
 			$resarray = $this->fill_substitutionarray_with_extrafields($object, $resarray, $extrafields, $array_key, $outputlangs);
@@ -193,8 +214,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		);
 
 		// Retrieve extrafields
-		if (is_array($task->array_options) && count($task->array_options))
-		{
+		if (is_array($task->array_options) && count($task->array_options)) {
 			$task->fetch_optionals();
 
 			$resarray = $this->fill_substitutionarray_with_extrafields($task, $resarray, $extrafields, $array_key, $outputlangs);
@@ -369,17 +389,19 @@ class doc_generic_task_odt extends ModelePDFTask
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -398,8 +420,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= $nbofiles;
@@ -407,14 +428,13 @@ class doc_generic_task_odt extends ModelePDFTask
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
-   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=tasks/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=tasks/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
 		}
 
 		$texte .= '</td>';
@@ -444,29 +464,27 @@ class doc_generic_task_odt extends ModelePDFTask
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output)
-		{
+		if ($conf->projet->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Task($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -477,21 +495,20 @@ class doc_generic_task_odt extends ModelePDFTask
 
 			$dir = $conf->projet->dir_output."/".$project->ref."/";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.(ods|odt)/i', '', $newfile);
@@ -531,8 +548,7 @@ class doc_generic_task_odt extends ModelePDFTask
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					return -1;
 				}
@@ -555,13 +571,14 @@ class doc_generic_task_odt extends ModelePDFTask
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -575,12 +592,13 @@ class doc_generic_task_odt extends ModelePDFTask
 				try {
 					// Security check
 					$socid = 0;
-					if (!empty($project->fk_soc)) $socid = $project->fk_soc;
+					if (!empty($project->fk_soc)) {
+						$socid = $project->fk_soc;
+					}
 
 					$tmparray = $this->get_substitutionarray_tasks($object, $outputlangs);
 					complete_substitutions_array($tmparray, $outputlangs, $object);
-					foreach ($tmparray as $key => $val)
-					{
+					foreach ($tmparray as $key => $val) {
 						try {
 							$odfHandler->setVars($key, $val, true, 'UTF-8');
 						} catch (OdfException $e) {
@@ -595,17 +613,14 @@ class doc_generic_task_odt extends ModelePDFTask
 					$contact_arrray = array();
 					foreach ($sourcearray as $source) {
 						$contact_temp = $object->liste_contact(-1, $source);
-						if ((is_array($contact_temp) && count($contact_temp) > 0))
-						{
+						if ((is_array($contact_temp) && count($contact_temp) > 0)) {
 							$contact_arrray = array_merge($contact_arrray, $contact_temp);
 						}
 					}
-					if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-					{
+					if ((is_array($contact_arrray) && count($contact_arrray) > 0)) {
 						$listlinestaskres = $odfHandler->setSegment('tasksressources');
 
-						foreach ($contact_arrray as $contact)
-						{
+						foreach ($contact_arrray as $contact) {
 							if ($contact['source'] == 'internal') {
 								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
@@ -622,8 +637,7 @@ class doc_generic_task_odt extends ModelePDFTask
 
 							$tmparray = $this->get_substitutionarray_tasksressource($contact, $outputlangs);
 
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlinestaskres->setVars($key, $val, true, 'UTF-8');
 								} catch (OdfException $e) {
@@ -647,14 +661,12 @@ class doc_generic_task_odt extends ModelePDFTask
 					$sql .= " ORDER BY t.task_date DESC";
 
 					$resql = $this->db->query($sql);
-					if ($resql)
-					{
+					if ($resql) {
 						$num = $this->db->num_rows($resql);
 						$i = 0;
 						$tasks = array();
 						$listlinestasktime = $odfHandler->setSegment('taskstimes');
-						while ($i < $num)
-						{
+						while ($i < $num) {
 							$row = $this->db->fetch_array($resql);
 							if (!empty($row['fk_user'])) {
 								$objectdetail = new User($this->db);
@@ -667,15 +679,12 @@ class doc_generic_task_odt extends ModelePDFTask
 
 							$tmparray = $this->get_substitutionarray_taskstime($row, $outputlangs);
 
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlinestasktime->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -695,19 +704,15 @@ class doc_generic_task_odt extends ModelePDFTask
 					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
-					foreach ($filearray as $filedetail)
-					{
+					foreach ($filearray as $filedetail) {
 						$tmparray = $this->get_substitutionarray_task_file($filedetail, $outputlangs);
 						//dol_syslog(get_class($this).'::main $tmparray'.var_export($tmparray,true));
-						foreach ($tmparray as $key => $val)
-						{
+						foreach ($tmparray as $key => $val) {
 							try {
 								$listtasksfiles->setVars($key, $val, true, 'UTF-8');
-							} catch (OdfException $e)
-							{
+							} catch (OdfException $e) {
 								dol_syslog($e->getMessage(), LOG_INFO);
-							} catch (SegmentException $e)
-							{
+							} catch (SegmentException $e) {
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
 						}
@@ -716,8 +721,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					//$listlines->merge();
 
 					$odfHandler->mergeSegment($listtasksfiles);
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -733,28 +737,23 @@ class doc_generic_task_odt extends ModelePDFTask
 					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
-					foreach ($filearray as $filedetail)
-					{
+					foreach ($filearray as $filedetail) {
 						//dol_syslog(get_class($this).'::main $filedetail'.var_export($filedetail,true));
 						$tmparray = $this->get_substitutionarray_project_file($filedetail, $outputlangs);
 
-						foreach ($tmparray as $key => $val)
-						{
+						foreach ($tmparray as $key => $val) {
 							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
-							} catch (OdfException $e)
-							{
+							} catch (OdfException $e) {
 								dol_syslog($e->getMessage(), LOG_INFO);
-							} catch (SegmentException $e)
-							{
+							} catch (SegmentException $e) {
 								dol_syslog($e->getMessage(), LOG_INFO);
 							}
 						}
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -765,18 +764,15 @@ class doc_generic_task_odt extends ModelePDFTask
 				$contact_arrray = array();
 				foreach ($sourcearray as $source) {
 					$contact_temp = $project->liste_contact(-1, $source);
-					if ((is_array($contact_temp) && count($contact_temp) > 0))
-					{
+					if ((is_array($contact_temp) && count($contact_temp) > 0)) {
 						$contact_arrray = array_merge($contact_arrray, $contact_temp);
 					}
 				}
-				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-				{
+				if ((is_array($contact_arrray) && count($contact_arrray) > 0)) {
 					try {
 						$listlines = $odfHandler->setSegment('projectcontacts');
 
-						foreach ($contact_arrray as $contact)
-						{
+						foreach ($contact_arrray as $contact) {
 							if ($contact['source'] == 'internal') {
 								$objectdetail = new User($this->db);
 								$objectdetail->fetch($contact['id']);
@@ -793,23 +789,19 @@ class doc_generic_task_odt extends ModelePDFTask
 
 							$tmparray = $this->get_substitutionarray_project_contacts($contact, $outputlangs);
 
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 						return -1;
@@ -843,8 +835,9 @@ class doc_generic_task_odt extends ModelePDFTask
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index 1451ce26412..654da5fff23 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -65,7 +65,7 @@ class mod_task_simple extends ModeleNumRefTask
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -99,13 +99,13 @@ class mod_task_simple extends ModeleNumRefTask
 		$sql .= " AND task.ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND project.entity = ".$conf->entity;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			return true;
 		} else {
 			$langs->load("errors");
@@ -133,11 +133,13 @@ class mod_task_simple extends ModeleNumRefTask
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_task_simple::getNextValue", LOG_DEBUG);
 			return -1;
@@ -148,8 +150,11 @@ class mod_task_simple extends ModeleNumRefTask
 		//$yymm = strftime("%y%m",time());
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_task_simple::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php
index 9addc4bc56e..09ba33332f1 100644
--- a/htdocs/core/modules/project/task/modules_task.php
+++ b/htdocs/core/modules/project/task/modules_task.php
@@ -141,9 +141,15 @@ abstract class ModeleNumRefTask
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index caaa92f8238..0ac3bc5e35d 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -95,7 +95,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -119,8 +121,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="PROPALE_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
+		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
 			$texte .= '<input type="hidden" name="param2" value="PROPALE_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="PROPALE_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="PROPALE_ADDON_PDF_ODT_CLOSED">';
@@ -132,17 +133,19 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->PROPALE_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -161,8 +164,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->PROPALE_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->PROPALE_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -170,18 +172,16 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
 				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=proposals/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+			}
+			$texte .= '</div>';
 
-   			// Set default template for different status of proposal
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-			{
+			// Set default template for different status of proposal
+			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
 				// Model for creation
 				$list = ModelePDFPropales::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
@@ -240,38 +240,35 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->propal->multidir_output[$conf->entity])
-		{
+		if ($conf->propal->multidir_output[$conf->entity]) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Propal($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -281,20 +278,19 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 			$dir = $conf->propal->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -305,10 +301,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -325,16 +322,14 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				// If CUSTOMER contact defined on proposal, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
+				if (!empty($usecontact)) {
 					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
@@ -361,8 +356,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'PROPOSAL_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -378,8 +372,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -395,8 +388,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
@@ -410,7 +402,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -419,19 +413,19 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -440,32 +434,26 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
+					if ($foundtagforlines) {
 						$linenumber = 0;
-						foreach ($object->lines as $line)
-						{
+						foreach ($object->lines as $line) {
 							$linenumber++;
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -473,8 +461,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -482,12 +469,10 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -517,8 +502,9 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index be0d044ac25..227b192a85d 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -162,12 +162,13 @@ class pdf_azur extends ModelePDFPropales
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->posxtva = 101;
 			$this->posxup = 118;
 			$this->posxqty = 135;
@@ -180,10 +181,11 @@ class pdf_azur extends ModelePDFPropales
 		}
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva = $this->posxup;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->posxtva = $this->posxup;
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
@@ -217,9 +219,13 @@ class pdf_azur extends ModelePDFPropales
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "propal", "products"));
@@ -228,18 +234,17 @@ class pdf_azur extends ModelePDFPropales
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE)) {
 			$objphoto = new Product($this->db);
 
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				} else {
@@ -248,21 +253,16 @@ class pdf_azur extends ModelePDFPropales
 				}
 
 				$arephoto = false;
-				foreach ($pdir as $midir)
-				{
-					if (!$arephoto)
-					{
+				foreach ($pdir as $midir) {
+					if (!$arephoto) {
 						if ($conf->product->entity != $objphoto->entity) {
 							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
 						} else {
 							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
 						}
-						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-						{
-							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-							{
-								if ($obj['photo_vignette'])
-								{
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+								if ($obj['photo_vignette']) {
 									$filename = $obj['photo_vignette'];
 								} else {
 									$filename = $obj['photo'];
@@ -277,21 +277,23 @@ class pdf_azur extends ModelePDFPropales
 					}
 				}
 
-				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+				if ($realpath && $arephoto) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxtva;
+		}
 
-		if ($conf->propal->multidir_output[$conf->entity])
-		{
+		if ($conf->propal->multidir_output[$conf->entity]) {
 			$object->fetch_thirdparty();
 
 			$deja_regle = 0;
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -300,20 +302,16 @@ class pdf_azur extends ModelePDFPropales
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -327,15 +325,13 @@ class pdf_azur extends ModelePDFPropales
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -349,20 +345,19 @@ class pdf_azur extends ModelePDFPropales
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Positionne $this->atleastonediscount si on a au moins une remise
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
-				if (empty($this->atleastonediscount))
-				{
+				if (empty($this->atleastonediscount)) {
 					$delta = ($this->postotalht - $this->posxdiscount);
 					$this->posxpicture += $delta;
 					$this->posxtva += $delta;
@@ -375,14 +370,18 @@ class pdf_azur extends ModelePDFPropales
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
 				$heightforsignature = empty($conf->global->PROPAL_DISABLE_SIGNATURE) ? (pdfGetHeightForHtmlContent($pdf, $outputlangs->transnoentities("ProposalCustomerSignature")) + 10) : 0;
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				//print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
@@ -395,11 +394,9 @@ class pdf_azur extends ModelePDFPropales
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -417,15 +414,15 @@ class pdf_azur extends ModelePDFPropales
 
 				// Affiche notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 				// Extrafields in note
@@ -433,16 +430,18 @@ class pdf_azur extends ModelePDFPropales
 				if (!empty($extranote)) {
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
-				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
-				{
+				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0) {
 					$tmpuser = new User($this->db);
 					$tmpuser->fetch($object->user_author_id);
 					$notetoshow .= $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-					if ($tmpuser->email) $notetoshow .= ',  Mail: '.$tmpuser->email;
-					if ($tmpuser->office_phone) $notetoshow .= ', Tel: '.$tmpuser->office_phone;
+					if ($tmpuser->email) {
+						$notetoshow .= ',  Mail: '.$tmpuser->email;
+					}
+					if ($tmpuser->office_phone) {
+						$notetoshow .= ', Tel: '.$tmpuser->office_phone;
+					}
 				}
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_top -= 2;
 
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
@@ -467,15 +466,16 @@ class pdf_azur extends ModelePDFPropales
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -486,23 +486,27 @@ class pdf_azur extends ModelePDFPropales
 					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 						$pdf->AddPage('', '', true);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
 
 						// Allows data in the first page if description is long enough to break in multiples pages
-						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 							$showpricebeforepagebreak = 1;
-						else $showpricebeforepagebreak = 0;
+						} else {
+							$showpricebeforepagebreak = 0;
+						}
 					}
 
-					if (isset($imglinesize['width']) && isset($imglinesize['height']))
-					{
+					if (isset($imglinesize['width']) && isset($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
 						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
@@ -515,8 +519,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->startTransaction();
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -526,22 +529,26 @@ class pdf_azur extends ModelePDFPropales
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -564,8 +571,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-					{
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva - 5, $curY);
 						$pdf->MultiCell($this->posxup - $this->posxtva + 4, 3, $vat_rate, 0, 'R');
@@ -582,8 +588,7 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS))
-					{
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -591,8 +596,7 @@ class pdf_azur extends ModelePDFPropales
 
 					// Discount on line
 					$pdf->SetXY($this->posxdiscount, $curY);
-					if ($object->lines[$i]->remise_percent)
-					{
+					if ($object->lines[$i]->remise_percent) {
 						$pdf->SetXY($this->posxdiscount - 2, $curY);
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht - $this->posxdiscount + 2, 3, $remise_percent, 0, 'R');
@@ -604,8 +608,11 @@ class pdf_azur extends ModelePDFPropales
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
@@ -614,36 +621,48 @@ class pdf_azur extends ModelePDFPropales
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
+					if ($localtax1_type && $localtax1ligne != 0) {
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate]))				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) {
+						$nexY = $posYAfterImage;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -654,11 +673,9 @@ class pdf_azur extends ModelePDFPropales
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -667,12 +684,12 @@ class pdf_azur extends ModelePDFPropales
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -680,15 +697,18 @@ class pdf_azur extends ModelePDFPropales
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				} else {
@@ -711,18 +731,18 @@ class pdf_azur extends ModelePDFPropales
 				*/
 
 				// Customer signature area
-				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
-				{
+				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE)) {
 					$posy = $this->_signature_area($pdf, $object, $posy, $outputlangs);
 				}
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				//If propal merge product PDF is active
-				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
-				{
+				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
 					require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
 
 					$already_merged = array();
@@ -752,8 +772,7 @@ class pdf_azur extends ModelePDFPropales
 							if (count($filetomerge->lines) > 0) {
 								foreach ($filetomerge->lines as $linefile) {
 									if (!empty($linefile->id) && !empty($linefile->file_name)) {
-										if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-										{
+										if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											} elseif (!empty($conf->service->enabled)) {
@@ -799,14 +818,14 @@ class pdf_azur extends ModelePDFPropales
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -857,8 +876,7 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
-		{
+		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@@ -869,8 +887,7 @@ class pdf_azur extends ModelePDFPropales
 		$posxval = 52;
 
 		// Show shipping date
-		if (!empty($object->delivery_date))
-		{
+		if (!empty($object->delivery_date)) {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -882,8 +899,7 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
-		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
-		{
+		} elseif ($object->availability_code || $object->availability) {    // Show availability conditions
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
@@ -899,8 +915,7 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		// Show payments conditions
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && ($object->cond_reglement_code || $object->cond_reglement))
-		{
+		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && ($object->cond_reglement_code || $object->cond_reglement)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -915,8 +930,7 @@ class pdf_azur extends ModelePDFPropales
 			$posy = $pdf->GetY() + 3;
 		}
 
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTMODE))
-		{
+		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTMODE)) {
 			// Check a payment mode is defined
 			/* Not required on a proposal
 			if (empty($object->mode_reglement_code)
@@ -936,8 +950,7 @@ class pdf_azur extends ModelePDFPropales
 			// Show payment mode
 			if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR')
-			{
+			&& $object->mode_reglement_code != 'VIR') {
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
@@ -951,15 +964,12 @@ class pdf_azur extends ModelePDFPropales
 			}
 
 			// Show payment mode CHQ
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-			{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// Si mode reglement non force ou si force a CHQ
-				if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-				{
+				if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
 					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
 						$account = new Account($this->db);
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
@@ -968,23 +978,20 @@ class pdf_azur extends ModelePDFPropales
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
-					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -995,12 +1002,12 @@ class pdf_azur extends ModelePDFPropales
 			}
 
 			// If payment mode not forced or forced to VIR, show payment with BAN
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-			{
-				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
-				{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER)) {
 					$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					if (!empty($object->fk_bank)) {
+						$bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					}
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
@@ -1041,8 +1048,7 @@ class pdf_azur extends ModelePDFPropales
 
 		// Total table
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -1065,32 +1071,28 @@ class pdf_azur extends ModelePDFPropales
 		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1103,18 +1105,17 @@ class pdf_azur extends ModelePDFPropales
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 
@@ -1123,8 +1124,7 @@ class pdf_azur extends ModelePDFPropales
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1139,18 +1139,15 @@ class pdf_azur extends ModelePDFPropales
 				}
 				//}
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($this->tva as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1166,22 +1163,20 @@ class pdf_azur extends ModelePDFPropales
 				//Local tax 1 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1194,27 +1189,25 @@ class pdf_azur extends ModelePDFPropales
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
 						// retrieve global local tax
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1249,8 +1242,7 @@ class pdf_azur extends ModelePDFPropales
 		if (! empty($object->paye)) $resteapayer=0;
 		*/
 
-		if ($deja_regle > 0)
-		{
+		if ($deja_regle > 0) {
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1312,7 +1304,9 @@ class pdf_azur extends ModelePDFPropales
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1321,14 +1315,15 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -1337,29 +1332,24 @@ class pdf_azur extends ModelePDFPropales
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE)) {
 			$pdf->line($this->posxpicture - 1, $tab_top, $this->posxpicture - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				//$pdf->SetXY($this->posxpicture-1, $tab_top+1);
 				//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
 			}
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				// Not do -3 and +3 instead of -1 -1 to have more space for text 'Sales tax'
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
 				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
@@ -1367,15 +1357,13 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 		}
 
 		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
@@ -1384,26 +1372,27 @@ class pdf_azur extends ModelePDFPropales
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
-				$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
-					'C');
+				$pdf->MultiCell(
+					$this->posxdiscount - $this->posxunit - 1,
+					2,
+					$outputlangs->transnoentities("Unit"),
+					'',
+					'C'
+				);
 			}
 		}
 
 		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
+		if (empty($hidetop)) {
+			if ($this->atleastonediscount) {
 				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
-		if ($this->atleastonediscount)
-		{
+		if ($this->atleastonediscount) {
 			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
 		}
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
 			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 		}
@@ -1431,8 +1420,7 @@ class pdf_azur extends ModelePDFPropales
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		//  Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->PROPALE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->PROPALE_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
 		}
 
@@ -1445,20 +1433,18 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
-		{
-			if ($this->emetteur->logo)
-			{
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+			if ($this->emetteur->logo) {
 				$logodir = $conf->mycompany->dir_output;
-				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
-				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
-				{
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
 				}
-				if (is_readable($logo))
-				{
+				if (is_readable($logo)) {
 					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
@@ -1489,19 +1475,16 @@ class pdf_azur extends ModelePDFPropales
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if ($object->ref_client)
-		{
+		if ($object->ref_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1509,11 +1492,9 @@ class pdf_azur extends ModelePDFPropales
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1531,8 +1512,7 @@ class pdf_azur extends ModelePDFPropales
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("DateEndPropal")." : ".dol_print_date($object->fin_validite, "day", false, $outputlangs, true), '', 'R');
 
-		if ($object->thirdparty->code_client)
-		{
+		if ($object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1540,11 +1520,9 @@ class pdf_azur extends ModelePDFPropales
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -1560,30 +1538,29 @@ class pdf_azur extends ModelePDFPropales
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-		 	// Add internal contact of proposal if defined
+			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
+			if (count($arrayidcontact) > 0) {
+				$object->fetch_user($arrayidcontact[0]);
+				$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
 			$posy = 42 + $top_shift;
-		 	$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -1611,8 +1588,7 @@ class pdf_azur extends ModelePDFPropales
 			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1630,10 +1606,14 @@ class pdf_azur extends ModelePDFPropales
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 4e1b448d9db..368b5520421 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -166,7 +166,9 @@ class pdf_cyan extends ModelePDFPropales
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
@@ -202,9 +204,13 @@ class pdf_cyan extends ModelePDFPropales
 
 		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
@@ -227,18 +233,17 @@ class pdf_cyan extends ModelePDFPropales
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
 		$this->atleastonephoto = false;
-		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE)) {
 			$objphoto = new Product($this->db);
 
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto->fetch($object->lines[$i]->fk_product);
 				//var_dump($objphoto->ref);exit;
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
 					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
 				} else {
@@ -247,22 +252,17 @@ class pdf_cyan extends ModelePDFPropales
 				}
 
 				$arephoto = false;
-				foreach ($pdir as $midir)
-				{
-					if (!$arephoto)
-					{
+				foreach ($pdir as $midir) {
+					if (!$arephoto) {
 						if ($conf->product->entity != $objphoto->entity) {
 							$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
 						} else {
 							$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
 						}
 
-						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-						{
-							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-							{
-								if ($obj['photo_vignette'])
-								{
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+								if ($obj['photo_vignette']) {
 									$filename = $obj['photo_vignette'];
 								} else {
 									$filename = $obj['photo'];
@@ -278,21 +278,23 @@ class pdf_cyan extends ModelePDFPropales
 					}
 				}
 
-				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+				if ($realpath && $arephoto) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxtva;
+		}
 
-		if ($conf->propal->multidir_output[$conf->entity])
-		{
+		if ($conf->propal->multidir_output[$conf->entity]) {
 			$object->fetch_thirdparty();
 
 			$deja_regle = 0;
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->propal->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -301,20 +303,16 @@ class pdf_cyan extends ModelePDFPropales
 				$file = $dir."/".$objectref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -332,15 +330,13 @@ class pdf_cyan extends ModelePDFPropales
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -354,15 +350,15 @@ class pdf_cyan extends ModelePDFPropales
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfCommercialProposalTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
@@ -370,7 +366,9 @@ class pdf_cyan extends ModelePDFPropales
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 
 				$heightforinfotot = 40; // Height reserved to output the info and total part
@@ -391,11 +389,9 @@ class pdf_cyan extends ModelePDFPropales
 
 				// Incoterm
 				$height_incoterms = 0;
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -413,15 +409,15 @@ class pdf_cyan extends ModelePDFPropales
 
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
-				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
-				{
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
 					// Get first sale rep
-					if (is_object($object->thirdparty))
-					{
+					if (is_object($object->thirdparty)) {
 						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
 						$salerepobj = new User($this->db);
 						$salerepobj->fetch($salereparray[0]['id']);
-						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						if (!empty($salerepobj->signature)) {
+							$notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+						}
 					}
 				}
 
@@ -431,20 +427,22 @@ class pdf_cyan extends ModelePDFPropales
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
-				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0)
-				{
+				if (!empty($conf->global->MAIN_ADD_CREATOR_IN_NOTE) && $object->user_author_id > 0) {
 					$tmpuser = new User($this->db);
 					$tmpuser->fetch($object->user_author_id);
 					$notetoshow .= $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
-					if ($tmpuser->email) $notetoshow .= ',  Mail: '.$tmpuser->email;
-					if ($tmpuser->office_phone) $notetoshow .= ', Tel: '.$tmpuser->office_phone;
+					if ($tmpuser->email) {
+						$notetoshow .= ',  Mail: '.$tmpuser->email;
+					}
+					if ($tmpuser->office_phone) {
+						$notetoshow .= ', Tel: '.$tmpuser->office_phone;
+					}
 				}
 
 				$tab_height = $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter;
 
 				$pagenb = $pdf->getPage();
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_top -= 2;
 
 					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
@@ -463,16 +461,19 @@ class pdf_cyan extends ModelePDFPropales
 					$pageposafternote = $pdf->getPage();
 					$posyafter = $pdf->GetY();
 
-					if ($pageposafternote > $pageposbeforenote)
-					{
+					if ($pageposafternote > $pageposbeforenote) {
 						$pdf->rollbackTransaction(true);
 
 						// prepare pages to receive notes
 						while ($pagenb < $pageposafternote) {
 							$pdf->AddPage();
 							$pagenb++;
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
@@ -488,8 +489,7 @@ class pdf_cyan extends ModelePDFPropales
 
 						$posyafter = $pdf->GetY();
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-						{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {	// There is no space left for total+free text
 							$pdf->AddPage('', '', true);
 							$pagenb++;
 							$pageposafternote++;
@@ -526,8 +526,12 @@ class pdf_cyan extends ModelePDFPropales
 
 						// apply note frame to last page
 						$pdf->setPage($pageposafternote);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$height_note = $posyafter - $tab_top_newpage;
 						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
 					} else // No pagebreak
@@ -538,15 +542,18 @@ class pdf_cyan extends ModelePDFPropales
 						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-						{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {
 							// not enough space, need to add page
 							$pdf->AddPage('', '', true);
 							$pagenb++;
 							$pageposafternote++;
 							$pdf->setPage($pageposafternote);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 
 							$posyafter = $tab_top_newpage;
 						}
@@ -570,15 +577,16 @@ class pdf_cyan extends ModelePDFPropales
 				// Loop on each lines
 				$pageposbeforeprintlines = $pdf->getPage();
 				$pagenb = $pageposbeforeprintlines;
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -588,26 +596,27 @@ class pdf_cyan extends ModelePDFPropales
 					$posYAfterImage = 0;
 					$posYAfterDescription = 0;
 
-					if ($this->getColumnStatus('photo'))
-					{
+					if ($this->getColumnStatus('photo')) {
 						// We start with Photo of product line
-						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// If photo too high, we moved completely on new page
-						{
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 							$pdf->AddPage('', '', true);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 
 
-						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-						{
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
 							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 							// $pdf->Image does not increase value return by getY, so we save it manually
 							$posYAfterImage = $curY + $imglinesize['height'];
@@ -615,15 +624,13 @@ class pdf_cyan extends ModelePDFPropales
 					}
 
 					// Description of product line
-					if ($this->getColumnStatus('desc'))
-					{
+					if ($this->getColumnStatus('desc')) {
 						$pdf->startTransaction();
 
 						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
 
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 
 							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
@@ -633,20 +640,22 @@ class pdf_cyan extends ModelePDFPropales
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
 							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot)))	// There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforsignature + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -670,16 +679,14 @@ class pdf_cyan extends ModelePDFPropales
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
-					if ($this->getColumnStatus('vat'))
-					{
+					if ($this->getColumnStatus('vat')) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Unit price before discount
-					if ($this->getColumnStatus('subprice'))
-					{
+					if ($this->getColumnStatus('subprice')) {
 						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -687,8 +694,7 @@ class pdf_cyan extends ModelePDFPropales
 
 					// Quantity
 					// Enough for 6 chars
-					if ($this->getColumnStatus('qty'))
-					{
+					if ($this->getColumnStatus('qty')) {
 						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -696,32 +702,28 @@ class pdf_cyan extends ModelePDFPropales
 
 
 					// Unit
-					if ($this->getColumnStatus('unit'))
-					{
+					if ($this->getColumnStatus('unit')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Discount on line
-					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent)
-					{
+					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent) {
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total excl tax line (HT)
-					if ($this->getColumnStatus('totalexcltax'))
-					{
+					if ($this->getColumnStatus('totalexcltax')) {
 						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total with tax line (TTC)
-					if ($this->getColumnStatus('totalincltax'))
-					{
+					if ($this->getColumnStatus('totalincltax')) {
 						$total_incl_tax = pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'totalincltax', $total_incl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -730,8 +732,7 @@ class pdf_cyan extends ModelePDFPropales
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-							if ($this->getColumnStatus($extrafieldColKey))
-							{
+							if ($this->getColumnStatus($extrafieldColKey)) {
 								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
@@ -752,8 +753,11 @@ class pdf_cyan extends ModelePDFPropales
 
 
 					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
@@ -762,16 +766,21 @@ class pdf_cyan extends ModelePDFPropales
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
@@ -785,11 +794,17 @@ class pdf_cyan extends ModelePDFPropales
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
 					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate]))				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY = max($nexY, $posYAfterImage);
+					if ($posYAfterImage > $posYAfterDescription) {
+						$nexY = max($nexY, $posYAfterImage);
+					}
 
 					// Add line
 					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
@@ -814,7 +829,9 @@ class pdf_cyan extends ModelePDFPropales
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 
 					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
@@ -826,15 +843,18 @@ class pdf_cyan extends ModelePDFPropales
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == $pageposbeforeprintlines)
-				{
+				if ($pagenb == $pageposbeforeprintlines) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				} else {
@@ -857,18 +877,18 @@ class pdf_cyan extends ModelePDFPropales
 				*/
 
 				// Customer signature area
-				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE))
-				{
+				if (empty($conf->global->PROPAL_DISABLE_SIGNATURE)) {
 					$posy = $this->drawSignatureArea($pdf, $object, $posy, $outputlangs);
 				}
 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				//If propal merge product PDF is active
-				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL))
-				{
+				if (!empty($conf->global->PRODUIT_PDF_MERGE_PROPAL)) {
 					require_once DOL_DOCUMENT_ROOT.'/product/class/propalmergepdfproduct.class.php';
 
 					$already_merged = array();
@@ -898,8 +918,7 @@ class pdf_cyan extends ModelePDFPropales
 							if (count($filetomerge->lines) > 0) {
 								foreach ($filetomerge->lines as $linefile) {
 									if (!empty($linefile->id) && !empty($linefile->file_name)) {
-										if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-										{
+										if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 											if (!empty($conf->product->enabled)) {
 												$filetomerge_dir = $conf->product->multidir_output[$entity_product_file].'/'.get_exdir($product->id, 2, 0, 0, $product, 'product').$product->id."/photos";
 											} elseif (!empty($conf->service->enabled)) {
@@ -945,14 +964,14 @@ class pdf_cyan extends ModelePDFPropales
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -997,8 +1016,7 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
-		{
+		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@@ -1009,8 +1027,7 @@ class pdf_cyan extends ModelePDFPropales
 		$posxval = 52;
 
 		// Show shipping date
-		if (!empty($object->delivery_date))
-		{
+		if (!empty($object->delivery_date)) {
 			$outputlangs->load("sendings");
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -1022,8 +1039,7 @@ class pdf_cyan extends ModelePDFPropales
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
 			$posy = $pdf->GetY() + 1;
-		} elseif ($object->availability_code || $object->availability)    // Show availability conditions
-		{
+		} elseif ($object->availability_code || $object->availability) {    // Show availability conditions
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
@@ -1039,8 +1055,7 @@ class pdf_cyan extends ModelePDFPropales
 		}
 
 		// Show payments conditions
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && ($object->cond_reglement_code || $object->cond_reglement))
-		{
+		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTTERM) && ($object->cond_reglement_code || $object->cond_reglement)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -1055,8 +1070,7 @@ class pdf_cyan extends ModelePDFPropales
 			$posy = $pdf->GetY() + 3;
 		}
 
-		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTMODE))
-		{
+		if (empty($conf->global->PROPOSAL_PDF_HIDE_PAYMENTMODE)) {
 			// Check a payment mode is defined
 			/* Not required on a proposal
 			if (empty($object->mode_reglement_code)
@@ -1076,8 +1090,7 @@ class pdf_cyan extends ModelePDFPropales
 			// Show payment mode
 			if ($object->mode_reglement_code
 			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR')
-			{
+			&& $object->mode_reglement_code != 'VIR') {
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
@@ -1091,15 +1104,12 @@ class pdf_cyan extends ModelePDFPropales
 			}
 
 			// Show payment mode CHQ
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-			{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ') {
 				// Si mode reglement non force ou si force a CHQ
-				if (!empty($conf->global->FACTURE_CHQ_NUMBER))
-				{
+				if (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
 					$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-					if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER > 0) {
 						$account = new Account($this->db);
 						$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
@@ -1108,23 +1118,20 @@ class pdf_cyan extends ModelePDFPropales
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
-					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-					{
+					if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 						$posy = $pdf->GetY() + 1;
 
-						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-						{
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
@@ -1135,12 +1142,12 @@ class pdf_cyan extends ModelePDFPropales
 			}
 
 			// If payment mode not forced or forced to VIR, show payment with BAN
-			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-			{
-				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
-				{
+			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
 					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					if ($object->fk_bank > 0) {
+						$bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					}
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
@@ -1188,8 +1195,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		// Total table
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -1212,32 +1218,28 @@ class pdf_cyan extends ModelePDFPropales
 		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$tvaisnull = ((!empty($this->tva) && count($this->tva) == 1 && isset($this->tva['0.000']) && is_float($this->tva['0.000'])) ? true : false);
-			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull)
-			{
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_IFNULL) && $tvaisnull) {
 				// Nothing to do
 			} else {
 				//Local tax 1 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1251,18 +1253,17 @@ class pdf_cyan extends ModelePDFPropales
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('1', '3', '5'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('1', '3', '5'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 
@@ -1271,8 +1272,7 @@ class pdf_cyan extends ModelePDFPropales
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1288,18 +1288,15 @@ class pdf_cyan extends ModelePDFPropales
 				}
 				//}
 				// VAT
-				foreach ($this->tva as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($this->tva as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1316,22 +1313,20 @@ class pdf_cyan extends ModelePDFPropales
 				//Local tax 1 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 				//{
-				foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1345,27 +1340,25 @@ class pdf_cyan extends ModelePDFPropales
 						}
 					}
 				}
-		  		//}
+				//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
-				foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-				{
-					if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+				foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+					if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+						continue;
+					}
 
-					foreach ($localtax_rate as $tvakey => $tvaval)
-					{
+					foreach ($localtax_rate as $tvakey => $tvaval) {
 						// retrieve global local tax
-						if ($tvakey != 0)    // On affiche pas taux 0
-						{
+						if ($tvakey != 0) {    // On affiche pas taux 0
 							//$this->atleastoneratenotnull++;
 
 							$index++;
 							$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 							$tvacompl = '';
-							if (preg_match('/\*/', $tvakey))
-							{
+							if (preg_match('/\*/', $tvakey)) {
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
@@ -1402,8 +1395,7 @@ class pdf_cyan extends ModelePDFPropales
 		if (! empty($object->paye)) $resteapayer=0;
 		*/
 
-		if ($deja_regle > 0)
-		{
+		if ($deja_regle > 0) {
 			// Already paid + Deposits
 			$index++;
 
@@ -1467,7 +1459,9 @@ class pdf_cyan extends ModelePDFPropales
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1476,8 +1470,7 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
 				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
@@ -1528,8 +1521,7 @@ class pdf_cyan extends ModelePDFPropales
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		//  Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->PROPALE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->PROPALE_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
 		}
 
@@ -1544,14 +1536,13 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO))
-		{
-			if ($this->emetteur->logo)
-			{
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+			if ($this->emetteur->logo) {
 				$logodir = $conf->mycompany->dir_output;
-				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
-				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO))
-				{
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
 					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
 				} else {
 					$logo = $logodir.'/logos/'.$this->emetteur->logo;
@@ -1583,8 +1574,7 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == $object::STATUS_DRAFT)
-		{
+		if ($object->statut == $object::STATUS_DRAFT) {
 			$pdf->SetTextColor(128, 0, 0);
 			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
 		}
@@ -1593,19 +1583,16 @@ class pdf_cyan extends ModelePDFPropales
 		$posy += 1;
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if ($object->ref_client)
-		{
+		if ($object->ref_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1613,11 +1600,9 @@ class pdf_cyan extends ModelePDFPropales
 			}
 		}
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 3;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
@@ -1640,8 +1625,7 @@ class pdf_cyan extends ModelePDFPropales
 		}
 		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->fin_validite, "day", false, $outputlangs, true), '', 'R');
 
-		if ($object->thirdparty->code_client)
-		{
+		if ($object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1649,11 +1633,9 @@ class pdf_cyan extends ModelePDFPropales
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -1669,31 +1651,30 @@ class pdf_cyan extends ModelePDFPropales
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-		 	// Add internal contact of proposal if defined
+			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user($arrayidcontact[0]);
-		 		$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
+			if (count($arrayidcontact) > 0) {
+				$object->fetch_user($arrayidcontact[0]);
+				$labelbeforecontactname = ($outputlangs->transnoentities("FromContactName") != 'FromContactName' ? $outputlangs->transnoentities("FromContactName") : $outputlangs->transnoentities("Name"));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$labelbeforecontactname." ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
 
 			// Show sender
-		 	$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
-		 	$posy += $top_shift;
-		 	$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 
 			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -1723,8 +1704,7 @@ class pdf_cyan extends ModelePDFPropales
 			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1742,11 +1722,15 @@ class pdf_cyan extends ModelePDFPropales
 
 			// Show recipient
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1852,22 +1836,22 @@ class pdf_cyan extends ModelePDFPropales
 		);
 
 		/*
-	     * For exemple
-	     $this->cols['theColKey'] = array(
-	     'rank' => $rank, // int : use for ordering columns
-	     'width' => 20, // the column width in mm
-	     'title' => array(
-	     'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	     'label' => ' ', // the final label : used fore final generated text
-	     'align' => 'L', // text alignement :  R,C,L
-	     'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	     ),
-	     'content' => array(
-	     'align' => 'L', // text alignement :  R,C,L
-	     'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	     ),
-	     );
-	     */
+		 * For exemple
+		 $this->cols['theColKey'] = array(
+		 'rank' => $rank, // int : use for ordering columns
+		 'width' => 20, // the column width in mm
+		 'title' => array(
+		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+		 'label' => ' ', // the final label : used fore final generated text
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 'content' => array(
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 );
+		 */
 
 		$rank = 0; // do not use negative rank
 		$this->cols['desc'] = array(
@@ -1903,8 +1887,7 @@ class pdf_cyan extends ModelePDFPropales
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_PROPOSALS_WITH_PICTURE) && !empty($this->atleastonephoto)) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -1920,8 +1903,7 @@ class pdf_cyan extends ModelePDFPropales
 			'border-left' => true, // add left line separator
 		);
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$this->cols['vat']['status'] = true;
 		}
 
@@ -2023,11 +2005,9 @@ class pdf_cyan extends ModelePDFPropales
 		);
 
 		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-		if ($reshook < 0)
-		{
+		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		} elseif (empty($reshook))
-		{
+		} elseif (empty($reshook)) {
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/propale/mod_propale_marbre.php b/htdocs/core/modules/propale/mod_propale_marbre.php
index fc3569323dc..77b1a97e17b 100644
--- a/htdocs/core/modules/propale/mod_propale_marbre.php
+++ b/htdocs/core/modules/propale/mod_propale_marbre.php
@@ -65,7 +65,7 @@ class mod_propale_marbre extends ModeleNumRefPropales
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -99,14 +99,14 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $pryymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$pryymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
 
-		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm))
-		{
+		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm)) {
 			return true;
 		} else {
 			$langs->load("errors");
@@ -134,11 +134,13 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		$sql .= " AND entity IN (".getEntity('proposalnumber', 1, $propal).")";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
@@ -147,8 +149,11 @@ class mod_propale_marbre extends ModeleNumRefPropales
 		$date = time();
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index 4a2bb721591..5fb7eeaa6fb 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -104,18 +104,17 @@ class mod_propale_saphir extends ModeleNumRefPropales
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$old_code_type = $mysoc->typent_code;
 		$mysoc->code_client = 'CCCCCCCCCC';
 		$mysoc->typent_code = 'TTTTTTTTTT';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = 'NotConfigured';
 		}
 		return $numExample;
@@ -137,8 +136,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 		// On defini critere recherche compteur
 		$mask = $conf->global->PROPALE_SAPHIR_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index ffcc13dc269..ee7df804c59 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -144,10 +144,18 @@ abstract class ModeleNumRefPropales
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/rapport/pdf_paiement.class.php b/htdocs/core/modules/rapport/pdf_paiement.class.php
index fb9bfbb8809..b69ebdeb828 100644
--- a/htdocs/core/modules/rapport/pdf_paiement.class.php
+++ b/htdocs/core/modules/rapport/pdf_paiement.class.php
@@ -71,8 +71,7 @@ class pdf_paiement
 		$this->posxbankaccount = 110;
 		$this->posxinvoiceamount = 132;
 		$this->posxpaymentamount = 162;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->line_per_page = 35;
 			$this->posxpaymenttype -= 10;
 			$this->posxinvoice -= 0;
@@ -102,21 +101,25 @@ class pdf_paiement
 		global $conf, $hookmanager, $langs, $user;
 
 		$socid = 0;
-		if ($user->socid) $socid = $user->socid;
+		if ($user->socid) {
+			$socid = $user->socid;
+		}
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		$this->month = $month;
 		$this->year = $year;
 		$dir = $_dir.'/'.$year;
 
-		if (!is_dir($dir))
-		{
+		if (!is_dir($dir)) {
 			$result = dol_mkdir($dir);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
@@ -137,8 +140,7 @@ class pdf_paiement
 
 
 		// Add pdfgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
@@ -150,8 +152,7 @@ class pdf_paiement
 		$pdf = pdf_getInstance($this->format);
 		$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
 
-		if (class_exists('TCPDF'))
-		{
+		if (class_exists('TCPDF')) {
 			$pdf->setPrintHeader(false);
 			$pdf->setPrintFooter(false);
 		}
@@ -173,8 +174,7 @@ class pdf_paiement
 		$sql .= " WHERE p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year, $month))."' AND '".$this->db->idate(dol_get_last_day($year, $month))."'";
 		$sql .= " AND p.entity = ".$conf->entity;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$numpaiement = $this->db->num_rows($result);
 		}
 
@@ -185,78 +185,86 @@ class pdf_paiement
 				$sql .= ", c.code as paiement_code, p.num_paiement as num_payment";
 				$sql .= ", p.amount as paiement_amount, f.total_ttc as facture_amount";
 				$sql .= ", pf.amount as pf_amount";
-				if (!empty($conf->banque->enabled))
+				if (!empty($conf->banque->enabled)) {
 					$sql .= ", ba.ref as bankaccount";
+				}
 				$sql .= ", p.rowid as prowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
 				$sql .= ", ".MAIN_DB_PREFIX."facture as f,";
 				$sql .= " ".MAIN_DB_PREFIX."paiement_facture as pf,";
-				if (!empty($conf->banque->enabled))
+				if (!empty($conf->banque->enabled)) {
 					$sql .= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,";
+				}
 				$sql .= " ".MAIN_DB_PREFIX."societe as s";
-				if (!$user->rights->societe->client->voir && !$socid)
-				{
+				if (!$user->rights->societe->client->voir && !$socid) {
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				}
 				$sql .= " WHERE f.fk_soc = s.rowid AND pf.fk_facture = f.rowid AND pf.fk_paiement = p.rowid";
-				if (!empty($conf->banque->enabled))
+				if (!empty($conf->banque->enabled)) {
 					$sql .= " AND p.fk_bank = b.rowid AND b.fk_account = ba.rowid ";
+				}
 				$sql .= " AND f.entity IN (".getEntity('invoice').")";
 				$sql .= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year, $month))."' AND '".$this->db->idate(dol_get_last_day($year, $month))."'";
-				if (!$user->rights->societe->client->voir && !$socid)
-				{
+				if (!$user->rights->societe->client->voir && !$socid) {
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 				}
-				if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
+				if (!empty($socid)) {
+					$sql .= " AND s.rowid = ".$socid;
+				}
 				// If global param PAYMENTS_REPORT_GROUP_BY_MOD is set, payement are ordered by paiement_code
-				if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD))
+				if (!empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) {
 					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiement ASC";
-				else $sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
+				} else {
+					$sql .= " ORDER BY p.datep ASC, pf.fk_paiement ASC";
+				}
 				break;
 			case "fourn":
 				$sql = "SELECT p.datep as dp, f.ref as ref";
 				$sql .= ", c.code as paiement_code, p.num_paiement as num_payment";
 				$sql .= ", p.amount as paiement_amount, f.total_ttc as facture_amount";
 				$sql .= ", pf.amount as pf_amount";
-				if (!empty($conf->banque->enabled))
+				if (!empty($conf->banque->enabled)) {
 					$sql .= ", ba.ref as bankaccount";
+				}
 				$sql .= ", p.rowid as prowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."paiementfourn as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
 				$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f,";
 				$sql .= " ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf,";
-				if (!empty($conf->banque->enabled))
+				if (!empty($conf->banque->enabled)) {
 					$sql .= " ".MAIN_DB_PREFIX."bank as b, ".MAIN_DB_PREFIX."bank_account as ba,";
+				}
 				$sql .= " ".MAIN_DB_PREFIX."societe as s";
-				if (!$user->rights->societe->client->voir && !$socid)
-				{
+				if (!$user->rights->societe->client->voir && !$socid) {
 					$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 				}
 				$sql .= " WHERE f.fk_soc = s.rowid AND pf.fk_facturefourn = f.rowid AND pf.fk_paiementfourn = p.rowid";
-				if (!empty($conf->banque->enabled))
+				if (!empty($conf->banque->enabled)) {
 					$sql .= " AND p.fk_bank = b.rowid AND b.fk_account = ba.rowid ";
+				}
 				$sql .= " AND f.entity = ".$conf->entity;
 				$sql .= " AND p.datep BETWEEN '".$this->db->idate(dol_get_first_day($year, $month))."' AND '".$this->db->idate(dol_get_last_day($year, $month))."'";
-				if (!$user->rights->societe->client->voir && !$socid)
-				{
+				if (!$user->rights->societe->client->voir && !$socid) {
 					$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 				}
-				if (!empty($socid)) $sql .= " AND s.rowid = ".$socid;
+				if (!empty($socid)) {
+					$sql .= " AND s.rowid = ".$socid;
+				}
 				// If global param PAYMENTS_FOURN_REPORT_GROUP_BY_MOD is set, payement fourn are ordered by paiement_code
-				if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))
+				if (!empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD)) {
 					$sql .= " ORDER BY paiement_code ASC, p.datep ASC, pf.fk_paiementfourn ASC";
-				else $sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
+				} else {
+					$sql .= " ORDER BY p.datep ASC, pf.fk_paiementfourn ASC";
+				}
 				break;
 		}
 
 		dol_syslog(get_class($this)."::write_file", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($result);
 
 				$lines[$i][0] = $objp->ref;
@@ -277,13 +285,11 @@ class pdf_paiement
 
 		$pages = intval(($num + $numpaiement) / $this->line_per_page);
 
-		if ((($num + $numpaiement) % $this->line_per_page) > 0)
-		{
+		if ((($num + $numpaiement) % $this->line_per_page) > 0) {
 			$pages++;
 		}
 
-		if ($pages == 0)
-		{
+		if ($pages == 0) {
 			// force to build at least one page if report has no line
 			$pages = 1;
 		}
@@ -297,7 +303,9 @@ class pdf_paiement
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		//$pdf->SetKeyWords();
-		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+			$pdf->SetCompression(false);
+		}
 
 		$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 		$pdf->SetAutoPageBreak(1, 0);
@@ -313,15 +321,16 @@ class pdf_paiement
 
 		$this->Body($pdf, 1, $lines, $outputlangs);
 
-		if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+		if (method_exists($pdf, 'AliasNbPages')) {
+			$pdf->AliasNbPages();
+		}
 
 		$pdf->Close();
 
 		$pdf->Output($file, 'F');
 
 		// Add pdfgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
@@ -329,14 +338,14 @@ class pdf_paiement
 		$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 		global $action;
 		$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook < 0)
-		{
+		if ($reshook < 0) {
 			$this->error = $hookmanager->error;
 			$this->errors = $hookmanager->errors;
 		}
 
-		if (!empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		$this->result = array('fullpath'=>$file);
 
@@ -440,26 +449,21 @@ class pdf_paiement
 		$pdf->SetFillColor(220, 220, 220);
 		$yp = 0;
 		$numlines = count($lines);
-		if (($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD)))
-		{
+		if (($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) {
 			$mod = $lines[0][2];
 			$total_mod = 0;
 		}
-		for ($j = 0; $j < $numlines; $j++)
-		{
+		for ($j = 0; $j < $numlines; $j++) {
 			$i = $j;
-			if ($yp > $this->tab_height - 5)
-			{
+			if ($yp > $this->tab_height - 5) {
 				$page++;
 				$pdf->AddPage();
 				$this->_pagehead($pdf, $page, 0, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$yp = 0;
 			}
-			if ($oldprowid <> $lines[$j][7])
-			{
-				if ($yp > $this->tab_height - 15)
-				{
+			if ($oldprowid <> $lines[$j][7]) {
+				if ($yp > $this->tab_height - 15) {
 					$pdf->SetFillColor(255, 255, 255);
 					$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
 					$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
@@ -493,7 +497,9 @@ class pdf_paiement
 				$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][4], 0, 'R', 1);
 				$yp = $yp + 5;
 				$total_page += $lines[$j][9];
-				if (($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) $total_mod += $lines[$j][9];
+				if (($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) {
+					$total_mod += $lines[$j][9];
+				}
 			}
 
 			// Invoice number
@@ -513,14 +519,12 @@ class pdf_paiement
 			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxpaymentamount, $this->line_height, $lines[$j][6], 0, 'R', 0);
 			$yp = $yp + 5;
 
-			if ($oldprowid <> $lines[$j][7])
-			{
+			if ($oldprowid <> $lines[$j][7]) {
 				$oldprowid = $lines[$j][7];
 			}
 
 			// Add line to add total by payment mode if mode reglement for nex line change
-			if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j + 1][2]))
-			{
+			if ((($this->doc_type == 'client' && !empty($conf->global->PAYMENTS_REPORT_GROUP_BY_MOD)) || ($this->doc_type == 'fourn' && !empty($conf->global->PAYMENTS_FOURN_REPORT_GROUP_BY_MOD))) && ($mod != $lines[$j + 1][2])) {
 				$pdf->SetFillColor(245, 245, 245);
 				$pdf->Rect($this->marge_gauche + 1, $this->tab_top + 10 + $yp, $this->posxpaymentamount - $this->marge_droite - 3, $this->line_height, 'F', array(), array());
 				$pdf->line($this->marge_gauche, $this->tab_top + 10 + $yp, $this->page_largeur - $this->marge_droite, $this->tab_top + 10 + $yp, array('dash'=>1));
@@ -534,8 +538,7 @@ class pdf_paiement
 				$mod = $lines[$j + 1][2];
 				$total_mod = 0;
 				$yp = $yp + 5;
-				if ($yp > $this->tab_height - 5)
-				{
+				if ($yp > $this->tab_height - 5) {
 					$page++;
 					$pdf->AddPage();
 					$this->_pagehead($pdf, $page, 0, $outputlangs);
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 22ef687d13b..0b19633b40e 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -93,7 +93,9 @@ class doc_generic_reception_odt extends ModelePdfReception
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -124,17 +126,19 @@ class doc_generic_reception_odt extends ModelePdfReception
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->RECEPTION_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -153,22 +157,20 @@ class doc_generic_reception_odt extends ModelePdfReception
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->RECEPTION_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->RECEPTION_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
 			//$texte.=$nbofiles?'</a>':'';
 			$texte .= '</b>';
 		}
-		if ($nbofiles)
-		{
+		if ($nbofiles) {
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
 			foreach ($listoffiles as $file) {
 				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=receptions/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
 			}
-   			$texte .= '</div>';
+			$texte .= '</div>';
 		}
 
 		$texte .= '</td>';
@@ -201,22 +203,22 @@ class doc_generic_reception_odt extends ModelePdfReception
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
@@ -225,16 +227,13 @@ class doc_generic_reception_odt extends ModelePdfReception
 		$outputlangs->load("companies");
 		$outputlangs->load("bills");
 
-		if ($conf->reception->dir_output."/reception")
-		{
+		if ($conf->reception->dir_output."/reception") {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Reception($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -244,20 +243,19 @@ class doc_generic_reception_odt extends ModelePdfReception
 
 			$dir = $conf->reception->dir_output."/reception";
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -267,10 +265,11 @@ class doc_generic_reception_odt extends ModelePdfReception
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -287,8 +286,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				// If BILLING contact defined on invoice, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'BILLING');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
@@ -322,8 +320,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'RECEPTION_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -339,8 +336,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					return -1;
 				}
@@ -361,14 +357,15 @@ class doc_generic_reception_odt extends ModelePdfReception
 				// Make substitutions into odt of user info
 				$tmparray = $this->get_substitutionarray_user($user, $outputlangs);
 				//var_dump($tmparray); exit;
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
+						if (preg_match('/logo$/', $key)) { // Image
 							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -380,14 +377,15 @@ class doc_generic_reception_odt extends ModelePdfReception
 				// Make substitutions into odt of mysoc
 				$tmparray = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
 				//var_dump($tmparray); exit;
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key))	// Image
-						{
+						if (preg_match('/logo$/', $key)) {	// Image
 							//var_dump($value);exit;
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -398,13 +396,14 @@ class doc_generic_reception_odt extends ModelePdfReception
 				}
 				// Make substitutions into odt of thirdparty
 				$tmparray = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key))	// Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) {	// Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -419,13 +418,14 @@ class doc_generic_reception_odt extends ModelePdfReception
 				// Call the ODTSubstitution hook
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
@@ -437,15 +437,13 @@ class doc_generic_reception_odt extends ModelePdfReception
 				// Replace tags of lines
 				try {
 					$listlines = $odfHandler->setSegment('lines');
-					foreach ($object->lines as $line)
-					{
+					foreach ($object->lines as $line) {
 						$tmparray = $this->get_substitutionarray_reception_lines($line, $outputlangs);
 						complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 						// Call the ODTSubstitutionLine hook
 						$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 						$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-						foreach ($tmparray as $key => $val)
-						{
+						foreach ($tmparray as $key => $val) {
 							try {
 								$listlines->setVars($key, $val, true, 'UTF-8');
 							} catch (OdfException $e) {
@@ -457,8 +455,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 						$listlines->merge();
 					}
 					$odfHandler->mergeSegment($listlines);
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -466,8 +463,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
 					} catch (OdfException $e) {
@@ -498,8 +494,9 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 8043f9f9ba6..ad1a702a622 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -62,7 +62,9 @@ class pdf_squille extends ModelePdfReception
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
@@ -81,16 +83,14 @@ class pdf_squille extends ModelePdfReception
 
 		$this->posxpicture = $this->posxweightvol - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
 
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxweightvol -= 20;
 			$this->posxpicture -= 20;
 			$this->posxqtyordered -= 20;
 			$this->posxqtytoship -= 20;
 		}
 
-		if (!empty($conf->global->RECEPTION_PDF_HIDE_ORDERED))
-		{
+		if (!empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
 			$this->posxweightvol += ($this->posxqtytoship - $this->posxqtyordered);
 			$this->posxpicture += ($this->posxqtytoship - $this->posxqtyordered);
 			$this->posxqtyordered = $this->posxqtytoship;
@@ -116,9 +116,13 @@ class pdf_squille extends ModelePdfReception
 
 		$object->fetch_thirdparty();
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal", "deliveries", "receptions", "productbatch", "sendings"));
 
@@ -126,13 +130,13 @@ class pdf_squille extends ModelePdfReception
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_SHIPMENT_WITH_PICTURE)) {
 			$objphoto = new Product($this->db);
 
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
@@ -145,8 +149,7 @@ class pdf_squille extends ModelePdfReception
 				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
 					if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {
 						// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
-						if ($obj['photo_vignette'])
-						{
+						if ($obj['photo_vignette']) {
 							$filename = $obj['photo_vignette'];
 						} else {
 							$filename = $obj['photo'];
@@ -159,17 +162,19 @@ class pdf_squille extends ModelePdfReception
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i] = $realpath;
+				if ($realpath) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
 
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxweightvol;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxweightvol;
+		}
 
-		if ($conf->reception->dir_output)
-		{
+		if ($conf->reception->dir_output) {
 			// Definition de $dir et $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->reception->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -178,20 +183,16 @@ class pdf_squille extends ModelePdfReception
 				$file = $dir."/".$rcpref.".pdf";
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -210,15 +211,13 @@ class pdf_squille extends ModelePdfReception
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -227,20 +226,26 @@ class pdf_squille extends ModelePdfReception
 				$pagenb = 0;
 				$pdf->SetDrawColor(128, 128, 128);
 
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("Reception"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Reception"));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -254,11 +259,9 @@ class pdf_squille extends ModelePdfReception
 
 				// Incoterm
 				$height_incoterms = 0;
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top = 88;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -275,8 +278,7 @@ class pdf_squille extends ModelePdfReception
 					}
 				}
 
-				if (!empty($object->note_public) || !empty($object->tracking_number))
-				{
+				if (!empty($object->note_public) || !empty($object->tracking_number)) {
 					$tab_top = 88 + $height_incoterms;
 					$tab_top_alt = $tab_top;
 
@@ -287,21 +289,19 @@ class pdf_squille extends ModelePdfReception
 					//$tab_top_alt += 1;
 
 					// Tracking number
-					if (!empty($object->tracking_number))
-					{
+					if (!empty($object->tracking_number)) {
 						$object->getUrlTrackingStatus($object->tracking_number);
-						if (!empty($object->tracking_url))
-						{
-							if ($object->reception_method_id > 0)
-							{
+						if (!empty($object->tracking_url)) {
+							if ($object->reception_method_id > 0) {
 								// Get code using getLabelFromKey
 								$code = $outputlangs->getLabelFromKey($this->db, $object->shipment_method_id, 'c_shipment_mode', 'rowid', 'code');
 								$label = '';
-								if ($object->tracking_url != $object->tracking_number) $label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								if ($object->tracking_url != $object->tracking_number) {
+									$label .= $outputlangs->trans("LinkToTrackYourPackage")."<br>";
+								}
 								$label .= $outputlangs->trans("ReceptionMethod").": ".$outputlangs->trans("ReceptionMethod".strtoupper($code));
 								//var_dump($object->tracking_url != $object->tracking_number);exit;
-								if ($object->tracking_url != $object->tracking_number)
-								{
+								if ($object->tracking_url != $object->tracking_number) {
 									$label .= " : ";
 									$label .= $object->tracking_url;
 								}
@@ -314,8 +314,7 @@ class pdf_squille extends ModelePdfReception
 					}
 
 					// Notes
-					if (!empty($object->note_public))
-					{
+					if (!empty($object->note_public)) {
 						$pdf->SetFont('', '', $default_font_size - 1); // Dans boucle pour gerer multi-page
 						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top_alt, dol_htmlentitiesbr($object->note_public), 0, 1);
 					}
@@ -339,15 +338,16 @@ class pdf_squille extends ModelePdfReception
 				$fk_commandefourndet = 0;
 				$totalOrdered = 0;
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -358,23 +358,27 @@ class pdf_squille extends ModelePdfReception
 					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 						$pdf->AddPage('', '', true);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
 
 						// Allows data in the first page if description is long enough to break in multiples pages
-						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 							$showpricebeforepagebreak = 1;
-						else $showpricebeforepagebreak = 0;
+						} else {
+							$showpricebeforepagebreak = 0;
+						}
 					}
 
-					if (isset($imglinesize['width']) && isset($imglinesize['height']))
-					{
+					if (isset($imglinesize['width']) && isset($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
 						$pdf->Image($realpatharray[$i], $curX + (($this->posxweightvol - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
@@ -388,8 +392,7 @@ class pdf_squille extends ModelePdfReception
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -400,22 +403,26 @@ class pdf_squille extends ModelePdfReception
 						$pageposafter = $pdf->getPage();
 						$posyafter = $pdf->GetY();
 						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -444,13 +451,11 @@ class pdf_squille extends ModelePdfReception
 
 					$pdf->SetXY($this->posxweightvol, $curY);
 					$weighttxt = '';
-					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->product->weight)
-					{
+					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->product->weight) {
 						$weighttxt = round($object->lines[$i]->product->weight * $object->lines[$i]->qty, 5).' '.measuringUnitString(0, "weight", $object->lines[$i]->product->weight_units);
 					}
 					$voltxt = '';
-					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->product->volume)
-					{
+					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->product->volume) {
 						$voltxt = round($object->lines[$i]->product->volume * $object->lines[$i]->qty, 5).' '.measuringUnitString(0, "volume", $object->lines[$i]->product->volume_units ? $object->lines[$i]->product->volume_units : 0);
 					}
 
@@ -469,8 +474,7 @@ class pdf_squille extends ModelePdfReception
 					$pdf->SetXY($this->posxqtytoship, $curY);
 					$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 3, $object->lines[$i]->qty, '', 'C');
 
-					if (!empty($conf->global->MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT))
-					{
+					if (!empty($conf->global->MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT)) {
 						$pdf->SetXY($this->posxpuht, $curY);
 						$pdf->MultiCell(($this->posxtotalht - $this->posxpuht - 1), 3, price($object->lines[$i]->subprice, 0, $outputlangs), '', 'R');
 
@@ -479,11 +483,12 @@ class pdf_squille extends ModelePdfReception
 					}
 
 					$nexY += 3;
-					if ($weighttxt && $voltxt) $nexY += 2;
+					if ($weighttxt && $voltxt) {
+						$nexY += 2;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -492,11 +497,9 @@ class pdf_squille extends ModelePdfReception
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -506,10 +509,8 @@ class pdf_squille extends ModelePdfReception
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -517,14 +518,15 @@ class pdf_squille extends ModelePdfReception
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -537,7 +539,9 @@ class pdf_squille extends ModelePdfReception
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -548,14 +552,14 @@ class pdf_squille extends ModelePdfReception
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				return 1; // No error
 			} else {
@@ -600,8 +604,11 @@ class pdf_squille extends ModelePdfReception
 		{
 			$col2x-=20;
 		}*/
-		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) $largcol2 = ($this->posxqtyordered - $this->posxweightvol);
-		else $largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
+			$largcol2 = ($this->posxqtyordered - $this->posxweightvol);
+		} else {
+			$largcol2 = ($this->posxqtytoship - $this->posxweightvol);
+		}
 
 		$useborder = 0;
 		$index = 0;
@@ -617,23 +624,29 @@ class pdf_squille extends ModelePdfReception
 
 
 		// Set trueVolume and volume_units not currently stored into database
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
-		{
+		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
 			$object->trueVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
 			$object->volume_units = $object->size_units * 3;
 		}
 
-		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
-		if ($totalVolume != '') $totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
-		if ($object->trueWeight) $totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
-		if ($object->trueVolume) $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		if ($totalWeight != '') {
+			$totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		}
+		if ($totalVolume != '') {
+			$totalVolumetoshow = showDimensionInBestUnit($totalVolume, 0, "volume", $outputlangs);
+		}
+		if ($object->trueWeight) {
+			$totalWeighttoshow = showDimensionInBestUnit($object->trueWeight, $object->weight_units, "weight", $outputlangs);
+		}
+		if ($object->trueVolume) {
+			$totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
+		}
 
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total"), 0, 'L', 1);
 
-		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED))
-		{
+		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
 			$pdf->SetXY($this->posxqtyordered, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($this->posxqtytoship - $this->posxqtyordered, $tab2_hl, $totalOrdered, 0, 'C', 1);
 		}
@@ -650,21 +663,21 @@ class pdf_squille extends ModelePdfReception
 		}
 
 		// Total Weight
-		if ($totalWeighttoshow)
-		{
+		if ($totalWeighttoshow) {
 			$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
 
 			$index++;
 		}
-		if ($totalVolumetoshow)
-		{
+		if ($totalVolumetoshow) {
 			$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
 
 			$index++;
 		}
-		if (!$totalWeighttoshow && !$totalVolumetoshow) $index++;
+		if (!$totalWeighttoshow && !$totalVolumetoshow) {
+			$index++;
+		}
 
 		$pdf->SetTextColor(0, 0, 0);
 
@@ -690,7 +703,9 @@ class pdf_squille extends ModelePdfReception
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -704,8 +719,7 @@ class pdf_squille extends ModelePdfReception
 		$pdf->SetDrawColor(128, 128, 128);
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
@@ -713,40 +727,34 @@ class pdf_squille extends ModelePdfReception
 		}
 
 		$pdf->line($this->posxweightvol - 1, $tab_top, $this->posxweightvol - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxweightvol - 1, $tab_top + 1);
 			$pdf->MultiCell(($this->posxqtyordered - $this->posxweightvol), 2, $outputlangs->transnoentities("WeightVolShort"), '', 'C');
 		}
 
-		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED))
-		{
+		if (empty($conf->global->RECEPTION_PDF_HIDE_ORDERED)) {
 			$pdf->line($this->posxqtyordered - 1, $tab_top, $this->posxqtyordered - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxqtyordered - 1, $tab_top + 1);
 				$pdf->MultiCell(($this->posxqtytoship - $this->posxqtyordered), 2, $outputlangs->transnoentities("QtyOrdered"), '', 'C');
 			}
 		}
 
 		$pdf->line($this->posxqtytoship - 1, $tab_top, $this->posxqtytoship - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqtytoship, $tab_top + 1);
 			$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 2, $outputlangs->transnoentities("QtyToReceive"), '', 'C');
 		}
 
 		if (!empty($conf->global->MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT)) {
 			$pdf->line($this->posxpuht - 1, $tab_top, $this->posxpuht - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxpuht - 1, $tab_top + 1);
 				$pdf->MultiCell(($this->posxtotalht - $this->posxpuht), 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 			}
 
 			$pdf->line($this->posxtotalht - 1, $tab_top, $this->posxtotalht - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtotalht - 1, $tab_top + 1);
 				$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxtotalht), 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
 			}
@@ -774,8 +782,7 @@ class pdf_squille extends ModelePdfReception
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->RECEPTION_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->RECEPTION_DRAFT_WATERMARK))) {
 					pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->RECEPTION_DRAFT_WATERMARK);
 		}
 
@@ -792,10 +799,8 @@ class pdf_squille extends ModelePdfReception
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -810,23 +815,20 @@ class pdf_squille extends ModelePdfReception
 		}
 
 		// Show barcode
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			$posx = 105;
 		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			// TODO Build code bar with function writeBarCode of barcode module for reception ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
-		if (!empty($conf->barcode->enabled))
-		{
+		if (!empty($conf->barcode->enabled)) {
 			// TODO Build code bar with function writeBarCode of barcode module for reception ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
@@ -851,16 +853,14 @@ class pdf_squille extends ModelePdfReception
 		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("RefReception")." : ".$object->ref, '', 'R');
 
 		// Date planned delivery
-		if (!empty($object->date_delivery))
-		{
+		if (!empty($object->date_delivery)) {
 				$posy += 4;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->date_delivery, "day", false, $outputlangs, true), '', 'R');
 		}
 
-		if (!empty($object->thirdparty->code_fournisseur))
-		{
+		if (!empty($object->thirdparty->code_fournisseur)) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -876,20 +876,20 @@ class pdf_squille extends ModelePdfReception
 		$origin_id = $object->origin_id;
 
 		// TODO move to external function
-		if (!empty($conf->fournisseur->enabled))     // commonly $origin='commande'
-		{
+		if (!empty($conf->fournisseur->enabled)) {     // commonly $origin='commande'
 			$outputlangs->load('orders');
 
 			$classname = 'CommandeFournisseur';
 			$linkedobject = new $classname($this->db);
 			$result = $linkedobject->fetch($origin_id);
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				//$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
 
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$text = $linkedobject->ref;
-				if ($linkedobject->ref_client) $text .= ' ('.$linkedobject->ref_client.')';
+				if ($linkedobject->ref_client) {
+					$text .= ' ('.$linkedobject->ref_client.')';
+				}
 				$Yoff = $Yoff + 8;
 				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w, $Yoff);
 				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("RefOrder")." : ".$outputlangs->transnoentities($text), 0, 'R');
@@ -899,26 +899,30 @@ class pdf_squille extends ModelePdfReception
 			}
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
-		 	// Add internal contact of origin element if defined
+			// Add internal contact of origin element if defined
 			$arrayidcontact = array();
-			if (!empty($origin) && is_object($object->$origin)) $arrayidcontact = $object->$origin->getIdContact('internal', 'SALESREPFOLL');
-			if (empty($arrayidcontact)) $arrayidcontact = $object->$origin->getIdContact('internal', 'SHIPPING');
-		 	if (count($arrayidcontact) > 0)
-		 	{
-		 		$object->fetch_user(reset($arrayidcontact));
-		 		$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
-		 	}
+			if (!empty($origin) && is_object($object->$origin)) {
+				$arrayidcontact = $object->$origin->getIdContact('internal', 'SALESREPFOLL');
+			}
+			if (empty($arrayidcontact)) {
+				$arrayidcontact = $object->$origin->getIdContact('internal', 'SHIPPING');
+			}
+			if (count($arrayidcontact) > 0) {
+				$object->fetch_user(reset($arrayidcontact));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
+			}
 
-		 	$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
+			$carac_emetteur .= pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
 			// Show sender
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 
 			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
@@ -938,8 +942,7 @@ class pdf_squille extends ModelePdfReception
 			$usecontact = false;
 			$arrayidcontact = $object->$origin->getIdContact('external', 'SHIPPING');
 
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -969,10 +972,14 @@ class pdf_squille extends ModelePdfReception
 
 			// Show recipient
 			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index 7dfd46c32c7..d75e82070df 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -42,7 +42,7 @@ class mod_reception_beryl extends ModelNumRefReception
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -75,13 +75,13 @@ class mod_reception_beryl extends ModelNumRefReception
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -108,11 +108,13 @@ class mod_reception_beryl extends ModelNumRefReception
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_reception_beryl::getNextValue", LOG_DEBUG);
 			return -1;
@@ -121,8 +123,11 @@ class mod_reception_beryl extends ModelNumRefReception
 		$date = time();
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_reception_beryl::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/reception/mod_reception_moonstone.php b/htdocs/core/modules/reception/mod_reception_moonstone.php
index 13f8e224754..bcab451ab9e 100644
--- a/htdocs/core/modules/reception/mod_reception_moonstone.php
+++ b/htdocs/core/modules/reception/mod_reception_moonstone.php
@@ -77,18 +77,17 @@ class mod_reception_moonstone extends ModelNumRefReception
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$old_code_type = $mysoc->typent_code;
 		$mysoc->code_client = 'CCCCCCCCCC';
 		$mysoc->typent_code = 'TTTTTTTTTT';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -109,8 +108,7 @@ class mod_reception_moonstone extends ModelNumRefReception
 
 		$mask = $conf->global->RECEPTION_MOONSTONE_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/reception/modules_reception.php b/htdocs/core/modules/reception/modules_reception.php
index a7b7cae7344..145a04fbd31 100644
--- a/htdocs/core/modules/reception/modules_reception.php
+++ b/htdocs/core/modules/reception/modules_reception.php
@@ -129,10 +129,15 @@ abstract class ModelNumRefReception
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
index 7a1da5ae130..c538affeb9f 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassPerso.class.php
@@ -99,8 +99,7 @@ class modGeneratePassPerso extends ModeleGenPassword
 		$this->NbRepeat = $tabConf[4];
 		$this->WithoutAmbi = $tabConf[5];
 
-		if ($this->WithoutAmbi)
-		{
+		if ($this->WithoutAmbi) {
 			$this->Maj = str_replace($this->Ambi, "", $this->Maj);
 			$this->Min = str_replace($this->Ambi, "", $this->Min);
 			$this->Nb  = str_replace($this->Ambi, "", $this->Nb);
@@ -215,7 +214,9 @@ class modGeneratePassPerso extends ModeleGenPassword
 	{
 		$last = "";
 
-		if (empty($this->NbRepeat)) return 1;
+		if (empty($this->NbRepeat)) {
+			return 1;
+		}
 
 		$count = 0;
 		$char = str_split($password);
diff --git a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
index cf49f0f063d..8ac01740a41 100644
--- a/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
+++ b/htdocs/core/modules/security/generate/modGeneratePassStandard.class.php
@@ -105,14 +105,12 @@ class modGeneratePassStandard extends ModeleGenPassword
 		$i = 0;
 
 		// add random characters to $password until $length is reached
-		while ($i < $this->length)
-		{
+		while ($i < $this->length) {
 			// pick a random character from the possible ones
 			$char = substr($possible, mt_rand(0, dol_strlen($possible) - 1), 1);
 
 			// we don't want this character if it's already in the password
-			if (!strstr($password, $char))
-			{
+			if (!strstr($password, $char)) {
 				$password .= $char;
 				$i++;
 			}
@@ -130,7 +128,9 @@ class modGeneratePassStandard extends ModeleGenPassword
 	 */
 	public function validatePassword($password)
 	{
-		if (dol_strlen($password) < $this->length) return 0;
+		if (dol_strlen($password) < $this->length) {
+			return 0;
+		}
 		return 1;
 	}
 }
diff --git a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
index 7b6ec019683..588ecaf747f 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -80,7 +80,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 
 		// Retrieves transmitter
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // Par defaut, si n'etait pas defini
+		}
 	}
 
 
@@ -111,15 +113,19 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->COMPANY_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
-			if (!$tmpdir) { unset($listofdir[$key]); continue; }
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!$tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.od(s|t)$', '', 'name', SORT_ASC, 0, true); // Disable hook for the moment
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -141,8 +147,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->COMPANY_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->COMPANY_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= $nbofiles;
@@ -150,14 +155,13 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
-   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=thirdparties/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
@@ -194,8 +198,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
@@ -208,30 +211,30 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->societe->multidir_output[$object->entity])
-		{
+		if ($conf->societe->multidir_output[$object->entity]) {
 			$dir = $conf->societe->multidir_output[$object->entity];
 			$objectref = dol_sanitizeFileName($object->id);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(s|t)/i', '', $newfile);
@@ -239,14 +242,14 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME)) {
 					$newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
 				}
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -274,8 +277,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -292,47 +294,39 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$result = $this->db->query($sql);
 				$num = $this->db->num_rows($result);
 
-				if ($num)
-				{
+				if ($num) {
 					require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
 					$i = 0;
 					$contactstatic = new Contact($this->db);
 
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$obj = $this->db->fetch_object($result);
 
 						$contact_arrray[$i] = $obj->rowid;
 						$i++;
 					}
 				}
-				if ((is_array($contact_arrray) && count($contact_arrray) > 0))
-				{
+				if ((is_array($contact_arrray) && count($contact_arrray) > 0)) {
 					try {
 						$listlines = $odfHandler->setSegment('companycontacts');
 
-						foreach ($contact_arrray as $array_key => $contact_id)
-						{
+						foreach ($contact_arrray as $array_key => $contact_id) {
 							$res_contact = $contactstatic->fetch($contact_id);
 							$tmparray = $this->get_substitutionarray_contact($contactstatic, $outputlangs, 'contact');
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
 							$listlines->merge();
 						}
 						$odfHandler->mergeSegment($listlines);
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						$this->error = $e->getMessage();
 						dol_syslog($this->error, LOG_WARNING);
 						//return -1;
@@ -353,19 +347,19 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Replace variables into document
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key))	// Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) {	// Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// setVars failed, probably because key not found
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
@@ -373,12 +367,10 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -417,8 +409,9 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				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));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 18947732b16..49e4ffbe80a 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -212,24 +212,27 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 
 		// Get Mask value
 		$mask = '';
-		if ($type == 0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if ($type == 1) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-		if (!$mask)
-		{
+		if ($type == 0) {
+			$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+		}
+		if ($type == 1) {
+			$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+		}
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return '';
 		}
 
 		$field = ''; $where = '';
-		if ($type == 0)
-		{
+		if ($type == 0) {
 			$field = 'code_client';
 			//$where = ' AND client in (1,2)';
-		} elseif ($type == 1)
-		{
+		} elseif ($type == 1) {
 			$field = 'code_fournisseur';
 			//$where = ' AND fournisseur = 1';
-		} else return -1;
+		} else {
+			return -1;
+		}
 
 		$now = dol_now();
 
@@ -251,10 +254,14 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		global $conf;
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-		if (preg_match('/\{pre\}/i', $mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) {
+			return 1;
+		}
 
 		$mask = $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-		if (preg_match('/\{pre\}/i', $mask)) return 1;
+		if (preg_match('/\{pre\}/i', $mask)) {
+			return 1;
+		}
 
 		return 0;
 	}
@@ -284,25 +291,25 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-		{
+		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 			$result = 0;
-		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
-		{
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))) {
 			$result = -2;
 		} else {
 			// Get Mask value
 			$mask = '';
-			if ($type == 0) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
-			if ($type == 1) $mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
-			if (!$mask)
-			{
+			if ($type == 0) {
+				$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_CUSTOMER;
+			}
+			if ($type == 1) {
+				$mask = empty($conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER) ? '' : $conf->global->COMPANY_ELEPHANT_MASK_SUPPLIER;
+			}
+			if (!$mask) {
 				$this->error = 'NotConfigured';
 				return -5;
 			}
 			$result = check_value($mask, $code);
-			if (is_string($result))
-			{
+			if (is_string($result)) {
 				$this->error = $result;
 				return -6;
 			}
@@ -327,15 +334,18 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 	{
 		// phpcs:enable
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
-		else $sql .= " WHERE code_client = '".$db->escape($code)."'";
-		if ($soc->id > 0) $sql .= " AND rowid <> ".$soc->id;
+		if ($type == 1) {
+			$sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
+		} else {
+			$sql .= " WHERE code_client = '".$db->escape($code)."'";
+		}
+		if ($soc->id > 0) {
+			$sql .= " AND rowid <> ".$soc->id;
+		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
+		if ($resql) {
+			if ($db->num_rows($resql) == 0) {
 				return 0;
 			} else {
 				return -1;
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 54ba73d08ef..aff13d41536 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -123,11 +123,9 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
 		$result = 0;
 		$code = trim($code);
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-		{
+		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 			$result = 0;
-		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
-		{
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))) {
 			$result = -2;
 		}
 
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 1d8b543234d..a7ae44323a1 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -139,11 +139,13 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			return -1;
 		}
@@ -151,8 +153,11 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		$date	= dol_now();
 		$yymm	= strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 5) - 1)) $num = $max + 1; // If counter > 99999, we do not format on 5 chars, we take number as it is
-		else $num = sprintf("%05s", $max + 1);
+		if ($max >= (pow(10, 5) - 1)) {
+			$num = $max + 1; // If counter > 99999, we do not format on 5 chars, we take number as it is
+		} else {
+			$num = sprintf("%05s", $max + 1);
+		}
 
 		dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
 		return $prefix.$yymm."-".$num;
@@ -179,25 +184,20 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		$result = 0;
 		$code = strtoupper(trim($code));
 
-		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))
-		{
+		if (empty($code) && $this->code_null && empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)) {
 			$result = 0;
-		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED)))
-		{
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->MAIN_COMPANY_CODE_ALWAYS_REQUIRED))) {
 			$result = -2;
 		} else {
-			if ($this->verif_syntax($code) >= 0)
-			{
+			if ($this->verif_syntax($code) >= 0) {
 				$is_dispo = $this->verif_dispo($db, $code, $soc, $type);
-				if ($is_dispo <> 0)
-				{
+				if ($is_dispo <> 0) {
 					$result = -3;
 				} else {
 					$result = 0;
 				}
 			} else {
-				if (dol_strlen($code) == 0)
-				{
+				if (dol_strlen($code) == 0) {
 					$result = -2;
 				} else {
 					$result = -1;
@@ -226,17 +226,20 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		global $conf, $mc;
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe";
-		if ($type == 1) $sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
-		else $sql .= " WHERE code_client = '".$db->escape($code)."'";
+		if ($type == 1) {
+			$sql .= " WHERE code_fournisseur = '".$db->escape($code)."'";
+		} else {
+			$sql .= " WHERE code_client = '".$db->escape($code)."'";
+		}
 		$sql .= " AND entity IN (".getEntity('societe').")";
-		if ($soc->id > 0) $sql .= " AND rowid <> ".$soc->id;
+		if ($soc->id > 0) {
+			$sql .= " AND rowid <> ".$soc->id;
+		}
 
 		dol_syslog(get_class($this)."::verif_dispo", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
+		if ($resql) {
+			if ($db->num_rows($resql) == 0) {
 				return 0;
 			} else {
 				return -1;
@@ -259,8 +262,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
 		// phpcs:enable
 		$res = 0;
 
-		if (dol_strlen($code) < 11)
-		{
+		if (dol_strlen($code) < 11) {
 			$res = -1;
 		} else {
 			$res = 0;
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 13cc8a4948c..752691b03b8 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -55,8 +55,12 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	public function __construct()
 	{
 		global $conf;
-		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER = '411';
-		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
+		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) || trim($conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER) == '') {
+			$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER = '411';
+		}
+		if (!isset($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) || trim($conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER) == '') {
+			$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER = '401';
+		}
 		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER;
 		$this->prefixsupplieraccountancycode = $conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER;
 	}
@@ -90,9 +94,13 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		$texte .= $langs->trans("ModuleCompanyCodeSupplier".$this->name, '{s1}')."<br>\n";
 		$texte = str_replace(array('{s1}', '{s2}'), array($s1, $s2), $texte);
 		$texte .= "<br>\n";
-		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
+		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) {
+			$texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
+		}
 		//if (! empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) $texte.=$langs->trans('COMPANY_AQUARIUM_REMOVE_ALPHA').' = '.yn($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)."<br>\n";
-		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))  $texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
+		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) {
+			$texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
+		}
 		$texte .= '</td>';
 		$texte .= '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 		$texte .= '</tr></table>';
@@ -139,12 +147,10 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(!empty($societe->name) ? $societe->name : ''));
 
 		// Regle gestion compte compta
-		if ($type == 'customer')
-		{
+		if ($type == 'customer') {
 			$codetouse = (!empty($societe->code_client) ? $societe->code_client : 'CUSTCODE');
 			$prefix = $this->prefixcustomeraccountancycode;
-		} elseif ($type == 'supplier')
-		{
+		} elseif ($type == 'supplier') {
 			$codetouse = (!empty($societe->code_fournisseur) ? $societe->code_fournisseur : 'SUPPCODE');
 			$prefix = $this->prefixsupplieraccountancycode;
 		} else {
@@ -155,20 +161,22 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 		//$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
 
 		// Remove special char if COMPANY_AQUARIUM_REMOVE_SPECIAL is set to 1 or not set (default)
-		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) $codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
+		if (!isset($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_AQUARIUM_REMOVE_SPECIAL)) {
+			$codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
+		}
 		// Remove special alpha if COMPANY_AQUARIUM_REMOVE_ALPHA is set to 1
-		if (!empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA))   $codetouse = preg_replace('/([a-z])/i', '', $codetouse);
+		if (!empty($conf->global->COMPANY_AQUARIUM_REMOVE_ALPHA)) {
+			$codetouse = preg_replace('/([a-z])/i', '', $codetouse);
+		}
 		// Apply a regex replacement pattern on code if COMPANY_AQUARIUM_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX))	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
-		{
+		if (!empty($conf->global->COMPANY_AQUARIUM_CLEAN_REGEX)) {	// Example: $conf->global->COMPANY_AQUARIUM_CLEAN_REGEX='^..(..)..';
 			$codetouse = preg_replace('/'.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX.'/', '\1\2\3', $codetouse);
 		}
 
 		$codetouse = $prefix.strtoupper($codetouse);
 
 		$is_dispo = $this->verif($db, $codetouse, $societe, $type);
-		if (!$is_dispo)
-		{
+		if (!$is_dispo) {
 			$this->code = $codetouse;
 		} else {
 			// Pour retour
@@ -191,20 +199,26 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 	public function verif($db, $code, $societe, $type)
 	{
 		$sql = "SELECT ";
-		if ($type == 'customer') $sql .= "code_compta";
-		elseif ($type == 'supplier') $sql .= "code_compta_fournisseur";
+		if ($type == 'customer') {
+			$sql .= "code_compta";
+		} elseif ($type == 'supplier') {
+			$sql .= "code_compta_fournisseur";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe";
 		$sql .= " WHERE ";
-		if ($type == 'customer') $sql .= "code_compta";
-		elseif ($type == 'supplier') $sql .= "code_compta_fournisseur";
+		if ($type == 'customer') {
+			$sql .= "code_compta";
+		} elseif ($type == 'supplier') {
+			$sql .= "code_compta_fournisseur";
+		}
 		$sql .= " = '".$db->escape($code)."'";
-		if (!empty($societe->id)) $sql .= " AND rowid <> ".$societe->id;
+		if (!empty($societe->id)) {
+			$sql .= " AND rowid <> ".$societe->id;
+		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
+		if ($resql) {
+			if ($db->num_rows($resql) == 0) {
 				dol_syslog("mod_codecompta_aquarium::verif code '".$code."' available");
 				return 1; // Dispo
 			} else {
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index ea25a480d45..363d3984516 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -64,13 +64,21 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	public function __construct()
 	{
 		global $conf, $langs;
-		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER = '411';
-		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER = '401';
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER) == '') {
+			$conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER = '411';
+		}
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER) == '') {
+			$conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER = '401';
+		}
 		$this->prefixcustomeraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_CUSTOMER;
 		$this->prefixsupplieraccountancycode = $conf->global->COMPANY_DIGITARIA_MASK_SUPPLIER;
 
-		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER = '5';
-		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) == '') $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER = '5';
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER) == '') {
+			$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER = '5';
+		}
+		if (!isset($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) || trim($conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER) == '') {
+			$conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER = '5';
+		}
 		$this->customeraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_CUSTOMER;
 		$this->supplieraccountancycodecharacternumber = $conf->global->COMPANY_DIGITARIA_MASK_NBCHARACTER_SUPPLIER;
 	}
@@ -105,11 +113,17 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		$texte = str_replace(array('{s1}', '{s2}', '{s3}', '{s4}'), array($s1, $s2, $s3, $s4), $texte);
 		$texte .= "<br>\n";
 		// Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
-		if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
+		if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->$conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) {
+			$texte .= $langs->trans('RemoveSpecialChars').' = '.yn(1)."<br>\n";
+		}
 		// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-		if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))  $texte .= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = '.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX."<br>\n";
+		if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX)) {
+			$texte .= $langs->trans('COMPANY_DIGITARIA_CLEAN_REGEX').' = '.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX."<br>\n";
+		}
 		// Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
-		if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) $texte .= $langs->trans('COMPANY_DIGITARIA_UNIQUE_CODE').' = '.yn(1)."<br>\n";
+		if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) {
+			$texte .= $langs->trans('COMPANY_DIGITARIA_UNIQUE_CODE').' = '.yn(1)."<br>\n";
+		}
 		$texte .= '</td>';
 		$texte .= '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 		$texte .= '</tr></table>';
@@ -133,7 +147,9 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		$s = $langs->trans("ThirdPartyName").": ".$mysoc->name;
 		$s .= "<br>\n";
 
-		if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $thirdpartylabelexample = preg_replace('/([^a-z0-9])/i', '', $mysoc->name);
+		if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) {
+			$thirdpartylabelexample = preg_replace('/([^a-z0-9])/i', '', $mysoc->name);
+		}
 		$s .= "<br>\n";
 		$s .= $this->prefixcustomeraccountancycode.strtoupper(substr($thirdpartylabelexample, 0, $this->customeraccountancycodecharacternumber));
 		$s .= "<br>\n";
@@ -159,16 +175,14 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 
 		$disponibility = 0;
 
-		if (is_object($societe))
-		{
+		if (is_object($societe)) {
 			dol_syslog("mod_codecompta_digitaria::get_code search code for type=".$type." & company=".(!empty($societe->name) ? $societe->name : ''));
 
 			if ($type == 'supplier') {
 				$codetouse = $societe->name;
 				$prefix = $this->prefixsupplieraccountancycode;
 				$width = $this->supplieraccountancycodecharacternumber;
-			} elseif ($type == 'customer')
-			{
+			} elseif ($type == 'customer') {
 				$codetouse = $societe->name;
 				$prefix = $this->prefixcustomeraccountancycode;
 				$width = $this->customeraccountancycodecharacternumber;
@@ -178,10 +192,11 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			}
 
 			// Remove special char if COMPANY_DIGITARIA_REMOVE_SPECIAL is set to 1 or not set (default)
-			if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) $codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
+			if (!isset($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL) || !empty($conf->global->COMPANY_DIGITARIA_REMOVE_SPECIAL)) {
+				$codetouse = preg_replace('/([^a-z0-9])/i', '', $codetouse);
+			}
 			// Apply a regex replacement pattern on code if COMPANY_DIGITARIA_CLEAN_REGEX is set. Value must be a regex with parenthesis. The part into parenthesis is kept, the rest removed.
-			if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX))	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
-			{
+			if (!empty($conf->global->COMPANY_DIGITARIA_CLEAN_REGEX)) {	// Example: $conf->global->COMPANY_DIGITARIA_CLEAN_REGEX='^..(..)..';
 				$codetouse = preg_replace('/'.$conf->global->COMPANY_DIGITARIA_CLEAN_REGEX.'/', '\1\2\3', $codetouse);
 			}
 
@@ -189,8 +204,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			dol_syslog("mod_codecompta_digitaria::get_code search code proposed=".$this->code);
 
 			// Unique index on code if COMPANY_DIGITARIA_UNIQUE_CODE is set to 1 or not set (default)
-			if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE))
-			{
+			if (!isset($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE) || !empty($conf->global->COMPANY_DIGITARIA_UNIQUE_CODE)) {
 				$disponibility = $this->checkIfAccountancyCodeIsAlreadyUsed($db, $this->code, $type);
 
 				while ($disponibility <> 0 && $i < 100) {
@@ -235,11 +249,9 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 	 */
 	public function checkIfAccountancyCodeIsAlreadyUsed($db, $code, $type = '')
 	{
-		if ($type == 'supplier')
-		{
+		if ($type == 'supplier') {
 			$typethirdparty = 'code_compta_fournisseur';
-		} elseif ($type == 'customer')
-		{
+		} elseif ($type == 'customer') {
 			$typethirdparty = 'code_compta';
 		} else {
 			$this->error = 'Bad value for parameter type';
@@ -250,10 +262,8 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 		$sql .= " WHERE ".$typethirdparty." = '".$db->escape($code)."'";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			if ($db->num_rows($resql) == 0)
-			{
+		if ($resql) {
+			if ($db->num_rows($resql) == 0) {
 				dol_syslog("mod_codecompta_digitaria::checkIfAccountancyCodeIsAlreadyUsed '".$code."' available");
 				return 0; // Available
 			} else {
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index 04ae16a1630..e86b9fa98c8 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -91,8 +91,11 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
 		$this->code = '';
 
 		if (is_object($societe)) {
-			if ($type == 'supplier') $this->code = (($societe->code_compta_fournisseur != "") ? $societe->code_compta_fournisseur : '');
-			else $this->code = (($societe->code_compta != "") ? $societe->code_compta : '');
+			if ($type == 'supplier') {
+				$this->code = (($societe->code_compta_fournisseur != "") ? $societe->code_compta_fournisseur : '');
+			} else {
+				$this->code = (($societe->code_compta != "") ? $societe->code_compta : '');
+			}
 		}
 
 		return 0; // return ok
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index c0614bd811e..ad6f51e342b 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -95,7 +95,9 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -126,17 +128,19 @@ class doc_generic_stock_odt extends ModelePDFStock
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->STOCK_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -155,8 +159,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->STOCK_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->STOCK_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -164,8 +167,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
+		if ($nbofiles) {
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
 			foreach ($listoffiles as $file) {
@@ -209,38 +211,35 @@ class doc_generic_stock_odt extends ModelePDFStock
 		// phpcs:enable
 		global $stock, $langs, $conf, $mysoc, $hookmanager, $user;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->product->dir_output)
-		{
+		if ($conf->product->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new Entrepot($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -252,20 +251,19 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 			$dir = $conf->product->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -276,10 +274,11 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -296,16 +295,14 @@ class doc_generic_stock_odt extends ModelePDFStock
 				// If CUSTOMER contact defined on stock, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
+				if (!empty($usecontact)) {
 					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
@@ -332,8 +329,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'stock_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -349,8 +345,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -366,8 +361,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
@@ -381,7 +375,9 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in stock as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -390,19 +386,19 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -410,22 +406,18 @@ class doc_generic_stock_odt extends ModelePDFStock
 				try {
 					$listlines = $odfHandler->setSegment('supplierprices');
 					if (!empty($object->supplierprices)) {
-						foreach ($object->supplierprices as $supplierprice)
-						{
+						foreach ($object->supplierprices as $supplierprice) {
 							$array_lines = $this->get_substitutionarray_each_var_object($supplierprice, $outputlangs);
 							complete_substitutions_array($array_lines, $outputlangs, $object, $supplierprice, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$array_lines, 'line'=>$supplierprice);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($array_lines as $key => $val)
-							{
+							foreach ($array_lines as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -433,8 +425,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 						}
 					}
 					$odfHandler->mergeSegment($listlines);
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -442,12 +433,10 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -477,8 +466,9 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index 55923d68a79..6297921dbcc 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -144,7 +144,9 @@ class pdf_standard extends ModelePDFStock
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 
 		// Define position of columns
 		$this->wref = 35;
@@ -157,10 +159,11 @@ class pdf_standard extends ModelePDFStock
 		$this->posxdiscount = 155;
 		$this->postotalht = 175;
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) $this->posxtva = $this->posxup;
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) || !empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->posxtva = $this->posxup;
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
@@ -194,20 +197,22 @@ class pdf_standard extends ModelePDFStock
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
 
 		$nblines = count($object->lines);
 
-		if ($conf->stock->dir_output)
-		{
+		if ($conf->stock->dir_output) {
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->stock->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -222,20 +227,16 @@ class pdf_standard extends ModelePDFStock
 
 			$productstatic = new Product($this->db);
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -253,15 +254,13 @@ class pdf_standard extends ModelePDFStock
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -275,14 +274,18 @@ class pdf_standard extends ModelePDFStock
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Stock")." ".$outputlangs->convToOutputCharset($object->label));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -317,8 +320,7 @@ class pdf_standard extends ModelePDFStock
 
 				//dol_syslog('List products', LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 					$nblines = $num;
@@ -326,15 +328,13 @@ class pdf_standard extends ModelePDFStock
 					$this->tabTitleHeight = 0;
 					$nexY = $tab_top + $this->tabTitleHeight;
 
-					for ($i = 0; $i < $nblines; $i++)
-					{
+					for ($i = 0; $i < $nblines; $i++) {
 						$curY = $nexY;
 
 						$objp = $this->db->fetch_object($resql);
 
 						// Multilangs
-						if (!empty($conf->global->MAIN_MULTILANGS)) // si l'option est active
-						{
+						if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
 							$sql = "SELECT label";
 							$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
 							$sql .= " WHERE fk_product=".$objp->rowid;
@@ -342,10 +342,11 @@ class pdf_standard extends ModelePDFStock
 							$sql .= " LIMIT 1";
 
 							$result = $this->db->query($sql);
-							if ($result)
-							{
+							if ($result) {
 								$objtp = $this->db->fetch_object($result);
-								if ($objtp->label != '') $objp->produit = $objtp->label;
+								if ($objtp->label != '') {
+									$objp->produit = $objtp->label;
+								}
 							}
 						}
 
@@ -364,8 +365,7 @@ class pdf_standard extends ModelePDFStock
 						$pdf->startTransaction();
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc);
 						$pageposafter = $pdf->getPage();
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
 							//print $pageposafter.'-'.$pageposbefore;exit;
@@ -373,22 +373,26 @@ class pdf_standard extends ModelePDFStock
 							pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc);
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
+									if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+										$this->_pagehead($pdf, $object, 0, $outputlangs);
+									}
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -444,8 +448,7 @@ class pdf_standard extends ModelePDFStock
 						$totalvalue += price2num($objp->ppmp * $objp->value, 'MT');
 
 						// Price sell min
-						if (empty($conf->global->PRODUIT_MULTIPRICES))
-						{
+						if (empty($conf->global->PRODUIT_MULTIPRICES)) {
 							$pricemin = $objp->price;
 							$pdf->SetXY($this->posxdiscount, $curY);
 							$pdf->MultiCell($this->postotalht - $this->posxdiscount, 3, price(price2num($pricemin, 'MU'), 0, $outputlangs), 0, 'R', 0);
@@ -457,8 +460,7 @@ class pdf_standard extends ModelePDFStock
 						$totalvaluesell += price2num($pricemin * $objp->value, 'MT');
 
 						// Add line
-						if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-						{
+						if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 							$pdf->setPage($pageposafter);
 							$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 							//$pdf->SetDrawColor(190,190,200);
@@ -469,11 +471,9 @@ class pdf_standard extends ModelePDFStock
 						$nexY += 2; // Add space between lines
 
 						// Detect if some page were added automatically and output _tableau for past pages
-						while ($pagenb < $pageposafter)
-						{
+						while ($pagenb < $pageposafter) {
 							$pdf->setPage($pagenb);
-							if ($pagenb == 1)
-							{
+							if ($pagenb == 1) {
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -482,12 +482,12 @@ class pdf_standard extends ModelePDFStock
 							$pagenb++;
 							$pdf->setPage($pagenb);
 							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
-						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-						{
-							if ($pagenb == 1)
-							{
+						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+							if ($pagenb == 1) {
 								$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 							} else {
 								$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -495,9 +495,13 @@ class pdf_standard extends ModelePDFStock
 							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 							// New page
 							$pdf->AddPage();
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 							$pagenb++;
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 						}
 					}
 
@@ -534,8 +538,7 @@ class pdf_standard extends ModelePDFStock
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 3, price(price2num($totalvalue, 'MT'), 0, $outputlangs), 0, 'R');
 
 						// Price sell min
-						if (empty($conf->global->PRODUIT_MULTIPRICES))
-						{
+						if (empty($conf->global->PRODUIT_MULTIPRICES)) {
 							// Total sell min
 							$pdf->SetXY($this->postotalht, $curY);
 							$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, price(price2num($totalvaluesell, 'MT'), 0, $outputlangs), 0, 'R', 0);
@@ -548,8 +551,7 @@ class pdf_standard extends ModelePDFStock
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
 					complete_substitutions_array($substitutionarray, $outputlangs, $object);
 					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
@@ -579,8 +581,7 @@ class pdf_standard extends ModelePDFStock
 				$tab_top = $tab_top_newpage + 25 + $top_shift;
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -598,7 +599,9 @@ class pdf_standard extends ModelePDFStock
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -609,14 +612,14 @@ class pdf_standard extends ModelePDFStock
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -651,7 +654,9 @@ class pdf_standard extends ModelePDFStock
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -660,14 +665,15 @@ class pdf_standard extends ModelePDFStock
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -683,51 +689,44 @@ class pdf_standard extends ModelePDFStock
 		$pdf->SetDrawColor(128, 128, 128);
 		$pdf->SetTextColor(0, 0, 120);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			//$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line takes a position y in 2nd parameter and 4th parameter
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell($this->wref, 3, $outputlangs->transnoentities("Ref"), '', 'L');
 		}
 
 		//$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxlabel - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxlabel - 1, 2, $outputlangs->transnoentities("Label"), '', 'L');
 		}
 
 		//$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxup - $this->posxqty - 1, 2, $outputlangs->transnoentities("Units"), '', 'R');
 		}
 
 		//$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxup - 1, 2, $outputlangs->transnoentities("AverageUnitPricePMPShort"), '', 'R');
 		}
 
 		//$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("EstimatedStockValueShort"), '', 'R');
 		}
 
 		//$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 			$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("SellPriceMin"), '', 'R');
 		}
 
 		//$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
 			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("EstimatedStockValueSellShort"), '', 'R');
 		}
@@ -758,14 +757,16 @@ class pdf_standard extends ModelePDFStock
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		if ($object->type == 1) $titlekey = 'ServiceSheet';
-		else $titlekey = 'StockSheet';
+		if ($object->type == 1) {
+			$titlekey = 'ServiceSheet';
+		} else {
+			$titlekey = 'StockSheet';
+		}
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
 		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK)))
-		{
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
 			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
@@ -779,10 +780,8 @@ class pdf_standard extends ModelePDFStock
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -865,16 +864,14 @@ class pdf_standard extends ModelePDFStock
 		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
 		$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
 		$resqlbis = $this->db->query($sql);
-		if ($resqlbis)
-		{
+		if ($resqlbis) {
 			$obj = $this->db->fetch_object($resqlbis);
 			$lastmovementdate = $this->db->jdate($obj->datem);
 		} else {
 			dol_print_error($this->db);
 		}
 
-		if ($lastmovementdate)
-		{
+		if ($lastmovementdate) {
 			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
 		} else {
 			$toWrite = $outputlangs->transnoentities("None");
@@ -889,8 +886,7 @@ class pdf_standard extends ModelePDFStock
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 9ac43fd1625..8fec70458c0 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -170,8 +170,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		}
 		//if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
@@ -207,22 +206,31 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		global $user, $langs, $conf, $mysoc, $hookmanager, $nblines;
 
 		// Get source company
-		if (!is_object($object->thirdparty)) $object->fetch_thirdparty();
-		if (!is_object($object->thirdparty)) $object->thirdparty = $mysoc; // If fetch_thirdparty fails, object has no socid (specimen)
+		if (!is_object($object->thirdparty)) {
+			$object->fetch_thirdparty();
+		}
+		if (!is_object($object->thirdparty)) {
+			$object->thirdparty = $mysoc; // If fetch_thirdparty fails, object has no socid (specimen)
+		}
 		$this->emetteur = $object->thirdparty;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
 
 		$nblines = count($object->lines);
 
-		if ($conf->fournisseur->facture->dir_output)
-		{
+		if ($conf->fournisseur->facture->dir_output) {
 			$object->fetch_thirdparty();
 
 			$deja_regle = $object->getSommePaiement((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
@@ -230,8 +238,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$amount_deposits_included = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->fournisseur->facture->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -239,23 +246,21 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$objectref;
 				$file = $dir."/".$objectref.".pdf";
-				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				}
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -276,17 +281,17 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -300,20 +305,19 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Set $this->atleastonediscount if you have at least one discount
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
-				if (empty($this->atleastonediscount))
-				{
+				if (empty($this->atleastonediscount)) {
 					$delta = ($this->postotalht - $this->posxdiscount);
 					$this->posxpicture += $delta;
 					$this->posxtva += $delta;
@@ -326,7 +330,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -337,11 +343,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -360,8 +364,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_top -= 2;
 
 					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
@@ -386,15 +389,16 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -409,29 +413,32 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->startTransaction();
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 3, $curX, $curY, $hideref, $hidedesc, 1);
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxtva - $curX, 4, $curX, $curY, $hideref, $hidedesc, 1);
 						$posyafter = $pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -453,11 +460,10 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-					{
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva, $curY);
-		   				$pdf->MultiCell($this->posxup - $this->posxtva - 1, 3, $vat_rate, 0, 'R');
+						$pdf->MultiCell($this->posxup - $this->posxtva - 1, 3, $vat_rate, 0, 'R');
 					}
 
 					// Unit price before discount
@@ -471,16 +477,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS))
-					{
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
 					}
 
 					// Discount on line
-					if ($object->lines[$i]->remise_percent)
-					{
+					if ($object->lines[$i]->remise_percent) {
 						$pdf->SetXY($this->posxdiscount - 2, $curY);
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht - $this->posxdiscount - 1, 3, $remise_percent, 0, 'R');
@@ -492,31 +496,45 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collection of totals by VAT value in $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
 
-					if (!empty($object->remise_percent)) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					if (!empty($object->remise_percent)) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 					$localtax1rate = (string) $object->lines[$i]->localtax1_tx;
 					$localtax2rate = (string) $object->lines[$i]->localtax2_tx;
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (empty($this->tva[$vatrate])) $this->tva[$vatrate] = 0;
-					if (empty($this->localtax1[$localtax1rate])) $this->localtax1[$localtax1rate] = 0;
-					if (empty($this->localtax2[$localtax2rate])) $this->localtax2[$localtax2rate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (empty($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
+					if (empty($this->localtax1[$localtax1rate])) {
+						$this->localtax1[$localtax1rate] = 0;
+					}
+					if (empty($this->localtax2[$localtax2rate])) {
+						$this->localtax2[$localtax2rate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 					$this->localtax1[$localtax1rate] += $localtax1ligne;
 					$this->localtax2[$localtax2rate] += $localtax2ligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) {
+						$nexY = $posYAfterImage;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -527,11 +545,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -540,12 +556,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -553,15 +569,18 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -576,14 +595,15 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$amount_deposits_included = 0;
 
 				// Display Payments area
-				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->SUPPLIER_INVOICE_NO_PAYMENT_DETAILS))
-				{
+				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->SUPPLIER_INVOICE_NO_PAYMENT_DETAILS)) {
 					$posy = $this->_tableau_versements($pdf, $object, $posy, $outputlangs, $heightforfooter);
 				}
 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -594,14 +614,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -634,7 +654,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		global $conf, $mysoc;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+			$sign = -1;
+		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -644,8 +666,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		// Total table
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -668,10 +689,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$total_ttc = (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ttc : $object->total_ttc;
 
 		$this->atleastoneratenotnull = 0;
-		foreach ($this->tva as $tvakey => $tvaval)
-		{
-			if ($tvakey > 0)    // We do not display rate 0
-			{
+		foreach ($this->tva as $tvakey => $tvaval) {
+			if ($tvakey > 0) {    // We do not display rate 0
 				$this->atleastoneratenotnull++;
 
 				$index++;
@@ -679,8 +698,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 				$tvacompl = '';
 
-				if (preg_match('/\*/', $tvakey))
-				{
+				if (preg_match('/\*/', $tvakey)) {
 					$tvakey = str_replace('*', '', $tvakey);
 					$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 				}
@@ -693,8 +711,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
 			}
 		}
-		if (!$this->atleastoneratenotnull) // If no vat at all
-		{
+		if (!$this->atleastoneratenotnull) { // If no vat at all
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', 1);
@@ -702,8 +719,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva, 0, $outputlangs), 0, 'R', 1);
 
 			// Total LocalTax1
-			if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on' && $object->total_localtax1 > 0)
-			{
+			if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on' && $object->total_localtax1 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', 1);
@@ -712,8 +728,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			}
 
 			// Total LocalTax2
-			if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on' && $object->total_localtax2 > 0)
-			{
+			if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on' && $object->total_localtax2 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', 1);
@@ -725,16 +740,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			//{
 			//Local tax 1
 			foreach ($this->localtax1 as $tvakey => $tvaval) {
-				if ($tvakey != 0)    // On affiche pas taux 0
-				{
+				if ($tvakey != 0) {    // On affiche pas taux 0
 					//$this->atleastoneratenotnull++;
 
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 					$tvacompl = '';
-					if (preg_match('/\*/', $tvakey))
-					{
+					if (preg_match('/\*/', $tvakey)) {
 						$tvakey = str_replace('*', '', $tvakey);
 						$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 					}
@@ -752,16 +765,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			//{
 			//Local tax 2
 			foreach ($this->localtax2 as $tvakey => $tvaval) {
-				if ($tvakey != 0)    // On affiche pas taux 0
-				{
+				if ($tvakey != 0) {    // On affiche pas taux 0
 					//$this->atleastoneratenotnull++;
 
 					$index++;
 					$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 					$tvacompl = '';
-					if (preg_match('/\*/', $tvakey))
-					{
+					if (preg_match('/\*/', $tvakey)) {
 						$tvakey = str_replace('*', '', $tvakey);
 						$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 					}
@@ -791,10 +802,11 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$depositsamount = $object->getSumDepositsUsed((!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) ? 1 : 0);
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
-		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
-		{
+		if (($deja_regle > 0 || $creditnoteamount > 0 || $depositsamount > 0) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS)) {
 			// Already paid + Deposits
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -803,8 +815,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle + $depositsamount, 0, $outputlangs), 0, 'R', 0);
 
 			// Credit note
-			if ($creditnoteamount)
-			{
+			if ($creditnoteamount) {
 				$labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -814,8 +825,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			}
 
 			// Escompte
-			if ($object->close_code == FactureFournisseur::CLOSECODE_DISCOUNTVAT)
-			{
+			if ($object->close_code == FactureFournisseur::CLOSECODE_DISCOUNTVAT) {
 				$index++;
 				$pdf->SetFillColor(255, 255, 255);
 
@@ -863,7 +873,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -872,14 +884,15 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -888,61 +901,57 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$pdf->line($this->posxtva - 1, $tab_top, $this->posxtva - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
 				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
 		}
 
 		$pdf->line($this->posxup - 1, $tab_top, $this->posxup - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 		}
 
 		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
-				$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("Unit"), '',
-					'C');
+				$pdf->MultiCell(
+					$this->posxdiscount - $this->posxunit - 1,
+					2,
+					$outputlangs->transnoentities("Unit"),
+					'',
+					'C'
+				);
 			}
 		}
 
-		if ($this->atleastonediscount)
-		{
+		if ($this->atleastonediscount) {
 			$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
 
 		$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
 			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHTShort"), '', 'C');
 		}
@@ -965,14 +974,15 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		global $conf;
 
 		$sign = 1;
-		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
+		if ($object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+			$sign = -1;
+		}
 
 		$tab3_posx = 120;
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$tab3_posx -= 20;
 		}
 
@@ -1011,8 +1021,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$sql .= " WHERE pf.fk_paiementfourn = p.rowid and pf.fk_facturefourn = ".$object->id;
 		$sql .= " ORDER BY p.datep";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
@@ -1077,8 +1086,8 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+				$height=pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
 			}
 			else
 			{
@@ -1100,8 +1109,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("SupplierInvoice")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
 		$posy += 1;
 
-		if ($object->ref_supplier)
-		{
+		if ($object->ref_supplier) {
 			$posy += 4;
 			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->SetXY($posx, $posy);
@@ -1112,11 +1120,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 4;
 				$pdf->SetXY($posx, $posy);
 				$langs->load("projects");
@@ -1125,8 +1131,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			}
 		}
 
-		if ($object->date)
-		{
+		if ($object->date) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1138,8 +1143,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			$pdf->MultiCell(100, 4, strtolower($outputlangs->transnoentities("OrderToProcess")), '', 'R');
 		}
 
-		if ($object->thirdparty->code_fournisseur)
-		{
+		if ($object->thirdparty->code_fournisseur) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1153,19 +1157,16 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
 			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$object->fetch_user($arrayidcontact[0]);
 				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
 			}
@@ -1175,7 +1176,9 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -1204,8 +1207,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			// If BILLING contact defined on invoice, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('internal', 'BILLING');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1223,10 +1225,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
index 74c487b4d25..1b76b805efc 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php
@@ -107,13 +107,13 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $siyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$siyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($siyymm && !preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i', $siyymm))
-		{
+		if ($siyymm && !preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i', $siyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -129,13 +129,13 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $siyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$siyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($siyymm && !preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i', $siyymm))
-		{
+		if ($siyymm && !preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i', $siyymm)) {
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
@@ -150,13 +150,13 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $siyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$siyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($siyymm && !preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i', $siyymm))
-		{
+		if ($siyymm && !preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i', $siyymm)) {
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
@@ -175,8 +175,11 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 		global $db, $conf;
 
 		$prefix = $this->prefixinvoice;
-		if ($object->type == 2) $prefix = $this->prefixcreditnote;
-		elseif ($object->type == 3) $prefix = $this->prefixdeposit;
+		if ($object->type == 2) {
+			$prefix = $this->prefixcreditnote;
+		} elseif ($object->type == 3) {
+			$prefix = $this->prefixdeposit;
+		}
 
 		// First, we get the max value
 		$posindice = strlen($prefix) + 6;
@@ -187,19 +190,23 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 
 		$resql = $db->query($sql);
 		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			return -1;
 		}
 
-		if ($mode == 'last')
-		{
-			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-			else $num = sprintf("%04s", $max);
+		if ($mode == 'last') {
+			if ($max >= (pow(10, 4) - 1)) {
+				$num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			} else {
+				$num = sprintf("%04s", $max);
+			}
 
 			$ref = '';
 			$sql = "SELECT ref as ref";
@@ -209,24 +216,31 @@ class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if ($obj) $ref = $obj->ref;
-			} else dol_print_error($db);
+				if ($obj) {
+					$ref = $obj->ref;
+				}
+			} else {
+				dol_print_error($db);
+			}
 
 			return $ref;
-		} elseif ($mode == 'next')
-		{
+		} elseif ($mode == 'next') {
 			$date = $object->date; // This is invoice date (not creation date)
 			$yymm = strftime("%y%m", $date);
 
-			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-			else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) {
+				$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			} else {
+				$num = sprintf("%04s", $max + 1);
+			}
 
 			dol_syslog(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
 			return $prefix.$yymm."-".$num;
-		} else dol_print_error('', 'Bad parameter for getNextValue');
+		} else {
+			dol_print_error('', 'Bad parameter for getNextValue');
+		}
 	}
 
 
diff --git a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
index db24e32280c..e560b8178e8 100644
--- a/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
+++ b/htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
@@ -104,8 +104,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
 		$texte .= '</tr>';
 
-		if ($conf->global->MAIN_FEATURE_LEVEL >= 2)
-		{
+		if ($conf->global->MAIN_FEATURE_LEVEL >= 2) {
 			// Parametrage du prefix des replacement
 			$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
 			$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
@@ -138,8 +137,7 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -161,18 +159,19 @@ class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 
 		// Get Mask value
 		$mask = '';
-		if (is_object($object) && $object->type == 1)
-		{
+		if (is_object($object) && $object->type == 1) {
 			$mask = $conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK;
-			if (!$mask)
-			{
+			if (!$mask) {
 				$mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 			}
-		} elseif (is_object($object) && $object->type == 2) $mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
-		elseif (is_object($object) && $object->type == 3) $mask = $conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
-		else $mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
-		if (!$mask)
-		{
+		} elseif (is_object($object) && $object->type == 2) {
+			$mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
+		} elseif (is_object($object) && $object->type == 3) {
+			$mask = $conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
+		} else {
+			$mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
+		}
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index 855809c0a58..acb3ad8fa2a 100644
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -135,10 +135,18 @@ abstract class ModeleNumRefSuppliersInvoices
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 1b58934b611..f75641f2b9d 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -99,7 +99,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 		// Recupere issuer
 		$this->issuer = $mysoc;
-		if (!$this->issuer->country_code) $this->issuer->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->issuer->country_code) {
+			$this->issuer->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -130,17 +132,19 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->SUPPLIER_ORDER_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -159,8 +163,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->COMMANDE_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->COMMANDE_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -168,14 +171,13 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
-   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=supplier_orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=supplier_orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
 		}
 
 		$texte .= '</td>';
@@ -208,33 +210,31 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->fournisseur->commande->dir_output)
-		{
+		if ($conf->fournisseur->commande->dir_output) {
 			$object->fetch_thirdparty();
 
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -242,20 +242,19 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
 				$file = $dir."/".$objectref.".pdf";
-				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				}
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -265,10 +264,11 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -285,21 +285,19 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				// If CUSTOMER contact defined on order, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
 				$contactobject = null;
-				if (!empty($usecontact))
-				{
+				if (!empty($usecontact)) {
 					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
 						$socobject = $object->thirdparty;
-			   			// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
+						// if we have a CUSTOMER contact and we dont use it as recipient we store the contact object for later use
 						$contactobject = $object->contact;
 					}
 				} else {
@@ -322,8 +320,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'ORDER_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -339,8 +336,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -355,8 +351,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
@@ -370,7 +365,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -379,19 +376,19 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -400,32 +397,26 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
+					if ($foundtagforlines) {
 						$linenumber = 0;
-						foreach ($object->lines as $line)
-						{
+						foreach ($object->lines as $line) {
 							$linenumber++;
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -433,8 +424,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -442,12 +432,10 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -479,8 +467,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 74abd0fc715..5bf915fb764 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -57,9 +57,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 	public $description;
 
 	/**
-     * @var int 	Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
 	 * @var string document type
@@ -161,7 +161,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1; // For module retrocompatibility support durring PDF transition: TODO remove this at the end
@@ -191,9 +193,13 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		// phpcs:enable
 		global $user, $langs, $conf, $hookmanager, $mysoc, $nblines;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "dict", "products"));
@@ -215,17 +221,16 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE))
-		{
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE)) {
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
@@ -234,21 +239,23 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				}
 
 				$realpath = '';
-				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-				{
+				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
 					$filename = $obj['photo'];
 					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
 					$realpath = $dir.$filename;
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i] = $realpath;
+				if ($realpath) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxtva;
+		}
 
-		if ($conf->fournisseur->commande->dir_output)
-		{
+		if ($conf->fournisseur->commande->dir_output) {
 			$object->fetch_thirdparty();
 
 			$deja_regle = 0;
@@ -258,8 +265,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			//$amount_deposits_included = $object->getSumDepositsUsed();
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -267,23 +273,21 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
 				$file = $dir."/".$objectref.".pdf";
-				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				}
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -299,18 +303,18 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -324,7 +328,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
@@ -338,7 +344,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -349,11 +357,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -374,14 +380,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				// Extrafields in note
 				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-				if (!empty($extranote))
-				{
+				if (!empty($extranote)) {
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
 				$pagenb = $pdf->getPage();
-				if ($notetoshow)
-				{
+				if ($notetoshow) {
 					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
 					$pageposbeforenote = $pagenb;
 
@@ -400,16 +404,19 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$pageposafternote = $pdf->getPage();
 					$posyafter = $pdf->GetY();
 
-					if ($pageposafternote > $pageposbeforenote)
-					{
+					if ($pageposafternote > $pageposbeforenote) {
 						$pdf->rollbackTransaction(true);
 
 						// prepar pages to receive notes
 						while ($pagenb < $pageposafternote) {
 							$pdf->AddPage();
 							$pagenb++;
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
 							$pdf->setTopMargin($tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
@@ -425,8 +432,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 						$posyafter = $pdf->GetY();
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-						{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {	// There is no space left for total+free text
 							$pdf->AddPage('', '', true);
 							$pagenb++;
 							$pageposafternote++;
@@ -463,8 +469,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 						// apply note frame to last page
 						$pdf->setPage($pageposafternote);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$height_note = $posyafter - $tab_top_newpage;
 						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
 					} else // No pagebreak
@@ -475,15 +485,18 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-						{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {
 							// not enough space, need to add page
 							$pdf->AddPage('', '', true);
 							$pagenb++;
 							$pageposafternote++;
 							$pdf->setPage($pageposafternote);
-							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
 
 							$posyafter = $tab_top_newpage;
 						}
@@ -503,15 +516,16 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				// Loop on each lines
 				$pageposbeforeprintlines = $pdf->getPage();
 				$pagenb = $pageposbeforeprintlines;
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -522,23 +536,27 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
+					if (!empty($imglinesize['width']) && !empty($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 						$pdf->AddPage('', '', true);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
 
 						// Allows data in the first page if description is long enough to break in multiples pages
-						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 							$showpricebeforepagebreak = 1;
-						else $showpricebeforepagebreak = 0;
+						} else {
+							$showpricebeforepagebreak = 0;
+						}
 					}
 
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
-					{
+					if (!empty($imglinesize['width']) && !empty($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
 						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
@@ -548,35 +566,35 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$curX = $this->posxdesc - 1;
 					$showpricebeforepagebreak = 1;
 
-					if ($this->getColumnStatus('desc'))
-					{
+					if ($this->getColumnStatus('desc')) {
 						$pdf->startTransaction();
 						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc, 1);
 
 						$pageposafter = $pdf->getPage();
-						if ($pageposafter > $pageposbefore)	// There is a pagebreak
-						{
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc, 1);
 
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-							{
-								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-								{
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
-									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
 									//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 									$pdf->setPage($pageposafter + 1);
 								}
 							} else {
 								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
-								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 									$showpricebeforepagebreak = 1;
-								else $showpricebeforepagebreak = 0;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
 							}
 						} else // No pagebreak
 						{
@@ -599,16 +617,14 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// VAT Rate
-					if ($this->getColumnStatus('vat'))
-					{
+					if ($this->getColumnStatus('vat')) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Unit price before discount
-					if ($this->getColumnStatus('subprice'))
-					{
+					if ($this->getColumnStatus('subprice')) {
 						$up_excl_tax = pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'subprice', $up_excl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -616,8 +632,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 					// Quantity
 					// Enough for 6 chars
-					if ($this->getColumnStatus('qty'))
-					{
+					if ($this->getColumnStatus('qty')) {
 						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -625,24 +640,21 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 
 					// Unit
-					if ($this->getColumnStatus('unit'))
-					{
+					if ($this->getColumnStatus('unit')) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Discount on line
-					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent)
-					{
+					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent) {
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
 					// Total HT line
-					if ($this->getColumnStatus('totalexcltax'))
-					{
+					if ($this->getColumnStatus('totalexcltax')) {
 						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
 						$this->printStdColumnContent($pdf, $curY, 'totalexcltax', $total_excl_tax);
 						$nexY = max($pdf->GetY(), $nexY);
@@ -651,8 +663,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-							if ($this->getColumnStatus($extrafieldColKey))
-							{
+							if ($this->getColumnStatus($extrafieldColKey)) {
 								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 								$nexY = max($pdf->GetY(), $nexY);
@@ -673,8 +684,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
@@ -683,36 +697,48 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if (!empty($object->remise_percent)) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if (!empty($object->remise_percent)) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if (!empty($object->remise_percent)) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if (!empty($object->remise_percent)) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if (!empty($object->remise_percent)) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if (!empty($object->remise_percent)) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $mysoc, $object->thirdparty);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
+					if ($localtax1_type && $localtax1ligne != 0) {
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) {
+						$nexY = $posYAfterImage;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -721,11 +747,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					}
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == $pageposbeforeprintlines)
-						{
+						if ($pagenb == $pageposbeforeprintlines) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -734,12 +758,12 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == $pageposafter)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -747,15 +771,18 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == $pageposbeforeprintlines)
-				{
+				if ($pagenb == $pageposbeforeprintlines) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -770,14 +797,15 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
-				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
-				{
+				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included) {
 					$posy = $this->_tableau_versements($pdf, $object, $posy, $outputlangs);
 				}
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -788,14 +816,14 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -844,8 +872,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// If France, show VAT mention if not applicable
-		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj))
-		{
+		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
@@ -856,8 +883,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$posxval = 52;
 
 		// Show payments conditions
-		if (!empty($object->cond_reglement_code) || $object->cond_reglement)
-		{
+		if (!empty($object->cond_reglement_code) || $object->cond_reglement) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
@@ -872,9 +898,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$posy = $pdf->GetY() + 3;
 		}
 
-	  	// Show payment mode
-		if (!empty($object->mode_reglement_code))
-		{
+		// Show payment mode
+		if (!empty($object->mode_reglement_code)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentMode").':';
@@ -917,8 +942,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -939,10 +963,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetFillColor(248, 248, 248);
 
 		$this->atleastoneratenotnull = 0;
-		foreach ($this->tva as $tvakey => $tvaval)
-		{
-			if ($tvakey > 0)    // On affiche pas taux 0
-			{
+		foreach ($this->tva as $tvakey => $tvaval) {
+			if ($tvakey > 0) {    // On affiche pas taux 0
 				$this->atleastoneratenotnull++;
 
 				$index++;
@@ -950,8 +972,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 				$tvacompl = '';
 
-				if (preg_match('/\*/', $tvakey))
-				{
+				if (preg_match('/\*/', $tvakey)) {
 					$tvakey = str_replace('*', '', $tvakey);
 					$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 				}
@@ -964,8 +985,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
 			}
 		}
-		if (!$this->atleastoneratenotnull) // If no vat at all
-		{
+		if (!$this->atleastoneratenotnull) { // If no vat at all
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', 1);
@@ -974,8 +994,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
 
 			// Total LocalTax1
-			if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on' && $object->total_localtax1 > 0)
-			{
+			if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on' && $object->total_localtax1 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', 1);
@@ -984,8 +1003,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			}
 
 			// Total LocalTax2
-			if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on' && $object->total_localtax2 > 0)
-			{
+			if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on' && $object->total_localtax2 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', 1);
@@ -996,22 +1014,20 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 				//Local tax 1
-			foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-			{
-				if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+			foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+				if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+					continue;
+				}
 
-				foreach ($localtax_rate as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($localtax_rate as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						//$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1028,22 +1044,20 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 			//{
 				//Local tax 2
-			foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-			{
-				if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+			foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+				if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+					continue;
+				}
 
-				foreach ($localtax_rate as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($localtax_rate as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						//$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -1077,10 +1091,11 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
-		if ($deja_regle > 0)
-		{
+		if ($deja_regle > 0) {
 			// Already paid + Deposits
 			$index++;
 
@@ -1126,7 +1141,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1135,8 +1152,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
@@ -1153,9 +1169,10 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		foreach ($this->cols as $colKey => $colDef)
-		{
-			if (!$this->getColumnStatus($colKey)) continue;
+		foreach ($this->cols as $colKey => $colDef) {
+			if (!$this->getColumnStatus($colKey)) {
+				continue;
+			}
 
 			// get title label
 			$colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
@@ -1165,8 +1182,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 				$pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
 			}
 
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($colDef['xStartPos'] + $colDef['title']['padding'][3], $tab_top + $colDef['title']['padding'][0]);
 
 				$textWidth = $colDef['width'] - $colDef['title']['padding'][3] - $colDef['title']['padding'][1];
@@ -1204,7 +1220,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		//Affiche le filigrane brouillon - Print Draft Watermark
 		/*if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
 		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
 		}*/
 		//Print content
 
@@ -1218,10 +1234,8 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -1242,8 +1256,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$pdf->MultiCell(100, 3, $title, '', 'R');
 		$posy += 1;
 
-		if ($object->ref_supplier)
-		{
+		if ($object->ref_supplier) {
 			$posy += 4;
 			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->SetXY($posx, $posy);
@@ -1254,11 +1267,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 4;
 				$pdf->SetXY($posx, $posy);
 				$langs->load("projects");
@@ -1267,8 +1278,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			}
 		}
 
-		if (!empty($object->date_commande))
-		{
+		if (!empty($object->date_commande)) {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1282,16 +1292,16 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 		$pdf->SetTextColor(0, 0, 60);
 		$usehourmin = 'day';
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
-		if (!empty($object->delivery_date))
-		{
+		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+			$usehourmin = 'dayhour';
+		}
+		if (!empty($object->delivery_date)) {
 			$posy += 4;
 			$pdf->SetXY($posx - 90, $posy);
 			$pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->delivery_date, $usehourmin, false, $outputlangs, true), '', 'R');
 		}
 
-		if ($object->thirdparty->code_fournisseur)
-		{
+		if ($object->thirdparty->code_fournisseur) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1299,11 +1309,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -1320,19 +1328,16 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
 			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$object->fetch_user($arrayidcontact[0]);
 				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
 			}
@@ -1342,7 +1347,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -1371,8 +1378,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			// If CUSTOMER contact defined on order, we use it. Note: Even if this is a supplier object, the code for external contat that follow order is 'CUSTOMER'
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1390,10 +1396,14 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
@@ -1464,22 +1474,22 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		);
 
 		/*
-	     * For exemple
-	     $this->cols['theColKey'] = array(
-	     'rank' => $rank, // int : use for ordering columns
-	     'width' => 20, // the column width in mm
-	     'title' => array(
-	     'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	     'label' => ' ', // the final label : used fore final generated text
-	     'align' => 'L', // text alignement :  R,C,L
-	     'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	     ),
-	     'content' => array(
-	     'align' => 'L', // text alignement :  R,C,L
-	     'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	     ),
-	     );
-	     */
+		 * For exemple
+		 $this->cols['theColKey'] = array(
+		 'rank' => $rank, // int : use for ordering columns
+		 'width' => 20, // the column width in mm
+		 'title' => array(
+		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+		 'label' => ' ', // the final label : used fore final generated text
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 'content' => array(
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 );
+		 */
 
 		$rank = 0; // do not use negative rank
 		$this->cols['desc'] = array(
@@ -1514,8 +1524,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE))
-		{
+		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE)) {
 			$this->cols['photo']['status'] = true;
 		}
 
@@ -1531,8 +1540,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			'border-left' => true, // add left line separator
 		);
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
 			$this->cols['vat']['status'] = true;
 		}
 
@@ -1612,11 +1620,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		);
 
 		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-		if ($reshook < 0)
-		{
+		if ($reshook < 0) {
 			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-		} elseif (empty($reshook))
-		{
+		} elseif (empty($reshook)) {
 			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
 		} else {
 			$this->cols = $hookmanager->resArray;
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index 99e76b20337..bccf6c75195 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -57,9 +57,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 	public $description;
 
 	/**
-     * @var int 	Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
 	 * @var string document type
@@ -161,15 +161,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
 
 		// Define position of columns
 		$this->posxdesc = $this->marge_gauche + 1;
 		$this->posxdiscount = 162;
 		$this->postotalht = 174;
 
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$this->posxtva = 95;
 			$this->posxup = 114;
 			$this->posxqty = 132;
@@ -181,10 +182,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$this->posxunit = 162;
 		}
 
-		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxup = $this->posxtva; // posxtva is picture position reference
+		if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
+			$this->posxup = $this->posxtva; // posxtva is picture position reference
+		}
 		$this->posxpicture = $this->posxtva - (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH); // width of images
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxpicture -= 20;
 			$this->posxtva -= 20;
 			$this->posxup -= 20;
@@ -219,9 +221,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		// phpcs:enable
 		global $user, $langs, $conf, $hookmanager, $mysoc, $nblines;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "dict", "products"));
@@ -230,17 +236,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		// Loop on each lines to detect if there is at least one image to show
 		$realpatharray = array();
-		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE))
-		{
-			for ($i = 0; $i < $nblines; $i++)
-			{
-				if (empty($object->lines[$i]->fk_product)) continue;
+		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE)) {
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) {
+					continue;
+				}
 
 				$objphoto = new Product($this->db);
 				$objphoto->fetch($object->lines[$i]->fk_product);
 
-				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
-				{
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
 					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
 					$dir = $conf->product->dir_output.'/'.$pdir;
 				} else {
@@ -249,21 +254,23 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				}
 
 				$realpath = '';
-				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
-				{
+				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
 					$filename = $obj['photo'];
 					//if ($obj['photo_vignette']) $filename='thumbs/'.$obj['photo_vignette'];
 					$realpath = $dir.$filename;
 					break;
 				}
 
-				if ($realpath) $realpatharray[$i] = $realpath;
+				if ($realpath) {
+					$realpatharray[$i] = $realpath;
+				}
 			}
 		}
-		if (count($realpatharray) == 0) $this->posxpicture = $this->posxtva;
+		if (count($realpatharray) == 0) {
+			$this->posxpicture = $this->posxtva;
+		}
 
-		if ($conf->fournisseur->commande->dir_output)
-		{
+		if ($conf->fournisseur->commande->dir_output) {
 			$object->fetch_thirdparty();
 
 			$deja_regle = 0;
@@ -273,8 +280,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			//$amount_deposits_included = $object->getSumDepositsUsed();
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->fournisseur->commande->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -282,23 +288,21 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->commande->dir_output.'/'.$objectref;
 				$file = $dir."/".$objectref.".pdf";
-				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				}
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -314,18 +318,18 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -339,20 +343,19 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// Positionne $this->atleastonediscount si on a au moins une remise
-				for ($i = 0; $i < $nblines; $i++)
-				{
-					if ($object->lines[$i]->remise_percent)
-					{
+				for ($i = 0; $i < $nblines; $i++) {
+					if ($object->lines[$i]->remise_percent) {
 						$this->atleastonediscount++;
 					}
 				}
-				if (empty($this->atleastonediscount))
-				{
+				if (empty($this->atleastonediscount)) {
 					$delta = ($this->postotalht - $this->posxdiscount);
 					$this->posxpicture += $delta;
 					$this->posxtva += $delta;
@@ -365,7 +368,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -376,11 +381,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
-				if (!empty($conf->incoterm->enabled))
-				{
+				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
-					if ($desc_incoterms)
-					{
+					if ($desc_incoterms) {
 						$tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
@@ -397,8 +400,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				}
 
 				// Affiche notes
-				if (!empty($object->note_public))
-				{
+				if (!empty($object->note_public)) {
 					$tab_top -= 2;
 
 					$pdf->SetFont('', '', $default_font_size - 1);
@@ -418,15 +420,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
 
 					// Define size of image if we need it
 					$imglinesize = array();
-					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
 
 					$pdf->setTopMargin($tab_top_newpage);
 					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
@@ -437,23 +440,27 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-					{
+					if (!empty($imglinesize['width']) && !empty($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
 						$pdf->AddPage('', '', true);
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 						$pdf->setPage($pageposbefore + 1);
 
 						$curY = $tab_top_newpage;
 
 						// Allows data in the first page if description is long enough to break in multiples pages
-						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 							$showpricebeforepagebreak = 1;
-						else $showpricebeforepagebreak = 0;
+						} else {
+							$showpricebeforepagebreak = 0;
+						}
 					}
 
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height']))
-					{
+					if (!empty($imglinesize['width']) && !empty($imglinesize['height'])) {
 						$curX = $this->posxpicture - 1;
 						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva - $this->posxpicture - $imglinesize['width']) / 2), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
 						// $pdf->Image does not increase value return by getY, so we save it manually
@@ -464,8 +471,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$showpricebeforepagebreak = 1;
 
 					$pdf->startTransaction();
-					if ($posYAfterImage > 0)
-					{
+					if ($posYAfterImage > 0) {
 						$descWidth = $this->posxpicture - $curX;
 					} else {
 						$descWidth = $this->posxtva - $curX;
@@ -473,29 +479,32 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
 
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $descWidth, 3, $curX, $curY, $hideref, $hidedesc, 1);
 						$posyafter = $pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -516,8 +525,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
 					// VAT Rate
-					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-					{
+					if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
 						$pdf->SetXY($this->posxtva, $curY);
 						$pdf->MultiCell($this->posxup - $this->posxtva - 1, 3, $vat_rate, 0, 'R');
@@ -534,8 +542,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->MultiCell($this->posxunit - $this->posxqty - 0.8, 4, $qty, 0, 'R'); // Enough for 6 chars
 
 					// Unit
-					if (!empty($conf->global->PRODUCT_USE_UNITS))
-					{
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
 						$pdf->SetXY($this->posxunit, $curY);
 						$pdf->MultiCell($this->posxdiscount - $this->posxunit - 0.8, 4, $unit, 0, 'L');
@@ -543,8 +550,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 					// Discount on line
 					$pdf->SetXY($this->posxdiscount, $curY);
-					if ($object->lines[$i]->remise_percent)
-					{
+					if ($object->lines[$i]->remise_percent) {
 						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht - $this->posxdiscount - 1, 3, $remise_percent, 0, 'R');
 					}
@@ -555,8 +561,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
 					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
-					else $tvaligne = $object->lines[$i]->total_tva;
+					if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+						$tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					} else {
+						$tvaligne = $object->lines[$i]->total_tva;
+					}
 
 					$localtax1ligne = $object->lines[$i]->total_localtax1;
 					$localtax2ligne = $object->lines[$i]->total_localtax2;
@@ -565,36 +574,48 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$localtax1_type = $object->lines[$i]->localtax1_type;
 					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-					if (!empty($object->remise_percent)) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-					if (!empty($object->remise_percent)) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-					if (!empty($object->remise_percent)) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if (!empty($object->remise_percent)) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if (!empty($object->remise_percent)) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if (!empty($object->remise_percent)) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
 
 					$vatrate = (string) $object->lines[$i]->tva_tx;
 
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-					{
+					&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
 						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $mysoc, $object->thirdparty);
 						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
 						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
 					}
 
 					// retrieve global local tax
-					if ($localtax1_type && $localtax1ligne != 0)
+					if ($localtax1_type && $localtax1ligne != 0) {
 						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-					if ($localtax2_type && $localtax2ligne != 0)
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
 						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
 					$this->tva[$vatrate] += $tvaligne;
 
-					if ($posYAfterImage > $posYAfterDescription) $nexY = $posYAfterImage;
+					if ($posYAfterImage > $posYAfterDescription) {
+						$nexY = $posYAfterImage;
+					}
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -605,11 +626,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -618,12 +637,12 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
@@ -631,15 +650,18 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -654,14 +676,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
-				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
-				{
+				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included) {
 					$posy = $this->_tableau_versements($pdf, $object, $posy, $outputlangs);
 				}
 
 				// Pied de page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -672,14 +695,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -797,8 +820,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$col2x -= 20;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
@@ -819,10 +841,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetFillColor(248, 248, 248);
 
 		$this->atleastoneratenotnull = 0;
-		foreach ($this->tva as $tvakey => $tvaval)
-		{
-			if ($tvakey > 0)    // On affiche pas taux 0
-			{
+		foreach ($this->tva as $tvakey => $tvaval) {
+			if ($tvakey > 0) {    // On affiche pas taux 0
 				$this->atleastoneratenotnull++;
 
 				$index++;
@@ -830,8 +850,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 				$tvacompl = '';
 
-				if (preg_match('/\*/', $tvakey))
-				{
+				if (preg_match('/\*/', $tvakey)) {
 					$tvakey = str_replace('*', '', $tvakey);
 					$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 				}
@@ -844,8 +863,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval), 0, 'R', 1);
 			}
 		}
-		if (!$this->atleastoneratenotnull) // If no vat at all
-		{
+		if (!$this->atleastoneratenotnull) { // If no vat at all
 			$index++;
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code), 0, 'L', 1);
@@ -854,8 +872,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_tva), 0, 'R', 1);
 
 			// Total LocalTax1
-			if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on' && $object->total_localtax1 > 0)
-			{
+			if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION == 'localtax1on' && $object->total_localtax1 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code), 0, 'L', 1);
@@ -864,8 +881,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			}
 
 			// Total LocalTax2
-			if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on' && $object->total_localtax2 > 0)
-			{
+			if (!empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION == 'localtax2on' && $object->total_localtax2 > 0) {
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code), 0, 'L', 1);
@@ -876,22 +892,20 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) && $conf->global->FACTURE_LOCAL_TAX1_OPTION=='localtax1on')
 			//{
 				//Local tax 1
-			foreach ($this->localtax1 as $localtax_type => $localtax_rate)
-			{
-				if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+			foreach ($this->localtax1 as $localtax_type => $localtax_rate) {
+				if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+					continue;
+				}
 
-				foreach ($localtax_rate as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($localtax_rate as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						//$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -908,22 +922,20 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 			//{
 				//Local tax 2
-			foreach ($this->localtax2 as $localtax_type => $localtax_rate)
-			{
-				if (in_array((string) $localtax_type, array('2', '4', '6'))) continue;
+			foreach ($this->localtax2 as $localtax_type => $localtax_rate) {
+				if (in_array((string) $localtax_type, array('2', '4', '6'))) {
+					continue;
+				}
 
-				foreach ($localtax_rate as $tvakey => $tvaval)
-				{
-					if ($tvakey != 0)    // On affiche pas taux 0
-					{
+				foreach ($localtax_rate as $tvakey => $tvaval) {
+					if ($tvakey != 0) {    // On affiche pas taux 0
 						//$this->atleastoneratenotnull++;
 
 						$index++;
 						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
 						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey))
-						{
+						if (preg_match('/\*/', $tvakey)) {
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
@@ -957,10 +969,11 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
 		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
-		if (!empty($object->paye)) $resteapayer = 0;
+		if (!empty($object->paye)) {
+			$resteapayer = 0;
+		}
 
-		if ($deja_regle > 0)
-		{
+		if ($deja_regle > 0) {
 			// Already paid + Deposits
 			$index++;
 
@@ -1006,7 +1019,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1015,14 +1030,15 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size - 2);
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
 			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
-			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, 5, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
@@ -1031,34 +1047,29 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		// Output Rect
 		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
 
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line takes a position y in 2nd parameter and 4th parameter
 
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell(108, 2, $outputlangs->transnoentities("Designation"), '', 'L');
 		}
 
-		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
-		{
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$pdf->line($this->posxtva, $tab_top, $this->posxtva, $tab_top + $tab_height);
-			if (empty($hidetop))
-			{
+			if (empty($hidetop)) {
 				$pdf->SetXY($this->posxtva - 3, $tab_top + 1);
 				$pdf->MultiCell($this->posxup - $this->posxtva + 3, 2, $outputlangs->transnoentities("VAT"), '', 'C');
 			}
 		}
 
 		$pdf->line($this->posxup, $tab_top, $this->posxup, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxqty - $this->posxup - 1, 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
 		}
 
 		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
 			$pdf->MultiCell($this->posxunit - $this->posxqty - 1, 2, $outputlangs->transnoentities("Qty"), '', 'C');
 		}
@@ -1072,21 +1083,17 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		}
 
 		$pdf->line($this->posxdiscount - 1, $tab_top, $this->posxdiscount - 1, $tab_top + $tab_height);
-		if (empty($hidetop))
-		{
-			if ($this->atleastonediscount)
-			{
+		if (empty($hidetop)) {
+			if ($this->atleastonediscount) {
 				$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
 				$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("ReductionShort"), '', 'C');
 			}
 		}
 
-		if ($this->atleastonediscount)
-		{
+		if ($this->atleastonediscount) {
 			$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
 		}
-		if (empty($hidetop))
-		{
+		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
 			$pdf->MultiCell(30, 2, $outputlangs->transnoentities("TotalHTShort"), '', 'C');
 		}
@@ -1117,7 +1124,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		//Affiche le filigrane brouillon - Print Draft Watermark
 		/*if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
 		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
 		}*/
 		//Print content
 
@@ -1131,10 +1138,8 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$this->emetteur->logo;
-		if ($this->emetteur->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($this->emetteur->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -1155,8 +1160,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$pdf->MultiCell(100, 3, $title, '', 'R');
 		$posy += 1;
 
-		if ($object->ref_supplier)
-		{
+		if ($object->ref_supplier) {
 			$posy += 4;
 			$pdf->SetFont('', 'B', $default_font_size);
 			$pdf->SetXY($posx, $posy);
@@ -1167,11 +1171,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		if (!empty($conf->global->PDF_SHOW_PROJECT))
-		{
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
 			$object->fetch_projet();
-			if (!empty($object->project->ref))
-			{
+			if (!empty($object->project->ref)) {
 				$posy += 4;
 				$pdf->SetXY($posx, $posy);
 				$langs->load("projects");
@@ -1180,8 +1182,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			}
 		}
 
-		if (!empty($object->date_commande))
-		{
+		if (!empty($object->date_commande)) {
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1195,16 +1196,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 		$pdf->SetTextColor(0, 0, 60);
 		$usehourmin = 'day';
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
-		if (!empty($object->delivery_date))
-		{
+		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+			$usehourmin = 'dayhour';
+		}
+		if (!empty($object->delivery_date)) {
 			$posy += 4;
 			$pdf->SetXY($posx - 90, $posy);
 			$pdf->MultiCell(190, 3, $outputlangs->transnoentities("DateDeliveryPlanned")." : ".dol_print_date($object->delivery_date, $usehourmin, false, $outputlangs, true), '', 'R');
 		}
 
-		if ($object->thirdparty->code_fournisseur)
-		{
+		if ($object->thirdparty->code_fournisseur) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
@@ -1212,11 +1213,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		}
 
 		// Get contact
-		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
-		{
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usertmp = new User($this->db);
 				$usertmp->fetch($arrayidcontact[0]);
 				$posy += 4;
@@ -1233,19 +1232,16 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		// Show list of linked objects
 		$current_y = $pdf->getY();
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-		if ($current_y < $pdf->getY())
-		{
+		if ($current_y < $pdf->getY()) {
 			$top_shift = $pdf->getY() - $current_y;
 		}
 
-		if ($showaddress)
-		{
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = '';
 			// Add internal contact of proposal if defined
 			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$object->fetch_user($arrayidcontact[0]);
 				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";
 			}
@@ -1255,7 +1251,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			// Show sender
 			$posy = 42 + $top_shift;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -1283,8 +1281,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 			// If CUSTOMER contact defined on order, we use it. Note: Even if this is a supplier object, the code for external contat that follow order is 'CUSTOMER'
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-			if (count($arrayidcontact) > 0)
-			{
+			if (count($arrayidcontact) > 0) {
 				$usecontact = true;
 				$result = $object->fetch_contact($arrayidcontact[0]);
 			}
@@ -1302,10 +1299,14 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 
 			// Show recipient
 			$widthrecbox = 100;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42 + $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
index 056b9c2c15e..ae33e2875f5 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_muguet.php
@@ -64,7 +64,9 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	{
 		global $conf;
 
-		if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) $this->prefix = 'PO'; // We use correct standard code "PO = Purchase Order"
+		if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 5.0) {
+			$this->prefix = 'PO'; // We use correct standard code "PO = Purchase Order"
+		}
 	}
 
 	/**
@@ -75,7 +77,7 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -108,13 +110,13 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
 		$sql .= " AND entity = ".$conf->entity;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if (!$coyymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			return true;
 		} else {
 			$langs->load("errors");
@@ -142,20 +144,27 @@ class mod_commande_fournisseur_muguet extends ModeleNumRefSuppliersOrders
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		}
 
 		//$date=time();
 		$date = $object->date_commande; // Not always defined
-		if (empty($date)) $date = $object->date; // Creation date is order date for suppliers orders
+		if (empty($date)) {
+			$date = $object->date; // Creation date is order date for suppliers orders
+		}
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		return $this->prefix.$yymm."-".$num;
 	}
diff --git a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
index 7fa99bd7453..a609eeade08 100644
--- a/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
+++ b/htdocs/core/modules/supplier_order/mod_commande_fournisseur_orchidee.php
@@ -111,8 +111,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -134,8 +133,7 @@ class mod_commande_fournisseur_orchidee extends ModeleNumRefSuppliersOrders
 		// On defini critere recherche compteur
 		$mask = $conf->global->COMMANDE_FOURNISSEUR_ORCHIDEE_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index d7d28afa9e8..6fe3cb8883d 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -137,10 +137,18 @@ abstract class ModeleNumRefSuppliersOrders
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index 0dbe2d84614..18d597eb8ba 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -54,9 +54,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	public $description;
 
 	/**
-     * @var int 	Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
 	 * @var string document type
@@ -158,8 +158,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$this->posxtotalttc = 180;
 
 		//if (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) $this->posxtva=$this->posxup;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
+		if ($this->page_largeur < 210) { // To work with US executive format
 			$this->posxreffacturefourn -= 20;
 			$this->posxreffacture -= 20;
 			$this->posxtype -= 20;
@@ -176,7 +175,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -197,17 +198,20 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "suppliers", "companies", "bills", "dict", "products"));
 
 		$object->factures = array();
 
-		if ($conf->fournisseur->payment->dir_output)
-		{
+		if ($conf->fournisseur->payment->dir_output) {
 			$object->fetch_thirdparty();
 			/**
 			 *	Supplier invoice list
@@ -218,10 +222,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
 			$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if ($this->db->num_rows($resql) > 0)
-				{
+			if ($resql) {
+				if ($this->db->num_rows($resql) > 0) {
 					while ($objp = $this->db->fetch_object($resql)) {
 						$objp->type = $outputlangs->trans('SupplierInvoice');
 						$object->lines[] = $objp;
@@ -232,8 +234,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			$total = $object->amount;
 
 			// Definition of $dir and $file
-			if ($object->specimen)
-			{
+			if ($object->specimen) {
 				$dir = $conf->fournisseur->payment->dir_output;
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
@@ -241,23 +242,21 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$objectrefsupplier = dol_sanitizeFileName($object->ref_supplier);
 				$dir = $conf->fournisseur->payment->dir_output.'/'.$objectref;
 				$file = $dir."/".$objectref.".pdf";
-				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) $file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				if (!empty($conf->global->SUPPLIER_REF_IN_NAME)) {
+					$file = $dir."/".$objectref.($objectrefsupplier ? "_".$objectrefsupplier : "").".pdf";
+				}
 			}
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				// Add pdfgeneration hook
-				if (!is_object($hookmanager))
-				{
+				if (!is_object($hookmanager)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 					$hookmanager = new HookManager($this->db);
 				}
@@ -273,18 +272,18 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$heightforinfotot = 50; // Height reserved to output the info and total part
 				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
 				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
-				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) $heightforfooter += 6;
+				if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS)) {
+					$heightforfooter += 6;
+				}
 				$pdf->SetAutoPageBreak(1, 0);
 
-				if (class_exists('TCPDF'))
-				{
+				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
 					$pdf->setPrintFooter(false);
 				}
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
-				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-				{
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
 					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
 					$tplidx = $pdf->importPage(1);
 				}
@@ -298,14 +297,18 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Order")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 
 				// New page
 				$pdf->AddPage();
-				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -327,8 +330,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$nexY = $tab_top + 7;
 
 				// Loop on each lines
-				for ($i = 0; $i < $nblines; $i++)
-				{
+				for ($i = 0; $i < $nblines; $i++) {
 					$curY = $nexY;
 					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 					$pdf->SetTextColor(0, 0, 0);
@@ -345,8 +347,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 					//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,3,$curX,$curY,$hideref,$hidedesc,1);
 					$pdf->writeHTMLCell($this->posxtva - $curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J', true);
 					$pageposafter = $pdf->getPage();
-					if ($pageposafter > $pageposbefore)	// There is a pagebreak
-					{
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 						$pdf->rollbackTransaction(true);
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
@@ -354,21 +355,25 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						//pdf_writelinedesc($pdf,$object,$i,$outputlangs,$this->posxtva-$curX,4,$curX,$curY,$hideref,$hidedesc,1);
 						$pdf->writeHTMLCell($this->posxtva - $curX, 4, $curX, $curY, $object->lines[$i]->datef, 0, 1, false, true, 'J', true);
 						$posyafter = $pdf->GetY();
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-						{
-							if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-							{
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 								$pdf->AddPage('', '', true);
-								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								if (!empty($tplidx)) {
+									$pdf->useTemplate($tplidx);
+								}
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+									$this->_pagehead($pdf, $object, 0, $outputlangs);
+								}
 								$pdf->setPage($pageposafter + 1);
 							}
 						} else {
 							// We found a page break
 							// Allows data in the first page if description is long enough to break in multiples pages
-							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
 								$showpricebeforepagebreak = 1;
-							else $showpricebeforepagebreak = 0;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
 					} else // No pagebreak
 					{
@@ -414,8 +419,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 
 					// Add line
-					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1))
-					{
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
 						$pdf->setPage($pageposafter);
 						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
 						//$pdf->SetDrawColor(190,190,200);
@@ -426,11 +430,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
 					$nexY += 2; // Add space between lines
 
 					// Detect if some page were added automatically and output _tableau for past pages
-					while ($pagenb < $pageposafter)
-					{
+					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
-						if ($pagenb == 1)
-						{
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -439,12 +441,12 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
-					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak)
-					{
-						if ($pagenb == 1)
-						{
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
 							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
 						} else {
 							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
@@ -452,15 +454,18 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
 						$pdf->AddPage();
-						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 						$pagenb++;
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
 					}
 				}
 
 				// Show square
-				if ($pagenb == 1)
-				{
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				} else {
@@ -476,7 +481,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 				// Footer page
 				$this->_pagefoot($pdf, $object, $outputlangs);
-				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -487,14 +494,14 @@ class pdf_standard extends ModelePDFSuppliersPayments
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
 				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0)
-				{
+				if ($reshook < 0) {
 					$this->error = $hookmanager->error;
 					$this->errors = $hookmanager->errors;
 				}
 
-				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));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
@@ -588,7 +595,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 		// Force to disable hidetop and hidebottom
 		$hidebottom = 0;
-		if ($hidetop) $hidetop = -1;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -645,10 +654,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 		// Logo
 		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->logo)
-		{
-			if (is_readable($logo))
-			{
+		if ($mysoc->logo) {
+			if (is_readable($logo)) {
 				$height = pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			} else {
@@ -670,11 +677,11 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 		if ($object->ref_supplier)
 		{
-    		$posy+=4;
+			$posy+=4;
 			$pdf->SetFont('','B', $default_font_size);
-    		$pdf->SetXY($posx,$posy);
+			$pdf->SetXY($posx,$posy);
 			$pdf->SetTextColor(0,0,60);
-    		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefSupplier")." : " . $object->ref_supplier, '', 'R');
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("RefSupplier")." : " . $object->ref_supplier, '', 'R');
 			$posy+=1;
 		}
 
@@ -685,9 +692,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
 			$object->fetch_projet();
 			if (! empty($object->project->ref))
 			{
-        		$posy+=4;
+				$posy+=4;
 				$pdf->SetXY($posx,$posy);
-        		$langs->load("projects");
+				$langs->load("projects");
 				$pdf->SetTextColor(0,0,60);
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Project")." : " . (empty($object->project->ref)?'':$object->projet->ref), '', 'R');
 			}
@@ -721,16 +728,17 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 		// Show list of linked objects
 		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
-        */
-		if ($showaddress)
-		{
+		*/
+		if ($showaddress) {
 			// Sender properties
 			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty);
 
 			// Show payer
 			$posy = 42;
 			$posx = $this->marge_gauche;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->page_largeur - $this->marge_droite - 80;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
 			$hautcadre = 40;
 
 			// Show sender frame
@@ -765,10 +773,14 @@ class pdf_standard extends ModelePDFSuppliersPayments
 
 			// Show recipient
 			$widthrecbox = 90;
-			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
 			$posy = 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
-			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
 
 			// Show recipient frame
 			$pdf->SetTextColor(0, 0, 0);
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
index 394ac684485..8f3b7ad36df 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_brodator.php
@@ -101,15 +101,14 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$mysoc->code_client = 'CCCCCCCCCC';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -131,8 +130,7 @@ class mod_supplier_payment_brodator extends ModeleNumRefSupplierPayments
 		// We get cursor rule
 		$mask = $conf->global->SUPPLIER_PAYMENT_BRODATOR_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
index 8a315399183..7dae12ee64e 100644
--- a/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
+++ b/htdocs/core/modules/supplier_payment/mod_supplier_payment_bronan.php
@@ -63,7 +63,7 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -97,13 +97,13 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $payyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$payyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm))
-		{
+		if ($payyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $payyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -131,11 +131,13 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			return -1;
@@ -145,8 +147,11 @@ class mod_supplier_payment_bronan extends ModeleNumRefSupplierPayments
 		$date = $object->datepaye;
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog(__METHOD__." return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
index 0d4cbaff529..b1b8e999ce9 100644
--- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -131,10 +131,15 @@ abstract class ModeleNumRefSupplierPayments
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		elseif ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		elseif ($this->version == 'dolibarr') return DOL_VERSION;
-		elseif ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		} elseif ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		} elseif ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		} elseif ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index e54d9db3076..e9280b346e1 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -97,7 +97,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -121,8 +123,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
+		if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0) {
 			$texte .= '<input type="hidden" name="param2" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED">';
@@ -134,17 +135,19 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -163,8 +166,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH))
-		{
+		if (!empty($conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -172,17 +174,15 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 			$texte .= '</b>';
 		}
 
-		if ($nbofiles)
-		{
-   			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
-   			// Show list of found files
-   			foreach ($listoffiles as $file) {
-   				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=supplier_proposal/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
-   			}
-   			$texte .= '</div>';
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=supplier_proposal/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
 
-			if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0)
-			{
+			if ($conf->global->MAIN_SUPPLIER_PROPOSAL_CHOOSE_ODT_DOCUMENT > 0) {
 				// Model for creation
 				$list = ModelePDFSupplierProposal::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
@@ -237,38 +237,35 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "dict"));
 
-		if ($conf->supplier_proposal->dir_output)
-		{
+		if ($conf->supplier_proposal->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new SupplierProposal($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -278,20 +275,19 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 			$dir = $conf->supplier_proposal->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -302,10 +298,11 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -322,8 +319,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				// If BILLING contact defined on invoice, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'BILLING');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
@@ -358,8 +354,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'SUPPLIER_PROPOSAL_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -375,8 +370,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_INFO);
 					return -1;
@@ -391,8 +385,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
@@ -405,7 +398,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($substitutionarray, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -414,19 +409,19 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -435,32 +430,26 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
+					if ($foundtagforlines) {
 						$linenumber = 0;
-						foreach ($object->lines as $line)
-						{
+						foreach ($object->lines as $line) {
 							$linenumber++;
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									$listlines->setVars($key, $val, true, 'UTF-8');
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_INFO);
 								}
 							}
@@ -468,8 +457,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -477,12 +465,10 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
 				}
@@ -512,8 +498,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 36f589531e6..e8a3861541b 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -54,9 +54,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	public $description;
 
 	/**
-     * @var int 	Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
 	 * @var string document type
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
index 9daf788d92e..d61f6db2a36 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -65,7 +65,7 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 	public function info()
 	{
 		global $langs;
-	  	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
 	}
 
 
@@ -99,14 +99,14 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $pryymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$pryymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
 
-		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm))
-		{
+		if (!$pryymm || preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $pryymm)) {
 			return true;
 		} else {
 			$langs->load("errors");
@@ -134,11 +134,13 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
@@ -147,8 +149,11 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 		$date = time();
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
index 4abb7cb07f1..adf53aed4e6 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -104,15 +104,14 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 	 */
 	public function getExample()
 	{
-	 	global $conf, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
 		$old_code_client = $mysoc->code_client;
 		$mysoc->code_client = 'CCCCCCCCCC';
-	 	$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, '');
 		$mysoc->code_client = $old_code_client;
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = 'NotConfigured';
 		}
 		return $numExample;
@@ -134,8 +133,7 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 		// On defini critere recherche compteur
 		$mask = $conf->global->SUPPLIER_PROPOSAL_SAPHIR_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
index 195533b1ce1..0b6f0b3725d 100644
--- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -144,10 +144,18 @@ abstract class ModeleNumRefSupplierProposal
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index cac16178c92..940f9a165d9 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -87,10 +87,11 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 
 		$filename = $this->getFilename();
 
-		if (file_exists($filename) && is_writable($filename))
-		{
+		if (file_exists($filename) && is_writable($filename)) {
 			dol_syslog('admin/syslog: file '.$filename);
-		} else $errors[] = $langs->trans("ErrorFailedToOpenFile", $filename);
+		} else {
+			$errors[] = $langs->trans("ErrorFailedToOpenFile", $filename);
+		}
 
 		return $errors;
 	}
@@ -105,17 +106,17 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	{
 		global $conf;
 
-		if (empty($conf->global->SYSLOG_FILE)) $tmp = DOL_DATA_ROOT.'/dolibarr.log';
-		else $tmp = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+		if (empty($conf->global->SYSLOG_FILE)) {
+			$tmp = DOL_DATA_ROOT.'/dolibarr.log';
+		} else {
+			$tmp = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+		}
 
-		if (!empty($conf->global->SYSLOG_FILE_ONEPERSESSION))
-		{
-			if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 1)	// file depend on session key name (Note that session name is same for all users and is not a per user value)
-			{
+		if (!empty($conf->global->SYSLOG_FILE_ONEPERSESSION)) {
+			if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 1) {	// file depend on session key name (Note that session name is same for all users and is not a per user value)
 				$suffixinfilename .= '_'.session_name();
 			}
-			if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 2)	// file depend on session value sor per user
-			{
+			if ($conf->global->SYSLOG_FILE_ONEPERSESSION == 2) {	// file depend on session value sor per user
 				$suffixinfilename .= '_'.session_name().'_'.$_SERVER["REMOTE_ADDR"];
 			}
 		}
@@ -134,18 +135,21 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 	{
 		global $conf, $dolibarr_main_prod;
 
-		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_FILE)) return; // Global option to disable output of this handler
+		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_FILE)) {
+			return; // Global option to disable output of this handler
+		}
 
 		$logfile = $this->getFilename($suffixinfilename);
 
 		// Test constant SYSLOG_FILE_NO_ERROR (should stay a constant defined with define('SYSLOG_FILE_NO_ERROR',1);
-		if (defined('SYSLOG_FILE_NO_ERROR')) $filefd = @fopen($logfile, 'a+');
-		else $filefd = fopen($logfile, 'a+');
+		if (defined('SYSLOG_FILE_NO_ERROR')) {
+			$filefd = @fopen($logfile, 'a+');
+		} else {
+			$filefd = fopen($logfile, 'a+');
+		}
 
-		if (!$filefd)
-		{
-			if (!defined('SYSLOG_FILE_NO_ERROR') || !constant('SYSLOG_FILE_NO_ERROR'))
-			{
+		if (!$filefd) {
+			if (!defined('SYSLOG_FILE_NO_ERROR') || !constant('SYSLOG_FILE_NO_ERROR')) {
 				// Do not break dolibarr usage if log fails
 				//throw new Exception('Failed to open log file '.basename($logfile));
 				print 'Failed to open log file '.($dolibarr_main_prod ?basename($logfile) : $logfile);
@@ -163,8 +167,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 			);
 
 			$delay = "";
-			if (!empty($conf->global->MAIN_SYSLOG_SHOW_DELAY))
-			{
+			if (!empty($conf->global->MAIN_SYSLOG_SHOW_DELAY)) {
 				$now = microtime(true);
 				$delay = " ".sprintf("%05.3f", $this->lastTime != 0 ? $now - $this->lastTime : 0);
 				$this->lastTime = $now;
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 0ac23c0bda4..87cd89b2035 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -51,7 +51,9 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 		global $conf;
 
 		// This function does not exists on some ISP (Ex: Free in France)
-		if (!function_exists('openlog')) return 0;
+		if (!function_exists('openlog')) {
+			return 0;
+		}
 
 		return empty($conf->global->SYSLOG_DISABLE_LOGHANDLER_SYSLOG) ? 1 : 0; // Set SYSLOG_DISABLE_LOGHANDLER_SYSLOG to 1 to disable this loghandler
 	}
@@ -86,10 +88,11 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 		$errors = array();
 
 		$facility = constant($conf->global->SYSLOG_FACILITY);
-		if ($facility)
-		{
+		if ($facility) {
 			// Only LOG_USER supported on Windows
-			if (!empty($_SERVER["WINDIR"])) $facility = constant('LOG_USER');
+			if (!empty($_SERVER["WINDIR"])) {
+				$facility = constant('LOG_USER');
+			}
 
 			dol_syslog("admin/syslog: facility ".$facility);
 		} else {
@@ -109,12 +112,15 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
 	{
 		global $conf;
 
-		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) return; // Global option to disable output of this handler
+		if (!empty($conf->global->MAIN_SYSLOG_DISABLE_SYSLOG)) {
+			return; // Global option to disable output of this handler
+		}
 
-		if (!empty($conf->global->SYSLOG_FACILITY))  // Example LOG_USER
-		{
+		if (!empty($conf->global->SYSLOG_FACILITY)) {  // Example LOG_USER
 			$facility = constant($conf->global->SYSLOG_FACILITY);
-		} else $facility = constant('LOG_USER');
+		} else {
+			$facility = constant('LOG_USER');
+		}
 
 		// (int) is required to avoid error parameter 3 expected to be long
 		openlog('dolibarr', LOG_PID | LOG_PERROR, (int) $facility);
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
index 57e87006559..1b0a5d5bf32 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_simple.php
@@ -141,17 +141,22 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 		$resql = $db->query($sql);
 		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
 			return -1;
 		}
 
-		if ($mode == 'last')
-		{
-			if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
-			else $num = sprintf("%04s", $max);
+		if ($mode == 'last') {
+			if ($max >= (pow(10, 4) - 1)) {
+				$num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			} else {
+				$num = sprintf("%04s", $max);
+			}
 
 			$ref = '';
 			$sql  = "SELECT ref as ref";
@@ -163,21 +168,29 @@ class mod_takepos_ref_simple extends ModeleNumRefTakepos
 			$resql = $db->query($sql);
 			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if ($obj) $ref = $obj->ref;
-			} else dol_print_error($db);
+				if ($obj) {
+					$ref = $obj->ref;
+				}
+			} else {
+				dol_print_error($db);
+			}
 
 			return $ref;
-		} elseif ($mode == 'next')
-		{
+		} elseif ($mode == 'next') {
 			$date = $invoice->date; // This is invoice date (not creation date)
 			$yymm = strftime("%y%m", $date);
 
-			if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-			else $num = sprintf("%04s", $max + 1);
+			if ($max >= (pow(10, 4) - 1)) {
+				$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+			} else {
+				$num = sprintf("%04s", $max + 1);
+			}
 
 			dol_syslog(get_class($this)."::getNextValue return ".$this->prefix.$pos_source.'-'.$yymm.'-'.$num);
 			return $this->prefix.$pos_source.'-'.$yymm.'-'.$num;
-		} else dol_print_error('', 'Bad parameter for getNextValue');
+		} else {
+			dol_print_error('', 'Bad parameter for getNextValue');
+		}
 	}
 
 	/**
diff --git a/htdocs/core/modules/takepos/modules_takepos.php b/htdocs/core/modules/takepos/modules_takepos.php
index c2e40abbd10..b9fae565647 100644
--- a/htdocs/core/modules/takepos/modules_takepos.php
+++ b/htdocs/core/modules/takepos/modules_takepos.php
@@ -107,10 +107,18 @@ abstract class ModeleNumRefTakepos
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans('VersionDevelopment');
-		if ($this->version == 'experimental') return $langs->trans('VersionExperimental');
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans('VersionDevelopment');
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans('VersionExperimental');
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans('NotAvailable');
 	}
 }
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index 35afdcf7192..176cdd1191c 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -89,7 +89,9 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -121,17 +123,19 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->TICKET_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -149,8 +153,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		$texte .= '<br></div></div>';
 
 		// Scan directories
-		if (count($listofdir))
-		{
+		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
@@ -196,38 +199,35 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "dict"));
 
-		if ($conf->user->dir_output)
-		{
+		if ($conf->user->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new User($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -237,20 +237,19 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 
 			$dir = $conf->user->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -261,10 +260,11 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -281,15 +281,13 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 				// If CUSTOMER contact defined on user, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				if (!empty($usecontact))
-				{
+				if (!empty($usecontact)) {
 					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
@@ -313,8 +311,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_WARNING);
 					return -1;
@@ -327,7 +324,9 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($array_user, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -335,31 +334,29 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 				// Call the ODTSubstitution hook
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
@@ -389,8 +386,9 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index 47e9e8bccc5..cf39a523605 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -94,7 +94,9 @@ class doc_generic_user_odt extends ModelePDFUser
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -118,8 +120,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="USER_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
+		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
 			$texte .= '<input type="hidden" name="param2" value="USER_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="USER_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="USER_ADDON_PDF_ODT_CLOSED">';
@@ -131,17 +132,19 @@ class doc_generic_user_odt extends ModelePDFUser
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->USER_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -159,12 +162,10 @@ class doc_generic_user_odt extends ModelePDFUser
 		$texte .= '<br></div></div>';
 
 		// Scan directories
-		if (count($listofdir))
-		{
+		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-			{
+			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
 				// Model for creation
 				$list = ModelePDFUser::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
@@ -230,38 +231,35 @@ class doc_generic_user_odt extends ModelePDFUser
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "dict"));
 
-		if ($conf->user->dir_output)
-		{
+		if ($conf->user->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new User($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -271,20 +269,19 @@ class doc_generic_user_odt extends ModelePDFUser
 
 			$dir = $conf->user->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -295,10 +292,11 @@ class doc_generic_user_odt extends ModelePDFUser
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -315,15 +313,13 @@ class doc_generic_user_odt extends ModelePDFUser
 				// If CUSTOMER contact defined on user, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				if (!empty($usecontact))
-				{
+				if (!empty($usecontact)) {
 					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
@@ -347,8 +343,7 @@ class doc_generic_user_odt extends ModelePDFUser
 							'DELIMITER_RIGHT' => '}'
 						)
 					);
-				} catch (Exception $e)
-				{
+				} catch (Exception $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($e->getMessage(), LOG_WARNING);
 					return -1;
@@ -361,7 +356,9 @@ class doc_generic_user_odt extends ModelePDFUser
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($array_user, $array_soc, $array_thirdparty, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -369,31 +366,29 @@ class doc_generic_user_odt extends ModelePDFUser
 				// Call the ODTSubstitution hook
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
@@ -423,8 +418,9 @@ class doc_generic_user_odt extends ModelePDFUser
 
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index 4c718db5654..2538f83dfa8 100644
--- a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
+++ b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
@@ -97,7 +97,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 		// Recupere emetteur
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
 	}
 
 
@@ -121,8 +123,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="USERGROUP_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-		{
+		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
 			$texte .= '<input type="hidden" name="param2" value="USERGROUP_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="USERGROUP_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="USERGROUP_ADDON_PDF_ODT_CLOSED">';
@@ -134,17 +135,19 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$texttitle = $langs->trans("ListOfDirectories");
 		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->USERGROUP_ADDON_PDF_ODT_PATH)));
 		$listoffiles = array();
-		foreach ($listofdir as $key=>$tmpdir)
-		{
+		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
 			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
 			if (!$tmpdir) {
 				unset($listofdir[$key]); continue;
 			}
-			if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
-			else {
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
 				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
-				if (count($tmpfiles)) $listoffiles = array_merge($listoffiles, $tmpfiles);
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
 			}
 		}
 		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
@@ -162,12 +165,10 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$texte .= '<br></div></div>';
 
 		// Scan directories
-		if (count($listofdir))
-		{
+		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0)
-			{
+			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
 				// Model for creation
 				$list = ModelePDFUserGroup::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
@@ -222,38 +223,35 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		// phpcs:enable
 		global $user, $langs, $conf, $mysoc, $hookmanager;
 
-		if (empty($srctemplatepath))
-		{
+		if (empty($srctemplatepath)) {
 			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
 			return -1;
 		}
 
 		// Add odtgeneration hook
-		if (!is_object($hookmanager))
-		{
+		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('odtgeneration'));
 		global $action;
 
-		if (!is_object($outputlangs)) $outputlangs = $langs;
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "companies", "bills", "dict"));
 
-		if ($conf->user->dir_output)
-		{
+		if ($conf->user->dir_output) {
 			// If $object is id instead of object
-			if (!is_object($object))
-			{
+			if (!is_object($object)) {
 				$id = $object;
 				$object = new UserGroup($this->db);
 				$result = $object->fetch($id);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($this->db, $object->error);
 					return -1;
 				}
@@ -261,20 +259,19 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 			$dir = $conf->usergroup->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
-			if (!preg_match('/specimen/i', $objectref)) $dir .= "/".$objectref;
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
 			$file = $dir."/".$objectref.".odt";
 
-			if (!file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
 					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
 
-			if (file_exists($dir))
-			{
+			if (file_exists($dir)) {
 				//print "srctemplatepath=".$srctemplatepath;	// Src filename
 				$newfile = basename($srctemplatepath);
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
@@ -285,10 +282,11 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
-				if (!empty($conf->global->MAIN_DOC_USE_TIMING))
-				{
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
 					$format = $conf->global->MAIN_DOC_USE_TIMING;
-					if ($format == '1') $format = '%Y%m%d%H%M%S';
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
 					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
 				} else {
 					$filename = $newfiletmp.'.'.$newfileformat;
@@ -305,15 +303,13 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// If CUSTOMER contact defined on user, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
-				if (count($arrayidcontact) > 0)
-				{
+				if (count($arrayidcontact) > 0) {
 					$usecontact = true;
 					$result = $object->fetch_contact($arrayidcontact[0]);
 				}
 
 				// Recipient name
-				if (!empty($usecontact))
-				{
+				if (!empty($usecontact)) {
 					if ($usecontact && ($object->contact->fk_soc != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)))) {
 						$socobject = $object->contact;
 					} else {
@@ -340,8 +336,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Line of free text
 				$newfreetext = '';
 				$paramfreetext = 'user_FREE_TEXT';
-				if (!empty($conf->global->$paramfreetext))
-				{
+				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
 
@@ -372,8 +367,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Make substitutions into odt of freetext
 				try {
 					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					dol_syslog($e->getMessage(), LOG_WARNING);
 				}
 
@@ -386,7 +380,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$array_other = $this->get_substitutionarray_other($outputlangs);
 				// retrieve contact information for use in object as contact_xxx tags
 				$array_thirdparty_contact = array();
-				if ($usecontact && is_object($contactobject)) $array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
 
 				$tmparray = array_merge($array_global, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
 				complete_substitutions_array($tmparray, $outputlangs, $object);
@@ -394,19 +390,19 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				// Call the ODTSubstitution hook
 				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				foreach ($tmparray as $key=>$value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) // Image
-						{
-							if (file_exists($value)) $odfHandler->setImage($key, $value);
-							else $odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+						if (preg_match('/logo$/', $key)) { // Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
 						} else // Text
 						{
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
@@ -415,16 +411,13 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 					$foundtagforlines = 1;
 					try {
 						$listlines = $odfHandler->setSegment('lines');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						// We may arrive here if tags for lines not present into template
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
-					if ($foundtagforlines)
-					{
-						foreach ($object->members as $u)
-						{
+					if ($foundtagforlines) {
+						foreach ($object->members as $u) {
 							$tmparray = $this->get_substitutionarray_each_var_object($u, $outputlangs);
 							unset($tmparray['object_pass']);
 							unset($tmparray['object_pass_indatabase']);
@@ -432,17 +425,14 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 							// Call the ODTSubstitutionLine hook
 							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$u);
 							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-							foreach ($tmparray as $key => $val)
-							{
+							foreach ($tmparray as $key => $val) {
 								try {
 									if (!is_array($val)) {
 										$listlines->setVars($key, $val, true, 'UTF-8');
 									}
-								} catch (OdfException $e)
-								{
+								} catch (OdfException $e) {
 									dol_syslog($e->getMessage(), LOG_WARNING);
-								} catch (SegmentException $e)
-								{
+								} catch (SegmentException $e) {
 									dol_syslog($e->getMessage(), LOG_WARNING);
 								}
 							}
@@ -450,8 +440,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 						}
 						$odfHandler->mergeSegment($listlines);
 					}
-				} catch (OdfException $e)
-				{
+				} catch (OdfException $e) {
 					$this->error = $e->getMessage();
 					dol_syslog($this->error, LOG_WARNING);
 					return -1;
@@ -459,12 +448,10 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 				// Replace labels translated
 				$tmparray = $outputlangs->get_translations_for_substitutions();
-				foreach ($tmparray as $key => $value)
-				{
+				foreach ($tmparray as $key => $value) {
 					try {
 						$odfHandler->setVars($key, $value, true, 'UTF-8');
-					} catch (OdfException $e)
-					{
+					} catch (OdfException $e) {
 						dol_syslog($e->getMessage(), LOG_WARNING);
 					}
 				}
@@ -494,8 +481,9 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (!empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK)) {
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$odfHandler = null; // Destroy object
 
diff --git a/htdocs/core/modules/workstation/mod_workstation_advanced.php b/htdocs/core/modules/workstation/mod_workstation_advanced.php
index cf9a1247e2b..4e23219581c 100755
--- a/htdocs/core/modules/workstation/mod_workstation_advanced.php
+++ b/htdocs/core/modules/workstation/mod_workstation_advanced.php
@@ -114,8 +114,7 @@ class mod_workstation_advanced extends ModeleNumRefWorkstation
 		/*$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;*/
 
-		if (!$numExample)
-		{
+		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
@@ -136,8 +135,7 @@ class mod_workstation_advanced extends ModeleNumRefWorkstation
 		// We get cursor rule
 		$mask = $conf->global->WORKSTATION_WORKSTATION_ADVANCED_MASK;
 
-		if (!$mask)
-		{
+		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/workstation/mod_workstation_standard.php b/htdocs/core/modules/workstation/mod_workstation_standard.php
index 0e793953f46..d504f9191f5 100755
--- a/htdocs/core/modules/workstation/mod_workstation_standard.php
+++ b/htdocs/core/modules/workstation/mod_workstation_standard.php
@@ -96,13 +96,13 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 		}
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
 		}
-		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
-		{
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
@@ -129,11 +129,13 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 		//$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max = 0;
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
 		} else {
 			dol_syslog("mod_workstation_standard::getNextValue", LOG_DEBUG);
 			return -1;
@@ -143,8 +145,11 @@ class mod_workstation_standard extends ModeleNumRefWorkstation
 		$date = dol_now();
 		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s", $max + 1);
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
 
 		dol_syslog("mod_workstation_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
diff --git a/htdocs/core/modules/workstation/modules_workstation.php b/htdocs/core/modules/workstation/modules_workstation.php
index ec6c2fc945b..c8052ed4ff8 100755
--- a/htdocs/core/modules/workstation/modules_workstation.php
+++ b/htdocs/core/modules/workstation/modules_workstation.php
@@ -142,10 +142,18 @@ abstract class ModeleNumRefWorkstation
 		global $langs;
 		$langs->load("admin");
 
-		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-		if ($this->version == 'dolibarr') return DOL_VERSION;
-		if ($this->version) return $this->version;
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
 		return $langs->trans("NotAvailable");
 	}
 }
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index 67c524d67f6..a8196f60056 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -44,214 +44,234 @@ $website = GETPOST('website', 'alpha');
 
 
 // Security check
-if (empty($modulepart)) accessforbidden('Bad value for modulepart');
+if (empty($modulepart)) {
+	accessforbidden('Bad value for modulepart');
+}
 $accessallowed = 0;
-if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service')
-{
+if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service') {
 	$result = restrictedArea($user, 'produit|service', $id, 'product&product');
-	if ($modulepart == 'produit|service' && (!$user->rights->produit->lire && !$user->rights->service->lire)) accessforbidden();
+	if ($modulepart == 'produit|service' && (!$user->rights->produit->lire && !$user->rights->service->lire)) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
-} elseif ($modulepart == 'project')
-{
+} elseif ($modulepart == 'project') {
 	$result = restrictedArea($user, 'projet', $id);
-	if (!$user->rights->projet->lire) accessforbidden();
+	if (!$user->rights->projet->lire) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
-} elseif ($modulepart == 'bom')
-{
+} elseif ($modulepart == 'bom') {
 	$result = restrictedArea($user, $modulepart, $id, 'bom_bom');
-	if (!$user->rights->bom->read) accessforbidden();
+	if (!$user->rights->bom->read) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
-} elseif ($modulepart == 'member')
-{
+} elseif ($modulepart == 'member') {
 	$result = restrictedArea($user, 'adherent', $id, '', '', 'fk_soc', 'rowid');
-	if (!$user->rights->adherent->lire) accessforbidden();
+	if (!$user->rights->adherent->lire) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
-} elseif ($modulepart == 'user')
-{
+} elseif ($modulepart == 'user') {
 	$result = restrictedArea($user, $modulepart, $id, $modulepart);
-	if (!$user->rights->user->user->lire) accessforbidden();
+	if (!$user->rights->user->user->lire) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
-} elseif ($modulepart == 'tax')
-{
+} elseif ($modulepart == 'tax') {
 	$result = restrictedArea($user, $modulepart, $id, 'chargesociales', 'charges');
-	if (!$user->rights->tax->charges->lire) accessforbidden();
+	if (!$user->rights->tax->charges->lire) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
-} elseif ($modulepart == 'bank')
-{
+} elseif ($modulepart == 'bank') {
 	$result = restrictedArea($user, 'banque', $id, 'bank_account');
-	if (!$user->rights->banque->lire) accessforbidden();
+	if (!$user->rights->banque->lire) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
-} elseif ($modulepart == 'medias')
-{
+} elseif ($modulepart == 'medias') {
 	$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
-	if (!$permtoadd) accessforbidden();
+	if (!$permtoadd) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
-} elseif ($modulepart == 'facture_fourn' || $modulepart == 'facture_fournisseur')
-{
+} elseif ($modulepart == 'facture_fourn' || $modulepart == 'facture_fournisseur') {
 	$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-	if (!$user->rights->fournisseur->facture->lire) accessforbidden();
+	if (!$user->rights->fournisseur->facture->lire) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
 } else // ticket, holiday, expensereport, societe...
 {
 	$result = restrictedArea($user, $modulepart, $id, $modulepart);
-	if (empty($user->rights->$modulepart->read) && empty($user->rights->$modulepart->lire)) accessforbidden();
+	if (empty($user->rights->$modulepart->read) && empty($user->rights->$modulepart->lire)) {
+		accessforbidden();
+	}
 	$accessallowed = 1;
 }
 
 // Security:
 // Limit access if permissions are wrong
-if (!$accessallowed)
-{
+if (!$accessallowed) {
 	accessforbidden();
 }
 
 // Define dir according to modulepart
-if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service')
-{
+if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service' || $modulepart == 'produit|service') {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 	$object = new Product($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->product->multidir_output[$object->entity]; // By default
-		if ($object->type == Product::TYPE_PRODUCT) $dir = $conf->product->multidir_output[$object->entity];
-		if ($object->type == Product::TYPE_SERVICE) $dir = $conf->service->multidir_output[$object->entity];
+		if ($object->type == Product::TYPE_PRODUCT) {
+			$dir = $conf->product->multidir_output[$object->entity];
+		}
+		if ($object->type == Product::TYPE_SERVICE) {
+			$dir = $conf->service->multidir_output[$object->entity];
+		}
 	}
-} elseif ($modulepart == 'project')
-{
+} elseif ($modulepart == 'project') {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	$object = new Project($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->project->multidir_output[$object->entity]; // By default
 	}
-} elseif ($modulepart == 'propal')
-{
+} elseif ($modulepart == 'propal') {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$object = new Propal($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->propal->multidir_output[$object->entity]; // By default
 	}
-} elseif ($modulepart == 'holiday')
-{
+} elseif ($modulepart == 'holiday') {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 	$object = new Holiday($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-} elseif ($modulepart == 'member')
-{
+} elseif ($modulepart == 'member') {
 	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 	$object = new Adherent($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->adherent->dir_output; // By default
 	}
-} elseif ($modulepart == 'societe')
-{
+} elseif ($modulepart == 'societe') {
 	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 	$object = new Societe($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->$modulepart->dir_output;
 	}
-} elseif ($modulepart == 'user')
-{
+} elseif ($modulepart == 'user') {
 	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 	$object = new User($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-} elseif ($modulepart == 'expensereport')
-{
+} elseif ($modulepart == 'expensereport') {
 	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 	$object = new ExpenseReport($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->expensereport->dir_output; // By default
 	}
-} elseif ($modulepart == 'tax')
-{
+} elseif ($modulepart == 'tax') {
 	require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 	$object = new ChargeSociales($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-} elseif ($modulepart == 'ticket')
-{
+} elseif ($modulepart == 'ticket') {
 	require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 	$object = new Ticket($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
-} elseif ($modulepart == 'bom')
-{
+} elseif ($modulepart == 'bom') {
 	require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
 	$object = new BOM($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
 } elseif ($modulepart == 'mrp') {
 	require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 	$object = new MO($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
 } elseif ($modulepart == 'bank') {
 	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 	$object = new Account($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->bank->dir_output; // By default
 	}
 } elseif ($modulepart == 'facture') {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$object = new Facture($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->$modulepart->dir_output; // By default
 	}
 } elseif ($modulepart == 'facture_fourn' || $modulepart == 'facture_fournisseur') {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 	$object = new FactureFournisseur($db);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		$result = $object->fetch($id);
-		if ($result <= 0) dol_print_error($db, 'Failed to load object');
+		if ($result <= 0) {
+			dol_print_error($db, 'Failed to load object');
+		}
 		$dir = $conf->fournisseur->dir_output.'/facture'; // By default
 	}
 } elseif ($modulepart == 'medias') {
@@ -260,34 +280,51 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	print 'Bug: Action crop for modulepart = '.$modulepart.' is not supported yet by photos_resize.php.';
 }
 
-if (empty($backtourl))
-{
+if (empty($backtourl)) {
 	$regs = array();
 
-	if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) $backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('expensereport'))) $backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('holiday')))       $backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('member')))        $backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('project')))       $backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('propal')))        $backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('societe')))       $backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('tax')))           $backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('ticket')))        $backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('user')))          $backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('facture')))       $backtourl = DOL_URL_ROOT."/compta/facture/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('facture_fourn', 'facture_fournisseur'))) $backtourl = DOL_URL_ROOT."/fourn/facture/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
+	if (in_array($modulepart, array('product', 'produit', 'service', 'produit|service'))) {
+		$backtourl = DOL_URL_ROOT."/product/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('expensereport'))) {
+		$backtourl = DOL_URL_ROOT."/expensereport/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('holiday'))) {
+		$backtourl = DOL_URL_ROOT."/holiday/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('member'))) {
+		$backtourl = DOL_URL_ROOT."/adherents/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('project'))) {
+		$backtourl = DOL_URL_ROOT."/projet/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('propal'))) {
+		$backtourl = DOL_URL_ROOT."/comm/propal/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('societe'))) {
+		$backtourl = DOL_URL_ROOT."/societe/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('tax'))) {
+		$backtourl = DOL_URL_ROOT."/compta/sociales/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('ticket'))) {
+		$backtourl = DOL_URL_ROOT."/ticket/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('user'))) {
+		$backtourl = DOL_URL_ROOT."/user/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('facture'))) {
+		$backtourl = DOL_URL_ROOT."/compta/facture/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('facture_fourn', 'facture_fournisseur'))) {
+		$backtourl = DOL_URL_ROOT."/fourn/facture/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('bank')) && preg_match('/\/statement\/([^\/]+)\//', $file, $regs)) {
 		$num = $regs[1];
 		$backtourl = DOL_URL_ROOT."/compta/bank/account_statement_document.php?id=".$id.'&num='.urlencode($num).'&file='.urldecode($file);
-	} elseif (in_array($modulepart, array('bank')))          $backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('mrp')))           $backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
-	elseif (in_array($modulepart, array('medias'))) {
+	} elseif (in_array($modulepart, array('bank'))) {
+		$backtourl = DOL_URL_ROOT."/compta/bank/document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('mrp'))) {
+		$backtourl = DOL_URL_ROOT."/mrp/mo_document.php?id=".$id.'&file='.urldecode($file);
+	} elseif (in_array($modulepart, array('medias'))) {
 		$section_dir = dirname($file);
-		if (!preg_match('/\/$/', $section_dir)) $section_dir .= '/';
+		if (!preg_match('/\/$/', $section_dir)) {
+			$section_dir .= '/';
+		}
 		$backtourl = DOL_URL_ROOT."/website/index.php?action=file_manager&website=".$website.'&section_dir='.urlencode($section_dir);
 	}
 	// Generic case that should work for everybody else
-	else $backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
+	else {
+		$backtourl = DOL_URL_ROOT."/".$modulepart."/".$modulepart."_document.php?id=".$id.'&file='.urldecode($file);
+	}
 }
 
 
@@ -305,8 +342,7 @@ if ($cancel) {
 	}
 }
 
-if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex") && GETPOSTISSET("sizey"))
-{
+if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex") && GETPOSTISSET("sizey")) {
 	if (empty($dir)) {
 		print 'Bug: Value for $dir could not be defined.';
 	}
@@ -315,8 +351,7 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 
 	$result = dol_imageResizeOrCrop($fullpath, 0, GETPOST('sizex', 'int'), GETPOST('sizey', 'int'));
 
-	if ($result == $fullpath)
-	{
+	if ($result == $fullpath) {
 		// If image is related to a given object, we create also thumbs.
 		if (is_object($object)) {
 			$object->addThumbs($fullpath);
@@ -329,8 +364,7 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 		$ecmfile = new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
-		if ($result > 0)   // If found
-		{
+		if ($result > 0) {   // If found
 			$filename = basename($rel_filename);
 			$rel_dir = dirname($rel_filename);
 			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
@@ -338,8 +372,7 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 
 			$ecmfile->label = md5_file(dol_osencode($fullpath));
 			$result = $ecmfile->update($user);
-		} elseif ($result == 0)   // If not found
-		{
+		} elseif ($result == 0) {   // If not found
 			$filename = basename($rel_filename);
 			$rel_dir = dirname($rel_filename);
 			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
@@ -353,15 +386,13 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 			$ecmfile->description = ''; // indexed content
 			$ecmfile->keyword = ''; // keyword content
 			$result = $ecmfile->create($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 			}
 			$result = $ecmfile->create($user);
 		}
 
-		if ($backtourl)
-		{
+		if ($backtourl) {
 			header("Location: ".$backtourl);
 			exit;
 		} else {
@@ -376,8 +407,7 @@ if ($action == 'confirm_resize' && GETPOSTISSET("file") && GETPOSTISSET("sizex")
 }
 
 // Crop d'une image
-if ($action == 'confirm_crop')
-{
+if ($action == 'confirm_crop') {
 	if (empty($dir)) {
 		print 'Bug: Value for $dir could not be defined.';
 	}
@@ -387,8 +417,7 @@ if ($action == 'confirm_crop')
 	//var_dump($fullpath.' '.$_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
 	$result = dol_imageResizeOrCrop($fullpath, 1, GETPOST('w', 'int'), GETPOST('h', 'int'), GETPOST('x', 'int'), GETPOST('y', 'int'));
 
-	if ($result == $fullpath)
-	{
+	if ($result == $fullpath) {
 		if (is_object($object)) {
 			$object->addThumbs($fullpath);
 		}
@@ -400,8 +429,7 @@ if ($action == 'confirm_crop')
 		include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 		$ecmfile = new EcmFiles($db);
 		$result = $ecmfile->fetch(0, '', $rel_filename);
-		if ($result > 0)   // If found
-		{
+		if ($result > 0) {   // If found
 			$filename = basename($rel_filename);
 			$rel_dir = dirname($rel_filename);
 			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
@@ -409,8 +437,7 @@ if ($action == 'confirm_crop')
 
 			$ecmfile->label = md5_file(dol_osencode($fullpath));
 			$result = $ecmfile->update($user);
-		} elseif ($result == 0)   // If not found
-		{
+		} elseif ($result == 0) {   // If not found
 			$filename = basename($rel_filename);
 			$rel_dir = dirname($rel_filename);
 			$rel_dir = preg_replace('/[\\/]$/', '', $rel_dir);
@@ -424,8 +451,7 @@ if ($action == 'confirm_crop')
 			$ecmfile->description = ''; // indexed content
 			$ecmfile->keyword = ''; // keyword content
 			$result = $ecmfile->create($user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($ecmfile->error, $ecmfile->errors, 'warnings');
 			}
 			$result = $ecmfile->create($user);
@@ -502,15 +528,13 @@ print '<br>'."\n";
 
 print '<br>'."\n";
 
-if (!empty($conf->use_javascript_ajax))
-{
+if (!empty($conf->use_javascript_ajax)) {
 	$infoarray = dol_getImageSize($dir."/".GETPOST("file"));
 	$height = $infoarray['height'];
 	$width = $infoarray['width'];
 	$widthforcrop = $width; $refsizeforcrop = 'orig'; $ratioforcrop = 1;
 	// If image is too large, we use another scale.
-	if (!empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth'] / 2)))
-	{
+	if (!empty($_SESSION['dol_screenwidth']) && ($widthforcrop > round($_SESSION['dol_screenwidth'] / 2))) {
 		$ratioforcrop = 2;
 		$widthforcrop = round($_SESSION['dol_screenwidth'] / $ratioforcrop);
 		$refsizeforcrop = 'screenwidth';
diff --git a/htdocs/core/search.php b/htdocs/core/search.php
index b0a61f5bd71..321fc94a925 100644
--- a/htdocs/core/search.php
+++ b/htdocs/core/search.php
@@ -23,14 +23,30 @@
  *       \brief      Wrapper that receive any search. Depending on input field, make a redirect to correct URL.
  */
 
-if (!defined('NOREQUIREUSER'))   define('NOREQUIREUSER', '1');
-if (!defined('NOREQUIREDB'))   define('NOREQUIREDB', '1');
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN')) define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREUSER')) {
+	define('NOREQUIREUSER', '1');
+}
+if (!defined('NOREQUIREDB')) {
+	define('NOREQUIREDB', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
 
 require_once '../main.inc.php';
 
@@ -38,104 +54,84 @@ require_once '../main.inc.php';
  * Actions
  */
 
-if (GETPOST('search_proposal') != '')
-{
+if (GETPOST('search_proposal') != '') {
 	header("Location: ".DOL_URL_ROOT.'/comm/propal/list.php?sall='.urlencode(GETPOST('search_proposal')));
 	exit;
 }
-if (GETPOST('search_customer_order') != '')
-{
+if (GETPOST('search_customer_order') != '') {
 	header("Location: ".DOL_URL_ROOT.'/commande/list.php?sall='.urlencode(GETPOST('search_customer_order')));
 	exit;
 }
-if (GETPOST('search_supplier_order') != '')
-{
+if (GETPOST('search_supplier_order') != '') {
 	header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php?search_all='.urlencode(GETPOST('search_supplier_order')));
 	exit;
 }
-if (GETPOST('search_intervention') != '')
-{
+if (GETPOST('search_intervention') != '') {
 	header("Location: ".DOL_URL_ROOT.'/fichinter/list.php?sall='.urlencode(GETPOST('search_intervention')));
 	exit;
 }
-if (GETPOST('search_contract') != '')
-{
+if (GETPOST('search_contract') != '') {
 	header("Location: ".DOL_URL_ROOT.'/contrat/list.php?sall='.urlencode(GETPOST('search_contract')));
 	exit;
 }
-if (GETPOST('search_invoice') != '')
-{
+if (GETPOST('search_invoice') != '') {
 	header("Location: ".DOL_URL_ROOT.'/compta/facture/list.php?sall='.urlencode(GETPOST('search_invoice')));
 	exit;
 }
-if (GETPOST('search_supplier_invoice') != '')
-{
+if (GETPOST('search_supplier_invoice') != '') {
 	header("Location: ".DOL_URL_ROOT.'/fourn/facture/list.php?sall='.urlencode(GETPOST('search_supplier_invoice')));
 	exit;
 }
-if (GETPOST('search_supplier_proposal') != '')
-{
+if (GETPOST('search_supplier_proposal') != '') {
 	header("Location: ".DOL_URL_ROOT.'/supplier_proposal/list.php?sall='.urlencode(GETPOST('search_supplier_proposal')));
 	exit;
 }
-if (GETPOST('search_donation') != '')
-{
+if (GETPOST('search_donation') != '') {
 	header("Location: ".DOL_URL_ROOT.'/don/list.php?sall='.urlencode(GETPOST('search_donation')));
 	exit;
 }
-if (GETPOST('search_product') != '')
-{
+if (GETPOST('search_product') != '') {
 	header("Location: ".DOL_URL_ROOT.'/product/list.php?sall='.urlencode(GETPOST('search_product')));
 	exit;
 }
-if (GETPOST('search_thirdparty') != '')
-{
+if (GETPOST('search_thirdparty') != '') {
 	header("Location: ".DOL_URL_ROOT.'/societe/list.php?mode=search&sall='.urlencode(GETPOST('search_thirdparty')));
 	exit;
 }
-if (GETPOST('search_contact') != '')
-{
+if (GETPOST('search_contact') != '') {
 	header("Location: ".DOL_URL_ROOT.'/contact/list.php?mode=search&sall='.urlencode(GETPOST('search_contact')));
 	exit;
 }
-if (GETPOST('search_deplacement') != '')
-{
+if (GETPOST('search_deplacement') != '') {
 	header("Location: ".DOL_URL_ROOT.'/compta/deplacement/list.php?mode=search&sall='.urlencode(GETPOST('search_deplacement')));
 	exit;
 }
-if (GETPOST('search_expensereport') != '')
-{
+if (GETPOST('search_expensereport') != '') {
 	header("Location: ".DOL_URL_ROOT.'/expensereport/list.php?mode=search&sall='.urlencode(GETPOST('search_expensereport')));
 	exit;
 }
-if (GETPOST('search_holiday') != '')
-{
+if (GETPOST('search_holiday') != '') {
 	header("Location: ".DOL_URL_ROOT.'/holiday/list.php?mode=search&sall='.urlencode(GETPOST('search_holiday')));
 	exit;
 }
-if (GETPOST('search_member') != '')
-{
+if (GETPOST('search_member') != '') {
 	header("Location: ".DOL_URL_ROOT.'/adherents/list.php?mode=search&sall='.urlencode(GETPOST('search_member')));
 	exit;
 }
-if (GETPOST('search_project') != '')
-{
+if (GETPOST('search_project') != '') {
 	header("Location: ".DOL_URL_ROOT.'/projet/list.php?mode=search&search_all='.urlencode(GETPOST('search_project')));
 	exit;
 }
-if (GETPOST('search_task') != '')
-{
+if (GETPOST('search_task') != '') {
 	header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php?mode=search&search_all='.urlencode(GETPOST('search_task')));
 	exit;
 }
 
-if (GETPOST('search_user') != '')
-{
+if (GETPOST('search_user') != '') {
 	header("Location: ".DOL_URL_ROOT.'/user/list.php?mode=search&sall='.urlencode(GETPOST('search_user')));
 	exit;
 }
-if (GETPOST('search_group') != '')
-{
+if (GETPOST('search_group') != '') {
 	header("Location: ".DOL_URL_ROOT.'/user/group/list.php?mode=search&sall='.urlencode(GETPOST('search_group')));
 	exit;
 }
@@ -143,8 +139,7 @@ if (GETPOST('search_group') != '')
 
 
 // If we are here, search was called with no supported criteria
-if (!empty($_SERVER['HTTP_REFERER']))
-{
+if (!empty($_SERVER['HTTP_REFERER'])) {
 	header("Location: ".$_SERVER['HTTP_REFERER']);
 	exit;
 } else {
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 39f41b1dfe7..8581776a2d8 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -27,15 +27,23 @@
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', 1);
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+	$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL by the main.inc.php
+}
 
 $langs->load("main");
 
@@ -69,9 +77,10 @@ $hookmanager->initHooks(array('searchform'));
 // Define $searchform
 $searchform = '';
 
-if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
-{
-	if (!is_object($form)) $form = new Form($db);
+if ($conf->use_javascript_ajax && 1 == 2) {   // select2 is ko with jmobile
+	if (!is_object($form)) {
+		$form = new Form($db);
+	}
 	$selected = -1;
 	$searchform .= '<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
 } else {
@@ -82,15 +91,13 @@ if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 
 	$i = 0;
 	$accesskeyalreadyassigned = array();
-	foreach ($arrayresult as $key => $val)
-	{
+	foreach ($arrayresult as $key => $val) {
 		$tmp = explode('?', $val['url']);
 		$urlaction = $tmp[0];
 		$keysearch = 'search_all';
 
 		$accesskey = '';
-		if (!$accesskeyalreadyassigned[$val['label'][0]])
-		{
+		if (!$accesskeyalreadyassigned[$val['label'][0]]) {
 			$accesskey = $val['label'][0];
 			$accesskeyalreadyassigned[$accesskey] = $accesskey;
 		}
@@ -104,10 +111,11 @@ if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 // Execute hook printSearchForm
 $parameters = array('searchform'=>$searchform);
 $reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$searchform .= $hookmanager->resPrint;
-} else $searchform = $hookmanager->resPrint;
+} else {
+	$searchform = $hookmanager->resPrint;
+}
 
 
 print "\n";
diff --git a/htdocs/core/tools.php b/htdocs/core/tools.php
index accb8eeed00..3c55f1a1e37 100644
--- a/htdocs/core/tools.php
+++ b/htdocs/core/tools.php
@@ -29,7 +29,9 @@ $langs->loadLangs(array("companies", "other"));
 
 // Security check
 $socid = 0;
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 
 
 
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index de16915fe3c..c22d3d932de 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -28,8 +28,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -43,60 +42,58 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_add.tpl.php -->
 <script>
-    jQuery(document).ready(function() {
-    	function init_typeoffields(type)
-    	{
-        	console.log("select a new type (add) = "+type);
-        	var size = jQuery("#size");
-    		var computed_value = jQuery("#computed_value");
-    		var langfile = jQuery("#langfile");
-    		var default_value = jQuery("#default_value");
-    		var unique = jQuery("#unique");
-    		var required = jQuery("#required");
-    		var alwayseditable = jQuery("#alwayseditable");
-    		var list = jQuery("#list");
-            var totalizable = jQuery("#totalizable");
-    		<?php
-			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
-			{
+	jQuery(document).ready(function() {
+		function init_typeoffields(type)
+		{
+			console.log("select a new type (add) = "+type);
+			var size = jQuery("#size");
+			var computed_value = jQuery("#computed_value");
+			var langfile = jQuery("#langfile");
+			var default_value = jQuery("#default_value");
+			var unique = jQuery("#unique");
+			var required = jQuery("#required");
+			var alwayseditable = jQuery("#alwayseditable");
+			var list = jQuery("#list");
+			var totalizable = jQuery("#totalizable");
+			<?php
+			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist")) {
 				print 'jQuery("#value_choice").hide();';
 			}
 
-			if (GETPOST('type', 'alpha') == "separate")
-			{
+			if (GETPOST('type', 'alpha') == "separate") {
 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
 				print 'jQuery("#value_choice").hide();';
 			}
 			?>
 
-    		// Case of computed field
-    		if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
-    			jQuery("tr.extra_computed_value").show();
-    		} else {
-    			computed_value.val(''); jQuery("tr.extra_computed_value").hide();
-    		}
-    		if (computed_value.val())
-    		{
-        		console.log("We enter a computed formula");
-        		jQuery("#default_value").val('');
-        		/* jQuery("#unique, #required, #alwayseditable, #list").removeAttr('checked'); */
-        		jQuery("#default_value, #unique, #required, #alwayseditable, #list").attr('disabled', true);
-        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_list").hide();
-    		}
-    		else
-    		{
-        		console.log("No computed formula");
-        		jQuery("#default_value, #unique, #required, #alwayseditable, #list").attr('disabled', false);
-        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_list").show();
-    		}
+			// Case of computed field
+			if (type == '' || type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
+				jQuery("tr.extra_computed_value").show();
+			} else {
+				computed_value.val(''); jQuery("tr.extra_computed_value").hide();
+			}
+			if (computed_value.val())
+			{
+				console.log("We enter a computed formula");
+				jQuery("#default_value").val('');
+				/* jQuery("#unique, #required, #alwayseditable, #list").removeAttr('checked'); */
+				jQuery("#default_value, #unique, #required, #alwayseditable, #list").attr('disabled', true);
+				jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_list").hide();
+			}
+			else
+			{
+				console.log("No computed formula");
+				jQuery("#default_value, #unique, #required, #alwayseditable, #list").attr('disabled', false);
+				jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_list").show();
+			}
 
 			if (type == 'date')          { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'double')   { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
+			else if (type == 'double')   { size.val('24,8').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'int')      { size.val('10').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'text')     { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'html')     { size.val('2000').removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
-    		else if (type == 'varchar')  { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
+			else if (type == 'varchar')  { size.val('255').removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helppassword").show();}
 			else if (type == 'boolean')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
 			else if (type == 'price')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide();}
@@ -127,17 +124,17 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 				default_value.removeAttr('disabled');
 				langfile.removeAttr('disabled');required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.removeAttr('disabled');
 			}
-    	}
-    	init_typeoffields('<?php echo GETPOST('type', 'alpha'); ?>');
-    	jQuery("#type").change(function() {
-    		init_typeoffields($(this).val());
-    	});
+		}
+		init_typeoffields('<?php echo GETPOST('type', 'alpha'); ?>');
+		jQuery("#type").change(function() {
+			init_typeoffields($(this).val());
+		});
 
-    	// If we enter a formula, we disable other fields
-    	jQuery("#computed_value").keyup(function() {
-    		init_typeoffields(jQuery('#type').val());
-    	});
-    });
+		// If we enter a formula, we disable other fields
+		jQuery("#computed_value").keyup(function() {
+			init_typeoffields(jQuery('#type').val());
+		});
+	});
 </script>
 
 <form action="<?php echo $_SERVER["PHP_SELF"]; ?>" method="post">
@@ -163,18 +160,18 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 	<?php echo $langs->trans("Value"); ?>
 </td>
 <td>
-    <table class="nobordernopadding">
-    <tr><td>
-    	<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo GETPOST('param', 'alpha'); ?></textarea>
-    </td><td>
-    <span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
-    <span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
-    <span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
-    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
-    <span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
-    <span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
-    </td></tr>
-    </table>
+	<table class="nobordernopadding">
+	<tr><td>
+		<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo GETPOST('param', 'alpha'); ?></textarea>
+	</td><td>
+	<span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
+	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
+	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
+	<span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
+	<span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
+	<span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
+	</td></tr>
+	</table>
 </td>
 </tr>
 <!-- Position -->
@@ -210,7 +207,7 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 <tr class="help"><td><?php echo $form->textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?></td><td class="valeur"><input id="help" class="quatrevingtpercent" type="text" name="help" value="<?php echo dol_escape_htmltag($help); ?>"></td></tr>
 <?php if ($conf->multicompany->enabled) { ?>
 	<!-- Multicompany entity -->
-    <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (GETPOST('entitycurrentorall', 'alpha') ? '' : ' checked'); ?>></td></tr>
+	<tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (GETPOST('entitycurrentorall', 'alpha') ? '' : ' checked'); ?>></td></tr>
 <?php } ?>
 </table>
 
diff --git a/htdocs/core/tpl/admin_extrafields_edit.tpl.php b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
index 5239a93fdf7..bba6fd1bb7c 100644
--- a/htdocs/core/tpl/admin_extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_edit.tpl.php
@@ -27,8 +27,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -42,60 +41,58 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 
 <!-- BEGIN PHP TEMPLATE admin_extrafields_edit.tpl.php -->
 <script>
-    jQuery(document).ready(function() {
-    	function init_typeoffields(type)
-    	{
-        	console.log("select a new type (edit) = "+type);
-    		var size = jQuery("#size");
-    		var computed_value = jQuery("#computed_value");
-    		var langfile = jQuery("#langfile");
-    		var default_value = jQuery("#default_value");
-    		var unique = jQuery("#unique");
-    		var required = jQuery("#required");
-    		var alwayseditable = jQuery("#alwayseditable");
-    		var list = jQuery("#list");
-            var totalizable = jQuery("#totalizable");
-    		<?php
-			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist"))
-			{
+	jQuery(document).ready(function() {
+		function init_typeoffields(type)
+		{
+			console.log("select a new type (edit) = "+type);
+			var size = jQuery("#size");
+			var computed_value = jQuery("#computed_value");
+			var langfile = jQuery("#langfile");
+			var default_value = jQuery("#default_value");
+			var unique = jQuery("#unique");
+			var required = jQuery("#required");
+			var alwayseditable = jQuery("#alwayseditable");
+			var list = jQuery("#list");
+			var totalizable = jQuery("#totalizable");
+			<?php
+			if ((GETPOST('type', 'alpha') != "select") && (GETPOST('type', 'alpha') != "sellist")) {
 				print 'jQuery("#value_choice").hide();';
 			}
 
-			if (GETPOST('type', 'alpha') == "separate")
-			{
+			if (GETPOST('type', 'alpha') == "separate") {
 				print "jQuery('#size, #default_value, #langfile').val('').prop('disabled', true);";
 				print 'jQuery("#value_choice").hide();';
 			}
 			?>
 
-    		// Case of computed field
-    		if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
-    			jQuery("tr.extra_computed_value").show();
-    		} else {
-    			computed_value.val(''); jQuery("tr.extra_computed_value").hide();
-    		}
-    		if (computed_value.val())
-    		{
-        		console.log("We enter a computed formula");
-        		jQuery("#default_value").val('');
-        		/* jQuery("#unique, #required, #alwayseditable, #list").removeAttr('checked'); */
-        		jQuery("#default_value, #unique, #required, #alwayseditable, #list").attr('disabled', true);
-        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_list").hide();
-    		}
-    		else
-    		{
-        		console.log("No computed formula");
-        		jQuery("#default_value, #unique, #required, #alwayseditable, #list").attr('disabled', false);
-        		jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_list").show();
-    		}
+			// Case of computed field
+			if (type == 'varchar' || type == 'int' || type == 'double' || type == 'price') {
+				jQuery("tr.extra_computed_value").show();
+			} else {
+				computed_value.val(''); jQuery("tr.extra_computed_value").hide();
+			}
+			if (computed_value.val())
+			{
+				console.log("We enter a computed formula");
+				jQuery("#default_value").val('');
+				/* jQuery("#unique, #required, #alwayseditable, #list").removeAttr('checked'); */
+				jQuery("#default_value, #unique, #required, #alwayseditable, #list").attr('disabled', true);
+				jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_list").hide();
+			}
+			else
+			{
+				console.log("No computed formula");
+				jQuery("#default_value, #unique, #required, #alwayseditable, #list").attr('disabled', false);
+				jQuery("tr.extra_default_value, tr.extra_unique, tr.extra_required, tr.extra_alwayseditable, tr.extra_list").show();
+			}
 
 			if (type == 'date') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'datetime') { size.val('').prop('disabled', true); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
-    		else if (type == 'double')   { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
+			else if (type == 'double')   { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'int')      { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'text')     { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'html')     { size.removeAttr('disabled'); unique.prop('disabled', true).removeAttr('checked'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
-    		else if (type == 'varchar')  { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
+			else if (type == 'varchar')  { size.removeAttr('disabled'); unique.removeAttr('disabled'); jQuery("#value_choice").hide();jQuery("#helpchkbxlst").hide(); }
 			else if (type == 'password') { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); required.val('').prop('disabled', true); default_value.val('').prop('disabled', true); jQuery("#value_choice").show(); jQuery(".spanforparamtooltip").hide(); jQuery("#helppassword").show();}
 			else if (type == 'boolean')  { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
 			else if (type == 'price')    { size.val('').prop('disabled', true); unique.removeAttr('checked').prop('disabled', true); jQuery("#value_choice").hide(); jQuery("#helpchkbxlst").hide();}
@@ -126,17 +123,17 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 				default_value.removeAttr('disabled');
 				required.removeAttr('disabled'); alwayseditable.removeAttr('disabled'); list.removeAttr('disabled');
 			}
-    	}
-    	init_typeoffields(jQuery("#type").val());
-    	jQuery("#type").change(function() {
-    		init_typeoffields($(this).val());
-    	});
+		}
+		init_typeoffields(jQuery("#type").val());
+		jQuery("#type").change(function() {
+			init_typeoffields($(this).val());
+		});
 
-    	// If we enter a formula, we disable other fields
-    	jQuery("#computed_value").keyup(function() {
-    		init_typeoffields(jQuery('#type').val());
-    	});
-    });
+		// If we enter a formula, we disable other fields
+		jQuery("#computed_value").keyup(function() {
+			init_typeoffields(jQuery('#type').val());
+		});
+	});
 </script>
 
 <!-- Form to edit an extra field -->
@@ -171,18 +168,14 @@ $entitycurrentorall = $extrafields->attributes[$elementtype]['entityid'][$attrna
 $printable = $extrafields->attributes[$elementtype]['printable'][$attrname];
 $enabled = $extrafields->attributes[$elementtype]['enabled'][$attrname];
 
-if ((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_array($param))
-{
+if ((($type == 'select') || ($type == 'checkbox') || ($type == 'radio')) && is_array($param)) {
 	$param_chain = '';
-	foreach ($param['options'] as $key => $value)
-	{
-		if (strlen($key))
-		{
+	foreach ($param['options'] as $key => $value) {
+		if (strlen($key)) {
 			$param_chain .= $key.','.$value."\n";
 		}
 	}
-} elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate'))
-{
+} elseif (($type == 'sellist') || ($type == 'chkbxlst') || ($type == 'link') || ($type == 'password') || ($type == 'separate')) {
 	$paramlist = array_keys($param['options']);
 	$param_chain = $paramlist[0];
 }
@@ -215,16 +208,19 @@ if ($size <= 255 && in_array($type, array('text', 'html'))) {
 	$typewecanchangeinto['text'][] = 'varchar';
 }*/
 
-if (in_array($type, array_keys($typewecanchangeinto)))
-{
+if (in_array($type, array_keys($typewecanchangeinto))) {
 	$newarray = array();
 	print '<select id="type" class="flat type" name="type">';
-	foreach ($type2label as $key => $val)
-	{
+	foreach ($type2label as $key => $val) {
 		$selected = '';
-		if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) $selected = ' selected="selected"';
-		if (in_array($key, $typewecanchangeinto[$type])) print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
-		else print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
+		if ($key == (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : $type)) {
+			$selected = ' selected="selected"';
+		}
+		if (in_array($key, $typewecanchangeinto[$type])) {
+			print '<option value="'.$key.'"'.$selected.'>'.$val.'</option>';
+		} else {
+			print '<option value="'.$key.'" disabled="disabled"'.$selected.'>'.$val.'</option>';
+		}
 	}
 	print '</select>';
 	print ajax_combobox('type');
@@ -244,18 +240,18 @@ if (in_array($type, array_keys($typewecanchangeinto)))
 	<?php echo $langs->trans("Value"); ?>
 </td>
 <td>
-    <table class="nobordernopadding">
-    <tr><td>
-    	<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo dol_htmlcleanlastbr($param_chain); ?></textarea>
-    </td><td>
-    <span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
-    <span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
-    <span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
-    <span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
-    <span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
-    <span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
-    </td></tr>
-    </table>
+	<table class="nobordernopadding">
+	<tr><td>
+		<textarea name="param" id="param" cols="80" rows="<?php echo ROWS_4 ?>"><?php echo dol_htmlcleanlastbr($param_chain); ?></textarea>
+	</td><td>
+	<span id="helpselect" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpselect"), 1, 0, '', 0, 2, 'helpvalue1')?></span>
+	<span id="helpsellist" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpsellist"), 1, 0, '', 0, 2, 'helpvalue2')?></span>
+	<span id="helpchkbxlst" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpchkbxlst"), 1, 0, '', 0, 2, 'helpvalue3')?></span>
+	<span id="helplink" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelplink").'<br><br>'.$langs->trans("Examples").':<br>'.$listofexamplesforlink, 1, 0, '', 0, 2, 'helpvalue4')?></span>
+	<span id="helppassword" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpPassword"), 1, 0, '', 0, 2, 'helpvalue5')?></span>
+	<span id="helpseparate" class="spanforparamtooltip"><?php print $form->textwithpicto('', $langs->trans("ExtrafieldParamHelpSeparator"), 1, 0, '', 0, 2, 'helpvalue6')?></span>
+	</td></tr>
+	</table>
 </td>
 </tr>
 
@@ -301,7 +297,7 @@ if (in_array($type, array_keys($typewecanchangeinto)))
 
 <?php if ($conf->multicompany->enabled) { ?>
 	<!-- Multicompany entity -->
-    <tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (empty($entitycurrentorall) ? ' checked' : ''); ?>></td></tr>
+	<tr><td><?php echo $langs->trans("AllEntities"); ?></td><td class="valeur"><input id="entitycurrentorall" type="checkbox" name="entitycurrentorall"<?php echo (empty($entitycurrentorall) ? ' checked' : ''); ?>></td></tr>
 <?php } ?>
 
 <!-- Show Enabled property when value is not a common value -->
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index c62a95ec12b..829ccaee903 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -25,8 +25,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($langs) || !is_object($langs))
-{
+if (empty($langs) || !is_object($langs)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -72,10 +71,8 @@ if ($conf->multicompany->enabled) {
 print '<td width="80">&nbsp;</td>';
 print "</tr>\n";
 
-if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafields->attributes[$elementtype]['type']))
-{
-	foreach ($extrafields->attributes[$elementtype]['type'] as $key => $value)
-	{
+if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafields->attributes[$elementtype]['type'])) {
+	foreach ($extrafields->attributes[$elementtype]['type'] as $key => $value) {
 		/*if (! dol_eval($extrafields->attributes[$elementtype]['enabled'][$key], 1)) {
 			// TODO Uncomment this to exclude extrafields of modules not enabled. Add a link to "Show extrafields disabled"
 			// continue;
@@ -102,12 +99,13 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 		print '<td class="center">'.yn($extrafields->attributes[$elementtype]['totalizable'][$key])."</td>\n";
 		if (!empty($conf->multicompany->enabled)) {
 			print '<td class="center">';
-			if (empty($extrafields->attributes[$elementtype]['entityid'][$key]))
-			{
+			if (empty($extrafields->attributes[$elementtype]['entityid'][$key])) {
 				print $langs->trans("All");
 			} else {
 				global $multicompanylabel_cache;
-				if (!is_array($multicompanylabel_cache)) $multicompanylabel_cache = array();
+				if (!is_array($multicompanylabel_cache)) {
+					$multicompanylabel_cache = array();
+				}
 				if (empty($multicompanylabel_cache[$extrafields->attributes[$elementtype]['entityid'][$key]])) {
 					global $mc;
 					$mc->getInfo($extrafields->attributes[$elementtype]['entityid'][$key]);
@@ -123,7 +121,9 @@ if (is_array($extrafields->attributes[$elementtype]['type']) && count($extrafiel
 	}
 } else {
 	$colspan = 13;
-	if (!empty($conf->multicompany->enabled))  $colspan++;
+	if (!empty($conf->multicompany->enabled)) {
+		$colspan++;
+	}
 
 	print '<tr class="oddeven">';
 	print '<td class="opacitymedium" colspan="'.$colspan.'">';
diff --git a/htdocs/core/tpl/advtarget.tpl.php b/htdocs/core/tpl/advtarget.tpl.php
index 590a65f1286..86292ec0ff4 100644
--- a/htdocs/core/tpl/advtarget.tpl.php
+++ b/htdocs/core/tpl/advtarget.tpl.php
@@ -154,7 +154,8 @@ if (!empty($array_query['cust_status'])) {
 }
 print '</td><td>';
 print $formadvtargetemaling->advMultiselectarray(
-	'cust_status', array(
+	'cust_status',
+	array(
 		'0' => $langs->trans('ActivityCeased'),
 		'1' => $langs->trans('InActivity')
 	),
@@ -473,8 +474,9 @@ if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
 	$extrafields->fetch_name_optionals_label($elementype);
 	if (!empty($extrafields->attributes[$elementtype]['type'])) {
 		foreach ($extrafields->attributes[$elementtype]['type'] as $key => &$value) {
-			if ($value == 'radio')
+			if ($value == 'radio') {
 				$value = 'select';
+			}
 		}
 	}
 	if (!empty($extrafields->attributes[$elementtype]['label'])) {
diff --git a/htdocs/core/tpl/ajax/fileupload_main.tpl.php b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
index 6b7e21b5261..a4563c7536a 100644
--- a/htdocs/core/tpl/ajax/fileupload_main.tpl.php
+++ b/htdocs/core/tpl/ajax/fileupload_main.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -27,20 +26,20 @@ if (empty($conf) || !is_object($conf))
 <!-- START TEMPLATE FILE UPLOAD MAIN -->
 <script>
 window.locale = {
-    "fileupload": {
-        "errors": {
-            "maxFileSize": "<?php echo $langs->trans('FileIsTooBig'); ?>",
-            "minFileSize": "<?php echo $langs->trans('FileIsTooSmall'); ?>",
-            "acceptFileTypes": "<?php echo $langs->trans('FileTypeNotAllowed'); ?>",
-            "maxNumberOfFiles": "<?php echo $langs->trans('MaxNumberOfFilesExceeded'); ?>",
-            "uploadedBytes": "<?php echo $langs->trans('UploadedBytesExceedFileSize'); ?>",
-            "emptyResult": "<?php echo $langs->trans('EmptyFileUploadResult'); ?>"
-        },
-        "error": "<?php echo $langs->trans('Error'); ?>",
-        "start": "<?php echo $langs->trans('Start'); ?>",
-        "cancel": "<?php echo $langs->trans("Cancel"); ?>",
-        "destroy": "<?php echo $langs->trans('Delete'); ?>"
-    }
+	"fileupload": {
+		"errors": {
+			"maxFileSize": "<?php echo $langs->trans('FileIsTooBig'); ?>",
+			"minFileSize": "<?php echo $langs->trans('FileIsTooSmall'); ?>",
+			"acceptFileTypes": "<?php echo $langs->trans('FileTypeNotAllowed'); ?>",
+			"maxNumberOfFiles": "<?php echo $langs->trans('MaxNumberOfFilesExceeded'); ?>",
+			"uploadedBytes": "<?php echo $langs->trans('UploadedBytesExceedFileSize'); ?>",
+			"emptyResult": "<?php echo $langs->trans('EmptyFileUploadResult'); ?>"
+		},
+		"error": "<?php echo $langs->trans('Error'); ?>",
+		"start": "<?php echo $langs->trans('Start'); ?>",
+		"cancel": "<?php echo $langs->trans("Cancel"); ?>",
+		"destroy": "<?php echo $langs->trans('Delete'); ?>"
+	}
 };
 
 $(function () {
diff --git a/htdocs/core/tpl/ajax/fileupload_view.tpl.php b/htdocs/core/tpl/ajax/fileupload_view.tpl.php
index 488d992ad02..70182a17dbc 100644
--- a/htdocs/core/tpl/ajax/fileupload_view.tpl.php
+++ b/htdocs/core/tpl/ajax/fileupload_view.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -79,62 +78,62 @@ if (empty($conf) || !is_object($conf))
 <!-- Warning id on script is not W3C compliant and is reported as error by phpcs but it is required by fileupload plugin -->
 <script id="template-upload" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-upload fade">
-        <td class="preview"><span class="fade"></span></td>
-        <td class="name"><span>{%=file.name%}</span></td>
-        <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-        {% if (file.error) { %}
-            <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
-        {% } else if (o.files.valid && !i) { %}
-            <td>
-                <div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="bar" style="width:0%;"></div></div>
-            </td>
-            <td class="start">{% if (!o.options.autoUpload) { %}
-                <button class="btn btn-primary">
-                    <i class="icon-upload icon-white"></i>
-                    <span>{%=locale.fileupload.start%}</span>
-                </button>
-            {% } %}</td>
-        {% } else { %}
-            <td colspan="2"></td>
-        {% } %}
-        <td class="cancel">{% if (!i) { %}
-            <button class="btn btn-warning">
-                <i class="icon-ban-circle icon-white"></i>
-                <span>{%=locale.fileupload.cancel%}</span>
-            </button>
-        {% } %}</td>
-    </tr>
+	<tr class="template-upload fade">
+		<td class="preview"><span class="fade"></span></td>
+		<td class="name"><span>{%=file.name%}</span></td>
+		<td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+		{% if (file.error) { %}
+			<td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
+		{% } else if (o.files.valid && !i) { %}
+			<td>
+				<div class="progress progress-success progress-striped active" role="progressbar" aria-valuemin="0" aria-valuemax="100" aria-valuenow="0"><div class="bar" style="width:0%;"></div></div>
+			</td>
+			<td class="start">{% if (!o.options.autoUpload) { %}
+				<button class="btn btn-primary">
+					<i class="icon-upload icon-white"></i>
+					<span>{%=locale.fileupload.start%}</span>
+				</button>
+			{% } %}</td>
+		{% } else { %}
+			<td colspan="2"></td>
+		{% } %}
+		<td class="cancel">{% if (!i) { %}
+			<button class="btn btn-warning">
+				<i class="icon-ban-circle icon-white"></i>
+				<span>{%=locale.fileupload.cancel%}</span>
+			</button>
+		{% } %}</td>
+	</tr>
 {% } %}
 </script>
 <!-- The template to display files available for download -->
 <!-- Warning id on script is not W3C compliant and is reported as error by phpcs but it is required by jfilepload plugin -->
 <script id="template-download" type="text/x-tmpl">
 {% for (var i=0, file; file=o.files[i]; i++) { %}
-    <tr class="template-download fade">
-        {% if (file.error) { %}
-            <td></td>
-            <td class="name"><span>{%=file.name%}</span></td>
-            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-            <td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
-        {% } else { %}
-            <td class="preview">{% if (file.thumbnail_url) { %}
-                <a href="{%=file.url%}" title="{%=file.name%}" rel="gallery" download="{%=file.name%}"><img src="{%=file.thumbnail_url%}"></a>
-            {% } %}</td>
-            <td class="name">
-                <a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}">{%=file.name%}</a>
-            </td>
-            <td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
-            <td colspan="2"></td>
-        {% } %}
-        <td class="delete">
-            <button class="btn btn-danger" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}">
-                <i class="icon-trash icon-white"></i>
-                <span>{%=locale.fileupload.destroy%}</span>
-            </button>
-            <input type="checkbox" name="delete" value="1">
-        </td>
-    </tr>
+	<tr class="template-download fade">
+		{% if (file.error) { %}
+			<td></td>
+			<td class="name"><span>{%=file.name%}</span></td>
+			<td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+			<td class="error" colspan="2"><span class="label label-important">{%=locale.fileupload.error%}</span> {%=locale.fileupload.errors[file.error] || file.error%}</td>
+		{% } else { %}
+			<td class="preview">{% if (file.thumbnail_url) { %}
+				<a href="{%=file.url%}" title="{%=file.name%}" rel="gallery" download="{%=file.name%}"><img src="{%=file.thumbnail_url%}"></a>
+			{% } %}</td>
+			<td class="name">
+				<a href="{%=file.url%}" title="{%=file.name%}" rel="{%=file.thumbnail_url&&'gallery'%}" download="{%=file.name%}">{%=file.name%}</a>
+			</td>
+			<td class="size"><span>{%=o.formatFileSize(file.size)%}</span></td>
+			<td colspan="2"></td>
+		{% } %}
+		<td class="delete">
+			<button class="btn btn-danger" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}">
+				<i class="icon-trash icon-white"></i>
+				<span>{%=locale.fileupload.destroy%}</span>
+			</button>
+			<input type="checkbox" name="delete" value="1">
+		</td>
+	</tr>
 {% } %}
 </script>
 <br>
diff --git a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
index 119e27a705b..3193f3db96d 100644
--- a/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
+++ b/htdocs/core/tpl/ajax/objectlinked_lineimport.tpl.php
@@ -16,15 +16,13 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
 $objectUrl = $object->getNomUrl(0, '', 0, 1);
-if ($object->element == 'propal')
-{
+if ($object->element == 'propal') {
 	$objectUrl = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
 }
 
@@ -36,67 +34,67 @@ if ($object->element == 'propal')
 $(document).ready(function(){
 	$('.objectlinked_importbtn').click(function (e) {
 
-        e.preventDefault();
-        var page = $(this).attr("href");
+		e.preventDefault();
+		var page = $(this).attr("href");
 
-        var fromelement = $(this).attr("data-element");
-        var fromelementid = $(this).attr("data-id");
+		var fromelement = $(this).attr("data-element");
+		var fromelementid = $(this).attr("data-id");
 
 		if( page != undefined && fromelement != undefined && fromelementid != undefined)
 		{
-	    	var windowWidth = $(window).width()*0.8; //retrieve current window width
-	    	var windowHeight = $(window).height()*0.8; //retrieve current window height
+			var windowWidth = $(window).width()*0.8; //retrieve current window width
+			var windowHeight = $(window).height()*0.8; //retrieve current window height
 			var htmlLines;
 			var formId = "ajaxloaded_tablelinesform_" + fromelement + "_" + fromelementid;
-	        $.get(page, function (data) {
-	        	htmlLines = $(data).find('#tablelines') ;
-	        });
+			$.get(page, function (data) {
+				htmlLines = $(data).find('#tablelines') ;
+			});
 
 
-	        var $dialog = $('<form id="' + formId + '" action="<?php print $objectUrl; ?>"  method="post" ></form>')
-	        .load( page + " #tablelines", function() {
+			var $dialog = $('<form id="' + formId + '" action="<?php print $objectUrl; ?>"  method="post" ></form>')
+			.load( page + " #tablelines", function() {
 
-	        	$("#" + formId + " #tablelines").prop("id", "ajaxloaded_tablelines"); // change id attribute
+				$("#" + formId + " #tablelines").prop("id", "ajaxloaded_tablelines"); // change id attribute
 
-	        	$("#" + formId + "  .linecheckbox,#" + formId + " .linecheckboxtoggle").prop("checked", true); // checked by default
+				$("#" + formId + "  .linecheckbox,#" + formId + " .linecheckboxtoggle").prop("checked", true); // checked by default
 
-		        // reload checkbox toggle function
-	            $("#" + formId + " .linecheckboxtoggle").click(function(){
-	        		var checkBoxes = $("#" + formId + " .linecheckbox");
-	        		checkBoxes.prop("checked", this.checked);
-	        	});
+				// reload checkbox toggle function
+				$("#" + formId + " .linecheckboxtoggle").click(function(){
+					var checkBoxes = $("#" + formId + " .linecheckbox");
+					checkBoxes.prop("checked", this.checked);
+				});
 
 
-	        })
-	        .html(htmlLines)
-	        .dialog({
-	            autoOpen: false,
-	            modal: true,
-	            height: windowHeight,
-	            width: windowWidth,
-	            title: "<?php echo $langs->transnoentities('LinesToImport'); ?>",
-	            buttons: {
-	                    "<?php echo $langs->trans('Import'); ?>": function() {
-	                      	$( this ).dialog( "close" );
-    	      	        	$("#" + formId).append('<input type="hidden" name="action" value="import_lines_from_object" />');
-    	      	        	$("#" + formId).append('<input type="hidden" name="fromelement" value="' + fromelement + '" />');
-    	      	        	$("#" + formId).append('<input type="hidden" name="fromelementid" value="' + fromelementid + '" />');
-    	      	        	$("#" + formId).submit();
-	                    },
-	                    "<?php echo $langs->trans("Cancel"); ?>": function() {
-	                      $( this ).dialog( "close" );
-	                    }
-	            }
-	        });
+			})
+			.html(htmlLines)
+			.dialog({
+				autoOpen: false,
+				modal: true,
+				height: windowHeight,
+				width: windowWidth,
+				title: "<?php echo $langs->transnoentities('LinesToImport'); ?>",
+				buttons: {
+						"<?php echo $langs->trans('Import'); ?>": function() {
+							  $( this ).dialog( "close" );
+							  $("#" + formId).append('<input type="hidden" name="action" value="import_lines_from_object" />');
+							  $("#" + formId).append('<input type="hidden" name="fromelement" value="' + fromelement + '" />');
+							  $("#" + formId).append('<input type="hidden" name="fromelementid" value="' + fromelementid + '" />');
+							  $("#" + formId).submit();
+						},
+						"<?php echo $langs->trans("Cancel"); ?>": function() {
+						  $( this ).dialog( "close" );
+						}
+				}
+			});
 
-	        $dialog.dialog('open');
+			$dialog.dialog('open');
 		}
 		else
 		{
 			$.jnotify("<?php echo $langs->trans('ErrorNoUrl'); ?>", "error", true);
 		}
 
-    });
+	});
 
 
 
@@ -106,7 +104,7 @@ $(document).ready(function(){
 </script>
 <style type="text/css">
 .objectlinked_importbtn{
-    cursor:pointer;
+	cursor:pointer;
 }
 </style>
 <!-- END TEMPLATE IMPORT OBJECT LINKED LINES -->
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 1a797b936c3..6d6df3a5408 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -26,8 +26,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || !is_object($object))
-{
+if (empty($object) || !is_object($object)) {
 	print "Error, template page ".basename(__FILE__)." can't be called with no object defined.";
 	exit;
 }
@@ -50,13 +49,13 @@ if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1 && $conf->browser-
 $(document).ready(function(){
 	$(".imgupforline").hide();
 	$(".imgdownforline").hide();
-    $(".lineupdown").removeAttr('href');
-    $(".tdlineupdown").css("background-image",'url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/grip.png'; ?>)');
-    $(".tdlineupdown").css("background-repeat","no-repeat");
-    $(".tdlineupdown").css("background-position","center center");
+	$(".lineupdown").removeAttr('href');
+	$(".tdlineupdown").css("background-image",'url(<?php echo DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/grip.png'; ?>)');
+	$(".tdlineupdown").css("background-repeat","no-repeat");
+	$(".tdlineupdown").css("background-position","center center");
 
-    console.log("Prepare tableDnd for #<?php echo $tagidfortablednd; ?>");
-    $("#<?php echo $tagidfortablednd; ?>").tableDnD({
+	console.log("Prepare tableDnd for #<?php echo $tagidfortablednd; ?>");
+	$("#<?php echo $tagidfortablednd; ?>").tableDnD({
 		onDrop: function(table, row) {
 			var reloadpage = "<?php echo $forcereloadpage; ?>";
 			console.log("tableDND onDrop");
@@ -100,9 +99,9 @@ $(document).ready(function(){
 		onDragClass: "dragClass",
 		dragHandle: "td.tdlineupdown"
 	});
-    $(".tdlineupdown").hover( function() { $(this).addClass('showDragHandle'); },
-    	function() { $(this).removeClass('showDragHandle'); }
-    );
+	$(".tdlineupdown").hover( function() { $(this).addClass('showDragHandle'); },
+		function() { $(this).removeClass('showDragHandle'); }
+	);
 });
 </script>
 <?php } else { ?>
@@ -110,7 +109,7 @@ $(document).ready(function(){
 $(document).ready(function(){
 	$(".imgupforline").hide();
 	$(".imgdownforline").hide();
-    $(".lineupdown").removeAttr('href');
+	$(".lineupdown").removeAttr('href');
 });
 </script>
 <?php } ?>
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index 6dae2c713f2..bf148c2124f 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -1,8 +1,7 @@
 <?php
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -36,8 +35,7 @@ print '<td width="25%"></td>';
 print '<td width="25%"></td>';
 print "</tr>\n";
 
-if ($action !== 'editcomment')
-{
+if ($action !== 'editcomment') {
 	print '<tr class="oddeven">';
 
 	// Description
@@ -58,21 +56,17 @@ if ($action !== 'editcomment')
 print '</table></form>';
 
 // List of comments
-if (!empty($object->comments))
-{
+if (!empty($object->comments)) {
 	// Default color for current user
 	$TColors = array($user->id => array('bgcolor'=>'efefef', 'color'=>'555'));
 	$first = true;
-	foreach ($object->comments as $comment)
-	{
+	foreach ($object->comments as $comment) {
 		$fk_user = $comment->fk_user_author;
 		$userstatic->fetch($fk_user);
 
-		if (empty($TColors[$fk_user]))
-		{
+		if (empty($TColors[$fk_user])) {
 			$bgcolor = randomColor(180, 240);
-			if (!empty($userstatic->color))
-			{
+			if (!empty($userstatic->color)) {
 				$bgcolor = $userstatic->color;
 			}
 			$color = (colorIsLight($bgcolor)) ? '555' : 'fff';
@@ -85,8 +79,7 @@ if (!empty($object->comments))
 
 		print '<div class="width75p float comment comment-table" style="background-color:#'.$TColors[$fk_user]['bgcolor'].'">';
 		print '<div class="comment-info comment-cell">';
-		if (!empty($user->photo))
-		{
+		if (!empty($user->photo)) {
 			print Form::showphoto('userphoto', $userstatic, 80, 0, 0, '', 'small', 0, 1).'<br/>';
 		}
 		print $langs->trans('User').' : '.$userstatic->getNomUrl().'<br/>';
@@ -96,8 +89,7 @@ if (!empty($object->comments))
 		print '<div class="comment-cell comment-right">';
 		print '<div class="comment-table width100p">';
 
-		if ($action === 'editcomment' && $comment->id == $idcomment)
-		{
+		if ($action === 'editcomment' && $comment->id == $idcomment) {
 			print '<form method="POST" action="'.$varpage.'?id='.$object->id.'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="updatecomment">';
@@ -107,8 +99,7 @@ if (!empty($object->comments))
 		}
 
 		print '<div class="comment-description comment-cell">';
-		if ($action === 'editcomment' && $comment->id == $idcomment)
-		{
+		if ($action === 'editcomment' && $comment->id == $idcomment) {
 			$doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
 			print $doleditor->Create(1);
 		} else {
@@ -116,15 +107,13 @@ if (!empty($object->comments))
 		}
 		print '</div>'; // End comment-description
 
-		if ($action === 'editcomment' && $comment->id == $idcomment)
-		{
+		if ($action === 'editcomment' && $comment->id == $idcomment) {
 			print '<input name="update" type="submit" class="button" value="'.$langs->trans("Update").'">';
 			print '<input name="cancel" type="submit" class="button button-cancel" value="'.$langs->trans("Cancel").'">';
 
 			print '</form>';
 		} else {
-			if ($fk_user == $user->id || $user->admin == 1)
-			{
+			if ($fk_user == $user->id || $user->admin == 1) {
 				print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
 				print img_picto('', 'edit.png');
 				print '</a>';
diff --git a/htdocs/core/tpl/bloc_showhide.tpl.php b/htdocs/core/tpl/bloc_showhide.tpl.php
index d654f2b97b3..ee67fa6b74a 100644
--- a/htdocs/core/tpl/bloc_showhide.tpl.php
+++ b/htdocs/core/tpl/bloc_showhide.tpl.php
@@ -18,15 +18,18 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($blocname))
-{
+if (empty($blocname)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
 $hide = true; // Hide by default
-if (isset($parameters['showblocbydefault'])) $hide = (empty($parameters['showblocbydefault']) ? true : false);
-if (isset($object->extraparams[$blocname]['showhide'])) $hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
+if (isset($parameters['showblocbydefault'])) {
+	$hide = (empty($parameters['showblocbydefault']) ? true : false);
+}
+if (isset($object->extraparams[$blocname]['showhide'])) {
+	$hide = (empty($object->extraparams[$blocname]['showhide']) ? true : false);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE bloc_showhide.tpl.php -->
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 0a7ed20981e..de10465a736 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -33,23 +33,20 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-if ($action == 'presend')
-{
+if ($action == 'presend') {
 	$langs->load("mails");
 
 	$titreform = 'SendMail';
 
 	$object->fetch_projet();
 
-	if (!in_array($object->element, array('societe', 'user', 'member')))
-	{
+	if (!in_array($object->element, array('societe', 'user', 'member'))) {
 		// TODO get also the main_lastdoc field of $object. If not found, try to guess with following code
 
 		$ref = dol_sanitizeFileName($object->ref);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		// Special case
-		if ($object->element == 'invoice_supplier')
-		{
+		if ($object->element == 'invoice_supplier') {
 			$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
 		} else {
 			$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
@@ -61,17 +58,14 @@ if ($action == 'presend')
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id']))
-	{
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) {
 		$newlang = $_REQUEST['lang_id'];
 	}
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))
-	{
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 		$newlang = $object->thirdparty->default_lang;
 	}
 
-	if (!empty($newlang))
-	{
+	if (!empty($newlang)) {
 		$outputlangs = new Translate('', $conf);
 		$outputlangs->setDefaultLang($newlang);
 		// Load traductions files required by page
@@ -87,19 +81,20 @@ if ($action == 'presend')
 
 	// Build document if it not exists
 	$forcebuilddoc = true;
-	if (in_array($object->element, array('societe', 'user', 'member'))) $forcebuilddoc = false;
-	if ($object->element == 'invoice_supplier' && empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) $forcebuilddoc = false;
-	if ($forcebuilddoc)    // If there is no default value for supplier invoice, we do not generate file, even if modelpdf was set by a manual generation
-	{
-		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument'))
-		{
+	if (in_array($object->element, array('societe', 'user', 'member'))) {
+		$forcebuilddoc = false;
+	}
+	if ($object->element == 'invoice_supplier' && empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) {
+		$forcebuilddoc = false;
+	}
+	if ($forcebuilddoc) {    // If there is no default value for supplier invoice, we do not generate file, even if modelpdf was set by a manual generation
+		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument')) {
 			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			if ($result < 0) {
 				dol_print_error($db, $object->error, $object->errors);
 				exit();
 			}
-			if ($object->element == 'invoice_supplier')
-			{
+			if ($object->element == 'invoice_supplier') {
 				$fileparams = dol_most_recent_file($diroutput.'/'.get_exdir($object->id, 2, 0, 0, $object, $object->element).$ref, preg_quote($ref, '/').'([^\-])+');
 			} else {
 				$fileparams = dol_most_recent_file($diroutput.'/'.$ref, preg_quote($ref, '/').'[^\-]+');
@@ -123,8 +118,7 @@ if ($action == 'presend')
 	$formmail->param['langsmodels'] = (empty($newlang) ? $langs->defaultlang : $newlang);
 	$formmail->fromtype = (GETPOST('fromtype') ?GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
 
-	if ($formmail->fromtype === 'user')
-	{
+	if ($formmail->fromtype === 'user') {
 		$formmail->fromid = $user->id;
 	}
 
@@ -145,8 +139,7 @@ if ($action == 'presend')
 	}
 
 	$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);
 	}
@@ -170,8 +163,7 @@ if ($action == 'presend')
 		if (!empty($object->socid) && $object->socid > 0 && !is_object($object->thirdparty) && method_exists($object, 'fetch_thirdparty')) {
 			$object->fetch_thirdparty();
 		}
-		if (is_object($object->thirdparty))
-		{
+		if (is_object($object->thirdparty)) {
 			foreach ($object->thirdparty->thirdparty_and_contact_email_array(1) as $key => $value) {
 				$liste[$key] = $value;
 			}
@@ -206,7 +198,9 @@ if ($action == 'presend')
 	$formmail->withcancel = 1;
 
 	//$arrayoffamiliestoexclude=array('system', 'mycompany', 'object', 'objectamount', 'date', 'user', ...);
-	if (!isset($arrayoffamiliestoexclude)) $arrayoffamiliestoexclude = null;
+	if (!isset($arrayoffamiliestoexclude)) {
+		$arrayoffamiliestoexclude = null;
+	}
 
 	// Make substitution in email content
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
diff --git a/htdocs/core/tpl/commonfields_add.tpl.php b/htdocs/core/tpl/commonfields_add.tpl.php
index 388b4b63926..526d640b62a 100644
--- a/htdocs/core/tpl/commonfields_add.tpl.php
+++ b/htdocs/core/tpl/commonfields_add.tpl.php
@@ -23,8 +23,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -35,34 +34,57 @@ if (empty($conf) || !is_object($conf))
 
 $object->fields = dol_sort_array($object->fields, 'position');
 
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1 && abs($val['visible']) != 3) continue;
+	if (abs($val['visible']) != 1 && abs($val['visible']) != 3) {
+		continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) continue; // We don't want this field
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) {
+		continue; // We don't want this field
+	}
 
 	print '<tr id="field_'.$key.'">';
 	print '<td';
 	print ' class="titlefieldcreate';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['notnull'] > 0) {
+		print ' fieldrequired';
+	}
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+		print ' tdtop';
+	}
 	print '"';
 	print '>';
-	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
-	else print $langs->trans($val['label']);
+	if (!empty($val['help'])) {
+		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+	} else {
+		print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td>';
-	if (!empty($val['picto'])) { print img_picto('', $val['picto']); }
-	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOST($key, 'int');
-	elseif ($val['type'] == 'double') $value = price2num(GETPOST($key, 'alphanohtml'));
-	elseif ($val['type'] == 'text' || $val['type'] == 'html') $value = GETPOST($key, 'restricthtml');
-	elseif ($val['type'] == 'date') $value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
-	elseif ($val['type'] == 'datetime') $value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
-	elseif ($val['type'] == 'boolean') $value = (GETPOST($key) == 'on' ? 1 : 0);
-	else $value = GETPOST($key, 'alphanohtml');
-	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);
-	else print $object->showInputField($val, $key, $value, '', '', '', 0);
+	if (!empty($val['picto'])) {
+		print img_picto('', $val['picto']);
+	}
+	if (in_array($val['type'], array('int', 'integer'))) {
+		$value = GETPOST($key, 'int');
+	} elseif ($val['type'] == 'double') {
+		$value = price2num(GETPOST($key, 'alphanohtml'));
+	} elseif ($val['type'] == 'text' || $val['type'] == 'html') {
+		$value = GETPOST($key, 'restricthtml');
+	} elseif ($val['type'] == 'date') {
+		$value = dol_mktime(12, 0, 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
+	} elseif ($val['type'] == 'datetime') {
+		$value = dol_mktime(GETPOST($key.'hour', 'int'), GETPOST($key.'min', 'int'), 0, GETPOST($key.'month', 'int'), GETPOST($key.'day', 'int'), GETPOST($key.'year', 'int'));
+	} elseif ($val['type'] == 'boolean') {
+		$value = (GETPOST($key) == 'on' ? 1 : 0);
+	} else {
+		$value = GETPOST($key, 'alphanohtml');
+	}
+	if ($val['noteditable']) {
+		print $object->showOutputField($val, $key, $value, '', '', '', 0);
+	} else {
+		print $object->showInputField($val, $key, $value, '', '', '', 0);
+	}
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 76a9fafe417..8ea1befa009 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -22,12 +22,13 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
-if (!is_object($form)) $form = new Form($db);
+if (!is_object($form)) {
+	$form = new Form($db);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE commonfields_edit.tpl.php -->
@@ -35,26 +36,40 @@ if (!is_object($form)) $form = new Form($db);
 
 $object->fields = dol_sort_array($object->fields, 'position');
 
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4) continue;
+	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4) {
+		continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) continue; // We don't want this field
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) {
+		continue; // We don't want this field
+	}
 
 	print '<tr><td';
 	print ' class="titlefieldcreate';
-	if ($val['notnull'] > 0) print ' fieldrequired';
-	if (preg_match('/^(text|html)/', $val['type'])) print ' tdtop';
+	if ($val['notnull'] > 0) {
+		print ' fieldrequired';
+	}
+	if (preg_match('/^(text|html)/', $val['type'])) {
+		print ' tdtop';
+	}
 	print '">';
-	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
-	else print $langs->trans($val['label']);
+	if (!empty($val['help'])) {
+		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+	} else {
+		print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td>';
-	if (!empty($val['picto'])) { print img_picto('', $val['picto']); }
-	if (in_array($val['type'], array('int', 'integer'))) $value = GETPOSTISSET($key) ?GETPOST($key, 'int') : $object->$key;
-	elseif ($val['type'] == 'double') $value = GETPOSTISSET($key) ? price2num(GETPOST($key, 'alphanohtml')) : $object->$key;
-	elseif (preg_match('/^(text|html)/', $val['type'])) {
+	if (!empty($val['picto'])) {
+		print img_picto('', $val['picto']);
+	}
+	if (in_array($val['type'], array('int', 'integer'))) {
+		$value = GETPOSTISSET($key) ?GETPOST($key, 'int') : $object->$key;
+	} elseif ($val['type'] == 'double') {
+		$value = GETPOSTISSET($key) ? price2num(GETPOST($key, 'alphanohtml')) : $object->$key;
+	} elseif (preg_match('/^(text|html)/', $val['type'])) {
 		$tmparray = explode(':', $val['type']);
 		if (!empty($tmparray[1])) {
 			$check = $tmparray[1];
@@ -62,11 +77,15 @@ foreach ($object->fields as $key => $val)
 			$check = 'restricthtml';
 		}
 		$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $object->$key;
+	} else {
+		$value = GETPOSTISSET($key) ? GETPOST($key, 'alpha') : $object->$key;
 	}
-	else $value = GETPOSTISSET($key) ? GETPOST($key, 'alpha') : $object->$key;
 	//var_dump($val.' '.$key.' '.$value);
-	if ($val['noteditable']) print $object->showOutputField($val, $key, $value, '', '', '', 0);
-	else print $object->showInputField($val, $key, $value, '', '', '', 0);
+	if ($val['noteditable']) {
+		print $object->showOutputField($val, $key, $value, '', '', '', 0);
+	} else {
+		print $object->showInputField($val, $key, $value, '', '', '', 0);
+	}
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/core/tpl/commonfields_view.tpl.php b/htdocs/core/tpl/commonfields_view.tpl.php
index 5f58ba9e7e9..8fbd5aa2fb3 100644
--- a/htdocs/core/tpl/commonfields_view.tpl.php
+++ b/htdocs/core/tpl/commonfields_view.tpl.php
@@ -24,12 +24,13 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
-if (!is_object($form)) $form = new Form($db);
+if (!is_object($form)) {
+	$form = new Form($db);
+}
 
 ?>
 <!-- BEGIN PHP TEMPLATE commonfields_view.tpl.php -->
@@ -37,34 +38,54 @@ if (!is_object($form)) $form = new Form($db);
 
 $object->fields = dol_sort_array($object->fields, 'position');
 
-foreach ($object->fields as $key => $val)
-{
-	if (!empty($keyforbreak) && $key == $keyforbreak) break; // key used for break on second column
+foreach ($object->fields as $key => $val) {
+	if (!empty($keyforbreak) && $key == $keyforbreak) {
+		break; // key used for break on second column
+	}
 
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) continue;
+	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) {
+		continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) continue; // We don't want this field
-	if (in_array($key, array('ref', 'status'))) continue; // Ref and status are already in dol_banner
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !verifCond($val['enabled'])) {
+		continue; // We don't want this field
+	}
+	if (in_array($key, array('ref', 'status'))) {
+		continue; // Ref and status are already in dol_banner
+	}
 
 	$value = $object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield fieldname_'.$key;
 	//if ($val['notnull'] > 0) print ' fieldrequired';     // No fieldrequired on the view output
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+		print ' tdtop';
+	}
 	print '">';
-	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
-	else print $langs->trans($val['label']);
+	if (!empty($val['help'])) {
+		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+	} else {
+		print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td class="valuefield fieldname_'.$key;
-	if ($val['type'] == 'text') print ' wordbreak';
-	if ($val['cssview']) print ' '.$val['cssview'];
+	if ($val['type'] == 'text') {
+		print ' wordbreak';
+	}
+	if ($val['cssview']) {
+		print ' '.$val['cssview'];
+	}
 	print '">';
-	if (in_array($val['type'], array('text', 'html'))) print '<div class="longmessagecut">';
+	if (in_array($val['type'], array('text', 'html'))) {
+		print '<div class="longmessagecut">';
+	}
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	//print dol_escape_htmltag($object->$key, 1, 1);
-	if (in_array($val['type'], array('text', 'html'))) print '</div>';
+	if (in_array($val['type'], array('text', 'html'))) {
+		print '</div>';
+	}
 	print '</td>';
 	print '</tr>';
 }
@@ -79,10 +100,8 @@ print '<div class="underbanner clearboth"></div>';
 print '<table class="border centpercent tableforfield">';
 
 $alreadyoutput = 1;
-foreach ($object->fields as $key => $val)
-{
-	if ($alreadyoutput)
-	{
+foreach ($object->fields as $key => $val) {
+	if ($alreadyoutput) {
 		if (!empty($keyforbreak) && $key == $keyforbreak) {
 			$alreadyoutput = 0; // key used for break on second column
 		} else {
@@ -91,29 +110,48 @@ foreach ($object->fields as $key => $val)
 	}
 
 	// Discard if extrafield is a hidden field on form
-	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) continue;
+	if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4 && abs($val['visible']) != 5) {
+		continue;
+	}
 
-	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) continue; // We don't want this field
-	if (in_array($key, array('ref', 'status'))) continue; // Ref and status are already in dol_banner
+	if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) {
+		continue; // We don't want this field
+	}
+	if (in_array($key, array('ref', 'status'))) {
+		continue; // Ref and status are already in dol_banner
+	}
 
 	$value = $object->$key;
 
 	print '<tr><td';
 	print ' class="titlefield fieldname_'.$key;
 	//if ($val['notnull'] > 0) print ' fieldrequired';		// No fieldrequired inthe view output
-	if ($val['type'] == 'text' || $val['type'] == 'html') print ' tdtop';
+	if ($val['type'] == 'text' || $val['type'] == 'html') {
+		print ' tdtop';
+	}
 	print '">';
-	if (!empty($val['help'])) print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
-	else print $langs->trans($val['label']);
+	if (!empty($val['help'])) {
+		print $form->textwithpicto($langs->trans($val['label']), $langs->trans($val['help']));
+	} else {
+		print $langs->trans($val['label']);
+	}
 	print '</td>';
 	print '<td class="valuefield fieldname_'.$key;
-	if ($val['type'] == 'text') print ' wordbreak';
-	if ($val['cssview']) print ' '.$val['cssview'];
+	if ($val['type'] == 'text') {
+		print ' wordbreak';
+	}
+	if ($val['cssview']) {
+		print ' '.$val['cssview'];
+	}
 	print '">';
-	if (in_array($val['type'], array('text', 'html'))) print '<div class="longmessagecut">';
+	if (in_array($val['type'], array('text', 'html'))) {
+		print '<div class="longmessagecut">';
+	}
 	print $object->showOutputField($val, $key, $value, '', '', '', 0);
 	//print dol_escape_htmltag($object->$key, 1, 1);
-	if (in_array($val['type'], array('text', 'html'))) print '</div>';
+	if (in_array($val['type'], array('text', 'html'))) {
+		print '</div>';
+	}
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index e3c45b788c6..4c57ec953d4 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -24,8 +24,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || !is_object($object))
-{
+if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -73,8 +72,7 @@ $userstatic = new User($db);
 
 <!-- BEGIN PHP TEMPLATE CONTACTS -->
 <?php
-if ($permission)
-{
+if ($permission) {
 	print '<div class="underbanner clearboth"></div>'."\n";
 
 	print '<div class="div-table-responsive-no-min">'."\n";
@@ -91,15 +89,16 @@ if ($permission)
 
 	<?php
 
-	if (empty($hideaddcontactforuser))
-	{
+	if (empty($hideaddcontactforuser)) {
 		?>
 	<form class="tagtr impair nohover" action="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id; ?>" method="POST">
 		<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
 		<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 		<input type="hidden" name="action" value="addcontact" />
 		<input type="hidden" name="source" value="internal" />
-	    <?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
+		<?php if ($withproject) {
+			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		} ?>
 
 		<div class="tagtd"><?php echo $conf->global->MAIN_INFO_SOCIETE_NOM; ?></div>
 		<!--  <div class="nowrap tagtd"><?php echo img_object('', 'user').' '.$langs->trans("Users"); ?></div> -->
@@ -107,14 +106,16 @@ if ($permission)
 		<div class="tagtd maxwidthonsmartphone">
 		<?php
 		$tmpobject = $object;
-		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
+		if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
+			$tmpobject = $objectsrc;
+		}
 		$formcompany->selectTypeContact($tmpobject, '', 'type', 'internal');
 		?></div>
 		<div class="tagtd">&nbsp;</div>
 		<div class="tagtd center"><input type="submit" class="button" value="<?php echo $langs->trans("Add"); ?>"></div>
 	</form>
 
-	    <?php
+		<?php
 	}
 
 	if (empty($hideaddcontactforthirdparty)) {
@@ -125,14 +126,15 @@ if ($permission)
 		<input type="hidden" name="id" value="<?php echo $object->id; ?>" />
 		<input type="hidden" name="action" value="addcontact" />
 		<input type="hidden" name="source" value="external" />
-	    <?php if ($withproject) print '<input type="hidden" name="withproject" value="'.$withproject.'">'; ?>
+		<?php if ($withproject) {
+			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		} ?>
 
 		<div class="tagtd nowrap maxwidthonsmartphone noborderbottom">
 			<?php $selectedCompany = isset($_GET["newcompany"]) ? $_GET["newcompany"] : $object->socid; ?>
 			<?php
 			// add company icon before select list
-			if ($selectedCompany)
-			{
+			if ($selectedCompany) {
 				echo img_object('', 'company', 'class="hideonsmartphone"');
 			}
 			?>
@@ -145,8 +147,7 @@ if ($permission)
 			$nbofcontacts = $form->num;
 
 			$newcardbutton = '';
-			if (!empty($object->socid) && $object->socid > 1 && $user->rights->societe->creer)
-			{
+			if (!empty($object->socid) && $object->socid > 1 && $user->rights->societe->creer) {
 				$newcardbutton .= '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$selectedCompany.'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'" title="'.$langs->trans('NewContact').'"><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
 			}
 			print $newcardbutton;
@@ -155,17 +156,21 @@ if ($permission)
 		<div class="tagtd maxwidthonsmartphone noborderbottom">
 			<?php
 			$tmpobject = $object;
-			if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) $tmpobject = $objectsrc;
+			if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
+				$tmpobject = $objectsrc;
+			}
 			$formcompany->selectTypeContact($tmpobject, $preselectedtypeofcontact, 'typecontact', 'external', 'position', 0, 'minwidth100imp');
 			?>
 		</div>
 		<div class="tagtd noborderbottom">&nbsp;</div>
 		<div class="tagtd center noborderbottom">
-			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) echo ' disabled'; ?>>
+			<input type="submit" id="add-customer-contact" class="button" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) {
+				echo ' disabled';
+																				 } ?>>
 		</div>
 	</form>
 
-        <?php
+		<?php
 	}
 
 	print "</div>";
@@ -179,17 +184,14 @@ if ($permission)
 
 // TODO: replace this with direct SQL string to use $db->sort($sortfield, $sortorder)
 $list = array();
-foreach (array('internal', 'external') as $source)
-{
-	if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc))
-	{
+foreach (array('internal', 'external') as $source) {
+	if (($object->element == 'shipping' || $object->element == 'reception') && is_object($objectsrc)) {
 		$contactlist = $objectsrc->liste_contact(-1, $source);
 	} else {
 		$contactlist = $object->liste_contact(-1, $source);
 	}
 
-	foreach ($contactlist as $contact)
-	{
+	foreach ($contactlist as $contact) {
 		$entry = new stdClass();
 		$entry->id   = $contact['rowid'];
 		$entry->type = $contact['libelle'];
@@ -200,15 +202,13 @@ foreach (array('internal', 'external') as $source)
 		$entry->contact_name = "";
 		$entry->status = "";
 
-		if ($contact['source'] == 'internal')
-		{
+		if ($contact['source'] == 'internal') {
 			$entry->nature = $langs->trans("User");
 		} elseif ($contact['source'] == 'external') {
 			$entry->nature = $langs->trans("ThirdPartyContact");
 		}
 
-		if ($contact['socid'] > 0)
-		{
+		if ($contact['socid'] > 0) {
 			$companystatic->fetch($contact['socid']);
 			$entry->thirdparty_html = $companystatic->getNomUrl(1);
 			$entry->thirdparty_name = strtolower($companystatic->getFullName($langs));
@@ -217,8 +217,7 @@ foreach (array('internal', 'external') as $source)
 			$entry->thirdparty_name = strtolower($conf->global->MAIN_INFO_SOCIETE_NOM);
 		}
 
-		if ($contact['source'] == 'internal')
-		{
+		if ($contact['source'] == 'internal') {
 			$userstatic->fetch($contact['id']);
 			$entry->contact_html = $userstatic->getNomUrl(-1, '', 0, 0, 0, 0, '', 'valignmiddle');
 			$entry->contact_name = strtolower($userstatic->getFullName($langs));
@@ -228,8 +227,7 @@ foreach (array('internal', 'external') as $source)
 			$entry->contact_name = strtolower($contactstatic->getFullName($langs));
 		}
 
-		if ($contact['source'] == 'internal')
-		{
+		if ($contact['source'] == 'internal') {
 			$entry->status = $userstatic->LibStatut($contact['statuscontact'], 3);
 		} elseif ($contact['source'] == 'external') {
 			$entry->status = $contactstatic->LibStatut($contact['statuscontact'], 3);
@@ -243,8 +241,12 @@ foreach (array('internal', 'external') as $source)
 $sortfield = GETPOST("sortfield", "aZ09comma");
 $sortorder = GETPOST("sortorder", 'aZ09comma');
 
-if (!$sortfield) $sortfield = "nature";
-if (!$sortorder) $sortorder = "asc";
+if (!$sortfield) {
+	$sortfield = "nature";
+}
+if (!$sortorder) {
+	$sortorder = "asc";
+}
 
 // Re-sort list
 $list = dol_sort_array($list, $sortfield, $sortorder, 1, 0, 1);
@@ -286,8 +288,7 @@ print_liste_field_titre($arrayfields['status']['label'], $_SERVER["PHP_SELF"], "
 print_liste_field_titre('', $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>";
 
-foreach ($list as $entry)
-{
+foreach ($list as $entry) {
 	print '<tr class="oddeven">';
 
 	print '<td class="tdoverflowmax200">'.$entry->thirdparty_html.'</td>';
@@ -296,8 +297,7 @@ foreach ($list as $entry)
 	print '<td class="tdoverflowmax200">'.$entry->type.'</td>';
 	print '<td class="tdoverflowmax200 center">'.$entry->status.'</td>';
 
-	if ($permission)
-	{
+	if ($permission) {
 		$href = $_SERVER["PHP_SELF"];
 		$href .= '?id='.$object->id;
 		$href .= '&action=deletecontact&token='.newToken();
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index 80fd0d7df12..0dc0962af56 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -30,25 +30,32 @@
 // $savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
 
 // Protection to avoid direct call of template
-if (empty($langs) || !is_object($langs))
-{
+if (empty($langs) || !is_object($langs)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
 
 $langs->load("link");
-if (empty($relativepathwithnofile)) $relativepathwithnofile = '';
+if (empty($relativepathwithnofile)) {
+	$relativepathwithnofile = '';
+}
 
-if (!isset($permission)) $permission = $permissiontoadd;
-if (!isset($permtoedit)) $permtoedit = $permissiontoadd;
+if (!isset($permission)) {
+	$permission = $permissiontoadd;
+}
+if (!isset($permtoedit)) {
+	$permtoedit = $permissiontoadd;
+}
 
 // Drag and drop for up and down allowed on product, thirdparty, ...
 // The drag and drop call the page core/ajax/row.php
 // If you enable the move up/down of files here, check that page that include template set its sortorder on 'position_name' instead of 'name'
 // Also the object->fk_element must be defined.
 $disablemove = 1;
-if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket', 'holiday', 'expensereport'))) $disablemove = 0;
+if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket', 'holiday', 'expensereport'))) {
+	$disablemove = 0;
+}
 
 
 
@@ -56,17 +63,16 @@ if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket
  * Confirm form to delete
  */
 
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	$langs->load("companies"); // Need for string DeleteFile+ConfirmDeleteFiles
 	print $form->formconfirm(
-			$_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")).'&linkid='.GETPOST('linkid', 'int').(empty($param) ? '' : $param),
-			$langs->trans('DeleteFile'),
-			$langs->trans('ConfirmDeleteFile'),
-			'confirm_deletefile',
-			'',
-			0,
-			1
+		$_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")).'&linkid='.GETPOST('linkid', 'int').(empty($param) ? '' : $param),
+		$langs->trans('DeleteFile'),
+		$langs->trans('ConfirmDeleteFile'),
+		'confirm_deletefile',
+		'',
+		0,
+		1
 	);
 }
 
@@ -99,8 +105,7 @@ if (!isset($savingdocmask) || !empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_
 			'product_batch',
 			'bom',
 			'mrp'
-		)))
-		{
+		))) {
 			$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
 		}
 		/*if (in_array($modulepart,array('member')))
diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php
index 53cbe3d99cf..f194a177178 100644
--- a/htdocs/core/tpl/extrafields_add.tpl.php
+++ b/htdocs/core/tpl/extrafields_add.tpl.php
@@ -26,8 +26,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -37,13 +36,17 @@ if (empty($conf) || !is_object($conf))
 <?php
 
 // Other attributes
-if (!isset($parameters)) $parameters = array();
+if (!isset($parameters)) {
+	$parameters = array();
+}
 
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (empty($reshook)) {
 	$params = array();
-	if (isset($tpl_context)) $params['tpl_context'] = $tpl_context;
+	if (isset($tpl_context)) {
+		$params['tpl_context'] = $tpl_context;
+	}
 	$params['cols'] = $parameters['colspanvalue'];
 	print $object->showOptionals($extrafields, 'create', $params);
 }
diff --git a/htdocs/core/tpl/extrafields_edit.tpl.php b/htdocs/core/tpl/extrafields_edit.tpl.php
index dbc2b9745cd..5915fb8a633 100644
--- a/htdocs/core/tpl/extrafields_edit.tpl.php
+++ b/htdocs/core/tpl/extrafields_edit.tpl.php
@@ -26,8 +26,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -37,7 +36,9 @@ if (empty($conf) || !is_object($conf))
 <?php
 
 // Other attributes
-if (!isset($parameters)) $parameters = array();
+if (!isset($parameters)) {
+	$parameters = array();
+}
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (empty($reshook)) {
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index bbc5ba3370b..d1fe41d8c1f 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -3,22 +3,24 @@
 // So no output must be done.
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+	$extrafieldsobjectkey = $object->table_element;
+}
 
 // Loop to show all columns of extrafields from $obj, $extrafields and $db
-if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
-{
+if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
 	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']) > 0) {
-		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+		if (empty($extrafieldsobjectprefix)) {
+			$extrafieldsobjectprefix = 'ef.';
+		}
 
 		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
-			if (!empty($extrafields->attributes[$extrafieldsobjectkey]['list'][$key]))
+			if (!empty($extrafields->attributes[$extrafieldsobjectkey]['list'][$key])) {
 				$arrayfields[$extrafieldsobjectprefix.$key] = array(
 					'label'    => $extrafields->attributes[$extrafieldsobjectkey]['label'][$key],
 					'checked'  => (($extrafields->attributes[$extrafieldsobjectkey]['list'][$key] < 0) ? 0 : 1),
@@ -27,6 +29,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 					'langfile' => $extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key],
 					'help'     => $extrafields->attributes[$extrafieldsobjectkey]['help'][$key],
 				);
+			}
 		}
 	}
 }
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 8c46e34b428..5ea0e4821d6 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -1,37 +1,36 @@
 <?php
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+	$extrafieldsobjectkey = $object->table_element;
+}
 
 // Loop to show all columns of extrafields from $obj, $extrafields and $db
-if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
-{
-	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
-	{
-		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+	if (is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label'])) {
+		if (empty($extrafieldsobjectprefix)) {
+			$extrafieldsobjectprefix = 'ef.';
+		}
 
-		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
-		{
-			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked']))
-			{
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
+			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
 				$align = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
 				print '<td';
-				if ($align) print ' class="'.$align.'"';
+				if ($align) {
+					print ' class="'.$align.'"';
+				}
 				print ' data-key="'.$key.'"';
 				print '>';
 				$tmpkey = 'options_'.$key;
 
-				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
-				{
+				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey)) {
 					$datenotinstring = $obj->$tmpkey;
-					if (!is_numeric($obj->$tmpkey))	// For backward compatibility
-					{
+					if (!is_numeric($obj->$tmpkey)) {	// For backward compatibility
 						$datenotinstring = $db->jdate($datenotinstring);
 					}
 					$value = $datenotinstring;
@@ -39,8 +38,7 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 					$value = $obj->$tmpkey;
 				}
 				// If field is a computed field, we make computation to get value
-				if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])
-				{
+				if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]) {
 					//global $obj, $object;
 					//var_dump($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]);
 					//var_dump($obj);
@@ -51,18 +49,23 @@ if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_e
 
 				print $extrafields->showOutputField($key, $value, '', $extrafieldsobjectkey);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 
 				if ($extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
 					if (!$i) {
 						// we keep position for the first line
 						$totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];
 					}
-					if (is_numeric($obj->$tmpkey)) $totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
+					if (is_numeric($obj->$tmpkey)) {
+						$totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
+					}
 				}
-				if (!empty($val['isameasure']))
-				{
-					if (!$i) $totalarray['pos'][$totalarray['nbfield']] = $extrafieldsobjectprefix.$tmpkey;
+				if (!empty($val['isameasure'])) {
+					if (!$i) {
+						$totalarray['pos'][$totalarray['nbfield']] = $extrafieldsobjectprefix.$tmpkey;
+					}
 					$totalarray['val'][$extrafieldsobjectprefix.$tmpkey] += $obj->$tmpkey;
 				}
 			}
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index d69c045641d..77329eb06a4 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -3,44 +3,50 @@
 print '<!-- extrafields_list_search_input.tpl.php -->'."\n";
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+	$extrafieldsobjectkey = $object->table_element;
+}
 
 // Loop to show all columns of extrafields for the search title line
-if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
-{
-    if (!empty($extrafields->attributes[$extrafieldsobjectkey]['label']) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
-	{
-		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
-		if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
+if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+	if (!empty($extrafields->attributes[$extrafieldsobjectkey]['label']) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label'])) {
+		if (empty($extrafieldsobjectprefix)) {
+			$extrafieldsobjectprefix = 'ef.';
+		}
+		if (empty($search_options_pattern)) {
+			$search_options_pattern = 'search_options_';
+		}
 
-		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
-		{
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
 			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
 				$align = $extrafields->getAlignFlag($key);
 				$typeofextrafield = $extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
 
 				print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
 				$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
-				if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]))
-				{
+				if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) {
 					$searchclass = '';
-					if (in_array($typeofextrafield, array('varchar'))) $searchclass = 'searchstring';
-					if (in_array($typeofextrafield, array('int', 'double'))) $searchclass = 'searchnum';
+					if (in_array($typeofextrafield, array('varchar'))) {
+						$searchclass = 'searchstring';
+					}
+					if (in_array($typeofextrafield, array('int', 'double'))) {
+						$searchclass = 'searchnum';
+					}
 					print '<input class="flat'.($searchclass ? ' '.$searchclass : '').'" size="4" type="text" name="'.$search_options_pattern.$tmpkey.'" value="'.dol_escape_htmltag($search_array_options[$search_options_pattern.$tmpkey]).'">';
-				} elseif (in_array($typeofextrafield, array('datetime', 'timestamp')))
-				{
+				} elseif (in_array($typeofextrafield, array('datetime', 'timestamp'))) {
 					$morecss = '';
 					echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss, 0, $extrafieldsobjectkey, 1);
 				} else {
 					// for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid')
 					$morecss = '';
-					if (in_array($typeofextrafield, array('link', 'sellist', 'text', 'html'))) $morecss = 'maxwidth200';
+					if (in_array($typeofextrafield, array('link', 'sellist', 'text', 'html'))) {
+						$morecss = 'maxwidth200';
+					}
 					echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss, 0, $extrafieldsobjectkey, 1);
 				}
 				print '</td>';
diff --git a/htdocs/core/tpl/extrafields_list_search_param.tpl.php b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
index 5fca6bc70a9..56652b87dd3 100644
--- a/htdocs/core/tpl/extrafields_list_search_param.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_param.tpl.php
@@ -1,19 +1,18 @@
 <?php
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
 // Loop to complete $param for extrafields
-if (!empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
-{
-	if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
+if (!empty($search_array_options) && is_array($search_array_options)) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+	if (empty($search_options_pattern)) {
+		$search_options_pattern = 'search_options_';
+	}
 
-	foreach ($search_array_options as $key => $val)
-	{
+	foreach ($search_array_options as $key => $val) {
 		$crit = $val;
 		$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
 		if (is_array($val) && array_key_exists('start', $val) && array_key_exists('end', $val)) {
@@ -32,6 +31,8 @@ if (!empty($search_array_options) && is_array($search_array_options))	// $extraf
 			$param .= '&' . $search_options_pattern.$tmpkey.'_endmin='   . dol_print_date($val['end'], '%M');
 			$val = '';
 		}
-		if ($val != '') $param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);
+		if ($val != '') {
+			$param .= '&'.$search_options_pattern.$tmpkey.'='.urlencode($val);
+		}
 	}
 }
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index b0fb03f2709..7268da76007 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -1,28 +1,30 @@
 <?php
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+	$extrafieldsobjectkey = $object->table_element;
+}
 
 // Loop to complete the sql search criterias from extrafields
-if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($search_array_options))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
-{
-	if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
-	if (empty($search_options_pattern)) $search_options_pattern = 'search_options_';
+if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($search_array_options)) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+	if (empty($extrafieldsobjectprefix)) {
+		$extrafieldsobjectprefix = 'ef.';
+	}
+	if (empty($search_options_pattern)) {
+		$search_options_pattern = 'search_options_';
+	}
 
-	foreach ($search_array_options as $key => $val)
-	{
+	foreach ($search_array_options as $key => $val) {
 		$crit = $val;
 		$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
 		$typ = $extrafields->attributes[$extrafieldsobjectkey]['type'][$tmpkey];
 
-		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp')))
-		{
+		if ($crit != '' && in_array($typ, array('date', 'datetime', 'timestamp'))) {
 			if (is_numeric($crit)) {
 				$sql .= " AND ".$extrafieldsobjectprefix.$tmpkey." = '".$db->idate($crit)."'";
 			} elseif (is_array($crit)) {
@@ -34,22 +36,31 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 					$sql .= ' AND ('.$extrafieldsobjectprefix.$tmpkey." <= '". $db->idate($crit['end'])."')";
 				}
 			}
-		} elseif (in_array($typ, array('boolean')))
-		{
+		} elseif (in_array($typ, array('boolean'))) {
 			if ($crit !== '-1' && $crit !== '') {
 				$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." = '".$db->escape($crit)."'";
-				if ($crit == '0') $sql .= " OR ".$extrafieldsobjectprefix.$tmpkey." IS NULL";
+				if ($crit == '0') {
+					$sql .= " OR ".$extrafieldsobjectprefix.$tmpkey." IS NULL";
+				}
 				$sql .= ")";
 			}
-		} elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1'))
-		{
+		} elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1')) {
 			$mode_search = 0;
-			if (in_array($typ, array('int', 'double', 'real', 'price'))) $mode_search = 1; // Search on a numeric
-			if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') $mode_search = 2; // Search on a foreign key int
-			if (in_array($typ, array('sellist')) && !is_numeric($crit)) $mode_search = 0;// Search on a foreign key string
-			if (in_array($typ, array('chkbxlst', 'checkbox'))) $mode_search = 4; // Search on a multiselect field with sql type = text
-			if (is_array($crit)) $crit = implode(' ', $crit); // natural_search() expects a string
-			elseif ($typ === 'select' and is_string($crit) and strpos($crit, ' ') === false) {
+			if (in_array($typ, array('int', 'double', 'real', 'price'))) {
+				$mode_search = 1; // Search on a numeric
+			}
+			if (in_array($typ, array('sellist', 'link')) && $crit != '0' && $crit != '-1') {
+				$mode_search = 2; // Search on a foreign key int
+			}
+			if (in_array($typ, array('sellist')) && !is_numeric($crit)) {
+				$mode_search = 0;// Search on a foreign key string
+			}
+			if (in_array($typ, array('chkbxlst', 'checkbox'))) {
+				$mode_search = 4; // Search on a multiselect field with sql type = text
+			}
+			if (is_array($crit)) {
+				$crit = implode(' ', $crit); // natural_search() expects a string
+			} elseif ($typ === 'select' and is_string($crit) and strpos($crit, ' ') === false) {
 				$sql .= ' AND ('.$extrafieldsobjectprefix.$tmpkey.' = "'.$db->escape($crit).'")';
 				continue;
 			}
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index f1ea80871b8..0a61e51d33d 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -1,29 +1,32 @@
 <?php
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
-if (empty($extrafieldsobjectkey) && is_object($object)) $extrafieldsobjectkey = $object->table_element;
-if (!isset($disablesortlink)) $disablesortlink = 0;
+if (empty($extrafieldsobjectkey) && is_object($object)) {
+	$extrafieldsobjectkey = $object->table_element;
+}
+if (!isset($disablesortlink)) {
+	$disablesortlink = 0;
+}
 
 // Loop to show all columns of extrafields for the title line
-if (!empty($extrafieldsobjectkey))	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
-{
-    if (!empty($extrafields->attributes[$extrafieldsobjectkey]['label']) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label']))
-	{
-		if (empty($extrafieldsobjectprefix)) $extrafieldsobjectprefix = 'ef.';
+if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table_element like 'societe', 'socpeople', ...
+	if (!empty($extrafields->attributes[$extrafieldsobjectkey]['label']) && is_array($extrafields->attributes[$extrafieldsobjectkey]['label']) && count($extrafields->attributes[$extrafieldsobjectkey]['label'])) {
+		if (empty($extrafieldsobjectprefix)) {
+			$extrafieldsobjectprefix = 'ef.';
+		}
 
-		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val)
-		{
-			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked']))
-			{
+		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
+			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
 				$align = $extrafields->getAlignFlag($key);
 				$sortonfield = $extrafieldsobjectprefix.$key;
-				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield = '';
+				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) {
+					$sortonfield = '';
+				}
 				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') {
 					print '<th class="liste_titre thseparator"></th>';
 				} else {
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index f8d86f2abee..1721f686776 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -26,74 +26,86 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || !is_object($object))
-{
+if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
-if (!is_object($form)) $form = new Form($db);
+if (!is_object($form)) {
+	$form = new Form($db);
+}
 
 
 ?>
 <!-- BEGIN PHP TEMPLATE extrafields_view.tpl.php -->
 <?php
-if (!is_array($parameters)) $parameters = array();
-if (!empty($cols)) $parameters['colspan'] = ' colspan="'.$cols.'"';
-if (!empty($cols)) $parameters['cols'] = $cols;
-if (!empty($object->fk_soc)) $parameters['socid'] = $object->fk_soc;
+if (!is_array($parameters)) {
+	$parameters = array();
+}
+if (!empty($cols)) {
+	$parameters['colspan'] = ' colspan="'.$cols.'"';
+}
+if (!empty($cols)) {
+	$parameters['cols'] = $cols;
+}
+if (!empty($object->fk_soc)) {
+	$parameters['socid'] = $object->fk_soc;
+}
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 print $hookmanager->resPrint;
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 
 //var_dump($extrafields->attributes[$object->table_element]);
-if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
-{
+if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label'])) {
 	$lastseparatorkeyfound = '';
 	$extrafields_collapse_num = '';
 	$extrafields_collapse_num_old = '';
 	$i = 0;
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $tmpkeyextra => $tmplabelextra)
-	{
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $tmpkeyextra => $tmplabelextra) {
 		$i++;
 
 		// Discard if extrafield is a hidden field on form
 
 		$enabled = 1;
-		if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra]))
-		{
+		if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra])) {
 			$enabled = dol_eval($extrafields->attributes[$object->table_element]['enabled'][$tmpkeyextra], 1);
 		}
-		if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra]))
-		{
+		if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra])) {
 			$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$tmpkeyextra], 1);
 		}
 
 		$perms = 1;
-		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$tmpkeyextra]))
-		{
+		if ($perms && isset($extrafields->attributes[$object->table_element]['perms'][$tmpkeyextra])) {
 			$perms = dol_eval($extrafields->attributes[$object->table_element]['perms'][$tmpkeyextra], 1);
 		}
 		//print $tmpkeyextra.'-'.$enabled.'-'.$perms.'-'.$tmplabelextra.$_POST["options_" . $tmpkeyextra].'<br>'."\n";
 
-		if (empty($enabled)) continue; // 0 = Never visible field
-		if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5 && abs($enabled) != 4) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list <> 4 = not visible at the creation
-		if (empty($perms)) continue; // 0 = Not visible
+		if (empty($enabled)) {
+			continue; // 0 = Never visible field
+		}
+		if (abs($enabled) != 1 && abs($enabled) != 3 && abs($enabled) != 5 && abs($enabled) != 4) {
+			continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list <> 4 = not visible at the creation
+		}
+		if (empty($perms)) {
+			continue; // 0 = Not visible
+		}
 
 		// Load language if required
-		if (!empty($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra])) $langs->load($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra]);
-		if ($action == 'edit_extras')
-		{
+		if (!empty($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra])) {
+			$langs->load($extrafields->attributes[$object->table_element]['langfile'][$tmpkeyextra]);
+		}
+		if ($action == 'edit_extras') {
 			$value = (GETPOSTISSET("options_".$tmpkeyextra) ? GETPOST("options_".$tmpkeyextra) : $object->array_options["options_".$tmpkeyextra]);
 		} else {
-		    $value = (!empty($object->array_options["options_".$tmpkeyextra]) ? $object->array_options["options_".$tmpkeyextra] : '');
+			$value = (!empty($object->array_options["options_".$tmpkeyextra]) ? $object->array_options["options_".$tmpkeyextra] : '');
 			//var_dump($tmpkeyextra.' - '.$value);
 		}
 
 		// Print line tr of extra field
-		if ($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra] == 'separate')
-		{
+		if ($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra] == 'separate') {
 			$extrafields_collapse_num = '';
 			$extrafield_param = $extrafields->attributes[$object->table_element]['param'][$tmpkeyextra];
 			if (!empty($extrafield_param) && is_array($extrafield_param)) {
@@ -126,7 +138,9 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			print '<tr>';
 
 			print '<td class="';
-			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$tmpkeyextra])) print ' fieldrequired';
+			if ((!empty($action) && ($action == 'create' || $action == 'edit')) && !empty($extrafields->attributes[$object->table_element]['required'][$tmpkeyextra])) {
+				print ' fieldrequired';
+			}
 			print '">';
 			if (!empty($extrafields->attributes[$object->table_element]['help'][$tmpkeyextra])) {
 				// You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
@@ -141,23 +155,42 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			//var_dump($user->rights);
 			$permok = false;
 			$keyforperm = $object->element;
-			if ($object->element == 'fichinter') $keyforperm = 'ficheinter';
-			if (isset($user->rights->$keyforperm)) $permok = $user->rights->$keyforperm->creer || $user->rights->$keyforperm->create || $user->rights->$keyforperm->write;
-			if ($object->element == 'order_supplier')   $permok = $user->rights->fournisseur->commande->creer;
-			if ($object->element == 'invoice_supplier') $permok = $user->rights->fournisseur->facture->creer;
-			if ($object->element == 'shipping')         $permok = $user->rights->expedition->creer;
-			if ($object->element == 'delivery')         $permok = $user->rights->expedition->delivery->creer;
-			if ($object->element == 'productlot')       $permok = $user->rights->stock->creer;
-			if ($object->element == 'facturerec') 	    $permok = $user->rights->facture->creer;
-			if ($object->element == 'mo') 	    		$permok = $user->rights->mrp->write;
+			if ($object->element == 'fichinter') {
+				$keyforperm = 'ficheinter';
+			}
+			if (isset($user->rights->$keyforperm)) {
+				$permok = $user->rights->$keyforperm->creer || $user->rights->$keyforperm->create || $user->rights->$keyforperm->write;
+			}
+			if ($object->element == 'order_supplier') {
+				$permok = $user->rights->fournisseur->commande->creer;
+			}
+			if ($object->element == 'invoice_supplier') {
+				$permok = $user->rights->fournisseur->facture->creer;
+			}
+			if ($object->element == 'shipping') {
+				$permok = $user->rights->expedition->creer;
+			}
+			if ($object->element == 'delivery') {
+				$permok = $user->rights->expedition->delivery->creer;
+			}
+			if ($object->element == 'productlot') {
+				$permok = $user->rights->stock->creer;
+			}
+			if ($object->element == 'facturerec') {
+				$permok = $user->rights->facture->creer;
+			}
+			if ($object->element == 'mo') {
+				$permok = $user->rights->mrp->write;
+			}
 
 			$isdraft = ((isset($object->statut) && $object->statut == 0) || (isset($object->status) && $object->status == 0));
 			if (($isdraft || !empty($extrafields->attributes[$object->table_element]['alwayseditable'][$tmpkeyextra]))
 				&& $permok && $enabled != 5 && ($action != 'edit_extras' || GETPOST('attribute') != $tmpkeyextra)
-				&& empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra]))
-			{
+				&& empty($extrafields->attributes[$object->table_element]['computed'][$tmpkeyextra])) {
 				$fieldid = 'id';
-				if ($object->table_element == 'societe') $fieldid = 'socid';
+				if ($object->table_element == 'societe') {
+					$fieldid = 'socid';
+				}
 				print '<td class="right"><a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?'.$fieldid.'='.$object->id.'&action=edit_extras&attribute='.$tmpkeyextra.'&ignorecollapsesetup=1">'.img_edit().'</a></td>';
 			}
 			print '</tr></table>';
@@ -168,12 +201,10 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			print '<td id="'.$html_id.'" class="'.$object->element.'_extras_'.$tmpkeyextra.' wordbreak"'.(!empty($cols) ? ' colspan="'.$cols.'"' : '').'>';
 
 			// Convert date into timestamp format
-			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('date', 'datetime')))
-			{
+			if (in_array($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra], array('date', 'datetime'))) {
 				$datenotinstring = $object->array_options['options_'.$tmpkeyextra];
 				// print 'X'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.'x';
-				if (!is_numeric($object->array_options['options_'.$tmpkeyextra]))	// For backward compatibility
-				{
+				if (!is_numeric($object->array_options['options_'.$tmpkeyextra])) {	// For backward compatibility
 					$datenotinstring = $db->jdate($datenotinstring);
 				}
 				//print 'x'.$object->array_options['options_' . $tmpkeyextra].'-'.$datenotinstring.' - '.dol_print_date($datenotinstring, 'dayhour');
@@ -181,10 +212,11 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 			}
 
 			//TODO Improve element and rights detection
-			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'restricthtml') == $tmpkeyextra)
-			{
+			if ($action == 'edit_extras' && $permok && GETPOST('attribute', 'restricthtml') == $tmpkeyextra) {
 				$fieldid = 'id';
-				if ($object->table_element == 'societe') $fieldid = 'socid';
+				if ($object->table_element == 'societe') {
+					$fieldid = 'socid';
+				}
 				print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formextra">';
 				print '<input type="hidden" name="action" value="update_extras">';
 				print '<input type="hidden" name="attribute" value="'.$tmpkeyextra.'">';
@@ -208,8 +240,7 @@ if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]
 
 	// Add code to manage list depending on others
 	// TODO Test/enhance this with a more generic solution
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		print "\n";
 		print '
 				<script>
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index a9098d60211..de165c8c752 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -19,8 +19,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page filemanager.tpl.php can't be called as URL";
 	exit;
 }
@@ -34,19 +33,19 @@ if (empty($conf) || !is_object($conf))
 
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+	$module = 'ecm';
+}
 
 $permtoadd = 0;
 $permtoupload = 0;
 $showroot = 0;
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	$permtoadd = $user->rights->ecm->setup;
 	$permtoupload = $user->rights->ecm->upload;
 	$showroot = 0;
 }
-if ($module == 'medias')
-{
+if ($module == 'medias') {
 	$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
 	$permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
 	$showroot = 1;
@@ -55,8 +54,7 @@ if ($module == 'medias')
 
 
 // Confirm remove file (for non javascript users)
-if (($action == 'delete' || $action == 'file_manager_delete') && empty($conf->use_javascript_ajax))
-{
+if (($action == 'delete' || $action == 'file_manager_delete') && empty($conf->use_javascript_ajax)) {
 	// TODO Add website, pageid, filemanager if defined
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
 }
@@ -72,8 +70,7 @@ if (($action == 'delete' || $action == 'file_manager_delete') && empty($conf->us
 print '<div class="inline-block toolbarbutton centpercent">';
 
 // Toolbar
-if ($permtoadd)
-{
+if ($permtoadd) {
 	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
 	print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
 	print '</a>';
@@ -82,8 +79,7 @@ if ($permtoadd)
 	print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
 	print '</a>';
 }
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	$tmpurl = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
 	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
 	print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
@@ -96,16 +92,14 @@ $nameforformuserfile = 'formuserfileecm';
 print '<div class="inline-block valignmiddle floatright">';
 
 // To attach new file
-if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || !empty($section))
-{
-	if ((empty($section) || $section == -1) && ($module != 'medias'))
-	{
+if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || !empty($section)) {
+	if ((empty($section) || $section == -1) && ($module != 'medias')) {
 		?>
 		<script>
-    	jQuery(document).ready(function() {
+		jQuery(document).ready(function() {
 			jQuery('#<?php echo $nameforformuserfile ?>').hide();
-    	});
-    	</script>
+		});
+		</script>
 		<?php
 	}
 
@@ -114,7 +108,9 @@ if ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);
 	$formfile->form_attach_new_file($_SERVER["PHP_SELF"], 'none', 0, ($section ? $section : -1), $permtoupload, 48, null, '', 0, '', 0, $nameforformuserfile, '', $sectiondir);
-} else print '&nbsp;';
+} else {
+	print '&nbsp;';
+}
 
 print '</div>';
 // End "Add new file" area
@@ -131,15 +127,13 @@ print '</div>';
 
 
 // Ask confirmation of deletion of directory
-if ($action == 'delete_section')
-{
+if ($action == 'delete_section') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 }
 // End confirm
 
 
-if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete')
-{
+if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete') {
 	$langs->load("ecm");
 
 	print '<table width="100%" class="liste noborderbottom">'."\n";
@@ -155,14 +149,15 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 	// Manual section
 	$htmltooltip = $langs->trans("ECMAreaDesc2");
 
-	if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
-	{
+	if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 		// Show the link to "Root"
-		if ($showroot)
-		{
+		if ($showroot) {
 			print '<tr><td><div style="padding-left: 5px; padding-right: 5px;"><a href="'.$_SERVER["PHP_SELF"].'?file_manager=1&pageid='.$pageid.'">';
-			if ($module == 'medias') print $langs->trans("RootOfMedias");
-			else print $langs->trans("Root");
+			if ($module == 'medias') {
+				print $langs->trans("RootOfMedias");
+			} else {
+				print $langs->trans("Root");
+			}
 			print '</a></div></td></tr>';
 		}
 
@@ -171,7 +166,9 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 		// Show filemanager tree (will be filled by a call of ajax /ecm/tpl/enablefiletreeajax.tpl.php, later, that executes ajaxdirtree.php)
 		print '<div id="filetree" class="ecmfiletree"></div>';
 
-		if ($action == 'deletefile') print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+		if ($action == 'deletefile') {
+			print $form->formconfirm('eeeee', $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 'deletefile');
+		}
 
 		print '</td></tr>';
 	} else { // Show filtree when ajax is disabled (rare)
@@ -188,7 +185,9 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 		// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
 		// $_POST['dir']
 		$mode = 'noajax';
-		if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
+		if (empty($url)) {
+			$url = DOL_URL_ROOT.'/ecm/index.php';
+		}
 		include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirtree.php';
 
 		print '</div>';
@@ -211,7 +210,9 @@ if (empty($action) || $action == 'editfile' || $action == 'file_manager' || preg
 
 
 $mode = 'noajax';
-if (empty($url)) $url = DOL_URL_ROOT.'/ecm/index.php';
+if (empty($url)) {
+	$url = DOL_URL_ROOT.'/ecm/index.php';
+}
 include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php'; // Show content of a directory on right side
 
 
@@ -225,14 +226,15 @@ include DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php'; // Show content of a
 <?php
 
 
-if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) // Show filtree when ajax is enabled
-{
+if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) { // Show filtree when ajax is enabled
 	//var_dump($modulepart);
 	// Variables that may be defined:
 	// $_GET['modulepart'], $_GET['openeddir'], $_GET['sortfield'], $_GET['sortorder']
 	// $_POST['dir']
 	// $_POST['section_dir'], $_POST['section_id'], $_POST['token'], $_POST['max_file_size'], $_POST['sendit']
-	if (GETPOST('section_dir', 'alpha')) { $preopened = GETPOST('section_dir', 'alpha'); }
+	if (GETPOST('section_dir', 'alpha')) {
+		$preopened = GETPOST('section_dir', 'alpha');
+	}
 
 	include DOL_DOCUMENT_ROOT.'/ecm/tpl/enablefiletreeajax.tpl.php';
 }
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 2cd485a9510..80baabf8a1e 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -7,20 +7,23 @@ if (is_array($totalarray['totalizable'])) {
 	}
 }
 // Show total line
-if (isset($totalarray['pos']))
-{
+if (isset($totalarray['pos'])) {
 	print '<tr class="liste_total">';
 	$i = 0;
-	while ($i < $totalarray['nbfield'])
-	{
+	while ($i < $totalarray['nbfield']) {
 		$i++;
-		if (!empty($totalarray['pos'][$i]))  print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
-		else {
-			if ($i == 1)
-			{
-				if ($num < $limit) print '<td class="left">'.$langs->trans("Total").'</td>';
-				else print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
-			} else print '<td></td>';
+		if (!empty($totalarray['pos'][$i])) {
+			print '<td class="right">'.price($totalarray['val'][$totalarray['pos'][$i]]).'</td>';
+		} else {
+			if ($i == 1) {
+				if ($num < $limit) {
+					print '<td class="left">'.$langs->trans("Total").'</td>';
+				} else {
+					print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				}
+			} else {
+				print '<td></td>';
+			}
 		}
 	}
 	print '</tr>';
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 8d9c79f807d..b5dc9b90be0 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -20,7 +20,9 @@
 // Caller can also set 	$morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);
 
 
-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', 1);
+}
 
 // Protection to avoid direct call of template
 if (empty($conf) || !is_object($conf)) {
@@ -34,18 +36,32 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
-if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu = 1;
-if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu = 1;
-if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen = 1;
-if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover = 1;
-if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile = 1;
+if (GETPOST('dol_hide_topmenu')) {
+	$conf->dol_hide_topmenu = 1;
+}
+if (GETPOST('dol_hide_leftmenu')) {
+	$conf->dol_hide_leftmenu = 1;
+}
+if (GETPOST('dol_optimize_smallscreen')) {
+	$conf->dol_optimize_smallscreen = 1;
+}
+if (GETPOST('dol_no_mouse_hover')) {
+	$conf->dol_no_mouse_hover = 1;
+}
+if (GETPOST('dol_use_jmobile')) {
+	$conf->dol_use_jmobile = 1;
+}
 
 // If we force to use jmobile, then we reenable javascript
-if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
+if (!empty($conf->dol_use_jmobile)) {
+	$conf->use_javascript_ajax = 1;
+}
 
 $php_self = dol_escape_htmltag($_SERVER['PHP_SELF']);
 $php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';
-if (!preg_match('/mainmenu=/', $php_self)) $php_self .= (preg_match('/\?/', $php_self) ? '&' : '?').'mainmenu=home';
+if (!preg_match('/mainmenu=/', $php_self)) {
+	$php_self .= (preg_match('/\?/', $php_self) ? '&' : '?').'mainmenu=home';
+}
 
 // Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second
 $arrayofjs = array(
@@ -62,14 +78,20 @@ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 $titleofloginpage .= ' @ '.$titletruedolibarrversion; // $titletruedolibarrversion is defined by dol_loginfunction in security2.lib.php. We must keep the @, some tools use it to know it is login page and find true dolibarr version.
 
 $disablenofollow = 1;
-if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) $disablenofollow = 0;
-if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) $disablenofollow = 0;
+if (!preg_match('/'.constant('DOL_APPLICATION_TITLE').'/', $title)) {
+	$disablenofollow = 0;
+}
+if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	$disablenofollow = 0;
+}
 
 print top_htmlhead('', $titleofloginpage, 0, 0, $arrayofjs, array(), 0, $disablenofollow);
 
 
 $colorbackhmenu1 = '60,70,100'; // topmenu
-if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
+	$conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+}
 $colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
 
@@ -91,7 +113,9 @@ if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
 <script>
 $(document).ready(function () {
 	/* Set focus on correct field */
-	<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element
+	<?php if ($focus_element) {
+		?>$('#<?php echo $focus_element; ?>').focus(); <?php
+	} ?>		// Warning to use this only on visible element
 });
 </script>
 <?php } ?>
@@ -122,9 +146,13 @@ $(document).ready(function () {
 <!-- Title with version -->
 <div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
 <?php
-if ($disablenofollow) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+if ($disablenofollow) {
+	echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+}
 echo dol_escape_htmltag($title);
-if ($disablenofollow) echo '</a>';
+if ($disablenofollow) {
+	echo '</a>';
+}
 ?>
 </div>
 
@@ -147,7 +175,9 @@ if ($disablenofollow) echo '</a>';
 <!-- Login -->
 <div class="trinputlogin">
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
-<?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="username" class="hidden"><?php echo $langs->trans("Login"); ?></label><?php } ?>
+<?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	?><label for="username" class="hidden"><?php echo $langs->trans("Login"); ?></label><?php
+} ?>
 <!-- <span class="span-icon-user">-->
 <span class="fa fa-user"></span>
 <input type="text" id="username" placeholder="<?php echo $langs->trans("Login"); ?>" name="username" class="flat input-icon-user minwidth150" value="<?php echo dol_escape_htmltag($login); ?>" tabindex="1" autofocus="autofocus" />
@@ -157,7 +187,9 @@ if ($disablenofollow) echo '</a>';
 <!-- Password -->
 <div class="trinputlogin">
 <div class="tagtd nowraponall center valignmiddle tdinputlogin">
-<?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { ?><label for="password" class="hidden"><?php echo $langs->trans("Password"); ?></label><?php } ?>
+<?php if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	?><label for="password" class="hidden"><?php echo $langs->trans("Password"); ?></label><?php
+} ?>
 <!--<span class="span-icon-password">-->
 <span class="fa fa-key"></span>
 <input id="password" placeholder="<?php echo $langs->trans("Password"); ?>" name="password" class="flat input-icon-password minwidth150" type="password" value="<?php echo dol_escape_htmltag($password); ?>" tabindex="2" autocomplete="<?php echo empty($conf->global->MAIN_LOGIN_ENABLE_PASSWORD_AUTOCOMPLETE) ? 'off' : 'on'; ?>" />
@@ -167,8 +199,11 @@ if ($disablenofollow) echo '</a>';
 if ($captcha) {
 	// Add a variable param to force not using cache (jmobile)
 	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
-	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
-	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
+	if (preg_match('/\?/', $php_self)) {
+		$php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
+	} else {
+		$php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
+	}
 	// TODO: provide accessible captcha variants
 	?>
 	<!-- Captcha -->
@@ -190,8 +225,7 @@ if ($captcha) {
 
 if (!empty($morelogincontent)) {
 	if (is_array($morelogincontent)) {
-		foreach ($morelogincontent as $format => $option)
-		{
+		foreach ($morelogincontent as $format => $option) {
 			if ($format == 'table') {
 				echo '<!-- Option by hook -->';
 				echo $option;
@@ -221,29 +255,42 @@ if (!empty($morelogincontent)) {
 </div>
 
 <?php
-if ($forgetpasslink || $helpcenterlink)
-{
+if ($forgetpasslink || $helpcenterlink) {
 	$moreparam = '';
-	if ($dol_hide_topmenu)   $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_topmenu='.$dol_hide_topmenu;
-	if ($dol_hide_leftmenu)  $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_leftmenu='.$dol_hide_leftmenu;
-	if ($dol_no_mouse_hover) $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_no_mouse_hover='.$dol_no_mouse_hover;
-	if ($dol_use_jmobile)    $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_use_jmobile='.$dol_use_jmobile;
+	if ($dol_hide_topmenu) {
+		$moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_topmenu='.$dol_hide_topmenu;
+	}
+	if ($dol_hide_leftmenu) {
+		$moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_leftmenu='.$dol_hide_leftmenu;
+	}
+	if ($dol_no_mouse_hover) {
+		$moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_no_mouse_hover='.$dol_no_mouse_hover;
+	}
+	if ($dol_use_jmobile) {
+		$moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_use_jmobile='.$dol_use_jmobile;
+	}
 
 	echo '<br>';
 	echo '<div class="center" style="margin-top: 5px;">';
 	if ($forgetpasslink) {
 		$url = DOL_URL_ROOT.'/user/passwordforgotten.php'.$moreparam;
-		if (!empty($conf->global->MAIN_PASSWORD_FORGOTLINK)) $url = $conf->global->MAIN_PASSWORD_FORGOTLINK;
+		if (!empty($conf->global->MAIN_PASSWORD_FORGOTLINK)) {
+			$url = $conf->global->MAIN_PASSWORD_FORGOTLINK;
+		}
 		echo '<a class="alogin" href="'.dol_escape_htmltag($url).'">';
 		echo $langs->trans('PasswordForgotten');
 		echo '</a>';
 	}
 
-	if ($forgetpasslink && $helpcenterlink) echo '&nbsp;-&nbsp;';
+	if ($forgetpasslink && $helpcenterlink) {
+		echo '&nbsp;-&nbsp;';
+	}
 
 	if ($helpcenterlink) {
 		$url = DOL_URL_ROOT.'/support/index.php'.$moreparam;
-		if (!empty($conf->global->MAIN_HELPCENTER_LINKTOUSE)) $url = $conf->global->MAIN_HELPCENTER_LINKTOUSE;
+		if (!empty($conf->global->MAIN_HELPCENTER_LINKTOUSE)) {
+			$url = $conf->global->MAIN_HELPCENTER_LINKTOUSE;
+		}
 		echo '<a class="alogin" href="'.dol_escape_htmltag($url).'" target="_blank">';
 		echo $langs->trans('NeedHelpCenter');
 		echo '</a>';
@@ -251,8 +298,7 @@ if ($forgetpasslink || $helpcenterlink)
 	echo '</div>';
 }
 
-if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication))
-{
+if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->file->main_authentication)) {
 	$langs->load("users");
 
 	//if (! empty($conf->global->MAIN_OPENIDURL_PERUSER)) $url=
@@ -260,8 +306,9 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
 	echo '<div class="center" style="margin-top: 4px;">';
 
 	$url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
-	if (!empty($url)) print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';
-	else {
+	if (!empty($url)) {
+		print '<a class="alogin" href="'.$url.'">'.$langs->trans("LoginUsingOpenID").'</a>';
+	} else {
 		$langs->load("errors");
 		print '<font class="warning">'.$langs->trans("ErrorOpenIDSetupNotComplete", 'MAIN_AUTHENTICATION_OPENID_URL').'</font>';
 	}
@@ -282,8 +329,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/', $conf->fil
 
 <?php
 // Show error message if defined
-if (!empty($_SESSION['dol_loginmesg']))
-{
+if (!empty($_SESSION['dol_loginmesg'])) {
 	?>
 	<div class="center login_main_message"><div class="error">
 	<?php echo $_SESSION['dol_loginmesg']; ?>
@@ -299,8 +345,7 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
 	} else {
 		$resgetcommitstrip = getURLContent("https://www.commitstrip.com/en/feed/");
 	}
-	if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200')
-	{
+	if ($resgetcommitstrip && $resgetcommitstrip['http_code'] == '200') {
 		$xml = simplexml_load_string($resgetcommitstrip['content']);
 		$little = $xml->channel->item[0]->children('content', true);
 		print preg_replace('/width="650" height="658"/', '', $little->encoded);
@@ -309,8 +354,7 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
 
 ?>
 
-<?php if ($main_home)
-{
+<?php if ($main_home) {
 	?>
 	<div class="center login_main_home paddingtopbottom <?php echo empty($conf->global->MAIN_LOGIN_BACKGROUND) ? '' : ' backgroundsemitransparent'; ?>" style="max-width: 70%">
 	<?php echo $main_home; ?>
@@ -326,11 +370,12 @@ if (!empty($conf->global->MAIN_EASTER_EGG_COMMITSTRIP)) {
 <!-- Common footer is not used for login page, this is same than footer but inside login tpl -->
 
 <?php
-if (!empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER;
+if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+	print $conf->global->MAIN_HTML_FOOTER;
+}
 
 if (!empty($morelogincontent) && is_array($morelogincontent)) {
-	foreach ($morelogincontent as $format => $option)
-	{
+	foreach ($morelogincontent as $format => $option) {
 		if ($format == 'js') {
 			echo "\n".'<!-- Javascript by hook -->';
 			echo $option."\n";
@@ -343,8 +388,7 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
 
 // Google Analytics
 // TODO Add a hook here
-if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
-{
+if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
 	$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
 	foreach ($tmptagarray as $tmptag) {
 		print "\n";
@@ -365,10 +409,8 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 
 // TODO Replace this with a hook
 // Google Adsense (need Google module)
-if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT))
-{
-	if (empty($conf->dol_use_jmobile))
-	{
+if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT)) {
+	if (empty($conf->dol_use_jmobile)) {
 		?>
 	<div class="center"><br>
 		<script><!--
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index 7c6ab6deaa5..79b00f01590 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -27,28 +27,29 @@
 // $trackid='ord'.$object->id;
 
 
-if ($massaction == 'predeletedraft')
-{
+if ($massaction == 'predeletedraft') {
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDraftDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
 }
 
-if ($massaction == 'predelete')
-{
+if ($massaction == 'predelete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeletion"), $langs->trans("ConfirmMassDeletionQuestion", count($toselect)), "delete", null, '', 0, 200, 500, 1);
 }
 
-if ($massaction == 'preaffecttag')
-{
+if ($massaction == 'preaffecttag') {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$categ = new Categorie($db);
 	$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 (!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']));
+			}
 		}
 	}
 
@@ -71,26 +72,25 @@ if ($massaction == 'preaffecttag')
 	}
 }
 
-if ($massaction == 'presend')
-{
+if ($massaction == 'presend') {
 	$langs->load("mails");
 
 	$listofselectedid = array();
 	$listofselectedthirdparties = array();
 	$listofselectedref = array();
 
-	if (!GETPOST('cancel', 'alpha'))
-	{
+	if (!GETPOST('cancel', 'alpha')) {
 		foreach ($arrayofselected as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$listofselectedid[$toselectid] = $toselectid;
 				$thirdpartyid = ($objecttmp->fk_soc ? $objecttmp->fk_soc : $objecttmp->socid);
-				if ($objecttmp->element == 'societe')
+				if ($objecttmp->element == 'societe') {
 					$thirdpartyid = $objecttmp->id;
-				if ($objecttmp->element == 'expensereport')
+				}
+				if ($objecttmp->element == 'expensereport') {
 					$thirdpartyid = $objecttmp->fk_user_author;
+				}
 				$listofselectedthirdparties[$thirdpartyid] = $thirdpartyid;
 				$listofselectedref[$thirdpartyid][$toselectid] = $objecttmp->ref;
 			}
@@ -110,24 +110,20 @@ if ($massaction == 'presend')
 	$formmail->withform = -1;
 	$formmail->fromtype = (GETPOST('fromtype') ? GETPOST('fromtype') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
 
-	if ($formmail->fromtype === 'user')
-	{
+	if ($formmail->fromtype === 'user') {
 		$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')
-		{
+		if ($objecttmp->element == 'expensereport') {
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
 			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
@@ -183,8 +179,7 @@ if ($massaction == 'presend')
 	$formmail->param['models_id'] = GETPOST('modelmailselected', 'int');
 	$formmail->param['id'] = join(',', $arrayofselected);
 	// $formmail->param['returnurl']=$_SERVER["PHP_SELF"].'?id='.$object->id;
-	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB)
-	{
+	if (!empty($conf->global->MAILING_LIMIT_SENDBYWEB) && count($listofselectedthirdparties) > $conf->global->MAILING_LIMIT_SENDBYWEB) {
 		$langs->load("errors");
 		print img_warning().' '.$langs->trans('WarningNumberOfRecipientIsRestrictedInMassAction', $conf->global->MAILING_LIMIT_SENDBYWEB);
 		print ' - <a href="javascript: window.history.go(-1)">'.$langs->trans("GoBack").'</a>';
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index ec098be9db7..b1d9664af57 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -35,24 +35,26 @@ $permission = (isset($permissionnote) ? $permissionnote : (isset($permission) ?
 $moreparam = (isset($moreparam) ? $moreparam : '');
 $value_public = $object->note_public;
 $value_private = $object->note_private;
-if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES))
-{
+if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PUBLIC_NOTES)) {
 	$stringtoadd = dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
-	if (GETPOST('action', 'aZ09') == 'edit'.$note_public)
-	{
+	if (GETPOST('action', 'aZ09') == 'edit'.$note_public) {
 		$value_public = dol_concatdesc($value_public, ($value_public ? "\n" : "")."-- ".$stringtoadd);
-		if (dol_textishtml($value_public)) $value_public .= "<br>\n";
-		else $value_public .= "\n";
+		if (dol_textishtml($value_public)) {
+			$value_public .= "<br>\n";
+		} else {
+			$value_public .= "\n";
+		}
 	}
 }
-if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES))
-{
+if (!empty($conf->global->MAIN_AUTO_TIMESTAMP_IN_PRIVATE_NOTES)) {
 	$stringtoadd = dol_print_date(dol_now(), 'dayhour').' '.$user->getFullName($langs).' --';
-	if (GETPOST('action', 'aZ09') == 'edit'.$note_private)
-	{
+	if (GETPOST('action', 'aZ09') == 'edit'.$note_private) {
 		$value_private = dol_concatdesc($value_private, ($value_private ? "\n" : "")."-- ".$stringtoadd);
-		if (dol_textishtml($value_private)) $value_private .= "<br>\n";
-		else $value_private .= "\n";
+		if (dol_textishtml($value_private)) {
+			$value_private .= "<br>\n";
+		} else {
+			$value_private .= "\n";
+		}
 	}
 }
 
diff --git a/htdocs/core/tpl/object_discounts.tpl.php b/htdocs/core/tpl/object_discounts.tpl.php
index c2c89e28ce0..e5bf1e1017c 100644
--- a/htdocs/core/tpl/object_discounts.tpl.php
+++ b/htdocs/core/tpl/object_discounts.tpl.php
@@ -40,15 +40,16 @@ if (!empty($discount_type)) {
 	$fixedDiscount = $thirdparty->remise_supplier_percent;
 }
 
-if ($fixedDiscount > 0)
-{
+if ($fixedDiscount > 0) {
 	$translationKey = (!empty($discount_type)) ? 'HasRelativeDiscountFromSupplier' : 'CompanyHasRelativeDiscount';
 	print $langs->trans($translationKey, $fixedDiscount).'.';
 } else {
 	$translationKey = (!empty($discount_type)) ? 'HasNoRelativeDiscountFromSupplier' : 'CompanyHasNoRelativeDiscount';
 	print '<span class="opacitymedium">'.$langs->trans($translationKey).'.</span>';
 }
-if ($isNewObject) print ' ('.$addrelativediscount.')';
+if ($isNewObject) {
+	print ' ('.$addrelativediscount.')';
+}
 
 // Is there is commercial discount or down payment available ?
 if ($absolute_discount > 0) {
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index b4950f00e39..ee3a1ab71a4 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -39,26 +39,39 @@ if (empty($object) || !is_object($object)) {
 	exit;
 }
 $usemargins = 0;
-if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande')))
-{
+if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) {
 	$usemargins = 1;
 }
-if (!isset($dateSelector)) global $dateSelector; // Take global var only if not already defined into function calling (for example formAddObjectLine)
+if (!isset($dateSelector)) {
+	global $dateSelector; // Take global var only if not already defined into function calling (for example formAddObjectLine)
+}
 global $forceall, $forcetoshowtitlelines, $senderissupplier, $inputalsopricewithtax;
-if (!isset($dateSelector)) $dateSelector = 1; // For backward compatibility
-elseif (empty($dateSelector)) $dateSelector = 0;
-if (empty($forceall)) $forceall = 0;
-if (empty($senderissupplier)) $senderissupplier = 0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax = 0;
+if (!isset($dateSelector)) {
+	$dateSelector = 1; // For backward compatibility
+} elseif (empty($dateSelector)) {
+	$dateSelector = 0;
+}
+if (empty($forceall)) {
+	$forceall = 0;
+}
+if (empty($senderissupplier)) {
+	$senderissupplier = 0;
+}
+if (empty($inputalsopricewithtax)) {
+	$inputalsopricewithtax = 0;
+}
 // Define colspan for the button 'Add'
 $colspan = 3; // Columns: total ht + col edit + col delete
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan++; //Add column for Total (currency) if required
-if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier'))) $colspan++; // With this, there is a column move button
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	$colspan++; //Add column for Total (currency) if required
+}
+if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier'))) {
+	$colspan++; // With this, there is a column move button
+}
 //print $object->element;
 // Lines for extrafield
 $objectline = null;
-if (!empty($extrafields))
-{
+if (!empty($extrafields)) {
 	if ($this->table_element_line == 'commandedet') {
 		$objectline = new OrderLine($this->db);
 	} elseif ($this->table_element_line == 'propaldet') {
@@ -89,8 +102,7 @@ if ($nolinesbefore) {
 			<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span>
 		</td>
 		<?php
-		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
-		{
+		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {	// We must have same test in printObjectLines
 			?>
 			<td class="linecolrefsupplier"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef'); ?></span></td>
 			<?php
@@ -106,8 +118,7 @@ if ($nolinesbefore) {
 		<?php } ?>
 		<td class="linecolqty right"><?php echo $langs->trans('Qty'); ?></td>
 		<?php
-		if (!empty($conf->global->PRODUCT_USE_UNITS))
-		{
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			print '<td class="linecoluseunit left">';
 			print '<span id="title_units">';
 			print $langs->trans('Unit');
@@ -121,18 +132,23 @@ if ($nolinesbefore) {
 			print '<td class="linecolcycleref right">'.$langs->trans('Progress').'</td>';
 			print '<td class="linecolcycleref2 right"></td>';
 		}
-		if (!empty($usemargins))
-		{
+		if (!empty($usemargins)) {
 			if (empty($user->rights->margins->creer)) {
 				$colspan++;
 			} else {
 				print '<td class="margininfos linecolmargin1 right">';
-				if ($conf->global->MARGIN_TYPE == "1")
+				if ($conf->global->MARGIN_TYPE == "1") {
 					echo $langs->trans('BuyingPrice');
-				else echo $langs->trans('CostPrice');
+				} else {
+					echo $langs->trans('CostPrice');
+				}
 				echo '</td>';
-				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
-				if (!empty($conf->global->DISPLAY_MARK_RATES)) echo '<td class="margininfos linecolmargin2 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
+				if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
+					echo '<td class="margininfos linecolmargin2 right"><span class="np_marginRate">'.$langs->trans('MarginRate').'</span></td>';
+				}
+				if (!empty($conf->global->DISPLAY_MARK_RATES)) {
+					echo '<td class="margininfos linecolmargin2 right"><span class="np_markRate">'.$langs->trans('MarkRate').'</span></td>';
+				}
 			}
 		}
 		?>
@@ -155,20 +171,20 @@ if ($nolinesbefore) {
 
 		<?php
 		$freelines = false;
-		if (empty($conf->global->MAIN_DISABLE_FREE_LINES))
-		{
+		if (empty($conf->global->MAIN_DISABLE_FREE_LINES)) {
 			$freelines = true;
 			$forceall = 1; // We always force all type for free lines (module product or service means we use predefined product or service)
-			if ($object->element == 'contrat')
-			{
-				if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall = -1; // With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
-				elseif (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $forceall = 3;
+			if ($object->element == 'contrat') {
+				if (empty($conf->product->enabled) && empty($conf->service->enabled) && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+					$forceall = -1; // With contract, by default, no choice at all, except if CONTRACT_SUPPORT_PRODUCTS is set
+				} elseif (empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+					$forceall = 3;
+				}
 			}
 			// Free line
 			echo '<span class="prod_entry_mode_free">';
 			// Show radio free line
-			if ($forceall >= 0 && (!empty($conf->product->enabled) || !empty($conf->service->enabled)))
-			{
+			if ($forceall >= 0 && (!empty($conf->product->enabled) || !empty($conf->service->enabled))) {
 				echo '<label for="prod_entry_mode_free">';
 				echo '<input type="radio" class="prod_entry_mode_free" name="prod_entry_mode" id="prod_entry_mode_free" value="free"';
 				//echo (GETPOST('prod_entry_mode')=='free' ? ' checked' : ((empty($forceall) && (empty($conf->product->enabled) || empty($conf->service->enabled)))?' checked':'') );
@@ -181,10 +197,12 @@ if ($nolinesbefore) {
 			} else {
 				echo '<input type="hidden" id="prod_entry_mode_free" name="prod_entry_mode" value="free">';
 				// Show type selector
-				if ($forceall >= 0)
-				{
-					if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type");
-					else echo $langs->trans("FreeLineOfType");
+				if ($forceall >= 0) {
+					if (empty($conf->product->enabled) || empty($conf->service->enabled)) {
+						echo $langs->trans("Type");
+					} else {
+						echo $langs->trans("FreeLineOfType");
+					}
 					echo ' ';
 				}
 			}
@@ -192,22 +210,32 @@ if ($nolinesbefore) {
 			echo '</span>';
 		}
 		// Predefined product/service
-		if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-		{
-			if ($forceall >= 0 && $freelines) echo '<br><span class="prod_entry_mode_predef paddingtop">';
-			else echo '<span class="prod_entry_mode_predef">';
+		if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+			if ($forceall >= 0 && $freelines) {
+				echo '<br><span class="prod_entry_mode_predef paddingtop">';
+			} else {
+				echo '<span class="prod_entry_mode_predef">';
+			}
 			echo '<label for="prod_entry_mode_predef">';
 			echo '<input type="radio" class="prod_entry_mode_predef" name="prod_entry_mode" id="prod_entry_mode_predef" value="predef"'.(GETPOST('prod_entry_mode') == 'predef' ? ' checked' : '').'> ';
 			$labelforradio = '';
 			if (empty($conf->dol_optimize_smallscreen)) {
 				if (empty($senderissupplier)) {
-					if (!empty($conf->product->enabled) && empty($conf->service->enabled)) $labelforradio = $langs->trans('PredefinedProductsToSell');
-					elseif ((empty($conf->product->enabled) && !empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) $labelforradio = $langs->trans('PredefinedServicesToSell');
-					else $labelforradio = $langs->trans('PredefinedProductsAndServicesToSell');
+					if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {
+						$labelforradio = $langs->trans('PredefinedProductsToSell');
+					} elseif ((empty($conf->product->enabled) && !empty($conf->service->enabled)) || ($object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS))) {
+						$labelforradio = $langs->trans('PredefinedServicesToSell');
+					} else {
+						$labelforradio = $langs->trans('PredefinedProductsAndServicesToSell');
+					}
 				} else {
-					if (!empty($conf->product->enabled) && empty($conf->service->enabled)) $labelforradio = $langs->trans('PredefinedProductsToPurchase');
-					elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) $labelforradio = $langs->trans('PredefinedServicesToPurchase');
-					else $labelforradio = $langs->trans('PredefinedProductsAndServicesToPurchase');
+					if (!empty($conf->product->enabled) && empty($conf->service->enabled)) {
+						$labelforradio = $langs->trans('PredefinedProductsToPurchase');
+					} elseif (empty($conf->product->enabled) && !empty($conf->service->enabled)) {
+						$labelforradio = $langs->trans('PredefinedServicesToPurchase');
+					} else {
+						$labelforradio = $langs->trans('PredefinedProductsAndServicesToPurchase');
+					}
 				}
 			} else {
 				$labelforradio = $langs->trans('PredefinedItem');
@@ -216,9 +244,10 @@ if ($nolinesbefore) {
 			echo '</label>';
 			echo ' ';
 			$filtertype = '';
-			if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) $filtertype = '1';
-			if (empty($senderissupplier))
-			{
+			if (!empty($object->element) && $object->element == 'contrat' && empty($conf->global->CONTRACT_SUPPORT_PRODUCTS)) {
+				$filtertype = '1';
+			}
+			if (empty($senderissupplier)) {
 				$statustoshow = 1;
 				if (!empty($conf->global->ENTREPOT_EXTRA_STATUS)) {
 					// hide products in closed warehouse, but show products for internal transfer
@@ -226,8 +255,7 @@ if ($nolinesbefore) {
 				} else {
 					$form->select_produits(GETPOST('idprod'), 'idprod', $filtertype, $conf->product->limit_size, $buyer->price_level, $statustoshow, 2, '', 1, array(), $buyer->id, '1', 0, 'maxwidth500', 0, '', GETPOST('combinations', 'array'));
 				}
-				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS))
-				{
+				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_CUSTOMER_PRODUCTS)) {
 					?>
 				<script>
 					$(document).ready(function(){
@@ -246,8 +274,7 @@ if ($nolinesbefore) {
 				}
 			} else {
 				// $senderissupplier=2 is the same as 1 but disables test on minimum qty, disable autofill qty with minimum and autofill unit price
-				if ($senderissupplier != 2)
-				{
+				if ($senderissupplier != 2) {
 					$ajaxoptions = array(
 						'update' => array('qty'=>'qty', 'remise_percent' => 'discount', 'idprod' => 'idprod'), // html id tags that will be edited with each ajax json response key
 						'option_disabled' => 'idthatdoesnotexists', // html id to disable once select is done
@@ -261,8 +288,7 @@ if ($nolinesbefore) {
 					$alsoproductwithnosupplierprice = 1;
 				}
 				$form->select_produits_fournisseurs($object->socid, GETPOST('idprodfournprice'), 'idprodfournprice', '', '', $ajaxoptions, 1, $alsoproductwithnosupplierprice, 'minwidth300imp maxwidth500');
-				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_SUPPLIER_PRODUCTS))
-				{
+				if (!empty($conf->global->MAIN_AUTO_OPEN_SELECT2_ON_FOCUS_FOR_SUPPLIER_PRODUCTS)) {
 					?>
 				<script>
 					$(document).ready(function(){
@@ -282,16 +308,14 @@ if ($nolinesbefore) {
 			echo '<input type="hidden" name="pbq" id="pbq" value="">';
 			echo '</span>';
 		}
-		if (is_object($hookmanager) && empty($senderissupplier))
-		{
+		if (is_object($hookmanager) && empty($senderissupplier)) {
 			$parameters = array('fk_parent_line'=>GETPOST('fk_parent_line', 'int'));
 			$reshook = $hookmanager->executeHooks('formCreateProductOptions', $parameters, $object, $action);
 			if (!empty($hookmanager->resPrint)) {
 				print $hookmanager->resPrint;
 			}
 		}
-		if (is_object($hookmanager) && !empty($senderissupplier))
-		{
+		if (is_object($hookmanager) && !empty($senderissupplier)) {
 			$parameters = array('htmlname'=>'addproduct');
 			$reshook = $hookmanager->executeHooks('formCreateProductSupplierOptions', $parameters, $object, $action);
 			if (!empty($hookmanager->resPrint)) {
@@ -308,14 +332,17 @@ if ($nolinesbefore) {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$nbrows = ROWS_2;
 		$enabled = (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
-		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+			$nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		}
 		$toolbarname = 'dolibarr_details';
-		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
+		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+			$toolbarname = 'dolibarr_notes';
+		}
 		$doleditor = new DolEditor('dp_desc', GETPOST('dp_desc', 'restricthtml'), '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 100 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enabled, $nbrows, '98%');
 		$doleditor->Create();
 		// Show autofill date for recurring invoices
-		if (!empty($conf->service->enabled) && $object->element == 'facturerec')
-		{
+		if (!empty($conf->service->enabled) && $object->element == 'facturerec') {
 			echo '<div class="divlinefordates"><br>';
 			echo $langs->trans('AutoFillDateFrom').' ';
 			echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
@@ -333,16 +360,18 @@ if ($nolinesbefore) {
 			}
 		}
 		echo '</td>';
-		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
-		{
+		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {	// We must have same test in printObjectLines
 			$coldisplay++;
 			?>
 	<td class="nobottom linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth125" value="<?php echo (GETPOSTISSET("fourn_ref") ? GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>
-        <?php }
+		<?php }
 		print '<td class="nobottom linecolvat right">';
 		$coldisplay++;
-		if ($seller->tva_assuj == "0") echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
-		else echo $form->load_tva('tva_tx', (GETPOSTISSET("tva_tx") ? GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1);
+		if ($seller->tva_assuj == "0") {
+			echo '<input type="hidden" name="tva_tx" id="tva_tx" value="0">'.vatrate(0, true);
+		} else {
+			echo $form->load_tva('tva_tx', (GETPOSTISSET("tva_tx") ? GETPOST("tva_tx", 'alpha', 2) : -1), $seller, $buyer, 0, 0, '', false, 1);
+		}
 		?>
 	</td>
 
@@ -405,13 +434,11 @@ if ($nolinesbefore) {
 				<input type="text" id="buying_price" name="buying_price" class="flat maxwidth75 maxwidth150 right" value="<?php echo (GETPOSTISSET("buying_price") ? GETPOST("buying_price", 'alpha', 2) : ''); ?>">
 			</td>
 			<?php
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-			{
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_marginRate" name="np_marginRate" value="'.(GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", 'alpha', 2) : '').'"><span class="np_marginRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
-			if (!empty($conf->global->DISPLAY_MARK_RATES))
-			{
+			if (!empty($conf->global->DISPLAY_MARK_RATES)) {
 				echo '<td class="nobottom nowrap margininfos right"><input class="flat right" type="text" size="2" id="np_markRate" name="np_markRate" value="'.(GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : '').'"><span class="np_markRate hideonsmartphone">%</span></td>';
 				$coldisplay++;
 			}
@@ -425,8 +452,7 @@ if ($nolinesbefore) {
 </tr>
 
 <?php
-if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0')	// We show date field if required
-{
+if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dateSelector && GETPOST('type') != '0') {	// We show date field if required
 	print '<tr id="trlinefordates" class="oddeven">'."\n";
 	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 		print '<td></td>';
@@ -437,14 +463,11 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 
 	$prefillDates = false;
 
-	if (!empty($conf->global->MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE) && !empty($object->lines))
-	{
-		for ($i = count($object->lines) - 1; $i >= 0; $i--)
-		{
+	if (!empty($conf->global->MAIN_FILL_SERVICE_DATES_FROM_LAST_SERVICE_LINE) && !empty($object->lines)) {
+		for ($i = count($object->lines) - 1; $i >= 0; $i--) {
 			$lastline = $object->lines[$i];
 
-			if ($lastline->product_type == Product::TYPE_SERVICE && (!empty($lastline->date_start) || !empty($lastline->date_end)))
-			{
+			if ($lastline->product_type == Product::TYPE_SERVICE && (!empty($lastline->date_start) || !empty($lastline->date_end))) {
 				$date_start_prefill = $lastline->date_start;
 				$date_end_prefill = $lastline->date_end;
 
@@ -455,8 +478,7 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 	}
 
 
-	if (!empty($object->element) && $object->element == 'contrat')
-	{
+	if (!empty($object->element) && $object->element == 'contrat') {
 		print $langs->trans("DateStartPlanned").' ';
 		print $form->selectDate($date_start, "date_start", $usehm, $usehm, 1, "addproduct");
 		print ' &nbsp; '.$langs->trans("DateEndPlanned").' ';
@@ -468,28 +490,26 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 		print $form->selectDate($date_end, 'date_end', empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE) ? 0 : 1, 1, "addproduct", 1, 0);
 	};
 
-	if ($prefillDates)
-	{
+	if ($prefillDates) {
 		echo ' <span class="small"><a href="#" id="prefill_service_dates">'.$langs->trans('FillWithLastServiceDates').'</a></span>';
 	}
 
 	print '<script>';
 
-	if ($prefillDates)
-	{
+	if ($prefillDates) {
 		?>
-        function prefill_service_dates()
-        {
-            $('#date_start').val("<?php echo dol_escape_js(dol_print_date($date_start_prefill, '%d/%m/%Y')); ?>").trigger('change');
-            $('#date_end').val("<?php echo dol_escape_js(dol_print_date($date_end_prefill, '%d/%m/%Y')); ?>").trigger('change');
+		function prefill_service_dates()
+		{
+			$('#date_start').val("<?php echo dol_escape_js(dol_print_date($date_start_prefill, '%d/%m/%Y')); ?>").trigger('change');
+			$('#date_end').val("<?php echo dol_escape_js(dol_print_date($date_end_prefill, '%d/%m/%Y')); ?>").trigger('change');
 
-            return false; // Prevent default link behaviour (which is go to href URL)
-        }
+			return false; // Prevent default link behaviour (which is go to href URL)
+		}
 
-        $(document).ready(function()
-        {
-            $('#prefill_service_dates').click(prefill_service_dates);
-        });
+		$(document).ready(function()
+		{
+			$('#prefill_service_dates').click(prefill_service_dates);
+		});
 
 		<?php
 	}
@@ -517,8 +537,7 @@ if ((!empty($conf->service->enabled) || ($object->element == 'contrat')) && $dat
 
 
 print "<script>\n";
-if (!empty($usemargins) && $user->rights->margins->creer)
-{
+if (!empty($usemargins) && $user->rights->margins->creer) {
 	?>
 	/* Some js test when we click on button "Add" */
 	jQuery(document).ready(function() {
@@ -665,8 +684,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 		jQuery('#trlinefordates').show();
 
 		<?php
-		if (empty($conf->global->MAIN_DISABLE_EDIT_PREDEF_PRICEHT) && empty($senderissupplier))
-		{
+		if (empty($conf->global->MAIN_DISABLE_EDIT_PREDEF_PRICEHT) && empty($senderissupplier)) {
 			?>
 			var pbq = parseInt($('option:selected', this).attr('data-pbq'));	/* If product was selected with a HTML select */
 			if (isNaN(pbq)) { pbq = jQuery('#idprod').attr('data-pbq'); } 		/* If product was selected with a HTML input with autocomplete */
@@ -725,8 +743,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 			<?php
 		}
 
-		if (!empty($usemargins) && $user->rights->margins->creer)
-		{
+		if (!empty($usemargins) && $user->rights->margins->creer) {
 			$langs->load('stocks');
 			?>
 
@@ -748,11 +765,16 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 
 					/* setup of margin calculation */
 					var defaultbuyprice = '<?php
-					if (isset($conf->global->MARGIN_TYPE))
-					{
-						if ($conf->global->MARGIN_TYPE == '1')   print 'bestsupplierprice';
-						if ($conf->global->MARGIN_TYPE == 'pmp') print 'pmp';
-						if ($conf->global->MARGIN_TYPE == 'costprice') print 'costprice';
+					if (isset($conf->global->MARGIN_TYPE)) {
+						if ($conf->global->MARGIN_TYPE == '1') {
+							print 'bestsupplierprice';
+						}
+						if ($conf->global->MARGIN_TYPE == 'pmp') {
+							print 'pmp';
+						}
+						if ($conf->global->MARGIN_TYPE == 'costprice') {
+							print 'costprice';
+						}
 					} ?>';
 					console.log("we will set the field for margin. defaultbuyprice="+defaultbuyprice);
 
@@ -833,8 +855,7 @@ if (!empty($usemargins) && $user->rights->margins->creer)
 		?>
 
 		<?php
-		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY))
-		{?>
+		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {?>
 		/* To process customer price per quantity (PRODUIT_CUSTOMER_PRICES_BY_QTY works only if combo product is not an ajax after x key pressed) */
 		var pbq = parseInt($('option:selected', this).attr('data-pbq'));				// When select is done from HTML select
 		if (isNaN(pbq)) { pbq = jQuery('#idprod').attr('data-pbq');	}					// When select is done from HTML input with autocomplete
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index d5eac3e83c2..6138bcecc1a 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -33,28 +33,45 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || !is_object($object))
-{
+if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
 
 
 $usemargins = 0;
-if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;
+if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) {
+	$usemargins = 1;
+}
 
 global $forceall, $senderissupplier, $inputalsopricewithtax, $canchangeproduct;
-if (empty($dateSelector)) $dateSelector = 0;
-if (empty($forceall)) $forceall = 0;
-if (empty($senderissupplier)) $senderissupplier = 0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax = 0;
-if (empty($canchangeproduct)) $canchangeproduct = 0;
+if (empty($dateSelector)) {
+	$dateSelector = 0;
+}
+if (empty($forceall)) {
+	$forceall = 0;
+}
+if (empty($senderissupplier)) {
+	$senderissupplier = 0;
+}
+if (empty($inputalsopricewithtax)) {
+	$inputalsopricewithtax = 0;
+}
+if (empty($canchangeproduct)) {
+	$canchangeproduct = 0;
+}
 
 // Define colspan for the button 'Add'
 $colspan = 3; // Col total ht + col edit + col delete
-if (!empty($inputalsopricewithtax)) $colspan++; // We add 1 if col total ttc
-if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'facturerec', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier'))) $colspan++; // With this, there is a column move button
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) $colspan += 2;
+if (!empty($inputalsopricewithtax)) {
+	$colspan++; // We add 1 if col total ttc
+}
+if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'facturerec', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier'))) {
+	$colspan++; // With this, there is a column move button
+}
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	$colspan += 2;
+}
 
 print "<!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->\n";
 
@@ -78,12 +95,17 @@ $coldisplay++;
 	<?php if ($line->fk_product > 0) { ?>
 		<?php
 		if (empty($canchangeproduct)) {
-			if ($line->fk_parent_line > 0) echo img_picto('', 'rightarrow');
+			if ($line->fk_parent_line > 0) {
+				echo img_picto('', 'rightarrow');
+			}
 			?>
 			<a href="<?php echo DOL_URL_ROOT.'/product/card.php?id='.$line->fk_product; ?>">
 			<?php
-			if ($line->product_type == 1) echo img_object($langs->trans('ShowService'), 'service');
-			else print img_object($langs->trans('ShowProduct'), 'product');
+			if ($line->product_type == 1) {
+				echo img_object($langs->trans('ShowService'), 'service');
+			} else {
+				print img_object($langs->trans('ShowProduct'), 'product');
+			}
 			echo ' '.$line->ref;
 			?>
 			</a>
@@ -102,23 +124,25 @@ $coldisplay++;
 	<?php }	?>
 
 	<?php
-	if (is_object($hookmanager))
-	{
+	if (is_object($hookmanager)) {
 		$fk_parent_line = (GETPOST('fk_parent_line') ? GETPOST('fk_parent_line') : $line->fk_parent_line);
 		$parameters = array('line'=>$line, 'fk_parent_line'=>$fk_parent_line, 'var'=>$var, 'dateSelector'=>$dateSelector, 'seller'=>$seller, 'buyer'=>$buyer);
 		$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $this, $action);
 	}
 
 	// Do not allow editing during a situation cycle
-	if ($line->fk_prev_id == null)
-	{
+	if ($line->fk_prev_id == null) {
 		// editor wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$nbrows = ROWS_2;
-		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
+			$nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		}
 		$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
 		$toolbarname = 'dolibarr_details';
-		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
+		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) {
+			$toolbarname = 'dolibarr_notes';
+		}
 		$doleditor = new DolEditor('product_desc', $line->description, '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 164 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enable, $nbrows, '98%');
 		$doleditor->Create();
 	} else {
@@ -126,8 +150,7 @@ $coldisplay++;
 	}
 
 	//Line extrafield
-	if (!empty($extrafields))
-	{
+	if (!empty($extrafields)) {
 		$temps = $line->showOptionals($extrafields, 'edit', array('class'=>'tredited'), '', '', 1, 'line');
 		if (!empty($temps)) {
 			print '<div style="padding-top: 10px" id="extrafield_lines_area_edit" name="extrafield_lines_area_edit">';
@@ -137,8 +160,7 @@ $coldisplay++;
 	}
 
 	// Show autofill date for recuring invoices
-	if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec')
-	{
+	if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec') {
 		echo '<br>';
 		echo $langs->trans('AutoFillDateFrom').' ';
 		echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
@@ -151,8 +173,7 @@ $coldisplay++;
 	</td>
 
 	<?php
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
-	{
+	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {	// We must have same test in printObjectLines
 		$coldisplay++;
 		?>
 		<td class="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
@@ -168,7 +189,9 @@ $coldisplay++;
 
 	$coldisplay++;
 	print '<td class="right"><input type="text" class="flat right" size="5" id="price_ht" name="price_ht" value="'.(isset($line->pu_ht) ?price($line->pu_ht, 0, '', 0) : price($line->subprice, 0, '', 0)).'"';
-	if ($line->fk_prev_id != null) print ' readonly';
+	if ($line->fk_prev_id != null) {
+		print ' readonly';
+	}
 	print '></td>';
 
 	if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
@@ -176,11 +199,12 @@ $coldisplay++;
 		print '<td class="right"><input rel="'.$object->multicurrency_tx.'" type="text" class="flat right" size="5" id="multicurrency_subprice" name="multicurrency_subprice" value="'.price($line->multicurrency_subprice).'" /></td>';
 	}
 
-	if ($inputalsopricewithtax)
-	{
+	if ($inputalsopricewithtax) {
 		$coldisplay++;
 		print '<td class="right"><input type="text" class="flat right" size="5" id="price_ttc" name="price_ttc" value="'.(isset($line->pu_ttc) ?price($line->pu_ttc, 0, '', 0) : '').'"';
-		if ($line->fk_prev_id != null) print ' readonly';
+		if ($line->fk_prev_id != null) {
+			print ' readonly';
+		}
 		print '></td>';
 	}
 	?>
@@ -192,7 +216,9 @@ $coldisplay++;
 		// must also not be output for most entities (proposal, intervention, ...)
 		//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
 		print '<input size="3" type="text" class="flat right" name="qty" id="qty" value="'.$line->qty.'"';
-		if ($line->fk_prev_id != null) print ' readonly';
+		if ($line->fk_prev_id != null) {
+			print ' readonly';
+		}
 		print '>';
 	} else { ?>
 		&nbsp;
@@ -223,7 +249,9 @@ $coldisplay++;
 	<?php $coldisplay++;
 	if (($line->info_bits & 2) != 2) {
 		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="'.$line->remise_percent.'"';
-		if ($line->fk_prev_id != null) print ' readonly';
+		if ($line->fk_prev_id != null) {
+			print ' readonly';
+		}
 		print '>%';
 	} else { ?>
 		&nbsp;
@@ -236,13 +264,11 @@ $coldisplay++;
 		$coldisplay++;
 		print '<td></td>';
 	}
-	if (!empty($usemargins))
-	{
-		if (!empty($user->rights->margins->creer))
-		{
+	if (!empty($usemargins)) {
+		if (!empty($user->rights->margins->creer)) {
 			$coldisplay++;
 			?>
-        <td class="margininfos right">
+		<td class="margininfos right">
 			<!-- For predef product -->
 			<?php if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { ?>
 			<select id="fournprice_predef" name="fournprice_predef" class="flat minwidth75imp right" style="display: none;"></select>
@@ -253,21 +279,23 @@ $coldisplay++;
 		<?php }
 
 		if ($user->rights->margins->creer) {
-			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
-			{
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) {
 				$margin_rate = (GETPOSTISSET("np_marginRate") ? GETPOST("np_marginRate", "alpha", 2) : (($line->pa_ht == 0) ? '' : price($line->marge_tx)));
 				// if credit note, dont allow to modify margin
-				if ($line->subprice < 0)
+				if ($line->subprice < 0) {
 					echo '<td class="right nowrap margininfos">'.$margin_rate.'<span class="hideonsmartphone">%</span></td>';
-				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+				} else {
+					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_marginRate" value="'.$margin_rate.'"><span class="hideonsmartphone">%</span></td>';
+				}
 				$coldisplay++;
-			} elseif (!empty($conf->global->DISPLAY_MARK_RATES))
-			{
+			} elseif (!empty($conf->global->DISPLAY_MARK_RATES)) {
 				$mark_rate = (GETPOSTISSET("np_markRate") ? GETPOST("np_markRate", 'alpha', 2) : price($line->marque_tx));
 				// if credit note, dont allow to modify margin
-				if ($line->subprice < 0)
+				if ($line->subprice < 0) {
 					echo '<td class="right nowrap margininfos">'.$mark_rate.'<span class="hideonsmartphone">%</span></td>';
-				else echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+				} else {
+					echo '<td class="right nowrap margininfos"><input class="right maxwidth75" type="text" name="np_markRate" value="'.$mark_rate.'"><span class="hideonsmartphone">%</span></td>';
+				}
 				$coldisplay++;
 			}
 		}
@@ -320,8 +348,7 @@ $coldisplay++;
 <script>
 
 <?php
-if (!empty($usemargins) && $user->rights->margins->creer)
-{
+if (!empty($usemargins) && $user->rights->margins->creer) {
 	?>
 	/* Some js test when we click on button "Add" */
 	jQuery(document).ready(function() {
@@ -416,9 +443,8 @@ jQuery(document).ready(function()
 		}
 	});
 
-    <?php
-	if (!empty($conf->margin->enabled))
-	{
+	<?php
+	if (!empty($conf->margin->enabled)) {
 		?>
 		/* Add rule to clear margin when we change some data, so when we change sell or buy price, margin will be recalculated after submitting form */
 		jQuery("#tva_tx").click(function() {						/* somtimes field is a text, sometimes a combo */
@@ -449,7 +475,7 @@ jQuery(document).ready(function()
 		/* Init field buying_price and fournprice */
 		var token = '<?php echo currentToken(); ?>';		// For AJAX Call we use old 'token' and not 'newtoken'
 		$.post('<?php echo DOL_URL_ROOT; ?>/fourn/ajax/getSupplierPrices.php', {'idprod': <?php echo $line->fk_product ? $line->fk_product : 0; ?>, 'token': token }, function(data) {
-          if (data && data.length > 0) {
+		  if (data && data.length > 0) {
 			var options = '';
 			var trouve=false;
 			$(data).each(function() {
@@ -483,7 +509,7 @@ jQuery(document).ready(function()
 			$('#buying_price').show();
 		}
 		}, 'json');
-        <?php
+		<?php
 	}
 	?>
 });
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index 697c46c6fcd..1db838d3c09 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -34,8 +34,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || !is_object($object))
-{
+if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -48,14 +47,15 @@ print "<thead>\n";
 print '<tr class="liste_titre nodrag nodrop">';
 
 // Adds a line numbering column
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) print '<td class="linecolnum center">&nbsp;</td>';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	print '<td class="linecolnum center">&nbsp;</td>';
+}
 
 // Description
 print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
 
 // Supplier ref
-if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier')
-{
+if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier') {
 	print '<td class="linerefsupplier maxwidth125"><span id="title_fourn_ref">'.$langs->trans("SupplierRef").'</span></td>';
 }
 
@@ -67,8 +67,7 @@ if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FA
 	print $langs->trans('VAT');
 }
 
-if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT)
-{
+if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) {
 	global $mysoc;
 	print img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"');
 	print '<script>$(document).ready(function() { $(".clickvatforalllines").click(function() { jQuery(".classvatforalllines").toggle(); }); });</script>';
@@ -84,16 +83,19 @@ print '</td>';
 print '<td class="linecoluht right" style="width: 80px">'.$langs->trans('PriceUHT').'</td>';
 
 // Multicurrency
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoluht_currency right" style="width: 80px">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	print '<td class="linecoluht_currency right" style="width: 80px">'.$langs->trans('PriceUHTCurrency', $this->multicurrency_code).'</td>';
+}
 
-if ($inputalsopricewithtax) print '<td class="right" style="width: 80px">'.$langs->trans('PriceUTTC').'</td>';
+if ($inputalsopricewithtax) {
+	print '<td class="right" style="width: 80px">'.$langs->trans('PriceUTTC').'</td>';
+}
 
 // Qty
 print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 
 // Unit
-if (!empty($conf->global->PRODUCT_USE_UNITS))
-{
+if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 	print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
 }
 
@@ -107,10 +109,8 @@ if ($this->situation_cycle_ref) {
 }
 
 // Purchase price
-if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid))
-{
-	if (!empty($user->rights->margins->creer))
-	{
+if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid)) {
+	if (!empty($user->rights->margins->creer)) {
 		if ($conf->global->MARGIN_TYPE == "1") {
 			print '<td class="linecolmargin1 margininfos right" style="width: 80px">'.$langs->trans('BuyingPrice').'</td>';
 		} else {
@@ -130,9 +130,13 @@ if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid))
 print '<td class="linecolht right">'.$langs->trans('TotalHTShort').'</td>';
 
 // Multicurrency
-if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) print '<td class="linecoltotalht_currency right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
+	print '<td class="linecoltotalht_currency right">'.$langs->trans('TotalHTShortCurrency', $this->multicurrency_code).'</td>';
+}
 
-if ($outputalsopricetotalwithtax) print '<td class="right" style="width: 80px">'.$langs->trans('TotalTTCShort').'</td>';
+if ($outputalsopricetotalwithtax) {
+	print '<td class="right" style="width: 80px">'.$langs->trans('TotalTTCShort').'</td>';
+}
 
 print '<td class="linecoledit"></td>'; // No width to allow autodim
 
@@ -140,8 +144,7 @@ print '<td class="linecoldelete" style="width: 10px"></td>';
 
 print '<td class="linecolmove" style="width: 10px"></td>';
 
-if ($action == 'selectlines')
-{
+if ($action == 'selectlines') {
 	print '<td class="linecolcheckall center">';
 	print '<input type="checkbox" class="linecheckboxtoggle" />';
 	print '<script>$(document).ready(function() {$(".linecheckboxtoggle").click(function() {var checkBoxes = $(".linecheckbox");checkBoxes.prop("checked", this.checked);})});</script>';
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index e3516b8b2fc..1a223416787 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -39,8 +39,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($object) || !is_object($object))
-{
+if (empty($object) || !is_object($object)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -49,13 +48,25 @@ global $mysoc;
 global $forceall, $senderissupplier, $inputalsopricewithtax, $outputalsopricetotalwithtax;
 
 $usemargins = 0;
-if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) $usemargins = 1;
+if (!empty($conf->margin->enabled) && !empty($object->element) && in_array($object->element, array('facture', 'facturerec', 'propal', 'commande'))) {
+	$usemargins = 1;
+}
 
-if (empty($dateSelector)) $dateSelector = 0;
-if (empty($forceall)) $forceall = 0;
-if (empty($senderissupplier)) $senderissupplier = 0;
-if (empty($inputalsopricewithtax)) $inputalsopricewithtax = 0;
-if (empty($outputalsopricetotalwithtax)) $outputalsopricetotalwithtax = 0;
+if (empty($dateSelector)) {
+	$dateSelector = 0;
+}
+if (empty($forceall)) {
+	$forceall = 0;
+}
+if (empty($senderissupplier)) {
+	$senderissupplier = 0;
+}
+if (empty($inputalsopricewithtax)) {
+	$inputalsopricewithtax = 0;
+}
+if (empty($outputalsopricetotalwithtax)) {
+	$outputalsopricetotalwithtax = 0;
+}
 
 // add html5 elements
 $domData  = ' data-element="'.$line->element.'"';
@@ -81,34 +92,34 @@ if (($line->info_bits & 2) == 2) {
 	print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->socid.'">';
 	$txt = '';
 	print img_object($langs->trans("ShowReduc"), 'reduc').' ';
-	if ($line->description == '(DEPOSIT)') $txt = $langs->trans("Deposit");
-	elseif ($line->description == '(EXCESS RECEIVED)') $txt = $langs->trans("ExcessReceived");
-	elseif ($line->description == '(EXCESS PAID)') $txt = $langs->trans("ExcessPaid");
+	if ($line->description == '(DEPOSIT)') {
+		$txt = $langs->trans("Deposit");
+	} elseif ($line->description == '(EXCESS RECEIVED)') {
+		$txt = $langs->trans("ExcessReceived");
+	} elseif ($line->description == '(EXCESS PAID)') {
+		$txt = $langs->trans("ExcessPaid");
+	}
 	//else $txt=$langs->trans("Discount");
 	print $txt;
 	print '</a>';
-	if ($line->description)
-	{
-		if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0)
-		{
+	if ($line->description) {
+		if ($line->description == '(CREDIT_NOTE)' && $line->fk_remise_except > 0) {
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromCreditNote", $discount->getNomUrl(0));
-		} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0)
-		{
+		} elseif ($line->description == '(DEPOSIT)' && $line->fk_remise_except > 0) {
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromDeposit", $discount->getNomUrl(0));
 			// Add date of deposit
-			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE))
+			if (!empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) {
 				print ' ('.dol_print_date($discount->datec).')';
-		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0)
-		{
+			}
+		} elseif ($line->description == '(EXCESS RECEIVED)' && $objp->fk_remise_except > 0) {
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessReceived", $discount->getNomUrl(0));
-		} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0)
-		{
+		} elseif ($line->description == '(EXCESS PAID)' && $objp->fk_remise_except > 0) {
 			$discount = new DiscountAbsolute($this->db);
 			$discount->fetch($line->fk_remise_except);
 			print ($txt ? ' - ' : '').$langs->transnoentities("DiscountFromExcessPaid", $discount->getNomUrl(0));
@@ -123,14 +134,19 @@ if (($line->info_bits & 2) == 2) {
 		print $form->textwithtooltip($text, $description, 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 	} else {
 		$type = (!empty($line->product_type) ? $line->product_type : $line->fk_product_type);
-		if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
-		else $text = img_object($langs->trans('Product'), 'product');
+		if ($type == 1) {
+			$text = img_object($langs->trans('Service'), 'service');
+		} else {
+			$text = img_object($langs->trans('Product'), 'product');
+		}
 
 		if (!empty($line->label)) {
 			$text .= ' <strong>'.$line->label.'</strong>';
 			print $form->textwithtooltip($text, dol_htmlentitiesbr($line->description), 3, '', '', $i, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
 		} else {
-			if (!empty($line->fk_parent_line)) print img_picto('', 'rightarrow');
+			if (!empty($line->fk_parent_line)) {
+				print img_picto('', 'rightarrow');
+			}
 			if (preg_match('/^\(DEPOSIT\)/', $line->description)) {
 				$newdesc = preg_replace('/^\(DEPOSIT\)/', $langs->trans("Deposit"), $line->description);
 				print $text.' '.dol_htmlentitiesbr($newdesc);
@@ -142,24 +158,34 @@ if (($line->info_bits & 2) == 2) {
 
 	// Show date range
 	if ($line->element == 'facturedetrec') {
-		if ($line->date_start_fill || $line->date_end_fill) print '<br><div class="clearboth nowraponall">';
-		if ($line->date_start_fill) print $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
-		if ($line->date_start_fill && $line->date_end_fill) print ' - ';
-		if ($line->date_end_fill) print $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
-		if ($line->date_start_fill || $line->date_end_fill) print '</div>';
+		if ($line->date_start_fill || $line->date_end_fill) {
+			print '<br><div class="clearboth nowraponall">';
+		}
+		if ($line->date_start_fill) {
+			print $langs->trans('AutoFillDateFromShort').': '.yn($line->date_start_fill);
+		}
+		if ($line->date_start_fill && $line->date_end_fill) {
+			print ' - ';
+		}
+		if ($line->date_end_fill) {
+			print $langs->trans('AutoFillDateToShort').': '.yn($line->date_end_fill);
+		}
+		if ($line->date_start_fill || $line->date_end_fill) {
+			print '</div>';
+		}
 	} else {
-		if ($line->date_start || $line->date_end) print '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+		if ($line->date_start || $line->date_end) {
+			print '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end, $format).'</div>';
+		}
 		//print get_date_range($line->date_start, $line->date_end, $format);
 	}
 
 	// Add description in form
-	if ($line->fk_product > 0 && !empty($conf->global->PRODUIT_DESC_IN_FORM))
-	{
+	if ($line->fk_product > 0 && !empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 		print (!empty($line->description) && $line->description != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->description) : '';
 	}
 	//Line extrafield
-	if (!empty($extrafields))
-	{
+	if (!empty($extrafields)) {
 		$temps = $line->showOptionals($extrafields, 'view', array(), '', '', 1, 'line');
 		if (!empty($temps)) {
 			print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
@@ -169,32 +195,28 @@ if (($line->info_bits & 2) == 2) {
 	}
 }
 
-if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0 && empty($conf->global->SUPPLIER_HIDE_SUPPLIER_OBJECTLINES))
-{
+if ($user->rights->fournisseur->lire && $line->fk_fournprice > 0 && empty($conf->global->SUPPLIER_HIDE_SUPPLIER_OBJECTLINES)) {
 	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 	$productfourn = new ProductFournisseur($this->db);
 	$productfourn->fetch_product_fournisseur_price($line->fk_fournprice);
 	print '<div class="clearboth"></div>';
 	print '<span class="opacitymedium">'.$langs->trans('Supplier').' : </span>'.$productfourn->getSocNomUrl(1, 'supplier').' - <span class="opacitymedium">'.$langs->trans('Ref').' : </span>';
 	// Supplier ref
-	if ($user->rights->produit->creer || $user->rights->service->creer) // change required right here
-	{
+	if ($user->rights->produit->creer || $user->rights->service->creer) { // change required right here
 		print $productfourn->getNomUrl();
 	} else {
 		print $productfourn->ref_supplier;
 	}
 }
 
-if (!empty($conf->accounting->enabled) && $line->fk_accounting_account > 0)
-{
+if (!empty($conf->accounting->enabled) && $line->fk_accounting_account > 0) {
 	$accountingaccount = new AccountingAccount($this->db);
 	$accountingaccount->fetch($line->fk_accounting_account);
 	print '<div class="clearboth"></div><br><span class="opacitymedium">'.$langs->trans('AccountingAffectation').' : </span>'.$accountingaccount->getNomUrl(0, 1, 1);
 }
 
 print '</td>';
-if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier')	// We must have same test in printObjectLines
-{
+if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {	// We must have same test in printObjectLines
 	print '<td class="linecolrefsupplier">';
 	print ($line->ref_fourn ? $line->ref_fourn : $line->ref_supplier);
 	print '</td>';
@@ -203,10 +225,18 @@ if ($object->element == 'supplier_proposal' || $object->element == 'order_suppli
 print '<td class="linecolvat nowrap right">';
 $coldisplay++;
 $positiverates = '';
-if (price2num($line->tva_tx))          $positiverates .= ($positiverates ? '/' : '').price2num($line->tva_tx);
-if (price2num($line->total_localtax1)) $positiverates .= ($positiverates ? '/' : '').price2num($line->localtax1_tx);
-if (price2num($line->total_localtax2)) $positiverates .= ($positiverates ? '/' : '').price2num($line->localtax2_tx);
-if (empty($positiverates)) $positiverates = '0';
+if (price2num($line->tva_tx)) {
+	$positiverates .= ($positiverates ? '/' : '').price2num($line->tva_tx);
+}
+if (price2num($line->total_localtax1)) {
+	$positiverates .= ($positiverates ? '/' : '').price2num($line->localtax1_tx);
+}
+if (price2num($line->total_localtax2)) {
+	$positiverates .= ($positiverates ? '/' : '').price2num($line->localtax2_tx);
+}
+if (empty($positiverates)) {
+	$positiverates = '0';
+}
 print vatrate($positiverates.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : ''), '%', $line->info_bits);
 //print vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
 ?></td>
@@ -229,11 +259,12 @@ if ((($line->info_bits & 2) != 2) && $line->special_code != 3) {
 	// must also not be output for most entities (proposal, intervention, ...)
 	//if($line->qty > $line->stock) print img_picto($langs->trans("StockTooLow"),"warning", 'style="vertical-align: bottom;"')." ";
 	print price($line->qty, 0, '', 0, 0); // Yes, it is a quantity, not a price, but we just want the formating role of function price
-} else print '&nbsp;';
+} else {
+	print '&nbsp;';
+}
 print '</td>';
 
-if (!empty($conf->global->PRODUCT_USE_UNITS))
-{
+if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 	print '<td class="linecoluseunit nowrap left">';
 	$label = $line->getLabelOfUnit('short');
 	if ($label !== '') {
@@ -253,8 +284,7 @@ if (!empty($line->remise_percent) && $line->special_code != 3) {
 }
 
 // Fields for situation invoices
-if ($this->situation_cycle_ref)
-{
+if ($this->situation_cycle_ref) {
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 	$coldisplay++;
 	print '<td class="linecolcycleref nowrap right">'.$line->situation_percent.'%</td>';
@@ -264,8 +294,7 @@ if ($this->situation_cycle_ref)
 	print '<td align="right" class="linecolcycleref2 nowrap">'.price($sign * $tmp[0]).'</td>';
 }
 
-if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid))
-{
+if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid)) {
 	if (!empty($user->rights->margins->creer)) { ?>
 		<td class="linecolmargin1 nowrap margininfos right"><?php $coldisplay++; ?><?php print price($line->pa_ht); ?></td>
 	<?php }
@@ -273,8 +302,8 @@ if ($usemargins && !empty($conf->margin->enabled) && empty($user->socid))
 		<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print (($line->pa_ht == 0) ? 'n/a' : price(price2num($line->marge_tx, 'MT')).'%'); ?></td>
 	<?php }
 	if (!empty($conf->global->DISPLAY_MARK_RATES) && $user->rights->margins->liretous) {?>
-  	  <td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>
-    <?php }
+		<td class="linecolmargin2 nowrap margininfos right"><?php $coldisplay++; ?><?php print price(price2num($line->marque_tx, 'MT')).'%'; ?></td>
+	<?php }
 }
 // Price total without tax
 if ($line->special_code == 3) { ?>
@@ -282,8 +311,7 @@ if ($line->special_code == 3) { ?>
 <?php } else {
 	print '<td class="linecolht nowrap right">';
 	$coldisplay++;
-	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
+	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		$tooltiponprice = $langs->transcountry("TotalHT", $mysoc->country_code).'='.price($line->total_ht);
 		$tooltiponprice .= '<br>'.$langs->transcountry("TotalVAT", ($senderissupplier ? $object->thirdparty->country_code : $mysoc->country_code)).'='.price($line->total_tva);
 		if (!$senderissupplier && is_object($object->thirdparty)) {
@@ -307,8 +335,7 @@ if ($line->special_code == 3) { ?>
 		print '<span class="classfortooltip" title="'.dol_escape_htmltag($tooltiponprice).'">';
 	}
 	print price($sign * $line->total_ht);
-	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-	{
+	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		print '</span>';
 	}
 	print '</td>';
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index 959bf7fd6ad..c4b2ad5e3e4 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -30,13 +29,11 @@ print '<!-- BEGIN PHP TEMPLATE ONLINEPAYMENTLINKS -->';
 print '<u>'.$langs->trans("FollowingUrlAreAvailableToMakePayments").':</u><br><br>';
 print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnFreeAmount", $servicename).':<br>';
 print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'free')."</strong><br><br>\n";
-if (!empty($conf->commande->enabled))
-{
+if (!empty($conf->commande->enabled)) {
 	print '<div id="order"></div>';
 	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnOrder", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'order')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("orders");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#order" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -44,8 +41,7 @@ if (!empty($conf->commande->enabled))
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Order")).': ';
 		print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-		if (GETPOST('generate_order_ref', 'alpha'))
-		{
+		if (GETPOST('generate_order_ref', 'alpha')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
 			print $url;
@@ -55,13 +51,11 @@ if (!empty($conf->commande->enabled))
 	}
 	print '<br>';
 }
-if (!empty($conf->facture->enabled))
-{
+if (!empty($conf->facture->enabled)) {
 	print '<div id="invoice"></div>';
 	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'invoice')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("bills");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#invoice" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -69,8 +63,7 @@ if (!empty($conf->facture->enabled))
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Invoice")).': ';
 		print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-		if (GETPOST('generate_invoice_ref', 'alpha'))
-		{
+		if (GETPOST('generate_invoice_ref', 'alpha')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
 			print $url;
@@ -80,13 +73,11 @@ if (!empty($conf->facture->enabled))
 	}
 	print '<br>';
 }
-if (!empty($conf->contrat->enabled))
-{
+if (!empty($conf->contrat->enabled)) {
 	print '<div id="contractline"></div>';
 	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'contractline')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("contracts");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#contractline" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -94,8 +85,7 @@ if (!empty($conf->contrat->enabled))
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("ContractLine")).': ';
 		print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none button" value="'.$langs->trans("GetSecuredUrl").'">';
-		if (GETPOST('generate_contract_ref'))
-		{
+		if (GETPOST('generate_contract_ref')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
 			print $url;
@@ -105,13 +95,11 @@ if (!empty($conf->contrat->enabled))
 	}
 	print '<br>';
 }
-if (!empty($conf->adherent->enabled))
-{
+if (!empty($conf->adherent->enabled)) {
 	print '<div id="membersubscription"></div>';
 	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'membersubscription')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("members");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#membersubscription" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -119,8 +107,7 @@ if (!empty($conf->adherent->enabled))
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Member")).': ';
 		print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
-		if (GETPOST('generate_member_ref'))
-		{
+		if (GETPOST('generate_member_ref')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
 			print $url;
@@ -130,13 +117,11 @@ if (!empty($conf->adherent->enabled))
 	}
 	print '<br>';
 }
-if (!empty($conf->don->enabled))
-{
+if (!empty($conf->don->enabled)) {
 	print '<div id="donation"></div>';
 	print img_picto('', 'globe').' '.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':<br>';
 	print '<strong class="wordbreak">'.getOnlinePaymentUrl(1, 'donation')."</strong><br>\n";
-	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE))
-	{
+	if (!empty($conf->global->PAYMENT_SECURITY_TOKEN) && !empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
 		$langs->load("members");
 		print '<form action="'.$_SERVER["PHP_SELF"].'#donation" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -144,8 +129,7 @@ if (!empty($conf->don->enabled))
 		print $langs->trans("EnterRefToBuildUrl", $langs->transnoentitiesnoconv("Don")).': ';
 		print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none reposition button" value="'.$langs->trans("GetSecuredUrl").'">';
-		if (GETPOST('generate_donation_ref'))
-		{
+		if (GETPOST('generate_donation_ref')) {
 			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
 			print $url;
@@ -156,8 +140,7 @@ if (!empty($conf->don->enabled))
 	print '<br>';
 }
 
-if (!empty($conf->use_javascript_ajax))
-{
+if (!empty($conf->use_javascript_ajax)) {
 	print "\n".'<script>';
 	print '$(document).ready(function () {
 		$("#generate_token").click(function() {
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index bd87008d0f8..d4943ac454d 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -32,17 +31,21 @@ print '<td>'.$this->tpl['label'].'</td>';
 print '<td>'.$this->tpl['description'].'</td>';
 print '<td class="right">'.$this->tpl['vat_rate'].'</td>';
 print '<td class="right">'.$this->tpl['price'].'</td>';
-if (!empty($conf->multicurrency->enabled))
+if (!empty($conf->multicurrency->enabled)) {
 	print '<td class="right">'.$this->tpl['multicurrency_price'].'</td>';
+}
 
 print '<td class="right">'.$this->tpl['qty'].'</td>';
-if (!empty($conf->global->PRODUCT_USE_UNITS))
+if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 	print '<td class="left">'.$langs->trans($this->tpl['unit']).'</td>';
+}
 
 print '<td class="right">'.$this->tpl['remise_percent'].'</td>';
 
 $selected = 1;
-if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) $selected = 0;
+if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) {
+	$selected = 0;
+}
 print '<td class="center">';
 print '<input id="cb'.$this->tpl['id'].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->tpl['id'].'"'.($selected ? ' checked="checked"' : '').'>';
 print '</td>';
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 2fb21094b4d..3e2fb78bdb0 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -17,11 +17,12 @@
  */
 
 
-if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', 1);
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', 1);
+}
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -32,14 +33,26 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 header('Cache-Control: Public, must-revalidate');
 header("Content-type: text/html; charset=".$conf->file->character_set_client);
 
-if (GETPOST('dol_hide_topmenu')) $conf->dol_hide_topmenu = 1;
-if (GETPOST('dol_hide_leftmenu')) $conf->dol_hide_leftmenu = 1;
-if (GETPOST('dol_optimize_smallscreen')) $conf->dol_optimize_smallscreen = 1;
-if (GETPOST('dol_no_mouse_hover')) $conf->dol_no_mouse_hover = 1;
-if (GETPOST('dol_use_jmobile')) $conf->dol_use_jmobile = 1;
+if (GETPOST('dol_hide_topmenu')) {
+	$conf->dol_hide_topmenu = 1;
+}
+if (GETPOST('dol_hide_leftmenu')) {
+	$conf->dol_hide_leftmenu = 1;
+}
+if (GETPOST('dol_optimize_smallscreen')) {
+	$conf->dol_optimize_smallscreen = 1;
+}
+if (GETPOST('dol_no_mouse_hover')) {
+	$conf->dol_no_mouse_hover = 1;
+}
+if (GETPOST('dol_use_jmobile')) {
+	$conf->dol_use_jmobile = 1;
+}
 
 // If we force to use jmobile, then we reenable javascript
-if (!empty($conf->dol_use_jmobile)) $conf->use_javascript_ajax = 1;
+if (!empty($conf->dol_use_jmobile)) {
+	$conf->use_javascript_ajax = 1;
+}
 
 $php_self = $_SERVER['PHP_SELF'];
 $php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]) : '';
@@ -51,7 +64,9 @@ print top_htmlhead('', $titleofpage);
 
 
 $colorbackhmenu1 = '60,70,100'; // topmenu
-if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
+	$conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
+}
 $colorbackhmenu1 = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $conf->global->THEME_ELDY_TOPMENU_BACK1) : (empty($user->conf->THEME_ELDY_TOPMENU_BACK1) ? $colorbackhmenu1 : $user->conf->THEME_ELDY_TOPMENU_BACK1);
 $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
 
@@ -64,7 +79,9 @@ $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize
 <script>
 $(document).ready(function () {
 	// Set focus on correct field
-	<?php if ($focus_element) { ?>$('#<?php echo $focus_element; ?>').focus(); <?php } ?>		// Warning to use this only on visible element
+	<?php if ($focus_element) {
+		?>$('#<?php echo $focus_element; ?>').focus(); <?php
+	} ?>		// Warning to use this only on visible element
 });
 </script>
 <?php } ?>
@@ -81,9 +98,13 @@ $(document).ready(function () {
 <!-- Title with version -->
 <div class="login_table_title center" title="<?php echo dol_escape_htmltag($title); ?>">
 <?php
-if (!empty($disablenofollow)) echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+if (!empty($disablenofollow)) {
+	echo '<a class="login_table_title" href="https://www.dolibarr.org" target="_blank">';
+}
 echo dol_escape_htmltag($title);
-if (!empty($disablenofollow)) echo '</a>';
+if (!empty($disablenofollow)) {
+	echo '</a>';
+}
 ?>
 </div>
 
@@ -116,8 +137,11 @@ if (!empty($disablenofollow)) echo '</a>';
 if (!empty($captcha)) {
 	// Add a variable param to force not using cache (jmobile)
 	$php_self = preg_replace('/[&\?]time=(\d+)/', '', $php_self); // Remove param time
-	if (preg_match('/\?/', $php_self)) $php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
-	else $php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
+	if (preg_match('/\?/', $php_self)) {
+		$php_self .= '&time='.dol_print_date(dol_now(), 'dayhourlog');
+	} else {
+		$php_self .= '?time='.dol_print_date(dol_now(), 'dayhourlog');
+	}
 	// TODO: provide accessible captcha variants
 	?>
 	<!-- Captcha -->
@@ -139,8 +163,7 @@ if (!empty($captcha)) {
 
 if (!empty($morelogincontent)) {
 	if (is_array($morelogincontent)) {
-		foreach ($morelogincontent as $format => $option)
-		{
+		foreach ($morelogincontent as $format => $option) {
 			if ($format == 'table') {
 				echo '<!-- Option by hook -->';
 				echo $option;
@@ -169,10 +192,18 @@ if (!empty($morelogincontent)) {
 <div class="center" style="margin-top: 15px;">
 	<?php
 	$moreparam = '';
-	if (!empty($conf->dol_hide_topmenu))   $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
-	if (!empty($conf->dol_hide_leftmenu))  $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
-	if (!empty($conf->dol_no_mouse_hover)) $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
-	if (!empty($conf->dol_use_jmobile))    $moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+	if (!empty($conf->dol_hide_topmenu)) {
+		$moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_topmenu='.$conf->dol_hide_topmenu;
+	}
+	if (!empty($conf->dol_hide_leftmenu)) {
+		$moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_hide_leftmenu='.$conf->dol_hide_leftmenu;
+	}
+	if (!empty($conf->dol_no_mouse_hover)) {
+		$moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_no_mouse_hover='.$conf->dol_no_mouse_hover;
+	}
+	if (!empty($conf->dol_use_jmobile)) {
+		$moreparam .= (strpos($moreparam, '?') === false ? '?' : '&').'dol_use_jmobile='.$conf->dol_use_jmobile;
+	}
 
 	print '<a class="alogin" href="'.$dol_url_root.'/index.php'.$moreparam.'">'.$langs->trans('BackToLoginPage').'</a>';
 	?>
@@ -210,11 +241,12 @@ if (!empty($morelogincontent)) {
 <!-- Common footer is not used for passwordforgotten page, this is same than footer but inside passwordforgotten tpl -->
 
 <?php
-if (!empty($conf->global->MAIN_HTML_FOOTER)) print $conf->global->MAIN_HTML_FOOTER;
+if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+	print $conf->global->MAIN_HTML_FOOTER;
+}
 
 if (!empty($morelogincontent) && is_array($morelogincontent)) {
-	foreach ($morelogincontent as $format => $option)
-	{
+	foreach ($morelogincontent as $format => $option) {
 		if ($format == 'js') {
 			echo "\n".'<!-- Javascript by hook -->';
 			echo $option."\n";
@@ -227,8 +259,7 @@ if (!empty($morelogincontent) && is_array($morelogincontent)) {
 
 // Google Analytics
 // TODO Add a hook here
-if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
-{
+if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID)) {
 	$tmptagarray = explode(',', $conf->global->MAIN_GOOGLE_AN_ID);
 	foreach ($tmptagarray as $tmptag) {
 		print "\n";
@@ -249,10 +280,8 @@ if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AN_ID))
 
 // TODO Replace this with a hook
 // Google Adsense (need Google module)
-if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT))
-{
-	if (empty($conf->dol_use_jmobile))
-	{
+if (!empty($conf->google->enabled) && !empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && !empty($conf->global->MAIN_GOOGLE_AD_SLOT)) {
+	if (empty($conf->dol_use_jmobile)) {
 		?>
 	<div class="center"><br>
 		<script><!--
diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php
index d1db4a819a5..01c3897f991 100644
--- a/htdocs/core/tpl/resource_add.tpl.php
+++ b/htdocs/core/tpl/resource_add.tpl.php
@@ -2,8 +2,7 @@
 <?php
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
diff --git a/htdocs/core/tpl/resource_view.tpl.php b/htdocs/core/tpl/resource_view.tpl.php
index 1df05e6e0a1..81ad11ebdc9 100644
--- a/htdocs/core/tpl/resource_view.tpl.php
+++ b/htdocs/core/tpl/resource_view.tpl.php
@@ -1,8 +1,7 @@
 <!-- BEGIN TEMPLATE resource_view.tpl.php -->
 <?php
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -28,16 +27,13 @@ print '<input type="hidden" name="id" value="'.$element_id.'" />';
 print '<input type="hidden" name="action" value="update_linked_resource" />';
 print '<input type="hidden" name="resource_type" value="'.$resource_type.'" />';
 
-if ((array) $linked_resources && count($linked_resources) > 0)
-{
-	foreach ($linked_resources as $linked_resource)
-	{
+if ((array) $linked_resources && count($linked_resources) > 0) {
+	foreach ($linked_resources as $linked_resource) {
 		$object_resource = fetchObjectByElement($linked_resource['resource_id'], $linked_resource['resource_type']);
 
 		//$element_id = $linked_resource['rowid'];
 
-		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid'))
-		{
+		if ($mode == 'edit' && $linked_resource['rowid'] == GETPOST('lineid')) {
 			print '<div class="tagtr oddeven">';
 			print '<input type="hidden" name="lineid" value="'.$linked_resource['rowid'].'" />';
 			print '<input type="hidden" name="element" value="'.$element.'" />';
@@ -51,8 +47,9 @@ if ((array) $linked_resources && count($linked_resources) > 0)
 			print '</div>';
 		} else {
 			$class = '';
-			if ($linked_resource['rowid'] == GETPOST('lineid'))
+			if ($linked_resource['rowid'] == GETPOST('lineid')) {
 				$class = 'highlight';
+			}
 
 			print '<div class="tagtr oddeven'.($class ? ' '.$class : '').'">';
 
diff --git a/htdocs/core/triggers/dolibarrtriggers.class.php b/htdocs/core/triggers/dolibarrtriggers.class.php
index 4db110c20da..6690d2a2a40 100644
--- a/htdocs/core/triggers/dolibarrtriggers.class.php
+++ b/htdocs/core/triggers/dolibarrtriggers.class.php
@@ -154,5 +154,5 @@ abstract class DolibarrTriggers
 	 *  @param conf         $conf       Object conf
 	 *  @return int                     <0 if KO, 0 if no triggered ran, >0 if OK
 	 */
-	public abstract function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
+	abstract public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf);
 }
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 48c9614dea6..3b9d59778e9 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -61,13 +61,19 @@ class InterfaceLogevents extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (!empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) return 0; // Log events is disabled (hidden features)
+		if (!empty($conf->global->MAIN_LOGEVENTS_DISABLE_ALL)) {
+			return 0; // Log events is disabled (hidden features)
+		}
 
 		$key = 'MAIN_LOGEVENTS_'.$action;
 		//dol_syslog("xxxxxxxxxxx".$key);
-		if (empty($conf->global->$key)) return 0; // Log events not enabled for this action
+		if (empty($conf->global->$key)) {
+			return 0; // Log events not enabled for this action
+		}
 
-		if (empty($conf->entity)) $conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
+		if (empty($conf->entity)) {
+			$conf->entity = $entity; // forcing of the entity if it's not defined (ex: in login form)
+		}
 
 		$date = dol_now();
 
@@ -156,15 +162,17 @@ class InterfaceLogevents extends DolibarrTriggers
 
 		// If not found
 		/*
-        else
-        {
-            dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
+		else
+		{
+			dol_syslog("Trigger '".$this->name."' for action '$action' was ran by ".__FILE__." but no handler found for this action.");
 			return 0;
-        }
-        */
+		}
+		*/
 
 		// Add more information into desc from the context property
-		if (!empty($desc) && !empty($object->context['audit'])) $desc .= ' - '.$object->context['audit'];
+		if (!empty($desc) && !empty($object->context['audit'])) {
+			$desc .= ' - '.$object->context['audit'];
+		}
 
 		// Add entry in event table
 		include_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index d4bd29838e8..410918b99ed 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -62,7 +62,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->workflow->enabled)) return 0; // Module not active, we do nothing
+		if (empty($conf->workflow->enabled)) {
+			return 0; // Module not active, we do nothing
+		}
 
 		// Proposals to order
 		if ($action == 'PROPAL_CLOSE_SIGNED') {
@@ -76,7 +78,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				$newobject->context['origin_id'] = $object->id;
 
 				$ret = $newobject->createFromProposal($object, $user);
-				if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
+				if ($ret < 0) {
+					$this->error = $newobject->error; $this->errors[] = $newobject->error;
+				}
 				return $ret;
 			}
 		}
@@ -93,7 +97,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				$newobject->context['origin_id'] = $object->id;
 
 				$ret = $newobject->createFromOrder($object, $user);
-				if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
+				if ($ret < 0) {
+					$this->error = $newobject->error; $this->errors[] = $newobject->error;
+				}
 				return $ret;
 			}
 		}
@@ -106,7 +112,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
 					foreach ($object->linkedObjects['propal'] as $element) {
-						if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+						if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) {
+							$totalonlinkedelements += $element->total_ht;
+						}
 					}
 					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
@@ -130,7 +138,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
 					foreach ($object->linkedObjects['commande'] as $element) {
-						if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+						if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) {
+							$totalonlinkedelements += $element->total_ht;
+						}
 					}
 					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
@@ -147,7 +157,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
 					foreach ($object->linkedObjects['propal'] as $element) {
-						if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+						if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) {
+							$totalonlinkedelements += $element->total_ht;
+						}
 					}
 					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
@@ -183,7 +195,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
 					foreach ($object->linkedObjects['order_supplier'] as $element) {
-						if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
+						if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) {
+							$totalonlinkedelements += $element->total_ht;
+						}
 					}
 					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
@@ -201,7 +215,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
 					foreach ($object->linkedObjects['supplier_proposal'] as $element) {
-						if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
+						if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) {
+							$totalonlinkedelements += $element->total_ht;
+						}
 					}
 					dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
@@ -223,7 +239,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
 					foreach ($object->linkedObjects['commande'] as $element) {
-						if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
+						if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) {
+							$totalonlinkedelements += $element->total_ht;
+						}
 					}
 					dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
 					if ($this->shouldClassify($conf, $totalonlinkedelements, $object->total_ht)) {
@@ -258,7 +276,7 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				}
 				//Build array of quantity shipped by product for an order
 				if (is_array($order->linkedObjects) && count($order->linkedObjects) > 0) {
-					foreach ($order->linkedObjects as $type=>$shipping_array) {
+					foreach ($order->linkedObjects as $type => $shipping_array) {
 						if ($type == 'shipping' && is_array($shipping_array) && count($shipping_array) > 0) {
 							foreach ($shipping_array as $shipping) {
 								if (is_array($shipping->lines) && count($shipping->lines) > 0) {
@@ -275,7 +293,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (is_array($order->lines) && count($order->lines) > 0) {
 					foreach ($order->lines as $orderline) {
 						// Exclude lines not qualified for shipment, similar code is found into calcAndSetStatusDispatch() for vendors
-						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) continue;
+						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $orderline->product_type > 0) {
+							continue;
+						}
 						$qtyordred[$orderline->fk_product] += $orderline->qty;
 					}
 				}
@@ -302,7 +322,9 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 				if (!empty($object->linkedObjects)) {
 					$totalonlinkedelements = 0;
 					foreach ($object->linkedObjects['reception'] as $element) {
-						if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
+						if ($element->statut == Reception::STATUS_VALIDATED) {
+							$totalonlinkedelements += $element->total_ht;
+						}
 					}
 					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
 					if ($totalonlinkedelements == $object->total_ht) {
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 4034198fff0..f9988e770bf 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -75,7 +75,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->agenda->enabled)) return 0; // Module not active, we do nothing
+		if (empty($conf->agenda->enabled)) {
+			return 0; // Module not active, we do nothing
+		}
 
 		// Do not log events when trigger is for creating event (infinite loop)
 		if (preg_match('/^ACTION_/', $action)) {
@@ -92,14 +94,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		$langs->load("agenda");
 
-		if (empty($object->actiontypecode)) $object->actiontypecode = 'AC_OTH_AUTO';
+		if (empty($object->actiontypecode)) {
+			$object->actiontypecode = 'AC_OTH_AUTO';
+		}
 
 		// Actions
 		if ($action == 'COMPANY_CREATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "companies"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
+			}
 			$object->actionmsg = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
 
 			$object->sendtoid = 0;
@@ -108,7 +114,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
+			if (empty($object->actionmsg2)) {
+				dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
+			}
 
 			// Parameters $object->sendtoid defined by caller
 			//$object->sendtoid=0;
@@ -116,7 +124,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "companies"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("CONTACT_CREATEInDolibarr", $object->getFullName($langs));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("CONTACT_CREATEInDolibarr", $object->getFullName($langs));
+			}
 			$object->actionmsg = $langs->transnoentities("CONTACT_CREATEInDolibarr", $object->getFullName($langs));
 
 			$object->sendtoid = array($object->id => $object->id);
@@ -125,7 +135,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "contracts"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -133,7 +145,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "contracts"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ContractSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ContractSentByEMail", $object->ref);
 			}
@@ -144,7 +158,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -152,7 +168,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
 			}
@@ -163,7 +181,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -171,7 +191,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -179,7 +201,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -187,7 +211,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -195,7 +221,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -203,7 +231,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -211,7 +241,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -219,7 +251,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("OrderSentByEMail", $object->ref);
 			}
@@ -230,7 +264,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -238,7 +274,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -246,7 +284,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
 			}
@@ -266,7 +306,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -274,7 +316,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -284,7 +328,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -294,7 +340,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -304,7 +352,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("InterventionSentByEMail", $object->ref);
 			}
@@ -315,23 +365,29 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
-		   	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
-		   	$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+			}
+			$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
 		} elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
-		   	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
-		   	$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+			}
+			$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
 		} elseif ($action == 'FICHINTER_DELETE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "interventions"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -341,7 +397,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "sendings"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
 			}
@@ -352,7 +410,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "sendings"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ShippingSentByEMail", $object->ref);
 			}
@@ -364,7 +424,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$langs->load("other");
 			$langs->load("receptions");
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
 			}
@@ -376,7 +438,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$langs->load("other");
 			$langs->load("receptions");
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
 			}
@@ -387,7 +451,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -395,7 +461,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
 			}
@@ -406,7 +474,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -414,7 +484,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -422,7 +494,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -430,7 +504,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -438,7 +514,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -446,7 +524,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -454,7 +534,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -462,7 +544,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -470,7 +554,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
 			}
@@ -481,7 +567,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
 			}
@@ -491,7 +579,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			}
 			$object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
 			$object->sendtoid = 0;
@@ -499,7 +589,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -507,7 +599,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
+			}
 			if (empty($object->actionmsg)) {
 				$object->actionmsg = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
 			}
@@ -518,7 +612,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -526,7 +622,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "bills"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
 			$object->sendtoid = 0;
@@ -537,7 +635,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+			}
 			$object->actionmsg = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
 			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
@@ -547,7 +647,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+			}
 			$object->actionmsg = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
 			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
@@ -565,7 +667,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 				$member->fetch($object->fk_adherent);
 			}
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
+			}
 			$object->actionmsg = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->id, $member->getFullName($langs));
 			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->fk_type;
@@ -573,7 +677,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
 
 			$object->sendtoid = 0;
-			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
+			if ($object->fk_soc > 0) {
+				$object->socid = $object->fk_soc;
+			}
 		} elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
@@ -585,7 +691,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 				$member->fetch($this->fk_adherent);
 			}
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
+			}
 			$object->actionmsg = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->id, $member->getFullName($langs));
 			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$member->getFullName($langs);
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->fk_type;
@@ -593,12 +701,16 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->dateh, 'day').' - '.dol_print_date($object->datef, 'day');
 
 			$object->sendtoid = 0;
-			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
+			if ($object->fk_soc > 0) {
+				$object->socid = $object->fk_soc;
+			}
 		} elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+			}
 			$object->actionmsg = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
 			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
@@ -606,12 +718,16 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
 
 			$object->sendtoid = 0;
-			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
+			if ($object->fk_soc > 0) {
+				$object->socid = $object->fk_soc;
+			}
 		} elseif ($action == 'MEMBER_RESILIATE') {
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+			}
 			$object->actionmsg = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
 			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
@@ -621,7 +737,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "members"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+			}
 			$object->actionmsg = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
 			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
@@ -634,7 +752,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
 			$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
@@ -643,7 +763,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
 			$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
@@ -652,7 +774,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
 			//$object->actionmsg .= "\n".$langs->transnoentities("Task").': ???';
 			if (!empty($object->usage_opportunity) && is_object($object->oldcopy) && $object->opp_status != $object->oldcopy->opp_status) {
@@ -667,7 +791,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
@@ -676,7 +802,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskModifiedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("TaskModifiedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("TaskModifieddInDolibarr", $object->ref);
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
@@ -685,7 +813,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
 			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
@@ -694,7 +824,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			// Load translation files required by the page
 			$langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
+			}
 			$object->actionmsg = $langs->transnoentities("TICKET_ASSIGNEDInDolibarr", $object->ref);
 			if ($object->oldcopy->fk_user_assign > 0) {
 				$tmpuser = new User($this->db);
@@ -745,24 +877,43 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		// If trackid is not defined, we set it
 		if (empty($object->trackid)) {
 			// See also similar list into emailcollector.class.php
-			if (preg_match('/^COMPANY_/', $action)) { $object->trackid = 'thi'.$object->id; }
-			elseif (preg_match('/^CONTACT_/', $action)) { $object->trackid = 'ctc'.$object->id; }
-			elseif (preg_match('/^CONTRACT_/', $action)) { $object->trackid = 'con'.$object->id; }
-			elseif (preg_match('/^PROPAL_/', $action)) { $object->trackid = 'pro'.$object->id; }
-			elseif (preg_match('/^ORDER_/', $action)) { $object->trackid = 'ord'.$object->id; }
-			elseif (preg_match('/^BILL_/', $action)) { $object->trackid = 'inv'.$object->id; }
-			elseif (preg_match('/^FICHINTER_/', $action)) { $object->trackid = 'int'.$object->id; }
-			elseif (preg_match('/^SHIPPING_/', $action)) { $object->trackid = 'shi'.$object->id; }
-			elseif (preg_match('/^RECEPTION_/', $action)) { $object->trackid = 'rec'.$object->id; }
-			elseif (preg_match('/^PROPOSAL_SUPPLIER/', $action)) { $object->trackid = 'spr'.$object->id; }
-			elseif (preg_match('/^ORDER_SUPPLIER_/', $action)) { $object->trackid = 'sor'.$object->id; }
-			elseif (preg_match('/^BILL_SUPPLIER_/', $action)) { $object->trackid = 'sin'.$object->id; }
-			elseif (preg_match('/^MEMBER_SUBSCRIPTION_/', $action)) { $object->trackid = 'sub'.$object->id; }
-			elseif (preg_match('/^MEMBER_/', $action)) { $object->trackid = 'mem'.$object->id; }
-			elseif (preg_match('/^PROJECT_/', $action)) { $object->trackid = 'proj'.$object->id; }
-			elseif (preg_match('/^TASK_/', $action)) { $object->trackid = 'tas'.$object->id; }
-			elseif (preg_match('/^TICKET_/', $action)) { $object->trackid = 'tic'.$object->id; }
-			else $object->trackid = '';
+			if (preg_match('/^COMPANY_/', $action)) {
+				$object->trackid = 'thi'.$object->id;
+			} elseif (preg_match('/^CONTACT_/', $action)) {
+				$object->trackid = 'ctc'.$object->id;
+			} elseif (preg_match('/^CONTRACT_/', $action)) {
+				$object->trackid = 'con'.$object->id;
+			} elseif (preg_match('/^PROPAL_/', $action)) {
+				$object->trackid = 'pro'.$object->id;
+			} elseif (preg_match('/^ORDER_/', $action)) {
+				$object->trackid = 'ord'.$object->id;
+			} elseif (preg_match('/^BILL_/', $action)) {
+				$object->trackid = 'inv'.$object->id;
+			} elseif (preg_match('/^FICHINTER_/', $action)) {
+				$object->trackid = 'int'.$object->id;
+			} elseif (preg_match('/^SHIPPING_/', $action)) {
+				$object->trackid = 'shi'.$object->id;
+			} elseif (preg_match('/^RECEPTION_/', $action)) {
+				$object->trackid = 'rec'.$object->id;
+			} elseif (preg_match('/^PROPOSAL_SUPPLIER/', $action)) {
+				$object->trackid = 'spr'.$object->id;
+			} elseif (preg_match('/^ORDER_SUPPLIER_/', $action)) {
+				$object->trackid = 'sor'.$object->id;
+			} elseif (preg_match('/^BILL_SUPPLIER_/', $action)) {
+				$object->trackid = 'sin'.$object->id;
+			} elseif (preg_match('/^MEMBER_SUBSCRIPTION_/', $action)) {
+				$object->trackid = 'sub'.$object->id;
+			} elseif (preg_match('/^MEMBER_/', $action)) {
+				$object->trackid = 'mem'.$object->id;
+			} elseif (preg_match('/^PROJECT_/', $action)) {
+				$object->trackid = 'proj'.$object->id;
+			} elseif (preg_match('/^TASK_/', $action)) {
+				$object->trackid = 'tas'.$object->id;
+			} elseif (preg_match('/^TICKET_/', $action)) {
+				$object->trackid = 'tic'.$object->id;
+			} else {
+				$object->trackid = '';
+			}
 		}
 
 		$object->actionmsg = dol_concatdesc($langs->transnoentities("Author").': '.$user->login, $object->actionmsg);
@@ -785,16 +936,25 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		// Set contactforaction if there is only 1 contact.
 
 		if (is_array($object->sendtoid)) {
-			if (count($object->sendtoid) == 1) $contactforaction->fetch(reset($object->sendtoid));
+			if (count($object->sendtoid) == 1) {
+				$contactforaction->fetch(reset($object->sendtoid));
+			}
 		} else {
-			if ($object->sendtoid > 0) $contactforaction->fetch($object->sendtoid);
+			if ($object->sendtoid > 0) {
+				$contactforaction->fetch($object->sendtoid);
+			}
 		}
 		// Set societeforaction.
-		if (isset($object->socid) && $object->socid > 0)		$societeforaction->fetch($object->socid);
-		elseif (isset($object->fk_soc) && $object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
+		if (isset($object->socid) && $object->socid > 0) {
+			$societeforaction->fetch($object->socid);
+		} elseif (isset($object->fk_soc) && $object->fk_soc > 0) {
+			$societeforaction->fetch($object->fk_soc);
+		}
 
 		$projectid = isset($object->fk_project) ? $object->fk_project : 0;
-		if ($object->element == 'project') $projectid = $object->id;
+		if ($object->element == 'project') {
+			$projectid = $object->id;
+		}
 
 		$elementid = $object->id; // id of object
 		$elementtype = $object->element;
@@ -854,7 +1014,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 
 		if ($ret > 0 && !empty($conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)) {
 			if (is_array($object->attachedfiles) && array_key_exists('paths', $object->attachedfiles) && count($object->attachedfiles['paths']) > 0) {
-				foreach ($object->attachedfiles['paths'] as $key=>$filespath) {
+				foreach ($object->attachedfiles['paths'] as $key => $filespath) {
 					$srcfile = $filespath;
 					$destdir = $conf->agenda->dir_output.'/'.$ret;
 					$destfile = $destdir.'/'.$object->attachedfiles['names'][$key];
diff --git a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
index 94d64886012..061af9baf2b 100644
--- a/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
+++ b/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php
@@ -59,11 +59,15 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->blockedlog->enabled)) return 0; // Module not active, we do nothing
+		if (empty($conf->blockedlog->enabled)) {
+			return 0; // Module not active, we do nothing
+		}
 
 		// Test if event/record is qualified
 		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (!in_array($object->element, $listofqualifiedelement)) return 1;
+		if (!in_array($object->element, $listofqualifiedelement)) {
+			return 1;
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -92,10 +96,13 @@ class InterfaceActionsBlockedLog extends DolibarrTriggers
 
 			if (in_array($action, array(
 				'MEMBER_SUBSCRIPTION_CREATE', 'MEMBER_SUBSCRIPTION_MODIFY', 'MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) $amounts = (double) $object->amount;
-			elseif ($action == 'CASHCONTROL_VALIDATE') {
+				'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) {
+				$amounts = (double) $object->amount;
+			} elseif ($action == 'CASHCONTROL_VALIDATE') {
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
-			} else $amounts = (double) $object->total_ttc;
+			} else {
+				$amounts = (double) $object->total_ttc;
+			}
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
diff --git a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
index 7417d07ccff..19f23b0bfe4 100644
--- a/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php
@@ -61,8 +61,12 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->ldap->enabled)) return 0; // Module not active, we do nothing
-		if (defined('DISABLE_LDAP_SYNCHRO')) return 0; // If constant defined, we do nothing
+		if (empty($conf->ldap->enabled)) {
+			return 0; // Module not active, we do nothing
+		}
+		if (defined('DISABLE_LDAP_SYNCHRO')) {
+			return 0; // If constant defined, we do nothing
+		}
 
 		if (!function_exists('ldap_connect')) {
 			dol_syslog("Warning, module LDAP is enabled but LDAP functions not available in this PHP", LOG_WARNING);
@@ -88,7 +92,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->add($dn, $info, $user);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'USER_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -121,7 +127,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->update($dn, $info, $user, $olddn, $newrdn, $newparent);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'USER_NEW_PASSWORD') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -152,7 +160,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->update($dn, $info, $user, $olddn);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'USER_ENABLEDISABLE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -169,7 +179,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'USER_SETINGROUP') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -201,7 +213,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'USER_REMOVEFROMGROUP') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -233,7 +247,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 
@@ -256,7 +272,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->add($dn, $info, $user);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'USERGROUP_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -287,7 +305,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->update($dn, $info, $user, $olddn);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'USERGROUP_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -302,7 +322,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 
@@ -320,7 +342,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->add($dn, $info, $user);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'CONTACT_MODIFY') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -351,7 +375,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->update($dn, $info, $user, $olddn);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'CONTACT_DELETE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -366,7 +392,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					$result = $ldap->delete($dn);
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		}
 
@@ -410,7 +438,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 					}
 				}
 
-				if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+				if ($result < 0) {
+					$this->error = "ErrorLDAP ".$ldap->error;
+				}
 			}
 		} elseif ($action == 'MEMBER_VALIDATE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
@@ -428,7 +458,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$result = $ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+					if ($result < 0) {
+						$this->error = "ErrorLDAP ".$ldap->error;
+					}
 				}
 			}
 		} elseif ($action == 'MEMBER_SUBSCRIPTION') {
@@ -451,7 +483,9 @@ class InterfaceLdapsynchro extends DolibarrTriggers
 						$result = $ldap->update($dn, $info, $user, $olddn);
 					}
 
-					if ($result < 0) $this->error = "ErrorLDAP ".$ldap->error;
+					if ($result < 0) {
+						$this->error = "ErrorLDAP ".$ldap->error;
+					}
 				}
 			}
 		} elseif ($action == 'MEMBER_MODIFY') {
diff --git a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
index de75b010305..ca1a33279bd 100644
--- a/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
+++ b/htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
@@ -59,7 +59,9 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
+		if (empty($conf->mailmanspip->enabled)) {
+			return 0; // Module not active, we do nothing
+		}
 
 		require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
 		require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
@@ -99,7 +101,9 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 			$return = 0;
 			if ($object->add_to_abo() < 0) {
 				$this->errors = $object->errors;
-				if (!empty($object->error)) $this->errors[] = $object->error;
+				if (!empty($object->error)) {
+					$this->errors[] = $object->error;
+				}
 				$return = -1;
 			} else {
 				$return = 1;
@@ -115,7 +119,9 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 				if (is_object($object->oldcopy) && (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))) {    // If email has changed or if list has changed we delete mailman subscription for old email
 					if ($object->oldcopy->del_to_abo() < 0) {
 						$this->errors = $object->oldcopy->errors;
-						if (!empty($object->oldcopy->error)) $this->errors[] = $object->oldcopy->error;
+						if (!empty($object->oldcopy->error)) {
+							$this->errors[] = $object->oldcopy->error;
+						}
 						$return = -1;
 					} else {
 						$return = 1;
@@ -124,7 +130,9 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 				// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
 				if ($object->add_to_abo() < 0) {
 					$this->errors = $object->errors;
-					if (!empty($object->error)) $this->errors[] = $object->error;
+					if (!empty($object->error)) {
+						$this->errors[] = $object->error;
+					}
 					$return = -1;
 				} else {
 					$return = 1;
@@ -139,7 +147,9 @@ class InterfaceMailmanSpipsynchro extends DolibarrTriggers
 			// Remove from external tools (mailman, spip, etc...)
 			if ($object->del_to_abo() < 0) {
 				$this->errors = $object->errors;
-				if (!empty($object->error)) $this->errors[] = $object->error;
+				if (!empty($object->error)) {
+					$this->errors[] = $object->error;
+				}
 				$return = -1;
 			} else {
 				$return = 1;
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index a6078796478..f3176cef0de 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -47,7 +47,7 @@ class InterfaceNotification extends DolibarrTriggers
 		'EXPENSE_REPORT_APPROVE',
 		'HOLIDAY_VALIDATE',
 		'HOLIDAY_APPROVE',
-        'ACTION_CREATE'
+		'ACTION_CREATE'
 	);
 
 	/**
@@ -80,12 +80,16 @@ class InterfaceNotification extends DolibarrTriggers
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->notification->enabled)) return 0; // Module not active, we do nothing
+		if (empty($conf->notification->enabled)) {
+			return 0; // Module not active, we do nothing
+		}
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 		$notify = new Notify($this->db);
 
-		if (!in_array($action, $notify->arrayofnotifsupported)) return 0;
+		if (!in_array($action, $notify->arrayofnotifsupported)) {
+			return 0;
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -119,19 +123,28 @@ class InterfaceNotification extends DolibarrTriggers
 
 				$qualified = 0;
 				// Check is this event is supported by notification module
-				if (in_array($obj->code, $this->listofmanagedevents)) $qualified = 1;
+				if (in_array($obj->code, $this->listofmanagedevents)) {
+					$qualified = 1;
+				}
 				// Check if module for this event is active
 				if ($qualified) {
 					//print 'xx'.$obj->code;
 					$element = $obj->elementtype;
 
 					// Exclude events if related module is disabled
-					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
-					elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
-					elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified = 0;
-					elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified = 0;
-					elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified = 0;
-					elseif (!in_array($element, array('order_supplier', 'invoice_supplier', 'withdraw', 'shipping', 'member', 'expensereport')) && empty($conf->$element->enabled)) $qualified = 0;
+					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) {
+						$qualified = 0;
+					} elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) {
+						$qualified = 0;
+					} elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) {
+						$qualified = 0;
+					} elseif ($element == 'shipping' && empty($conf->expedition->enabled)) {
+						$qualified = 0;
+					} elseif ($element == 'member' && empty($conf->adherent->enabled)) {
+						$qualified = 0;
+					} elseif (!in_array($element, array('order_supplier', 'invoice_supplier', 'withdraw', 'shipping', 'member', 'expensereport')) && empty($conf->$element->enabled)) {
+						$qualified = 0;
+					}
 				}
 
 				if ($qualified) {
@@ -140,7 +153,9 @@ class InterfaceNotification extends DolibarrTriggers
 
 				$i++;
 			}
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return $ret;
 	}
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 55c128c2f0f..6f1acac7050 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -61,7 +61,9 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	{
 		$ok = 0;
 
-		if (empty($conf->ticket->enabled)) return 0; // Module not active, we do nothing
+		if (empty($conf->ticket->enabled)) {
+			return 0; // Module not active, we do nothing
+		}
 
 		switch ($action) {
 			case 'TICKET_ASSIGNED':
@@ -240,10 +242,16 @@ class InterfaceTicketEmail extends DolibarrTriggers
 							}
 
 							$qualified = true;
-							if (empty($enabled)) $qualified = false;
-							if (empty($perms)) $qualified = false;
+							if (empty($enabled)) {
+								$qualified = false;
+							}
+							if (empty($perms)) {
+								$qualified = false;
+							}
 
-							if ($qualified) $message_customer .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
+							if ($qualified) {
+								$message_customer .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
+							}
 						}
 
 						$message_customer .= '</ul>';
@@ -286,13 +294,13 @@ class InterfaceTicketEmail extends DolibarrTriggers
 				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				break;
 
-		   	case 'TICKET_MODIFY':
-		   		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-		   		break;
+			case 'TICKET_MODIFY':
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+				break;
 
-		   	case 'TICKET_CLOSE':
-		   		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-		   		break;
+			case 'TICKET_CLOSE':
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+				break;
 		}
 
 
diff --git a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
index 502a32656c8..a7678029fd9 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -72,7 +72,9 @@ class InterfaceStripe extends DolibarrTriggers
 		require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 		$stripe = new Stripe($db);
 
-		if (empty($conf->stripe->enabled)) return 0;
+		if (empty($conf->stripe->enabled)) {
+			return 0;
+		}
 
 		$ok = 1;
 
@@ -107,7 +109,9 @@ class InterfaceStripe extends DolibarrTriggers
 
 					// Detect if we change a Stripe info (email, description, vat id)
 					$changerequested = 0;
-					if (!empty($object->email) && $object->email != $customer->email) $changerequested++;
+					if (!empty($object->email) && $object->email != $customer->email) {
+						$changerequested++;
+					}
 					/* if ($namecleaned != $customer->description) $changerequested++;
 					if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) $changerequested++;
 					elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) $changerequested++;
@@ -115,14 +119,25 @@ class InterfaceStripe extends DolibarrTriggers
 					{
 						if ($vatcleaned != $customer->tax_info['tax_id']) $changerequested++;
 					} */
-					if ($namecleaned != $customer->name) $changerequested++;
-					if ($desccleaned != $customer->description) $changerequested++;
-					if (($customer->tax_exempt == 'exempt' && !$object->tva_assuj) || (!$customer->tax_exempt == 'exempt' && empty($object->tva_assuj))) $changerequested++;
-					if (!isset($customer->tax_ids['data']) && !is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_ids['data'])) {
+					if ($namecleaned != $customer->name) {
+						$changerequested++;
+					}
+					if ($desccleaned != $customer->description) {
+						$changerequested++;
+					}
+					if (($customer->tax_exempt == 'exempt' && !$object->tva_assuj) || (!$customer->tax_exempt == 'exempt' && empty($object->tva_assuj))) {
+						$changerequested++;
+					}
+					if (!isset($customer->tax_ids['data']) && !is_null($vatcleaned)) {
+						$changerequested++;
+					} elseif (isset($customer->tax_ids['data'])) {
 						$taxinfo = reset($customer->tax_ids['data']);
-						if (empty($taxinfo) && !empty($vatcleaned)) $changerequested++;
-						if (isset($taxinfo->value) && $vatcleaned != $taxinfo->value) $changerequested++;
+						if (empty($taxinfo) && !empty($vatcleaned)) {
+							$changerequested++;
+						}
+						if (isset($taxinfo->value) && $vatcleaned != $taxinfo->value) {
+							$changerequested++;
+						}
 					}
 
 					if ($changerequested) {
@@ -239,8 +254,11 @@ class InterfaceStripe extends DolibarrTriggers
 					if ($customer) {
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
-							if (method_exists($card, 'detach')) $card->detach();
-							else $card->delete();
+							if (method_exists($card, 'detach')) {
+								$card->detach();
+							} else {
+								$card->delete();
+							}
 						}
 					}
 				}
diff --git a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
index a903ab53b23..26e1c35449c 100644
--- a/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
+++ b/htdocs/core/triggers/interface_90_modSociete_ContactRoles.class.php
@@ -92,16 +92,18 @@ class InterfaceContactRoles extends DolibarrTriggers
 
 					foreach ($TContact as $i => $infos) {
 						foreach ($TContactAlreadyLinked as $contactData) {
-							if ($contactData['id'] == $infos['fk_socpeople'] && $contactData['fk_c_type_contact'] == $infos['type_contact'])
+							if ($contactData['id'] == $infos['fk_socpeople'] && $contactData['fk_c_type_contact'] == $infos['type_contact']) {
 								unset($TContact[$i]);
+							}
 						}
 					}
 
 					$nb = 0;
 					foreach ($TContact as $infos) {
 						$res = $object->add_contact($infos['fk_socpeople'], $infos['type_contact']);
-						if ($res > 0)
+						if ($res > 0) {
 							$nb++;
+						}
 					}
 
 					if ($nb > 0) {
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 7fe59ad9903..67ba6e64edc 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -28,8 +28,7 @@ include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
 // Detection browser (copy of code from main.inc.php)
-if (isset($_SERVER["HTTP_USER_AGENT"]) && is_object($conf) && empty($conf->browser->name))
-{
+if (isset($_SERVER["HTTP_USER_AGENT"]) && is_object($conf) && empty($conf->browser->name)) {
 	$tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
 	$conf->browser->name = $tmp['browsername'];
 	$conf->browser->os = $tmp['browseros'];
@@ -37,42 +36,39 @@ if (isset($_SERVER["HTTP_USER_AGENT"]) && is_object($conf) && empty($conf->brows
 	$conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
 	//var_dump($conf->browser);
 
-	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover = 1;
+	if ($conf->browser->layout == 'phone') {
+		$conf->dol_no_mouse_hover = 1;
+	}
 }
 // Define $website
-if (!is_object($website))
-{
+if (!is_object($website)) {
 	$website = new Website($db);
 	$website->fetch(0, $websitekey);
 }
 // Define $websitepage if we have $websitepagefile defined
-if (!$pageid && !empty($websitepagefile))
-{
+if (!$pageid && !empty($websitepagefile)) {
 	$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile));
-	if ($pageid == 'index.php') $pageid = $website->fk_default_home;
+	if ($pageid == 'index.php') {
+		$pageid = $website->fk_default_home;
+	}
 }
-if (!is_object($websitepage))
-{
+if (!is_object($websitepage)) {
 	$websitepage = new WebsitePage($db);
 }
 // Define $weblangs
-if (!is_object($weblangs))
-{
+if (!is_object($weblangs)) {
 	$weblangs = new Translate('', $conf);
 }
-if (!is_object($pagelangs))
-{
+if (!is_object($pagelangs)) {
 	$pagelangs = new Translate('', $conf);
 }
-if ($pageid > 0)
-{
+if ($pageid > 0) {
 	$websitepage->fetch($pageid);
 
 	$weblangs->setDefaultLang(GETPOSTISSET('lang') ? GETPOST('lang', 'aZ09') : (empty($_COOKIE['weblangs-shortcode']) ? 'auto' : preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['weblangs-shortcode'])));
 	$pagelangs->setDefaultLang($websitepage->lang ? $websitepage->lang : $weblangs->shortlang);
 
-	if (!defined('USEDOLIBARREDITOR') && (in_array($websitepage->type_container, array('menu', 'other')) || empty($websitepage->status)))
-	{
+	if (!defined('USEDOLIBARREDITOR') && (in_array($websitepage->type_container, array('menu', 'other')) || empty($websitepage->status))) {
 		$weblangs->load("website");
 		http_response_code(404);
 		print '<center><br><br>'.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage", $websitepage->pageurl, $websitepage->type_container, $websitepage->status).'</center>';
@@ -88,30 +84,29 @@ if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
 }
 
 // A lang was forced, so we change weblangs init
-if (GETPOST('l', 'aZ09')) $weblangs->setDefaultLang(GETPOST('l', 'aZ09'));
+if (GETPOST('l', 'aZ09')) {
+	$weblangs->setDefaultLang(GETPOST('l', 'aZ09'));
+}
 // A lang was forced, so we check to find if we must make a redirect on translation page
-if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php')	// If we browsing page using Dolibarr server or a Native web server
-{
+if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php') {	// If we browsing page using Dolibarr server or a Native web server
 	//print_r(get_defined_constants(true));exit;
-	if (GETPOST('l', 'aZ09'))
-	{
+	if (GETPOST('l', 'aZ09')) {
 		$sql = "SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page";
 		$sql .= " FROM ".MAIN_DB_PREFIX."website_page as wp";
 		$sql .= " WHERE wp.fk_website = ".$website->id;
 		$sql .= " AND (wp.fk_page = ".$pageid." OR wp.rowid  = ".$pageid;
-		if (is_object($websitepage) && $websitepage->fk_page > 0) $sql .= " OR wp.fk_page = ".$websitepage->fk_page." OR wp.rowid = ".$websitepage->fk_page;
+		if (is_object($websitepage) && $websitepage->fk_page > 0) {
+			$sql .= " OR wp.fk_page = ".$websitepage->fk_page." OR wp.rowid = ".$websitepage->fk_page;
+		}
 		$sql .= ")";
 		$sql .= " AND wp.lang = '".$db->escape(GETPOST('l', 'aZ09'))."'";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$newpageid = $obj->rowid;
-				if ($newpageid != $pageid) 		// To avoid to make a redirect on same page (infinite loop)
-				{
+				if ($newpageid != $pageid) { 		// To avoid to make a redirect on same page (infinite loop)
 					if (defined('USEDOLIBARRSERVER')) {
 						header("Location: ".DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$newpageid.'&l='.GETPOST('l', 'aZ09'));
 						exit;
@@ -127,8 +122,7 @@ if ($_SERVER['PHP_SELF'] != DOL_URL_ROOT.'/website/index.php')	// If we browsing
 }
 
 // Show off line message
-if (!defined('USEDOLIBARREDITOR') && empty($website->status))
-{
+if (!defined('USEDOLIBARREDITOR') && empty($website->status)) {
 	$weblangs->load("website");
 	http_response_code(503);
 	print '<center><br><br>'.$weblangs->trans("SorryWebsiteIsCurrentlyOffLine").'</center>';
diff --git a/htdocs/datapolicy/admin/setup.php b/htdocs/datapolicy/admin/setup.php
index d50f544449d..a334b36929e 100644
--- a/htdocs/datapolicy/admin/setup.php
+++ b/htdocs/datapolicy/admin/setup.php
@@ -33,7 +33,9 @@ $langs->load('members');
 $langs->load('datapolicy@datapolicy');
 
 // Access control
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 // Parameters
 $action = GETPOST('action', 'aZ09');
@@ -104,8 +106,7 @@ print dol_get_fiche_head($head, 'settings', '', -1, "datapolicy@datapolicy");
 echo '<span class="opacitymedium">'.$langs->trans("datapolicySetupPage").'</span><br><br>';
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -113,11 +114,9 @@ if ($action == 'edit')
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($arrayofparameters as $title => $tab)
-	{
+	foreach ($arrayofparameters as $title => $tab) {
 		print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
-		foreach ($tab as $key => $val)
-		{
+		foreach ($tab as $key => $val) {
 			print '<tr class="oddeven"><td>';
 			print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
 			print '</td><td>';
@@ -144,11 +143,9 @@ if ($action == 'edit')
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($arrayofparameters as $title => $tab)
-	{
+	foreach ($arrayofparameters as $title => $tab) {
 		print '<tr class="trforbreak"><td class="titlefield trforbreak" colspan="2">'.$langs->trans($title).'</td></tr>';
-		foreach ($tab as $key => $val)
-		{
+		foreach ($tab as $key => $val) {
 			print '<tr class="oddeven"><td>';
 			print $form->textwithpicto($langs->trans($key), $langs->trans('DATAPOLICY_Tooltip_SETUP'));
 			print '</td><td>'.($conf->global->$key == '' ? $langs->trans('None') : $valTab[$conf->global->$key]).'</td></tr>';
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index 7076608898e..c25d4c2263d 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -39,8 +39,9 @@ if (GETPOST('l')) {
 	$l = $langs->defaultlang;
 }
 // Access control
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 /*
  * Actions
@@ -62,8 +63,9 @@ if ($action == 'setvalue' && $user->admin) {
 	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
 	$sub = "DATAPOLICIESREFUSE_".$l;
 	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0)
+	if (!$result > 0) {
 		$error++;
+	}
 	if (!$error) {
 		$db->commit();
 		setEventMessage($langs->trans("SetupSaved"));
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index d6c16a6be4e..8dcfcdadb1c 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -332,8 +332,7 @@ class ActionsDatapolicy
 		global $conf, $user, $langs;
 		$langs->load('datapolicy@datapolicy');
 
-		if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS))
-		{
+		if (!empty($conf->global->DATAPOLICIES_ENABLE_EMAILS)) {
 			$dialog = '<div id="dialogdatapolicy" style="display:none;" title="'.$langs->trans('DATAPOLICIES_PORTABILITE_TITLE').'">';
 			$dialog .= '<div class="confirmmessage">'.img_help('', '').' '.$langs->trans('DATAPOLICIES_PORTABILITE_CONFIRMATION').'</div>';
 			$dialog .= "</div>";
diff --git a/htdocs/datapolicy/class/datapolicy.class.php b/htdocs/datapolicy/class/datapolicy.class.php
index 6d7b71129f7..a7ed08d7e6f 100644
--- a/htdocs/datapolicy/class/datapolicy.class.php
+++ b/htdocs/datapolicy/class/datapolicy.class.php
@@ -194,8 +194,9 @@ class DataPolicy
 		$actiontypecode = 'AC_EMAIL';
 		$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
 		if ($message) {
-			if ($sendtocc)
+			if ($sendtocc) {
 				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
+			}
 				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
 				$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
 				$actionmsg = dol_concatdesc($actionmsg, $message);
diff --git a/htdocs/datapolicy/class/datapolicycron.class.php b/htdocs/datapolicy/class/datapolicycron.class.php
index e1d8f7c36d4..28a713fb733 100644
--- a/htdocs/datapolicy/class/datapolicycron.class.php
+++ b/htdocs/datapolicy/class/datapolicycron.class.php
@@ -464,43 +464,36 @@ class DataPolicyCron
 
 		$this->db->begin();
 
-		foreach ($arrayofparameters as $key => $params)
-		{
-			if ($conf->global->$key != '' && is_numeric($conf->global->$key) && (int) $conf->global->$key > 0)
-			{
+		foreach ($arrayofparameters as $key => $params) {
+			if ($conf->global->$key != '' && is_numeric($conf->global->$key) && (int) $conf->global->$key > 0) {
 				$sql = sprintf($params['sql'], (int) $conf->entity, (int) $conf->global->$key, (int) $conf->global->$key);
 
 				$resql = $this->db->query($sql);
 
-				if ($resql && $this->db->num_rows($resql) > 0)
-				{
+				if ($resql && $this->db->num_rows($resql) > 0) {
 					$num = $this->db->num_rows($resql);
 					$i = 0;
 
 					require_once $params['file'];
 					$object = new $params['class']($this->db);
 
-					while ($i < $num && !$error)
-					{
+					while ($i < $num && !$error) {
 						$obj = $this->db->fetch_object($resql);
 
 						$object->fetch($obj->rowid);
 						$object->id = $obj->rowid;
 
-						if ($object->isObjectUsed($obj->rowid) > 0)			// If object to clean is used
-						{
+						if ($object->isObjectUsed($obj->rowid) > 0) {			// If object to clean is used
 							foreach ($params['fields_anonym'] as $fields => $val) {
 								$object->$fields = $val;
 							}
 							$result = $object->update($obj->rowid, $user);
-							if ($result > 0)
-							{
+							if ($result > 0) {
 								if ($params['class'] == 'Societe') {
 									// We delete contacts of thirdparty
 									$sql = "DELETE FROM ".MAIN_DB_PREFIX."socpeople WHERE fk_soc = ".$obj->rowid;
 									$result = $this->db->query($sql);
-									if ($result < 0)
-									{
+									if ($result < 0) {
 										$errormsg = $this->db->lasterror();
 										$error++;
 									}
@@ -516,8 +509,7 @@ class DataPolicyCron
 							} else {
 								$result = $object->delete($user);
 							}
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$errormsg = $object->error;
 								$error++;
 							}
@@ -533,8 +525,7 @@ class DataPolicyCron
 
 		$this->db->commit();
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->output = $nbupdated.' record updated, '.$nbdeleted.' record deleted';
 		} else {
 			$this->error = $errormsg;
diff --git a/htdocs/datapolicy/mailing.php b/htdocs/datapolicy/mailing.php
index 40597cc3e70..7e2dccaf7d4 100644
--- a/htdocs/datapolicy/mailing.php
+++ b/htdocs/datapolicy/mailing.php
@@ -29,13 +29,13 @@ require_once DOL_DOCUMENT_ROOT.'/datapolicy/class/datapolicy.class.php';
 $idcontact = GETPOST('idc');
 
 if (!empty($idcontact)) {
-    $contact = new Contact($db);
-    $contact->fetch($idcontact);
-    DataPolicy::sendMailDataPolicyContact($contact);
+	$contact = new Contact($db);
+	$contact->fetch($idcontact);
+	DataPolicy::sendMailDataPolicyContact($contact);
 } else {
-    $contacts = new DataPolicy($db);
-    $contacts->getAllContactNotInformed();
-    $contacts->getAllCompaniesNotInformed();
-    $contacts->getAllAdherentsNotInformed();
-    echo $langs->trans('AllAgreementSend');
+	$contacts = new DataPolicy($db);
+	$contacts->getAllContactNotInformed();
+	$contacts->getAllCompaniesNotInformed();
+	$contacts->getAllAdherentsNotInformed();
+	echo $langs->trans('AllAgreementSend');
 }
diff --git a/htdocs/datapolicy/public/index.php b/htdocs/datapolicy/public/index.php
index 0930d7d07d7..104b393bf7e 100644
--- a/htdocs/datapolicy/public/index.php
+++ b/htdocs/datapolicy/public/index.php
@@ -22,12 +22,15 @@
  * \brief   datapolicy setup page.
  */
 
-if (!defined('NOLOGIN'))
+if (!defined('NOLOGIN')) {
 	define("NOLOGIN", 1); // This means this output page does not require to be logged.
-if (!defined('NOCSRFCHECK'))
+}
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
-if (!defined('NOREQUIREMENU'))
+}
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
diff --git a/htdocs/dav/dav.class.php b/htdocs/dav/dav.class.php
index 3a73f61c70c..6ff9e58b73a 100644
--- a/htdocs/dav/dav.class.php
+++ b/htdocs/dav/dav.class.php
@@ -82,8 +82,7 @@ class CdavLib
 						LEFT OUTER JOIN '.MAIN_DB_PREFIX.'user AS u ON (u.rowid=fk_element)
 						WHERE ar.element_type=\'user\' AND fk_actioncomm=a.id) AS other_users
 				FROM '.MAIN_DB_PREFIX.'actioncomm AS a';
-		if (!$this->user->rights->societe->client->voir)//FIXME si 'voir' on voit plus de chose ?
-		{
+		if (!$this->user->rights->societe->client->voir) {//FIXME si 'voir' on voit plus de chose ?
 			$sql .= ' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
@@ -100,8 +99,7 @@ class CdavLib
 						AND a.code IN (SELECT cac.code FROM '.MAIN_DB_PREFIX.'c_actioncomm cac WHERE cac.type<>\'systemauto\')
 						AND a.entity IN ('.getEntity('societe', 1).')';
 		if ($oid !== false) {
-			if ($ouri === false)
-			{
+			if ($ouri === false) {
 				$sql .= ' AND a.id = '.intval($oid);
 			} else {
 				$sql .= ' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
@@ -130,8 +128,7 @@ class CdavLib
 		$location = $obj->location;
 
 		// contact address
-		if (empty($location) && !empty($obj->address))
-		{
+		if (empty($location) && !empty($obj->address)) {
 			$location = trim(str_replace(array("\r", "\t", "\n"), ' ', $obj->address));
 			$location = trim($location.', '.$obj->zip);
 			$location = trim($location.' '.$obj->town);
@@ -139,8 +136,7 @@ class CdavLib
 		}
 
 		// contact address
-		if (empty($location) && !empty($obj->soc_address))
-		{
+		if (empty($location) && !empty($obj->soc_address)) {
 			$location = trim(str_replace(array("\r", "\t", "\n"), ' ', $obj->soc_address));
 			$location = trim($location.', '.$obj->soc_zip);
 			$location = trim($location.' '.$obj->soc_town);
@@ -148,16 +144,17 @@ class CdavLib
 		}
 
 		$address = explode("\n", $obj->address, 2);
-		foreach ($address as $kAddr => $vAddr)
-		{
+		foreach ($address as $kAddr => $vAddr) {
 			$address[$kAddr] = trim(str_replace(array("\r", "\t"), ' ', str_replace("\n", ' | ', trim($vAddr))));
 		}
 		$address[] = '';
 		$address[] = '';
 
-		if ($obj->percent == -1 && trim($obj->datep) != '')
+		if ($obj->percent == -1 && trim($obj->datep) != '') {
 			$type = 'VEVENT';
-		else $type = 'VTODO';
+		} else {
+			$type = 'VTODO';
+		}
 
 		$timezone = date_default_timezone_get();
 
@@ -169,60 +166,72 @@ class CdavLib
 		$caldata .= "CREATED:".gmdate('Ymd\THis', strtotime($obj->datec))."Z\n";
 		$caldata .= "LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
 		$caldata .= "DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
-		if ($obj->sourceuid == '')
+		if ($obj->sourceuid == '') {
 			$caldata .= "UID:".$obj->id.'-ev-'.$calid.'-cal-'.constant('CDAV_URI_KEY')."\n";
-		else $caldata .= "UID:".$obj->sourceuid."\n";
+		} else {
+			$caldata .= "UID:".$obj->sourceuid."\n";
+		}
 		$caldata .= "SUMMARY:".$obj->label."\n";
 		$caldata .= "LOCATION:".$location."\n";
 		$caldata .= "PRIORITY:".$obj->priority."\n";
-		if ($obj->fulldayevent)
-		{
+		if ($obj->fulldayevent) {
 			$caldata .= "DTSTART;VALUE=DATE:".date('Ymd', strtotime($obj->datep))."\n";
-			if ($type == 'VEVENT')
-			{
-				if (trim($obj->datep2) != '')
+			if ($type == 'VEVENT') {
+				if (trim($obj->datep2) != '') {
 					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
-				else $caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
-			} elseif (trim($obj->datep2) != '')
+				} else {
+					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
+				}
+			} elseif (trim($obj->datep2) != '') {
 				$caldata .= "DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
+			}
 		} else {
 			$caldata .= "DTSTART;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
-			if ($type == 'VEVENT')
-			{
-				if (trim($obj->datep2) != '')
+			if ($type == 'VEVENT') {
+				if (trim($obj->datep2) != '') {
 					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
-				else $caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
-			} elseif (trim($obj->datep2) != '')
+				} else {
+					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				}
+			} elseif (trim($obj->datep2) != '') {
 				$caldata .= "DUE;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
+			}
 		}
 		$caldata .= "CLASS:PUBLIC\n";
-		if ($obj->transparency == 1)
+		if ($obj->transparency == 1) {
 			$caldata .= "TRANSP:TRANSPARENT\n";
-		else $caldata .= "TRANSP:OPAQUE\n";
+		} else {
+			$caldata .= "TRANSP:OPAQUE\n";
+		}
 
-		if ($type == 'VEVENT')
+		if ($type == 'VEVENT') {
 			$caldata .= "STATUS:CONFIRMED\n";
-		elseif ($obj->percent == 0)
+		} elseif ($obj->percent == 0) {
 			$caldata .= "STATUS:NEEDS-ACTION\n";
-		elseif ($obj->percent == 100)
+		} elseif ($obj->percent == 100) {
 			$caldata .= "STATUS:COMPLETED\n";
-		else {
+		} else {
 			$caldata .= "STATUS:IN-PROCESS\n";
 			$caldata .= "PERCENT-COMPLETE:".$obj->percent."\n";
 		}
 
 		$caldata .= "DESCRIPTION:";
 		$caldata .= strtr($obj->note, array("\n"=>"\\n", "\r"=>""));
-		if (!empty($obj->soc_nom))
+		if (!empty($obj->soc_nom)) {
 			$caldata .= "\\n*DOLIBARR-SOC: ".$obj->soc_nom;
-		if (!empty($obj->soc_phone))
+		}
+		if (!empty($obj->soc_phone)) {
 			$caldata .= "\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
-		if (!empty($obj->firstname) || !empty($obj->lastname))
+		}
+		if (!empty($obj->firstname) || !empty($obj->lastname)) {
 			$caldata .= "\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
-		if (!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile))
+		}
+		if (!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile)) {
 			$caldata .= "\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
-		if (strpos($obj->other_users, ',')) // several
+		}
+		if (strpos($obj->other_users, ',')) { // several
 			$caldata .= "\\n*DOLIBARR-USR: ".$obj->other_users;
+		}
 		$caldata .= "\n";
 
 		$caldata .= "END:".$type."\n";
@@ -243,24 +252,23 @@ class CdavLib
 		$calid = ($calendarId * 1);
 		$calevents = array();
 
-		if (!$this->user->rights->agenda->myactions->read)
+		if (!$this->user->rights->agenda->myactions->read) {
 			return $calevents;
+		}
 
-		if ($calid != $this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
+		if ($calid != $this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read)) {
 			return $calevents;
+		}
 
 		$sql = $this->getSqlCalEvents($calid);
 
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			while ($obj = $this->db->fetch_object($result))
-			{
+		if ($result) {
+			while ($obj = $this->db->fetch_object($result)) {
 				$calendardata = $this->toVCalendar($calid, $obj);
 
-				if ($bCalendarData)
-				{
+				if ($bCalendarData) {
 					$calevents[] = array(
 						'calendardata' => $calendardata,
 						'uri' => $obj->id.'-ev-'.constant('CDAV_URI_KEY'),
diff --git a/htdocs/dav/dav.lib.php b/htdocs/dav/dav.lib.php
index bb4835c4d52..2861b8744bf 100644
--- a/htdocs/dav/dav.lib.php
+++ b/htdocs/dav/dav.lib.php
@@ -22,19 +22,21 @@
  */
 
 // define CDAV_CONTACT_TAG if not
-if (!defined('CDAV_CONTACT_TAG'))
-{
-	if (isset($conf->global->CDAV_CONTACT_TAG))
+if (!defined('CDAV_CONTACT_TAG')) {
+	if (isset($conf->global->CDAV_CONTACT_TAG)) {
 		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-	else define('CDAV_CONTACT_TAG', '');
+	} else {
+		define('CDAV_CONTACT_TAG', '');
+	}
 }
 
 // define CDAV_URI_KEY if not
-if (!defined('CDAV_URI_KEY'))
-{
-	if (isset($conf->global->CDAV_URI_KEY))
+if (!defined('CDAV_URI_KEY')) {
+	if (isset($conf->global->CDAV_URI_KEY)) {
 		define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
-	else define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
+	} else {
+		define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
+	}
 }
 
 
diff --git a/htdocs/dav/fileserver.php b/htdocs/dav/fileserver.php
index bd6df769553..c77d4d02226 100644
--- a/htdocs/dav/fileserver.php
+++ b/htdocs/dav/fileserver.php
@@ -25,12 +25,24 @@
  *      \brief      Server DAV
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOLOGIN'))  		 define("NOLOGIN", 1); // This means this output page does not require to be logged.
-if (!defined('NOCSRFCHECK'))  	 define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOLOGIN')) {
+	define("NOLOGIN", 1); // This means this output page does not require to be logged.
+}
+if (!defined('NOCSRFCHECK')) {
+	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+}
 
 require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -41,8 +53,7 @@ require_once DOL_DOCUMENT_ROOT.'/includes/sabre/autoload.php';
 
 
 $user = new User($db);
-if (isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] != '')
-{
+if (isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] != '') {
 	$user->fetch('', $_SERVER['PHP_AUTH_USER']);
 	$user->getrights();
 }
@@ -51,17 +62,16 @@ if (isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] != '')
 $langs->loadLangs(array("main", "other"));
 
 
-if (empty($conf->dav->enabled))
+if (empty($conf->dav->enabled)) {
 	accessforbidden();
+}
 
 
 // Restrict API to some IPs
-if (!empty($conf->global->DAV_RESTRICT_ON_IP))
-{
+if (!empty($conf->global->DAV_RESTRICT_ON_IP)) {
 	$allowedip = explode(' ', $conf->global->DAV_RESTRICT_ON_IP);
 	$ipremote = getUserRemoteIP();
-	if (!in_array($ipremote, $allowedip))
-	{
+	if (!in_array($ipremote, $allowedip)) {
 		dol_syslog('Remote ip is '.$ipremote.', not into list '.$conf->global->DAV_RESTRICT_ON_IP);
 		print 'DAV not allowed from the IP '.$ipremote;
 		header('HTTP/1.1 503 DAV not allowed from your IP '.$ipremote);
@@ -87,31 +97,30 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 	global $conf;
 	global $dolibarr_main_authentication, $dolibarr_auto_user;
 
-	if (empty($user->login))
-	{
+	if (empty($user->login)) {
 		dol_syslog("Failed to authenticate to DAV, login is not provided", LOG_WARNING);
 		return false;
 	}
-	if ($user->socid > 0)
-	{
+	if ($user->socid > 0) {
 		dol_syslog("Failed to authenticate to DAV, use is an external user", LOG_WARNING);
 		return false;
 	}
-	if ($user->login != $username)
-	{
+	if ($user->login != $username) {
 		dol_syslog("Failed to authenticate to DAV, login does not match the login of loaded user", LOG_WARNING);
 		return false;
 	}
 
 	// Authentication mode
-	if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'dolibarr';
+	if (empty($dolibarr_main_authentication)) {
+		$dolibarr_main_authentication = 'dolibarr';
+	}
 
 	// Authentication mode: forceuser
-	if ($dolibarr_main_authentication == 'forceuser')
-	{
-		if (empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
-		if ($dolibarr_auto_user != $username)
-		{
+	if ($dolibarr_main_authentication == 'forceuser') {
+		if (empty($dolibarr_auto_user)) {
+			$dolibarr_auto_user = 'auto';
+		}
+		if ($dolibarr_auto_user != $username) {
 			dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. DAV usage is forbidden in this mode.");
 			return false;
 		}
@@ -120,8 +129,9 @@ $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $p
 	$authmode = explode(',', $dolibarr_main_authentication);
 	$entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
-	if (checkLoginPassEntity($username, $password, $entity, $authmode, 'dav') != $username)
+	if (checkLoginPassEntity($username, $password, $entity, $authmode, 'dav') != $username) {
 		return false;
+	}
 
 	return true;
 });
@@ -142,15 +152,13 @@ $nodes = array();
 
 // Enable directories and features according to DAV setup
 // Public dir
-if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR))
-{
+if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR)) {
 	$nodes[] = new \Sabre\DAV\FS\Directory($publicDir);
 }
 // Private dir
 $nodes[] = new \Sabre\DAV\FS\Directory($privateDir);
 // ECM dir
-if (!empty($conf->ecm->enabled) && !empty($conf->global->DAV_ALLOW_ECM_DIR))
-{
+if (!empty($conf->ecm->enabled) && !empty($conf->global->DAV_ALLOW_ECM_DIR)) {
 	$nodes[] = new \Sabre\DAV\FS\Directory($ecmDir);
 }
 
@@ -175,14 +183,15 @@ $server = new \Sabre\DAV\Server($nodes);
 // If you want to run the SabreDAV server in a custom location (using mod_rewrite for instance)
 // You can override the baseUri here.
 $baseUri = DOL_URL_ROOT.'/dav/fileserver.php/';
-if (isset($baseUri)) $server->setBaseUri($baseUri);
+if (isset($baseUri)) {
+	$server->setBaseUri($baseUri);
+}
 
 // Add authentication function
 if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
 	|| !preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public', '/').'/', $_SERVER["PHP_SELF"]))
 	&& !preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
-	)
-{
+	) {
 	//var_dump($_SERVER["QUERY_STRING"]);exit;
 	$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
 }
@@ -192,8 +201,7 @@ $lockPlugin = new \Sabre\DAV\Locks\Plugin($lockBackend);
 $server->addPlugin($lockPlugin);
 
 // Support for html frontend
-if (empty($conf->global->DAV_DISABLE_BROWSER))
-{
+if (empty($conf->global->DAV_DISABLE_BROWSER)) {
 	$browser = new \Sabre\DAV\Browser\Plugin();
 	$server->addPlugin($browser);
 }
@@ -213,4 +221,6 @@ $server->addPlugin($tempFF);
 // And off we go!
 $server->exec();
 
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index 626b4ec2613..520a0a20a72 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -2,6 +2,7 @@
 
 use DebugBar\DataCollector\MessagesCollector;
 use Psr\Log\LogLevel;
+
 //use ReflectionClass;
 
 /**
@@ -74,15 +75,13 @@ class DolLogsCollector extends MessagesCollector
 
 		$uselogfile = $conf->global->DEBUGBAR_USE_LOGFILE;
 
-		if ($uselogfile)
-		{
+		if ($uselogfile) {
 			$this->getStorageLogs($this->path);
 		} else {
 			$log_levels = $this->getLevels();
 
 			foreach ($conf->logbuffer as $line) {
-				if ($this->nboflines >= $this->maxnboflines)
-				{
+				if ($this->nboflines >= $this->maxnboflines) {
 					break;
 				}
 				foreach ($log_levels as $level_key => $level) {
diff --git a/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php b/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
index 5f3e43a0d60..938643802d5 100644
--- a/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolRequestDataCollector.php
@@ -22,11 +22,11 @@ class DolRequestDataCollector extends RequestDataCollector
 			if (isset($GLOBALS[$var])) {
 				$arrayofvalues = $GLOBALS[$var];
 
-				if ($var == '_COOKIE')
-				{
-					foreach ($arrayofvalues as $key => $val)
-					{
-						if (preg_match('/^DOLSESSID_/', $key)) $arrayofvalues[$key] = '*****hidden*****';
+				if ($var == '_COOKIE') {
+					foreach ($arrayofvalues as $key => $val) {
+						if (preg_match('/^DOLSESSID_/', $key)) {
+							$arrayofvalues[$key] = '*****hidden*****';
+						}
 					}
 					//var_dump($arrayofvalues);
 				}
diff --git a/htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php b/htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php
index ae69b16eba7..ed5e979d539 100644
--- a/htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolTimeDataCollector.php
@@ -2,7 +2,6 @@
 
 use \DebugBar\DataCollector\TimeDataCollector;
 
-
 /**
  * DolTimeDataCollector class
  */
diff --git a/htdocs/debugbar/class/DebugBar.php b/htdocs/debugbar/class/DebugBar.php
index e3f2ac159f7..15bb2360ed8 100644
--- a/htdocs/debugbar/class/DebugBar.php
+++ b/htdocs/debugbar/class/DebugBar.php
@@ -4,6 +4,7 @@ dol_include_once('/debugbar/class/autoloader.php');
 
 use \DebugBar\DebugBar;
 use \DebugBar\DataCollector\PhpInfoCollector;
+
 dol_include_once('/debugbar/class/DataCollector/DolMessagesCollector.php');
 dol_include_once('/debugbar/class/DataCollector/DolRequestDataCollector.php');
 dol_include_once('/debugbar/class/DataCollector/DolConfigCollector.php');
diff --git a/htdocs/delivery/card.php b/htdocs/delivery/card.php
index 8b0b53bd37d..69fd5a9bec0 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -34,12 +34,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->expedition_bon->enabled))
+}
+if (!empty($conf->expedition_bon->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-if (!empty($conf->stock->enabled))
+}
+if (!empty($conf->stock->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+}
 if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -48,7 +51,9 @@ if (!empty($conf->projet->enabled)) {
 // Load translation files required by the page
 $langs->loadLangs(array("sendings", "bills", 'deliveries', 'orders'));
 
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load('incoterm');
+}
 
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
@@ -56,7 +61,9 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 // Security check
 $id = GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expedition', $id, 'delivery', 'delivery');
 
 $object = new Delivery($db);
@@ -84,8 +91,7 @@ $error = 0;
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-if ($action == 'add')
-{
+if ($action == 'add') {
 	$db->begin();
 
 	$object->date_delivery = dol_now();
@@ -103,13 +109,11 @@ if ($action == 'add')
 	$commande->fetch($object->commande_id);
 	$commande->fetch_lines();
 	$num = count($commande->lines);
-	for ($i = 0; $i < $num; $i++)
-	{
+	for ($i = 0; $i < $num; $i++) {
 		$qty = "qtyl".$i;
 		$idl = "idl".$i;
 		$qtytouse = price2num(GETPOST($qty));
-		if ($qtytouse > 0)
-		{
+		if ($qtytouse > 0) {
 			$object->addline(GETPOST($idl), price2num($qtytouse));
 		}
 	}
@@ -128,17 +132,19 @@ if ($action == 'add')
 } elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
 	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
 	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
-)
-{
+) {
 	$result = $object->valid($user);
 
 	// Define output language
-	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-	{
+	if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 		$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 = $object->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 = $object->thirdparty->default_lang;
+		}
 		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
@@ -147,74 +153,70 @@ if ($action == 'add')
 		$ret = $object->fetch($id); // Reload to get new records
 
 		$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-		if ($result < 0) dol_print_error($db, $result);
+		if ($result < 0) {
+			dol_print_error($db, $result);
+		}
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->delivery->supprimer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->delivery->supprimer) {
 	$db->begin();
 	$result = $object->delete();
 
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->commit();
-		if (!empty($backtopage)) header("Location: ".$backtopage);
-		else header("Location: ".DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1');
+		if (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+		} else {
+			header("Location: ".DOL_URL_ROOT.'/expedition/list.php?restore_lastsearch_values=1');
+		}
 		exit;
 	} else {
 		$db->rollback();
 	}
 }
 
-if ($action == 'setdate_delivery' && $user->rights->expedition->delivery->creer)
-{
+if ($action == 'setdate_delivery' && $user->rights->expedition->delivery->creer) {
 	$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 	$result = $object->setDeliveryDate($user, $datedelivery);
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		$mesg = '<div class="error">'.$object->error.'</div>';
 	}
-}
-
-// Set incoterm
-elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-{
+} elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {
+	// Set incoterm
 	$result = $object->setIncoterms((int) GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 }
 
 // Update extrafields
-if ($action == 'update_extras')
-{
+if ($action == 'update_extras') {
 	$object->oldcopy = dol_clone($object);
 
 	// Fill array 'array_options' with data from update form
 	$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-	if ($ret < 0) $error++;
+	if ($ret < 0) {
+		$error++;
+	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		// Actions on extra fields
 		$result = $object->insertExtraFields('DELIVERY_MODIFY');
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$error++;
 		}
 	}
 
-	if ($error)
+	if ($error) {
 		$action = 'edit_extras';
+	}
 }
 
 // Extrafields line
-if ($action == 'update_extras_line')
-{
+if ($action == 'update_extras_line') {
 	$array_options = array();
 	$num = count($object->lines);
 
-	for ($i = 0; $i < $num; $i++)
-	{
+	for ($i = 0; $i < $num; $i++) {
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
 		$array_options[$i] = $extrafields->getOptionalsFromPost($extralabelsline, $i);
@@ -227,8 +229,7 @@ if ($action == 'update_extras_line')
 		}
 
 		$ret = $object->update_line($object->lines[$i]->id, $array_options[$i]); // extrafields update
-		if ($ret < 0)
-		{
+		if ($ret < 0) {
 			$mesg = '<div class="error">'.$object->error.'</div>';
 			$error++;
 		}
@@ -253,24 +254,20 @@ llxHeader('', $langs->trans('Delivery'), 'Livraison');
 $form = new Form($db);
 $formfile = new FormFile($db);
 
-if ($action == 'create')    // Create. Seems to no be used
-{
+if ($action == 'create') {    // Create. Seems to no be used
 } else // View
 {
-	if ($object->id > 0)
-	{
+	if ($object->id > 0) {
 		// Origin of a 'livraison' (delivery receipt) is ALWAYS 'expedition' (shipment).
 		// However, origin of shipment in future may differs (commande, proposal, ...)
 		$expedition = new Expedition($db);
 		$result = $expedition->fetch($object->origin_id);
 		$typeobject = $expedition->origin; // example: commande
-		if ($object->origin_id > 0)
-		{
+		if ($object->origin_id > 0) {
 			$object->fetch_origin();
 		}
 
-		if ($object->id > 0)
-		{
+		if ($object->id > 0) {
 			$soc = new Societe($db);
 			$soc->fetch($object->socid);
 
@@ -289,8 +286,7 @@ if ($action == 'create')    // Create. Seems to no be used
 			 * Confirmation de la suppression
 			 *
 			 */
-			if ($action == 'delete')
-			{
+			if ($action == 'delete') {
 				$expedition_id = GETPOST("expid");
 				print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&expid='.$expedition_id.'&backtopage='.urlencode($backtopage), $langs->trans("DeleteDeliveryReceipt"), $langs->trans("DeleteDeliveryReceiptConfirm", $object->ref), 'confirm_delete', '', '', 1);
 			}
@@ -298,8 +294,7 @@ if ($action == 'create')    // Create. Seems to no be used
 			/*
 			 * Confirmation de la validation
 			 */
-			if ($action == 'valid')
-			{
+			if ($action == 'valid') {
 				print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidateDeliveryReceipt"), $langs->trans("ValidateDeliveryReceiptConfirm", $object->ref), 'confirm_valid', '', '', 1);
 			}
 
@@ -308,13 +303,11 @@ if ($action == 'create')    // Create. Seems to no be used
 			 *   Delivery
 			 */
 
-			if ($typeobject == 'commande' && $expedition->origin_id > 0 && !empty($conf->commande->enabled))
-			{
+			if ($typeobject == 'commande' && $expedition->origin_id > 0 && !empty($conf->commande->enabled)) {
 				$objectsrc = new Commande($db);
 				$objectsrc->fetch($expedition->origin_id);
 			}
-			if ($typeobject == 'propal' && $expedition->origin_id > 0 && !empty($conf->propal->enabled))
-			{
+			if ($typeobject == 'propal' && $expedition->origin_id > 0 && !empty($conf->propal->enabled)) {
 				$objectsrc = new Propal($db);
 				$objectsrc->fetch($expedition->origin_id);
 			}
@@ -390,19 +383,18 @@ if ($action == 'create')    // Create. Seems to no be used
 
 			// Ref
 			print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
-    		print '<td colspan="3">';
-    		print $object->ref;
-    		print '</td></tr>';
+			print '<td colspan="3">';
+			print $object->ref;
+			print '</td></tr>';
 
 			// Client
 			print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
 			print '<td colspan="3">'.$soc->getNomUrl(1).'</td>';
 			print "</tr>";
-            */
+			*/
 
 			// Document origine
-			if ($typeobject == 'commande' && $expedition->origin_id && !empty($conf->commande->enabled))
-			{
+			if ($typeobject == 'commande' && $expedition->origin_id && !empty($conf->commande->enabled)) {
 				print '<tr><td class="titlefield">'.$langs->trans("RefOrder").'</td>';
 				$order = new Commande($db);
 				$order->fetch($expedition->origin_id);
@@ -411,8 +403,7 @@ if ($action == 'create')    // Create. Seems to no be used
 				print "</td>\n";
 				print '</tr>';
 			}
-			if ($typeobject == 'propal' && $expedition->origin_id && !empty($conf->propal->enabled))
-			{
+			if ($typeobject == 'propal' && $expedition->origin_id && !empty($conf->propal->enabled)) {
 				$propal = new Propal($db);
 				$propal->fetch($expedition->origin_id);
 				print '<tr><td class="titlefield">'.$langs->trans("RefProposal").'</td>';
@@ -433,11 +424,12 @@ if ($action == 'create')    // Create. Seems to no be used
 			print $langs->trans('DateReceived');
 			print '</td>';
 
-			if ($action != 'editdate_delivery') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_delivery&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+			if ($action != 'editdate_delivery') {
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_delivery&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td colspan="2">';
-			if ($action == 'editdate_delivery')
-			{
+			if ($action == 'editdate_delivery') {
 				print '<form name="setdate_delivery" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="action" value="setdate_delivery">';
@@ -451,19 +443,20 @@ if ($action == 'create')    // Create. Seems to no be used
 			print '</tr>';
 
 			// Incoterms
-			if (!empty($conf->incoterm->enabled))
-			{
+			if (!empty($conf->incoterm->enabled)) {
 				print '<tr><td>';
 				print '<table width="100%" class="nobordernopadding"><tr><td>';
 				print $langs->trans('IncotermLabel');
 				print '<td><td class="right">';
-				if ($user->rights->expedition->delivery->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-				else print '&nbsp;';
+				if ($user->rights->expedition->delivery->creer) {
+					print '<a class="editfielda" href="'.DOL_URL_ROOT.'/delivery/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+				} else {
+					print '&nbsp;';
+				}
 				print '</td></tr></table>';
 				print '</td>';
 				print '<td colspan="3">';
-				if ($action != 'editincoterm')
-				{
+				if ($action != 'editincoterm') {
 					print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 				} else {
 					print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -473,25 +466,24 @@ if ($action == 'create')    // Create. Seems to no be used
 
 			/* A delivery note should be just more properties of a shipment, so notes are on shipment
 			// Note Public
-            print '<tr><td>'.$langs->trans("NotePublic").'</td>';
-            print '<td colspan="3">';
-            print nl2br($object->note_public);
-            print "</td></tr>";
+			print '<tr><td>'.$langs->trans("NotePublic").'</td>';
+			print '<td colspan="3">';
+			print nl2br($object->note_public);
+			print "</td></tr>";
 
 			// Note Private
-            print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
-            print '<td colspan="3">';
-            print nl2br($object->note_private);
-            print "</td></tr>";
-            */
+			print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
+			print '<td colspan="3">';
+			print nl2br($object->note_private);
+			print "</td></tr>";
+			*/
 
 			// Statut
 			/*print '<tr><td>'.$langs->trans("Status").'</td>';
 			print '<td colspan="3">'.$object->getLibStatut(4)."</td>\n";
 			print '</tr>';*/
 
-			if (!$conf->expedition_bon->enabled && !empty($conf->stock->enabled))
-			{
+			if (!$conf->expedition_bon->enabled && !empty($conf->stock->enabled)) {
 				// Entrepot
 				$entrepot = new Entrepot($db);
 				$entrepot->fetch($object->entrepot_id);
@@ -524,8 +516,7 @@ if ($action == 'create')    // Create. Seems to no be used
 
 			print '<table class="noborder centpercent">';
 
-			if ($num_prod)
-			{
+			if ($num_prod) {
 				$i = 0;
 
 				print '<tr class="liste_titre">';
@@ -534,29 +525,30 @@ if ($action == 'create')    // Create. Seems to no be used
 				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
 				print "</tr>\n";
 			}
-			while ($i < $num_prod)
-			{
+			while ($i < $num_prod) {
 				$parameters = array('i' => $i, 'line' => $object->lines[$i], 'num' => $num_prod);
 				$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
 
-				if (empty($reshook))
-				{
+				if (empty($reshook)) {
 					print '<tr class="oddeven">';
-					if ($object->lines[$i]->fk_product > 0)
-					{
+					if ($object->lines[$i]->fk_product > 0) {
 						$product = new Product($db);
 						$product->fetch($object->lines[$i]->fk_product);
 
 						// Define output language
-						if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-						{
+						if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 							$outputlangs = $langs;
 							$newlang = '';
-							if (empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
-							if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
-							if (!empty($newlang))
-							{
+							if (empty($newlang) && !empty($_REQUEST['lang_id'])) {
+								$newlang = $_REQUEST['lang_id'];
+							}
+							if (empty($newlang)) {
+								$newlang = $object->thirdparty->default_lang;
+							}
+							if (!empty($newlang)) {
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
 							}
@@ -570,22 +562,27 @@ if ($action == 'create')    // Create. Seems to no be used
 
 						// Affiche ligne produit
 						$text = '<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$object->lines[$i]->fk_product.'">';
-						if ($object->lines[$i]->fk_product_type == 1) $text .= img_object($langs->trans('ShowService'), 'service');
-						else $text .= img_object($langs->trans('ShowProduct'), 'product');
+						if ($object->lines[$i]->fk_product_type == 1) {
+							$text .= img_object($langs->trans('ShowService'), 'service');
+						} else {
+							$text .= img_object($langs->trans('ShowProduct'), 'product');
+						}
 						$text .= ' '.$object->lines[$i]->product_ref.'</a>';
 						$text .= ' - '.$label;
 						$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($object->lines[$i]->description));
 						//print $description;
 						print $form->textwithtooltip($text, $description, 3, '', '', $i);
 						print_date_range($object->lines[$i]->date_start, $object->lines[$i]->date_end);
-						if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-						{
+						if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 							print (!empty($object->lines[$i]->description) && $object->lines[$i]->description != $object->lines[$i]->product_label) ? '<br>'.dol_htmlentitiesbr($object->lines[$i]->description) : '';
 						}
 					} else {
 						print "<td>";
-						if ($object->lines[$i]->fk_product_type == 1) $text = img_object($langs->trans('Service'), 'service');
-						else $text = img_object($langs->trans('Product'), 'product');
+						if ($object->lines[$i]->fk_product_type == 1) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
 
 						if (!empty($object->lines[$i]->label)) {
 							$text .= ' <strong>'.$object->lines[$i]->label.'</strong>';
@@ -640,23 +637,18 @@ if ($action == 'create')    // Create. Seems to no be used
 			 *    Boutons actions
 			 */
 
-			if ($user->socid == 0)
-			{
+			if ($user->socid == 0) {
 				print '<div class="tabsAction">';
 
-				if ($object->statut == 0 && $num_prod > 0)
-				{
+				if ($object->statut == 0 && $num_prod > 0) {
 					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
-						|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
-					{
+						|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate))) {
 						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
 					}
 				}
 
-				if ($user->rights->expedition->delivery->supprimer)
-				{
-					if ($conf->expedition_bon->enabled)
-					{
+				if ($user->rights->expedition->delivery->supprimer) {
+					if ($conf->expedition_bon->enabled) {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;expid='.$object->origin_id.'&amp;action=delete&amp;token='.newToken().'&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
 					} else {
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
@@ -670,7 +662,7 @@ if ($action == 'create')    // Create. Seems to no be used
 			print '<table width="100%" cellspacing="2"><tr><td width="50%" valign="top">';
 
 			/*
-		 	 * Documents generated
+			  * Documents generated
 			 */
 
 			$objectref = dol_sanitizeFileName($object->ref);
@@ -683,10 +675,9 @@ if ($action == 'create')    // Create. Seems to no be used
 			print $formfile->showdocuments('delivery', $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
 
 			/*
-		 	 * Linked object block (of linked shipment)
-		 	 */
-			if ($object->origin == 'expedition')
-			{
+			  * Linked object block (of linked shipment)
+			  */
+			if ($object->origin == 'expedition') {
 				$shipment = new Expedition($db);
 				$shipment->fetch($object->origin_id);
 
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 9c1e9682a10..c91b9780edb 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -31,8 +31,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
-if (!empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (!empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
 
 
 /**
@@ -132,7 +136,9 @@ class Delivery extends CommonObject
 
 		dol_syslog("Delivery::create");
 
-		if (empty($this->model_pdf)) $this->model_pdf = $conf->global->DELIVERY_ADDON_PDF;
+		if (empty($this->model_pdf)) {
+			$this->model_pdf = $conf->global->DELIVERY_ADDON_PDF;
+		}
 
 		$error = 0;
 
@@ -176,8 +182,7 @@ class Delivery extends CommonObject
 
 		dol_syslog("Delivery::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."delivery");
 
 			$numref = "(PROV".$this->id.")";
@@ -188,10 +193,8 @@ class Delivery extends CommonObject
 
 			dol_syslog("Delivery::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if (!$conf->expedition_bon->enabled)
-				{
+			if ($resql) {
+				if (!$conf->expedition_bon->enabled) {
 					$commande = new Commande($this->db);
 					$commande->id = $this->commande_id;
 					$commande->fetch_lines();
@@ -202,38 +205,33 @@ class Delivery extends CommonObject
 				 *  Inserting products into the database
 				 */
 				$num = count($this->lines);
-				for ($i = 0; $i < $num; $i++)
-				{
+				for ($i = 0; $i < $num; $i++) {
 					$origin_id = $this->lines[$i]->origin_line_id;
-					if (!$origin_id) $origin_id = $this->lines[$i]->commande_ligne_id; // For backward compatibility
+					if (!$origin_id) {
+						$origin_id = $this->lines[$i]->commande_ligne_id; // For backward compatibility
+					}
 
-					if (!$this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description))
-					{
+					if (!$this->create_line($origin_id, $this->lines[$i]->qty, $this->lines[$i]->fk_product, $this->lines[$i]->description)) {
 						$error++;
 					}
 				}
 
-				if (!$error && $this->id && $this->origin_id)
-				{
+				if (!$error && $this->id && $this->origin_id) {
 					$ret = $this->add_object_linked();
-					if (!$ret)
-					{
+					if (!$ret) {
 						$error++;
 					}
 
-					if (!$conf->expedition_bon->enabled)
-					{
+					if (!$conf->expedition_bon->enabled) {
 						// TODO standardize status uniformiser les statuts
 						$ret = $this->setStatut(2, $this->origin_id, $this->origin);
-						if (!$ret)
-						{
+						if (!$ret) {
 							$error++;
 						}
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$this->db->commit();
 					return $this->id;
 				} else {
@@ -281,13 +279,11 @@ class Delivery extends CommonObject
 		$sql .= $qty.")";
 
 		dol_syslog(get_class($this)."::create_line", LOG_DEBUG);
-		if (!$this->db->query($sql))
-		{
+		if (!$this->db->query($sql)) {
 			$error++;
 		}
 
-		if ($error == 0)
-		{
+		if ($error == 0) {
 			return 1;
 		}
 	}
@@ -315,10 +311,8 @@ class Delivery extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id                   = $obj->rowid;
@@ -346,7 +340,9 @@ class Delivery extends CommonObject
 				$this->label_incoterms = $obj->label_incoterms;
 				$this->db->free($result);
 
-				if ($this->statut == 0) $this->draft = 1;
+				if ($this->statut == 0) {
+					$this->draft = 1;
+				}
 
 				// Retrieve all extrafields
 				// fetch optionals attributes and labels
@@ -354,8 +350,7 @@ class Delivery extends CommonObject
 
 				// Load lines
 				$result = $this->fetch_lines();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					return -3;
 				}
 
@@ -390,15 +385,12 @@ class Delivery extends CommonObject
 		$error = 0;
 
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
-	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate)))
-		{
-			if (!empty($conf->global->DELIVERY_ADDON_NUMBER))
-			{
+		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate))) {
+			if (!empty($conf->global->DELIVERY_ADDON_NUMBER)) {
 				// Setting the command numbering module name
 				$modName = $conf->global->DELIVERY_ADDON_NUMBER;
 
-				if (is_readable(DOL_DOCUMENT_ROOT.'/core/modules/delivery/'.$modName.'.php'))
-				{
+				if (is_readable(DOL_DOCUMENT_ROOT.'/core/modules/delivery/'.$modName.'.php')) {
 					require_once DOL_DOCUMENT_ROOT.'/core/modules/delivery/'.$modName.'.php';
 
 					$now = dol_now();
@@ -408,8 +400,7 @@ class Delivery extends CommonObject
 					$soc = new Societe($this->db);
 					$soc->fetch($this->socid);
 
-					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-					{
+					if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) { // empty should not happened, but when it occurs, the test save life
 						$numref = $objMod->delivery_get_num($soc, $this);
 					} else {
 						$numref = $this->ref;
@@ -424,11 +415,9 @@ class Delivery extends CommonObject
 					$sql .= " AND entity = ".$conf->entity;
 
 					$resql = $this->db->query($sql);
-					if ($resql)
-					{
+					if ($resql) {
 						$num = $this->db->num_rows($resql);
-						if ($num > 0)
-						{
+						if ($num > 0) {
 							return 0;
 						}
 					}
@@ -442,50 +431,47 @@ class Delivery extends CommonObject
 					$sql .= " AND fk_statut = 0";
 
 					$resql = $this->db->query($sql);
-					if (!$resql)
-					{
+					if (!$resql) {
 						dol_print_error($this->db);
 						$this->error = $this->db->lasterror();
 						$error++;
 					}
 
-					if (!$error && !$notrigger)
-					{
+					if (!$error && !$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('DELIVERY_VALIDATE', $user);
-						if ($result < 0) $error++;
+						if ($result < 0) {
+							$error++;
+						}
 						// End call triggers
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						$this->oldref = $this->ref;
 
 						// Rename directory if dir was a temporary ref
-						if (preg_match('/^[\(]?PROV/i', $this->ref))
-						{
+						if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 							// Now we rename also files into index
 							$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'expedition/receipt/".$this->db->escape($this->newref)."'";
 							$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expedition/receipt/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 							$resql = $this->db->query($sql);
-							if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+							if (!$resql) {
+								$error++; $this->error = $this->db->lasterror();
+							}
 
 							// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 							$oldref = dol_sanitizeFileName($this->ref);
 							$newref = dol_sanitizeFileName($numref);
 							$dirsource = $conf->expedition->dir_output.'/receipt/'.$oldref;
 							$dirdest = $conf->expedition->dir_output.'/receipt/'.$newref;
-							if (!$error && file_exists($dirsource))
-							{
+							if (!$error && file_exists($dirsource)) {
 								dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
 
-								if (@rename($dirsource, $dirdest))
-								{
+								if (@rename($dirsource, $dirdest)) {
 									dol_syslog("Rename ok");
 									// Rename docs starting with $oldref with $newref
 									$listoffiles = dol_dir_list($conf->expedition->dir_output.'/receipt/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-									foreach ($listoffiles as $fileentry)
-									{
+									foreach ($listoffiles as $fileentry) {
 										$dirsource = $fileentry['name'];
 										$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 										$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -497,8 +483,7 @@ class Delivery extends CommonObject
 						}
 
 						// Set new ref and current status
-						if (!$error)
-						{
+						if (!$error) {
 							$this->ref = $numref;
 							$this->statut = 1;
 						}
@@ -506,8 +491,7 @@ class Delivery extends CommonObject
 						dol_syslog(get_class($this)."::valid ok");
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						$this->db->commit();
 						return 1;
 					} else {
@@ -540,8 +524,7 @@ class Delivery extends CommonObject
 		$this->lines = array();
 
 		$num = count($expedition->lines);
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			$line = new DeliveryLine($this->db);
 			$line->origin_line_id    = $expedition->lines[$i]->origin_line_id;
 			$line->label             = $expedition->lines[$i]->label;
@@ -583,22 +566,23 @@ class Delivery extends CommonObject
 		global $conf;
 		$error = 0;
 
-		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
-		{
+		if ($id > 0 && !$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 			$line = new DeliveryLine($this->db);
 			$line->array_options = $array_options;
 			$line->id = $id;
 			$result = $line->insertExtraFields();
 
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error[] = $line->error;
 				$error++;
 			}
 		}
 
-		if (!$error) return 1;
-		else return -1;
+		if (!$error) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -628,13 +612,11 @@ class Delivery extends CommonObject
 	 */
 	public function deleteline($lineid)
 	{
-		if ($this->statut == 0)
-		{
+		if ($this->statut == 0) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."commandedet";
 			$sql .= " WHERE rowid = ".$lineid;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->update_price();
 
 				return 1;
@@ -660,37 +642,31 @@ class Delivery extends CommonObject
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."deliverydet";
 		$sql .= " WHERE fk_delivery = ".$this->id;
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."delivery";
 				$sql .= " WHERE rowid = ".$this->id;
-				if ($this->db->query($sql))
-				{
+				if ($this->db->query($sql)) {
 					$this->db->commit();
 
 					// Deleting pdf folder's draft On efface le repertoire de pdf provisoire
 					$ref = dol_sanitizeFileName($this->ref);
-					if (!empty($conf->expedition->dir_output))
-					{
+					if (!empty($conf->expedition->dir_output)) {
 						$dir = $conf->expedition->dir_output.'/receipt/'.$ref;
 						$file = $dir.'/'.$ref.'.pdf';
-						if (file_exists($file))
-						{
-							if (!dol_delete_file($file))
-							{
+						if (file_exists($file)) {
+							if (!dol_delete_file($file)) {
 								return 0;
 							}
 						}
-						if (file_exists($dir))
-						{
-							if (!dol_delete_dir($dir))
-							{
+						if (file_exists($dir)) {
+							if (!dol_delete_dir($dir)) {
 								$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 								return 0;
 							}
@@ -699,8 +675,7 @@ class Delivery extends CommonObject
 
 					// Call trigger
 					$result = $this->call_trigger('DELIVERY_DELETE', $user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$this->db->rollback();
 						return -4;
 					}
@@ -746,16 +721,24 @@ class Delivery extends CommonObject
 		//{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values = 1;
+		}
+		if ($add_save_lastsearch_values) {
+			$url .= '&save_lastsearch_values=1';
+		}
 		//}
 
 
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
-		if ($withpicto) $result .= ($linkstart.img_object($label, $this->picto, 'class="classfortooltip"').$linkend);
-		if ($withpicto && $withpicto != 2) $result .= ' ';
+		if ($withpicto) {
+			$result .= ($linkstart.img_object($label, $this->picto, 'class="classfortooltip"').$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result .= ' ';
+		}
 		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
 	}
@@ -782,12 +765,10 @@ class Delivery extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$line = new DeliveryLine($this->db);
 
 				$obj = $this->db->fetch_object($resql);
@@ -862,8 +843,7 @@ class Delivery extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[-1] = $langs->trans('StatusDeliveryCanceled');
@@ -875,8 +855,12 @@ class Delivery extends CommonObject
 		}
 
 		$statusType = 'status0';
-		if ($status == -1) $statusType = 'status5';
-		if ($status == 1) $statusType = 'status4';
+		if ($status == -1) {
+			$statusType = 'status5';
+		}
+		if ($status == 1) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -905,12 +889,10 @@ class Delivery extends CommonObject
 		$sql .= $this->db->plimit(100);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_prods = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_prods)
-			{
+			while ($i < $num_prods) {
 				$i++;
 				$row = $this->db->fetch_row($resql);
 				$prodids[$i] = $row[0];
@@ -961,13 +943,11 @@ class Delivery extends CommonObject
 		$sqlSourceLine .= " WHERE fk_".$this->linked_object[0]['type']." = ".$this->linked_object[0]['linkid'];
 
 		$resultSourceLine = $this->db->query($sqlSourceLine);
-		if ($resultSourceLine)
-		{
+		if ($resultSourceLine) {
 			$num_lines = $this->db->num_rows($resultSourceLine);
 			$i = 0;
 			$resultArray = array();
-			while ($i < $num_lines)
-			{
+			while ($i < $num_lines) {
 				$objSourceLine = $this->db->fetch_object($resultSourceLine);
 
 				// Get lines of sources alread delivered
@@ -985,10 +965,8 @@ class Delivery extends CommonObject
 				$result = $this->db->query($sql);
 				$row = $this->db->fetch_row($result);
 
-				if ($objSourceLine->qty - $row[1] > 0)
-				{
-					if ($row[0] == $objSourceLine->rowid)
-					{
+				if ($objSourceLine->qty - $row[1] > 0) {
+					if ($row[0] == $objSourceLine->rowid) {
 						$array[$i]['qty'] = $objSourceLine->qty - $row[1];
 					} else {
 						$array[$i]['qty'] = $objSourceLine->qty;
@@ -996,8 +974,7 @@ class Delivery extends CommonObject
 
 					$array[$i]['ref'] = $objSourceLine->ref;
 					$array[$i]['label'] = $objSourceLine->label ? $objSourceLine->label : $objSourceLine->description;
-				} elseif ($objSourceLine->qty - $row[1] < 0)
-				{
+				} elseif ($objSourceLine->qty - $row[1] < 0) {
 					$array[$i]['qty'] = $objSourceLine->qty - $row[1]." Erreur livraison !";
 					$array[$i]['ref'] = $objSourceLine->ref;
 					$array[$i]['label'] = $objSourceLine->label ? $objSourceLine->label : $objSourceLine->description;
@@ -1021,16 +998,14 @@ class Delivery extends CommonObject
 	 */
 	public function setDeliveryDate($user, $delivery_date)
 	{
-		if ($user->rights->expedition->creer)
-		{
+		if ($user->rights->expedition->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."delivery";
 			$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->date_delivery = $delivery_date;
 				return 1;
 			} else {
diff --git a/htdocs/don/admin/donation.php b/htdocs/don/admin/donation.php
index 7b0896134e0..2cbd00c8522 100644
--- a/htdocs/don/admin/donation.php
+++ b/htdocs/don/admin/donation.php
@@ -30,12 +30,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'donations', 'accountancy', 'other'));
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value');
@@ -49,8 +53,7 @@ $type = 'donation';
  * Action
  */
 
-if ($action == 'specimen')
-{
+if ($action == 'specimen') {
 	$modele = GETPOST('module', 'alpha');
 
 	$don = new Don($db);
@@ -59,15 +62,13 @@ if ($action == 'specimen')
 	// Search template files
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/dons/";
 	$file = $modele.".modules.php";
-	if (file_exists($dir.$file))
-	{
+	if (file_exists($dir.$file)) {
 		$classname = $modele;
 		require_once $dir.$file;
 
 		$obj = new $classname($db);
 
-		if ($obj->write_file($don, $langs) > 0)
-		{
+		if ($obj->write_file($don, $langs) > 0) {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=donation&file=SPECIMEN.html");
 			return;
 		} else {
@@ -78,13 +79,9 @@ if ($action == 'specimen')
 		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
 		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
 	}
-}
-
-// Set default model
-elseif ($action == 'setdoc')
-{
-	if (dolibarr_set_const($db, "DON_ADDON_MODEL", $value, 'chaine', 0, '', $conf->entity))
-	{
+} elseif ($action == 'setdoc') {
+	// Set default model
+	if (dolibarr_set_const($db, "DON_ADDON_MODEL", $value, 'chaine', 0, '', $conf->entity)) {
 		// The constant that was read before the new set
 		// So we go through a variable for a coherent display
 		$conf->global->DON_ADDON_MODEL = $value;
@@ -92,52 +89,48 @@ elseif ($action == 'setdoc')
 
 	// It enables the model
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
+	if ($ret > 0) {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
-}
-
-// Activate a model
-elseif ($action == 'set')
-{
+} elseif ($action == 'set') {
+	// Activate a model
 	$ret = addDocumentModel($value, $type, $label, $scandir);
-} elseif ($action == 'del')
-{
+} elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
-	if ($ret > 0)
-	{
-		if ($conf->global->DON_ADDON_MODEL == "$value") dolibarr_del_const($db, 'DON_ADDON_MODEL', $conf->entity);
+	if ($ret > 0) {
+		if ($conf->global->DON_ADDON_MODEL == "$value") {
+			dolibarr_del_const($db, 'DON_ADDON_MODEL', $conf->entity);
+		}
 	}
 }
 
 // Options
-if ($action == 'set_DONATION_ACCOUNTINGACCOUNT')
-{
+if ($action == 'set_DONATION_ACCOUNTINGACCOUNT') {
 	$account = GETPOST('DONATION_ACCOUNTINGACCOUNT', 'alpha');
 
 	$res = dolibarr_set_const($db, "DONATION_ACCOUNTINGACCOUNT", $account, 'chaine', 0, '', $conf->entity);
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
-if ($action == 'set_DONATION_MESSAGE')
-{
+if ($action == 'set_DONATION_MESSAGE') {
 	$freemessage = GETPOST('DONATION_MESSAGE', 'restricthtml'); // No alpha here, we want exact string
 
 	$res = dolibarr_set_const($db, "DONATION_MESSAGE", $freemessage, 'chaine', 0, '', $conf->entity);
 
-	if (!($res > 0)) $error++;
+	if (!($res > 0)) {
+		$error++;
+	}
 
- 	if (!$error)
-	{
+	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -147,11 +140,9 @@ if ($action == 'set_DONATION_MESSAGE')
 /*
  * Action
  */
-if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
-{
+if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
-	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-	{
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -159,11 +150,9 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 	}
 }
 
-if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
-{
+if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
-	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-	{
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -177,7 +166,9 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 
 $dir = "../../core/modules/dons/";
 $form = new Form($db);
-if (!empty($conf->accounting->enabled)) $formaccounting = new FormAccounting($db);
+if (!empty($conf->accounting->enabled)) {
+	$formaccounting = new FormAccounting($db);
+}
 
 llxHeader('', $langs->trans("DonationsSetup"), 'DonConfiguration');
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
@@ -198,12 +189,10 @@ $sql = "SELECT nom";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql .= " WHERE type = '".$db->escape($type)."'";
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$i = 0;
 	$num_rows = $db->num_rows($resql);
-	while ($i < $num_rows)
-	{
+	while ($i < $num_rows) {
 		$array = $db->fetch_array($resql);
 		array_push($def, $array[0]);
 		$i++;
@@ -226,12 +215,9 @@ clearstatcache();
 
 $handle = opendir($dir);
 
-if (is_resource($handle))
-{
-	while (($file = readdir($handle)) !== false)
-	{
-		if (preg_match('/\.modules\.php$/i', $file))
-		{
+if (is_resource($handle)) {
+	while (($file = readdir($handle)) !== false) {
+		if (preg_match('/\.modules\.php$/i', $file)) {
 			$name = substr($file, 0, dol_strlen($file) - 12);
 			$classname = substr($file, 0, dol_strlen($file) - 12);
 
@@ -239,11 +225,14 @@ if (is_resource($handle))
 			$module = new $classname($db);
 
 			// Show modules according to features level
-			if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
-			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+			if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+				continue;
+			}
+			if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+				continue;
+			}
 
-			if ($module->isEnabled())
-			{
+			if ($module->isEnabled()) {
 				print '<tr class="oddeven"><td width=\"100\">';
 				echo $module->name;
 				print '</td>';
@@ -252,10 +241,8 @@ if (is_resource($handle))
 				print '</td>';
 
 				// Active
-				if (in_array($name, $def))
-				{
-					if ($conf->global->DON_ADDON_MODEL == $name)
-					{
+				if (in_array($name, $def)) {
+					if ($conf->global->DON_ADDON_MODEL == $name) {
 						print "<td class=\"center\">\n";
 						print img_picto($langs->trans("Enabled"), 'switch_on');
 						print '</td>';
@@ -271,8 +258,7 @@ if (is_resource($handle))
 				}
 
 				// Default
-				if ($conf->global->DON_ADDON_MODEL == "$name")
-				{
+				if ($conf->global->DON_ADDON_MODEL == "$name") {
 					print "<td class=\"center\">";
 					print img_picto($langs->trans("Default"), 'on');
 					print '</td>';
@@ -285,8 +271,7 @@ if (is_resource($handle))
 				// Info
 				$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
 				$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
-				if ($module->type == 'pdf')
-				{
+				if ($module->type == 'pdf') {
 					$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 				}
 				$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
@@ -345,8 +330,7 @@ print '<td>';
 $label = $langs->trans("AccountAccounting");
 print '<label for="DONATION_ACCOUNTINGACCOUNT">'.$label.'</label></td>';
 print '<td class="center">';
-if (!empty($conf->accounting->enabled))
-{
+if (!empty($conf->accounting->enabled)) {
 	print $formaccounting->select_account($conf->global->DONATION_ACCOUNTINGACCOUNT, 'DONATION_ACCOUNTINGACCOUNT', 1, '', 1, 1);
 } else {
 	print '<input type="text" size="10" id="DONATION_ACCOUNTINGACCOUNT" name="DONATION_ACCOUNTINGACCOUNT" value="'.$conf->global->DONATION_ACCOUNTINGACCOUNT.'">';
@@ -373,8 +357,7 @@ print '</form>';
 /*
  *  French params
  */
-if (preg_match('/fr/i', $conf->global->MAIN_INFO_SOCIETE_COUNTRY))
-{
+if (preg_match('/fr/i', $conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {
 	print '<br>';
 	print load_fiche_titre($langs->trans("FrenchOptions"), '', '');
 
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index 6062d4fca26..699bcdf7379 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -35,13 +35,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'don'; //Must be the $table_element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -74,8 +78,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
 	print "</div>";
@@ -88,8 +91,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -101,8 +103,7 @@ if ($action == 'create')
 /* Edit optional field                                                        */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 1f0835ee80b..093e478e2c4 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -79,23 +79,27 @@ $permissiontoadd = $user->rights->don->creer;
 $parameters = array();
 
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 // Action reopen object
-if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
-{
+if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
 	$object->fetch($id);
 
 	$result = $object->reopen($user);
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		// Define output language
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			if (method_exists($object, 'generateDocument')) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -114,32 +118,27 @@ if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd)
 	}
 }
 
-if ($action == 'update')
-{
-	if (!empty($cancel))
-	{
+if ($action == 'update') {
+	if (!empty($cancel)) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 		exit;
 	}
 
 	$error = 0;
 
-	if (empty($donation_date))
-	{
+	if (empty($donation_date)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 		$action = "create";
 		$error++;
 	}
 
-	if (empty($amount))
-	{
+	if (empty($amount)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 		$action = "create";
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$object->fetch($id);
 
 		$object->firstname = (string) GETPOST("firstname", 'alpha');
@@ -160,7 +159,9 @@ if ($action == 'update')
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
 		if ($object->update($user) > 0) {
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
@@ -169,32 +170,27 @@ if ($action == 'update')
 	}
 }
 
-if ($action == 'add')
-{
-	if (!empty($cancel))
-	{
+if ($action == 'add') {
+	if (!empty($cancel)) {
 		header("Location: index.php");
 		exit;
 	}
 
 	$error = 0;
 
-	if (empty($donation_date))
-	{
+	if (empty($donation_date)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 		$action = "create";
 		$error++;
 	}
 
-	if (empty($amount))
-	{
+	if (empty($amount)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 		$action = "create";
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$object->socid = (int) GETPOST("socid", 'int');
 		$object->firstname = (string) GETPOST("firstname", 'alpha');
 		$object->lastname = (string) GETPOST("lastname", 'alpha');
@@ -214,7 +210,9 @@ if ($action == 'add')
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
 		$res = $object->create($user);
 		if ($res > 0) {
@@ -331,10 +329,11 @@ llxHeader('', $langs->trans("Donation"), 'EN:Module_Donations|FR:Module_Dons|ES:
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formcompany = new FormCompany($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("AddDonation"), '', 'object_donation');
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
@@ -350,12 +349,10 @@ if ($action == 'create')
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td colspan="2">'.$langs->trans('Draft').'</td></tr>';
 
 	// Company
-	if (!empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES))
-	{
+	if (!empty($conf->societe->enabled) && !empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 		// Thirdparty
 		print '<td>'.$langs->trans('Customer').'</td>';
-		if ($soc->id > 0 && !GETPOST('fac_rec', 'alpha'))
-		{
+		if ($soc->id > 0 && !GETPOST('fac_rec', 'alpha')) {
 			print '<td colspan="2">';
 			print $soc->getNomUrl(1);
 			print '<input type="hidden" name="socid" value="'.$soc->id.'">';
@@ -364,9 +361,10 @@ if ($action == 'create')
 			$outstandingBills = $arrayoutstandingbills['opened'];
 			print ' ('.$langs->trans('CurrentOutstandingBill').': ';
 			print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
-			if ($soc->outstanding_limit != '')
-			{
-				if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+			if ($soc->outstanding_limit != '') {
+				if ($outstandingBills > $soc->outstanding_limit) {
+					print img_warning($langs->trans("OutstandingBillReached"));
+				}
 				print ' / '.price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
 			}
 			print ')';
@@ -375,8 +373,7 @@ if ($action == 'create')
 			print '<td colspan="2">';
 			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 			// Option to reload page to retrieve customer informations. Note, this clear other input
-			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED))
-			{
+			if (!empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
 				print '<script type="text/javascript">
 				$(document).ready(function() {
 					$("#socid").change(function() {
@@ -408,8 +405,7 @@ if ($action == 'create')
 	print $form->selectyesno("public", $public_donation, 1);
 	print "</td></tr>\n";
 
-	if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES))
-	{
+	if (empty($conf->societe->enabled) || empty($conf->global->DONATION_USE_THIRDPARTIES)) {
 		print "<tr>".'<td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" value="'.dol_escape_htmltag(GETPOST("societe")).'" class="maxwidth200"></td></tr>';
 		print "<tr>".'<td>'.$langs->trans("Lastname").'</td><td><input type="text" name="lastname" value="'.dol_escape_htmltag(GETPOST("lastname")).'" class="maxwidth200"></td></tr>';
 		print "<tr>".'<td>'.$langs->trans("Firstname").'</td><td><input type="text" name="firstname" value="'.dol_escape_htmltag(GETPOST("firstname")).'" class="maxwidth200"></td></tr>';
@@ -426,7 +422,9 @@ if ($action == 'create')
 		// Country
 		print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
 		print img_picto('', 'globe-americas', 'class="paddingrightonly"').$form->select_country(GETPOST('country_id') != '' ?GETPOST('country_id') : $object->country_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
 		print '</td></tr>';
 
 		print "<tr>".'<td>'.$langs->trans("EMail").'</td><td>'.img_picto('', 'object_email', 'class="paddingrightonly"').'<input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
@@ -458,8 +456,7 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		print "<tr><td>".$langs->trans("Project")."</td><td>";
 		$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print "</td></tr>\n";
@@ -469,8 +466,7 @@ if ($action == 'create')
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
@@ -495,8 +491,7 @@ if ($action == 'create')
 /*                                                              */
 /* ************************************************************ */
 
-if (!empty($id) && $action == 'edit')
-{
+if (!empty($id) && $action == 'edit') {
 	$result = $object->fetch($id);
 	if ($result < 0) {
 		dol_print_error($db, $object->error); exit;
@@ -577,8 +572,11 @@ if (!empty($id) && $action == 'edit')
 	}
 	// Payment mode
 	print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-	if ($object->mode_reglement_id) $selected = $object->mode_reglement_id;
-	else $selected = '';
+	if ($object->mode_reglement_id) {
+		$selected = $object->mode_reglement_id;
+	} else {
+		$selected = '';
+	}
 	$form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
 	print "</td></tr>\n";
 
@@ -599,9 +597,8 @@ if (!empty($id) && $action == 'edit')
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (empty($reshook))
-	{
-	  	print $object->showOptionals($extrafields, 'edit', $parameters);
+	if (empty($reshook)) {
+		print $object->showOptionals($extrafields, 'edit', $parameters);
 	}
 
 	print "</table>\n";
@@ -620,11 +617,9 @@ if (!empty($id) && $action == 'edit')
 /* Donation card in view mode                                   */
 /*                                                              */
 /* ************************************************************ */
-if (!empty($id) && $action != 'edit')
-{
+if (!empty($id) && $action != 'edit') {
 	// Confirmation delete
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$text = $langs->trans("ConfirmDeleteADonation");
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("DeleteADonation"), $text, "confirm_delete", '', '', 1);
 	}
@@ -650,12 +645,10 @@ if (!empty($id) && $action != 'edit')
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
-		if ($user->rights->don->creer)
-		{
+		if ($user->rights->don->creer) {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 			}
@@ -749,8 +742,7 @@ if (!empty($id) && $action != 'edit')
 
 	//print $sql;
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 		$i = 0; $total = 0;
 		print '<table class="noborder paymenttable centpercent">';
@@ -758,11 +750,10 @@ if (!empty($id) && $action != 'edit')
 		print '<td>'.$langs->trans("RefPayment").'</td>';
 		print '<td>'.$langs->trans("Date").'</td>';
 		print '<td>'.$langs->trans("Type").'</td>';
-   		print '<td class="right">'.$langs->trans("Amount").'</td>';
-   		print '</tr>';
+		print '<td class="right">'.$langs->trans("Amount").'</td>';
+		print '</tr>';
 
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 
 			print '<tr class="oddeven"><td>';
@@ -776,8 +767,7 @@ if (!empty($id) && $action != 'edit')
 			$i++;
 		}
 
-		if ($object->paid == 0)
-		{
+		if ($object->paid == 0) {
 			print "<tr><td colspan=\"3\" class=\"right\">".$langs->trans("AlreadyPaid")." :</td><td class=\"right\">".price($totalpaid)."</td></tr>\n";
 			print "<tr><td colspan=\"3\" class=\"right\">".$langs->trans("AmountExpected")." :</td><td class=\"right\">".price($object->amount)."</td></tr>\n";
 
@@ -807,28 +797,23 @@ if (!empty($id) && $action != 'edit')
 	print '<div class="tabsAction">';
 
 	// Re-open
-	if ($permissiontoadd && $object->statut == $object::STATUS_CANCELED)
-	{
+	if ($permissiontoadd && $object->statut == $object::STATUS_CANCELED) {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 	}
 
 	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
-	if ($object->statut == $object::STATUS_DRAFT)
-	{
+	if ($object->statut == $object::STATUS_DRAFT) {
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=valid_promesse&token='.newToken().'">'.$langs->trans("ValidPromess").'</a></div>';
 	}
 
-	if (($object->statut == $object::STATUS_DRAFT || $object->statut == $object::STATUS_VALIDATED) && $totalpaid == 0 && $object->paid == 0)
-	{
+	if (($object->statut == $object::STATUS_DRAFT || $object->statut == $object::STATUS_VALIDATED) && $totalpaid == 0 && $object->paid == 0) {
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_cancel&token='.newToken().'">'.$langs->trans("ClassifyCanceled")."</a></div>";
 	}
 
 	// Create payment
-	if ($object->statut == $object::STATUS_VALIDATED && $object->paid == 0 && $user->rights->don->creer)
-	{
-		if ($remaintopay == 0)
-		{
+	if ($object->statut == $object::STATUS_VALIDATED && $object->paid == 0 && $user->rights->don->creer) {
+		if ($remaintopay == 0) {
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
 		} else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/don/payment/payment.php?rowid='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
@@ -836,16 +821,13 @@ if (!empty($id) && $action != 'edit')
 	}
 
 	// Classify 'paid'
-	if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer)
-	{
+	if ($object->statut == $object::STATUS_VALIDATED && round($remaintopay) == 0 && $object->paid == 0 && $user->rights->don->creer) {
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&action=set_paid">'.$langs->trans("ClassifyPaid")."</a></div>";
 	}
 
 	// Delete
-	if ($user->rights->don->supprimer)
-	{
-		if ($object->statut == $object::STATUS_CANCELED || $object->statut == $object::STATUS_DRAFT)
-		{
+	if ($user->rights->don->supprimer) {
+		if ($object->statut == $object::STATUS_CANCELED || $object->statut == $object::STATUS_DRAFT) {
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?rowid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>";
 		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
@@ -877,8 +859,7 @@ if (!empty($id) && $action != 'edit')
 	// Show online payment link
 	$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
 
-	if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
-	{
+	if ($useonlinepayment) { //$object->statut != Facture::STATUS_DRAFT &&
 		print '<br><!-- Link to pay -->'."\n";
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 		print showOnlinePaymentUrl('donation', $object->ref).'<br>';
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 18a8563fd89..ab0d6e5f483 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -32,7 +32,7 @@ class Donations extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'socid'
 	);
 
@@ -109,18 +109,22 @@ class Donations extends DolibarrApi
 		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."don as t";
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('don').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($thirdparty_ids) $sql .= " AND t.fk_soc = ".$thirdparty_ids." ";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids)) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($thirdparty_ids) {
+			$sql .= " AND t.fk_soc = ".$thirdparty_ids." ";
+		}
 
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -129,8 +133,7 @@ class Donations extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -141,13 +144,11 @@ class Donations extends DolibarrApi
 		dol_syslog("API Rest request");
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$don_static = new Don($this->db);
 				if ($don_static->fetch($obj->rowid)) {
@@ -185,12 +186,12 @@ class Donations extends DolibarrApi
 			$this->don->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
-          $lines = array();
-          foreach ($request_data["lines"] as $line) {
-            array_push($lines, (object) $line);
-          }
-          $this->don->lines = $lines;
-        }*/
+		  $lines = array();
+		  foreach ($request_data["lines"] as $line) {
+			array_push($lines, (object) $line);
+		  }
+		  $this->don->lines = $lines;
+		}*/
 
 		if ($this->don->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating order", array_merge(array($this->don->error), $this->don->errors));
@@ -222,12 +223,13 @@ class Donations extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->don->$field = $value;
 		}
 
-		if ($this->don->update(DolibarrApiAccess::$user) > 0)
-		{
+		if ($this->don->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->don->error);
@@ -356,8 +358,9 @@ class Donations extends DolibarrApi
 	{
 		$don = array();
 		foreach (Orders::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, $field." field missing");
+			}
 			$don[$field] = $data[$field];
 		}
 		return $don;
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 7e9b913312a..5cf550258ab 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -171,8 +171,7 @@ class Don extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			$langs->load("donations");
 			$this->labelStatus[-1] = $langs->transnoentitiesnoconv("Canceled");
@@ -186,8 +185,12 @@ class Don extends CommonObject
 		}
 
 		$statusType = 'status'.$status;
-		if ($status == self::STATUS_CANCELED) $statusType = 'status9';
-		if ($status == self::STATUS_PAID) $statusType = 'status6';
+		if ($status == self::STATUS_CANCELED) {
+			$statusType = 'status9';
+		}
+		if ($status == self::STATUS_PAID) {
+			$statusType = 'status6';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -216,12 +219,10 @@ class Don extends CommonObject
 		$sql .= " LIMIT 10";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_socs = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_socs)
-			{
+			while ($i < $num_socs) {
 				$i++;
 
 				$row = $this->db->fetch_row($resql);
@@ -269,35 +270,29 @@ class Don extends CommonObject
 		$error_string = array();
 		$err = 0;
 
-		if (dol_strlen(trim($this->societe)) == 0)
-		{
-			if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0)
-			{
+		if (dol_strlen(trim($this->societe)) == 0) {
+			if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0) {
 				$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Company').'/'.$langs->transnoentitiesnoconv('Firstname').'-'.$langs->transnoentitiesnoconv('Lastname'));
 				$err++;
 			}
 		}
 
-		if (dol_strlen(trim($this->address)) == 0)
-		{
+		if (dol_strlen(trim($this->address)) == 0) {
 			$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Address'));
 			$err++;
 		}
 
-		if (dol_strlen(trim($this->zip)) == 0)
-		{
+		if (dol_strlen(trim($this->zip)) == 0) {
 			$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Zip'));
 			$err++;
 		}
 
-		if (dol_strlen(trim($this->town)) == 0)
-		{
+		if (dol_strlen(trim($this->town)) == 0) {
 			$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Town'));
 			$err++;
 		}
 
-		if (dol_strlen(trim($this->email)) == 0)
-		{
+		if (dol_strlen(trim($this->email)) == 0) {
 			$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMail'));
 			$err++;
 		}
@@ -306,10 +301,8 @@ class Don extends CommonObject
 
 		$map = range(0, 9);
 		$len = dol_strlen($this->amount);
-		for ($i = 0; $i < $len; $i++)
-		{
-			if (!isset($map[substr($this->amount, $i, 1)]))
-			{
+		for ($i = 0; $i < $len; $i++) {
+			if (!isset($map[substr($this->amount, $i, 1)])) {
 				$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
 				$err++;
 				$amount_invalid = 1;
@@ -317,23 +310,19 @@ class Don extends CommonObject
 			}
 		}
 
-		if (!$amount_invalid)
-		{
-			if ($this->amount == 0)
-			{
+		if (!$amount_invalid) {
+			if ($this->amount == 0) {
 				$error_string[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Amount'));
 				$err++;
 			} else {
-				if ($this->amount < $minimum && $minimum > 0)
-				{
+				if ($this->amount < $minimum && $minimum > 0) {
 					$error_string[] = $langs->trans('MinimumAmount', $langs->transnoentitiesnoconv('$minimum'));
 					$err++;
 				}
 			}
 		}
 
-		if ($err)
-		{
+		if ($err) {
 			$this->errors = $error_string;
 			return 0;
 		} else {
@@ -404,7 +393,7 @@ class Don extends CommonObject
 		$sql .= ", ".(int) ($this->country_id > 0 ? $this->country_id : 0);
 		$sql .= ", ".(int) $this->public;
 		$sql .= ", ".($this->fk_project > 0 ? (int) $this->fk_project : "null");
-	   	$sql .= ", ".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
+		$sql .= ", ".(!empty($this->note_private) ? ("'".$this->db->escape($this->note_private)."'") : "NULL");
 		$sql .= ", ".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
 		$sql .= ", ".$user->id;
 		$sql .= ", null";
@@ -415,16 +404,16 @@ class Don extends CommonObject
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."don");
 			$ret = $this->id;
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('DON_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		} else {
@@ -441,14 +430,12 @@ class Don extends CommonObject
 			}
 		}
 
-		if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS))
-		{
+		if (!$error && !empty($conf->global->MAIN_DISABLEDRAFTSTATUS)) {
 			//$res = $this->setValid($user);
 			//if ($res < 0) $error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $ret;
 		} else {
@@ -503,28 +490,25 @@ class Don extends CommonObject
 
 		dol_syslog(get_class($this)."::Update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$notrigger)
-			{
+		if ($resql) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('DON_MODIFY', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
 			// Update extrafield
-			if (!$error)
-			{
-			   	$result = $this->insertExtraFields();
-			   	if ($result < 0)
-			   	{
-			   		$error++;
-			   	}
+			if (!$error) {
+				$result = $this->insertExtraFields();
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				$result = 1;
 			} else {
@@ -557,7 +541,7 @@ class Don extends CommonObject
 
 		$this->db->begin();
 
-   		if (!$error && !$notrigger) {
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('DON_DELETE', $user);
 
@@ -568,39 +552,33 @@ class Don extends CommonObject
 		}
 
 		// Delete donation
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."don_extrafields";
 			$sql .= " WHERE fk_object=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."don";
 			$sql .= " WHERE rowid=".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->lasterror();
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -633,20 +611,16 @@ class Don extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as cp ON cp.id = d.fk_payment";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.fk_country = c.rowid";
 		$sql .= " WHERE d.entity IN (".getEntity('donation').")";
-		if (!empty($id))
-		{
+		if (!empty($id)) {
 			$sql .= " AND d.rowid=".$id;
-		} elseif (!empty($ref))
-		{
+		} elseif (!empty($ref)) {
 			$sql .= " AND d.ref='".$this->db->escape($ref)."'";
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id                 = $obj->rowid;
@@ -731,14 +705,14 @@ class Don extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 1, fk_user_valid = ".$userid." WHERE rowid = ".$id." AND fk_statut = 0";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->affected_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->affected_rows($resql)) {
 				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('DON_VALIDATE', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 			}
@@ -784,8 +758,7 @@ class Don extends CommonObject
 	public function setPaid($id, $modepayment = 0)
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."don SET fk_statut = 2";
-		if ($modepayment)
-		{
+		if ($modepayment) {
 			$sql .= ", fk_payment=".$modepayment;
 		}
 		$sql .= " WHERE rowid = ".$id." AND fk_statut = 1";
@@ -874,8 +847,7 @@ class Don extends CommonObject
 		$sql .= " AND entity = ".$conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$result = $obj->total;
 		}
@@ -902,10 +874,8 @@ class Don extends CommonObject
 		$sql .= " AND d.entity IN (".getEntity('donation').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["donations"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -930,7 +900,9 @@ class Don extends CommonObject
 	{
 		global $conf, $langs;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Donation").'</u>';
@@ -941,20 +913,30 @@ class Don extends CommonObject
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->id;
 			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
 		}
-		if ($moretitle) $label .= ' - '.$moretitle;
+		if ($moretitle) {
+			$label .= ' - '.$moretitle;
+		}
 
 		$url = DOL_URL_ROOT.'/don/card.php?id='.$this->id;
 
-	   	$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-	   	if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-	   	if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values = 1;
+		}
+		if ($add_save_lastsearch_values) {
+			$url .= '&save_lastsearch_values=1';
+		}
 
 		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -976,20 +958,16 @@ class Don extends CommonObject
 		dol_syslog(get_class($this).'::info', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_modification = $vuser;
@@ -1045,8 +1023,7 @@ class Don extends CommonObject
 
 		// If selected modele is a filename template (then $modele="modelname:filename")
 		$tmp = explode(':', $modele, 2);
-		if (!empty($tmp[1]))
-		{
+		if (!empty($tmp[1])) {
 			$modele = $tmp[0];
 			$srctemplatepath = $tmp[1];
 		}
@@ -1054,28 +1031,28 @@ class Don extends CommonObject
 		// Search template files
 		$file = ''; $classname = ''; $filefound = 0;
 		$dirmodels = array('/');
-		if (is_array($conf->modules_parts['models'])) $dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
-		foreach ($dirmodels as $reldir)
-		{
-			foreach (array('html', 'doc', 'pdf') as $prefix)
-			{
+		if (is_array($conf->modules_parts['models'])) {
+			$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
+		}
+		foreach ($dirmodels as $reldir) {
+			foreach (array('html', 'doc', 'pdf') as $prefix) {
 				$file = $prefix."_".preg_replace('/^html_/', '', $modele).".modules.php";
 
 				// On verifie l'emplacement du modele
 				$file = dol_buildpath($reldir."core/modules/dons/".$file, 0);
-				if (file_exists($file))
-				{
+				if (file_exists($file)) {
 					$filefound = 1;
 					$classname = $prefix.'_'.$modele;
 					break;
 				}
 			}
-			if ($filefound) break;
+			if ($filefound) {
+				break;
+			}
 		}
 
 		// Charge le modele
-		if ($filefound)
-		{
+		if ($filefound) {
 			require_once $file;
 
 			$object = $this;
@@ -1086,8 +1063,7 @@ class Don extends CommonObject
 			// We save charset_output to restore it because write_file can change it if needed for
 			// output format that does not support UTF8.
 			$sav_charset_output = $outputlangs->charset_output;
-			if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0)
-			{
+			if ($obj->write_file($object, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref) > 0) {
 				$outputlangs->charset_output = $sav_charset_output;
 
 				// we delete preview files
diff --git a/htdocs/don/class/donstats.class.php b/htdocs/don/class/donstats.class.php
index 684c04ead44..e3deff2dc2d 100644
--- a/htdocs/don/class/donstats.class.php
+++ b/htdocs/don/class/donstats.class.php
@@ -84,7 +84,9 @@ class DonationStats extends Stats
 
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= " AND d.entity = ".$conf->entity;
-		if ($this->userid > 0) $this->where .= ' WHERE c.fk_user_author = '.$this->userid;
+		if ($this->userid > 0) {
+			$this->where .= ' WHERE c.fk_user_author = '.$this->userid;
+		}
 	}
 
 	/**
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index 710e21f76b7..5f03215efac 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -120,25 +120,39 @@ class PaymentDonation extends CommonObject
 		$now = dol_now();
 
 		// Validate parameters
-		if (!$this->datepaid)
-		{
+		if (!$this->datepaid) {
 			$this->error = 'ErrorBadValueForParameterCreatePaymentDonation';
 			return -1;
 		}
 
 		// Clean parameters
-		if (isset($this->fk_donation)) 		$this->fk_donation = (int) $this->fk_donation;
-		if (isset($this->amount))			$this->amount = trim($this->amount);
-		if (isset($this->fk_typepayment))   $this->fk_typepayment = trim($this->fk_typepayment);
-		if (isset($this->num_payment))      $this->num_payment    = trim($this->num_payment);
-		if (isset($this->note_public))		$this->note_public = trim($this->note_public);
-		if (isset($this->fk_bank))			$this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat))	$this->fk_user_creat  = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif))	$this->fk_user_modif  = (int) $this->fk_user_modif;
+		if (isset($this->fk_donation)) {
+			$this->fk_donation = (int) $this->fk_donation;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = trim($this->fk_typepayment);
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment    = trim($this->num_payment);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat  = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif  = (int) $this->fk_user_modif;
+		}
 
 		$totalamount = 0;
-		foreach ($this->amounts as $key => $value)  // How payment is dispatch
-		{
+		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
 			$newvalue = price2num($value, 'MT');
 			$this->amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
@@ -146,13 +160,14 @@ class PaymentDonation extends CommonObject
 		$totalamount = price2num($totalamount);
 
 		// Check parameters
-		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		if ($totalamount == 0) {
+			return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		}
 
 
 		$this->db->begin();
 
-		if ($totalamount != 0)
-		{
+		if ($totalamount != 0) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_donation (fk_donation, datec, datep, amount,";
 			$sql .= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)";
 			$sql .= " VALUES ($this->chid, '".$this->db->idate($now)."',";
@@ -163,8 +178,7 @@ class PaymentDonation extends CommonObject
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_donation");
 				$this->ref = $this->id;
 			} else {
@@ -172,16 +186,16 @@ class PaymentDonation extends CommonObject
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call triggers
 			$result = $this->call_trigger('DONATION_PAYMENT_CREATE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if ($totalamount != 0 && !$error)
-		{
+		if ($totalamount != 0 && !$error) {
 			$this->amount = $totalamount;
 			$this->total = $totalamount; // deprecated
 			$this->db->commit();
@@ -224,10 +238,8 @@ class PaymentDonation extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id  = $obj->rowid;
@@ -275,14 +287,30 @@ class PaymentDonation extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->fk_donation))		$this->fk_donation = (int) $this->fk_donation;
-		if (isset($this->amount))			$this->amount = trim($this->amount);
-		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
-		if (isset($this->num_payment))		$this->num_payment = trim($this->num_payment);
-		if (isset($this->note_public))		$this->note_public = trim($this->note_public);
-		if (isset($this->fk_bank))			$this->fk_bank = (int) $this->fk_bank;
-		if (isset($this->fk_user_creat))	$this->fk_user_creat = (int) $this->fk_user_creat;
-		if (isset($this->fk_user_modif))	$this->fk_user_modif = (int) $this->fk_user_modif;
+		if (isset($this->fk_donation)) {
+			$this->fk_donation = (int) $this->fk_donation;
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = trim($this->fk_typepayment);
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = (int) $this->fk_bank;
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = (int) $this->fk_user_creat;
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = (int) $this->fk_user_modif;
+		}
 
 		// Check parameters
 		// Put here code to add control on parameters values
@@ -311,25 +339,22 @@ class PaymentDonation extends CommonObject
 			$this->errors[] = "Error ".$this->db->lasterror();
 		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
-				if (!$error && !$notrigger)
-				{
+		if (!$error) {
+			if (!$notrigger) {
+				if (!$error && !$notrigger) {
 					// Call triggers
 					$result = $this->call_trigger('DONATION_PAYMENT_MODIFY', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -356,18 +381,18 @@ class PaymentDonation extends CommonObject
 
 		$this->db->begin();
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
 			$sql .= " WHERE type='payment_donation' AND url_id=".(int) $this->id;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_donation";
 			$sql .= " WHERE rowid=".$this->id;
 
@@ -379,25 +404,22 @@ class PaymentDonation extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
-				if (!$error && !$notrigger)
-				{
+		if (!$error) {
+			if (!$notrigger) {
+				if (!$error && !$notrigger) {
 					// Call triggers
 					$result = $this->call_trigger('DONATION_PAYMENT_DELETE', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -439,21 +461,18 @@ class PaymentDonation extends CommonObject
 		$result = $object->create($user);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $object->error;
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 		}
 
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
@@ -534,15 +553,16 @@ class PaymentDonation extends CommonObject
 
 		$error = 0;
 
-		if (!empty($conf->banque->enabled))
-		{
+		if (!empty($conf->banque->enabled)) {
 			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);
 			$acc->fetch($accountid);
 
 			$total = $this->total;
-			if ($mode == 'payment_donation') $amount = $total;
+			if ($mode == 'payment_donation') {
+				$amount = $total;
+			}
 
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
@@ -559,23 +579,21 @@ class PaymentDonation extends CommonObject
 
 			// Update fk_bank in llx_paiement.
 			// On connait ainsi le paiement qui a genere l'ecriture bancaire
-			if ($bank_line_id > 0)
-			{
+			if ($bank_line_id > 0) {
 				$result = $this->update_fk_bank($bank_line_id);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$error++;
 					dol_print_error($this->db);
 				}
 
 				// Add link 'payment', 'payment_supplier', 'payment_donation' in bank_url between payment and bank transaction
 				$url = '';
-				if ($mode == 'payment_donation') $url = DOL_URL_ROOT.'/don/payment/card.php?rowid=';
-				if ($url)
-				{
+				if ($mode == 'payment_donation') {
+					$url = DOL_URL_ROOT.'/don/payment/card.php?rowid=';
+				}
+				if ($url) {
 					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$error++;
 						dol_print_error($this->db);
 					}
@@ -586,8 +604,7 @@ class PaymentDonation extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			return 1;
 		} else {
 			return -1;
@@ -609,8 +626,7 @@ class PaymentDonation extends CommonObject
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			$this->error = $this->db->error();
@@ -635,14 +651,19 @@ class PaymentDonation extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
-		if (!empty($this->id))
-		{
+		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend = '</a>';
 
-			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result .= ' ';
-			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+			if ($withpicto) {
+				$result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			}
+			if ($withpicto && $withpicto != 2) {
+				$result .= ' ';
+			}
+			if ($withpicto != 2) {
+				$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+			}
 		}
 
 		return $result;
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index a211f076253..08667c6ab4c 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -34,8 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -50,7 +49,9 @@ $confirm = GETPOST('confirm', 'alpha');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 
@@ -59,12 +60,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 $object = new Don($db);
@@ -80,8 +87,7 @@ $modulepart = 'don';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
-if ($action == 'classin' && $user->rights->don->creer)
-{
+if ($action == 'classin' && $user->rights->don->creer) {
 	$object->fetch($id);
 	$object->setProject($projectid);
 }
@@ -91,15 +97,16 @@ if ($action == 'classin' && $user->rights->don->creer)
  */
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $title = $langs->trans('Donation')." - ".$langs->trans('Documents');
 $helpurl = "";
 llxHeader('', $title, $helpurl);
 
 
-if ($object->id)
-{
+if ($object->id) {
 	$object->fetch_thirdparty();
 
 	$head = donation_prepare_head($object);
@@ -110,8 +117,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
@@ -119,12 +125,10 @@ if ($object->id)
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
-		if ($user->rights->don->creer)
-		{
+		if ($user->rights->don->creer) {
 			if ($action != 'classify') {
 				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			}
@@ -166,7 +170,7 @@ if ($object->id)
 	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>';
 	print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
 	print '</td></tr>';
-    */
+	*/
 
 	// Societe
 	//print "<tr><td>".$langs->trans("Company")."</td><td>".$object->client->getNomUrl(1)."</td></tr>";
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index ce47e6ca89b..9415a1e928b 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -66,12 +66,10 @@ $sql .= " GROUP BY d.fk_statut";
 $sql .= " ORDER BY d.fk_statut";
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$i = 0;
 	$num = $db->num_rows($result);
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 
 		$somme[$objp->fk_statut] = $objp->somme;
@@ -90,25 +88,25 @@ print load_fiche_titre($langs->trans("DonationsArea"), '', 'object_donation');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
-	if (!empty($conf->don->enabled) && $user->rights->don->lire)
-	{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
+	if (!empty($conf->don->enabled) && $user->rights->don->lire) {
 		$listofsearchfields['search_donation'] = array('text'=>'Donation');
 	}
 
-	if (count($listofsearchfields))
-	{
+	if (count($listofsearchfields)) {
 		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<table class="noborder nohover centpercent">';
 		$i = 0;
-		foreach ($listofsearchfields as $key => $value)
-		{
-			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+		foreach ($listofsearchfields as $key => $value) {
+			if ($i == 0) {
+				print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			}
 			print '<tr '.$bc[false].'>';
 			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'"></td>';
-			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			if ($i == 0) {
+				print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			}
 			print '</tr>';
 			$i++;
 		}
@@ -129,17 +127,23 @@ print '<th colspan="4">'.$langs->trans("Statistics").'</th>';
 print "</tr>\n";
 
 $listofstatus = array(0, 1, -1, 2);
-foreach ($listofstatus as $status)
-{
+foreach ($listofstatus as $status) {
 	$dataseries[] = array($donstatic->LibStatut($status, 1), (isset($nb[$status]) ? (int) $nb[$status] : 0));
-	if ($status == Don::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-	if ($status == Don::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-	if ($status == Don::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
-	if ($status == Don::STATUS_PAID) $colorseries[$status] = $badgeStatus6;
+	if ($status == Don::STATUS_DRAFT) {
+		$colorseries[$status] = '-'.$badgeStatus0;
+	}
+	if ($status == Don::STATUS_VALIDATED) {
+		$colorseries[$status] = $badgeStatus1;
+	}
+	if ($status == Don::STATUS_CANCELED) {
+		$colorseries[$status] = $badgeStatus9;
+	}
+	if ($status == Don::STATUS_PAID) {
+		$colorseries[$status] = $badgeStatus6;
+	}
 }
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print '<tr><td class="center" colspan="4">';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -165,8 +169,7 @@ print '</tr>';
 
 $total = 0;
 $totalnb = 0;
-foreach ($listofstatus as $status)
-{
+foreach ($listofstatus as $status) {
 	print '<tr class="oddeven">';
 	print '<td><a href="list.php?search_status='.$status.'">'.$donstatic->LibStatut($status, 4).'</a></td>';
 	print '<td class="right">'.(!empty($nb[$status]) ? $nb[$status] : '&nbsp;').'</td>';
@@ -203,18 +206,15 @@ $sql .= " ORDER BY c.tms DESC";
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="5">'.$langs->trans("LastModifiedDonations", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -246,7 +246,9 @@ if ($resql)
 		}
 	}
 	print "</table><br>";
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 
 print '</div></div></div>';
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index 1e7e18c9baf..866ff4baf22 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -25,8 +25,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -39,7 +38,9 @@ $action = GETPOST('action', 'aZ09');
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 $object = new Don($db);
@@ -47,8 +48,7 @@ $object->fetch($id);
 /*
  * Actions
  */
-if ($action == 'classin' && $user->rights->don->creer)
-{
+if ($action == 'classin' && $user->rights->don->creer) {
 	$object->fetch($id);
 	$object->setProject($projectid);
 }
@@ -61,7 +61,9 @@ $helpurl = "";
 llxHeader('', $title, $helpurl);
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $object->info($id);
 
@@ -73,12 +75,10 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(!empty($socid) ? '?socid='
 
 $morehtmlref = '<div class="refidno">';
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= $langs->trans('Project').' ';
-	if ($user->rights->don->creer)
-	{
+	if ($user->rights->don->creer) {
 		if ($action != 'classify') {
 			// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 		}
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index b81b5eaa231..9798cd02eea 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -27,7 +27,9 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "donations"));
@@ -38,12 +40,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "d.datedon";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "d.datedon";
+}
 
 $search_status = (GETPOST("search_status", 'intcomma') != '') ? GETPOST("search_status", 'intcomma') : "-4";
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -53,10 +61,11 @@ $search_name = GETPOST('search_name', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-if (!$user->rights->don->lire) accessforbidden();
+if (!$user->rights->don->lire) {
+	accessforbidden();
+}
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 	$search_all = "";
 	$search_ref = "";
 	$search_company = "";
@@ -84,7 +93,9 @@ $fieldstosearchall = array(
 
 $donationstatic = new Don($db);
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) $projectstatic = new Project($db);
+if (!empty($conf->projet->enabled)) {
+	$projectstatic = new Project($db);
+}
 
 llxHeader('', $langs->trans("Donations"), 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones');
 
@@ -94,37 +105,32 @@ $sql .= " d.amount, d.fk_statut as status,";
 $sql .= " p.rowid as pid, p.ref, p.title, p.public";
 $sql .= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
 $sql .= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('donation').")";
-if ($search_status != '' && $search_status != '-4')
-{
+if ($search_status != '' && $search_status != '-4') {
 	$sql .= " AND d.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
 }
-if (trim($search_ref) != '')
-{
+if (trim($search_ref) != '') {
 	$sql .= natural_search('d.ref', $search_ref);
 }
-if (trim($search_all) != '')
-{
+if (trim($search_all) != '') {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if (trim($search_company) != '')
-{
+if (trim($search_company) != '') {
 	$sql .= natural_search('d.societe', $search_company);
 }
-if (trim($search_name) != '')
-{
+if (trim($search_name) != '') {
 	$sql .= natural_search(array('d.lastname', 'd.firstname'), $search_name);
 }
-if ($search_amount) $sql .= natural_search('d.amount', $search_amount, 1);
+if ($search_amount) {
+	$sql .= natural_search('d.amount', $search_amount, 1);
+}
 
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -133,29 +139,45 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-	if ($search_status && $search_status != -1) $param .= '&search_status='.urlencode($search_status);
-	if ($search_ref) $param .= '&search_ref='.urlencode($search_ref);
-	if ($search_company) $param .= '&search_company='.urlencode($search_company);
-	if ($search_name) $param .= '&search_name='.urlencode($search_name);
-	if ($search_amount) $param .= '&search_amount='.urlencode($search_amount);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
+	if ($search_status && $search_status != -1) {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_company) {
+		$param .= '&search_company='.urlencode($search_company);
+	}
+	if ($search_name) {
+		$param .= '&search_name='.urlencode($search_name);
+	}
+	if ($search_amount) {
+		$param .= '&search_amount='.urlencode($search_amount);
+	}
 
 	$newcardbutton = '';
-	if ($user->rights->don->creer)
-	{
+	if ($user->rights->don->creer) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('NewDonation'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/don/card.php?action=create');
 	}
 
 	print '<form method="POST" 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="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
@@ -165,9 +187,10 @@ if ($resql)
 
 	print_barre_liste($langs->trans("Donations"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'object_donation', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-	if ($search_all)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($search_all) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 	}
 
@@ -194,8 +217,7 @@ if ($resql)
 	print '<td class="liste_titre left">';
 	print '&nbsp;';
 	print '</td>';
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		print '<td class="liste_titre right">';
 		print '&nbsp;';
 		print '</td>';
@@ -225,8 +247,7 @@ if ($resql)
 	}
 	print_liste_field_titre("Name", $_SERVER["PHP_SELF"], "d.lastname", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.datedon", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		print_liste_field_titre("Project", $_SERVER["PHP_SELF"], "d.fk_projet", "", $param, "", $sortfield, $sortorder);
 	}
@@ -235,8 +256,7 @@ if ($resql)
 	print_liste_field_titre('');
 	print "</tr>\n";
 
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$objp = $db->fetch_object($resql);
 
 		print '<tr class="oddeven">';
@@ -258,18 +278,18 @@ if ($resql)
 		}
 		print "<td>".$donationstatic->getFullName($langs)."</td>";
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datedon), 'day').'</td>';
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			print "<td>";
-			if ($objp->pid)
-			{
+			if ($objp->pid) {
 				$projectstatic->id = $objp->pid;
 				$projectstatic->ref = $objp->ref;
 				$projectstatic->id = $objp->pid;
 				$projectstatic->public = $objp->public;
 				$projectstatic->title = $objp->title;
 				print $projectstatic->getNomUrl(1);
-			} else print '&nbsp;';
+			} else {
+				print '&nbsp;';
+			}
 			print "</td>\n";
 		}
 		print '<td class="right">'.price($objp->amount).'</td>';
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index d1bbd0642d9..fa0122eaba2 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -29,8 +29,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -45,7 +44,9 @@ $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
 $socid = 0;
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 $object = new Don($db);
@@ -59,8 +60,7 @@ $permissionnote = $user->rights->don->creer; // Used by the include of actions_s
  */
 include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 
-if ($action == 'classin' && $user->rights->don->creer)
-{
+if ($action == 'classin' && $user->rights->don->creer) {
 	$object->fetch($id);
 	$object->setProject($projectid);
 }
@@ -74,10 +74,11 @@ $helpurl = "";
 llxHeader('', $title, $helpurl);
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object = new Don($db);
 	$object->fetch($id, $ref);
 
@@ -89,12 +90,10 @@ if ($id > 0 || !empty($ref))
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
-		if ($user->rights->don->creer)
-		{
+		if ($user->rights->don->creer) {
 			if ($action != 'classify') {
 				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			}
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index e827bca338d..bc14780c1b2 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -27,7 +27,9 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
-if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (!empty($conf->banque->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "banks", "companies", "donations"));
@@ -36,15 +38,18 @@ $langs->loadLangs(array("bills", "banks", "companies", "donations"));
 $id = GETPOST('rowid') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 // TODO Add rule to restrict access payment
 //$result = restrictedArea($user, 'facture', $id,'');
 
 $object = new PaymentDonation($db);
-if ($id > 0)
-{
+if ($id > 0) {
 	$result = $object->fetch($id);
-	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
+	if (!$result) {
+		dol_print_error($db, 'Failed to get payment id '.$id);
+	}
 }
 
 
@@ -53,13 +58,11 @@ if ($id > 0)
  */
 
 // Delete payment
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supprimer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supprimer) {
 	$db->begin();
 
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->commit();
 		header("Location: ".DOL_URL_ROOT."/don/index.php");
 		exit;
@@ -93,8 +96,7 @@ print dol_get_fiche_head($head, $hselected, $langs->trans("DonationPayment"), -1
 /*
  * Confirm deleting of the payment
  */
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
@@ -122,10 +124,8 @@ print '<tr><td>'.$langs->trans('Amount').'</td><td>'.price($object->amount, 0, $
 print '<tr><td>'.$langs->trans('Note').'</td><td>'.nl2br($object->note_public).'</td></tr>';
 
 // Bank account
-if (!empty($conf->banque->enabled))
-{
-	if ($object->bank_account)
-	{
+if (!empty($conf->banque->enabled)) {
+	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);
 
@@ -154,8 +154,7 @@ $sql .= ' AND pd.rowid = '.$id;
 
 dol_syslog("don/payment/card.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$i = 0;
@@ -168,10 +167,8 @@ if ($resql)
 	print '<td class="right">'.$langs->trans('PayedByThisPayment').'</td>';
 	print "</tr>\n";
 
-	if ($num > 0)
-	{
-		while ($i < $num)
-		{
+	if ($num > 0) {
+		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -213,12 +210,9 @@ print dol_get_fiche_end();
  */
 print '<div class="tabsAction">';
 
-if (empty($action))
-{
-	if ($user->rights->don->supprimer)
-	{
-		if (!$disable_delete)
-		{
+if (empty($action)) {
+	if ($user->rights->don->supprimer) {
+		if (!$disable_delete) {
 			print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("CantRemovePaymentWithOneInvoicePaid")).'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 9f944fe65b3..ca33d6ffc23 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -46,12 +46,10 @@ $object = new Don($db);
  * Actions
  */
 
-if ($action == 'add_payment')
-{
+if ($action == 'add_payment') {
 	$error = 0;
 
-	if ($_POST["cancel"])
-	{
+	if ($_POST["cancel"]) {
 		$loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
 		header("Location: ".$loc);
 		exit;
@@ -59,45 +57,37 @@ if ($action == 'add_payment')
 
 	$datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 
-	if (!$_POST["paymenttype"] > 0)
-	{
+	if (!$_POST["paymenttype"] > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
 	}
-	if ($datepaid == '')
-	{
+	if ($datepaid == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-	if (!empty($conf->banque->enabled) && !$_POST["accountid"] > 0)
-	{
+	if (!empty($conf->banque->enabled) && !$_POST["accountid"] > 0) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToCredit")), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$paymentid = 0;
 
 		// Read possible payments
-		foreach ($_POST as $key => $value)
-		{
-			if (substr($key, 0, 7) == 'amount_')
-			{
+		foreach ($_POST as $key => $value) {
+			if (substr($key, 0, 7) == 'amount_') {
 				$other_chid = substr($key, 7);
 				$amounts[$other_chid] = price2num($_POST[$key]);
 			}
 		}
 
-		if (count($amounts) <= 0)
-		{
+		if (count($amounts) <= 0) {
 			$error++;
 			$errmsg = 'ErrorNoPaymentDefined';
 			setEventMessages($errmsg, null, 'errors');
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// Create a line of payments
@@ -109,30 +99,25 @@ if ($action == 'add_payment')
 			$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
 			$payment->note_public  = GETPOST("note_public", 'restricthtml');
 
-			if (!$error)
-			{
+			if (!$error) {
 				$paymentid = $payment->create($user);
-				if ($paymentid < 0)
-				{
+				if ($paymentid < 0) {
 					$errmsg = $payment->error;
 					setEventMessages($errmsg, null, 'errors');
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', $_POST['accountid'], '', '');
-				if (!$result > 0)
-				{
+				if (!$result > 0) {
 					$errmsg = $payment->error;
 					setEventMessages($errmsg, null, 'errors');
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 				$loc = DOL_URL_ROOT.'/don/card.php?rowid='.$chid;
 				header('Location: '.$loc);
@@ -160,8 +145,7 @@ $sql = "SELECT sum(p.amount) as total";
 $sql .= " FROM ".MAIN_DB_PREFIX."payment_donation as p";
 $sql .= " WHERE p.fk_donation = ".$chid;
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$obj = $db->fetch_object($resql);
 	$sumpaid = $obj->total;
 	$db->free();
@@ -169,16 +153,14 @@ if ($resql)
 
 
 // Form to create donation payment
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$object->fetch($chid);
 
 	$total = $object->amount;
 
 	print load_fiche_titre($langs->trans("DoPayment"));
 
-	if (!empty($conf->use_javascript_ajax))
-	{
+	if (!empty($conf->use_javascript_ajax)) {
 		print "\n".'<script type="text/javascript" language="javascript">';
 		//Add js for AutoFill
 		print ' $(document).ready(function () {';
@@ -234,7 +216,7 @@ if ($action == 'create')
 	print dol_get_fiche_end();
 
 	/*
- 	 * List of payments on donation
+	  * List of payments on donation
 	 */
 
 	$num = 1;
@@ -252,8 +234,7 @@ if ($action == 'create')
 	$total = 0;
 	$totalrecu = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $object;
 
 		print '<tr class="oddeven">';
@@ -267,11 +248,11 @@ if ($action == 'create')
 		print '<td class="right">'.price($objp->amount - $sumpaid)."</td>";
 
 		print '<td class="center">';
-		if ($sumpaid < $objp->amount)
-		{
+		if ($sumpaid < $objp->amount) {
 			$namef = "amount_".$objp->id;
-			if (!empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax)) {
 				print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".price($objp->amount - $sumpaid)."'");
+			}
 			print '<input type="text" size="8" name="'.$namef.'">';
 		} else {
 			print '-';
diff --git a/htdocs/don/stats/index.php b/htdocs/don/stats/index.php
index 1f500207898..917e30edb50 100644
--- a/htdocs/don/stats/index.php
+++ b/htdocs/don/stats/index.php
@@ -35,8 +35,7 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -72,8 +71,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
 	$filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
@@ -81,12 +79,10 @@ if (!$user->rights->societe->client->voir || $user->socid)
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -112,36 +108,36 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
 }
 else
 {
-    $filenameamount = $dir.'/shipmentsamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/shipmentsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (! $mesg)
 {
-    $px2->SetData($data);
-    $i=$startyear;$legend=array();
-    while ($i <= $endyear)
-    {
-        $legend[]=$i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0,$px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfShipments"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode='depth';
-    $px2->SetTitle($langs->trans("AmountOfShipmentsByMonthHT"));
+	$px2->SetData($data);
+	$i=$startyear;$legend=array();
+	while ($i <= $endyear)
+	{
+		$legend[]=$i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0,$px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfShipments"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode='depth';
+	$px2->SetTitle($langs->trans("AmountOfShipmentsByMonthHT"));
 
-    $px2->draw($filenameamount,$fileurlamount);
+	$px2->draw($filenameamount,$fileurlamount);
 }
 */
 
@@ -150,36 +146,36 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/shipmentsaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/shipmentsaverage-'.$user->id.'-'.$year.'.png';
 }
 else
 {
-    $filename_avg = $dir.'/shipmentsaverage-'.$year.'.png';
+	$filename_avg = $dir.'/shipmentsaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (! $mesg)
 {
-    $px3->SetData($data);
-    $i=$startyear;$legend=array();
-    while ($i <= $endyear)
-    {
-        $legend[]=$i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode='depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i=$startyear;$legend=array();
+	while ($i <= $endyear)
+	{
+		$legend[]=$i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode='depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg,$fileurl_avg);
+	$px3->draw($filename_avg,$fileurl_avg);
 }
 */
 
@@ -192,7 +188,9 @@ foreach ($data as $val) {
 		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 $h = 0;
 $head = array();
@@ -229,8 +227,12 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '</td></tr>';
 	// Year
 	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
-	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 	arsort($arrayyears);
 	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';
@@ -250,11 +252,9 @@ print '<td class="center">'.$langs->trans("AmountAverage").'</td>';*/
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	$year = $val['year'];
-	while (!empty($year) && $oldyear > $year + 1)
-	{ // If we have empty year
+	while (!empty($year) && $oldyear > $year + 1) { // If we have empty year
 		$oldyear--;
 		print '<tr height="24">';
 		print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.'">'.$oldyear.'</a></td>';
@@ -283,12 +283,14 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	print $px1->show();
 	print "<br>\n";
 	/*print $px2->show();
-    print "<br>\n";
-    print $px3->show();*/
+	print "<br>\n";
+	print $px3->show();*/
 }
 print '</td></tr></table>';
 
@@ -315,17 +317,17 @@ $sql.= " GROUP BY dm DESC";
 $resql=$db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
-    while ($i < $num)
-    {
-        $row = $db->fetch_row($resql);
-        $nbproduct = $row[0];
-        $year = $row[1];
-        print "<tr>";
-        print '<td class="center"><a href="month.php?year='.$year.'">'.$year.'</a></td><td class="center">'.$nbproduct.'</td></tr>';
-        $i++;
-    }
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
+		$nbproduct = $row[0];
+		$year = $row[1];
+		print "<tr>";
+		print '<td class="center"><a href="month.php?year='.$year.'">'.$year.'</a></td><td class="center">'.$nbproduct.'</td></tr>';
+		$i++;
+	}
 }
 $db->free($resql);
 
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
index 9e2525b82b2..3d6ec68ba2e 100644
--- a/htdocs/don/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -35,7 +35,9 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	print '<tr class="'.$trclass.'">';
 	print '<td>'.$langs->trans("Donation").'</td>';
 	print '<td>'.$objectlink->getNomUrl(1).'</td>';
@@ -49,19 +51,18 @@ print '</td>';
 print '<td class="right">'.$objectlink->getLibStatut(3).'</td>';
 print '</tr>';
 
-if (count($linkedObjectBlock) > 1)
-{
+if (count($linkedObjectBlock) > 1) {
 	?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
-        <td><?php echo $langs->trans("Total"); ?></td>
-        <td></td>
-    	<td class="center"></td>
-    	<td class="center"></td>
-    	<td class="right"><?php echo price($total); ?></td>
-    	<td class="right"></td>
-    	<td class="right"></td>
-    </tr>
-    <?php
+	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+		<td><?php echo $langs->trans("Total"); ?></td>
+		<td></td>
+		<td class="center"></td>
+		<td class="center"></td>
+		<td class="right"><?php echo price($total); ?></td>
+		<td class="right"></td>
+		<td class="right"></td>
+	</tr>
+	<?php
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index e817f6af4a4..4d782a3caeb 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -20,10 +20,18 @@
  *       \brief      File to build ecm database
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -40,12 +48,10 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Load original field value
-if (isset($action) && !empty($action))
-{
+if (isset($action) && !empty($action)) {
 	$error = 0;
 
-	if ($action == 'build' && !empty($element))
-	{
+	if ($action == 'build' && !empty($element)) {
 		require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
 		$ecmdirstatic = new EcmDirectory($db);
@@ -68,22 +74,18 @@ if (isset($action) && !empty($action))
 		// Now we compare both trees to complete missing trees into database
 		//var_dump($disktree);
 		//var_dump($sqltree);
-		foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-		{
+		foreach ($disktree as $dirdesc) {    // Loop on tree onto disk
 			set_time_limit(0); // To force restarts the timeout counter from zero
 
 			$dirisindatabase = 0;
-			foreach ($sqltree as $dirsqldesc)
-			{
-				if ($conf->$element->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-				{
+			foreach ($sqltree as $dirsqldesc) {
+				if ($conf->$element->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname']) {
 					$dirisindatabase = 1;
 					break;
 				}
 			}
 
-			if (!$dirisindatabase)
-			{
+			if (!$dirisindatabase) {
 				$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
 				dol_syslog($txt);
 
@@ -92,24 +94,20 @@ if (isset($action) && !empty($action))
 				$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
 				$relativepathtosearchparent = $relativepathmissing;
 				//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-				if (preg_match('/\//', $relativepathtosearchparent))
+				if (preg_match('/\//', $relativepathtosearchparent)) {
 					//while (preg_match('/\//',$relativepathtosearchparent))
-				{
 					$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
 					$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
 					dol_syslog($txt);
 					//print $txt." -> ";
 					$parentdirisindatabase = 0;
-					foreach ($sqltree as $dirsqldesc)
-					{
-						if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-						{
+					foreach ($sqltree as $dirsqldesc) {
+						if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent) {
 							$parentdirisindatabase = $dirsqldesc['id'];
 							break;
 						}
 					}
-					if ($parentdirisindatabase > 0)
-					{
+					if ($parentdirisindatabase > 0) {
 						dol_syslog("Yes with id ".$parentdirisindatabase);
 						//print "Yes with id ".$parentdirisindatabase."<br>\n";
 						$fk_parent = $parentdirisindatabase;
@@ -123,8 +121,7 @@ if (isset($action) && !empty($action))
 					$fk_parent = 0; // Parent is root
 				}
 
-				if ($fk_parent >= 0)
-				{
+				if ($fk_parent >= 0) {
 					$ecmdirtmp->ref                = 'NOTUSEDYET';
 					$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
 					$ecmdirtmp->description        = '';
@@ -134,8 +131,7 @@ if (isset($action) && !empty($action))
 					dol_syslog($txt);
 					//print $txt."<br>\n";
 					$id = $ecmdirtmp->create($user);
-					if ($id > 0)
-					{
+					if ($id > 0) {
 						$newdirsql = array('id'=>$id,
 								'id_mere'=>$ecmdirtmp->fk_parent,
 								'label'=>$ecmdirtmp->label,
@@ -156,11 +152,9 @@ if (isset($action) && !empty($action))
 		}
 
 		// Loop now on each sql tree to check if dir exists
-		foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
-		{
+		foreach ($sqltree as $dirdesc) {    // Loop on each sqltree to check dir is on disk
 			$dirtotest = $conf->$element->dir_output.'/'.$dirdesc['fullrelativename'];
-			if (!dol_is_dir($dirtotest))
-			{
+			if (!dol_is_dir($dirtotest)) {
 				$mesg .= $dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."<br>\n";
 				$ecmdirtmp->id = $dirdesc['id'];
 				$ecmdirtmp->delete($user, 'databaseonly');
diff --git a/htdocs/ecm/class/htmlecm.form.class.php b/htdocs/ecm/class/htmlecm.form.class.php
index 5866ba16893..4b9d0a847f2 100644
--- a/htdocs/ecm/class/htmlecm.form.class.php
+++ b/htdocs/ecm/class/htmlecm.form.class.php
@@ -62,31 +62,29 @@ class FormEcm
 		global $conf, $langs;
 		$langs->load("ecm");
 
-		if ($select_name == '') $select_name = "catParent";
+		if ($select_name == '') {
+			$select_name = "catParent";
+		}
 
 		$cate_arbo = null;
-		if ($module == 'ecm')
-		{
+		if ($module == 'ecm') {
 			$cat = new EcmDirectory($this->db);
 			$cate_arbo = $cat->get_full_arbo();
-		} elseif ($module == 'medias')
-		{
+		} elseif ($module == 'medias') {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			$path = $conf->medias->multidir_output[$conf->entity];
 			$cate_arbo = dol_dir_list($path, 'directories', 1, '', array('(\.meta|_preview.*\.png)$', '^\.'), 'relativename', SORT_ASC);
 		}
 
 		$output = '<select class="flat minwidth100 maxwidth500" id="'.$select_name.'" name="'.$select_name.'">';
-		if (is_array($cate_arbo))
-		{
-			if (!count($cate_arbo)) $output .= '<option value="-1" disabled>'.$langs->trans("NoDirectoriesFound").'</option>';
-			else {
+		if (is_array($cate_arbo)) {
+			if (!count($cate_arbo)) {
+				$output .= '<option value="-1" disabled>'.$langs->trans("NoDirectoriesFound").'</option>';
+			} else {
 				$output .= '<option value="-1">&nbsp;</option>';
-				foreach ($cate_arbo as $key => $value)
-				{
+				foreach ($cate_arbo as $key => $value) {
 					$valueforoption = empty($cate_arbo[$key]['id']) ? $cate_arbo[$key]['relativename'] : $cate_arbo[$key]['id'];
-					if ($selected && $valueforoption == $selected)
-					{
+					if ($selected && $valueforoption == $selected) {
 						$add = 'selected ';
 					} else {
 						$add = '';
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 8b86f99d2c7..4c93e005266 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -40,23 +40,30 @@ $confirm    = GETPOST('confirm', 'alpha');
 $module  = GETPOST('module', 'alpha');
 $website = GETPOST('website', 'alpha');
 $pageid  = GETPOST('pageid', 'int');
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+	$module = 'ecm';
+}
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $section = GETPOST("section", 'alpha') ? GETPOST("section", 'alpha') : GETPOST("relativedir", 'alpha');
-if (!$section)
-{
+if (!$section) {
 	dol_print_error('', "ErrorSectionParamNotDefined");
 	exit;
 }
@@ -64,8 +71,7 @@ if (!$section)
 // Load ecm object
 $ecmdir = new EcmDirectory($db);
 
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	// $section should be an int except if it is dir not yet created into EcmDirectory
 	$result = $ecmdir->fetch($section);
 	if ($result > 0) {
@@ -84,13 +90,11 @@ if ($module == 'ecm')
 // Permissions
 $permtoadd = 0;
 $permtoupload = 0;
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	$permtoadd = $user->rights->ecm->setup;
 	$permtoupload = $user->rights->ecm->upload;
 }
-if ($module == 'medias')
-{
+if ($module == 'medias') {
 	$permtoadd = ($user->rights->mailing->creer || $user->rights->website->write);
 	$permtoupload = ($user->rights->mailing->creer || $user->rights->website->write);
 }
@@ -102,18 +106,14 @@ if ($module == 'medias')
  */
 
 // Upload file
-if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
-{
-	if (dol_mkdir($upload_dir) >= 0)
-	{
+if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC)) {
+	if (dol_mkdir($upload_dir) >= 0) {
 		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir."/".dol_unescapefile($_FILES['userfile']['name']), 0, 0, $_FILES['userfile']['error']);
-		if (is_numeric($resupload) && $resupload > 0)
-		{
+		if (is_numeric($resupload) && $resupload > 0) {
 			$result = $ecmdir->changeNbOfFiles('+');
 		} else {
-   			$langs->load("errors");
-			if ($resupload < 0)	// Unknown error
-			{
+			$langs->load("errors");
+			if ($resupload < 0) {	// Unknown error
 				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
 				// Files infected by a virus
@@ -131,13 +131,15 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 }
 
 // Remove file
-if ($action == 'confirm_deletefile' && $confirm == 'yes')
-{
+if ($action == 'confirm_deletefile' && $confirm == 'yes') {
 	$langs->load("other");
 	$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 	$ret = dol_delete_file($file);
-	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	if ($ret) {
+		setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	}
 
 	$result = $ecmdir->changeNbOfFiles('-');
 }
@@ -164,8 +166,9 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes') {
 		} else {
 			$resbool = dol_delete_dir($upload_dir, 1);
 		}
-		if ($resbool) $result = 1;
-		else {
+		if ($resbool) {
+			$result = 1;
+		} else {
 			$langs->load('errors');
 			setEventMessages($langs->trans("ErrorFailToDeleteDir", $upload_dir), null, 'errors');
 			$result = 0;
@@ -178,12 +181,10 @@ if ($action == 'confirm_deletedir' && $confirm == 'yes') {
 }
 
 // Update dirname or description
-if ($action == 'update' && !GETPOST('cancel', 'alpha'))
-{
+if ($action == 'update' && !GETPOST('cancel', 'alpha')) {
 	$error = 0;
 
-	if ($module == 'ecm')
-	{
+	if ($module == 'ecm') {
 		$oldlabel = $ecmdir->label;
 		$olddir = $ecmdir->getRelativePath(0);
 		$olddir = $conf->ecm->dir_output.'/'.$olddir;
@@ -192,15 +193,16 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		$olddir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
 	}
 
-	if ($module == 'ecm')
-	{
+	if ($module == 'ecm') {
 		$db->begin();
 
 		// Fetch was already done
 		$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
 		$ecmdir->description = GETPOST("description");
 		$ret = $extrafields->setOptionalsFromPost(null, $ecmdir);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 		if (!$error) {
 			// Actions on extra fields
 			$result = $ecmdir->insertExtraFields();
@@ -210,25 +212,21 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 			}
 		}
 		$result = $ecmdir->update($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Try to rename file if changed
-			if ($oldlabel != $ecmdir->label && file_exists($olddir))
-			{
+			if ($oldlabel != $ecmdir->label && file_exists($olddir)) {
 				$newdir = $ecmdir->getRelativePath(1); // return "xxx/zzz/" from ecm directory
 				$newdir = $conf->ecm->dir_output.'/'.$newdir;
 				//print $olddir.'-'.$newdir;
 				$result = @rename($olddir, $newdir);
-				if (!$result)
-				{
+				if (!$result) {
 					$langs->load('errors');
 					setEventMessages($langs->trans('ErrorFailToRenameDir', $olddir, $newdir), null, 'errors');
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 
 				// Set new value after renaming
@@ -245,15 +243,13 @@ if ($action == 'update' && !GETPOST('cancel', 'alpha'))
 		$newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
 
 		$result = @rename($olddir, $newdir);
-		if (!$result)
-		{
+		if (!$result) {
 			$langs->load('errors');
 			setEventMessages($langs->trans('ErrorFailToRenameDir', $olddir, $newdir), null, 'errors');
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Set new value after renaming
 			$relativepath = GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
 			$upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
@@ -284,8 +280,7 @@ llxHeader();
 $filearrayall = dol_dir_list($upload_dir, "all", 0, '', '', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 $filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 $totalsize = 0;
-foreach ($filearray as $key => $file)
-{
+foreach ($filearray as $key => $file) {
 	$totalsize += $file['size'];
 }
 
@@ -294,8 +289,7 @@ $head = ecm_prepare_head($ecmdir, $module, $section);
 print dol_get_fiche_head($head, 'card', $langs->trans("ECMSectionManual"), -1, 'dir');
 
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="section" value="'.$section.'">';
@@ -308,23 +302,21 @@ $morehtml = '';
 
 $morehtmlref = '/'.$module.'/'.$relativepath;
 
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	$s = '';
 	$result = 1;
 	$i = 0;
 	$tmpecmdir = new EcmDirectory($db); // Need to create a new one
 	if ($ecmdir->id > 0) {
 		$tmpecmdir->fetch($ecmdir->id);
-		while ($tmpecmdir && $result > 0)
-		{
+		while ($tmpecmdir && $result > 0) {
 			$tmpecmdir->ref = $tmpecmdir->label;
-			if ($i == 0 && $action == 'edit')
-			{
+			if ($i == 0 && $action == 'edit') {
 				$s = '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$tmpecmdir->label.'">';
-			} else $s = $tmpecmdir->getNomUrl(1).$s;
-			if ($tmpecmdir->fk_parent)
-			{
+			} else {
+				$s = $tmpecmdir->getNomUrl(1).$s;
+			}
+			if ($tmpecmdir->fk_parent) {
 				$s = ' -> '.$s;
 				$result = $tmpecmdir->fetch($tmpecmdir->fk_parent);
 			} else {
@@ -337,25 +329,22 @@ if ($module == 'ecm')
 	}
 	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> '.$s;
 }
-if ($module == 'medias')
-{
+if ($module == 'medias') {
 	$s = 'medias -> ';
 	$result = 1;
 	$subdirs = explode('/', $section);
 	$i = 0;
-	foreach ($subdirs as $subdir)
-	{
-		if ($i == (count($subdirs) - 1))
-		{
-			if ($action == 'edit')
-			{
+	foreach ($subdirs as $subdir) {
+		if ($i == (count($subdirs) - 1)) {
+			if ($action == 'edit') {
 				$s .= '<input type="text" name="label" class="minwidth300" maxlength="32" value="'.$subdir.'">';
 				$s .= '<input type="hidden" name="oldrelparentdir" value="'.dirname($section).'">';
 				$s .= '<input type="hidden" name="oldreldir" value="'.basename($section).'">';
-			} else $s .= $subdir;
+			} else {
+				$s .= $subdir;
+			}
 		}
-		if ($i < (count($subdirs) - 1))
-		{
+		if ($i < (count($subdirs) - 1)) {
 			$s .= $subdir.' -> ';
 		}
 		$i++;
@@ -375,15 +364,15 @@ print '<table class="border centpercent tableforfield">';
 print img_picto('','object_dir').' <a href="'.DOL_URL_ROOT.'/ecm/index.php">'.$langs->trans("ECMRoot").'</a> -> ';
 print $s;
 print '</td></tr>';*/
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-	if ($action == 'edit')
-	{
+	if ($action == 'edit') {
 		print '<textarea class="flat quatrevingtpercent" name="description">';
 		print $ecmdir->description;
 		print '</textarea>';
-	} else print dol_nl2br($ecmdir->description);
+	} else {
+		print dol_nl2br($ecmdir->description);
+	}
 	print '</td></tr>';
 
 	print '<tr><td class="titlefield">'.$langs->trans("ECMCreationUser").'</td><td>';
@@ -395,8 +384,7 @@ if ($module == 'ecm')
 	print '</td></tr>';
 }
 print '<tr><td class="titlefield">'.$langs->trans("ECMCreationDate").'</td><td>';
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	print dol_print_date($ecmdir->date_c, 'dayhour');
 } else {
 	//var_dump($upload_dir);
@@ -404,8 +392,7 @@ if ($module == 'ecm')
 }
 print '</td></tr>';
 print '<tr><td>'.$langs->trans("ECMDirectoryForFiles").'</td><td>';
-if ($module == 'ecm')
-{
+if ($module == 'ecm') {
 	print '/ecm/'.$relativepath;
 } else {
 	print '/'.$module.'/'.$relativepath;
@@ -414,11 +401,9 @@ print '</td></tr>';
 print '<tr><td>'.$langs->trans("ECMNbOfDocs").'</td><td>';
 $nbofiles = count($filearray);
 print $nbofiles;
-if ($ecmdir->id > 0)
-{
+if ($ecmdir->id > 0) {
 	// Test if nb is same than in cache
-	if ($nbofiles != $ecmdir->cachenbofdoc)
-	{
+	if ($nbofiles != $ecmdir->cachenbofdoc) {
 		$ecmdir->changeNbOfFiles((string) $nbofiles);
 	}
 }
@@ -429,8 +414,7 @@ print '</td></tr>';
 print $object->showOptionals($extrafields, ($action == 'edit' ? 'edit' : 'view'));
 print '</table>';
 
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<br><div align="center">';
 	print '<input type="submit" class="button button-save" name="submit" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; ';
@@ -439,8 +423,7 @@ if ($action == 'edit')
 }
 
 print '</div>';
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '</form>';
 }
 
@@ -449,17 +432,14 @@ print dol_get_fiche_end();
 
 
 // Actions buttons
-if ($action != 'edit' && $action != 'delete')
-{
+if ($action != 'edit' && $action != 'delete') {
 	print '<div class="tabsAction">';
 
-	if ($permtoadd)
-	{
+	if ($permtoadd) {
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit'.($module ? '&module='.$module : '').'&section='.$section.'">'.$langs->trans('Edit').'</a>';
 	}
 
-	if ($permtoadd)
-	{
+	if ($permtoadd) {
 		print '<a class="butAction" href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create'.($module ? '&module='.$module : '').'&catParent='.$section.'">'.$langs->trans('ECMAddSection').'</a>';
 	} else {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('ECMAddSection').'</a>';
@@ -467,8 +447,7 @@ if ($action != 'edit' && $action != 'delete')
 
 	//if (count($filearrayall) == 0)
 	//{
-	if ($permtoadd)
-	{
+	if ($permtoadd) {
 		print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete_dir&token='.newToken().($module ? '&module='.$module : '').'&section='.$section.($backtopage ? '&backtopage='.urlencode($backtopage) : '').'">'.$langs->trans('Delete').'</a>';
 	} else {
 		print '<a class="butActionDeleteRefused" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
@@ -485,19 +464,16 @@ if ($action != 'edit' && $action != 'delete')
 }
 
 // Confirm remove file
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.GETPOST("section", 'alpha').'&urlfile='.urlencode($_GET["urlfile"]).($backtopage ? '&backtopage='.urlencode($backtopage) : ''), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
 }
 
 // Confirm remove file
-if ($action == 'delete_dir')
-{
+if ($action == 'delete_dir') {
 	$relativepathwithoutslash = preg_replace('/[\/]$/', '', $relativepath);
 
 	//Form to close proposal (signed or not)
-	if (count($filearrayall) > 0)
-	{
+	if (count($filearrayall) > 0) {
 		$langs->load("other");
 		$formquestion = array(
 			array('type' => 'checkbox', 'name' => 'deletedirrecursive', 'label' => $langs->trans("ContentOfDirectoryIsNotEmpty").'<br>'.$langs->trans("DeleteAlsoContentRecursively"), 'value' => '0')				// Field to complete private note (not replace)
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 8feff24e4c3..26bf242b0f2 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -35,33 +35,41 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ecm', 0);
 
 // Get parameters
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 $section = GETPOST('section', 'int') ?GETPOST('section', 'int') : GETPOST('section_id', 'int');
-if (!$section) $section = 0;
+if (!$section) {
+	$section = 0;
+}
 $section_dir = GETPOST('section_dir', 'alpha');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "fullname";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "fullname";
+}
 
 $ecmdir = new EcmDirectory($db);
-if ($section > 0)
-{
+if ($section > 0) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0)
-	{
+	if (!$result > 0) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -83,21 +91,24 @@ $error = 0;
 //include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 // Upload file (code similar but different than actions_linkedfiles.inc.php)
-if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
-{
+if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 	// Define relativepath and upload_dir
 	$relativepath = '';
-	if ($ecmdir->id) $relativepath = $ecmdir->getRelativePath();
-	else $relativepath = $section_dir;
+	if ($ecmdir->id) {
+		$relativepath = $ecmdir->getRelativePath();
+	} else {
+		$relativepath = $section_dir;
+	}
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 
-	if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
-	else $userfiles = array($_FILES['userfile']['tmp_name']);
+	if (is_array($_FILES['userfile']['tmp_name'])) {
+		$userfiles = $_FILES['userfile']['tmp_name'];
+	} else {
+		$userfiles = array($_FILES['userfile']['tmp_name']);
+	}
 
-	foreach ($userfiles as $key => $userfile)
-	{
-		if (empty($_FILES['userfile']['tmp_name'][$key]))
-		{
+	foreach ($userfiles as $key => $userfile) {
+		if (empty($_FILES['userfile']['tmp_name'][$key])) {
 			$error++;
 			if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 				setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
@@ -107,29 +118,24 @@ if (GETPOST("sendit", 'alphanohtml') && !empty($conf->global->MAIN_UPLOAD_DOC))
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$generatethumbs = 0;
 		$res = dol_add_file_process($upload_dir, 0, 1, 'userfile', '', null, '', $generatethumbs);
-		if ($res > 0)
-		{
+		if ($res > 0) {
 			$result = $ecmdir->changeNbOfFiles('+');
 		}
 	}
 }
 
 // Remove file (code similar but different than actions_linkedfiles.inc.php)
-if ($action == 'confirm_deletefile')
-{
-	if (GETPOST('confirm') == 'yes')
-	{
+if ($action == 'confirm_deletefile') {
+	if (GETPOST('confirm') == 'yes') {
 		// GETPOST('urlfile','alpha') is full relative URL from ecm root dir. Contains path of all sections.
 
 		$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
 		$file = $upload_dir."/".GETPOST('urlfile', 'alpha');
 		$ret = dol_delete_file($file); // This include also the delete from file index in database.
-		if ($ret)
-		{
+		if ($ret) {
 			$urlfiletoshow = GETPOST('urlfile', 'alpha');
 			$urlfiletoshow = preg_replace('/\.noexe$/', '', $urlfiletoshow);
 			setEventMessages($langs->trans("FileWasRemoved", $urlfiletoshow), null, 'mesgs');
@@ -144,15 +150,13 @@ if ($action == 'confirm_deletefile')
 }
 
 // Add directory
-if ($action == 'add' && $user->rights->ecm->setup)
-{
+if ($action == 'add' && $user->rights->ecm->setup) {
 	$ecmdir->ref                = 'NOTUSEDYET';
 	$ecmdir->label              = GETPOST("label");
 	$ecmdir->description        = GETPOST("desc");
 
 	$id = $ecmdir->create($user);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -164,8 +168,7 @@ if ($action == 'add' && $user->rights->ecm->setup)
 }
 
 // Remove directory
-if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
-{
+if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes') {
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
@@ -175,8 +178,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm', 'alpha') == 'yes')
 // Refresh directory view
 // This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
 // To refresh content of dir with cache, just open the dir in edit mode.
-if ($action == 'refreshmanual')
-{
+if ($action == 'refreshmanual') {
 	$ecmdirtmp = new EcmDirectory($db);
 
 	// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
@@ -196,20 +198,16 @@ if ($action == 'refreshmanual')
 	// Now we compare both trees to complete missing trees into database
 	//var_dump($disktree);
 	//var_dump($sqltree);
-	foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-	{
+	foreach ($disktree as $dirdesc) {    // Loop on tree onto disk
 		$dirisindatabase = 0;
-		foreach ($sqltree as $dirsqldesc)
-		{
-			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-			{
+		foreach ($sqltree as $dirsqldesc) {
+			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname']) {
 				$dirisindatabase = 1;
 				break;
 			}
 		}
 
-		if (!$dirisindatabase)
-		{
+		if (!$dirisindatabase) {
 			$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
 			dol_syslog($txt);
 			//print $txt."<br>\n";
@@ -219,24 +217,20 @@ if ($action == 'refreshmanual')
 			$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
 			$relativepathtosearchparent = $relativepathmissing;
 			//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-			if (preg_match('/\//', $relativepathtosearchparent))
-			//while (preg_match('/\//',$relativepathtosearchparent))
-			{
+			if (preg_match('/\//', $relativepathtosearchparent)) {
+				//while (preg_match('/\//',$relativepathtosearchparent))
 				$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
 				$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
 				dol_syslog($txt);
 				//print $txt." -> ";
 				$parentdirisindatabase = 0;
-				foreach ($sqltree as $dirsqldesc)
-				{
-					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-					{
+				foreach ($sqltree as $dirsqldesc) {
+					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent) {
 						$parentdirisindatabase = $dirsqldesc['id'];
 						break;
 					}
 				}
-				if ($parentdirisindatabase > 0)
-				{
+				if ($parentdirisindatabase > 0) {
 					dol_syslog("Yes with id ".$parentdirisindatabase);
 					//print "Yes with id ".$parentdirisindatabase."<br>\n";
 					$fk_parent = $parentdirisindatabase;
@@ -250,8 +244,7 @@ if ($action == 'refreshmanual')
 				$fk_parent = 0; // Parent is root
 			}
 
-			if ($fk_parent >= 0)
-			{
+			if ($fk_parent >= 0) {
 				$ecmdirtmp->ref                = 'NOTUSEDYET';
 				$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
 				$ecmdirtmp->description        = '';
@@ -261,8 +254,7 @@ if ($action == 'refreshmanual')
 				dol_syslog($txt);
 				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
 				$id = $ecmdirtmp->create($user);
-				if ($id > 0)
-				{
+				if ($id > 0) {
 					$newdirsql = array('id'=>$id,
 									 'id_mere'=>$ecmdirtmp->fk_parent,
 									 'label'=>$ecmdirtmp->label,
@@ -283,11 +275,9 @@ if ($action == 'refreshmanual')
 	}
 
 	// Loop now on each sql tree to check if dir exists
-	foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
-	{
+	foreach ($sqltree as $dirdesc) {    // Loop on each sqltree to check dir is on disk
 		$dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
-		if (!dol_is_dir($dirtotest))
-		{
+		if (!dol_is_dir($dirtotest)) {
 			$ecmdirtmp->id = $dirdesc['id'];
 			$ecmdirtmp->delete($user, 'databaseonly');
 			//exit;
@@ -300,7 +290,9 @@ if ($action == 'refreshmanual')
 
 	// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
 	// it to be sure that fulltree array is not used without reloading it.
-	if ($adirwascreated) $sqltree = null;
+	if ($adirwascreated) {
+		$sqltree = null;
+	}
 }
 
 
@@ -318,7 +310,9 @@ $moreheadjs = '';
 
 //$morejs=array();
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+}
 
 $moreheadjs .= '<script type="text/javascript">'."\n";
 $moreheadjs .= 'var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 9d8e1527b9b..f20985d45fb 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -34,7 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ecm', 0);
 
 // Get parameters
@@ -42,7 +44,9 @@ $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 $section = GETPOST('section', 'int') ?GETPOST('section', 'int') : GETPOST('section_id', 'int');
 $module = GETPOST('module', 'alpha');
-if (!$section) $section = 0;
+if (!$section) {
+	$section = 0;
+}
 $section_dir = GETPOST('section_dir', 'alpha');
 
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
@@ -51,20 +55,26 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "fullname";
-if ($module == 'invoice_supplier' && $sortfield == "fullname") $sortfield = "level1name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "fullname";
+}
+if ($module == 'invoice_supplier' && $sortfield == "fullname") {
+	$sortfield = "level1name";
+}
 
 $ecmdir = new EcmDirectory($db);
-if ($section)
-{
+if ($section) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0)
-	{
+	if (!$result > 0) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -85,8 +95,7 @@ $error = 0;
 $hookmanager->initHooks(array('ecmautocard', 'globalcard'));
 
 // 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_doc_ref = '';
 }
 
@@ -94,15 +103,13 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 
 // Add directory
-if ($action == 'add' && $user->rights->ecm->setup)
-{
+if ($action == 'add' && $user->rights->ecm->setup) {
 	$ecmdir->ref                = 'NOTUSEDYET';
 	$ecmdir->label              = GETPOST("label");
 	$ecmdir->description        = GETPOST("desc");
 
 	$id = $ecmdir->create($user);
-	if ($id > 0)
-	{
+	if ($id > 0) {
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
 	} else {
@@ -114,38 +121,38 @@ if ($action == 'add' && $user->rights->ecm->setup)
 }
 
 // Remove file
-if ($action == 'confirm_deletefile')
-{
-	if (GETPOST('confirm') == 'yes')
-	{
+if ($action == 'confirm_deletefile') {
+	if (GETPOST('confirm') == 'yes') {
 		$langs->load("other");
-		if ($section)
-		{
+		if ($section) {
 			$result = $ecmdir->fetch($section);
-			if (!($result > 0))
-			{
+			if (!($result > 0)) {
 				dol_print_error($db, $ecmdir->error);
 				exit;
 			}
 			$relativepath = $ecmdir->getRelativePath();
-		} else $relativepath = '';
+		} else {
+			$relativepath = '';
+		}
 		$upload_dir = $conf->ecm->dir_output.($relativepath ? '/'.$relativepath : '');
 		$file = $upload_dir."/".GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
 
 		$ret = dol_delete_file($file);
-		if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-		else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		if ($ret) {
+			setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+		}
 
 		$result = $ecmdir->changeNbOfFiles('-');
 
 		clearstatcache();
 	}
-   	$action = 'file_manager';
+	$action = 'file_manager';
 }
 
 // Remove directory
-if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
-{
+if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes') {
 	$result = $ecmdir->delete($user);
 	setEventMessages($langs->trans("ECMSectionWasRemoved", $ecmdir->label), null, 'mesgs');
 
@@ -155,8 +162,7 @@ if ($action == 'confirm_deletesection' && GETPOST('confirm') == 'yes')
 // Refresh directory view
 // This refresh list of dirs, not list of files (for preformance reason). List of files is refresh only if dir was not synchronized.
 // To refresh content of dir with cache, just open the dir in edit mode.
-if ($action == 'refreshmanual')
-{
+if ($action == 'refreshmanual') {
 	$ecmdirtmp = new EcmDirectory($db);
 
 	// This part of code is same than into file ecm/ajax/ecmdatabase.php TODO Remove duplicate
@@ -176,20 +182,16 @@ if ($action == 'refreshmanual')
 	// Now we compare both trees to complete missing trees into database
 	//var_dump($disktree);
 	//var_dump($sqltree);
-	foreach ($disktree as $dirdesc)    // Loop on tree onto disk
-	{
+	foreach ($disktree as $dirdesc) {    // Loop on tree onto disk
 		$dirisindatabase = 0;
-		foreach ($sqltree as $dirsqldesc)
-		{
-			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
-			{
+		foreach ($sqltree as $dirsqldesc) {
+			if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname']) {
 				$dirisindatabase = 1;
 				break;
 			}
 		}
 
-		if (!$dirisindatabase)
-		{
+		if (!$dirisindatabase) {
 			$txt = "Directory found on disk ".$dirdesc['fullname'].", not found into database so we add it";
 			dol_syslog($txt);
 			//print $txt."<br>\n";
@@ -199,24 +201,20 @@ if ($action == 'refreshmanual')
 			$relativepathmissing = str_replace($diroutputslash, '', $dirdesc['fullname']);
 			$relativepathtosearchparent = $relativepathmissing;
 			//dol_syslog("Try to find parent id for directory ".$relativepathtosearchparent);
-			if (preg_match('/\//', $relativepathtosearchparent))
-			//while (preg_match('/\//',$relativepathtosearchparent))
-			{
+			if (preg_match('/\//', $relativepathtosearchparent)) {
+				//while (preg_match('/\//',$relativepathtosearchparent))
 				$relativepathtosearchparent = preg_replace('/\/[^\/]*$/', '', $relativepathtosearchparent);
 				$txt = "Is relative parent path ".$relativepathtosearchparent." for ".$relativepathmissing." found in sql tree ?";
 				dol_syslog($txt);
 				//print $txt." -> ";
 				$parentdirisindatabase = 0;
-				foreach ($sqltree as $dirsqldesc)
-				{
-					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent)
-					{
+				foreach ($sqltree as $dirsqldesc) {
+					if ($dirsqldesc['fullrelativename'] == $relativepathtosearchparent) {
 						$parentdirisindatabase = $dirsqldesc['id'];
 						break;
 					}
 				}
-				if ($parentdirisindatabase > 0)
-				{
+				if ($parentdirisindatabase > 0) {
 					dol_syslog("Yes with id ".$parentdirisindatabase);
 					//print "Yes with id ".$parentdirisindatabase."<br>\n";
 					$fk_parent = $parentdirisindatabase;
@@ -230,8 +228,7 @@ if ($action == 'refreshmanual')
 				$fk_parent = 0; // Parent is root
 			}
 
-			if ($fk_parent >= 0)
-			{
+			if ($fk_parent >= 0) {
 				$ecmdirtmp->ref                = 'NOTUSEDYET';
 				$ecmdirtmp->label              = dol_basename($dirdesc['fullname']);
 				$ecmdirtmp->description        = '';
@@ -241,8 +238,7 @@ if ($action == 'refreshmanual')
 				dol_syslog($txt);
 				//print $ecmdirtmp->cachenbofdoc."<br>\n";exit;
 				$id = $ecmdirtmp->create($user);
-				if ($id > 0)
-				{
+				if ($id > 0) {
 					$newdirsql = array('id'=>$id,
 									 'id_mere'=>$ecmdirtmp->fk_parent,
 									 'label'=>$ecmdirtmp->label,
@@ -263,11 +259,9 @@ if ($action == 'refreshmanual')
 	}
 
 	// Loop now on each sql tree to check if dir exists
-	foreach ($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
-	{
+	foreach ($sqltree as $dirdesc) {    // Loop on each sqltree to check dir is on disk
 		$dirtotest = $conf->ecm->dir_output.'/'.$dirdesc['fullrelativename'];
-		if (!dol_is_dir($dirtotest))
-		{
+		if (!dol_is_dir($dirtotest)) {
 			$ecmdirtmp->id = $dirdesc['id'];
 			$ecmdirtmp->delete($user, 'databaseonly');
 			//exit;
@@ -280,7 +274,9 @@ if ($action == 'refreshmanual')
 
 	// If a directory was added, the fulltree array is not correctly completed and sorted, so we clean
 	// it to be sure that fulltree array is not used without reloading it.
-	if ($adirwascreated) $sqltree = null;
+	if ($adirwascreated) {
+		$sqltree = null;
+	}
 }
 
 
@@ -298,7 +294,9 @@ $moreheadjs = '';
 
 //$morejs=array();
 $morejs = array('includes/jquery/plugins/blockUI/jquery.blockUI.js', 'core/js/blockUI.js'); // Used by ecm/tpl/enabledfiletreeajax.tpl.pgp
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+	$morejs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+}
 
 $moreheadjs .= '<script type="text/javascript">'."\n";
 $moreheadjs .= 'var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
@@ -310,31 +308,63 @@ llxHeader($moreheadcss.$moreheadjs, $langs->trans("ECMArea"), '', '', '', '', $m
 // Add sections to manage
 $rowspan = 0;
 $sectionauto = array();
-if (!empty($conf->global->ECM_AUTO_TREE_ENABLED))
-{
-	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
-	if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties"))); }
-	if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals"))); }
-	if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts"))); }
-	if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders"))); }
-	if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices"))); }
-	if (!empty($conf->supplier_proposal->enabled)) { $langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals"))); }
-	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders"))); }
-	if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices"))); }
-	if (!empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions"))); }
-	if (!empty($conf->projet->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects"))); }
-	if (!empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions"))); }
-	if (!empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports"))); }
-	if (!empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays"))); }
-	if (!empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount"))); }
-	if (!empty($conf->mrp->enabled)) { $langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders"))); }
-	if (!empty($conf->recruitment->enabled)) { $langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications"))); }
+if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
+	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+		$langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
+	}
+	if (!empty($conf->societe->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+	}
+	if (!empty($conf->propal->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
+	}
+	if (!empty($conf->contrat->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+	}
+	if (!empty($conf->commande->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
+	}
+	if (!empty($conf->facture->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+	}
+	if (!empty($conf->supplier_proposal->enabled)) {
+		$langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
+	}
+	if (!empty($conf->fournisseur->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
+	}
+	if (!empty($conf->fournisseur->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
+	}
+	if (!empty($conf->tax->enabled)) {
+		$langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
+	}
+	if (!empty($conf->projet->enabled)) {
+		$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+	}
+	if (!empty($conf->ficheinter->enabled)) {
+		$langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
+	}
+	if (!empty($conf->expensereport->enabled)) {
+		$langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
+	}
+	if (!empty($conf->holiday->enabled)) {
+		$langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
+	}
+	if (!empty($conf->banque->enabled)) {
+		$langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+	}
+	if (!empty($conf->mrp->enabled)) {
+		$langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
+	}
+	if (!empty($conf->recruitment->enabled)) {
+		$langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
+	}
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'user', 'test'=>1, 'label'=>$langs->trans("Users"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Users")));
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addSectionECMAuto', $parameters);
-	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0)
-	{
+	if ($reshook > 0 && is_array($hookmanager->resArray) && count($hookmanager->resArray)>0) {
 		$sectionauto[]=$hookmanager->resArray;
 		$rowspan += count($hookmanager->resArray);
 	}
@@ -346,8 +376,7 @@ print dol_get_fiche_head($head, 'index_auto', '', -1, '');
 
 
 // Confirm remove file (for non javascript users)
-if ($action == 'delete' && empty($conf->use_javascript_ajax))
-{
+if ($action == 'delete' && empty($conf->use_javascript_ajax)) {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
 }
 
@@ -378,15 +407,13 @@ print '</div>';
 
 
 // Confirmation de la suppression d'une ligne categorie
-if ($action == 'delete_section')
-{
+if ($action == 'delete_section') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.$section, $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 }
 // End confirm
 
 
-if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete')
-{
+if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $action) || $action == 'delete') {
 	print '<table width="100%" class="liste noborderbottom">'."\n";
 
 	print '<!-- Title for auto directories -->'."\n";
@@ -397,8 +424,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 
 	$showonrightsize = '';
 	// Auto section
-	if (count($sectionauto))
-	{
+	if (count($sectionauto)) {
 		$htmltooltip = $langs->trans("ECMAreaDesc2");
 
 		$sectionauto = dol_sort_array($sectionauto, 'label', 'ASC', true, false);
@@ -409,18 +435,18 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i', $act
 
 		$nbofentries = 0;
 		$oldvallevel = 0;
-		foreach ($sectionauto as $key => $val)
-		{
-			if (empty($val['test'])) continue; // If condition to show is ok
+		foreach ($sectionauto as $key => $val) {
+			if (empty($val['test'])) {
+				continue; // If condition to show is ok
+			}
 
 			$var = false;
 
 			print '<li class="directory collapsed">';
-			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS))
-			{
+			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 				print $val['label'];
-   				print '</a>';
+				print '</a>';
 			} else {
 				print '<a class="fmdirlia jqft ecmjqft" href="'.$_SERVER["PHP_SELF"].'?module='.$val['module'].'">';
 				print $val['label'];
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index a3c242cb787..a665d57f1a3 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -33,7 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 $langs->loadLangs(array("ecm", "companies", "other", "users", "orders", "propal", "bills", "contracts"));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ecm', '');
 
 // Load permissions
@@ -43,12 +45,16 @@ $user->getrights('ecm');
 $socid = GETPOST('socid', 'int');
 $action = GETPOST('action', 'aZ09');
 $section = GETPOST('section');
-if (!$section) $section = 0;
+if (!$section) {
+	$section = 0;
+}
 
 $module  = GETPOST('module', 'alpha');
 $website = GETPOST('website', 'alpha');
 $pageid  = GETPOST('pageid', 'int');
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+	$module = 'ecm';
+}
 
 $upload_dir = $conf->ecm->dir_output.'/'.$section;
 
@@ -56,19 +62,23 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "label";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "label";
+}
 
 $ecmdir = new EcmDirectory($db);
-if (!empty($section))
-{
+if (!empty($section)) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0)
-	{
+	if (!$result > 0) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -97,23 +107,57 @@ $userstatic = new User($db);
 // Ajout rubriques automatiques
 $rowspan = 0;
 $sectionauto = array();
-if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) { $langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts")); }
-if (!empty($conf->societe->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties"))); }
-if (!empty($conf->propal->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals"))); }
-if (!empty($conf->contrat->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts"))); }
-if (!empty($conf->commande->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders"))); }
-if (!empty($conf->facture->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices"))); }
-if (!empty($conf->supplier_proposal->enabled)) { $langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals"))); }
-if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders"))); }
-if (!empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices"))); }
-if (!empty($conf->tax->enabled)) { $langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions"))); }
-if (!empty($conf->projet->enabled)) { $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects"))); }
-if (!empty($conf->ficheinter->enabled)) { $langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions"))); }
-if (!empty($conf->expensereport->enabled)) { $langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports"))); }
-if (!empty($conf->holiday->enabled)) { $langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays"))); }
-if (!empty($conf->banque->enabled)) { $langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount"))); }
-if (!empty($conf->mrp->enabled)) { $langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders"))); }
-if (!empty($conf->recruitment->enabled)) { $langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications"))); }
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+	$langs->load("products"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'product', 'test'=>(!empty($conf->product->enabled) || !empty($conf->service->enabled)), 'label'=>$langs->trans("ProductsAndServices"), 'desc'=>$langs->trans("ECMDocsByProducts"));
+}
+if (!empty($conf->societe->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'company', 'test'=>$conf->societe->enabled, 'label'=>$langs->trans("ThirdParties"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ThirdParties")));
+}
+if (!empty($conf->propal->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'propal', 'test'=>$conf->propal->enabled, 'label'=>$langs->trans("Proposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Proposals")));
+}
+if (!empty($conf->contrat->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'contract', 'test'=>$conf->contrat->enabled, 'label'=>$langs->trans("Contracts"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Contracts")));
+}
+if (!empty($conf->commande->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
+}
+if (!empty($conf->facture->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
+}
+if (!empty($conf->supplier_proposal->enabled)) {
+	$langs->load("supplier_proposal"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'supplier_proposal', 'test'=>$conf->supplier_proposal->enabled, 'label'=>$langs->trans("SupplierProposals"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierProposals")));
+}
+if (!empty($conf->fournisseur->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("PurchaseOrders")));
+}
+if (!empty($conf->fournisseur->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SupplierInvoices")));
+}
+if (!empty($conf->tax->enabled)) {
+	$langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
+}
+if (!empty($conf->projet->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+}
+if (!empty($conf->ficheinter->enabled)) {
+	$langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
+}
+if (!empty($conf->expensereport->enabled)) {
+	$langs->load("trips"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'expensereport', 'test'=>$conf->expensereport->enabled, 'label'=>$langs->trans("ExpenseReports"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ExpenseReports")));
+}
+if (!empty($conf->holiday->enabled)) {
+	$langs->load("holiday"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'holiday', 'test'=>$conf->holiday->enabled, 'label'=>$langs->trans("Holidays"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Holidays")));
+}
+if (!empty($conf->banque->enabled)) {
+	$langs->load("banks"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'banque', 'test'=>$conf->banque->enabled, 'label'=>$langs->trans("BankAccount"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("BankAccount")));
+}
+if (!empty($conf->mrp->enabled)) {
+	$langs->load("mrp"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'mrp-mo', 'test'=>$conf->mrp->enabled, 'label'=>$langs->trans("MOs"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("ManufacturingOrders")));
+}
+if (!empty($conf->recruitment->enabled)) {
+	$langs->load("recruitment"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'recruitment-recruitmentcandidature', 'test'=>$conf->recruitment->enabled, 'label'=>$langs->trans("Candidatures"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("JobApplications")));
+}
 
 
 //***********************
@@ -160,9 +204,10 @@ print '<td colspan="4">'.$langs->trans("ECMSearchByEntity").'</td></tr>';
 
 $buthtml = '<td rowspan="'.$rowspan.'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
 $butshown = 0;
-foreach ($sectionauto as $sectioncur)
-{
-	if (!$sectioncur['test']) continue;
+foreach ($sectionauto as $sectioncur) {
+	if (!$sectioncur['test']) {
+		continue;
+	}
 	print '<tr class="impair">';
 	print "<td>".$sectioncur['label'].':</td>';
 	print '<td';
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index 4dd9cd63cb2..b1be94524cf 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -19,8 +19,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template enablefiletreeajax.tpl.php can't be called as URL";
 	exit;
 }
@@ -33,7 +32,9 @@ if (empty($conf) || !is_object($conf))
 <script type="text/javascript">
 
 <?php
-if (empty($module)) $module = 'ecm';
+if (empty($module)) {
+	$module = 'ecm';
+}
 $paramwithoutsection = preg_replace('/&?section=(\d+)/', '', $param);
 
 $openeddir = '/'; // The root directory shown
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 3d07d52506b..ff05dc4f4c4 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -217,25 +217,24 @@ class EmailCollector extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
 
 		// Translate some data of arrayofkeyval
-		foreach ($this->fields as $key => $val)
-		{
-			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
-			{
-				foreach ($val['arrayofkeyval'] as $key2 => $val2)
-				{
+		foreach ($this->fields as $key => $val) {
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+				foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 					$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 				}
 			}
@@ -326,14 +325,11 @@ class EmailCollector extends CommonObject
 		$object->title = $langs->trans("CopyOf")." ".$object->title;
 		// ...
 		// Clear extrafields that are unique
-		if (is_array($object->array_options) && count($object->array_options) > 0)
-		{
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
 			$extrafields->fetch_name_optionals_label($this->table_element);
-			foreach ($object->array_options as $key => $option)
-			{
+			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
-				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-				{
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
 					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
@@ -381,15 +377,15 @@ class EmailCollector extends CommonObject
 	 * @return int         <0 if KO, 0 if not found, >0 if OK
 	 */
 	/*
-    public function fetchLines()
-    {
-        $this->lines=array();
+	public function fetchLines()
+	{
+		$this->lines=array();
 
-        // Load lines with object EmailCollectorLine
+		// Load lines with object EmailCollectorLine
 
-        return count($this->lines)?1:0;
-    }
-    */
+		return count($this->lines)?1:0;
+	}
+	*/
 
 	/**
 	 * Fetch all account and load objects into an array
@@ -428,8 +424,7 @@ class EmailCollector extends CommonObject
 		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$emailcollector_static = new EmailCollector($this->db);
 				if ($emailcollector_static->fetch($obj->rowid)) {
@@ -496,7 +491,9 @@ class EmailCollector extends CommonObject
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -506,8 +503,7 @@ class EmailCollector extends CommonObject
 
 		$url = dol_buildpath('/admin/emailcollector_card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
 			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
@@ -519,10 +515,8 @@ class EmailCollector extends CommonObject
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowEmailCollector");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -530,20 +524,26 @@ class EmailCollector extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-             $hookmanager->initHooks(array('myobjectdao'));
-             $parameters=array('id'=>$this->id);
-             $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-             if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-             */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+			 $hookmanager->initHooks(array('myobjectdao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -551,8 +551,11 @@ class EmailCollector extends CommonObject
 		$hookmanager->initHooks(array('emailcollectordao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -579,8 +582,7 @@ class EmailCollector extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled');
@@ -590,7 +592,9 @@ class EmailCollector extends CommonObject
 		}
 
 		$statusType = 'status5';
-		if ($status == self::STATUS_ENABLED) $statusType = 'status4';
+		if ($status == self::STATUS_ENABLED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -608,28 +612,23 @@ class EmailCollector extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
@@ -673,18 +672,18 @@ class EmailCollector extends CommonObject
 		//$sql.= ' ORDER BY position';
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$this->filters[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'rulevalue'=>$obj->rulevalue, 'status'=>$obj->status);
 				$i++;
 			}
 			$this->db->free($resql);
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 
 		return 1;
 	}
@@ -705,18 +704,18 @@ class EmailCollector extends CommonObject
 		$sql .= ' ORDER BY position';
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$this->actions[$obj->rowid] = array('id'=>$obj->rowid, 'type'=>$obj->type, 'actionparam'=>$obj->actionparam, 'status'=>$obj->status);
 				$i++;
 			}
 			$this->db->free($resql);
-		} else dol_print_error($this->db);
+		} else {
+			dol_print_error($this->db);
+		}
 	}
 
 
@@ -736,12 +735,16 @@ class EmailCollector extends CommonObject
 		if (!empty($conf->global->IMAP_FORCE_TLS)) {
 			$flags .= '/tls';
 		} elseif (empty($conf->global->IMAP_FORCE_NOSSL)) {
-			if ($ssl) $flags .= '/ssl';
+			if ($ssl) {
+				$flags .= '/ssl';
+			}
 		}
 		$flags .= '/novalidate-cert';
 		//$flags.='/readonly';
 		//$flags.='/debug';
-		if ($norsh || !empty($conf->global->IMAP_FORCE_NORSH)) $flags .= '/norsh';
+		if ($norsh || !empty($conf->global->IMAP_FORCE_NORSH)) {
+			$flags .= '/norsh';
+		}
 
 		$connectstringserver = '{'.$this->host.':993'.$flags.'}';
 
@@ -769,7 +772,7 @@ class EmailCollector extends CommonObject
 			} else {
 				// print error and return false
 				$this->error = "error: is not possible to encode this string '".$str."'";
-		 		return false;
+				return false;
 			}
 		} else {
 			return $str;
@@ -791,13 +794,14 @@ class EmailCollector extends CommonObject
 		$arrayofcollectors = $this->fetchAll($user, 1);
 
 		// Loop on each collector
-		foreach ($arrayofcollectors as $emailcollector)
-		{
+		foreach ($arrayofcollectors as $emailcollector) {
 			$result = $emailcollector->doCollectOneCollector();
 			dol_syslog("doCollect result = ".$result." for emailcollector->id = ".$emailcollector->id);
 
 			$this->error .= 'EmailCollector ID '.$emailcollector->id.':'.$emailcollector->error.'<br>';
-			if (!empty($emailcollector->errors)) $this->error .= join('<br>', $emailcollector->errors);
+			if (!empty($emailcollector->errors)) {
+				$this->error .= join('<br>', $emailcollector->errors);
+			}
 			$this->output .= 'EmailCollector ID '.$emailcollector->id.': '.$emailcollector->lastresult.'<br>';
 		}
 
@@ -821,53 +825,55 @@ class EmailCollector extends CommonObject
 		// Overwrite values with values extracted from source email
 		// $this->actionparam = 'opportunity_status=123;abc=EXTRACT:BODY:....'
 		$arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '=');
-		foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty)
-		{
+		foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty) {
 			$tmpclass = ''; $tmpproperty = '';
 			$tmparray = explode('.', $propertytooverwrite);
-			if (count($tmparray) == 2)
-			{
+			if (count($tmparray) == 2) {
 				$tmpclass = $tmparray[0];
 				$tmpproperty = $tmparray[1];
 			} else {
 				$tmpproperty = $tmparray[0];
 			}
-			if ($tmpclass && ($tmpclass != $object->element)) continue; // Property is for another type of object
+			if ($tmpclass && ($tmpclass != $object->element)) {
+				continue; // Property is for another type of object
+			}
 
 			//if (property_exists($object, $tmpproperty) || preg_match('/^options_/', $tmpproperty))
-			if ($tmpproperty)
-			{
+			if ($tmpproperty) {
 				$sourcestring = '';
 				$sourcefield = '';
 				$regexstring = '';
 				//$transformationstring='';
 				$regforregex = array();
-				if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*):([^:])$/', $valueforproperty, $regforregex))
-				{
+				if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*):([^:])$/', $valueforproperty, $regforregex)) {
 					$sourcefield = $regforregex[1];
 					$regexstring = $regforregex[2];
 					//$transofrmationstring=$regforregex[3];
-				} elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
-				{
+				} elseif (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex)) {
 					$sourcefield = $regforregex[1];
 					$regexstring = $regforregex[2];
 				}
-				if (!empty($sourcefield) && !empty($regexstring))
-				{
-					if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
-					elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
-					elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
+				if (!empty($sourcefield) && !empty($regexstring)) {
+					if (strtolower($sourcefield) == 'body') {
+						$sourcestring = $messagetext;
+					} elseif (strtolower($sourcefield) == 'subject') {
+						$sourcestring = $subject;
+					} elseif (strtolower($sourcefield) == 'header') {
+						$sourcestring = $header;
+					}
 
-					if ($sourcestring)
-					{
+					if ($sourcestring) {
 						$regforval = array();
 						$regexoptions = '';
-						if (strtolower($sourcefield) == 'body') $regexoptions = 'ms'; // The m means ^ and $ char is valid at each new line. The s means the char '.' is valid for new lines char too
-						if (strtolower($sourcefield) == 'header') $regexoptions = 'm'; // The m means ^ and $ char is valid at each new line.
+						if (strtolower($sourcefield) == 'body') {
+							$regexoptions = 'ms'; // The m means ^ and $ char is valid at each new line. The s means the char '.' is valid for new lines char too
+						}
+						if (strtolower($sourcefield) == 'header') {
+							$regexoptions = 'm'; // The m means ^ and $ char is valid at each new line.
+						}
 
 						//var_dump($tmpproperty.' - '.$regexstring.' - '.$regexoptions.' - '.$sourcestring);
-						if (preg_match('/'.$regexstring.'/'.$regexoptions, $sourcestring, $regforval))
-						{
+						if (preg_match('/'.$regexstring.'/'.$regexoptions, $sourcestring, $regforval)) {
 							//var_dump($regforval[count($regforval)-1]);exit;
 							// Overwrite param $tmpproperty
 							$valueextracted = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
@@ -886,25 +892,23 @@ class EmailCollector extends CommonObject
 						$this->error = 'The extract rule to use has on an unknown source (must be HEADER, SUBJECT or BODY)';
 						$this->errors[] = $this->error;
 					}
-				} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex))
-				{
+				} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $regforregex)) {
 					$valuecurrent = '';
-					if (preg_match('/^options_/', $tmpproperty)) $valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
-					else $valuecurrent = $object->$tmpproperty;
+					if (preg_match('/^options_/', $tmpproperty)) {
+						$valuecurrent = $object->array_options[preg_replace('/^options_/', '', $tmpproperty)];
+					} else {
+						$valuecurrent = $object->$tmpproperty;
+					}
 
-					if ($regforregex[1] == 'SET' || empty($valuecurrent))
-					{
+					if ($regforregex[1] == 'SET' || empty($valuecurrent)) {
 						$valuetouse = $regforregex[2];
 						$substitutionarray = array();
 						$matcharray = array();
 						preg_match_all('/__([a-z0-9]+(?:_[a-z0-9]+)?)__/i', $valuetouse, $matcharray);
 						//var_dump($tmpproperty.' - '.$object->$tmpproperty.' - '.$valuetouse); var_dump($matcharray);
-						if (is_array($matcharray[1]))    // $matcharray[1] is array with list of substitution key found without the __
-						{
-							foreach ($matcharray[1] as $keytoreplace)
-							{
-								if ($keytoreplace && isset($object->$keytoreplace))
-								{
+						if (is_array($matcharray[1])) {    // $matcharray[1] is array with list of substitution key found without the __
+							foreach ($matcharray[1] as $keytoreplace) {
+								if ($keytoreplace && isset($object->$keytoreplace)) {
 									$substitutionarray['__'.$keytoreplace.'__'] = $object->$keytoreplace;
 								}
 							}
@@ -913,8 +917,11 @@ class EmailCollector extends CommonObject
 						dol_syslog(var_export($substitutionarray, true));
 						//var_dump($substitutionarray);
 						$valuetouse = make_substitutions($valuetouse, $substitutionarray);
-						if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
-						else $object->$tmpproperty = $valuetouse;
+						if (preg_match('/^options_/', $tmpproperty)) {
+							$object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $valuetouse;
+						} else {
+							$object->$tmpproperty = $valuetouse;
+						}
 					}
 				} else {
 					$errorforthisaction++;
@@ -950,23 +957,19 @@ class EmailCollector extends CommonObject
 
 		$now = dol_now();
 
-		if (empty($this->host))
-		{
+		if (empty($this->host)) {
 			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('EMailHost'));
 			return -1;
 		}
-		if (empty($this->login))
-		{
+		if (empty($this->login)) {
 			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Login'));
 			return -1;
 		}
-		if (empty($this->source_directory))
-		{
+		if (empty($this->source_directory)) {
 			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('MailboxSourceDirectory'));
 			return -1;
 		}
-		if (!function_exists('imap_open'))
-		{
+		if (!function_exists('imap_open')) {
 			$this->error = 'IMAP function not enabled on your PHP';
 			return -2;
 		}
@@ -982,8 +985,7 @@ class EmailCollector extends CommonObject
 		$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
 
 		$connection = imap_open($connectstringsource, $this->login, $this->password);
-		if (!$connection)
-		{
+		if (!$connection) {
 			$this->error = 'Failed to open IMAP connection '.$connectstringsource;
 			return -3;
 		}
@@ -1002,9 +1004,10 @@ class EmailCollector extends CommonObject
 		$searchfilternodoltrackid = 0;
 		$searchfilterisanswer = 0;
 		$searchfilterisnotanswer = 0;
-		foreach ($this->filters as $rule)
-		{
-			if (empty($rule['status'])) continue;
+		foreach ($this->filters as $rule) {
+			if (empty($rule['status'])) {
+				continue;
+			}
 
 			if ($rule['type'] == 'to') {
 				$tmprulevaluearray = explode('*', $rule['rulevalue']);
@@ -1016,37 +1019,80 @@ class EmailCollector extends CommonObject
 					$search .= ($search ? ' ' : '').'TO "'.str_replace('"', '', $rule['rulevalue']).'"';
 				}
 			}
-			if ($rule['type'] == 'bcc')     $search .= ($search ? ' ' : '').'BCC';
-			if ($rule['type'] == 'cc')      $search .= ($search ? ' ' : '').'CC';
-			if ($rule['type'] == 'from')    $search .= ($search ? ' ' : '').'FROM "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'subject') $search .= ($search ? ' ' : '').'SUBJECT "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'body')    $search .= ($search ? ' ' : '').'BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'header')  $search .= ($search ? ' ' : '').'HEADER '.$rule['rulevalue'];
+			if ($rule['type'] == 'bcc') {
+				$search .= ($search ? ' ' : '').'BCC';
+			}
+			if ($rule['type'] == 'cc') {
+				$search .= ($search ? ' ' : '').'CC';
+			}
+			if ($rule['type'] == 'from') {
+				$search .= ($search ? ' ' : '').'FROM "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'subject') {
+				$search .= ($search ? ' ' : '').'SUBJECT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'body') {
+				$search .= ($search ? ' ' : '').'BODY "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'header') {
+				$search .= ($search ? ' ' : '').'HEADER '.$rule['rulevalue'];
+			}
 
-			if ($rule['type'] == 'notinsubject') $search .= ($search ? ' ' : '').'SUBJECT NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'notinbody') $search .= ($search ? ' ' : '').'BODY NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'notinsubject') {
+				$search .= ($search ? ' ' : '').'SUBJECT NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'notinbody') {
+				$search .= ($search ? ' ' : '').'BODY NOT "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
 
-			if ($rule['type'] == 'seen')    $search .= ($search ? ' ' : '').'SEEN';
-			if ($rule['type'] == 'unseen')  $search .= ($search ? ' ' : '').'UNSEEN';
-			if ($rule['type'] == 'unanswered') $search .= ($search ? ' ' : '').'UNANSWERED';
-			if ($rule['type'] == 'answered')   $search .= ($search ? ' ' : '').'ANSWERED';
-			if ($rule['type'] == 'smaller') $search .= ($search ? ' ' : '').'SMALLER "'.str_replace('"', '', $rule['rulevalue']).'"';
-			if ($rule['type'] == 'larger')  $search .= ($search ? ' ' : '').'LARGER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			if ($rule['type'] == 'seen') {
+				$search .= ($search ? ' ' : '').'SEEN';
+			}
+			if ($rule['type'] == 'unseen') {
+				$search .= ($search ? ' ' : '').'UNSEEN';
+			}
+			if ($rule['type'] == 'unanswered') {
+				$search .= ($search ? ' ' : '').'UNANSWERED';
+			}
+			if ($rule['type'] == 'answered') {
+				$search .= ($search ? ' ' : '').'ANSWERED';
+			}
+			if ($rule['type'] == 'smaller') {
+				$search .= ($search ? ' ' : '').'SMALLER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
+			if ($rule['type'] == 'larger') {
+				$search .= ($search ? ' ' : '').'LARGER "'.str_replace('"', '', $rule['rulevalue']).'"';
+			}
 
-			if ($rule['type'] == 'withtrackingidinmsgid') { $searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/'; }
-			if ($rule['type'] == 'withouttrackingidinmsgid') { $searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/'; }
-			if ($rule['type'] == 'withtrackingid') { $searchfilterdoltrackid++; $searchhead .= '/References.*@'.preg_quote($host, '/').'/'; }
-			if ($rule['type'] == 'withouttrackingid') { $searchfilternodoltrackid++; $searchhead .= '! /References.*@'.preg_quote($host, '/').'/'; }
+			if ($rule['type'] == 'withtrackingidinmsgid') {
+				$searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
+			}
+			if ($rule['type'] == 'withouttrackingidinmsgid') {
+				$searchfilterdoltrackid++; $searchhead .= '/Message-ID.*@'.preg_quote($host, '/').'/';
+			}
+			if ($rule['type'] == 'withtrackingid') {
+				$searchfilterdoltrackid++; $searchhead .= '/References.*@'.preg_quote($host, '/').'/';
+			}
+			if ($rule['type'] == 'withouttrackingid') {
+				$searchfilternodoltrackid++; $searchhead .= '! /References.*@'.preg_quote($host, '/').'/';
+			}
 
-			if ($rule['type'] == 'isanswer') { $searchfilterisanswer++; $searchhead .= '/References.*@.*/'; }
-			if ($rule['type'] == 'isnotanswer') { $searchfilterisnotanswer++; $searchhead .= '! /References.*@.*/'; }
+			if ($rule['type'] == 'isanswer') {
+				$searchfilterisanswer++; $searchhead .= '/References.*@.*/';
+			}
+			if ($rule['type'] == 'isnotanswer') {
+				$searchfilterisnotanswer++; $searchhead .= '! /References.*@.*/';
+			}
 		}
 
-		if (empty($targetdir))	// Use last date as filter if there is no targetdir defined.
-		{
+		if (empty($targetdir)) {	// Use last date as filter if there is no targetdir defined.
 			$fromdate = 0;
-			if ($this->datelastok) $fromdate = $this->datelastok;
-			if ($fromdate > 0) $search .= ($search ? ' ' : '').'SINCE '.date('j-M-Y', $fromdate - 1); // SENTSINCE not supported. Date must be X-Abc-9999 (X on 1 digit if < 10)
+			if ($this->datelastok) {
+				$fromdate = $this->datelastok;
+			}
+			if ($fromdate > 0) {
+				$search .= ($search ? ' ' : '').'SINCE '.date('j-M-Y', $fromdate - 1); // SENTSINCE not supported. Date must be X-Abc-9999 (X on 1 digit if < 10)
+			}
 			//$search.=($search?' ':'').'SINCE 8-Apr-2018';
 		}
 		dol_syslog("IMAP search string = ".$search);
@@ -1059,12 +1105,10 @@ class EmailCollector extends CommonObject
 
 		// Scan IMAP inbox
 		$arrayofemail = imap_search($connection, $search, null, $charset);
-		if ($arrayofemail === false)
-		{
+		if ($arrayofemail === false) {
 			// Nothing found or search string not understood
 			$mapoferrrors = imap_errors();
-			if ($mapoferrrors !== false)
-			{
+			if ($mapoferrrors !== false) {
 				$error++;
 				$this->error = "Search string not understood - ".join(',', $mapoferrrors);
 				$this->errors[] = $this->error;
@@ -1072,24 +1116,23 @@ class EmailCollector extends CommonObject
 		}
 
 		// Loop on each email found
-		if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0)
-		{
+		if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0) {
 			// Loop to get part html and plain
 			/*
-             0 multipart/mixed
-             1 multipart/alternative
-             1.1 text/plain
-             1.2 text/html
-             2 message/rfc822
-             2 multipart/mixed
-             2.1 multipart/alternative
-             2.1.1 text/plain
-             2.1.2 text/html
-             2.2 message/rfc822
-             2.2 multipart/alternative
-             2.2.1 text/plain
-             2.2.2 text/html
-             */
+			 0 multipart/mixed
+			 1 multipart/alternative
+			 1.1 text/plain
+			 1.2 text/html
+			 2 message/rfc822
+			 2 multipart/mixed
+			 2.1 multipart/alternative
+			 2.1.1 text/plain
+			 2.1.2 text/html
+			 2.2 message/rfc822
+			 2.2 multipart/alternative
+			 2.2.1 text/plain
+			 2.2.2 text/html
+			 */
 			/**
 			 * create_part_array
 			 *
@@ -1098,18 +1141,18 @@ class EmailCollector extends CommonObject
 			 * @return 	array				Array with number and object
 			 */
 			/*function createPartArray($structure, $prefix = "")
-            {
-                //print_r($structure);
-                $part_array=array();
-                if (count($structure->parts) > 0) {    // There some sub parts
-                    foreach ($structure->parts as $count => $part) {
-                        addPartToArray($part, $prefix.($count+1), $part_array);
-                    }
-                }else{    // Email does not have a seperate mime attachment for text
-                    $part_array[] = array('part_number' => $prefix.'1', 'part_object' => $structure);
-                }
-                return $part_array;
-            }*/
+			{
+				//print_r($structure);
+				$part_array=array();
+				if (count($structure->parts) > 0) {    // There some sub parts
+					foreach ($structure->parts as $count => $part) {
+						addPartToArray($part, $prefix.($count+1), $part_array);
+					}
+				}else{    // Email does not have a seperate mime attachment for text
+					$part_array[] = array('part_number' => $prefix.'1', 'part_object' => $structure);
+				}
+				return $part_array;
+			}*/
 
 			/**
 			 * Sub function for createPartArray(). Only called by createPartArray() and itself.
@@ -1120,40 +1163,38 @@ class EmailCollector extends CommonObject
 			 * @return	void
 			 */
 			/*function addPartToArray($obj, $partno, &$part_array)
-            {
-                $part_array[] = array('part_number' => $partno, 'part_object' => $obj);
-                if ($obj->type == 2) { // Check to see if the part is an attached email message, as in the RFC-822 type
-                    //print_r($obj);
-                    if (array_key_exists('parts', $obj)) {    // Check to see if the email has parts
-                        foreach ($obj->parts as $count => $part) {
-                            // Iterate here again to compensate for the broken way that imap_fetchbody() handles attachments
-                            if (count($part->parts) > 0) {
-                                foreach ($part->parts as $count2 => $part2) {
-                                    addPartToArray($part2, $partno.".".($count2+1), $part_array);
-                                }
-                            }else{    // Attached email does not have a seperate mime attachment for text
-                                $part_array[] = array('part_number' => $partno.'.'.($count+1), 'part_object' => $obj);
-                            }
-                        }
-                    }else{    // Not sure if this is possible
-                        $part_array[] = array('part_number' => $partno.'.1', 'part_object' => $obj);
-                    }
-                }else{    // If there are more sub-parts, expand them out.
-                    if (array_key_exists('parts', $obj)) {
-                        foreach ($obj->parts as $count => $p) {
-                            addPartToArray($p, $partno.".".($count+1), $part_array);
-                        }
-                    }
-                }
-            }*/
+			{
+				$part_array[] = array('part_number' => $partno, 'part_object' => $obj);
+				if ($obj->type == 2) { // Check to see if the part is an attached email message, as in the RFC-822 type
+					//print_r($obj);
+					if (array_key_exists('parts', $obj)) {    // Check to see if the email has parts
+						foreach ($obj->parts as $count => $part) {
+							// Iterate here again to compensate for the broken way that imap_fetchbody() handles attachments
+							if (count($part->parts) > 0) {
+								foreach ($part->parts as $count2 => $part2) {
+									addPartToArray($part2, $partno.".".($count2+1), $part_array);
+								}
+							}else{    // Attached email does not have a seperate mime attachment for text
+								$part_array[] = array('part_number' => $partno.'.'.($count+1), 'part_object' => $obj);
+							}
+						}
+					}else{    // Not sure if this is possible
+						$part_array[] = array('part_number' => $partno.'.1', 'part_object' => $obj);
+					}
+				}else{    // If there are more sub-parts, expand them out.
+					if (array_key_exists('parts', $obj)) {
+						foreach ($obj->parts as $count => $p) {
+							addPartToArray($p, $partno.".".($count+1), $part_array);
+						}
+					}
+				}
+			}*/
 
 			dol_syslog("Start of loop on email", LOG_INFO, 1);
 
 			$iforemailloop = 0;
-			foreach ($arrayofemail as $imapemail)
-			{
-				if ($nbemailprocessed > 1000)
-				{
+			foreach ($arrayofemail as $imapemail) {
+				if ($nbemailprocessed > 1000) {
 					break; // Do not process more than 1000 email per launch (this is a different protection than maxnbcollectedpercollect
 				}
 
@@ -1162,15 +1203,21 @@ class EmailCollector extends CommonObject
 				$header = imap_fetchheader($connection, $imapemail, 0);
 				$header = preg_replace('/\r\n\s+/m', ' ', $header); // When a header line is on several lines, merge lines
 				/*print $header;
-                print $header;*/
+				print $header;*/
 
 				$matches = array();
 				preg_match_all('/([^: ]+): (.+?(?:\r\n\s(?:.+?))*)\r\n/m', $header, $matches);
 				$headers = array_combine($matches[1], $matches[2]);
 
-				if (!empty($headers['in-reply-to']) && empty($headers['In-Reply-To'])) { $headers['In-Reply-To'] = $headers['in-reply-to']; }
-				if (!empty($headers['references']) && empty($headers['References'])) { $headers['References'] = $headers['references']; }
-				if (!empty($headers['message-id']) && empty($headers['Message-ID'])) { $headers['Message-ID'] = $headers['message-id']; }
+				if (!empty($headers['in-reply-to']) && empty($headers['In-Reply-To'])) {
+					$headers['In-Reply-To'] = $headers['in-reply-to'];
+				}
+				if (!empty($headers['references']) && empty($headers['References'])) {
+					$headers['References'] = $headers['references'];
+				}
+				if (!empty($headers['message-id']) && empty($headers['Message-ID'])) {
+					$headers['Message-ID'] = $headers['message-id'];
+				}
 
 				$headers['Subject'] = $this->decodeSMTPSubject($headers['Subject']);
 
@@ -1179,33 +1226,30 @@ class EmailCollector extends CommonObject
 				//print "Process mail ".$iforemailloop." Subject: ".dol_escape_htmltag($headers['Subject'])." References: ".dol_escape_htmltag($headers['References'])." In-Reply-To: ".dol_escape_htmltag($headers['In-Reply-To'])."<br>\n";
 
 				// If there is a filter on trackid
-				if ($searchfilterdoltrackid > 0)
-				{
-					if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))
-					{
+				if ($searchfilterdoltrackid > 0) {
+					if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References'])) {
 						$nbemailprocessed++;
 						continue; // Exclude email
 					}
 				}
-				if ($searchfilternodoltrackid > 0)
-				{
-					if (!empty($headers['References']) && preg_match('/@'.preg_quote($host, '/').'/', $headers['References']))
-					{
+				if ($searchfilternodoltrackid > 0) {
+					if (!empty($headers['References']) && preg_match('/@'.preg_quote($host, '/').'/', $headers['References'])) {
 						$nbemailprocessed++;
 						continue; // Exclude email
 					}
 				}
 
 				if ($searchfilterisanswer > 0) {
-					if (empty($headers['In-Reply-To']))
-					{
+					if (empty($headers['In-Reply-To'])) {
 						$nbemailprocessed++;
 						continue; // Exclude email
 					}
 					// Note: we can have
 					// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
 					$isanswer = 0;
-					if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) $isanswer = 1;
+					if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) {
+						$isanswer = 1;
+					}
 					//if ($headers['In-Reply-To'] != $headers['Message-ID'] && empty($headers['References'])) $isanswer = 1;	// If in-reply-to differs of message-id, this is a reply
 					//if ($headers['In-Reply-To'] != $headers['Message-ID'] && !empty($headers['References']) && strpos($headers['References'], $headers['Message-ID']) !== false) $isanswer = 1;
 
@@ -1215,12 +1259,13 @@ class EmailCollector extends CommonObject
 					}
 				}
 				if ($searchfilterisnotanswer > 0) {
-					if (!empty($headers['In-Reply-To']))
-					{
+					if (!empty($headers['In-Reply-To'])) {
 						// Note: we can have
 						// Message-ID=A, In-Reply-To=B, References=B and message can BE an answer or NOT (a transfer rewriten)
 						$isanswer = 0;
-						if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) $isanswer = 1;
+						if (preg_match('/Re\s*:\s+/i', $headers['Subject'])) {
+							$isanswer = 1;
+						}
 						//if ($headers['In-Reply-To'] != $headers['Message-ID'] && empty($headers['References'])) $isanswer = 1;	// If in-reply-to differs of message-id, this is a reply
 						//if ($headers['In-Reply-To'] != $headers['Message-ID'] && !empty($headers['References']) && strpos($headers['References'], $headers['Message-ID']) !== false) $isanswer = 1;
 						if ($isanswer) {
@@ -1270,51 +1315,51 @@ class EmailCollector extends CommonObject
 				$messagetext = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $messagetext);
 
 				/*var_dump($plainmsg);
-                var_dump($htmlmsg);
-                var_dump($messagetext);*/
+				var_dump($htmlmsg);
+				var_dump($messagetext);*/
 				/*var_dump($charset);
-                var_dump($attachments);
-                exit;*/
+				var_dump($attachments);
+				exit;*/
 
 				// Parse IMAP email structure
 				/*
-                $structure = imap_fetchstructure($connection, $imapemail, 0);
+				$structure = imap_fetchstructure($connection, $imapemail, 0);
 
-                $partplain = $parthtml = -1;
-                $encodingplain = $encodinghtml = '';
+				$partplain = $parthtml = -1;
+				$encodingplain = $encodinghtml = '';
 
-                $result = createPartArray($structure, '');
+				$result = createPartArray($structure, '');
 
-                foreach($result as $part)
-                {
-                    // $part['part_object']->type seems 0 for content
-                    // $part['part_object']->type seems 5 for attachment
-                    if (empty($part['part_object'])) continue;
-                    if ($part['part_object']->subtype == 'HTML')
-                    {
-                        $parthtml=$part['part_number'];
-                        if ($part['part_object']->encoding == 4)
-                        {
-                            $encodinghtml = 'aaa';
-                        }
-                    }
-                    if ($part['part_object']->subtype == 'PLAIN')
-                    {
-                        $partplain=$part['part_number'];
-                        if ($part['part_object']->encoding == 4)
-                        {
-                            $encodingplain = 'rr';
-                        }
-                    }
-                }
-                //var_dump($result); var_dump($partplain); var_dump($parthtml);
+				foreach($result as $part)
+				{
+					// $part['part_object']->type seems 0 for content
+					// $part['part_object']->type seems 5 for attachment
+					if (empty($part['part_object'])) continue;
+					if ($part['part_object']->subtype == 'HTML')
+					{
+						$parthtml=$part['part_number'];
+						if ($part['part_object']->encoding == 4)
+						{
+							$encodinghtml = 'aaa';
+						}
+					}
+					if ($part['part_object']->subtype == 'PLAIN')
+					{
+						$partplain=$part['part_number'];
+						if ($part['part_object']->encoding == 4)
+						{
+							$encodingplain = 'rr';
+						}
+					}
+				}
+				//var_dump($result); var_dump($partplain); var_dump($parthtml);
 
-                var_dump($structure);
-                var_dump($parthtml);
-                var_dump($partplain);
+				var_dump($structure);
+				var_dump($parthtml);
+				var_dump($partplain);
 
-                $messagetext = imap_fetchbody($connection, $imapemail, ($parthtml != '-1' ? $parthtml : ($partplain != '-1' ? $partplain : 1)), FT_PEEK);
-                */
+				$messagetext = imap_fetchbody($connection, $imapemail, ($parthtml != '-1' ? $parthtml : ($partplain != '-1' ? $partplain : 1)), FT_PEEK);
+				*/
 
 				//var_dump($messagetext);
 				//var_dump($structure->parts[0]->parts);
@@ -1334,8 +1379,7 @@ class EmailCollector extends CommonObject
 				//var_dump($msgid);exit;
 
 				$reg = array();
-				if (preg_match('/^(.*)<(.*)>$/', $fromstring, $reg))
-				{
+				if (preg_match('/^(.*)<(.*)>$/', $fromstring, $reg)) {
 					$from = $reg[2];
 					$fromtext = $reg[1];
 				} else {
@@ -1356,8 +1400,7 @@ class EmailCollector extends CommonObject
 				$objectemail = null;
 
 				$reg = array();
-				if (!empty($headers['References']))
-				{
+				if (!empty($headers['References'])) {
 					$arrayofreferences = preg_split('/(,|\s+)/', $headers['References']);
 					//var_dump($headers['References']);
 					//var_dump($arrayofreferences);
@@ -1370,44 +1413,34 @@ class EmailCollector extends CommonObject
 
 							$objectid = $reg[2];
 							// See also list into interface_50_modAgenda_ActionsAuto
-							if ($reg[1] == 'thi')
-							{
+							if ($reg[1] == 'thi') {
 								$objectemail = new Societe($this->db);
 							}
-							if ($reg[1] == 'ctc')
-							{
+							if ($reg[1] == 'ctc') {
 								$objectemail = new Contact($this->db);
 							}
-							if ($reg[1] == 'inv')
-							{
+							if ($reg[1] == 'inv') {
 								$objectemail = new Facture($this->db);
 							}
-							if ($reg[1] == 'proj')
-							{
+							if ($reg[1] == 'proj') {
 								$objectemail = new Project($this->db);
 							}
-							if ($reg[1] == 'tas')
-							{
+							if ($reg[1] == 'tas') {
 								$objectemail = new Task($this->db);
 							}
-							if ($reg[1] == 'con')
-							{
+							if ($reg[1] == 'con') {
 								$objectemail = new Contact($this->db);
 							}
-							if ($reg[1] == 'use')
-							{
+							if ($reg[1] == 'use') {
 								$objectemail = new User($this->db);
 							}
-							if ($reg[1] == 'tic')
-							{
+							if ($reg[1] == 'tic') {
 								$objectemail = new Ticket($this->db);
 							}
-							if ($reg[1] == 'recruitmentcandidature')
-							{
+							if ($reg[1] == 'recruitmentcandidature') {
 								$objectemail = new RecruitmentCandidature($this->db);
 							}
-							if ($reg[1] == 'mem')
-							{
+							if ($reg[1] == 'mem') {
 								$objectemail = new Adherent($this->db);
 							}
 						} elseif (preg_match('/<(.*@.*)>/', $reference, $reg)) {
@@ -1459,81 +1492,97 @@ class EmailCollector extends CommonObject
 						}
 
 						// Load object linked to email
-						if (is_object($objectemail))
-						{
+						if (is_object($objectemail)) {
 							$result = $objectemail->fetch($objectid);
-							if ($result > 0)
-							{
+							if ($result > 0) {
 								$fk_element_id = $objectemail->id;
 								$fk_element_type = $objectemail->element;
 								// Fix fk_element_type
-								if ($fk_element_type == 'facture') $fk_element_type = 'invoice';
+								if ($fk_element_type == 'facture') {
+									$fk_element_type = 'invoice';
+								}
 
-								if (get_class($objectemail) != 'Societe') $thirdpartyid = $objectemail->fk_soc;
-								else $thirdpartyid = $objectemail->id;
+								if (get_class($objectemail) != 'Societe') {
+									$thirdpartyid = $objectemail->fk_soc;
+								} else {
+									$thirdpartyid = $objectemail->id;
+								}
 
-								if (get_class($objectemail) != 'Contact') $contactid = $objectemail->fk_socpeople;
-								else $contactid = $objectemail->id;
+								if (get_class($objectemail) != 'Contact') {
+									$contactid = $objectemail->fk_socpeople;
+								} else {
+									$contactid = $objectemail->id;
+								}
 
-								if (get_class($objectemail) != 'Project') $projectid = isset($objectemail->fk_project) ? $objectemail->fk_project : $objectemail->fk_projet;
-								else $projectid = $objectemail->id;
+								if (get_class($objectemail) != 'Project') {
+									$projectid = isset($objectemail->fk_project) ? $objectemail->fk_project : $objectemail->fk_projet;
+								} else {
+									$projectid = $objectemail->id;
+								}
 							}
 						}
 
 						// Project
-						if ($projectid > 0)
-						{
+						if ($projectid > 0) {
 							$result = $projectstatic->fetch($projectid);
-							if ($result <= 0) $projectstatic->id = 0;
-							else {
+							if ($result <= 0) {
+								$projectstatic->id = 0;
+							} else {
 								$projectid = $projectstatic->id;
-								if ($trackid) $projectfoundby = 'trackid ('.$trackid.')';
-								if (empty($contactid)) $contactid = $projectstatic->fk_contact;
-								if (empty($thirdpartyid)) $thirdpartyid = $projectstatic->fk_soc;
+								if ($trackid) {
+									$projectfoundby = 'trackid ('.$trackid.')';
+								}
+								if (empty($contactid)) {
+									$contactid = $projectstatic->fk_contact;
+								}
+								if (empty($thirdpartyid)) {
+									$thirdpartyid = $projectstatic->fk_soc;
+								}
 							}
 						}
 						// Contact
-						if ($contactid > 0)
-						{
+						if ($contactid > 0) {
 							$result = $contactstatic->fetch($contactid);
-							if ($result <= 0) $contactstatic->id = 0;
-							else {
+							if ($result <= 0) {
+								$contactstatic->id = 0;
+							} else {
 								$contactid = $contactstatic->id;
-								if ($trackid) $contactfoundby = 'trackid ('.$trackid.')';
-								if (empty($thirdpartyid)) $thirdpartyid = $contactstatic->fk_soc;
+								if ($trackid) {
+									$contactfoundby = 'trackid ('.$trackid.')';
+								}
+								if (empty($thirdpartyid)) {
+									$thirdpartyid = $contactstatic->fk_soc;
+								}
 							}
 						}
 						// Thirdparty
-						if ($thirdpartyid > 0)
-						{
+						if ($thirdpartyid > 0) {
 							$result = $thirdpartystatic->fetch($thirdpartyid);
-							if ($result <= 0) $thirdpartystatic->id = 0;
-							else {
+							if ($result <= 0) {
+								$thirdpartystatic->id = 0;
+							} else {
 								$thirdpartyid = $thirdpartystatic->id;
-								if ($trackid) $thirdpartyfoundby = 'trackid ('.$trackid.')';
+								if ($trackid) {
+									$thirdpartyfoundby = 'trackid ('.$trackid.')';
+								}
 							}
 						}
 
-						if (is_object($objectemail))
-						{
+						if (is_object($objectemail)) {
 							break; // Exit loop of references. We already found an accurate reference
 						}
 					}
 				}
 
-				if (empty($contactid))		// Try to find contact using email
-				{
+				if (empty($contactid)) {		// Try to find contact using email
 					$result = $contactstatic->fetch(0, null, '', $from);
 
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$contactid = $contactstatic->id;
 						$contactfoundby = 'email of contact ('.$from.')';
-						if (empty($thirdpartyid) && $contactstatic->socid > 0)
-						{
+						if (empty($thirdpartyid) && $contactstatic->socid > 0) {
 							$result = $thirdpartystatic->fetch($contactstatic->socid);
-							if ($result > 0)
-							{
+							if ($result > 0) {
 								$thirdpartyid = $thirdpartystatic->id;
 								$thirdpartyfoundby = 'email of contact ('.$from.')';
 							}
@@ -1541,19 +1590,23 @@ class EmailCollector extends CommonObject
 					}
 				}
 
-				if (empty($thirdpartyid))		// Try to find thirdparty using email
-				{
+				if (empty($thirdpartyid)) {		// Try to find thirdparty using email
 					$result = $thirdpartystatic->fetch(0, '', '', '', '', '', '', '', '', '', $from);
-					if ($result > 0) $thirdpartyfoundby = 'email ('.$from.')';
+					if ($result > 0) {
+						$thirdpartyfoundby = 'email ('.$from.')';
+					}
 				}
 
 				// Do operations
-				foreach ($this->actions as $operation)
-				{
+				foreach ($this->actions as $operation) {
 					$errorforthisaction = 0;
 
-					if ($errorforactions) break;
-					if (empty($operation['status'])) continue;
+					if ($errorforactions) {
+						break;
+					}
+					if (empty($operation['status'])) {
+						continue;
+					}
 
 					// Make Operation
 					dol_syslog("Execute action ".$operation['type']." actionparam=".$operation['actionparam'].' thirdpartystatic->id='.$thirdpartystatic->id.' contactstatic->id='.$contactstatic->id.' projectstatic->id='.$projectstatic->id);
@@ -1561,7 +1614,9 @@ class EmailCollector extends CommonObject
 
 					$actioncode = 'EMAIL_IN';
 					// If we scan the Sent box, we use the code for out email
-					if ($this->source_directory == 'Sent') $actioncode = 'EMAIL_OUT';
+					if ($this->source_directory == 'Sent') {
+						$actioncode = 'EMAIL_OUT';
+					}
 
 					$description = $descriptiontitle = $descriptionmeta = $descriptionfull = '';
 
@@ -1569,13 +1624,16 @@ class EmailCollector extends CommonObject
 
 					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTopic").' : '.dol_escape_htmltag($subject));
 					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailFrom").($langs->trans("MailFrom") != 'From' ? ' (From)' : '').' : '.dol_escape_htmltag($fromstring));
-					if ($sender) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("Sender").($langs->trans("Sender") != 'Sender' ? ' (Sender)' : '').' : '.dol_escape_htmltag($sender));
+					if ($sender) {
+						$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("Sender").($langs->trans("Sender") != 'Sender' ? ' (Sender)' : '').' : '.dol_escape_htmltag($sender));
+					}
 					$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailTo").($langs->trans("MailTo") != 'To' ? ' (To)' : '').' : '.dol_escape_htmltag($to));
-					if ($sendtocc) $descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailCC").($langs->trans("MailCC") != 'CC' ? ' (CC)' : '').' : '.dol_escape_htmltag($sendtocc));
+					if ($sendtocc) {
+						$descriptionmeta = dol_concatdesc($descriptionmeta, $langs->trans("MailCC").($langs->trans("MailCC") != 'CC' ? ' (CC)' : '').' : '.dol_escape_htmltag($sendtocc));
+					}
 
 					// Search and create thirdparty
-					if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty')
-					{
+					if ($operation['type'] == 'loadthirdparty' || $operation['type'] == 'loadandcreatethirdparty') {
 						if (empty($operation['actionparam'])) {
 							$errorforactions++;
 							$this->error = "Action loadthirdparty or loadandcreatethirdparty has empty parameter. Must be a rule like 'SET:xxx' or 'EXTRACT:(body|subject):regex' to define how to set or extract data";
@@ -1586,31 +1644,30 @@ class EmailCollector extends CommonObject
 
 							// $this->actionparam = 'SET:aaa' or 'EXTRACT:BODY:....'
 							$arrayvaluetouse = dolExplodeIntoArray($actionparam, ';', '=');
-							foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty)
-							{
+							foreach ($arrayvaluetouse as $propertytooverwrite => $valueforproperty) {
 								$sourcestring = '';
 								$sourcefield = '';
 								$regexstring = '';
 								$regforregex = array();
 
-								if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex))
-								{
+								if (preg_match('/^EXTRACT:([a-zA-Z0-9]+):(.*)$/', $valueforproperty, $regforregex)) {
 									$sourcefield = $regforregex[1];
 									$regexstring = $regforregex[2];
 								}
 
-								if (!empty($sourcefield) && !empty($regexstring))
-								{
-									if (strtolower($sourcefield) == 'body') $sourcestring = $messagetext;
-									elseif (strtolower($sourcefield) == 'subject') $sourcestring = $subject;
-									elseif (strtolower($sourcefield) == 'header') $sourcestring = $header;
+								if (!empty($sourcefield) && !empty($regexstring)) {
+									if (strtolower($sourcefield) == 'body') {
+										$sourcestring = $messagetext;
+									} elseif (strtolower($sourcefield) == 'subject') {
+										$sourcestring = $subject;
+									} elseif (strtolower($sourcefield) == 'header') {
+										$sourcestring = $header;
+									}
 
-									if ($sourcestring)
-									{
+									if ($sourcestring) {
 										$regforval = array();
 										//var_dump($regexstring);var_dump($sourcestring);
-										if (preg_match('/'.$regexstring.'/ms', $sourcestring, $regforval))
-										{
+										if (preg_match('/'.$regexstring.'/ms', $sourcestring, $regforval)) {
 											//var_dump($regforval[count($regforval)-1]);exit;
 											// Overwrite param $tmpproperty
 											$nametouseforthirdparty = isset($regforval[count($regforval) - 1]) ? trim($regforval[count($regforval) - 1]) : null;
@@ -1625,8 +1682,7 @@ class EmailCollector extends CommonObject
 										$this->error = 'The extract rule to use to load thirdparty has on an unknown source (must be HEADER, SUBJECT or BODY)';
 										$this->errors[] = $this->error;
 									}
-								} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg))
-								{
+								} elseif (preg_match('/^(SET|SETIFEMPTY):(.*)$/', $valueforproperty, $reg)) {
 									//if (preg_match('/^options_/', $tmpproperty)) $object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $reg[1];
 									//else $object->$tmpproperty = $reg[1];
 									$nametouseforthirdparty = $reg[2];
@@ -1638,43 +1694,38 @@ class EmailCollector extends CommonObject
 								}
 							}
 
-							if (!$errorforactions && $nametouseforthirdparty)
-							{
+							if (!$errorforactions && $nametouseforthirdparty) {
 								$result = $thirdpartystatic->fetch(0, $nametouseforthirdparty);
-								if ($result < 0)
-								{
+								if ($result < 0) {
 									$errorforactions++;
 									$this->error = 'Error when getting thirdparty with name '.$nametouseforthirdparty.' (may be 2 record exists with same name ?)';
 									$this->errors[] = $this->error;
 									break;
-								} elseif ($result == 0)
-								{
-									if ($operation['type'] == 'loadthirdparty')
-									{
+								} elseif ($result == 0) {
+									if ($operation['type'] == 'loadthirdparty') {
 										dol_syslog("Third party with name ".$nametouseforthirdparty." was not found");
 
 										$errorforactions++;
 										$this->error = 'ErrorFailedToLoadThirdParty';
 										$this->errors[] = 'ErrorFailedToLoadThirdParty';
-									} elseif ($operation['type'] == 'loadandcreatethirdparty')
-									{
+									} elseif ($operation['type'] == 'loadandcreatethirdparty') {
 										dol_syslog("Third party with name ".$nametouseforthirdparty." was not found. We try to create it.");
 
 										// Create thirdparty
 										$thirdpartystatic->name = $nametouseforthirdparty;
-										if ($fromtext != $nametouseforthirdparty) $thirdpartystatic->name_alias = $fromtext;
+										if ($fromtext != $nametouseforthirdparty) {
+											$thirdpartystatic->name_alias = $fromtext;
+										}
 										$thirdpartystatic->email = $from;
 
 										// Overwrite values with values extracted from source email
 										$errorforthisaction = $this->overwritePropertiesOfObject($thirdpartystatic, $operation['actionparam'], $messagetext, $subject, $header);
 
-										if ($errorforthisaction)
-										{
+										if ($errorforthisaction) {
 											$errorforactions++;
 										} else {
 											$result = $thirdpartystatic->create($user);
-											if ($result <= 0)
-											{
+											if ($result <= 0) {
 												$errorforactions++;
 												$this->error = $thirdpartystatic->error;
 												$this->errors = $thirdpartystatic->errors;
@@ -1684,26 +1735,26 @@ class EmailCollector extends CommonObject
 								}
 							}
 						}
-					}
-					// Create event
-					elseif ($operation['type'] == 'recordevent')
-					{
+					} elseif ($operation['type'] == 'recordevent') {
+						// Create event
 						$actioncomm = new ActionComm($this->db);
 
 						$alreadycreated = $actioncomm->fetch(0, '', '', $msgid);
-						if ($alreadycreated == 0)
-						{
-							if ($projectstatic->id > 0)
-							{
-								if ($projectfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
+						if ($alreadycreated == 0) {
+							if ($projectstatic->id > 0) {
+								if ($projectfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Project found from '.$projectfoundby);
+								}
 							}
-							if ($thirdpartystatic->id > 0)
-							{
-								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+							if ($thirdpartystatic->id > 0) {
+								if ($thirdpartyfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								}
 							}
-							if ($contactstatic->id > 0)
-							{
-								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+							if ($contactstatic->id > 0) {
+								if ($contactfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								}
 							}
 
 							$description = $descriptiontitle;
@@ -1742,8 +1793,7 @@ class EmailCollector extends CommonObject
 							$actioncomm->email_subject = $subject;
 							$actioncomm->errors_to   = '';
 
-							if (!in_array($fk_element_type, array('societe', 'contact', 'project', 'user')))
-							{
+							if (!in_array($fk_element_type, array('societe', 'contact', 'project', 'user'))) {
 								$actioncomm->fk_element  = $fk_element_id;
 								$actioncomm->elementid = $fk_element_id;
 								$actioncomm->elementtype = $fk_element_type;
@@ -1758,42 +1808,39 @@ class EmailCollector extends CommonObject
 							$errorforthisaction = $this->overwritePropertiesOfObject($actioncomm, $operation['actionparam'], $messagetext, $subject, $header);
 
 							/*var_dump($fk_element_id);
-	                        var_dump($fk_element_type);
-	                        var_dump($alreadycreated);
-	                        var_dump($operation['type']);
-	                        var_dump($actioncomm);
-	                        exit;*/
+							var_dump($fk_element_type);
+							var_dump($alreadycreated);
+							var_dump($operation['type']);
+							var_dump($actioncomm);
+							exit;*/
 
-							if ($errorforthisaction)
-							{
+							if ($errorforthisaction) {
 								$errorforactions++;
 							} else {
 								$result = $actioncomm->create($user);
-								if ($result <= 0)
-								{
+								if ($result <= 0) {
 									$errorforactions++;
 									$this->errors = $actioncomm->errors;
 								}
 							}
 						}
-					}
-					// Create project / lead
-					elseif ($operation['type'] == 'project')
-					{
+					} elseif ($operation['type'] == 'project') {
+						// Create project / lead
 						$projecttocreate = new Project($this->db);
 
 						$alreadycreated = $projecttocreate->fetch(0, '', '', $msgid);
-						if ($alreadycreated == 0)
-						{
-							if ($thirdpartystatic->id > 0)
-							{
+						if ($alreadycreated == 0) {
+							if ($thirdpartystatic->id > 0) {
 								$projecttocreate->socid = $thirdpartystatic->id;
-								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								if ($thirdpartyfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								}
 							}
-							if ($contactstatic->id > 0)
-							{
+							if ($contactstatic->id > 0) {
 								$projecttocreate->contact_id = $contactstatic->id;
-								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								if ($contactfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								}
 							}
 
 							$description = $descriptiontitle;
@@ -1828,8 +1875,7 @@ class EmailCollector extends CommonObject
 							$errorforthisaction = $this->overwritePropertiesOfObject($projecttocreate, $operation['actionparam'], $messagetext, $subject, $header);
 
 							// Set project ref if not yet defined
-							if (empty($projecttocreate->ref))
-							{
+							if (empty($projecttocreate->ref)) {
 								// Get next Ref
 								$defaultref = '';
 								$modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
@@ -1837,29 +1883,23 @@ class EmailCollector extends CommonObject
 								// Search template files
 								$file = ''; $classname = ''; $filefound = 0; $reldir = '';
 								$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-								foreach ($dirmodels as $reldir)
-								{
+								foreach ($dirmodels as $reldir) {
 									$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
-									if (file_exists($file))
-									{
+									if (file_exists($file)) {
 										$filefound = 1;
 										$classname = $modele;
 										break;
 									}
 								}
 
-								if ($filefound)
-								{
-									if ($savesocid > 0)
-									{
-										if ($savesocid != $projecttocreate->socid)
-										{
+								if ($filefound) {
+									if ($savesocid > 0) {
+										if ($savesocid != $projecttocreate->socid) {
 											$errorforactions++;
 											setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$projecttocreate->socid.') by setting socid in operation with a different value', null, 'errors');
 										}
 									} else {
-										if ($projecttocreate->socid > 0)
-										{
+										if ($projecttocreate->socid > 0) {
 											$thirdpartystatic->fetch($projecttocreate->socid);
 										}
 									}
@@ -1871,19 +1911,16 @@ class EmailCollector extends CommonObject
 								$projecttocreate->ref = $defaultref;
 							}
 
-							if ($errorforthisaction)
-							{
+							if ($errorforthisaction) {
 								$errorforactions++;
 							} else {
-								if (empty($projecttocreate->ref) || (is_numeric($projecttocreate->ref) && $projecttocreate->ref <= 0))
-								{
+								if (empty($projecttocreate->ref) || (is_numeric($projecttocreate->ref) && $projecttocreate->ref <= 0)) {
 									$errorforactions++;
 									$this->error = 'Failed to create project: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
 								} else {
 									// Create project
 									$result = $projecttocreate->create($user);
-									if ($result <= 0)
-									{
+									if ($result <= 0) {
 										$errorforactions++;
 										$this->error = 'Failed to create project: '.$langs->trans($projecttocreate->error);
 										$this->errors = $projecttocreate->errors;
@@ -1891,25 +1928,24 @@ class EmailCollector extends CommonObject
 								}
 							}
 						}
-					}
-					// Create ticket
-					elseif ($operation['type'] == 'ticket')
-					{
+					} elseif ($operation['type'] == 'ticket') {
+						// Create ticket
 						$tickettocreate = new Ticket($this->db);
 
 						$alreadycreated = $tickettocreate->fetch(0, '', '', $msgid);
-						if ($alreadycreated == 0)
-						{
-							if ($thirdpartystatic->id > 0)
-							{
+						if ($alreadycreated == 0) {
+							if ($thirdpartystatic->id > 0) {
 								$tickettocreate->socid = $thirdpartystatic->id;
 								$tickettocreate->fk_soc = $thirdpartystatic->id;
-								if ($thirdpartyfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								if ($thirdpartyfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Third party found from '.$thirdpartyfoundby);
+								}
 							}
-							if ($contactstatic->id > 0)
-							{
+							if ($contactstatic->id > 0) {
 								$tickettocreate->contact_id = $contactstatic->id;
-								if ($contactfoundby) $descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								if ($contactfoundby) {
+									$descriptionmeta = dol_concatdesc($descriptionmeta, 'Contact/address found from '.$contactfoundby);
+								}
 							}
 
 							$description = $descriptiontitle;
@@ -1946,8 +1982,7 @@ class EmailCollector extends CommonObject
 							$errorforthisaction = $this->overwritePropertiesOfObject($tickettocreate, $operation['actionparam'], $messagetext, $subject, $header);
 
 							// Set ticket ref if not yet defined
-							if (empty($tickettocreate->ref))
-							{
+							if (empty($tickettocreate->ref)) {
 								// Get next Ref
 								$defaultref = '';
 								$modele = empty($conf->global->TICKET_ADDON) ? 'mod_ticket_simple' : $conf->global->TICKET_ADDON;
@@ -1955,29 +1990,23 @@ class EmailCollector extends CommonObject
 								// Search template files
 								$file = ''; $classname = ''; $filefound = 0; $reldir = '';
 								$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-								foreach ($dirmodels as $reldir)
-								{
+								foreach ($dirmodels as $reldir) {
 									$file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
-									if (file_exists($file))
-									{
+									if (file_exists($file)) {
 										$filefound = 1;
 										$classname = $modele;
 										break;
 									}
 								}
 
-								if ($filefound)
-								{
-									if ($savesocid > 0)
-									{
-										if ($savesocid != $tickettocreate->socid)
-										{
+								if ($filefound) {
+									if ($savesocid > 0) {
+										if ($savesocid != $tickettocreate->socid) {
 											$errorforactions++;
 											setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$tickettocreate->socid.') by setting socid in operation with a different value', null, 'errors');
 										}
 									} else {
-										if ($tickettocreate->socid > 0)
-										{
+										if ($tickettocreate->socid > 0) {
 											$thirdpartystatic->fetch($tickettocreate->socid);
 										}
 									}
@@ -1989,19 +2018,16 @@ class EmailCollector extends CommonObject
 								$tickettocreate->ref = $defaultref;
 							}
 
-							if ($errorforthisaction)
-							{
+							if ($errorforthisaction) {
 								$errorforactions++;
 							} else {
-								if (is_numeric($tickettocreate->ref) && $tickettocreate->ref <= 0)
-								{
+								if (is_numeric($tickettocreate->ref) && $tickettocreate->ref <= 0) {
 									$errorforactions++;
 									$this->error = 'Failed to create ticket: Can\'t get a valid value for the field ref with numbering template = '.$modele.', thirdparty id = '.$thirdpartystatic->id;
 								} else {
 									// Create project
 									$result = $tickettocreate->create($user);
-									if ($result <= 0)
-									{
+									if ($result <= 0) {
 										$errorforactions++;
 										$this->error = 'Failed to create ticket: '.$langs->trans($tickettocreate->error);
 										$this->errors = $tickettocreate->errors;
@@ -2009,15 +2035,12 @@ class EmailCollector extends CommonObject
 								}
 							}
 						}
-					}
-					// Create candidature
-					elseif ($operation['type'] == 'candidature')
-					{
+					} elseif ($operation['type'] == 'candidature') {
+						// Create candidature
 						$candidaturetocreate = new RecruitmentCandidature($this->db);
 
 						$alreadycreated = $candidaturetocreate->fetch(0, '', $msgid);
-						if ($alreadycreated == 0)
-						{
+						if ($alreadycreated == 0) {
 							$description = $descriptiontitle;
 							$description = dol_concatdesc($description, "-----");
 							$description = dol_concatdesc($description, $descriptionmeta);
@@ -2051,66 +2074,59 @@ class EmailCollector extends CommonObject
 
 							// Set candidature ref if not yet defined
 							/*if (empty($candidaturetocreate->ref))				We do not need this because we create object in draft status
-	                    	{
-	                    		// Get next Ref
-	                    		$defaultref = '';
-	                    		$modele = empty($conf->global->CANDIDATURE_ADDON) ? 'mod_candidature_simple' : $conf->global->CANDIDATURE_ADDON;
-
-	                    		// Search template files
-	                    		$file = ''; $classname = ''; $filefound = 0; $reldir = '';
-	                    		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-	                    		foreach ($dirmodels as $reldir)
-	                    		{
-	                    			$file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
-	                    			if (file_exists($file))
-	                    			{
-	                    				$filefound = 1;
-	                    				$classname = $modele;
-	                    				break;
-	                    			}
-	                    		}
-
-	                    		if ($filefound)
-	                    		{
-	                    			if ($savesocid > 0)
-	                    			{
-	                    				if ($savesocid != $candidaturetocreate->socid)
-	                    				{
-	                    					$errorforactions++;
-	                    					setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$candidaturetocreate->socid.') by setting socid in operation with a different value', null, 'errors');
-	                    				}
-	                    			} else {
-	                    				if ($candidaturetocreate->socid > 0)
-	                    				{
-	                    					$thirdpartystatic->fetch($candidaturetocreate->socid);
-	                    				}
-	                    			}
-
-	                    			$result = dol_include_once($reldir."core/modules/ticket/".$modele.'.php');
-	                    			$modModuleToUseForNextValue = new $classname;
-	                    			$defaultref = $modModuleToUseForNextValue->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $tickettocreate);
-	                    		}
-	                    		$candidaturetocreate->ref = $defaultref;
-	                    	}*/
-
-							if ($errorforthisaction)
 							{
+								// Get next Ref
+								$defaultref = '';
+								$modele = empty($conf->global->CANDIDATURE_ADDON) ? 'mod_candidature_simple' : $conf->global->CANDIDATURE_ADDON;
+
+								// Search template files
+								$file = ''; $classname = ''; $filefound = 0; $reldir = '';
+								$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+								foreach ($dirmodels as $reldir)
+								{
+									$file = dol_buildpath($reldir."core/modules/ticket/".$modele.'.php', 0);
+									if (file_exists($file)) {
+										$filefound = 1;
+										$classname = $modele;
+										break;
+									}
+								}
+
+								if ($filefound) {
+									if ($savesocid > 0) {
+										if ($savesocid != $candidaturetocreate->socid) {
+											$errorforactions++;
+											setEventMessages('You loaded a thirdparty (id='.$savesocid.') and you force another thirdparty id (id='.$candidaturetocreate->socid.') by setting socid in operation with a different value', null, 'errors');
+										}
+									} else {
+										if ($candidaturetocreate->socid > 0)
+										{
+											$thirdpartystatic->fetch($candidaturetocreate->socid);
+										}
+									}
+
+									$result = dol_include_once($reldir."core/modules/ticket/".$modele.'.php');
+									$modModuleToUseForNextValue = new $classname;
+									$defaultref = $modModuleToUseForNextValue->getNextValue(($thirdpartystatic->id > 0 ? $thirdpartystatic : null), $tickettocreate);
+								}
+								$candidaturetocreate->ref = $defaultref;
+							}*/
+
+							if ($errorforthisaction) {
 								$errorforactions++;
 							} else {
 								// Create project
 								$result = $candidaturetocreate->create($user);
-								if ($result <= 0)
-								{
+								if ($result <= 0) {
 									$errorforactions++;
 									$this->error = 'Failed to create ticket: '.join(', ', $candidaturetocreate->errors);
 									$this->errors = $candidaturetocreate->errors;
 								}
 							}
 						}
-					}
-					// Create event specific on hook
-					// this code action is hook..... for support this call
-					elseif (substr($operation['type'], 0, 4) == 'hook') {
+					} elseif (substr($operation['type'], 0, 4) == 'hook') {
+						// Create event specific on hook
+						// this code action is hook..... for support this call
 						global $hookmanager;
 
 						if (!is_object($hookmanager)) {
@@ -2141,23 +2157,19 @@ class EmailCollector extends CommonObject
 							$errorforthisaction++;
 							$this->error = $hookmanager->resPrint;
 						}
-						if ($errorforthisaction)
-						{
+						if ($errorforthisaction) {
 							$errorforactions++;
 						}
 					}
 
-					if (!$errorforactions)
-					{
+					if (!$errorforactions) {
 						$nbactiondoneforemail++;
 					}
 				}
 
 				// Error for email or not ?
-				if (!$errorforactions)
-				{
-					if ($targetdir)
-					{
+				if (!$errorforactions) {
+					if ($targetdir) {
 						dol_syslog("EmailCollector::doCollectOneCollector move message ".$imapemail." to ".$connectstringtarget, LOG_DEBUG);
 						$res = imap_mail_move($connection, $imapemail, $targetdir, 0);
 						if ($res == false) {
@@ -2180,16 +2192,14 @@ class EmailCollector extends CommonObject
 
 				$nbemailprocessed++;
 
-				if (!$errorforemail)
-				{
+				if (!$errorforemail) {
 					$nbactiondone += $nbactiondoneforemail;
 					$nbemailok++;
 
 					$this->db->commit();
 
 					// Stop the loop to process email if we reach maximum collected per collect
-					if ($this->maxemailpercollect > 0 && $nbemailok >= $this->maxemailpercollect)
-					{
+					if ($this->maxemailpercollect > 0 && $nbemailok >= $this->maxemailpercollect) {
 						dol_syslog("EmailCollect::doCollectOneCollector We reach maximum of ".$nbemailok." collected with success, so we stop this collector now.");
 						break;
 					}
@@ -2214,11 +2224,17 @@ class EmailCollector extends CommonObject
 		$this->datelastresult = $now;
 		$this->lastresult = $output;
 		$this->debuginfo = 'IMAP search string used : '.$search;
-		if ($searchhead) $this->debuginfo .= '<br>Then search string into email header : '.$searchhead;
+		if ($searchhead) {
+			$this->debuginfo .= '<br>Then search string into email header : '.$searchhead;
+		}
 
-		if (!$error) $this->datelastok = $now;
+		if (!$error) {
+			$this->datelastok = $now;
+		}
 
-		if (!empty($this->errors)) $this->lastresult .= " - ".join(" - ", $this->errors);
+		if (!empty($this->errors)) {
+			$this->lastresult .= " - ".join(" - ", $this->errors);
+		}
 		$this->codelastresult = ($error ? 'KO' : 'OK');
 		$this->update($user);
 
@@ -2265,20 +2281,20 @@ class EmailCollector extends CommonObject
 	}
 
 	/* partno string
-     0 multipart/mixed
-     1 multipart/alternative
-     1.1 text/plain
-     1.2 text/html
-     2 message/rfc822
-     2 multipart/mixed
-     2.1 multipart/alternative
-     2.1.1 text/plain
-     2.1.2 text/html
-     2.2 message/rfc822
-     2.2 multipart/alternative
-     2.2.1 text/plain
-     2.2.2 text/html
-     */
+	 0 multipart/mixed
+	 1 multipart/alternative
+	 1.1 text/plain
+	 1.2 text/html
+	 2 message/rfc822
+	 2 multipart/mixed
+	 2.1 multipart/alternative
+	 2.1.1 text/plain
+	 2.1.2 text/html
+	 2.2 message/rfc822
+	 2.2 multipart/alternative
+	 2.2.1 text/plain
+	 2.2.2 text/html
+	 */
 	/**
 	 * Sub function for getpart(). Only called by createPartArray() and itself.
 	 *
@@ -2298,25 +2314,22 @@ class EmailCollector extends CommonObject
 		imap_fetchbody($mbox, $mid, $partno) : // multipart
 		imap_body($mbox, $mid); // simple
 		// Any part may be encoded, even plain text messages, so check everything.
-		if ($p->encoding == 4)
+		if ($p->encoding == 4) {
 			$data = quoted_printable_decode($data);
-		elseif ($p->encoding == 3)
+		} elseif ($p->encoding == 3) {
 			$data = base64_decode($data);
+		}
 
 		// PARAMETERS
 		// get all parameters, like charset, filenames of attachments, etc.
 		$params = array();
-		if ($p->parameters)
-		{
-			foreach ($p->parameters as $x)
-			{
+		if ($p->parameters) {
+			foreach ($p->parameters as $x) {
 				$params[strtolower($x->attribute)] = $x->value;
 			}
 		}
-		if ($p->dparameters)
-		{
-			foreach ($p->dparameters as $x)
-			{
+		if ($p->dparameters) {
+			foreach ($p->dparameters as $x) {
 				$params[strtolower($x->attribute)] = $x->value;
 			}
 		}
@@ -2338,18 +2351,18 @@ class EmailCollector extends CommonObject
 			}
 			// Messages may be split in different parts because of inline attachments,
 			// so append parts together with blank row.
-			if (strtolower($p->subtype) == 'plain')
+			if (strtolower($p->subtype) == 'plain') {
 				$plainmsg .= trim($data)."\n\n";
-			else $htmlmsg .= $data."<br><br>";
+			} else {
+				$htmlmsg .= $data."<br><br>";
+			}
 			$charset = $params['charset']; // assume all parts are same charset
-		}
-
-		// EMBEDDED MESSAGE
-		// Many bounce notifications embed the original message as type 2,
-		// but AOL uses type 1 (multipart), which is not handled here.
-		// There are no PHP functions to parse embedded messages,
-		// so this just appends the raw source to the main message.
-		elseif ($p->type == 2 && $data) {
+		} elseif ($p->type == 2 && $data) {
+			// EMBEDDED MESSAGE
+			// Many bounce notifications embed the original message as type 2,
+			// but AOL uses type 1 (multipart), which is not handled here.
+			// There are no PHP functions to parse embedded messages,
+			// so this just appends the raw source to the main message.
 			if (!empty($params['charset'])) {
 				$data = $this->convertStringEncoding($data, $params['charset']);
 			}
@@ -2358,8 +2371,7 @@ class EmailCollector extends CommonObject
 
 		// SUBPART RECURSION
 		if ($p->parts) {
-			foreach ($p->parts as $partno0=>$p2)
-			{
+			foreach ($p->parts as $partno0 => $p2) {
 				$this->getpart($mbox, $mid, $p2, $partno.'.'.($partno0 + 1)); // 1.2, 1.2.1, etc.
 			}
 		}
@@ -2376,52 +2388,52 @@ class EmailCollector extends CommonObject
 	 */
 	protected function convertStringEncoding($string, $fromEncoding, $toEncoding = 'UTF-8')
 	{
-  		if (!$string || $fromEncoding == $toEncoding) {
-  			return $string;
-  		}
-  		$convertedString = function_exists('iconv') ? @iconv($fromEncoding, $toEncoding.'//IGNORE', $string) : null;
-  		if (!$convertedString && extension_loaded('mbstring')) {
-  			$convertedString = @mb_convert_encoding($string, $toEncoding, $fromEncoding);
-  		}
-  		if (!$convertedString) {
-  			throw new Exception('Mime string encoding conversion failed');
-  		}
-  		return $convertedString;
-  	}
+		if (!$string || $fromEncoding == $toEncoding) {
+			return $string;
+		}
+		$convertedString = function_exists('iconv') ? @iconv($fromEncoding, $toEncoding.'//IGNORE', $string) : null;
+		if (!$convertedString && extension_loaded('mbstring')) {
+			$convertedString = @mb_convert_encoding($string, $toEncoding, $fromEncoding);
+		}
+		if (!$convertedString) {
+			throw new Exception('Mime string encoding conversion failed');
+		}
+		return $convertedString;
+	}
 
-  	/**
-  	 * Decode a subject string according to RFC2047
-  	 * Example: '=?Windows-1252?Q?RE=A0:_ABC?=' => 'RE : ABC...'
-  	 * Example: '=?UTF-8?Q?A=C3=A9B?=' => 'AéB'
-  	 * Example: '=?UTF-8?B?2KLYstmF2KfbjNi0?=' =>
-  	 * Example: '=?utf-8?B?UkU6IG1vZHVsZSBkb2xpYmFyciBnZXN0aW9ubmFpcmUgZGUgZmljaGllcnMg?= =?utf-8?B?UsOpZsOpcmVuY2UgZGUgbGEgY29tbWFuZGUgVFVHRURJSklSIOKAkyBwYXNz?= =?utf-8?B?w6llIGxlIDIyLzA0LzIwMjA=?='
-  	 *
-  	 * @param 	string	$subject		Subject
-  	 * @return 	string					Decoded subject (in UTF-8)
-  	 */
-  	protected function decodeSMTPSubject($subject)
-  	{
-  		// Decode $overview[0]->subject according to RFC2047
-  		// Can use also imap_mime_header_decode($str)
-  		// Can use also mb_decode_mimeheader($str)
-  		// Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
+	/**
+	 * Decode a subject string according to RFC2047
+	 * Example: '=?Windows-1252?Q?RE=A0:_ABC?=' => 'RE : ABC...'
+	 * Example: '=?UTF-8?Q?A=C3=A9B?=' => 'AéB'
+	 * Example: '=?UTF-8?B?2KLYstmF2KfbjNi0?=' =>
+	 * Example: '=?utf-8?B?UkU6IG1vZHVsZSBkb2xpYmFyciBnZXN0aW9ubmFpcmUgZGUgZmljaGllcnMg?= =?utf-8?B?UsOpZsOpcmVuY2UgZGUgbGEgY29tbWFuZGUgVFVHRURJSklSIOKAkyBwYXNz?= =?utf-8?B?w6llIGxlIDIyLzA0LzIwMjA=?='
+	 *
+	 * @param 	string	$subject		Subject
+	 * @return 	string					Decoded subject (in UTF-8)
+	 */
+	protected function decodeSMTPSubject($subject)
+	{
+		// Decode $overview[0]->subject according to RFC2047
+		// Can use also imap_mime_header_decode($str)
+		// Can use also mb_decode_mimeheader($str)
+		// Can use also iconv_mime_decode($str, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8')
 		if (function_exists('imap_mime_header_decode') && function_exists('iconv_mime_decode')) {
-  			$elements = imap_mime_header_decode($subject);
-  			$newstring = '';
-  			if (!empty($elements)) {
-  				$num = count($elements);
-  				for ($i = 0; $i < $num; $i++) {
-  					$stringinutf8 = (in_array(strtoupper($elements[$i]->charset), array('DEFAULT', 'UTF-8')) ? $elements[$i]->text : iconv_mime_decode($elements[$i]->text, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, $elements[$i]->charset));
-  					$newstring .= $stringinutf8;
-  				}
-  				$subject = $newstring;
-  			}
+			$elements = imap_mime_header_decode($subject);
+			$newstring = '';
+			if (!empty($elements)) {
+				$num = count($elements);
+				for ($i = 0; $i < $num; $i++) {
+					$stringinutf8 = (in_array(strtoupper($elements[$i]->charset), array('DEFAULT', 'UTF-8')) ? $elements[$i]->text : iconv_mime_decode($elements[$i]->text, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, $elements[$i]->charset));
+					$newstring .= $stringinutf8;
+				}
+				$subject = $newstring;
+			}
 		} elseif (!function_exists('mb_decode_mimeheader')) {
 			$subject = mb_decode_mimeheader($subject);
 		} elseif (function_exists('iconv_mime_decode')) {
-  			$subject = iconv_mime_decode($subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
-  		}
+			$subject = iconv_mime_decode($subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
+		}
 
-  		return $subject;
-  	}
+		return $subject;
+	}
 }
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index 58aaf9efdb7..0b8dfbca973 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -155,25 +155,24 @@ class EmailCollectorAction extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
 
 		// Translate some data of arrayofkeyval
-		foreach ($this->fields as $key => $val)
-		{
-			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
-			{
-				foreach ($val['arrayofkeyval'] as $key2 => $val2)
-				{
+		foreach ($this->fields as $key => $val) {
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+				foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 					$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 				}
 			}
@@ -190,8 +189,7 @@ class EmailCollectorAction extends CommonObject
 	public function create(User $user, $notrigger = false)
 	{
 		global $langs;
-		if (empty($this->type))
-		{
+		if (empty($this->type)) {
 			$langs->load("errors");
 			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			return -1;
@@ -230,14 +228,11 @@ class EmailCollectorAction extends CommonObject
 		$object->title = $langs->trans("CopyOf")." ".$object->title;
 		// ...
 		// Clear extrafields that are unique
-		if (is_array($object->array_options) && count($object->array_options) > 0)
-		{
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
 			$extrafields->fetch_name_optionals_label($this->table_element);
-			foreach ($object->array_options as $key => $option)
-			{
+			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
-				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-				{
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
 					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
@@ -275,7 +270,9 @@ class EmailCollectorAction extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -285,13 +282,13 @@ class EmailCollectorAction extends CommonObject
 	 * @return int         <0 if KO, 0 if not found, >0 if OK
 	 */
 	/*public function fetchLines()
-    {
-        $this->lines=array();
+	{
+		$this->lines=array();
 
-        // Load lines with object EmailcollectorActionLine
+		// Load lines with object EmailcollectorActionLine
 
-        return count($this->lines)?1:0;
-    }*/
+		return count($this->lines)?1:0;
+	}*/
 
 	/**
 	 * Update object into database
@@ -333,7 +330,9 @@ class EmailCollectorAction extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$companylink = '';
@@ -344,19 +343,20 @@ class EmailCollectorAction extends CommonObject
 
 		$url = dol_buildpath('/emailcollector/emailcollectoraction_card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowEmailcollectorAction");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -364,20 +364,26 @@ class EmailCollectorAction extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-             $hookmanager->initHooks(array('emailcollectoractiondao'));
-             $parameters=array('id'=>$this->id);
-             $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-             if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-             */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+			 $hookmanager->initHooks(array('emailcollectoractiondao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -385,8 +391,11 @@ class EmailCollectorAction extends CommonObject
 		$hookmanager->initHooks(array('emailcollectoractiondao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -413,40 +422,47 @@ class EmailCollectorAction extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus))
-		{
+		if (empty($this->labelStatus)) {
 			global $langs;
 			//$langs->load("emailcollector");
 			$this->labelStatus[1] = $langs->trans('Enabled');
 			$this->labelStatus[0] = $langs->trans('Disabled');
 		}
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $this->labelStatus[$status];
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $this->labelStatus[$status];
-		} elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		} elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		} elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		} elseif ($mode == 5)
-		{
-			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		} elseif ($mode == 6)
-		{
-			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		} elseif ($mode == 2) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			}
+		} elseif ($mode == 3) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			}
+		} elseif ($mode == 5) {
+			if ($status == 1) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
+		} elseif ($mode == 6) {
+			if ($status == 1) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
 		}
 	}
 
@@ -463,28 +479,23 @@ class EmailCollectorAction extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index 71edce42d94..0e6e54529a8 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -124,25 +124,24 @@ class EmailCollectorFilter extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
 
 		// Translate some data of arrayofkeyval
-		foreach ($this->fields as $key => $val)
-		{
-			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
-			{
-				foreach ($val['arrayofkeyval'] as $key2 => $val2)
-				{
+		foreach ($this->fields as $key => $val) {
+			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+				foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 					$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 				}
 			}
@@ -159,14 +158,12 @@ class EmailCollectorFilter extends CommonObject
 	public function create(User $user, $notrigger = false)
 	{
 		global $langs;
-		if (empty($this->type))
-		{
+		if (empty($this->type)) {
 			$langs->load("errors");
 			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"));
 			return -1;
 		}
-		if (!in_array($this->type, array('seen', 'unseen', 'unanswered', 'answered', 'withtrackingidinmsgid', 'withouttrackingidinmsgid', 'withtrackingid', 'withouttrackingid', 'isanswer', 'isnotanswer')) && empty($this->rulevalue))
-		{
+		if (!in_array($this->type, array('seen', 'unseen', 'unanswered', 'answered', 'withtrackingidinmsgid', 'withouttrackingidinmsgid', 'withtrackingid', 'withouttrackingid', 'isanswer', 'isnotanswer')) && empty($this->rulevalue)) {
 			$langs->load("errors");
 			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("SearchString"));
 			return -2;
@@ -205,14 +202,11 @@ class EmailCollectorFilter extends CommonObject
 		$object->title = $langs->trans("CopyOf")." ".$object->title;
 		// ...
 		// Clear extrafields that are unique
-		if (is_array($object->array_options) && count($object->array_options) > 0)
-		{
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
 			$extrafields->fetch_name_optionals_label($this->table_element);
-			foreach ($object->array_options as $key => $option)
-			{
+			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
-				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey]))
-				{
+				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
 					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
@@ -250,7 +244,9 @@ class EmailCollectorFilter extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -308,7 +304,9 @@ class EmailCollectorFilter extends CommonObject
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 		$companylink = '';
@@ -319,19 +317,20 @@ class EmailCollectorFilter extends CommonObject
 
 		$url = dol_buildpath('/emailcollector/emailcollectorfilter_card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowEmailcollectorFilter");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -339,20 +338,26 @@ class EmailCollectorFilter extends CommonObject
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 
 			/*
-             $hookmanager->initHooks(array('emailcollectorfilterdao'));
-             $parameters=array('id'=>$this->id);
-             $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-             if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-             */
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+			 $hookmanager->initHooks(array('emailcollectorfilterdao'));
+			 $parameters=array('id'=>$this->id);
+			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+			 */
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
@@ -360,8 +365,11 @@ class EmailCollectorFilter extends CommonObject
 		$hookmanager->initHooks(array('emailcollectorfilterdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -388,40 +396,47 @@ class EmailCollectorFilter extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus))
-		{
+		if (empty($this->labelStatus)) {
 			global $langs;
 			//$langs->load("emailcollector");
 			$this->labelStatus[1] = $langs->trans('Enabled');
 			$this->labelStatus[0] = $langs->trans('Disabled');
 		}
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $this->labelStatus[$status];
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $this->labelStatus[$status];
-		} elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		} elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		} elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-			elseif ($status == 0) return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
-		} elseif ($mode == 5)
-		{
-			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
-		} elseif ($mode == 6)
-		{
-			if ($status == 1) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
-			elseif ($status == 0) return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+		} elseif ($mode == 2) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			}
+		} elseif ($mode == 3) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 1) {
+				return img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			} elseif ($status == 0) {
+				return img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelStatus[$status];
+			}
+		} elseif ($mode == 5) {
+			if ($status == 1) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
+		} elseif ($mode == 6) {
+			if ($status == 1) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut4', '', false, 0, 0, '', 'valignmiddle');
+			} elseif ($status == 0) {
+				return $this->labelStatus[$status].' '.img_picto($this->labelStatus[$status], 'statut5', '', false, 0, 0, '', 'valignmiddle');
+			}
 		}
 	}
 
@@ -438,28 +453,23 @@ class EmailCollectorFilter extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
new file mode 100644
index 00000000000..d87ad431b7c
--- /dev/null
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -0,0 +1,1058 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        class/conferenceorbooth.class.php
+ * \ingroup     eventorganization
+ * \brief       This file is a CRUD class file for ConferenceOrBooth (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for ConferenceOrBooth
+ */
+class ConferenceOrBooth extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'eventorganization';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'conferenceorbooth';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'actioncomm';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 1;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
+	/**
+	 * @var string String with name of icon for conferenceorbooth. Must be the part after the 'object_' into object_conferenceorbooth.png
+	 */
+	public $picto = 'conferenceorbooth@eventorganization';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'picto' is code of a picto to show before value in forms
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of object"),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'help'=>"Help text", 'showoncombobox'=>'1',),
+		//'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"Help text for amount",),
+		//'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Help text for quantity",),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"LinkToThirparty",),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1,),
+		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3,),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
+		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>600, 'notnull'=>0, 'visible'=>0,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Valid&eacute;', '9'=>'Annul&eacute;'),),
+	);
+	public $rowid;
+	public $ref;
+	public $label;
+	public $amount;
+	public $qty;
+	public $fk_soc;
+	public $fk_project;
+	public $description;
+	public $note_public;
+	public $note_private;
+	public $date_creation;
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $last_main_doc;
+	public $import_key;
+	public $model_pdf;
+	public $status;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'eventorganization_conferenceorboothline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_conferenceorbooth';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'ConferenceOrBoothline';
+
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables = array();
+
+	// /**
+	//  * @var array    List of child tables. To know object to delete on cascade.
+	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	//  */
+	// protected $childtablesoncascade = array('eventorganization_conferenceorboothdet');
+
+	// /**
+	//  * @var ConferenceOrBoothLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$this->db = $db;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+
+		// Example to show how to set values of fields definition dynamically
+		/*if ($user->rights->eventorganization->conferenceorbooth->read) {
+			$this->fields['myfield']['visible'] = 1;
+			$this->fields['myfield']['noteditable'] = 0;
+		}*/
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val)
+		{
+			if (isset($val['enabled']) && empty($val['enabled']))
+			{
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs))
+		{
+			foreach ($this->fields as $key => $val)
+			{
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
+				{
+					foreach ($val['arrayofkeyval'] as $key2 => $val2)
+					{
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		return $this->createCommon($user, $notrigger);
+	}
+
+	/**
+	 * Clone an object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
+
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
+
+		// Clear fields
+		if (property_exists($object, 'ref')) $object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
+		if (property_exists($object, 'label')) $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		if (property_exists($object, 'status')) { $object->status = self::STATUS_DRAFT; }
+		if (property_exists($object, 'date_creation')) { $object->date_creation = dol_now(); }
+		if (property_exists($object, 'date_modification')) { $object->date_modification = null; }
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0)
+		{
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option)
+			{
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey]))
+				{
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		if (!$error)
+		{
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0)
+			{
+				$error++;
+			}
+		}
+
+		if (!$error)
+		{
+			// copy external contacts if same company
+			if (property_exists($this, 'socid') && $this->socid == $object->socid)
+			{
+				if ($this->copy_linked_contact($object, 'external') < 0)
+					$error++;
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		return $result;
+	}
+
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList();
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		else $sql .= ' WHERE 1 = 1';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= ' AND ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0)
+		{
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		return $this->deleteLineCommon($user, $idline, $notrigger);
+	}
+
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED)
+		{
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->conferenceorbooth->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->conferenceorbooth->conferenceorbooth_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		{
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."'";
+			if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".$user->id;
+			$sql .= " WHERE rowid = ".$this->id;
+
+			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql)
+			{
+				dol_print_error($this->db);
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !$notrigger)
+			{
+				// Call trigger
+				$result = $this->call_trigger('CONFERENCEORBOOTH_VALIDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
+
+		if (!$error)
+		{
+			$this->oldref = $this->ref;
+
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref))
+			{
+				// Now we rename also files into index
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'conferenceorbooth/".$this->db->escape($this->newref)."'";
+				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'conferenceorbooth/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
+				$resql = $this->db->query($sql);
+				if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+
+				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
+				$oldref = dol_sanitizeFileName($this->ref);
+				$newref = dol_sanitizeFileName($num);
+				$dirsource = $conf->eventorganization->dir_output.'/conferenceorbooth/'.$oldref;
+				$dirdest = $conf->eventorganization->dir_output.'/conferenceorbooth/'.$newref;
+				if (!$error && file_exists($dirsource))
+				{
+					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
+
+					if (@rename($dirsource, $dirdest))
+					{
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles = dol_dir_list($conf->eventorganization->dir_output.'/conferenceorbooth/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry)
+						{
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
+
+		// Set new ref and current status
+		if (!$error)
+		{
+			$this->ref = $num;
+			$this->status = self::STATUS_VALIDATED;
+		}
+
+		if (!$error)
+		{
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function setDraft($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status <= self::STATUS_DRAFT)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->eventorganization_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'CONFERENCEORBOOTH_UNVALIDATE');
+	}
+
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->eventorganization_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'CONFERENCEORBOOTH_CANCEL');
+	}
+
+	/**
+	 *	Set back to validated status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_CANCELED)
+		{
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->eventorganization->eventorganization_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'CONFERENCEORBOOTH_REOPEN');
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+
+		$result = '';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("ConferenceOrBooth").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+
+		$url = dol_buildpath('/eventorganization/conferenceorbooth_card.php', 1).'?id='.$this->id;
+
+		if ($option != 'nolink')
+		{
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
+
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowConferenceOrBooth");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				}
+			}
+		}
+
+		if ($withpicto != 2) $result .= $this->ref;
+
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('conferenceorboothdao'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) $result = $hookmanager->resPrint;
+		else $result .= $hookmanager->resPrint;
+
+		return $result;
+	}
+
+	/**
+	 *  Return the label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort))
+		{
+			global $langs;
+			//$langs->load("eventorganization@eventorganization");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_CANCELED) $statusType = 'status6';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+				if ($obj->fk_user_author)
+				{
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_valid)
+				{
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				if ($obj->fk_user_cloture)
+				{
+					$cluser = new User($this->db);
+					$cluser->fetch($obj->fk_user_cloture);
+					$this->user_cloture = $cluser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		$objectline = new ConferenceOrBoothLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_conferenceorbooth = '.$this->id));
+
+		if (is_numeric($result))
+		{
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
+	}
+
+	/**
+	 *  Returns the reference to the following non used object depending on the active numbering module.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("eventorganization@eventorganization");
+
+		if (empty($conf->global->EVENTORGANIZATION_CONFERENCEORBOOTH_ADDON)) {
+			$conf->global->EVENTORGANIZATION_CONFERENCEORBOOTH_ADDON = 'mod_conferenceorbooth_standard';
+		}
+
+		if (!empty($conf->global->EVENTORGANIZATION_CONFERENCEORBOOTH_ADDON))
+		{
+			$mybool = false;
+
+			$file = $conf->global->EVENTORGANIZATION_CONFERENCEORBOOTH_ADDON.".php";
+			$classname = $conf->global->EVENTORGANIZATION_CONFERENCEORBOOTH_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir)
+			{
+				$dir = dol_buildpath($reldir."core/modules/eventorganization/");
+
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
+
+			if ($mybool === false)
+			{
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
+
+			if (class_exists($classname)) {
+				$obj = new $classname();
+				$numref = $obj->getNextValue($this);
+
+				if ($numref != '' && $numref != '-1')
+				{
+					return $numref;
+				} else {
+					$this->error = $obj->error;
+					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+					return "";
+				}
+			} else {
+				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
+				return "";
+			}
+		} else {
+			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
+			return "";
+		}
+	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 *  @param      null|array  $moreparams     Array to provide more information
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
+
+		$result = 0;
+		$includedocgeneration = 0;
+
+		$langs->load("eventorganization@eventorganization");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_conferenceorbooth';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->CONFERENCEORBOOTH_ADDON_PDF)) {
+				$modele = $conf->global->CONFERENCEORBOOTH_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/eventorganization/doc/";
+
+		if ($includedocgeneration && !empty($modele)) {
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
+
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+
+/**
+ * Class ConferenceOrBoothLine. You can also remove this and generate a CRUD class for lines objects.
+ */
+class ConferenceOrBoothLine extends CommonObjectLine
+{
+	// To complete with content of an object ConferenceOrBoothLine
+	// We should have a field rowid, fk_conferenceorbooth and position
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+}
diff --git a/htdocs/eventorganization/conferenceorbooth_agenda.php b/htdocs/eventorganization/conferenceorbooth_agenda.php
new file mode 100644
index 00000000000..1583c0acbd2
--- /dev/null
+++ b/htdocs/eventorganization/conferenceorbooth_agenda.php
@@ -0,0 +1,287 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       conferenceorbooth_agenda.php
+ *  \ingroup    eventorganization
+ *  \brief      Tab of events on ConferenceOrBooth
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+dol_include_once('/eventorganization/class/conferenceorbooth.class.php');
+dol_include_once('/eventorganization/lib/eventorganization_conferenceorbooth.lib.php');
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("eventorganization@eventorganization", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+} else {
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
+
+// Initialize technical objects
+$object = new ConferenceOrBooth($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('conferenceorboothagenda', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->eventorganization->multidir_output[$object->entity]."/".$object->id;
+}
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'eventorganization', $object->id);
+
+$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$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 (empty($reshook)) {
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+	// 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
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0) {
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = '';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+	$head = conferenceorboothPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("ConferenceOrBooth"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/eventorganization/conferenceorbooth_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	// Ref customer
+	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	// Project
+	if (! empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		if ($permissiontoadd) {
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			}
+			$morehtmlref.=' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref.='<input type="hidden" name="action" value="classin">';
+				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref.='</form>';
+			} else {
+				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (! empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+
+
+	// Actions buttons
+
+	$objthirdparty = $object;
+	$objcon = new stdClass();
+
+	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&backtopage='.urlencode($urlbacktopage);
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&socid='.urlencode($objthirdparty->id);
+		}
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
+	}
+
+
+	print '<div class="tabsAction">';
+
+	if (!empty($conf->agenda->enabled)) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
+
+	print '</div>';
+
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage='.urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
+
+
+		//print load_fiche_titre($langs->trans("ActionsOnConferenceOrBooth"), '', '');
+
+		// List of all actions
+		$filters = array();
+		$filters['search_agenda_label'] = $search_agenda_label;
+
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
new file mode 100644
index 00000000000..59b59b78436
--- /dev/null
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -0,0 +1,550 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       event.php
+ *		\ingroup    eventorganization
+ *		\brief      Page to create/edit/view conferenceorbooth
+ */
+
+require '../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("eventorganization", "projects"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+//$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new ConferenceOrBooth($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('conferenceorboothcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+}
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+
+/*$permissiontoread = $user->rights->eventorganization->conferenceorbooth->read;
+$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->eventorganization->conferenceorbooth->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_dellink.inc.php*/
+$permissiontoread = $user->rights->eventorganization->read;
+$permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $user->rights->eventorganization->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->eventorganization->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+// Security check - Protection if external user
+if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) $socid = $user->socid;
+$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$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 (empty($reshook)) {
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/eventorganization/conferenceorbooth_list.php', 1);
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = dol_buildpath('/eventorganization/conferenceorbooth_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+			}
+		}
+	}
+
+	$triggermodname = 'EVENTORGANIZATION_CONFERENCEORBOOTH_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
+
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	if ($action == 'set_thirdparty' && $permissiontoadd) {
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+	}
+	if ($action == 'classin' && $permissiontoadd) {
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
+
+	// Actions to send emails
+	$triggersendname = 'EVENTORGANIZATION_CONFERENCEORBOOTH_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_CONFERENCEORBOOTH_TO';
+	$trackid = 'conferenceorbooth'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+}
+
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("ConferenceOrBooth");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+/*print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';*/
+
+
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("ConferenceOrBooth")), '', 'object_'.$object->picto);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
+
+	print dol_get_fiche_head(array(), '');
+
+	// Set some default values
+	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	print dol_get_fiche_end();
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+	print '&nbsp; ';
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '</div>';
+
+	print '</form>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("ConferenceOrBooth"), '', 'object_'.$object->picto);
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
+
+	print dol_get_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$res = $object->fetch_optionals();
+
+	$head = conferenceorboothPrepareHead($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("ConferenceOrBooth"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteConferenceOrBooth'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}
+	// Confirmation to delete line
+	if ($action == 'deleteline') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+	}
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	}
+
+	// Confirmation of action xxxx
+	if ($action == 'xxx') {
+		$formquestion = array();
+		/*
+		$forcecombo=0;
+		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		$formquestion = array(
+			// 'text' => $langs->trans("ConfirmClone"),
+			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+			// array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+		);
+		*/
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
+
+	// Print form confirm
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/eventorganization/conferenceorbooth_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled)) {
+	 $langs->load("projects");
+	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd) {
+	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+	 $morehtmlref .= ' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+	 $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref .= '</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
+	//unset($object->fields['fk_project']);				// Hide field already shown in banner
+	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+
+	/*
+	 * Lines
+	 */
+
+	if (!empty($object->table_element_line)) {
+		// Show object lines
+		$result = $object->getLinesArray();
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="' . $object->id.'">
+		';
+
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+		}
+
+		print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
+
+		if (!empty($object->lines)) {
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+			if ($action != 'editline') {
+				// Add products/services form
+				$object->formAddObjectLine(1, $mysoc, $soc);
+
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			}
+		}
+
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
+			print '</table>';
+		}
+		print '</div>';
+
+		print "</form>\n";
+	}
+
+
+	// Buttons for actions
+
+	if ($action != 'presend' && $action != 'editline') {
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+		if (empty($reshook)) {
+			// Send
+			if (empty($user->socid)) {
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle');
+			}
+
+			// Back to draft
+			if ($object->status == $object::STATUS_VALIDATED) {
+				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes', '', $permissiontoadd);
+			}
+
+			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit', '', $permissiontoadd);
+
+			// Validate
+			if ($object->status == $object::STATUS_DRAFT) {
+				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
+					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', $permissiontoadd);
+				} else {
+					$langs->load("errors");
+					//print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes', '', 0);
+					print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+				}
+			}
+
+			// Clone
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=scrumsprint', '', $permissiontoadd);
+
+			/*
+			if ($permissiontoadd) {
+				if ($object->status == $object::STATUS_ENABLED) {
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
+				} else {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a>'."\n";
+				}
+			}
+			if ($permissiontoadd) {
+				if ($object->status == $object::STATUS_VALIDATED) {
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close">'.$langs->trans("Cancel").'</a>'."\n";
+				} else {
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans("Re-Open").'</a>'."\n";
+				}
+			}
+			*/
+
+			// Delete (need delete permission, or if draft, just need create/modify permission)
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete', '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+		}
+		print '</div>'."\n";
+	}
+
+
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	if ($action != 'presend') {
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+
+		$includedocgeneration = 0;
+
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->eventorganization->dir_output.'/'.$object->element.'/'.$objref;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->eventorganization->conferenceorbooth->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->eventorganization->conferenceorbooth->write; // If you can create/edit, you can remove a file on card
+			print $formfile->showdocuments('eventorganization:ConferenceOrBooth', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('conferenceorbooth'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+		$MAXEVENT = 10;
+
+		$morehtmlright = '<a href="'.dol_buildpath('/eventorganization/conferenceorbooth_agenda.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+
+		print '</div></div></div>';
+	}
+
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	// Presend form
+	$modelmail = 'conferenceorbooth';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->eventorganization->dir_output;
+	$trackid = 'conferenceorbooth'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
new file mode 100644
index 00000000000..b2a80de902c
--- /dev/null
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -0,0 +1,197 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       conferenceorbooth_contact.php
+ *  \ingroup    eventorganization
+ *  \brief      Tab for contacts linked to ConferenceOrBooth
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+dol_include_once('/eventorganization/class/conferenceorbooth.class.php');
+dol_include_once('/eventorganization/lib/eventorganization_conferenceorbooth.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("eventorganization@eventorganization", "companies", "other", "mails"));
+
+$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref    = GETPOST('ref', 'alpha');
+$lineid = GETPOST('lineid', 'int');
+$socid  = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+
+// Initialize technical objects
+$object = new ConferenceOrBooth($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('conferenceorboothcontact', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'eventorganization', $object->id);
+
+$permission = $user->rights->eventorganization->conferenceorbooth->write;
+
+/*
+ * Add a new contact
+ */
+
+if ($action == 'addcontact' && $permission) {
+	$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
+	$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+
+	if ($result >= 0) {
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	} else {
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+} elseif ($action == 'swapstatut' && $permission) {
+	// Toggle the status of a contact
+	$result = $object->swapContactStatus(GETPOST('ligne'));
+} elseif ($action == 'deletecontact' && $permission) {
+	// Deletes a contact
+	$result = $object->delete_contact($lineid);
+
+	if ($result >= 0) {
+		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
+		exit;
+	} else {
+		dol_print_error($db);
+	}
+}
+
+
+/*
+ * View
+ */
+
+$title = $langs->trans('ConferenceOrBooth')." - ".$langs->trans('ContactsAddresses');
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
+
+
+/* *************************************************************************** */
+/*                                                                             */
+/* View and edit mode                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+
+if ($object->id) {
+	/*
+	 * Show tabs
+	 */
+	$head = conferenceorboothPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'contact', $langs->trans("ConferenceOrBooth"), -1, $object->picto);
+
+	$linkback = '<a href="'.dol_buildpath('/eventorganization/conferenceorbooth_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+
+	print dol_get_fiche_end();
+
+	print '<br>';
+
+	// Contacts lines (modules that overwrite templates must declare this into descriptor)
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	foreach ($dirtpls as $reldir) {
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) {
+			break;
+		}
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
new file mode 100644
index 00000000000..7ad8088c127
--- /dev/null
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -0,0 +1,234 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       conferenceorbooth_document.php
+ *  \ingroup    eventorganization
+ *  \brief      Tab for documents linked to ConferenceOrBooth
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+dol_include_once('/eventorganization/class/conferenceorbooth.class.php');
+dol_include_once('/eventorganization/lib/eventorganization_conferenceorbooth.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("eventorganization@eventorganization", "companies", "other", "mails"));
+
+
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$ref = GETPOST('ref', 'alpha');
+
+// Get parameters
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $liste_limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new ConferenceOrBooth($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('conferenceorboothdocument', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->eventorganization->multidir_output[$object->entity ? $object->entity : $conf->entity]."/conferenceorbooth/".get_exdir(0, 0, 0, 1, $object);
+}
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'eventorganization', $object->id);
+
+$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("ConferenceOrBooth").' - '.$langs->trans("Files");
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+if ($object->id) {
+	/*
+	 * Show tabs
+	 */
+	$head = conferenceorboothPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'document', $langs->trans("ConferenceOrBooth"), -1, $object->picto);
+
+
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file) {
+		$totalsize += $file['size'];
+	}
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/eventorganization/conferenceorbooth_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	// Number of files
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+	// Total size
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+	$modulepart = 'eventorganization';
+	//$permission = $user->rights->eventorganization->conferenceorbooth->write;
+	$permission = 1;
+	//$permtoedit = $user->rights->eventorganization->conferenceorbooth->write;
+	$permtoedit = 1;
+	$param = '&id='.$object->id;
+
+	//$relativepathwithnofile='conferenceorbooth/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = 'conferenceorbooth/'.dol_sanitizeFileName($object->ref).'/';
+
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+} else {
+	accessforbidden('', 0, 1);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
new file mode 100644
index 00000000000..737e69f67e6
--- /dev/null
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -0,0 +1,678 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       conferenceorbooth_list.php
+ *		\ingroup    eventorganization
+ *		\brief      List page for conferenceorbooth
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// load eventorganization libraries
+require_once __DIR__.'/class/conferenceorbooth.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("eventorganization@eventorganization", "other"));
+
+$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical objects
+$object = new ConferenceOrBooth($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('conferenceorboothlist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) {
+	reset($object->fields);					// Reset is required to avoid key() to return null.
+	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml') ? 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 (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
+	}
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=>$val['help']
+		);
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
+
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+$permissiontoread = $user->rights->eventorganization->conferenceorbooth->read;
+$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write;
+$permissiontodelete = $user->rights->eventorganization->conferenceorbooth->delete;
+
+// Security check
+if (empty($conf->eventorganization->enabled)) accessforbidden('Module not enabled');
+$socid = 0;
+if ($user->socid > 0) { // Protection if external user
+	//$socid = $user->socid;
+	accessforbidden();
+}
+//$result = restrictedArea($user, 'eventorganization', $id, '');
+//if (!$permissiontoread) accessforbidden();
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
+$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 (empty($reshook)) {
+	// 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
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
+		}
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'ConferenceOrBooth';
+	$objectlabel = 'ConferenceOrBooth';
+	$uploaddir = $conf->eventorganization->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$now = dol_now();
+
+//$help_url="EN:Module_ConferenceOrBooth|FR:Module_ConferenceOrBooth_FR|ES:Módulo_ConferenceOrBooth";
+$help_url = '';
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("ConferenceOrBooths"));
+
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+foreach ($object->fields as $key => $val) {
+	$sql .= 't.'.$key.', ';
+}
+// 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.', ' : '');
+	}
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+else $sql .= " WHERE 1 = 1";
+foreach ($search as $key => $val) {
+	if (in_array($key, $object->fields)) {
+		if ($key == 'status' && $search[$key] == -1) continue;
+		$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+		if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+			if ($search[$key] == '-1') $search[$key] = '';
+			$mode_search = 2;
+		}
+		if ($search[$key] != '') {
+			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		}
+	} else {
+		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
+			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
+		}
+	}
+}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+/* If a group by is required
+$sql.= " GROUP BY ";
+foreach($object->fields as $key => $val) {
+	$sql.='t.'.$key.', ';
+}
+// 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.', ' : '');
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql=preg_replace('/,\s*$/','', $sql);
+*/
+
+$sql .= $db->order($sortfield, $sortorder);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$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
+		$page = 0;
+		$offset = 0;
+	}
+}
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+		exit;
+	}
+
+	$num = $db->num_rows($resql);
+}
+
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/eventorganization/conferenceorbooth_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			$param .= '&search_'.$key.'[]='.urlencode($skey);
+		}
+	} else {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
+	}
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
+
+// List of mass actions available
+$arrayofmassactions = array(
+	//'validate'=>$langs->trans("Validate"),
+	//'generate_doc'=>$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+);
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
+$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.'">';
+}
+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">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/eventorganization/conferenceorbooth_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendConferenceOrBoothRef";
+$modelmail = "conferenceorbooth";
+$objecttmp = new ConferenceOrBooth($db);
+$trackid = 'xxxx'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
+
+$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($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif (strpos($val['type'], 'integer:') === 0) {
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
+		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+			print '</div>';
+			print '<div class="nowrap">';
+			print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+			print '</div>';
+		}
+		print '</td>';
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+	}
+}
+// 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;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print '</tr>'."\n";
+
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine = 0;
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+	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
+	}
+}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+while ($i < ($limit ? min($num, $limit) : $num)) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
+
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach ($object->fields as $key => $val) {
+		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
+
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
+
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
+		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+			if ($key == 'status') {
+				print $object->getLibStatut(5);
+			} else {
+				print $object->showOutputField($val, $key, $object->$key, '');
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!empty($val['isameasure'])) {
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				}
+				$totalarray['val']['t.'.$key] += $object->$key;
+			}
+		}
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		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']++;
+
+	print '</tr>'."\n";
+
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+}
+
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
+
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_eventorganization', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/eventorganization/conferenceorbooth_note.php b/htdocs/eventorganization/conferenceorbooth_note.php
new file mode 100644
index 00000000000..c34b01df436
--- /dev/null
+++ b/htdocs/eventorganization/conferenceorbooth_note.php
@@ -0,0 +1,184 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       conferenceorbooth_note.php
+ *  \ingroup    eventorganization
+ *  \brief      Tab for notes on ConferenceOrBooth
+ */
+
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+dol_include_once('/eventorganization/class/conferenceorbooth.class.php');
+dol_include_once('/eventorganization/lib/eventorganization_conferenceorbooth.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("eventorganization@eventorganization", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new ConferenceOrBooth($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->eventorganization->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('conferenceorboothnote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'eventorganization', $id);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->eventorganization->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissionnote = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_setnotes.inc.php
+$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('ConferenceOrBooth'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = conferenceorboothPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("ConferenceOrBooth"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/eventorganization/conferenceorbooth_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	 $morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+
+	$cssclass = "titlefield";
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/eventorganization/eventorganizationindex.php b/htdocs/eventorganization/eventorganizationindex.php
new file mode 100644
index 00000000000..655da7813e6
--- /dev/null
+++ b/htdocs/eventorganization/eventorganizationindex.php
@@ -0,0 +1,225 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       eventorganization/eventorganizationindex.php
+ *	\ingroup    eventorganization
+ *	\brief      Home page of eventorganization top menu
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("eventorganization@eventorganization"));
+
+$action = GETPOST('action', 'aZ09');
+
+
+// Security check
+// if (! $user->rights->eventorganization->myobject->read) {
+// 	accessforbidden();
+// }
+$socid = GETPOST('socid', 'int');
+if (isset($user->socid) && $user->socid > 0) {
+	$action = '';
+	$socid = $user->socid;
+}
+
+$max = 5;
+$now = dol_now();
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+llxHeader("", $langs->trans("EventOrganizationArea"));
+
+print load_fiche_titre($langs->trans("EventOrganizationArea"), '', 'eventorganization.png@eventorganization');
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+
+/* BEGIN MODULEBUILDER DRAFT MYOBJECT
+// Draft MyObject
+if (! empty($conf->eventorganization->enabled) && $user->rights->eventorganization->read)
+{
+	$langs->load("orders");
+
+	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
+	$sql.= ", s.code_client";
+	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE c.fk_soc = s.rowid";
+	$sql.= " AND c.fk_statut = 0";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
+	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	if ($socid)	$sql.= " AND c.fk_soc = ".$socid;
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$total = 0;
+		$num = $db->num_rows($resql);
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("DraftMyObjects").($num?'<span class="badge marginleftonlyshort">'.$num.'</span>':'').'</th></tr>';
+
+		$var = true;
+		if ($num > 0)
+		{
+			$i = 0;
+			while ($i < $num)
+			{
+
+				$obj = $db->fetch_object($resql);
+				print '<tr class="oddeven"><td class="nowrap">';
+
+				$myobjectstatic->id=$obj->rowid;
+				$myobjectstatic->ref=$obj->ref;
+				$myobjectstatic->ref_client=$obj->ref_client;
+				$myobjectstatic->total_ht = $obj->total_ht;
+				$myobjectstatic->total_tva = $obj->total_tva;
+				$myobjectstatic->total_ttc = $obj->total_ttc;
+
+				print $myobjectstatic->getNomUrl(1);
+				print '</td>';
+				print '<td class="nowrap">';
+				print '</td>';
+				print '<td class="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
+				$i++;
+				$total += $obj->total_ttc;
+			}
+			if ($total>0)
+			{
+
+				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
+			}
+		}
+		else
+		{
+
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
+		}
+		print "</table><br>";
+
+		$db->free($resql);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+END MODULEBUILDER DRAFT MYOBJECT */
+
+
+print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
+
+
+$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+
+/* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
+// Last modified myobject
+if (! empty($conf->eventorganization->enabled) && $user->rights->eventorganization->read)
+{
+	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
+	$sql.= " FROM ".MAIN_DB_PREFIX."eventorganization_myobject as s";
+	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.entity IN (".getEntity($myobjectstatic->element).")";
+	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	//if ($socid)	$sql.= " AND s.rowid = $socid";
+	$sql .= " ORDER BY s.tms DESC";
+	$sql .= $db->plimit($max, 0);
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="2">';
+		print $langs->trans("BoxTitleLatestModifiedMyObjects", $max);
+		print '</th>';
+		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '</tr>';
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+
+				$myobjectstatic->id=$objp->rowid;
+				$myobjectstatic->ref=$objp->ref;
+				$myobjectstatic->label=$objp->label;
+				$myobjectstatic->status = $objp->status;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$myobjectstatic->getNomUrl(1).'</td>';
+				print '<td class="right nowrap">';
+				print "</td>";
+				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
+				print '</tr>';
+				$i++;
+			}
+
+			$db->free($resql);
+		} else {
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print "</table><br>";
+	}
+}
+*/
+
+print '</div></div></div>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
new file mode 100644
index 00000000000..792fa77d087
--- /dev/null
+++ b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
@@ -0,0 +1,85 @@
+<?php
+/* Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    lib/eventorganization_conferenceorbooth.lib.php
+ * \ingroup eventorganization
+ * \brief   Library files with common functions for ConferenceOrBooth
+ */
+
+/**
+ * Prepare array of tabs for ConferenceOrBooth
+ *
+ * @param	ConferenceOrBooth	$object		ConferenceOrBooth
+ * @return 	array					Array of tabs
+ */
+function conferenceorboothPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("eventorganization@eventorganization");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/eventorganization/conferenceorbooth_card.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
+
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
+	{
+		$nbNote = 0;
+		if (!empty($object->note_private)) $nbNote++;
+		if (!empty($object->note_public)) $nbNote++;
+		$head[$h][0] = dol_buildpath('/eventorganization/conferenceorbooth_note.php', 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Notes');
+		if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		$head[$h][2] = 'note';
+		$h++;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->eventorganization->dir_output."/conferenceorbooth/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = dol_buildpath("/eventorganization/conferenceorbooth_document.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	$head[$h][2] = 'document';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/eventorganization/conferenceorbooth_agenda.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Events");
+	$head[$h][2] = 'agenda';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@eventorganization:/eventorganization/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@eventorganization:/eventorganization/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'conferenceorbooth@eventorganization');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'conferenceorbooth@eventorganization', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 0652424d919..1b723cf716d 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -46,9 +46,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->product->enabled) || !empty($conf->service->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->propal->enabled))   require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+}
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (!empty($conf->productbatch->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+}
 if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -57,25 +63,38 @@ if (!empty($conf->projet->enabled)) {
 // Load translation files required by the page
 $langs->loadLangs(array("sendings", "companies", "bills", 'deliveries', 'orders', 'stocks', 'other', 'propal'));
 
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
-if (!empty($conf->productbatch->enabled)) $langs->load('productbatch');
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load('incoterm');
+}
+if (!empty($conf->productbatch->enabled)) {
+	$langs->load('productbatch');
+}
 
 $origin = GETPOST('origin', 'alpha') ?GETPOST('origin', 'alpha') : 'expedition'; // Example: commande, propal
 $origin_id = GETPOST('id', 'int') ?GETPOST('id', 'int') : '';
 $id = $origin_id;
-if (empty($origin_id)) $origin_id  = GETPOST('origin_id', 'int'); // Id of order or propal
-if (empty($origin_id)) $origin_id  = GETPOST('object_id', 'int'); // Id of order or propal
+if (empty($origin_id)) {
+	$origin_id  = GETPOST('origin_id', 'int'); // Id of order or propal
+}
+if (empty($origin_id)) {
+	$origin_id  = GETPOST('object_id', 'int'); // Id of order or propal
+}
 $ref = GETPOST('ref', 'alpha');
 $line_id = GETPOST('lineid', 'int') ?GETPOST('lineid', 'int') : '';
 
 // Security check
 $socid = '';
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 
-if ($origin == 'expedition') $result = restrictedArea($user, $origin, $id);
-else {
+if ($origin == 'expedition') {
+	$result = restrictedArea($user, $origin, $id);
+} else {
 	$result = restrictedArea($user, 'expedition');
-	if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) accessforbidden();
+	if (empty($user->rights->{$origin}->lire) && empty($user->rights->{$origin}->read)) {
+		accessforbidden();
+	}
 }
 
 $action		= GETPOST('action', 'alpha');
@@ -114,12 +133,12 @@ $date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_d
 
 $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))
-{
-	if ($cancel)
-	{
+if (empty($reshook)) {
+	if ($cancel) {
 		$action = '';
 		$object->fetch($id); // show shipment also after canceling modification
 	}
@@ -132,20 +151,17 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Reopen
-	if ($action == 'reopen' && $user->rights->expedition->creer)
-	{
+	if ($action == 'reopen' && $user->rights->expedition->creer) {
 		$object->fetch($id);
 		$result = $object->reOpen();
 	}
 
 	// Set incoterm
-	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-	{
+	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 	}
 
-	if ($action == 'setref_customer')
-	{
+	if ($action == 'setref_customer') {
 		$result = $object->fetch($id);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -161,32 +177,31 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update_extras')
-	{
+	if ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Actions on extra fields
 			$result = $object->insertExtraFields('SHIPMENT_MODIFY');
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 		}
 
-		if ($error)
+		if ($error) {
 			$action = 'edit_extras';
+		}
 	}
 
 	// Create shipment
-	if ($action == 'add' && $user->rights->expedition->creer)
-	{
+	if ($action == 'add' && $user->rights->expedition->creer) {
 		$error = 0;
 
 		$db->begin();
@@ -226,8 +241,7 @@ if (empty($reshook))
 		$num = count($objectsrc->lines);
 		$totalqty = 0;
 
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			$idl = "idl".$i;
 
 			$sub_qty = array();
@@ -238,14 +252,11 @@ if (empty($reshook))
 			$stockLocation = "ent1".$i."_0";
 			$qty = "qtyl".$i;
 
-			if (!empty($conf->productbatch->enabled) && $objectsrc->lines[$i]->product_tobatch)      // If product need a batch number
-			{
-				if (GETPOSTISSET($batch))
-				{
+			if (!empty($conf->productbatch->enabled) && $objectsrc->lines[$i]->product_tobatch) {      // If product need a batch number
+				if (GETPOSTISSET($batch)) {
 					//shipment line with batch-enable product
 					$qty .= '_'.$j;
-					while (GETPOSTISSET($batch))
-					{
+					while (GETPOSTISSET($batch)) {
 						// save line of detail into sub_qty
 						$sub_qty[$j]['q'] = GETPOST($qty, 'int'); // the qty we want to move for this stock record
 						$sub_qty[$j]['id_batch'] = GETPOST($batch, 'int'); // the id into llx_product_batch of stock record to move
@@ -265,8 +276,7 @@ if (empty($reshook))
 					$totalqty += $subtotalqty;
 				} else {
 					// No detail were provided for lots
-					if (!empty($_POST[$qty]))
-					{
+					if (!empty($_POST[$qty])) {
 						// We try to set an amount
 						// Case we dont use the list of available qty for each warehouse/lot
 						// GUI does not allow this yet
@@ -276,8 +286,7 @@ if (empty($reshook))
 			} elseif (GETPOSTISSET($stockLocation)) {
 				//shipment line from multiple stock locations
 				$qty .= '_'.$j;
-				while (GETPOSTISSET($stockLocation))
-				{
+				while (GETPOSTISSET($stockLocation)) {
 					// save sub line of warehouse
 					$stockLine[$i][$j]['qty'] = price2num(GETPOST($qty, 'alpha'), 'MS');
 					$stockLine[$i][$j]['warehouse_id'] = GETPOST($stockLocation, 'int');
@@ -292,7 +301,9 @@ if (empty($reshook))
 			} else {
 				//var_dump(GETPOST($qty,'alpha')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
-				if (GETPOST($qty, 'int') > 0) $totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
+				if (GETPOST($qty, 'int') > 0) {
+					$totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
+				}
 			}
 
 			// Extrafields
@@ -308,43 +319,38 @@ if (empty($reshook))
 
 		//var_dump($batch_line[2]);
 
-		if ($totalqty > 0)		// There is at least one thing to ship
-		{
+		if ($totalqty > 0) {		// There is at least one thing to ship
 			//var_dump($_POST);exit;
-			for ($i = 0; $i < $num; $i++)
-			{
+			for ($i = 0; $i < $num; $i++) {
 				$qty = "qtyl".$i;
-				if (!isset($batch_line[$i]))
-				{
+				if (!isset($batch_line[$i])) {
 					// not batch mode
-					if (isset($stockLine[$i]))
-					{
+					if (isset($stockLine[$i])) {
 						//shipment from multiple stock locations
 						$nbstockline = count($stockLine[$i]);
-						for ($j = 0; $j < $nbstockline; $j++)
-						{
-							if ($stockLine[$i][$j]['qty'] > 0)
-							{
+						for ($j = 0; $j < $nbstockline; $j++) {
+							if ($stockLine[$i][$j]['qty'] > 0) {
 								$ret = $object->addline($stockLine[$i][$j]['warehouse_id'], $stockLine[$i][$j]['ix_l'], $stockLine[$i][$j]['qty'], $array_options[$i]);
-								if ($ret < 0)
-								{
+								if ($ret < 0) {
 									setEventMessages($object->error, $object->errors, 'errors');
 									$error++;
 								}
 							}
 						}
 					} else {
-						if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS))
-						{
+						if (GETPOST($qty, 'int') > 0 || (GETPOST($qty, 'int') == 0 && $conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {
 							$ent = "entl".$i;
 							$idl = "idl".$i;
 							$entrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : GETPOST('entrepot_id', 'int');
-							if ($entrepot_id < 0) $entrepot_id = '';
-							if (!($objectsrc->lines[$i]->fk_product > 0)) $entrepot_id = 0;
+							if ($entrepot_id < 0) {
+								$entrepot_id = '';
+							}
+							if (!($objectsrc->lines[$i]->fk_product > 0)) {
+								$entrepot_id = 0;
+							}
 
 							$ret = $object->addline($entrepot_id, GETPOST($idl, 'int'), GETPOST($qty, 'int'), $array_options[$i]);
-							if ($ret < 0)
-							{
+							if ($ret < 0) {
 								setEventMessages($object->error, $object->errors, 'errors');
 								$error++;
 							}
@@ -352,11 +358,9 @@ if (empty($reshook))
 					}
 				} else {
 					// batch mode
-					if ($batch_line[$i]['qty'] > 0)
-					{
+					if ($batch_line[$i]['qty'] > 0) {
 						$ret = $object->addline_batch($batch_line[$i], $array_options[$i]);
-						if ($ret < 0)
-						{
+						if ($ret < 0) {
 							setEventMessages($object->error, $object->errors, 'errors');
 							$error++;
 						}
@@ -365,13 +369,13 @@ if (empty($reshook))
 			}
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$ret = $object->create($user); // This create shipment (like Odoo picking) and lines of shipments. Stock movement will be done when validating shipment.
-				if ($ret <= 0)
-				{
+				if ($ret <= 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
@@ -381,8 +385,7 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 			header("Location: card.php?id=".$object->id);
 			exit;
@@ -391,16 +394,10 @@ if (empty($reshook))
 			$_GET["commande_id"] = GETPOST('commande_id', 'int');
 			$action = 'create';
 		}
-	}
-
-	/*
-	 * Build a receiving receipt
-	 */
-	elseif ($action == 'create_delivery' && $conf->delivery_note->enabled && $user->rights->expedition->delivery->creer)
-	{
+	} elseif ($action == 'create_delivery' && $conf->delivery_note->enabled && $user->rights->expedition->delivery->creer) {
+		// Build a receiving receipt
 		$result = $object->create_delivery($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".DOL_URL_ROOT.'/delivery/card.php?action=create_delivery&id='.$result);
 			exit;
 		} else {
@@ -408,9 +405,8 @@ if (empty($reshook))
 		}
 	} elseif ($action == 'confirm_valid' && $confirm == 'yes' &&
 		((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
-	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
-	)
-	{
+		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
+	) {
 		$object->fetch_thirdparty();
 
 		$result = $object->valid($user);
@@ -419,12 +415,15 @@ if (empty($reshook))
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -433,57 +432,47 @@ if (empty($reshook))
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result < 0) dol_print_error($db, $result);
+				if ($result < 0) {
+					dol_print_error($db, $result);
+				}
 			}
 		}
-	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->expedition->supprimer)
-	{
+	} elseif ($action == 'confirm_cancel' && $confirm == 'yes' && $user->rights->expedition->supprimer) {
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
 		$result = $object->cancel(0, $also_update_stock);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$result = $object->setStatut(-1);
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer)
-	{
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->supprimer) {
 		$also_update_stock = (GETPOST('alsoUpdateStock', 'alpha') ? 1 : 0);
 		$result = $object->delete(0, $also_update_stock);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".DOL_URL_ROOT.'/expedition/index.php');
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-	// TODO add alternative status
-	/*elseif ($action == 'reopen' && (! empty($user->rights->expedition->creer) || ! empty($user->rights->expedition->shipping_advance->validate)))
-	{
-	    $result = $object->setStatut(0);
-	    if ($result < 0)
-	    {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
-	}*/
-
-	elseif ($action == 'setdate_livraison' && $user->rights->expedition->creer)
-	{
+		// TODO add alternative status
+		//} elseif ($action == 'reopen' && (! empty($user->rights->expedition->creer) || ! empty($user->rights->expedition->shipping_advance->validate)))
+		//{
+		//	$result = $object->setStatut(0);
+		//	if ($result < 0)
+		//	{
+		//		setEventMessages($object->error, $object->errors, 'errors');
+		//	}
+		//}
+	} elseif ($action == 'setdate_livraison' && $user->rights->expedition->creer) {
 		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 		$object->fetch($id);
 		$result = $object->setDeliveryDate($user, $datedelivery);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Action update
-	elseif (
-		($action == 'settracking_number'
+	} elseif (($action == 'settracking_number'
 		|| $action == 'settracking_url'
 		|| $action == 'settrueWeight'
 		|| $action == 'settrueWidth'
@@ -491,28 +480,36 @@ if (empty($reshook))
 		|| $action == 'settrueDepth'
 		|| $action == 'setshipping_method_id')
 		&& $user->rights->expedition->creer
-		)
-	{
+		) {
+		// Action update
 		$error = 0;
 
-		if ($action == 'settracking_number')		$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
-		if ($action == 'settracking_url')		$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
+		if ($action == 'settracking_number') {
+			$object->tracking_number = trim(GETPOST('tracking_number', 'alpha'));
+		}
+		if ($action == 'settracking_url') {
+			$object->tracking_url = trim(GETPOST('tracking_url', 'int'));
+		}
 		if ($action == 'settrueWeight') {
 			$object->trueWeight = trim(GETPOST('trueWeight', 'int'));
 			$object->weight_units = GETPOST('weight_units', 'int');
 		}
-		if ($action == 'settrueWidth')			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
+		if ($action == 'settrueWidth') {
+			$object->trueWidth = trim(GETPOST('trueWidth', 'int'));
+		}
 		if ($action == 'settrueHeight') {
 						$object->trueHeight = trim(GETPOST('trueHeight', 'int'));
 						$object->size_units = GETPOST('size_units', 'int');
 		}
-		if ($action == 'settrueDepth')			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
-		if ($action == 'setshipping_method_id')	$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
+		if ($action == 'settrueDepth') {
+			$object->trueDepth = trim(GETPOST('trueDepth', 'int'));
+		}
+		if ($action == 'setshipping_method_id') {
+			$object->shipping_method_id = trim(GETPOST('shipping_method_id', 'int'));
+		}
 
-		if (!$error)
-		{
-			if ($object->update($user) >= 0)
-			{
+		if (!$error) {
+			if ($object->update($user) >= 0) {
 				header("Location: card.php?id=".$object->id);
 				exit;
 			}
@@ -520,8 +517,7 @@ if (empty($reshook))
 		}
 
 		$action = "";
-	} elseif ($action == 'classifybilled')
-	{
+	} elseif ($action == 'classifybilled') {
 		$object->fetch($id);
 		$result = $object->setBilled();
 		if ($result >= 0) {
@@ -529,8 +525,7 @@ if (empty($reshook))
 			exit();
 		}
 		setEventMessages($object->error, $object->errors, 'errors');
-	} elseif ($action == 'classifyclosed')
-	{
+	} elseif ($action == 'classifyclosed') {
 		$object->fetch($id);
 		$result = $object->setClosed();
 		if ($result >= 0) {
@@ -538,37 +533,27 @@ if (empty($reshook))
 			exit();
 		}
 		setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	/*
-	 *  delete a line
-	 */
-	elseif ($action == 'deleteline' && !empty($line_id))
-	{
+	} elseif ($action == 'deleteline' && !empty($line_id)) {
+		// delete a line
 		$object->fetch($id);
 		$lines = $object->lines;
 		$line = new ExpeditionLigne($db);
 
 		$num_prod = count($lines);
-		for ($i = 0; $i < $num_prod; $i++)
-		{
-			if ($lines[$i]->id == $line_id)
-			{
-				if (count($lines[$i]->details_entrepot) > 1)
-				{
+		for ($i = 0; $i < $num_prod; $i++) {
+			if ($lines[$i]->id == $line_id) {
+				if (count($lines[$i]->details_entrepot) > 1) {
 					// delete multi warehouse lines
 					foreach ($lines[$i]->details_entrepot as $details_entrepot) {
 						$line->id = $details_entrepot->line_id;
-						if (!$error && $line->delete($user) < 0)
-						{
+						if (!$error && $line->delete($user) < 0) {
 							$error++;
 						}
 					}
 				} else {
 					// delete single warehouse line
 					$line->id = $line_id;
-					if (!$error && $line->delete($user) < 0)
-					{
+					if (!$error && $line->delete($user) < 0) {
 						$error++;
 					}
 				}
@@ -582,13 +567,8 @@ if (empty($reshook))
 		} else {
 			setEventMessages($line->error, $line->errors, 'errors');
 		}
-	}
-
-	/*
-	 *  Update a line
-	 */
-	elseif ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('save'))
-	{
+	} elseif ($action == 'updateline' && $user->rights->expedition->creer && GETPOST('save')) {
+		// Update a line
 		// Clean parameters
 		$qty = 0;
 		$entrepot_id = 0;
@@ -596,10 +576,8 @@ if (empty($reshook))
 
 		$lines = $object->lines;
 		$num_prod = count($lines);
-		for ($i = 0; $i < $num_prod; $i++)
-		{
-			if ($lines[$i]->id == $line_id)		// we have found line to update
-			{
+		for ($i = 0; $i < $num_prod; $i++) {
+			if ($lines[$i]->id == $line_id) {		// we have found line to update
 				$line = new ExpeditionLigne($db);
 
 				// Extrafields Lines
@@ -611,28 +589,25 @@ if (empty($reshook))
 					}
 				}
 				$line->fk_product = $lines[$i]->fk_product;
-				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
-				{
+				if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0) {
 					// line with lot
-					foreach ($lines[$i]->detail_batch as $detail_batch)
-					{
+					foreach ($lines[$i]->detail_batch as $detail_batch) {
 						$lotStock = new Productbatch($db);
 						$batch = "batchl".$detail_batch->fk_expeditiondet."_".$detail_batch->fk_origin_stock;
 						$qty = "qtyl".$detail_batch->fk_expeditiondet.'_'.$detail_batch->id;
 						$batch_id = GETPOST($batch, 'int');
 						$batch_qty = GETPOST($qty, 'int');
-						if (!empty($batch_id) && ($batch_id != $detail_batch->fk_origin_stock || $batch_qty != $detail_batch->qty))
-						{
-							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0)	// $line is ExpeditionLine
-							{
-								if ($lines[$i]->entrepot_id != 0)
-								{
+						if (!empty($batch_id) && ($batch_id != $detail_batch->fk_origin_stock || $batch_qty != $detail_batch->qty)) {
+							if ($lotStock->fetch($batch_id) > 0 && $line->fetch($detail_batch->fk_expeditiondet) > 0) {	// $line is ExpeditionLine
+								if ($lines[$i]->entrepot_id != 0) {
 									// allow update line entrepot_id if not multi warehouse shipping
 									$line->entrepot_id = $lotStock->warehouseid;
 								}
 
 								// detail_batch can be an object with keys, or an array of ExpeditionLineBatch
-								if (empty($line->detail_batch)) $line->detail_batch = new stdClass();
+								if (empty($line->detail_batch)) {
+									$line->detail_batch = new stdClass();
+								}
 
 								$line->detail_batch->fk_origin_stock = $batch_id;
 								$line->detail_batch->batch = $lotStock->batch;
@@ -658,34 +633,25 @@ if (empty($reshook))
 					$batch_id = GETPOST($batch, 'int');
 					$batch_qty = GETPOST($qty, 'int');
 					$lineIdToAddLot = 0;
-					if ($batch_qty > 0 && !empty($batch_id))
-					{
-						if ($lotStock->fetch($batch_id) > 0)
-						{
+					if ($batch_qty > 0 && !empty($batch_id)) {
+						if ($lotStock->fetch($batch_id) > 0) {
 							// check if lotStock warehouse id is same as line warehouse id
-							if ($lines[$i]->entrepot_id > 0)
-							{
+							if ($lines[$i]->entrepot_id > 0) {
 								// single warehouse shipment line
-								if ($lines[$i]->entrepot_id == $lotStock->warehouseid)
-								{
+								if ($lines[$i]->entrepot_id == $lotStock->warehouseid) {
 									$lineIdToAddLot = $line_id;
 								}
-							} elseif (count($lines[$i]->details_entrepot) > 1)
-							{
+							} elseif (count($lines[$i]->details_entrepot) > 1) {
 								// multi warehouse shipment lines
-								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-								{
-									if ($detail_entrepot->entrepot_id == $lotStock->warehouseid)
-									{
+								foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+									if ($detail_entrepot->entrepot_id == $lotStock->warehouseid) {
 										$lineIdToAddLot = $detail_entrepot->line_id;
 									}
 								}
 							}
-							if ($lineIdToAddLot)
-							{
+							if ($lineIdToAddLot) {
 								// add lot to existing line
-								if ($line->fetch($lineIdToAddLot) > 0)
-								{
+								if ($line->fetch($lineIdToAddLot) > 0) {
 									$line->detail_batch->fk_origin_stock = $batch_id;
 									$line->detail_batch->batch = $lotStock->batch;
 									$line->detail_batch->entrepot_id = $lotStock->warehouseid;
@@ -707,8 +673,7 @@ if (empty($reshook))
 								$line->detail_batch[0]->batch = $lotStock->batch;
 								$line->detail_batch[0]->entrepot_id = $lotStock->warehouseid;
 								$line->detail_batch[0]->qty = $batch_qty;
-								if ($object->create_line_batch($line, $line->array_options) < 0)
-								{
+								if ($object->create_line_batch($line, $line->array_options) < 0) {
 									setEventMessages($object->error, $object->errors, 'errors');
 									$error++;
 								}
@@ -719,11 +684,9 @@ if (empty($reshook))
 						}
 					}
 				} else {
-					if ($lines[$i]->fk_product > 0)
-					{
+					if ($lines[$i]->fk_product > 0) {
 						// line without lot
-						if ($lines[$i]->entrepot_id > 0)
-						{
+						if ($lines[$i]->entrepot_id > 0) {
 							// single warehouse shipment line
 							$stockLocation = "entl".$line_id;
 							$qty = "qtyl".$line_id;
@@ -736,17 +699,14 @@ if (empty($reshook))
 							}
 							unset($_POST[$stockLocation]);
 							unset($_POST[$qty]);
-						} elseif (count($lines[$i]->details_entrepot) > 1)
-						{
+						} elseif (count($lines[$i]->details_entrepot) > 1) {
 							// multi warehouse shipment lines
-							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-							{
+							foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
 								if (!$error) {
 									$stockLocation = "entl".$detail_entrepot->line_id;
 									$qty = "qtyl".$detail_entrepot->line_id;
 									$warehouse = GETPOST($stockLocation, 'int');
-									if (!empty($warehouse))
-									{
+									if (!empty($warehouse)) {
 										$line->id = $detail_entrepot->line_id;
 										$line->entrepot_id = $warehouse;
 										$line->qty = GETPOST($qty, 'int');
@@ -783,10 +743,12 @@ if (empty($reshook))
 				// Define output language
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 					$newlang = GETPOST('lang_id', 'aZ09');
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 					$newlang = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -807,7 +769,9 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Actions to send emails
-	if (empty($id)) $id = $facid;
+	if (empty($id)) {
+		$id = $facid;
+	}
 	$triggersendname = 'SHIPPING_SENTBYMAIL';
 	$paramname = 'id';
 	$mode = 'emailfromshipment';
@@ -825,14 +789,15 @@ llxHeader('', $langs->trans('Shipment'), 'Expedition');
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $product_static = new Product($db);
 $shipment_static = new Expedition($db);
 $warehousestatic = new Entrepot($db);
 
-if ($action == 'create2')
-{
+if ($action == 'create2') {
 	print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
 
 	print '<br>'.$langs->trans("ShipmentCreationIsDoneFromOrder");
@@ -840,31 +805,29 @@ if ($action == 'create2')
 }
 
 // Mode creation.
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$expe = new Expedition($db);
 
 	print load_fiche_titre($langs->trans("CreateShipment"), '', 'dolly');
 
-	if (!$origin)
-	{
+	if (!$origin) {
 		setEventMessages($langs->trans("ErrorBadParameters"), null, 'errors');
 	}
 
-	if ($origin)
-	{
+	if ($origin) {
 		$classname = ucfirst($origin);
 
 		$object = new $classname($db);
-		if ($object->fetch($origin_id))	// This include the fetch_lines
-		{
+		if ($object->fetch($origin_id)) {	// This include the fetch_lines
 			$soc = new Societe($db);
 			$soc->fetch($object->socid);
 
 			$author = new User($db);
 			$author->fetch($object->user_author_id);
 
-			if (!empty($conf->stock->enabled)) $entrepot = new Entrepot($db);
+			if (!empty($conf->stock->enabled)) {
+				$entrepot = new Entrepot($db);
+			}
 
 			print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -872,8 +835,7 @@ if ($action == 'create')
 			print '<input type="hidden" name="origin" value="'.$origin.'">';
 			print '<input type="hidden" name="origin_id" value="'.$object->id.'">';
 			print '<input type="hidden" name="ref_int" value="'.$object->ref_int.'">';
-			if (GETPOST('entrepot_id', 'int'))
-			{
+			if (GETPOST('entrepot_id', 'int')) {
 				print '<input type="hidden" name="entrepot_id" value="'.GETPOST('entrepot_id', 'int').'">';
 			}
 
@@ -883,12 +845,10 @@ if ($action == 'create')
 
 			// Ref
 			print '<tr><td class="titlefieldcreate fieldrequired">';
-			if ($origin == 'commande' && !empty($conf->commande->enabled))
-			{
+			if ($origin == 'commande' && !empty($conf->commande->enabled)) {
 				print $langs->trans("RefOrder");
 			}
-			if ($origin == 'propal' && !empty($conf->propal->enabled))
-			{
+			if ($origin == 'propal' && !empty($conf->propal->enabled)) {
 				print $langs->trans("RefProposal");
 			}
 			print '</td><td colspan="3">';
@@ -898,9 +858,13 @@ if ($action == 'create')
 
 			// Ref client
 			print '<tr><td>';
-			if ($origin == 'commande') print $langs->trans('RefCustomerOrder');
-			elseif ($origin == 'propal') print $langs->trans('RefCustomerOrder');
-			else print $langs->trans('RefCustomer');
+			if ($origin == 'commande') {
+				print $langs->trans('RefCustomerOrder');
+			} elseif ($origin == 'propal') {
+				print $langs->trans('RefCustomerOrder');
+			} else {
+				print $langs->trans('RefCustomer');
+			}
 			print '</td><td colspan="3">';
 			print '<input type="text" name="ref_customer" value="'.$object->ref_client.'" />';
 			print '</td>';
@@ -912,11 +876,14 @@ if ($action == 'create')
 			print '</tr>';
 
 			// Project
-			if (!empty($conf->projet->enabled))
-			{
+			if (!empty($conf->projet->enabled)) {
 				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
-				if (empty($projectid) && !empty($object->fk_project)) $projectid = $object->fk_project;
-				if ($origin == 'project') $projectid = ($originid ? $originid : 0);
+				if (empty($projectid) && !empty($object->fk_project)) {
+					$projectid = $object->fk_project;
+				}
+				if ($origin == 'project') {
+					$projectid = ($originid ? $originid : 0);
+				}
 
 				$langs->load("projects");
 				print '<tr>';
@@ -944,8 +911,7 @@ if ($action == 'create')
 			print "</td></tr>";
 
 			// Note Private
-			if ($object->note_private && !$user->socid)
-			{
+			if ($object->note_private && !$user->socid) {
 				print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
 				print '<td colspan="3">';
 				$doleditor = new DolEditor('note_private', $object->note_private, '', 60, 'dolibarr_notes', 'In', 0, false, empty($conf->global->FCKEDITOR_ENABLE_NOTE_PRIVATE) ? 0 : 1, ROWS_3, '90%');
@@ -978,7 +944,9 @@ if ($action == 'create')
 			print '<td colspan="3">';
 			$expe->fetch_delivery_methods();
 			print $form->selectarray("shipping_method_id", $expe->meths, GETPOST('shipping_method_id', 'int'), 1, 0, 0, "", 1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 			print "</td></tr>\n";
 
 			// Tracking number
@@ -1002,8 +970,7 @@ if ($action == 'create')
 
 
 			// Incoterms
-			if (!empty($conf->incoterm->enabled))
-			{
+			if (!empty($conf->incoterm->enabled)) {
 				print '<tr>';
 				print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $object->label_incoterms, 1).'</label></td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -1014,8 +981,7 @@ if ($action == 'create')
 			// Document model
 			include_once DOL_DOCUMENT_ROOT.'/core/modules/expedition/modules_expedition.php';
 			$list = ModelePdfExpedition::liste_modeles($db);
-			if (count($list) > 1)
-			{
+			if (count($list) > 1) {
 				print "<tr><td>".$langs->trans("DefaultModel")."</td>";
 				print '<td colspan="3">';
 				print $form->selectarray('model', $list, $conf->global->EXPEDITION_ADDON_PDF);
@@ -1035,19 +1001,21 @@ if ($action == 'create')
             jQuery(document).ready(function() {
 	            jQuery("#autofill").click(function() {';
 			$i = 0;
-			while ($i < $numAsked)
-			{
+			while ($i < $numAsked) {
 				print 'jQuery("#qtyl'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
-				if (!empty($conf->productbatch->enabled)) print 'jQuery("#qtyl'.$i.'_'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+				if (!empty($conf->productbatch->enabled)) {
+					print 'jQuery("#qtyl'.$i.'_'.$i.'").val(jQuery("#qtyasked'.$i.'").val() - jQuery("#qtydelivered'.$i.'").val());'."\n";
+				}
 				$i++;
 			}
 			print '});
 	            jQuery("#autoreset").click(function() { console.log("Reset values to 0"); ';
 			$i = 0;
-			while ($i < $numAsked)
-			{
+			while ($i < $numAsked) {
 				print 'jQuery("#qtyl'.$i.'").val(0);'."\n";
-				if (!empty($conf->productbatch->enabled)) print 'jQuery("#qtyl'.$i.'_'.$i.'").val(0);'."\n";
+				if (!empty($conf->productbatch->enabled)) {
+					print 'jQuery("#qtyl'.$i.'_'.$i.'").val(0);'."\n";
+				}
 				$i++;
 			}
 			print '});
@@ -1061,15 +1029,13 @@ if ($action == 'create')
 			// Load shipments already done for same order
 			$object->loadExpeditions();
 
-			if ($numAsked)
-			{
+			if ($numAsked) {
 				print '<tr class="liste_titre">';
 				print '<td>'.$langs->trans("Description").'</td>';
 				print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
 				print '<td class="center">'.$langs->trans("QtyShipped").'</td>';
 				print '<td class="center">'.$langs->trans("QtyToShip");
-				if (empty($conf->productbatch->enabled))
-				{
+				if (empty($conf->productbatch->enabled)) {
 					print '<br><a href="#" id="autofill" class="opacitymedium link cursor cursorpointer">'.$langs->trans("Fill").'</a>';
 					print ' / ';
 				} else {
@@ -1077,10 +1043,8 @@ if ($action == 'create')
 				}
 				print '<span id="autoreset" class="opacitymedium link cursor cursorpointer">'.img_picto($langs->trans("Reset"), 'eraser').'</span>';
 				print '</td>';
-				if (!empty($conf->stock->enabled))
-				{
-					if (empty($conf->productbatch->enabled))
-					{
+				if (!empty($conf->stock->enabled)) {
+					if (empty($conf->productbatch->enabled)) {
 						print '<td class="left">'.$langs->trans("Warehouse").' ('.$langs->trans("Stock").')</td>';
 					} else {
 						print '<td class="left">'.$langs->trans("Warehouse").' / '.$langs->trans("Batch").' ('.$langs->trans("Stock").')</td>';
@@ -1090,31 +1054,34 @@ if ($action == 'create')
 			}
 
 			$indiceAsked = 0;
-			while ($indiceAsked < $numAsked)
-			{
+			while ($indiceAsked < $numAsked) {
 				$product = new Product($db);
 
 				$line = $object->lines[$indiceAsked];
 
 				$parameters = array('i' => $indiceAsked, 'line' => $line, 'num' => $numAsked);
 				$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
 
-				if (empty($reshook))
-				{
+				if (empty($reshook)) {
 					// Show product and description
 					$type = $line->product_type ? $line->product_type : $line->fk_product_type;
 					// Try to enhance type detection using date_start and date_end for free lines where type
 					// was not saved.
-					if (!empty($line->date_start)) $type = 1;
-					if (!empty($line->date_end)) $type = 1;
+					if (!empty($line->date_start)) {
+						$type = 1;
+					}
+					if (!empty($line->date_end)) {
+						$type = 1;
+					}
 
 					print '<!-- line '.$line->id.' for product -->'."\n";
 					print '<tr class="oddeven">'."\n";
 
 					// Product label
-					if ($line->fk_product > 0)  // If predefined product
-					{
+					if ($line->fk_product > 0) {  // If predefined product
 						$product->fetch($line->fk_product);
 						$product->load_stock('warehouseopen'); // Load all $product->stock_warehouse[idwarehouse]->detail_batch
 						//var_dump($product->stock_warehouse[1]);
@@ -1139,16 +1106,18 @@ if ($action == 'create')
 						print_date_range($db->jdate($line->date_start), $db->jdate($line->date_end));
 
 						// Add description in form
-						if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-						{
+						if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 							print ($line->desc && $line->desc != $line->product_label) ? '<br>'.dol_htmlentitiesbr($line->desc) : '';
 						}
 
 						print '</td>';
 					} else {
 						print "<td>";
-						if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
-						else $text = img_object($langs->trans('Product'), 'product');
+						if ($type == 1) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
 
 						if (!empty($line->label)) {
 							$text .= ' <strong>'.$line->label.'</strong>';
@@ -1177,8 +1146,7 @@ if ($action == 'create')
 
 					// Qty to ship
 					$quantityAsked = $line->qty;
-					if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES))
-					{
+					if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 						$quantityToBeDelivered = 0;
 					} else {
 						$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
@@ -1186,37 +1154,37 @@ if ($action == 'create')
 					$warehouse_id = GETPOST('entrepot_id', 'int');
 
 					$warehouseObject = null;
-					if ($warehouse_id > 0 || !($line->fk_product > 0) || empty($conf->stock->enabled))     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
-					{
+					if ($warehouse_id > 0 || !($line->fk_product > 0) || empty($conf->stock->enabled)) {     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 						print '<!-- Case warehouse already known or product not a predefined product -->';
 						//ship from preselected location
 						$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
 						$deliverableQty = min($quantityToBeDelivered, $stock);
-						if ($deliverableQty < 0) $deliverableQty = 0;
-						if (empty($conf->productbatch->enabled) || !$product->hasbatch())
-						{
+						if ($deliverableQty < 0) {
+							$deliverableQty = 0;
+						}
+						if (empty($conf->productbatch->enabled) || !$product->hasbatch()) {
 							// Quantity to send
 							print '<td class="center">';
-							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
-							{
-								if (GETPOST('qtyl'.$indiceAsked, 'int')) $deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
+							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+								if (GETPOST('qtyl'.$indiceAsked, 'int')) {
+									$deliverableQty = GETPOST('qtyl'.$indiceAsked, 'int');
+								}
 								print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
-							} else print $langs->trans("NA");
+							} else {
+								print $langs->trans("NA");
+							}
 							print '</td>';
 
 							// Stock
-							if (!empty($conf->stock->enabled))
-							{
+							if (!empty($conf->stock->enabled)) {
 								print '<td class="left">';
-								if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))   // Type of product need stock change ?
-								{
+								if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {   // Type of product need stock change ?
 									// Show warehouse combo list
 									$ent = "entl".$indiceAsked;
 									$idl = "idl".$indiceAsked;
 									$tmpentrepot_id = is_numeric(GETPOST($ent, 'int')) ?GETPOST($ent, 'int') : $warehouse_id;
-									if ($line->fk_product > 0)
-									{
+									if ($line->fk_product > 0) {
 										print '<!-- Show warehouse selection -->';
 
 										$stockMin = false;
@@ -1225,11 +1193,9 @@ if ($action == 'create')
 										}
 										print $formproduct->selectWarehouses($tmpentrepot_id, 'entl'.$indiceAsked, '', 1, 0, $line->fk_product, '', 1, 0, array(), 'minwidth200', '', 1, $stockMin, 'stock DESC, e.ref');
 
-										if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id)
-										{
+										if ($tmpentrepot_id > 0 && $tmpentrepot_id == $warehouse_id) {
 											//print $stock.' '.$quantityToBeDelivered;
-											if ($stock < $quantityToBeDelivered)
-											{
+											if ($stock < $quantityToBeDelivered) {
 												print ' '.img_warning($langs->trans("StockTooLow")); // Stock too low for this $warehouse_id but you can change warehouse
 											}
 										}
@@ -1243,18 +1209,14 @@ if ($action == 'create')
 							print "</tr>\n";
 
 							// Show subproducts of product
-							if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
-							{
+							if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0) {
 								$product->get_sousproduits_arbo();
 								$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-								if (count($prods_arbo) > 0)
-								{
-									foreach ($prods_arbo as $key => $value)
-									{
+								if (count($prods_arbo) > 0) {
+									foreach ($prods_arbo as $key => $value) {
 										//print $value[0];
 										$img = '';
-										if ($value['stock'] < $value['stock_alert'])
-										{
+										if ($value['stock'] < $value['stock_alert']) {
 											$img = img_warning($langs->trans("StockTooLow"));
 										}
 										print "<tr class=\"oddeven\"><td>&nbsp; &nbsp; &nbsp; ->
@@ -1270,23 +1232,21 @@ if ($action == 'create')
 							print '<!-- Case product need lot -->';
 
 							$staticwarehouse = new Entrepot($db);
-							if ($warehouse_id > 0) $staticwarehouse->fetch($warehouse_id);
+							if ($warehouse_id > 0) {
+								$staticwarehouse->fetch($warehouse_id);
+							}
 
 							$subj = 0;
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
-							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
-							{
-								foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)
-								{
+							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch)) {
+								foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch) {
 									$nbofsuggested++;
 								}
 							}
 							print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch))
-							{
-								foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch)	// $dbatch is instance of Productbatch
-								{
+							if (is_object($product->stock_warehouse[$warehouse_id]) && count($product->stock_warehouse[$warehouse_id]->detail_batch)) {
+								foreach ($product->stock_warehouse[$warehouse_id]->detail_batch as $dbatch) {	// $dbatch is instance of Productbatch
 									//var_dump($dbatch);
 									$batchStock = + $dbatch->qty; // To get a numeric
 									$deliverableQty = min($quantityToBeDelivered, $batchStock);
@@ -1315,8 +1275,7 @@ if ($action == 'create')
 									print $detail;
 
 									$quantityToBeDelivered -= $deliverableQty;
-									if ($quantityToBeDelivered < 0)
-									{
+									if ($quantityToBeDelivered < 0) {
 										$quantityToBeDelivered = 0;
 									}
 									$subj++;
@@ -1335,8 +1294,7 @@ if ($action == 'create')
 						}
 					} else {
 						// ship from multiple locations
-						if (empty($conf->productbatch->enabled) || !$product->hasbatch())
-						{
+						if (empty($conf->productbatch->enabled) || !$product->hasbatch()) {
 							print '<!-- Case warehouse not already known and product does not need lot -->';
 							print '<td></td><td></td></tr>'."\n"; // end line and start a new one for each warehouse
 
@@ -1344,38 +1302,33 @@ if ($action == 'create')
 							$subj = 0;
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
-							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
-							{
-								if ($stock_warehouse->real > 0)
-								{
+							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
+								if ($stock_warehouse->real > 0) {
 									$nbofsuggested++;
 								}
 							}
 							$tmpwarehouseObject = new Entrepot($db);
-							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)    // $stock_warehouse is product_stock
-							{
+							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {    // $stock_warehouse is product_stock
 								$tmpwarehouseObject->fetch($warehouse_id);
-								if ($stock_warehouse->real > 0)
-								{
+								if ($stock_warehouse->real > 0) {
 									$stock = + $stock_warehouse->real; // Convert it to number
 									$deliverableQty = min($quantityToBeDelivered, $stock);
 									$deliverableQty = max(0, $deliverableQty);
 									// Quantity to send
 									print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'>';
 									print '<td colspan="3" ></td><td class="center"><!-- qty to ship (no lot management for product line indiceAsked='.$indiceAsked.') -->';
-									if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
-									{
+									if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 										print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '<input name="ent1'.$indiceAsked.'_'.$subj.'" type="hidden" value="'.$warehouse_id.'">';
-									} else print $langs->trans("NA");
+									} else {
+										print $langs->trans("NA");
+									}
 									print '</td>';
 
 									// Stock
-									if (!empty($conf->stock->enabled))
-									{
+									if (!empty($conf->stock->enabled)) {
 										print '<td class="left">';
-										if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
-										{
+										if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 											print $tmpwarehouseObject->getNomUrl(0).' ';
 
 											print '<!-- Show details of stock -->';
@@ -1386,8 +1339,7 @@ if ($action == 'create')
 										print '</td>';
 									}
 									$quantityToBeDelivered -= $deliverableQty;
-									if ($quantityToBeDelivered < 0)
-									{
+									if ($quantityToBeDelivered < 0) {
 										$quantityToBeDelivered = 0;
 									}
 									$subj++;
@@ -1395,18 +1347,14 @@ if ($action == 'create')
 								}
 							}
 							// Show subproducts of product (not recommanded)
-							if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0)
-							{
+							if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $line->fk_product > 0) {
 								$product->get_sousproduits_arbo();
 								$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
-								if (count($prods_arbo) > 0)
-								{
-									foreach ($prods_arbo as $key => $value)
-									{
+								if (count($prods_arbo) > 0) {
+									foreach ($prods_arbo as $key => $value) {
 										//print $value[0];
 										$img = '';
-										if ($value['stock'] < $value['stock_alert'])
-										{
+										if ($value['stock'] < $value['stock_alert']) {
 											$img = img_warning($langs->trans("StockTooLow"));
 										}
 										print '<tr class"oddeven"><td>';
@@ -1429,25 +1377,23 @@ if ($action == 'create')
 							$productlotObject = new Productlot($db);
 							// Define nb of lines suggested for this order line
 							$nbofsuggested = 0;
-							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
-							{
+							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-									foreach ($stock_warehouse->detail_batch as $dbatch)
-									{
+									foreach ($stock_warehouse->detail_batch as $dbatch) {
 										$nbofsuggested++;
 									}
 								}
 							}
-							foreach ($product->stock_warehouse as $warehouse_id=>$stock_warehouse)
-							{
+							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
 								$tmpwarehouseObject->fetch($warehouse_id);
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
-									foreach ($stock_warehouse->detail_batch as $dbatch)
-									{
+									foreach ($stock_warehouse->detail_batch as $dbatch) {
 										//var_dump($dbatch);
 										$batchStock = + $dbatch->qty; // To get a numeric
 										$deliverableQty = min($quantityToBeDelivered, $batchStock);
-										if ($deliverableQty < 0) $deliverableQty = 0;
+										if ($deliverableQty < 0) {
+											$deliverableQty = 0;
+										}
 										print '<!-- subj='.$subj.'/'.$nbofsuggested.' --><tr '.((($subj + 1) == $nbofsuggested) ? $bc[$var] : '').'><td colspan="3"></td><td class="center">';
 										print '<input name="qtyl'.$indiceAsked.'_'.$subj.'" id="qtyl'.$indiceAsked.'_'.$subj.'" type="text" size="4" value="'.$deliverableQty.'">';
 										print '</td>';
@@ -1462,12 +1408,14 @@ if ($action == 'create')
 										//print '|'.$line->fk_product.'|'.$dbatch->batch.'|<br>';
 										print $langs->trans("Batch").': ';
 										$result = $productlotObject->fetch(0, $line->fk_product, $dbatch->batch);
-										if ($result > 0) print $productlotObject->getNomUrl(1);
-										else print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
+										if ($result > 0) {
+											print $productlotObject->getNomUrl(1);
+										} else {
+											print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
+										}
 										print ' ('.$dbatch->qty.')';
 										$quantityToBeDelivered -= $deliverableQty;
-										if ($quantityToBeDelivered < 0)
-										{
+										if ($quantityToBeDelivered < 0) {
 											$quantityToBeDelivered = 0;
 										}
 										//dol_syslog('deliverableQty = '.$deliverableQty.' batchStock = '.$batchStock);
@@ -1477,18 +1425,15 @@ if ($action == 'create')
 								}
 							}
 						}
-						if ($subj == 0) // Line not shown yet, we show it
-						{
+						if ($subj == 0) { // Line not shown yet, we show it
 							$warehouse_selected_id = GETPOST('entrepot_id', 'int');
 
 							print '<!-- line not shown yet, we show it -->';
 							print '<tr class="oddeven"><td colspan="3"></td><td class="center">';
 
-							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
-							{
+							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 								$disabled = '';
-								if (!empty($conf->productbatch->enabled) && $product->hasbatch())
-								{
+								if (!empty($conf->productbatch->enabled) && $product->hasbatch()) {
 									$disabled = 'disabled="disabled"';
 								}
 								if ($warehouse_selected_id <= 0) {		// We did not force a given warehouse, so we won't have no warehouse to change qty.
@@ -1501,16 +1446,17 @@ if ($action == 'create')
 							print '</td>';
 
 							print '<td class="left">';
-							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
-							{
-								if ($warehouse_selected_id > 0)
-								{
+							if ($line->product_type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+								if ($warehouse_selected_id > 0) {
 									$warehouseObject = new Entrepot($db);
 									$warehouseObject->fetch($warehouse_selected_id);
 									print img_warning().' '.$langs->trans("NoProductToShipFoundIntoStock", $warehouseObject->label);
 								} else {
-									if ($line->fk_product) print img_warning().' '.$langs->trans("StockTooLow");
-									else print '';
+									if ($line->fk_product) {
+										print img_warning().' '.$langs->trans("StockTooLow");
+									} else {
+										print '';
+									}
 								}
 							} else {
 								print $langs->trans("Service");
@@ -1521,8 +1467,7 @@ if ($action == 'create')
 					}
 
 					// Line extrafield
-					if (!empty($extrafields))
-					{
+					if (!empty($extrafields)) {
 						//var_dump($line);
 						$colspan = 5;
 						$expLine = new ExpeditionLigne($db);
@@ -1556,21 +1501,18 @@ if ($action == 'create')
 			dol_print_error($db);
 		}
 	}
-} elseif ($id || $ref)
-/* *************************************************************************** */
-/*                                                                             */
-/* Edit and view mode                                                          */
-/*                                                                             */
-/* *************************************************************************** */
-{
+} elseif ($id || $ref) {
+	/* *************************************************************************** */
+	/*                                                                             */
+	/* Edit and view mode                                                          */
+	/*                                                                             */
+	/* *************************************************************************** */
 	$lines = $object->lines;
 
 	$num_prod = count($lines);
 
-	if ($object->id > 0)
-	{
-		if (!empty($object->origin) && $object->origin_id > 0)
-		{
+	if ($object->id > 0) {
+		if (!empty($object->origin) && $object->origin_id > 0) {
 			$typeobject = $object->origin;
 			$origin = $object->origin;
 			$origin_id = $object->origin_id;
@@ -1588,8 +1530,7 @@ if ($action == 'create')
 		$formconfirm = '';
 
 		// Confirm deleteion
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			$formquestion = array();
 			if ($object->statut == Expedition::STATUS_CLOSED && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
 				$formquestion = array(
@@ -1613,11 +1554,9 @@ if ($action == 'create')
 		}
 
 		// Confirmation validation
-		if ($action == 'valid')
-		{
+		if ($action == 'valid') {
 			$objectref = substr($object->ref, 1, 4);
-			if ($objectref == 'PROV')
-			{
+			if ($objectref == 'PROV') {
 				$numref = $object->getNextNumRef($soc);
 			} else {
 				$numref = $object->ref;
@@ -1625,8 +1564,7 @@ if ($action == 'create')
 
 			$text = $langs->trans("ConfirmValidateSending", $numref);
 
-			if (!empty($conf->notification->enabled))
-			{
+			if (!empty($conf->notification->enabled)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 				$notify = new Notify($db);
 				$text .= '<br>';
@@ -1636,16 +1574,18 @@ if ($action == 'create')
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('ValidateSending'), $text, 'confirm_valid', '', 0, 1);
 		}
 		// Confirm cancelation
-		if ($action == 'cancel')
-		{
+		if ($action == 'cancel') {
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('CancelSending'), $langs->trans("ConfirmCancelSending", $object->ref), 'confirm_cancel', '', 0, 1);
 		}
 
 		// Call Hook formConfirm
 		$parameters = array('formConfirm' => $formconfirm);
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+		if (empty($reshook)) {
+			$formconfirm .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm = $hookmanager->resPrint;
+		}
 
 		// Print form confirm
 		print $formconfirm;
@@ -1657,13 +1597,11 @@ if ($action == 'create')
 		$totalVolume = $tmparray['volume'];
 
 
-		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-		{
+		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
 			$objectsrc = new Commande($db);
 			$objectsrc->fetch($object->$typeobject->id);
 		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-		{
+		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled)) {
 			$objectsrc = new Propal($db);
 			$objectsrc->fetch($object->$typeobject->id);
 		}
@@ -1723,8 +1661,7 @@ if ($action == 'create')
 		print '<table class="border tableforfield" width="100%">';
 
 		// Linked documents
-		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-		{
+		if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
 			print '<tr><td>';
 			print $langs->trans("RefOrder").'</td>';
 			print '<td colspan="3">';
@@ -1732,8 +1669,7 @@ if ($action == 'create')
 			print "</td>\n";
 			print '</tr>';
 		}
-		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-		{
+		if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled)) {
 			print '<tr><td>';
 			print $langs->trans("RefProposal").'</td>';
 			print '<td colspan="3">';
@@ -1753,11 +1689,12 @@ if ($action == 'create')
 		print $langs->trans('DateDeliveryPlanned');
 		print '</td>';
 
-		if ($action != 'editdate_livraison') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+		if ($action != 'editdate_livraison') {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
-		if ($action == 'editdate_livraison')
-		{
+		if ($action == 'editdate_livraison') {
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
@@ -1775,8 +1712,7 @@ if ($action == 'create')
 		print $form->editfieldkey("Weight", 'trueWeight', $object->trueWeight, $object, $user->rights->expedition->creer);
 		print '</td><td colspan="3">';
 
-		if ($action == 'edittrueWeight')
-		{
+		if ($action == 'edittrueWeight') {
 			print '<form name="settrueweight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input name="action" value="settrueWeight" type="hidden">';
 			print '<input name="id" value="'.$object->id.'" type="hidden">';
@@ -1792,11 +1728,14 @@ if ($action == 'create')
 		}
 
 		// Calculated
-		if ($totalWeight > 0)
-		{
-			if (!empty($object->trueWeight)) print ' ('.$langs->trans("SumOfProductWeights").': ';
+		if ($totalWeight > 0) {
+			if (!empty($object->trueWeight)) {
+				print ' ('.$langs->trans("SumOfProductWeights").': ';
+			}
 			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
-			if (!empty($object->trueWeight)) print ')';
+			if (!empty($object->trueWeight)) {
+				print ')';
+			}
 		}
 		print '</td></tr>';
 
@@ -1808,8 +1747,7 @@ if ($action == 'create')
 
 		// Height
 		print '<tr><td>'.$form->editfieldkey("Height", 'trueHeight', $object->trueHeight, $object, $user->rights->expedition->creer).'</td><td colspan="3">';
-		if ($action == 'edittrueHeight')
-		{
+		if ($action == 'edittrueHeight') {
 			print '<form name="settrueHeight" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input name="action" value="settrueHeight" type="hidden">';
 			print '<input name="id" value="'.$object->id.'" type="hidden">';
@@ -1839,25 +1777,27 @@ if ($action == 'create')
 		print '<td colspan="3">';
 		$calculatedVolume = 0;
 		$volumeUnit = 0;
-		if ($object->trueWidth && $object->trueHeight && $object->trueDepth)
-		{
+		if ($object->trueWidth && $object->trueHeight && $object->trueDepth) {
 			$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
 			$volumeUnit = $object->size_units * 3;
 		}
 		// If sending volume not defined we use sum of products
-		if ($calculatedVolume > 0)
-		{
-			if ($volumeUnit < 50)
-			{
+		if ($calculatedVolume > 0) {
+			if ($volumeUnit < 50) {
 				print showDimensionInBestUnit($calculatedVolume, $volumeUnit, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
-			} else print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
+			} else {
+				print $calculatedVolume.' '.measuringUnitString(0, "volume", $volumeUnit);
+			}
 		}
-		if ($totalVolume > 0)
-		{
-			if ($calculatedVolume) print ' ('.$langs->trans("SumOfProductVolumes").': ';
+		if ($totalVolume > 0) {
+			if ($calculatedVolume) {
+				print ' ('.$langs->trans("SumOfProductVolumes").': ';
+			}
 			print showDimensionInBestUnit($totalVolume, 0, "volume", $langs, isset($conf->global->MAIN_VOLUME_DEFAULT_ROUND) ? $conf->global->MAIN_VOLUME_DEFAULT_ROUND : -1, isset($conf->global->MAIN_VOLUME_DEFAULT_UNIT) ? $conf->global->MAIN_VOLUME_DEFAULT_UNIT : 'no');
 			//if (empty($calculatedVolume)) print ' ('.$langs->trans("Calculated").')';
-			if ($calculatedVolume) print ')';
+			if ($calculatedVolume) {
+				print ')';
+			}
 		}
 		print "</td>\n";
 		print '</tr>';
@@ -1881,22 +1821,24 @@ if ($action == 'create')
 		print $langs->trans('SendingMethod');
 		print '</td>';
 
-		if ($action != 'editshipping_method_id') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).'</a></td>';
+		if ($action != 'editshipping_method_id') {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping_method_id&amp;id='.$object->id.'">'.img_edit($langs->trans('SetSendingMethod'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
-		if ($action == 'editshipping_method_id')
-		{
+		if ($action == 'editshipping_method_id') {
 			print '<form name="setshipping_method_id" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setshipping_method_id">';
 			$object->fetch_delivery_methods();
 			print $form->selectarray("shipping_method_id", $object->meths, $object->shipping_method_id, 1, 0, 0, "", 1);
-			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			if ($user->admin) {
+				print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			}
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 			print '</form>';
 		} else {
-			if ($object->shipping_method_id > 0)
-			{
+			if ($object->shipping_method_id > 0) {
 				// Get code using getLabelFromKey
 				$code = $langs->getLabelFromKey($db, $object->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 				print $langs->trans("SendingMethod".strtoupper($code));
@@ -1911,19 +1853,20 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Incoterms
-		if (!empty($conf->incoterm->enabled))
-		{
+		if (!empty($conf->incoterm->enabled)) {
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
 			print $langs->trans('IncotermLabel');
 			print '<td><td class="right">';
-			if ($user->rights->expedition->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-			else print '&nbsp;';
+			if ($user->rights->expedition->creer) {
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/expedition/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td></tr></table>';
 			print '</td>';
 			print '<td colspan="3">';
-			if ($action != 'editincoterm')
-			{
+			if ($action != 'editincoterm') {
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -1947,8 +1890,7 @@ if ($action == 'create')
 
 		// Lines of products
 
-		if ($action == 'editline')
-		{
+		if ($action == 'editline') {
 			print '	<form name="updateline" id="updateline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;lineid='.$line_id.'" method="POST">
 			<input type="hidden" name="token" value="' . newToken().'">
 			<input type="hidden" name="action" value="updateline">
@@ -1963,76 +1905,72 @@ if ($action == 'create')
 		print '<thead>';
 		print '<tr class="liste_titre">';
 		// Adds a line numbering column
-		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-		{
+		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 			print '<td width="5" class="center linecolnum">&nbsp;</td>';
 		}
 		// Product/Service
 		print '<td  class="linecoldescription" >'.$langs->trans("Products").'</td>';
 		// Qty
 		print '<td class="center linecolqty">'.$langs->trans("QtyOrdered").'</td>';
-		if ($origin && $origin_id > 0)
-		{
+		if ($origin && $origin_id > 0) {
 			print '<td class="center linecolqtyinothershipments">'.$langs->trans("QtyInOtherShipments").'</td>';
 		}
-		if ($action == 'editline')
-		{
+		if ($action == 'editline') {
 			$editColspan = 3;
-			if (empty($conf->stock->enabled)) $editColspan--;
-			if (empty($conf->productbatch->enabled)) $editColspan--;
+			if (empty($conf->stock->enabled)) {
+				$editColspan--;
+			}
+			if (empty($conf->productbatch->enabled)) {
+				$editColspan--;
+			}
 			print '<td class="center linecoleditlineotherinfo" colspan="'.$editColspan.'">';
-			if ($object->statut <= 1)
-			{
+			if ($object->statut <= 1) {
 				print $langs->trans("QtyToShip").' - ';
 			} else {
 				print $langs->trans("QtyShipped").' - ';
 			}
-			if (!empty($conf->stock->enabled))
-			{
+			if (!empty($conf->stock->enabled)) {
 				print $langs->trans("WarehouseSource").' - ';
 			}
-			if (!empty($conf->productbatch->enabled))
-			{
+			if (!empty($conf->productbatch->enabled)) {
 				print $langs->trans("Batch");
 			}
 			print '</td>';
 		} else {
-			if ($object->statut <= 1)
-			{
+			if ($object->statut <= 1) {
 				print '<td class="center linecolqtytoship">'.$langs->trans("QtyToShip").'</td>';
 			} else {
 				print '<td class="center linecolqtyshipped">'.$langs->trans("QtyShipped").'</td>';
 			}
-			if (!empty($conf->stock->enabled))
-			{
+			if (!empty($conf->stock->enabled)) {
 				print '<td class="left linecolwarehousesource">'.$langs->trans("WarehouseSource").'</td>';
 			}
 
-			if (!empty($conf->productbatch->enabled))
-			{
+			if (!empty($conf->productbatch->enabled)) {
 				print '<td class="left linecolbatch">'.$langs->trans("Batch").'</td>';
 			}
 		}
 		print '<td class="center linecolweight">'.$langs->trans("CalculatedWeight").'</td>';
 		print '<td class="center linecolvolume">'.$langs->trans("CalculatedVolume").'</td>';
 		//print '<td class="center">'.$langs->trans("Size").'</td>';
-		if ($object->statut == 0)
-		{
+		if ($object->statut == 0) {
 			print '<td class="linecoledit"></td>';
 			print '<td class="linecoldelete" width="10"></td>';
 		}
 		print "</tr>\n";
 		print '</thead>';
 
-		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-		{
+		if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 			$object->fetch_thirdparty();
 			$outputlangs = $langs;
 			$newlang = '';
-			if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-			if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
-			if (!empty($newlang))
-			{
+			if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+				$newlang = GETPOST('lang_id', 'aZ09');
+			}
+			if (empty($newlang)) {
+				$newlang = $object->thirdparty->default_lang;
+			}
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
@@ -2040,8 +1978,7 @@ if ($action == 'create')
 
 		// Get list of products already sent for same source object into $alreadysent
 		$alreadysent = array();
-		if ($origin && $origin_id > 0)
-		{
+		if ($origin && $origin_id > 0) {
 			$sql = "SELECT obj.rowid, obj.fk_product, obj.label, obj.description, obj.product_type as fk_product_type, obj.qty as qty_asked, obj.date_start, obj.date_end";
 			$sql .= ", ed.rowid as shipmentline_id, ed.qty as qty_shipped, ed.fk_expedition as expedition_id, ed.fk_origin_line, ed.fk_entrepot";
 			$sql .= ", e.rowid as shipment_id, e.ref as shipment_ref, e.date_creation, e.date_valid, e.date_delivery, e.date_expedition";
@@ -2062,16 +1999,13 @@ if ($action == 'create')
 
 			dol_syslog("get list of shipment lines", LOG_DEBUG);
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $db->num_rows($resql);
 				$i = 0;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
-					if ($obj)
-					{
+					if ($obj) {
 						// $obj->rowid is rowid in $origin."det" table
 						$alreadysent[$obj->rowid][$obj->shipmentline_id] = array(
 							'shipment_ref'=>$obj->shipment_ref, 'shipment_id'=>$obj->shipment_id, 'warehouse'=>$obj->fk_entrepot, 'qty_shipped'=>$obj->qty_shipped,
@@ -2087,33 +2021,32 @@ if ($action == 'create')
 		print '<tbody>';
 
 		// Loop on each product to send/sent
-		for ($i = 0; $i < $num_prod; $i++)
-		{
+		for ($i = 0; $i < $num_prod; $i++) {
 			$parameters = array('i' => $i, 'line' => $lines[$i], 'line_id' => $line_id, 'num' => $num_prod, 'alreadysent' => $alreadysent, 'editColspan' => $editColspan, 'outputlangs' => $outputlangs);
 			$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
-			if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			}
 
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				print '<!-- origin line id = '.$lines[$i]->origin_line_id.' -->'; // id of order line
 				print '<tr class="oddeven" id="row-'.$lines[$i]->id.'" data-id="'.$lines[$i]->id.'" data-element="'.$lines[$i]->element.'" >';
 
 				// #
-				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER))
-				{
+				if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 					print '<td class="center linecolnum">'.($i + 1).'</td>';
 				}
 
 				// Predefined product or service
-				if ($lines[$i]->fk_product > 0)
-				{
+				if ($lines[$i]->fk_product > 0) {
 					// Define output language
-					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-					{
+					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 						$prod = new Product($db);
 						$prod->fetch($lines[$i]->fk_product);
 						$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $lines[$i]->product_label;
-					} else $label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
+					} else {
+						$label = (!empty($lines[$i]->label) ? $lines[$i]->label : $lines[$i]->product_label);
+					}
 
 					print '<td class="linecoldescription">';
 
@@ -2143,15 +2076,17 @@ if ($action == 'create')
 					$description = (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($lines[$i]->description));
 					print $form->textwithtooltip($text, $description, 3, '', '', $i);
 					print_date_range($lines[$i]->date_start, $lines[$i]->date_end);
-					if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-					{
+					if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 						print (!empty($lines[$i]->description) && $lines[$i]->description != $lines[$i]->product) ? '<br>'.dol_htmlentitiesbr($lines[$i]->description) : '';
 					}
 					print "</td>\n";
 				} else {
 					print '<td class="linecoldescription" >';
-					if ($lines[$i]->product_type == Product::TYPE_SERVICE) $text = img_object($langs->trans('Service'), 'service');
-					else $text = img_object($langs->trans('Product'), 'product');
+					if ($lines[$i]->product_type == Product::TYPE_SERVICE) {
+						$text = img_object($langs->trans('Service'), 'service');
+					} else {
+						$text = img_object($langs->trans('Product'), 'product');
+					}
 
 					if (!empty($lines[$i]->label)) {
 						$text .= ' <strong>'.$lines[$i]->label.'</strong>';
@@ -2168,26 +2103,25 @@ if ($action == 'create')
 				print '<td class="center linecolqty">'.$lines[$i]->qty_asked.'</td>';
 
 				// Qty in other shipments (with shipment and warehouse used)
-				if ($origin && $origin_id > 0)
-				{
+				if ($origin && $origin_id > 0) {
 					print '<td class="linecolqtyinothershipments center nowrap">';
-					foreach ($alreadysent as $key => $val)
-					{
-						if ($lines[$i]->fk_origin_line == $key)
-						{
+					foreach ($alreadysent as $key => $val) {
+						if ($lines[$i]->fk_origin_line == $key) {
 							$j = 0;
-							foreach ($val as $shipmentline_id=> $shipmentline_var)
-							{
-								if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) continue; // We want to show only "other shipments"
+							foreach ($val as $shipmentline_id => $shipmentline_var) {
+								if ($shipmentline_var['shipment_id'] == $lines[$i]->fk_expedition) {
+									continue; // We want to show only "other shipments"
+								}
 
 								$j++;
-								if ($j > 1) print '<br>';
+								if ($j > 1) {
+									print '<br>';
+								}
 								$shipment_static->fetch($shipmentline_var['shipment_id']);
 								print $shipment_static->getNomUrl(1);
 								print ' - '.$shipmentline_var['qty_shipped'];
 								$htmltext = $langs->trans("DateValidation").' : '.(empty($shipmentline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($shipmentline_var['date_valid'], 'dayhour'));
-								if (!empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0)
-								{
+								if (!empty($conf->stock->enabled) && $shipmentline_var['warehouse'] > 0) {
 									$warehousestatic->fetch($shipmentline_var['warehouse']);
 									$htmltext .= '<br>'.$langs->trans("FromLocation").' : '.$warehousestatic->getNomUrl(1, '', 0, 1);
 								}
@@ -2198,22 +2132,18 @@ if ($action == 'create')
 					print '</td>';
 				}
 
-				if ($action == 'editline' && $lines[$i]->id == $line_id)
-				{
+				if ($action == 'editline' && $lines[$i]->id == $line_id) {
 					// edit mode
 					print '<td colspan="'.$editColspan.'" class="center"><table class="nobordernopadding">';
-					if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0)
-					{
+					if (is_array($lines[$i]->detail_batch) && count($lines[$i]->detail_batch) > 0) {
 						print '<!-- case edit 1 -->';
 						$line = new ExpeditionLigne($db);
-						foreach ($lines[$i]->detail_batch as $detail_batch)
-						{
+						foreach ($lines[$i]->detail_batch as $detail_batch) {
 							print '<tr>';
 							// Qty to ship or shipped
 							print '<td><input name="qtyl'.$detail_batch->fk_expeditiondet.'_'.$detail_batch->id.'" id="qtyl'.$line_id.'_'.$detail_batch->id.'" type="text" size="4" value="'.$detail_batch->qty.'"></td>';
 							// Batch number managment
-							if ($lines[$i]->entrepot_id == 0)
-							{
+							if ($lines[$i]->entrepot_id == 0) {
 								// only show lot numbers from src warehouse when shipping from multiple warehouses
 								$line->fetch($detail_batch->fk_expeditiondet);
 							}
@@ -2227,12 +2157,9 @@ if ($action == 'create')
 						// Batch number managment
 						print '<td>'.$formproduct->selectLotStock('', 'batchl'.$line_id.'_0', '', 1, 0, $lines[$i]->fk_product).'</td>';
 						print '</tr>';
-					} elseif (!empty($conf->stock->enabled))
-					{
-						if ($lines[$i]->fk_product > 0)
-						{
-							if ($lines[$i]->entrepot_id > 0)
-							{
+					} elseif (!empty($conf->stock->enabled)) {
+						if ($lines[$i]->fk_product > 0) {
+							if ($lines[$i]->entrepot_id > 0) {
 								print '<!-- case edit 2 -->';
 								print '<tr>';
 								// Qty to ship or shipped
@@ -2242,11 +2169,9 @@ if ($action == 'create')
 								// Batch number managment
 								print '<td> - '.$langs->trans("NA").'</td>';
 								print '</tr>';
-							} elseif (count($lines[$i]->details_entrepot) > 1)
-							{
+							} elseif (count($lines[$i]->details_entrepot) > 1) {
 								print '<!-- case edit 3 -->';
-								foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-								{
+								foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
 									print '<tr>';
 									// Qty to ship or shipped
 									print '<td><input name="qtyl'.$detail_entrepot->line_id.'" id="qtyl'.$detail_entrepot->line_id.'" type="text" size="4" value="'.$detail_entrepot->qty_shipped.'"></td>';
@@ -2279,21 +2204,16 @@ if ($action == 'create')
 					print '<td class="linecolqtytoship center">'.$lines[$i]->qty_shipped.'</td>';
 
 					// Warehouse source
-					if (!empty($conf->stock->enabled))
-					{
+					if (!empty($conf->stock->enabled)) {
 						print '<td class="linecolwarehousesource left">';
-						if ($lines[$i]->entrepot_id > 0)
-						{
+						if ($lines[$i]->entrepot_id > 0) {
 							$entrepot = new Entrepot($db);
 							$entrepot->fetch($lines[$i]->entrepot_id);
 							print $entrepot->getNomUrl(1);
-						} elseif (count($lines[$i]->details_entrepot) > 1)
-						{
+						} elseif (count($lines[$i]->details_entrepot) > 1) {
 							$detail = '';
-							foreach ($lines[$i]->details_entrepot as $detail_entrepot)
-							{
-								if ($detail_entrepot->entrepot_id > 0)
-								{
+							foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+								if ($detail_entrepot->entrepot_id > 0) {
 									$entrepot = new Entrepot($db);
 									$entrepot->fetch($detail_entrepot->entrepot_id);
 									$detail .= $langs->trans("DetailWarehouseFormat", $entrepot->libelle, $detail_entrepot->qty_shipped).'<br/>';
@@ -2305,17 +2225,13 @@ if ($action == 'create')
 					}
 
 					// Batch number managment
-					if (!empty($conf->productbatch->enabled))
-					{
-						if (isset($lines[$i]->detail_batch))
-						{
+					if (!empty($conf->productbatch->enabled)) {
+						if (isset($lines[$i]->detail_batch)) {
 							print '<!-- Detail of lot -->';
 							print '<td class="linecolbatch">';
-							if ($lines[$i]->product_tobatch)
-							{
+							if ($lines[$i]->product_tobatch) {
 								$detail = '';
-								foreach ($lines[$i]->detail_batch as $dbatch)	// $dbatch is instance of ExpeditionLineBatch
-								{
+								foreach ($lines[$i]->detail_batch as $dbatch) {	// $dbatch is instance of ExpeditionLineBatch
 									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
 									if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
@@ -2339,27 +2255,31 @@ if ($action == 'create')
 
 				// Weight
 				print '<td class="center linecolweight">';
-				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->weight * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "weight", $lines[$i]->weight_units);
-				else print '&nbsp;';
+				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+					print $lines[$i]->weight * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "weight", $lines[$i]->weight_units);
+				} else {
+					print '&nbsp;';
+				}
 				print '</td>';
 
 				// Volume
 				print '<td class="center linecolvolume">';
-				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) print $lines[$i]->volume * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units);
-				else print '&nbsp;';
+				if ($lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
+					print $lines[$i]->volume * $lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units);
+				} else {
+					print '&nbsp;';
+				}
 				print '</td>';
 
 				// Size
 				//print '<td class="center">'.$lines[$i]->volume*$lines[$i]->qty_shipped.' '.measuringUnitString(0, "volume", $lines[$i]->volume_units).'</td>';
 
-				if ($action == 'editline' && $lines[$i]->id == $line_id)
-				{
+				if ($action == 'editline' && $lines[$i]->id == $line_id) {
 					print '<td class="center" colspan="2" valign="middle">';
 					print '<input type="submit" class="button button-save" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
 					print '<input type="submit" class="button button-cancel" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"><br>';
 					print '</td>';
-				} elseif ($object->statut == Expedition::STATUS_DRAFT)
-				{
+				} elseif ($object->statut == Expedition::STATUS_DRAFT) {
 					// edit-delete buttons
 					print '<td class="linecoledit center">';
 					print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$lines[$i]->id.'">'.img_edit().'</a>';
@@ -2369,8 +2289,7 @@ if ($action == 'create')
 					print '</td>';
 
 					// Display lines extrafields
-					if (!empty($rowExtrafieldsStart))
-					{
+					if (!empty($rowExtrafieldsStart)) {
 						print $rowExtrafieldsStart;
 						print $rowExtrafieldsView;
 						print $rowEnd;
@@ -2381,15 +2300,20 @@ if ($action == 'create')
 				// Display lines extrafields
 				if (!empty($extrafields)) {
 					$colspan = 6;
-					if ($origin && $origin_id > 0) $colspan++;
-					if (!empty($conf->productbatch->enabled)) $colspan++;
-					if (!empty($conf->stock->enabled)) $colspan++;
+					if ($origin && $origin_id > 0) {
+						$colspan++;
+					}
+					if (!empty($conf->productbatch->enabled)) {
+						$colspan++;
+					}
+					if (!empty($conf->stock->enabled)) {
+						$colspan++;
+					}
 
 					$line = $lines[$i];
 					$line->fetch_optionals();
 
-					if ($action == 'editline' && $line->id == $line_id)
-					{
+					if ($action == 'editline' && $line->id == $line_id) {
 						print $lines[$i]->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
 					} else {
 						print $lines[$i]->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
@@ -2416,20 +2340,16 @@ if ($action == 'create')
 	 *    Boutons actions
 	 */
 
-	if (($user->socid == 0) && ($action != 'presend'))
-	{
+	if (($user->socid == 0) && ($action != 'presend')) {
 		print '<div class="tabsAction">';
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 																									   // modified by hook
-		if (empty($reshook))
-		{
-			if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0)
-			{
+		if (empty($reshook)) {
+			if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0) {
 				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
-	  			 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))
-				{
+				 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate))) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
@@ -2438,10 +2358,8 @@ if ($action == 'create')
 
 			// TODO add alternative status
 			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
-			if ($object->statut == Expedition::STATUS_CLOSED && $user->rights->expedition->creer)
-			{
-				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
-				{
+			if ($object->statut == Expedition::STATUS_CLOSED && $user->rights->expedition->creer) {
+				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ClassifyUnbilled").'</a>';
 				} else {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
@@ -2450,20 +2368,18 @@ if ($action == 'create')
 
 			// Send
 			if (empty($user->socid)) {
-				if ($object->statut > 0)
-				{
-					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
-					{
+				if ($object->statut > 0) {
+					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send) {
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-					} else print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+					} else {
+						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+					}
 				}
 			}
 
 			// Create bill
-			if (!empty($conf->facture->enabled) && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED))
-			{
-				if ($user->rights->facture->creer)
-				{
+			if (!empty($conf->facture->enabled) && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED)) {
+				if ($user->rights->facture->creer) {
 					// TODO show button only   if (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
 					// If we do that, we must also make this option official.
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
@@ -2472,19 +2388,15 @@ if ($action == 'create')
 
 			// This is just to generate a delivery receipt
 			//var_dump($object->linkedObjectsIds['delivery']);
-			if ($conf->delivery_note->enabled && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED) && $user->rights->expedition->delivery->creer && empty($object->linkedObjectsIds['delivery']))
-			{
+			if ($conf->delivery_note->enabled && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED) && $user->rights->expedition->delivery->creer && empty($object->linkedObjectsIds['delivery'])) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'</a>';
 			}
 			// Close
-			if ($object->statut == Expedition::STATUS_VALIDATED)
-			{
-				if ($user->rights->expedition->creer && $object->statut > 0 && !$object->billed)
-				{
+			if ($object->statut == Expedition::STATUS_VALIDATED) {
+				if ($user->rights->expedition->creer && $object->statut > 0 && !$object->billed) {
 					$label = "Close"; $paramaction = 'classifyclosed'; // = Transferred/Received
 					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on shipments instead of orders
-					if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
-					{
+					if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 						$label = "ClassifyBilled";
 						$paramaction = 'classifybilled';
 					}
@@ -2493,17 +2405,14 @@ if ($action == 'create')
 			}
 
 			// Cancel
-			if ($object->statut == Expedition::STATUS_VALIDATED)
-			{
-				if ($user->rights->expedition->supprimer)
-				{
+			if ($object->statut == Expedition::STATUS_VALIDATED) {
+				if ($user->rights->expedition->supprimer) {
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("Cancel").'</a>';
 				}
 			}
 
 			// Delete
-			if ($user->rights->expedition->supprimer)
-			{
+			if ($user->rights->expedition->supprimer) {
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
 			}
 		}
@@ -2516,8 +2425,7 @@ if ($action == 'create')
 	 * Documents generated
 	 */
 
-	if ($action != 'presend' && $action != 'editline')
-	{
+	if ($action != 'presend' && $action != 'editline') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 
 		$objectref = dol_sanitizeFileName($object->ref);
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 22acaeaa26b..42564f7dd72 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -32,7 +32,7 @@ class Shipments extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'socid',
 		'origin_id',
 		'origin_type',
@@ -110,28 +110,37 @@ class Shipments extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."expedition as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('expedition').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -140,8 +149,7 @@ class Shipments extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -152,13 +160,11 @@ class Shipments extends DolibarrApi
 		dol_syslog("API Rest request");
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$shipment_static = new Expedition($this->db);
 				if ($shipment_static->fetch($obj->rowid)) {
@@ -217,28 +223,28 @@ class Shipments extends DolibarrApi
 	//  * @return int
 	//  */
 	/*
-    public function getLines($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->expedition->lire) {
-            throw new RestException(401);
-        }
+	public function getLines($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->expedition->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->shipment->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->shipment->getLinesArray();
-        $result = array();
-        foreach ($this->shipment->lines as $line) {
-            array_push($result,$this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
-    */
+		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->shipment->getLinesArray();
+		$result = array();
+		foreach ($this->shipment->lines as $line) {
+			array_push($result,$this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
+	*/
 
 	// /**
 	//  * Add a line to given shipment
@@ -251,56 +257,56 @@ class Shipments extends DolibarrApi
 	//  * @return int
 	//  */
 	/*
-    public function postLine($id, $request_data = null)
-    {
-        if(! DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401);
-        }
+	public function postLine($id, $request_data = null)
+	{
+		if(! DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->shipment->fetch($id);
-        if ( ! $result ) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->fetch($id);
+		if ( ! $result ) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
-        $updateRes = $this->shipment->addline(
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        $request_data->fk_product,
-                        $request_data->remise_percent,
-                        $request_data->info_bits,
-                        $request_data->fk_remise_except,
-                        'HT',
-                        0,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->rang,
-                        $request_data->special_code,
-                        $fk_parent_line,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $request_data->origin,
-                        $request_data->origin_id,
-                        $request_data->multicurrency_subprice
-        );
+		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->shipment->addline(
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						$request_data->fk_product,
+						$request_data->remise_percent,
+						$request_data->info_bits,
+						$request_data->fk_remise_except,
+						'HT',
+						0,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+						$fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$request_data->origin,
+						$request_data->origin_id,
+						$request_data->multicurrency_subprice
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
+		if ($updateRes > 0) {
+			return $updateRes;
 
-        }
-        return false;
-    }*/
+		}
+		return false;
+	}*/
 
 	// /**
 	//  * Update a line to given shipment
@@ -314,53 +320,53 @@ class Shipments extends DolibarrApi
 	//  * @return object
 	//  */
 	/*
-    public function putLine($id, $lineid, $request_data = null)
-    {
-        if (! DolibarrApiAccess::$user->rights->expedition->creer) {
-            throw new RestException(401);
-        }
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if (! DolibarrApiAccess::$user->rights->expedition->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->shipment->fetch($id);
-        if ( ! $result ) {
-            throw new RestException(404, 'Shipment not found');
-        }
+		$result = $this->shipment->fetch($id);
+		if ( ! $result ) {
+			throw new RestException(404, 'Shipment not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
-        $updateRes = $this->shipment->updateline(
-                        $lineid,
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->remise_percent,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        'HT',
-                        $request_data->info_bits,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->fk_parent_line,
-                        0,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->special_code,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $request_data->multicurrency_subprice
-        );
+		if( ! DolibarrApi::_checkAccessToResource('expedition',$this->shipment->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->shipment->updateline(
+						$lineid,
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->remise_percent,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						'HT',
+						$request_data->info_bits,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->fk_parent_line,
+						0,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->special_code,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$request_data->multicurrency_subprice
+		);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
-        return false;
-    }*/
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
+	}*/
 
 	/**
 	 * Delete a line to given shipment
@@ -425,12 +431,13 @@ class Shipments extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->shipment->$field = $value;
 		}
 
-		if ($this->shipment->update(DolibarrApiAccess::$user) > 0)
-		{
+		if ($this->shipment->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->shipment->error);
@@ -539,27 +546,27 @@ class Shipments extends DolibarrApi
 	//  * @throws RestException 405
 	//  */
 	 /*
-    public function setinvoiced($id)
-    {
+	public function setinvoiced($id)
+	{
 
-        if(! DolibarrApiAccess::$user->rights->expedition->creer) {
-                throw new RestException(401);
-        }
-        if(empty($id)) {
-                throw new RestException(400, 'Shipment ID is mandatory');
-        }
-        $result = $this->shipment->fetch($id);
-        if( ! $result ) {
-                throw new RestException(404, 'Shipment not found');
-        }
+		if(! DolibarrApiAccess::$user->rights->expedition->creer) {
+				throw new RestException(401);
+		}
+		if(empty($id)) {
+				throw new RestException(400, 'Shipment ID is mandatory');
+		}
+		$result = $this->shipment->fetch($id);
+		if( ! $result ) {
+				throw new RestException(404, 'Shipment not found');
+		}
 
-        $result = $this->shipment->classifyBilled(DolibarrApiAccess::$user);
-        if( $result < 0) {
-                throw new RestException(400, $this->shipment->error);
-        }
-        return $result;
-    }
-    */
+		$result = $this->shipment->classifyBilled(DolibarrApiAccess::$user);
+		if( $result < 0) {
+				throw new RestException(400, $this->shipment->error);
+		}
+		return $result;
+	}
+	*/
 
 
 	//  /**
@@ -576,35 +583,35 @@ class Shipments extends DolibarrApi
 	//  * @throws RestException 405
 	//  */
 	/*
-    public function createShipmentFromOrder($orderid)
-    {
+	public function createShipmentFromOrder($orderid)
+	{
 
-        require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
 
-        if(! DolibarrApiAccess::$user->rights->expedition->lire) {
-                throw new RestException(401);
-        }
-        if(! DolibarrApiAccess::$user->rights->expedition->creer) {
-                throw new RestException(401);
-        }
-        if(empty($proposalid)) {
-                throw new RestException(400, 'Order ID is mandatory');
-        }
+		if(! DolibarrApiAccess::$user->rights->expedition->lire) {
+				throw new RestException(401);
+		}
+		if(! DolibarrApiAccess::$user->rights->expedition->creer) {
+				throw new RestException(401);
+		}
+		if(empty($proposalid)) {
+				throw new RestException(400, 'Order ID is mandatory');
+		}
 
-        $order = new Commande($this->db);
-        $result = $order->fetch($proposalid);
-        if( ! $result ) {
-                throw new RestException(404, 'Order not found');
-        }
+		$order = new Commande($this->db);
+		$result = $order->fetch($proposalid);
+		if( ! $result ) {
+				throw new RestException(404, 'Order not found');
+		}
 
-        $result = $this->shipment->createFromOrder($order, DolibarrApiAccess::$user);
-        if( $result < 0) {
-                throw new RestException(405, $this->shipment->error);
-        }
-        $this->shipment->fetchObjectLinked();
-        return $this->_cleanObjectDatas($this->shipment);
-    }
-    */
+		$result = $this->shipment->createFromOrder($order, DolibarrApiAccess::$user);
+		if( $result < 0) {
+				throw new RestException(405, $this->shipment->error);
+		}
+		$this->shipment->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->shipment);
+	}
+	*/
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
@@ -627,10 +634,8 @@ class Shipments extends DolibarrApi
 		unset($object->barcode_type_label);
 		unset($object->barcode_type_coder);
 
-		if (!empty($object->lines) && is_array($object->lines))
-		{
-			foreach ($object->lines as $line)
-			{
+		if (!empty($object->lines) && is_array($object->lines)) {
+			foreach ($object->lines as $line) {
 				unset($line->tva_tx);
 				unset($line->vat_src_code);
 				unset($line->total_ht);
@@ -656,8 +661,9 @@ class Shipments extends DolibarrApi
 	{
 		$shipment = array();
 		foreach (Shipments::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$shipment[$field] = $data[$field];
 		}
 		return $shipment;
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index df2e3f347e0..a79ee76a2fa 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -37,9 +37,15 @@
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
-if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (!empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (!empty($conf->productbatch->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+}
 
 
 /**
@@ -231,8 +237,7 @@ class Expedition extends CommonObject
 		global $langs, $conf;
 		$langs->load("sendings");
 
-		if (!empty($conf->global->EXPEDITION_ADDON_NUMBER))
-		{
+		if (!empty($conf->global->EXPEDITION_ADDON_NUMBER)) {
 			$mybool = false;
 
 			$file = $conf->global->EXPEDITION_ADDON_NUMBER.".php";
@@ -248,8 +253,7 @@ class Expedition extends CommonObject
 				$mybool |= @include_once $dir.$file;
 			}
 
-			if (!$mybool)
-			{
+			if (!$mybool) {
 				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
@@ -258,8 +262,7 @@ class Expedition extends CommonObject
 			$numref = "";
 			$numref = $obj->getNextValue($soc, $this);
 
-			if ($numref != "")
-			{
+			if ($numref != "") {
 				return $numref;
 			} else {
 				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
@@ -290,7 +293,9 @@ class Expedition extends CommonObject
 		// Clean parameters
 		$this->brouillon = 1;
 		$this->tracking_number = dol_sanitizeFileName($this->tracking_number);
-		if (empty($this->fk_project)) $this->fk_project = 0;
+		if (empty($this->fk_project)) {
+			$this->fk_project = 0;
+		}
 
 		$this->user = $user;
 
@@ -353,8 +358,7 @@ class Expedition extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expedition");
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
@@ -362,59 +366,49 @@ class Expedition extends CommonObject
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				// Insert of lines
 				$num = count($this->lines);
-				for ($i = 0; $i < $num; $i++)
-				{
-					if (!isset($this->lines[$i]->detail_batch))
-					{	// no batch management
-						if (!$this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->rang, $this->lines[$i]->array_options) > 0)
-						{
+				for ($i = 0; $i < $num; $i++) {
+					if (!isset($this->lines[$i]->detail_batch)) {	// no batch management
+						if (!$this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->rang, $this->lines[$i]->array_options) > 0) {
 							$error++;
 						}
 					} else {	// with batch management
-						if (!$this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) > 0)
-						{
+						if (!$this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) > 0) {
 							$error++;
 						}
 					}
 				}
 
-				if (!$error && $this->id && $this->origin_id)
-				{
+				if (!$error && $this->id && $this->origin_id) {
 					$ret = $this->add_object_linked();
-					if (!$ret)
-					{
+					if (!$ret) {
 						$error++;
 					}
 				}
 
 				// Actions on extra fields
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $this->insertExtraFields();
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				}
 
-				if (!$error && !$notrigger)
-				{
+				if (!$error && !$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('SHIPPING_CREATE', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 
-					if (!$error)
-					{
+					if (!$error) {
 						$this->db->commit();
 						return $this->id;
 					} else {
-						foreach ($this->errors as $errmsg)
-						{
+						foreach ($this->errors as $errmsg) {
 							dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 							$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 						}
@@ -465,8 +459,7 @@ class Expedition extends CommonObject
 		$expeditionline->rang = $rang;
 		$expeditionline->array_options = $array_options;
 
-		if (($lineId = $expeditionline->insert($user)) < 0)
-		{
+		if (($lineId = $expeditionline->insert($user)) < 0) {
 			$this->errors[] = $expeditionline->error;
 		}
 		return $lineId;
@@ -489,26 +482,21 @@ class Expedition extends CommonObject
 
 		$tab = $line_ext->detail_batch;
 		// create stockLocation Qty array
-		foreach ($tab as $detbatch)
-		{
-			if ($detbatch->entrepot_id)
-			{
+		foreach ($tab as $detbatch) {
+			if ($detbatch->entrepot_id) {
 				$stockLocationQty[$detbatch->entrepot_id] += $detbatch->qty;
 			}
 		}
 		// create shipment lines
-		foreach ($stockLocationQty as $stockLocation => $qty)
-		{
+		foreach ($stockLocationQty as $stockLocation => $qty) {
 			$line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $line_ext->rang, $array_options);
 			if ($line_id < 0) {
 				$error++;
 			} else {
 				// create shipment batch lines for stockLocation
-				foreach ($tab as $detbatch)
-				{
+				foreach ($tab as $detbatch) {
 					if ($detbatch->entrepot_id == $stockLocation) {
-						if (!($detbatch->create($line_id) > 0))		// Create an expeditionlinebatch
-						{
+						if (!($detbatch->create($line_id) > 0)) {		// Create an expeditionlinebatch
 							$error++;
 						}
 					}
@@ -516,8 +504,11 @@ class Expedition extends CommonObject
 			}
 		}
 
-		if (!$error) return 1;
-		else return -1;
+		if (!$error) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 	/**
@@ -534,7 +525,9 @@ class Expedition extends CommonObject
 		global $conf;
 
 		// Check parameters
-		if (empty($id) && empty($ref) && empty($ref_ext)) return -1;
+		if (empty($id) && empty($ref) && empty($ref_ext)) {
+			return -1;
+		}
 
 		$sql = "SELECT e.rowid, e.entity, e.ref, e.fk_soc as socid, e.date_creation, e.ref_customer, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut, e.fk_projet as fk_project, e.billed";
 		$sql .= ", e.date_valid";
@@ -551,17 +544,23 @@ class Expedition extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_shipment_mode as s ON e.fk_shipping_method = s.rowid';
 		$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-		if ($id)   	  $sql .= " AND e.rowid=".$id;
-		if ($ref)     $sql .= " AND e.ref='".$this->db->escape($ref)."'";
-		if ($ref_ext) $sql .= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-		if ($notused) $sql .= " AND e.ref_int='".$this->db->escape($notused)."'";
+		if ($id) {
+			$sql .= " AND e.rowid=".$id;
+		}
+		if ($ref) {
+			$sql .= " AND e.ref='".$this->db->escape($ref)."'";
+		}
+		if ($ref_ext) {
+			$sql .= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+		}
+		if ($notused) {
+			$sql .= " AND e.ref_int='".$this->db->escape($notused)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 
 				$this->id                   = $obj->rowid;
@@ -614,7 +613,9 @@ class Expedition extends CommonObject
 
 				$this->db->free($result);
 
-				if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
 
 				// Tracking url
 				$this->getUrlTrackingStatus($obj->tracking_number);
@@ -626,18 +627,20 @@ class Expedition extends CommonObject
 				$this->fetch_optionals();
 
 				// Fix Get multicurrency param for transmited
-				if (!empty($conf->multicurrency->enabled))
-				{
-					if (!empty($this->multicurrency_code)) $this->multicurrency_code = $this->thirdparty->multicurrency_code;
-					if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($this->thirdparty->multicurrency_tx))	$this->multicurrency_tx = $this->thirdparty->multicurrency_tx;
+				if (!empty($conf->multicurrency->enabled)) {
+					if (!empty($this->multicurrency_code)) {
+						$this->multicurrency_code = $this->thirdparty->multicurrency_code;
+					}
+					if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($this->thirdparty->multicurrency_tx)) {
+						$this->multicurrency_tx = $this->thirdparty->multicurrency_tx;
+					}
 				}
 
 				/*
 				 * Lines
 				 */
 				$result = $this->fetch_lines();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					return -3;
 				}
 
@@ -669,15 +672,13 @@ class Expedition extends CommonObject
 		dol_syslog(get_class($this)."::valid");
 
 		// Protection
-		if ($this->statut)
-		{
+		if ($this->statut) {
 			dol_syslog(get_class($this)."::valid not in draft status", LOG_WARNING);
 			return 0;
 		}
 
 		if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
-	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate))))
-		{
+		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate)))) {
 			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
@@ -695,8 +696,7 @@ class Expedition extends CommonObject
 		$result = $soc->set_as_client();
 
 		// Define new ref
-		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-		{
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
 			$numref = $this->getNextNumRef($soc);
 		} else {
 			$numref = "EXP".$this->id;
@@ -715,15 +715,13 @@ class Expedition extends CommonObject
 
 		dol_syslog(get_class($this)."::valid update expedition", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql)
-		{
+		if (!$resql) {
 			$this->error = $this->db->lasterror();
 			$error++;
 		}
 
 		// If stock increment is done on sending (recommanded choice)
-		if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
-		{
+		if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)) {
 			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 			$langs->load("agenda");
@@ -740,27 +738,25 @@ class Expedition extends CommonObject
 
 			dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$cpt = $this->db->num_rows($resql);
-				for ($i = 0; $i < $cpt; $i++)
-				{
+				for ($i = 0; $i < $cpt; $i++) {
 					$obj = $this->db->fetch_object($resql);
-					if (empty($obj->edbrowid))
-					{
+					if (empty($obj->edbrowid)) {
 						$qty = $obj->qty;
 					} else {
 						$qty = $obj->edbqty;
 					}
-					if ($qty <= 0) continue;
+					if ($qty <= 0) {
+						continue;
+					}
 					dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 					//var_dump($this->lines[$i]);
 					$mouvS = new MouvementStock($this->db);
 					$mouvS->origin = dol_clone($this, 1);
 
-					if (empty($obj->edbrowid))
-					{
+					if (empty($obj->edbrowid)) {
 						// line without batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
@@ -795,48 +791,45 @@ class Expedition extends CommonObject
 
 		// Change status of order to "shipment in process"
 		$ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin);
-		if (!$ret)
-		{
+		if (!$ret) {
 			$error++;
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('SHIPPING_VALIDATE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->oldref = $this->ref;
 
 			// Rename directory if dir was a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref))
-			{
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 				// Now we rename also files into index
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'expedition/sending/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expedition/sending/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
-				if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 				$oldref = dol_sanitizeFileName($this->ref);
 				$newref = dol_sanitizeFileName($numref);
 				$dirsource = $conf->expedition->dir_output.'/sending/'.$oldref;
 				$dirdest = $conf->expedition->dir_output.'/sending/'.$newref;
-				if (!$error && file_exists($dirsource))
-				{
+				if (!$error && file_exists($dirsource)) {
 					dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
 
-					if (@rename($dirsource, $dirdest))
-					{
+					if (@rename($dirsource, $dirdest)) {
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
 						$listoffiles = dol_dir_list($conf->expedition->dir_output.'/sending/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-						foreach ($listoffiles as $fileentry)
-						{
+						foreach ($listoffiles as $fileentry) {
 							$dirsource = $fileentry['name'];
 							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 							$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -849,14 +842,12 @@ class Expedition extends CommonObject
 		}
 
 		// Set new ref and current status
-		if (!$error)
-		{
+		if (!$error) {
 			$this->ref = $numref;
 			$this->statut = self::STATUS_VALIDATED;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -878,23 +869,24 @@ class Expedition extends CommonObject
 		// phpcs:enable
 		global $conf;
 
-		if ($conf->delivery_note->enabled)
-		{
-			if ($this->statut == self::STATUS_VALIDATED || $this->statut == self::STATUS_CLOSED)
-			{
+		if ($conf->delivery_note->enabled) {
+			if ($this->statut == self::STATUS_VALIDATED || $this->statut == self::STATUS_CLOSED) {
 				// Expedition validee
 				include_once DOL_DOCUMENT_ROOT.'/delivery/class/delivery.class.php';
 				$delivery = new Delivery($this->db);
 				$result = $delivery->create_from_sending($user, $this->id);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					return $result;
 				} else {
 					$this->error = $delivery->error;
 					return $result;
 				}
-			} else return 0;
-		} else return 0;
+			} else {
+				return 0;
+			}
+		} else {
+			return 0;
+		}
 	}
 
 	/**
@@ -926,8 +918,7 @@ class Expedition extends CommonObject
 		// Copy the rang of the order line to the expedition line
 		$line->rang = $orderline->rang;
 
-		if (!empty($conf->stock->enabled) && !empty($orderline->fk_product))
-		{
+		if (!empty($conf->stock->enabled) && !empty($orderline->fk_product)) {
 			$fk_product = $orderline->fk_product;
 
 			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS)) {
@@ -967,15 +958,15 @@ class Expedition extends CommonObject
 		}
 
 		// If product need a batch number, we should not have called this function but addline_batch instead.
-		if (!empty($conf->productbatch->enabled) && !empty($orderline->fk_product) && !empty($orderline->product_tobatch))
-		{
+		if (!empty($conf->productbatch->enabled) && !empty($orderline->fk_product) && !empty($orderline->product_tobatch)) {
 			$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
 			return -4;
 		}
 
 		// extrafields
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 			$line->array_options = $array_options;
+		}
 
 		$this->lines[$num] = $line;
 	}
@@ -994,36 +985,30 @@ class Expedition extends CommonObject
 		global $conf, $langs;
 
 		$num = count($this->lines);
-		if ($dbatch['qty'] > 0)
-		{
+		if ($dbatch['qty'] > 0) {
 			$line = new ExpeditionLigne($this->db);
 			$tab = array();
-			foreach ($dbatch['detail'] as $key=>$value)
-			{
-				if ($value['q'] > 0)
-				{
+			foreach ($dbatch['detail'] as $key => $value) {
+				if ($value['q'] > 0) {
 					// $value['q']=qty to move
 					// $value['id_batch']=id into llx_product_batch of record to move
 					//var_dump($value);
 
 					$linebatch = new ExpeditionLineBatch($this->db);
 					$ret = $linebatch->fetchFromStock($value['id_batch']); // load serial, sellby, eatby
-					if ($ret < 0)
-					{
+					if ($ret < 0) {
 						$this->error = $linebatch->error;
 						return -1;
 					}
 					$linebatch->qty = $value['q'];
 					$tab[] = $linebatch;
 
-					if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
-					{
+					if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT) {
 						require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 						$prod_batch = new Productbatch($this->db);
 						$prod_batch->fetch($value['id_batch']);
 
-						if ($prod_batch->qty < $linebatch->qty)
-						{
+						if ($prod_batch->qty < $linebatch->qty) {
 							$langs->load("errors");
 							$this->errors[] = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $prod_batch->fk_product);
 							dol_syslog(get_class($this)."::addline_batch error=Product ".$prod_batch->batch.": ".$this->errorsToString(), LOG_ERR);
@@ -1042,8 +1027,9 @@ class Expedition extends CommonObject
 			$line->detail_batch = $tab;
 
 			// extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) { // For avoid conflicts if trigger used
 				$line->array_options = $array_options;
+			}
 
 			//var_dump($line);
 			$this->lines[$num] = $line;
@@ -1065,25 +1051,63 @@ class Expedition extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->ref)) $this->ref = trim($this->ref);
-		if (isset($this->entity)) $this->entity = (int) $this->entity;
-		if (isset($this->ref_customer)) $this->ref_customer = trim($this->ref_customer);
-		if (isset($this->socid)) $this->socid = (int) $this->socid;
-		if (isset($this->fk_user_author)) $this->fk_user_author = (int) $this->fk_user_author;
-		if (isset($this->fk_user_valid)) $this->fk_user_valid = (int) $this->fk_user_valid;
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address = (int) $this->fk_delivery_address;
-		if (isset($this->shipping_method_id)) $this->shipping_method_id = (int) $this->shipping_method_id;
-		if (isset($this->tracking_number)) $this->tracking_number = trim($this->tracking_number);
-		if (isset($this->statut)) $this->statut = (int) $this->statut;
-		if (isset($this->trueDepth)) $this->trueDepth = trim($this->trueDepth);
-		if (isset($this->trueWidth)) $this->trueWidth = trim($this->trueWidth);
-		if (isset($this->trueHeight)) $this->trueHeight = trim($this->trueHeight);
-		if (isset($this->size_units)) $this->size_units = trim($this->size_units);
-		if (isset($this->weight_units)) $this->weight_units = trim($this->weight_units);
-		if (isset($this->trueWeight)) $this->weight = trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note_private = trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
+		if (isset($this->ref)) {
+			$this->ref = trim($this->ref);
+		}
+		if (isset($this->entity)) {
+			$this->entity = (int) $this->entity;
+		}
+		if (isset($this->ref_customer)) {
+			$this->ref_customer = trim($this->ref_customer);
+		}
+		if (isset($this->socid)) {
+			$this->socid = (int) $this->socid;
+		}
+		if (isset($this->fk_user_author)) {
+			$this->fk_user_author = (int) $this->fk_user_author;
+		}
+		if (isset($this->fk_user_valid)) {
+			$this->fk_user_valid = (int) $this->fk_user_valid;
+		}
+		if (isset($this->fk_delivery_address)) {
+			$this->fk_delivery_address = (int) $this->fk_delivery_address;
+		}
+		if (isset($this->shipping_method_id)) {
+			$this->shipping_method_id = (int) $this->shipping_method_id;
+		}
+		if (isset($this->tracking_number)) {
+			$this->tracking_number = trim($this->tracking_number);
+		}
+		if (isset($this->statut)) {
+			$this->statut = (int) $this->statut;
+		}
+		if (isset($this->trueDepth)) {
+			$this->trueDepth = trim($this->trueDepth);
+		}
+		if (isset($this->trueWidth)) {
+			$this->trueWidth = trim($this->trueWidth);
+		}
+		if (isset($this->trueHeight)) {
+			$this->trueHeight = trim($this->trueHeight);
+		}
+		if (isset($this->size_units)) {
+			$this->size_units = trim($this->size_units);
+		}
+		if (isset($this->weight_units)) {
+			$this->weight_units = trim($this->weight_units);
+		}
+		if (isset($this->trueWeight)) {
+			$this->weight = trim($this->trueWeight);
+		}
+		if (isset($this->note_private)) {
+			$this->note_private = trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->model_pdf)) {
+			$this->model_pdf = trim($this->model_pdf);
+		}
 
 
 
@@ -1125,20 +1149,22 @@ class Expedition extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('SHIPPING_MODIFY', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -1180,15 +1206,16 @@ class Expedition extends CommonObject
 		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('SHIPPING_CANCEL', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
 		// Stock control
 		if (!$error && $conf->stock->enabled &&
 			(($conf->global->STOCK_CALCULATE_ON_SHIPMENT && $this->statut > self::STATUS_DRAFT) ||
-			 ($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE && $this->statut == self::STATUS_CLOSED && $also_update_stock)))
-		{
+			 ($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE && $this->statut == self::STATUS_CLOSED && $also_update_stock))) {
 			require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
 
 			$langs->load("agenda");
@@ -1202,11 +1229,9 @@ class Expedition extends CommonObject
 
 			dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$cpt = $this->db->num_rows($resql);
-				for ($i = 0; $i < $cpt; $i++)
-				{
+				for ($i = 0; $i < $cpt; $i++) {
 					dol_syslog(get_class($this)."::delete movement index ".$i);
 					$obj = $this->db->fetch_object($resql);
 
@@ -1215,11 +1240,9 @@ class Expedition extends CommonObject
 					$mouvS->origin = null;
 					// get lot/serial
 					$lotArray = null;
-					if ($conf->productbatch->enabled)
-					{
+					if ($conf->productbatch->enabled) {
 						$lotArray = ExpeditionLineBatch::fetchAll($this->db, $obj->expeditiondet_id);
-						if (!is_array($lotArray))
-						{
+						if (!is_array($lotArray)) {
 							$error++; $this->errors[] = "Error ".$this->db->lasterror();
 						}
 					}
@@ -1228,24 +1251,23 @@ class Expedition extends CommonObject
 						// We increment stock of product (and sub-products)
 						// We use warehouse selected for each line
 						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentCanceledInDolibarr", $this->ref)); // Price is set to 0, because we don't want to see WAP changed
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
 					} else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
-						foreach ($lotArray as $lot)
-						{
+						foreach ($lotArray as $lot) {
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->qty, 0, $langs->trans("ShipmentCanceledInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // Price is set to 0, because we don't want to see WAP changed
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$error++; $this->errors = $this->errors + $mouvS->errors;
 								break;
 							}
 						}
-						if ($error) break; // break for loop incase of error
+						if ($error) {
+							break; // break for loop incase of error
+						}
 					}
 				}
 			} else {
@@ -1254,71 +1276,58 @@ class Expedition extends CommonObject
 		}
 
 		// delete batch expedition line
-		if (!$error && $conf->productbatch->enabled)
-		{
-			if (ExpeditionLineBatch::deletefromexp($this->db, $this->id) < 0)
-			{
+		if (!$error && $conf->productbatch->enabled) {
+			if (ExpeditionLineBatch::deletefromexp($this->db, $this->id) < 0) {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
 			$sql .= " WHERE fk_expedition = ".$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
-				if ($res < 0) $error++;
+				if ($res < 0) {
+					$error++;
+				}
 
 				// No delete expedition
-				if (!$error)
-				{
+				if (!$error) {
 					$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."expedition";
 					$sql .= " WHERE rowid = ".$this->id;
 
-					if ($this->db->query($sql))
-					{
-						if (!empty($this->origin) && $this->origin_id > 0)
-						{
+					if ($this->db->query($sql)) {
+						if (!empty($this->origin) && $this->origin_id > 0) {
 							$this->fetch_origin();
 							$origin = $this->origin;
-							if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS)     // If order source of shipment is "shipment in progress"
-							{
+							if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS) {     // If order source of shipment is "shipment in progress"
 								// Check if there is no more shipment. If not, we can move back status of order to "validated" instead of "shipment in progress"
 								$this->$origin->loadExpeditions();
 								//var_dump($this->$origin->expeditions);exit;
-								if (count($this->$origin->expeditions) <= 0)
-								{
+								if (count($this->$origin->expeditions) <= 0) {
 									$this->$origin->setStatut(Commande::STATUS_VALIDATED);
 								}
 							}
 						}
 
-						if (!$error)
-						{
+						if (!$error) {
 							$this->db->commit();
 
 							// We delete PDFs
 							$ref = dol_sanitizeFileName($this->ref);
-							if (!empty($conf->expedition->dir_output))
-							{
+							if (!empty($conf->expedition->dir_output)) {
 								$dir = $conf->expedition->dir_output.'/sending/'.$ref;
 								$file = $dir.'/'.$ref.'.pdf';
-								if (file_exists($file))
-								{
-									if (!dol_delete_file($file))
-									{
+								if (file_exists($file)) {
+									if (!dol_delete_file($file)) {
 										return 0;
 									}
 								}
-								if (file_exists($dir))
-								{
-									if (!dol_delete_dir_recursive($dir))
-									{
+								if (file_exists($dir)) {
+									if (!dol_delete_dir_recursive($dir)) {
 										$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 										return 0;
 									}
@@ -1373,8 +1382,7 @@ class Expedition extends CommonObject
 
 		// Add a protection to refuse deleting if shipment has at least one delivery
 		$this->fetchObjectLinked($this->id, 'shipping', 0, 'delivery'); // Get deliveries linked to this shipment
-		if (count($this->linkedObjectsIds) > 0)
-		{
+		if (count($this->linkedObjectsIds) > 0) {
 			$this->error = 'ErrorThereIsSomeDeliveries';
 			$error++;
 		}
@@ -1382,15 +1390,16 @@ class Expedition extends CommonObject
 		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('SHIPPING_DELETE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
 		// Stock control
 		if (!$error && $conf->stock->enabled &&
 			(($conf->global->STOCK_CALCULATE_ON_SHIPMENT && $this->statut > self::STATUS_DRAFT) ||
-			 ($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE && $this->statut == self::STATUS_CLOSED && $also_update_stock)))
-		{
+			 ($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE && $this->statut == self::STATUS_CLOSED && $also_update_stock))) {
 			require_once DOL_DOCUMENT_ROOT."/product/stock/class/mouvementstock.class.php";
 
 			$langs->load("agenda");
@@ -1404,11 +1413,9 @@ class Expedition extends CommonObject
 
 			dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$cpt = $this->db->num_rows($resql);
-				for ($i = 0; $i < $cpt; $i++)
-				{
+				for ($i = 0; $i < $cpt; $i++) {
 					dol_syslog(get_class($this)."::delete movement index ".$i);
 					$obj = $this->db->fetch_object($resql);
 
@@ -1417,11 +1424,9 @@ class Expedition extends CommonObject
 					$mouvS->origin = null;
 					// get lot/serial
 					$lotArray = null;
-					if ($conf->productbatch->enabled)
-					{
+					if ($conf->productbatch->enabled) {
 						$lotArray = ExpeditionLineBatch::fetchAll($this->db, $obj->expeditiondet_id);
-						if (!is_array($lotArray))
-						{
+						if (!is_array($lotArray)) {
 							$error++; $this->errors[] = "Error ".$this->db->lasterror();
 						}
 					}
@@ -1430,24 +1435,23 @@ class Expedition extends CommonObject
 						// We increment stock of product (and sub-products)
 						// We use warehouse selected for each line
 						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref)); // Price is set to 0, because we don't want to see WAP changed
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
 					} else {
 						// We increment stock of batches
 						// We use warehouse selected for each line
-						foreach ($lotArray as $lot)
-						{
+						foreach ($lotArray as $lot) {
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // Price is set to 0, because we don't want to see WAP changed
-							if ($result < 0)
-							{
+							if ($result < 0) {
 								$error++; $this->errors = $this->errors + $mouvS->errors;
 								break;
 							}
 						}
-						if ($error) break; // break for loop incase of error
+						if ($error) {
+							break; // break for loop incase of error
+						}
 					}
 				}
 			} else {
@@ -1456,16 +1460,13 @@ class Expedition extends CommonObject
 		}
 
 		// delete batch expedition line
-		if (!$error && $conf->productbatch->enabled)
-		{
-			if (ExpeditionLineBatch::deletefromexp($this->db, $this->id) < 0)
-			{
+		if (!$error && $conf->productbatch->enabled) {
+			if (ExpeditionLineBatch::deletefromexp($this->db, $this->id) < 0) {
 				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 					$main = MAIN_DB_PREFIX.'expeditiondet';
 					$ef = $main."_extrafields";
 					$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_expedition = ".$this->id.")";
@@ -1473,41 +1474,38 @@ class Expedition extends CommonObject
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
 			$sql .= " WHERE fk_expedition = ".$this->id;
 
-			if ($this->db->query($sqlef) && $this->db->query($sql))
-			{
+			if ($this->db->query($sqlef) && $this->db->query($sql)) {
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
-				if ($res < 0) $error++;
+				if ($res < 0) {
+					$error++;
+				}
 
 								// delete extrafields
 								$res = $this->deleteExtraFields();
-								if ($res < 0) $error++;
+				if ($res < 0) {
+					$error++;
+				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition";
 					$sql .= " WHERE rowid = ".$this->id;
 
-					if ($this->db->query($sql))
-					{
-						if (!empty($this->origin) && $this->origin_id > 0)
-						{
+					if ($this->db->query($sql)) {
+						if (!empty($this->origin) && $this->origin_id > 0) {
 							$this->fetch_origin();
 							$origin = $this->origin;
-							if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS)     // If order source of shipment is "shipment in progress"
-							{
+							if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS) {     // If order source of shipment is "shipment in progress"
 								// Check if there is no more shipment. If not, we can move back status of order to "validated" instead of "shipment in progress"
 								$this->$origin->loadExpeditions();
 								//var_dump($this->$origin->expeditions);exit;
-								if (count($this->$origin->expeditions) <= 0)
-								{
+								if (count($this->$origin->expeditions) <= 0) {
 									$this->$origin->setStatut(Commande::STATUS_VALIDATED);
 								}
 							}
 						}
 
-						if (!$error)
-						{
+						if (!$error) {
 							$this->db->commit();
 
 							// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
@@ -1515,21 +1513,16 @@ class Expedition extends CommonObject
 
 							// We delete PDFs
 							$ref = dol_sanitizeFileName($this->ref);
-							if (!empty($conf->expedition->dir_output))
-							{
+							if (!empty($conf->expedition->dir_output)) {
 								$dir = $conf->expedition->dir_output.'/sending/'.$ref;
 								$file = $dir.'/'.$ref.'.pdf';
-								if (file_exists($file))
-								{
-									if (!dol_delete_file($file))
-									{
+								if (file_exists($file)) {
+									if (!dol_delete_file($file)) {
 										return 0;
 									}
 								}
-								if (file_exists($dir))
-								{
-									if (!dol_delete_dir_recursive($dir))
-									{
+								if (file_exists($dir)) {
+									if (!dol_delete_dir_recursive($dir)) {
 										$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 										return 0;
 									}
@@ -1590,8 +1583,7 @@ class Expedition extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			$num = $this->db->num_rows($resql);
@@ -1607,8 +1599,7 @@ class Expedition extends CommonObject
 
 			$line = new ExpeditionLigne($this->db);
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
 				if ($originline == $obj->fk_origin_line) {
@@ -1699,21 +1690,17 @@ class Expedition extends CommonObject
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
 				$this->multicurrency_total_ttc 	= $obj->multicurrency_total_ttc;
 
-				if ($originline != $obj->fk_origin_line)
-				{
+				if ($originline != $obj->fk_origin_line) {
 					$line->detail_batch = array();
 				}
 
 				// Detail of batch
-				if (!empty($conf->productbatch->enabled) && $obj->line_id > 0 && $obj->product_tobatch > 0)
-				{
+				if (!empty($conf->productbatch->enabled) && $obj->line_id > 0 && $obj->product_tobatch > 0) {
 					require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 
 					$newdetailbatch = ExpeditionLineBatch::fetchAll($this->db, $obj->line_id, $obj->fk_product);
-					if (is_array($newdetailbatch))
-					{
-						if ($originline != $obj->fk_origin_line)
-						{
+					if (is_array($newdetailbatch)) {
+						if ($originline != $obj->fk_origin_line) {
 							$line->detail_batch = $newdetailbatch;
 						} else {
 							$line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
@@ -1721,8 +1708,7 @@ class Expedition extends CommonObject
 					}
 				}
 
-				if ($originline != $obj->fk_origin_line)
-				{
+				if ($originline != $obj->fk_origin_line) {
 					$this->lines[$lineindex] = $line;
 					$lineindex++;
 				} else {
@@ -1755,8 +1741,7 @@ class Expedition extends CommonObject
 	{
 		global $user;
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			$this->db->begin();
 
 			$line = new ExpeditionLigne($this->db);
@@ -1764,8 +1749,7 @@ class Expedition extends CommonObject
 			// For triggers
 			$line->fetch($lineid);
 
-			if ($line->delete($user) > 0)
-			{
+			if ($line->delete($user) > 0) {
 				//$this->update_price(1);
 
 				$this->db->commit();
@@ -1803,21 +1787,24 @@ class Expedition extends CommonObject
 
 		$url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id;
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
-		if ($option !== 'nolink')
-		{
+		if ($option !== 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("Shipment");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -1830,8 +1817,12 @@ class Expedition extends CommonObject
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -1865,9 +1856,15 @@ class Expedition extends CommonObject
 		$labelStatusShort = $langs->trans($this->statutshorts[$status]);
 
 		$statusType = 'status'.$status;
-		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
-		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
-		if ($status == self::STATUS_CANCELED) $statusType = 'status9';
+		if ($status == self::STATUS_VALIDATED) {
+			$statusType = 'status4';
+		}
+		if ($status == self::STATUS_CLOSED) {
+			$statusType = 'status6';
+		}
+		if ($status == self::STATUS_CANCELED) {
+			$statusType = 'status9';
+		}
 
 		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
@@ -1894,12 +1891,10 @@ class Expedition extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."product";
 		$sql .= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_prods = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_prods)
-			{
+			while ($i < $num_prods) {
 				$i++;
 				$row = $this->db->fetch_row($resql);
 				$prodids[$i] = $row[0];
@@ -1936,8 +1931,7 @@ class Expedition extends CommonObject
 
 		$nbp = 5;
 		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
+		while ($xnbp < $nbp) {
 			$line = new ExpeditionLigne($this->db);
 			$line->desc = $langs->trans("Description")." ".$xnbp;
 			$line->libelle = $langs->trans("Description")." ".$xnbp; // deprecated
@@ -1976,16 +1970,14 @@ class Expedition extends CommonObject
 	 */
 	public function setDeliveryDate($user, $delivery_date)
 	{
-		if ($user->rights->expedition->creer)
-		{
+		if ($user->rights->expedition->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
 			$sql .= " SET date_delivery = ".($delivery_date ? "'".$this->db->idate($delivery_date)."'" : 'null');
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::setDeliveryDate", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->date_delivery = $delivery_date;
 				return 1;
 			} else {
@@ -2015,10 +2007,8 @@ class Expedition extends CommonObject
 		$sql .= " ORDER BY em.libelle ASC";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$label = $langs->trans('SendingMethod'.$obj->code);
 				$this->meths[$obj->rowid] = ($label != 'SendingMethod'.$obj->code ? $label : $obj->label);
 			}
@@ -2042,13 +2032,13 @@ class Expedition extends CommonObject
 
 		$sql = "SELECT em.rowid, em.code, em.libelle as label, em.description, em.tracking, em.active";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-		if ($id != '') $sql .= " WHERE em.rowid=".$id;
+		if ($id != '') {
+			$sql .= " WHERE em.rowid=".$id;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->listmeths[$i]['rowid'] = $obj->rowid;
 				$this->listmeths[$i]['code'] = $obj->code;
 				$label = $langs->trans('SendingMethod'.$obj->code);
@@ -2072,8 +2062,7 @@ class Expedition extends CommonObject
 	public function update_delivery_method($id = '')
 	{
 		// phpcs:enable
-		if ($id == '')
-		{
+		if ($id == '') {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
 			$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
 			$resql = $this->db->query($sql);
@@ -2086,7 +2075,9 @@ class Expedition extends CommonObject
 			$sql .= " WHERE rowid=".$id;
 			$resql = $this->db->query($sql);
 		}
-		if ($resql < 0) dol_print_error($this->db, '');
+		if ($resql < 0) {
+			dol_print_error($this->db, '');
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2131,24 +2122,20 @@ class Expedition extends CommonObject
 	 */
 	public function getUrlTrackingStatus($value = '')
 	{
-		if (!empty($this->shipping_method_id))
-		{
+		if (!empty($this->shipping_method_id)) {
 			$sql = "SELECT em.code, em.tracking";
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
 			$sql .= " WHERE em.rowid = ".$this->shipping_method_id;
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if ($obj = $this->db->fetch_object($resql))
-				{
+			if ($resql) {
+				if ($obj = $this->db->fetch_object($resql)) {
 					$tracking = $obj->tracking;
 				}
 			}
 		}
 
-		if (!empty($tracking) && !empty($value))
-		{
+		if (!empty($tracking) && !empty($value)) {
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
 		} else {
@@ -2168,8 +2155,7 @@ class Expedition extends CommonObject
 		$error = 0;
 
 		// Protection. This avoid to move stock later when we should not
-		if ($this->statut == self::STATUS_CLOSED)
-		{
+		if ($this->statut == self::STATUS_CLOSED) {
 			return 0;
 		}
 
@@ -2179,31 +2165,26 @@ class Expedition extends CommonObject
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Set order billed if 100% of order is shipped (qty in shipment lines match qty in order lines)
-			if ($this->origin == 'commande' && $this->origin_id > 0)
-			{
+			if ($this->origin == 'commande' && $this->origin_id > 0) {
 				$order = new Commande($this->db);
 				$order->fetch($this->origin_id);
 
 				$order->loadExpeditions(self::STATUS_CLOSED); // Fill $order->expeditions = array(orderlineid => qty)
 
 				$shipments_match_order = 1;
-				foreach ($order->lines as $line)
-				{
+				foreach ($order->lines as $line) {
 					$lineid = $line->id;
 					$qty = $line->qty;
-					if (($line->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->expeditions[$lineid] != $qty)
-					{
+					if (($line->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->expeditions[$lineid] != $qty) {
 						$shipments_match_order = 0;
 						$text = 'Qty for order line id '.$lineid.' is '.$qty.'. However in the shipments with status Expedition::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->expeditions[$lineid].', so we can t close order';
 						dol_syslog($text);
 						break;
 					}
 				}
-				if ($shipments_match_order)
-				{
+				if ($shipments_match_order) {
 					dol_syslog("Qty for the ".count($order->lines)." lines of order have same value for shipments with status Expedition::STATUS_CLOSED=".self::STATUS_CLOSED.', so we close order');
 					$order->cloture($user);
 				}
@@ -2213,8 +2194,7 @@ class Expedition extends CommonObject
 
 
 			// If stock increment is done on closing
-			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
-			{
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 				$langs->load("agenda");
@@ -2232,26 +2212,24 @@ class Expedition extends CommonObject
 
 				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$cpt = $this->db->num_rows($resql);
-					for ($i = 0; $i < $cpt; $i++)
-					{
+					for ($i = 0; $i < $cpt; $i++) {
 						$obj = $this->db->fetch_object($resql);
-						if (empty($obj->edbrowid))
-						{
+						if (empty($obj->edbrowid)) {
 							$qty = $obj->qty;
 						} else {
 							$qty = $obj->edbqty;
 						}
-						if ($qty <= 0) continue;
+						if ($qty <= 0) {
+							continue;
+						}
 						dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 						$mouvS = new MouvementStock($this->db);
 						$mouvS->origin = &$this;
 
-						if (empty($obj->edbrowid))
-						{
+						if (empty($obj->edbrowid)) {
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2280,8 +2258,7 @@ class Expedition extends CommonObject
 			}
 
 			// Call trigger
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->call_trigger('SHIPPING_CLOSED', $user);
 				if ($result < 0) {
 					$error++;
@@ -2292,8 +2269,7 @@ class Expedition extends CommonObject
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -2334,8 +2310,7 @@ class Expedition extends CommonObject
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->statut = self::STATUS_CLOSED;
 			$this->billed = 1;
 
@@ -2372,8 +2347,7 @@ class Expedition extends CommonObject
 		$error = 0;
 
 		// Protection. This avoid to move stock later when we should not
-		if ($this->statut == self::STATUS_VALIDATED)
-		{
+		if ($this->statut == self::STATUS_VALIDATED) {
 			return 0;
 		}
 
@@ -2385,14 +2359,12 @@ class Expedition extends CommonObject
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->statut = self::STATUS_VALIDATED;
 			$this->billed = 0;
 
 			// If stock increment is done on closing
-			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
-			{
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 				$langs->load("agenda");
@@ -2410,27 +2382,25 @@ class Expedition extends CommonObject
 
 				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$cpt = $this->db->num_rows($resql);
-					for ($i = 0; $i < $cpt; $i++)
-					{
+					for ($i = 0; $i < $cpt; $i++) {
 						$obj = $this->db->fetch_object($resql);
-						if (empty($obj->edbrowid))
-						{
+						if (empty($obj->edbrowid)) {
 							$qty = $obj->qty;
 						} else {
 							$qty = $obj->edbqty;
 						}
-						if ($qty <= 0) continue;
+						if ($qty <= 0) {
+							continue;
+						}
 						dol_syslog(get_class($this)."::reopen expedition movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 						//var_dump($this->lines[$i]);
 						$mouvS = new MouvementStock($this->db);
 						$mouvS->origin = &$this;
 
-						if (empty($obj->edbrowid))
-						{
+						if (empty($obj->edbrowid)) {
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
@@ -2470,8 +2440,7 @@ class Expedition extends CommonObject
 			$this->errors[] = $this->db->lasterror();
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -2715,8 +2684,7 @@ class ExpeditionLigne extends CommonObjectLine
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as ed';
 		$sql .= ' WHERE ed.rowid = '.$rowid;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$objp = $this->db->fetch_object($result);
 			$this->id = $objp->rowid;
 			$this->fk_expedition = $objp->fk_expedition;
@@ -2749,20 +2717,20 @@ class ExpeditionLigne extends CommonObjectLine
 		$error = 0;
 
 		// Check parameters
-		if (empty($this->fk_expedition) || empty($this->fk_origin_line) || !is_numeric($this->qty))
-		{
+		if (empty($this->fk_expedition) || empty($this->fk_origin_line) || !is_numeric($this->qty)) {
 			$this->error = 'ErrorMandatoryParametersNotProvided';
 			return -1;
 		}
 
 		$this->db->begin();
 
-		if (empty($this->rang)) $this->rang = 0;
+		if (empty($this->rang)) {
+			$this->rang = 0;
+		}
 
 		// Rank to use
 		$ranktouse = $this->rang;
-		if ($ranktouse == -1)
-		{
+		if ($ranktouse == -1) {
 			$rangmax = $this->line_max($this->fk_expedition);
 			$ranktouse = $rangmax + 1;
 		}
@@ -2783,25 +2751,20 @@ class ExpeditionLigne extends CommonObjectLine
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINESHIPPING_INSERT', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 				// End call triggers
@@ -2812,8 +2775,7 @@ class ExpeditionLigne extends CommonObjectLine
 				return $this->id;
 			}
 
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -2841,13 +2803,11 @@ class ExpeditionLigne extends CommonObjectLine
 		$this->db->begin();
 
 		// delete batch expedition line
-		if ($conf->productbatch->enabled)
-		{
+		if ($conf->productbatch->enabled) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
 			$sql .= " WHERE fk_expeditiondet = ".$this->id;
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				$this->errors[] = $this->db->lasterror()." - sql=$sql";
 				$error++;
 			}
@@ -2856,24 +2816,19 @@ class ExpeditionLigne extends CommonObjectLine
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
 		$sql .= " WHERE rowid = ".$this->id;
 
-		if (!$error && $this->db->query($sql))
-		{
+		if (!$error && $this->db->query($sql)) {
 			// Remove extrafields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->deleteExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->errors[] = $this->error;
 					$error++;
 				}
 			}
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINESHIPPING_DELETE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->errors[] = $this->error;
 					$error++;
 				}
@@ -2888,8 +2843,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -2916,16 +2870,16 @@ class ExpeditionLigne extends CommonObjectLine
 		$this->db->begin();
 
 		// Clean parameters
-		if (empty($this->qty)) $this->qty = 0;
+		if (empty($this->qty)) {
+			$this->qty = 0;
+		}
 		$qty = price2num($this->qty);
 		$remainingQty = 0;
 		$batch = null;
 		$batch_id = null;
 		$expedition_batch_id = null;
-		if (is_array($this->detail_batch)) 	// array of ExpeditionLineBatch
-		{
-			if (count($this->detail_batch) > 1)
-			{
+		if (is_array($this->detail_batch)) { 	// array of ExpeditionLineBatch
+			if (count($this->detail_batch) > 1) {
 				dol_syslog(get_class($this).'::update only possible for one batch', LOG_ERR);
 				$this->errors[] = 'ErrorBadParameters';
 				$error++;
@@ -2933,21 +2887,18 @@ class ExpeditionLigne extends CommonObjectLine
 				$batch = $this->detail_batch[0]->batch;
 				$batch_id = $this->detail_batch[0]->fk_origin_stock;
 				$expedition_batch_id = $this->detail_batch[0]->id;
-				if ($this->entrepot_id != $this->detail_batch[0]->entrepot_id)
-				{
+				if ($this->entrepot_id != $this->detail_batch[0]->entrepot_id) {
 					dol_syslog(get_class($this).'::update only possible for batch of same warehouse', LOG_ERR);
 					$this->errors[] = 'ErrorBadParameters';
 					$error++;
 				}
 				$qty = price2num($this->detail_batch[0]->qty);
 			}
-		} elseif (!empty($this->detail_batch))
-		{
+		} elseif (!empty($this->detail_batch)) {
 			$batch = $this->detail_batch->batch;
 			$batch_id = $this->detail_batch->fk_origin_stock;
 			$expedition_batch_id = $this->detail_batch->id;
-			if ($this->entrepot_id != $this->detail_batch->entrepot_id)
-			{
+			if ($this->entrepot_id != $this->detail_batch->entrepot_id) {
 				dol_syslog(get_class($this).'::update only possible for batch of same warehouse', LOG_ERR);
 				$this->errors[] = 'ErrorBadParameters';
 				$error++;
@@ -2956,8 +2907,7 @@ class ExpeditionLigne extends CommonObjectLine
 		}
 
 		// check parameters
-		if (!isset($this->id) || !isset($this->entrepot_id))
-		{
+		if (!isset($this->id) || !isset($this->entrepot_id)) {
 			dol_syslog(get_class($this).'::update missing line id and/or warehouse id', LOG_ERR);
 			$this->errors[] = 'ErrorMandatoryParametersNotProvided';
 			$error++;
@@ -2966,8 +2916,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 		// update lot
 
-		if (!empty($batch) && $conf->productbatch->enabled)
-		{
+		if (!empty($batch) && $conf->productbatch->enabled) {
 			dol_syslog(get_class($this)."::update expedition batch id=$expedition_batch_id, batch_id=$batch_id, batch=$batch");
 
 			if (empty($batch_id) || empty($this->fk_product)) {
@@ -2978,16 +2927,13 @@ class ExpeditionLigne extends CommonObjectLine
 
 			// fetch remaining lot qty
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-			if (!$error && ($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0)
-			{
+			if (!$error && ($lotArray = ExpeditionLineBatch::fetchAll($this->db, $this->id)) < 0) {
 				$this->errors[] = $this->db->lasterror()." - ExpeditionLineBatch::fetchAll";
 				$error++;
 			} else {
 				// caculate new total line qty
-				foreach ($lotArray as $lot)
-				{
-					if ($expedition_batch_id != $lot->id)
-					{
+				foreach ($lotArray as $lot) {
+					if ($expedition_batch_id != $lot->id) {
 						$remainingQty += $lot->qty;
 					}
 				}
@@ -2998,29 +2944,24 @@ class ExpeditionLigne extends CommonObjectLine
 				// fetch from product_lot
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 				$lot = new Productlot($this->db);
-				if ($lot->fetch(0, $this->fk_product, $batch) < 0)
-				{
+				if ($lot->fetch(0, $this->fk_product, $batch) < 0) {
 					$this->errors[] = $lot->errors;
 					$error++;
 				}
-				if (!$error && !empty($expedition_batch_id))
-				{
+				if (!$error && !empty($expedition_batch_id)) {
 					// delete lot expedition line
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
 					$sql .= " WHERE fk_expeditiondet = ".$this->id;
 					$sql .= " AND rowid = ".$expedition_batch_id;
 
-					if (!$this->db->query($sql))
-					{
+					if (!$this->db->query($sql)) {
 						$this->errors[] = $this->db->lasterror()." - sql=$sql";
 						$error++;
 					}
 				}
-				if (!$error && $this->detail_batch->qty > 0)
-				{
+				if (!$error && $this->detail_batch->qty > 0) {
 					// create lot expedition line
-					if (isset($lot->id))
-					{
+					if (isset($lot->id)) {
 						$shipmentLot = new ExpeditionLineBatch($this->db);
 						$shipmentLot->batch = $lot->batch;
 						$shipmentLot->eatby = $lot->eatby;
@@ -3028,8 +2969,7 @@ class ExpeditionLigne extends CommonObjectLine
 						$shipmentLot->entrepot_id = $this->detail_batch->entrepot_id;
 						$shipmentLot->qty = $this->detail_batch->qty;
 						$shipmentLot->fk_origin_stock = $batch_id;
-						if ($shipmentLot->create($this->id) < 0)
-						{
+						if ($shipmentLot->create($this->id) < 0) {
 							$this->errors[] = $shipmentLot->errors;
 							$error++;
 						}
@@ -3037,40 +2977,33 @@ class ExpeditionLigne extends CommonObjectLine
 				}
 			}
 		}
-		if (!$error)
-		{
+		if (!$error) {
 			// update line
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
 			$sql .= " fk_entrepot = ".($this->entrepot_id > 0 ? $this->entrepot_id : 'null');
 			$sql .= " , qty = ".$qty;
 			$sql .= " WHERE rowid = ".$this->id;
 
-			if (!$this->db->query($sql))
-			{
+			if (!$this->db->query($sql)) {
 				$this->errors[] = $this->db->lasterror()." - sql=$sql";
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
-			if (!$error)
-			{
+		if (!$error) {
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->errors[] = $this->error;
 					$error++;
 				}
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('LINESHIPPING_UPDATE', $user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->errors[] = $this->error;
 				$error++;
 			}
@@ -3080,8 +3013,7 @@ class ExpeditionLigne extends CommonObjectLine
 			$this->db->commit();
 			return 1;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
diff --git a/htdocs/expedition/class/expeditionbatch.class.php b/htdocs/expedition/class/expeditionbatch.class.php
index 637f9dd749c..f97d6b87a1b 100644
--- a/htdocs/expedition/class/expeditionbatch.class.php
+++ b/htdocs/expedition/class/expeditionbatch.class.php
@@ -75,10 +75,8 @@ class ExpeditionLineBatch extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->sellby = $this->db->jdate($obj->sellby);
@@ -126,16 +124,16 @@ class ExpeditionLineBatch extends CommonObject
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.self::$_table_element);
 			$this->fk_expeditiondet = $id_line_expdet;
 			return $this->id;
 		} else {
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -159,8 +157,7 @@ class ExpeditionLineBatch extends CommonObject
 		$sql .= " WHERE fk_expeditiondet in (SELECT rowid FROM ".MAIN_DB_PREFIX."expeditiondet WHERE fk_expedition=".$id_expedition.")";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		if ($db->query($sql))
-		{
+		if ($db->query($sql)) {
 			return 1;
 		} else {
 			return -1;
@@ -185,27 +182,23 @@ class ExpeditionLineBatch extends CommonObject
 		$sql .= " eb.batch,";
 		$sql .= " eb.qty,";
 		$sql .= " eb.fk_origin_stock";
-		if ($fk_product > 0)
-		{
+		if ($fk_product > 0) {
 			$sql .= ", pl.sellby";
 			$sql .= ", pl.eatby";
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX.self::$_table_element." as eb";
-		if ($fk_product > 0)
-		{
+		if ($fk_product > 0) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lot as pl ON pl.batch = eb.batch AND pl.fk_product = ".$fk_product;
 		}
 		$sql .= " WHERE fk_expeditiondet=".(int) $id_line_expdet;
 
 		dol_syslog(__METHOD__."", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
 			$ret = array();
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$tmp = new self($db);
 
 				$obj = $db->fetch_object($resql);
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index 49d37179eda..50382cef164 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -73,12 +73,15 @@ class ExpeditionStats extends Stats
 
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
 		$this->where .= " AND c.entity = ".$conf->entity;
-		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
-		if ($this->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
+		if ($this->socid) {
 			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+		if ($this->userid > 0) {
+			$this->where .= ' AND c.fk_user_author = '.$this->userid;
+		}
 	}
 
 	/**
@@ -94,7 +97,9 @@ class ExpeditionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -116,7 +121,9 @@ class ExpeditionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, SUM(c.".$this->field.")";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -135,7 +142,9 @@ class ExpeditionStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, SUM(c.".$this->field.") as total, AVG(".$this->field.") as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
 		$sql .= $this->db->order('year', 'DESC');
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index d15e267b285..a096b2155ce 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -42,30 +42,28 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expedition', $id, '');
 
 $object = new Expedition($db);
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
 
-	if (!empty($object->origin))
-	{
+	if (!empty($object->origin)) {
 		$typeobject = $object->origin;
 		$origin = $object->origin;
 		$object->fetch_origin();
 	}
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-	{
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
-	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-	{
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled)) {
 		$objectsrc = new Propal($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
@@ -76,22 +74,18 @@ if ($id > 0 || !empty($ref))
  * Actions
  */
 
-if ($action == 'addcontact' && $user->rights->expedition->creer)
-{
-	if ($result > 0 && $id > 0)
-	{
+if ($action == 'addcontact' && $user->rights->expedition->creer) {
+	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $objectsrc->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
-		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($objectsrc->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 		} else {
@@ -100,21 +94,14 @@ if ($action == 'addcontact' && $user->rights->expedition->creer)
 		}
 		setEventMessages($mesg, $mesgs, 'errors');
 	}
-}
-
-// bascule du statut d'un contact
-elseif ($action == 'swapstatut' && $user->rights->expedition->creer)
-{
+} elseif ($action == 'swapstatut' && $user->rights->expedition->creer) {
+	// bascule du statut d'un contact
 	$result = $objectsrc->swapContactStatus(GETPOST('ligne'));
-}
-
-// Efface un contact
-elseif ($action == 'deletecontact' && $user->rights->expedition->creer)
-{
+} elseif ($action == 'deletecontact' && $user->rights->expedition->creer) {
+	// Efface un contact
 	$result = $objectsrc->delete_contact(GETPOST("lineid"));
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -149,8 +136,7 @@ $userstatic = new User($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$langs->trans("OrderCard");
 
 	$head = shipping_prepare_head($object);
@@ -213,8 +199,7 @@ if ($id > 0 || !empty($ref))
 	print '<table class="border centpercent tableforfield">';
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-	{
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
 		print '<tr><td class="titlefield">';
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
@@ -224,8 +209,7 @@ if ($id > 0 || !empty($ref))
 		print "</td>\n";
 		print '</tr>';
 	}
-	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-	{
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled)) {
 		print '<tr><td class="titlefield">';
 		$objectsrc = new Propal($db);
 		$objectsrc->fetch($object->$typeobject->id);
@@ -260,10 +244,11 @@ if ($id > 0 || !empty($ref))
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
 	$preselectedtypeofcontact = dol_getIdFromCode($db, 'SHIPPING', 'c_type_contact', 'code', 'rowid');
-	foreach ($dirtpls as $reldir)
-	{
+	foreach ($dirtpls as $reldir) {
 		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) break;
+		if ($res) {
+			break;
+		}
 	}
 }
 
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 2b710e87dee..836b469cb77 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -46,8 +46,7 @@ $id			= GETPOST('id', 'int');
 $ref		= GETPOST('ref');
 
 // Security check
-if ($user->socid)
-{
+if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'expedition', $id, '');
@@ -57,12 +56,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new Expedition($db);
 
@@ -70,8 +75,7 @@ $object = new Expedition($db);
 /*
  * Actions
  */
-if ($object->fetch($id))
-{
+if ($object->fetch($id)) {
 	$object->fetch_thirdparty();
 	$upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
 }
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 4a84bfc6718..5ea3b923e91 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -54,8 +54,7 @@ print load_fiche_titre($langs->trans("SendingsArea"), '', 'dolly');
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	print '<form method="post" action="list.php">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<div class="div-table-responsive-no-min">';
@@ -79,19 +78,19 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (!$user->rights->societe->client->voir && !$socid)
-{
+if (!$user->rights->societe->client->voir && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 	$sql .= $clause." sc.fk_user = ".$user->id;
 	$clause = " AND ";
 }
 $sql .= $clause." e.fk_statut = ".Expedition::STATUS_DRAFT;
 $sql .= " AND e.entity IN (".getEntity('expedition').")";
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+if ($socid) {
+	$sql .= " AND c.fk_soc = ".$socid;
+}
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	print '<div class="div-table-responsive-no-min">';
@@ -105,11 +104,9 @@ if ($resql)
 	print '</th>';
 	print '</tr>';
 
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			$shipment->id = $obj->rowid;
@@ -123,7 +120,9 @@ if ($resql)
 			print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name.'</a>';
 			print '</td>';
 			print '<td>';
-			if ($obj->commande_id) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
+			if ($obj->commande_id) {
+				print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
+			}
 			print '</td></tr>';
 			$i++;
 		}
@@ -151,17 +150,22 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
+}
 $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND sc.fk_user = ".$user->id;
+}
 $sql .= " AND e.fk_statut = ".Expedition::STATUS_VALIDATED;
-if ($socid) $sql .= " AND c.fk_soc = ".$socid;
+if ($socid) {
+	$sql .= " AND c.fk_soc = ".$socid;
+}
 $sql .= " ORDER BY e.date_delivery DESC";
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	print '<div class="div-table-responsive-no-min">';
@@ -175,11 +179,9 @@ if ($resql)
 	print '</th>';
 	print '</tr>';
 
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			$shipment->id = $obj->rowid;
@@ -191,8 +193,7 @@ if ($resql)
 			print '</td>';
 			print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.$obj->name.'</a></td>';
 			print '<td>';
-			if ($obj->commande_id > 0)
-			{
+			if ($obj->commande_id > 0) {
 				$orderstatic->id = $obj->commande_id;
 				$orderstatic->ref = $obj->commande_ref;
 				print $orderstatic->getNomUrl(1);
@@ -209,7 +210,9 @@ if ($resql)
 	}
 	print "</table></div><br>";
 	$db->free($resql);
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 /*
  * Open orders
@@ -217,17 +220,22 @@ if ($resql)
 $sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande as c,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity IN (".getEntity('order').")";
 $sql .= " AND c.fk_statut IN (".Commande::STATUS_VALIDATED.", ".Commande::STATUS_ACCEPTED.")";
-if ($socid > 0) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid > 0) {
+	$sql .= " AND c.fk_soc = ".$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 $sql .= " ORDER BY c.rowid ASC";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$langs->load("orders");
 
 	$num = $db->num_rows($resql);
@@ -243,11 +251,9 @@ if ($resql)
 	print '</th>';
 	print '</tr>';
 
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num && $i < 10)
-		{
+		while ($i < $num && $i < 10) {
 			$obj = $db->fetch_object($resql);
 
 			$orderstatic->id = $obj->rowid;
@@ -284,7 +290,9 @@ if ($resql)
 	}
 
 	print "</table></div><br>";
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 
 print '</div></div></div>';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index a21ad170b09..f325fc286a5 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -49,7 +49,9 @@ $toselect   = GETPOST('toselect', 'array');
 
 // Security check
 $expeditionid = GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expedition', $expeditionid, '');
 
 $search_ref_exp = GETPOST("search_ref_exp", 'alpha');
@@ -79,9 +81,15 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (!$sortfield) $sortfield = "e.ref";
-if (!$sortorder) $sortorder = "DESC";
-if (empty($page) || $page == -1 || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1
+if (!$sortfield) {
+	$sortfield = "e.ref";
+}
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (empty($page) || $page == -1 || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -109,7 +117,9 @@ $fieldstosearchall = array(
 	'e.note_public'=>'NotePublic',
 	'e.tracking_number'=>"TrackingNumber",
 );
-if (empty($user->socid)) $fieldstosearchall["e.note_private"] = "NotePrivate";
+if (empty($user->socid)) {
+	$fieldstosearchall["e.note_private"] = "NotePrivate";
+}
 
 $checkedtypetiers = 0;
 $arrayfields = array(
@@ -144,18 +154,23 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  */
 $error = 0;
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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');
+}
 
 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_categ = '';
 	$search_user = '';
 	$search_sale = '';
@@ -182,8 +197,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_categ_cus = 0;
 }
 
-if (empty($reshook))
-{
+if (empty($reshook)) {
 	$objectclass  = 'Expedition';
 	$objectlabel  = 'Sendings';
 	$permissiontoread   = $user->rights->expedition->lire;
@@ -211,7 +225,9 @@ $helpurl = 'EN:Module_Shipments|FR:Module_Exp&eacute;ditions|ES:M&oacute;dulo_Ex
 llxHeader('', $langs->trans('ListOfSendings'), $helpurl);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0 || $search_user > 0) {
+	$sql = 'SELECT DISTINCT';
+}
 $sql .= " e.rowid, e.ref, e.ref_customer, e.date_expedition as date_expedition, e.weight, e.weight_units, e.date_delivery as delivery_date, e.fk_statut, e.billed, e.tracking_number,";
 $sql .= " l.date_delivery as date_reception,";
 $sql .= " s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, ";
@@ -219,24 +235,34 @@ $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " e.date_creation as date_creation, e.tms as date_update,";
 $sql .= " u.login";
-if ($search_categ_cus) $sql .= ", cc.fk_categorie, cc.fk_soc";
+if ($search_categ_cus) {
+	$sql .= ", cc.fk_categorie, cc.fk_soc";
+}
 // 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
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
-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 (e.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 (e.rowid = ef.fk_object)";
+}
 if ($sall || $search_product_category > 0) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expeditiondet as ed ON e.rowid=ed.fk_expedition';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commandedet as pd ON pd.rowid=ed.fk_origin_line';
 }
-if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+if ($search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
-if (!empty($search_categ_cus)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+if (!empty($search_categ_cus)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_societe as cc ON s.rowid = cc.fk_soc"; // We'll need this table joined to the select in order to filter by categ
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
@@ -247,50 +273,91 @@ if ($search_user > 0) {		// Get link to order to get the order id in eesource.fk
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as eesource ON eesource.fk_target = e.rowid AND eesource.targettype = 'shipping' AND eesource.sourcetype = 'commande'";
 }
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
-if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
-if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
-if (!$user->rights->societe->client->voir && !$socid)	// Internal user with no permission to see all
-{
+if ($search_product_category > 0) {
+	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+}
+if ($socid > 0) {
+	$sql .= ' AND s.rowid = '.$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {	// Internal user with no permission to see all
 	$sql .= " AND e.fk_soc = sc.fk_soc";
 	$sql .= " AND sc.fk_user = ".$user->id;
 }
-if ($socid)
-{
+if ($socid) {
 	$sql .= " AND e.fk_soc = ".$socid;
 }
 if ($search_status <> '' && $search_status >= 0) {
 	$sql .= " AND e.fk_statut = ".$search_status;
 }
-if ($search_ref_customer != '') $sql .= natural_search('e.ref_customer', $search_ref_customer);
-if ($search_billed != '' && $search_billed >= 0) $sql .= ' AND e.billed = '.$search_billed;
-if ($search_town)  $sql .= natural_search('s.town', $search_town);
-if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
-if ($search_state) $sql .= natural_search("state.nom", $search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_tracking)   $sql .= natural_search("e.tracking_number", $search_tracking);
-if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-if ($search_sale > 0)                        $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
-if ($search_user > 0)
-{
+if ($search_ref_customer != '') {
+	$sql .= natural_search('e.ref_customer', $search_ref_customer);
+}
+if ($search_billed != '' && $search_billed >= 0) {
+	$sql .= ' AND e.billed = '.$search_billed;
+}
+if ($search_town) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+	$sql .= natural_search("s.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_country) {
+	$sql .= " AND s.fk_pays IN (".$search_country.')';
+}
+if ($search_tracking) {
+	$sql .= natural_search("e.tracking_number", $search_tracking);
+}
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
+	$sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+}
+if ($search_sale > 0) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
+}
+if ($search_user > 0) {
 	// The contact on a shipment is also the contact of the order.
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='commande' AND tc.source='internal' AND ec.element_id = eesource.fk_source AND ec.fk_socpeople = ".$db->escape($search_user);
 }
-if ($search_ref_exp) $sql .= natural_search('e.ref', $search_ref_exp);
-if ($search_ref_liv) $sql .= natural_search('l.ref', $search_ref_liv);
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_datedelivery_start)	$sql .= " AND e.date_delivery >= '".$db->idate($search_datedelivery_start)."'";
-if ($search_datedelivery_end)	$sql .= " AND e.date_delivery <= '".$db->idate($search_datedelivery_end)."'";
-if ($search_datereceipt_start)	$sql .= " AND l.date_delivery >= '".$db->idate($search_datereceipt_start)."'";
-if ($search_datereceipt_end)	$sql .= " AND l.date_delivery <= '".$db->idate($search_datereceipt_end)."'";
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_categ_cus > 0)                   $sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
-if ($search_categ_cus == -2)                 $sql .= " AND cc.fk_categorie IS NULL";
+if ($search_ref_exp) {
+	$sql .= natural_search('e.ref', $search_ref_exp);
+}
+if ($search_ref_liv) {
+	$sql .= natural_search('l.ref', $search_ref_liv);
+}
+if ($search_company) {
+	$sql .= natural_search('s.nom', $search_company);
+}
+if ($search_datedelivery_start) {
+	$sql .= " AND e.date_delivery >= '".$db->idate($search_datedelivery_start)."'";
+}
+if ($search_datedelivery_end) {
+	$sql .= " AND e.date_delivery <= '".$db->idate($search_datedelivery_end)."'";
+}
+if ($search_datereceipt_start) {
+	$sql .= " AND l.date_delivery >= '".$db->idate($search_datereceipt_start)."'";
+}
+if ($search_datereceipt_end) {
+	$sql .= " AND l.date_delivery <= '".$db->idate($search_datereceipt_end)."'";
+}
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if ($search_categ_cus > 0) {
+	$sql .= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
+}
+if ($search_categ_cus == -2) {
+	$sql .= " AND cc.fk_categorie IS NULL";
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -303,12 +370,10 @@ $sql .= $hookmanager->resPrint;
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -318,8 +383,7 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 //print $sql;
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
@@ -327,29 +391,71 @@ if ($resql)
 	$expedition = new Expedition($db);
 
 	$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 .= "&amp;sall=".urlencode($sall);
-	if ($search_ref_exp)  $param .= "&amp;search_ref_exp=".urlencode($search_ref_exp);
-	if ($search_ref_liv)  $param .= "&amp;search_ref_liv=".urlencode($search_ref_liv);
-	if ($search_ref_customer) $param .= "&amp;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_company)   $param .= "&amp;search_company=".urlencode($search_company);
-	if ($search_tracking)   $param .= "&amp;search_tracking=".urlencode($search_tracking);
-	if ($search_town)      $param .= '&search_town='.urlencode($search_town);
-	if ($search_zip)       $param .= '&search_zip='.urlencode($search_zip);
-	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)   $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	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 .= "&amp;sall=".urlencode($sall);
+	}
+	if ($search_ref_exp) {
+		$param .= "&amp;search_ref_exp=".urlencode($search_ref_exp);
+	}
+	if ($search_ref_liv) {
+		$param .= "&amp;search_ref_liv=".urlencode($search_ref_liv);
+	}
+	if ($search_ref_customer) {
+		$param .= "&amp;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_company) {
+		$param .= "&amp;search_company=".urlencode($search_company);
+	}
+	if ($search_tracking) {
+		$param .= "&amp;search_tracking=".urlencode($search_tracking);
+	}
+	if ($search_town) {
+		$param .= '&search_town='.urlencode($search_town);
+	}
+	if ($search_zip) {
+		$param .= '&search_zip='.urlencode($search_zip);
+	}
+	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
+		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	}
 
-	if ($search_datedelivery_start)	$param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
-	if ($search_datedelivery_end)	$param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);
-	if ($search_datereceipt_start)	$param .= '&search_datereceipt_start='.urlencode($search_datereceipt_start);
-	if ($search_datereceipt_end)	$param .= '&search_datereceipt_end='.urlencode($search_datereceipt_end);
+	if ($search_datedelivery_start) {
+		$param .= '&search_datedelivery_start='.urlencode($search_datedelivery_start);
+	}
+	if ($search_datedelivery_end) {
+		$param .= '&search_datedelivery_end='.urlencode($search_datedelivery_end);
+	}
+	if ($search_datereceipt_start) {
+		$param .= '&search_datereceipt_start='.urlencode($search_datereceipt_start);
+	}
+	if ($search_datereceipt_end) {
+		$param .= '&search_datereceipt_end='.urlencode($search_datereceipt_end);
+	}
 
-	if ($search_product_category != '') $param .= '&search_product_category='.urlencode($search_product_category);
-	if ($search_categ_cus > 0)      $param .= '&search_categ_cus='.urlencode($search_categ_cus);
-	if ($search_status != '') $param .= '&search_status='.urlencode($search_status);
-	if ($optioncss != '')  $param .= '&optioncss='.urlencode($optioncss);
+	if ($search_product_category != '') {
+		$param .= '&search_product_category='.urlencode($search_product_category);
+	}
+	if ($search_categ_cus > 0) {
+		$param .= '&search_categ_cus='.urlencode($search_categ_cus);
+	}
+	if ($search_status != '') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -358,7 +464,9 @@ if ($resql)
 		//'classifyclose'=>$langs->trans("Close"), TODO massive close shipment ie: when truck is charged
 		'presend'  => $langs->trans("SendByMail"),
 	);
-	if (in_array($massaction, array('presend'))) $arrayofmassactions = array();
+	if (in_array($massaction, array('presend'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	// Currently: a sending can't create from sending list
@@ -369,7 +477,9 @@ if ($resql)
 
 	$i = 0;
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -384,34 +494,32 @@ if ($resql)
 	$trackid = 'shi'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($sall)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
 	$moreforfilter = '';
 
- 	// If the user can view prospects other than his'
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
- 		$langs->load("commercial");
+	// If the user can view prospects other than his'
+	if ($user->rights->societe->client->voir || $socid) {
+		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
- 		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
+		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
 		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
-	 	$moreforfilter .= '</div>';
- 	}
+		$moreforfilter .= '</div>';
+	}
 	// If the user can view other users
-	if ($user->rights->user->user->lire)
-	{
+	if ($user->rights->user->user->lire) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
 		$moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
@@ -419,21 +527,22 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
-	 	$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
+		$moreforfilter .= $langs->trans('CustomersProspectsCategoriesShort').': ';
 		$moreforfilter .= $formother->select_categories('customer', $search_categ_cus, 'search_categ_cus', 1);
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 	$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))
-	{
+	if (!empty($moreforfilter)) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
@@ -441,7 +550,9 @@ if ($resql)
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);
-	if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1); // This also change content of $arrayfields
+	if ($massactionbutton) {
+		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1); // This also change content of $arrayfields
+	}
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
@@ -449,61 +560,57 @@ if ($resql)
 	// Fields title search
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (!empty($arrayfields['e.ref']['checked']))
-	{
+	if (!empty($arrayfields['e.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_ref_exp" value="'.$search_ref_exp.'">';
 		print '</td>';
 	}
 	// Ref customer
-	if (!empty($arrayfields['e.ref_customer']['checked']))
-	{
+	if (!empty($arrayfields['e.ref_customer']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_ref_customer" value="'.$search_ref_customer.'">';
 		print '</td>';
 	}
 	// Thirdparty
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre left">';
 		print '<input class="flat" type="text" size="8" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
 		print '</td>';
 	}
 	// Town
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
+	}
 	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_zip" value="'.$search_zip.'"></td>';
+	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="liste_titre center">';
 		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 		print '</td>';
 	}
 	// Company type
-	if (!empty($arrayfields['typent.code']['checked']))
-	{
+	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Weight
-	if (!empty($arrayfields['e.weight']['checked']))
-	{
+	if (!empty($arrayfields['e.weight']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
 
 		print '</td>';
 	}
 	// Date delivery planned
-	if (!empty($arrayfields['e.date_delivery']['checked']))
-	{
+	if (!empty($arrayfields['e.date_delivery']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		print $langs->trans('From').' ';
@@ -516,21 +623,18 @@ if ($resql)
 		print '</td>';
 	}
 	// Tracking number
-	if (!empty($arrayfields['e.tracking_number']['checked']))
-	{
+	if (!empty($arrayfields['e.tracking_number']['checked'])) {
 		print '<td class="liste_titre center">';
 		print '<input class="flat" size="6" type="text" name="search_tracking" value="'.dol_escape_htmltag($search_tracking).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['l.ref']['checked']))
-	{
+	if (!empty($arrayfields['l.ref']['checked'])) {
 		// Delivery ref
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="10" type="text" name="search_ref_liv" value="'.$search_ref_liv.'"';
 		print '</td>';
 	}
-	if (!empty($arrayfields['l.date_delivery']['checked']))
-	{
+	if (!empty($arrayfields['l.date_delivery']['checked'])) {
 		// Date received
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
@@ -551,27 +655,23 @@ if ($resql)
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['e.datec']['checked']))
-	{
+	if (!empty($arrayfields['e.datec']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['e.tms']['checked']))
-	{
+	if (!empty($arrayfields['e.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['e.fk_statut']['checked']))
-	{
+	if (!empty($arrayfields['e.fk_statut']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone right">';
 		print $form->selectarray('search_status', array('0'=>$langs->trans('StatusSendingDraftShort'), '1'=>$langs->trans('StatusSendingValidatedShort'), '2'=>$langs->trans('StatusSendingProcessedShort')), $search_status, 1);
 		print '</td>';
 	}
 	// Status billed
-	if (!empty($arrayfields['e.billed']['checked']))
-	{
+	if (!empty($arrayfields['e.billed']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
 		print '</td>';
@@ -584,37 +684,70 @@ if ($resql)
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['e.ref']['checked']))            print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['e.ref_customer']['checked']))   print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"], "e.ref_customer", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.nom']['checked']))            print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder, 'left ');
-	if (!empty($arrayfields['s.town']['checked']))           print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.zip']['checked']))            print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['typent.code']['checked']))      print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['e.weight']['checked']))         print_liste_field_titre($arrayfields['e.weight']['label'], $_SERVER["PHP_SELF"], "e.weight", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['e.date_delivery']['checked']))  print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['e.tracking_number']['checked']))  print_liste_field_titre($arrayfields['e.tracking_number']['label'], $_SERVER["PHP_SELF"], "e.tracking_number", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['l.ref']['checked']))            print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['l.date_delivery']['checked']))  print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['e.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['e.ref_customer']['checked'])) {
+		print_liste_field_titre($arrayfields['e.ref_customer']['label'], $_SERVER["PHP_SELF"], "e.ref_customer", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder, 'left ');
+	}
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['typent.code']['checked'])) {
+		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['e.weight']['checked'])) {
+		print_liste_field_titre($arrayfields['e.weight']['label'], $_SERVER["PHP_SELF"], "e.weight", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['e.date_delivery']['checked'])) {
+		print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['e.tracking_number']['checked'])) {
+		print_liste_field_titre($arrayfields['e.tracking_number']['label'], $_SERVER["PHP_SELF"], "e.tracking_number", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['l.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['l.ref']['label'], $_SERVER["PHP_SELF"], "l.ref", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['l.date_delivery']['checked'])) {
+		print_liste_field_titre($arrayfields['l.date_delivery']['label'], $_SERVER["PHP_SELF"], "l.date_delivery", "", $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); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (!empty($arrayfields['e.datec']['checked']))  print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['e.tms']['checked']))    print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['e.fk_statut']['checked'])) print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['e.billed']['checked'])) print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['e.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['e.datec']['label'], $_SERVER["PHP_SELF"], "e.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['e.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['e.tms']['label'], $_SERVER["PHP_SELF"], "e.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['e.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['e.fk_statut']['label'], $_SERVER["PHP_SELF"], "e.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['e.billed']['checked'])) {
+		print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
 	$typenArray = $formcompany->typent_array(1);
 	$i = 0;
 	$totalarray = array();
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$shipment->id = $obj->rowid;
@@ -630,76 +763,84 @@ if ($resql)
 		print '<tr class="oddeven">';
 
 		// Ref
-		if (!empty($arrayfields['e.ref']['checked']))
-		{
+		if (!empty($arrayfields['e.ref']['checked'])) {
 			print "<td>";
 			print $shipment->getNomUrl(1);
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Ref customer
-		if (!empty($arrayfields['e.ref_customer']['checked']))
-		{
+		if (!empty($arrayfields['e.ref_customer']['checked'])) {
 			print "<td>";
 			print $obj->ref_customer;
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Third party
-		if (!empty($arrayfields['s.nom']['checked']))
-		{
+		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td>';
 			print $companystatic->getNomUrl(1);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Town
-		if (!empty($arrayfields['s.town']['checked']))
-		{
+		if (!empty($arrayfields['s.town']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->town;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Zip
-		if (!empty($arrayfields['s.zip']['checked']))
-		{
+		if (!empty($arrayfields['s.zip']['checked'])) {
 			print '<td class="nocellnopadd">';
 			print $obj->zip;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// State
-		if (!empty($arrayfields['state.nom']['checked']))
-		{
+		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']))
-		{
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
 			$tmparray = getCountry($obj->fk_pays, 'all');
 			print $tmparray['label'];
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Type ent
-		if (!empty($arrayfields['typent.code']['checked']))
-		{
+		if (!empty($arrayfields['typent.code']['checked'])) {
 			print '<td class="center">';
-			if (isset($typenArray[$obj->typent_code]))  print $typenArray[$obj->typent_code];
+			if (isset($typenArray[$obj->typent_code])) {
+				print $typenArray[$obj->typent_code];
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Weight
-		if (!empty($arrayfields['e.weight']['checked']))
-		{
+		if (!empty($arrayfields['e.weight']['checked'])) {
 			print '<td class="center">';
-			if (empty($object->trueWeight))
-			{
+			if (empty($object->trueWeight)) {
 				$tmparray = $object->getTotalWeightVolume();
 				print showDimensionInBestUnit($tmparray['weight'], 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
 				print $form->textwithpicto('', $langs->trans('EstimatedWeight'), 1);
@@ -708,42 +849,43 @@ if ($resql)
 				print ($object->trueWeight && $object->weight_units != '') ? ' '.measuringUnitString(0, "weight", $object->weight_units) : '';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Date delivery planed
-		if (!empty($arrayfields['e.date_delivery']['checked']))
-		{
+		if (!empty($arrayfields['e.date_delivery']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->delivery_date), "dayhour");
 			/*$now = time();
-    		if ( ($now - $db->jdate($obj->date_expedition)) > $conf->warnings->lim && $obj->statutid == 1 )
-    		{
-    		}*/
+			if ( ($now - $db->jdate($obj->date_expedition)) > $conf->warnings->lim && $obj->statutid == 1 )
+			{
+			}*/
 			print "</td>\n";
 		}
 		// Tracking number
-		if (!empty($arrayfields['e.tracking_number']['checked']))
-		{
+		if (!empty($arrayfields['e.tracking_number']['checked'])) {
 			print '<td class="center">'.$obj->tracking_number."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
-		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked']))
-		{
+		if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked'])) {
 			$shipment->fetchObjectLinked($shipment->id, $shipment->element);
 			$receiving = '';
-			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) $receiving = reset($shipment->linkedObjects['delivery']);
+			if (is_array($shipment->linkedObjects['delivery']) && count($shipment->linkedObjects['delivery']) > 0) {
+				$receiving = reset($shipment->linkedObjects['delivery']);
+			}
 
-			if (!empty($arrayfields['l.ref']['checked']))
-			{
+			if (!empty($arrayfields['l.ref']['checked'])) {
 				// Ref
 				print '<td>';
 				print !empty($receiving) ? $receiving->getNomUrl($db) : '';
 				print '</td>';
 			}
 
-			if (!empty($arrayfields['l.date_delivery']['checked']))
-			{
+			if (!empty($arrayfields['l.date_delivery']['checked'])) {
 				// Date received
 				print '<td class="center">';
 				print dol_print_date($db->jdate($obj->date_reception), "day");
@@ -758,44 +900,51 @@ if ($resql)
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
-		if (!empty($arrayfields['e.datec']['checked']))
-		{
+		if (!empty($arrayfields['e.datec']['checked'])) {
 			print '<td class="center nowrap">';
 			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['e.tms']['checked']))
-		{
+		if (!empty($arrayfields['e.tms']['checked'])) {
 			print '<td class="center nowrap">';
 			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['e.fk_statut']['checked']))
-		{
+		if (!empty($arrayfields['e.fk_statut']['checked'])) {
 			print '<td class="right nowrap">'.$shipment->LibStatut($obj->fk_statut, 5).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Billed
-		if (!empty($arrayfields['e.billed']['checked']))
-		{
+		if (!empty($arrayfields['e.billed']['checked'])) {
 			print '<td class="center">'.yn($obj->billed).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Action column
 		print '<td class="nowrap" align="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->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";
 
@@ -812,7 +961,9 @@ if ($resql)
 	print '</form>';
 
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files)   $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	// Show list of available documents
 	$urlsource  = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index 6397a301e59..c8209910b48 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -41,30 +41,28 @@ $action = GETPOST('action', 'aZ09');
 
 // Security check
 $socid = '';
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, $origin, $origin_id);
 
 $object = new Expedition($db);
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
 
-	if (!empty($object->origin))
-	{
+	if (!empty($object->origin)) {
 		$typeobject = $object->origin;
 		$origin = $object->origin;
 		$object->fetch_origin();
 	}
 
 	// Linked documents
-	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled))
-	{
+	if ($typeobject == 'commande' && $object->$typeobject->id && !empty($conf->commande->enabled)) {
 		$objectsrc = new Commande($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
-	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled))
-	{
+	if ($typeobject == 'propal' && $object->$typeobject->id && !empty($conf->propal->enabled)) {
 		$objectsrc = new Propal($db);
 		$objectsrc->fetch($object->$typeobject->id);
 	}
@@ -88,8 +86,7 @@ llxHeader();
 
 $form = new Form($db);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$head = shipping_prepare_head($object);
 	print dol_get_fiche_head($head, 'note', $langs->trans("Shipment"), -1, 'sending');
 
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 1c4e5bf5c25..66efd5c4ca7 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -37,9 +37,15 @@ if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-if (!empty($conf->stock->enabled))  require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
-if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (!empty($conf->stock->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+}
+if (!empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('orders', "companies", "bills", 'propal', 'deliveries', 'stocks', "productbatch", 'incoterm', 'other'));
@@ -53,7 +59,9 @@ $hookmanager->initHooks(array('ordershipmentcard'));
 
 // Security check
 $socid = 0;
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'commande', $id);
 
 $object = new Commande($db);
@@ -74,93 +82,86 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 $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))
-{
+if (empty($reshook)) {
 	// Categorisation dans projet
-	if ($action == 'classin')
-	{
+	if ($action == 'classin') {
 		$object = new Commande($db);
 		$object->fetch($id);
 		$object->setProject(GETPOST('projectid', 'int'));
 	}
 
-	if ($action == 'confirm_cloture' && GETPOST('confirm', 'alpha') == 'yes')
-	{
+	if ($action == 'confirm_cloture' && GETPOST('confirm', 'alpha') == 'yes') {
 		$object = new Commande($db);
 		$object->fetch($id);
 		$result = $object->cloture($user);
-	}
-
-	// Positionne ref commande client
-	elseif ($action == 'setref_client' && $user->rights->commande->creer) {
+	} elseif ($action == 'setref_client' && $user->rights->commande->creer) {
+		// Positionne ref commande client
 		$result = $object->set_ref_client($user, GETPOST('ref_client'));
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	if ($action == 'setdatedelivery' && $user->rights->commande->creer)
-	{
+	if ($action == 'setdatedelivery' && $user->rights->commande->creer) {
 		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 		$object->fetch($id);
 		$result = $object->setDeliveryDate($user, $datedelivery);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 	/*
-    if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
-    {
-    	$object = new Commande($db);
-    	$object->fetch($id);
-    	$object->setDeliveryAddress(GETPOST('delivery_address_id','int'));
-    	if ($result < 0)
-    		setEventMessages($object->error, $object->errors, 'errors');
-    }
-    */
-	if ($action == 'setmode' && $user->rights->commande->creer)
+	if ($action == 'setdeliveryaddress' && $user->rights->commande->creer)
 	{
 		$object = new Commande($db);
 		$object->fetch($id);
-		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		$object->setDeliveryAddress(GETPOST('delivery_address_id','int'));
 		if ($result < 0)
 			setEventMessages($object->error, $object->errors, 'errors');
 	}
+	*/
+	if ($action == 'setmode' && $user->rights->commande->creer) {
+		$object = new Commande($db);
+		$object->fetch($id);
+		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 
 	if ($action == 'setavailability' && $user->rights->commande->creer) {
 		$object = new Commande($db);
 		$object->fetch($id);
 		$result = $object->availability(GETPOST('availability_id'));
-		if ($result < 0)
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	if ($action == 'setdemandreason' && $user->rights->commande->creer) {
 		$object = new Commande($db);
 		$object->fetch($id);
 		$result = $object->demand_reason(GETPOST('demand_reason_id'));
-		if ($result < 0)
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
-	if ($action == 'setconditions' && $user->rights->commande->creer)
-	{
+	if ($action == 'setconditions' && $user->rights->commande->creer) {
 		$object = new Commande($db);
 		$object->fetch($id);
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-		if ($result < 0)
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	// Set incoterm
-	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-	{
+		}
+	} elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {
+		// Set incoterm
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -172,8 +173,9 @@ if (empty($reshook))
 		$object = new Commande($db);
 		$object->fetch($id);
 		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-		if ($result < 0)
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// warehouse
@@ -181,35 +183,35 @@ if (empty($reshook))
 		$object = new Commande($db);
 		$object->fetch($id);
 		$result = $object->setWarehouse(GETPOST('warehouse_id', 'int'));
-		if ($result < 0)
+		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
-	if ($action == 'update_extras')
-	{
+	if ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Actions on extra fields
 			$result = $object->insertExtraFields('SHIPMENT_MODIFY');
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 		}
 
-		if ($error)
+		if ($error) {
 			$action = 'edit_extras';
+		}
 	}
 
-	if ($action == 'set_thirdparty' && $user->rights->commande->creer)
-	{
+	if ($action == 'set_thirdparty' && $user->rights->commande->creer) {
 		$object->fetch($id);
 		$object->setValueFrom('fk_soc', $socid, '', '', 'date', '', $user, 'ORDER_MODIFY');
 
@@ -227,16 +229,16 @@ if (empty($reshook))
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 llxHeader('', $langs->trans('OrderCard'), '');
 
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object = new Commande($db);
-	if ($object->fetch($id, $ref) > 0)
-	{
+	if ($object->fetch($id, $ref) > 0) {
 		$object->loadExpeditions(1);
 
 		$product_static = new Product($db);
@@ -256,16 +258,18 @@ if ($id > 0 || !empty($ref))
 		$formconfirm = '';
 
 		// Confirm validation
-		if ($action == 'cloture')
-		{
+		if ($action == 'cloture') {
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id, $langs->trans("CloseShipment"), $langs->trans("ConfirmCloseShipment"), "confirm_cloture");
 		}
 
 		// Call Hook formConfirm
 		$parameters = array('formConfirm' => $formconfirm);
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+		if (empty($reshook)) {
+			$formconfirm .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm = $hookmanager->resPrint;
+		}
 
 		// Print form confirm
 		print $formconfirm;
@@ -283,12 +287,10 @@ if ($id > 0 || !empty($ref))
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->commande->creer)
-			{
+			if ($user->rights->commande->creer) {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
@@ -366,11 +368,12 @@ if ($id > 0 || !empty($ref))
 		print $langs->trans('DateDeliveryPlanned');
 		print '</td>';
 
-		if ($action != 'editdate_livraison') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+		if ($action != 'editdate_livraison') {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
-		if ($action == 'editdate_livraison')
-		{
+		if ($action == 'editdate_livraison') {
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdatedelivery">';
@@ -395,8 +398,9 @@ if ($id > 0 || !empty($ref))
 		print '<table width="100%" class="nobordernopadding"><tr><td>';
 		print $langs->trans('SendingMethod');
 		print '</td>';
-		if ($action != 'editshippingmethod' && $user->rights->expedition->creer)
+		if ($action != 'editshippingmethod' && $user->rights->expedition->creer) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshippingmethod&amp;id='.$object->id.'">'.img_edit($langs->trans('SetShippingMode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
 		if ($action == 'editshippingmethod') {
@@ -415,8 +419,9 @@ if ($id > 0 || !empty($ref))
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
 			print $langs->trans('Warehouse');
 			print '</td>';
-			if ($action != 'editwarehouse' && $user->rights->commande->creer)
+			if ($action != 'editwarehouse' && $user->rights->commande->creer) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editwarehouse&amp;id='.$object->id.'">'.img_edit($langs->trans('SetWarehouse'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td colspan="2">';
 			if ($action == 'editwarehouse') {
@@ -471,8 +476,9 @@ if ($id > 0 || !empty($ref))
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('AvailabilityPeriod');
 		print '</td>';
-		if ($action != 'editavailability')
+		if ($action != 'editavailability') {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editavailability&amp;id='.$object->id.'">'.img_edit($langs->trans('SetAvailability'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editavailability') {
@@ -487,8 +493,9 @@ if ($id > 0 || !empty($ref))
 		print '<table class="nobordernopadding" width="100%"><tr><td>';
 		print $langs->trans('Source');
 		print '</td>';
-		if ($action != 'editdemandreason')
+		if ($action != 'editdemandreason') {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdemandreason&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDemandReason'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td colspan="3">';
 		if ($action == 'editdemandreason') {
@@ -500,8 +507,7 @@ if ($id > 0 || !empty($ref))
 		$tmparray = $object->getTotalWeightVolume();
 		$totalWeight = $tmparray['weight'];
 		$totalVolume = $tmparray['volume'];
-		if ($totalWeight || $totalVolume)
-		{
+		if ($totalWeight || $totalVolume) {
 			print '<tr><td>'.$langs->trans("CalculatedWeight").'</td>';
 			print '<td>';
 			print showDimensionInBestUnit($totalWeight, 0, "weight", $langs, isset($conf->global->MAIN_WEIGHT_DEFAULT_ROUND) ? $conf->global->MAIN_WEIGHT_DEFAULT_ROUND : -1, isset($conf->global->MAIN_WEIGHT_DEFAULT_UNIT) ? $conf->global->MAIN_WEIGHT_DEFAULT_UNIT : 'no');
@@ -515,19 +521,20 @@ if ($id > 0 || !empty($ref))
 		// TODO How record was recorded OrderMode (llx_c_input_method)
 
 		// Incoterms
-		if (!empty($conf->incoterm->enabled))
-		{
+		if (!empty($conf->incoterm->enabled)) {
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
 			print $langs->trans('IncotermLabel');
 			print '<td><td class="right">';
-			if ($user->rights->commande->creer) print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-			else print '&nbsp;';
+			if ($user->rights->commande->creer) {
+				print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'/expedition/shipment.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td></tr></table>';
 			print '</td>';
 			print '<td colspan="3">';
-			if ($action != 'editincoterm')
-			{
+			if ($action != 'editincoterm') {
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -551,8 +558,7 @@ if ($id > 0 || !empty($ref))
 
 		print '<table class="border centpercent tableforfield">';
 
-		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
-		{
+		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount HT
 			print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
 			print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -579,13 +585,11 @@ if ($id > 0 || !empty($ref))
 		print '</tr>';
 
 		// Amount Local Taxes
-		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) 		// Localtax1
-		{
+		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { 		// Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 			print '<td>'.price($object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
-		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) 		// Localtax2 IRPF
-		{
+		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { 		// Localtax2 IRPF
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 			print '<td>'.price($object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 		}
@@ -627,8 +631,7 @@ if ($id > 0 || !empty($ref))
 		//print $sql;
 		dol_syslog("shipment.php", LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
 
@@ -637,8 +640,7 @@ if ($id > 0 || !empty($ref))
 			print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
 			print '<td class="center">'.$langs->trans("QtyShipped").'</td>';
 			print '<td class="center">'.$langs->trans("KeepToShip").'</td>';
-			if (!empty($conf->stock->enabled))
-			{
+			if (!empty($conf->stock->enabled)) {
 				print '<td class="center">'.$langs->trans("RealStock").'</td>';
 			} else {
 				print '<td>&nbsp;</td>';
@@ -647,32 +649,34 @@ if ($id > 0 || !empty($ref))
 
 			$toBeShipped = array();
 			$toBeShippedTotal = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
 				$parameters = array('i' => $i, 'line' => $objp, 'num' => $num);
 				$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $object, $action);
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
 
-				if (empty($reshook))
-				{
+				if (empty($reshook)) {
 					// Show product and description
 					$type = isset($objp->type) ? $objp->type : $objp->product_type;
 
 					// Try to enhance type detection using date_start and date_end for free lines where type
 					// was not saved.
-					if (!empty($objp->date_start)) $type = 1;
-					if (!empty($objp->date_end)) $type = 1;
+					if (!empty($objp->date_start)) {
+						$type = 1;
+					}
+					if (!empty($objp->date_end)) {
+						$type = 1;
+					}
 
 					print '<tr class="oddeven">';
 
 					// Product label
-					if ($objp->fk_product > 0)
-					{
+					if ($objp->fk_product > 0) {
 						// Define output language
-						if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
-						{
+						if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 							$object->fetch_thirdparty();
 
 							$prod = new Product($db);
@@ -682,16 +686,21 @@ if ($id > 0 || !empty($ref))
 
 							$outputlangs = $langs;
 							$newlang = '';
-							if (empty($newlang) && !empty($_REQUEST['lang_id'])) $newlang = $_REQUEST['lang_id'];
-							if (empty($newlang)) $newlang = $object->thirdparty->default_lang;
-							if (!empty($newlang))
-							{
+							if (empty($newlang) && !empty($_REQUEST['lang_id'])) {
+								$newlang = $_REQUEST['lang_id'];
+							}
+							if (empty($newlang)) {
+								$newlang = $object->thirdparty->default_lang;
+							}
+							if (!empty($newlang)) {
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
 							}
 
 							$label = (!empty($prod->multilangs[$outputlangs->defaultlang]["label"])) ? $prod->multilangs[$outputlangs->defaultlang]["label"] : $objp->product_label;
-						} else $label = (!empty($objp->label) ? $objp->label : $objp->product_label);
+						} else {
+							$label = (!empty($objp->label) ? $objp->label : $objp->product_label);
+						}
 
 						print '<td>';
 						print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
@@ -725,16 +734,18 @@ if ($id > 0 || !empty($ref))
 						print_date_range($db->jdate($objp->date_start), $db->jdate($objp->date_end));
 
 						// Add description in form
-						if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
-						{
+						if (!empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 							print ($objp->description && $objp->description != $objp->product_label) ? '<br>'.dol_htmlentitiesbr($objp->description) : '';
 						}
 
 						print '</td>';
 					} else {
 						print "<td>";
-						if ($type == 1) $text = img_object($langs->trans('Service'), 'service');
-						else $text = img_object($langs->trans('Product'), 'product');
+						if ($type == 1) {
+							$text = img_object($langs->trans('Service'), 'service');
+						} else {
+							$text = img_object($langs->trans('Product'), 'product');
+						}
 
 						if (!empty($objp->label)) {
 							$text .= ' <strong>'.$objp->label.'</strong>';
@@ -761,8 +772,7 @@ if ($id > 0 || !empty($ref))
 
 					// Qty remains to ship
 					print '<td class="center">';
-					if ($type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES))
-					{
+					if ($type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 						$toBeShipped[$objp->fk_product] = $objp->qty - $qtyAlreadyShipped;
 						$toBeShippedTotal += $toBeShipped[$objp->fk_product];
 						print $toBeShipped[$objp->fk_product];
@@ -771,19 +781,16 @@ if ($id > 0 || !empty($ref))
 					}
 					print '</td>';
 
-					if ($objp->fk_product > 0)
-					{
+					if ($objp->fk_product > 0) {
 						$product = new Product($db);
 						$product->fetch($objp->fk_product);
 						$product->load_stock('warehouseopen');
 					}
 
-					if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && !empty($conf->stock->enabled))
-					{
+					if ($objp->fk_product > 0 && ($type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && !empty($conf->stock->enabled)) {
 						print '<td class="center">';
 						print $product->stock_reel;
-						if ($product->stock_reel < $toBeShipped[$objp->fk_product])
-						{
+						if ($product->stock_reel < $toBeShipped[$objp->fk_product]) {
 							print ' '.img_warning($langs->trans("StockTooLow"));
 						}
 						print '</td>';
@@ -793,8 +800,7 @@ if ($id > 0 || !empty($ref))
 					print "</tr>\n";
 
 					// Show subproducts lines
-					if ($objp->fk_product > 0 && !empty($conf->global->PRODUIT_SOUSPRODUITS))
-					{
+					if ($objp->fk_product > 0 && !empty($conf->global->PRODUIT_SOUSPRODUITS)) {
 						// Set tree of subproducts in product->sousprods
 						$product->get_sousproduits_arbo();
 						//var_dump($product->sousprods);exit;
@@ -802,13 +808,10 @@ if ($id > 0 || !empty($ref))
 						// Define a new tree with quantiies recalculated
 						$prods_arbo = $product->get_arbo_each_prod($qtyProdCom);
 						//var_dump($prods_arbo);
-						if (count($prods_arbo) > 0)
-						{
-							foreach ($prods_arbo as $key => $value)
-							{
+						if (count($prods_arbo) > 0) {
+							foreach ($prods_arbo as $key => $value) {
 								$img = '';
-								if ($value['stock'] < $value['stock_alert'])
-								{
+								if ($value['stock'] < $value['stock_alert']) {
 									$img = img_warning($langs->trans("StockTooLow"));
 								}
 								print '<tr class="oddeven"><td>&nbsp; &nbsp; &nbsp; -> <a href="'.DOL_URL_ROOT."/product/card.php?id=".$value['id'].'">'.$value['fullpath'].'</a> ('.$value['nb'].')</td>';
@@ -824,8 +827,7 @@ if ($id > 0 || !empty($ref))
 			}
 			$db->free($resql);
 
-			if (!$num)
-			{
+			if (!$num) {
 				print '<tr '.$bc[false].'><td colspan="5">'.$langs->trans("NoArticleOfTypeProduct").'<br>';
 			}
 
@@ -841,18 +843,14 @@ if ($id > 0 || !empty($ref))
 		 * Boutons Actions
 		 */
 
-		if (empty($user->socid))
-		{
+		if (empty($user->socid)) {
 			print '<div class="tabsAction">';
 
 			// Bouton expedier sans gestion des stocks
-			if (empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
-			{
-				if ($user->rights->expedition->creer)
-				{
+			if (empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED)) {
+				if ($user->rights->expedition->creer) {
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/card.php?action=create&amp;origin=commande&amp;object_id='.$id.'">'.$langs->trans("CreateShipment").'</a>';
-					if ($toBeShippedTotal <= 0)
-					{
+					if ($toBeShippedTotal <= 0) {
 						print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
 					}
 				} else {
@@ -865,15 +863,12 @@ if ($id > 0 || !empty($ref))
 
 		// Bouton expedier avec gestion des stocks
 
-		if (!empty($conf->stock->enabled) && $object->statut == Commande::STATUS_DRAFT)
-		{
+		if (!empty($conf->stock->enabled) && $object->statut == Commande::STATUS_DRAFT) {
 			print $langs->trans("ValidateOrderFirstBeforeShipment");
 		}
 
-		if (!empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED))
-		{
-			if ($user->rights->expedition->creer)
-			{
+		if (!empty($conf->stock->enabled) && ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED)) {
+			if ($user->rights->expedition->creer) {
 				//print load_fiche_titre($langs->trans("CreateShipment"));
 				print '<div class="tabsAction">';
 
@@ -890,23 +885,20 @@ if ($id > 0 || !empty($ref))
 
 				//print '<tr>';
 
-				if (!empty($conf->stock->enabled))
-				{
+				if (!empty($conf->stock->enabled)) {
 					//print '<td>';
 					print $langs->trans("WarehouseSource");
 					//print '</td>';
 					//print '<td>';
 					print $formproduct->selectWarehouses(!empty($object->warehouse_id) ? $object->warehouse_id : 'ifone', 'entrepot_id', '', 1, 0, 0, '', 0, 0, array(), 'minwidth200');
-					if (count($formproduct->cache_warehouses) <= 0)
-					{
+					if (count($formproduct->cache_warehouses) <= 0) {
 						print ' &nbsp; '.$langs->trans("WarehouseSourceNotDefined").' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create">'.$langs->trans("AddOne").'</a>';
 					}
 					//print '</td>';
 				}
 				//print '<td class="center">';
 				print '<input type="submit" class="butAction" named="save" value="'.$langs->trans("CreateShipment").'">';
-				if ($toBeShippedTotal <= 0)
-				{
+				if ($toBeShippedTotal <= 0) {
 					print ' '.img_warning($langs->trans("WarningNoQtyLeftToSend"));
 				}
 				//print '</td></tr>';
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index fcc0d26f81c..151edbdba2b 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -34,8 +34,7 @@ $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -71,8 +70,7 @@ $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filenamenb = $dir.'/shipmentsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
 	$filenamenb = $dir.'/shipmentsnbinyear-'.$year.'.png';
@@ -80,12 +78,10 @@ if (!$user->rights->societe->client->voir || $user->socid)
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -111,36 +107,36 @@ $data = $stats->getAmountByMonthWithPrevYear($endyear,$startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filenameamount = $dir.'/shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
+	$filenameamount = $dir.'/shipmentsamountinyear-'.$user->id.'-'.$year.'.png';
 }
 else
 {
-    $filenameamount = $dir.'/shipmentsamountinyear-'.$year.'.png';
+	$filenameamount = $dir.'/shipmentsamountinyear-'.$year.'.png';
 }
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
 if (! $mesg)
 {
-    $px2->SetData($data);
-    $i=$startyear;$legend=array();
-    while ($i <= $endyear)
-    {
-        $legend[]=$i;
-        $i++;
-    }
-    $px2->SetLegend($legend);
-    $px2->SetMaxValue($px2->GetCeilMaxValue());
-    $px2->SetMinValue(min(0,$px2->GetFloorMinValue()));
-    $px2->SetWidth($WIDTH);
-    $px2->SetHeight($HEIGHT);
-    $px2->SetYLabel($langs->trans("AmountOfShipments"));
-    $px2->SetShading(3);
-    $px2->SetHorizTickIncrement(1);
-    $px2->mode='depth';
-    $px2->SetTitle($langs->trans("AmountOfShipmentsByMonthHT"));
+	$px2->SetData($data);
+	$i=$startyear;$legend=array();
+	while ($i <= $endyear)
+	{
+		$legend[]=$i;
+		$i++;
+	}
+	$px2->SetLegend($legend);
+	$px2->SetMaxValue($px2->GetCeilMaxValue());
+	$px2->SetMinValue(min(0,$px2->GetFloorMinValue()));
+	$px2->SetWidth($WIDTH);
+	$px2->SetHeight($HEIGHT);
+	$px2->SetYLabel($langs->trans("AmountOfShipments"));
+	$px2->SetShading(3);
+	$px2->SetHorizTickIncrement(1);
+	$px2->mode='depth';
+	$px2->SetTitle($langs->trans("AmountOfShipmentsByMonthHT"));
 
-    $px2->draw($filenameamount,$fileurlamount);
+	$px2->draw($filenameamount,$fileurlamount);
 }
 */
 
@@ -149,36 +145,36 @@ $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 if (!$user->rights->societe->client->voir || $user->socid)
 {
-    $filename_avg = $dir.'/shipmentsaverage-'.$user->id.'-'.$year.'.png';
+	$filename_avg = $dir.'/shipmentsaverage-'.$user->id.'-'.$year.'.png';
 }
 else
 {
-    $filename_avg = $dir.'/shipmentsaverage-'.$year.'.png';
+	$filename_avg = $dir.'/shipmentsaverage-'.$year.'.png';
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
 if (! $mesg)
 {
-    $px3->SetData($data);
-    $i=$startyear;$legend=array();
-    while ($i <= $endyear)
-    {
-        $legend[]=$i;
-        $i++;
-    }
-    $px3->SetLegend($legend);
-    $px3->SetYLabel($langs->trans("AmountAverage"));
-    $px3->SetMaxValue($px3->GetCeilMaxValue());
-    $px3->SetMinValue($px3->GetFloorMinValue());
-    $px3->SetWidth($WIDTH);
-    $px3->SetHeight($HEIGHT);
-    $px3->SetShading(3);
-    $px3->SetHorizTickIncrement(1);
-    $px3->mode='depth';
-    $px3->SetTitle($langs->trans("AmountAverage"));
+	$px3->SetData($data);
+	$i=$startyear;$legend=array();
+	while ($i <= $endyear)
+	{
+		$legend[]=$i;
+		$i++;
+	}
+	$px3->SetLegend($legend);
+	$px3->SetYLabel($langs->trans("AmountAverage"));
+	$px3->SetMaxValue($px3->GetCeilMaxValue());
+	$px3->SetMinValue($px3->GetFloorMinValue());
+	$px3->SetWidth($WIDTH);
+	$px3->SetHeight($HEIGHT);
+	$px3->SetShading(3);
+	$px3->SetHorizTickIncrement(1);
+	$px3->mode='depth';
+	$px3->SetTitle($langs->trans("AmountAverage"));
 
-    $px3->draw($filename_avg,$fileurl_avg);
+	$px3->draw($filename_avg,$fileurl_avg);
 }
 */
 
@@ -191,7 +187,9 @@ foreach ($data as $val) {
 		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 $h = 0;
 $head = array();
@@ -228,8 +226,12 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '</td></tr>';
 	// Year
 	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
-	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 	arsort($arrayyears);
 	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';
@@ -250,11 +252,9 @@ print '<td class="center">'.$langs->trans("AmountAverage").'</td>';*/
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	$year = $val['year'];
-	while (!empty($year) && $oldyear > $year + 1)
-	{ // If we have empty year
+	while (!empty($year) && $oldyear > $year + 1) { // If we have empty year
 		$oldyear--;
 
 
@@ -292,12 +292,14 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	print $px1->show();
 	print "<br>\n";
 	/*print $px2->show();
-    print "<br>\n";
-    print $px3->show();*/
+	print "<br>\n";
+	print $px3->show();*/
 }
 print '</td></tr></table>';
 
@@ -324,17 +326,17 @@ $sql.= " GROUP BY dm DESC";
 $resql=$db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
-    while ($i < $num)
-    {
-        $row = $db->fetch_row($resql);
-        $nbproduct = $row[0];
-        $year = $row[1];
-        print "<tr>";
-        print '<td class="center"><a href="month.php?year='.$year.'">'.$year.'</a></td><td class="center">'.$nbproduct.'</td></tr>';
-        $i++;
-    }
+	$num = $db->num_rows($resql);
+	$i = 0;
+	while ($i < $num)
+	{
+		$row = $db->fetch_row($resql);
+		$nbproduct = $row[0];
+		$year = $row[1];
+		print "<tr>";
+		print '<td class="center"><a href="month.php?year='.$year.'">'.$year.'</a></td><td class="center">'.$nbproduct.'</td></tr>';
+		$i++;
+	}
 }
 $db->free($resql);
 
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 897e35b8813..b00d63eaba1 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -37,48 +36,49 @@ $langs->load("sendings");
 
 $total = 0;
 $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	?>
-    <tr class="<?php echo $trclass; ?>">
-        <td><?php echo $langs->trans("Shipment"); ?></td>
-        <td><?php echo $objectlink->getNomUrl(1); ?></td>
-        <td></td>
-    	<td class="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
-    	<td class="right"><?php
+	<tr class="<?php echo $trclass; ?>">
+		<td><?php echo $langs->trans("Shipment"); ?></td>
+		<td><?php echo $objectlink->getNomUrl(1); ?></td>
+		<td></td>
+		<td class="center"><?php echo dol_print_date($objectlink->date_delivery, 'day'); ?></td>
+		<td class="right"><?php
 		if ($user->rights->expedition->lire) {
 			$total = $total + $objectlink->total_ht;
 			echo price($objectlink->total_ht);
 		} ?></td>
-    	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-    	<td class="right">
-    		<?php
+		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
+		<td class="right">
+			<?php
 			// For now, shipments must stay linked to order, so link is not deletable
 			if ($object->element != 'commande') {
 				?>
-    			<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
-    			<?php
+				<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+				<?php
 			}
 			?>
-    </tr>
-    <?php
+	</tr>
+	<?php
 }
 if (count($linkedObjectBlock) > 1) {
 	?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
-        <td><?php echo $langs->trans("Total"); ?></td>
-        <td></td>
-    	<td class="center"></td>
-    	<td class="center"></td>
-    	<td class="right"><?php echo price($total); ?></td>
-    	<td class="right"></td>
-    	<td class="right"></td>
-    </tr>
-    <?php
+	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+		<td><?php echo $langs->trans("Total"); ?></td>
+		<td></td>
+		<td class="center"></td>
+		<td class="center"></td>
+		<td class="right"><?php echo price($total); ?></td>
+		<td class="right"></td>
+		<td class="right"></td>
+	</tr>
+	<?php
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php
index 413bc061fbf..72c38959ef8 100644
--- a/htdocs/expensereport/ajax/ajaxik.php
+++ b/htdocs/expensereport/ajax/ajaxik.php
@@ -22,12 +22,24 @@
  *       \brief      File to return Ajax response on third parties request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
 
 $res = 0;
 require '../../main.inc.php';
@@ -50,20 +62,25 @@ $fk_expense = GETPOST('fk_expense');
 $fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat');
 
 
-if (empty($fk_expense) || $fk_expense < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense')));
-elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat')));
-else {
+if (empty($fk_expense) || $fk_expense < 0) {
+	echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense')));
+} elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) {
+	echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat')));
+} else {
 	// @see ndfp.class.php:3576 (method: compute_total_km)
 	$expense = new ExpenseReport($db);
-	if ($expense->fetch($fk_expense) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_expense' => $fk_expense));
-	else {
+	if ($expense->fetch($fk_expense) <= 0) {
+		echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_expense' => $fk_expense));
+	} else {
 		$userauthor = new User($db);
-		if ($userauthor->fetch($expense->fk_user_author) <= 0) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author));
-		else {
+		if ($userauthor->fetch($expense->fk_user_author) <= 0) {
+			echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author));
+		} else {
 			$range = ExpenseReportIk::getRangeByUser($userauthor, $fk_c_exp_tax_cat);
 
-			if (empty($range)) echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'range' => $range));
-			else {
+			if (empty($range)) {
+				echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'range' => $range));
+			} else {
 				$ikoffset = price($range->ikoffset, 0, $langs, 1, -1, -1, $conf->currency);
 				echo json_encode(array('up' => $range->coef, 'ikoffset' => $range->ikoffset, 'title' => $langs->transnoentitiesnoconv('ExpenseRangeOffset', $offset), 'comment' => 'offset should be apply on addline or updateline'));
 			}
diff --git a/htdocs/expensereport/ajax/ajaxprojet.php b/htdocs/expensereport/ajax/ajaxprojet.php
index 62ceb504dac..8549d62fa62 100644
--- a/htdocs/expensereport/ajax/ajaxprojet.php
+++ b/htdocs/expensereport/ajax/ajaxprojet.php
@@ -24,12 +24,24 @@
  *       \brief      File to return Ajax response on third parties request
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
 
 $res = 0;
 require '../../main.inc.php';
@@ -52,21 +64,20 @@ dol_syslog(join(',', $_GET));
 
 
 // Generation liste des projets
-if (GETPOST('fk_projet') != '')
-{
+if (GETPOST('fk_projet') != '') {
 	$return_arr = array();
 
 	$sql = "SELECT p.rowid, p.ref, p.title, s.nom";
 	$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON p.fk_soc = s.rowid";
-	if (!empty($_GET["fk_projet"])) $sql .= " WHERE p.ref LIKE '%".$db->escape($_GET["fk_projet"])."%' OR p.title LIKE '%".$db->escape($_GET["fk_projet"])."%' OR s.nom LIKE '%".$db->escape($_GET["fk_projet"])."%'"; // Add other filters
+	if (!empty($_GET["fk_projet"])) {
+		$sql .= " WHERE p.ref LIKE '%".$db->escape($_GET["fk_projet"])."%' OR p.title LIKE '%".$db->escape($_GET["fk_projet"])."%' OR s.nom LIKE '%".$db->escape($_GET["fk_projet"])."%'"; // Add other filters
+	}
 	$sql .= " ORDER BY p.ref ASC";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
-		while ($row = $db->fetch_array($resql))
-		{
+	if ($resql) {
+		while ($row = $db->fetch_array($resql)) {
 			$label = $row['ref'].' - '.$row['title'];
 			$row_array['label'] = $label;
 			$row_array['value'] = $label;
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index f41f2902e71..70db8856327 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -69,7 +69,9 @@ $childids = $user->getAllChildIds(1);
 
 // Security check
 $id = GETPOST("id", 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
 
@@ -77,8 +79,7 @@ $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 $rootfordata = DOL_DATA_ROOT;
 $rootforuser = DOL_DATA_ROOT;
 // If multicompany module is enabled, we redefine the root of data
-if (!empty($conf->multicompany->enabled) && !empty($conf->entity) && $conf->entity > 1)
-{
+if (!empty($conf->multicompany->enabled) && !empty($conf->entity) && $conf->entity > 1) {
 	$rootfordata .= '/'.$conf->entity;
 }
 $conf->expensereport->dir_output = $rootfordata.'/expensereport';
@@ -114,14 +115,16 @@ $permissiontoadd = $user->rights->expensereport->creer; // Used by the include o
 $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
-	if (!empty($user->rights->expensereport->readall)) $canread = 1;
-	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
-	if (!$canread)
-	{
+	if (!empty($user->rights->expensereport->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+		$canread = 1;
+	}
+	if (!$canread) {
 		accessforbidden();
 	}
 }
@@ -133,14 +136,13 @@ if ($object->id > 0)
 
 $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))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -160,10 +162,12 @@ if (empty($reshook))
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
-	if (GETPOSTISSET('sendit'))    // If we just submit a file
-	{
-		if ($action == 'updateline') $action = 'editline'; // To avoid to make the updateline now
-		else $action = ''; // To avoid to make the addline now
+	if (GETPOSTISSET('sendit')) {    // If we just submit a file
+		if ($action == 'updateline') {
+			$action = 'editline'; // To avoid to make the updateline now
+		} else {
+			$action = ''; // To avoid to make the addline now
+		}
 	}
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
@@ -173,20 +177,16 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->expensereport->creer)
-	{
-		if (1 == 0 && !GETPOST('clone_content', 'alpha') && !GETPOST('clone_receivers', 'alpha'))
-		{
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->expensereport->creer) {
+		if (1 == 0 && !GETPOST('clone_content', 'alpha') && !GETPOST('clone_receivers', 'alpha')) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
-			if ($object->id > 0)
-			{
+			if ($object->id > 0) {
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later if it fails
 				$orig = clone $object;
 
 				$result = $object->createFromClone($user, GETPOST('fk_user_author', 'int'));
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
 				} else {
@@ -198,13 +198,11 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_delete' && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->supprimer)
-	{
+	if ($action == 'confirm_delete' && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->supprimer) {
 		$object = new ExpenseReport($db);
 		$result = $object->fetch($id);
 		$result = $object->delete($user);
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			header("Location: index.php");
 			exit;
 		} else {
@@ -212,8 +210,7 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'add' && $user->rights->expensereport->creer)
-	{
+	if ($action == 'add' && $user->rights->expensereport->creer) {
 		$error = 0;
 
 		$object = new ExpenseReport($db);
@@ -222,7 +219,9 @@ if (empty($reshook))
 		$object->date_fin = $date_end;
 
 		$object->fk_user_author = GETPOST('fk_user_author', 'int');
-		if (!($object->fk_user_author > 0)) $object->fk_user_author = $user->id;
+		if (!($object->fk_user_author > 0)) {
+			$object->fk_user_author = $user->id;
+		}
 
 		// Check that expense report is for a user inside the hierarchy or advanced permission for all is set
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer))
@@ -248,31 +247,28 @@ if (empty($reshook))
 		$object->note_public = GETPOST('note_public', 'restricthtml');
 		$object->note_private = GETPOST('note_private', 'restricthtml');
 		// Fill array 'array_options' with data from add form
-		if (!$error)
-		{
+		if (!$error) {
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
-			if ($ret < 0) $error++;
+			if ($ret < 0) {
+				$error++;
+			}
 		}
 
-		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS) && $object->periode_existe($fuser, $object->date_debut, $object->date_fin))
-		{
+		if (!$error && empty($conf->global->EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS) && $object->periode_existe($fuser, $object->date_debut, $object->date_fin)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorDoubleDeclaration"), null, 'errors');
 			$action = 'create';
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			$id = $object->create($user);
-			if ($id <= 0)
-			{
+			if ($id <= 0) {
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 				Header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
@@ -284,16 +280,14 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update' && $user->rights->expensereport->creer)
-	{
+	if ($action == 'update' && $user->rights->expensereport->creer) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
 		$object->date_debut = $date_start;
 		$object->date_fin = $date_end;
 
-		if ($object->status < 3)
-		{
+		if ($object->status < 3) {
 			$object->fk_user_validator = GETPOST('fk_user_validator', 'int');
 		}
 
@@ -303,8 +297,7 @@ if (empty($reshook))
 		$object->fk_user_modif = $user->id;
 
 		$result = $object->update($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
 			exit;
 		} else {
@@ -312,31 +305,30 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update_extras')
-	{
+	if ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Actions on extra fields
-		   	$result = $object->insertExtraFields('EXPENSEREPORT_MODIFY');
-			if ($result < 0)
-			{
+			$result = $object->insertExtraFields('EXPENSEREPORT_MODIFY');
+			if ($result < 0) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 		}
 
-		if ($error)
+		if ($error) {
 			$action = 'edit_extras';
+		}
 	}
 
-	if ($action == "confirm_validate" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
-	{
+	if ($action == "confirm_validate" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer) {
 		$error = 0;
 
 		$db->begin();
@@ -346,15 +338,17 @@ if (empty($reshook))
 
 		$result = $object->setValidate($user);
 
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -369,8 +363,7 @@ if (empty($reshook))
 			$error++;
 		}
 
-		if (!$error && $result > 0 && $object->fk_user_validator > 0)
-		{
+		if (!$error && $result > 0 && $object->fk_user_validator > 0) {
 			$langs->load("mails");
 
 			// TO
@@ -383,13 +376,14 @@ if (empty($reshook))
 			$expediteur->fetch($object->fk_user_author);
 			$emailFrom = $expediteur->email;
 
-			if ($emailTo && $emailFrom)
-			{
+			if ($emailTo && $emailFrom) {
 				$filename = array(); $filedir = array(); $mimetype = array();
 
 				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForApproval");
 
@@ -400,31 +394,28 @@ if (empty($reshook))
 
 				// Rebuild pdf
 				/*
-    			$object->setDocModel($user,"");
-    			$resultPDF = expensereport_pdf_create($db,$id,'',"",$langs);
+				$object->setDocModel($user,"");
+				$resultPDF = expensereport_pdf_create($db,$id,'',"",$langs);
 
-    			if($resultPDF):
-    			// ATTACHMENT
-    			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref).".pdf");
-    			array_push($mimetype,"application/pdf");
-    			*/
+				if($resultPDF):
+				// ATTACHMENT
+				array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+				array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref).".pdf");
+				array_push($mimetype,"application/pdf");
+				*/
 
 				// PREPARE SEND
 				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-				if ($mailfile)
-				{
+				if ($mailfile) {
 					// SEND
 					$result = $mailfile->sendfile();
-					if ($result)
-					{
+					if ($result) {
 						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
 						setEventMessages($mesg, null, 'mesgs');
 					} else {
 						$langs->load("other");
-						if ($mailfile->error)
-						{
+						if ($mailfile->error) {
 							$mesg = '';
 							$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
 							$mesg .= '<br>'.$mailfile->error;
@@ -443,8 +434,7 @@ if (empty($reshook))
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 			exit;
@@ -453,21 +443,22 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == "confirm_save_from_refuse" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
-	{
+	if ($action == "confirm_save_from_refuse" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 		$result = $object->set_save_from_refuse($user);
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -479,27 +470,27 @@ if (empty($reshook))
 			}
 		}
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Send mail
 
-   			// TO
-   			$destinataire = new User($db);
-   			$destinataire->fetch($object->fk_user_validator);
-   			$emailTo = $destinataire->email;
+			// TO
+			$destinataire = new User($db);
+			$destinataire->fetch($object->fk_user_validator);
+			$emailTo = $destinataire->email;
 
 			// FROM
 			$expediteur = new User($db);
 			$expediteur->fetch($object->fk_user_author);
 			$emailFrom = $expediteur->email;
 
-   			if ($emailFrom && $emailTo)
-   			{
+			if ($emailFrom && $emailTo) {
 				$filename = array(); $filedir = array(); $mimetype = array();
 
-   				// SUBJECT
+				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportWaitingForReApproval");
 
@@ -509,18 +500,18 @@ if (empty($reshook))
 				$dateRefusEx = explode(" ", $object->date_refuse);
 				$message = $langs->transnoentities("ExpenseReportWaitingForReApprovalMessage", $dateRefusEx[0], $object->detail_refuse, $expediteur->getFullName($langs), $link);
 
-   				// Rebuild pdf
+				// Rebuild pdf
 				/*
 				$object->setDocModel($user,"");
 				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
 
-   				if($resultPDF)
-   				{
-   					// ATTACHMENT
-   					$filename=array(); $filedir=array(); $mimetype=array();
-   					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-   					array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref_number).".pdf");
-   					array_push($mimetype,"application/pdf");
+				   if($resultPDF)
+				   {
+					   // ATTACHMENT
+					   $filename=array(); $filedir=array(); $mimetype=array();
+					   array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+					   array_push($filedir,$conf->expensereport->dir_output . "/" . dol_sanitizeFileName($object->ref) . "/" . dol_sanitizeFileName($object->ref_number).".pdf");
+					   array_push($mimetype,"application/pdf");
 				}
 				*/
 
@@ -528,20 +519,17 @@ if (empty($reshook))
 				// PREPARE SEND
 				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-				if ($mailfile)
-				{
+				if ($mailfile) {
 					// SEND
 					$result = $mailfile->sendfile();
-					if ($result)
-					{
+					if ($result) {
 						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
 						setEventMessages($mesg, null, 'mesgs');
 						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 						exit;
 					} else {
 						$langs->load("other");
-						if ($mailfile->error)
-						{
+						if ($mailfile->error) {
 							$mesg = '';
 							$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
 							$mesg .= '<br>'.$mailfile->error;
@@ -564,22 +552,23 @@ if (empty($reshook))
 	}
 
 	// Approve
-	if ($action == "confirm_approve" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve)
-	{
+	if ($action == "confirm_approve" && GETPOST("confirm", 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
 		$result = $object->setApproved($user);
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -591,109 +580,109 @@ if (empty($reshook))
 			}
 		}
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Send mail
 
-  			// TO
-   			$destinataire = new User($db);
-   			$destinataire->fetch($object->fk_user_author);
-   			$emailTo = $destinataire->email;
+			// TO
+			$destinataire = new User($db);
+			$destinataire->fetch($object->fk_user_author);
+			$emailTo = $destinataire->email;
 
-   			// CC
-   			$emailCC = $conf->global->NDF_CC_EMAILS;
-			if (empty($emailTo)) $emailTo = $emailCC;
+			// CC
+			$emailCC = $conf->global->NDF_CC_EMAILS;
+			if (empty($emailTo)) {
+				$emailTo = $emailCC;
+			}
 
 			// FROM
-   			$expediteur = new User($db);
-   			$expediteur->fetch($object->fk_user_approve > 0 ? $object->fk_user_approve : $object->fk_user_validator);
-   			$emailFrom = $expediteur->email;
+			$expediteur = new User($db);
+			$expediteur->fetch($object->fk_user_approve > 0 ? $object->fk_user_approve : $object->fk_user_validator);
+			$emailFrom = $expediteur->email;
 
-   			if ($emailFrom && $emailTo)
-   			{
+			if ($emailFrom && $emailTo) {
 				$filename = array(); $filedir = array(); $mimetype = array();
 
-   				// SUBJECT
+				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportApproved");
 
-	   			// CONTENT
-	   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+				// CONTENT
+				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$link = '<a href="'.$link.'">'.$link.'</a>';
-	   			$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
+				$message = $langs->transnoentities("ExpenseReportApprovedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $link);
 
-	   			// Rebuilt pdf
+				// Rebuilt pdf
 				/*
-        		$object->setDocModel($user,"");
-        		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+				$object->setDocModel($user,"");
+				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
 
-        		if($resultPDF
-    			{
-        			// ATTACHMENT
-        			$filename=array(); $filedir=array(); $mimetype=array();
-        			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-        			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
-        			array_push($mimetype,"application/pdf");
-    			}
-    			*/
+				if($resultPDF
+				{
+					// ATTACHMENT
+					$filename=array(); $filedir=array(); $mimetype=array();
+					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+					array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+					array_push($mimetype,"application/pdf");
+				}
+				*/
 
 				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-	   			if ($mailfile)
-	   			{
-	   				// SEND
-	   				$result = $mailfile->sendfile();
-	   				if ($result)
-	   				{
-	   					$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
-	   					setEventMessages($mesg, null, 'mesgs');
-	   					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-	   					exit;
-	   				} else {
-	   					$langs->load("other");
-	   					if ($mailfile->error)
-	   					{
-	   						$mesg = '';
-	   						$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
-	   						$mesg .= '<br>'.$mailfile->error;
-	   						setEventMessages($mesg, null, 'errors');
-	   					} else {
-	   						setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
-	   					}
-	   				}
-	   			} else {
-	   				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
-	   				$action = '';
-	   			}
-   			} else {
+				if ($mailfile) {
+					// SEND
+					$result = $mailfile->sendfile();
+					if ($result) {
+						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
+						setEventMessages($mesg, null, 'mesgs');
+						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+						exit;
+					} else {
+						$langs->load("other");
+						if ($mailfile->error) {
+							$mesg = '';
+							$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
+							$mesg .= '<br>'.$mailfile->error;
+							setEventMessages($mesg, null, 'errors');
+						} else {
+							setEventMessages('No mail sent. Feature is disabled by option MAIN_DISABLE_ALL_MAILS', null, 'warnings');
+						}
+					}
+				} else {
+					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
+					$action = '';
+				}
+			} else {
 				setEventMessages($langs->trans("NoEmailSentBadSenderOrRecipientEmail"), null, 'warnings');
 				$action = '';
 			}
 		} else {
-   			setEventMessages($langs->trans("FailedtoSetToApprove"), null, 'warnings');
-   			$action = '';
-   		}
-   	}
+			setEventMessages($langs->trans("FailedtoSetToApprove"), null, 'warnings');
+			$action = '';
+		}
+	}
 
-	if ($action == "confirm_refuse" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve)
-	{
+	if ($action == "confirm_refuse" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->approve) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
 		$detailRefuse = GETPOST('detail_refuse', 'alpha');
 		$result = $object->setDeny($user, $detailRefuse);
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -705,8 +694,7 @@ if (empty($reshook))
 			}
 		}
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Send mail
 
 			// TO
@@ -719,53 +707,51 @@ if (empty($reshook))
 			$expediteur->fetch($object->fk_user_refuse);
 			$emailFrom = $expediteur->email;
 
-			if ($emailFrom && $emailTo)
-			{
+			if ($emailFrom && $emailTo) {
 				$filename = array(); $filedir = array(); $mimetype = array();
 
 				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportRefused");
 
-	   			// CONTENT
-	   			$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
+				// CONTENT
+				$link = $urlwithroot.'/expensereport/card.php?id='.$object->id;
 				$link = '<a href="'.$link.'">'.$link.'</a>';
 				$message = $langs->transnoentities("ExpenseReportRefusedMessage", $object->ref, $destinataire->getFullName($langs), $expediteur->getFullName($langs), $detailRefuse, $link);
 
-	   			// Rebuilt pdf
+				// Rebuilt pdf
 				/*
-        		$object->setDocModel($user,"");
-        		$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+				$object->setDocModel($user,"");
+				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
 
-        		if($resultPDF
-    			{
-        			// ATTACHMENT
-        			$filename=array(); $filedir=array(); $mimetype=array();
-        			array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-        			array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
-        			array_push($mimetype,"application/pdf");
-    			}
-    			*/
+				if($resultPDF
+				{
+					// ATTACHMENT
+					$filename=array(); $filedir=array(); $mimetype=array();
+					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+					array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+					array_push($mimetype,"application/pdf");
+				}
+				*/
 
 				// PREPARE SEND
 				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-				if ($mailfile)
-				{
+				if ($mailfile) {
 					// SEND
 					$result = $mailfile->sendfile();
-					if ($result)
-					{
+					if ($result) {
 						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
 						setEventMessages($mesg, null, 'mesgs');
 						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 						exit;
 					} else {
 						$langs->load("other");
-						if ($mailfile->error)
-						{
+						if ($mailfile->error) {
 							$mesg = '';
 							$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
 							$mesg .= '<br>'.$mailfile->error;
@@ -789,29 +775,28 @@ if (empty($reshook))
 	}
 
 	//var_dump($user->id == $object->fk_user_validator);exit;
-	if ($action == "confirm_cancel" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
-	{
-		if (!GETPOST('detail_cancel', 'alpha'))
-		{
+	if ($action == "confirm_cancel" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer) {
+		if (!GETPOST('detail_cancel', 'alpha')) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
 		} else {
 			$object = new ExpenseReport($db);
 			$object->fetch($id);
 
-			if ($user->id == $object->fk_user_valid || $user->id == $object->fk_user_author)
-			{
+			if ($user->id == $object->fk_user_valid || $user->id == $object->fk_user_author) {
 				$detailCancel = GETPOST('detail_cancel', 'alpha');
 				$result = $object->set_cancel($user, $detailCancel);
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					// Define output language
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-					{
+					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						$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 = $object->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 = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
@@ -823,8 +808,7 @@ if (empty($reshook))
 					}
 				}
 
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					// Send mail
 
 					// TO
@@ -837,13 +821,14 @@ if (empty($reshook))
 					$expediteur->fetch($object->fk_user_cancel);
 					$emailFrom = $expediteur->email;
 
-					if ($emailFrom && $emailTo)
-					{
+					if ($emailFrom && $emailTo) {
 						$filename = array(); $filedir = array(); $mimetype = array();
 
 						// SUBJECT
 						$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+						if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+							$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+						}
 
 						$subject = $societeName." - ".$langs->transnoentities("ExpenseReportCanceled");
 
@@ -854,36 +839,33 @@ if (empty($reshook))
 
 						// Rebuilt pdf
 						/*
-	    				$object->setDocModel($user,"");
-	    				$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
+						$object->setDocModel($user,"");
+						$resultPDF = expensereport_pdf_create($db,$object,'',"",$langs);
 
-	    				if($resultPDF
-	    				{
-	    					// ATTACHMENT
-	    					$filename=array(); $filedir=array(); $mimetype=array();
-	    					array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
-	    					array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
-	    					array_push($mimetype,"application/pdf");
-	    				}
-	    				*/
+						if($resultPDF
+						{
+							// ATTACHMENT
+							$filename=array(); $filedir=array(); $mimetype=array();
+							array_push($filename,dol_sanitizeFileName($object->ref).".pdf");
+							array_push($filedir, $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref)."/".dol_sanitizeFileName($object->ref).".pdf");
+							array_push($mimetype,"application/pdf");
+						}
+						*/
 
 						// PREPARE SEND
 						$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-						if ($mailfile)
-						{
+						if ($mailfile) {
 							// SEND
 							$result = $mailfile->sendfile();
-							if ($result)
-							{
+							if ($result) {
 								$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
 								setEventMessages($mesg, null, 'mesgs');
 								header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 								exit;
 							} else {
 								$langs->load("other");
-								if ($mailfile->error)
-								{
+								if ($mailfile->error) {
 									$mesg = '';
 									$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
 									$mesg .= '<br>'.$mailfile->error;
@@ -910,23 +892,23 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == "confirm_setdraft" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer)
-	{
+	if ($action == "confirm_setdraft" && GETPOST('confirm', 'alpha') == "yes" && $id > 0 && $user->rights->expensereport->creer) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
-		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
-		{
+		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
 			$result = $object->setStatut(0);
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				{
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -938,8 +920,7 @@ if (empty($reshook))
 				}
 			}
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 				exit;
 			} else {
@@ -950,22 +931,23 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid)
-	{
+	if ($action == 'set_unpaid' && $id > 0 && $user->rights->expensereport->to_paid) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
 		$result = $object->setUnpaid($user);
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -978,22 +960,23 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid)
-	{
+	if ($action == 'set_paid' && $id > 0 && $user->rights->expensereport->to_paid) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
 		$result = $object->setPaid($id, $user);
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -1005,8 +988,7 @@ if (empty($reshook))
 			}
 		}
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Send mail
 
 			// TO
@@ -1019,13 +1001,14 @@ if (empty($reshook))
 			$expediteur->fetch($user->id);
 			$emailFrom = $expediteur->email;
 
-			if ($emailFrom && $emailTo)
-			{
+			if ($emailFrom && $emailTo) {
 				$filename = array(); $filedir = array(); $mimetype = array();
 
 				// SUBJECT
 				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
 
 				$subject = $societeName." - ".$langs->transnoentities("ExpenseReportPaid");
 
@@ -1041,20 +1024,17 @@ if (empty($reshook))
 				// PREPARE SEND
 				$mailfile = new CMailFile($subject, $emailTo, $emailFrom, $message, $filedir, $mimetype, $filename, '', '', 0, -1);
 
-				if ($mailfile)
-				{
+				if ($mailfile) {
 					// SEND
 					$result = $mailfile->sendfile();
-					if ($result)
-					{
+					if ($result) {
 						$mesg = $langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($emailFrom, 2), $mailfile->getValidAddress($emailTo, 2));
 						setEventMessages($mesg, null, 'mesgs');
 						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 						exit;
 					} else {
 						$langs->load("other");
-						if ($mailfile->error)
-						{
+						if ($mailfile->error) {
 							$mesg = '';
 							$mesg .= $langs->trans('ErrorFailedToSendMail', $emailFrom, $emailTo);
 							$mesg .= '<br>'.$mailfile->error;
@@ -1077,17 +1057,14 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == "addline" && $user->rights->expensereport->creer)
-	{
+	if ($action == "addline" && $user->rights->expensereport->creer) {
 		$error = 0;
 
 		// First save uploaded file
 		$fk_ecm_files = 0;
-		if (GETPOSTISSET('attachfile'))
-		{
+		if (GETPOSTISSET('attachfile')) {
 			$arrayoffiles = GETPOST('attachfile', 'array');
-			if (is_array($arrayoffiles) && !empty($arrayoffiles[0]))
-			{
+			if (is_array($arrayoffiles) && !empty($arrayoffiles[0])) {
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 				$relativepath = 'expensereport/'.$object->ref.'/'.$arrayoffiles[0];
 				$ecmfiles = new EcmFiles($db);
@@ -1097,70 +1074,67 @@ if (empty($reshook))
 		}
 
 		// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
-		if (empty($vatrate)) $vatrate = "0.000";
+		if (empty($vatrate)) {
+			$vatrate = "0.000";
+		}
 		$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $vatrate));
 
 		$value_unit_ht = price2num(GETPOST('value_unit_ht', 'alpha'), 'MU');
 		$value_unit = price2num(GETPOST('value_unit', 'alpha'), 'MU');
-		if (empty($value_unit))
-		{
+		if (empty($value_unit)) {
 			$value_unit = price2num($value_unit_ht + ($value_unit_ht * $tmpvat / 100), 'MU');
 		}
 
 		$fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
 
 		$qty = GETPOST('qty', 'int');
-		if (empty($qty)) $qty = 1;
+		if (empty($qty)) {
+			$qty = 1;
+		}
 
-		if (!($fk_c_type_fees > 0))
-		{
+		if (!($fk_c_type_fees > 0)) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$action = '';
 		}
 
-		if ((int) $tmpvat < 0 || $tmpvat == '')
-		{
+		if ((int) $tmpvat < 0 || $tmpvat == '') {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("VAT")), null, 'errors');
 			$action = '';
 		}
 
 		// Si aucune date n'est rentrée
-		if (empty($date) || $date == "--")
-		{
+		if (empty($date) || $date == "--") {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
 		}
 		// Si aucun prix n'est rentré
-		if ($value_unit == 0)
-		{
+		if ($value_unit == 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("PriceUTTC")), null, 'errors');
 		}
 		// Warning if date out of range
-		if ($date < $object->date_debut || $date > ($object->date_fin + (24 * 3600 - 1)))
-		{
+		if ($date < $object->date_debut || $date > ($object->date_fin + (24 * 3600 - 1))) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("WarningDateOfLineMustBeInExpenseReportRange"), null, 'warnings');
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$type = 0; // TODO What if service ? We should take the type product/service from the type of expense report llx_c_type_fees
 
 			// Insert line
 			$result = $object->addline($qty, $value_unit, $fk_c_type_fees, $vatrate, $date, $comments, $fk_project, $fk_c_exp_tax_cat, $type, $fk_ecm_files);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$ret = $object->fetch($object->id); // Reload to get new records
 
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					// Define output language
 					$outputlangs = $langs;
 					$newlang = GETPOST('lang_id', 'alpha');
-					if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
+					if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1186,8 +1160,7 @@ if (empty($reshook))
 		$action = '';
 	}
 
-	if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->rights->expensereport->creer)
-	{
+	if ($action == 'confirm_delete_line' && GETPOST("confirm", 'alpha') == "yes" && $user->rights->expensereport->creer) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
@@ -1197,17 +1170,18 @@ if (empty($reshook))
 		$total_tva = $object_ligne->total_tva;
 
 		$result = $object->deleteline(GETPOST("rowid", 'int'), $user);
-		if ($result >= 0)
-		{
-			if ($result > 0)
-			{
+		if ($result >= 0) {
+			if ($result > 0) {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				{
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1227,18 +1201,15 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == "updateline" && $user->rights->expensereport->creer)
-	{
+	if ($action == "updateline" && $user->rights->expensereport->creer) {
 		$object = new ExpenseReport($db);
 		$object->fetch($id);
 
 		// First save uploaded file
 		$fk_ecm_files = 0;
-		if (GETPOSTISSET('attachfile'))
-		{
+		if (GETPOSTISSET('attachfile')) {
 			$arrayoffiles = GETPOST('attachfile', 'array');
-			if (is_array($arrayoffiles) && !empty($arrayoffiles[0]))
-			{
+			if (is_array($arrayoffiles) && !empty($arrayoffiles[0])) {
 				include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 				$relativepath = 'expensereport/'.$object->ref.'/'.$arrayoffiles[0];
 				$ecmfiles = new EcmFiles($db);
@@ -1256,50 +1227,48 @@ if (empty($reshook))
 		$vatrate = GETPOST('vatrate', 'alpha');
 
 		// if VAT is not used in Dolibarr, set VAT rate to 0 because VAT rate is necessary.
-		if (empty($vatrate)) $vatrate = "0.000";
+		if (empty($vatrate)) {
+			$vatrate = "0.000";
+		}
 		$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $vatrate));
 
 		$value_unit_ht = price2num(GETPOST('value_unit_ht', 'alpha'), 'MU');
 		$value_unit = price2num(GETPOST('value_unit', 'alpha'), 'MU');
-		if (empty($value_unit))
-		{
+		if (empty($value_unit)) {
 			$value_unit = price2num($value_unit_ht + ($value_unit_ht * $tmpvat / 100), 'MU');
 		}
 
-		if (!GETPOST('fk_c_type_fees', 'int') > 0)
-		{
+		if (!GETPOST('fk_c_type_fees', 'int') > 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$action = '';
 		}
-		if ((int) $tmpvat < 0 || $tmpvat == '')
-		{
+		if ((int) $tmpvat < 0 || $tmpvat == '') {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Vat")), null, 'errors');
 			$action = '';
 		}
 		// Warning if date out of range
-		if ($date < $object->date_debut || $date > ($object->date_fin + (24 * 3600 - 1)))
-		{
+		if ($date < $object->date_debut || $date > ($object->date_fin + (24 * 3600 - 1))) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("WarningDateOfLineMustBeInExpenseReportRange"), null, 'warnings');
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// TODO Use update method of ExpenseReportLine
 			$result = $object->updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $id, $fk_c_exp_tax_cat, $fk_ecm_files);
-			if ($result >= 0)
-			{
-				if ($result > 0)
-				{
+			if ($result >= 0) {
+				if ($result > 0) {
 					// Define output language
-					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-					{
+					if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 						$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 = $object->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 = $object->thirdparty->default_lang;
+						}
 						if (!empty($newlang)) {
 							$outputlangs = new Translate("", $conf);
 							$outputlangs->setDefaultLang($newlang);
@@ -1356,8 +1325,7 @@ $ecmfilesstatic = new EcmFiles($db);
 $formexpensereport = new FormExpenseReport($db);
 
 // Create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewTrip"), '', 'trip');
 
 	print '<form action="'.$_SERVER['PHP_SELF'].'" method="post" name="create">';
@@ -1390,9 +1358,13 @@ if ($action == 'create')
 	print '<td class="fieldrequired">'.$langs->trans("User").'</td>';
 	print '<td>';
 	$defaultselectuser = $user->id;
-	if (GETPOST('fk_user_author', 'int') > 0) $defaultselectuser = GETPOST('fk_user_author', 'int');
+	if (GETPOST('fk_user_author', 'int') > 0) {
+		$defaultselectuser = GETPOST('fk_user_author', 'int');
+	}
 	$include_users = 'hierarchyme';
-	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expensereport->writeall_advance)) $include_users = array();
+	if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expensereport->writeall_advance)) {
+		$include_users = array();
+	}
 	$s = $form->select_dolusers($defaultselectuser, "fk_user_author", 0, "", 0, $include_users, '', '0,'.$conf->entity);
 	print $s;
 	print '</td>';
@@ -1404,11 +1376,16 @@ if ($action == 'create')
 	print '<td>';
 	$object = new ExpenseReport($db);
 	$include_users = $object->fetch_users_approver_expensereport();
-	if (empty($include_users)) print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateExpenseReport");
-	else {
+	if (empty($include_users)) {
+		print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateExpenseReport");
+	} else {
 		$defaultselectuser = (empty($user->fk_user_expense_validator) ? $user->fk_user : $user->fk_user_expense_validator); // Will work only if supervisor has permission to approve so is inside include_users
-		if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) $defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR; // Can force default approver
-		if (GETPOST('fk_user_validator', 'int') > 0) $defaultselectuser = GETPOST('fk_user_validator', 'int');
+		if (!empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR)) {
+			$defaultselectuser = $conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR; // Can force default approver
+		}
+		if (GETPOST('fk_user_validator', 'int') > 0) {
+			$defaultselectuser = GETPOST('fk_user_validator', 'int');
+		}
 		$s = $form->select_dolusers($defaultselectuser, "fk_user_validator", 1, "", ((empty($defaultselectuser) || empty($conf->global->EXPENSEREPORT_DEFAULT_VALIDATOR_UNCHANGEABLE)) ? 0 : 1), $include_users);
 		print $form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
 	}
@@ -1416,8 +1393,7 @@ if ($action == 'create')
 	print '</tr>';
 
 	// Payment mode
-	if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION))
-	{
+	if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
 		print '<tr>';
 		print '<td>'.$langs->trans("ModePaiement").'</td>';
 		print '<td>';
@@ -1471,13 +1447,10 @@ if ($action == 'create')
 
 		$res = $object->fetch_optionals();
 
-		if ($result > 0)
-		{
-			if (!in_array($object->fk_user_author, $user->getAllChildIds(1)))
-			{
+		if ($result > 0) {
+			if (!in_array($object->fk_user_author, $user->getAllChildIds(1))) {
 				if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-					&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
-				{
+					&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 					print load_fiche_titre($langs->trans('TripCard'), '', 'trip');
 
 					print '<div class="tabBar">';
@@ -1494,16 +1467,14 @@ if ($action == 'create')
 
 			$head = expensereport_prepare_head($object);
 
-			if ($action == 'edit' && ($object->status < 3 || $object->status == 99))
-			{
+			if ($action == 'edit' && ($object->status < 3 || $object->status == 99)) {
 				print "<form name='update' action=\"".$_SERVER['PHP_SELF']."\" method=\"post\">\n";
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="id" value="'.$id.'">';
 
 				print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), 0, 'trip');
 
-				if ($object->status == 99)
-				{
+				if ($object->status == 99) {
 					print '<input type="hidden" name="action" value="updateFromRefuse">';
 				} else {
 					print '<input type="hidden" name="action" value="update">';
@@ -1517,8 +1488,7 @@ if ($action == 'create')
 				print '<td>'.$langs->trans("User").'</td>';
 				print '<td>';
 				$userfee = new User($db);
-				if ($object->fk_user_author > 0)
-				{
+				if ($object->fk_user_author > 0) {
 					$userfee->fetch($object->fk_user_author);
 					print $userfee->getNomUrl(-1);
 				}
@@ -1542,8 +1512,7 @@ if ($action == 'create')
 				print '</td>';
 				print '</tr>';
 
-				if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION))
-				{
+				if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
 					print '<tr>';
 					print '<td>'.$langs->trans("ModePaiement").'</td>';
 					print '<td>';
@@ -1552,8 +1521,7 @@ if ($action == 'create')
 					print '</tr>';
 				}
 
-				if ($object->status < 3)
-				{
+				if ($object->status < 3) {
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // Approbator
 					print '<td>';
@@ -1572,8 +1540,7 @@ if ($action == 'create')
 					print '</td></tr>';
 				}
 
-				if ($object->status == 6)
-				{
+				if ($object->status == 6) {
 					print '<tr>';
 					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
 					print '<td>';
@@ -1604,7 +1571,9 @@ if ($action == 'create')
 				if ($action == 'clone') {
 					// Create an array for form
 					$criteriaforfilter = 'hierarchyme';
-					if (!empty($user->rights->expensereport->readall)) $criteriaforfilter = '';
+					if (!empty($user->rights->expensereport->readall)) {
+						$criteriaforfilter = '';
+					}
 					$formquestion = array(
 						'text' => '',
 						array('type' => 'other', 'name' => 'fk_user_author', 'label' => $langs->trans("SelectTargetUser"), 'value' => $form->select_dolusers((GETPOST('fk_user_author', 'int') > 0 ? GETPOST('fk_user_author', 'int') : $user->id), 'fk_user_author', 0, null, 0, $criteriaforfilter, '', '0', 0, 0, '', 0, '', 'maxwidth150'))
@@ -1613,50 +1582,41 @@ if ($action == 'create')
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneExpenseReport', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 				}
 
-				if ($action == 'save')
-				{
+				if ($action == 'save') {
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_validate", "", "", 1);
 				}
 
-				if ($action == 'save_from_refuse')
-				{
+				if ($action == 'save_from_refuse') {
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("SaveTrip"), $langs->trans("ConfirmSaveTrip"), "confirm_save_from_refuse", "", "", 1);
 				}
 
-				if ($action == 'delete')
-				{
+				if ($action == 'delete') {
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete", "", "", 1);
 				}
 
-				if ($action == 'validate')
-				{
+				if ($action == 'validate') {
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("ValideTrip"), $langs->trans("ConfirmValideTrip"), "confirm_approve", "", "", 1);
 				}
 
-				if ($action == 'paid')
-				{
+				if ($action == 'paid') {
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("PaidTrip"), $langs->trans("ConfirmPaidTrip"), "confirm_paid", "", "", 1);
 				}
 
-				if ($action == 'cancel')
-				{
+				if ($action == 'cancel') {
 					$array_input = array('text'=>$langs->trans("ConfirmCancelTrip"), array('type'=>"text", 'label'=>'<strong>'.$langs->trans("Comment").'</strong>', 'name'=>"detail_cancel", 'value'=>""));
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Cancel"), "", "confirm_cancel", $array_input, "", 1);
 				}
 
-				if ($action == 'setdraft')
-				{
+				if ($action == 'setdraft') {
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("BrouillonnerTrip"), $langs->trans("ConfirmBrouillonnerTrip"), "confirm_setdraft", "", "", 1);
 				}
 
-				if ($action == 'refuse')		// Deny
-				{
+				if ($action == 'refuse') {		// Deny
 					$array_input = array('text'=>$langs->trans("ConfirmRefuseTrip"), array('type'=>"text", 'label'=>$langs->trans("Comment"), 'name'=>"detail_refuse", 'value'=>""));
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("Deny"), '', "confirm_refuse", $array_input, "yes", 1);
 				}
 
-				if ($action == 'delete_line')
-				{
+				if ($action == 'delete_line') {
 					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id."&rowid=".GETPOST('rowid', 'int'), $langs->trans("DeleteLine"), $langs->trans("ConfirmDeleteLine"), "confirm_delete_line", '', 'yes', 1);
 				}
 
@@ -1676,34 +1636,34 @@ if ($action == 'create')
 				// Project
 				if (! empty($conf->projet->enabled))
 				{
-				    $langs->load("projects");
-				    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-				    if ($user->rights->commande->creer)
-				    {
-				        if ($action != 'classify')
-				            $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-				            if ($action == 'classify') {
-				                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-				                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-				                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-				                $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-				                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-				                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-				                $morehtmlref.='</form>';
-				            } else {
-				                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-				            }
-				    } else {
-				        if (! empty($object->fk_project)) {
-				            $proj = new Project($db);
-				            $proj->fetch($object->fk_project);
-				            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-				            $morehtmlref.=$proj->ref;
-				            $morehtmlref.='</a>';
-				        } else {
-				            $morehtmlref.='';
-				        }
-				    }
+					$langs->load("projects");
+					$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+					if ($user->rights->commande->creer)
+					{
+						if ($action != 'classify')
+							$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+							if ($action == 'classify') {
+								//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+								$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+								$morehtmlref.='<input type="hidden" name="action" value="classin">';
+								$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+								$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+								$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+								$morehtmlref.='</form>';
+							} else {
+								$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+							}
+					} else {
+						if (! empty($object->fk_project)) {
+							$proj = new Project($db);
+							$proj->fetch($object->fk_project);
+							$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+							$morehtmlref.=$proj->ref;
+							$morehtmlref.='</a>';
+						} else {
+							$morehtmlref.='';
+						}
+					}
 				}*/
 				$morehtmlref .= '</div>';
 
@@ -1719,12 +1679,14 @@ if ($action == 'create')
 				print '<tr>';
 				print '<td class="titlefield">'.$langs->trans("User").'</td>';
 				print '<td>';
-				if ($object->fk_user_author > 0)
-				{
+				if ($object->fk_user_author > 0) {
 					$userauthor = new User($db);
 					$result = $userauthor->fetch($object->fk_user_author);
-					if ($result < 0) dol_print_error('', $userauthor->error);
-					elseif ($result > 0) print $userauthor->getNomUrl(-1);
+					if ($result < 0) {
+						dol_print_error('', $userauthor->error);
+					} elseif ($result > 0) {
+						print $userauthor->getNomUrl(-1);
+					}
 				}
 				print '</td></tr>';
 
@@ -1735,8 +1697,7 @@ if ($action == 'create')
 				print get_date_range($object->date_debut, $object->date_fin, 'day', $langs, 0);
 				print '</td>';
 				print '</tr>';
-				if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION))
-				{
+				if (!empty($conf->global->EXPENSEREPORT_ASK_PAYMENTMODE_ON_CREATION)) {
 					print '<tr>';
 					print '<td>'.$langs->trans("ModePaiement").'</td>';
 					print '<td>'.$object->fk_c_paiement.'</td>';
@@ -1747,39 +1708,42 @@ if ($action == 'create')
 				print '<tr>';
 				print '<td>'.$langs->trans("DATE_SAVE").'</td>';
 				print '<td>'.dol_print_date($object->date_valid, 'dayhour', 'tzuser');
-				if ($object->status == 2 && $object->hasDelay('toapprove')) print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToApprove"));
-				if ($object->status == 5 && $object->hasDelay('topay')) print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToPay"));
+				if ($object->status == 2 && $object->hasDelay('toapprove')) {
+					print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToApprove"));
+				}
+				if ($object->status == 5 && $object->hasDelay('topay')) {
+					print ' '.img_warning($langs->trans("Late").' - '.$langs->trans("ToPay"));
+				}
 				print '</td></tr>';
 				print '</tr>';
 
 				// User to inform for approval
-				if ($object->status <= ExpenseReport::STATUS_VALIDATED)	// informed
-				{
+				if ($object->status <= ExpenseReport::STATUS_VALIDATED) {	// informed
 					print '<tr>';
 					print '<td>'.$langs->trans("VALIDATOR").'</td>'; // approver
 					print '<td>';
-					if ($object->fk_user_validator > 0)
-					{
+					if ($object->fk_user_validator > 0) {
 						$userfee = new User($db);
 						$result = $userfee->fetch($object->fk_user_validator);
-						if ($result > 0) print $userfee->getNomUrl(-1);
-						if (empty($userfee->email) || !isValidEmail($userfee->email))
-						{
+						if ($result > 0) {
+							print $userfee->getNomUrl(-1);
+						}
+						if (empty($userfee->email) || !isValidEmail($userfee->email)) {
 							$langs->load("errors");
 							print img_warning($langs->trans("ErrorBadEMail", $userfee->email));
 						}
 					}
 					print '</td></tr>';
-				} elseif ($object->status == ExpenseReport::STATUS_CANCELED)
-				{
+				} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
 					print '<tr>';
 					print '<td>'.$langs->trans("CANCEL_USER").'</span></td>';
 					print '<td>';
-					if ($object->fk_user_cancel > 0)
-					{
+					if ($object->fk_user_cancel > 0) {
 						$userfee = new User($db);
 						$result = $userfee->fetch($object->fk_user_cancel);
-						if ($result > 0) print $userfee->getNomUrl(-1);
+						if ($result > 0) {
+							print $userfee->getNomUrl(-1);
+						}
 					}
 					print '</td></tr>';
 
@@ -1795,11 +1759,12 @@ if ($action == 'create')
 					print '<tr>';
 					print '<td>'.$langs->trans("ApprovedBy").'</td>';
 					print '<td>';
-					if ($object->fk_user_approve > 0)
-					{
+					if ($object->fk_user_approve > 0) {
 						$userapp = new User($db);
 						$result = $userapp->fetch($object->fk_user_approve);
-						if ($result > 0) print $userapp->getNomUrl(-1);
+						if ($result > 0) {
+							print $userapp->getNomUrl(-1);
+						}
 					}
 					print '</td></tr>';
 
@@ -1809,26 +1774,28 @@ if ($action == 'create')
 					print '</tr>';
 				}
 
-				if ($object->status == 99 || !empty($object->detail_refuse))
-				{
+				if ($object->status == 99 || !empty($object->detail_refuse)) {
 					print '<tr>';
 					print '<td>'.$langs->trans("REFUSEUR").'</td>';
 					print '<td>';
 					$userfee = new User($db);
 					$result = $userfee->fetch($object->fk_user_refuse);
-					if ($result > 0) print $userfee->getNomUrl(-1);
+					if ($result > 0) {
+						print $userfee->getNomUrl(-1);
+					}
 					print '</td></tr>';
 
 					print '<tr>';
 					print '<td>'.$langs->trans("DATE_REFUS").'</td>';
 					print '<td>'.dol_print_date($object->date_refuse, 'dayhour', 'tzuser');
-					if ($object->detail_refuse) print ' - '.$object->detail_refuse;
+					if ($object->detail_refuse) {
+						print ' - '.$object->detail_refuse;
+					}
 					print '</td>';
 					print '</tr>';
 				}
 
-				if ($object->status == $object::STATUS_CLOSED)
-				{
+				if ($object->status == $object::STATUS_CLOSED) {
 					/* TODO this fields are not yet filled
 					print '<tr>';
 					print '<td>'.$langs->trans("AUTHORPAIEMENT").'</td>';
@@ -1862,11 +1829,19 @@ if ($action == 'create')
 				print '<td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
 				print '<td class="nowrap amountcard">'.price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td>';
 				$rowspan = 5;
-				if ($object->status <= ExpenseReport::STATUS_VALIDATED) $rowspan++;
-				elseif ($object->status == ExpenseReport::STATUS_CANCELED) $rowspan += 2;
-				else $rowspan += 2;
-				if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) $rowspan += 2;
-				if ($object->status == ExpenseReport::STATUS_CLOSED) $rowspan += 2;
+				if ($object->status <= ExpenseReport::STATUS_VALIDATED) {
+					$rowspan++;
+				} elseif ($object->status == ExpenseReport::STATUS_CANCELED) {
+					$rowspan += 2;
+				} else {
+					$rowspan += 2;
+				}
+				if ($object->status == ExpenseReport::STATUS_REFUSED || !empty($object->detail_refuse)) {
+					$rowspan += 2;
+				}
+				if ($object->status == ExpenseReport::STATUS_CLOSED) {
+					$rowspan += 2;
+				}
 				print "</td>";
 				print '</tr>';
 
@@ -1914,12 +1889,10 @@ if ($action == 'create')
 				$sql .= " ORDER BY dp";
 
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $db->num_rows($resql);
 					$i = 0; $totalpaid = 0;
-					while ($i < $num)
-					{
+					while ($i < $num) {
 						$objp = $db->fetch_object($resql);
 
 						$paymentexpensereportstatic->id = $objp->rowid;
@@ -1935,8 +1908,7 @@ if ($action == 'create')
 						print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 						$labeltype = $langs->trans("PaymentType".$objp->p_code) != ("PaymentType".$objp->p_code) ? $langs->trans("PaymentType".$objp->p_code) : $objp->payment_type;
 						print "<td>".$labeltype.' '.$objp->num_payment."</td>\n";
-						if (!empty($conf->banque->enabled))
-						{
+						if (!empty($conf->banque->enabled)) {
 							$bankaccountstatic->id = $objp->baid;
 							$bankaccountstatic->ref = $objp->baref;
 							$bankaccountstatic->label = $objp->baref;
@@ -1951,8 +1923,9 @@ if ($action == 'create')
 							}
 
 							print '<td class="right">';
-							if ($bankaccountstatic->id)
+							if ($bankaccountstatic->id) {
 								print $bankaccountstatic->getNomUrl(1, 'transactions');
+							}
 							print '</td>';
 						}
 						print '<td class="right">'.price($objp->amount)."</td>";
@@ -1961,8 +1934,7 @@ if ($action == 'create')
 						$totalpaid += $objp->amount;
 						$i++;
 					}
-					if (!is_null($totalpaid))
-					{
+					if (!is_null($totalpaid)) {
 						$totalpaid = price2num($totalpaid); // Round $totalpaid to fix floating problem after addition into loop
 					}
 
@@ -1971,12 +1943,10 @@ if ($action == 'create')
 
 					$cssforamountpaymentcomplete = 'amountpaymentcomplete';
 
-					if ($object->status == ExpenseReport::STATUS_REFUSED)
-					{
+					if ($object->status == ExpenseReport::STATUS_REFUSED) {
 						$cssforamountpaymentcomplete = 'amountpaymentneutral';
 						$resteapayeraffiche = 0;
-					} elseif ($object->paid == 0)
-					{
+					} elseif ($object->paid == 0) {
 						$cssforamountpaymentcomplete = 'amountpaymentneutral';
 					}
 					print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").':</td><td class="right">'.price($totalpaid).'</td><td></td></tr>';
@@ -2000,7 +1970,9 @@ if ($action == 'create')
 				print '<div style="clear: both;"></div>';
 
 				$actiontouse = 'updateline';
-				if (($object->status == 0 || $object->status == 99) && $action != 'editline') $actiontouse = 'addline';
+				if (($object->status == 0 || $object->status == 99) && $action != 'editline') {
+					$actiontouse = 'addline';
+				}
 
 				print '<form name="expensereport" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="post" >';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -2011,24 +1983,26 @@ if ($action == 'create')
 				print '<div class="div-table-responsive-no-min">';
 				print '<table id="tablelines" class="noborder centpercent">';
 
-				if (!empty($object->lines))
-				{
+				if (!empty($object->lines)) {
 					$i = 0; $total = 0;
 
 					print '<tr class="liste_titre">';
 					print '<td class="center">'.$langs->trans('LineNb').'</td>';
 					//print '<td class="center">'.$langs->trans('Piece').'</td>';
 					print '<td class="center">'.$langs->trans('Date').'</td>';
-					if (!empty($conf->projet->enabled)) print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
+					if (!empty($conf->projet->enabled)) {
+						print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
+					}
 					print '<td class="center">'.$langs->trans('Type').'</td>';
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) print '<td>'.$langs->trans('CarCategory').'</td>';
+					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+						print '<td>'.$langs->trans('CarCategory').'</td>';
+					}
 					print '<td>'.$langs->trans('Description').'</td>';
 					print '<td class="right">'.$langs->trans('VAT').'</td>';
 					print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
 					print '<td class="right">'.$langs->trans('PriceUTTC').'</td>';
 					print '<td class="right">'.$langs->trans('Qty').'</td>';
-					if ($action != 'editline')
-					{
+					if ($action != 'editline') {
 						print '<td class="right">'.$langs->trans('AmountHT').'</td>';
 						print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
 					}
@@ -2036,18 +2010,15 @@ if ($action == 'create')
 					print '<td>';
 					print '</td>';
 					// Ajout des boutons de modification/suppression
-					if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer)
-					{
+					if (($object->status < 2 || $object->status == 99) && $user->rights->expensereport->creer) {
 						print '<td class="right"></td>';
 					}
 					print '</tr>';
 
-					foreach ($object->lines as &$line)
-					{
+					foreach ($object->lines as &$line) {
 						$numline = $i + 1;
 
-						if ($action != 'editline' || $line->rowid != GETPOST('rowid', 'int'))
-						{
+						if ($action != 'editline' || $line->rowid != GETPOST('rowid', 'int')) {
 							print '<tr class="oddeven">';
 
 							// Num
@@ -2059,11 +2030,9 @@ if ($action == 'create')
 							print '<td class="center">'.dol_print_date($db->jdate($line->date), 'day').'</td>';
 
 							// Project
-							if (!empty($conf->projet->enabled))
-							{
+							if (!empty($conf->projet->enabled)) {
 								print '<td>';
-								if ($line->fk_project > 0)
-								{
+								if ($line->fk_project > 0) {
 									$projecttmp->id = $line->fk_project;
 									$projecttmp->ref = $line->projet_ref;
 									$projecttmp->title = $line->projet_title;
@@ -2079,8 +2048,7 @@ if ($action == 'create')
 							print '</td>';
 
 							// IK
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
-							{
+							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 								print '<td class="fk_c_exp_tax_cat">';
 								print dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
 								print '</td>';
@@ -2092,8 +2060,7 @@ if ($action == 'create')
 							print '<td class="right">'.vatrate($line->vatrate, true).'</td>';
 							// Unit price HT
 							print '<td class="right">';
-							if (!empty($line->value_unit_ht))
-							{
+							if (!empty($line->value_unit_ht)) {
 								print price($line->value_unit_ht);
 							} else {
 								$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $line->vatrate));
@@ -2106,28 +2073,26 @@ if ($action == 'create')
 
 							print '<td class="right">'.dol_escape_htmltag($line->qty).'</td>';
 
-							if ($action != 'editline')
-							{
+							if ($action != 'editline') {
 								print '<td class="right">'.price($line->total_ht).'</td>';
 								print '<td class="right">'.price($line->total_ttc).'</td>';
 							}
 
 							// Column with preview
 							print '<td class="center">';
-							if ($line->fk_ecm_files > 0)
-							{
+							if ($line->fk_ecm_files > 0) {
 								$modulepart = 'expensereport';
 								$maxheightmini = 32;
 
 								$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
-								if ($result > 0)
-								{
+								if ($result > 0) {
 									$relativepath = preg_replace('/expensereport\//', '', $ecmfilesstatic->filepath);
 									$fileinfo = pathinfo($ecmfilesstatic->filepath.'/'.$ecmfilesstatic->filename);
-									if (image_format_supported($fileinfo['basename']) > 0)
-									{
+									if (image_format_supported($fileinfo['basename']) > 0) {
 										$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini'); // For new thumbs using same ext (in lower case howerver) than original
-										if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) $minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+										if (!dol_is_file($conf->expensereport->dir_output.'/'.$relativepath.'/'.$minifile)) {
+											$minifile = getImageFileNameForSize($fileinfo['basename'], '_mini', '.png'); // For backward compatibility of old thumbs that were created with filename in lower case and with .png extension
+										}
 										//print $file['path'].'/'.$minifile.'<br>';
 										$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.'/'.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 										if (empty($urlforhref)) {
@@ -2141,42 +2106,39 @@ if ($action == 'create')
 									} else {
 										$modulepart = 'expensereport';
 										$thumbshown = 0;
-										if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename))
-										{
+										if (preg_match('/\.pdf$/i', $ecmfilesstatic->filename)) {
 											$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename;
 											$fileimage = $conf->expensereport->dir_output.'/'.$relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
 											$relativepathimage = $relativepath.'/'.$ecmfilesstatic->filename.'_preview.png';
 
 											$pdfexists = file_exists($filepdf);
-											if ($pdfexists)
-											{
+											if ($pdfexists) {
 												// Conversion du PDF en image png si fichier png non existant
-												if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
-												{
-													if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
-													{
+												if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
+													if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 														include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 														$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
-														if ($ret < 0) $error++;
+														if ($ret < 0) {
+															$error++;
+														}
 													}
 												}
 											}
 
-											if ($pdfexists && !$error)
-											{
+											if ($pdfexists && !$error) {
 												$heightforphotref = 70;
-												if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
+												if (!empty($conf->dol_optimize_smallscreen)) {
+													$heightforphotref = 60;
+												}
 												// If the preview file is found
-												if (file_exists($fileimage))
-												{
+												if (file_exists($fileimage)) {
 													$thumbshown = 1;
 													print '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
 												}
 											}
 										}
 
-										if (!$thumbshown)
-										{
+										if (!$thumbshown) {
 											print img_mime($ecmfilesstatic->filename);
 										}
 									}
@@ -2185,8 +2147,7 @@ if ($action == 'create')
 							print '</td>';
 
 							// Ajout des boutons de modification/suppression
-							if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer)
-							{
+							if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer) {
 								print '<td class="nowrap right">';
 
 								print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;token='.newToken().'&amp;rowid='.$line->rowid.'">';
@@ -2202,12 +2163,15 @@ if ($action == 'create')
 							print '</tr>';
 						}
 
-						if ($action == 'editline' && $line->rowid == GETPOST('rowid', 'int'))
-						{
+						if ($action == 'editline' && $line->rowid == GETPOST('rowid', 'int')) {
 							// Add line with link to add new file or attach line to an existing file
 							$colspan = 10;
-							if (!empty($conf->projet->enabled)) $colspan++;
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) $colspan++;
+							if (!empty($conf->projet->enabled)) {
+								$colspan++;
+							}
+							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+								$colspan++;
+							}
 
 							print '<tr class="tredited">';
 
@@ -2219,8 +2183,7 @@ if ($action == 'create')
 							print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
 							print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 							print '</a>';
-							if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
-							{
+							if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 								print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
 								print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 								print '</a>';
@@ -2238,8 +2201,7 @@ if ($action == 'create')
                                     jQuery(".truploadnewfilenow").hide();
                                     return false;
                                 });';
-							if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')))
-							{
+							if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array'))) {
 								print 'jQuery(".trattachnewfilenow").toggle();'."\n";
 							}
 							print '
@@ -2249,11 +2211,9 @@ if ($action == 'create')
 							print '</td></tr>';
 
 							$filenamelinked = '';
-							if ($line->fk_ecm_files > 0)
-							{
+							if ($line->fk_ecm_files > 0) {
 								$result = $ecmfilesstatic->fetch($line->fk_ecm_files);
-								if ($result > 0)
-								{
+								if ($result > 0) {
 									$filenamelinked = $ecmfilesstatic->filename;
 								}
 							}
@@ -2272,8 +2232,7 @@ if ($action == 'create')
 							print '</td>';
 
 							// Select project
-							if (!empty($conf->projet->enabled))
-							{
+							if (!empty($conf->projet->enabled)) {
 								print '<td>';
 								$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 								print '</td>';
@@ -2284,8 +2243,7 @@ if ($action == 'create')
 							print $formexpensereport->selectTypeExpenseReport($line->fk_c_type_fees, 'fk_c_type_fees');
 							print '</td>';
 
-							if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
-							{
+							if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 								print '<td class="fk_c_exp_tax_cat">';
 								$params = array('fk_expense' => $object->id, 'fk_expense_det' => $line->rowid, 'date' => $line->dates);
 								print $form->selectExpenseCategories($line->fk_c_exp_tax_cat, 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params);
@@ -2341,17 +2299,21 @@ if ($action == 'create')
 				// Add a new line
 				if (($object->status == ExpenseReport::STATUS_DRAFT || $object->status == ExpenseReport::STATUS_REFUSED)
 					&& $action != 'editline'
-					&& $user->rights->expensereport->creer)
-				{
+					&& $user->rights->expensereport->creer) {
 					$colspan = 11;
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) $colspan++;
-					if (!empty($conf->projet->enabled)) $colspan++;
-					if ($action != 'editline') $colspan++;
+					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+						$colspan++;
+					}
+					if (!empty($conf->projet->enabled)) {
+						$colspan++;
+					}
+					if ($action != 'editline') {
+						$colspan++;
+					}
 
 					$nbFiles = $nbLinks = 0;
 					$arrayoffiles = array();
-					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
-					{
+					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 						require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 						require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
@@ -2367,8 +2329,7 @@ if ($action == 'create')
 					print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
 					print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 					print '</a>';
-					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
-					{
+					if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 						print ' &nbsp; - &nbsp; <a href="" class="commonlink aattachtodoc reposition">'.$langs->trans("AttachTheNewLineToTheDocument");
 						print img_picto($langs->trans("AttachTheNewLineToTheDocument"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 						print '</a>';
@@ -2386,8 +2347,7 @@ if ($action == 'create')
                             jQuery(".truploadnewfilenow").hide();
                             return false;
                         });'."\n";
-					if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline')
-					{
+					if (is_array(GETPOST('attachfile', 'array')) && count(GETPOST('attachfile', 'array')) && $action != 'updateline') {
 						print 'jQuery(".trattachnewfilenow").show();'."\n";
 					}
 					print '
@@ -2431,8 +2391,7 @@ if ($action == 'create')
 					print '</td>';
 
 					// Select project
-					if (!empty($conf->projet->enabled))
-					{
+					if (!empty($conf->projet->enabled)) {
 						print '<td>';
 						$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 						print '</td>';
@@ -2443,8 +2402,7 @@ if ($action == 'create')
 					print $formexpensereport->selectTypeExpenseReport($fk_c_type_fees, 'fk_c_type_fees', 1);
 					print '</td>';
 
-					if (!empty($conf->global->MAIN_USE_EXPENSE_IK))
-					{
+					if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 						print '<td class="fk_c_exp_tax_cat">';
 						$params = array('fk_expense' => $object->id);
 						print $form->selectExpenseCategories('', 'fk_c_exp_tax_cat', 1, array(), 'fk_c_type_fees', $userauthor->default_c_exp_tax_cat, $params, 0);
@@ -2459,7 +2417,9 @@ if ($action == 'create')
 					// Select VAT
 					print '<td class="right">';
 					$defaultvat = -1;
-					if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
+					if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
+						$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
+					}
 					print $form->load_tva('vatrate', ($vatrate != '' ? $vatrate : $defaultvat), $mysoc, '', 0, 0, '', false, 1);
 					print '</td>';
 
@@ -2481,8 +2441,7 @@ if ($action == 'create')
 					// Picture
 					print '<td></td>';
 
-					if ($action != 'editline')
-					{
+					if ($action != 'editline') {
 						print '<td class="right"></td>';
 						print '<td class="right"></td>';
 					}
@@ -2499,31 +2458,30 @@ if ($action == 'create')
 
 				/* JQuery for product free or predefined select */
 				jQuery(document).ready(function() {
-				    jQuery("#value_unit_ht").keyup(function(event) {
-				         console.log(event.which);		// discard event tag and arrows
-				        if (event.which != 9 && (event.which < 37 ||event.which > 40) && jQuery("#value_unit_ht").val() != "") {
-				            jQuery("#value_unit").val("");
-				        }
-				    });
-				    jQuery("#value_unit").keyup(function(event) {
-				         console.log(event.which);		// discard event tag and arrows
-				        if (event.which != 9 && (event.which < 37 || event.which > 40) && jQuery("#value_unit").val() != "") {
-				            jQuery("#value_unit_ht").val("");
-				        }
-				    });
+					jQuery("#value_unit_ht").keyup(function(event) {
+						console.log(event.which);		// discard event tag and arrows
+						if (event.which != 9 && (event.which < 37 ||event.which > 40) && jQuery("#value_unit_ht").val() != "") {
+							jQuery("#value_unit").val("");
+						}
+					});
+					jQuery("#value_unit").keyup(function(event) {
+						console.log(event.which);		// discard event tag and arrows
+						if (event.which != 9 && (event.which < 37 || event.which > 40) && jQuery("#value_unit").val() != "") {
+							jQuery("#value_unit_ht").val("");
+						}
+					});
 				});
 
-                </script>';
+				</script>';
 
 				print '</form>';
 
 				print dol_get_fiche_end();
-			} // end edit or not edit
-		}	// end of if result
-		else {
+			}
+		} else {
 			dol_print_error($db);
 		}
-	} //fin si id > 0
+	}
 }
 
 /*
@@ -2532,8 +2490,7 @@ if ($action == 'create')
 
 print '<div class="tabsAction">';
 
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	$object = new ExpenseReport($db);
 	$object->fetch($id, $ref);
 
@@ -2552,16 +2509,13 @@ if ($action != 'create' && $action != 'edit')
 	*	ET fk_user_author == user courant
 	* 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	*/
-	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_DRAFT)
-	{
-		if (in_array($object->fk_user_author, $user->getAllChildIds(1)) || !empty($user->rights->expensereport->writeall_advance))
-		{
+	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_DRAFT) {
+		if (in_array($object->fk_user_author, $user->getAllChildIds(1)) || !empty($user->rights->expensereport->writeall_advance)) {
 			// Modify
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
 			// Validate
-			if (count($object->lines) > 0)
-			{
+			if (count($object->lines) > 0) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=save&id='.$object->id.'">'.$langs->trans('ValidateAndSubmit').'</a></div>';
 			}
 		}
@@ -2572,10 +2526,8 @@ if ($action != 'create' && $action != 'edit')
 	 *	ET fk_user_author == user courant
 	 * 	Afficher : "Enregistrer" / "Modifier" / "Supprimer"
 	 */
-	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_REFUSED)
-	{
-		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
-		{
+	if ($user->rights->expensereport->creer && $object->status == ExpenseReport::STATUS_REFUSED) {
+		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
 			// Modify
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$object->id.'">'.$langs->trans('Modify').'</a></div>';
 
@@ -2586,10 +2538,8 @@ if ($action != 'create' && $action != 'edit')
 		}
 	}
 
-	if ($user->rights->expensereport->to_paid && $object->status == ExpenseReport::STATUS_APPROVED)
-	{
-		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
-		{
+	if ($user->rights->expensereport->to_paid && $object->status == ExpenseReport::STATUS_APPROVED) {
+		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
 			// setdraft
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=setdraft&token='.newToken().'&id='.$object->id.'">'.$langs->trans('SetToDraft').'</a></div>';
 		}
@@ -2600,17 +2550,14 @@ if ($action != 'create' && $action != 'edit')
 	 *	ET fk_user_validator == user courant
 	 *	Afficher : "Valider" / "Refuser" / "Supprimer"
 	 */
-	if ($object->status == ExpenseReport::STATUS_VALIDATED)
-	{
-		if (in_array($object->fk_user_author, $user->getAllChildIds(1)))
-		{
+	if ($object->status == ExpenseReport::STATUS_VALIDATED) {
+		if (in_array($object->fk_user_author, $user->getAllChildIds(1))) {
 			// set draft
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=setdraft&token='.newToken().'&id='.$object->id.'">'.$langs->trans('SetToDraft').'</a></div>';
 		}
 	}
 
-	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_VALIDATED)
-	{
+	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_VALIDATED) {
 		//if($object->fk_user_validator==$user->id)
 		//{
 			// Validate
@@ -2619,8 +2566,7 @@ if ($action != 'create' && $action != 'edit')
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
 		//}
 
-		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid)
-		{
+		if ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) {
 			// Cancel
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&id='.$object->id.'">'.$langs->trans("Cancel").'</a></div>';
 		}
@@ -2630,17 +2576,14 @@ if ($action != 'create' && $action != 'edit')
 	// If status is Approved
 	// ---------------------
 
-	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_APPROVED)
-	{
+	if ($user->rights->expensereport->approve && $object->status == ExpenseReport::STATUS_APPROVED) {
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=refuse&id='.$object->id.'">'.$langs->trans('Deny').'</a></div>';
 	}
 
 	// If bank module is used
-	if ($user->rights->expensereport->to_paid && !empty($conf->banque->enabled) && $object->status == ExpenseReport::STATUS_APPROVED)
-	{
+	if ($user->rights->expensereport->to_paid && !empty($conf->banque->enabled) && $object->status == ExpenseReport::STATUS_APPROVED) {
 		// Pay
-		if ($remaintopay == 0)
-		{
+		if ($remaintopay == 0) {
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span></div>';
 		} else {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a></div>';
@@ -2648,30 +2591,25 @@ if ($action != 'create' && $action != 'edit')
 	}
 
 	// If bank module is not used
-	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->status == ExpenseReport::STATUS_APPROVED)
-	{
+	if (($user->rights->expensereport->to_paid || empty($conf->banque->enabled)) && $object->status == ExpenseReport::STATUS_APPROVED) {
 		//if ((round($remaintopay) == 0 || empty($conf->banque->enabled)) && $object->paid == 0)
-		if ($object->paid == 0)
-		{
+		if ($object->paid == 0) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=set_paid&token='.newToken().'">'.$langs->trans("ClassifyPaid")."</a></div>";
 		}
 	}
 
-	if ($user->rights->expensereport->creer && ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) && $object->status == ExpenseReport::STATUS_APPROVED)
-	{
-		// Cancel
-   		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Cancel").'</a></div>';
-	}
-
-	// TODO Replace this. It should be SetUnpaid and should go back to status unpaid not canceled.
-	if (($user->rights->expensereport->approve || $user->rights->expensereport->to_paid) && $object->status == ExpenseReport::STATUS_CLOSED)
-	{
+	if ($user->rights->expensereport->creer && ($user->id == $object->fk_user_author || $user->id == $object->fk_user_valid) && $object->status == ExpenseReport::STATUS_APPROVED) {
 		// Cancel
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Cancel").'</a></div>';
 	}
 
-	if ($user->rights->expensereport->to_paid && $object->paid && $object->status == ExpenseReport::STATUS_CLOSED)
-	{
+	// TODO Replace this. It should be SetUnpaid and should go back to status unpaid not canceled.
+	if (($user->rights->expensereport->approve || $user->rights->expensereport->to_paid) && $object->status == ExpenseReport::STATUS_CLOSED) {
+		// Cancel
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Cancel").'</a></div>';
+	}
+
+	if ($user->rights->expensereport->to_paid && $object->paid && $object->status == ExpenseReport::STATUS_CLOSED) {
 		// Set unpaid
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=set_unpaid&token='.newToken().'&id='.$object->id.'">'.$langs->trans('ClassifyUnPaid').'</a></div>';
 	}
@@ -2682,12 +2620,10 @@ if ($action != 'create' && $action != 'edit')
 	}
 
 	/* If draft, validated, cancel, and user can create, he can always delete its card before it is approved */
-	if ($user->rights->expensereport->creer && $user->id == $object->fk_user_author && $object->status < ExpenseReport::STATUS_APPROVED)
-	{
+	if ($user->rights->expensereport->creer && $user->id == $object->fk_user_author && $object->status < ExpenseReport::STATUS_APPROVED) {
 		// Delete
 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
-	} elseif ($user->rights->expensereport->supprimer && $object->status != ExpenseReport::STATUS_CLOSED)
-	{
+	} elseif ($user->rights->expensereport->supprimer && $object->status != ExpenseReport::STATUS_CLOSED) {
 		// Delete
 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
 	}
@@ -2704,8 +2640,7 @@ if (GETPOST('modelselected', 'alpha')) {
 	$action = 'presend';
 }
 
-if ($action != 'presend')
-{
+if ($action != 'presend') {
 	/*
 	 * Generate documents
 	 */
@@ -2713,8 +2648,7 @@ if ($action != 'presend')
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 	print '<a name="builddoc"></a>'; // ancre
 
-	if ($user->rights->expensereport->creer && $action != 'create' && $action != 'edit')
-	{
+	if ($user->rights->expensereport->creer && $action != 'create' && $action != 'edit') {
 		$filename = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->expensereport->dir_output."/".dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
@@ -2732,7 +2666,7 @@ if ($action != 'presend')
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('expensereport'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 	}
-    */
+	*/
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 	// List of actions on element
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index aa892e50fc0..98da4534e0c 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -33,7 +33,7 @@ class ExpenseReports extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'fk_user_author'
 	);
 
@@ -107,11 +107,12 @@ class ExpenseReports extends DolibarrApi
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t";
 		$sql .= ' WHERE t.entity IN ('.getEntity('expensereport').')';
-		if ($user_ids) $sql .= " AND t.fk_user_author IN (".$user_ids.")";
+		if ($user_ids) {
+			$sql .= " AND t.fk_user_author IN (".$user_ids.")";
+		}
 
 		// Add sql filters
-		if ($sqlfilters)
-		{
+		if ($sqlfilters) {
 			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
@@ -131,13 +132,11 @@ class ExpenseReports extends DolibarrApi
 
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$expensereport_static = new ExpenseReport($this->db);
 				if ($expensereport_static->fetch($obj->rowid)) {
@@ -172,12 +171,12 @@ class ExpenseReports extends DolibarrApi
 			$this->expensereport->$field = $value;
 		}
 		/*if (isset($request_data["lines"])) {
-          $lines = array();
-          foreach ($request_data["lines"] as $line) {
-            array_push($lines, (object) $line);
-          }
-          $this->expensereport->lines = $lines;
-        }*/
+		  $lines = array();
+		  foreach ($request_data["lines"] as $line) {
+			array_push($lines, (object) $line);
+		  }
+		  $this->expensereport->lines = $lines;
+		}*/
 		if ($this->expensereport->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating expensereport", array_merge(array($this->expensereport->error), $this->expensereport->errors));
 		}
@@ -195,28 +194,28 @@ class ExpenseReports extends DolibarrApi
 	 * @return int
 	 */
 	/*
-    public function getLines($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->expensereport->lire) {
-            throw new RestException(401);
-        }
+	public function getLines($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->expensereport->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->expensereport->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'expensereport not found');
-        }
+		$result = $this->expensereport->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'expensereport not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->expensereport->getLinesArray();
-        $result = array();
-        foreach ($this->expensereport->lines as $line) {
-            array_push($result,$this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
-    */
+		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->expensereport->getLinesArray();
+		$result = array();
+		foreach ($this->expensereport->lines as $line) {
+			array_push($result,$this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
+	*/
 
 	/**
 	 * Add a line to given Expense Report
@@ -229,56 +228,56 @@ class ExpenseReports extends DolibarrApi
 	 * @return int
 	 */
 	/*
-    public function postLine($id, $request_data = null)
-    {
-      if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
-              throw new RestException(401);
-          }
+	public function postLine($id, $request_data = null)
+	{
+	  if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+			  throw new RestException(401);
+		  }
 
-      $result = $this->expensereport->fetch($id);
-      if( ! $result ) {
-         throw new RestException(404, 'expensereport not found');
-      }
+	  $result = $this->expensereport->fetch($id);
+	  if( ! $result ) {
+		 throw new RestException(404, 'expensereport not found');
+	  }
 
-          if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
-              throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
-            $request_data = (object) $request_data;
-      $updateRes = $this->expensereport->addline(
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        $request_data->fk_product,
-                        $request_data->remise_percent,
-                        $request_data->info_bits,
-                        $request_data->fk_remise_except,
-                        'HT',
-                        0,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->rang,
-                        $request_data->special_code,
-                        $fk_parent_line,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $this->element,
-                        $request_data->id
-      );
+		  if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+	  }
+			$request_data = (object) $request_data;
+	  $updateRes = $this->expensereport->addline(
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						$request_data->fk_product,
+						$request_data->remise_percent,
+						$request_data->info_bits,
+						$request_data->fk_remise_except,
+						'HT',
+						0,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+						$fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$this->element,
+						$request_data->id
+	  );
 
-      if ($updateRes > 0) {
-        return $updateRes;
+	  if ($updateRes > 0) {
+		return $updateRes;
 
-      }
-      return false;
-    }
-    */
+	  }
+	  return false;
+	}
+	*/
 
 	/**
 	 * Update a line to given Expense Report
@@ -292,53 +291,53 @@ class ExpenseReports extends DolibarrApi
 	 * @return object
 	 */
 	/*
-    public function putLine($id, $lineid, $request_data = null)
-    {
-        if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
-              throw new RestException(401);
-        }
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+			  throw new RestException(401);
+		}
 
-        $result = $this->expensereport->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'expensereport not found');
-        }
+		$result = $this->expensereport->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'expensereport not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $request_data = (object) $request_data;
-        $updateRes = $this->expensereport->updateline(
-                        $lineid,
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->remise_percent,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        'HT',
-                        $request_data->info_bits,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->product_type,
-                        $request_data->fk_parent_line,
-                        0,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->special_code,
-                        $request_data->array_options,
-                        $request_data->fk_unit
-        );
+		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$request_data = (object) $request_data;
+		$updateRes = $this->expensereport->updateline(
+						$lineid,
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->remise_percent,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						'HT',
+						$request_data->info_bits,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->fk_parent_line,
+						0,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->special_code,
+						$request_data->array_options,
+						$request_data->fk_unit
+		);
 
-        if ($updateRes > 0) {
-            $result = $this->get($id);
-            unset($result->line);
-            return $this->_cleanObjectDatas($result);
-        }
-        return false;
-    }
-    */
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
+	}
+	*/
 
 	/**
 	 * Delete a line of given Expense Report
@@ -351,30 +350,30 @@ class ExpenseReports extends DolibarrApi
 	 * @return int
 	 */
 	/*
-    public function deleteLine($id, $lineid)
-    {
-      if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
-              throw new RestException(401);
-          }
+	public function deleteLine($id, $lineid)
+	{
+	  if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+			  throw new RestException(401);
+		  }
 
-      $result = $this->expensereport->fetch($id);
-      if( ! $result ) {
-         throw new RestException(404, 'expensereport not found');
-      }
+	  $result = $this->expensereport->fetch($id);
+	  if( ! $result ) {
+		 throw new RestException(404, 'expensereport not found');
+	  }
 
-          if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
-              throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-      }
+		  if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+			  throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+	  }
 
-      // TODO Check the lineid $lineid is a line of ojbect
+	  // TODO Check the lineid $lineid is a line of ojbect
 
-      $updateRes = $this->expensereport->deleteline($lineid);
-      if ($updateRes == 1) {
-        return $this->get($id);
-      }
-      return false;
-    }
-    */
+	  $updateRes = $this->expensereport->deleteline($lineid);
+	  if ($updateRes == 1) {
+		return $this->get($id);
+	  }
+	  return false;
+	}
+	*/
 
 	/**
 	 * Update Expense Report general fields (won't touch lines of expensereport)
@@ -403,12 +402,13 @@ class ExpenseReports extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->expensereport->$field = $value;
 		}
 
-		if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
-		{
+		if ($this->expensereport->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
 			throw new RestException(500, $this->expensereport->error);
@@ -464,31 +464,31 @@ class ExpenseReports extends DolibarrApi
 	 * }
 	 */
 	/*
-    public function validate($id, $idwarehouse=0)
-    {
-        if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->expensereport->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'expensereport not found');
-        }
+	public function validate($id, $idwarehouse=0)
+	{
+		if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->expensereport->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'expensereport not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        if( ! $this->expensereport->valid(DolibarrApiAccess::$user, $idwarehouse)) {
-            throw new RestException(500, 'Error when validate expensereport');
-        }
+		if( ! $this->expensereport->valid(DolibarrApiAccess::$user, $idwarehouse)) {
+			throw new RestException(500, 'Error when validate expensereport');
+		}
 
-        return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'expensereport validated'
-            )
-        );
-    }*/
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'expensereport validated'
+			)
+		);
+	}*/
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
@@ -555,8 +555,9 @@ class ExpenseReports extends DolibarrApi
 	{
 		$expensereport = array();
 		foreach (ExpenseReports::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$expensereport[$field] = $data[$field];
 		}
 		return $expensereport;
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index cdc4fe4da5d..f95302cdba2 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -237,14 +237,15 @@ class ExpenseReport extends CommonObject
 		$error = 0;
 
 		// Check parameters
-		if (empty($this->date_debut) || empty($this->date_fin))
-		{
+		if (empty($this->date_debut) || empty($this->date_fin)) {
 			$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Date'));
 			return -1;
 		}
 
 		$fuserid = $this->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
-		if (empty($fuserid)) $fuserid = $user->id;
+		if (empty($fuserid)) {
+			$fuserid = $user->id;
+		}
 
 		$this->db->begin();
 
@@ -289,25 +290,20 @@ class ExpenseReport extends CommonObject
 		$sql .= ")";
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 			$this->ref = '(PROV'.$this->id.')';
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
 
-			if (!$error)
-			{
-				if (is_array($this->lines) && count($this->lines) > 0)
-				{
-					foreach ($this->lines as $line)
-					{
+			if (!$error) {
+				if (is_array($this->lines) && count($this->lines) > 0) {
+					foreach ($this->lines as $line) {
 						// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 						//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
 						if (!is_object($line)) {
@@ -334,8 +330,7 @@ class ExpenseReport extends CommonObject
 						//$newndfline=new ExpenseReportLine($this->db);
 						$newndfline->fk_expensereport = $this->id;
 						$result = $newndfline->insert();
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->error = $newndfline->error;
 							$this->errors = $newndfline->errors;
 							$error++;
@@ -345,19 +340,17 @@ class ExpenseReport extends CommonObject
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-		   		if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->update_price();
-				if ($result > 0)
-				{
-					if (!$notrigger)
-					{
+				if ($result > 0) {
+					if (!$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('EXPENSE_REPORT_CREATE', $user);
 
@@ -367,8 +360,7 @@ class ExpenseReport extends CommonObject
 						// End call triggers
 					}
 
-					if (empty($error))
-					{
+					if (empty($error)) {
 						$this->db->commit();
 						return $this->id;
 					} else {
@@ -405,7 +397,9 @@ class ExpenseReport extends CommonObject
 
 		$error = 0;
 
-		if (empty($fk_user_author)) $fk_user_author = $user->id;
+		if (empty($fk_user_author)) {
+			$fk_user_author = $user->id;
+		}
 
 		$this->db->begin();
 
@@ -430,10 +424,8 @@ class ExpenseReport extends CommonObject
 		$this->date_validation    = '';
 
 		// Remove link on lines to a joined file
-		if (is_array($this->lines) && count($this->lines) > 0)
-		{
-			foreach ($this->lines as $key => $line)
-			{
+		if (is_array($this->lines) && count($this->lines) > 0) {
+			foreach ($this->lines as $key => $line) {
 				$this->lines[$key]->fk_ecm_files = 0;
 			}
 		}
@@ -441,25 +433,26 @@ class ExpenseReport extends CommonObject
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Hook of thirdparty module
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('objFrom'=>$objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 		}
 
 		unset($this->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -490,8 +483,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " , total_tva = ".$this->total_tva;
 		$sql .= " , date_debut = '".$this->db->idate($this->date_debut)."'";
 		$sql .= " , date_fin = '".$this->db->idate($this->date_fin)."'";
-		if ($userofexpensereport && is_object($userofexpensereport))
-		{
+		if ($userofexpensereport && is_object($userofexpensereport)) {
 			$sql .= " , fk_user_author = ".($userofexpensereport->id > 0 ? $userofexpensereport->id : "null"); // Note fk_user_author is not the 'author' but the guy the expense report is for.
 		}
 		$sql .= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator : "null");
@@ -507,10 +499,8 @@ class ExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if (!$notrigger)
-			{
+		if ($result) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('EXPENSE_REPORT_UPDATE', $user);
 
@@ -520,8 +510,7 @@ class ExpenseReport extends CommonObject
 				// End call triggers
 			}
 
-			if (empty($error))
-			{
+			if (empty($error)) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -556,17 +545,18 @@ class ExpenseReport extends CommonObject
 		$sql .= " d.fk_user_valid, d.fk_user_approve,";
 		$sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
-		if ($ref) $sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
-		else $sql .= " WHERE d.rowid = ".$id;
+		if ($ref) {
+			$sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
+		} else {
+			$sql .= " WHERE d.rowid = ".$id;
+		}
 		//$sql.= $restrict;
 
 		dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->id           = $obj->rowid;
 				$this->ref          = $obj->ref;
 
@@ -599,13 +589,18 @@ class ExpenseReport extends CommonObject
 				$this->fk_user_approve          = $obj->fk_user_approve;
 
 				$user_author = new User($this->db);
-				if ($this->fk_user_author > 0) $user_author->fetch($this->fk_user_author);
+				if ($this->fk_user_author > 0) {
+					$user_author->fetch($this->fk_user_author);
+				}
 
 				$this->user_author_infos = dolGetFirstLastname($user_author->firstname, $user_author->lastname);
 
 				$user_approver = new User($this->db);
-				if ($this->fk_user_approve > 0) $user_approver->fetch($this->fk_user_approve);
-				elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator); // For backward compatibility
+				if ($this->fk_user_approve > 0) {
+					$user_approver->fetch($this->fk_user_approve);
+				} elseif ($this->fk_user_validator > 0) {
+					$user_approver->fetch($this->fk_user_validator); // For backward compatibility
+				}
 				$this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
 
 				$this->fk_statut                = $obj->status; // deprecated
@@ -613,10 +608,11 @@ class ExpenseReport extends CommonObject
 				$this->fk_c_paiement            = $obj->fk_c_paiement;
 				$this->paid                     = $obj->paid;
 
-				if ($this->status == self::STATUS_APPROVED || $this->status == self::STATUS_CLOSED)
-				{
+				if ($this->status == self::STATUS_APPROVED || $this->status == self::STATUS_CLOSED) {
 					$user_valid = new User($this->db);
-					if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
+					if ($this->fk_user_valid > 0) {
+						$user_valid->fetch($this->fk_user_valid);
+					}
 					$this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
 				}
 
@@ -671,12 +667,9 @@ class ExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::set_paid sql=".$sql, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->affected_rows($resql))
-			{
-				if (!$notrigger)
-				{
+		if ($resql) {
+			if ($this->db->affected_rows($resql)) {
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('EXPENSE_REPORT_PAID', $fuser);
 
@@ -686,8 +679,7 @@ class ExpenseReport extends CommonObject
 					// End call triggers
 				}
 
-				if (empty($error))
-				{
+				if (empty($error)) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -763,10 +755,8 @@ class ExpenseReport extends CommonObject
 		$sql .= " AND f.entity = ".$conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -780,26 +770,22 @@ class ExpenseReport extends CommonObject
 				$cuser->fetch($obj->fk_user_author);
 				$this->user_creation = $cuser;
 
-				if ($obj->fk_user_creation)
-				{
+				if ($obj->fk_user_creation) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creation);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
-				if ($obj->fk_user_modification)
-				{
+				if ($obj->fk_user_modification) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modification);
 					$this->user_modification = $muser;
 				}
-				if ($obj->fk_user_approve)
-				{
+				if ($obj->fk_user_approve) {
 					$auser = new User($this->db);
 					$auser->fetch($obj->fk_user_approve);
 					$this->user_approve = $auser;
@@ -898,15 +884,13 @@ class ExpenseReport extends CommonObject
 
 			dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
 			$result = $this->db->query($sql);
-			if ($result)
-			{
+			if ($result) {
 				$num = $this->db->num_rows($result);
 				$i = 0;
 				$total_HT = 0;
 				$total_TTC = 0;
 
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$objp = $this->db->fetch_object($result);
 
 					$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut as status";
@@ -953,13 +937,13 @@ class ExpenseReport extends CommonObject
 							break;
 					}
 					/*
-                     if ($status==4) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
-                    if ($status==1) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
-                    if ($status==2) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
-                    if ($status==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
-                    if ($status==5) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
-                    if ($status==6) return img_picto($langs->trans('StatusOrderOnProcess'),'statut6');
-                    */
+					 if ($status==4) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+					if ($status==1) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
+					if ($status==2) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
+					if ($status==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
+					if ($status==5) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
+					if ($status==6) return img_picto($langs->trans('StatusOrderOnProcess'),'statut6');
+					*/
 					print '</td>';
 					print '</tr>';
 
@@ -994,11 +978,10 @@ class ExpenseReport extends CommonObject
 		$total_ht = 0; $total_tva = 0; $total_ttc = 0;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num):
+			while ($i < $num) :
 				$objp = $this->db->fetch_object($result);
 				$total_ht += $objp->total_ht;
 				$total_tva += $objp->total_tva;
@@ -1012,7 +995,7 @@ class ExpenseReport extends CommonObject
 			$sql .= " , total_tva = ".$total_tva;
 			$sql .= " WHERE rowid = ".$id;
 			$result = $this->db->query($sql);
-			if ($result):
+			if ($result) :
 				$this->db->free($result);
 				return 1;
 			else :
@@ -1049,20 +1032,17 @@ class ExpenseReport extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
 		$sql .= ' WHERE de.'.$this->fk_element.' = '.$this->id;
-		if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID))
-		{
+		if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID)) {
 			$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
 		} else {
 			$sql .= ' ORDER BY de.rang ASC, de.date ASC';
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($resql);
 
 				$deplig = new ExpenseReportLine($this->db);
@@ -1128,7 +1108,9 @@ class ExpenseReport extends CommonObject
 		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('EXPENSEREPORT_DELETE', $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		}
 
@@ -1148,13 +1130,17 @@ class ExpenseReport extends CommonObject
 		if (!$error) {
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		if (!$error) {
 			// Delete linked contacts
 			$res = $this->delete_linked_contact();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		// Removed extrafields of object
@@ -1239,8 +1225,7 @@ class ExpenseReport extends CommonObject
 		$now = dol_now();
 
 		// Protection
-		if ($this->status == self::STATUS_VALIDATED)
-		{
+		if ($this->status == self::STATUS_VALIDATED) {
 			dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
 			return 0;
 		}
@@ -1248,13 +1233,14 @@ class ExpenseReport extends CommonObject
 		$this->date_valid = $now; // Required for the getNextNum later.
 
 		// Define new ref
-		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-		{
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
 			$num = $this->getNextNumRef();
 		} else {
 			$num = $this->ref;
 		}
-		if (empty($num) || $num < 0) return -1;
+		if (empty($num) || $num < 0) {
+			return -1;
+		}
 
 		$this->newref = dol_sanitizeFileName($num);
 
@@ -1269,10 +1255,8 @@ class ExpenseReport extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$error && !$notrigger)
-			{
+		if ($resql) {
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('EXPENSE_REPORT_VALIDATE', $fuser);
 				if ($result < 0) {
@@ -1281,37 +1265,34 @@ class ExpenseReport extends CommonObject
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
-				if (preg_match('/^[\(]?PROV/i', $this->ref))
-				{
+				if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 					// Now we rename also files into index
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'expensereport/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expensereport/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
-					if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+					if (!$resql) {
+						$error++; $this->error = $this->db->lasterror();
+					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 					$oldref = dol_sanitizeFileName($this->ref);
 					$newref = dol_sanitizeFileName($num);
 					$dirsource = $conf->expensereport->dir_output.'/'.$oldref;
 					$dirdest = $conf->expensereport->dir_output.'/'.$newref;
-					if (!$error && file_exists($dirsource))
-					{
+					if (!$error && file_exists($dirsource)) {
 						dol_syslog(get_class($this)."::setValidate() rename dir ".$dirsource." into ".$dirdest);
 
-						if (@rename($dirsource, $dirdest))
-						{
+						if (@rename($dirsource, $dirdest)) {
 							dol_syslog("Rename ok");
 							// Rename docs starting with $oldref with $newref
 							$listoffiles = dol_dir_list($conf->expensereport->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-							foreach ($listoffiles as $fileentry)
-							{
+							foreach ($listoffiles as $fileentry) {
 								$dirsource = $fileentry['name'];
 								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 								$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -1324,14 +1305,12 @@ class ExpenseReport extends CommonObject
 			}
 
 			// Set new ref and current status
-			if (!$error)
-			{
+			if (!$error) {
 				$this->ref = $num;
 				$this->status = self::STATUS_VALIDATED;
 			}
 
-			if (empty($error))
-			{
+			if (empty($error)) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1369,16 +1348,14 @@ class ExpenseReport extends CommonObject
 
 		$this->date_debut = $this->db->jdate($objp->date_debut);
 
-		if ($this->status != self::STATUS_VALIDATED)
-		{
+		if ($this->status != self::STATUS_VALIDATED) {
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET fk_statut = ".self::STATUS_VALIDATED;
 			$sql .= ' WHERE rowid = '.$this->id;
 
 			dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				return 1;
 			} else {
 				$this->error = $this->db->lasterror();
@@ -1403,18 +1380,15 @@ class ExpenseReport extends CommonObject
 
 		// date approval
 		$this->date_approve = $now;
-		if ($this->status != self::STATUS_APPROVED)
-		{
+		if ($this->status != self::STATUS_APPROVED) {
 			$this->db->begin();
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_APPROVED.", fk_user_approve = ".$fuser->id.",";
 			$sql .= " date_approve='".$this->db->idate($this->date_approve)."'";
 			$sql .= ' WHERE rowid = '.$this->id;
-			if ($this->db->query($sql))
-			{
-				if (!$notrigger)
-				{
+			if ($this->db->query($sql)) {
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('EXPENSE_REPORT_APPROVE', $fuser);
 
@@ -1424,8 +1398,7 @@ class ExpenseReport extends CommonObject
 					// End call triggers
 				}
 
-				if (empty($error))
-				{
+				if (empty($error)) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -1459,24 +1432,21 @@ class ExpenseReport extends CommonObject
 		$error = 0;
 
 		// date de refus
-		if ($this->status != self::STATUS_REFUSED)
-		{
+		if ($this->status != self::STATUS_REFUSED) {
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_REFUSED.", fk_user_refuse = ".$fuser->id.",";
 			$sql .= " date_refuse='".$this->db->idate($now)."',";
 			$sql .= " detail_refuse='".$this->db->escape($details)."',";
 			$sql .= " fk_user_approve = NULL";
 			$sql .= ' WHERE rowid = '.$this->id;
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->fk_statut = 99; // deprecated
 				$this->status = 99;
 				$this->fk_user_refuse = $fuser->id;
 				$this->detail_refuse = $details;
 				$this->date_refuse = $now;
 
-				if (!$notrigger)
-				{
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('EXPENSE_REPORT_DENY', $fuser);
 
@@ -1486,8 +1456,7 @@ class ExpenseReport extends CommonObject
 					// End call triggers
 				}
 
-				if (empty($error))
-				{
+				if (empty($error)) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -1533,8 +1502,7 @@ class ExpenseReport extends CommonObject
 	{
 		$error = 0;
 
-		if ($this->paid)
-		{
+		if ($this->paid) {
 			$this->db->begin();
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
@@ -1543,10 +1511,8 @@ class ExpenseReport extends CommonObject
 
 			dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
 
-			if ($this->db->query($sql))
-			{
-				if (!$notrigger)
-				{
+			if ($this->db->query($sql)) {
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('EXPENSE_REPORT_UNPAID', $fuser);
 
@@ -1556,8 +1522,7 @@ class ExpenseReport extends CommonObject
 					// End call triggers
 				}
 
-				if (empty($error))
-				{
+				if (empty($error)) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -1589,8 +1554,7 @@ class ExpenseReport extends CommonObject
 		// phpcs:enable
 		$error = 0;
 		$this->date_cancel = $this->db->idate(dol_now());
-		if ($this->status != self::STATUS_CANCELED)
-		{
+		if ($this->status != self::STATUS_CANCELED) {
 			$this->db->begin();
 
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
@@ -1601,10 +1565,8 @@ class ExpenseReport extends CommonObject
 
 			dol_syslog(get_class($this)."::set_cancel sql=".$sql, LOG_DEBUG);
 
-			if ($this->db->query($sql))
-			{
-				if (!$notrigger)
-				{
+			if ($this->db->query($sql)) {
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('EXPENSE_REPORT_CANCEL', $fuser);
 
@@ -1614,8 +1576,7 @@ class ExpenseReport extends CommonObject
 					// End call triggers
 				}
 
-				if (empty($error))
-				{
+				if (empty($error)) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -1643,8 +1604,7 @@ class ExpenseReport extends CommonObject
 		global $langs, $conf;
 		$langs->load("trips");
 
-		if (!empty($conf->global->EXPENSEREPORT_ADDON))
-		{
+		if (!empty($conf->global->EXPENSEREPORT_ADDON)) {
 			$mybool = false;
 
 			$file = $conf->global->EXPENSEREPORT_ADDON.".php";
@@ -1652,8 +1612,7 @@ class ExpenseReport extends CommonObject
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-			foreach ($dirmodels as $reldir)
-			{
+			foreach ($dirmodels as $reldir) {
 				$dir = dol_buildpath($reldir."core/modules/expensereport/");
 
 				// Load file with numbering class (if found)
@@ -1668,8 +1627,7 @@ class ExpenseReport extends CommonObject
 			$obj = new $classname();
 			$numref = $obj->getNextValue($this);
 
-			if ($numref != "")
-			{
+			if ($numref != "") {
 				return $numref;
 			} else {
 				$this->error = $obj->error;
@@ -1702,38 +1660,50 @@ class ExpenseReport extends CommonObject
 
 		$url = DOL_URL_ROOT.'/expensereport/card.php?id='.$this->id;
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
 		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("ExpenseReport").'</u>';
 		if (isset($this->status)) {
 			$label .= ' '.$this->getLibStatut(5);
 		}
-		if (!empty($this->ref))
+		if (!empty($this->ref)) {
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->total_ht))
+		}
+		if (!empty($this->total_ht)) {
 			$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_tva))
+		}
+		if (!empty($this->total_tva)) {
 			$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_ttc))
+		}
+		if (!empty($this->total_ttc)) {
 			$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-		if ($moretitle) $label .= ' - '.$moretitle;
+		}
+		if ($moretitle) {
+			$label .= ' - '.$moretitle;
+		}
 
 		//if ($option != 'nolink')
 		//{
 		// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+			$add_save_lastsearch_values = 1;
+		}
+		if ($add_save_lastsearch_values) {
+			$url .= '&save_lastsearch_values=1';
+		}
 		//}
 
 		$ref = $this->ref;
-		if (empty($ref)) $ref = $this->id;
+		if (empty($ref)) {
+			$ref = $this->id;
+		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowExpenseReport");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -1746,8 +1716,12 @@ class ExpenseReport extends CommonObject
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($max ?dol_trunc($ref, $max) : $ref);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= ($max ?dol_trunc($ref, $max) : $ref);
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -1775,7 +1749,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result):
+		if ($result) :
 			return 1;
 		else :
 			$this->error = $this->db->error();
@@ -1805,7 +1779,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result):
+		if ($result) :
 			return 1;
 		else :
 			$this->error = $this->db->error();
@@ -1834,14 +1808,25 @@ class ExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::addline qty=$qty, up=$up, fk_c_type_fees=$fk_c_type_fees, vatrate=$vatrate, date=$date, fk_project=$fk_project, type=$type, comments=$comments", LOG_DEBUG);
 
-		if ($this->status == self::STATUS_DRAFT)
-		{
-			if (empty($qty)) $qty = 0;
-			if (empty($fk_c_type_fees) || $fk_c_type_fees < 0) $fk_c_type_fees = 0;
-			if (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) $fk_c_exp_tax_cat = 0;
-			if (empty($vatrate) || $vatrate < 0) $vatrate = 0;
-			if (empty($date)) $date = '';
-			if (empty($fk_project)) $fk_project = 0;
+		if ($this->status == self::STATUS_DRAFT) {
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($fk_c_type_fees) || $fk_c_type_fees < 0) {
+				$fk_c_type_fees = 0;
+			}
+			if (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) {
+				$fk_c_exp_tax_cat = 0;
+			}
+			if (empty($vatrate) || $vatrate < 0) {
+				$vatrate = 0;
+			}
+			if (empty($date)) {
+				$date = '';
+			}
+			if (empty($fk_project)) {
+				$fk_project = 0;
+			}
 
 			$qty = price2num($qty);
 			if (!preg_match('/\s*\((.*)\)/', $vatrate)) {
@@ -1857,8 +1842,7 @@ class ExpenseReport extends CommonObject
 
 			$vat_src_code = '';
 			$reg = array();
-			if (preg_match('/\s*\((.*)\)/', $vatrate, $reg))
-			{
+			if (preg_match('/\s*\((.*)\)/', $vatrate, $reg)) {
 				$vat_src_code = $reg[1];
 				$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
 			}
@@ -1890,11 +1874,9 @@ class ExpenseReport extends CommonObject
 			$this->checkRules($type, $seller);
 
 			$result = $this->line->insert(0, true);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result = $this->update_price(); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$this->db->commit();
 					return $this->line->id;
 				} else {
@@ -1927,7 +1909,9 @@ class ExpenseReport extends CommonObject
 
 		$langs->load('trips');
 
-		if (empty($conf->global->MAIN_USE_EXPENSE_RULE)) return true; // if don't use rules
+		if (empty($conf->global->MAIN_USE_EXPENSE_RULE)) {
+			return true; // if don't use rules
+		}
 
 		$rulestocheck = ExpenseReportRule::getAllRule($this->line->fk_c_type_fees, $this->line->date, $this->fk_user_author);
 
@@ -1938,19 +1922,19 @@ class ExpenseReport extends CommonObject
 		$new_current_total_ttc = $this->line->total_ttc;
 
 		// check if one is violated
-		foreach ($rulestocheck as $rule)
-		{
-			if (in_array($rule->code_expense_rules_type, array('EX_DAY', 'EX_MON', 'EX_YEA'))) $amount_to_test = $this->line->getExpAmount($rule, $this->fk_user_author, $rule->code_expense_rules_type);
-			else $amount_to_test = $current_total_ttc; // EX_EXP
+		foreach ($rulestocheck as $rule) {
+			if (in_array($rule->code_expense_rules_type, array('EX_DAY', 'EX_MON', 'EX_YEA'))) {
+				$amount_to_test = $this->line->getExpAmount($rule, $this->fk_user_author, $rule->code_expense_rules_type);
+			} else {
+				$amount_to_test = $current_total_ttc; // EX_EXP
+			}
 
 			$amount_to_test = $amount_to_test - $current_total_ttc + $new_current_total_ttc; // if amount as been modified by a previous rule
 
-			if ($amount_to_test > $rule->amount)
-			{
+			if ($amount_to_test > $rule->amount) {
 				$violation++;
 
-				if ($rule->restrictive)
-				{
+				if ($rule->restrictive) {
 					$this->error = 'ExpenseReportConstraintViolationError';
 					$this->errors[] = $this->error;
 
@@ -1969,8 +1953,7 @@ class ExpenseReport extends CommonObject
 
 		$this->line->rule_warning_message = implode('\n', $rule_warning_message_tab);
 
-		if ($violation > 0)
-		{
+		if ($violation > 0) {
 			$tmp = calcul_price_total($this->line->qty, $new_current_total_ttc / $this->line->qty, 0, $this->line->vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
 
 			$this->line->value_unit = $tmp[5];
@@ -1979,7 +1962,9 @@ class ExpenseReport extends CommonObject
 			$this->line->total_tva = $tmp[1];
 
 			return false;
-		} else return true;
+		} else {
+			return true;
+		}
 	}
 
 	/**
@@ -1991,11 +1976,12 @@ class ExpenseReport extends CommonObject
 	{
 		global $conf;
 
-		if (empty($conf->global->MAIN_USE_EXPENSE_IK)) return false;
+		if (empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+			return false;
+		}
 
 		$userauthor = new User($this->db);
-		if ($userauthor->fetch($this->fk_user_author) <= 0)
-		{
+		if ($userauthor->fetch($this->fk_user_author) <= 0) {
 			$this->error = 'ErrorCantFetchUser';
 			$this->errors[] = 'ErrorCantFetchUser';
 			return false;
@@ -2003,19 +1989,20 @@ class ExpenseReport extends CommonObject
 
 		$range = ExpenseReportIk::getRangeByUser($userauthor, $this->line->fk_c_exp_tax_cat);
 
-		if (empty($range))
-		{
+		if (empty($range)) {
 			$this->error = 'ErrorNoRangeAvailable';
 			$this->errors[] = 'ErrorNoRangeAvailable';
 			return false;
 		}
 
-		if (!empty($conf->global->MAIN_EXPENSE_APPLY_ENTIRE_OFFSET)) $ikoffset = $range->ikoffset;
-		else $ikoffset = $range->ikoffset / 12; // The amount of offset is a global value for the year
+		if (!empty($conf->global->MAIN_EXPENSE_APPLY_ENTIRE_OFFSET)) {
+			$ikoffset = $range->ikoffset;
+		} else {
+			$ikoffset = $range->ikoffset / 12; // The amount of offset is a global value for the year
+		}
 
 		// Test if ikoffset has been applied for the current month
-		if (!$this->offsetAlreadyGiven())
-		{
+		if (!$this->offsetAlreadyGiven()) {
 			$new_up = $range->coef + ($ikoffset / $this->line->qty);
 			$tmp = calcul_price_total($this->line->qty, $new_up, 0, $this->line->vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
 
@@ -2042,14 +2029,17 @@ class ExpenseReport extends CommonObject
 		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees f ON (d.fk_c_type_fees = f.id AND f.code = "EX_KME")';
 		$sql .= ' WHERE e.fk_user_author = '.(int) $this->fk_user_author;
 		$sql .= ' AND YEAR(d.date) = "'.dol_print_date($this->line->date, '%Y').'" AND MONTH(d.date) = "'.dol_print_date($this->line->date, '%m').'"';
-		if (!empty($this->line->id)) $sql .= ' AND d.rowid <> '.$this->line->id;
+		if (!empty($this->line->id)) {
+			$sql .= ' AND d.rowid <> '.$this->line->id;
+		}
 
 		dol_syslog(get_class($this)."::offsetAlreadyGiven sql=".$sql);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num > 0) return true;
+			if ($num > 0) {
+				return true;
+			}
 		} else {
 			dol_print_error($this->db);
 		}
@@ -2077,8 +2067,7 @@ class ExpenseReport extends CommonObject
 	{
 		global $user, $mysoc;
 
-		if ($this->status == self::STATUS_DRAFT || $this->status == self::STATUS_REFUSED)
-		{
+		if ($this->status == self::STATUS_DRAFT || $this->status == self::STATUS_REFUSED) {
 			$this->db->begin();
 
 			$type = 0; // TODO What if type is service ?
@@ -2092,8 +2081,7 @@ class ExpenseReport extends CommonObject
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $vatrate, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $vatrate, $reg)) {
 				$vat_src_code = $reg[1];
 				$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
 			}
@@ -2138,8 +2126,7 @@ class ExpenseReport extends CommonObject
 			$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
 			$sql .= " WHERE c.id = ".$type_fees_id;
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$objp_fees = $this->db->fetch_object($resql);
 				$this->line->type_fees_code      = $objp_fees->code_type_fees;
 				$this->line->type_fees_libelle   = $objp_fees->libelle_type_fees;
@@ -2162,8 +2149,7 @@ class ExpenseReport extends CommonObject
 			$this->checkRules();
 
 			$result = $this->line->update($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2191,8 +2177,7 @@ class ExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::deleteline sql=".$sql);
 		$result = $this->db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::deleteline  Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
@@ -2225,27 +2210,30 @@ class ExpenseReport extends CommonObject
 		if ($result) {
 			$num_rows = $this->db->num_rows($result); $i = 0;
 
-			if ($num_rows > 0)
-			{
+			if ($num_rows > 0) {
 				$date_d_form = $date_debut;
 				$date_f_form = $date_fin;
 
 				$existe = false;
 
-				while ($i < $num_rows)
-				{
+				while ($i < $num_rows) {
 					$objp = $this->db->fetch_object($result);
 
 					$date_d_req = $this->db->jdate($objp->date_debut); // 3
 					$date_f_req = $this->db->jdate($objp->date_fin); // 4
 
-					if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) $existe = true;
+					if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) {
+						$existe = true;
+					}
 
 					$i++;
 				}
 
-				if ($existe) return 1;
-				else return 0;
+				if ($existe) {
+					return 1;
+				} else {
+					return 0;
+				}
 			} else {
 				return 0;
 			}
@@ -2280,11 +2268,9 @@ class ExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch_users_approver_expensereport sql=".$sql);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num_rows = $this->db->num_rows($result); $i = 0;
-			while ($i < $num_rows)
-			{
+			while ($i < $num_rows) {
 				$objp = $this->db->fetch_object($result);
 				array_push($users_validator, $objp->fk_user);
 				$i++;
@@ -2348,12 +2334,10 @@ class ExpenseReport extends CommonObject
 		$sql .= " WHERE active = ".$active;
 		dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$ret[$obj->code] = (($langs->transnoentitiesnoconv($obj->code) != $obj->code) ? $langs->transnoentitiesnoconv($obj->code) : $obj->label);
 				$i++;
@@ -2381,8 +2365,7 @@ class ExpenseReport extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
 		$sql .= " WHERE ex.fk_statut > 0";
 		$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
-		if (empty($user->rights->expensereport->readall))
-		{
+		if (empty($user->rights->expensereport->readall)) {
 			$userchildids = $user->getAllChildIds(1);
 			$sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
 			$sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
@@ -2415,30 +2398,32 @@ class ExpenseReport extends CommonObject
 		// phpcs:enable
 		global $conf, $langs;
 
-		if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+		if ($user->socid) {
+			return -1; // protection pour eviter appel par utilisateur externe
+		}
 
 		$now = dol_now();
 
 		$sql = "SELECT ex.rowid, ex.date_valid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
-		if ($option == 'toapprove') $sql .= " WHERE ex.fk_statut = ".self::STATUS_VALIDATED;
-		else $sql .= " WHERE ex.fk_statut = ".self::STATUS_APPROVED;
+		if ($option == 'toapprove') {
+			$sql .= " WHERE ex.fk_statut = ".self::STATUS_VALIDATED;
+		} else {
+			$sql .= " WHERE ex.fk_statut = ".self::STATUS_APPROVED;
+		}
 		$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
-		if (empty($user->rights->expensereport->readall))
-		{
+		if (empty($user->rights->expensereport->readall)) {
 			$userchildids = $user->getAllChildIds(1);
 			$sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
 			$sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
 		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$langs->load("trips");
 
 			$response = new WorkboardResponse();
-			if ($option == 'toapprove')
-			{
+			if ($option == 'toapprove') {
 				$response->warning_delay = $conf->expensereport->approve->warning_delay / 60 / 60 / 24;
 				$response->label = $langs->trans("ExpenseReportsToApprove");
 				$response->labelShort = $langs->trans("ToApprove");
@@ -2451,12 +2436,10 @@ class ExpenseReport extends CommonObject
 			}
 			$response->img = img_object('', "trip");
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 
-				if ($option == 'toapprove')
-				{
+				if ($option == 'toapprove') {
 					if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->approve->warning_delay)) {
 						$response->nbtodolate++;
 					}
@@ -2486,8 +2469,12 @@ class ExpenseReport extends CommonObject
 		global $conf;
 
 		// Only valid expenses reports
-		if ($option == 'toapprove' && $this->status != 2) return false;
-		if ($option == 'topay' && $this->status != 5) return false;
+		if ($option == 'toapprove' && $this->status != 2) {
+			return false;
+		}
+		if ($option == 'topay' && $this->status != 5) {
+			return false;
+		}
 
 		$now = dol_now();
 		if ($option == 'toapprove') {
@@ -2510,11 +2497,9 @@ class ExpenseReport extends CommonObject
 
 		$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$alreadydispatched = $obj->nb;
 			}
 		} else {
@@ -2522,8 +2507,7 @@ class ExpenseReport extends CommonObject
 			return -1;
 		}
 
-		if ($alreadydispatched)
-		{
+		if ($alreadydispatched) {
 			return 1;
 		}
 		return 0;
@@ -2545,8 +2529,7 @@ class ExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::getSumPayments", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$this->db->free($resql);
 			return (empty($obj->amount) ? 0 : $obj->amount);
@@ -2649,8 +2632,7 @@ class ExpenseReportLine
 
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$objp = $this->db->fetch_object($result);
 
 			$this->rowid = $objp->rowid;
@@ -2700,10 +2682,14 @@ class ExpenseReportLine
 
 		// Clean parameters
 		$this->comments = trim($this->comments);
-		if (empty($this->value_unit)) $this->value_unit = 0;
+		if (empty($this->value_unit)) {
+			$this->value_unit = 0;
+		}
 		$this->qty = price2num($this->qty);
 		$this->vatrate = price2num($this->vatrate);
-		if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
+		if (empty($this->fk_c_exp_tax_cat)) {
+			$this->fk_c_exp_tax_cat = 0;
+		}
 
 		$this->db->begin();
 
@@ -2728,17 +2714,14 @@ class ExpenseReportLine
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'expensereport_det');
 
-			if (!$fromaddline)
-			{
+			if (!$fromaddline) {
 				$tmpparent = new ExpenseReport($this->db);
 				$tmpparent->fetch($this->fk_expensereport);
 				$result = $tmpparent->update_price();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->error = $tmpparent->error;
 					$this->errors = $tmpparent->errors;
@@ -2748,8 +2731,7 @@ class ExpenseReportLine
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -2776,20 +2758,24 @@ class ExpenseReportLine
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_det d';
 		$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'expensereport e ON (d.fk_expensereport = e.rowid)';
 		$sql .= ' WHERE e.fk_user_author = '.$fk_user;
-		if (!empty($this->id)) $sql .= ' AND d.rowid <> '.$this->id;
+		if (!empty($this->id)) {
+			$sql .= ' AND d.rowid <> '.$this->id;
+		}
 		$sql .= ' AND d.fk_c_type_fees = '.$rule->fk_c_type_fees;
-		if ($mode == 'day' || $mode == 'EX_DAY') $sql .= ' AND d.date = \''.dol_print_date($this->date, '%Y-%m-%d').'\'';
-		elseif ($mode == 'mon' || $mode == 'EX_MON') $sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\''; // @todo DATE_FORMAT is forbidden
-		elseif ($mode == 'year' || $mode == 'EX_YEA') $sql .= ' AND DATE_FORMAT(d.date, \'%Y\') = \''.dol_print_date($this->date, '%Y').'\''; // @todo DATE_FORMAT is forbidden
+		if ($mode == 'day' || $mode == 'EX_DAY') {
+			$sql .= ' AND d.date = \''.dol_print_date($this->date, '%Y-%m-%d').'\'';
+		} elseif ($mode == 'mon' || $mode == 'EX_MON') {
+			$sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\''; // @todo DATE_FORMAT is forbidden
+		} elseif ($mode == 'year' || $mode == 'EX_YEA') {
+			$sql .= ' AND DATE_FORMAT(d.date, \'%Y\') = \''.dol_print_date($this->date, '%Y').'\''; // @todo DATE_FORMAT is forbidden
+		}
 
 		dol_syslog('ExpenseReportLine::getExpAmount');
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$obj = $this->db->fetch_object($resql);
 				$amount = (double) $obj->total_amount;
 			}
@@ -2816,7 +2802,9 @@ class ExpenseReportLine
 		$this->comments = trim($this->comments);
 		$this->vatrate = price2num($this->vatrate);
 		$this->value_unit = price2num($this->value_unit);
-		if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
+		if (empty($this->fk_c_exp_tax_cat)) {
+			$this->fk_c_exp_tax_cat = 0;
+		}
 
 		$this->db->begin();
 
@@ -2834,24 +2822,27 @@ class ExpenseReportLine
 		$sql .= ",rule_warning_message='".$this->db->escape($this->rule_warning_message)."'";
 		$sql .= ",fk_c_exp_tax_cat=".$this->db->escape($this->fk_c_exp_tax_cat);
 		$sql .= ",fk_ecm_files=".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
-		if ($this->fk_c_type_fees) $sql .= ",fk_c_type_fees=".$this->db->escape($this->fk_c_type_fees);
-		else $sql .= ",fk_c_type_fees=null";
-		if ($this->fk_project > 0) $sql .= ",fk_projet=".$this->db->escape($this->fk_project);
-		else $sql .= ",fk_projet=null";
+		if ($this->fk_c_type_fees) {
+			$sql .= ",fk_c_type_fees=".$this->db->escape($this->fk_c_type_fees);
+		} else {
+			$sql .= ",fk_c_type_fees=null";
+		}
+		if ($this->fk_project > 0) {
+			$sql .= ",fk_projet=".$this->db->escape($this->fk_project);
+		} else {
+			$sql .= ",fk_projet=null";
+		}
 		$sql .= " WHERE rowid = ".$this->db->escape($this->rowid ? $this->rowid : $this->id);
 
 		dol_syslog("ExpenseReportLine::update sql=".$sql);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$tmpparent = new ExpenseReport($this->db);
 			$result = $tmpparent->fetch($this->fk_expensereport);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result = $tmpparent->update_price();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$this->error = $tmpparent->error;
 					$this->errors = $tmpparent->errors;
@@ -2866,8 +2857,7 @@ class ExpenseReportLine
 			dol_print_error($this->db);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 55af1eb00ed..18a0503cdd7 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -111,15 +111,16 @@ class ExpenseReportIk extends CoreObject
 		$sql = 'SELECT rowid, label, entity, active';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat';
 		$sql .= ' WHERE entity IN ('.getEntity('c_exp_tax_cat').')';
-		if ($mode == 1) $sql .= ' AND active = 1';
-		elseif ($mode == 2) $sql .= 'AND active = 0';
+		if ($mode == 1) {
+			$sql .= ' AND active = 1';
+		} elseif ($mode == 2) {
+			$sql .= 'AND active = 0';
+		}
 
 		dol_syslog(get_called_class().'::getTaxCategories sql='.$sql, LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $db->fetch_object($resql)) {
 				$categories[$obj->rowid] = $obj;
 			}
 		} else {
@@ -142,8 +143,11 @@ class ExpenseReportIk extends CoreObject
 		$ranges = self::getRangesByCategory($fk_c_exp_tax_cat);
 
 		// substract 1 because array start from 0
-		if (empty($ranges) || !isset($ranges[$default_range - 1])) return false;
-		else return $ranges[$default_range - 1];
+		if (empty($ranges) || !isset($ranges[$default_range - 1])) {
+			return false;
+		} else {
+			return $ranges[$default_range - 1];
+		}
 	}
 
 	/**
@@ -160,20 +164,21 @@ class ExpenseReportIk extends CoreObject
 		$ranges = array();
 
 		$sql = 'SELECT r.rowid FROM '.MAIN_DB_PREFIX.'c_exp_tax_range r';
-		if ($active) $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_exp_tax_cat c ON (r.fk_c_exp_tax_cat = c.rowid)';
+		if ($active) {
+			$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_exp_tax_cat c ON (r.fk_c_exp_tax_cat = c.rowid)';
+		}
 		$sql .= ' WHERE r.fk_c_exp_tax_cat = '.$fk_c_exp_tax_cat;
-		if ($active) $sql .= ' AND r.active = 1 AND c.active = 1';
+		if ($active) {
+			$sql .= ' AND r.active = 1 AND c.active = 1';
+		}
 		$sql .= ' ORDER BY r.range_ik';
 
 		dol_syslog(get_called_class().'::getRangesByCategory sql='.$sql, LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
-				while ($obj = $db->fetch_object($resql))
-				{
+			if ($num > 0) {
+				while ($obj = $db->fetch_object($resql)) {
 					$object = new ExpenseReportIk($db);
 					$object->fetch($obj->rowid);
 
@@ -207,15 +212,17 @@ class ExpenseReportIk extends CoreObject
 
 		dol_syslog(get_called_class().'::getAllRanges sql='.$sql, LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $db->fetch_object($resql)) {
 				$ik = new ExpenseReportIk($db);
-				if ($obj->fk_expense_ik > 0) $ik->fetch($obj->fk_expense_ik);
+				if ($obj->fk_expense_ik > 0) {
+					$ik->fetch($obj->fk_expense_ik);
+				}
 				$obj->ik = $ik;
 
-				if (!isset($ranges[$obj->fk_c_exp_tax_cat])) $ranges[$obj->fk_c_exp_tax_cat] = array('label' => $obj->label, 'active' => $obj->cat_active, 'ranges' => array());
+				if (!isset($ranges[$obj->fk_c_exp_tax_cat])) {
+					$ranges[$obj->fk_c_exp_tax_cat] = array('label' => $obj->label, 'active' => $obj->cat_active, 'ranges' => array());
+				}
 				$ranges[$obj->fk_c_exp_tax_cat]['ranges'][] = $obj;
 			}
 		} else {
@@ -239,14 +246,15 @@ class ExpenseReportIk extends CoreObject
 		$sql .= ' SELECT COUNT(*) as counted';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_range r';
 		$sql .= ' WHERE r.entity IN (0, '.$conf->entity.')';
-		if ($default_c_exp_tax_cat > 0) $sql .= ' AND r.fk_c_exp_tax_cat = '.$default_c_exp_tax_cat;
+		if ($default_c_exp_tax_cat > 0) {
+			$sql .= ' AND r.fk_c_exp_tax_cat = '.$default_c_exp_tax_cat;
+		}
 		$sql .= ' GROUP BY r.fk_c_exp_tax_cat';
 		$sql .= ') as counts';
 
 		dol_syslog(get_called_class().'::getMaxRangeNumber sql='.$sql, LOG_DEBUG);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $db->fetch_object($resql);
 			return $obj->nbRange;
 		} else {
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 9a172cd7563..4e4d1009750 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -156,18 +156,15 @@ class ExpenseReportRule extends CoreObject
 		$sql = 'SELECT er.rowid';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_rules er';
 		$sql .= ' WHERE er.entity IN (0,'.getEntity('').')';
-		if (!empty($fk_c_type_fees))
-		{
+		if (!empty($fk_c_type_fees)) {
 			$sql .= ' AND er.fk_c_type_fees IN (-1, '.$fk_c_type_fees.')';
 		}
-		if (!empty($date))
-		{
+		if (!empty($date)) {
 			$date = dol_print_date($date, '%Y-%m-%d');
 			$sql .= ' AND er.dates <= \''.$date.'\'';
 			$sql .= ' AND er.datee >= \''.$date.'\'';
 		}
-		if ($fk_user > 0)
-		{
+		if ($fk_user > 0) {
 			$sql .= ' AND (er.is_for_all = 1';
 			$sql .= ' OR er.fk_user = '.$fk_user;
 			$sql .= ' OR er.fk_usergroup IN (SELECT ugu.fk_usergroup FROM '.MAIN_DB_PREFIX.'usergroup_user ugu WHERE ugu.fk_user = '.$fk_user.') )';
@@ -177,13 +174,14 @@ class ExpenseReportRule extends CoreObject
 		dol_syslog("ExpenseReportRule::getAllRule sql=".$sql);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $db->fetch_object($resql)) {
 				$rule = new ExpenseReportRule($db);
-				if ($rule->fetch($obj->rowid) > 0) $rules[$rule->id] = $rule;
-				else dol_print_error($db);
+				if ($rule->fetch($obj->rowid) > 0) {
+					$rules[$rule->id] = $rule;
+				} else {
+					dol_print_error($db);
+				}
 			}
 		} else {
 			dol_print_error($db);
@@ -201,11 +199,9 @@ class ExpenseReportRule extends CoreObject
 	{
 		include_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 
-		if ($this->fk_usergroup > 0)
-		{
+		if ($this->fk_usergroup > 0) {
 			$group = new UserGroup($this->db);
-			if ($group->fetch($this->fk_usergroup) > 0)
-			{
+			if ($group->fetch($this->fk_usergroup) > 0) {
 				return $group->nom;
 			} else {
 				$this->error = $group->error;
@@ -225,11 +221,9 @@ class ExpenseReportRule extends CoreObject
 	{
 		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
-		if ($this->fk_user > 0)
-		{
+		if ($this->fk_user > 0) {
 			$u = new User($this->db);
-			if ($u->fetch($this->fk_user) > 0)
-			{
+			if ($u->fetch($this->fk_user) > 0) {
 				return dolGetFirstLastname($u->firstname, $u->lastname);
 			} else {
 				$this->error = $u->error;
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index c4167e3002f..3d627cbce8d 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -70,20 +70,20 @@ class ExpenseReportStats extends Stats
 		$this->where .= ' e.entity IN ('.getEntity('expensereport').')';
 
 		//$this->where.= " AND entity = ".$conf->entity;
-		if ($this->socid)
-		{
+		if ($this->socid) {
 			$this->where .= " AND e.fk_soc = ".$this->socid;
 		}
 
 		// Only me and subordinates
-		if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous))
-		{
+		if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) {
 			$childids = $user->getAllChildIds();
 			$childids[] = $user->id;
 			$this->where .= " AND e.fk_user_author IN (".(join(',', $childids)).")";
 		}
 
-		if ($this->userid > 0) $this->where .= ' AND e.fk_user_author = '.$this->userid;
+		if ($this->userid > 0) {
+			$this->where .= ' AND e.fk_user_author = '.$this->userid;
+		}
 	}
 
 
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index be8693f223e..56525e7b99c 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -119,19 +119,36 @@ class PaymentExpenseReport extends CommonObject
 		}
 
 		// Clean parameters
-		if (isset($this->fk_expensereport)) $this->fk_expensereport = trim($this->fk_expensereport);
-		if (isset($this->amount))			$this->amount = trim($this->amount);
-		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
-		if (isset($this->num_payment))		$this->num_payment = trim($this->num_payment);
-		if (isset($this->note))				$this->note = trim($this->note);
-		if (isset($this->note_public))		$this->note_public = trim($this->note_public);
-		if (isset($this->fk_bank))			$this->fk_bank = trim($this->fk_bank);
-		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
+		if (isset($this->fk_expensereport)) {
+			$this->fk_expensereport = trim($this->fk_expensereport);
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = trim($this->fk_typepayment);
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note)) {
+			$this->note = trim($this->note);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = trim($this->fk_bank);
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = trim($this->fk_user_creat);
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = trim($this->fk_user_modif);
+		}
 
 		$totalamount = 0;
-		foreach ($this->amounts as $key => $value)  // How payment is dispatch
-		{
+		foreach ($this->amounts as $key => $value) {  // How payment is dispatch
 			$newvalue = price2num($value, 'MT');
 			$this->amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
@@ -139,13 +156,14 @@ class PaymentExpenseReport extends CommonObject
 		$totalamount = price2num($totalamount);
 
 		// Check parameters
-		if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		if ($totalamount == 0) {
+			return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+		}
 
 
 		$this->db->begin();
 
-		if ($totalamount != 0)
-		{
+		if ($totalamount != 0) {
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_expensereport (fk_expensereport, datec, datep, amount,";
 			$sql .= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)";
 			$sql .= " VALUES ($this->fk_expensereport, '".$this->db->idate($now)."',";
@@ -156,16 +174,14 @@ class PaymentExpenseReport extends CommonObject
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_expensereport");
 			} else {
 				$error++;
 			}
 		}
 
-		if ($totalamount != 0 && !$error)
-		{
+		if ($totalamount != 0 && !$error) {
 			$this->amount = $totalamount;
 			$this->db->commit();
 			return $this->id;
@@ -206,10 +222,8 @@ class PaymentExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id    = $obj->rowid;
@@ -258,14 +272,30 @@ class PaymentExpenseReport extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->fk_expensereport)) $this->fk_expensereport = trim($this->fk_expensereport);
-		if (isset($this->amount))			$this->amount = trim($this->amount);
-		if (isset($this->fk_typepayment))	$this->fk_typepayment = trim($this->fk_typepayment);
-		if (isset($this->num_payment))		$this->num_payment = trim($this->num_payment);
-		if (isset($this->note))				$this->note = trim($this->note);
-		if (isset($this->fk_bank))			$this->fk_bank = trim($this->fk_bank);
-		if (isset($this->fk_user_creat))	$this->fk_user_creat = trim($this->fk_user_creat);
-		if (isset($this->fk_user_modif))	$this->fk_user_modif = trim($this->fk_user_modif);
+		if (isset($this->fk_expensereport)) {
+			$this->fk_expensereport = trim($this->fk_expensereport);
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->fk_typepayment)) {
+			$this->fk_typepayment = trim($this->fk_typepayment);
+		}
+		if (isset($this->num_payment)) {
+			$this->num_payment = trim($this->num_payment);
+		}
+		if (isset($this->note)) {
+			$this->note = trim($this->note);
+		}
+		if (isset($this->fk_bank)) {
+			$this->fk_bank = trim($this->fk_bank);
+		}
+		if (isset($this->fk_user_creat)) {
+			$this->fk_user_creat = trim($this->fk_user_creat);
+		}
+		if (isset($this->fk_user_modif)) {
+			$this->fk_user_modif = trim($this->fk_user_modif);
+		}
 
 
 		// Check parameters
@@ -293,13 +323,13 @@ class PaymentExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -327,18 +357,18 @@ class PaymentExpenseReport extends CommonObject
 
 		$this->db->begin();
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
 			$sql .= " WHERE type='payment_expensereport' AND url_id=".$this->id;
 
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_expensereport";
 			$sql .= " WHERE rowid=".$this->id;
 
@@ -351,10 +381,8 @@ class PaymentExpenseReport extends CommonObject
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -396,8 +424,7 @@ class PaymentExpenseReport extends CommonObject
 		$result = $object->create($user);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $object->error;
 			$error++;
 		}
@@ -405,8 +432,7 @@ class PaymentExpenseReport extends CommonObject
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
@@ -487,8 +513,7 @@ class PaymentExpenseReport extends CommonObject
 
 		$error = 0;
 
-		if (!empty($conf->banque->enabled))
-		{
+		if (!empty($conf->banque->enabled)) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 
 			$acc = new Account($this->db);
@@ -497,7 +522,9 @@ class PaymentExpenseReport extends CommonObject
 			//Fix me field
 			$total = $this->amount;
 
-			if ($mode == 'payment_expensereport') $amount = $total;
+			if ($mode == 'payment_expensereport') {
+				$amount = $total;
+			}
 
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
@@ -514,35 +541,30 @@ class PaymentExpenseReport extends CommonObject
 
 			// Update fk_bank in llx_paiement.
 			// On connait ainsi le paiement qui a genere l'ecriture bancaire
-			if ($bank_line_id > 0)
-			{
+			if ($bank_line_id > 0) {
 				$result = $this->update_fk_bank($bank_line_id);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$error++;
 					dol_print_error($this->db);
 				}
 
 				// Add link 'payment', 'payment_supplier', 'payment_expensereport' in bank_url between payment and bank transaction
 				$url = '';
-				if ($mode == 'payment_expensereport') $url = DOL_URL_ROOT.'/expensereport/payment/card.php?rowid=';
-				if ($url)
-				{
+				if ($mode == 'payment_expensereport') {
+					$url = DOL_URL_ROOT.'/expensereport/payment/card.php?rowid=';
+				}
+				if ($url) {
 					$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
-					if ($result <= 0)
-					{
+					if ($result <= 0) {
 						$error++;
 						dol_print_error($this->db);
 					}
 				}
 
 				// Add link 'user' in bank_url between user and bank transaction
-				if (!$error)
-				{
-					foreach ($this->amounts as $key => $value)  // We should have always same user but we loop in case of.
-					{
-						if ($mode == 'payment_expensereport')
-						{
+				if (!$error) {
+					foreach ($this->amounts as $key => $value) {  // We should have always same user but we loop in case of.
+						if ($mode == 'payment_expensereport') {
 							$fuser = new User($this->db);
 							$fuser->fetch($key);
 
@@ -553,8 +575,7 @@ class PaymentExpenseReport extends CommonObject
 								$fuser->getFullName($langs),
 								'user'
 							);
-							if ($result <= 0)
-							{
+							if ($result <= 0) {
 								$this->error = $this->db->lasterror();
 								dol_syslog(get_class($this).'::addPaymentToBank '.$this->error);
 								$error++;
@@ -568,8 +589,7 @@ class PaymentExpenseReport extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			return 1;
 		} else {
 			return -1;
@@ -591,8 +611,7 @@ class PaymentExpenseReport extends CommonObject
 
 		dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			return 1;
 		} else {
 			$this->error = $this->db->error();
@@ -613,17 +632,24 @@ class PaymentExpenseReport extends CommonObject
 
 		$result = '';
 
-		if (empty($this->ref)) $this->ref = $this->label;
+		if (empty($this->ref)) {
+			$this->ref = $this->label;
+		}
 		$label = $langs->trans("ShowPayment").': '.$this->ref;
 
-		if (!empty($this->id))
-		{
+		if (!empty($this->id)) {
 			$link = '<a href="'.DOL_URL_ROOT.'/expensereport/payment/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 			$linkend = '</a>';
 
-			if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
-			if ($withpicto && $withpicto != 2) $result .= ' ';
-			if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+			if ($withpicto) {
+				$result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+			}
+			if ($withpicto && $withpicto != 2) {
+				$result .= ' ';
+			}
+			if ($withpicto != 2) {
+				$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+			}
 		}
 
 		return $result;
@@ -644,20 +670,16 @@ class PaymentExpenseReport extends CommonObject
 		dol_syslog(get_class($this).'::info', LOG_DEBUG);
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_creat)
-				{
+				if ($obj->fk_user_creat) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creat);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_modif)
-				{
+				if ($obj->fk_user_modif) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modif);
 					$this->user_modification = $muser;
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 55799b10589..7713745a0a3 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -45,7 +45,9 @@ $confirm = GETPOST('confirm', 'alpha');
 $childids = $user->getAllChildIds(1);
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
 
@@ -54,17 +56,22 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "position_name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "position_name";
+}
 
 
 $object = new ExpenseReport($db);
-if (!$object->fetch($id, $ref) > 0)
-{
+if (!$object->fetch($id, $ref) > 0) {
 	dol_print_error($db);
 }
 
@@ -74,14 +81,16 @@ $modulepart = 'trip';
 // Load object
 //include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
-	if (!empty($user->rights->expensereport->readall)) $canread = 1;
-	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
-	if (!$canread)
-	{
+	if (!empty($user->rights->expensereport->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+		$canread = 1;
+	}
+	if (!$canread) {
 		accessforbidden();
 	}
 }
@@ -104,8 +113,7 @@ $title = $langs->trans("ExpenseReport")." - ".$langs->trans("Documents");
 $helpurl = "EN:Module_Expense_Reports";
 llxHeader("", $title, $helpurl);
 
-if ($object->id)
-{
+if ($object->id) {
 	$object->fetch_thirdparty();
 
 	$head = expensereport_prepare_head($object);
@@ -124,8 +132,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 046bde4efa1..541c2c0738e 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -42,19 +42,27 @@ $langs->loadLangs(array('companies', 'users', 'trips'));
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expensereport', '', '');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "d.date_create";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "d.date_create";
+}
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 
 
@@ -80,8 +88,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."expensere
 $sql .= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport').") AND de.fk_c_type_fees = tf.id";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
-{
+	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 	$childids = $user->getAllChildIds();
 	$childids[] = $user->id;
 	$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
@@ -90,12 +97,10 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense
 $sql .= " GROUP BY tf.code, tf.label";
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $db->fetch_object($result);
 
 		$somme[$objp->code] = $objp->km;
@@ -123,13 +128,11 @@ print '<th colspan="4">'.$langs->trans("Statistics").'</th>';
 print "</tr>\n";
 
 $listoftype = $tripandexpense_static->listOfTypes();
-foreach ($listoftype as $code => $label)
-{
+foreach ($listoftype as $code => $label) {
 	$dataseries[] = array($label, (isset($somme[$code]) ? (int) $somme[$code] : 0));
 }
 
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
 	print '<tr><td class="center" colspan="4">';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -168,25 +171,29 @@ $langs->load("boxes");
 $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut as user_status, u.photo, u.email, u.admin,";
 $sql .= " d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
-if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$user->socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE u.rowid = d.fk_user_author";
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
-{
+	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 	$childids = $user->getAllChildIds();
 	$childids[] = $user->id;
 	$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
 }
 $sql .= ' AND d.entity IN ('.getEntity('expensereport').')';
-if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid) $sql .= " AND d.fk_user_author = ".$socid;
+if (!$user->rights->societe->client->voir && !$user->socid) {
+	$sql .= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($socid) {
+	$sql .= " AND d.fk_user_author = ".$socid;
+}
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($max, 0);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$var = false;
 	$num = $db->num_rows($result);
 
@@ -201,14 +208,12 @@ if ($result)
 	print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
 	print '<th>&nbsp;</th>';
 	print '</tr>';
-	if ($num)
-	{
+	if ($num) {
 		$total_ttc = $totalam = $total = 0;
 
 		$expensereportstatic = new ExpenseReport($db);
 		$userstatic = new User($db);
-		while ($i < $num && $i < $max)
-		{
+		while ($i < $num && $i < $max) {
 			$obj = $db->fetch_object($result);
 
 			$expensereportstatic->id = $obj->rowid;
@@ -241,7 +246,9 @@ if ($result)
 		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
 	}
 	print '</table></div><br>';
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 print '</div></div></div>';
 
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index 53d1531f4b9..605197d14ac 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -37,23 +37,26 @@ $ref = GETPOST('ref', 'alpha');
 $childids = $user->getAllChildIds(1);
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
 $object = new ExpenseReport($db);
-if (!$object->fetch($id, $ref) > 0)
-{
+if (!$object->fetch($id, $ref) > 0) {
 	dol_print_error($db);
 }
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
-	if (!empty($user->rights->expensereport->readall)) $canread = 1;
-	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
-	if (!$canread)
-	{
+	if (!empty($user->rights->expensereport->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+		$canread = 1;
+	}
+	if (!$canread) {
 		accessforbidden();
 	}
 }
@@ -69,8 +72,7 @@ $title = $langs->trans("ExpenseReport")." - ".$langs->trans("Info");
 $helpurl = "EN:Module_Expense_Reports";
 llxHeader("", $title, $helpurl);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object = new ExpenseReport($db);
 	$object->fetch($id, $ref);
 	$object->info($object->id);
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 7afb464e4f4..ea3a034e252 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -54,18 +54,24 @@ $childids = $user->getAllChildIds(1);
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expensereport', '', '');
 $id = GETPOST('id', 'int');
 // If we are on the view of a specific user
-if ($id > 0)
-{
+if ($id > 0) {
 	$canread = 0;
-	if ($id == $user->id) $canread = 1;
-	if (!empty($user->rights->expensereport->readall)) $canread = 1;
-	if (!empty($user->rights->expensereport->lire) && in_array($id, $childids)) $canread = 1;
-	if (!$canread)
-	{
+	if ($id == $user->id) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->expensereport->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->expensereport->lire) && in_array($id, $childids)) {
+		$canread = 1;
+	}
+	if (!$canread) {
 		accessforbidden();
 	}
 }
@@ -78,12 +84,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "d.date_debut";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "d.date_debut";
+}
 
 
 $sall         = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -101,8 +113,12 @@ $month_end    = GETPOST("month_end", "int");
 $year_end     = GETPOST("year_end", "int");
 $optioncss    = GETPOST('optioncss', 'alpha');
 
-if ($search_status == '') $search_status = -1;
-if ($search_user == '') $search_user = -1;
+if ($search_status == '') {
+	$search_status = -1;
+}
+if ($search_user == '') {
+	$search_user = -1;
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new ExpenseReport($db);
@@ -123,7 +139,9 @@ $fieldstosearchall = array(
 	'u.firstname'=>"Firstname",
 	'u.login'=>"Login",
 );
-if (empty($user->socid)) $fieldstosearchall["d.note_private"] = "NotePrivate";
+if (empty($user->socid)) {
+	$fieldstosearchall["d.note_private"] = "NotePrivate";
+}
 
 $arrayfields = array(
 	'd.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
@@ -151,21 +169,25 @@ $objectuser = new User($db);
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// 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
 		$search_ref = "";
 		$search_user = "";
 		$search_amount_ht = "";
@@ -181,8 +203,7 @@ if (empty($reshook))
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -216,8 +237,7 @@ $min_year = 10;
 // Get current user id
 $user_id = $user->id;
 
-if ($id > 0)
-{
+if ($id > 0) {
 	// Charge utilisateur edite
 	$fuser->fetch($id, '', '', 1);
 	$fuser->getrights();
@@ -231,35 +251,50 @@ $sql .= " d.date_debut, d.date_fin, d.date_create, d.tms as date_modif, d.date_v
 $sql .= " u.rowid as id_user, u.firstname, u.lastname, u.login, u.email, u.statut, u.photo";
 // 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
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d";
-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 (d.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 (d.rowid = ef.fk_object)";
+}
 $sql .= ", ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE d.fk_user_author = u.rowid AND d.entity IN (".getEntity('expensereport').")";
 // Search all
-if (!empty($sall)) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+if (!empty($sall)) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
 // Ref
-if (!empty($search_ref)) $sql .= natural_search('d.ref', $search_ref);
+if (!empty($search_ref)) {
+	$sql .= natural_search('d.ref', $search_ref);
+}
 // Date Start
 $sql .= dolSqlDateFilter("d.date_debut", $day_start, $month_start, $year_start);
 // Date End
 $sql .= dolSqlDateFilter("d.date_fin", $day_end, $month_end, $year_end);
 
-if ($search_amount_ht != '') $sql .= natural_search('d.total_ht', $search_amount_ht, 1);
-if ($search_amount_ttc != '') $sql .= natural_search('d.total_ttc', $search_amount_ttc, 1);
+if ($search_amount_ht != '') {
+	$sql .= natural_search('d.total_ht', $search_amount_ht, 1);
+}
+if ($search_amount_ttc != '') {
+	$sql .= natural_search('d.total_ttc', $search_amount_ttc, 1);
+}
 // User
-if ($search_user != '' && $search_user >= 0) $sql .= " AND u.rowid = '".$db->escape($search_user)."'";
+if ($search_user != '' && $search_user >= 0) {
+	$sql .= " AND u.rowid = '".$db->escape($search_user)."'";
+}
 // Status
-if ($search_status != '' && $search_status >= 0) $sql .= " AND d.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
+if ($search_status != '' && $search_status >= 0) {
+	$sql .= " AND d.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
+}
 // RESTRICT RIGHTS
 if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
-	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
-{
+	&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
 	$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
 }
 // Add where from extra fields
@@ -273,12 +308,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -288,22 +321,39 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 //print $sql;
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
 	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($sall)					$param .= "&sall=".urlencode($sall);
-	if ($search_ref)			$param .= "&search_ref=".urlencode($search_ref);
-	if ($search_user)			$param .= "&search_user=".urlencode($search_user);
-	if ($search_amount_ht)		$param .= "&search_amount_ht=".urlencode($search_amount_ht);
-	if ($search_amount_ttc)		$param .= "&search_amount_ttc=".urlencode($search_amount_ttc);
-	if ($search_status >= 0)  	$param .= "&search_status=".urlencode($search_status);
-	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_user) {
+		$param .= "&search_user=".urlencode($search_user);
+	}
+	if ($search_amount_ht) {
+		$param .= "&search_amount_ht=".urlencode($search_amount_ht);
+	}
+	if ($search_amount_ttc) {
+		$param .= "&search_amount_ttc=".urlencode($search_amount_ttc);
+	}
+	if ($search_status >= 0) {
+		$param .= "&search_status=".urlencode($search_status);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -313,23 +363,30 @@ if ($resql)
 		'builddoc'=>$langs->trans("PDFMerge"),
 		'presend'=>$langs->trans("SendByMail"),
 	);
-	if ($user->rights->expensereport->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	if ($user->rights->expensereport->supprimer) {
+		$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	// Lines of title fields
 	print '<form id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="'.($action == 'edit' ? 'update' : 'list').'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	if ($id > 0) print '<input type="hidden" name="id" value="'.$id.'">';
+	if ($id > 0) {
+		print '<input type="hidden" name="id" value="'.$id.'">';
+	}
 
-	if ($id > 0)		// For user tab
-	{
+	if ($id > 0) {		// For user tab
 		$title = $langs->trans("User");
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 		$head = user_prepare_head($fuser);
@@ -340,8 +397,7 @@ if ($resql)
 
 		print dol_get_fiche_end();
 
-		if ($action != 'edit')
-		{
+		if ($action != 'edit') {
 			print '<div class="tabsAction">';
 
 			$childids = $user->getAllChildIds(1);
@@ -366,7 +422,9 @@ if ($resql)
 		$title = $langs->trans("ListTripsAndExpenses");
 
 		$url = DOL_URL_ROOT.'/expensereport/card.php?action=create';
-		if (!empty($socid)) $url .= '&socid='.$socid;
+		if (!empty($socid)) {
+			$url .= '&socid='.$socid;
+		}
 		$newcardbutton = dolGetButtonTitle($langs->trans('NewTrip'), '', 'fa fa-plus-circle', $url, '', $user->rights->expensereport->creer);
 
 		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'trip', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -378,9 +436,10 @@ if ($resql)
 	$trackid = 'exp'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($sall)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
@@ -388,11 +447,13 @@ if ($resql)
 
 	$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))
-	{
+	if (!empty($moreforfilter)) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
@@ -407,17 +468,14 @@ if ($resql)
 
 	// Filters
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['d.ref']['checked']))
-	{
+	if (!empty($arrayfields['d.ref']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" size="15" type="text" name="search_ref" value="'.$search_ref.'">';
 		print '</td>';
 	}
 	// User
-	if (!empty($arrayfields['user']['checked']))
-	{
-		if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous)
-		{
+	if (!empty($arrayfields['user']['checked'])) {
+		if ($user->rights->expensereport->readall || $user->rights->expensereport->lire_tous) {
 			print '<td class="liste_titre maxwidthonspartphone" align="left">';
 			print $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 			print '</td>';
@@ -426,8 +484,7 @@ if ($resql)
 		}
 	}
 	// Date start
-	if (!empty($arrayfields['d.date_debut']['checked']))
-	{
+	if (!empty($arrayfields['d.date_debut']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
 			print '<input class="flat width25" type="text" maxlength="2" name="day_start" value="'.dol_escape_htmltag($day_start).'">';
@@ -438,8 +495,7 @@ if ($resql)
 		print '</td>';
 	}
 	// Date end
-	if (!empty($arrayfields['d.date_fin']['checked']))
-	{
+	if (!empty($arrayfields['d.date_fin']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
 			print '<input class="flat width25" type="text" maxlength="2" name="day_end" value="'.dol_escape_htmltag($day_end).'">';
@@ -449,33 +505,28 @@ if ($resql)
 		print '</td>';
 	}
 	// Date valid
-	if (!empty($arrayfields['d.date_valid']['checked']))
-	{
+	if (!empty($arrayfields['d.date_valid']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
 		//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
 		print '</td>';
 	}
 	// Date approve
-	if (!empty($arrayfields['d.date_approve']['checked']))
-	{
+	if (!empty($arrayfields['d.date_approve']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
 		//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
 		print '</td>';
 	}
 	// Amount with no tax
-	if (!empty($arrayfields['d.total_ht']['checked']))
-	{
+	if (!empty($arrayfields['d.total_ht']['checked'])) {
 		print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ht" value="'.$search_amount_ht.'"></td>';
 	}
-	if (!empty($arrayfields['d.total_vat']['checked']))
-	{
+	if (!empty($arrayfields['d.total_vat']['checked'])) {
 		print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_vat" value="'.$search_amount_vat.'"></td>';
 	}
 	// Amount with all taxes
-	if (!empty($arrayfields['d.total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['d.total_ttc']['checked'])) {
 		print '<td class="liste_titre right"><input class="flat" type="text" size="5" name="search_amount_ttc" value="'.$search_amount_ttc.'"></td>';
 	}
 	// Extra fields
@@ -486,20 +537,17 @@ if ($resql)
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['d.date_create']['checked']))
-	{
+	if (!empty($arrayfields['d.date_create']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['d.tms']['checked']))
-	{
+	if (!empty($arrayfields['d.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['d.fk_statut']['checked']))
-	{
+	if (!empty($arrayfields['d.fk_statut']['checked'])) {
 		print '<td class="liste_titre right">';
 		$formexpensereport->selectExpensereportStatus($search_status, 'search_status', 1, 1);
 		print '</td>';
@@ -513,24 +561,48 @@ if ($resql)
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	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['user']['checked']))                   print_liste_field_titre($arrayfields['user']['label'], $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['d.date_debut']['checked']))           print_liste_field_titre($arrayfields['d.date_debut']['label'], $_SERVER["PHP_SELF"], "d.date_debut", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['d.date_fin']['checked']))             print_liste_field_titre($arrayfields['d.date_fin']['label'], $_SERVER["PHP_SELF"], "d.date_fin", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['d.date_valid']['checked']))           print_liste_field_titre($arrayfields['d.date_valid']['label'], $_SERVER["PHP_SELF"], "d.date_valid", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['d.date_approve']['checked']))         print_liste_field_titre($arrayfields['d.date_approve']['label'], $_SERVER["PHP_SELF"], "d.date_approve", "", $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['d.total_ht']['checked']))             print_liste_field_titre($arrayfields['d.total_ht']['label'], $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['d.total_vat']['checked']))            print_liste_field_titre($arrayfields['d.total_vat']['label'], $_SERVER["PHP_SELF"], "d.total_tva", "", $param, 'align="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['d.total_ttc']['checked']))            print_liste_field_titre($arrayfields['d.total_ttc']['label'], $_SERVER["PHP_SELF"], "d.total_ttc", "", $param, 'align="right"', $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['user']['checked'])) {
+		print_liste_field_titre($arrayfields['user']['label'], $_SERVER["PHP_SELF"], "u.lastname", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['d.date_debut']['checked'])) {
+		print_liste_field_titre($arrayfields['d.date_debut']['label'], $_SERVER["PHP_SELF"], "d.date_debut", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['d.date_fin']['checked'])) {
+		print_liste_field_titre($arrayfields['d.date_fin']['label'], $_SERVER["PHP_SELF"], "d.date_fin", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['d.date_valid']['checked'])) {
+		print_liste_field_titre($arrayfields['d.date_valid']['label'], $_SERVER["PHP_SELF"], "d.date_valid", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['d.date_approve']['checked'])) {
+		print_liste_field_titre($arrayfields['d.date_approve']['label'], $_SERVER["PHP_SELF"], "d.date_approve", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['d.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['d.total_ht']['label'], $_SERVER["PHP_SELF"], "d.total_ht", "", $param, 'align="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['d.total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['d.total_vat']['label'], $_SERVER["PHP_SELF"], "d.total_tva", "", $param, 'align="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['d.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['d.total_ttc']['label'], $_SERVER["PHP_SELF"], "d.total_ttc", "", $param, 'align="right"', $sortfield, $sortorder);
+	}
 	// 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); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (!empty($arrayfields['d.date_create']['checked'])) print_liste_field_titre($arrayfields['d.date_create']['label'], $_SERVER["PHP_SELF"], "d.date_create", "", $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.fk_statut']['checked']))   print_liste_field_titre($arrayfields['d.fk_statut']['label'], $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['d.date_create']['checked'])) {
+		print_liste_field_titre($arrayfields['d.date_create']['label'], $_SERVER["PHP_SELF"], "d.date_create", "", $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.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['d.fk_statut']['label'], $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
 	print "</tr>\n";
 
@@ -541,12 +613,10 @@ if ($resql)
 	$expensereportstatic = new ExpenseReport($db);
 	$usertmp = new User($db);
 
-	if ($num > 0)
-	{
+	if ($num > 0) {
 		$i = 0;
 		$totalarray = array();
- 		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 
 			$expensereportstatic->id = $obj->rowid;
@@ -572,10 +642,13 @@ if ($resql)
 				print '</td>';
 				// Warning late icon and note
 				print '<td class="nobordernopadding nowrap">';
-				if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) print img_warning($langs->trans("Late"));
-				if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) print img_warning($langs->trans("Late"));
-				if (!empty($obj->note_private) || !empty($obj->note_public))
-				{
+				if ($expensereportstatic->status == 2 && $expensereportstatic->hasDelay('toappove')) {
+					print img_warning($langs->trans("Late"));
+				}
+				if ($expensereportstatic->status == 5 && $expensereportstatic->hasDelay('topay')) {
+					print img_warning($langs->trans("Late"));
+				}
+				if (!empty($obj->note_private) || !empty($obj->note_public)) {
 					print ' <span class="note">';
 					print '<a href="'.DOL_URL_ROOT.'/expensereport/note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
 					print '</span>';
@@ -589,7 +662,9 @@ if ($resql)
 				print '</td>';
 				print '</tr></table>';
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// User
 			if (!empty($arrayfields['user']['checked'])) {
@@ -603,50 +678,69 @@ if ($resql)
 				$usertmp->email = $obj->email;
 				print $usertmp->getNomUrl(-1);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Start date
 			if (!empty($arrayfields['d.date_debut']['checked'])) {
 				print '<td class="center">'.($obj->date_debut > 0 ? dol_print_date($db->jdate($obj->date_debut), 'day') : '').'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// End date
 			if (!empty($arrayfields['d.date_fin']['checked'])) {
 				print '<td class="center">'.($obj->date_fin > 0 ? dol_print_date($db->jdate($obj->date_fin), 'day') : '').'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Date validation
 			if (!empty($arrayfields['d.date_valid']['checked'])) {
 				print '<td class="center">'.($obj->date_valid > 0 ? dol_print_date($db->jdate($obj->date_valid), 'day') : '').'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Date approval
 			if (!empty($arrayfields['d.date_approve']['checked'])) {
 				print '<td class="center">'.($obj->date_approve > 0 ? dol_print_date($db->jdate($obj->date_approve), 'day') : '').'</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Amount HT
-			if (!empty($arrayfields['d.total_ht']['checked']))
-			{
+			if (!empty($arrayfields['d.total_ht']['checked'])) {
 				  print '<td class="right">'.price($obj->total_ht)."</td>\n";
-				  if (!$i) $totalarray['nbfield']++;
-				  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ht';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'd.total_ht';
+				}
 				  $totalarray['val']['d.total_ht'] += $obj->total_ht;
 			}
 			// Amount VAT
-			if (!empty($arrayfields['d.total_vat']['checked']))
-			{
+			if (!empty($arrayfields['d.total_vat']['checked'])) {
 				print '<td class="right">'.price($obj->total_tva)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_tva';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'd.total_tva';
+				}
 				$totalarray['val']['d.total_tva'] += $obj->total_tva;
 			}
 			// Amount TTC
-			if (!empty($arrayfields['d.total_ttc']['checked']))
-			{
+			if (!empty($arrayfields['d.total_ttc']['checked'])) {
 				print '<td class="right">'.price($obj->total_ttc)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'd.total_ttc';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'd.total_ttc';
+				}
 				$totalarray['val']['d.total_ttc'] += $obj->total_ttc;
 			}
 
@@ -658,37 +752,43 @@ if ($resql)
 			print $hookmanager->resPrint;
 
 			// Date creation
-			if (!empty($arrayfields['d.date_create']['checked']))
-			{
+			if (!empty($arrayfields['d.date_create']['checked'])) {
 				print '<td class="nowrap center">';
 				print dol_print_date($db->jdate($obj->date_create), 'dayhour');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Date modification
-			if (!empty($arrayfields['d.tms']['checked']))
-			{
+			if (!empty($arrayfields['d.tms']['checked'])) {
 				print '<td class="nowrap center">';
 				print dol_print_date($db->jdate($obj->date_modif), 'dayhour');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Status
-			if (!empty($arrayfields['d.fk_statut']['checked']))
-			{
+			if (!empty($arrayfields['d.fk_statut']['checked'])) {
 				print '<td class="nowrap right">'.$expensereportstatic->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($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";
 
@@ -700,7 +800,11 @@ if ($resql)
 		}
 	} else {
 		$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>';
 	}
 
@@ -718,10 +822,11 @@ if ($resql)
 
 	print '</form>'."\n";
 
-	if (empty($id))
-	{
+	if (empty($id)) {
 		$hidegeneratedfilelistifempty = 1;
-		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+		if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+			$hidegeneratedfilelistifempty = 0;
+		}
 
 		// Show list of available documents
 		$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index ebb66ce42fd..b0156c6a475 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -41,26 +41,29 @@ $childids = $user->getAllChildIds(1);
 
 // Security check
 $socid = 0;
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expensereport', $id, 'expensereport');
 
 
 $object = new ExpenseReport($db);
-if (!$object->fetch($id, $ref) > 0)
-{
+if (!$object->fetch($id, $ref) > 0) {
 	dol_print_error($db);
 }
 
 $permissionnote = $user->rights->expensereport->creer; // Used by the include of actions_setnotes.inc.php
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	// Check current user can read this expense report
 	$canread = 0;
-	if (!empty($user->rights->expensereport->readall)) $canread = 1;
-	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
-	if (!$canread)
-	{
+	if (!empty($user->rights->expensereport->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+		$canread = 1;
+	}
+	if (!$canread) {
 		accessforbidden();
 	}
 }
@@ -82,8 +85,7 @@ llxHeader("", $title, $helpurl);
 
 $form = new Form($db);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object = new ExpenseReport($db);
 	$object->fetch($id, $ref);
 	$object->info($object->id);
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 14c95f2d68a..608309ceee0 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -26,7 +26,9 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/expensereport/modules_expensereport.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/expensereport.lib.php';
-if (!empty($conf->banque->enabled)) require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+if (!empty($conf->banque->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'companies', 'trips'));
@@ -36,16 +38,19 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 // TODO Add rule to restrict access payment
 //$result = restrictedArea($user, 'facture', $id,'');
 
 $object = new PaymentExpenseReport($db);
 
-if ($id > 0)
-{
+if ($id > 0) {
 	$result = $object->fetch($id);
-	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
+	if (!$result) {
+		dol_print_error($db, 'Failed to get payment id '.$id);
+	}
 }
 
 
@@ -54,13 +59,11 @@ if ($id > 0)
  */
 
 // Delete payment
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensereport->supprimer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensereport->supprimer) {
 	$db->begin();
 
 	$result = $object->delete($user);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->commit();
 		header("Location: ".DOL_URL_ROOT."/expensereport/index.php");
 		exit;
@@ -86,8 +89,7 @@ print dol_get_fiche_head($head, 'payment', $langs->trans("ExpenseReportPayment")
 /*
  * Confirm deleting of the payment
  */
-if ($action == 'delete')
-{
+if ($action == 'delete') {
 	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
@@ -118,14 +120,11 @@ print '<tr><td class="tdtop">'.$langs->trans('Note').'</td><td colspan="3">'.nl2
 
 $disable_delete = 0;
 // Bank account
-if (!empty($conf->banque->enabled))
-{
-	if ($object->bank_account)
-	{
+if (!empty($conf->banque->enabled)) {
+	if ($object->bank_account) {
 		$bankline = new AccountLine($db);
 		$bankline->fetch($object->bank_line);
-		if ($bankline->rappro)
-		{
+		if ($bankline->rappro) {
 			$disable_delete = 1;
 			$title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
 		}
@@ -167,8 +166,7 @@ $sql .= ' AND per.rowid = '.$id;
 
 dol_syslog("expensereport/payment/card.php", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$i = 0;
@@ -186,10 +184,8 @@ if ($resql)
 	print '<td class="center">'.$langs->trans('Status').'</td>';
 	print "</tr>\n";
 
-	if ($num > 0)
-	{
-		while ($i < $num)
-		{
+	if ($num > 0) {
+		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -216,8 +212,7 @@ if ($resql)
 
 			print "</tr>\n";
 
-			if ($objp->paid == 1)	// If at least one invoice is paid, disable delete
-			{
+			if ($objp->paid == 1) {	// If at least one invoice is paid, disable delete
 				$disable_delete = 2;
 				$title_button = $langs->trans("CantRemovePaymentWithOneInvoicePaid");
 			}
@@ -242,12 +237,9 @@ if ($resql)
  */
 print '<div class="tabsAction">';
 
-if ($action == '')
-{
-	if ($user->rights->expensereport->supprimer)
-	{
-		if (!$disable_delete)
-		{
+if ($action == '') {
+	if ($user->rights->expensereport->supprimer) {
+		if (!$disable_delete) {
 			print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($title_button).'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index b66103f38f5..926559769b4 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -39,8 +39,7 @@ $accountid = GETPOST('accountid', 'int');
 
 // Security check
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
@@ -49,12 +48,10 @@ if ($user->socid > 0)
  * Actions
  */
 
-if ($action == 'add_payment')
-{
+if ($action == 'add_payment') {
 	$error = 0;
 
-	if ($_POST["cancel"])
-	{
+	if ($_POST["cancel"]) {
 		$loc = DOL_URL_ROOT.'/expensereport/card.php?id='.$id;
 		header("Location: ".$loc);
 		exit;
@@ -62,53 +59,44 @@ if ($action == 'add_payment')
 
 	$expensereport = new ExpenseReport($db);
 	$result = $expensereport->fetch($id, $ref);
-	if (!$result)
-	{
+	if (!$result) {
 		$error++;
 		setEventMessages($expensereport->error, $expensereport->errors, 'errors');
 	}
 
 	$datepaid = dol_mktime(12, 0, 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
 
-	if (!($_POST["fk_typepayment"] > 0))
-	{
+	if (!($_POST["fk_typepayment"] > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("PaymentMode")), null, 'errors');
 		$error++;
 	}
-	if ($datepaid == '')
-	{
+	if ($datepaid == '') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
-	if (!empty($conf->banque->enabled) && !($accountid > 0))
-	{
+	if (!empty($conf->banque->enabled) && !($accountid > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
 		$error++;
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$paymentid = 0;
 		$total = 0;
 
 		// Read possible payments
-		foreach ($_POST as $key => $value)
-		{
-			if (substr($key, 0, 7) == 'amount_')
-			{
+		foreach ($_POST as $key => $value) {
+			if (substr($key, 0, 7) == 'amount_') {
 				$amounts[$expensereport->fk_user_author] = price2num($_POST[$key]);
 				$total += price2num($_POST[$key]);
 			}
 		}
 
-		if (count($amounts) <= 0)
-		{
+		if (count($amounts) <= 0) {
 			$error++;
 			$errmsg = 'ErrorNoPaymentDefined';
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// Create a line of payments
@@ -121,21 +109,17 @@ if ($action == 'add_payment')
 			$payment->num_payment    = GETPOST("num_payment", 'alphanothtml');
 			$payment->note_public    = GETPOST("note_public", 'restricthtml');
 
-			if (!$error)
-			{
+			if (!$error) {
 				$paymentid = $payment->create($user);
-				if ($paymentid < 0)
-				{
+				if ($paymentid < 0) {
 					setEventMessages($payment->error, $payment->errors, 'errors');
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $payment->addPaymentToBank($user, 'payment_expensereport', '(ExpenseReportPayment)', $accountid, '', '');
-				if (!$result > 0)
-				{
+				if (!$result > 0) {
 					setEventMessages($payment->error, $payment->errors, 'errors');
 					$error++;
 				}
@@ -152,8 +136,7 @@ if ($action == 'add_payment')
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 				$loc = DOL_URL_ROOT.'/expensereport/card.php?id='.$id;
 				header('Location: '.$loc);
@@ -178,8 +161,7 @@ $form = new Form($db);
 
 
 // Form to create expense report payment
-if ($action == 'create' || empty($action))
-{
+if ($action == 'create' || empty($action)) {
 	$expensereport = new ExpenseReport($db);
 	$expensereport->fetch($id, $ref);
 
@@ -226,8 +208,7 @@ if ($action == 'create' || empty($action))
 	$sql .= " WHERE p.fk_expensereport = e.rowid AND p.fk_expensereport = ".$id;
 	$sql .= ' AND e.entity IN ('.getEntity('expensereport').')';
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$sumpaid = $obj->total;
 		$db->free();
@@ -257,8 +238,7 @@ if ($action == 'create' || empty($action))
 	print "</td>\n";
 	print '</tr>';
 
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<tr>';
 		print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 		print '<td colspan="2">';
@@ -299,8 +279,7 @@ if ($action == 'create' || empty($action))
 	$total = 0;
 	$totalrecu = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$objp = $expensereport;
 
 		print '<tr class="oddeven">';
@@ -310,12 +289,12 @@ if ($action == 'create' || empty($action))
 		print '<td class="right">'.price($sumpaid)."</td>";
 		print '<td class="right">'.price($objp->total_ttc - $sumpaid)."</td>";
 		print '<td class="center">';
-		if ($sumpaid < $objp->total_ttc)
-		{
+		if ($sumpaid < $objp->total_ttc) {
 			$namef = "amount_".$objp->id;
 			$nameRemain = "remain_".$objp->id; // autofill remainder amount
-			if (!empty($conf->use_javascript_ajax)) // autofill remainder amount
+			if (!empty($conf->use_javascript_ajax)) { // autofill remainder amount
 					print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmount' data-rowid='".$namef."' data-value='".($objp->total_ttc - $sumpaid)."'"); // autofill remainder amount
+			}
 			$remaintopay = $objp->total_ttc - $sumpaid; // autofill remainder amount
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">'; // autofill remainder amount
 			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
@@ -331,8 +310,7 @@ if ($action == 'create' || empty($action))
 		$totalrecu += $objp->am;
 		$i++;
 	}
-	if ($i > 1)
-	{
+	if ($i > 1) {
 		// Print total
 		print '<tr class="oddeven">';
 		print '<td colspan="2" class="left">'.$langs->trans("Total").':</td>';
diff --git a/htdocs/expensereport/stats/index.php b/htdocs/expensereport/stats/index.php
index f3a3e263fa7..87bac2dde1a 100644
--- a/htdocs/expensereport/stats/index.php
+++ b/htdocs/expensereport/stats/index.php
@@ -38,16 +38,19 @@ $mode = GETPOSTISSET("mode") ? GETPOST("mode", 'aZ09') : 'customer';
 $object_status = GETPOST('object_status', 'intcomma');
 
 $userid = GETPOST('userid', 'int');
-$socid = GETPOST('socid', 'int'); if ($socid < 0) $socid = 0;
+$socid = GETPOST('socid', 'int'); if ($socid < 0) {
+	$socid = 0;
+}
 $id = GETPOST('id', 'int');
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'expensereport', $id, '');
 
 $nowyear = strftime("%Y", dol_now());
@@ -75,7 +78,9 @@ print load_fiche_titre($title, '', 'trip');
 dol_mkdir($dir);
 
 $stats = new ExpenseReportStats($db, $socid, $userid);
-if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND e.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+if ($object_status != '' && $object_status >= -1) {
+	$stats->where .= ' AND e.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+}
 
 // Build graphic number of object
 // $data = array(array('Lib',val1,val2,val3),...)
@@ -88,12 +93,10 @@ $fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=tripsexpensesstats&amp;file
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -120,12 +123,10 @@ $fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=tripsexpensesstats&amp;
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px2->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -146,25 +147,30 @@ if (!$mesg)
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$user->id.'-'.$year.'.png';
+	}
 } else {
 	$filename_avg = $dir.'/ordersaverage-'.$year.'.png';
-	if ($mode == 'customer') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
-	if ($mode == 'supplier') $fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	if ($mode == 'customer') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstats&file=ordersaverage-'.$year.'.png';
+	}
+	if ($mode == 'supplier') {
+		$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=orderstatssupplier&file=ordersaverage-'.$year.'.png';
+	}
 }
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px3->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -189,7 +195,9 @@ $arrayyears = array();
 foreach ($data as $val) {
 	$arrayyears[$val['year']] = $val['year'];
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 
 $h = 0;
@@ -223,7 +231,9 @@ print '</td></tr>';
 // User
 print '<tr><td>'.$langs->trans("User").'</td><td>';
 $include = '';
-if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) $include = 'hierarchy';
+if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) {
+	$include = 'hierarchy';
+}
 print $form->select_dolusers($userid, 'userid', 1, '', 0, $include, '', 0, 0, 0, '', 0, '', 'maxwidth300');
 print '</td></tr>';
 // Status
@@ -235,7 +245,9 @@ print '</td></tr>';
 print '<tr><td>';
 print $form->textwithpicto($langs->trans("Year"), $langs->trans("DateValidation"));
 print '</td><td>';
-if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
 arsort($arrayyears);
 print $form->selectarray('year', $arrayyears, $year, 0);
 print '</td></tr>';
@@ -254,11 +266,9 @@ print '<td class="right">'.$langs->trans("AmountAverage").'</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	$year = $val['year'];
-	while ($year && $oldyear > $year + 1)
-	{	// If we have empty year
+	while ($year && $oldyear > $year + 1) {	// If we have empty year
 		$oldyear--;
 
 		print '<tr class="oddeven" height="24">';
@@ -287,7 +297,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	print $px1->show();
 	print "<br>\n";
 	print $px2->show();
diff --git a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
index 9b2cd49faec..c27136ebd38 100644
--- a/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_addfile.tpl.php
@@ -9,11 +9,9 @@ $permission = $user->rights->expensereport->creer;
 
 // We define var to enable the feature to add prefix of uploaded files
 $savingdocmask = '';
-if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX))
-{
+if (empty($conf->global->MAIN_DISABLE_SUGGEST_REF_AS_PREFIX)) {
 	//var_dump($modulepart);
-	if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch')))
-	{
+	if (in_array($modulepart, array('facture_fournisseur', 'commande_fournisseur', 'facture', 'commande', 'propal', 'supplier_proposal', 'ficheinter', 'contract', 'expedition', 'project', 'project_task', 'expensereport', 'tax', 'produit', 'product_batch'))) {
 		$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
 	}
 }
@@ -35,6 +33,6 @@ $formfile->form_attach_new_file(
 	'accept',
 	'',
 	1
-	);
+);
 
 print '</td></tr>';
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 04bb2a71990..640f4c17b5d 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -1,7 +1,6 @@
 <?php
 // Add line to select existing file
-if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
-{
+if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 	print '<!-- expensereport_linktofile.tpl.php -->'."\n";
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -12,23 +11,20 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 	$nbFiles = count($arrayoffiles);
 	$nbLinks = Link::count($db, $object->element, $object->id);
 
-	if ($nbFiles > 0)
-	{
+	if ($nbFiles > 0) {
 		print '<tr class="trattachnewfilenow'.(empty($tredited) ? ' oddeven nohover' : ' '.$tredited).'"'.(!GETPOSTISSET('sendit') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display: none"' : '').'>';
 		print '<td colspan="'.$colspan.'">';
 		//print '<span class="opacitymedium">'.$langs->trans("AttachTheNewLineToTheDocument").'</span><br>';
 		$modulepart = 'expensereport'; $maxheightmini = 48;
 		$relativepath = (!empty($object->ref) ?dol_sanitizeFileName($object->ref) : '').'/';
 		$filei = 0;
-		foreach ($arrayoffiles as $file)
-		{
+		foreach ($arrayoffiles as $file) {
 			$urlforhref = array();
 			$filei++;
 
 			print '<div class="inline-block margintoponly marginleftonly marginrightonly center valigntop">';
 			$fileinfo = pathinfo($file['fullname']);
-			if (image_format_supported($file['name']) > 0)
-			{
+			if (image_format_supported($file['name']) > 0) {
 				$minifile = getImageFileNameForSize($file['name'], '_mini'); // For new thumbs using same ext (in lower case however) than original
 				//print $file['path'].'/'.$minifile.'<br>';
 				$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
@@ -46,8 +42,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 				$error = 0;
 				$thumbshown = '';
 
-				if (preg_match('/\.pdf$/i', $file['name']))
-				{
+				if (preg_match('/\.pdf$/i', $file['name'])) {
 					$urlforhref = getAdvancedPreviewUrl($modulepart, $relativepath.$fileinfo['filename'].'.'.strtolower($fileinfo['extension']), 1, '&entity='.(!empty($object->entity) ? $object->entity : $conf->entity));
 
 					$filepdf = $conf->expensereport->dir_output.'/'.$relativepath.$file['name'];
@@ -56,27 +51,26 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 
 					$pdfexists = file_exists($filepdf);
 
-					if ($pdfexists)
-					{
+					if ($pdfexists) {
 						// Conversion du PDF en image png si fichier png non existant
-						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf)))
-						{
-							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS))		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
-							{
+						if (!file_exists($fileimage) || (filemtime($fileimage) < filemtime($filepdf))) {
+							if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {		// If you experience trouble with pdf thumb generation and imagick, you can disable here.
 								include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 								$ret = dol_convert_file($filepdf, 'png', $fileimage, '0'); // Convert first page of PDF into a file _preview.png
-								if ($ret < 0) $error++;
+								if ($ret < 0) {
+									$error++;
+								}
 							}
 						}
 					}
 
-					if ($pdfexists && !$error)
-					{
+					if ($pdfexists && !$error) {
 						$heightforphotref = 70;
-						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
+						if (!empty($conf->dol_optimize_smallscreen)) {
+							$heightforphotref = 60;
+						}
 						// If the preview file is found
-						if (file_exists($fileimage))
-						{
+						if (file_exists($fileimage)) {
 							$thumbshown = '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
 						}
 					}
@@ -98,10 +92,8 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 			//var_dump(GETPOST($file['relativename'])); var_dump($file['relativename']); var_dump($_FILES['userfile']['name']);
 			// If a file was just uploaded, we check to preselect it
 			if (is_array($_FILES['userfile']['name'])) {
-				foreach ($_FILES['userfile']['name'] as $tmpfile)
-				{
-					if ($file['relativename'] == (GETPOST('savingdocmask', 'alpha') ? dol_sanitizeFileName($object->ref.'-') : '').$tmpfile)
-					{
+				foreach ($_FILES['userfile']['name'] as $tmpfile) {
+					if ($file['relativename'] == (GETPOST('savingdocmask', 'alpha') ? dol_sanitizeFileName($object->ref.'-') : '').$tmpfile) {
 						$checked = ' checked';
 						break;
 					} elseif ($file['relativename'] && in_array($file['relativename'], GETPOST('attachfile', 'array'))) {
@@ -111,8 +103,7 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES))
 				}
 			}
 			// If we edit a line already linked, then $filenamelinked is defined to the filename (without path) of linked file
-			if (!empty($filenamelinked) && $filenamelinked == $file['relativename'])
-			{
+			if (!empty($filenamelinked) && $filenamelinked == $file['relativename']) {
 				$checked = ' checked';
 			}
 			print '<div class="margintoponly maxwidth150"><input type="checkbox"'.$checked.' id="radio'.$filei.'" name="attachfile[]" class="checkboxattachfile" value="'.$file['relativename'].'">';
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
index a0ef7c353c6..31c5526903b 100644
--- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
@@ -18,8 +18,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -35,13 +34,12 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 
 $var = true;
 $total = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	?>
 <tr <?php echo $GLOBALS['bc'][$var]; ?> >
 	<td><?php echo $langs->trans("ExpenseReport"); ?></td>
-    <td><?php echo $objectlink->getNomUrl(1); ?></td>
-    <td></td>
+	<td><?php echo $objectlink->getNomUrl(1); ?></td>
+	<td></td>
 	<td class="center"><?php echo dol_print_date($objectlink->date_debut, 'day'); ?></td>
 	<td class="right"><?php
 	if ($user->rights->expensereport->lire) {
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index e4725db3946..174a7271d25 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -96,50 +96,49 @@ class Export
 
 		$modulesdir = dolGetModulesDirs();
 
-		foreach ($modulesdir as $dir)
-		{
+		foreach ($modulesdir as $dir) {
 			// Search available exports
 			$handle = @opendir(dol_osencode($dir));
-			if (is_resource($handle))
-			{
+			if (is_resource($handle)) {
 				// Search module files
-				while (($file = readdir($handle)) !== false)
-				{
+				while (($file = readdir($handle)) !== false) {
 					$reg = array();
-					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
-					{
+					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg)) {
 						$modulename = $reg[1];
 
 						// Defined if module is enabled
 						$enabled = true;
 						$part = strtolower(preg_replace('/^mod/i', '', $modulename));
-						if ($part == 'propale') $part = 'propal';
-						if (empty($conf->$part->enabled)) $enabled = false;
+						if ($part == 'propale') {
+							$part = 'propal';
+						}
+						if (empty($conf->$part->enabled)) {
+							$enabled = false;
+						}
 
-						if ($enabled)
-						{
+						if ($enabled) {
 							// Loading Class
 							$file = $dir.$modulename.".class.php";
 							$classname = $modulename;
 							require_once $file;
 							$module = new $classname($this->db);
 
-							if (isset($module->export_code) && is_array($module->export_code))
-							{
-								foreach ($module->export_code as $r => $value)
-								{
+							if (isset($module->export_code) && is_array($module->export_code)) {
+								foreach ($module->export_code as $r => $value) {
 									//print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
-									if ($filter && ($filter != $module->export_code[$r])) continue;
+									if ($filter && ($filter != $module->export_code[$r])) {
+										continue;
+									}
 
 									// Test if condition to show are ok
-									if (!empty($module->export_enabled[$r]) && !verifCond($module->export_enabled[$r])) continue;
+									if (!empty($module->export_enabled[$r]) && !verifCond($module->export_enabled[$r])) {
+										continue;
+									}
 
 									// Test if permissions are ok
 									$bool = true;
-									if (isset($module->export_permission))
-									{
-										foreach ($module->export_permission[$r] as $val)
-										{
+									if (isset($module->export_permission)) {
+										foreach ($module->export_permission[$r] as $val) {
 											$perm = $val;
 											//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
 											if (!empty($perm[2])) {
@@ -147,8 +146,12 @@ class Export
 											} else {
 												$bool = isset($user->rights->{$perm[0]}->{$perm[1]}) ? $user->rights->{$perm[0]}->{$perm[1]} : false;
 											}
-											if ($perm[0] == 'user' && $user->admin) $bool = true;
-											if (!$bool) break;
+											if ($perm[0] == 'user' && $user->admin) {
+												$bool = true;
+											}
+											if (!$bool) {
+												break;
+											}
 										}
 									}
 									//print $bool." $perm[0]"."<br>";
@@ -158,10 +161,8 @@ class Export
 									//	          {
 									// Charge fichier lang en rapport
 									$langtoload = $module->getLangFilesArray();
-									if (is_array($langtoload))
-									{
-										foreach ($langtoload as $key)
-										{
+									if (is_array($langtoload)) {
+										foreach ($langtoload as $key) {
 											$langs->load($key);
 										}
 									}
@@ -234,12 +235,18 @@ class Export
 		$i = 0;
 
 		//print_r($array_selected);
-		foreach ($this->array_export_fields[$indice] as $key => $value)
-		{
-			if (!array_key_exists($key, $array_selected)) continue; // Field not selected
-			if (preg_match('/^none\./', $key)) continue; // A field that must not appears into SQL
-			if ($i > 0) $sql .= ', ';
-			else $i++;
+		foreach ($this->array_export_fields[$indice] as $key => $value) {
+			if (!array_key_exists($key, $array_selected)) {
+				continue; // Field not selected
+			}
+			if (preg_match('/^none\./', $key)) {
+				continue; // A field that must not appears into SQL
+			}
+			if ($i > 0) {
+				$sql .= ', ';
+			} else {
+				$i++;
+			}
 
 			if (strpos($key, ' as ') === false) {
 				$newfield = $key.' as '.str_replace(array('.', '-', '(', ')'), '_', $key);
@@ -252,14 +259,16 @@ class Export
 		$sql .= $this->array_export_sql_end[$indice];
 
 		// Add the WHERE part. Filtering into sql if a filtering array is provided
-		if (is_array($array_filterValue) && !empty($array_filterValue))
-		{
+		if (is_array($array_filterValue) && !empty($array_filterValue)) {
 			$sqlWhere = '';
 			// Loop on each condition to add
-			foreach ($array_filterValue as $key => $value)
-			{
-				if (preg_match('/GROUP_CONCAT/i', $key)) continue;
-				if ($value != '') $sqlWhere .= " and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+			foreach ($array_filterValue as $key => $value) {
+				if (preg_match('/GROUP_CONCAT/i', $key)) {
+					continue;
+				}
+				if ($value != '') {
+					$sqlWhere .= " and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+				}
 			}
 			$sql .= $sqlWhere;
 		}
@@ -268,12 +277,12 @@ class Export
 		$sql .= $this->array_export_sql_order[$indice];
 
 		// Add the HAVING part.
-		if (is_array($array_filterValue) && !empty($array_filterValue))
-		{
+		if (is_array($array_filterValue) && !empty($array_filterValue)) {
 			// Loop on each condition to add
-			foreach ($array_filterValue as $key => $value)
-			{
-				if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql .= " HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+			foreach ($array_filterValue as $key => $value) {
+				if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') {
+					$sql .= " HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+				}
 			}
 		}
 
@@ -297,37 +306,41 @@ class Export
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				if (!(strpos($ValueField, '%') === false))
+				if (!(strpos($ValueField, '%') === false)) {
 					$szFilterQuery .= " ".$NameField." LIKE '".$ValueField."'";
-				else $szFilterQuery .= " ".$NameField." = '".$ValueField."'";
+				} else {
+					$szFilterQuery .= " ".$NameField." = '".$ValueField."'";
+				}
 				break;
 			case 'Date':
-				if (strpos($ValueField, "+") > 0)
-				{
+				if (strpos($ValueField, "+") > 0) {
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery = "(".$this->conditionDate($NameField, trim($ValueArray[0]), ">=");
 					$szFilterQuery .= " AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")";
 				} else {
-					if (is_numeric(substr($ValueField, 0, 1)))
+					if (is_numeric(substr($ValueField, 0, 1))) {
 						$szFilterQuery = $this->conditionDate($NameField, trim($ValueField), "=");
-					else $szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
+					} else {
+						$szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
+					}
 				}
 				break;
 			case 'Duree':
 				break;
 			case 'Numeric':
 				// si le signe -
-				if (strpos($ValueField, "+") > 0)
-				{
+				if (strpos($ValueField, "+") > 0) {
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery = "(".$NameField.">=".$ValueArray[0];
 					$szFilterQuery .= " AND ".$NameField."<=".$ValueArray[1].")";
 				} else {
-					if (is_numeric(substr($ValueField, 0, 1)))
+					if (is_numeric(substr($ValueField, 0, 1))) {
 						$szFilterQuery = " ".$NameField."=".$ValueField;
-					else $szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
+					} else {
+						$szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
+					}
 				}
 				break;
 			case 'Boolean':
@@ -335,12 +348,14 @@ class Export
 				break;
 			case 'Status':
 			case 'List':
-				if (is_numeric($ValueField))
+				if (is_numeric($ValueField)) {
 					$szFilterQuery = " ".$NameField."=".$ValueField;
-				else {
-					if (!(strpos($ValueField, '%') === false))
+				} else {
+					if (!(strpos($ValueField, '%') === false)) {
 						$szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
-					else $szFilterQuery = " ".$NameField." = '".$ValueField."'";
+					} else {
+						$szFilterQuery = " ".$NameField." = '".$ValueField."'";
+					}
 				}
 				break;
 			default:
@@ -361,9 +376,13 @@ class Export
 	public function conditionDate($Field, $Value, $Sens)
 	{
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
-		if (strlen($Value) == 4) $Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
-		elseif (strlen($Value) == 6) $Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
-		else $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		if (strlen($Value) == 4) {
+			$Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
+		} elseif (strlen($Value) == 6) {
+			$Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
+		} else {
+			$Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		}
 		return $Condition;
 	}
 
@@ -385,8 +404,7 @@ class Export
 		$InfoFieldList = explode(":", $TypeField);
 
 		// build the input field on depend of the type of file
-		switch ($InfoFieldList[0])
-		{
+		switch ($InfoFieldList[0]) {
 			case 'Text':
 			case 'Date':
 				$szFilterField = '<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
@@ -403,15 +421,21 @@ class Export
 			case 'Boolean':
 				$szFilterField = '<select name="'.$NameField.'" class="flat">';
 				$szFilterField .= '<option ';
-				if ($ValueField == '') $szFilterField .= ' selected ';
+				if ($ValueField == '') {
+					$szFilterField .= ' selected ';
+				}
 				$szFilterField .= ' value="">&nbsp;</option>';
 
 				$szFilterField .= '<option ';
-				if ($ValueField == 'yes' || $ValueField == '1') $szFilterField .= ' selected ';
+				if ($ValueField == 'yes' || $ValueField == '1') {
+					$szFilterField .= ' selected ';
+				}
 				$szFilterField .= ' value="1">'.yn(1).'</option>';
 
 				$szFilterField .= '<option ';
-				if ($ValueField == 'no' || $ValueField == '0') $szFilterField .= ' selected ';
+				if ($ValueField == 'no' || $ValueField == '0') {
+					$szFilterField .= ' selected ';
+				}
 				$szFilterField .= ' value="0">'.yn(0).'</option>';
 				$szFilterField .= "</select>";
 				break;
@@ -422,51 +446,50 @@ class Export
 				// 3 : Name of field with key (if it is not "rowid"). Used this field as key for combo list.
 				// 4 : Name of element for getEntity().
 
-				if (!empty($InfoFieldList[3]))
+				if (!empty($InfoFieldList[3])) {
 					$keyList = $InfoFieldList[3];
-				else $keyList = 'rowid';
+				} else {
+					$keyList = 'rowid';
+				}
 				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
+				if ($InfoFieldList[1] == 'c_stcomm') {
+					$sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
+				}
+				if ($InfoFieldList[1] == 'c_country') {
+					$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
+				}
 				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[1];
 				if (!empty($InfoFieldList[4])) {
 					$sql .= ' WHERE entity IN ('.getEntity($InfoFieldList[4]).')';
 				}
 
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$szFilterField = '<select class="flat" name="'.$NameField.'">';
 					$szFilterField .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 
 					$i = 0;
-					if ($num)
-					{
-						while ($i < $num)
-						{
+					if ($num) {
+						while ($i < $num) {
 							$obj = $this->db->fetch_object($resql);
-							if ($obj->label == '-')
-							{
+							if ($obj->label == '-') {
 								// Discard entry '-'
 								$i++;
 								continue;
 							}
 							//var_dump($InfoFieldList[1]);
 							$labeltoshow = dol_trunc($obj->label, 18);
-							if ($InfoFieldList[1] == 'c_stcomm')
-							{
+							if ($InfoFieldList[1] == 'c_stcomm') {
 								$langs->load("companies");
 								$labeltoshow = (($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id) ? $langs->trans("StatusProspect".$obj->id) : $obj->label);
 							}
-							if ($InfoFieldList[1] == 'c_country')
-							{
+							if ($InfoFieldList[1] == 'c_country') {
 								//var_dump($sql);
 								$langs->load("dict");
 								$labeltoshow = (($langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label);
 							}
-							if (!empty($ValueField) && $ValueField == $obj->rowid)
-							{
+							if (!empty($ValueField) && $ValueField == $obj->rowid) {
 								$szFilterField .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							} else {
 								$szFilterField .= '<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
@@ -477,7 +500,9 @@ class Export
 					$szFilterField .= "</select>";
 
 					$this->db->free($resql);
-				} else dol_print_error($this->db);
+				} else {
+					dol_print_error($this->db);
+				}
 				break;
 		}
 
@@ -542,8 +567,7 @@ class Export
 		dol_syslog(__METHOD__." ".$model.", ".$datatoexport.", ".implode(",", $array_selected));
 
 		// Check parameters or context properties
-		if (empty($this->array_export_fields) || !is_array($this->array_export_fields))
-		{
+		if (empty($this->array_export_fields) || !is_array($this->array_export_fields)) {
 			$this->error = "ErrorBadParameter";
 			dol_syslog($this->error, LOG_ERR);
 			return -1;
@@ -556,22 +580,20 @@ class Export
 		require_once $dir.$file;
 		$objmodel = new $classname($this->db);
 
-		if (!empty($sqlquery)) $sql = $sqlquery;
-		else {
+		if (!empty($sqlquery)) {
+			$sql = $sqlquery;
+		} else {
 			// Define value for indice from $datatoexport
 			$foundindice = 0;
-			foreach ($this->array_export_code as $key => $dataset)
-			{
-				if ($datatoexport == $dataset)
-				{
+			foreach ($this->array_export_code as $key => $dataset) {
+				if ($datatoexport == $dataset) {
 					$indice = $key;
 					$foundindice++;
 					//print "Found indice = ".$indice." for dataset=".$datatoexport."\n";
 					break;
 				}
 			}
-			if (empty($foundindice))
-			{
+			if (empty($foundindice)) {
 				$this->error = "ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
 				return -1;
 			}
@@ -582,13 +604,11 @@ class Export
 		$this->sqlusedforexport = $sql;
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			//$this->array_export_label[$indice]
 			if (!empty($conf->global->EXPORT_PREFIX_SPEC)) {
 				$filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			}
-			else {
+			} else {
 				$filename = "export_".$datatoexport;
 			}
 			$filename .= '.'.$objmodel->getDriverExtension();
@@ -600,55 +620,48 @@ class Export
 			dol_mkdir($dirname);
 			$result = $objmodel->open_file($dirname."/".$filename, $outputlangs);
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				// Genere en-tete
 				$objmodel->write_header($outputlangs);
 
 				// Genere ligne de titre
 				$objmodel->write_title($this->array_export_fields[$indice], $array_selected, $outputlangs, isset($this->array_export_TypeFields[$indice]) ? $this->array_export_TypeFields[$indice] : null);
 
-				while ($obj = $this->db->fetch_object($resql))
-				{
+				while ($obj = $this->db->fetch_object($resql)) {
 					// Process special operations
-					if (!empty($this->array_export_special[$indice]))
-					{
-						foreach ($this->array_export_special[$indice] as $key => $value)
-						{
-							if (!array_key_exists($key, $array_selected)) continue; // Field not selected
+					if (!empty($this->array_export_special[$indice])) {
+						foreach ($this->array_export_special[$indice] as $key => $value) {
+							if (!array_key_exists($key, $array_selected)) {
+								continue; // Field not selected
+							}
 							// Operation NULLIFNEG
-							if ($this->array_export_special[$indice][$key] == 'NULLIFNEG')
-							{
+							if ($this->array_export_special[$indice][$key] == 'NULLIFNEG') {
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
-								if ($obj->$alias < 0) $obj->$alias = '';
-							}
-							// Operation ZEROIFNEG
-							elseif ($this->array_export_special[$indice][$key] == 'ZEROIFNEG')
-							{
+								if ($obj->$alias < 0) {
+									$obj->$alias = '';
+								}
+							} elseif ($this->array_export_special[$indice][$key] == 'ZEROIFNEG') {
+								// Operation ZEROIFNEG
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
-								if ($obj->$alias < 0) $obj->$alias = '0';
-							}
-							// Operation GETNUMOPENDAYS (for Holiday module)
-							elseif ($this->array_export_special[$indice][$key] == 'getNumOpenDays')
-							{
+								if ($obj->$alias < 0) {
+									$obj->$alias = '0';
+								}
+							} elseif ($this->array_export_special[$indice][$key] == 'getNumOpenDays') {
+								// Operation GETNUMOPENDAYS (for Holiday module)
 								include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
 								$obj->$alias = num_open_day(dol_stringtotime($obj->d_date_debut, 1), dol_stringtotime($obj->d_date_fin, 1), 0, 1, $obj->d_halfday, $mysoc->country_code);
-							}
-							// Operation INVOICEREMAINTOPAY
-							elseif ($this->array_export_special[$indice][$key] == 'getRemainToPay')
-							{
+							} elseif ($this->array_export_special[$indice][$key] == 'getRemainToPay') {
+								// Operation INVOICEREMAINTOPAY
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
 								$remaintopay = '';
-								if ($obj->f_rowid > 0)
-								{
+								if ($obj->f_rowid > 0) {
 									global $tmpobjforcomputecall;
-									if (!is_object($tmpobjforcomputecall))
-									{
+									if (!is_object($tmpobjforcomputecall)) {
 										include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 										$tmpobjforcomputecall = new Facture($this->db);
 									}
@@ -725,8 +738,7 @@ class Export
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -751,11 +763,9 @@ class Export
 
 		dol_syslog("Export::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$obj = $this->db->fetch_object($result);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->id = $obj->rowid;
 				$this->model_name = $obj->label;
 				$this->datatoexport = $obj->type;
@@ -794,13 +804,13 @@ class Export
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -829,12 +839,10 @@ class Export
 		$sql .= " ORDER BY rowid";
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				$keyModel = array_search($obj->type, $this->array_export_code);
 				print "<tr>";
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index c80ee4d248f..f1099f9692f 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -54,14 +54,14 @@ $entitytoicon = array(
 	'subscription' => 'payment',
 	'payment'      => 'payment',
 	'tax'          => 'generic',
-    'tax_type'     => 'generic',
-    'other'        => 'generic',
+	'tax_type'     => 'generic',
+	'other'        => 'generic',
 	'account'      => 'account',
 	'product'      => 'product',
 	'virtualproduct'=>'product',
 	'subproduct'   => 'product',
 	'product_supplier_ref'      => 'product',
-    'stock'        => 'stock',
+	'stock'        => 'stock',
 	'warehouse'    => 'stock',
 	'batch'        => 'stock',
 	'stockbatch'   => 'stock',
@@ -159,17 +159,16 @@ $usefilters = 1;
  * Actions
  */
 
-if ($action == 'selectfield')     // Selection of field at step 2
-{
+if ($action == 'selectfield') {     // Selection of field at step 2
 	$fieldsarray = $objexport->array_export_fields[0];
 	$fieldsentitiesarray = $objexport->array_export_entities[0];
 	$fieldsdependenciesarray = $objexport->array_export_dependencies[0];
 
-	if ($field == 'all')
-	{
-		foreach ($fieldsarray as $key=>$val)
-		{
-			if (!empty($array_selected[$key])) continue; // If already selected, check next
+	if ($field == 'all') {
+		foreach ($fieldsarray as $key => $val) {
+			if (!empty($array_selected[$key])) {
+				continue; // If already selected, check next
+			}
 			$array_selected[$key] = count($array_selected) + 1;
 			//print_r($array_selected);
 			$_SESSION["export_selected_fields"] = $array_selected;
@@ -180,29 +179,30 @@ if ($action == 'selectfield')     // Selection of field at step 2
 		$array_selected[$field] = count($array_selected) + 1; // We tag the key $field as "selected"
 		// We check if there is a dependency to activate
 		/*var_dump($field);
-        var_dump($fieldsentitiesarray[$field]);
-        var_dump($fieldsdependenciesarray);*/
+		var_dump($fieldsentitiesarray[$field]);
+		var_dump($fieldsdependenciesarray);*/
 		$listofdependencies = array();
-		if (!empty($fieldsentitiesarray[$field]) && !empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]]))
-		{
+		if (!empty($fieldsentitiesarray[$field]) && !empty($fieldsdependenciesarray[$fieldsentitiesarray[$field]])) {
 			// We found a dependency on the type of field
 			$tmp = $fieldsdependenciesarray[$fieldsentitiesarray[$field]]; // $fieldsdependenciesarray=array('element'=>'fd.rowid') or array('element'=>array('fd.rowid','ab.rowid'))
-			if (is_array($tmp)) $listofdependencies = $tmp;
-			else $listofdependencies = array($tmp);
-		} elseif (!empty($field) && !empty($fieldsdependenciesarray[$field]))
-		{
+			if (is_array($tmp)) {
+				$listofdependencies = $tmp;
+			} else {
+				$listofdependencies = array($tmp);
+			}
+		} elseif (!empty($field) && !empty($fieldsdependenciesarray[$field])) {
 			// We found a dependency on a dedicated field
 			$tmp = $fieldsdependenciesarray[$field]; // $fieldsdependenciesarray=array('fd.fieldx'=>'fd.rowid') or array('fd.fieldx'=>array('fd.rowid','ab.rowid'))
-			if (is_array($tmp)) $listofdependencies = $tmp;
-			else $listofdependencies = array($tmp);
+			if (is_array($tmp)) {
+				$listofdependencies = $tmp;
+			} else {
+				$listofdependencies = array($tmp);
+			}
 		}
 
-		if (count($listofdependencies))
-		{
-			foreach ($listofdependencies as $fieldid)
-			{
-				if (empty($array_selected[$fieldid]))
-				{
+		if (count($listofdependencies)) {
+			foreach ($listofdependencies as $fieldid) {
+				if (empty($array_selected[$fieldid])) {
 					$array_selected[$fieldid] = count($array_selected) + 1; // We tag the key $fieldid as "selected"
 					$warnings[] = $langs->trans("ExportFieldAutomaticallyAdded", $langs->transnoentitiesnoconv($fieldsarray[$fieldid]));
 				}
@@ -214,10 +214,8 @@ if ($action == 'selectfield')     // Selection of field at step 2
 		setEventMessages($warnings, null, 'warnings');
 	}
 }
-if ($action == 'unselectfield')
-{
-	if ($_GET["field"] == 'all')
-	{
+if ($action == 'unselectfield') {
+	if ($_GET["field"] == 'all') {
 		$array_selected = array();
 		$_SESSION["export_selected_fields"] = $array_selected;
 	} else {
@@ -226,8 +224,7 @@ if ($action == 'unselectfield')
 		asort($array_selected);
 		$i = 0;
 		$array_selected_save = $array_selected;
-		foreach ($array_selected as $code=>$value)
-		{
+		foreach ($array_selected as $code => $value) {
 			$i++;
 			$array_selected[$code] = $i;
 			//print "x $code x $i y<br>";
@@ -236,52 +233,48 @@ if ($action == 'unselectfield')
 	}
 }
 
-if ($action == 'downfield' || $action == 'upfield')
-{
+if ($action == 'downfield' || $action == 'upfield') {
 	$pos = $array_selected[$_GET["field"]];
-	if ($action == 'downfield') $newpos = $pos + 1;
-	if ($action == 'upfield') $newpos = $pos - 1;
+	if ($action == 'downfield') {
+		$newpos = $pos + 1;
+	}
+	if ($action == 'upfield') {
+		$newpos = $pos - 1;
+	}
 	// Recherche code avec qui switcher
 	$newcode = "";
-	foreach ($array_selected as $code=>$value)
-	{
-		if ($value == $newpos)
-		{
+	foreach ($array_selected as $code => $value) {
+		if ($value == $newpos) {
 			$newcode = $code;
 			break;
 		}
 	}
 	//print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)");
-	if ($newcode)   // Si newcode trouve (protection contre resoumission de page)
-	{
+	if ($newcode) {   // Si newcode trouve (protection contre resoumission de page)
 		$array_selected[$_GET["field"]] = $newpos;
 		$array_selected[$newcode] = $pos;
 		$_SESSION["export_selected_fields"] = $array_selected;
 	}
 }
 
-if ($step == 1 || $action == 'cleanselect')
-{
+if ($step == 1 || $action == 'cleanselect') {
 	$_SESSION["export_selected_fields"] = array();
 	$_SESSION["export_filtered_fields"] = array();
 	$array_selected = array();
 	$array_filtervalue = array();
 }
 
-if ($action == 'builddoc')
-{
+if ($action == 'builddoc') {
 	$max_execution_time_for_importexport = (empty($conf->global->EXPORT_MAX_EXECUTION_TIME) ? 300 : $conf->global->EXPORT_MAX_EXECUTION_TIME); // 5mn if not defined
 	$max_time = @ini_get("max_execution_time");
-	if ($max_time && $max_time < $max_execution_time_for_importexport)
-	{
+	if ($max_time && $max_time < $max_execution_time_for_importexport) {
 		dol_syslog("max_execution_time=".$max_time." is lower than max_execution_time_for_importexport=".$max_execution_time_for_importexport.". We try to increase it dynamically.");
 		@ini_set("max_execution_time", $max_execution_time_for_importexport); // This work only if safe mode is off. also web servers has timeout of 300
 	}
 
 	// Build export file
 	$result = $objexport->build_file($user, GETPOST('model', 'alpha'), $datatoexport, $array_selected, $array_filtervalue);
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		setEventMessages($objexport->error, $objexport->errors, 'errors');
 		$sqlusedforexport = $objexport->sqlusedforexport;
 	} else {
@@ -291,47 +284,46 @@ if ($action == 'builddoc')
 }
 
 // Delete file
-if ($step == 5 && $action == 'confirm_deletefile' && $confirm == 'yes')
-{
+if ($step == 5 && $action == 'confirm_deletefile' && $confirm == 'yes') {
 	$file = $upload_dir."/".GETPOST('file'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
 
 	$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');
+	}
 	header('Location: '.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport);
 	exit;
 }
 
-if ($action == 'deleteprof')
-{
-	if (GETPOST("id", 'int'))
-	{
+if ($action == 'deleteprof') {
+	if (GETPOST("id", 'int')) {
 		$objexport->fetch(GETPOST('id', 'int'));
 		$result = $objexport->delete($user);
 	}
 }
 
 // TODO The export for filter is not yet implemented (old code created conflicts with step 2). We must use same way of working and same combo list of predefined export than step 2.
-if ($action == 'add_export_model')
-{
-	if ($export_name)
-	{
+if ($action == 'add_export_model') {
+	if ($export_name) {
 		asort($array_selected);
 
 		// Set save string
 		$hexa = '';
-		foreach ($array_selected as $key=>$val)
-		{
-			if ($hexa) $hexa .= ',';
+		foreach ($array_selected as $key => $val) {
+			if ($hexa) {
+				$hexa .= ',';
+			}
 			$hexa .= $key;
 		}
 
 		$hexafiltervalue = '';
-		if (!empty($array_filtervalue) && is_array($array_filtervalue))
-		{
-			foreach ($array_filtervalue as $key=>$val)
-			{
-				if ($hexafiltervalue) $hexafiltervalue .= ',';
+		if (!empty($array_filtervalue) && is_array($array_filtervalue)) {
+			foreach ($array_filtervalue as $key => $val) {
+				if ($hexafiltervalue) {
+					$hexafiltervalue .= ',';
+				}
 				$hexafiltervalue .= $key.'='.$val;
 			}
 		}
@@ -342,14 +334,15 @@ if ($action == 'add_export_model')
 		$objexport->hexafiltervalue = $hexafiltervalue;
 
 		$result = $objexport->create($user);
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			setEventMessages($langs->trans("ExportModelSaved", $objexport->model_name), null, 'mesgs');
 		} else {
 			$langs->load("errors");
-			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			if ($objexport->errno == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->trans("ErrorExportDuplicateProfil"), null, 'errors');
-			else setEventMessages($objexport->error, $objexport->errors, 'errors');
+			} else {
+				setEventMessages($objexport->error, $objexport->errors, 'errors');
+			}
 		}
 	} else {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ExportModelName")), null, 'errors');
@@ -357,8 +350,7 @@ if ($action == 'add_export_model')
 }
 
 // Reload a predefined export model
-if ($step == 2 && $action == 'select_model')
-{
+if ($step == 2 && $action == 'select_model') {
 	$_SESSION["export_selected_fields"] = array();
 	$_SESSION["export_filtered_fields"] = array();
 
@@ -366,12 +358,10 @@ if ($step == 2 && $action == 'select_model')
 	$array_filtervalue = array();
 
 	$result = $objexport->fetch($exportmodelid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$fieldsarray = preg_split("/,(?! [^(]*\))/", $objexport->hexa);
 		$i = 1;
-		foreach ($fieldsarray as $val)
-		{
+		foreach ($fieldsarray as $val) {
 			$array_selected[$val] = $i;
 			$i++;
 		}
@@ -379,8 +369,7 @@ if ($step == 2 && $action == 'select_model')
 
 		$fieldsarrayvalue = explode(',', $objexport->hexafiltervalue);
 		$i = 1;
-		foreach ($fieldsarrayvalue as $val)
-		{
+		foreach ($fieldsarrayvalue as $val) {
 			$tmp = explode('=', $val);
 			$array_filtervalue[$tmp[0]] = $tmp[1];
 			$i++;
@@ -390,21 +379,20 @@ if ($step == 2 && $action == 'select_model')
 }
 
 // Get form with filters
-if ($step == 4 && $action == 'submitFormField')
-{
+if ($step == 4 && $action == 'submitFormField') {
 	// on boucle sur les champs selectionne pour recuperer la valeur
-	if (is_array($objexport->array_export_TypeFields[0]))
-	{
+	if (is_array($objexport->array_export_TypeFields[0])) {
 		$_SESSION["export_filtered_fields"] = array();
-		foreach ($objexport->array_export_TypeFields[0] as $code => $type)	// $code: s.fieldname $value: Text|Boolean|List:ccc
-		{
+		foreach ($objexport->array_export_TypeFields[0] as $code => $type) {	// $code: s.fieldname $value: Text|Boolean|List:ccc
 			$newcode = (string) preg_replace('/\./', '_', $code);
 			//print 'xxx'.$code."=".$newcode."=".$type."=".$_POST[$newcode]."\n<br>";
 			$filterqualified = 1;
-			if (!GETPOSTISSET($newcode) || GETPOST($newcode, 'restricthtml') == '') $filterqualified = 0;
-			elseif (preg_match('/^List/', $type) && (is_numeric(GETPOST($newcode, 'restricthtml')) && GETPOST($newcode, 'restricthtml') <= 0)) $filterqualified = 0;
-			if ($filterqualified)
-			{
+			if (!GETPOSTISSET($newcode) || GETPOST($newcode, 'restricthtml') == '') {
+				$filterqualified = 0;
+			} elseif (preg_match('/^List/', $type) && (is_numeric(GETPOST($newcode, 'restricthtml')) && GETPOST($newcode, 'restricthtml') <= 0)) {
+				$filterqualified = 0;
+			}
+			if ($filterqualified) {
 				//print 'Filter on '.$newcode.' type='.$type.' value='.$_POST[$newcode]."\n";
 				$objexport->array_export_FilterValue[0][$code] = GETPOST($newcode, 'restricthtml');
 			}
@@ -419,8 +407,7 @@ if ($step == 4 && $action == 'submitFormField')
  * View
  */
 
-if ($step == 1 || !$datatoexport)
-{
+if ($step == 1 || !$datatoexport) {
 	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
 	$h = 0;
@@ -443,13 +430,11 @@ if ($step == 1 || !$datatoexport)
 	print '<td>&nbsp;</td>';
 	print '</tr>';
 
-	if (count($objexport->array_export_module))
-	{
+	if (count($objexport->array_export_module)) {
 		asort($objexport->array_export_code_for_sort);
 		//var_dump($objexport->array_export_code_for_sort);
 		//$sortedarrayofmodules = dol_sort_array($objexport->array_export_module, 'module_position', 'asc', 0, 0, 1);
-		foreach ($objexport->array_export_code_for_sort as $key => $value)
-		{
+		foreach ($objexport->array_export_code_for_sort as $key => $value) {
 			print '<tr class="oddeven"><td nospan="nospan">';
 			//print img_object($objexport->array_export_module[$key]->getName(),$export->array_export_module[$key]->picto).' ';
 			print $objexport->array_export_module[$key]->getName();
@@ -466,7 +451,7 @@ if ($step == 1 || !$datatoexport)
 			} else {
 				print $langs->trans("NotEnoughPermissions");
 			}
-		   	print '</td></tr>';
+			print '</td></tr>';
 		}
 	} else {
 		print '<tr><td class="oddeven" colspan="3">'.$langs->trans("NoExportableData").'</td></tr>';
@@ -477,8 +462,7 @@ if ($step == 1 || !$datatoexport)
 	print '</div>';
 }
 
-if ($step == 2 && $datatoexport)
-{
+if ($step == 2 && $datatoexport) {
 	llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones');
 
 	$h = 0;
@@ -505,14 +489,14 @@ if ($step == 2 && $datatoexport)
 	print $objexport->array_export_module[0]->getName();
 	print '</td></tr>';
 
-    // Lot de donnees a exporter
-    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-    print '<td>';
-    $entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
-    print $objexport->array_export_label[0];
-    print '</td></tr>';
+	// Lot de donnees a exporter
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+	print '<td>';
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+	print $objexport->array_export_label[0];
+	print '</td></tr>';
 
 	print '</table>';
 	print '</div>';
@@ -568,8 +552,7 @@ if ($step == 2 && $datatoexport)
 
 	$i = 0;
 
-	foreach ($fieldsarray as $code=>$label)
-	{
+	foreach ($fieldsarray as $code => $label) {
 		print '<tr class="oddeven">';
 
 		$i++;
@@ -583,8 +566,7 @@ if ($step == 2 && $datatoexport)
 		//print $code.'-'.$label.'-'.$entity;
 
 		$tmparray = explode(':', $entityicon);
-		if (count($tmparray) >= 2)
-		{
+		if (count($tmparray) >= 2) {
 			$entityicon = $tmparray[0];
 			$entitylang = $tmparray[1];
 		}
@@ -595,27 +577,22 @@ if ($step == 2 && $datatoexport)
 
 		$tablename = getablenamefromfield($code, $sqlmaxforexport);
 		$htmltext = '<b>'.$langs->trans("Name").":</b> ".$text.'<br>';
-		if (!empty($objexport->array_export_special[0][$code]))
-		{
+		if (!empty($objexport->array_export_special[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
 		} else {
 			$htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
-   		if (!empty($objexport->array_export_examplevalues[0][$code]))
-		{
+		if (!empty($objexport->array_export_examplevalues[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
 		}
-		if (!empty($objexport->array_export_TypeFields[0][$code]))
-		{
+		if (!empty($objexport->array_export_TypeFields[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
 		}
-		if (!empty($objexport->array_export_help[0][$code]))
-		{
+		if (!empty($objexport->array_export_help[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("Help").':</b> '.$langs->trans($objexport->array_export_help[0][$code]).'<br>';
 		}
 
-		if (isset($array_selected[$code]) && $array_selected[$code])
-		{
+		if (isset($array_selected[$code]) && $array_selected[$code]) {
 			// Selected fields
 			print '<td>&nbsp;</td>';
 			print '<td class="center"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?step=2&datatoexport='.$datatoexport.'&action=unselectfield&field='.$code.'">'.img_left('default', 0, 'style="max-width: 20px"').'</a></td>';
@@ -642,15 +619,13 @@ if ($step == 2 && $datatoexport)
 	print '</div>';
 
 	/*
-     * Barre d'action
-     */
+	 * Barre d'action
+	 */
 	print '<div class="tabsAction tabsActionNoBottom">';
 
-	if (count($array_selected))
-	{
+	if (count($array_selected)) {
 		// If filters exist
-		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-		{
+		if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) {
 			print '<a class="butAction" href="export.php?step=3&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
 		} else {
 			print '<a class="butAction" href="export.php?step=4&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
@@ -662,10 +637,8 @@ if ($step == 2 && $datatoexport)
 	print '</div>';
 }
 
-if ($step == 3 && $datatoexport)
-{
-	if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
-	{
+if ($step == 3 && $datatoexport) {
+	if (count($array_selected) < 1) {      // This occurs when going back to page after sessecion expired
 		// Switch to step 2
 		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
 		exit;
@@ -713,8 +686,7 @@ if ($step == 3 && $datatoexport)
 	// Nbre champs exportes
 	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
 	$list = '';
-	foreach ($array_selected as $code=>$value)
-	{
+	foreach ($array_selected as $code => $value) {
 		$list .= (!empty($list) ? ', ' : '');
 		$list .= (isset($objexport->array_export_fields[0][$code]) ? $langs->trans($objexport->array_export_fields[0][$code]) : '');
 	}
@@ -755,8 +727,7 @@ if ($step == 3 && $datatoexport)
 
 	$i = 0;
 	// on boucle sur les champs
-	foreach ($fieldsarray as $code => $label)
-	{
+	foreach ($fieldsarray as $code => $label) {
 		print '<tr class="oddeven">';
 
 		$i++;
@@ -767,8 +738,7 @@ if ($step == 3 && $datatoexport)
 		print '<td class="nowrap">';
 		// If value of entityicon=entitylang='icon:Label'
 		$tmparray = explode(':', $entityicon);
-		if (count($tmparray) >= 2)
-		{
+		if (count($tmparray) >= 2) {
 			$entityicon = $tmparray[0];
 			$entitylang = $tmparray[1];
 		}
@@ -782,22 +752,18 @@ if ($step == 3 && $datatoexport)
 
 		$tablename = getablenamefromfield($code, $sqlmaxforexport);
 		$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-		if (!empty($objexport->array_export_special[0][$code]))
-		{
+		if (!empty($objexport->array_export_special[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
 		} else {
 			$htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
-		if (!empty($objexport->array_export_examplevalues[0][$code]))
-		{
+		if (!empty($objexport->array_export_examplevalues[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
 		}
-		if (!empty($objexport->array_export_TypeFields[0][$code]))
-		{
+		if (!empty($objexport->array_export_TypeFields[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
 		}
-		if (!empty($objexport->array_export_help[0][$code]))
-		{
+		if (!empty($objexport->array_export_help[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("Help").':</b> '.$langs->trans($objexport->array_export_help[0][$code]).'<br>';
 		}
 
@@ -807,11 +773,9 @@ if ($step == 3 && $datatoexport)
 
 		// Filter value
 		print '<td>';
-		if (!empty($Typefieldsarray[$code]))	// Example: Text, List:c_country:label:rowid, Number, Boolean
-		{
+		if (!empty($Typefieldsarray[$code])) {	// Example: Text, List:c_country:label:rowid, Number, Boolean
 			$szInfoFiltre = $objexport->genDocFilter($Typefieldsarray[$code]);
-			if ($szInfoFiltre)	// Is there an info help for this filter ?
-			{
+			if ($szInfoFiltre) {	// Is there an info help for this filter ?
 				$tmp = $objexport->build_filterField($Typefieldsarray[$code], $code, $ValueFilter);
 				print $form->textwithpicto($tmp, $szInfoFiltre);
 			} else {
@@ -837,10 +801,8 @@ if ($step == 3 && $datatoexport)
 	print '</div>';
 }
 
-if ($step == 4 && $datatoexport)
-{
-	if (count($array_selected) < 1)     // This occurs when going back to page after sessecion expired
-	{
+if ($step == 4 && $datatoexport) {
+	if (count($array_selected) < 1) {     // This occurs when going back to page after sessecion expired
 		// Switch to step 2
 		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
 		exit;
@@ -862,8 +824,7 @@ if ($step == 4 && $datatoexport)
 	$h++;
 
 	// If filters exist
-	if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-	{
+	if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) {
 		$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
 		$head[$h][1] = $langs->trans("Step")." 3";
 		$h++;
@@ -888,20 +849,19 @@ if ($step == 4 && $datatoexport)
 	print $objexport->array_export_module[0]->getName();
 	print '</td></tr>';
 
-    // Lot de donnees a exporter
-    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-    print '<td>';
+	// Lot de donnees a exporter
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+	print '<td>';
 	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
 	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
-    print $objexport->array_export_label[0];
-    print '</td></tr>';
+	print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+	print $objexport->array_export_label[0];
+	print '</td></tr>';
 
 	// List of exported fields
 	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
 	$list = '';
-	foreach ($array_selected as $code=>$value)
-	{
+	foreach ($array_selected as $code => $value) {
 		$list .= (!empty($list) ? ', ' : '');
 		$list .= $langs->trans($objexport->array_export_fields[0][$code]);
 	}
@@ -909,19 +869,18 @@ if ($step == 4 && $datatoexport)
 	print '</tr>';
 
 	// List of filtered fiels
-	if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-	{
+	if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) {
 		print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
 		$list = '';
-		if (!empty($array_filtervalue))
-		{
-			foreach ($array_filtervalue as $code=>$value)
-			{
-				if (isset($objexport->array_export_fields[0][$code]))
-				{
+		if (!empty($array_filtervalue)) {
+			foreach ($array_filtervalue as $code => $value) {
+				if (isset($objexport->array_export_fields[0][$code])) {
 					$list .= ($list ? ', ' : '');
-					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
-					else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) {
+						$list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+					} else {
+						$list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+					}
 				}
 			}
 		}
@@ -949,8 +908,7 @@ if ($step == 4 && $datatoexport)
 	//print '<td>'.$langs->trans("FieldsTitle").'</td>';
 	print '</tr>';
 
-	foreach ($array_selected as $code=>$value)
-	{
+	foreach ($array_selected as $code => $value) {
 		print '<tr class="oddeven">';
 
 		$entity = (!empty($objexport->array_export_entities[0][$code]) ? $objexport->array_export_entities[0][$code] : $objexport->array_export_icon[0]);
@@ -960,8 +918,7 @@ if ($step == 4 && $datatoexport)
 		print '<td class="nowrap">';
 		// If value of entityicon=entitylang='icon:Label'
 		$tmparray = explode(':', $entityicon);
-		if (count($tmparray) >= 2)
-		{
+		if (count($tmparray) >= 2) {
 			$entityicon = $tmparray[0];
 			$entitylang = $tmparray[1];
 		}
@@ -974,22 +931,18 @@ if ($step == 4 && $datatoexport)
 
 		$tablename = getablenamefromfield($code, $sqlmaxforexport);
 		$htmltext = '<b>'.$langs->trans("Name").':</b> '.$text.'<br>';
-		if (!empty($objexport->array_export_special[0][$code]))
-		{
+		if (!empty($objexport->array_export_special[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("ComputedField")." -> ".$langs->trans("Method")." :</b> ".$objexport->array_export_special[0][$code]."<br>";
 		} else {
 			$htmltext .= '<b>'.$langs->trans("Table")." -> ".$langs->trans("Field").":</b> ".$tablename." -> ".preg_replace('/^.*\./', '', $code)."<br>";
 		}
-		if (!empty($objexport->array_export_examplevalues[0][$code]))
-		{
+		if (!empty($objexport->array_export_examplevalues[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("SourceExample").':</b> '.$objexport->array_export_examplevalues[0][$code].'<br>';
 		}
-		if (!empty($objexport->array_export_TypeFields[0][$code]))
-		{
+		if (!empty($objexport->array_export_TypeFields[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("Type").':</b> '.$objexport->array_export_TypeFields[0][$code].'<br>';
 		}
-		if (!empty($objexport->array_export_help[0][$code]))
-		{
+		if (!empty($objexport->array_export_help[0][$code])) {
 			$htmltext .= '<b>'.$langs->trans("Help").':</b> '.$langs->trans($objexport->array_export_help[0][$code]).'<br>';
 		}
 
@@ -1001,8 +954,12 @@ if ($step == 4 && $datatoexport)
 		print '<td class="right" width="100">';
 		print $value.' ';
 		print '</td><td class="center nowraponall" width="40">';
-		if ($value < count($array_selected)) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
-		if ($value > 1) print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
+		if ($value < count($array_selected)) {
+			print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=downfield&field='.$code.'">'.img_down().'</a>';
+		}
+		if ($value > 1) {
+			print '<a href="'.$_SERVER["PHP_SELF"].'?step='.$step.'&datatoexport='.$datatoexport.'&action=upfield&field='.$code.'">'.img_up().'</a>';
+		}
 		print '</td>';
 
 		//print '<td>&nbsp;</td>';
@@ -1017,13 +974,12 @@ if ($step == 4 && $datatoexport)
 	print '</div>';
 
 	/*
-     * Barre d'action
-     *
-     */
+	 * Barre d'action
+	 *
+	 */
 	print '<div class="tabsAction">';
 
-	if (count($array_selected))
-	{
+	if (count($array_selected)) {
 		print '<a class="butAction" href="export.php?step='.($step + 1).'&datatoexport='.$datatoexport.'">'.$langs->trans("NextStep").'</a>';
 	}
 
@@ -1031,8 +987,7 @@ if ($step == 4 && $datatoexport)
 
 
 	// Area for profils export
-	if (count($array_selected))
-	{
+	if (count($array_selected)) {
 		print '<br>';
 
 		print '<div class="marginbottomonly">';
@@ -1062,15 +1017,15 @@ if ($step == 4 && $datatoexport)
 		$sql = "SELECT rowid, label";
 		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
 		$sql .= " WHERE type = '".$db->escape($datatoexport)."'";
-		if (empty($conf->global->EXPORTS_SHARE_MODELS))$sql .= " AND fk_user=".$user->id;
+		if (empty($conf->global->EXPORTS_SHARE_MODELS)) {
+			$sql .= " AND fk_user=".$user->id;
+		}
 		$sql .= " ORDER BY rowid";
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven"><td>';
 				print $obj->label;
@@ -1092,10 +1047,8 @@ if ($step == 4 && $datatoexport)
 	}
 }
 
-if ($step == 5 && $datatoexport)
-{
-	if (count($array_selected) < 1)      // This occurs when going back to page after sessecion expired
-	{
+if ($step == 5 && $datatoexport) {
+	if (count($array_selected) < 1) {      // This occurs when going back to page after sessecion expired
 		// Switch to step 2
 		header("Location: ".DOL_URL_ROOT.'/exports/export.php?step=2&datatoexport='.$datatoexport);
 		exit;
@@ -1117,8 +1070,7 @@ if ($step == 5 && $datatoexport)
 	$h++;
 
 	// si le filtrage est parametre pour l'export ou pas
-	if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-	{
+	if ($usefilters && isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) {
 		$head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=3&datatoexport='.$datatoexport;
 		$head[$h][1] = $langs->trans("Step")." 3";
 		$h++;
@@ -1137,10 +1089,9 @@ if ($step == 5 && $datatoexport)
 	print dol_get_fiche_head($head, $hselected, '', -2);
 
 	/*
-     * Confirmation suppression fichier
-     */
-	if ($action == 'remove_file')
-	{
+	 * Confirmation suppression fichier
+	 */
+	if ($action == 'remove_file') {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport.'&file='.urlencode(GETPOST("file")), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
 	}
 
@@ -1156,39 +1107,37 @@ if ($step == 5 && $datatoexport)
 	print $objexport->array_export_module[0]->getName();
 	print '</td></tr>';
 
-    // Dataset to export
-    print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
-    print '<td>';
-    $entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
-    $entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
-    print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
-    print $objexport->array_export_label[0];
-    print '</td></tr>';
+	// Dataset to export
+	print '<tr><td>'.$langs->trans("DatasetToExport").'</td>';
+	print '<td>';
+	$entity = preg_replace('/:.*$/', '', $objexport->array_export_icon[0]);
+	$entityicon = strtolower(!empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity);
+	print img_object($objexport->array_export_module[0]->getName(), $entityicon).' ';
+	print $objexport->array_export_label[0];
+	print '</td></tr>';
 
 	// List of exported fields
 	print '<tr><td>'.$langs->trans("ExportedFields").'</td>';
 	$list = '';
-	foreach ($array_selected as $code=>$label)
-	{
+	foreach ($array_selected as $code => $label) {
 		$list .= (!empty($list) ? ', ' : '');
 		$list .= $langs->trans($objexport->array_export_fields[0][$code]);
 	}
 	print '<td>'.$list.'</td></tr>';
 
 	// List of filtered fields
-	if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0]))
-	{
+	if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) {
 		print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
 		$list = '';
-		if (!empty($array_filtervalue))
-		{
-			foreach ($array_filtervalue as $code=>$value)
-			{
-				if (isset($objexport->array_export_fields[0][$code]))
-				{
+		if (!empty($array_filtervalue)) {
+			foreach ($array_filtervalue as $code => $value) {
+				if (isset($objexport->array_export_fields[0][$code])) {
 					$list .= ($list ? ', ' : '');
-					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) $list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
-					else $list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) {
+						$list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+					} else {
+						$list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+					}
 				}
 			}
 		}
@@ -1211,10 +1160,8 @@ if ($step == 5 && $datatoexport)
 
 	$liste = $objmodelexport->liste_modeles($db);
 	$listeall = $liste;
-	foreach ($listeall as $key => $val)
-	{
-		if (preg_match('/__\(Disabled\)__/', $listeall[$key]))
-		{
+	foreach ($listeall as $key => $val) {
+		if (preg_match('/__\(Disabled\)__/', $listeall[$key])) {
 			$listeall[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $listeall[$key]);
 			unset($liste[$key]);
 		}
@@ -1237,13 +1184,14 @@ if ($step == 5 && $datatoexport)
 	print '</div>';
 
 
-	if ($sqlusedforexport && $user->admin)
-	{
+	if ($sqlusedforexport && $user->admin) {
 		print info_admin($langs->trans("SQLUsedForExport").':<br> '.$sqlusedforexport, 0, 0, 1, '', 'TechnicalInformation');
 	}
 
 
-	if (!is_dir($conf->export->dir_temp)) dol_mkdir($conf->export->dir_temp);
+	if (!is_dir($conf->export->dir_temp)) {
+		dol_mkdir($conf->export->dir_temp);
+	}
 
 	// Show existing generated documents
 	// NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
@@ -1273,8 +1221,9 @@ function getablenamefromfield($code, $sqlmaxforexport)
 	$newsql = preg_replace('/^(.*) FROM /i', '', $newsql); // Remove part before the FROM
 	$newsql = preg_replace('/WHERE (.*)$/i', '', $newsql); // Remove part after the WHERE so we have now only list of table aliases in a string. We must keep the ' ' before WHERE
 
-	if (preg_match($regexstring, $newsql, $reg))
-	{
+	if (preg_match($regexstring, $newsql, $reg)) {
 		return $reg[1]; // The tablename
-	} else return '';
+	} else {
+		return '';
+	}
 }
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 79655a19b2f..3bff58453ab 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -48,8 +48,7 @@ print '<br>';
 
 
 print '<div class="center">';
-if (count($export->array_export_code))
-{
+if (count($export->array_export_code)) {
 	print dolGetButtonTitle($langs->trans('NewExport'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/exports/export.php?leftmenu=export', '', $user->rights->export->creer);
 }
 print '</div>';
@@ -71,10 +70,8 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 $model = new ModeleExports($db);
 $liste = $model->liste_modeles($db); // This is not a static method for exports because method load non static properties
 
-foreach ($liste as $key => $val)
-{
-	if (preg_match('/__\(Disabled\)__/', $liste[$key]))
-	{
+foreach ($liste as $key => $val) {
+	if (preg_match('/__\(Disabled\)__/', $liste[$key])) {
 		$liste[$key] = preg_replace('/__\(Disabled\)__/', '('.$langs->transnoentitiesnoconv("Disabled").')', $liste[$key]);
 	}
 
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index 66c6d265dec..47f0a3d57be 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -26,14 +26,17 @@
  *    \brief      Page de configuration du module externalsite
  */
 
-if (!defined('NOSCANPOSTFORINJECTION')) define('NOSCANPOSTFORINJECTION', '1'); // Do not check anti CSRF attack test
+if (!defined('NOSCANPOSTFORINJECTION')) {
+	define('NOSCANPOSTFORINJECTION', '1'); // Do not check anti CSRF attack test
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 
-if (!$user->admin)
+if (!$user->admin) {
 	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'externalsite'));
@@ -43,8 +46,7 @@ $def = array();
 $action = GETPOST('action', 'aZ09');
 
 // Sauvegardes parametres
-if ($action == 'update')
-{
+if ($action == 'update') {
 	$i = 0;
 
 	$db->begin();
@@ -55,8 +57,7 @@ if ($action == 'update')
 	$i += dolibarr_set_const($db, 'EXTERNALSITE_LABEL', trim($label), 'chaine', 0, '', $conf->entity);
 	$i += dolibarr_set_const($db, 'EXTERNALSITE_URL', trim($exturl), 'chaine', 0, '', $conf->entity);
 
-	if ($i >= 2)
-	{
+	if ($i >= 2) {
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 4827d832af4..04b48ba3cad 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -44,35 +44,29 @@ $keyforcontent = GETPOST('keyforcontent', 'aZ09');
  * View
  */
 
-if (empty($keyforcontent) && empty($conf->global->EXTERNALSITE_URL))
-{
+if (empty($keyforcontent) && empty($conf->global->EXTERNALSITE_URL)) {
 	llxHeader();
 	print '<div class="error">'.$langs->trans('ExternalSiteModuleNotComplete').'</div>';
 	llxFooter();
 	exit;
 }
 
-if (!empty($keyforcontent))
-{
+if (!empty($keyforcontent)) {
 	llxHeader();
 
 	print '<div class="framecontent" style="height: '.($_SESSION['dol_screenheight'] - 90).'px">';
 
 	if (!preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent)
-		 && !preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
-	{
+		 && !preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent)) {
 		$langs->load("errors");
 		print $langs->trans("ErrorBadSyntaxForParamKeyForContent", 'EXTERNAL_SITE_CONTENT_', 'EXTERNAL_SITE_URL_');
-	} elseif (empty($conf->global->$keyforcontent))
-	{
+	} elseif (empty($conf->global->$keyforcontent)) {
 		$langs->load("errors");
 		print $langs->trans("ErrorVariableKeyForContentMustBeSet", 'EXTERNAL_SITE_CONTENT_'.$keyforcontent, 'EXTERNAL_SITE_URL_'.$keyforcontent);
 	} else {
-		if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent))
-		{
+		if (preg_match('/EXTERNAL_SITE_CONTENT_/', $keyforcontent)) {
 			print $conf->global->$keyforcontent;
-		} elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent))
-		{
+		} elseif (preg_match('/EXTERNAL_SITE_URL_/', $keyforcontent)) {
 			/*print "
 			<html>
 			<head>
@@ -80,17 +74,17 @@ if (!empty($keyforcontent))
 			</head>
 
 			<frameset ".(empty($conf->global->MAIN_MENU_INVERT)?"rows":"cols")."=\"".$heightforframes.",*\" border=0 framespacing=0 frameborder=0>
-			    <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
+				<frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
 			  ";
 					print '<frame name="main" src="';
 					print $conf->global->$keyforcontent;
 					print '">';
 					print "
-			    <noframes>
-			    <body>
+				<noframes>
+				<body>
 
-			    </body>
-			    </noframes>
+				</body>
+				</noframes>
 			</frameset>
 
 			<noframes>
@@ -111,8 +105,7 @@ if (!empty($keyforcontent))
 	print '<div>';
 	llxFooter();
 } else {
-	if (preg_match('/^\//', $conf->global->EXTERNALSITE_URL) || preg_match('/^http/i', $conf->global->EXTERNALSITE_URL))
-	{
+	if (preg_match('/^\//', $conf->global->EXTERNALSITE_URL) || preg_match('/^http/i', $conf->global->EXTERNALSITE_URL)) {
 		print "
 	<html>
 	<head>
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 0fa5a930f05..2fec51a0f5b 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -39,13 +39,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'fichinter'; //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -77,8 +81,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -91,8 +94,7 @@ if ($action != 'create' && $action != 'edit')
 /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -104,8 +106,7 @@ if ($action == 'create')
 /* Edition of an optional field                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index f648548c3b4..1cbdeb4cf0a 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -39,13 +39,17 @@ $form = new Form($db);
 // List of supported format
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key] = $langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+	$type2label[$key] = $langs->transnoentitiesnoconv($val);
+}
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'fichinterdet'; //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -78,8 +82,7 @@ print dol_get_fiche_end();
 
 
 // Buttons
-if ($action != 'create' && $action != 'edit')
-{
+if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
 	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
 	print "</div>";
@@ -92,8 +95,7 @@ if ($action != 'create' && $action != 'edit')
  /*                                                                            */
 /* ************************************************************************** */
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
@@ -105,8 +107,7 @@ if ($action == 'create')
 /* Edition d'un champ optionnel                                               */
 /*                                                                            */
 /* ************************************************************************** */
-if ($action == 'edit' && !empty($attrname))
-{
+if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index bee9ac1c9fe..775f83ef500 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -52,22 +52,29 @@ $langs->loadLangs(array("interventions", "admin", "compta", "bills"));
 // Security check
 $id = (GETPOST('fichinterid', 'int') ?GETPOST('fichinterid', 'int') : GETPOST('id', 'int'));
 $action = GETPOST('action', 'aZ09');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $objecttype = 'fichinter_rec';
-if ($action == "create" || $action == "add") $objecttype = '';
+if ($action == "create" || $action == "add") {
+	$objecttype = '';
+}
 $result = restrictedArea($user, 'ficheinter', $id, $objecttype);
 
-if ($page == -1)
+if ($page == -1) {
 	$page = 0;
+}
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
-if ($sortorder == "")
+if ($sortorder == "") {
 	$sortorder = "DESC";
+}
 
-if ($sortfield == "")
+if ($sortfield == "") {
 	$sortfield = "f.datec";
+}
 
 $object = new FichinterRec($db);
 $extrafields = new ExtraFields($db);
@@ -212,7 +219,9 @@ if ($action == 'add') {
 	// Set next date of execution
 	$object->fetch($id);
 	$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
-	if (!empty($date)) $object->setNextDate($date);
+	if (!empty($date)) {
+		$object->setNextDate($date);
+	}
 } elseif ($action == 'setnb_gen_max' && $user->rights->ficheinter->creer) {
 	// Set max period
 	$object->fetch($id);
@@ -261,8 +270,12 @@ if ($action == 'create') {
 		print dol_get_fiche_head();
 
 		$rowspan = 4;
-		if (!empty($conf->projet->enabled) && $object->fk_project > 0) $rowspan++;
-		if (!empty($conf->contrat->enabled) && $object->fk_contrat > 0) $rowspan++;
+		if (!empty($conf->projet->enabled) && $object->fk_project > 0) {
+			$rowspan++;
+		}
+		if (!empty($conf->contrat->enabled) && $object->fk_contrat > 0) {
+			$rowspan++;
+		}
 
 		print '<table class="border centpercent">';
 
@@ -595,9 +608,11 @@ if ($action == 'create') {
 				print '<td class="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
 				print '</tr></table></form>';
 			} else {
-				if ($object->frequency > 0)
+				if ($object->frequency > 0) {
 					print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
-				else print $langs->trans("NotARecurringInterventionalTemplate");
+				} else {
+					print $langs->trans("NotARecurringInterventionalTemplate");
+				}
 			}
 			print '</td></tr>';
 
@@ -619,12 +634,16 @@ if ($action == 'create') {
 			print '<tr><td>';
 			if ($user->rights->ficheinter->creer && ($action == 'nb_gen_max' || $object->frequency > 0)) {
 				print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $user->rights->facture->creer);
-			} else print $langs->trans("MaxPeriodNumber");
+			} else {
+				print $langs->trans("MaxPeriodNumber");
+			}
 
 			print '</td><td>';
 			if ($action == 'nb_gen_max' || $object->frequency > 0) {
 				print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $user->rights->facture->creer);
-			} else print '';
+			} else {
+				print '';
+			}
 
 			print '</td>';
 			print '</tr>';
@@ -688,13 +707,19 @@ if ($action == 'create') {
 			$i = 0;
 			while ($i < $num) {
 				// Show product and description
-				if (isset($object->lines[$i]->product_type))
+				if (isset($object->lines[$i]->product_type)) {
 					$type = $object->lines[$i]->product_type;
-				else $object->lines[$i]->fk_product_type;
+				} else {
+					$object->lines[$i]->fk_product_type;
+				}
 				// Try to enhance type detection using date_start and date_end for free lines when type
 				// was not saved.
-				if (!empty($objp->date_start)) $type = 1;
-				if (!empty($objp->date_end)) $type = 1;
+				if (!empty($objp->date_start)) {
+					$type = 1;
+				}
+				if (!empty($objp->date_end)) {
+					$type = 1;
+				}
 
 				// Show line
 				print '<tr class="oddeven">';
@@ -727,7 +752,9 @@ if ($action == 'create') {
 				print $langs->trans('Delete').'</a></div>';
 			}
 			print '</div>';
-		} else print $langs->trans("ErrorRecordNotFound");
+		} else {
+			print $langs->trans("ErrorRecordNotFound");
+		}
 	} else {
 		/*
 		 *  List mode
@@ -743,14 +770,24 @@ if ($action == 'create') {
 		}
 		$sql .= " WHERE f.fk_soc = s.rowid";
 		$sql .= " AND f.entity = ".$conf->entity;
-		if ($socid)	$sql .= " AND s.rowid = ".$socid;
+		if ($socid) {
+			$sql .= " AND s.rowid = ".$socid;
+		}
 		if (!$user->rights->societe->client->voir && !$socid) {
 			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 		}
-		if ($search_ref) $sql .= natural_search('f.titre', $search_ref);
-		if ($search_societe) $sql .= natural_search('s.nom', $search_societe);
-		if ($search_frequency == '1') $sql .= ' AND f.frequency > 0';
-		if ($search_frequency == '0') $sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
+		if ($search_ref) {
+			$sql .= natural_search('f.titre', $search_ref);
+		}
+		if ($search_societe) {
+			$sql .= natural_search('s.nom', $search_societe);
+		}
+		if ($search_frequency == '1') {
+			$sql .= ' AND f.frequency > 0';
+		}
+		if ($search_frequency == '0') {
+			$sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
+		}
 
 
 		//$sql .= " ORDER BY $sortfield $sortorder, rowid DESC ";
@@ -855,8 +892,12 @@ if ($action == 'create') {
 								print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=createfrommodel';
 								print '&socid='.$objp->socid.'&id='.$objp->fich_rec.'">';
 								print $langs->trans("CreateFichInter").'</a>';
-							} else print $langs->trans("DateIsNotEnough");
-						} else print "&nbsp;";
+							} else {
+								print $langs->trans("DateIsNotEnough");
+							}
+						} else {
+							print "&nbsp;";
+						}
 
 						print "</td>";
 
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 6c1dd4ddeb2..d1507d52418 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -36,18 +36,15 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-if ($conf->contrat->enabled)
-{
+if ($conf->contrat->enabled) {
 	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
 	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 }
-if (!empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php"))
-{
+if (!empty($conf->global->FICHEINTER_ADDON) && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.".php")) {
 	require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_".$conf->global->FICHEINTER_ADDON.'.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -75,7 +72,9 @@ $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($
 $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -87,11 +86,14 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref);
-	if ($ret > 0) $ret = $object->fetch_thirdparty();
-	if ($ret < 0) dol_print_error('', $object->error);
+	if ($ret > 0) {
+		$ret = $object->fetch_thirdparty();
+	}
+	if ($ret < 0) {
+		dol_print_error('', $object->error);
+	}
 }
 
 $permissionnote = $user->rights->ficheinter->creer; // Used by the include of actions_setnotes.inc.php
@@ -106,14 +108,13 @@ $error = 0;
 
 $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))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -125,20 +126,16 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-	{
-		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
-		{
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $user->rights->ficheinter->creer) {
+		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
-			if ($object->id > 0)
-			{
+			if ($object->id > 0) {
 				// Because createFromClone modifies the object, we must clone it so that we can restore it later
 				$orig = clone $object;
 
 				$result = $object->createFromClone($user, $socid);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
 				} else {
@@ -150,21 +147,21 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-	{
+	if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->ficheinter->creer) {
 		$result = $object->setValid($user);
 
-		if ($result >= 0)
-		{
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+		if ($result >= 0) {
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				// Define output language
 				$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 = $object->thirdparty->default_lang;
-				if (!empty($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 = $object->thirdparty->default_lang;
+				}
+				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
 				}
@@ -178,15 +175,17 @@ if (empty($reshook))
 		}
 	} elseif ($action == 'confirm_modify' && $confirm == 'yes' && $user->rights->ficheinter->creer) {
 		$result = $object->setDraft($user);
-		if ($result >= 0)
-		{
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+		if ($result >= 0) {
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				// Define output language
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -212,16 +211,13 @@ if (empty($reshook))
 		$object->note_private = GETPOST('note_private', 'restricthtml');
 		$object->note_public = GETPOST('note_public', 'restricthtml');
 
-		if ($object->socid > 0)
-		{
+		if ($object->socid > 0) {
 			// If creation from another object of another module (Example: origin=propal, originid=1)
-			if (!empty($origin) && !empty($originid))
-			{
+			if (!empty($origin) && !empty($originid)) {
 				// Parse element/subelement (ex: project_task)
 				$regs = array();
 				$element = $subelement = GETPOST('origin', 'alphanohtml');
-				if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin', 'alphanohtml'), $regs))
-				{
+				if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin', 'alphanohtml'), $regs)) {
 					$element = $regs[1];
 					$subelement = $regs[2];
 				}
@@ -242,8 +238,7 @@ if (empty($reshook))
 
 				// Possibility to add external linked objects with hooks
 				$object->linked_objects[$object->origin] = $object->origin_id;
-				if (is_array($_POST['other_linked_objects']) && !empty($_POST['other_linked_objects']))
-				{
+				if (is_array($_POST['other_linked_objects']) && !empty($_POST['other_linked_objects'])) {
 					$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
 				}
 
@@ -261,8 +256,7 @@ if (empty($reshook))
 
 				$id = $object->create($user);
 
-				if ($id > 0)
-				{
+				if ($id > 0) {
 					dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 					$classname = ucfirst($subelement);
@@ -270,12 +264,10 @@ if (empty($reshook))
 
 					dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 					$result = $srcobject->fetch($object->origin_id);
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$srcobject->fetch_thirdparty();
 						$lines = $srcobject->lines;
-						if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
-						{
+						if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {
 							$srcobject->fetch_lines();
 							$lines = $srcobject->lines;
 						}
@@ -283,9 +275,10 @@ if (empty($reshook))
 						if (is_array($lines)) {
 							$num = count($lines);
 
-							for ($i = 0; $i < $num; $i++)
-							{
-								if (!in_array($lines[$i]->id, $selectedLines)) continue; // Skip unselected lines
+							for ($i = 0; $i < $num; $i++) {
+								if (!in_array($lines[$i]->id, $selectedLines)) {
+									continue; // Skip unselected lines
+								}
 
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : Product::TYPE_PRODUCT);
 
@@ -293,8 +286,7 @@ if (empty($reshook))
 									$duration = 3600; // Default to one hour
 
 									// Predefined products & services
-									if ($lines[$i]->fk_product > 0)
-									{
+									if ($lines[$i]->fk_product > 0) {
 										$prod = new Product($db);
 										$prod->id = $lines[$i]->fk_product;
 
@@ -305,8 +297,12 @@ if (empty($reshook))
 											$prod->fetch($lines[$i]->fk_product);
 											$outputlangs = $langs;
 											$newlang = '';
-											if (empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-											if (empty($newlang)) $newlang = $srcobject->thirdparty->default_lang;
+											if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+												$newlang = GETPOST('lang_id', 'aZ09');
+											}
+											if (empty($newlang)) {
+												$newlang = $srcobject->thirdparty->default_lang;
+											}
 											if (!empty($newlang)) {
 												$outputlangs = new Translate("", $conf);
 												$outputlangs->setDefaultLang($newlang);
@@ -367,12 +363,11 @@ if (empty($reshook))
 										$id,
 										$desc,
 										$date_intervention,
-						 				$duration,
-						 				$array_options
+										$duration,
+										$array_options
 									);
 
-									if ($result < 0)
-									{
+									if ($result < 0) {
 										$error++;
 										break;
 									}
@@ -395,16 +390,14 @@ if (empty($reshook))
 					$action = 'create';
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Extrafields
 					$array_options = $extrafields->getOptionalsFromPost($object->table_element);
 
 					$object->array_options = $array_options;
 
 					$result = $object->create($user);
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$id = $result; // Force raffraichissement sur fiche venant d'etre cree
 					} else {
 						$langs->load("errors");
@@ -429,22 +422,19 @@ if (empty($reshook))
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Set into a project
-	elseif ($action == 'classin' && $user->rights->ficheinter->creer)
-	{
+	} elseif ($action == 'classin' && $user->rights->ficheinter->creer) {
+		// Set into a project
 		$result = $object->setProject(GETPOST('projectid', 'int'));
-		if ($result < 0) dol_print_error($db, $object->error);
-	}
-
-	// Set into a contract
-	elseif ($action == 'setcontract' && $user->rights->contrat->creer)
-	{
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
+	} elseif ($action == 'setcontract' && $user->rights->contrat->creer) {
+		// Set into a contract
 		$result = $object->set_contrat($user, GETPOST('contratid', 'int'));
-		if ($result < 0) dol_print_error($db, $object->error);
-	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer)
-	{
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
+	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer) {
 		$result = $object->delete($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -452,32 +442,26 @@ if (empty($reshook))
 
 		header('Location: '.DOL_URL_ROOT.'/fichinter/list.php?leftmenu=ficheinter&restore_lastsearch_values=1');
 		exit;
-	} elseif ($action == 'setdescription' && $user->rights->ficheinter->creer)
-	{
+	} elseif ($action == 'setdescription' && $user->rights->ficheinter->creer) {
 		$result = $object->set_description($user, GETPOST('description'));
-		if ($result < 0) dol_print_error($db, $object->error);
-	}
-
-	// Add line
-	elseif ($action == "addline" && $user->rights->ficheinter->creer)
-	{
-		if (!GETPOST('np_desc', 'restricthtml') && empty($conf->global->FICHINTER_EMPTY_LINE_DESC))
- 		{
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
+	} elseif ($action == "addline" && $user->rights->ficheinter->creer) {
+		// Add line
+		if (!GETPOST('np_desc', 'restricthtml') && empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Description"));
 			$error++;
 		}
-		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && !GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int'))
-		{
+		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && !GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Duration"));
 			$error++;
 		}
-		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && GETPOST('durationhour', 'int') >= 24 && GETPOST('durationmin', 'int') > 0)
-		{
+		if (empty($conf->global->FICHINTER_WITHOUT_DURATION) && GETPOST('durationhour', 'int') >= 24 && GETPOST('durationmin', 'int') > 0) {
 			$mesg = $langs->trans("ErrorValueTooHigh");
 			$error++;
 		}
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			$desc = GETPOST('np_desc', 'restricthtml');
@@ -500,19 +484,23 @@ if (empty($reshook))
 			// Define output language
 			$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 = $object->thirdparty->default_lang;
-			if (!empty($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 = $object->thirdparty->default_lang;
+			}
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				$db->commit();
 
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+					fichinter_create($db, $object, $object->model_pdf, $outputlangs);
+				}
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 				exit;
 			} else {
@@ -520,11 +508,8 @@ if (empty($reshook))
 				$db->rollback();
 			}
 		}
-	}
-
-	// Classify Billed
-	elseif ($action == 'classifybilled' && $user->rights->ficheinter->creer)
-	{
+	} elseif ($action == 'classifybilled' && $user->rights->ficheinter->creer) {
+		// Classify Billed
 		$result = $object->setStatut(2);
 		if ($result > 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
@@ -532,61 +517,42 @@ if (empty($reshook))
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Classify unbilled
-	elseif ($action == 'classifyunbilled' && $user->rights->ficheinter->creer)
-	{
+	} elseif ($action == 'classifyunbilled' && $user->rights->ficheinter->creer) {
+		// Classify unbilled
 		$result = $object->setStatut(1);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
 		}
-	}
-
-	// Classify Done
-	elseif ($action == 'classifydone' && $user->rights->ficheinter->creer)
-	{
+	} elseif ($action == 'classifydone' && $user->rights->ficheinter->creer) {
+		// Classify Done
 		$result = $object->setStatut(3);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
-	}
-
-	// Reopen
-	elseif ($action == 'confirm_reopen' && $user->rights->ficheinter->creer)
-	{
+	} elseif ($action == 'confirm_reopen' && $user->rights->ficheinter->creer) {
+		// Reopen
 		$result = $object->setStatut(Fichinter::STATUS_VALIDATED);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
-		}
-		else {
+		} else {
 			$mesg = $object->error;
 		}
-	}
-
-	/*
-	 *  Mise a jour d'une ligne d'intervention
-	 */
-	elseif ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save', 'alpha') == $langs->trans("Save")) {
+	} elseif ($action == 'updateline' && $user->rights->ficheinter->creer && GETPOST('save', 'alpha') == $langs->trans("Save")) {
+		// Mise a jour d'une ligne d'intervention
 		$objectline = new FichinterLigne($db);
-		if ($objectline->fetch($lineid) <= 0)
-		{
+		if ($objectline->fetch($lineid) <= 0) {
 			dol_print_error($db);
 			exit;
 		}
 
-		if ($object->fetch($objectline->fk_fichinter) <= 0)
-		{
+		if ($object->fetch($objectline->fk_fichinter) <= 0) {
 			dol_print_error($db);
 			exit;
 		}
@@ -606,8 +572,7 @@ if (empty($reshook))
 		$objectline->array_options = $array_options;
 
 		$result = $objectline->update($user);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			dol_print_error($db);
 			exit;
 		}
@@ -615,34 +580,32 @@ if (empty($reshook))
 		// Define output language
 		$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 = $object->thirdparty->default_lang;
-		if (!empty($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 = $object->thirdparty->default_lang;
+		}
+		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
+		}
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
-	}
-
-	/*
-	 *  Supprime une ligne d'intervention AVEC confirmation
-	*/
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->ficheinter->creer)
-	{
+	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->ficheinter->creer) {
+		// Supprime une ligne d'intervention AVEC confirmation
 		$objectline = new FichinterLigne($db);
-		if ($objectline->fetch($lineid) <= 0)
-		{
+		if ($objectline->fetch($lineid) <= 0) {
 			dol_print_error($db);
 			exit;
 		}
 		$result = $objectline->deleteline($user);
 
-		if ($object->fetch($objectline->fk_fichinter) <= 0)
-		{
+		if ($object->fetch($objectline->fk_fichinter) <= 0) {
 			dol_print_error($db);
 			exit;
 		}
@@ -650,52 +613,61 @@ if (empty($reshook))
 		// Define output language
 		$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 = $object->thirdparty->default_lang;
-		if (!empty($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 = $object->thirdparty->default_lang;
+		}
+		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
-	}
-
-	/*
-	 * Set position of lines
-	 */
-	elseif ($action == 'up' && $user->rights->ficheinter->creer)
-	{
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
+		}
+	} elseif ($action == 'up' && $user->rights->ficheinter->creer) {
+		// Set position of lines
 		$object->line_up($lineid);
 
 		// Define output language
 		$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 = $object->thirdparty->default_lang;
-		if (!empty($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 = $object->thirdparty->default_lang;
+		}
+		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
+		}
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid);
 		exit;
-	} elseif ($action == 'down' && $user->rights->ficheinter->creer)
-	{
+	} elseif ($action == 'down' && $user->rights->ficheinter->creer) {
 		$object->line_down($lineid);
 
 		// Define output language
 		$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 = $object->thirdparty->default_lang;
-		if (!empty($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 = $object->thirdparty->default_lang;
+		}
+		if (!empty($newlang)) {
 			$outputlangs = new Translate("", $conf);
 			$outputlangs->setDefaultLang($newlang);
 		}
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) fichinter_create($db, $object, $object->model_pdf, $outputlangs);
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			fichinter_create($db, $object, $object->model_pdf, $outputlangs);
+		}
 
 		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.$lineid);
 		exit;
@@ -715,66 +687,55 @@ if (empty($reshook))
 	$permissiontoadd = $user->rights->ficheinter->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
-	if ($action == 'update_extras')
-	{
+	if ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Actions on extra fields
 			$result = $object->insertExtraFields('INTERVENTION_MODIFY');
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if ($error) $action = 'edit_extras';
+		if ($error) {
+			$action = 'edit_extras';
+		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer)
-	{
-		if ($action == 'addcontact')
-		{
-			if ($result > 0 && $id > 0)
-			{
+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $user->rights->ficheinter->creer) {
+		if ($action == 'addcontact') {
+			if ($result > 0 && $id > 0) {
 				$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			} else {
-				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$langs->load("errors");
 					$mesg = $langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType");
 				} else {
 					$mesg = $object->error;
 				}
 			}
-		}
-
-		// bascule du statut d'un contact
-		elseif ($action == 'swapstatut')
-		{
+		} elseif ($action == 'swapstatut') {
+			// bascule du statut d'un contact
 			$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-		}
-
-		// Efface un contact
-		elseif ($action == 'deletecontact')
-		{
+		} elseif ($action == 'deletecontact') {
+			// Efface un contact
 			$result = $object->delete_contact(GETPOST('lineid', 'int'));
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			} else {
@@ -791,13 +752,16 @@ if (empty($reshook))
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if ($conf->contrat->enabled) $formcontract = new FormContract($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if ($conf->contrat->enabled) {
+	$formcontract = new FormContract($db);
+}
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 llxHeader('', $langs->trans("Intervention"));
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	// Create new intervention
 
 	$soc = new Societe($db);
@@ -810,21 +774,20 @@ if ($action == 'create')
 		dol_htmloutput_mesg($mesg);
 	}
 
-	if ($socid) $res = $soc->fetch($socid);
+	if ($socid) {
+		$res = $soc->fetch($socid);
+	}
 
-	if (GETPOST('origin', 'alphanohtml') && GETPOST('originid', 'int'))
-	{
+	if (GETPOST('origin', 'alphanohtml') && GETPOST('originid', 'int')) {
 		// Parse element/subelement (ex: project_task)
 		$regs = array();
 		$element = $subelement = GETPOST('origin', 'alphanohtml');
-		if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin', 'alphanohtml'), $regs))
-		{
+		if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin', 'alphanohtml'), $regs)) {
 			$element = $regs[1];
 			$subelement = $regs[2];
 		}
 
-		if ($element == 'project')
-		{
+		if ($element == 'project') {
 			$projectid = GETPOST('originid', 'int');
 		} else {
 			// For compatibility
@@ -843,8 +806,7 @@ if ($action == 'create')
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
 			$objectsrc->fetch(GETPOST('originid'));
-			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
-			{
+			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 				$objectsrc->fetch_lines();
 				$lines = $objectsrc->lines;
 			}
@@ -864,8 +826,7 @@ if ($action == 'create')
 		$projectid = GETPOST('projectid', 'int');
 	}
 
-	if (!$conf->global->FICHEINTER_ADDON)
-	{
+	if (!$conf->global->FICHEINTER_ADDON) {
 		dol_print_error($db, $langs->trans("Error")." ".$langs->trans("Error_FICHEINTER_ADDON_NotDefined"));
 		exit;
 	}
@@ -878,8 +839,7 @@ if ($action == 'create')
 	//$modFicheinter = new $obj;
 	//$numpr = $modFicheinter->getNextValue($soc, $object);
 
-	if ($socid > 0)
-	{
+	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 
@@ -904,35 +864,31 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$formproject = new FormProjets($db);
 
 			$langs->load("project");
 
 			print '<tr><td>'.$langs->trans("Project").'</td><td>';
 			/* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
-            if ($societe->fournisseur==1)
-            	$numprojet=select_projects(-1,$_POST["projectid"],'projectid');
-            else
-            	$numprojet=select_projects($societe->id,$_POST["projectid"],'projectid');
-            	*/
+			if ($societe->fournisseur==1)
+				$numprojet=select_projects(-1,$_POST["projectid"],'projectid');
+			else
+				$numprojet=select_projects($societe->id,$_POST["projectid"],'projectid');
+				*/
 			$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid');
-			if ($numprojet == 0)
-			{
+			if ($numprojet == 0) {
 				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 			}
 			print '</td></tr>';
 		}
 
 		// Contract
-		if ($conf->contrat->enabled)
-		{
+		if ($conf->contrat->enabled) {
 			$langs->load("contracts");
 			print '<tr><td>'.$langs->trans("Contract").'</td><td>';
 			$numcontrat = $formcontract->select_contract($soc->id, GETPOST('contratid', 'int'), 'contratid', 0, 1, 1);
-			if ($numcontrat == 0)
-			{
+			if ($numcontrat == 0) {
 				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddContract").'"></span></a>';
 			}
 			print '</td></tr>';
@@ -956,8 +912,7 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Private note
-		if (empty($user->socid))
-		{
+		if (empty($user->socid)) {
 			print '<tr>';
 			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
 			print '<td>';
@@ -971,47 +926,46 @@ if ($action == 'create')
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			print $object->showOptionals($extrafields, 'edit');
 		}
 
 		// Show link to origin object
-		if (!empty($origin) && !empty($originid) && is_object($objectsrc))
-		{
+		if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
 			$newclassname = $classname;
-			if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
+			if ($newclassname == 'Propal') {
+				$newclassname = 'CommercialProposal';
+			}
 			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
 
 			// Amount
 			/* Hide amount because we only copy services so amount may differ than source
-        	print '<tr><td>' . $langs->trans('AmountHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
-        	print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
-        	if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
-        	{
-        		print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1) . "</td></tr>";
-        	}
+			print '<tr><td>' . $langs->trans('AmountHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
+			print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
+			if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
+			{
+				print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax1) . "</td></tr>";
+			}
 
-        	if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
-        	{
-        		print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2) . "</td></tr>";
-        	}
+			if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
+			{
+				print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td><td>' . price($objectsrc->total_localtax2) . "</td></tr>";
+			}
 
-        	print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td>' . price($objectsrc->total_ttc) . "</td></tr>";
+			print '<tr><td>' . $langs->trans('AmountTTC') . '</td><td>' . price($objectsrc->total_ttc) . "</td></tr>";
 
-        	if (!empty($conf->multicurrency->enabled))
-        	{
-        		print '<tr><td>' . $langs->trans('MulticurrencyAmountHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
-        		print '<tr><td>' . $langs->trans('MulticurrencyAmountVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
-        		print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
-        	}
-        	*/
+			if (!empty($conf->multicurrency->enabled))
+			{
+				print '<tr><td>' . $langs->trans('MulticurrencyAmountHT') . '</td><td>' . price($objectsrc->multicurrency_total_ht) . '</td></tr>';
+				print '<tr><td>' . $langs->trans('MulticurrencyAmountVAT') . '</td><td>' . price($objectsrc->multicurrency_total_tva) . "</td></tr>";
+				print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
+			}
+			*/
 		}
 
 		print '</table>';
 
-		if (is_object($objectsrc))
-		{
+		if (is_object($objectsrc)) {
 			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
 			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 		} elseif ($origin == 'project' && !empty($projectid)) {
@@ -1045,8 +999,7 @@ if ($action == 'create')
 
 		print dol_get_fiche_head('');
 
-		if (is_object($objectsrc))
-		{
+		if (is_object($objectsrc)) {
 			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
 			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 		} elseif ($origin == 'project' && !empty($projectid)) {
@@ -1070,11 +1023,10 @@ if ($action == 'create')
 
 		print '</form>';
 	}
-} elseif ($id > 0 || !empty($ref))
-{
+} elseif ($id > 0 || !empty($ref)) {
 	/*
 	 * Affichage en mode visu
- 	 */
+	  */
 
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
@@ -1095,21 +1047,17 @@ if ($action == 'create')
 	$formconfirm = '';
 
 	// Confirm deletion of intervention
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteIntervention'), $langs->trans('ConfirmDeleteIntervention'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Confirm validation
-	if ($action == 'validate')
-	{
+	if ($action == 'validate') {
 		// on verifie si l'objet est en numerotation provisoire
 		$ref = substr($object->ref, 1, 4);
-		if ($ref == 'PROV')
-		{
+		if ($ref == 'PROV') {
 			$numref = $object->getNextNumRef($soc);
-			if (empty($numref))
-			{
+			if (empty($numref)) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
@@ -1122,20 +1070,17 @@ if ($action == 'create')
 	}
 
 	// Confirm back to draft
-	if ($action == 'modify')
-	{
+	if ($action == 'modify') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ModifyIntervention'), $langs->trans('ConfirmModifyIntervention'), 'confirm_modify', '', 0, 1);
 	}
 
 	// Confirm back to open
-	if ($action == 'reopen')
-	{
+	if ($action == 'reopen') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Reopen'), $langs->trans('ConfirmReopenIntervention', $object->ref), 'confirm_reopen', '', 0, 1);
 	}
 
 	// Confirm deletion of line
-	if ($action == 'ask_deleteline')
-	{
+	if ($action == 'ask_deleteline') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&line_id='.$lineid, $langs->trans('DeleteInterventionLine'), $langs->trans('ConfirmDeleteInterventionLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
@@ -1153,12 +1098,14 @@ if ($action == 'create')
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneIntervention', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 	}
 
-	if (!$formconfirm)
-	{
+	if (!$formconfirm) {
 		$parameters = array('formConfirm' => $formconfirm, 'lineid'=>$lineid);
 		$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-		elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+		if (empty($reshook)) {
+			$formconfirm .= $hookmanager->resPrint;
+		} elseif ($reshook > 0) {
+			$formconfirm = $hookmanager->resPrint;
+		}
 	}
 
 	// Print form confirm
@@ -1176,12 +1123,10 @@ if ($action == 'create')
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->ficheinter->creer)
-		{
+		if ($user->rights->ficheinter->creer) {
 			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 			}
@@ -1219,8 +1164,7 @@ if ($action == 'create')
 
 	print '<table class="border tableforfield" width="100%">';
 
-	if (!empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES))
-	{
+	if (!empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES)) {
 		// Date Start
 		print '<tr><td class="titlefield">'.$langs->trans("Dateo").'</td>';
 		print '<td>';
@@ -1252,8 +1196,7 @@ if ($action == 'create')
 	print '</tr>';
 
 	// Contract
-	if ($conf->contrat->enabled)
-	{
+	if ($conf->contrat->enabled) {
 		$langs->load('contracts');
 		print '<tr>';
 		print '<td>';
@@ -1261,21 +1204,18 @@ if ($action == 'create')
 		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('Contract');
 		print '</td>';
-		if ($action != 'contrat')
-		{
+		if ($action != 'contrat') {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=contrat&amp;id='.$object->id.'">';
 			print img_edit($langs->trans('SetContract'), 1);
 			print '</a></td>';
 		}
 		print '</tr></table>';
 		print '</td><td>';
-		if ($action == 'contrat')
-		{
+		if ($action == 'contrat') {
 			$formcontract = new Formcontract($db);
 			$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1, 1);
 		} else {
-			if ($object->fk_contrat)
-			{
+			if ($object->fk_contrat) {
 				$contratstatic = new Contrat($db);
 				$contratstatic->fetch($object->fk_contrat);
 				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
@@ -1301,8 +1241,7 @@ if ($action == 'create')
 
 	print '<table class="border tableforfield centpercent">';
 
-	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
-	{
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 		// Duration
 		print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
 		print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
@@ -1318,23 +1257,20 @@ if ($action == 'create')
 	print '<div class="clearboth"></div><br>';
 
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$blocname = 'contacts';
 		$title = $langs->trans('ContactsAddresses');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$blocname = 'notes';
 		$title = $langs->trans('Notes');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 	}
 
 	// Line of interventions
- 	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
- 	{
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" name="addinter" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
@@ -1356,13 +1292,11 @@ if ($action == 'create')
 		$sql .= ' ORDER BY ft.rang ASC, ft.date ASC, ft.rowid';
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
 
-			if ($num)
-			{
+			if ($num) {
 				print '<br>';
 				print '<table class="noborder centpercent">';
 				print '<tr class="liste_titre">';
@@ -1404,8 +1338,7 @@ if ($action == 'create')
 					print "</td>\n";
 
 					// Icon to edit and delete
-					if ($object->statut == 0 && $user->rights->ficheinter->creer)
-					{
+					if ($object->statut == 0 && $user->rights->ficheinter->creer) {
 						print '<td class="center">';
 						print '<a class="editfielda marginrightonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;line_id='.$objp->rowid.'#'.$objp->rowid.'">';
 						print img_edit();
@@ -1414,16 +1347,13 @@ if ($action == 'create')
 						print img_delete();
 						print '</a></td>';
 						print '<td class="center">';
-						if ($num > 1)
-						{
-							if ($i > 0)
-							{
+						if ($num > 1) {
+							if ($i > 0) {
 								print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=up&amp;line_id='.$objp->rowid.'">';
 								print img_up();
 								print '</a>';
 							}
-							if ($i < $num - 1)
-							{
+							if ($i < $num - 1) {
 								print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=down&amp;line_id='.$objp->rowid.'">';
 								print img_down();
 								print '</a>';
@@ -1447,8 +1377,7 @@ if ($action == 'create')
 				}
 
 				// Line in update mode
-				if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id', 'int') == $objp->rowid)
-				{
+				if ($object->statut == 0 && $action == 'editline' && $user->rights->ficheinter->creer && GETPOST('line_id', 'int') == $objp->rowid) {
 					print '<tr class="oddeven nohover">';
 
 					// No.
@@ -1478,8 +1407,9 @@ if ($action == 'create')
 					print '<td class="right">';
 					if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
 						$selectmode = 'select';
-						if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION))
+						if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
 							$selectmode = 'text';
+						}
 						$form->select_duration('duration', $objp->duree, 0, $selectmode);
 					}
 					print '</td>';
@@ -1504,10 +1434,8 @@ if ($action == 'create')
 			$db->free($resql);
 
 			// Add new line
-			if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS))
-			{
-				if (!$num)
-				{
+			if ($object->statut == 0 && $user->rights->ficheinter->creer && $action <> 'editline' && empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
+				if (!$num) {
 					print '<br>';
 					print '<table class="noborder centpercent">';
 					print '<tr class="liste_titre">';
@@ -1522,7 +1450,7 @@ if ($action == 'create')
 					print $langs->trans('Description').'</td>';
 					print '<td class="center">'.$langs->trans('Date').'</td>';
 					print '<td class="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
-	  				print '<td colspan="3">&nbsp;</td>';
+					print '<td colspan="3">&nbsp;</td>';
 					print "</tr>\n";
 				}
 
@@ -1580,16 +1508,20 @@ if ($action == 'create')
 
 				print $lineadd->showOptionals($extrafields, 'edit', array('colspan'=>5));
 
-				if (!$num) print '</table>';
+				if (!$num) {
+					print '</table>';
+				}
 			}
 
-			if ($num) print '</table>';
+			if ($num) {
+				print '</table>';
+			}
 		} else {
 			dol_print_error($db);
 		}
 
 		print '</form>'."\n";
- 	}
+	}
 
 	print dol_get_fiche_end();
 
@@ -1605,10 +1537,8 @@ if ($action == 'create')
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 																								  // modified by hook
-	if (empty($reshook))
-	{
-		if ($user->socid == 0)
-		{
+	if (empty($reshook)) {
+		if ($user->socid == 0) {
 			if ($action != 'editdescription' && ($action != 'presend')) {
 				// Validate
 				if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
@@ -1619,31 +1549,33 @@ if ($action == 'create')
 				}
 
 				// Modify
-				if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate)))
-				{
+				if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate))) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modify">';
-					if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify");
-					else print $langs->trans("SetToDraft");
+					if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
+						print $langs->trans("Modify");
+					} else {
+						print $langs->trans("SetToDraft");
+					}
 					print '</a></div>';
 				}
 
 				// Reopen
-				if ($object->statut >= Fichinter::STATUS_CLOSED)
-				{
-					if ($user->rights->ficheinter->creer)
-					{
+				if ($object->statut >= Fichinter::STATUS_CLOSED) {
+					if ($user->rights->ficheinter->creer) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans('Reopen').'</a></div>';
-					} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Reopen').'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Reopen').'</a></div>';
+					}
 				}
 
 				// Send
 				if (empty($user->socid)) {
-					if ($object->statut > Fichinter::STATUS_DRAFT)
-					{
-						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
-						{
+					if ($object->statut > Fichinter::STATUS_DRAFT) {
+						if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+						}
 					}
 				}
 
@@ -1655,30 +1587,30 @@ if ($action == 'create')
 				}
 
 				// Proposal
-				if ($conf->service->enabled && !empty($conf->propal->enabled) && $object->statut > Fichinter::STATUS_DRAFT)
-				{
+				if ($conf->service->enabled && !empty($conf->propal->enabled) && $object->statut > Fichinter::STATUS_DRAFT) {
 					$langs->load("propal");
-					if ($object->statut < Fichinter::STATUS_BILLED)
-					{
-						if ($user->rights->propal->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddProp").'</a></div>';
-						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddProp").'</a></div>';
+					if ($object->statut < Fichinter::STATUS_BILLED) {
+						if ($user->rights->propal->creer) {
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddProp").'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddProp").'</a></div>';
+						}
 					}
 				}
 
 				// Invoicing
-				if (!empty($conf->facture->enabled) && $object->statut > Fichinter::STATUS_DRAFT)
-				{
+				if (!empty($conf->facture->enabled) && $object->statut > Fichinter::STATUS_DRAFT) {
 					$langs->load("bills");
-					if ($object->statut < Fichinter::STATUS_BILLED)
-					{
-						if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a></div>';
-						else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddBill").'</a></div>';
+					if ($object->statut < Fichinter::STATUS_BILLED) {
+						if ($user->rights->facture->creer) {
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddBill").'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddBill").'</a></div>';
+						}
 					}
 
-					if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED))    // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
-					{
-						if ($object->statut != Fichinter::STATUS_BILLED)
-						{
+					if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {    // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
+						if ($object->statut != Fichinter::STATUS_BILLED) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("InterventionClassifyBilled").'</a></div>';
 						} else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyunbilled">'.$langs->trans("InterventionClassifyUnBilled").'</a></div>';
@@ -1687,8 +1619,7 @@ if ($action == 'create')
 				}
 
 				// Done
-				if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED)
-				{
+				if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifydone">'.$langs->trans("InterventionClassifyDone").'</a></div>';
 				}
 
@@ -1698,8 +1629,7 @@ if ($action == 'create')
 				}
 
 				// Delete
-				if (($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer)
-				{
+				if (($object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer) || $user->rights->ficheinter->supprimer) {
 					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'"';
 					print '>'.$langs->trans('Delete').'</a></div>';
 				}
@@ -1709,8 +1639,7 @@ if ($action == 'create')
 
 	print '</div>';
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 
 		/*
diff --git a/htdocs/fichinter/class/api_interventions.class.php b/htdocs/fichinter/class/api_interventions.class.php
index 7046a61e2d5..a5ba127a54d 100644
--- a/htdocs/fichinter/class/api_interventions.class.php
+++ b/htdocs/fichinter/class/api_interventions.class.php
@@ -32,7 +32,7 @@ class Interventions extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 	  'socid',
 	  'fk_project',
 	  'description',
@@ -41,7 +41,7 @@ class Interventions extends DolibarrApi
 	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDSLINE = array(
+	public static $FIELDSLINE = array(
 	  'description',
 	  'date',
 	  'duree',
@@ -117,27 +117,37 @@ class Interventions extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('intervention').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 		// Insert sale filter
 		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -146,8 +156,7 @@ class Interventions extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -158,13 +167,11 @@ class Interventions extends DolibarrApi
 		dol_syslog("API Rest request");
 		$result = $this->db->query($sql);
 
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
 			$i = 0;
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$fichinter_static = new Fichinter($this->db);
 				if ($fichinter_static->fetch($obj->rowid)) {
@@ -216,28 +223,28 @@ class Interventions extends DolibarrApi
 	 * @return int
 	 */
 	/* TODO
-    public function getLines($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->ficheinter->lire) {
-            throw new RestException(401);
-        }
+	public function getLines($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->ficheinter->lire) {
+			throw new RestException(401);
+		}
 
-        $result = $this->fichinter->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Intervention not found');
-        }
+		$result = $this->fichinter->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Intervention not found');
+		}
 
-        if( ! DolibarrApi::_checkAccessToResource('fichinter',$this->fichinter->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
-        $this->fichinter->getLinesArray();
-        $result = array();
-        foreach ($this->fichinter->lines as $line) {
-            array_push($result,$this->_cleanObjectDatas($line));
-        }
-        return $result;
-    }
-    */
+		if( ! DolibarrApi::_checkAccessToResource('fichinter',$this->fichinter->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->fichinter->getLinesArray();
+		$result = array();
+		foreach ($this->fichinter->lines as $line) {
+			array_push($result,$this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
+	*/
 
 	/**
 	 * Add a line to given intervention
@@ -270,11 +277,11 @@ class Interventions extends DolibarrApi
 		}
 
 		$updateRes = $this->fichinter->addLine(
-				DolibarrApiAccess::$user,
-				$id,
-				$this->fichinter->description,
-				$this->fichinter->date,
-				$this->fichinter->duree
+			DolibarrApiAccess::$user,
+			$id,
+			$this->fichinter->description,
+			$this->fichinter->date,
+			$this->fichinter->duree
 		);
 
 		if ($updateRes > 0) {
@@ -369,8 +376,7 @@ class Interventions extends DolibarrApi
 	 */
 	public function closeFichinter($id)
 	{
-		if (!DolibarrApiAccess::$user->rights->ficheinter->creer)
-		{
+		if (!DolibarrApiAccess::$user->rights->ficheinter->creer) {
 			throw new RestException(401, "Insuffisant rights");
 		}
 		$result = $this->fichinter->fetch($id);
@@ -408,8 +414,9 @@ class Interventions extends DolibarrApi
 	{
 		$fichinter = array();
 		foreach (Interventions::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$fichinter[$field] = $data[$field];
 		}
 		return $fichinter;
@@ -447,8 +454,9 @@ class Interventions extends DolibarrApi
 	{
 		$fichinter = array();
 		foreach (Interventions::$FIELDSLINE as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$fichinter[$field] = $data[$field];
 		}
 		return $fichinter;
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 39ac094132a..cea1b1ca48c 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -204,8 +204,7 @@ class Fichinter extends CommonObject
 		$sql = "SELECT count(fi.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as fi";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON fi.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
@@ -213,10 +212,8 @@ class Fichinter extends CommonObject
 		$sql .= " ".$clause." fi.entity IN (".getEntity('intervention').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["interventions"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -244,21 +241,20 @@ class Fichinter extends CommonObject
 		dol_syslog(get_class($this)."::create ref=".$this->ref);
 
 		// Check parameters
-		if (!empty($this->ref))	// We check that ref is not already used
-		{
+		if (!empty($this->ref)) {	// We check that ref is not already used
 			$result = self::isExistingObject($this->element, 0, $this->ref); // Check ref is not yet used
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->error = 'ErrorRefAlreadyExists';
 				dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING);
 				$this->db->rollback();
 				return -1;
 			}
 		}
-		if (!is_numeric($this->duration)) $this->duration = 0;
+		if (!is_numeric($this->duration)) {
+			$this->duration = 0;
+		}
 
-		if ($this->socid <= 0)
-		{
+		if ($this->socid <= 0) {
 			$this->error = 'ErrorBadParameterForFunc';
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
@@ -304,42 +300,42 @@ class Fichinter extends CommonObject
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."fichinter");
 
-			if ($this->id)
-			{
+			if ($this->id) {
 				$this->ref = '(PROV'.$this->id.')';
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."fichinter SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
 
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if (!$resql) $error++;
+				if (!$resql) {
+					$error++;
+				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
 			// Add linked object
-			if (!$error && $this->origin && $this->origin_id)
-			{
+			if (!$error && $this->origin && $this->origin_id) {
 				$ret = $this->add_object_linked();
-				if (!$ret)	dol_print_error($this->db);
+				if (!$ret) {
+					dol_print_error($this->db);
+				}
 			}
 
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('FICHINTER_CREATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -370,14 +366,14 @@ class Fichinter extends CommonObject
 	{
 		global $conf;
 
-	 	if (!is_numeric($this->duration)) {
-	 		$this->duration = 0;
-	 	}
-	 	if (!dol_strlen($this->fk_project)) {
-	 		$this->fk_project = 0;
-	 	}
+		if (!is_numeric($this->duration)) {
+			$this->duration = 0;
+		}
+		if (!dol_strlen($this->fk_project)) {
+			$this->fk_project = 0;
+		}
 
-	 	$error = 0;
+		$error = 0;
 
 		$this->db->begin();
 
@@ -391,22 +387,20 @@ class Fichinter extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
-			if (!$error)
-			{
+		if ($this->db->query($sql)) {
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('FICHINTER_MODIFY', $user);
-				if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+				if ($result < 0) {
+					$error++; $this->db->rollback(); return -1;
+				}
 				// End call triggers
 			}
 
@@ -437,14 +431,14 @@ class Fichinter extends CommonObject
 		if ($ref) {
 			$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 			$sql .= " AND f.ref='".$this->db->escape($ref)."'";
-		} else $sql .= " WHERE f.rowid=".$rowid;
+		} else {
+			$sql .= " WHERE f.rowid=".$rowid;
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id           = $obj->rowid;
@@ -470,7 +464,9 @@ class Fichinter extends CommonObject
 
 				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
-				if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) {
+					$this->brouillon = 1;
+				}
 
 				// Retrieve extrafields
 				$this->fetch_optionals();
@@ -479,8 +475,7 @@ class Fichinter extends CommonObject
 				 * Lines
 				 */
 				$result = $this->fetch_lines();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					return -3;
 				}
 				$this->db->free($resql);
@@ -505,8 +500,7 @@ class Fichinter extends CommonObject
 		$error = 0;
 
 		// Protection
-		if ($this->statut <= self::STATUS_DRAFT)
-		{
+		if ($this->statut <= self::STATUS_DRAFT) {
 			return 0;
 		}
 
@@ -519,8 +513,7 @@ class Fichinter extends CommonObject
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			if (!$error) {
 				$this->oldcopy = clone $this;
 			}
@@ -528,7 +521,9 @@ class Fichinter extends CommonObject
 			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('FICHINTER_UNVALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 			}
 
 			if (!$error) {
@@ -560,15 +555,13 @@ class Fichinter extends CommonObject
 
 		$error = 0;
 
-		if ($this->statut != 1)
-		{
+		if ($this->statut != 1) {
 			$this->db->begin();
 
 			$now = dol_now();
 
 			// Define new ref
-			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-			{
+			if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
 				$num = $this->getNextNumRef($this->thirdparty);
 			} else {
 				$num = $this->ref;
@@ -586,51 +579,48 @@ class Fichinter extends CommonObject
 
 			dol_syslog(get_class($this)."::setValid", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				dol_print_error($this->db);
 				$error++;
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('FICHINTER_VALIDATE', $user);
-				if ($result < 0) { $error++; }
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
-				if (preg_match('/^[\(]?PROV/i', $this->ref))
-				{
+				if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 					// Now we rename also files into index
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'ficheinter/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'ficheinter/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
-					if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+					if (!$resql) {
+						$error++; $this->error = $this->db->lasterror();
+					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 					$oldref = dol_sanitizeFileName($this->ref);
 					$newref = dol_sanitizeFileName($num);
 					$dirsource = $conf->ficheinter->dir_output.'/'.$oldref;
 					$dirdest = $conf->ficheinter->dir_output.'/'.$newref;
-					if (!$error && file_exists($dirsource))
-					{
+					if (!$error && file_exists($dirsource)) {
 						dol_syslog(get_class($this)."::setValid rename dir ".$dirsource." into ".$dirdest);
 
-						if (@rename($dirsource, $dirdest))
-						{
+						if (@rename($dirsource, $dirdest)) {
 							dol_syslog("Rename ok");
 							// Rename docs starting with $oldref with $newref
 							$listoffiles = dol_dir_list($conf->ficheinter->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-							foreach ($listoffiles as $fileentry)
-							{
+							foreach ($listoffiles as $fileentry) {
 								$dirsource = $fileentry['name'];
 								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 								$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -643,8 +633,7 @@ class Fichinter extends CommonObject
 			}
 
 			// Set new ref and define current statut
-			if (!$error)
-			{
+			if (!$error) {
 				$this->ref = $num;
 				$this->statut = 1;
 				$this->brouillon = 0;
@@ -740,8 +729,7 @@ class Fichinter extends CommonObject
 	{
 		// phpcs:enable
 		// Init/load array of translation of status
-		if (empty($this->statuts) || empty($this->statuts_short) || empty($this->statuts_logo))
-		{
+		if (empty($this->statuts) || empty($this->statuts_short) || empty($this->statuts_logo)) {
 			global $langs;
 			$langs->load("fichinter");
 
@@ -785,19 +773,20 @@ class Fichinter extends CommonObject
 
 		$url = DOL_URL_ROOT.'/fichinter/card.php?id='.$this->id;
 
-		if ($option !== 'nolink')
-		{
+		if ($option !== 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
-	   	}
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowIntervention");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -817,16 +806,23 @@ class Fichinter extends CommonObject
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		global $action;
 		$hookmanager->initHooks(array('interventiondao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -844,8 +840,7 @@ class Fichinter extends CommonObject
 		global $conf, $db, $langs;
 		$langs->load("interventions");
 
-		if (!empty($conf->global->FICHEINTER_ADDON))
-		{
+		if (!empty($conf->global->FICHEINTER_ADDON)) {
 			$mybool = false;
 
 			$file = "mod_".$conf->global->FICHEINTER_ADDON.".php";
@@ -870,8 +865,7 @@ class Fichinter extends CommonObject
 			$numref = "";
 			$numref = $obj->getNextValue($soc, $this);
 
-			if ($numref != "")
-			{
+			if ($numref != "") {
 				return $numref;
 			} else {
 				dol_print_error($db, "Fichinter::getNextNumRef ".$obj->error);
@@ -905,10 +899,8 @@ class Fichinter extends CommonObject
 		$sql .= " WHERE f.rowid = ".$id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id                = $obj->rowid;
@@ -921,14 +913,12 @@ class Fichinter extends CommonObject
 				$cuser->fetch($obj->fk_user_author);
 				$this->user_creation = $cuser;
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
-				if ($obj->fk_user_modification)
-				{
+				if ($obj->fk_user_modification) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modification);
 					$this->user_modification = $muser;
@@ -956,27 +946,27 @@ class Fichinter extends CommonObject
 
 		$this->db->begin();
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('FICHINTER_DELETE', $user);
-			if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+			if ($result < 0) {
+				$error++; $this->db->rollback(); return -1;
+			}
 			// End call triggers
 		}
 
 		// Delete linked object
-		if (!$error)
-		{
+		if (!$error) {
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
 		// Delete linked contacts
-		if (!$error)
-		{
+		if (!$error) {
 			$res = $this->delete_linked_contact();
-			if ($res < 0)
-			{
+			if ($res < 0) {
 				$this->error = 'ErrorFailToDeleteLinkedContact';
 				$error++;
 			}
@@ -988,62 +978,61 @@ class Fichinter extends CommonObject
 			$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_fichinter = ".$this->id.")";
 
 			$resql = $this->db->query($sql);
-			if (!$resql) $error++;
+			if (!$resql) {
+				$error++;
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet";
 			$sql .= " WHERE fk_fichinter = ".$this->id;
 
 			$resql = $this->db->query($sql);
-			if (!$resql) $error++;
+			if (!$resql) {
+				$error++;
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Remove extrafields
 			$res = $this->deleteExtraFields();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete object
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinter";
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog("Fichinter::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql) $error++;
+			if (!$resql) {
+				$error++;
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
 			$this->deleteEcmFiles();
 
 			// Remove directory with files
 			$fichinterref = dol_sanitizeFileName($this->ref);
-			if ($conf->ficheinter->dir_output)
-			{
+			if ($conf->ficheinter->dir_output) {
 				$dir = $conf->ficheinter->dir_output."/".$fichinterref;
 				$file = $conf->ficheinter->dir_output."/".$fichinterref."/".$fichinterref.".pdf";
-				if (file_exists($file))
-				{
+				if (file_exists($file)) {
 					dol_delete_preview($this);
 
-					if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-					{
+					if (!dol_delete_file($file, 0, 0, 0, $this)) { // For triggers
 						$langs->load("errors");
 						$this->error = $langs->trans("ErrorFailToDeleteFile", $file);
 						return 0;
 					}
 				}
-				if (file_exists($dir))
-				{
-					if (!dol_delete_dir_recursive($dir))
-					{
+				if (file_exists($dir)) {
+					if (!dol_delete_dir_recursive($dir)) {
 						$langs->load("errors");
 						$this->error = $langs->trans("ErrorFailToDeleteDir", $dir);
 						return 0;
@@ -1052,8 +1041,7 @@ class Fichinter extends CommonObject
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -1075,15 +1063,13 @@ class Fichinter extends CommonObject
 		// phpcs:enable
 		global $conf;
 
-		if ($user->rights->ficheinter->creer)
-		{
+		if ($user->rights->ficheinter->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
 			$sql .= " SET datei = '".$this->db->idate($date_delivery)."'";
 			$sql .= " WHERE rowid = ".$this->id;
 			$sql .= " AND fk_statut = 0";
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->date_delivery = $date_delivery;
 				return 1;
 			} else {
@@ -1107,15 +1093,13 @@ class Fichinter extends CommonObject
 		// phpcs:enable
 		global $conf;
 
-		if ($user->rights->ficheinter->creer)
-		{
+		if ($user->rights->ficheinter->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
 			$sql .= " SET description = '".$this->db->escape($description)."',";
 			$sql .= " fk_user_modif = ".$user->id;
 			$sql .= " WHERE rowid = ".$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->description = $description;
 				return 1;
 			} else {
@@ -1140,14 +1124,12 @@ class Fichinter extends CommonObject
 		// phpcs:enable
 		global $conf;
 
-		if ($user->rights->ficheinter->creer)
-		{
+		if ($user->rights->ficheinter->creer) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter ";
 			$sql .= " SET fk_contrat = ".((int) $contractid);
 			$sql .= " WHERE rowid = ".$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->fk_contrat = $contractid;
 				return 1;
 			} else {
@@ -1176,19 +1158,18 @@ class Fichinter extends CommonObject
 		$this->db->begin();
 
 		// get extrafields so they will be clone
-		foreach ($this->lines as $line)
+		foreach ($this->lines as $line) {
 			$line->fetch_optionals();
+		}
 
 		// Load source object
 		$objFrom = clone $this;
 
 		// Change socid if needed
-		if (!empty($socid) && $socid != $this->socid)
-		{
+		if (!empty($socid) && $socid != $this->socid) {
 			$objsoc = new Societe($this->db);
 
-			if ($objsoc->fetch($socid) > 0)
-			{
+			if ($objsoc->fetch($socid) > 0) {
 				$this->socid = $objsoc->id;
 				//$this->cond_reglement_id	= (! empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
 				//$this->mode_reglement_id	= (! empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
@@ -1213,31 +1194,31 @@ class Fichinter extends CommonObject
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Add lines because it is not included into create function
-			foreach ($this->lines as $line)
-			{
+			foreach ($this->lines as $line) {
 				$this->addline($user, $this->id, $line->desc, $line->datei, $line->duration);
 			}
 
 			// Hook of thirdparty module
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('objFrom'=>$objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 		}
 
 		unset($this->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -1262,8 +1243,7 @@ class Fichinter extends CommonObject
 	{
 		dol_syslog(get_class($this)."::addline $fichinterid, $desc, $date_intervention, $duration");
 
-		if ($this->statut == 0)
-		{
+		if ($this->statut == 0) {
 			$this->db->begin();
 
 			// Insertion ligne
@@ -1280,8 +1260,7 @@ class Fichinter extends CommonObject
 
 			$result = $line->insert($user);
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1317,8 +1296,7 @@ class Fichinter extends CommonObject
 		$this->duration = 0;
 		$nbp = 25;
 		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
+		while ($xnbp < $nbp) {
 			$line = new FichinterLigne($this->db);
 			$line->desc = $langs->trans("Description")." ".$xnbp;
 			$line->datei = ($now - 3600 * (1 + $xnbp));
@@ -1348,12 +1326,10 @@ class Fichinter extends CommonObject
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($resql);
 
 				$line = new FichinterLigne($this->db);
@@ -1466,8 +1442,7 @@ class FichinterLigne extends CommonObjectLine
 
 		dol_syslog("FichinterLigne::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$objp = $this->db->fetch_object($result);
 			$this->rowid          	= $objp->rowid;
 			$this->id = $objp->rowid;
@@ -1503,14 +1478,12 @@ class FichinterLigne extends CommonObjectLine
 		$this->db->begin();
 
 		$rangToUse = $this->rang;
-		if ($rangToUse == -1)
-		{
+		if ($rangToUse == -1) {
 			// Recupere rang max de la ligne d'intervention dans $rangmax
 			$sql = 'SELECT max(rang) as max FROM '.MAIN_DB_PREFIX.'fichinterdet';
 			$sql .= ' WHERE fk_fichinter ='.$this->fk_fichinter;
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
 				$rangToUse = $obj->max + 1;
 			} else {
@@ -1532,16 +1505,13 @@ class FichinterLigne extends CommonObjectLine
 
 		dol_syslog("FichinterLigne::insert", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'fichinterdet');
 			$this->rowid = $this->id;
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
@@ -1549,15 +1519,15 @@ class FichinterLigne extends CommonObjectLine
 
 			$result = $this->update_total();
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$this->rang = $rangToUse;
 
-				if (!$notrigger)
-				{
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('LINEFICHINTER_CREATE', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 			}
@@ -1602,31 +1572,27 @@ class FichinterLigne extends CommonObjectLine
 
 		dol_syslog("FichinterLigne::update", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$error)
-			{
+		if ($resql) {
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
 			$result = $this->update_total();
-			if ($result > 0)
-			{
-				if (!$notrigger)
-				{
+			if ($result > 0) {
+				if (!$notrigger) {
 					// Call trigger
 					$result = $this->call_trigger('LINEFICHINTER_UPDATE', $user);
-					if ($result < 0) { $error++; }
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return $result;
 			} else {
@@ -1660,11 +1626,12 @@ class FichinterLigne extends CommonObjectLine
 
 		dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$total_duration = 0;
-			if (!empty($obj->total_duration)) $total_duration = $obj->total_duration;
+			if (!empty($obj->total_duration)) {
+				$total_duration = $obj->total_duration;
+			}
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
 			$sql .= " SET duree = ".$total_duration;
@@ -1674,8 +1641,7 @@ class FichinterLigne extends CommonObjectLine
 
 			dol_syslog("FichinterLigne::update_total", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1703,8 +1669,7 @@ class FichinterLigne extends CommonObjectLine
 
 		$error = 0;
 
-		if ($this->statut == 0)
-		{
+		if ($this->statut == 0) {
 			dol_syslog(get_class($this)."::deleteline lineid=".$this->id);
 			$this->db->begin();
 
@@ -1718,16 +1683,15 @@ class FichinterLigne extends CommonObjectLine
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."fichinterdet WHERE rowid = ".$this->id;
 			$resql = $this->db->query($sql);
 
-			if ($resql)
-			{
+			if ($resql) {
 				$result = $this->update_total();
-				if ($result > 0)
-				{
-					if (!$notrigger)
-					{
+				if ($result > 0) {
+					if (!$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('LINEFICHINTER_DELETE', $user);
-						if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+						if ($result < 0) {
+							$error++; $this->db->rollback(); return -1;
+						}
 						// End call triggers
 					}
 
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 418e1232bb8..8ed842a70c9 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -214,8 +214,8 @@ class FichinterRec extends Fichinter
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
 				/*
-                 * Lines
-                 */
+				 * Lines
+				 */
 				$num = count($fichintsrc->lines);
 				for ($i = 0; $i < $num; $i++) {
 					//var_dump($fichintsrc->lines[$i]);
@@ -239,13 +239,14 @@ class FichinterRec extends Fichinter
 						$fichintsrc->lines[$i]->fk_unit
 					);
 
-					if ($result_insert < 0)
+					if ($result_insert < 0) {
 						$error++;
+					}
 				}
 
-				if ($error)
+				if ($error) {
 					$this->db->rollback();
-				else {
+				} else {
 					$this->db->commit();
 					return $this->id;
 				}
@@ -277,8 +278,11 @@ class FichinterRec extends Fichinter
 		$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 @@ class FichinterRec extends Fichinter
 	 */
 	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 @@ class FichinterRec extends Fichinter
 		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 @@ class FichinterRec extends Fichinter
 
 		$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 @@ class FichinterRec extends Fichinter
 		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 @@ class FichinterRec extends Fichinter
 		}
 		$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 @@ class FichinterRec extends Fichinter
 			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 @@ class FichinterRec extends Fichinter
 		$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)
+		if ($this->nb_gen_max == $this->nb_gen_done + 1) {
 			$sql .= ' , statut = 1';
+		}
 
 		$sql .= ' WHERE rowid = '.$this->id;
 
diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php
index 5df841bf6f2..a0d22cf1e2a 100644
--- a/htdocs/fichinter/class/fichinterstats.class.php
+++ b/htdocs/fichinter/class/fichinterstats.class.php
@@ -64,8 +64,7 @@ class FichinterStats extends Stats
 		$this->userid = $userid;
 		$this->cachefilesuffix = $mode;
 
-		if ($mode == 'customer')
-		{
+		if ($mode == 'customer') {
 			$object = new Fichinter($this->db);
 			$this->from = MAIN_DB_PREFIX.$object->table_element." as c";
 			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
@@ -73,14 +72,17 @@ class FichinterStats extends Stats
 			$this->field_line = '0';
 			//$this->where.= " AND c.fk_statut > 0";    // Not draft and not cancelled
 		}
-		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
 		$this->where .= ($this->where ? ' AND ' : '')."c.entity IN (".getEntity('fichinter').')';
 
-		if ($this->socid)
-		{
+		if ($this->socid) {
 			$this->where .= " AND c.fk_soc = ".$this->socid;
 		}
-		if ($this->userid > 0) $this->where .= ' AND c.fk_user_author = '.$this->userid;
+		if ($this->userid > 0) {
+			$this->where .= ' AND c.fk_user_author = '.$this->userid;
+		}
 	}
 
 	/**
@@ -96,7 +98,9 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, COUNT(*) as nb";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -118,7 +122,9 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as dm, COUNT(*) as nb, 0";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
@@ -139,7 +145,9 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -161,7 +169,9 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%m') as dm, 0";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE c.date_valid BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
 		$sql .= " AND ".$this->where;
 		$sql .= " GROUP BY dm";
@@ -181,7 +191,9 @@ class FichinterStats extends Stats
 
 		$sql = "SELECT date_format(c.date_valid,'%Y') as year, COUNT(*) as nb, 0 as total, 0 as avg";
 		$sql .= " FROM ".$this->from;
-		if (!$user->rights->societe->client->voir && !$this->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE ".$this->where;
 		$sql .= " GROUP BY year";
 		$sql .= $this->db->order('year', 'DESC');
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index bace3d10231..7957479e611 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -39,13 +39,14 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 $object = new Fichinter($db);
 $result = $object->fetch($id, $ref);
-if (!$result)
-{
+if (!$result) {
 	print 'Record not found';
 	exit;
 }
@@ -54,17 +55,14 @@ if (!$result)
  * Adding a new contact
  */
 
-if ($action == 'addcontact' && $user->rights->ficheinter->creer)
-{
-	if ($result > 0 && $id > 0)
-	{
+if ($action == 'addcontact' && $user->rights->ficheinter->creer) {
+	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -77,21 +75,14 @@ if ($action == 'addcontact' && $user->rights->ficheinter->creer)
 
 		setEventMessages($mesg, null, 'errors');
 	}
-}
-
-// Toggle the status of a contact
-elseif ($action == 'swapstatut' && $user->rights->ficheinter->creer)
-{
+} elseif ($action == 'swapstatut' && $user->rights->ficheinter->creer) {
+	// Toggle the status of a contact
 	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
-}
-
-// Deletes a contact
-elseif ($action == 'deletecontact' && $user->rights->ficheinter->creer)
-{
+} elseif ($action == 'deletecontact' && $user->rights->ficheinter->creer) {
+	// Deletes a contact
 	$result = $object->delete_contact(GETPOST('lineid', 'int'));
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -114,8 +105,7 @@ llxHeader('', $langs->trans("Intervention"));
 
 // Mode vue et edition
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = fichinter_prepare_head($object);
@@ -133,12 +123,10 @@ if ($id > 0 || !empty($ref))
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->ficheinter->creer)
-		{
+		if ($user->rights->ficheinter->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
@@ -174,15 +162,20 @@ if ($id > 0 || !empty($ref))
 
 	print '<br>';
 
-	if (!empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_USER))     $hideaddcontactforuser = 1;
-	if (!empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_THIPARTY)) $hideaddcontactforthirdparty = 1;
+	if (!empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_USER)) {
+		$hideaddcontactforuser = 1;
+	}
+	if (!empty($conf->global->FICHINTER_HIDE_ADD_CONTACT_THIPARTY)) {
+		$hideaddcontactforthirdparty = 1;
+	}
 
 	// Contacts lines (modules that overwrite templates must declare this into descriptor)
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
-	foreach ($dirtpls as $reldir)
-	{
+	foreach ($dirtpls as $reldir) {
 		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
-		if ($res) break;
+		if ($res) {
+			break;
+		}
 	}
 }
 
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index aaab2072013..ba1f22c122b 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -47,7 +47,9 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 
@@ -56,12 +58,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 $object = new Fichinter($db);
@@ -86,8 +94,7 @@ $form = new Form($db);
 
 llxHeader('', $langs->trans("Intervention"));
 
-if ($object->id)
-{
+if ($object->id) {
 	$object->fetch_thirdparty();
 
 	$head = fichinter_prepare_head($object);
@@ -98,8 +105,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
@@ -115,12 +121,10 @@ if ($object->id)
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->commande->creer)
-		{
+		if ($user->rights->commande->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 3ea69f8d185..863463e8d0e 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -30,7 +30,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 
-if (!$user->rights->ficheinter->lire) accessforbidden();
+if (!$user->rights->ficheinter->lire) {
+	accessforbidden();
+}
 
 $hookmanager = new HookManager($db);
 
@@ -42,8 +44,7 @@ $langs->load("interventions");
 
 // Security check
 $socid = GETPOST('socid', 'int');
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -66,8 +67,7 @@ print load_fiche_titre($langs->trans("InterventionsArea"), '', 'intervention');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	// Search ficheinter
 	$var = false;
 	print '<form method="post" action="'.DOL_URL_ROOT.'/fichinter/list.php">';
@@ -88,15 +88,20 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
 $sql = "SELECT count(f.rowid), f.fk_statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."fichinter as f";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 $sql .= " AND f.fk_soc = s.rowid";
-if ($user->socid) $sql .= ' AND f.fk_soc = '.$user->socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($user->socid) {
+	$sql .= ' AND f.fk_soc = '.$user->socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 $sql .= " GROUP BY f.fk_statut";
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -106,15 +111,15 @@ if ($resql)
 	$vals = array();
 	$bool = false;
 	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
-		if ($row)
-		{
+		if ($row) {
 			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
 			{
 				$bool = (!empty($row[2]) ?true:false);
-				if (!isset($vals[$row[1].$bool])) $vals[$row[1].$bool] = 0;
+			if (!isset($vals[$row[1].$bool])) {
+				$vals[$row[1].$bool] = 0;
+			}
 				$vals[$row[1].$bool] += $row[0];
 				$totalinprocess += $row[0];
 			}
@@ -131,19 +136,28 @@ if ($resql)
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
 	$listofstatus = array(0, 1, 3);
 	$bool = false;
-	foreach ($listofstatus as $status)
-	{
+	foreach ($listofstatus as $status) {
 		$dataseries[] = array($fichinterstatic->LibStatut($status, $bool, 1), (isset($vals[$status.$bool]) ? (int) $vals[$status.$bool] : 0));
-		if ($status == 3 && !$bool) $bool = true;
-		else $bool = false;
+		if ($status == 3 && !$bool) {
+			$bool = true;
+		} else {
+			$bool = false;
+		}
 
-		if ($status == Fichinter::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-		if ($status == Fichinter::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
-		if ($status == Fichinter::STATUS_BILLED) $colorseries[$status] = $badgeStatus4;
-		if ($status == Fichinter::STATUS_CLOSED) $colorseries[$status] = $badgeStatus6;
+		if ($status == Fichinter::STATUS_DRAFT) {
+			$colorseries[$status] = '-'.$badgeStatus0;
+		}
+		if ($status == Fichinter::STATUS_VALIDATED) {
+			$colorseries[$status] = $badgeStatus1;
+		}
+		if ($status == Fichinter::STATUS_BILLED) {
+			$colorseries[$status] = $badgeStatus4;
+		}
+		if ($status == Fichinter::STATUS_CLOSED) {
+			$colorseries[$status] = $badgeStatus6;
+		}
 	}
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		print '<tr class="impair"><td class="center" colspan="2">';
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -160,10 +174,8 @@ if ($resql)
 		print '</td></tr>';
 	}
 	$bool = false;
-	foreach ($listofstatus as $status)
-	{
-		if (!$conf->use_javascript_ajax)
-		{
+	foreach ($listofstatus as $status) {
+		if (!$conf->use_javascript_ajax) {
 			print '<tr class="oddeven">';
 			print '<td>'.$fichinterstatic->LibStatut($status, $bool, 0).'</td>';
 			print '<td class="right"><a href="list.php?search_status='.$status.'">'.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' ';
@@ -171,8 +183,11 @@ if ($resql)
 			print '</a>';
 			print '</td>';
 			print "</tr>\n";
-			if ($status == 3 && !$bool) $bool = true;
-			else $bool = false;
+			if ($status == 3 && !$bool) {
+				$bool = true;
+			} else {
+				$bool = false;
+			}
 		}
 	}
 	//if ($totalinprocess != $total)
@@ -187,32 +202,34 @@ if ($resql)
 /*
  * Draft orders
  */
-if (!empty($conf->ficheinter->enabled))
-{
+if (!empty($conf->ficheinter->enabled)) {
 	$sql = "SELECT f.rowid, f.ref, s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 	$sql .= " AND f.fk_soc = s.rowid";
 	$sql .= " AND f.fk_statut = 0";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("DraftFichinter").'</th></tr>';
 		$langs->load("fichinter");
 		$num = $db->num_rows($resql);
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
 				print '<td class="nowrap">';
@@ -239,29 +256,32 @@ $sql = "SELECT f.rowid, f.ref, f.fk_statut, f.date_valid as datec, f.tms as date
 $sql .= " s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 $sql .= " AND f.fk_soc = s.rowid";
 //$sql.= " AND c.fk_statut > 2";
-if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($socid) {
+	$sql .= " AND f.fk_soc = ".$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 $sql .= " ORDER BY f.tms DESC";
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastModifiedInterventions", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -296,29 +316,35 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 
 /*
  * interventions to process
  */
 
-if (!empty($conf->ficheinter->enabled))
-{
+if (!empty($conf->ficheinter->enabled)) {
 	$sql = "SELECT f.rowid, f.ref, f.fk_statut, s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 	$sql .= " AND f.fk_soc = s.rowid";
 	$sql .= " AND f.fk_statut = 1";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " ORDER BY f.rowid DESC";
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		print '<div class="div-table-responsive-no-min">';
@@ -326,11 +352,9 @@ if (!empty($conf->ficheinter->enabled))
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("FichinterToProcess").' <a href="'.DOL_URL_ROOT.'/fichinter/list.php?search_status=1"><span class="badge">'.$num.'</span></a></th></tr>';
 
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
 				print '<td class="nowrap" width="20%">';
@@ -366,7 +390,9 @@ if (!empty($conf->ficheinter->enabled))
 		}
 
 		print "</table></div><br>";
-	} else dol_print_error($db);
+	} else {
+		dol_print_error($db);
+	}
 }
 
 print '</div></div></div>';
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index a53c69b77bd..39ac695f84e 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -40,13 +40,14 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 $object = new Fichinter($db);
 
-if (!$object->fetch($id, $ref) > 0)
-{
+if (!$object->fetch($id, $ref) > 0) {
 	dol_print_error($db);
 	exit;
 }
@@ -77,15 +78,14 @@ $morehtmlref = '<div class="refidno">';
 // Thirdparty
 $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	if ($user->rights->commande->creer)
-	{
-		if ($action != 'classify')
+	if ($user->rights->commande->creer) {
+		if ($action != 'classify') {
 			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
+		}
 		if ($action == 'classify') {
 			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d054f5e5bcc..8f0ae8e626f 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -32,13 +32,21 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled))     require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-if (!empty($conf->contrat->enabled))    require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+if (!empty($conf->projet->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
+if (!empty($conf->contrat->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'interventions'));
-if (!empty($conf->projet->enabled))     $langs->load("projects");
-if (!empty($conf->contrat->enabled))    $langs->load("contracts");
+if (!empty($conf->projet->enabled)) {
+	$langs->load("projects");
+}
+if (!empty($conf->contrat->enabled)) {
+	$langs->load("contracts");
+}
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
@@ -59,7 +67,9 @@ $socid = GETPOST('socid', 'int');
 
 // Security check
 $id = GETPOST('id', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id;
@@ -68,14 +78,17 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield)
-{
- 	$sortfield = "f.ref";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "f.ref";
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -97,8 +110,12 @@ $fieldstosearchall = array(
 	'f.note_public'=>'NotePublic',
 	'fd.description'=>'DescriptionOfLine',
 );
-if (empty($user->socid)) $fieldstosearchall["f.note_private"] = "NotePrivate";
-if (!empty($conf->global->FICHINTER_DISABLE_DETAILS)) unset($fieldstosearchall['fd.description']);
+if (empty($user->socid)) {
+	$fieldstosearchall["f.note_private"] = "NotePrivate";
+}
+if (!empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
+	unset($fieldstosearchall['fd.description']);
+}
 
 // Definition of fields for list
 $arrayfields = array(
@@ -127,21 +144,25 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// 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
 		$search_ref = "";
 		$search_company = "";
 		$search_projet_ref = "";
@@ -187,10 +208,8 @@ $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
 $atleastonefieldinlines = 0;
-foreach ($arrayfields as $tmpkey => $tmpval)
-{
-	if (preg_match('/^fd\./', $tmpkey) && !empty($arrayfields[$tmpkey]['checked']))
-	{
+foreach ($arrayfields as $tmpkey => $tmpval) {
+	if (preg_match('/^fd\./', $tmpkey) && !empty($arrayfields[$tmpkey]['checked'])) {
 		$atleastonefieldinlines++;
 		break;
 	}
@@ -198,7 +217,9 @@ foreach ($arrayfields as $tmpkey => $tmpval)
 
 $sql = "SELECT";
 $sql .= " f.ref, f.rowid, f.fk_statut as status, f.description, f.datec as date_creation, f.tms as date_update, f.note_public, f.note_private,";
-if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
+if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
+	$sql .= " fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
+}
 $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.status as thirdpartystatus";
 if (!empty($conf->projet->enabled)) {
 	$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
@@ -208,7 +229,9 @@ if (!empty($conf->contrat->enabled)) {
 }
 // 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();
@@ -221,9 +244,15 @@ if (!empty($conf->projet->enabled)) {
 if (!empty($conf->contrat->enabled)) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat as c on f.fk_contrat = c.rowid";
 }
-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 (f.rowid = ef.fk_object)";
-if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
-if (!$user->rights->societe->client->voir && empty($socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+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 (f.rowid = ef.fk_object)";
+}
+if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."fichinterdet as fd ON fd.fk_fichinter = f.rowid";
+}
+if (!$user->rights->societe->client->voir && empty($socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
 $sql .= " WHERE f.entity IN (".getEntity('intervention').")";
 $sql .= " AND f.fk_soc = s.rowid";
@@ -240,16 +269,21 @@ if ($search_contrat_ref) {
 	$sql .= natural_search('c.ref', $search_contrat_ref);
 }
 if ($search_desc) {
-	if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) $sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
-	else $sql .= natural_search(array('f.description'), $search_desc);
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
+		$sql .= natural_search(array('f.description', 'fd.description'), $search_desc);
+	} else {
+		$sql .= natural_search(array('f.description'), $search_desc);
+	}
 }
 if ($search_status != '' && $search_status >= 0) {
 	$sql .= ' AND f.fk_statut = '.urlencode($search_status);
 }
-if (!$user->rights->societe->client->voir && empty($socid))
+if (!$user->rights->societe->client->voir && empty($socid)) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid)
+}
+if ($socid) {
 	$sql .= " AND s.rowid = ".$socid;
+}
 if ($sall) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
 }
@@ -263,12 +297,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -278,30 +310,50 @@ $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($socid > 0)
-	{
+	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
-		if (empty($search_company)) $search_company = $soc->name;
+		if (empty($search_company)) {
+			$search_company = $soc->name;
+		}
 	}
 
 	$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)          $param .= "&socid=".urlencode($socid);
-	if ($search_ref)     $param .= "&search_ref=".urlencode($search_ref);
-	if ($search_company) $param .= "&search_company=".urlencode($search_company);
-	if ($search_desc)    $param .= "&search_desc=".urlencode($search_desc);
-	if ($search_status != '' && $search_status > -1) $param .= "&search_status=".urlencode($search_status);
-	if ($show_files)            $param .= '&show_files='.urlencode($show_files);
-	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 ($socid) {
+		$param .= "&socid=".urlencode($socid);
+	}
+	if ($search_ref) {
+		$param .= "&search_ref=".urlencode($search_ref);
+	}
+	if ($search_company) {
+		$param .= "&search_company=".urlencode($search_company);
+	}
+	if ($search_desc) {
+		$param .= "&search_desc=".urlencode($search_desc);
+	}
+	if ($search_status != '' && $search_status > -1) {
+		$param .= "&search_status=".urlencode($search_status);
+	}
+	if ($show_files) {
+		$param .= '&show_files='.urlencode($show_files);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -311,19 +363,27 @@ if ($resql)
 		'builddoc'=>$langs->trans("PDFMerge"),
 		//'presend'=>$langs->trans("SendByMail"),
 	);
-	if ($user->rights->ficheinter->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	if ($user->rights->ficheinter->supprimer) {
+		$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$newcardbutton = '';
 
 	$url = DOL_URL_ROOT.'/fichinter/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->rights->ficheinter->creer);
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -339,9 +399,10 @@ if ($resql)
 	$trackid = 'int'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($sall)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
@@ -349,48 +410,47 @@ if ($resql)
 
 	$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))
-	{
+	if (!empty($moreforfilter)) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
 	}
 
-	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";
 
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['f.ref']['checked']))
-	{
+	if (!empty($arrayfields['f.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input type="text" class="flat" name="search_ref" value="'.$search_ref.'" size="8">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input type="text" class="flat" name="search_company" value="'.$search_company.'" size="10">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['pr.ref']['checked']))
-	{
+	if (!empty($arrayfields['pr.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input type="text" class="flat" name="search_projet_ref" value="'.$search_projet_ref.'" size="8">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['c.ref']['checked']))
-	{
+	if (!empty($arrayfields['c.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input type="text" class="flat" name="search_contrat_ref" value="'.$search_contrat_ref.'" size="8">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.description']['checked']))
-	{
+	if (!empty($arrayfields['f.description']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input type="text" class="flat" name="search_desc" value="'.$search_desc.'" size="12">';
 		print '</td>';
@@ -402,51 +462,45 @@ if ($resql)
 	$parameters = array('arrayfields'=>$arrayfields);
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (!empty($arrayfields['f.datec']['checked']))
-	{
+	if (!empty($arrayfields['f.datec']['checked'])) {
 		// Date creation
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.tms']['checked']))
-	{
+	if (!empty($arrayfields['f.tms']['checked'])) {
 		// Date modification
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.note_public']['checked']))
-	{
+	if (!empty($arrayfields['f.note_public']['checked'])) {
 		// Note public
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.note_private']['checked']))
-	{
+	if (!empty($arrayfields['f.note_private']['checked'])) {
 		// Note private
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['f.fk_statut']['checked']))
-	{
+	if (!empty($arrayfields['f.fk_statut']['checked'])) {
 		print '<td class="liste_titre right">';
 		$tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short
 		$liststatus = $objectstatic->statuts_short;
-		if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
+		if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
+			unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
+		}
 		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 1);
 		print '</td>';
 	}
 	// Fields of detail line
-	if (!empty($arrayfields['fd.description']['checked']))
-	{
+	if (!empty($arrayfields['fd.description']['checked'])) {
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
-	if (!empty($arrayfields['fd.date']['checked']))
-	{
+	if (!empty($arrayfields['fd.date']['checked'])) {
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
-	if (!empty($arrayfields['fd.duree']['checked']))
-	{
+	if (!empty($arrayfields['fd.duree']['checked'])) {
 		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	print '<td class="liste_titre maxwidthsearch">';
@@ -457,33 +511,58 @@ if ($resql)
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['f.ref']['checked']))          print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $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['pr.ref']['checked']))         print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], "pr.ref", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['c.ref']['checked']))          print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.description']['checked']))  print_liste_field_titre($arrayfields['f.description']['label'], $_SERVER["PHP_SELF"], "f.description", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $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['pr.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], "pr.ref", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['c.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.description']['checked'])) {
+		print_liste_field_titre($arrayfields['f.description']['label'], $_SERVER["PHP_SELF"], "f.description", "", $param, '', $sortfield, $sortorder);
+	}
 	// 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); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (!empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['f.note_public']['checked']))       print_liste_field_titre($arrayfields['f.note_public']['label'], $_SERVER["PHP_SELF"], "f.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['f.note_private']['checked']))       print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['fd.description']['checked'])) print_liste_field_titre($arrayfields['fd.description']['label'], $_SERVER["PHP_SELF"], '');
-	if (!empty($arrayfields['fd.date']['checked']))        print_liste_field_titre($arrayfields['fd.date']['label'], $_SERVER["PHP_SELF"], "fd.date", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['fd.duree']['checked']))       print_liste_field_titre($arrayfields['fd.duree']['label'], $_SERVER["PHP_SELF"], "fd.duree", "", $param, '', $sortfield, $sortorder, 'right ');
+	if (!empty($arrayfields['f.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['f.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['f.note_public']['checked'])) {
+		print_liste_field_titre($arrayfields['f.note_public']['label'], $_SERVER["PHP_SELF"], "f.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['f.note_private']['checked'])) {
+		print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['f.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['fd.description']['checked'])) {
+		print_liste_field_titre($arrayfields['fd.description']['label'], $_SERVER["PHP_SELF"], '');
+	}
+	if (!empty($arrayfields['fd.date']['checked'])) {
+		print_liste_field_titre($arrayfields['fd.date']['label'], $_SERVER["PHP_SELF"], "fd.date", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['fd.duree']['checked'])) {
+		print_liste_field_titre($arrayfields['fd.duree']['label'], $_SERVER["PHP_SELF"], "fd.duree", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
 	$total = 0;
 	$i = 0;
 	$totalarray = array();
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->rowid;
@@ -500,8 +579,7 @@ if ($resql)
 
 		print '<tr class="oddeven">';
 
-		if (!empty($arrayfields['f.ref']['checked']))
-		{
+		if (!empty($arrayfields['f.ref']['checked'])) {
 			print "<td>";
 
 			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
@@ -512,15 +590,13 @@ if ($resql)
 			// Warning
 			$warnornote = '';
 			//if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->fichinter->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
-			if (!empty($obj->note_private))
-			{
+			if (!empty($obj->note_private)) {
 				$warnornote .= ($warnornote ? ' ' : '');
 				$warnornote .= '<span class="note">';
 				$warnornote .= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
 				$warnornote .= '</span>';
 			}
-			if ($warnornote)
-			{
+			if ($warnornote) {
 				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
 				print $warnornote;
 				print '</td>';
@@ -535,17 +611,19 @@ if ($resql)
 			print '</td></tr></table>';
 
 			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		if (!empty($arrayfields['s.nom']['checked']))
-		{
+		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td>';
 			print $companystatic->getNomUrl(1, '', 44);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		if (!empty($arrayfields['pr.ref']['checked']))
-		{
+		if (!empty($arrayfields['pr.ref']['checked'])) {
 			print '<td>';
 			$projetstatic->id = $obj->projet_id;
 			$projetstatic->ref = $obj->projet_ref;
@@ -554,10 +632,11 @@ if ($resql)
 				print $projetstatic->getNomUrl(1, '');
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		if (!empty($arrayfields['c.ref']['checked']))
-		{
+		if (!empty($arrayfields['c.ref']['checked'])) {
 			print '<td>';
 			$contratstatic->id = $obj->contrat_id;
 			$contratstatic->ref = $obj->contrat_ref;
@@ -567,12 +646,15 @@ if ($resql)
 				print $contratstatic->getNomUrl(1, '');
 				print '</td>';
 			}
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		if (!empty($arrayfields['f.description']['checked']))
-		{
+		if (!empty($arrayfields['f.description']['checked'])) {
 			print '<td>'.dol_trunc(dolGetFirstLineOfText($obj->description), 48).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Extra fields
@@ -582,71 +664,84 @@ if ($resql)
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
-		if (!empty($arrayfields['f.datec']['checked']))
-		{
+		if (!empty($arrayfields['f.datec']['checked'])) {
 			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['f.tms']['checked']))
-		{
+		if (!empty($arrayfields['f.tms']['checked'])) {
 			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']++;
+			}
 		}
 		// Note public
-		if (!empty($arrayfields['f.note_public']['checked']))
-		{
+		if (!empty($arrayfields['f.note_public']['checked'])) {
 			print '<td class="center">';
 			print dol_escape_htmltag($obj->note_public);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Note private
-		if (!empty($arrayfields['f.note_private']['checked']))
-		{
+		if (!empty($arrayfields['f.note_private']['checked'])) {
 			print '<td class="center">';
 			print dol_escape_htmltag($obj->note_private);
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Status
-		if (!empty($arrayfields['f.fk_statut']['checked']))
-		{
+		if (!empty($arrayfields['f.fk_statut']['checked'])) {
 			print '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Fields of detail of line
-		if (!empty($arrayfields['fd.description']['checked']))
-		{
+		if (!empty($arrayfields['fd.description']['checked'])) {
 			print '<td>'.dolGetFirstLineOfText($obj->descriptiondetail).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		if (!empty($arrayfields['fd.date']['checked']))
-		{
+		if (!empty($arrayfields['fd.date']['checked'])) {
 			print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-		if (!empty($arrayfields['fd.duree']['checked']))
-		{
+		if (!empty($arrayfields['fd.duree']['checked'])) {
 			print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
+			}
 			$totalarray['val']['fd.duree'] += $obj->duree;
 		}
 		// 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->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";
 
@@ -669,7 +764,9 @@ if ($resql)
 	print "</form>\n";
 
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	// Show list of available documents
 	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index dddbe79e33e..fcc790bf8c2 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -39,7 +39,9 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
 
 $object = new Fichinter($db);
@@ -62,8 +64,7 @@ llxHeader('', $langs->trans("Intervention"));
 
 $form = new Form($db);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = fichinter_prepare_head($object);
@@ -80,12 +81,10 @@ if ($id > 0 || !empty($ref))
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->commande->creer)
-		{
+		if ($user->rights->commande->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
diff --git a/htdocs/fichinter/stats/index.php b/htdocs/fichinter/stats/index.php
index 19e7f86d8a0..29a5f9976b0 100644
--- a/htdocs/fichinter/stats/index.php
+++ b/htdocs/fichinter/stats/index.php
@@ -30,13 +30,14 @@ $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 $mode = 'customer';
-if (!$user->rights->ficheinter->lire) accessforbidden();
+if (!$user->rights->ficheinter->lire) {
+	accessforbidden();
+}
 
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -70,15 +71,16 @@ print load_fiche_titre($title, '', 'intervention');
 dol_mkdir($dir);
 
 $stats = new FichinterStats($db, $socid, $mode, ($userid > 0 ? $userid : 0));
-if ($object_status != '' && $object_status > -1) $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+if ($object_status != '' && $object_status > -1) {
+	$stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+}
 
 // Build graphic number of object
 $data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filenamenb = $dir.'/interventionsnbinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsnbinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -88,12 +90,10 @@ if (!$user->rights->societe->client->voir || $user->socid)
 
 $px1 = new DolGraph();
 $mesg = $px1->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px1->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -115,8 +115,7 @@ if (!$mesg)
 $data = $stats->getAmountByMonthWithPrevYear($endyear, $startyear);
 // $data = array(array('Lib',val1,val2,val3),...)
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filenameamount = $dir.'/interventionsamountinyear-'.$user->id.'-'.$year.'.png';
 	$fileurlamount = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsamountinyear-'.$user->id.'-'.$year.'.png';
 } else {
@@ -126,12 +125,10 @@ if (!$user->rights->societe->client->voir || $user->socid)
 
 $px2 = new DolGraph();
 $mesg = $px2->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px2->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -152,8 +149,7 @@ if (!$mesg)
 
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
-if (!$user->rights->societe->client->voir || $user->socid)
-{
+if (!$user->rights->societe->client->voir || $user->socid) {
 	$filename_avg = $dir.'/interventionsaverage-'.$user->id.'-'.$year.'.png';
 	$fileurl_avg = DOL_URL_ROOT.'/viewimage.php?modulepart=interventionstats&file=interventionsaverage-'.$user->id.'-'.$year.'.png';
 } else {
@@ -163,12 +159,10 @@ if (!$user->rights->societe->client->voir || $user->socid)
 
 $px3 = new DolGraph();
 $mesg = $px3->isGraphKo();
-if (!$mesg)
-{
+if (!$mesg) {
 	$px3->SetData($data);
 	$i = $startyear; $legend = array();
-	while ($i <= $endyear)
-	{
+	while ($i <= $endyear) {
 		$legend[] = $i;
 		$i++;
 	}
@@ -196,7 +190,9 @@ foreach ($data as $val) {
 		$arrayyears[$val['year']] = $val['year'];
 	}
 }
-if (!count($arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!count($arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 
 $h = 0;
 $head = array();
@@ -236,13 +232,19 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 	print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
 	$tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short
 	$liststatus = $objectstatic->statuts_short;
-	if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
+if (empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
+	unset($liststatus[2]); // Option deprecated. In a future, billed must be managed with a dedicated field to 0 or 1
+}
 	print $form->selectarray('object_status', $liststatus, $object_status, 1, 0, 0, '', 1);
 	print '</td></tr>';
 	// Year
 	print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';
-	if (!in_array($year, $arrayyears)) $arrayyears[$year] = $year;
-	if (!in_array($nowyear, $arrayyears)) $arrayyears[$nowyear] = $nowyear;
+if (!in_array($year, $arrayyears)) {
+	$arrayyears[$year] = $year;
+}
+if (!in_array($nowyear, $arrayyears)) {
+	$arrayyears[$nowyear] = $nowyear;
+}
 	arsort($arrayyears);
 	print $form->selectarray('year', $arrayyears, $year, 0);
 	print '</td></tr>';
@@ -265,11 +267,9 @@ print '<td class="right">%</td>';
 print '</tr>';
 
 $oldyear = 0;
-foreach ($data as $val)
-{
+foreach ($data as $val) {
 	$year = $val['year'];
-	while (!empty($year) && $oldyear > $year + 1)
-	{
+	while (!empty($year) && $oldyear > $year + 1) {
 		// If we have empty year
 		$oldyear--;
 
@@ -307,12 +307,14 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 // Show graphs
 print '<table class="border centpercent"><tr class="pair nohover"><td class="center">';
-if ($mesg) { print $mesg; } else {
+if ($mesg) {
+	print $mesg;
+} else {
 	print $px1->show();
 	/*print "<br>\n";
-    print $px2->show();
-    print "<br>\n";
-    print $px3->show();*/
+	print $px2->show();
+	print "<br>\n";
+	print $px3->show();*/
 }
 print '</td></tr></table>';
 
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index b483e877e5e..ba754ec3321 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -16,8 +16,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -36,17 +35,18 @@ $langs->load("interventions");
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
 
 $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	?>
-    <tr class="<?php echo $trclass; ?>">
+	<tr class="<?php echo $trclass; ?>">
 		<td><?php echo $langs->trans("Intervention"); ?></td>
-	    <td><?php echo $objectlink->getNomUrl(1); ?></td>
-	    <td></td>
+		<td><?php echo $objectlink->getNomUrl(1); ?></td>
+		<td></td>
 		<td class="center"><?php echo dol_print_date($objectlink->datev, 'day'); ?></td>
 		<td></td>
 		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index 8d9778b177e..9fbdcc88eab 100644
--- a/htdocs/filefunc.inc.php
+++ b/htdocs/filefunc.inc.php
@@ -30,14 +30,19 @@
  *  \brief      File that include conf.php file and commons lib like functions.lib.php
  */
 
-if (!defined('DOL_APPLICATION_TITLE')) define('DOL_APPLICATION_TITLE', 'Dolibarr');
-if (!defined('DOL_VERSION')) define('DOL_VERSION', '14.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+if (!defined('DOL_APPLICATION_TITLE')) {
+	define('DOL_APPLICATION_TITLE', 'Dolibarr');
+}
+if (!defined('DOL_VERSION')) {
+	define('DOL_VERSION', '14.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+}
 
-if (!defined('EURO')) define('EURO', chr(128));
+if (!defined('EURO')) {
+	define('EURO', chr(128));
+}
 
 // Define syslog constants
-if (!defined('LOG_DEBUG'))
-{
+if (!defined('LOG_DEBUG')) {
 	if (!function_exists("syslog")) {
 		// For PHP versions without syslog (like running on Windows OS)
 		define('LOG_EMERG', 0);
@@ -52,7 +57,9 @@ if (!defined('LOG_DEBUG'))
 }
 
 // End of common declaration part
-if (defined('DOL_INC_FOR_VERSION_ERROR')) return;
+if (defined('DOL_INC_FOR_VERSION_ERROR')) {
+	return;
+}
 
 
 // Define vars
@@ -73,15 +80,13 @@ $conffiletoshow = "htdocs/conf/conf.php";
 // Include configuration
 $result = @include_once $conffile; // Keep @ because with some error reporting this break the redirect done when file not found
 
-if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done and we are in a web session
-{
-	if (!empty($_SERVER["CONTEXT_PREFIX"]))    // CONTEXT_PREFIX and CONTEXT_DOCUMENT_ROOT are not defined on all apache versions
-	{
+if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"])) {    // If install not done and we are in a web session
+	if (!empty($_SERVER["CONTEXT_PREFIX"])) {    // CONTEXT_PREFIX and CONTEXT_DOCUMENT_ROOT are not defined on all apache versions
 		$path = $_SERVER["CONTEXT_PREFIX"]; // example '/dolibarr/' when using an apache alias.
-		if (!preg_match('/\/$/', $path)) $path .= '/';
-	}
-	elseif (preg_match('/index\.php/', $_SERVER['PHP_SELF']))
-	{
+		if (!preg_match('/\/$/', $path)) {
+			$path .= '/';
+		}
+	} elseif (preg_match('/index\.php/', $_SERVER['PHP_SELF'])) {
 		// When we ask index.php, we MUST BE SURE that $path is '' at the end. This is required to make install process
 		// when using apache alias like '/dolibarr/' that point to htdocs.
 		// Note: If calling page was an index.php not into htdocs (ie comm/index.php, ...), then this redirect will fails,
@@ -94,11 +99,16 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done
 		$TDir = explode('/', $_SERVER['PHP_SELF']);
 		$path = '';
 		$i = count($TDir);
-		while ($i--)
-		{
-			if (empty($TDir[$i]) || $TDir[$i] == 'htdocs') break;
-			if ($TDir[$i] == 'dolibarr') break;
-			if (substr($TDir[$i], -4, 4) == '.php') continue;
+		while ($i--) {
+			if (empty($TDir[$i]) || $TDir[$i] == 'htdocs') {
+				break;
+			}
+			if ($TDir[$i] == 'dolibarr') {
+				break;
+			}
+			if (substr($TDir[$i], -4, 4) == '.php') {
+				continue;
+			}
 
 			$path .= '../';
 		}
@@ -109,15 +119,16 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"]))    // If install not done
 }
 
 // Force PHP error_reporting setup (Dolibarr may report warning without this)
-if (!empty($dolibarr_strict_mode))
-{
+if (!empty($dolibarr_strict_mode)) {
 	error_reporting(E_ALL | E_STRICT);
 } else {
 	error_reporting(E_ALL & ~(E_STRICT | E_NOTICE | E_DEPRECATED));
 }
 
 // Disable php display errors
-if (!empty($dolibarr_main_prod)) ini_set('display_errors', 'Off');
+if (!empty($dolibarr_main_prod)) {
+	ini_set('display_errors', 'Off');
+}
 
 // Clean parameters
 $dolibarr_main_data_root = trim($dolibarr_main_data_root);
@@ -126,39 +137,63 @@ $dolibarr_main_url_root_alt = (empty($dolibarr_main_url_root_alt) ? '' : trim($d
 $dolibarr_main_document_root = trim($dolibarr_main_document_root);
 $dolibarr_main_document_root_alt = (empty($dolibarr_main_document_root_alt) ? '' : trim($dolibarr_main_document_root_alt));
 
-if (empty($dolibarr_main_db_port)) $dolibarr_main_db_port = 3306; // For compatibility with old configs, if not defined, we take 'mysql' type
-if (empty($dolibarr_main_db_type)) $dolibarr_main_db_type = 'mysqli'; // For compatibility with old configs, if not defined, we take 'mysql' type
+if (empty($dolibarr_main_db_port)) {
+	$dolibarr_main_db_port = 3306; // For compatibility with old configs, if not defined, we take 'mysql' type
+}
+if (empty($dolibarr_main_db_type)) {
+	$dolibarr_main_db_type = 'mysqli'; // For compatibility with old configs, if not defined, we take 'mysql' type
+}
 
 // Mysql driver support has been removed in favor of mysqli
-if ($dolibarr_main_db_type == 'mysql') $dolibarr_main_db_type = 'mysqli';
-if (empty($dolibarr_main_db_prefix)) $dolibarr_main_db_prefix = 'llx_';
-if (empty($dolibarr_main_db_character_set)) $dolibarr_main_db_character_set = ($dolibarr_main_db_type == 'mysqli' ? 'utf8' : ''); // Old installation
-if (empty($dolibarr_main_db_collation)) $dolibarr_main_db_collation = ($dolibarr_main_db_type == 'mysqli' ? 'utf8_unicode_ci' : ''); // Old installation
-if (empty($dolibarr_main_db_encryption)) $dolibarr_main_db_encryption = 0;
-if (empty($dolibarr_main_db_cryptkey)) $dolibarr_main_db_cryptkey = '';
-if (empty($dolibarr_main_limit_users)) $dolibarr_main_limit_users = 0;
-if (empty($dolibarr_mailing_limit_sendbyweb)) $dolibarr_mailing_limit_sendbyweb = 0;
-if (empty($dolibarr_mailing_limit_sendbycli)) $dolibarr_mailing_limit_sendbycli = 0;
-if (empty($dolibarr_strict_mode)) $dolibarr_strict_mode = 0; // For debug in php strict mode
+if ($dolibarr_main_db_type == 'mysql') {
+	$dolibarr_main_db_type = 'mysqli';
+}
+if (empty($dolibarr_main_db_prefix)) {
+	$dolibarr_main_db_prefix = 'llx_';
+}
+if (empty($dolibarr_main_db_character_set)) {
+	$dolibarr_main_db_character_set = ($dolibarr_main_db_type == 'mysqli' ? 'utf8' : ''); // Old installation
+}
+if (empty($dolibarr_main_db_collation)) {
+	$dolibarr_main_db_collation = ($dolibarr_main_db_type == 'mysqli' ? 'utf8_unicode_ci' : ''); // Old installation
+}
+if (empty($dolibarr_main_db_encryption)) {
+	$dolibarr_main_db_encryption = 0;
+}
+if (empty($dolibarr_main_db_cryptkey)) {
+	$dolibarr_main_db_cryptkey = '';
+}
+if (empty($dolibarr_main_limit_users)) {
+	$dolibarr_main_limit_users = 0;
+}
+if (empty($dolibarr_mailing_limit_sendbyweb)) {
+	$dolibarr_mailing_limit_sendbyweb = 0;
+}
+if (empty($dolibarr_mailing_limit_sendbycli)) {
+	$dolibarr_mailing_limit_sendbycli = 0;
+}
+if (empty($dolibarr_strict_mode)) {
+	$dolibarr_strict_mode = 0; // For debug in php strict mode
+}
 
 // Security: CSRF protection
 // This test check if referrer ($_SERVER['HTTP_REFERER']) is same web site than Dolibarr ($_SERVER['HTTP_HOST'])
 // when we post forms (we allow GET to allow direct link to access a particular page).
 // Note about $_SERVER[HTTP_HOST/SERVER_NAME]: http://shiflett.org/blog/2006/mar/server-name-versus-http-host
 // See also option $conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN for a stronger CSRF protection.
-if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
-{
-	if (!empty($_SERVER['REQUEST_METHOD']) && !in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD')) && !empty($_SERVER['HTTP_HOST']))
-	{
+if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck)) {
+	if (!empty($_SERVER['REQUEST_METHOD']) && !in_array($_SERVER['REQUEST_METHOD'], array('GET', 'HEAD')) && !empty($_SERVER['HTTP_HOST'])) {
 		$csrfattack = false;
-		if (empty($_SERVER['HTTP_REFERER'])) $csrfattack = true; // An evil browser was used
-		else {
+		if (empty($_SERVER['HTTP_REFERER'])) {
+			$csrfattack = true; // An evil browser was used
+		} else {
 			$tmpa = parse_url($_SERVER['HTTP_HOST']);
 			$tmpb = parse_url($_SERVER['HTTP_REFERER']);
-			if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) $csrfattack = true;
+			if ((empty($tmpa['host']) ? $tmpa['path'] : $tmpa['host']) != (empty($tmpb['host']) ? $tmpb['path'] : $tmpb['host'])) {
+				$csrfattack = true;
+			}
 		}
-		if ($csrfattack)
-		{
+		if ($csrfattack) {
 			//print 'NOCSRFCHECK='.defined('NOCSRFCHECK').' REQUEST_METHOD='.$_SERVER['REQUEST_METHOD'].' HTTP_HOST='.$_SERVER['HTTP_HOST'].' HTTP_REFERER='.$_SERVER['HTTP_REFERER'];
 			// Note: We can't use dol_escape_htmltag here to escape output because lib functions.lib.ph is not yet loaded.
 			print "Access refused by CSRF protection in main.inc.php. Referer of form (".htmlentities($_SERVER['HTTP_REFERER'], ENT_COMPAT, 'UTF-8').") is outside the server that serve this page (with method = ".htmlentities($_SERVER['REQUEST_METHOD'], ENT_COMPAT, 'UTF-8').").\n";
@@ -168,20 +203,17 @@ if (!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck))
 	}
 	// Another test is done later on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on.
 }
-if (empty($dolibarr_main_db_host))
-{
+if (empty($dolibarr_main_db_host)) {
 	print '<div class="center">Dolibarr setup is not yet complete.<br><br>'."\n";
 	print '<a href="install/index.php">Click here to finish Dolibarr install process</a> ...</div>'."\n";
 	die;
 }
-if (empty($dolibarr_main_url_root))
-{
+if (empty($dolibarr_main_url_root)) {
 	print 'Value for parameter \'dolibarr_main_url_root\' is not defined in your \'htdocs\conf\conf.php\' file.<br>'."\n";
 	print 'You must add this parameter with your full Dolibarr root Url (Example: http://myvirtualdomain/ or http://mydomain/mydolibarrurl/)'."\n";
 	die;
 }
-if (empty($dolibarr_main_data_root))
-{
+if (empty($dolibarr_main_data_root)) {
 	// Si repertoire documents non defini, on utilise celui par defaut
 	$dolibarr_main_data_root = str_replace("/htdocs", "", $dolibarr_main_document_root);
 	$dolibarr_main_data_root .= "/documents";
@@ -204,14 +236,14 @@ if (!empty($_SERVER["DOCUMENT_ROOT"])) {
 $paths = explode('/', str_replace('\\', '/', $_SERVER["SCRIPT_NAME"])); // C) Value reported by web server, to say full path on filesystem of a file. Ex: /dolibarr/htdocs/admin/system/phpinfo.php
 // Try to detect if $_SERVER["DOCUMENT_ROOT"]+start of $_SERVER["SCRIPT_NAME"] is $dolibarr_main_document_root. If yes, relative url to add before dol files is this start part.
 $concatpath = '';
-foreach ($paths as $tmppath)	// We check to find (B+start of C)=A
-{
-	if (empty($tmppath)) continue;
+foreach ($paths as $tmppath) {	// We check to find (B+start of C)=A
+	if (empty($tmppath)) {
+		continue;
+	}
 	$concatpath .= '/'.$tmppath;
 	//if ($tmppath) $concatpath.='/'.$tmppath;
 	//print $_SERVER["SCRIPT_NAME"].'-'.$pathroot.'-'.$concatpath.'-'.$real_dolibarr_main_document_root.'-'.realpath($pathroot.$concatpath).'<br>';
-	if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath))    // @ avoid warning when safe_mode is on.
-	{
+	if ($real_dolibarr_main_document_root == @realpath($pathroot.$concatpath)) {    // @ avoid warning when safe_mode is on.
 		//print "Found relative url = ".$concatpath;
 		$tmp3 = $concatpath;
 		$found = 1;
@@ -220,14 +252,21 @@ foreach ($paths as $tmppath)	// We check to find (B+start of C)=A
 	//else print "Not found yet for concatpath=".$concatpath."<br>\n";
 }
 //print "found=".$found." dolibarr_main_url_root=".$dolibarr_main_url_root."\n";
-if (!$found) $tmp = $dolibarr_main_url_root; // If autodetect fails (Ie: when using apache alias that point outside default DOCUMENT_ROOT).
-else $tmp = 'http'.(((empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') && (empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] != 443)) ? '' : 's').'://'.$_SERVER["SERVER_NAME"].((empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] == 80 || $_SERVER["SERVER_PORT"] == 443) ? '' : ':'.$_SERVER["SERVER_PORT"]).($tmp3 ? (preg_match('/^\//', $tmp3) ? '' : '/').$tmp3 : '');
+if (!$found) {
+	$tmp = $dolibarr_main_url_root; // If autodetect fails (Ie: when using apache alias that point outside default DOCUMENT_ROOT).
+} else {
+	$tmp = 'http'.(((empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on') && (empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] != 443)) ? '' : 's').'://'.$_SERVER["SERVER_NAME"].((empty($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] == 80 || $_SERVER["SERVER_PORT"] == 443) ? '' : ':'.$_SERVER["SERVER_PORT"]).($tmp3 ? (preg_match('/^\//', $tmp3) ? '' : '/').$tmp3 : '');
+}
 //print "tmp1=".$tmp1." tmp2=".$tmp2." tmp3=".$tmp3." tmp=".$tmp."\n";
-if (!empty($dolibarr_main_force_https)) $tmp = preg_replace('/^http:/i', 'https:', $tmp);
+if (!empty($dolibarr_main_force_https)) {
+	$tmp = preg_replace('/^http:/i', 'https:', $tmp);
+}
 define('DOL_MAIN_URL_ROOT', $tmp); // URL absolute root (https://sss/dolibarr, ...)
 $uri = preg_replace('/^http(s?):\/\//i', '', constant('DOL_MAIN_URL_ROOT')); // $uri contains url without http*
 $suburi = strstr($uri, '/'); // $suburi contains url without domain:port
-if ($suburi == '/') $suburi = ''; // If $suburi is /, it is now ''
+if ($suburi == '/') {
+	$suburi = ''; // If $suburi is /, it is now ''
+}
 define('DOL_URL_ROOT', $suburi); // URL relative root ('', '/dolibarr', ...)
 
 //print DOL_MAIN_URL_ROOT.'-'.DOL_URL_ROOT."\n";
@@ -241,29 +280,54 @@ define('MAIN_DB_PREFIX', $dolibarr_main_db_prefix);
  * To use other version than embeded libraries, define here constant to path. Use '' to use include class path autodetect.
  */
 // Path to root libraries
-if (!defined('ADODB_PATH')) { define('ADODB_PATH', (!isset($dolibarr_lib_ADODB_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/adodbtime/' : (empty($dolibarr_lib_ADODB_PATH) ? '' : $dolibarr_lib_ADODB_PATH.'/')); }
-if (!defined('TCPDF_PATH')) { define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/'); }
-if (!defined('TCPDI_PATH')) { define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH.'/'); }
-if (!defined('NUSOAP_PATH')) { define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH.'/')); }
-if (!defined('PHPEXCELNEW_PATH')) { define('PHPEXCELNEW_PATH', (!isset($dolibarr_lib_PHPEXCELNEW_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/phpoffice/PhpSpreadsheet/' : (empty($dolibarr_lib_PHPEXCELNEW_PATH) ? '' : $dolibarr_lib_PHPEXCELNEW_PATH.'/')); }
-if (!defined('ODTPHP_PATH')) { define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH.'/')); }
-if (!defined('ODTPHP_PATHTOPCLZIP')) { define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/')); }
-if (!defined('JS_CKEDITOR')) { define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR)) ? '' : (empty($dolibarr_js_CKEDITOR) ? '' : $dolibarr_js_CKEDITOR.'/')); }
-if (!defined('JS_JQUERY')) { define('JS_JQUERY', (!isset($dolibarr_js_JQUERY)) ? '' : (empty($dolibarr_js_JQUERY) ? '' : $dolibarr_js_JQUERY.'/')); }
-if (!defined('JS_JQUERY_UI')) { define('JS_JQUERY_UI', (!isset($dolibarr_js_JQUERY_UI)) ? '' : (empty($dolibarr_js_JQUERY_UI) ? '' : $dolibarr_js_JQUERY_UI.'/')); }
+if (!defined('ADODB_PATH')) {
+	define('ADODB_PATH', (!isset($dolibarr_lib_ADODB_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/adodbtime/' : (empty($dolibarr_lib_ADODB_PATH) ? '' : $dolibarr_lib_ADODB_PATH.'/'));
+}
+if (!defined('TCPDF_PATH')) {
+	define('TCPDF_PATH', (empty($dolibarr_lib_TCPDF_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tecnickcom/tcpdf/' : $dolibarr_lib_TCPDF_PATH.'/');
+}
+if (!defined('TCPDI_PATH')) {
+	define('TCPDI_PATH', (empty($dolibarr_lib_TCPDI_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/tcpdi/' : $dolibarr_lib_TCPDI_PATH.'/');
+}
+if (!defined('NUSOAP_PATH')) {
+	define('NUSOAP_PATH', (!isset($dolibarr_lib_NUSOAP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/nusoap/lib/' : (empty($dolibarr_lib_NUSOAP_PATH) ? '' : $dolibarr_lib_NUSOAP_PATH.'/'));
+}
+if (!defined('PHPEXCELNEW_PATH')) {
+	define('PHPEXCELNEW_PATH', (!isset($dolibarr_lib_PHPEXCELNEW_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/phpoffice/PhpSpreadsheet/' : (empty($dolibarr_lib_PHPEXCELNEW_PATH) ? '' : $dolibarr_lib_PHPEXCELNEW_PATH.'/'));
+}
+if (!defined('ODTPHP_PATH')) {
+	define('ODTPHP_PATH', (!isset($dolibarr_lib_ODTPHP_PATH)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/' : (empty($dolibarr_lib_ODTPHP_PATH) ? '' : $dolibarr_lib_ODTPHP_PATH.'/'));
+}
+if (!defined('ODTPHP_PATHTOPCLZIP')) {
+	define('ODTPHP_PATHTOPCLZIP', (!isset($dolibarr_lib_ODTPHP_PATHTOPCLZIP)) ?DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/' : (empty($dolibarr_lib_ODTPHP_PATHTOPCLZIP) ? '' : $dolibarr_lib_ODTPHP_PATHTOPCLZIP.'/'));
+}
+if (!defined('JS_CKEDITOR')) {
+	define('JS_CKEDITOR', (!isset($dolibarr_js_CKEDITOR)) ? '' : (empty($dolibarr_js_CKEDITOR) ? '' : $dolibarr_js_CKEDITOR.'/'));
+}
+if (!defined('JS_JQUERY')) {
+	define('JS_JQUERY', (!isset($dolibarr_js_JQUERY)) ? '' : (empty($dolibarr_js_JQUERY) ? '' : $dolibarr_js_JQUERY.'/'));
+}
+if (!defined('JS_JQUERY_UI')) {
+	define('JS_JQUERY_UI', (!isset($dolibarr_js_JQUERY_UI)) ? '' : (empty($dolibarr_js_JQUERY_UI) ? '' : $dolibarr_js_JQUERY_UI.'/'));
+}
 // Other required path
-if (!defined('DOL_DEFAULT_TTF')) { define('DOL_DEFAULT_TTF', (!isset($dolibarr_font_DOL_DEFAULT_TTF)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/Aerial.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF) ? '' : $dolibarr_font_DOL_DEFAULT_TTF)); }
-if (!defined('DOL_DEFAULT_TTF_BOLD')) { define('DOL_DEFAULT_TTF_BOLD', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/AerialBd.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD) ? '' : $dolibarr_font_DOL_DEFAULT_TTF_BOLD)); }
+if (!defined('DOL_DEFAULT_TTF')) {
+	define('DOL_DEFAULT_TTF', (!isset($dolibarr_font_DOL_DEFAULT_TTF)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/Aerial.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF) ? '' : $dolibarr_font_DOL_DEFAULT_TTF));
+}
+if (!defined('DOL_DEFAULT_TTF_BOLD')) {
+	define('DOL_DEFAULT_TTF_BOLD', (!isset($dolibarr_font_DOL_DEFAULT_TTF_BOLD)) ?DOL_DOCUMENT_ROOT.'/includes/fonts/AerialBd.ttf' : (empty($dolibarr_font_DOL_DEFAULT_TTF_BOLD) ? '' : $dolibarr_font_DOL_DEFAULT_TTF_BOLD));
+}
 
 
 /*
  * Include functions
  */
 
-if (!defined('ADODB_DATE_VERSION')) include_once ADODB_PATH.'adodb-time.inc.php';
+if (!defined('ADODB_DATE_VERSION')) {
+	include_once ADODB_PATH.'adodb-time.inc.php';
+}
 
-if (!file_exists(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php"))
-{
+if (!file_exists(DOL_DOCUMENT_ROOT."/core/lib/functions.lib.php")) {
 	print "Error: Dolibarr config file content seems to be not correctly defined.<br>\n";
 	print "Please run dolibarr setup by calling page <b>/install</b>.<br>\n";
 	exit;
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index 0c0d8f42c9e..e0cd9beff0c 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -22,10 +22,18 @@
  *	\brief      File to return an Ajax response to get list of possible prices for margin calculation
  */
 
-if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Disables token renewal
-if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
-if (!defined('NOREQUIRESOC'))   define('NOREQUIRESOC', '1');
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
@@ -46,47 +54,45 @@ top_httphead();
 
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-if ($idprod > 0)
-{
+if ($idprod > 0) {
 	$producttmp = new ProductFournisseur($db);
 	$producttmp->fetch($idprod);
 
 	$sorttouse = 's.nom, pfp.quantity, pfp.price';
-	if (GETPOST('bestpricefirst')) $sorttouse = 'pfp.unitprice, s.nom, pfp.quantity, pfp.price';
+	if (GETPOST('bestpricefirst')) {
+		$sorttouse = 'pfp.unitprice, s.nom, pfp.quantity, pfp.price';
+	}
 
 	$productSupplierArray = $producttmp->list_product_fournisseur_price($idprod, $sorttouse); // We list all price per supplier, and then firstly with the lower quantity. So we can choose first one with enough quantity into list.
-	if (is_array($productSupplierArray))
-	{
-		foreach ($productSupplierArray as $productSupplier)
-		{
+	if (is_array($productSupplierArray)) {
+		foreach ($productSupplierArray as $productSupplier) {
 			$price = $productSupplier->fourn_price * (1 - $productSupplier->fourn_remise_percent / 100);
 			$unitprice = $productSupplier->fourn_unitprice * (1 - $productSupplier->fourn_remise_percent / 100);
 
 			$title = $productSupplier->fourn_name.' - '.$productSupplier->fourn_ref.' - ';
 
-			if ($productSupplier->fourn_qty == 1)
-			{
+			if ($productSupplier->fourn_qty == 1) {
 				$title .= price($price, 0, $langs, 0, 0, -1, $conf->currency)."/";
 			}
 			$title .= $productSupplier->fourn_qty.' '.($productSupplier->fourn_qty == 1 ? $langs->trans("Unit") : $langs->trans("Units"));
 
-			if ($productSupplier->fourn_qty > 1)
-			{
+			if ($productSupplier->fourn_qty > 1) {
 				$title .= " - ";
 				$title .= price($unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit");
 				$price = $unitprice;
 			}
 
 			$label = price($price, 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit");
-			if ($productSupplier->fourn_ref) $label .= ' ('.$productSupplier->fourn_ref.')';
+			if ($productSupplier->fourn_ref) {
+				$label .= ' ('.$productSupplier->fourn_ref.')';
+			}
 
 			$prices[] = array("id" => $productSupplier->product_fourn_price_id, "price" => price2num($price, 0, '', 0), "label" => $label, "title" => $title); // For price field, we must use price2num(), for label or title, price()
 		}
 	}
 
 	// After best supplier prices and before costprice
-	if (!empty($conf->stock->enabled))
-	{
+	if (!empty($conf->stock->enabled)) {
 		// Add price for pmp
 		$price = $producttmp->pmp;
 		$prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort").': '.price($price, 0, $langs, 0, 0, -1, $conf->currency)); // For price field, we must use price2num(), for label or title, price()
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 9794ea3cc11..1d7f5cce418 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2014      Jean Heimburger      <jean@tiaris.info>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2021       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,8 +36,12 @@ require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-if (!empty($conf->categorie->enabled)) require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+if (!empty($conf->adherent->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+}
+if (!empty($conf->categorie->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 
 // Load translation files required by page
 $langs->loadLangs(array(
@@ -53,7 +58,9 @@ $cancelbutton = GETPOST('cancel', 'alpha');
 
 // Security check
 $id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
-if ($user->socid) $id = $user->socid;
+if ($user->socid) {
+	$id = $user->socid;
+}
 $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe', '', 'rowid');
 
 $object = new Fournisseur($db);
@@ -81,44 +88,48 @@ if ($object->id > 0) {
 
 $parameters = array('id'=>$id);
 $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))
-{
-	if ($cancelbutton)
-	{
+if (empty($reshook)) {
+	if ($cancelbutton) {
 		$action = "";
 	}
 
-	if ($action == 'setsupplieraccountancycode')
-	{
+	if ($action == 'setsupplieraccountancycode') {
 		$result = $object->fetch($id);
-   		$object->code_compta_fournisseur = $_POST["supplieraccountancycode"];
+		$object->code_compta_fournisseur = $_POST["supplieraccountancycode"];
 		$result = $object->update($object->id, $user, 1, 0, 1);
-		if ($result < 0)	setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 	// terms of the settlement
-	if ($action == 'setconditions' && $user->rights->societe->creer)
-	{
+	if ($action == 'setconditions' && $user->rights->societe->creer) {
 		$object->fetch($id);
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_supplier_id', 'int'));
-		if ($result < 0) dol_print_error($db, $object->error);
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
 	}
 	// mode de reglement
-	if ($action == 'setmode' && $user->rights->societe->creer)
-	{
+	if ($action == 'setmode' && $user->rights->societe->creer) {
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_supplier_id', 'int'));
-		if ($result < 0) dol_print_error($db, $object->error);
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
 	}
 
 	// update supplier order min amount
-	if ($action == 'setsupplier_order_min_amount')
-	{
+	if ($action == 'setsupplier_order_min_amount') {
 		$object->fetch($id);
 		$object->supplier_order_min_amount = price2num(GETPOST('supplier_order_min_amount', 'alpha'));
 		$result = $object->update($object->id, $user);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	if ($action == 'update_extras') {
@@ -129,15 +140,20 @@ if (empty($reshook))
 		// Fill array 'array_options' with data from update form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
 
-		if ($ret < 0) $error++;
-
-		if (!$error)
-		{
-			$result = $object->insertExtraFields('COMPANY_MODIFY');
-			if ($result < 0) $error++;
+		if ($ret < 0) {
+			$error++;
 		}
 
-		if ($error) $action = 'edit_extras';
+		if (!$error) {
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
+			if ($result < 0) {
+				$error++;
+			}
+		}
+
+		if ($error) {
+			$action = 'edit_extras';
+		}
 	}
 }
 
@@ -149,17 +165,19 @@ if (empty($reshook))
 $contactstatic = new Contact($db);
 $form = new Form($db);
 
-if ($id > 0 && empty($object->id))
-{
+if ($id > 0 && empty($object->id)) {
 	// Load data of third party
 	$res = $object->fetch($id);
-	if ($object->id <= 0) dol_print_error($db, $object->error);
+	if ($object->id <= 0) {
+		dol_print_error($db, $object->error);
+	}
 }
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$title = $langs->trans("ThirdParty")." - ".$langs->trans('Supplier');
-	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->name." - ".$langs->trans('Supplier');
+	if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+		$title = $object->name." - ".$langs->trans('Supplier');
+	}
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
@@ -184,22 +202,20 @@ if ($object->id > 0)
 	print $object->getTypeUrl(1);
 	print '</td></tr>';
 
-	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-	{
+	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
-	if ($object->fournisseur)
-	{
+	if ($object->fournisseur) {
 		print '<tr>';
-        print '<td class="titlefield">'.$langs->trans("SupplierCode").'</td><td>';
-        print $object->code_fournisseur;
-        $tmpcheck = $object->check_codefournisseur();
-        if ($tmpcheck != 0 && $tmpcheck != -5) {
-        	print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        }
-        print '</td>';
-        print '</tr>';
+		print '<td class="titlefield">'.$langs->trans("SupplierCode").'</td><td>';
+		print $object->code_fournisseur;
+		$tmpcheck = $object->check_codefournisseur();
+		if ($tmpcheck != 0 && $tmpcheck != -5) {
+			print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		}
+		print '</td>';
+		print '</tr>';
 
 		$langs->load('compta');
 		print '<tr>';
@@ -221,14 +237,12 @@ if ($object->id > 0)
 	print '</tr>';
 
 	// Local Taxes
-	if ($mysoc->useLocalTax(1))
-	{
+	if ($mysoc->useLocalTax(1)) {
 		print '<tr><td>'.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).'</td><td>';
 		print yn($object->localtax1_assuj);
 		print '</td></tr>';
 	}
-	if ($mysoc->useLocalTax(2))
-	{
+	if ($mysoc->useLocalTax(2)) {
 		print '<tr><td>'.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).'</td><td>';
 		print yn($object->localtax2_assuj);
 		print '</td></tr>';
@@ -246,11 +260,12 @@ if ($object->id > 0)
 	print '<table width="100%" class="nobordernopadding"><tr><td>';
 	print $langs->trans('PaymentConditions');
 	print '<td>';
-	if (($action != 'editconditions') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	if (($action != 'editconditions') && $user->rights->societe->creer) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
-	if ($action == 'editconditions')
-	{
+	if ($action == 'editconditions') {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', -1, 1);
 	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'none');
@@ -263,11 +278,12 @@ if ($object->id > 0)
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans('PaymentMode');
 	print '<td>';
-	if (($action != 'editmode') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	if (($action != 'editmode') && $user->rights->societe->creer) {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
-	if ($action == 'editmode')
-	{
+	if ($action == 'editmode') {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'mode_reglement_supplier_id', 'DBIT', 1, 1);
 	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->mode_reglement_supplier_id, 'none');
@@ -280,8 +296,7 @@ if ($object->id > 0)
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans("CustomerRelativeDiscountShort");
 	print '<td><td class="right">';
-	if ($user->rights->societe->creer && !$user->socid > 0)
-	{
+	if ($user->rights->societe->creer && !$user->socid > 0) {
 		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
 	}
 	print '</td></tr></table>';
@@ -294,22 +309,24 @@ if ($object->id > 0)
 	print '<tr><td class="nowrap">';
 	print $langs->trans("CustomerAbsoluteDiscountShort");
 	print '<td><td class="right">';
-	if ($user->rights->societe->creer && !$user->socid > 0)
-	{
+	if ($user->rights->societe->creer && !$user->socid > 0) {
 		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
 	}
 	print '</td></tr></table>';
 	print '</td>';
 	print '<td>';
 	$amount_discount = $object->getAvailableDiscounts('', '', 0, 1);
-	if ($amount_discount < 0) dol_print_error($db, $object->error);
-	if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
+	if ($amount_discount < 0) {
+		dol_print_error($db, $object->error);
+	}
+	if ($amount_discount > 0) {
+		print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
+	}
 	//else print $langs->trans("DiscountNone");
 	print '</td>';
 	print '</tr>';
 
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT))
-	{
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT)) {
 		print '<tr class="nowrap">';
 		print '<td>';
 		print $form->editfieldkey("OrderMinAmount", 'supplier_order_min_amount', $object->supplier_order_min_amount, $object, $user->rights->societe->creer);
@@ -321,8 +338,7 @@ if ($object->id > 0)
 	}
 
 	// Categories
-	if (!empty($conf->categorie->enabled))
-	{
+	if (!empty($conf->categorie->enabled)) {
 		$langs->load("categories");
 		print '<tr><td>'.$langs->trans("SuppliersCategoriesShort").'</td>';
 		print '<td>';
@@ -335,16 +351,14 @@ if ($object->id > 0)
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Module Adherent
-	if (!empty($conf->adherent->enabled))
-	{
+	if (!empty($conf->adherent->enabled)) {
 		$langs->load("members");
 		$langs->load("users");
 		print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
 		print '<td>';
 		$adh = new Adherent($db);
 		$result = $adh->fetch('', '', $object->id);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$adh->ref = $adh->getFullName($langs);
 			print $adh->getNomUrl(1);
 		} else {
@@ -371,8 +385,7 @@ if ($object->id > 0)
 	$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
 	$boxstat .= '<tr class="impair nohover"><td colspan="2" class="tdboxstats nohover">';
 
-	if ($conf->supplier_proposal->enabled)
-	{
+	if ($conf->supplier_proposal->enabled) {
 		// Box proposals
 		$tmp = $object->getOutstandingProposals('supplier');
 		$outstandingOpened = $tmp['opened'];
@@ -381,16 +394,19 @@ if ($object->id > 0)
 		$text = $langs->trans("OverAllSupplierProposals");
 		$link = DOL_URL_ROOT.'/supplier_proposal/list.php?socid='.$object->id;
 		$icon = 'bill';
-		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		if ($link) {
+			$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		}
 		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
 		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
 		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 		$boxstat .= '</div>';
-		if ($link) $boxstat .= '</a>';
+		if ($link) {
+			$boxstat .= '</a>';
+		}
 	}
 
-	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-	{
+	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 		// Box proposals
 		$tmp = $object->getOutstandingOrders('supplier');
 		$outstandingOpened = $tmp['opened'];
@@ -399,16 +415,19 @@ if ($object->id > 0)
 		$text = $langs->trans("OverAllOrders");
 		$link = DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id;
 		$icon = 'bill';
-		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		if ($link) {
+			$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		}
 		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
 		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
 		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 		$boxstat .= '</div>';
-		if ($link) $boxstat .= '</a>';
+		if ($link) {
+			$boxstat .= '</a>';
+		}
 	}
 
-	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-	{
+	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 		$tmp = $object->getOutstandingBills('supplier');
 		$outstandingOpened = $tmp['opened'];
 		$outstandingTotal = $tmp['total_ht'];
@@ -417,23 +436,31 @@ if ($object->id > 0)
 		$text = $langs->trans("OverAllInvoices");
 		$link = DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->id;
 		$icon = 'bill';
-		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		if ($link) {
+			$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		}
 		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
 		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
 		$boxstat .= '<span class="boxstatsindicator">'.price($outstandingTotal, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 		$boxstat .= '</div>';
-		if ($link) $boxstat .= '</a>';
+		if ($link) {
+			$boxstat .= '</a>';
+		}
 
 		// Box outstanding bill
 		$text = $langs->trans("CurrentOutstandingBill");
 		$link = DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
 		$icon = 'bill';
-		if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		if ($link) {
+			$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+		}
 		$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
 		$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
 		$boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
 		$boxstat .= '</div>';
-		if ($link) $boxstat .= '</a>';
+		if ($link) {
+			$boxstat .= '</a>';
+		}
 
 		$tmp = $object->getOutstandingBills('supplier', 1);
 		$outstandingOpenedLate = $tmp['opened'];
@@ -441,12 +468,16 @@ if ($object->id > 0)
 			$text = $langs->trans("CurrentOutstandingBillLate");
 			$link = DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
 			$icon = 'bill';
-			if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+			if ($link) {
+				$boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+			}
 			$boxstat .= '<div class="boxstats" title="'.dol_escape_htmltag($text).'">';
 			$boxstat .= '<span class="boxstatstext">'.img_object("", $icon).' <span>'.$text.'</span></span><br>';
 			$boxstat .= '<span class="boxstatsindicator'.($outstandingOpenedLate > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
 			$boxstat .= '</div>';
-			if ($link) $boxstat .= '</a>';
+			if ($link) {
+				$boxstat .= '</a>';
+			}
 		}
 	}
 
@@ -468,13 +499,12 @@ if ($object->id > 0)
 	print '</tr>';
 	print '</table>';
 	print '<br>';
-    */
+	*/
 
 	/*
 	 * List of products
 	 */
-	if (!empty($conf->product->enabled) || !empty($conf->service->enabled))
-	{
+	if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 		$langs->load("products");
 		//Query from product/liste.php
 		$sql = 'SELECT p.rowid, p.ref, p.label, p.fk_product_type, p.entity,';
@@ -487,7 +517,9 @@ if ($object->id > 0)
 		$sql .= $db->plimit($MAXLIST);
 
 		$query = $db->query($sql);
-		if (!$query) dol_print_error($db);
+		if (!$query) {
+			dol_print_error($db);
+		}
 
 		$num = $db->num_rows($query);
 
@@ -498,12 +530,10 @@ if ($object->id > 0)
 		print '</a></td></tr>';
 
 		$return = array();
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			$productstatic = new Product($db);
 
-			while ($objp = $db->fetch_object($query))
-			{
+			while ($objp = $db->fetch_object($query)) {
 				$productstatic->id = $objp->rowid;
 				$productstatic->ref = $objp->ref;
 				$productstatic->label = $objp->label;
@@ -523,11 +553,9 @@ if ($object->id > 0)
 				//print '<td class="right" class="nowrap">'.dol_print_date($objp->tms, 'day').'</td>';
 				print '<td class="right">';
 				//print (isset($objp->unitprice) ? price($objp->unitprice) : '');
-				if (isset($objp->price))
-				{
+				if (isset($objp->price)) {
 					print price($objp->price);
-					if ($objp->quantity > 1)
-					{
+					if ($objp->quantity > 1) {
 						print ' / ';
 						print $objp->quantity;
 					}
@@ -546,8 +574,7 @@ if ($object->id > 0)
 	 */
 	$proposalstatic = new SupplierProposal($db);
 
-	if ($user->rights->supplier_proposal->lire)
-	{
+	if ($user->rights->supplier_proposal->lire) {
 		$langs->loadLangs(array("supplier_proposal"));
 
 		$sql = "SELECT p.rowid, p.ref, p.date_valid as dc, p.fk_statut, p.total_ht, p.total_tva, p.total_ttc";
@@ -558,13 +585,11 @@ if ($object->id > 0)
 		$sql .= " ".$db->plimit($MAXLIST);
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num = $db->num_rows($resql);
 
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
@@ -576,8 +601,7 @@ if ($object->id > 0)
 				print '</td></tr>';
 			}
 
-			while ($i < $num && $i <= $MAXLIST)
-			{
+			while ($i < $num && $i <= $MAXLIST) {
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
@@ -590,8 +614,7 @@ if ($object->id > 0)
 				print $proposalstatic->getNomUrl(1);
 				print '</td>';
 				print '<td class="center" width="80">';
-				if ($obj->dc)
-				{
+				if ($obj->dc) {
 					print dol_print_date($db->jdate($obj->dc), 'day');
 				} else {
 					print "-";
@@ -603,7 +626,9 @@ if ($object->id > 0)
 			}
 			$db->free($resql);
 
-			if ($num > 0) print "</table>";
+			if ($num > 0) {
+				print "</table>";
+			}
 		} else {
 			dol_print_error($db);
 		}
@@ -614,8 +639,7 @@ if ($object->id > 0)
 	 */
 	$orderstatic = new CommandeFournisseur($db);
 
-	if ($user->rights->fournisseur->commande->lire)
-	{
+	if ($user->rights->fournisseur->commande->lire) {
 		// TODO move to DAO class
 		// Check if there are supplier orders billable
 		$sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
@@ -626,8 +650,7 @@ if ($object->id > 0)
 		$sql2 .= " AND c.entity IN (".getEntity('commande_fournisseur').")";
 		$sql2 .= ' AND s.rowid = '.$object->id;
 		// Show orders we can bill
-		if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS))
-		{
+		if (empty($conf->global->SUPPLIER_ORDER_TO_INVOICE_STATUS)) {
 			$sql2 .= " AND c.fk_statut IN (".$db->sanitize(CommandeFournisseur::STATUS_RECEIVED_COMPLETELY).")"; //  Must match filter in htdocs/fourn/commande/list.php
 		} else {
 			// CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.", ".CommandeFournisseur::STATUS_RECEIVED_COMPLETELY
@@ -651,25 +674,22 @@ if ($object->id > 0)
 		$sql .= " WHERE p.fk_soc =".$object->id;
 		$sql .= " AND p.entity IN (".getEntity('commande_fournisseur').")";
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$object_count = $db->fetch_object($resql);
 			$num = $object_count->total;
 		}
 
-		$sql  = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut, p.total_ht, p.tva as total_tva, p.total_ttc";
+		$sql  = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut, p.total_ht, p.total_tva, p.total_ttc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p";
 		$sql .= " WHERE p.fk_soc =".$object->id;
 		$sql .= " AND p.entity IN (".getEntity('commande_fournisseur').")";
 		$sql .= " ORDER BY p.date_commande DESC";
 		$sql .= " ".$db->plimit($MAXLIST);
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
@@ -681,8 +701,7 @@ if ($object->id > 0)
 				print '</td></tr>';
 			}
 
-			while ($i < $num && $i < $MAXLIST)
-			{
+			while ($i < $num && $i < $MAXLIST) {
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
@@ -695,8 +714,7 @@ if ($object->id > 0)
 				print $orderstatic->getNomUrl(1);
 				print '</td>';
 				print '<td class="center" width="80">';
-				if ($obj->dc)
-				{
+				if ($obj->dc) {
 					print dol_print_date($db->jdate($obj->dc), 'day');
 				} else {
 					print "-";
@@ -708,7 +726,9 @@ if ($object->id > 0)
 			}
 			$db->free($resql);
 
-			if ($num > 0) print "</table>";
+			if ($num > 0) {
+				print "</table>";
+			}
 		} else {
 			dol_print_error($db);
 		}
@@ -721,8 +741,7 @@ if ($object->id > 0)
 	$langs->load('bills');
 	$facturestatic = new FactureFournisseur($db);
 
-	if ($user->rights->fournisseur->facture->lire)
-	{
+	if ($user->rights->fournisseur->facture->lire) {
 		// TODO move to DAO class
 		$sql = 'SELECT f.rowid, f.libelle as label, f.ref, f.ref_supplier, f.fk_statut, f.datef as df, f.total_ht, f.total_tva, f.total_ttc as amount,f.paye,';
 		$sql .= ' SUM(pf.amount) as am';
@@ -733,12 +752,10 @@ if ($object->id > 0)
 		$sql .= ' GROUP BY f.rowid,f.libelle,f.ref,f.ref_supplier,f.fk_statut,f.datef,f.total_ht,f.total_tva,f.total_ttc,f.paye';
 		$sql .= ' ORDER BY f.datef DESC';
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num = $db->num_rows($resql);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				print '<table class="noborder centpercent lastrecordtable">';
 
 				print '<tr class="liste_titre">';
@@ -749,8 +766,7 @@ if ($object->id > 0)
 				print '</td></tr>';
 			}
 
-			while ($i < min($num, $MAXLIST))
-			{
+			while ($i < min($num, $MAXLIST)) {
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
@@ -777,7 +793,9 @@ if ($object->id > 0)
 				$i++;
 			}
 			$db->free($resql);
-			if ($num > 0) print '</table>';
+			if ($num > 0) {
+				print '</table>';
+			}
 		} else {
 			dol_print_error($db);
 		}
@@ -797,15 +815,12 @@ if ($object->id > 0)
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 	// modified by hook
-	if (empty($reshook))
-	{
-		if ($object->status != 1)
-		{
+	if (empty($reshook)) {
+		if ($object->status != 1) {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
 		}
 
-		if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer)
-		{
+		if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->creer) {
 			$langs->load("supplier_proposal");
 			if ($object->status == 1) {
 				print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierProposal").'</a>';
@@ -814,8 +829,7 @@ if ($object->id > 0)
 			}
 		}
 
-		if ($user->rights->fournisseur->commande->creer)
-		{
+		if ($user->rights->fournisseur->commande->creer) {
 			$langs->load("orders");
 			if ($object->status == 1) {
 				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
@@ -824,21 +838,20 @@ if ($object->id > 0)
 			}
 		}
 
-		if ($user->rights->fournisseur->facture->creer)
-		{
-			if (!empty($orders2invoice) && $orders2invoice > 0)
-			{
+		if ($user->rights->fournisseur->facture->creer) {
+			if (!empty($orders2invoice) && $orders2invoice > 0) {
 				if ($object->status == 1) {
 					// Company is open
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisSupplier").'</a></div>';
 				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
 				}
-			} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')').'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+			} else {
+				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')').'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+			}
 		}
 
-		if ($user->rights->fournisseur->facture->creer)
-		{
+		if ($user->rights->fournisseur->facture->creer) {
 			$langs->load("bills");
 			if ($object->status == 1) {
 				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
@@ -848,10 +861,8 @@ if ($object->id > 0)
 		}
 
 		// Add action
-		if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
-		{
-			if ($user->rights->agenda->myactions->create)
-			{
+		if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1) {
+			if ($user->rights->agenda->myactions->create) {
 				print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
 			} else {
 				print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
@@ -862,15 +873,13 @@ if ($object->id > 0)
 	print '</div>';
 
 
-	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD))
-	{
+	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD)) {
 		print '<br>';
 		// List of contacts
 		show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 	}
 
-	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-	{
+	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB)) {
 		print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
 
 		// List of todo actions
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 247434be7a8..953092120e4 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -34,7 +34,7 @@ class SupplierInvoices extends DolibarrApi
 	 *
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'socid',
 	);
 
@@ -109,20 +109,32 @@ class SupplierInvoices extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
 		// We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user";
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t";
 
 		// We need this table joined to the select in order to filter by sale
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 
 		// Filter by status
 		if ($status == 'draft') {
@@ -142,10 +154,8 @@ class SupplierInvoices extends DolibarrApi
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -154,8 +164,7 @@ class SupplierInvoices extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -168,8 +177,7 @@ class SupplierInvoices extends DolibarrApi
 			$i = 0;
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$invoice_static = new FactureFournisseur($this->db);
 				if ($invoice_static->fetch($obj->rowid)) {
@@ -244,12 +252,15 @@ class SupplierInvoices extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->invoice->$field = $value;
 		}
 
-		if ($this->invoice->update($id, DolibarrApiAccess::$user))
+		if ($this->invoice->update($id, DolibarrApiAccess::$user)) {
 			return $this->get($id);
+		}
 
 		return false;
 	}
@@ -279,8 +290,7 @@ class SupplierInvoices extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if ($this->invoice->delete(DolibarrApiAccess::$user) < 0)
-		{
+		if ($this->invoice->delete(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500);
 		}
 
@@ -459,16 +469,14 @@ class SupplierInvoices extends DolibarrApi
 		$paiement->note_public = $comment;
 
 		$paiement_id = $paiement->create(DolibarrApiAccess::$user, ($closepaidinvoices == 'yes' ? 1 : 0)); // This include closing invoices
-		if ($paiement_id < 0)
-		{
+		if ($paiement_id < 0) {
 			$this->db->rollback();
 			throw new RestException(400, 'Payment error : '.$paiement->error);
 		}
 
 		if (!empty($conf->banque->enabled)) {
 			$result = $paiement->addPaymentToBank(DolibarrApiAccess::$user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, $chqemetteur, $chqbank);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				throw new RestException(400, 'Add payment to bank error : '.$paiement->error);
 			}
@@ -706,8 +714,9 @@ class SupplierInvoices extends DolibarrApi
 	{
 		$invoice = array();
 		foreach (SupplierInvoices::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$invoice[$field] = $data[$field];
 		}
 		return $invoice;
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index 254e577f2f2..895902b13b2 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -32,7 +32,7 @@ class SupplierOrders extends DolibarrApi
 	 *
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
-	static $FIELDS = array(
+	public static $FIELDS = array(
 		'socid'
 	);
 
@@ -108,41 +108,70 @@ class SupplierOrders extends DolibarrApi
 
 		// If the internal user must only see his customers, force searching by him
 		$search_sale = 0;
-		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) $search_sale = DolibarrApiAccess::$user->id;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
 
 		$sql = "SELECT t.rowid";
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as t";
 
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
 
-  		if (!empty($product_ids)) $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseurdet as cd"; // We need this table joined to the select in order to filter by product
+		if (!empty($product_ids)) {
+			$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseurdet as cd"; // We need this table joined to the select in order to filter by product
+		}
 
 		$sql .= ' WHERE t.entity IN ('.getEntity('supplier_order').')';
-		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
-		if (!empty($product_ids)) $sql .= " AND cd.fk_commande = t.rowid AND cd.fk_product IN (".$product_ids.")";
-		if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
-		if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if (!empty($product_ids)) {
+			$sql .= " AND cd.fk_commande = t.rowid AND cd.fk_product IN (".$product_ids.")";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$socids.")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
 
 		// Filter by status
-		if ($status == 'draft')     $sql .= " AND t.fk_statut IN (0)";
-		if ($status == 'validated') $sql .= " AND t.fk_statut IN (1)";
-		if ($status == 'approved')  $sql .= " AND t.fk_statut IN (2)";
-		if ($status == 'running')   $sql .= " AND t.fk_statut IN (3)";
-		if ($status == 'received_start') $sql .= " AND t.fk_statut IN (4)";
-		if ($status == 'received_end')   $sql .= " AND t.fk_statut IN (5)";
-		if ($status == 'cancelled') $sql .= " AND t.fk_statut IN (6,7)";
-		if ($status == 'refused')   $sql .= " AND t.fk_statut IN (9)";
+		if ($status == 'draft') {
+			$sql .= " AND t.fk_statut IN (0)";
+		}
+		if ($status == 'validated') {
+			$sql .= " AND t.fk_statut IN (1)";
+		}
+		if ($status == 'approved') {
+			$sql .= " AND t.fk_statut IN (2)";
+		}
+		if ($status == 'running') {
+			$sql .= " AND t.fk_statut IN (3)";
+		}
+		if ($status == 'received_start') {
+			$sql .= " AND t.fk_statut IN (4)";
+		}
+		if ($status == 'received_end') {
+			$sql .= " AND t.fk_statut IN (5)";
+		}
+		if ($status == 'cancelled') {
+			$sql .= " AND t.fk_statut IN (6,7)";
+		}
+		if ($status == 'refused') {
+			$sql .= " AND t.fk_statut IN (9)";
+		}
 		// Insert sale filter
-		if ($search_sale > 0)
-		{
+		if ($search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".$search_sale;
 		}
 		// Add sql filters
-		if ($sqlfilters)
-		{
-			if (!DolibarrApi::_checkFilters($sqlfilters))
-			{
+		if ($sqlfilters) {
+			if (!DolibarrApi::_checkFilters($sqlfilters)) {
 				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
@@ -151,8 +180,7 @@ class SupplierOrders extends DolibarrApi
 
 		$sql .= $this->db->order($sortfield, $sortorder);
 		if ($limit) {
-			if ($page < 0)
-			{
+			if ($page < 0) {
 				$page = 0;
 			}
 			$offset = $limit * $page;
@@ -161,13 +189,11 @@ class SupplierOrders extends DolibarrApi
 		}
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$i = 0;
 			$num = $this->db->num_rows($result);
 			$min = min($num, ($limit <= 0 ? $num : $limit));
-			while ($i < $min)
-			{
+			while ($i < $min) {
 				$obj = $this->db->fetch_object($result);
 				$order_static = new CommandeFournisseur($this->db);
 				if ($order_static->fetch($obj->rowid)) {
@@ -207,13 +233,13 @@ class SupplierOrders extends DolibarrApi
 			$this->order->date = dol_now();
 		}
 		/* We keep lines as an array
-         if (isset($request_data["lines"])) {
-            $lines = array();
-            foreach ($request_data["lines"] as $line) {
-                array_push($lines, (object) $line);
-            }
-            $this->order->lines = $lines;
-        }*/
+		 if (isset($request_data["lines"])) {
+			$lines = array();
+			foreach ($request_data["lines"] as $line) {
+				array_push($lines, (object) $line);
+			}
+			$this->order->lines = $lines;
+		}*/
 
 		if ($this->order->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating order", array_merge(array($this->order->error), $this->order->errors));
@@ -244,12 +270,15 @@ class SupplierOrders extends DolibarrApi
 		}
 
 		foreach ($request_data as $field => $value) {
-			if ($field == 'id') continue;
+			if ($field == 'id') {
+				continue;
+			}
 			$this->order->$field = $value;
 		}
 
-		if ($this->order->update($id, DolibarrApiAccess::$user))
+		if ($this->order->update($id, DolibarrApiAccess::$user)) {
 			return $this->get($id);
+		}
 
 		return false;
 	}
@@ -368,8 +397,9 @@ class SupplierOrders extends DolibarrApi
 	{
 		$order = array();
 		foreach (SupplierOrders::$FIELDS as $field) {
-			if (!isset($data[$field]))
+			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");
+			}
 			$order[$field] = $data[$field];
 		}
 		return $order;
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 4ca073a38c7..57f6fa52d26 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -62,12 +62,10 @@ class Fournisseur extends Societe
 		$sql .= " WHERE cf.fk_soc = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			if ($num == 1)
-			{
+			if ($num == 1) {
 				$row = $this->db->fetch_row($resql);
 
 				$this->single_open_commande = $row[0];
@@ -91,8 +89,7 @@ class Fournisseur extends Societe
 		$sql .= " AND pfp.fk_soc = ".$this->id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			return $obj->nb;
 		} else {
@@ -116,8 +113,7 @@ class Fournisseur extends Societe
 
 		$sql = "SELECT count(s.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
@@ -126,10 +122,8 @@ class Fournisseur extends Societe
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["suppliers"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -158,8 +152,7 @@ class Fournisseur extends Societe
 
 		dol_syslog("Fournisseur::CreateCategory", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			dol_syslog("Fournisseur::CreateCategory : Success");
 			return 0;
 		} else {
@@ -185,17 +178,19 @@ class Fournisseur extends Societe
 
 		$sql = "SELECT s.rowid, s.nom as name";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
 		$sql .= " WHERE s.fournisseur = 1";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
 
 		$resql = $this->db->query($sql);
 
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$arr[$obj->rowid] = $obj->name;
 			}
 		} else {
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 52121d8c83d..d4e92fd8bf4 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -34,7 +34,9 @@
 
 include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+if (!empty($conf->productbatch->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+}
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
 /**
@@ -303,7 +305,9 @@ class CommandeFournisseur extends CommonOrder
 		global $conf;
 
 		// Check parameters
-		if (empty($id) && empty($ref)) return -1;
+		if (empty($id) && empty($ref)) {
+			return -1;
+		}
 
 		$sql = "SELECT c.rowid, c.entity, c.ref, ref_supplier, c.fk_soc, c.fk_statut, c.amount_ht, c.total_ht, c.total_ttc, c.total_tva,";
 		$sql .= " c.localtax1, c.localtax2, ";
@@ -324,18 +328,21 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_input_method as cm ON cm.rowid = c.fk_input_method";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON c.fk_incoterms = i.rowid';
 
-		if (empty($id)) $sql .= " WHERE c.entity IN (".getEntity('supplier_order').")";
-		else $sql .= " WHERE c.rowid=".$id;
+		if (empty($id)) {
+			$sql .= " WHERE c.entity IN (".getEntity('supplier_order').")";
+		} else {
+			$sql .= " WHERE c.rowid=".$id;
+		}
 
-		if ($ref) $sql .= " AND c.ref='".$this->db->escape($ref)."'";
+		if ($ref) {
+			$sql .= " AND c.ref='".$this->db->escape($ref)."'";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if (!$obj)
-			{
+			if (!$obj) {
 				$this->error = 'Bill with id '.$id.' not found';
 				dol_syslog(get_class($this).'::fetch '.$this->error);
 				return 0;
@@ -409,14 +416,15 @@ class CommandeFournisseur extends CommonOrder
 			// fetch optionals attributes and labels
 			$this->fetch_optionals();
 
-			if ($this->statut == 0) $this->brouillon = 1;
+			if ($this->statut == 0) {
+				$this->brouillon = 1;
+			}
 
 			/*
-             * Lines
-             */
+			 * Lines
+			 */
 			$result = $this->fetch_lines();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				return -1;
 			} else {
 				return 1;
@@ -449,26 +457,28 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " l.fk_unit,";
 		$sql .= " l.date_start, l.date_end,";
 		$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc';
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
+		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 			$sql .= ", pfp.rowid as fk_pfp, pfp.packaging";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
+		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON l.fk_product = pfp.fk_product and l.ref = pfp.ref_fourn";
+		}
 		$sql .= " WHERE l.fk_commande = ".$this->id;
-		if ($only_product) $sql .= ' AND p.fk_product_type = 0';
+		if ($only_product) {
+			$sql .= ' AND p.fk_product_type = 0';
+		}
 		$sql .= " ORDER BY l.rang, l.rowid";
 		//print $sql;
 
 		dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($result);
 
 				$line = new CommandeFournisseurLigne($this->db);
@@ -505,8 +515,7 @@ class CommandeFournisseur extends CommonOrder
 				$line->ref_fourn           = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
 				$line->ref_supplier        = $objp->ref_supplier; // The supplier ref of price when product was added. May have change since
 
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
-				{
+				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$line->fk_fournprice = $objp->fk_pfp;
 					$line->packaging     = $objp->packaging;
 				}
@@ -563,8 +572,7 @@ class CommandeFournisseur extends CommonOrder
 		dol_syslog(get_class($this)."::valid");
 		$result = 0;
 		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->commande->creer))
-	   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate)))
-		{
+		|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate))) {
 			$this->db->begin();
 
 			// Definition of supplier order numbering model name
@@ -572,8 +580,7 @@ class CommandeFournisseur extends CommonOrder
 			$soc->fetch($this->fourn_id);
 
 			// Check if object has a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-			{
+			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) { // empty should not happened, but when it occurs, the test save life
 				$num = $this->getNextNumRef($soc);
 			} else {
 				$num = $this->ref;
@@ -589,49 +596,46 @@ class CommandeFournisseur extends CommonOrder
 			$sql .= " AND fk_statut = ".self::STATUS_DRAFT;
 
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				dol_print_error($this->db);
 				$error++;
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_SUPPLIER_VALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
-				if (preg_match('/^[\(]?PROV/i', $this->ref))
-				{
+				if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 					// Now we rename also files into index
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'fournisseur/commande/".$this->db->escape($this->newref)."'";
 					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/commande/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
-					if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+					if (!$resql) {
+						$error++; $this->error = $this->db->lasterror();
+					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 					$oldref = dol_sanitizeFileName($this->ref);
 					$newref = dol_sanitizeFileName($num);
 					$dirsource = $conf->fournisseur->commande->dir_output.'/'.$oldref;
 					$dirdest = $conf->fournisseur->commande->dir_output.'/'.$newref;
-					if (!$error && file_exists($dirsource))
-					{
+					if (!$error && file_exists($dirsource)) {
 						dol_syslog(get_class($this)."::valid rename dir ".$dirsource." into ".$dirdest);
 
-						if (@rename($dirsource, $dirdest))
-						{
+						if (@rename($dirsource, $dirdest)) {
 							dol_syslog("Rename ok");
 							// Rename docs starting with $oldref with $newref
 							$listoffiles = dol_dir_list($conf->fournisseur->commande->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-							foreach ($listoffiles as $fileentry)
-							{
+							foreach ($listoffiles as $fileentry) {
 								$dirsource = $fileentry['name'];
 								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 								$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -643,15 +647,13 @@ class CommandeFournisseur extends CommonOrder
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = 1;
 				$this->statut = self::STATUS_VALIDATED;
 				$this->ref = $num;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -696,8 +698,11 @@ class CommandeFournisseur extends CommonOrder
 			$this->statuts[0] = 'StatusSupplierOrderDraft';
 			$this->statuts[1] = 'StatusSupplierOrderValidated';
 			$this->statuts[2] = 'StatusSupplierOrderApproved';
-			if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $this->statuts[3] = 'StatusSupplierOrderOnProcess';
-			else $this->statuts[3] = 'StatusSupplierOrderOnProcessWithValidation';
+			if (empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+				$this->statuts[3] = 'StatusSupplierOrderOnProcess';
+			} else {
+				$this->statuts[3] = 'StatusSupplierOrderOnProcessWithValidation';
+			}
 			$this->statuts[4] = 'StatusSupplierOrderReceivedPartially';
 			$this->statuts[5] = 'StatusSupplierOrderReceivedAll';
 			$this->statuts[6] = 'StatusSupplierOrderCanceled'; // Approved->Canceled
@@ -737,7 +742,9 @@ class CommandeFournisseur extends CommonOrder
 		if ($billed) {
 			$billedtext = ' - '.$langs->trans("Billed");
 		}
-		if ($status == 5 && $billed) $statusClass = 'status6';
+		if ($status == 5 && $billed) {
+			$statusClass = 'status6';
+		}
 
 		$statusLong = $langs->transnoentitiesnoconv($this->statuts[$status]).$billedtext;
 		$statusShort = $langs->transnoentitiesnoconv($this->statutshort[$status]);
@@ -792,19 +799,20 @@ class CommandeFournisseur extends CommonOrder
 		$picto = 'order';
 		$url = DOL_URL_ROOT.'/fourn/commande/card.php?id='.$this->id;
 
-		if ($option !== 'nolink')
-		{
+		if ($option !== 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowOrder");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -817,15 +825,17 @@ class CommandeFournisseur extends CommonOrder
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
-		if ($addlinktonotes)
-		{
+		if ($addlinktonotes) {
 			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-			if ($txttoshow)
-			{
+			if ($txttoshow) {
 				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
 				$result .= ' <span class="note inline-block">';
 				$result .= '<a href="'.DOL_URL_ROOT.'/fourn/commande/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
@@ -853,8 +863,7 @@ class CommandeFournisseur extends CommonOrder
 		global $db, $langs, $conf;
 		$langs->load("orders");
 
-		if (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER))
-		{
+		if (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER)) {
 			$mybool = false;
 
 			$file = $conf->global->COMMANDE_SUPPLIER_ADDON_NUMBER.'.php';
@@ -878,8 +887,7 @@ class CommandeFournisseur extends CommonOrder
 			$obj = new $classname();
 			$numref = $obj->getNextValue($soc, $this);
 
-			if ($numref != "")
-			{
+			if ($numref != "") {
 				return $numref;
 			} else {
 				$this->error = $obj->error;
@@ -900,8 +908,7 @@ class CommandeFournisseur extends CommonOrder
 	{
 		$error = 0;
 
-		if ($this->billed)
-		{
+		if ($this->billed) {
 			return 0;
 		}
 
@@ -910,18 +917,17 @@ class CommandeFournisseur extends CommonOrder
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur SET billed = 1';
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > '.self::STATUS_DRAFT;
 
-		if ($this->db->query($sql))
-		{
-			if (!$error)
-			{
+		if ($this->db->query($sql)) {
+			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_SUPPLIER_CLASSIFY_BILLED', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->billed = 1;
 
 				$this->db->commit();
@@ -955,8 +961,7 @@ class CommandeFournisseur extends CommonOrder
 
 		dol_syslog(get_class($this)."::approve");
 
-		if ($user->rights->fournisseur->commande->approuver)
-		{
+		if ($user->rights->fournisseur->commande->approuver) {
 			$now = dol_now();
 
 			$this->db->begin();
@@ -966,8 +971,7 @@ class CommandeFournisseur extends CommonOrder
 			$soc->fetch($this->fourn_id);
 
 			// Check if object has a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-			{
+			if (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) { // empty should not happened, but when it occurs, the test save life
 				$num = $this->getNextNumRef($soc);
 			} else {
 				$num = $this->ref;
@@ -980,14 +984,11 @@ class CommandeFournisseur extends CommonOrder
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
 			$sql .= " SET ref='".$this->db->escape($num)."',";
-			if (empty($secondlevel))	// standard or first level approval
-			{
+			if (empty($secondlevel)) {	// standard or first level approval
 				$sql .= " date_approve='".$this->db->idate($now)."',";
 				$sql .= " fk_user_approve = ".$user->id;
-				if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
-				{
-					if (empty($this->user_approve_id2))
-					{
+				if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $conf->global->MAIN_FEATURES_LEVEL > 0 && $this->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) {
+					if (empty($this->user_approve_id2)) {
 						$movetoapprovestatus = false; // second level approval not done
 						$comment = ' (first level)';
 					}
@@ -996,67 +997,72 @@ class CommandeFournisseur extends CommonOrder
 			{
 				$sql .= " date_approve2='".$this->db->idate($now)."',";
 				$sql .= " fk_user_approve2 = ".$user->id;
-				if (empty($this->user_approve_id)) $movetoapprovestatus = false; // first level approval not done
+				if (empty($this->user_approve_id)) {
+					$movetoapprovestatus = false; // first level approval not done
+				}
 				$comment = ' (second level)';
 			}
 			// If double approval is required and first approval, we keep status to 1 = validated
-			if ($movetoapprovestatus) $sql .= ", fk_statut = ".self::STATUS_ACCEPTED;
-			else $sql .= ", fk_statut = ".self::STATUS_VALIDATED;
+			if ($movetoapprovestatus) {
+				$sql .= ", fk_statut = ".self::STATUS_ACCEPTED;
+			} else {
+				$sql .= ", fk_statut = ".self::STATUS_VALIDATED;
+			}
 			$sql .= " WHERE rowid = ".$this->id;
 			$sql .= " AND fk_statut = ".self::STATUS_VALIDATED;
 
-			if ($this->db->query($sql))
-			{
-				if (!empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT))
-				{
+			if ($this->db->query($sql)) {
+				if (!empty($conf->global->SUPPLIER_ORDER_AUTOADD_USER_CONTACT)) {
 					$result = $this->add_contact($user->id, 'SALESREPFOLL', 'internal', 1);
-					if ($result < 0 && $result != -2)	// -2 means already exists
-					{
+					if ($result < 0 && $result != -2) {	// -2 means already exists
 						$error++;
 					}
 				}
 
 				// If stock is incremented on validate order, we must increment it
-				if (!$error && $movetoapprovestatus && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER))
-				{
+				if (!$error && $movetoapprovestatus && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER)) {
 					require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 					$langs->load("agenda");
 
 					$cpt = count($this->lines);
-					for ($i = 0; $i < $cpt; $i++)
-					{
+					for ($i = 0; $i < $cpt; $i++) {
 						// Product with reference
-						if ($this->lines[$i]->fk_product > 0)
-						{
+						if ($this->lines[$i]->fk_product > 0) {
 							$this->line = $this->lines[$i];
 							$mouvP = new MouvementStock($this->db);
 							$mouvP->origin = &$this;
 							// We decrement stock of product (and sub-products)
 							$up_ht_disc = $this->lines[$i]->subprice;
-							if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+							if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
+								$up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+							}
 							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("OrderApprovedInDolibarr", $this->ref));
-							if ($result < 0) { $error++; }
+							if ($result < 0) {
+								$error++;
+							}
 							unset($this->line);
 						}
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Call trigger
 					$result = $this->call_trigger('ORDER_SUPPLIER_APPROVE', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$this->ref = $this->newref;
 
-					if ($movetoapprovestatus) $this->statut = self::STATUS_ACCEPTED;
-					else $this->statut = self::STATUS_VALIDATED;
-		   			if (empty($secondlevel))	// standard or first level approval
-					{
+					if ($movetoapprovestatus) {
+						$this->statut = self::STATUS_ACCEPTED;
+					} else {
+						$this->statut = self::STATUS_VALIDATED;
+					}
+					if (empty($secondlevel)) {	// standard or first level approval
 						$this->date_approve = $now;
 						$this->user_approve_id = $user->id;
 					} else // request a second level approval
@@ -1096,26 +1102,24 @@ class CommandeFournisseur extends CommonOrder
 
 		dol_syslog(get_class($this)."::refuse");
 		$result = 0;
-		if ($user->rights->fournisseur->commande->approuver)
-		{
+		if ($user->rights->fournisseur->commande->approuver) {
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".self::STATUS_REFUSED;
 			$sql .= " WHERE rowid = ".$this->id;
 
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$result = 0;
 
-				if ($error == 0)
-				{
+				if ($error == 0) {
 					// Call trigger
 					$result = $this->call_trigger('ORDER_SUPPLIER_REFUSE', $user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						$this->db->rollback();
-					} else $this->db->commit();
+					} else {
+						$this->db->commit();
+					}
 					// End call triggers
 				}
 			} else {
@@ -1148,8 +1152,7 @@ class CommandeFournisseur extends CommonOrder
 
 		//dol_syslog("CommandeFournisseur::Cancel");
 		$result = 0;
-		if ($user->rights->fournisseur->commande->commander)
-		{
+		if ($user->rights->fournisseur->commande->commander) {
 			$statut = self::STATUS_CANCELED;
 
 			$this->db->begin();
@@ -1157,17 +1160,17 @@ class CommandeFournisseur extends CommonOrder
 			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur SET fk_statut = ".$statut;
 			$sql .= " WHERE rowid = ".$this->id;
 			dol_syslog(get_class($this)."::cancel", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$result = 0;
 
 				// Call trigger
 				$result = $this->call_trigger('ORDER_SUPPLIER_CANCEL', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 
-				if ($error == 0)
-				{
+				if ($error == 0) {
 					$this->db->commit();
 					return 1;
 				} else {
@@ -1200,12 +1203,13 @@ class CommandeFournisseur extends CommonOrder
 		global $langs;
 		dol_syslog(get_class($this)."::commande");
 		$error = 0;
-		if ($user->rights->fournisseur->commande->commander)
-		{
+		if ($user->rights->fournisseur->commande->commander) {
 			$this->db->begin();
 
 			$newnoteprivate = $this->note_private;
-			if ($comment) $newnoteprivate = dol_concatdesc($newnoteprivate, $langs->trans("Comment").': '.$comment);
+			if ($comment) {
+				$newnoteprivate = dol_concatdesc($newnoteprivate, $langs->trans("Comment").': '.$comment);
+			}
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
 			$sql .= " SET fk_statut=".self::STATUS_ORDERSENT.", fk_input_method=".$methode.", date_commande='".$this->db->idate($date)."', ";
@@ -1213,8 +1217,7 @@ class CommandeFournisseur extends CommonOrder
 			$sql .= " WHERE rowid=".$this->id;
 
 			dol_syslog(get_class($this)."::commande", LOG_DEBUG);
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->statut = self::STATUS_ORDERSENT;
 				$this->methode_commande_id = $methode;
 				$this->date_commande = $date;
@@ -1222,7 +1225,9 @@ class CommandeFournisseur extends CommonOrder
 
 				// Call trigger
 				$result = $this->call_trigger('ORDER_SUPPLIER_SUBMIT', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			} else {
 				$error++;
@@ -1230,8 +1235,7 @@ class CommandeFournisseur extends CommonOrder
 				$this->errors[] = $this->db->lasterror();
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 			} else {
 				$this->db->rollback();
@@ -1264,17 +1268,23 @@ class CommandeFournisseur extends CommonOrder
 
 		// set tmp vars
 		$date = ($this->date_commande ? $this->date_commande : $this->date); // in case of date is set
-		if (empty($date)) $date = $now;
+		if (empty($date)) {
+			$date = $now;
+		}
 		$delivery_date = empty($this->delivery_date) ? $this->date_livraison : $this->delivery_date;
 
 		// Clean parameters
-		if (empty($this->source)) $this->source = 0;
+		if (empty($this->source)) {
+			$this->source = 0;
+		}
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $date);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = $conf->currency;
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
@@ -1330,16 +1340,14 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		if ($this->db->query($sql))
-		{
+		if ($this->db->query($sql)) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."commande_fournisseur");
 
 			if ($this->id) {
 				$num = count($this->lines);
 
 				// insert products details into database
-				for ($i = 0; $i < $num; $i++)
-				{
+				for ($i = 0; $i < $num; $i++) {
 					$this->special_code = $this->lines[$i]->special_code; // TODO : remove this in 9.0 and add special_code param to addline()
 
 					// This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
@@ -1364,8 +1372,7 @@ class CommandeFournisseur extends CommonOrder
 						$this->lines[$i]->array_options,
 						$this->lines[$i]->fk_unit
 					);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						dol_syslog(get_class($this)."::create ".$this->error, LOG_WARNING); // do not use dol_print_error here as it may be a functionnal error
 						$this->db->rollback();
 						return -1;
@@ -1376,30 +1383,22 @@ class CommandeFournisseur extends CommonOrder
 				$sql .= " SET ref='(PROV".$this->id.")'";
 				$sql .= " WHERE rowid=".$this->id;
 				dol_syslog(get_class($this)."::create", LOG_DEBUG);
-				if ($this->db->query($sql))
-				{
+				if ($this->db->query($sql)) {
 					// Add link with price request and supplier order
-					if ($this->id)
-					{
+					if ($this->id) {
 						$this->ref = "(PROV".$this->id.")";
 
-						if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-						{
+						if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {	// To use new linkedObjectsIds instead of old linked_objects
 							$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 						}
 
 						// Add object linked
-						if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
-						{
-							foreach ($this->linked_objects as $origin => $tmp_origin_id)
-							{
-								if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-								{
-									foreach ($tmp_origin_id as $origin_id)
-									{
+						if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) {
+							foreach ($this->linked_objects as $origin => $tmp_origin_id) {
+								if (is_array($tmp_origin_id)) {       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+									foreach ($tmp_origin_id as $origin_id) {
 										$ret = $this->add_object_linked($origin, $origin_id);
-										if (!$ret)
-										{
+										if (!$ret) {
 											dol_print_error($this->db);
 											$error++;
 										}
@@ -1408,8 +1407,7 @@ class CommandeFournisseur extends CommonOrder
 								{
 									$origin_id = $tmp_origin_id;
 									$ret = $this->add_object_linked($origin, $origin_id);
-									if (!$ret)
-									{
+									if (!$ret) {
 										dol_print_error($this->db);
 										$error++;
 									}
@@ -1418,18 +1416,17 @@ class CommandeFournisseur extends CommonOrder
 						}
 					}
 
-					if (!$error)
-					{
+					if (!$error) {
 						$result = $this->insertExtraFields();
-						if ($result < 0) $error++;
+						if ($result < 0) {
+							$error++;
+						}
 					}
 
-					if (!$error && !$notrigger)
-					{
+					if (!$error && !$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('ORDER_SUPPLIER_CREATE', $user);
-						if ($result < 0)
-						{
+						if ($result < 0) {
 							$this->db->rollback();
 							return -1;
 						}
@@ -1467,19 +1464,18 @@ class CommandeFournisseur extends CommonOrder
 		$this->db->begin();
 
 		// get extrafields so they will be clone
-		foreach ($this->lines as $line)
+		foreach ($this->lines as $line) {
 			$line->fetch_optionals();
+		}
 
 		// Load source object
 		$objFrom = clone $this;
 
 		// Change socid if needed
-		if (!empty($socid) && $socid != $this->socid)
-		{
+		if (!empty($socid) && $socid != $this->socid) {
 			$objsoc = new Societe($this->db);
 
-			if ($objsoc->fetch($socid) > 0)
-			{
+			if ($objsoc->fetch($socid) > 0) {
 				$this->socid = $objsoc->id;
 				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
 				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
@@ -1507,25 +1503,26 @@ class CommandeFournisseur extends CommonOrder
 		// Create clone
 		$this->context['createfromclone'] = 'createfromclone';
 		$result = $this->create($user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Hook of thirdparty module
-			if (is_object($hookmanager))
-			{
+			if (is_object($hookmanager)) {
 				$parameters = array('objFrom'=>$objFrom);
 				$action = '';
 				$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 			}
 		}
 
 		unset($this->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $this->id;
 		} else {
@@ -1568,17 +1565,28 @@ class CommandeFournisseur extends CommonOrder
 		dol_syslog(get_class($this)."::addline $desc, $pu_ht, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $fk_prod_fourn_price, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, $info_bits, $notrigger, $date_start, $date_end, $fk_unit, $pu_ht_devise, $origin, $origin_id");
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
-			if (empty($qty)) $qty = 0;
-			if (!$info_bits) $info_bits = 0;
-			if (empty($txtva)) $txtva = 0;
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
-			if (empty($remise_percent)) $remise_percent = 0;
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (!$info_bits) {
+				$info_bits = 0;
+			}
+			if (empty($txtva)) {
+				$txtva = 0;
+			}
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
@@ -1590,8 +1598,7 @@ class CommandeFournisseur extends CommonOrder
 			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
-			if ($price_base_type == 'HT')
-			{
+			if ($price_base_type == 'HT') {
 				$pu = $pu_ht;
 			} else {
 				$pu = $pu_ttc;
@@ -1599,12 +1606,13 @@ class CommandeFournisseur extends CommonOrder
 			$desc = trim($desc);
 
 			// Check parameters
-			if ($qty < 0 && !$fk_product)
-			{
+			if ($qty < 0 && !$fk_product) {
 				$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Product"));
 				return -1;
 			}
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorStartDateGreaterEnd');
@@ -1632,15 +1640,15 @@ class CommandeFournisseur extends CommonOrder
 
 						// If supplier order created from customer order, we take best supplier price
 						// If $pu (defined previously from pu_ht or pu_ttc) is not defined at all, we also take the best supplier price
-						if ($result > 0 && ($origin == 'commande' || $pu === ''))
-						{
+						if ($result > 0 && ($origin == 'commande' || $pu === '')) {
 							$pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
 							$ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
 							// is remise percent not keyed but present for the product we add it
-							if ($remise_percent == 0 && $prod->remise_percent != 0) $remise_percent = $prod->remise_percent;
+							if ($remise_percent == 0 && $prod->remise_percent != 0) {
+								$remise_percent = $prod->remise_percent;
+							}
 						}
-						if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
-						{
+						if ($result == 0) {                   // If result == 0, we failed to found the supplier reference price
 							$langs->load("errors");
 							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
 							$this->db->rollback();
@@ -1649,16 +1657,14 @@ class CommandeFournisseur extends CommonOrder
 							//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
 							return -1;
 						}
-						if ($result == -1)
-						{
+						if ($result == -1) {
 							$langs->load("errors");
 							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
 							$this->db->rollback();
 							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
 							return -1;
 						}
-						if ($result < -1)
-						{
+						if ($result < -1) {
 							$this->error = $prod->error;
 							$this->db->rollback();
 							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
@@ -1695,8 +1701,7 @@ class CommandeFournisseur extends CommonOrder
 
 			// Clean vat code
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -1783,15 +1788,15 @@ class CommandeFournisseur extends CommonOrder
 			}
 
 			$result = $this->line->insert($notrigger);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour informations denormalisees au niveau de la commande meme
 				$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$this->db->commit();
 					return $this->line->id;
 				} else {
@@ -1833,24 +1838,23 @@ class CommandeFournisseur extends CommonOrder
 		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 		// Check parameters (if test are wrong here, there is bug into caller)
-		if ($entrepot <= 0)
-		{
+		if ($entrepot <= 0) {
 			$this->error = 'ErrorBadValueForParameterWarehouse';
 			return -1;
 		}
-		if ($qty == 0)
-		{
+		if ($qty == 0) {
 			$this->error = 'ErrorBadValueForParameterQty';
 			return -1;
 		}
 
 		$dispatchstatus = 1;
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) $dispatchstatus = 0; // Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
+		if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+			$dispatchstatus = 0; // Setting dispatch status (a validation step after receiving products) will be done manually to 1 or 2 if this option is on
+		}
 
 		$now = dol_now();
 
-		if (($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY || $this->statut == self::STATUS_RECEIVED_COMPLETELY))
-		{
+		if (($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY || $this->statut == self::STATUS_RECEIVED_COMPLETELY)) {
 			$this->db->begin();
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande_fournisseur_dispatch";
@@ -1861,15 +1865,12 @@ class CommandeFournisseur extends CommonOrder
 
 			dol_syslog(get_class($this)."::dispatchProduct", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if (!$notrigger)
-				{
+			if ($resql) {
+				if (!$notrigger) {
 					global $conf, $langs, $user;
 					// Call trigger
 					$result = $this->call_trigger('LINEORDER_SUPPLIER_DISPATCH', $user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 					// End call triggers
@@ -1880,16 +1881,13 @@ class CommandeFournisseur extends CommonOrder
 			}
 
 			// If module stock is enabled and the stock increase is done on purchase order dispatching
-			if (!$error && $entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
-			{
+			if (!$error && $entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
 				$mouv = new MouvementStock($this->db);
-				if ($product > 0)
-				{
+				if ($product > 0) {
 					// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
 					$mouv->origin = &$this;
 					$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$this->error = $mouv->error;
 						$this->errors = $mouv->errors;
 						dol_syslog(get_class($this)."::dispatchProduct ".$this->error." ".join(',', $this->errors), LOG_ERR);
@@ -1898,8 +1896,7 @@ class CommandeFournisseur extends CommonOrder
 				}
 			}
 
-			if ($error == 0)
-			{
+			if ($error == 0) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1921,17 +1918,14 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public function deleteline($idline, $notrigger = 0)
 	{
-		if ($this->statut == 0)
-		{
+		if ($this->statut == 0) {
 			$line = new CommandeFournisseurLigne($this->db);
 
-			if ($line->fetch($idline) <= 0)
-			{
+			if ($line->fetch($idline) <= 0) {
 				return 0;
 			}
 
-			if ($line->delete($notrigger) > 0)
-			{
+			if ($line->delete($notrigger) > 0) {
 				$this->update_price();
 				return 1;
 			} else {
@@ -1960,12 +1954,10 @@ class CommandeFournisseur extends CommonOrder
 
 		$this->db->begin();
 
-		if (empty($notrigger))
-		{
+		if (empty($notrigger)) {
 			// Call trigger
 			$result = $this->call_trigger('ORDER_SUPPLIER_DELETE', $user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->errors[] = 'ErrorWhenRunningTrigger';
 				dol_syslog(get_class($this)."::delete ".$this->error, LOG_ERR);
 				$this->db->rollback();
@@ -1978,8 +1970,7 @@ class CommandeFournisseur extends CommonOrder
 		$ef = $main."_extrafields";
 		$sql = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_commande = ".$this->id.")";
 		dol_syslog(get_class($this)."::delete extrafields lines", LOG_DEBUG);
-		if (!$this->db->query($sql))
-		{
+		if (!$this->db->query($sql)) {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
 			$error++;
@@ -1987,8 +1978,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseurdet WHERE fk_commande =".$this->id;
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		if (!$this->db->query($sql))
-		{
+		if (!$this->db->query($sql)) {
 			$this->error = $this->db->lasterror();
 			$this->errors[] = $this->db->lasterror();
 			$error++;
@@ -1996,10 +1986,8 @@ class CommandeFournisseur extends CommonOrder
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."commande_fournisseur WHERE rowid =".$this->id;
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-		if ($resql = $this->db->query($sql))
-		{
-			if ($this->db->affected_rows($resql) < 1)
-			{
+		if ($resql = $this->db->query($sql)) {
+			if ($this->db->affected_rows($resql) < 1) {
 				$this->error = $this->db->lasterror();
 				$this->errors[] = $this->db->lasterror();
 				$error++;
@@ -2011,11 +1999,9 @@ class CommandeFournisseur extends CommonOrder
 		}
 
 		// Remove extrafields
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->deleteExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->error = 'FailToDeleteExtraFields';
 				$this->errors[] = 'FailToDeleteExtraFields';
 				$error++;
@@ -2031,31 +2017,25 @@ class CommandeFournisseur extends CommonOrder
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
 			$this->deleteEcmFiles();
 
 			// We remove directory
 			$ref = dol_sanitizeFileName($this->ref);
-			if ($conf->fournisseur->commande->dir_output)
-			{
+			if ($conf->fournisseur->commande->dir_output) {
 				$dir = $conf->fournisseur->commande->dir_output."/".$ref;
 				$file = $dir."/".$ref.".pdf";
-				if (file_exists($file))
-				{
-					if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-					{
+				if (file_exists($file)) {
+					if (!dol_delete_file($file, 0, 0, 0, $this)) { // For triggers
 						$this->error = 'ErrorFailToDeleteFile';
 						$this->errors[] = 'ErrorFailToDeleteFile';
 						$error++;
 					}
 				}
-				if (file_exists($dir))
-				{
+				if (file_exists($dir)) {
 					$res = @dol_delete_dir_recursive($dir);
-					if (!$res)
-					{
+					if (!$res) {
 						$this->error = 'ErrorFailToDeleteDir';
 						$this->errors[] = 'ErrorFailToDeleteDir';
 						$error++;
@@ -2064,8 +2044,7 @@ class CommandeFournisseur extends CommonOrder
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
 			$this->db->commit();
 			return 1;
@@ -2090,13 +2069,11 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " WHERE active = 1";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num = $this->db->num_rows($resql);
 			$this->methodes_commande = array();
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$row = $this->db->fetch_row($resql);
 
 				$this->methodes_commande[$row[0]] = $row[1];
@@ -2130,20 +2107,19 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
 		$sql .= " WHERE cfd.fk_commande = ".$this->id;
 		$sql .= " AND cfd.fk_product = p.rowid";
-		if ($status >= 0) $sql .= " AND cfd.status = ".$status;
+		if ($status >= 0) {
+			$sql .= " AND cfd.status = ".$status;
+		}
 		$sql .= " ORDER BY cfd.rowid ASC";
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $this->db->fetch_object($resql);
-				if ($objp)
-				{
+				if ($objp) {
 					$ret[] = array(
 						'id' => $objp->dispatchedlineid,
 						'productid' => $objp->fk_product,
@@ -2154,7 +2130,9 @@ class CommandeFournisseur extends CommonOrder
 
 				$i++;
 			}
-		} else dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
+		} else {
+			dol_print_error($this->db, 'Failed to execute request to get dispatched lines');
+		}
 
 		return $ret;
 	}
@@ -2180,39 +2158,37 @@ class CommandeFournisseur extends CommonOrder
 
 		dol_syslog(get_class($this)."::Livraison");
 
-		if ($user->rights->fournisseur->commande->receptionner)
-		{
+		if ($user->rights->fournisseur->commande->receptionner) {
 			// Define the new status
-			if ($type == 'par') $statut = self::STATUS_RECEIVED_PARTIALLY;
-			elseif ($type == 'tot')	$statut = self::STATUS_RECEIVED_COMPLETELY;
-			elseif ($type == 'nev') $statut = self::STATUS_CANCELED_AFTER_ORDER;
-			elseif ($type == 'can') $statut = self::STATUS_CANCELED_AFTER_ORDER;
-			else {
+			if ($type == 'par') {
+				$statut = self::STATUS_RECEIVED_PARTIALLY;
+			} elseif ($type == 'tot') {
+				$statut = self::STATUS_RECEIVED_COMPLETELY;
+			} elseif ($type == 'nev') {
+				$statut = self::STATUS_CANCELED_AFTER_ORDER;
+			} elseif ($type == 'can') {
+				$statut = self::STATUS_CANCELED_AFTER_ORDER;
+			} else {
 				$error++;
 				dol_syslog(get_class($this)."::Livraison Error -2", LOG_ERR);
 				return -2;
 			}
 
 			// Some checks to accept the record
-			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS))
-			{
+			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
 				// If option SUPPLIER_ORDER_USE_DISPATCH_STATUS is on, we check all reception are approved to allow status "total/done"
-				if (!$error && ($type == 'tot'))
-				{
+				if (!$error && ($type == 'tot')) {
 					$dispatchedlinearray = $this->getDispachedLines(0);
-					if (count($dispatchedlinearray) > 0)
-					{
+					if (count($dispatchedlinearray) > 0) {
 						$result = -1;
 						$error++;
 						$this->errors[] = 'ErrorCantSetReceptionToTotalDoneWithReceptionToApprove';
 						dol_syslog('ErrorCantSetReceptionToTotalDoneWithReceptionToApprove', LOG_DEBUG);
 					}
 				}
-				if (!$error && !empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot'))	// Accept to move to reception done, only if status of all line are ok (refuse denied)
-				{
+				if (!$error && !empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS_NEED_APPROVE) && ($type == 'tot')) {	// Accept to move to reception done, only if status of all line are ok (refuse denied)
 					$dispatcheddenied = $this->getDispachedLines(2);
-					if (count($dispatchedlinearray) > 0)
-					{
+					if (count($dispatchedlinearray) > 0) {
 						$result = -1;
 						$error++;
 						$this->errors[] = 'ErrorCantSetReceptionToTotalDoneWithReceptionDenied';
@@ -2223,8 +2199,7 @@ class CommandeFournisseur extends CommonOrder
 
 			// TODO LDR01 Add a control test to accept only if ALL predefined products are received (same qty).
 
-			if (empty($error))
-			{
+			if (empty($error)) {
 				$this->db->begin();
 
 				$sql = "UPDATE ".MAIN_DB_PREFIX."commande_fournisseur";
@@ -2234,8 +2209,7 @@ class CommandeFournisseur extends CommonOrder
 
 				dol_syslog(get_class($this)."::Livraison", LOG_DEBUG);
 				$resql = $this->db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$result = 1;
 					$old_statut = $this->statut;
 					$this->statut = $statut;
@@ -2243,11 +2217,12 @@ class CommandeFournisseur extends CommonOrder
 
 					// Call trigger
 					$result_trigger = $this->call_trigger('ORDER_SUPPLIER_RECEIVE', $user);
-					if ($result_trigger < 0) $error++;
+					if ($result_trigger < 0) {
+						$error++;
+					}
 					// End call triggers
 
-					if (empty($error))
-					{
+					if (empty($error)) {
 						$this->db->commit();
 					} else {
 						$this->statut = $old_statut;
@@ -2296,8 +2271,7 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public function setDeliveryDate($user, $delivery_date, $notrigger = 0)
 	{
-		if ($user->rights->fournisseur->commande->creer)
-		{
+		if ($user->rights->fournisseur->commande->creer) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2308,34 +2282,31 @@ class CommandeFournisseur extends CommonOrder
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->date_livraison = $delivery_date;
 				$this->delivery_date = $delivery_date;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_SUPPLIER_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2359,8 +2330,7 @@ class CommandeFournisseur extends CommonOrder
 	public function set_id_projet($user, $id_projet, $notrigger = 0)
 	{
 		// phpcs:enable
-		if ($user->rights->fournisseur->commande->creer)
-		{
+		if ($user->rights->fournisseur->commande->creer) {
 			$error = 0;
 
 			$this->db->begin();
@@ -2371,34 +2341,31 @@ class CommandeFournisseur extends CommonOrder
 
 			dol_syslog(__METHOD__, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->errors[] = $this->db->error();
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldcopy = clone $this;
 				$this->fk_projet = $id_projet;
 				$this->fk_project = $id_projet;
 			}
 
-			if (!$notrigger && empty($error))
-			{
+			if (!$notrigger && empty($error)) {
 				// Call trigger
 				$result = $this->call_trigger('ORDER_SUPPLIER_MODIFY', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
-				foreach ($this->errors as $errmsg)
-				{
+				foreach ($this->errors as $errmsg) {
 					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
 					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 				}
@@ -2428,13 +2395,11 @@ class CommandeFournisseur extends CommonOrder
 		$this->lines = array();
 
 		$num = count($comclient->lines);
-		for ($i = 0; $i < $num; $i++)
-		{
+		for ($i = 0; $i < $num; $i++) {
 			$prod = new Product($this->db);
 			$label = '';
 			$ref = '';
-			if ($prod->fetch($comclient->lines[$i]->fk_product) > 0)
-			{
+			if ($prod->fetch($comclient->lines[$i]->fk_product) > 0) {
 				$label  = $prod->label;
 				$ref    = $prod->ref;
 			}
@@ -2445,8 +2410,7 @@ class CommandeFournisseur extends CommonOrder
 			$sql .= ",".$comclient->lines[$i]->fk_product.", ".price2num($comclient->lines[$i]->price);
 			$sql .= ", ".$comclient->lines[$i]->qty.", ".$comclient->lines[$i]->tva_tx.", ".$comclient->lines[$i]->localtax1_tx.", ".$comclient->lines[$i]->localtax2_tx.", ".$comclient->lines[$i]->remise_percent;
 			$sql .= ", '".price2num($comclient->lines[$i]->subprice)."','0', '".$this->db->escape($ref)."');";
-			if ($this->db->query($sql))
-			{
+			if ($this->db->query($sql)) {
 				$this->update_price();
 			}
 		}
@@ -2474,8 +2438,7 @@ class CommandeFournisseur extends CommonOrder
 
 		dol_syslog(get_class($this)."::setStatus", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Trigger names for each status
 			$triggerName = array();
 			$triggerName[0] = 'DRAFT';
@@ -2490,7 +2453,9 @@ class CommandeFournisseur extends CommonOrder
 
 			// Call trigger
 			$result = $this->call_trigger("ORDER_SUPPLIER_STATUS_".$triggerName[$status], $user);
-			if ($result < 0) { $error++; }
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		} else {
 			$error++;
@@ -2498,8 +2463,7 @@ class CommandeFournisseur extends CommonOrder
 			dol_syslog(get_class($this)."::setStatus ".$this->error);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->statut = $status;
 			$this->db->commit();
 			return 1;
@@ -2540,30 +2504,47 @@ class CommandeFournisseur extends CommonOrder
 
 		$error = 0;
 
-		if ($this->brouillon)
-		{
+		if ($this->brouillon) {
 			// Clean parameters
-			if (empty($qty)) $qty = 0;
-			if (empty($info_bits)) $info_bits = 0;
-			if (empty($txtva)) $txtva = 0;
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
-			if (empty($remise)) $remise = 0;
-			if (empty($remise_percent)) $remise_percent = 0;
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
+			if (empty($txtva)) {
+				$txtva = 0;
+			}
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
+			if (empty($remise)) {
+				$remise = 0;
+			}
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
-			if (!$qty) $qty = 1;
+			if (!$qty) {
+				$qty = 1;
+			}
 			$pu = price2num($pu);
 			$pu_ht_devise = price2num($pu_ht_devise);
-        	if (!preg_match('/\((.*)\)/', $txtva)) {
-        		$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
-        	}
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
 			$txlocaltax1 = price2num($txlocaltax1);
 			$txlocaltax2 = price2num($txlocaltax2);
 
 			// Check parameters
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 			if ($date_start && $date_end && $date_start > $date_end) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorStartDateGreaterEnd');
@@ -2582,8 +2563,7 @@ class CommandeFournisseur extends CommonOrder
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -2621,14 +2601,11 @@ class CommandeFournisseur extends CommonOrder
 			$this->line->desc = $desc;
 
 			// redefine quantity according to packaging
-			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
-			{
-				if ($qty < $this->line->packaging)
-				{
+			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				if ($qty < $this->line->packaging) {
 					$qty = $this->line->packaging;
 				} else {
-					if (($qty % $this->line->packaging) > 0)
-					{
+					if (($qty % $this->line->packaging) > 0) {
 						$coeff = intval($qty / $this->line->packaging) + 1;
 						$qty = $this->line->packaging * $coeff;
 						setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
@@ -2686,8 +2663,7 @@ class CommandeFournisseur extends CommonOrder
 
 
 			// Mise a jour info denormalisees au niveau facture
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				$this->update_price('', 'auto');
 				$this->db->commit();
 				return $result;
@@ -2730,8 +2706,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= $this->db->order("rowid", "ASC");
 		$sql .= $this->db->plimit(1);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$prodid = $obj->rowid;
 		}
@@ -2758,8 +2733,7 @@ class CommandeFournisseur extends CommonOrder
 		// Lines
 		$nbp = 5;
 		$xnbp = 0;
-		while ($xnbp < $nbp)
-		{
+		while ($xnbp < $nbp) {
 			$line = new CommandeFournisseurLigne($this->db);
 			$line->desc = $langs->trans("Description")." ".$xnbp;
 			$line->qty = 1;
@@ -2768,8 +2742,7 @@ class CommandeFournisseur extends CommonOrder
 			$line->tva_tx = 19.6;
 			$line->localtax1_tx = 0;
 			$line->localtax2_tx = 0;
-			if ($xnbp == 2)
-			{
+			if ($xnbp == 2) {
 				$line->total_ht = 50;
 				$line->total_ttc = 59.8;
 				$line->total_tva = 9.8;
@@ -2806,17 +2779,25 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= ' WHERE c.rowid = '.$id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)   $this->user_creation_id = $obj->fk_user_author;
-				if ($obj->fk_user_valid)    $this->user_validation_id = $obj->fk_user_valid;
-				if ($obj->fk_user_modif)    $this->user_modification_id = $obj->fk_user_modif;
-				if ($obj->fk_user_approve)  $this->user_approve_id = $obj->fk_user_approve;
-				if ($obj->fk_user_approve2) $this->user_approve_id2 = $obj->fk_user_approve2;
+				if ($obj->fk_user_author) {
+					$this->user_creation_id = $obj->fk_user_author;
+				}
+				if ($obj->fk_user_valid) {
+					$this->user_validation_id = $obj->fk_user_valid;
+				}
+				if ($obj->fk_user_modif) {
+					$this->user_modification_id = $obj->fk_user_modif;
+				}
+				if ($obj->fk_user_approve) {
+					$this->user_approve_id = $obj->fk_user_approve;
+				}
+				if ($obj->fk_user_approve2) {
+					$this->user_approve_id2 = $obj->fk_user_approve2;
+				}
 
 				$this->date_creation     = $this->db->idate($obj->datec);
 				$this->date_modification = $this->db->idate($obj->datem);
@@ -2847,8 +2828,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql = "SELECT count(co.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as co";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON co.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
@@ -2856,10 +2836,8 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " ".$clause." co.entity = ".$conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["supplier_orders"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -2888,8 +2866,7 @@ class CommandeFournisseur extends CommonOrder
 
 		$sql = "SELECT c.rowid, c.date_creation as datec, c.date_commande, c.fk_statut, c.date_livraison as delivery_date";
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = " AND";
@@ -2900,11 +2877,12 @@ class CommandeFournisseur extends CommonOrder
 		} else {
 			$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.", ".self::STATUS_ACCEPTED.")";
 		}
-		if ($user->socid) $sql .= " AND c.fk_soc = ".$user->socid;
+		if ($user->socid) {
+			$sql .= " AND c.fk_soc = ".$user->socid;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$commandestatic = new CommandeFournisseur($this->db);
 
 			$response = new WorkboardResponse();
@@ -2920,8 +2898,7 @@ class CommandeFournisseur extends CommonOrder
 				$response->url = DOL_URL_ROOT.'/fourn/commande/list.php?statut=3,4&mainmenu=commercial&leftmenu=orders_suppliers';
 			}
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 
 				$commandestatic->delivery_date = $this->db->jdate($obj->delivery_date);
@@ -2950,27 +2927,25 @@ class CommandeFournisseur extends CommonOrder
 	{
 		global $db, $langs;
 
-		if ($this->methode_commande_id > 0)
-		{
+		if ($this->methode_commande_id > 0) {
 			$sql = "SELECT rowid, code, libelle as label";
 			$sql .= " FROM ".MAIN_DB_PREFIX.'c_input_method';
 			$sql .= " WHERE active=1 AND rowid = ".$this->db->escape($this->methode_commande_id);
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				if ($this->db->num_rows($resql))
-				{
+			if ($resql) {
+				if ($this->db->num_rows($resql)) {
 					$obj = $this->db->fetch_object($resql);
 
 					$string = $langs->trans($obj->code);
-					if ($string == $obj->code)
-					{
+					if ($string == $obj->code) {
 						$string = $obj->label != '-' ? $obj->label : '';
 					}
 					return $string;
 				}
-			} else dol_print_error($this->db);
+			} else {
+				dol_print_error($this->db);
+			}
 		}
 
 		return '';
@@ -3017,26 +2992,30 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public function getMaxDeliveryTimeDay($langs)
 	{
-		if (empty($this->lines)) return '';
+		if (empty($this->lines)) {
+			return '';
+		}
 
 		$obj = new ProductFournisseur($this->db);
 
 		$nb = 0;
-		foreach ($this->lines as $line)
-		{
-			if ($line->fk_product > 0)
-			{
+		foreach ($this->lines as $line) {
+			if ($line->fk_product > 0) {
 				$idp = $obj->find_min_price_product_fournisseur($line->fk_product, $line->qty);
-				if ($idp)
-				{
+				if ($idp) {
 					$obj->fetch($idp);
-					if ($obj->delivery_time_days > $nb) $nb = $obj->delivery_time_days;
+					if ($obj->delivery_time_days > $nb) {
+						$nb = $obj->delivery_time_days;
+					}
 				}
 			}
 		}
 
-		if ($nb === 0) return '';
-		else return $nb.' '.$langs->trans('Days');
+		if ($nb === 0) {
+			return '';
+		} else {
+			return $nb.' '.$langs->trans('Days');
+		}
 	}
 
 	/**
@@ -3079,7 +3058,9 @@ class CommandeFournisseur extends CommonOrder
 	{
 		global $conf;
 
-		if (empty($this->delivery_date) && !empty($this->date_livraison)) $this->delivery_date = $this->date_livraison; // For backward compatibility
+		if (empty($this->delivery_date) && !empty($this->date_livraison)) {
+			$this->delivery_date = $this->date_livraison; // For backward compatibility
+		}
 
 		if ($this->statut == self::STATUS_ORDERSENT || $this->statut == self::STATUS_RECEIVED_PARTIALLY) {
 			$now = dol_now();
@@ -3110,7 +3091,9 @@ class CommandeFournisseur extends CommonOrder
 	{
 		global $conf, $langs;
 
-		if (empty($this->delivery_date) && !empty($this->date_livraison)) $this->delivery_date = $this->date_livraison; // For backward compatibility
+		if (empty($this->delivery_date) && !empty($this->date_livraison)) {
+			$this->delivery_date = $this->date_livraison; // For backward compatibility
+		}
 
 		$text = '';
 
@@ -3143,8 +3126,7 @@ class CommandeFournisseur extends CommonOrder
 	{
 		global $conf, $langs;
 
-		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled))
-		{
+		if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) {
 			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 
 			$qtydelivered = array();
@@ -3171,7 +3153,9 @@ class CommandeFournisseur extends CommonOrder
 					}
 					foreach ($this->lines as $line) {
 						// Exclude lines not qualified for shipment, similar code is found into interface_20_modWrokflow for customers
-						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $line->product_type > 0) continue;
+						if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $line->product_type > 0) {
+							continue;
+						}
 						$qtywished[$line->fk_product] += $line->qty;
 					}
 
@@ -3181,16 +3165,14 @@ class CommandeFournisseur extends CommonOrder
 					$keysindeliverednotinwished = array_diff(array_keys($qtydelivered), array_keys($qtywished)); // To check we also have same number of keys
 					/*var_dump(array_keys($qtydelivered));
 
-    				var_dump(array_keys($qtywished));
-    				var_dump($diff_array);
-    				var_dump($keysinwishednotindelivered);
-    				var_dump($keysindeliverednotinwished);
-    				exit;*/
+					var_dump(array_keys($qtywished));
+					var_dump($diff_array);
+					var_dump($keysinwishednotindelivered);
+					var_dump($keysindeliverednotinwished);
+					exit;*/
 
-					if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) //No diff => mean everythings is received
-					{
-						if ($closeopenorder)
-						{
+					if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) { //No diff => mean everythings is received
+						if ($closeopenorder) {
 							//$ret=$this->setStatus($user,5);
 							$ret = $this->Livraison($user, $date_liv, 'tot', $comment); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
 							if ($ret < 0) {
@@ -3211,16 +3193,13 @@ class CommandeFournisseur extends CommonOrder
 
 						$close = 0;
 
-						if (count($diff_array) > 0)
-						{
+						if (count($diff_array) > 0) {
 							//there are some difference between  the two arrays
 
 							//scan the array of results
-							foreach ($diff_array as $key => $value)
-							{
+							foreach ($diff_array as $key => $value) {
 								//if the quantity delivered is greater or equal to wish quantity
-								if ($qtydelivered[$key] >= $qtywished[$key])
-								{
+								if ($qtydelivered[$key] >= $qtywished[$key]) {
 									$close++;
 								}
 							}
@@ -3280,25 +3259,31 @@ class CommandeFournisseur extends CommonOrder
 		$sql = 'SELECT cd.rowid, cd.fk_product,';
 		$sql .= ' sum(cfd.qty) as qty';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch as cfd,';
-		if ($filtre_statut >= 0) $sql .= ' '.MAIN_DB_PREFIX.'reception as e,';
+		if ($filtre_statut >= 0) {
+			$sql .= ' '.MAIN_DB_PREFIX.'reception as e,';
+		}
 		$sql .= ' '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
 		$sql .= ' WHERE';
-		if ($filtre_statut >= 0) $sql .= ' cfd.fk_reception = e.rowid AND';
+		if ($filtre_statut >= 0) {
+			$sql .= ' cfd.fk_reception = e.rowid AND';
+		}
 		$sql .= ' cfd.fk_commandefourndet = cd.rowid';
 		$sql .= ' AND cd.fk_commande ='.$this->id;
-		if ($this->fk_product > 0) $sql .= ' AND cd.fk_product = '.$this->fk_product;
-		if ($filtre_statut >= 0) $sql .= ' AND e.fk_statut >= '.$filtre_statut;
+		if ($this->fk_product > 0) {
+			$sql .= ' AND cd.fk_product = '.$this->fk_product;
+		}
+		if ($filtre_statut >= 0) {
+			$sql .= ' AND e.fk_statut >= '.$filtre_statut;
+		}
 		$sql .= ' GROUP BY cd.rowid, cd.fk_product';
 
 
 		dol_syslog(get_class($this)."::loadReceptions", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($result);
 				empty($this->receptions[$obj->rowid]) ? $this->receptions[$obj->rowid] = $obj->qty : $this->receptions[$obj->rowid] += $obj->qty;
 				$i++;
@@ -3399,20 +3384,20 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
 		$sql .= ' cd.date_start, cd.date_end, cd.fk_unit,';
 		$sql .= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc';
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
+		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 			$sql .= ", pfp.rowid as fk_pfp, pfp.packaging";
+		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
+		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON cd.fk_product = pfp.fk_product and cd.ref = pfp.ref_fourn";
+		}
 		$sql .= ' WHERE cd.rowid = '.$rowid;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$objp = $this->db->fetch_object($result);
 
-			if (!empty($objp))
-			{
+			if (!empty($objp)) {
 				$this->rowid = $objp->rowid;
 				$this->id               = $objp->rowid;
 				$this->fk_commande      = $objp->fk_commande;
@@ -3443,8 +3428,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 				$this->product_ref      = $objp->product_ref;
 				$this->product_label    = $objp->product_label;
 				$this->product_desc     = $objp->product_desc;
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
-				{
+				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$this->packaging = $objp->packaging;
 					$this->fk_fournprice = $objp->fk_pfp;
 				}
@@ -3488,32 +3472,63 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		dol_syslog(get_class($this)."::insert rang=".$this->rang);
 
 		// Clean parameters
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = '0';
-		if (empty($this->localtax2_type)) $this->localtax2_type = '0';
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->rang)) $this->rang = 0;
-		if (empty($this->remise)) $this->remise = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = '0';
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = '0';
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->rang)) {
+			$this->rang = 0;
+		}
+		if (empty($this->remise)) {
+			$this->remise = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
 
 		// Multicurrency
-		if (!empty($this->multicurrency_code)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code)) {
+			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = $conf->currency;
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
 		}
 
 		// Check parameters
-		if ($this->product_type < 0) return -1;
+		if ($this->product_type < 0) {
+			return -1;
+		}
 
 		$this->db->begin();
 
@@ -3528,7 +3543,11 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		$sql .= " VALUES (".$this->fk_commande.", '".$this->db->escape($this->label)."','".$this->db->escape($this->desc)."',";
 		$sql .= " ".($this->date_start ? "'".$this->db->idate($this->date_start)."'" : "null").",";
 		$sql .= " ".($this->date_end ? "'".$this->db->idate($this->date_end)."'" : "null").",";
-		if ($this->fk_product) { $sql .= $this->fk_product.","; } else { $sql .= "null,"; }
+		if ($this->fk_product) {
+			$sql .= $this->fk_product.",";
+		} else {
+			$sql .= "null,";
+		}
 		$sql .= "'".$this->db->escape($this->product_type)."',";
 		$sql .= "'".$this->db->escape($this->special_code)."',";
 		$sql .= "'".$this->db->escape($this->rang)."',";
@@ -3556,25 +3575,23 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
 		dol_syslog(get_class($this)."::insert", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 			$this->rowid = $this->id;
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEORDER_SUPPLIER_CREATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
@@ -3583,8 +3600,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 				return 1;
 			}
 
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->errors[] = ($this->errors ? ', '.$errmsg : $errmsg);
 			}
@@ -3647,32 +3663,26 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
 		dol_syslog(get_class($this)."::updateline", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if ($result > 0)
-		{
-			if (!$error)
-			{
+		if ($result > 0) {
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				global $user;
 				// Call trigger
 				$result = $this->call_trigger('LINEORDER_SUPPLIER_UPDATE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
 				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -3702,8 +3712,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
 		// extrafields
 		$result = $this->deleteExtraFields();
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->db->rollback();
 			return -1;
 		}
@@ -3712,24 +3721,22 @@ class CommandeFournisseurLigne extends CommonOrderLine
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if (!$notrigger)
-			{
+		if ($resql) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEORDER_SUPPLIER_DELETE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			}
 
-			foreach ($this->errors as $errmsg)
-			{
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index a7abed27369..c79a53297f2 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -140,16 +140,36 @@ class CommandeFournisseurDispatch extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->fk_commande)) $this->fk_commande = trim($this->fk_commande);
-		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
-		if (isset($this->fk_commandefourndet)) $this->fk_commandefourndet = trim($this->fk_commandefourndet);
-		if (isset($this->qty)) $this->qty = trim($this->qty);
-		if (isset($this->fk_entrepot)) $this->fk_entrepot = trim($this->fk_entrepot);
-		if (isset($this->fk_user)) $this->fk_user = trim($this->fk_user);
-		if (isset($this->comment)) $this->comment = trim($this->comment);
-		if (isset($this->status)) $this->status = trim($this->status);
-		if (isset($this->batch)) $this->batch = trim($this->batch);
-		if (empty($this->datec)) $this->datec = dol_now();
+		if (isset($this->fk_commande)) {
+			$this->fk_commande = trim($this->fk_commande);
+		}
+		if (isset($this->fk_product)) {
+			$this->fk_product = trim($this->fk_product);
+		}
+		if (isset($this->fk_commandefourndet)) {
+			$this->fk_commandefourndet = trim($this->fk_commandefourndet);
+		}
+		if (isset($this->qty)) {
+			$this->qty = trim($this->qty);
+		}
+		if (isset($this->fk_entrepot)) {
+			$this->fk_entrepot = trim($this->fk_entrepot);
+		}
+		if (isset($this->fk_user)) {
+			$this->fk_user = trim($this->fk_user);
+		}
+		if (isset($this->comment)) {
+			$this->comment = trim($this->comment);
+		}
+		if (isset($this->status)) {
+			$this->status = trim($this->status);
+		}
+		if (isset($this->batch)) {
+			$this->batch = trim($this->batch);
+		}
+		if (empty($this->datec)) {
+			$this->datec = dol_now();
+		}
 
 
 		// Check parameters
@@ -190,16 +210,16 @@ class CommandeFournisseurDispatch extends CommonObject
 
 		$this->db->begin();
 
-	   	dol_syslog(__METHOD__, LOG_DEBUG);
+		dol_syslog(__METHOD__, LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
 
@@ -211,17 +231,16 @@ class CommandeFournisseurDispatch extends CommonObject
 		}
 
 		// Create extrafields
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -264,15 +283,16 @@ class CommandeFournisseurDispatch extends CommonObject
 
 
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
-		if ($ref) $sql .= " WHERE t.ref = '".$ref."'";
-		else $sql .= " WHERE t.rowid = ".$id;
+		if ($ref) {
+			$sql .= " WHERE t.ref = '".$ref."'";
+		} else {
+			$sql .= " WHERE t.rowid = ".$id;
+		}
 
 		dol_syslog(get_class($this)."::fetch");
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -318,15 +338,33 @@ class CommandeFournisseurDispatch extends CommonObject
 
 		// Clean parameters
 
-		if (isset($this->fk_commande)) $this->fk_commande = trim($this->fk_commande);
-		if (isset($this->fk_product)) $this->fk_product = trim($this->fk_product);
-		if (isset($this->fk_commandefourndet)) $this->fk_commandefourndet = trim($this->fk_commandefourndet);
-		if (isset($this->qty)) $this->qty = trim($this->qty);
-		if (isset($this->fk_entrepot)) $this->fk_entrepot = trim($this->fk_entrepot);
-		if (isset($this->fk_user)) $this->fk_user = trim($this->fk_user);
-		if (isset($this->comment)) $this->comment = trim($this->comment);
-		if (isset($this->status)) $this->status = trim($this->status);
-		if (isset($this->batch)) $this->batch = trim($this->batch);
+		if (isset($this->fk_commande)) {
+			$this->fk_commande = trim($this->fk_commande);
+		}
+		if (isset($this->fk_product)) {
+			$this->fk_product = trim($this->fk_product);
+		}
+		if (isset($this->fk_commandefourndet)) {
+			$this->fk_commandefourndet = trim($this->fk_commandefourndet);
+		}
+		if (isset($this->qty)) {
+			$this->qty = trim($this->qty);
+		}
+		if (isset($this->fk_entrepot)) {
+			$this->fk_entrepot = trim($this->fk_entrepot);
+		}
+		if (isset($this->fk_user)) {
+			$this->fk_user = trim($this->fk_user);
+		}
+		if (isset($this->comment)) {
+			$this->comment = trim($this->comment);
+		}
+		if (isset($this->status)) {
+			$this->status = trim($this->status);
+		}
+		if (isset($this->batch)) {
+			$this->batch = trim($this->batch);
+		}
 
 
 
@@ -357,34 +395,34 @@ class CommandeFournisseurDispatch extends CommonObject
 
 		dol_syslog(__METHOD__);
 		$resql = $this->db->query($sql);
-		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+		if (!$resql) {
+			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		}
 
-		if (!$error)
-		{
-			if (!$error)
-			{
-				if (empty($this->id) && !empty($this->rowid))$this->id = $this->rowid;
+		if (!$error) {
+			if (!$error) {
+				if (empty($this->id) && !empty($this->rowid)) {
+					$this->id = $this->rowid;
+				}
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				$result = $this->call_trigger('LINERECEPTION_UPDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				//// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -397,13 +435,13 @@ class CommandeFournisseurDispatch extends CommonObject
 	}
 
 
- 	/**
- 	 *  Delete object in database
- 	 *
- 	 *	@param  User	$user        User that deletes
- 	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
- 	 *  @return	int					 <0 if KO, >0 if OK
- 	 */
+	/**
+	 *  Delete object in database
+	 *
+	 *	@param  User	$user        User that deletes
+	 *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
 	public function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
@@ -411,10 +449,8 @@ class CommandeFournisseurDispatch extends CommonObject
 
 		$this->db->begin();
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action calls a trigger.
 
@@ -428,28 +464,26 @@ class CommandeFournisseurDispatch extends CommonObject
 				// Remove extrafields
 		if (!$error) {
 			$result = $this->deleteExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				dol_syslog(get_class($this)."::delete error deleteExtraFields ".$this->error, LOG_ERR);
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " WHERE rowid=".$this->id;
 
 			dol_syslog(__METHOD__);
 			$resql = $this->db->query($sql);
-			if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
+			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(__METHOD__." ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -491,21 +525,18 @@ class CommandeFournisseurDispatch extends CommonObject
 		$result = $object->create($user);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $object->error;
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 		}
 
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
@@ -541,30 +572,36 @@ class CommandeFournisseurDispatch extends CommonObject
 		global $langs;
 		$langs->load('orders');
 
-		if ($mode == 0)
-		{
+		if ($mode == 0) {
 			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 1)
-		{
+		} elseif ($mode == 1) {
 			return $langs->trans($this->statutshort[$status]);
-		} elseif ($mode == 2)
-		{
+		} elseif ($mode == 2) {
 			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 3)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0');
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4');
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8');
-		} elseif ($mode == 4)
-		{
-			if ($status == 0) return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 1) return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-			elseif ($status == 2) return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
-		} elseif ($mode == 5)
-		{
-			if ($status == 0) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut0');
-			elseif ($status == 1) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut4');
-			elseif ($status == 2) return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+		} elseif ($mode == 3) {
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut0');
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut4');
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut8');
+			}
+		} elseif ($mode == 4) {
+			if ($status == 0) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 1) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
+			} elseif ($status == 2) {
+				return img_picto($langs->trans($this->statuts[$status]), 'statut8').' '.$langs->trans($this->statuts[$status]);
+			}
+		} elseif ($mode == 5) {
+			if ($status == 0) {
+				return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut0');
+			} elseif ($status == 1) {
+				return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut4');
+			} elseif ($status == 2) {
+				return '<span class="hideonsmartphone">'.$langs->trans($this->statutshort[$status]).' </span>'.img_picto($langs->trans($this->statuts[$status]), 'statut8');
+			}
 		}
 	}
 
@@ -610,7 +647,7 @@ class CommandeFournisseurDispatch extends CommonObject
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
- 		$sql = "SELECT";
+		$sql = "SELECT";
 		$sql .= " t.rowid,";
 
 		$sql .= " t.fk_commande,";
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 0157dbd0eec..2336b22a366 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -38,8 +38,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+}
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+}
 
 /**
  *	Class to manage suppliers invoices
@@ -350,9 +354,15 @@ class FactureFournisseur extends CommonInvoice
 		$now = dol_now();
 
 		// Clean parameters
-		if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
-		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
-		if (empty($this->date)) $this->date = $now;
+		if (isset($this->ref_supplier)) {
+			$this->ref_supplier = trim($this->ref_supplier);
+		}
+		if (empty($this->type)) {
+			$this->type = self::TYPE_STANDARD;
+		}
+		if (empty($this->date)) {
+			$this->date = $now;
+		}
 
 		$socid = $this->socid;
 		$ref_supplier = $this->ref_supplier;
@@ -360,10 +370,12 @@ class FactureFournisseur extends CommonInvoice
 		$remise = $this->remise;
 
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
-		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
-		else $this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
-		if (empty($this->fk_multicurrency))
-		{
+		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
+			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
+		} else {
+			$this->fk_multicurrency = MultiCurrency::getIdFromCode($this->db, $this->multicurrency_code);
+		}
+		if (empty($this->fk_multicurrency)) {
 			$this->multicurrency_code = $conf->currency;
 			$this->fk_multicurrency = 0;
 			$this->multicurrency_tx = 1;
@@ -371,7 +383,9 @@ class FactureFournisseur extends CommonInvoice
 
 		$this->db->begin();
 
-		if (!$remise) $remise = 0;
+		if (!$remise) {
+			$remise = 0;
+		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (";
 		$sql .= "ref";
@@ -423,8 +437,7 @@ class FactureFournisseur extends CommonInvoice
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn');
 
 			// Update ref with new one
@@ -433,25 +446,21 @@ class FactureFournisseur extends CommonInvoice
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql) $error++;
+			if (!$resql) {
+				$error++;
+			}
 
-			if (!empty($this->linkedObjectsIds) && empty($this->linked_objects))	// To use new linkedObjectsIds instead of old linked_objects
-			{
+			if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {	// To use new linkedObjectsIds instead of old linked_objects
 				$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
 			}
 
 			// Add object linked
-			if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects))
-			{
-				foreach ($this->linked_objects as $origin => $tmp_origin_id)
-				{
-					if (is_array($tmp_origin_id))       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
-					{
-						foreach ($tmp_origin_id as $origin_id)
-						{
+			if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) {
+				foreach ($this->linked_objects as $origin => $tmp_origin_id) {
+					if (is_array($tmp_origin_id)) {       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+						foreach ($tmp_origin_id as $origin_id) {
 							$ret = $this->add_object_linked($origin, $origin_id);
-							if (!$ret)
-							{
+							if (!$ret) {
 								dol_print_error($this->db);
 								$error++;
 							}
@@ -460,8 +469,7 @@ class FactureFournisseur extends CommonInvoice
 					{
 						$origin_id = $tmp_origin_id;
 						$ret = $this->add_object_linked($origin, $origin_id);
-						if (!$ret)
-						{
+						if (!$ret) {
 							dol_print_error($this->db);
 							$error++;
 						}
@@ -469,17 +477,14 @@ class FactureFournisseur extends CommonInvoice
 				}
 			}
 
-			if (count($this->lines) && is_object($this->lines[0]))	// If this->lines is array of InvoiceLines (preferred mode)
-			{
+			if (count($this->lines) && is_object($this->lines[0])) {	// If this->lines is array of InvoiceLines (preferred mode)
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
-				foreach ($this->lines as $i => $val)
-				{
+				foreach ($this->lines as $i => $val) {
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code)';
 					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).')';
 
 					$resql_insert = $this->db->query($sql);
-					if ($resql_insert)
-					{
+					if ($resql_insert) {
 						$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
 
 						$this->updateline(
@@ -511,20 +516,20 @@ class FactureFournisseur extends CommonInvoice
 			} else // If this->lines is an array of invoice line arrays
 			{
 				dol_syslog("There is ".count($this->lines)." lines that are array lines");
-				foreach ($this->lines as $i => $val)
-				{
+				foreach ($this->lines as $i => $val) {
 					$line = $this->lines[$i];
 
 					// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
 					//if (! is_object($line)) $line=json_decode(json_encode($line), false);  // convert recursively array into object.
-					if (!is_object($line)) $line = (object) $line;
+					if (!is_object($line)) {
+						$line = (object) $line;
+					}
 
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code)';
 					$sql .= ' VALUES ('.$this->id.','.intval($this->lines[$i]->special_code).')';
 
 					$resql_insert = $this->db->query($sql);
-					if ($resql_insert)
-					{
+					if ($resql_insert) {
 						$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
 
 						$this->updateline(
@@ -539,7 +544,7 @@ class FactureFournisseur extends CommonInvoice
 							'HT',
 							(!empty($line->info_bits) ? $line->info_bits : ''),
 							$line->product_type
-							);
+						);
 					} else {
 						$this->error = $this->db->lasterror();
 						$this->db->rollback();
@@ -550,28 +555,25 @@ class FactureFournisseur extends CommonInvoice
 
 			// Update total price
 			$result = $this->update_price();
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Actions on extra fields
-				if (!$error)
-				{
+				if (!$error) {
 					$result = $this->insertExtraFields(); // This also set $this->error or $this->errors if errors are found
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Call trigger
 					$result = $this->call_trigger('BILL_SUPPLIER_CREATE', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$this->db->commit();
 					return $this->id;
 				} else {
@@ -584,8 +586,7 @@ class FactureFournisseur extends CommonInvoice
 				return -3;
 			}
 		} else {
-			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$this->error = $langs->trans('ErrorRefAlreadyExists');
 				$this->db->rollback();
 				return -1;
@@ -655,15 +656,17 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_payment_term as cr ON t.fk_cond_reglement = cr.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as p ON t.fk_mode_reglement = p.id";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON t.fk_incoterms = i.rowid';
-		if ($id)  $sql .= " WHERE t.rowid=".$id;
-		if ($ref) $sql .= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity IN (".getEntity('supplier_invoice').")";
+		if ($id) {
+			$sql .= " WHERE t.rowid=".$id;
+		}
+		if ($ref) {
+			$sql .= " WHERE t.ref='".$this->db->escape($ref)."' AND t.entity IN (".getEntity('supplier_invoice').")";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			if ($this->db->num_rows($resql))
-			{
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id = $obj->rowid;
@@ -737,11 +740,12 @@ class FactureFournisseur extends CommonInvoice
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 
-				if ($this->statut == self::STATUS_DRAFT) $this->brouillon = 1;
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
 
 				$result = $this->fetch_lines();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $this->db->lasterror();
 					return -3;
 				}
@@ -783,14 +787,11 @@ class FactureFournisseur extends CommonInvoice
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql_rows = $this->db->query($sql);
-		if ($resql_rows)
-		{
+		if ($resql_rows) {
 			$num_rows = $this->db->num_rows($resql_rows);
-			if ($num_rows)
-			{
+			if ($num_rows) {
 				$i = 0;
-				while ($i < $num_rows)
-				{
+				while ($i < $num_rows) {
 					$obj = $this->db->fetch_object($resql_rows);
 
 					$line = new SupplierInvoiceLine($this->db);
@@ -877,37 +878,95 @@ class FactureFournisseur extends CommonInvoice
 		$error = 0;
 
 		// Clean parameters
-		if (empty($this->type)) $this->type = self::TYPE_STANDARD;
-		if (isset($this->ref)) $this->ref = trim($this->ref);
-		if (isset($this->ref_supplier)) $this->ref_supplier = trim($this->ref_supplier);
-		if (isset($this->entity)) $this->entity = trim($this->entity);
-		if (isset($this->type)) $this->type = trim($this->type);
-		if (isset($this->fk_soc)) $this->fk_soc = trim($this->fk_soc);
-		if (isset($this->label)) $this->label = trim($this->label);
-		if (isset($this->libelle)) $this->libelle = trim($this->libelle); // deprecated
-		if (isset($this->paye)) $this->paye = trim($this->paye);
-		if (isset($this->amount)) $this->amount = trim($this->amount);
-		if (isset($this->remise)) $this->remise = trim($this->remise);
-		if (isset($this->close_code)) $this->close_code = trim($this->close_code);
-		if (isset($this->close_note)) $this->close_note = trim($this->close_note);
-		if (isset($this->tva)) $this->tva = trim($this->tva);
-		if (isset($this->localtax1)) $this->localtax1 = trim($this->localtax1);
-		if (isset($this->localtax2)) $this->localtax2 = trim($this->localtax2);
-		if (empty($this->total_ht)) $this->total_ht = 0;
-		if (empty($this->total_tva)) $this->total_tva = 0;
+		if (empty($this->type)) {
+			$this->type = self::TYPE_STANDARD;
+		}
+		if (isset($this->ref)) {
+			$this->ref = trim($this->ref);
+		}
+		if (isset($this->ref_supplier)) {
+			$this->ref_supplier = trim($this->ref_supplier);
+		}
+		if (isset($this->entity)) {
+			$this->entity = trim($this->entity);
+		}
+		if (isset($this->type)) {
+			$this->type = trim($this->type);
+		}
+		if (isset($this->fk_soc)) {
+			$this->fk_soc = trim($this->fk_soc);
+		}
+		if (isset($this->label)) {
+			$this->label = trim($this->label);
+		}
+		if (isset($this->libelle)) {
+			$this->libelle = trim($this->libelle); // deprecated
+		}
+		if (isset($this->paye)) {
+			$this->paye = trim($this->paye);
+		}
+		if (isset($this->amount)) {
+			$this->amount = trim($this->amount);
+		}
+		if (isset($this->remise)) {
+			$this->remise = trim($this->remise);
+		}
+		if (isset($this->close_code)) {
+			$this->close_code = trim($this->close_code);
+		}
+		if (isset($this->close_note)) {
+			$this->close_note = trim($this->close_note);
+		}
+		if (isset($this->tva)) {
+			$this->tva = trim($this->tva);
+		}
+		if (isset($this->localtax1)) {
+			$this->localtax1 = trim($this->localtax1);
+		}
+		if (isset($this->localtax2)) {
+			$this->localtax2 = trim($this->localtax2);
+		}
+		if (empty($this->total_ht)) {
+			$this->total_ht = 0;
+		}
+		if (empty($this->total_tva)) {
+			$this->total_tva = 0;
+		}
 		//	if (isset($this->total_localtax1)) $this->total_localtax1=trim($this->total_localtax1);
 		//	if (isset($this->total_localtax2)) $this->total_localtax2=trim($this->total_localtax2);
-		if (isset($this->total_ttc)) $this->total_ttc = trim($this->total_ttc);
-		if (isset($this->statut)) $this->statut = (int) $this->statut;
-		if (isset($this->author)) $this->author = trim($this->author);
-		if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
-		if (isset($this->fk_facture_source)) $this->fk_facture_source = trim($this->fk_facture_source);
-		if (isset($this->fk_project)) $this->fk_project = trim($this->fk_project);
-		if (isset($this->cond_reglement_id)) $this->cond_reglement_id = trim($this->cond_reglement_id);
-		if (isset($this->note_private)) $this->note = trim($this->note_private);
-		if (isset($this->note_public)) $this->note_public = trim($this->note_public);
-		if (isset($this->model_pdf)) $this->model_pdf = trim($this->model_pdf);
-		if (isset($this->import_key)) $this->import_key = trim($this->import_key);
+		if (isset($this->total_ttc)) {
+			$this->total_ttc = trim($this->total_ttc);
+		}
+		if (isset($this->statut)) {
+			$this->statut = (int) $this->statut;
+		}
+		if (isset($this->author)) {
+			$this->author = trim($this->author);
+		}
+		if (isset($this->fk_user_valid)) {
+			$this->fk_user_valid = trim($this->fk_user_valid);
+		}
+		if (isset($this->fk_facture_source)) {
+			$this->fk_facture_source = trim($this->fk_facture_source);
+		}
+		if (isset($this->fk_project)) {
+			$this->fk_project = trim($this->fk_project);
+		}
+		if (isset($this->cond_reglement_id)) {
+			$this->cond_reglement_id = trim($this->cond_reglement_id);
+		}
+		if (isset($this->note_private)) {
+			$this->note = trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note_public = trim($this->note_public);
+		}
+		if (isset($this->model_pdf)) {
+			$this->model_pdf = trim($this->model_pdf);
+		}
+		if (isset($this->import_key)) {
+			$this->import_key = trim($this->import_key);
+		}
 
 
 		// Check parameters
@@ -922,7 +981,9 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " fk_soc=".(isset($this->fk_soc) ? $this->fk_soc : "null").",";
 		$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
 		$sql .= " datef=".(dol_strlen($this->date) != 0 ? "'".$this->db->idate($this->date)."'" : 'null').",";
-		if (dol_strlen($this->tms) != 0) $sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		if (dol_strlen($this->tms) != 0) {
+			$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		}
 		$sql .= " libelle=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " paye=".(isset($this->paye) ? $this->paye : "null").",";
 		$sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
@@ -963,31 +1024,27 @@ class FactureFournisseur extends CommonInvoice
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
-			if (!$notrigger)
-			{
+		if (!$error) {
+			if (!$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('BILL_SUPPLIER_UPDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
 		// Commit or rollback
-		if ($error)
-		{
-			foreach ($this->errors as $errmsg)
-			{
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
@@ -1019,10 +1076,8 @@ class FactureFournisseur extends CommonInvoice
 		$remise = new DiscountAbsolute($this->db);
 		$result = $remise->fetch($idremise);
 
-		if ($result > 0)
-		{
-			if ($remise->fk_invoice_supplier)	// Protection against multiple submission
-			{
+		if ($result > 0) {
+			if ($remise->fk_invoice_supplier) {	// Protection against multiple submission
 				$this->error = $langs->trans("ErrorDiscountAlreadyUsed");
 				$this->db->rollback();
 				return -5;
@@ -1043,8 +1098,7 @@ class FactureFournisseur extends CommonInvoice
 			$facligne->info_bits = 2;
 
 			// Get buy/cost price of invoice that is source of discount
-			if ($remise->fk_invoice_supplier_source > 0)
-			{
+			if ($remise->fk_invoice_supplier_source > 0) {
 				$srcinvoice = new FactureFournisseur($this->db);
 				$srcinvoice->fetch($remise->fk_invoice_supplier_source);
 				$totalcostpriceofinvoice = 0;
@@ -1064,15 +1118,12 @@ class FactureFournisseur extends CommonInvoice
 			$facligne->multicurrency_total_ttc = -$remise->multicurrency_total_ttc;
 
 			$lineid = $facligne->insert();
-			if ($lineid > 0)
-			{
+			if ($lineid > 0) {
 				$result = $this->update_price(1);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					// Create link between discount and invoice line
 					$result = $remise->link_to_invoice($lineid, 0, 'supplier');
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$this->error = $remise->error;
 						$this->db->rollback();
 						return -4;
@@ -1117,12 +1168,10 @@ class FactureFournisseur extends CommonInvoice
 		$error = 0;
 		$this->db->begin();
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('BILL_SUPPLIER_DELETE', $user);
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$this->db->rollback();
 				return -1;
 			}
@@ -1156,8 +1205,7 @@ class FactureFournisseur extends CommonInvoice
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$main = MAIN_DB_PREFIX.'facture_fourn_det';
 			$ef = $main."_extrafields";
 			$sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_facture_fourn = $rowid)";
@@ -1165,8 +1213,7 @@ class FactureFournisseur extends CommonInvoice
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
 			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resqlef && $resql)
-			{
+			if ($resqlef && $resql) {
 				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid;
 				dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 				$resql2 = $this->db->query($sql);
@@ -1178,47 +1225,43 @@ class FactureFournisseur extends CommonInvoice
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete linked object
 			$res = $this->deleteObjectLinked();
-			if ($res < 0) $error++;
+			if ($res < 0) {
+				$error++;
+			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
 			$this->deleteEcmFiles();
 
 			// We remove directory
-			if ($conf->fournisseur->facture->dir_output)
-			{
+			if ($conf->fournisseur->facture->dir_output) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 				$ref = dol_sanitizeFileName($this->ref);
 				$dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoive_supplier').$ref;
 				$file = $dir."/".$ref.".pdf";
-				if (file_exists($file))
-				{
-					if (!dol_delete_file($file, 0, 0, 0, $this)) // For triggers
-					{
+				if (file_exists($file)) {
+					if (!dol_delete_file($file, 0, 0, 0, $this)) { // For triggers
 						$this->error = 'ErrorFailToDeleteFile';
 						$error++;
 					}
 				}
-				if (file_exists($dir))
-				{
+				if (file_exists($dir)) {
 					$res = @dol_delete_dir_recursive($dir);
 
-					if (!$res)
-					{
+					if (!$res) {
 						$this->error = 'ErrorFailToDeleteDir';
 						$error++;
 					}
@@ -1227,18 +1270,15 @@ class FactureFournisseur extends CommonInvoice
 		}
 
 		// Remove extrafields
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->deleteExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			dol_syslog(get_class($this)."::delete $this->id by $user->id", LOG_DEBUG);
 			$this->db->commit();
 			return 1;
@@ -1289,11 +1329,12 @@ class FactureFournisseur extends CommonInvoice
 
 		dol_syslog("FactureFournisseur::set_paid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('BILL_SUPPLIER_PAYED', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		} else {
 			$error++;
@@ -1301,8 +1342,7 @@ class FactureFournisseur extends CommonInvoice
 			dol_print_error($this->db);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -1350,11 +1390,12 @@ class FactureFournisseur extends CommonInvoice
 
 		dol_syslog("FactureFournisseur::set_unpaid", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Call trigger
 			$result = $this->call_trigger('BILL_SUPPLIER_UNPAYED', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 		} else {
 			$error++;
@@ -1362,8 +1403,7 @@ class FactureFournisseur extends CommonInvoice
 			dol_syslog("FactureFournisseur::set_unpaid ".$this->error);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -1397,19 +1437,16 @@ class FactureFournisseur extends CommonInvoice
 		$this->fetch_lines();
 
 		// Check parameters
-		if ($this->statut > self::STATUS_DRAFT)	// This is to avoid to validate twice (avoid errors on logs and stock management)
-		{
+		if ($this->statut > self::STATUS_DRAFT) {	// This is to avoid to validate twice (avoid errors on logs and stock management)
 			dol_syslog(get_class($this)."::validate no draft status", LOG_WARNING);
 			return 0;
 		}
-		if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->ref_supplier))
-		{
+		if (preg_match('/^'.preg_quote($langs->trans("CopyOf").' ').'/', $this->ref_supplier)) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorFieldFormat", $langs->transnoentities("RefSupplier")).'. '.$langs->trans('RemoveString', $langs->transnoentitiesnoconv("CopyOf"));
 			return -1;
 		}
-		if (count($this->lines) <= 0)
-		{
+		if (count($this->lines) <= 0) {
 			$langs->load("errors");
 			$this->error = $langs->trans("ErrorObjectMustHaveLinesToBeValidated", $this->ref);
 			return -1;
@@ -1418,11 +1455,9 @@ class FactureFournisseur extends CommonInvoice
 		$this->db->begin();
 
 		// Define new ref
-		if ($force_number)
-		{
+		if ($force_number) {
 			$num = $force_number;
-		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) // empty should not happened, but when it occurs, the test save life
-		{
+		} elseif (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref)) { // empty should not happened, but when it occurs, the test save life
 			$num = $this->getNextNumRef($this->thirdparty);
 		} else {
 			$num = $this->ref;
@@ -1435,71 +1470,72 @@ class FactureFournisseur extends CommonInvoice
 
 		dol_syslog(get_class($this)."::validate", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			// Si on incrémente le produit principal et ses composants à la validation de facture fournisseur
-			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
-			{
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
 				$cpt = count($this->lines);
-				for ($i = 0; $i < $cpt; $i++)
-				{
-					if ($this->lines[$i]->fk_product > 0)
-					{
+				for ($i = 0; $i < $cpt; $i++) {
+					if ($this->lines[$i]->fk_product > 0) {
 						$this->line = $this->lines[$i];
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We increase stock for product
 						$up_ht_disc = $this->lines[$i]->pu_ht;
-						if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) $up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
-						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
-						else $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
-						if ($result < 0) { $error++; }
+						if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
+							$up_ht_disc = price2num($up_ht_disc * (100 - $this->lines[$i]->remise_percent) / 100, 'MU');
+						}
+						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+							$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
+						} else {
+							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $up_ht_disc, $langs->trans("InvoiceValidatedInDolibarr", $num));
+						}
+						if ($result < 0) {
+							$error++;
+						}
 						unset($this->line);
 					}
 				}
 			}
 
 			// Triggers call
-			if (!$error && empty($notrigger))
-			{
+			if (!$error && empty($notrigger)) {
 				// Call trigger
 				$result = $this->call_trigger('BILL_SUPPLIER_VALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->oldref = $this->ref;
 
 				// Rename directory if dir was a temporary ref
-				if (preg_match('/^[\(]?PROV/i', $this->ref))
-				{
+				if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 					// Now we rename also files into index
 					$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->db->escape($this->newref)."'";
 					$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'fournisseur/facture/".get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 					$resql = $this->db->query($sql);
-					if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+					if (!$resql) {
+						$error++; $this->error = $this->db->lasterror();
+					}
 
 					// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 					$oldref = dol_sanitizeFileName($this->ref);
 					$newref = dol_sanitizeFileName($num);
 					$dirsource = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$oldref;
 					$dirdest = $conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$newref;
-					if (!$error && file_exists($dirsource))
-					{
+					if (!$error && file_exists($dirsource)) {
 						dol_syslog(get_class($this)."::validate rename dir ".$dirsource." into ".$dirdest);
 
-						if (@rename($dirsource, $dirdest))
-						{
+						if (@rename($dirsource, $dirdest)) {
 							dol_syslog("Rename ok");
 							// Rename docs starting with $oldref with $newref
 							$listoffiles = dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($this->id, 2, 0, 0, $this, 'invoice_supplier').$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-							foreach ($listoffiles as $fileentry)
-							{
+							foreach ($listoffiles as $fileentry) {
 								$dirsource = $fileentry['name'];
 								$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 								$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -1512,15 +1548,13 @@ class FactureFournisseur extends CommonInvoice
 			}
 
 			// Set new ref and define current statut
-			if (!$error)
-			{
+			if (!$error) {
 				$this->ref = $num;
 				$this->statut = self::STATUS_VALIDATED;
 				//$this->date_validation=$now; this is stored into log table
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1548,8 +1582,7 @@ class FactureFournisseur extends CommonInvoice
 
 		$error = 0;
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			dol_syslog(__METHOD__." already draft status", LOG_WARNING);
 			return 0;
 		}
@@ -1563,42 +1596,40 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " WHERE rowid = ".$this->id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if (!$error)
-			{
+		if ($result) {
+			if (!$error) {
 				$this->oldcopy = clone $this;
 			}
 
 			// Si on incremente le produit principal et ses composants a la validation de facture fournisseur, on decremente
-			if ($result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL))
-			{
+			if ($result >= 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL)) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 				$langs->load("agenda");
 
 				$cpt = count($this->lines);
-				for ($i = 0; $i < $cpt; $i++)
-				{
-					if ($this->lines[$i]->fk_product > 0)
-					{
+				for ($i = 0; $i < $cpt; $i++) {
+					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
 						// We increase stock for product
-						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) $result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
-						else $result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+						} else {
+							$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
+						}
 					}
 				}
 			}
 			// Triggers call
-			if (!$error && empty($notrigger))
-			{
+			if (!$error && empty($notrigger)) {
 				// Call trigger
 				$result = $this->call_trigger('BILL_SUPPLIER_UNVALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
-			if ($error == 0)
-			{
+			if ($error == 0) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -1652,17 +1683,32 @@ class FactureFournisseur extends CommonInvoice
 		dol_syslog(get_class($this)."::addline $desc,$pu,$qty,$txtva,$fk_product,$remise_percent,$date_start,$date_end,$ventil,$info_bits,$price_base_type,$type,$fk_unit", LOG_DEBUG);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($this->statut == self::STATUS_DRAFT)
-		{
+		if ($this->statut == self::STATUS_DRAFT) {
 			// Clean parameters
-			if (empty($remise_percent)) $remise_percent = 0;
-			if (empty($qty)) $qty = 0;
-			if (empty($info_bits)) $info_bits = 0;
-			if (empty($rang)) $rang = 0;
-			if (empty($ventil)) $ventil = 0;
-			if (empty($txtva)) $txtva = 0;
-			if (empty($txlocaltax1)) $txlocaltax1 = 0;
-			if (empty($txlocaltax2)) $txlocaltax2 = 0;
+			if (empty($remise_percent)) {
+				$remise_percent = 0;
+			}
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($info_bits)) {
+				$info_bits = 0;
+			}
+			if (empty($rang)) {
+				$rang = 0;
+			}
+			if (empty($ventil)) {
+				$ventil = 0;
+			}
+			if (empty($txtva)) {
+				$txtva = 0;
+			}
+			if (empty($txlocaltax1)) {
+				$txlocaltax1 = 0;
+			}
+			if (empty($txlocaltax2)) {
+				$txlocaltax2 = 0;
+			}
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
@@ -1681,15 +1727,12 @@ class FactureFournisseur extends CommonInvoice
 
 			$this->db->begin();
 
-			if ($fk_product > 0)
-			{
-				if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY))
-				{
+			if ($fk_product > 0) {
+				if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
 					// Check quantity is enough
 					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." qty=".$qty." ref_supplier=".$ref_supplier);
 					$prod = new Product($this->db, $fk_product);
-					if ($prod->fetch($fk_product) > 0)
-					{
+					if ($prod->fetch($fk_product) > 0) {
 						$product_type = $prod->type;
 						$label = $prod->label;
 						$fk_prod_fourn_price = 0;
@@ -1697,16 +1740,17 @@ class FactureFournisseur extends CommonInvoice
 						// We use 'none' instead of $ref_supplier, because $ref_supplier may not exists anymore. So we will take the first supplier price ok.
 						// If we want a dedicated supplier price, we must provide $fk_prod_fourn_price.
 						$result = $prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid)); // Search on couple $fk_prod_fourn_price/$qty first, then on triplet $qty/$fk_product/$ref_supplier/$this->fk_soc
-						if ($result > 0)
-						{
-							if (empty($pu)) $pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+						if ($result > 0) {
+							if (empty($pu)) {
+								$pu = $prod->fourn_pu; // Unit price supplier price set by get_buyprice
+							}
 							$ref_supplier = $prod->ref_supplier; // Ref supplier price set by get_buyprice
 							// is remise percent not keyed but present for the product we add it
-							if ($remise_percent == 0 && $prod->remise_percent != 0)
+							if ($remise_percent == 0 && $prod->remise_percent != 0) {
 								$remise_percent = $prod->remise_percent;
+							}
 						}
-						if ($result == 0)                   // If result == 0, we failed to found the supplier reference price
-						{
+						if ($result == 0) {                   // If result == 0, we failed to found the supplier reference price
 							$langs->load("errors");
 							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
 							$this->db->rollback();
@@ -1715,16 +1759,14 @@ class FactureFournisseur extends CommonInvoice
 							//$ref   = $prod->ref_fourn;    // We do not overwrite ref supplier price
 							return -1;
 						}
-						if ($result == -1)
-						{
+						if ($result == -1) {
 							$langs->load("errors");
 							$this->error = "Ref ".$prod->ref." ".$langs->trans("ErrorQtyTooLowForThisSupplier");
 							$this->db->rollback();
 							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_DEBUG);
 							return -1;
 						}
-						if ($result < -1)
-						{
+						if ($result < -1) {
 							$this->error = $prod->error;
 							$this->db->rollback();
 							dol_syslog(get_class($this)."::addline result=".$result." - ".$this->error, LOG_ERR);
@@ -1749,8 +1791,7 @@ class FactureFournisseur extends CommonInvoice
 			// Clean vat code
 			$reg = array();
 			$vat_src_code = '';
-			if (preg_match('/\((.*)\)/', $txtva, $reg))
-			{
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
 				$vat_src_code = $reg[1];
 				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
 			}
@@ -1775,10 +1816,11 @@ class FactureFournisseur extends CommonInvoice
 			$pu_ht_devise = $tabprice[19];
 
 			// Check parameters
-			if ($type < 0) return -1;
+			if ($type < 0) {
+				return -1;
+			}
 
-			if ($rang < 0)
-			{
+			if ($rang < 0) {
 				$rangmax = $this->line_max();
 				$rang = $rangmax + 1;
 			}
@@ -1837,15 +1879,15 @@ class FactureFournisseur extends CommonInvoice
 			}
 
 			$result = $this->line->insert($notrigger);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Reorder if child line
-				if (!empty($fk_parent_line)) $this->line_order(true, 'DESC');
+				if (!empty($fk_parent_line)) {
+					$this->line_order(true, 'DESC');
+				}
 
 				// Mise a jour informations denormalisees au niveau de la facture meme
 				$result = $this->update_price(1, 'auto', 0, $this->thirdparty); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$this->db->commit();
 					return $this->line->id;
 				} else {
@@ -1902,7 +1944,9 @@ class FactureFournisseur extends CommonInvoice
 
 		// Check parameters
 		//if (! is_numeric($pu) || ! is_numeric($qty)) return -1;
-		if ($type < 0) return -1;
+		if ($type < 0) {
+			return -1;
+		}
 
 		if ($date_start && $date_end && $date_start > $date_end) {
 			$langs->load("errors");
@@ -1911,9 +1955,15 @@ class FactureFournisseur extends CommonInvoice
 		}
 
 		// Clean parameters
-		if (empty($vatrate)) $vatrate = 0;
-		if (empty($txlocaltax1)) $txlocaltax1 = 0;
-		if (empty($txlocaltax2)) $txlocaltax2 = 0;
+		if (empty($vatrate)) {
+			$vatrate = 0;
+		}
+		if (empty($txlocaltax1)) {
+			$txlocaltax1 = 0;
+		}
+		if (empty($txlocaltax2)) {
+			$txlocaltax2 = 0;
+		}
 
 		$txlocaltax1 = price2num($txlocaltax1);
 		$txlocaltax2 = price2num($txlocaltax2);
@@ -1929,8 +1979,7 @@ class FactureFournisseur extends CommonInvoice
 
 		// Clean vat code
 		$vat_src_code = '';
-		if (preg_match('/\((.*)\)/', $vatrate, $reg))
-		{
+		if (preg_match('/\((.*)\)/', $vatrate, $reg)) {
 			$vat_src_code = $reg[1];
 			$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
 		}
@@ -1951,10 +2000,11 @@ class FactureFournisseur extends CommonInvoice
 		$multicurrency_total_ttc = $tabprice[18];
 		$pu_ht_devise = $tabprice[19];
 
-		if (empty($info_bits)) $info_bits = 0;
+		if (empty($info_bits)) {
+			$info_bits = 0;
+		}
 
-		if ($idproduct)
-		{
+		if ($idproduct) {
 			$product = new Product($this->db);
 			$result = $product->fetch($idproduct);
 			$product_type = $product->type;
@@ -2046,8 +2096,7 @@ class FactureFournisseur extends CommonInvoice
 
 		dol_syslog(get_class($this)."::deleteline", LOG_DEBUG);
 		$result = $this->db->query($sql);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->error = $this->db->error();
 			$this->db->rollback();
 			return -2;
@@ -2068,8 +2117,7 @@ class FactureFournisseur extends CommonInvoice
 		} else {
 			$res = $this->update_price();
 
-			if ($res > 0)
-			{
+			if ($res > 0) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2095,26 +2143,21 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ' WHERE c.rowid = '.$id;
 
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
-				if ($obj->fk_user_modif)
-				{
+				if ($obj->fk_user_modif) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modif);
 					$this->user_modification = $muser;
@@ -2155,15 +2198,15 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " AND f.paye = 0"; // Pas classee payee completement
 		$sql .= " AND pf.fk_paiementfourn IS NULL"; // Aucun paiement deja fait
 		$sql .= " AND ff.fk_statut IS NULL"; // Renvoi vrai si pas facture de remplacement
-		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".$socid;
+		}
 		$sql .= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_replacable_supplier_invoices", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$return[$obj->rowid] = array(
 					'id' => $obj->rowid,
 					'ref' => $obj->ref,
@@ -2203,20 +2246,23 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " AND NOT EXISTS (SELECT rowid from ".MAIN_DB_PREFIX."facture_fourn as ff WHERE f.rowid = ff.fk_facture_source";
 		$sql .= " AND ff.type=".self::TYPE_REPLACEMENT.")";
 		$sql .= " AND f.type != ".self::TYPE_CREDIT_NOTE; // Type non 2 si facture non avoir
-		if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".$socid;
+		}
 		$sql .= " ORDER BY f.ref";
 
 		dol_syslog(get_class($this)."::list_qualified_avoir_supplier_invoices", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$qualified = 0;
-				if ($obj->fk_statut == self::STATUS_VALIDATED) $qualified = 1;
-				if ($obj->fk_statut == self::STATUS_CLOSED) $qualified = 1;
-				if ($qualified)
-				{
+				if ($obj->fk_statut == self::STATUS_VALIDATED) {
+					$qualified = 1;
+				}
+				if ($obj->fk_statut == self::STATUS_CLOSED) {
+					$qualified = 1;
+				}
+				if ($qualified) {
 					$paymentornot = ($obj->fk_paiementfourn ? 1 : 0);
 					$return[$obj->rowid] = array('ref'=>$obj->ref, 'status'=>$obj->fk_statut, 'type'=>$obj->type, 'paye'=>$obj->paye, 'paymentornot'=>$paymentornot);
 				}
@@ -2243,16 +2289,21 @@ class FactureFournisseur extends CommonInvoice
 
 		$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
-		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 ff.paye=0';
 		$sql .= ' AND ff.fk_statut > 0';
 		$sql .= " AND ff.entity = ".$conf->entity;
-		if ($user->socid) $sql .= ' AND ff.fk_soc = '.$user->socid;
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		if ($user->socid) {
+			$sql .= ' AND ff.fk_soc = '.$user->socid;
+		}
+		if (!$user->rights->societe->client->voir && !$user->socid) {
+			$sql .= " AND ff.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+		}
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$langs->load("bills");
 			$now = dol_now();
 
@@ -2266,8 +2317,7 @@ class FactureFournisseur extends CommonInvoice
 
 			$facturestatic = new FactureFournisseur($this->db);
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$response->nbtodo++;
 
 				$facturestatic->date_echeance = $this->db->jdate($obj->datefin);
@@ -2307,56 +2357,84 @@ class FactureFournisseur extends CommonInvoice
 
 		$result = '';
 
-		if ($option == 'withdraw') $url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id.'&type=bank-transfer';
-		elseif ($option == 'document')	$url = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$this->id;
-		else $url = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id;
+		if ($option == 'withdraw') {
+			$url = DOL_URL_ROOT.'/compta/facture/prelevement.php?facid='.$this->id.'&type=bank-transfer';
+		} elseif ($option == 'document') {
+			$url = DOL_URL_ROOT.'/fourn/facture/document.php?facid='.$this->id;
+		} else {
+			$url = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$this->id;
+		}
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
-		if ($option !== 'nolink')
-		{
+		if ($option !== 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$picto = $this->picto;
-		if ($this->type == self::TYPE_REPLACEMENT) $picto .= 'r'; // Replacement invoice
-		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
-		if ($this->type == self::TYPE_DEPOSIT)     $picto .= 'd'; // Deposit invoice
+		if ($this->type == self::TYPE_REPLACEMENT) {
+			$picto .= 'r'; // Replacement invoice
+		}
+		if ($this->type == self::TYPE_CREDIT_NOTE) {
+			$picto .= 'a'; // Credit note
+		}
+		if ($this->type == self::TYPE_DEPOSIT) {
+			$picto .= 'd'; // Deposit invoice
+		}
 
 		$label = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("SupplierInvoice").'</u>';
-		if ($this->type == self::TYPE_REPLACEMENT) $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("InvoiceReplace").'</u>';
-		elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
-		elseif ($this->type == self::TYPE_DEPOSIT)     $label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("Deposit").'</u>';
-		if (!empty($this->ref))
+		if ($this->type == self::TYPE_REPLACEMENT) {
+			$label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("InvoiceReplace").'</u>';
+		} elseif ($this->type == self::TYPE_CREDIT_NOTE) {
+			$label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
+		} elseif ($this->type == self::TYPE_DEPOSIT) {
+			$label = '<u class="paddingrightonly">'.$langs->transnoentitiesnoconv("Deposit").'</u>';
+		}
+		if (!empty($this->ref)) {
 			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		if (!empty($this->ref_supplier))
+		}
+		if (!empty($this->ref_supplier)) {
 			$label .= '<br><b>'.$langs->trans('RefSupplier').':</b> '.$this->ref_supplier;
-		if (!empty($this->label))
+		}
+		if (!empty($this->label)) {
 			$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
-		if (!empty($this->date))
+		}
+		if (!empty($this->date)) {
 			$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
-		if (!empty($this->total_ht))
+		}
+		if (!empty($this->total_ht)) {
 			$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_tva))
+		}
+		if (!empty($this->total_tva)) {
 			$label .= '<br><b>'.$langs->trans('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
-		if (!empty($this->total_ttc))
+		}
+		if (!empty($this->total_ttc)) {
 			$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
-		if ($moretitle) $label .= ' - '.$moretitle;
+		}
+		if ($moretitle) {
+			$label .= ' - '.$moretitle;
+		}
 		if (isset($this->statut) && isset($this->alreadypaid)) {
 			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5, $this->alreadypaid);
 		}
 
 		$ref = $this->ref;
-		if (empty($ref)) $ref = $this->id;
+		if (empty($ref)) {
+			$ref = $this->id;
+		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowSupplierInvoice");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
@@ -2369,15 +2447,17 @@ class FactureFournisseur extends CommonInvoice
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($max ?dol_trunc($ref, $max) : $ref);
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= ($max ?dol_trunc($ref, $max) : $ref);
+		}
 		$result .= $linkend;
 
-		if ($addlinktonotes)
-		{
+		if ($addlinktonotes) {
 			$txttoshow = ($user->socid > 0 ? $this->note_public : $this->note_private);
-			if ($txttoshow)
-			{
+			if ($txttoshow) {
 				$notetoshow = $langs->trans("ViewPrivateNote").':<br>'.dol_string_nohtmltag($txttoshow, 1);
 				$result .= ' <span class="note inline-block">';
 				$result .= '<a href="'.DOL_URL_ROOT.'/fourn/facture/note.php?id='.$this->id.'" class="classfortooltip" title="'.dol_escape_htmltag($notetoshow).'">';
@@ -2406,7 +2486,9 @@ class FactureFournisseur extends CommonInvoice
 		$langs->load("orders");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) $conf->global->INVOICE_SUPPLIER_ADDON_NUMBER = 'mod_facture_fournisseur_cactus';
+		if (empty($conf->global->INVOICE_SUPPLIER_ADDON_NUMBER)) {
+			$conf->global->INVOICE_SUPPLIER_ADDON_NUMBER = 'mod_facture_fournisseur_cactus';
+		}
 
 		$mybool = false;
 
@@ -2432,8 +2514,7 @@ class FactureFournisseur extends CommonInvoice
 		$numref = "";
 		$numref = $obj->getNumRef($soc, $this, $mode);
 
-		if ($numref != "")
-		{
+		if ($numref != "") {
 			return $numref;
 		} else {
 			$this->error = $obj->error;
@@ -2467,12 +2548,10 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= $this->db->plimit(100);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_prods = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < $num_prods)
-			{
+			while ($i < $num_prods) {
 				$i++;
 				$row = $this->db->fetch_row($resql);
 				$prodids[$i] = $row[0];
@@ -2496,13 +2575,11 @@ class FactureFournisseur extends CommonInvoice
 		$this->multicurrency_tx = 1;
 		$this->multicurrency_code = $conf->currency;
 
-		if (empty($option) || $option != 'nolines')
-		{
+		if (empty($option) || $option != 'nolines') {
 			// Lines
 			$nbp = 5;
 			$xnbp = 0;
-			while ($xnbp < $nbp)
-			{
+			while ($xnbp < $nbp) {
 				$line = new SupplierInvoiceLine($this->db);
 				$line->desc = $langs->trans("Description")." ".$xnbp;
 				$line->qty = 1;
@@ -2512,8 +2589,7 @@ class FactureFournisseur extends CommonInvoice
 				$line->tva_tx = 19.6;
 				$line->localtax1_tx = 0;
 				$line->localtax2_tx = 0;
-				if ($xnbp == 2)
-				{
+				if ($xnbp == 2) {
 					$line->total_ht = 50;
 					$line->total_ttc = 59.8;
 					$line->total_tva = 9.8;
@@ -2525,8 +2601,7 @@ class FactureFournisseur extends CommonInvoice
 					$line->remise_percent = 0;
 				}
 
-				if ($num_prods > 0)
-				{
+				if ($num_prods > 0) {
 					$prodid = mt_rand(1, $num_prods);
 					$line->fk_product = $prodids[$prodid];
 				}
@@ -2566,8 +2641,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql = "SELECT count(f.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-		if (!$user->rights->societe->client->voir && !$user->socid)
-		{
+		if (!$user->rights->societe->client->voir && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".$user->id;
 			$clause = "AND";
@@ -2575,10 +2649,8 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " ".$clause." f.entity = ".$conf->entity;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
-			while ($obj = $this->db->fetch_object($resql))
-			{
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
 				$this->nb["supplier_invoices"] = $obj->nb;
 			}
 			$this->db->free($resql);
@@ -2629,10 +2701,8 @@ class FactureFournisseur extends CommonInvoice
 		$object->close_note         = '';
 
 		// Loop on each line of new invoice
-		foreach ($object->lines as $i => $line)
-		{
-			if (isset($object->lines[$i]->info_bits) && ($object->lines[$i]->info_bits & 0x02) == 0x02)	// We do not clone line of discounts
-			{
+		foreach ($object->lines as $i => $line) {
+			if (isset($object->lines[$i]->info_bits) && ($object->lines[$i]->info_bits & 0x02) == 0x02) {	// We do not clone line of discounts
 				unset($object->lines[$i]);
 			}
 		}
@@ -2642,22 +2712,19 @@ class FactureFournisseur extends CommonInvoice
 		$result = $object->create($user);
 
 		// Other options
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$this->error = $object->error;
 			$this->errors = $object->errors;
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 		}
 
 		unset($object->context['createfromclone']);
 
 		// End
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return $object->id;
 		} else {
@@ -2685,18 +2752,15 @@ class FactureFournisseur extends CommonInvoice
 		$outputlangs->load("products");
 
 		// Set the model on the model name to use
-		if (empty($modele))
-		{
-			if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF))
-			{
+		if (empty($modele)) {
+			if (!empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) {
 				$modele = $conf->global->INVOICE_SUPPLIER_ADDON_PDF;
 			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
 
-		if (empty($modele))
-		{
+		if (empty($modele)) {
 			return 0;
 		} else {
 			$modelpath = "core/modules/supplier_invoice/doc/";
@@ -2764,7 +2828,9 @@ class FactureFournisseur extends CommonInvoice
 		$resql = $this->db->query($sql);
 		if (!empty($resql)) {
 			$obj = $this->db->fetch_object($resql);
-			if (!empty($obj->fk_invoice_supplier)) $isUsed = true;
+			if (!empty($obj->fk_invoice_supplier)) {
+				$isUsed = true;
+			}
 		}
 
 		return $isUsed;
@@ -3111,11 +3177,9 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->deleteObjectLinked();
 
 		// Remove extrafields
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->deleteExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 				dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
 			}
@@ -3133,8 +3197,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -3157,22 +3220,31 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$qty = price2num($this->qty);
 
 		// Check parameters
-		if (empty($this->qty)) $this->qty = 0;
+		if (empty($this->qty)) {
+			$this->qty = 0;
+		}
 
 		if ($this->product_type < 0) {
 			return -1;
 		}
 
 		// Clean parameters
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->tva_tx))  		  $this->tva_tx = 0;
-		if (empty($this->localtax1_tx))   $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx))   $this->localtax2_tx = 0;
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
 
 		$this->db->begin();
 
-		if (empty($this->fk_product))
-		{
+		if (empty($this->fk_product)) {
 			$fk_product = "null";
 		} else {
 			$fk_product = $this->fk_product;
@@ -3229,17 +3301,14 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->rowid = $this->id;
 		$error = 0;
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $this->insertExtraFields();
-			if ($result < 0)
-			{
+			if ($result < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error && !$notrigger)
-		{
+		if (!$error && !$notrigger) {
 			global $langs, $user;
 
 			// Call trigger
@@ -3275,41 +3344,78 @@ class SupplierInvoiceLine extends CommonObjectLine
 
 		// Clean parameters
 		$this->desc = trim($this->desc);
-		if (empty($this->tva_tx)) $this->tva_tx = 0;
-		if (empty($this->localtax1_tx)) $this->localtax1_tx = 0;
-		if (empty($this->localtax2_tx)) $this->localtax2_tx = 0;
-		if (empty($this->localtax1_type)) $this->localtax1_type = '0';
-		if (empty($this->localtax2_type)) $this->localtax2_type = '0';
-		if (empty($this->total_tva)) $this->total_tva = 0;
-		if (empty($this->total_localtax1)) $this->total_localtax1 = 0;
-		if (empty($this->total_localtax2)) $this->total_localtax2 = 0;
-		if (empty($this->rang)) $this->rang = 0;
-		if (empty($this->remise_percent)) $this->remise_percent = 0;
-		if (empty($this->info_bits)) $this->info_bits = 0;
-		if (empty($this->subprice)) $this->subprice = 0;
-		if (empty($this->special_code)) $this->special_code = 0;
-		if (empty($this->fk_parent_line)) $this->fk_parent_line = 0;
-		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') $this->situation_percent = 100;
+		if (empty($this->tva_tx)) {
+			$this->tva_tx = 0;
+		}
+		if (empty($this->localtax1_tx)) {
+			$this->localtax1_tx = 0;
+		}
+		if (empty($this->localtax2_tx)) {
+			$this->localtax2_tx = 0;
+		}
+		if (empty($this->localtax1_type)) {
+			$this->localtax1_type = '0';
+		}
+		if (empty($this->localtax2_type)) {
+			$this->localtax2_type = '0';
+		}
+		if (empty($this->total_tva)) {
+			$this->total_tva = 0;
+		}
+		if (empty($this->total_localtax1)) {
+			$this->total_localtax1 = 0;
+		}
+		if (empty($this->total_localtax2)) {
+			$this->total_localtax2 = 0;
+		}
+		if (empty($this->rang)) {
+			$this->rang = 0;
+		}
+		if (empty($this->remise_percent)) {
+			$this->remise_percent = 0;
+		}
+		if (empty($this->info_bits)) {
+			$this->info_bits = 0;
+		}
+		if (empty($this->subprice)) {
+			$this->subprice = 0;
+		}
+		if (empty($this->special_code)) {
+			$this->special_code = 0;
+		}
+		if (empty($this->fk_parent_line)) {
+			$this->fk_parent_line = 0;
+		}
+		if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
+			$this->situation_percent = 100;
+		}
 
-		if (empty($this->pa_ht)) $this->pa_ht = 0;
-		if (empty($this->multicurrency_subprice)) $this->multicurrency_subprice = 0;
-		if (empty($this->multicurrency_total_ht)) $this->multicurrency_total_ht = 0;
-		if (empty($this->multicurrency_total_tva)) $this->multicurrency_total_tva = 0;
-		if (empty($this->multicurrency_total_ttc)) $this->multicurrency_total_ttc = 0;
+		if (empty($this->pa_ht)) {
+			$this->pa_ht = 0;
+		}
+		if (empty($this->multicurrency_subprice)) {
+			$this->multicurrency_subprice = 0;
+		}
+		if (empty($this->multicurrency_total_ht)) {
+			$this->multicurrency_total_ht = 0;
+		}
+		if (empty($this->multicurrency_total_tva)) {
+			$this->multicurrency_total_tva = 0;
+		}
+		if (empty($this->multicurrency_total_ttc)) {
+			$this->multicurrency_total_ttc = 0;
+		}
 
 
 		// Check parameters
-		if ($this->product_type < 0)
-		{
+		if ($this->product_type < 0) {
 			$this->error = 'ErrorProductTypeMustBe0orMore';
 			return -1;
 		}
-		if (!empty($this->fk_product))
-		{
+		if (!empty($this->fk_product)) {
 			// Check product exists
 			$result = Product::isExistingObject('product', $this->fk_product);
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				$this->error = 'ErrorProductIdDoesNotExists';
 				return -1;
 			}
@@ -3365,26 +3471,21 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ')';
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
 			$this->rowid = $this->id; // backward compatibility
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $this->insertExtraFields();
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('LINEBILL_SUPPLIER_CREATE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -2;
 				}
@@ -3423,8 +3524,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 		dol_syslog("FactureFournisseurLigne.class.php::update_total", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->db->commit();
 			return 1;
 		} else {
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 6ae9a3491ab..e0eea961b9e 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -168,14 +168,12 @@ class ProductFournisseur extends Product
 
 		dol_syslog(get_class($this)."::remove_fournisseur", LOG_DEBUG);
 		$resql2 = $this->db->query($sql);
-		if (!$resql2)
-		{
+		if (!$resql2) {
 			$this->error = $this->db->lasterror();
 			$ok = 0;
 		}
 
-		if ($ok)
-		{
+		if ($ok) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -203,18 +201,18 @@ class ProductFournisseur extends Product
 
 		// Call trigger
 		$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_DELETE', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 		// End call triggers
 
-		if (empty($error))
-		{
+		if (empty($error)) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_fournisseur_price";
 			$sql .= " WHERE rowid = ".$rowid;
 
 			dol_syslog(get_class($this)."::remove_product_fournisseur_price", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
@@ -266,15 +264,28 @@ class ProductFournisseur extends Product
 		//global $mysoc;
 
 		// Clean parameter
-		if (empty($qty)) $qty = 0;
-		if (empty($buyprice)) $buyprice = 0;
-		if (empty($charges)) $charges = 0;
-		if (empty($availability)) $availability = 0;
-		if (empty($remise_percent)) $remise_percent = 0;
-		if (empty($supplier_reputation) || $supplier_reputation == -1) $supplier_reputation = '';
-		if ($delivery_time_days != '' && !is_numeric($delivery_time_days)) $delivery_time_days = '';
-		if ($price_base_type == 'TTC')
-		{
+		if (empty($qty)) {
+			$qty = 0;
+		}
+		if (empty($buyprice)) {
+			$buyprice = 0;
+		}
+		if (empty($charges)) {
+			$charges = 0;
+		}
+		if (empty($availability)) {
+			$availability = 0;
+		}
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
+		if (empty($supplier_reputation) || $supplier_reputation == -1) {
+			$supplier_reputation = '';
+		}
+		if ($delivery_time_days != '' && !is_numeric($delivery_time_days)) {
+			$delivery_time_days = '';
+		}
+		if ($price_base_type == 'TTC') {
 			$ttx = $tva_tx;
 			$buyprice = $buyprice / (1 + ($ttx / 100));
 		}
@@ -283,10 +294,13 @@ class ProductFournisseur extends Product
 		$multicurrency_unitBuyPrice = null;
 		$fk_multicurrency = null;
 		if (!empty($conf->multicurrency->enabled)) {
-			if (empty($multicurrency_tx)) $multicurrency_tx = 1;
-			if (empty($multicurrency_buyprice)) $multicurrency_buyprice = 0;
-			if ($multicurrency_price_base_type == 'TTC')
-			{
+			if (empty($multicurrency_tx)) {
+				$multicurrency_tx = 1;
+			}
+			if (empty($multicurrency_buyprice)) {
+				$multicurrency_buyprice = 0;
+			}
+			if ($multicurrency_price_base_type == 'TTC') {
 				$ttx = $tva_tx;
 				$multicurrency_buyprice = $multicurrency_buyprice / (1 + ($ttx / 100));
 			}
@@ -309,8 +323,7 @@ class ProductFournisseur extends Product
 
 		$newvat = $tva_tx;
 
-		if (count($localtaxes_array) > 0)
-		{
+		if (count($localtaxes_array) > 0) {
 			$localtaxtype1 = $localtaxes_array['0'];
 			$localtax1 = $localtaxes_array['1'];
 			$localtaxtype2 = $localtaxes_array['2'];
@@ -321,26 +334,26 @@ class ProductFournisseur extends Product
 			$localtaxtype2 = '0';
 			$localtax2 = get_localtax($newvat, 2);
 		}
-		if (empty($localtax1)) $localtax1 = 0; // If = '' then = 0
-		if (empty($localtax2)) $localtax2 = 0; // If = '' then = 0
+		if (empty($localtax1)) {
+			$localtax1 = 0; // If = '' then = 0
+		}
+		if (empty($localtax2)) {
+			$localtax2 = 0; // If = '' then = 0
+		}
 
 		// Check parameters
-		if ($buyprice != '' && !is_numeric($buyprice))
-		{
+		if ($buyprice != '' && !is_numeric($buyprice)) {
 		}
 
 		$this->db->begin();
 
-		if ($this->product_fourn_price_id > 0)
-		{
+		if ($this->product_fourn_price_id > 0) {
 			// check if price already logged, if not first log current price
 			$logPrices = $this->listProductFournisseurPriceLog($this->product_fourn_price_id);
-			if (is_array($logPrices) && count($logPrices) == 0)
-			{
+			if (is_array($logPrices) && count($logPrices) == 0) {
 				$currentPfp = new self($this->db);
 				$result = $currentPfp->fetch_product_fournisseur_price($this->product_fourn_price_id);
-				if ($result > 0 && $currentPfp->fourn_price != 0)
-				{
+				if ($result > 0 && $currentPfp->fourn_price != 0) {
 					$currentPfpUser = new User($this->db);
 					$result = $currentPfpUser->fetch($currentPfp->user_id);
 					if ($result > 0) {
@@ -387,27 +400,28 @@ class ProductFournisseur extends Product
 			$sql .= " supplier_reputation = ".(empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
 			$sql .= " barcode = ".(empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
 			$sql .= " fk_barcode_type = ".(empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
-			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", packaging = ".(empty($packaging) ? 1 : $packaging);
+			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				$sql .= ", packaging = ".(empty($packaging) ? 1 : $packaging);
+			}
 			$sql .= " WHERE rowid = ".$this->product_fourn_price_id;
 			// TODO Add price_base_type and price_ttc
 
 			dol_syslog(get_class($this).'::update_buyprice update knowing id of line = product_fourn_price_id = '.$this->product_fourn_price_id, LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				// Call trigger
 				$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
-				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG))
-				{
+				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
 					$result = $this->logPrice($user, $now, $buyprice, $qty, $multicurrency_buyprice, $multicurrency_unitBuyPrice, $multicurrency_tx, $fk_multicurrency, $multicurrency_code);
 					if ($result < 0) {
 						$error++;
 					}
 				}
-				if (empty($error))
-				{
+				if (empty($error)) {
 					$this->db->commit();
 					return $this->product_fourn_price_id;
 				} else {
@@ -431,7 +445,9 @@ class ProductFournisseur extends Product
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
 				$sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
 				$sql .= "datec, fk_product, fk_soc, ref_fourn, desc_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation, barcode, fk_barcode_type)";
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", packaging";
+				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+					$sql .= ", packaging";
+				}
 				$sql .= " values(";
 				$sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
 				$sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
@@ -459,7 +475,9 @@ class ProductFournisseur extends Product
 				$sql .= (empty($supplier_reputation) ? 'NULL' : "'".$this->db->escape($supplier_reputation)."'").",";
 				$sql .= (empty($barcode) ? 'NULL' : "'".$this->db->escape($barcode)."'").",";
 				$sql .= (empty($fk_barcode_type) ? 'NULL' : "'".$this->db->escape($fk_barcode_type)."'");
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", ".(empty($this->packaging) ? 1 : $this->db->escape($this->packaging));
+				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+					$sql .= ", ".(empty($this->packaging) ? 1 : $this->db->escape($this->packaging));
+				}
 				$sql .= ")";
 
 				$this->product_fourn_price_id = 0;
@@ -483,8 +501,9 @@ class ProductFournisseur extends Product
 				if (!$error) {
 					// Call trigger
 					$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_CREATE', $user);
-					if ($result < 0)
+					if ($result < 0) {
 						$error++;
+					}
 						// End call triggers
 
 					if (empty($error)) {
@@ -532,11 +551,9 @@ class ProductFournisseur extends Product
 
 		dol_syslog(get_class($this)."::fetch_product_fournisseur_price", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
-			if ($obj)
-			{
+			if ($obj) {
 				$this->product_fourn_price_id = $rowid;
 				$this->id = $obj->fk_product;
 
@@ -578,18 +595,18 @@ class ProductFournisseur extends Product
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$this->packaging = $obj->packaging;
-					if ($this->packaging < $this->fourn_qty) $this->packaging = $this->fourn_qty;
+					if ($this->packaging < $this->fourn_qty) {
+						$this->packaging = $this->fourn_qty;
+					}
 				}
 
-				if (empty($ignore_expression) && !empty($this->fk_supplier_price_expression))
-				{
+				if (empty($ignore_expression) && !empty($this->fk_supplier_price_expression)) {
 					$priceparser = new PriceParser($this->db);
 					$price_result = $priceparser->parseProductSupplier($this);
 					if ($price_result >= 0) {
 						$this->fourn_price = $price_result;
 						//recalculation of unitprice, as probably the price changed...
-						if ($this->fourn_qty != 0)
-						{
+						if ($this->fourn_qty != 0) {
 							$this->fourn_unitprice = price2num($this->fourn_price / $this->fourn_qty, 'MU');
 						} else {
 							$this->fourn_unitprice = "";
@@ -629,24 +646,27 @@ class ProductFournisseur extends Product
 		$sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation,";
 		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code, pfp.datec, pfp.tms,";
 		$sql .= " pfp.barcode, pfp.fk_barcode_type";
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) $sql .= ", pfp.packaging";
+		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+			$sql .= ", pfp.packaging";
+		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
 		$sql .= " AND pfp.fk_soc = s.rowid AND pfp.fk_product = p.rowid";
 		$sql .= " AND s.status=1"; // only enabled company selected
 		$sql .= " AND pfp.fk_product = ".$prodid;
-		if (empty($sortfield)) $sql .= " ORDER BY s.nom, pfp.quantity, pfp.price";
-		else $sql .= $this->db->order($sortfield, $sortorder);
+		if (empty($sortfield)) {
+			$sql .= " ORDER BY s.nom, pfp.quantity, pfp.price";
+		} else {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
 		$sql .= $this->db->plimit($limit, $offset);
 		dol_syslog(get_class($this)."::list_product_fournisseur_price", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$retarray = array();
 
-			while ($record = $this->db->fetch_array($resql))
-			{
+			while ($record = $this->db->fetch_array($resql)) {
 				//define base attribute
 				$prodfourn = new ProductFournisseur($this->db);
 
@@ -683,7 +703,9 @@ class ProductFournisseur extends Product
 
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$prodfourn->packaging = $record["packaging"];
-					if ($prodfourn->packaging < $prodfourn->fourn_qty) $prodfourn->packaging = $prodfourn->fourn_qty;
+					if ($prodfourn->packaging < $prodfourn->fourn_qty) {
+						$prodfourn->packaging = $prodfourn->fourn_qty;
+					}
 				}
 
 				if (!empty($conf->barcode->enabled)) {
@@ -700,10 +722,8 @@ class ProductFournisseur extends Product
 					}
 				}
 
-				if (!isset($prodfourn->fourn_unitprice))
-				{
-					if ($prodfourn->fourn_qty != 0)
-					{
+				if (!isset($prodfourn->fourn_unitprice)) {
+					if ($prodfourn->fourn_qty != 0) {
 						$prodfourn->fourn_unitprice = price2num($prodfourn->fourn_price / $prodfourn->fourn_qty, 'MU');
 					} else {
 						$prodfourn->fourn_unitprice = "";
@@ -735,8 +755,7 @@ class ProductFournisseur extends Product
 		// phpcs:enable
 		global $conf;
 
-		if (empty($prodid))
-		{
+		if (empty($prodid)) {
 			dol_syslog("Warning function find_min_price_product_fournisseur were called with prodid empty. May be a bug.", LOG_WARNING);
 			return 0;
 		}
@@ -771,30 +790,30 @@ class ProductFournisseur extends Product
 		$sql .= " AND pfp.fk_product = ".$prodid;
 		$sql .= " AND pfp.fk_soc = s.rowid";
 		$sql .= " AND s.status = 1"; // only enabled society
-		if ($qty > 0) $sql .= " AND pfp.quantity <= ".$qty;
-		if ($socid > 0) $sql .= ' AND pfp.fk_soc = '.$socid;
+		if ($qty > 0) {
+			$sql .= " AND pfp.quantity <= ".$qty;
+		}
+		if ($socid > 0) {
+			$sql .= ' AND pfp.fk_soc = '.$socid;
+		}
 
 		dol_syslog(get_class($this)."::find_min_price_product_fournisseur", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$record_array = array();
 
 			//Store each record to array for later search of min
-			while ($record = $this->db->fetch_array($resql))
-			{
+			while ($record = $this->db->fetch_array($resql)) {
 				$record_array[] = $record;
 			}
 
-			if (count($record_array) == 0)
-			{
+			if (count($record_array) == 0) {
 				$this->db->free($resql);
 				return 0;
 			} else {
 				$min = -1;
-				foreach ($record_array as $record)
-				{
+				foreach ($record_array as $record) {
 					$fourn_price = $record["price"];
 					// discount calculated buy price
 					$fourn_unitprice = $record["unitprice"] * (1 - $record["remise_percent"] / 100) - $record["remise"];
@@ -809,16 +828,14 @@ class ProductFournisseur extends Product
 						$price_result = $priceparser->parseProductSupplier($prod_supplier);
 						if ($price_result >= 0) {
 							$fourn_price = price2num($price_result, 'MU');
-							if ($record["quantity"] != 0)
-							{
+							if ($record["quantity"] != 0) {
 								$fourn_unitprice = price2num($fourn_price / $record["quantity"], 'MU');
 							} else {
 								$fourn_unitprice = $fourn_price;
 							}
 						}
 					}
-					if ($fourn_unitprice < $min || $min == -1)
-					{
+					if ($fourn_unitprice < $min || $min == -1) {
 						$this->product_fourn_price_id   = $record["product_fourn_price_id"];
 						$this->ref_supplier             = $record["ref_fourn"];
 						$this->ref_fourn                = $record["ref_fourn"]; // deprecated
@@ -874,8 +891,7 @@ class ProductFournisseur extends Product
 		dol_syslog(get_class($this)."::setSupplierPriceExpression", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -982,18 +998,19 @@ class ProductFournisseur extends Product
 		$sql .= " AND pfpl.fk_user = u.rowid";
 		$sql .= " AND pfp.rowid = pfpl.fk_product_fournisseur";
 		$sql .= " AND pfpl.fk_product_fournisseur = ".$product_fourn_price_id;
-		if (empty($sortfield)) $sql .= " ORDER BY pfpl.datec";
-		else $sql .= $this->db->order($sortfield, $sortorder);
+		if (empty($sortfield)) {
+			$sql .= " ORDER BY pfpl.datec";
+		} else {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
 		$sql .= $this->db->plimit($limit, $offset);
 		dol_syslog(get_class($this)."::list_product_fournisseur_price_log", LOG_DEBUG);
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$retarray = array();
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$tmparray = array();
 				$tmparray['rowid'] = $obj->rowid;
 				$tmparray['supplier_ref'] = $obj->supplier_ref;
@@ -1126,7 +1143,9 @@ class ProductFournisseur extends Product
 			if ($this->height) {
 				$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Height").'</b>: '.$this->height.' '.measuringUnitString(0, 'size', $this->height_units);
 			}
-			if ($labelsize) $label .= "<br>".$labelsize;
+			if ($labelsize) {
+				$label .= "<br>".$labelsize;
+			}
 
 			$labelsurfacevolume = "";
 			if ($this->surface) {
@@ -1135,7 +1154,9 @@ class ProductFournisseur extends Product
 			if ($this->volume) {
 				$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuringUnitString(0, 'volume', $this->volume_units);
 			}
-			if ($labelsurfacevolume) $label .= "<br>".$labelsurfacevolume;
+			if ($labelsurfacevolume) {
+				$label .= "<br>".$labelsurfacevolume;
+			}
 		}
 
 		if (!empty($conf->accounting->enabled) && $this->status) {
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index cd172d08345..ceb7bb835ef 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -98,20 +98,19 @@ class PaiementFourn extends Paiement
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
 		$sql .= ' WHERE p.entity IN ('.getEntity('facture_fourn').')';
-		if ($id > 0)
+		if ($id > 0) {
 			$sql .= ' AND p.rowid = '.$id;
-		elseif ($ref)
+		} elseif ($ref) {
 			$sql .= ' AND p.rowid = '.$ref;
-		elseif ($fk_bank)
+		} elseif ($fk_bank) {
 			$sql .= ' AND p.fk_bank = '.$fk_bank;
+		}
 		//print $sql;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num > 0)
-			{
+			if ($num > 0) {
 				$obj = $this->db->fetch_object($resql);
 
 				$this->id             = $obj->rowid;
@@ -166,8 +165,7 @@ class PaiementFourn extends Paiement
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
 
-		if ($way == 'dolibarr')
-		{
+		if ($way == 'dolibarr') {
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
 		} else {
@@ -175,8 +173,7 @@ class PaiementFourn extends Paiement
 			$amounts_to_update = &$this->amounts;
 		}
 
-		foreach ($amounts as $key => $value)
-		{
+		foreach ($amounts as $key => $value) {
 			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value ? $value : 0, $way, 'facture_fourn');
 			$totalamount_converted += $value_converted;
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
@@ -190,13 +187,11 @@ class PaiementFourn extends Paiement
 
 		$this->db->begin();
 
-		if ($totalamount <> 0) // On accepte les montants negatifs
-		{
+		if ($totalamount <> 0) { // On accepte les montants negatifs
 			$ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
 			$now = dol_now();
 
-			if ($way == 'dolibarr')
-			{
+			if ($way == 'dolibarr') {
 				$total = $totalamount;
 				$mtotal = $totalamount_converted; // Maybe use price2num with MT for the converted value
 			} else {
@@ -210,28 +205,23 @@ class PaiementFourn extends Paiement
 			$sql .= " '".$this->db->idate($this->datepaye)."', '".$total."', '".$mtotal."', ".$this->paiementid.", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_private)."', ".$user->id.", 0)";
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'paiementfourn');
 
 				// Insere tableau des montants / factures
-				foreach ($this->amounts as $key => $amount)
-				{
+				foreach ($this->amounts as $key => $amount) {
 					$facid = $key;
-					if (is_numeric($amount) && $amount <> 0)
-					{
+					if (is_numeric($amount) && $amount <> 0) {
 						$amount = price2num($amount);
 						$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'paiementfourn_facturefourn (fk_facturefourn, fk_paiementfourn, amount, multicurrency_amount)';
 						$sql .= ' VALUES ('.$facid.','.$this->id.',\''.$amount.'\', \''.$this->multicurrency_amounts[$key].'\')';
 						$resql = $this->db->query($sql);
-						if ($resql)
-						{
+						if ($resql) {
 							$invoice = new FactureFournisseur($this->db);
 							$invoice->fetch($facid);
 
 							// If we want to closed paid invoices
-							if ($closepaidinvoices)
-							{
+							if ($closepaidinvoices) {
 								$paiement = $invoice->getSommePaiement();
 								//$creditnotes=$invoice->getSumCreditNotesUsed();
 								$creditnotes = 0;
@@ -239,18 +229,20 @@ class PaiementFourn extends Paiement
 								$deposits = 0;
 								$alreadypayed = price2num($paiement + $creditnotes + $deposits, 'MT');
 								$remaintopay = price2num($invoice->total_ttc - $paiement - $creditnotes - $deposits, 'MT');
-								if ($remaintopay == 0)
-								{
+								if ($remaintopay == 0) {
 									$result = $invoice->setPaid($user, '', '');
-								} else dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
+								} else {
+									dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing.");
+								}
 							}
 
 							// Regenerate documents of invoices
-							if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-							{
+							if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 								$newlang = '';
 								$outputlangs = $langs;
-								if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $invoice->thirdparty->default_lang;
+								if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+									$newlang = $invoice->thirdparty->default_lang;
+								}
 								if (!empty($newlang)) {
 									$outputlangs = new Translate("", $conf);
 									$outputlangs->setDefaultLang($newlang);
@@ -271,11 +263,12 @@ class PaiementFourn extends Paiement
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					// Call trigger
 					$result = $this->call_trigger('PAYMENT_SUPPLIER_CREATE', $user);
-					if ($result < 0) $error++;
+					if ($result < 0) {
+						$error++;
+					}
 					// End call triggers
 				}
 			} else {
@@ -288,8 +281,7 @@ class PaiementFourn extends Paiement
 			$error++;
 		}
 
-		if ($totalamount <> 0 && $error == 0) // On accepte les montants negatifs
-		{
+		if ($totalamount <> 0 && $error == 0) { // On accepte les montants negatifs
 			$this->amount = $total;
 			$this->total = $total;
 			$this->multicurrency_amount = $mtotal;
@@ -322,10 +314,8 @@ class PaiementFourn extends Paiement
 		// Verifier si paiement porte pas sur une facture a l'etat payee
 		// Si c'est le cas, on refuse la suppression
 		$billsarray = $this->getBillsArray('paye=1');
-		if (is_array($billsarray))
-		{
-			if (count($billsarray))
-			{
+		if (is_array($billsarray)) {
+			if (count($billsarray)) {
 				$this->error = "ErrorCantDeletePaymentSharedWithPayedInvoice";
 				$this->db->rollback();
 				return -1;
@@ -337,12 +327,10 @@ class PaiementFourn extends Paiement
 
 		// Verifier si paiement ne porte pas sur ecriture bancaire rapprochee
 		// Si c'est le cas, on refuse le delete
-		if ($bank_line_id)
-		{
+		if ($bank_line_id) {
 			$accline = new AccountLine($this->db);
 			$accline->fetch($bank_line_id);
-			if ($accline->rappro)
-			{
+			if ($accline->rappro) {
 				$this->error = "ErrorCantDeletePaymentReconciliated";
 				$this->db->rollback();
 				return -3;
@@ -353,41 +341,34 @@ class PaiementFourn extends Paiement
 		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn';
 		$sql .= ' WHERE fk_paiementfourn = '.$this->id;
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'paiementfourn';
 			$sql .= ' WHERE rowid = '.$this->id;
 			$result = $this->db->query($sql);
-			if (!$result)
-			{
+			if (!$result) {
 				$this->error = $this->db->error();
 				$this->db->rollback();
 				return -3;
 			}
 
 			// Supprimer l'ecriture bancaire si paiement lie a ecriture
-			if ($bank_line_id)
-			{
+			if ($bank_line_id) {
 				$accline = new AccountLine($this->db);
 				$result = $accline->fetch($bank_line_id);
-				if ($result > 0) // If result = 0, record not found, we don't try to delete
-				{
+				if ($result > 0) { // If result = 0, record not found, we don't try to delete
 					$result = $accline->delete($user);
 				}
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->error = $accline->error;
 					$this->db->rollback();
 					return -4;
 				}
 			}
 
-			if (!$notrigger)
-			{
+			if (!$notrigger) {
 				// Appel des triggers
 				$result = $this->call_trigger('PAYMENT_SUPPLIER_DELETE', $user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
 				}
@@ -416,22 +397,18 @@ class PaiementFourn extends Paiement
 		$sql .= ' WHERE c.rowid = '.$id;
 
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $this->db->num_rows($resql);
-			if ($num)
-			{
+			if ($num) {
 				$obj = $this->db->fetch_object($resql);
 				$this->id = $obj->rowid;
 
-				if ($obj->fk_user_creat)
-				{
+				if ($obj->fk_user_creat) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creat);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_modif)
-				{
+				if ($obj->fk_user_modif) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modif);
 					$this->user_modification = $muser;
@@ -456,18 +433,18 @@ class PaiementFourn extends Paiement
 		$sql = 'SELECT fk_facturefourn';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf, '.MAIN_DB_PREFIX.'facture_fourn as f';
 		$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND fk_paiementfourn = '.$this->id;
-		if ($filter) $sql .= ' AND '.$filter;
+		if ($filter) {
+			$sql .= ' AND '.$filter;
+		}
 
 		dol_syslog(get_class($this).'::getBillsArray', LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$i = 0;
 			$num = $this->db->num_rows($resql);
 			$billsarray = array();
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 				$billsarray[$i] = $obj->fk_facturefourn;
 				$i++;
@@ -564,20 +541,28 @@ class PaiementFourn extends Paiement
 		$reg = array();
 		if (preg_match('/^\((.*)\)$/i', $text, $reg)) {
 			// Label generique car entre parentheses. On l'affiche en le traduisant
-			if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+			if ($reg[1] == 'paiement') {
+				$reg[1] = 'Payment';
+			}
 			$text = $langs->trans($reg[1]);
 		}
 
 		$label = '<u>'.$langs->trans("Payment").'</u><br>';
 		$label .= '<strong>'.$langs->trans("Ref").':</strong> '.$text;
-		if ($this->datepaye ? $this->datepaye : $this->date) $label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+		if ($this->datepaye ? $this->datepaye : $this->date) {
+			$label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+		}
 
 		$linkstart = '<a href="'.DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend = '</a>';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -622,12 +607,15 @@ class PaiementFourn extends Paiement
 		$langs->load("bills");
 
 		// Clean parameters (if not defined or using deprecated value)
-		if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) $conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
-		elseif ($conf->global->SUPPLIER_PAYMENT_ADDON == 'brodator') $conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_brodator';
-		elseif ($conf->global->SUPPLIER_PAYMENT_ADDON == 'bronan') $conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
+		if (empty($conf->global->SUPPLIER_PAYMENT_ADDON)) {
+			$conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
+		} elseif ($conf->global->SUPPLIER_PAYMENT_ADDON == 'brodator') {
+			$conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_brodator';
+		} elseif ($conf->global->SUPPLIER_PAYMENT_ADDON == 'bronan') {
+			$conf->global->SUPPLIER_PAYMENT_ADDON = 'mod_supplier_payment_bronan';
+		}
 
-		if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON))
-		{
+		if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON)) {
 			$mybool = false;
 
 			$file = $conf->global->SUPPLIER_PAYMENT_ADDON.".php";
@@ -640,8 +628,7 @@ class PaiementFourn extends Paiement
 				$dir = dol_buildpath($reldir."core/modules/supplier_payment/");
 
 				// Load file with numbering class (if found)
-				if (is_file($dir.$file) && is_readable($dir.$file))
-				{
+				if (is_file($dir.$file) && is_readable($dir.$file)) {
 					$mybool |= include_once $dir.$file;
 				}
 			}
@@ -706,18 +693,15 @@ class PaiementFourn extends Paiement
 		$langs->load("suppliers");
 
 		// Set the model on the model name to use
-		if (empty($modele))
-		{
-			if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF))
-			{
+		if (empty($modele)) {
+			if (!empty($conf->global->SUPPLIER_PAYMENT_ADDON_PDF)) {
 				$modele = $conf->global->SUPPLIER_PAYMENT_ADDON_PDF;
 			} else {
 				$modele = ''; // No default value. For supplier invoice, we allow to disable all PDF generation
 			}
 		}
 
-		if (empty($modele))
-		{
+		if (empty($modele)) {
 			return 0;
 		} else {
 			$modelpath = "core/modules/supplier_payment/doc/";
@@ -738,12 +722,9 @@ class PaiementFourn extends Paiement
 		global $conf;
 
 		$way = 'dolibarr';
-		if (!empty($conf->multicurrency->enabled))
-		{
-			foreach ($this->multicurrency_amounts as $value)
-			{
-				if (!empty($value)) // one value found then payment is in invoice currency
-				{
+		if (!empty($conf->multicurrency->enabled)) {
+			foreach ($this->multicurrency_amounts as $value) {
+				if (!empty($value)) { // one value found then payment is in invoice currency
 					$way = 'customer';
 					break;
 				}
@@ -766,14 +747,11 @@ class PaiementFourn extends Paiement
 		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 
-		if (empty($force_thirdparty_id))
-		{
+		if (empty($force_thirdparty_id)) {
 			$billsarray = $this->getBillsArray(); // From payment, the fk_soc isn't available, we should load the first supplier invoice to get him
-			if (!empty($billsarray))
-			{
+			if (!empty($billsarray)) {
 				$supplier_invoice = new FactureFournisseur($this->db);
-				if ($supplier_invoice->fetch($billsarray[0]) > 0)
-				{
+				if ($supplier_invoice->fetch($billsarray[0]) > 0) {
 					$force_thirdparty_id = $supplier_invoice->fk_soc;
 				}
 			}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0aea652de68..76ef5de8af0 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -41,10 +41,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (!empty($conf->supplier_proposal->enabled))
+if (!empty($conf->supplier_proposal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-if (!empty($conf->product->enabled))
+}
+if (!empty($conf->product->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+}
 if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
@@ -56,7 +58,9 @@ if (!empty($conf->variants->enabled)) {
 }
 
 $langs->loadLangs(array('admin', 'orders', 'sendings', 'companies', 'bills', 'propal', 'receptions', 'supplier_proposal', 'deliveries', 'products', 'stocks', 'productbatch'));
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load('incoterm');
+}
 
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
@@ -80,7 +84,9 @@ $datelivraison = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'
 
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -93,20 +99,26 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref);
-	if ($ret < 0) dol_print_error($db, $object->error);
+	if ($ret < 0) {
+		dol_print_error($db, $object->error);
+	}
 	$ret = $object->fetch_thirdparty();
-	if ($ret < 0) dol_print_error($db, $object->error);
-} elseif (!empty($socid) && $socid > 0)
-{
+	if ($ret < 0) {
+		dol_print_error($db, $object->error);
+	}
+} elseif (!empty($socid) && $socid > 0) {
 	$fourn = new Fournisseur($db);
 	$ret = $fourn->fetch($socid);
-	if ($ret < 0) dol_print_error($db, $object->error);
+	if ($ret < 0) {
+		dol_print_error($db, $object->error);
+	}
 	$object->socid = $fourn->id;
 	$ret = $object->fetch_thirdparty();
-	if ($ret < 0) dol_print_error($db, $object->error);
+	if ($ret < 0) {
+		dol_print_error($db, $object->error);
+	}
 }
 
 // Common permissions
@@ -136,14 +148,13 @@ $permissiontoadd		= $usercancreate; // Used by the include of actions_addupdated
 
 $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))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -156,67 +167,69 @@ if (empty($reshook))
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
-	if ($action == 'setref_supplier' && $usercancreate)
-	{
+	if ($action == 'setref_supplier' && $usercancreate) {
 		$result = $object->setValueFrom('ref_supplier', GETPOST('ref_supplier', 'alpha'), '', null, 'text', '', $user, 'ORDER_SUPPLIER_MODIFY');
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Set incoterm
-	if ($action == 'set_incoterms' && $usercancreate)
-	{
+	if ($action == 'set_incoterms' && $usercancreate) {
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// payment conditions
-	if ($action == 'setconditions' && $usercancreate)
-	{
+	if ($action == 'setconditions' && $usercancreate) {
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// payment mode
-	if ($action == 'setmode' && $usercancreate)
-	{
+	if ($action == 'setmode' && $usercancreate) {
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+		// Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+		// Multicurrency rate
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')));
 	}
 
 	// bank account
-	if ($action == 'setbankaccount' && $usercancreate)
-	{
+	if ($action == 'setbankaccount' && $usercancreate) {
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// date of delivery
-	if ($action == 'setdate_livraison' && $usercancreate)
-	{
+	if ($action == 'setdate_livraison' && $usercancreate) {
 		$result = $object->setDeliveryDate($user, $datelivraison);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Set project
-	if ($action == 'classin' && $usercancreate)
-	{
+	if ($action == 'classin' && $usercancreate) {
 		$result = $object->setProject($projectid);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Edit Thirdparty
-	if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $usercancreate && $object->statut == CommandeFournisseur::STATUS_DRAFT)
-	{
+	if (!empty($conf->global->MAIN_CAN_EDIT_SUPPLIER_ON_SUPPLIER_ORDER) && $action == 'set_thirdparty' && $usercancreate && $object->statut == CommandeFournisseur::STATUS_DRAFT) {
 		$new_socid = GETPOST('new_socid', 'int');
 		if (!empty($new_socid) && $new_socid != $object->thirdparty->id) {
 			$db->begin();
@@ -229,8 +242,9 @@ if (empty($reshook))
 
 			$res = $db->query($sql);
 
-			if (!$res) $db->rollback();
-			else {
+			if (!$res) {
+				$db->rollback();
+			} else {
 				$db->commit();
 
 				// Replace prices for each lines by new supplier prices
@@ -275,38 +289,44 @@ if (empty($reshook))
 		exit;
 	}
 
-	if ($action == 'setremisepercent' && $usercancreate)
-	{
+	if ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise($user, $_POST['remise_percent']);
-		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
-	if ($action == 'reopen')	// no test on permission here, permission to use will depends on status
-	{
-		if (in_array($object->statut, array(1, 2, 3, 4, 5, 6, 7, 9)))
-		{
-			if ($object->statut == 1) $newstatus = 0; // Validated->Draft
-			elseif ($object->statut == 2) $newstatus = 0; // Approved->Draft
-			elseif ($object->statut == 3) $newstatus = 2; // Ordered->Approved
-			elseif ($object->statut == 4) $newstatus = 3;
-			elseif ($object->statut == 5)
-			{
+	if ($action == 'reopen') {	// no test on permission here, permission to use will depends on status
+		if (in_array($object->statut, array(1, 2, 3, 4, 5, 6, 7, 9))) {
+			if ($object->statut == 1) {
+				$newstatus = 0; // Validated->Draft
+			} elseif ($object->statut == 2) {
+				$newstatus = 0; // Approved->Draft
+			} elseif ($object->statut == 3) {
+				$newstatus = 2; // Ordered->Approved
+			} elseif ($object->statut == 4) {
+				$newstatus = 3;
+			} elseif ($object->statut == 5) {
 				//$newstatus=2;    // Ordered
 				// TODO Can we set it to submited ?
 				//$newstatus=3;  // Submited
 				// TODO If there is at least one reception, we can set to Received->Received partially
 				$newstatus = 4; // Received partially
-			} elseif ($object->statut == 6) $newstatus = 2; // Canceled->Approved
-			elseif ($object->statut == 7) $newstatus = 3; // Canceled->Process running
-			elseif ($object->statut == 9) $newstatus = 1; // Refused->Validated
-			else $newstatus = 2;
+			} elseif ($object->statut == 6) {
+				$newstatus = 2; // Canceled->Approved
+			} elseif ($object->statut == 7) {
+				$newstatus = 3; // Canceled->Process running
+			} elseif ($object->statut == 9) {
+				$newstatus = 1; // Refused->Validated
+			} else {
+				$newstatus = 2;
+			}
 
 			//print "old status = ".$object->statut.' new status = '.$newstatus;
 			$db->begin();
 
 			$result = $object->setStatus($user, $newstatus);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				// Currently the "Re-open" also remove the billed flag because there is no button "Set unpaid" yet.
 				$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
 				$sql .= ' SET billed = 0';
@@ -314,8 +334,7 @@ if (empty($reshook))
 
 				$resql = $db->query($sql);
 
-				if ($newstatus == 0)
-				{
+				if ($newstatus == 0) {
 					$sql = 'UPDATE '.MAIN_DB_PREFIX.'commande_fournisseur';
 					$sql .= ' SET fk_user_approve = null, fk_user_approve2 = null, date_approve = null, date_approve2 = null';
 					$sql .= ' WHERE rowid = '.$object->id;
@@ -338,8 +357,7 @@ if (empty($reshook))
 	/*
 	 * Classify supplier order as billed
 	 */
-	if ($action == 'classifybilled' && $usercancreate)
-	{
+	if ($action == 'classifybilled' && $usercancreate) {
 		$ret = $object->classifyBilled($user);
 		if ($ret < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -347,8 +365,7 @@ if (empty($reshook))
 	}
 
 	// Add a product line
-	if ($action == 'addline' && $usercancreate)
-	{
+	if ($action == 'addline' && $usercancreate) {
 		$db->begin();
 
 		$langs->load('errors');
@@ -360,8 +377,7 @@ if (empty($reshook))
 		$date_start = dol_mktime(GETPOST('date_start'.$predef.'hour'), GETPOST('date_start'.$predef.'min'), GETPOST('date_start'.$predef.'sec'), GETPOST('date_start'.$predef.'month'), GETPOST('date_start'.$predef.'day'), GETPOST('date_start'.$predef.'year'));
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 		$prod_entry_mode = GETPOST('prod_entry_mode');
-		if ($prod_entry_mode == 'free')
-		{
+		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
@@ -386,28 +402,23 @@ if (empty($reshook))
 			}
 		}
 
-		if ($prod_entry_mode == 'free' && GETPOST('price_ht') < 0 && $qty < 0)
-		{
+		if ($prod_entry_mode == 'free' && GETPOST('price_ht') < 0 && $qty < 0) {
 			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && !GETPOST('idprodfournprice') && GETPOST('type') < 0)
-		{
+		if ($prod_entry_mode == 'free' && !GETPOST('idprodfournprice') && GETPOST('type') < 0) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && $price_ht_devise === '') // Unit price can be 0 but not ''
-		{
+		if ($prod_entry_mode == 'free' && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && $price_ht_devise === '') { // Unit price can be 0 but not ''
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && !GETPOST('dp_desc'))
-		{
+		if ($prod_entry_mode == 'free' && !GETPOST('dp_desc')) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('qty', 'int') == '')
-		{
+		if (GETPOST('qty', 'int') == '') {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
@@ -426,51 +437,49 @@ if (empty($reshook))
 			}
 		}
 
-		if ($prod_entry_mode != 'free' && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
-		{
+		if ($prod_entry_mode != 'free' && empty($error)) {	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 			$productsupplier = new ProductFournisseur($db);
 
 			$idprod = 0;
-			if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') $idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+			if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') {
+				$idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+			}
 
 			$reg = array();
-			if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg))
-			{
+			if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg)) {
 				$idprod = $reg[1];
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 				// Call to init some price properties of $productsupplier
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
-				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER))
-				{
+				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
 					$fksoctosearch = 0;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
-					if ($productsupplier->fourn_socid != $socid)	// The price we found is for another supplier, so we clear supplier price
-					{
+					if ($productsupplier->fourn_socid != $socid) {	// The price we found is for another supplier, so we clear supplier price
 						$productsupplier->ref_supplier = '';
 					}
 				} else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
-			{
+			} elseif (GETPOST('idprodfournprice', 'alpha') > 0) {
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
 				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
 				$idprod = $productsupplier->get_buyprice(GETPOST('idprodfournprice', 'alpha'), $qtytosearch);
 				$res = $productsupplier->fetch($idprod);
 			}
 
-			if ($idprod > 0)
-			{
+			if ($idprod > 0) {
 				$label = $productsupplier->label;
 				// Define output language
 				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
 					$newlang = '';
-					if (empty($newlang) && GETPOST('lang_id', 'aZ09'))
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 						$newlang = GETPOST('lang_id', 'aZ09');
-					if (empty($newlang))
+					}
+					if (empty($newlang)) {
 						$newlang = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -489,8 +498,12 @@ if (empty($reshook))
 					$product_desc='';
 				}
 
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
-				if (!empty($product_desc) && trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+					$desc = $product_desc;
+				}
+				if (!empty($product_desc) && trim($product_desc) != trim($desc)) {
+					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				}
 
 				$type = $productsupplier->type;
 				if ($price_ht != '' || $price_ht_devise != '') {
@@ -514,11 +527,15 @@ if (empty($reshook))
 
 				$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
 				$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
-				if (empty($tva_tx)) $tva_npr = 0;
+				if (empty($tva_tx)) {
+					$tva_npr = 0;
+				}
 				$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
 				$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
-				if (empty($pu)) $pu = 0; // If pu is '' or null, we force to have a numeric value
+				if (empty($pu)) {
+					$pu = 0; // If pu is '' or null, we force to have a numeric value
+				}
 
 				$result = $object->addline(
 					$desc,
@@ -545,22 +562,19 @@ if (empty($reshook))
 					0
 				);
 			}
-			if ($idprod == -99 || $idprod == 0)
-			{
+			if ($idprod == -99 || $idprod == 0) {
 				// Product not selected
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
 			}
-			if ($idprod == -1)
-			{
+			if ($idprod == -1) {
 				// Quantity too low
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 			}
-		} elseif (empty($error)) // $price_ht is already set
-		{
+		} elseif (empty($error)) { // $price_ht is already set
 			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 			$tva_tx = str_replace('*', '', $tva_tx);
 			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
@@ -578,8 +592,7 @@ if (empty($reshook))
 			$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 			$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-			if ($price_ht !== '')
-			{
+			if ($price_ht !== '') {
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 			} else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
@@ -592,19 +605,21 @@ if (empty($reshook))
 		}
 
 		//print "xx".$tva_tx; exit;
-		if (!$error && $result > 0)
-		{
+		if (!$error && $result > 0) {
 			$db->commit();
 
 			$ret = $object->fetch($object->id); // Reload to get new records
 
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -613,7 +628,9 @@ if (empty($reshook))
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result < 0) dol_print_error($db, $result);
+				if ($result < 0) {
+					dol_print_error($db, $result);
+				}
 			}
 
 			unset($_POST ['prod_entry_mode']);
@@ -658,17 +675,17 @@ if (empty($reshook))
 	/*
 	 *	Updating a line in the order
 	 */
-	if ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha'))
-	{
+	if ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) {
 		$db->begin();
 
 		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 
-   		if ($lineid)
-		{
+		if ($lineid) {
 			$line = new CommandeFournisseurLigne($db);
 			$res = $line->fetch($lineid);
-			if (!$res) dol_print_error($db);
+			if (!$res) {
+				dol_print_error($db);
+			}
 		}
 
 		$productsupplier = new ProductFournisseur($db);
@@ -692,14 +709,12 @@ if (empty($reshook))
 		$localtax1_rate = get_localtax($vat_rate, 1, $mysoc, $object->thirdparty);
 		$localtax2_rate = get_localtax($vat_rate, 2, $mysoc, $object->thirdparty);
 
-		if (GETPOST('price_ht') != '')
-		{
+		if (GETPOST('price_ht') != '') {
 			$price_base_type = 'HT';
 			$ht = price2num(GETPOST('price_ht'));
 		} else {
 			$vatratecleaned = $vat_rate;
-			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg))      // If vat is "xx (yy)"
-			{
+			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg)) {      // If vat is "xx (yy)"
 				$vatratecleaned = trim($reg[1]);
 				$vatratecode = $reg[2];
 			}
@@ -769,15 +784,17 @@ if (empty($reshook))
 		unset($_POST['date_endmonth']);
 		unset($_POST['date_endyear']);
 
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -786,7 +803,9 @@ if (empty($reshook))
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result < 0) dol_print_error($db, $result);
+				if ($result < 0) {
+					dol_print_error($db, $result);
+				}
 			}
 
 			$db->commit();
@@ -799,20 +818,20 @@ if (empty($reshook))
 	}
 
 	// Remove a product line
-	if ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
-	{
+	if ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) {
 		$db->begin();
 
 		$result = $object->deleteline($lineid);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09'))
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 				$newlang = GETPOST('lang_id', 'aZ09');
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang))
+			}
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
 				$newlang = $object->thirdparty->default_lang;
+			}
 			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -839,21 +858,22 @@ if (empty($reshook))
 	}
 
 	// Validate
-	if ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate)
-	{
+	if ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) {
 		$db->begin();
 
 		$object->date_commande = dol_now();
 		$result = $object->valid($user);
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -873,8 +893,7 @@ if (empty($reshook))
 		}
 
 		// If we have permission, and if we don't need to provide the idwarehouse, we go directly on approved step
-		if (!$error && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $usercanapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1)))
-		{
+		if (!$error && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $usercanapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $object->hasProductsOrServices(1))) {
 			$action = 'confirm_approve'; // can make standard or first level approval also if permission is set
 		}
 
@@ -885,41 +904,39 @@ if (empty($reshook))
 		}
 	}
 
-	if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $usercanapprove)
-	{
+	if (($action == 'confirm_approve' || $action == 'confirm_approve2') && $confirm == 'yes' && $usercanapprove) {
 		$db->begin();
 
 		$idwarehouse = GETPOST('idwarehouse', 'int');
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-		{
-		   	$qualified_for_stock_change = $object->hasProductsOrServices(2);
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
+			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
-		   	$qualified_for_stock_change = $object->hasProductsOrServices(1);
+			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		// Check parameters
-		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change)	// warning name of option should be STOCK_CALCULATE_ON_SUPPLIER_APPROVE_ORDER
-		{
-			if (!$idwarehouse || $idwarehouse == -1)
-			{
+		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change) {	// warning name of option should be STOCK_CALCULATE_ON_SUPPLIER_APPROVE_ORDER
+			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 				$action = '';
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$result = $object->approve($user, $idwarehouse, ($action == 'confirm_approve2' ? 1 : 0));
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -942,11 +959,9 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_refuse' && $confirm == 'yes' && $usercanapprove)
-	{
+	if ($action == 'confirm_refuse' && $confirm == 'yes' && $usercanapprove) {
 		$result = $object->refuse($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
 		} else {
@@ -964,19 +979,20 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_commande' && $confirm == 'yes' && $usercanorder)
-	{
+	if ($action == 'confirm_commande' && $confirm == 'yes' && $usercanorder) {
 		$db->begin();
 
 		$result = $object->commande($user, GETPOST("datecommande"), GETPOST("methode", 'int'), GETPOST('comment', 'alphanohtml'));
-		if ($result > 0)
-		{
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+		if ($result > 0) {
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -1000,11 +1016,9 @@ if (empty($reshook))
 	}
 
 
-	if ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete)
-	{
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $usercandelete) {
 		$result = $object->delete($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".DOL_URL_ROOT.'/fourn/commande/list.php?restore_lastsearch_values=1');
 			exit;
 		} else {
@@ -1013,19 +1027,15 @@ if (empty($reshook))
 	}
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate)
-	{
-		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
-		{
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $usercancreate) {
+		if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers')) {
 			setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 		} else {
-			if ($object->id > 0)
-			{
+			if ($object->id > 0) {
 				$orig = clone $object;
 
 				$result = $object->createFromClone($user, $socid);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit;
 				} else {
@@ -1038,22 +1048,18 @@ if (empty($reshook))
 	}
 
 	// Set status of reception (complete, partial, ...)
-	if ($action == 'livraison' && $usercanreceived)
-	{
+	if ($action == 'livraison' && $usercanreceived) {
 		$db->begin();
 
-		if (GETPOST("type") != '')
-		{
+		if (GETPOST("type") != '') {
 			$date_liv = dol_mktime(GETPOST('rehour'), GETPOST('remin'), GETPOST('resec'), GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
 
 			$result = $object->Livraison($user, $date_liv, GETPOST("type"), GETPOST("comment")); // GETPOST("type") is 'tot', 'par', 'nev', 'can'
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$langs->load("deliveries");
 				setEventMessages($langs->trans("DeliveryStateSaved"), null);
 				$action = '';
-			} elseif ($result == -3)
-			{
+			} elseif ($result == -3) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
@@ -1072,11 +1078,9 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanorder)
-	{
+	if ($action == 'confirm_cancel' && $confirm == 'yes' && $usercanorder) {
 		$result = $object->cancel($user);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$object->id);
 			exit;
 		} else {
@@ -1099,48 +1103,44 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 
-	if ($action == 'update_extras')
-	{
+	if ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $object->insertExtraFields('ORDER_SUPPLIER_MODIFY');
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
 
-		if ($error)
+		if ($error) {
 			$action = 'edit_extras';
+		}
 	}
 
 	/*
 	 * Create an order
 	 */
-	if ($action == 'add' && $usercancreate)
-	{
-	 	$error = 0;
+	if ($action == 'add' && $usercancreate) {
+		$error = 0;
 		$selectedLines = GETPOST('toselect', 'array');
-		if ($socid < 1)
-		{
+		if ($socid < 1) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Supplier')), null, 'errors');
 			$action = 'create';
 			$error++;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			// Creation commande
@@ -1160,23 +1160,20 @@ if (empty($reshook))
 			$object->fk_project       = GETPOST('projectid');
 
 			// Fill array 'array_options' with data from add form
-		   	if (!$error)
-		   	{
+			if (!$error) {
 				$ret = $extrafields->setOptionalsFromPost(null, $object);
-				if ($ret < 0) $error++;
-		   	}
+				if ($ret < 0) {
+					$error++;
+				}
+			}
 
-		   	if (!$error)
-		   	{
-	   			// If creation from another object of another module (Example: origin=propal, originid=1)
-				if (!empty($origin) && !empty($originid))
-				{
-					if ($origin == 'propal' || $origin == 'proposal')
-					{
+			if (!$error) {
+				// If creation from another object of another module (Example: origin=propal, originid=1)
+				if (!empty($origin) && !empty($originid)) {
+					if ($origin == 'propal' || $origin == 'proposal') {
 						$classname = 'Propal';
 						$element = 'comm/propal'; $subelement = 'propal';
-					} elseif ($origin == 'order' || $origin == 'commande')
-					{
+					} elseif ($origin == 'order' || $origin == 'commande') {
 						$classname = 'Commande';
 						$element = $subelement = 'commande';
 					} else {
@@ -1196,23 +1193,20 @@ if (empty($reshook))
 					}
 
 					$id = $object->create($user);
-					if ($id > 0)
-					{
+					if ($id > 0) {
 						dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
 						$srcobject = new $classname($db);
 
 						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 						$result = $srcobject->fetch($object->origin_id);
-						if ($result > 0)
-						{
+						if ($result > 0) {
 							$tmpdate = ($srcobject->delivery_date ? $srcobject->delivery_date : $srcobject->date_livraison);
 							$object->setDeliveryDate($user, $tmpdate);
 							$object->set_id_projet($user, $srcobject->fk_project);
 
 							$lines = $srcobject->lines;
-							if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
-							{
+							if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {
 								$srcobject->fetch_lines();
 								$lines = $srcobject->lines;
 							}
@@ -1220,10 +1214,10 @@ if (empty($reshook))
 							$fk_parent_line = 0;
 							$num = count($lines);
 
-							for ($i = 0; $i < $num; $i++)
-							{
-								if (empty($lines[$i]->subprice) || $lines[$i]->qty <= 0 || !in_array($lines[$i]->id, $selectedLines))
+							for ($i = 0; $i < $num; $i++) {
+								if (empty($lines[$i]->subprice) || $lines[$i]->qty <= 0 || !in_array($lines[$i]->id, $selectedLines)) {
 									continue;
+								}
 
 								$label = (!empty($lines[$i]->label) ? $lines[$i]->label : '');
 								$desc = (!empty($lines[$i]->desc) ? $lines[$i]->desc : $lines[$i]->product_desc);
@@ -1235,20 +1229,17 @@ if (empty($reshook))
 								}
 
 								// Extrafields
-								if (method_exists($lines[$i], 'fetch_optionals')) 							// For avoid conflicts if
-								{
+								if (method_exists($lines[$i], 'fetch_optionals')) { 							// For avoid conflicts if
 									$lines[$i]->fetch_optionals();
 									$array_option = $lines[$i]->array_options;
 								}
 
 								$ref_supplier = '';
 								$product_fourn_price_id = 0;
-								if ($origin == "commande")
-								{
+								if ($origin == "commande") {
 									$productsupplier = new ProductFournisseur($db);
 									$result = $productsupplier->find_min_price_product_fournisseur($lines[$i]->fk_product, $lines[$i]->qty, $srcobject->socid);
-									if ($result > 0)
-									{
+									if ($result > 0) {
 										$ref_supplier = $productsupplier->ref_supplier;
 										$product_fourn_price_id = $productsupplier->product_fourn_price_id;
 									}
@@ -1259,8 +1250,7 @@ if (empty($reshook))
 
 								$tva_tx = $lines[$i]->tva_tx;
 
-								if ($origin == "commande")
-								{
+								if ($origin == "commande") {
 									$soc = new societe($db);
 									$soc->fetch($socid);
 									$tva_tx = get_default_tva($soc, $mysoc, $lines[$i]->fk_product, $product_fourn_price_id);
@@ -1309,8 +1299,9 @@ if (empty($reshook))
 							$parameters = array('objFrom' => $srcobject);
 							$reshook = $hookmanager->executeHooks('createFrom', $parameters, $object, $action); // Note that $action and $object may have been
 
-							if ($reshook < 0)
+							if ($reshook < 0) {
 								$error++;
+							}
 						} else {
 							setEventMessages($srcobject->error, $srcobject->errors, 'errors');
 							$error++;
@@ -1320,17 +1311,15 @@ if (empty($reshook))
 						$error++;
 					}
 				} else {
-			   		$id = $object->create($user);
-					if ($id < 0)
-					{
+					$id = $object->create($user);
+					if ($id < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 				}
 			}
 
-			if ($error)
-			{
+			if ($error) {
 				$langs->load("errors");
 				$db->rollback();
 				$action = 'create';
@@ -1343,8 +1332,7 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && !GETPOST('cancel', 'alpha'))
-	{
+	if ($action == 'webservice' && GETPOST('mode', 'alpha') == "send" && !GETPOST('cancel', 'alpha')) {
 		$ws_url         = $object->thirdparty->webservices_url;
 		$ws_key         = $object->thirdparty->webservices_key;
 		$ws_user        = GETPOST('ws_user', 'alpha');
@@ -1382,13 +1370,11 @@ if (empty($reshook))
 
 			//Prepare the order lines from order
 			$order_lines = array();
-			foreach ($object->lines as $line)
-			{
+			foreach ($object->lines as $line) {
 				$ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $line->ref_supplier);
 				$result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
 
-				if ($result_product["result"]["result_code"] == "OK")
-				{
+				if ($result_product["result"]["result_code"] == "OK") {
 					$order_lines[] = array(
 						'desc'          => $line->product_desc,
 						'type'          => $line->product_type,
@@ -1419,11 +1405,9 @@ if (empty($reshook))
 			$ws_parameters = array('authentication'=>$ws_authentication, 'order' => $order);
 			$result_order = $soapclient_order->call("createOrder", $ws_parameters, $ws_ns, '');
 
-			if (empty($result_order["result"]["result_code"])) //No result, check error str
-			{
+			if (empty($result_order["result"]["result_code"])) { //No result, check error str
 				setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-			} elseif ($result_order["result"]["result_code"] != "OK") //Something went wrong
-			{
+			} elseif ($result_order["result"]["result_code"] != "OK") { //Something went wrong
 				setEventMessages($langs->trans("SOAPError")." '".$result_order["result"]["result_code"]."' - '".$result_order["result"]["result_label"]."'", null, 'errors');
 			} else {
 				setEventMessages($langs->trans("RemoteOrderRef")." ".$result_order["ref"], null, 'mesgs');
@@ -1431,45 +1415,33 @@ if (empty($reshook))
 		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate)
-	{
-		if ($action == 'addcontact')
-		{
-			if ($object->id > 0)
-			{
+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
+		if ($action == 'addcontact') {
+			if ($object->id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			} else {
-				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-		}
-
-		// bascule du statut d'un contact
-		elseif ($action == 'swapstatut' && $object->id > 0)
-		{
+		} elseif ($action == 'swapstatut' && $object->id > 0) {
+			// bascule du statut d'un contact
 			$result = $object->swapContactStatus(GETPOST('ligne'));
-		}
-
-		// Efface un contact
-		elseif ($action == 'deletecontact' && $object->id > 0)
-		{
+		} elseif ($action == 'deletecontact' && $object->id > 0) {
+			// Efface un contact
 			$result = $object->delete_contact($_GET["lineid"]);
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			} else {
@@ -1488,15 +1460,16 @@ $form = new	Form($db);
 $formfile = new FormFile($db);
 $formorder = new FormOrder($db);
 $productstatic = new Product($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 llxHeader('', $langs->trans("Order"), $help_url);
 
 $now = dol_now();
 
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans('NewOrderSupplier'), '', 'supplier_order');
 
 	dol_htmloutput_events();
@@ -1504,14 +1477,12 @@ if ($action == 'create')
 	$currency_code = $conf->currency;
 
 	$societe = '';
-	if ($socid > 0)
-	{
+	if ($socid > 0) {
 		$societe = new Societe($db);
 		$societe->fetch($socid);
 	}
 
-	if (!empty($origin) && !empty($originid))
-	{
+	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
 		$regs = array();
@@ -1520,12 +1491,10 @@ if ($action == 'create')
 			$subelement = $regs[2];
 		}
 
-		if ($origin == 'propal' || $origin == 'proposal')
-		{
+		if ($origin == 'propal' || $origin == 'proposal') {
 			$classname = 'Propal';
 			$element = 'comm/propal'; $subelement = 'propal';
-		} elseif ($origin == 'order' || $origin == 'commande')
-		{
+		} elseif ($origin == 'order' || $origin == 'commande') {
 			$classname = 'Commande';
 			$element = $subelement = 'commande';
 		} else {
@@ -1538,8 +1507,9 @@ if ($action == 'create')
 
 		$objectsrc = new $classname($db);
 		$objectsrc->fetch($originid);
-		if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))
+		if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 			$objectsrc->fetch_lines();
+		}
 		$objectsrc->fetch_thirdparty();
 
 		// Replicate extrafields
@@ -1562,10 +1532,13 @@ if ($action == 'create')
 
 		$datedelivery = (!empty($objectsrc->date_livraison) ? $objectsrc->date_livraison : (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : ''));
 
-		if (!empty($conf->multicurrency->enabled))
-		{
-			if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
-			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
+		if (!empty($conf->multicurrency->enabled)) {
+			if (!empty($objectsrc->multicurrency_code)) {
+				$currency_code = $objectsrc->multicurrency_code;
+			}
+			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
+				$currency_tx = $objectsrc->multicurrency_tx;
+			}
 		}
 
 		$note_private = $object->getDefaultCreateValueFor('note_private', (!empty($objectsrc->note_private) ? $objectsrc->note_private : null));
@@ -1577,15 +1550,21 @@ if ($action == 'create')
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
 
-		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) $currency_code = $societe->multicurrency_code;
+		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) {
+			$currency_code = $societe->multicurrency_code;
+		}
 
 		$note_private = $object->getDefaultCreateValueFor('note_private');
 		$note_public = $object->getDefaultCreateValueFor('note_public');
 	}
 
 	// If not defined, set default value from constant
-	if (empty($cond_reglement_id) && !empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID)) $cond_reglement_id = $conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID;
-	if (empty($mode_reglement_id) && !empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID)) $mode_reglement_id = $conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID;
+	if (empty($cond_reglement_id) && !empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID)) {
+		$cond_reglement_id = $conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_TERM_ID;
+	}
+	if (empty($mode_reglement_id) && !empty($conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID)) {
+		$mode_reglement_id = $conf->global->SUPPLIER_ORDER_DEFAULT_PAYMENT_MODE_ID;
+	}
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1594,7 +1573,9 @@ if ($action == 'create')
 	print '<input type="hidden" name="remise_percent" value="'.$soc->remise_supplier_percent.'">';
 	print '<input type="hidden" name="origin" value="'.$origin.'">';
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
-	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
+	if (!empty($currency_tx)) {
+		print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
+	}
 
 	print dol_get_fiche_head('');
 
@@ -1607,15 +1588,13 @@ if ($action == 'create')
 	print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
 	print '<td>';
 
-	if ($socid > 0)
-	{
+	if ($socid > 0) {
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$socid.'">';
 	} else {
 		print img_picto('', 'company').$form->select_company((empty($socid) ? '' : $socid), 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve customer informations
-		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
-		{
+		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
 			print '<script>
 			$(document).ready(function() {
 				$("#socid").change(function() {
@@ -1630,8 +1609,7 @@ if ($action == 'create')
 	}
 	print '</td>';
 
-	if ($societe->id > 0)
-	{
+	if ($societe->id > 0) {
 		// Discounts for third party
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
 
@@ -1665,13 +1643,14 @@ if ($action == 'create')
 	print '</td>';
 	print '<td>';
 	$usehourmin = 0;
-	if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 1;
+	if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+		$usehourmin = 1;
+	}
 	print $form->selectDate($datelivraison ? $datelivraison : -1, 'liv_', $usehourmin, $usehourmin, '', "set");
 	print '</td></tr>';
 
 	// Bank Account
-	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && !empty($conf->banque->enabled))
-	{
+	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && !empty($conf->banque->enabled)) {
 		$langs->load("bank");
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 		print img_picto('', 'bank_account', 'class="paddingrightonly"');
@@ -1680,8 +1659,7 @@ if ($action == 'create')
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
@@ -1692,8 +1670,7 @@ if ($action == 'create')
 	}
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled))
-	{
+	if (!empty($conf->incoterm->enabled)) {
 		$fkincoterms = (!empty($object->fk_incoterms) ? $object->fk_incoterms : ($socid > 0 ? $societe->fk_incoterms : ''));
 		$locincoterms = (!empty($object->location_incoterms) ? $object->location_incoterms : ($socid > 0 ? $societe->location_incoterms : ''));
 		print '<tr>';
@@ -1704,8 +1681,7 @@ if ($action == 'create')
 	}
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
+	if (!empty($conf->multicurrency->enabled)) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -1742,20 +1718,17 @@ if ($action == 'create')
 		print '<tr><td>'.$langs->trans($newclassname).'</td><td>'.$objectsrc->getNomUrl(1).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
-		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
-		{
+		if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) { 		// Localtax1 RE
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax1)."</td></tr>";
 		}
 
-		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) 		// Localtax2 IRPF
-		{
+		if ($mysoc->localtax2_assuj == "1" || $objectsrc->total_localtax2 != 0) { 		// Localtax2 IRPF
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax2)."</td></tr>";
 		}
 
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc).'</td></tr>';
@@ -1767,8 +1740,7 @@ if ($action == 'create')
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
@@ -1786,8 +1758,7 @@ if ($action == 'create')
 
 
 	// Show origin lines
-	if (!empty($origin) && !empty($originid) && is_object($objectsrc))
-	{
+	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
@@ -1803,7 +1774,9 @@ if ($action == 'create')
 
 	$societe = new Fournisseur($db);
 	$result = $societe->fetch($object->socid);
-	if ($result < 0) dol_print_error($db);
+	if ($result < 0) {
+		dol_print_error($db);
+	}
 
 	$author = new User($db);
 	$author->fetch($object->user_author_id);
@@ -1820,14 +1793,12 @@ if ($action == 'create')
 	$formconfirm = '';
 
 	// Confirmation de la suppression de la commande
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteOrder'), $langs->trans('ConfirmDeleteOrder'), 'confirm_delete', '', 0, 2);
 	}
 
 	// Clone confirmation
-	if ($action == 'clone')
-	{
+	if ($action == 'clone') {
 		// Create an array for form
 		$formquestion = array(
 			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.fournisseur=1)'))
@@ -1837,24 +1808,22 @@ if ($action == 'create')
 	}
 
 	// Confirmation de la validation
-	if ($action == 'valid')
-	{
+	if ($action == 'valid') {
 		$object->date_commande = dol_now();
 
 		// We check if number is temporary number
-		if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) // empty should not happened, but when it occurs, the test save life
-		{
+		if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) { // empty should not happened, but when it occurs, the test save life
 			$newref = $object->getNextNumRef($object->thirdparty);
-		} else $newref = $object->ref;
+		} else {
+			$newref = $object->ref;
+		}
 
-		if ($newref < 0)
-		{
+		if ($newref < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		} else {
 			$text = $langs->trans('ConfirmValidateOrder', $newref);
-			if (!empty($conf->notification->enabled))
-			{
+			if (!empty($conf->notification->enabled)) {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 				$notify = new	Notify($db);
 				$text .= '<br>';
@@ -1866,24 +1835,23 @@ if ($action == 'create')
 	}
 
 	// Confirm approval
-	if ($action == 'approve' || $action == 'approve2')
-	{
+	if ($action == 'approve' || $action == 'approve2') {
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-		{
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
 		}
 
 		$formquestion = array();
-		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change)
-		{
+		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $qualified_for_stock_change) {
 			$langs->load("stocks");
 			require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 			$formproduct = new FormProduct($db);
 			$forcecombo = 0;
-			if ($conf->browser->name == 'ie') $forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+			if ($conf->browser->name == 'ie') {
+				$forcecombo = 1; // There is a bug in IE10 that make combo inside popup crazy
+			}
 			$formquestion = array(
 				//'text' => $langs->trans("ConfirmClone"),
 				//array('type' => 'checkbox', 'name' => 'clone_content',   'label' => $langs->trans("CloneMainAttributes"),   'value' => 1),
@@ -1892,8 +1860,7 @@ if ($action == 'create')
 			);
 		}
 		$text = $langs->trans("ConfirmApproveThisOrder", $object->ref);
-		if (!empty($conf->notification->enabled))
-		{
+		if (!empty($conf->notification->enabled)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 			$notify = new	Notify($db);
 			$text .= '<br>';
@@ -1904,34 +1871,33 @@ if ($action == 'create')
 	}
 
 	// Confirmation de la desapprobation
-	if ($action == 'refuse')
-	{
+	if ($action == 'refuse') {
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", '', 0, 1);
 	}
 
 	// Confirmation de l'annulation
-	if ($action == 'cancel')
-	{
+	if ($action == 'cancel') {
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=$object->id", $langs->trans("Cancel"), $langs->trans("ConfirmCancelThisOrder", $object->ref), "confirm_cancel", '', 0, 1);
 	}
 
 	// Confirmation de l'envoi de la commande
-	if ($action == 'commande')
-	{
+	if ($action == 'commande') {
 		$date_com = dol_mktime(GETPOST('rehour'), GETPOST('remin'), GETPOST('resec'), GETPOST("remonth"), GETPOST("reday"), GETPOST("reyear"));
 		$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id."&datecommande=".$date_com."&methode=".$_POST["methodecommande"]."&comment=".urlencode($_POST["comment"]), $langs->trans("MakeOrder"), $langs->trans("ConfirmMakeOrder", dol_print_date($date_com, 'day')), "confirm_commande", '', 0, 2);
 	}
 
 	// Confirmation to delete line
-	if ($action == 'ask_deleteline')
-	{
+	if ($action == 'ask_deleteline') {
 		 $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
 	$parameters = array('formConfirm' => $formconfirm, 'lineid'=>$lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -1961,7 +1927,9 @@ if ($action == 'create')
 			$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=edit_thirdparty&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetThirdParty')).'</a>';
 		}
 		$morehtmlref .= ' : '.$object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherOrders").'</a>)';
+		}
 	}
 
 	// Project
@@ -1969,8 +1937,9 @@ if ($action == 'create')
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {
-			if ($action != 'classify')
+			if ($action != 'classify') {
 				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -2007,8 +1976,7 @@ if ($action == 'create')
 	print '<table class="border tableforfield centpercent">';
 
 	// Date
-	if ($object->methode_commande_id > 0)
-	{
+	if ($object->methode_commande_id > 0) {
 		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>';
 		print $object->date_commande ? dol_print_date($object->date_commande, $usehourmin) : '';
 		if ($object->hasDelay() && !empty($object->date_delivery) && !empty($object->date_commande)) {
@@ -2016,8 +1984,7 @@ if ($action == 'create')
 		}
 		print "</td></tr>";
 
-		if ($object->methode_commande)
-		{
+		if ($object->methode_commande) {
 			print '<tr><td>'.$langs->trans("Method").'</td><td>'.$object->getInputMethod().'</td></tr>';
 		}
 	}
@@ -2056,11 +2023,12 @@ if ($action == 'create')
 	print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 	print $langs->trans('PaymentConditions');
 	print '<td>';
-	if ($action != 'editconditions') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	if ($action != 'editconditions') {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->trans('SetConditions'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
-	if ($action == 'editconditions')
-	{
+	if ($action == 'editconditions') {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
@@ -2074,11 +2042,12 @@ if ($action == 'create')
 	print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	if ($action != 'editmode') {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
-	if ($action == 'editmode')
-	{
+	if ($action == 'editmode') {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
 	} else {
 		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
@@ -2086,16 +2055,16 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
+	if (!empty($conf->multicurrency->enabled)) {
 		// Multicurrency code
 		print '<tr>';
 		print '<td>';
 		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 		print '</td>';
-		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT)
+		if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editmulticurrencycode') {
@@ -2106,16 +2075,16 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Multicurrency rate
-		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
-		{
+		if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 			print '<tr>';
 			print '<td>';
 			print '<table class="nobordernopadding centpercent"><tr>';
 			print '<td>';
 			print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 			print '</td>';
-			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
+			if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td>';
 			if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
@@ -2136,14 +2105,14 @@ if ($action == 'create')
 	}
 
 	// Bank Account
-	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && !empty($conf->banque->enabled))
-	{
+	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER) && !empty($conf->banque->enabled)) {
 		print '<tr><td class="nowrap">';
 		print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 		print $langs->trans('BankAccount');
 		print '<td>';
-		if ($action != 'editbankaccount' && $usercancreate)
+		if ($action != 'editbankaccount' && $usercancreate) {
 			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		}
 		print '</tr></table>';
 		print '</td><td>';
 		if ($action == 'editbankaccount') {
@@ -2166,22 +2135,27 @@ if ($action == 'create')
 	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('DateDeliveryPlanned');
 	print '</td>';
-	if ($action != 'editdate_livraison') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+	if ($action != 'editdate_livraison') {
+		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&amp;id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'), 1).'</a></td>';
+	}
 	print '</tr></table>';
 	print '</td><td>';
-	if ($action == 'editdate_livraison')
-	{
+	if ($action == 'editdate_livraison') {
 		print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
 		$usehourmin = 0;
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 1;
+		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+			$usehourmin = 1;
+		}
 		print $form->selectDate($object->delivery_date ? $object->delivery_date : -1, 'liv_', $usehourmin, $usehourmin, '', "setdate_livraison");
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
 		print '</form>';
 	} else {
 		$usehourmin = 'day';
-		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) $usehourmin = 'dayhour';
+		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+			$usehourmin = 'dayhour';
+		}
 		print $object->delivery_date ? dol_print_date($object->delivery_date, $usehourmin) : '&nbsp;';
 		if ($object->hasDelay() && !empty($object->delivery_date)) {
 			print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
@@ -2190,19 +2164,20 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled))
-	{
+	if (!empty($conf->incoterm->enabled)) {
 		print '<tr><td>';
 		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('IncotermLabel');
 		print '<td><td class="right">';
-		if ($usercancreate) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-		else print '&nbsp;';
+		if ($usercancreate) {
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?id='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td></tr></table>';
 		print '</td>';
 		print '<td>';
-		if ($action != 'editincoterm')
-		{
+		if ($action != 'editincoterm') {
 			print $form->textwithpicto(dol_escape_htmltag($object->display_incoterms()), $object->label_incoterms, 1);
 		} else {
 			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -2222,8 +2197,7 @@ if ($action == 'create')
 
 	print '<table class="border tableforfield centpercent">';
 
-	if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
-	{
+	if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
 		print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -2254,14 +2228,12 @@ if ($action == 'create')
 	print '</tr>';
 
 	// Amount Local Taxes
-	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) //Localtax1
-	{
+	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { //Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax1, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
-	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) //Localtax2
-	{
+	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { //Localtax2
 		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax2, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
@@ -2275,7 +2247,7 @@ if ($action == 'create')
 
 	// Margin Infos
 	/*if (! empty($conf->margin->enabled)) {
-	    $formmargin->displayMarginInfos($object);
+		$formmargin->displayMarginInfos($object);
 	}*/
 
 
@@ -2285,15 +2257,13 @@ if ($action == 'create')
 
 	print '<div class="clearboth"></div><br>';
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-	{
+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$blocname = 'contacts';
 		$title = $langs->trans('ContactsAddresses');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-	{
+	if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 		$blocname = 'notes';
 		$title = $langs->trans('Notes');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
@@ -2324,19 +2294,20 @@ if ($action == 'create')
 	global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
 	$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
 	$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
-	if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier = 1;
+	if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY)) {
+		$senderissupplier = 1;
+	}
 
 	// Show object lines
-	if (!empty($object->lines))
+	if (!empty($object->lines)) {
 		$ret = $object->printObjectLines($action, $societe, $mysoc, $lineid, 1);
+	}
 
 	$num = count($object->lines);
 
 	// Form to add new line
-	if ($object->statut == CommandeFournisseur::STATUS_DRAFT && $usercancreate)
-	{
-		if ($action != 'editline')
-		{
+	if ($object->statut == CommandeFournisseur::STATUS_DRAFT && $usercancreate) {
+		if ($action != 'editline') {
 			// Add free products/services
 			$object->formAddObjectLine(1, $societe, $mysoc);
 
@@ -2354,24 +2325,22 @@ if ($action == 'create')
 	 * Boutons actions
 	 */
 
-	if ($user->socid == 0 && $action != 'editline' && $action != 'delete')
-	{
+	if ($user->socid == 0 && $action != 'editline' && $action != 'delete') {
 		print '<div	class="tabsAction">';
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 		// modified by hook
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			$object->fetchObjectLinked(); // Links are used to show or not button, so we load them now.
 
 			// Validate
-			if ($object->statut == 0 && $num > 0)
-			{
-				if ($usercanvalidate)
-				{
+			if ($object->statut == 0 && $num > 0) {
+				if ($usercanvalidate) {
 					$tmpbuttonlabel = $langs->trans('Validate');
-					if ($usercanapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) $tmpbuttonlabel = $langs->trans("ValidateAndApprove");
+					if ($usercanapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) {
+						$tmpbuttonlabel = $langs->trans("ValidateAndApprove");
+					}
 
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">';
 					print $tmpbuttonlabel;
@@ -2385,21 +2354,16 @@ if ($action == 'create')
 			}*/
 
 			// Modify
-			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
-			{
-				if ($usercanorder)
-				{
+			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
+				if ($usercanorder) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Modify").'</a>';
 				}
 			}
 
 			// Approve
-			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
-			{
-				if ($usercanapprove)
-				{
-					if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id))
-					{
+			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
+				if ($usercanapprove) {
+					if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED && !empty($object->user_approve_id)) {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("FirstApprovalAlreadyDone")).'">'.$langs->trans("ApproveOrder").'</a>';
 					} else {
 						print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
@@ -2410,14 +2374,10 @@ if ($action == 'create')
 			}
 
 			// Second approval (if option SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED is set)
-			if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)
-			{
-				if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
-				{
-					if ($usercanapprovesecond)
-					{
-						if (!empty($object->user_approve_id2))
-						{
+			if (!empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) && $object->total_ht >= $conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED) {
+				if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
+					if ($usercanapprovesecond) {
+						if (!empty($object->user_approve_id2)) {
 							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SecondApprovalAlreadyDone")).'">'.$langs->trans("Approve2Order").'</a>';
 						} else {
 							print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve2">'.$langs->trans("Approve2Order").'</a>';
@@ -2429,10 +2389,8 @@ if ($action == 'create')
 			}
 
 			// Refuse
-			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED)
-			{
-				if ($usercanapprove || $usercanapprovesecond)
-				{
+			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
+				if ($usercanapprove || $usercanapprovesecond) {
 					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("RefuseOrder").'</a>';
@@ -2441,51 +2399,43 @@ if ($action == 'create')
 
 			// Send
 			if (empty($user->socid)) {
-				if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED, 3, 4, 5)) || !empty($conf->global->SUPPLIER_ORDER_SENDBYEMAIL_FOR_ALL_STATUS))
-				{
-					if ($usercanorder)
-					{
+				if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED, 3, 4, 5)) || !empty($conf->global->SUPPLIER_ORDER_SENDBYEMAIL_FOR_ALL_STATUS)) {
+					if ($usercanorder) {
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 					}
 				}
 			}
 
 			// Reopen
-			if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED)))
-			{
+			if (in_array($object->statut, array(CommandeFournisseur::STATUS_ACCEPTED))) {
 				$buttonshown = 0;
-				if (!$buttonshown && $usercanapprove)
-				{
+				if (!$buttonshown && $usercanapprove) {
 					if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY)
-						|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id))
-					{
+						|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER_ONLY) && $user->id == $object->user_approve_id)) {
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Disapprove").'</a>';
 						$buttonshown++;
 					}
 				}
-				if (!$buttonshown && $usercanapprovesecond && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED))
-				{
+				if (!$buttonshown && $usercanapprovesecond && !empty($conf->global->SUPPLIER_ORDER_3_STEPS_TO_BE_APPROVED)) {
 					if (empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY)
-						|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2))
-					{
+						|| (!empty($conf->global->SUPPLIER_ORDER_REOPEN_BY_APPROVER2_ONLY) && $user->id == $object->user_approve_id2)) {
 						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("Disapprove").'</a>';
 					}
 				}
 			}
-			if (in_array($object->statut, array(3, 4, 5, 6, 7, 9)))
-			{
-				if ($usercanorder)
-				{
+			if (in_array($object->statut, array(3, 4, 5, 6, 7, 9))) {
+				if ($usercanorder) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans("ReOpen").'</a>';
 				}
 			}
 
 			// Ship
 
-			if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)))
-			{
+			if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
 				$labelofbutton = $langs->trans('ReceiveProducts');
-				if ($conf->reception->enabled) $labelofbutton = $langs->trans("CreateReception");
+				if ($conf->reception->enabled) {
+					$labelofbutton = $langs->trans("CreateReception");
+				}
 
 				if (in_array($object->statut, array(3, 4, 5))) {
 					if ($conf->fournisseur->enabled && $usercanreceived) {
@@ -2496,10 +2446,8 @@ if ($action == 'create')
 				}
 			}
 
-			if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED)
-			{
-				if ($usercanorder)
-				{
+			if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED) {
+				if ($usercanorder) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=makeorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
 				} else {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("MakeOrder").'</a></div>';
@@ -2507,10 +2455,8 @@ if ($action == 'create')
 			}
 
 			// Classify received (this does not record reception)
-			if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY)
-			{
-				if ($usercanreceived)
-				{
+			if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY) {
+				if ($usercanreceived) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifyreception#classifyreception">'.$langs->trans("ClassifyReception").'</a></div>';
 				}
 			}
@@ -2518,26 +2464,20 @@ if ($action == 'create')
 			// Create bill
 			//if (! empty($conf->facture->enabled))
 			//{
-			if (!empty($conf->fournisseur->enabled) && ($object->statut >= 2 && $object->statut != 7 && $object->billed != 1))  // statut 2 means approved, 7 means canceled
-			{
-				if ($user->rights->fournisseur->facture->creer)
-				{
+			if (!empty($conf->fournisseur->enabled) && ($object->statut >= 2 && $object->statut != 7 && $object->billed != 1)) {  // statut 2 means approved, 7 means canceled
+				if ($user->rights->fournisseur->facture->creer) {
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
 				}
 			}
 			//}
 
 			// Classify billed manually (need one invoice if module invoice is on, no condition on invoice if not)
-			if ($usercancreate && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1)  // statut 2 means approved
-			{
-				if (empty($conf->facture->enabled))
-				{
+			if ($usercancreate && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1) {  // statut 2 means approved
+				if (empty($conf->facture->enabled)) {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
 				} else {
-					if (!empty($object->linkedObjectsIds['invoice_supplier']))
-					{
-						if ($user->rights->fournisseur->facture->creer)
-						{
+					if (!empty($object->linkedObjectsIds['invoice_supplier'])) {
+						if ($user->rights->fournisseur->facture->creer) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifybilled">'.$langs->trans("ClassifyBilled").'</a>';
 						}
 					} else {
@@ -2547,29 +2487,24 @@ if ($action == 'create')
 			}
 
 			// Create a remote order using WebService only if module is activated
-			if (!empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) // 2 means accepted
-			{
+			if (!empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) { // 2 means accepted
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=webservice&amp;mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
 			}
 
 			// Clone
-			if ($usercancreate)
-			{
+			if ($usercancreate) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a>';
 			}
 
 			// Cancel
-			if ($object->statut == 2)
-			{
-				if ($usercanorder)
-				{
+			if ($object->statut == 2) {
+				if ($usercanorder) {
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("CancelOrder").'</a>';
 				}
 			}
 
 			// Delete
-			if (!empty($usercandelete) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && !empty($usercancreate)))
-			{
+			if (!empty($usercandelete) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && !empty($usercancreate))) {
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
 			}
 		}
@@ -2578,8 +2513,7 @@ if ($action == 'create')
 
 
 
-		if ($usercanorder && $object->statut == CommandeFournisseur::STATUS_ACCEPTED && $action == 'makeorder')
-		{
+		if ($usercanorder && $object->statut == CommandeFournisseur::STATUS_ACCEPTED && $action == 'makeorder') {
 			// Set status to ordered (action=commande)
 			print '<!-- form to record supplier order -->'."\n";
 			print '<form name="commande" id="makeorder" action="card.php?id='.$object->id.'&amp;action=commande" method="POST">';
@@ -2591,7 +2525,9 @@ if ($action == 'create')
 			//print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("ToOrder").'</td></tr>';
 			print '<tr><td class="fieldrequired">'.$langs->trans("OrderDate").'</td><td>';
 			$date_com = dol_mktime(GETPOST('rehour', 'int'), GETPOST('remin', 'int'), GETPOST('resec', 'int'), GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-			if (empty($date_com)) $date_com = dol_now();
+			if (empty($date_com)) {
+				$date_com = dol_now();
+			}
 			print $form->selectDate($date_com, '', 1, 1, '', "commande", 1, 1);
 			print '</td></tr>';
 
@@ -2612,8 +2548,7 @@ if ($action == 'create')
 			print "<br>";
 		}
 
-		if ($action != 'makeorder')
-		{
+		if ($action != 'makeorder') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
 			// Generated documents
@@ -2634,10 +2569,8 @@ if ($action == 'create')
 
 			print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-			if ($action == 'classifyreception')
-			{
-				if ($usercanreceived && ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY))
-				{
+			if ($action == 'classifyreception') {
+				if ($usercanreceived && ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY)) {
 					// Set status to received (action=livraison)
 					print '<!-- form to record purchase order received -->'."\n";
 					print '<form id="classifyreception" action="card.php?id='.$object->id.'" method="post">';
@@ -2682,8 +2615,7 @@ if ($action == 'create')
 		/*
 		 * Action webservice
 		 */
-		if ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && !GETPOST('cancel', 'alpha'))
-		{
+		if ($action == 'webservice' && GETPOST('mode', 'alpha') != "send" && !GETPOST('cancel', 'alpha')) {
 			$mode        = GETPOST('mode', 'alpha');
 			$ws_url      = $object->thirdparty->webservices_url;
 			$ws_key      = $object->thirdparty->webservices_key;
@@ -2712,8 +2644,7 @@ if ($action == 'create')
 				$mode = "init";
 			}
 
-			if ($mode == "init")
-			{
+			if ($mode == "init") {
 				//Table/form header
 				print '<table class="border centpercent">';
 				print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
@@ -2721,8 +2652,7 @@ if ($action == 'create')
 				print '<input type="hidden" name="action" value="webservice">';
 				print '<input type="hidden" name="mode" value="check">';
 
-				if ($error_occurred)
-				{
+				if ($error_occurred) {
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
 					print '<input class="button button-cancel" type="submit" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 				} else {
@@ -2745,8 +2675,7 @@ if ($action == 'create')
 				//End table/form
 				print '</form>';
 				print '</table>';
-			} elseif ($mode == "check")
-			{
+			} elseif ($mode == "check") {
 				$ws_entity = '';
 				$ws_thirdparty = '';
 				$error_occurred = false;
@@ -2761,14 +2690,12 @@ if ($action == 'create')
 				$result_user = $soapclient_user->call("getUser", $ws_parameters, $ws_ns, '');
 				$user_status_code = $result_user["result"]["result_code"];
 
-				if ($user_status_code == "OK")
-				{
+				if ($user_status_code == "OK") {
 					//Fill the variables
 					$ws_entity = $result_user["user"]["entity"];
 					$ws_authentication['entity'] = $ws_entity;
 					$ws_thirdparty = $result_user["user"]["fk_thirdparty"];
-					if (empty($ws_thirdparty))
-					{
+					if (empty($ws_thirdparty)) {
 						setEventMessages($langs->trans("RemoteUserMissingAssociatedSoc"), null, 'errors');
 						$error_occurred = true;
 					} else {
@@ -2788,8 +2715,7 @@ if ($action == 'create')
 							}
 							$ws_parameters = array('authentication' => $ws_authentication, 'id' => '', 'ref' => $ref_supplier);
 							$result_product = $soapclient_product->call("getProductOrService", $ws_parameters, $ws_ns, '');
-							if (!$result_product)
-							{
+							if (!$result_product) {
 								setEventMessages($line_id.$langs->trans("SOAPError")." ".$soapclient_product->error_str." - ".$soapclient_product->response, null, 'errors');
 								$error_occurred = true;
 								break;
@@ -2797,13 +2723,10 @@ if ($action == 'create')
 
 							// Check the result code
 							$status_code = $result_product["result"]["result_code"];
-							if (empty($status_code)) //No result, check error str
-							{
+							if (empty($status_code)) { //No result, check error str
 								setEventMessages($langs->trans("SOAPError")." '".$soapclient_order->error_str."'", null, 'errors');
-							} elseif ($status_code != "OK") //Something went wrong
-							{
-								if ($status_code == "NOT_FOUND")
-								{
+							} elseif ($status_code != "OK") { //Something went wrong
+								if ($status_code == "NOT_FOUND") {
 									setEventMessages($line_id.$langs->trans("SupplierMissingRef")." '".$ref_supplier."'", null, 'warnings');
 								} else {
 									setEventMessages($line_id.$langs->trans("ResponseNonOK")." '".$status_code."' - '".$result_product["result"]["result_label"]."'", null, 'errors');
@@ -2819,10 +2742,8 @@ if ($action == 'create')
 
 							$product_fourn = new ProductFournisseur($db);
 							$product_fourn_list = $product_fourn->list_product_fournisseur_price($line->fk_product);
-							if (count($product_fourn_list) > 0)
-							{
-								foreach ($product_fourn_list as $product_fourn_line)
-								{
+							if (count($product_fourn_list) > 0) {
+								foreach ($product_fourn_list as $product_fourn_line) {
 									//Only accept the line where the supplier is the same at this order and has the same ref
 									if ($product_fourn_line->fourn_id == $object->socid && $product_fourn_line->fourn_ref == $ref_supplier) {
 										$local_price = price($product_fourn_line->fourn_price);
@@ -2840,12 +2761,10 @@ if ($action == 'create')
 							}
 						}
 					}
-				} elseif ($user_status_code == "PERMISSION_DENIED")
-				{
+				} elseif ($user_status_code == "PERMISSION_DENIED") {
 					setEventMessages($langs->trans("RemoteUserNotPermission"), null, 'errors');
 					$error_occurred = true;
-				} elseif ($user_status_code == "BAD_CREDENTIALS")
-				{
+				} elseif ($user_status_code == "BAD_CREDENTIALS") {
 					setEventMessages($langs->trans("RemoteUserBadCredentials"), null, 'errors');
 					$error_occurred = true;
 				} else {
@@ -2862,8 +2781,7 @@ if ($action == 'create')
 				print '<input type="hidden" name="ws_password" value="'.$ws_password.'">';
 				print '<input type="hidden" name="ws_entity" value="'.$ws_entity.'">';
 				print '<input type="hidden" name="ws_thirdparty" value="'.$ws_thirdparty.'">';
-				if ($error_occurred)
-				{
+				if ($error_occurred) {
 					print "<br>".$langs->trans("ErrorOccurredReviseAndRetry")."<br>";
 				} else {
 					print '<input class="button" type="submit" id="ws_submit" name="ws_submit" value="'.$langs->trans("Confirm").'">';
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index 3e52f35d8bb..ae2e8bab481 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -41,7 +41,9 @@ $ref	= GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 $object = new CommandeFournisseur($db);
@@ -51,51 +53,39 @@ $object = new CommandeFournisseur($db);
  * Add a new contact
  */
 
-if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer)
-{
+if ($action == 'addcontact' && $user->rights->fournisseur->commande->creer) {
 	$result = $object->fetch($id);
 
-	if ($result > 0 && $id > 0)
-	{
+	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-
-// Toggle the status of a contact
-elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer)
-{
-	if ($object->fetch($id))
-	{
+} elseif ($action == 'swapstatut' && $user->rights->fournisseur->commande->creer) {
+	// Toggle the status of a contact
+	if ($object->fetch($id)) {
 		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
-}
-
-// Deleting a contact
-elseif ($action == 'deletecontact' && $user->rights->fournisseur->commande->creer)
-{
+} elseif ($action == 'deletecontact' && $user->rights->fournisseur->commande->creer) {
+	// Deleting a contact
 	$object->fetch($id);
 	$result = $object->delete_contact($_GET["lineid"]);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -123,12 +113,10 @@ $userstatic = new User($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$langs->trans("OrderCard");
 
-	if ($object->fetch($id, $ref) > 0)
-	{
+	if ($object->fetch($id, $ref) > 0) {
 		$object->fetch_thirdparty();
 
 		$head = ordersupplier_prepare_head($object);
@@ -145,12 +133,10 @@ if ($id > 0 || !empty($ref))
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->fournisseur->commande->creer)
-			{
+			if ($user->rights->fournisseur->commande->creer) {
 				if ($action != 'classify') {
 					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index dbe0bd5d7af..ee8c86aa0b8 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -40,14 +40,16 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
-if (!empty($conf->projet->enabled))
+if (!empty($conf->projet->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("bills", "orders", "sendings", "companies", "deliveries", "products", "stocks", "receptions"));
 
-if (!empty($conf->productbatch->enabled))
+if (!empty($conf->productbatch->enabled)) {
 	$langs->load('productbatch');
+}
 
 	// Security check
 $id = GETPOST("id", 'int');
@@ -58,8 +60,9 @@ $fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 
-if ($user->socid)
+if ($user->socid) {
 	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 if (empty($conf->stock->enabled)) {
@@ -70,8 +73,9 @@ $hookmanager->initHooks(array('ordersupplierdispatch'));
 
 // Recuperation de l'id de projet
 $projectid = 0;
-if ($_GET["projectid"])
+if ($_GET["projectid"]) {
 	$projectid = GETPOST("projectid", 'int');
+}
 
 $object = new CommandeFournisseur($db);
 
@@ -93,25 +97,24 @@ if ($id > 0 || !empty($ref)) {
 
 $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 ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check))))
-{
+if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))) {
 	$error = 0;
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 
 	$db->begin();
 
 	$result = $supplierorderdispatch->fetch($lineid);
-	if (!$result)
-	{
+	if (!$result) {
 		$error++;
 		setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors');
 		$action = '';
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $supplierorderdispatch->setStatut(1);
 		if ($result < 0) {
 			setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors');
@@ -120,8 +123,7 @@ if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $object->calcAndSetStatusDispatch($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -129,31 +131,27 @@ if ($action == 'checkdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_
 			$action = '';
 		}
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 	} else {
 		$db->rollback();
 	}
 }
 
-if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check))))
-{
+if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))) {
 	$error = 0;
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 
 	$db->begin();
 
 	$result = $supplierorderdispatch->fetch($lineid);
-	if (!$result)
-	{
+	if (!$result) {
 		$error++;
 		setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors');
 		$action = '';
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $supplierorderdispatch->setStatut(0);
 		if ($result < 0) {
 			setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors');
@@ -161,8 +159,7 @@ if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCE
 			$action = '';
 		}
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $object->calcAndSetStatusDispatch($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -170,31 +167,27 @@ if ($action == 'uncheckdispatchline' && !((empty($conf->global->MAIN_USE_ADVANCE
 			$action = '';
 		}
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 	} else {
 		$db->rollback();
 	}
 }
 
-if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check))))
-{
+if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))) {
 	$error = 0;
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 
 	$db->begin();
 
 	$result = $supplierorderdispatch->fetch($lineid);
-	if (!$result)
-	{
+	if (!$result) {
 		$error++;
 		setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors');
 		$action = '';
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $supplierorderdispatch->setStatut(2);
 		if ($result < 0) {
 			setEventMessages($supplierorderdispatch->error, $supplierorderdispatch->errors, 'errors');
@@ -202,8 +195,7 @@ if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_P
 			$action = '';
 		}
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$result = $object->calcAndSetStatusDispatch($user);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -211,8 +203,7 @@ if ($action == 'denydispatchline' && !((empty($conf->global->MAIN_USE_ADVANCED_P
 			$action = '';
 		}
 	}
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 	} else {
 		$db->rollback();
@@ -225,12 +216,10 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 	$db->begin();
 
 	$pos = 0;
-	foreach ($_POST as $key => $value)
-	{
+	foreach ($_POST as $key => $value) {
 		// without batch module enabled
 		$reg = array();
-		if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg))
-		{
+		if (preg_match('/^product_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
 			$pos++;
 
 			// $numline=$reg[2] + 1; // line of product
@@ -238,7 +227,9 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 			$prod = "product_".$reg[1].'_'.$reg[2];
 			$qty = "qty_".$reg[1].'_'.$reg[2];
 			$ent = "entrepot_".$reg[1].'_'.$reg[2];
-			if (empty(GETPOST($ent))) $ent = $fk_default_warehouse;
+			if (empty(GETPOST($ent))) {
+				$ent = $fk_default_warehouse;
+			}
 			$pu = "pu_".$reg[1].'_'.$reg[2]; // This is unit price including discount
 			$fk_commandefourndet = "fk_commandefourndet_".$reg[1].'_'.$reg[2];
 
@@ -293,8 +284,7 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 			}
 		}
 		// with batch module enabled
-		if (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg))
-		{
+		if (preg_match('/^product_batch_([0-9]+)_([0-9]+)$/i', $key, $reg)) {
 			$pos++;
 
 			// eat-by date dispatch
@@ -398,14 +388,12 @@ if ($action == 'dispatch' && $user->rights->fournisseur->commande->receptionner)
 }
 
 // Remove a dispatched line
-if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->receptionner)
-{
+if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fournisseur->commande->receptionner) {
 	$db->begin();
 
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 	$result = $supplierorderdispatch->fetch($lineid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$qty = $supplierorderdispatch->qty;
 		$entrepot = $supplierorderdispatch->fk_entrepot;
 		$product = $supplierorderdispatch->fk_product;
@@ -417,48 +405,39 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $user->rights->fourn
 
 		$result = $supplierorderdispatch->delete($user);
 	}
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		$errors = $object->errors;
 		$error++;
-	}
-	else {
+	} else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
-		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
-		{
+		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
 			$mouv = new MouvementStock($db);
-			if ($product > 0)
-			{
+			if ($product > 0) {
 				$mouv->origin = &$object;
 				$result = $mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$errors = $mouv->errors;
 					$error++;
 				}
 			}
 		}
 	}
-	if ($error > 0)
-	{
+	if ($error > 0) {
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
-	}
-	else {
+	} else {
 		$db->commit();
 	}
 }
 
 // Update a dispatched line
-if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionner)
-{
+if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionner) {
 	$db->begin();
 	$error = 0;
 
 	$supplierorderdispatch = new CommandeFournisseurDispatch($db);
 	$result = $supplierorderdispatch->fetch($lineid);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$qty = $supplierorderdispatch->qty;
 		$entrepot = $supplierorderdispatch->fk_entrepot;
 		$product = $supplierorderdispatch->fk_product;
@@ -472,30 +451,23 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 		$supplierorderdispatch->fk_entrepot = GETPOST('fk_entrepot');
 		$result = $supplierorderdispatch->update($user);
 	}
-	if ($result < 0)
-	{
+	if ($result < 0) {
 		$error++;
 		$errors = $supplierorderdispatch->errors;
-	}
-	else {
+	} else {
 		// If module stock is enabled and the stock increase is done on purchase order dispatching
-		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
-		{
+		if ($entrepot > 0 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
 			$mouv = new MouvementStock($db);
-			if ($product > 0)
-			{
+			if ($product > 0) {
 				$mouv->origin = &$object;
 				$result = $mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$errors = $mouv->errors;
 					$error++;
-				}
-				else {
+				} else {
 					$mouv->origin = &$object;
 					$result = $mouv->reception($user, $product, $supplierorderdispatch->fk_entrepot, $supplierorderdispatch->qty, $price, $comment, $eatby, $sellby, $batch);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$errors = $mouv->errors;
 						$error++;
 					}
@@ -503,12 +475,10 @@ if ($action == 'updateline' && $user->rights->fournisseur->commande->receptionne
 			}
 		}
 	}
-	if ($error > 0)
-	{
+	if ($error > 0) {
 		$db->rollback();
 		setEventMessages($error, $errors, 'errors');
-	}
-	else {
+	} else {
 		$db->commit();
 	}
 }
@@ -544,8 +514,7 @@ if ($id > 0 || !empty($ref)) {
 	$formconfirm = '';
 
 	// Confirmation to delete line
-	if ($action == 'ask_deleteline')
-	{
+	if ($action == 'ask_deleteline') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
 
@@ -553,8 +522,11 @@ if ($id > 0 || !empty($ref)) {
 	$parameters = array('lineid' => $lineid);
 	// Note that $action and $object may be modified by hook
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action);
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -570,12 +542,10 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->fournisseur->commande->creer)
-		{
+		if ($user->rights->fournisseur->commande->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
@@ -643,8 +613,9 @@ if ($id > 0 || !empty($ref)) {
 	print '<br>';
 
 	$disabled = 1;
-	if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER))
+	if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
 		$disabled = 0;
+	}
 
 	// Line of orders
 	if ($object->statut <= CommandeFournisseur::STATUS_ACCEPTED || $object->statut >= CommandeFournisseur::STATUS_CANCELED) {
@@ -653,8 +624,7 @@ if ($id > 0 || !empty($ref)) {
 
 	if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT
 		|| $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY
-		|| $object->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY)
-	{
+		|| $object->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
 		$formproduct->loadWarehouses();
@@ -662,12 +632,18 @@ if ($id > 0 || !empty($ref)) {
 		$listwarehouses = $entrepot->list_array(1);
 
 
-		if (empty($conf->reception->enabled))print '<form method="POST" action="dispatch.php?id='.$object->id.'">';
-		else print '<form method="post" action="'.dol_buildpath('/reception/card.php', 1).'?originid='.$object->id.'&origin=supplierorder">';
+		if (empty($conf->reception->enabled)) {
+			print '<form method="POST" action="dispatch.php?id='.$object->id.'">';
+		} else {
+			print '<form method="post" action="'.dol_buildpath('/reception/card.php', 1).'?originid='.$object->id.'&origin=supplierorder">';
+		}
 
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		if (empty($conf->reception->enabled))print '<input type="hidden" name="action" value="dispatch">';
-		else print '<input type="hidden" name="action" value="create">';
+		if (empty($conf->reception->enabled)) {
+			print '<input type="hidden" name="action" value="dispatch">';
+		} else {
+			print '<input type="hidden" name="action" value="create">';
+		}
 
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
@@ -706,14 +682,17 @@ if ($id > 0 || !empty($ref)) {
 			$object,
 			$action
 		);
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 		$sql .= $hookmanager->resPrint;
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product=p.rowid";
 		$sql .= " WHERE l.fk_commande = ".$object->id;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 			$sql .= " AND l.product_type = 0";
+		}
 
 		// Enable hooks to alter the SQL query (WHERE)
 		$parameters = array();
@@ -723,7 +702,9 @@ if ($id > 0 || !empty($ref)) {
 			$object,
 			$action
 		);
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 		$sql .= $hookmanager->resPrint;
 
 		$sql .= " GROUP BY p.ref, p.label, p.tobatch, p.fk_default_warehouse, l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
@@ -785,7 +766,9 @@ if ($id > 0 || !empty($ref)) {
 					$object,
 					$action
 				);
-				if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				if ($reshook < 0) {
+					setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+				}
 				print $hookmanager->resPrint;
 
 				print "</tr>\n";
@@ -803,8 +786,9 @@ if ($id > 0 || !empty($ref)) {
 					$nbfreeproduct++;
 				} else {
 					$remaintodispatch = price2num($objp->qty - ((float) $products_dispatched[$objp->rowid]), 5); // Calculation of dispatched
-					if ($remaintodispatch < 0)
+					if ($remaintodispatch < 0) {
 						$remaintodispatch = 0;
+					}
 
 					if ($remaintodispatch || empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
 						$nbproduct++;
@@ -858,8 +842,9 @@ if ($id > 0 || !empty($ref)) {
 
 						// Define unit price for PMP calculation
 						$up_ht_disc = $objp->subprice;
-						if (!empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP))
+						if (!empty($objp->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
 							$up_ht_disc = price2num($up_ht_disc * (100 - $objp->remise_percent) / 100, 'MU');
+						}
 
 						// Supplier ref
 						print '<td class="right">'.$objp->sref.'</td>';
@@ -892,7 +877,9 @@ if ($id > 0 || !empty($ref)) {
 								$object,
 								$action
 							);
-							if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+							if ($reshook < 0) {
+								setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+							}
 							print $hookmanager->resPrint;
 
 							print '</tr>';
@@ -903,8 +890,7 @@ if ($id > 0 || !empty($ref)) {
 							print '<input name="product_batch'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
 
 							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
-							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
-							{
+							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) { // Not tested !
 								print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
 							} else {
 								print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
@@ -953,7 +939,9 @@ if ($id > 0 || !empty($ref)) {
 								$object,
 								$action
 							);
-							if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+							if ($reshook < 0) {
+								setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+							}
 							print $hookmanager->resPrint;
 
 							print '</tr>';
@@ -964,8 +952,7 @@ if ($id > 0 || !empty($ref)) {
 							print '<input name="product'.$suffix.'" type="hidden" value="'.$objp->fk_product.'">';
 
 							print '<!-- This is a up (may include discount or not depending on STOCK_EXCLUDE_DISCOUNT_FOR_PMP. will be used for PMP calculation) -->';
-							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) // Not tested !
-							{
+							if (!empty($conf->global->SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT)) { // Not tested !
 								print $langs->trans("BuyingPrice").': <input class="maxwidth75" name="pu'.$suffix.'" type="text" value="'.price2num($up_ht_disc, 'MU').'">';
 							} else {
 								print '<input class="maxwidth75" name="pu'.$suffix.'" type="hidden" value="'.price2num($up_ht_disc, 'MU').'">';
@@ -1030,7 +1017,9 @@ if ($id > 0 || !empty($ref)) {
 							$object,
 							$action
 						);
-						if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+						if ($reshook < 0) {
+							setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+						}
 						print $hookmanager->resPrint;
 
 						print "</tr>\n";
@@ -1046,16 +1035,14 @@ if ($id > 0 || !empty($ref)) {
 		print "</table>\n";
 		print '</div>';
 
-		if ($nbproduct)
-		{
+		if ($nbproduct) {
 			$checkboxlabel = $langs->trans("CloseReceivedSupplierOrdersAutomatically", $langs->transnoentitiesnoconv('StatusOrderReceivedAll'));
 
 			print '<div class="center">';
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 			// modified by hook
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				if (empty($conf->reception->enabled)) {
 					print $langs->trans("Comment").' : ';
 					print '<input type="text" class="minwidth400" maxlength="128" name="comment" value="';
@@ -1069,8 +1056,9 @@ if ($id > 0 || !empty($ref)) {
 				$dispatchBt = empty($conf->reception->enabled) ? $langs->trans("Receive") : $langs->trans("CreateReception");
 
 				print '<br><input type="submit" class="button" name="dispatch" value="'.dol_escape_htmltag($dispatchBt).'"';
-				if (count($listwarehouses) <= 0)
+				if (count($listwarehouses) <= 0) {
 					print ' disabled';
+				}
 				print '>';
 			}
 			print '</div>';
@@ -1079,9 +1067,11 @@ if ($id > 0 || !empty($ref)) {
 		// Message if nothing to dispatch
 		if (!$nbproduct) {
 			print "<br>\n";
-			if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED))
+			if (empty($conf->global->SUPPLIER_ORDER_DISABLE_STOCK_DISPATCH_WHEN_TOTAL_REACHED)) {
 				print '<div class="opacitymedium">'.$langs->trans("NoPredefinedProductToDispatch").'</div>'; // No predefined line at all
-			else print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.
+			} else {
+				print '<div class="opacitymedium">'.$langs->trans("NoMorePredefinedProductToDispatch").'</div>'; // No predefined line that remain to be dispatched.
+			}
 		}
 
 		print '</form>';
@@ -1113,12 +1103,16 @@ if ($id > 0 || !empty($ref)) {
 	$sql .= " e.rowid as warehouse_id, e.ref as entrepot,";
 	$sql .= " cfd.rowid as dispatchlineid, cfd.fk_product, cfd.qty, cfd.eatby, cfd.sellby, cfd.batch, cfd.comment, cfd.status, cfd.datec";
 	$sql .= " ,cd.rowid, cd.subprice";
-	if ($conf->reception->enabled)$sql .= " ,cfd.fk_reception, r.date_delivery";
+	if ($conf->reception->enabled) {
+		$sql .= " ,cfd.fk_reception, r.date_delivery";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."product as p,";
 	$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as cfd";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande_fournisseurdet as cd ON cd.rowid = cfd.fk_commandefourndet";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e ON cfd.fk_entrepot = e.rowid";
-	if ($conf->reception->enabled)$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."reception as r ON cfd.fk_reception = r.rowid";
+	if ($conf->reception->enabled) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."reception as r ON cfd.fk_reception = r.rowid";
+	}
 	$sql .= " WHERE cfd.fk_commande = ".$object->id;
 	$sql .= " AND cfd.fk_product = p.rowid";
 	$sql .= " ORDER BY cfd.rowid ASC";
@@ -1137,7 +1131,9 @@ if ($id > 0 || !empty($ref)) {
 			print '<table id="dispatch_received_products" class="noborder centpercent">';
 
 			print '<tr class="liste_titre">';
-			if ($conf->reception->enabled)print '<td>'.$langs->trans("Reception").'</td>';
+			if ($conf->reception->enabled) {
+				print '<td>'.$langs->trans("Reception").'</td>';
+			}
 
 			print '<td>'.$langs->trans("Product").'</td>';
 			print '<td>'.$langs->trans("DateCreation").'</td>';
@@ -1169,8 +1165,7 @@ if ($id > 0 || !empty($ref)) {
 			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
-				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
-				{
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid) {
 					print '<form name="editdispatchedlines" id="editdispatchedlines" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'#line_'.GETPOST('lineid').'" method="POST">
 					<input type="hidden" name="token" value="'.newToken().'">
 					<input type="hidden" name="action" value="updateline">
@@ -1219,11 +1214,9 @@ if ($id > 0 || !empty($ref)) {
 
 				// Qty
 				print '<td class="right">';
-				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
-				{
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid) {
 					print '<input style="width: 50px;" type="number" min="1" name="qty" value="'.$objp->qty.'" />';
-				}
-				else {
+				} else {
 					print $objp->qty;
 				}
 				print '<input type="hidden" name="price" value="'.$objp->subprice.'" />';
@@ -1231,8 +1224,7 @@ if ($id > 0 || !empty($ref)) {
 
 				// Warehouse
 				print '<td>';
-				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
-				{
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid) {
 					if (count($listwarehouses) > 1) {
 						print $formproduct->selectWarehouses(GETPOST("fk_entrepot") ?GETPOST("fk_entrepot") : ($objp->warehouse_id ? $objp->warehouse_id : ''), "fk_entrepot", '', 1, 0, $objp->fk_product, '', 1, 1, null, 'csswarehouse');
 					} elseif (count($listwarehouses) == 1) {
@@ -1241,8 +1233,7 @@ if ($id > 0 || !empty($ref)) {
 						$langs->load("errors");
 						print $langs->trans("ErrorNoWarehouseDefined");
 					}
-				}
-				else {
+				} else {
 					$warehouse_static->id = $objp->warehouse_id;
 					$warehouse_static->libelle = $objp->entrepot;
 					print $warehouse_static->getNomUrl(1);
@@ -1262,8 +1253,7 @@ if ($id > 0 || !empty($ref)) {
 
 					// Add button to check/uncheck disaptching
 					print '<td class="center">';
-					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check)))
-					{
+					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande->receptionner)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->fournisseur->commande_advance->check))) {
 						if (empty($objp->status)) {
 							print '<a class="button buttonRefused" href="#">'.$langs->trans("Approve").'</a>';
 							print '<a class="button buttonRefused" href="#">'.$langs->trans("Deny").'</a>';
@@ -1273,8 +1263,9 @@ if ($id > 0 || !empty($ref)) {
 						}
 					} else {
 						$disabled = '';
-						if ($object->statut == 5)
+						if ($object->statut == 5) {
 							$disabled = 1;
+						}
 						if (empty($objp->status)) {
 							print '<a class="button'.($disabled ? ' buttonRefused' : '').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=checkdispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Approve").'</a>';
 							print '<a class="button'.($disabled ? ' buttonRefused' : '').'" href="'.$_SERVER["PHP_SELF"]."?id=".$id."&action=denydispatchline&lineid=".$objp->dispatchlineid.'">'.$langs->trans("Deny").'</a>';
@@ -1297,8 +1288,7 @@ if ($id > 0 || !empty($ref)) {
 					print '</td>';
 				}
 
-				if ($action != 'editline' || $lineid != $objp->dispatchlineid)
-				{
+				if ($action != 'editline' || $lineid != $objp->dispatchlineid) {
 					print '<td class="linecoledit center">';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid='.$objp->dispatchlineid.'#line_'.$objp->dispatchlineid.'">';
 					print img_edit();
@@ -1310,8 +1300,7 @@ if ($id > 0 || !empty($ref)) {
 					print img_delete();
 					print '</a>';
 					print '</td>';
-				}
-				else {
+				} else {
 					print '<td class="center valignmiddle">';
 					print '<input type="submit" class="button button-save" id="savelinebutton" name="save" value="'.$langs->trans("Save").'" />';
 					print '</td>';
@@ -1322,7 +1311,9 @@ if ($id > 0 || !empty($ref)) {
 
 
 				print "</tr>\n";
-				if ($action == 'editline' && $lineid == $objp->dispatchlineid)  print '</form>';
+				if ($action == 'editline' && $lineid == $objp->dispatchlineid) {
+					print '</form>';
+				}
 
 				$i++;
 			}
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index 293edb549ea..3bc2a799a5f 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -47,7 +47,9 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 // Get parameters
@@ -55,17 +57,22 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 
 $object = new CommandeFournisseur($db);
-if ($object->fetch($id, $ref) < 0)
-{
+if ($object->fetch($id, $ref) < 0) {
 	dol_print_error($db);
 	exit;
 }
@@ -87,8 +94,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 $form = new	Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 	llxHeader('', $langs->trans("Order"), $help_url);
 
@@ -105,8 +111,7 @@ if ($object->id > 0)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
@@ -121,12 +126,10 @@ if ($object->id > 0)
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->fournisseur->commande->creer)
-		{
+		if ($user->rights->fournisseur->commande->creer) {
 			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 1e9e69fb8cd..d46456b52dc 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -32,7 +32,9 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
 // Security check
 $orderid = GETPOST('orderid');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 
 $hookmanager = new HookManager($db);
@@ -59,8 +61,7 @@ print load_fiche_titre($langs->trans("SuppliersOrdersArea"), '', 'supplier_order
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {     // This is useless due to the global search combo
 	print '<form method="post" action="list.php">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<div class="div-table-responsive-no-min">';
@@ -79,16 +80,21 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
 $sql = "SELECT count(cf.rowid) as nb, fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE cf.fk_soc = s.rowid";
 $sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
-if ($user->socid) $sql .= ' AND cf.fk_soc = '.$user->socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if ($user->socid) {
+	$sql .= ' AND cf.fk_soc = '.$user->socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 $sql .= " GROUP BY cf.fk_statut";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -98,11 +104,9 @@ if ($resql)
 	//	0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
 	//	-> 7=Canceled/Never received -> (reopen) 3=Process runing
 	//	-> 6=Canceled -> (reopen) 2=Approved
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
-		if ($obj)
-		{
+		if ($obj) {
 			$vals[($obj->status == CommandeFournisseur::STATUS_CANCELED_AFTER_ORDER ? CommandeFournisseur::STATUS_CANCELED : $obj->status)] = $obj->nb;
 
 			$total += $obj->nb;
@@ -118,28 +122,41 @@ if ($resql)
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SuppliersOrders").'</th></tr>';
 	print "</tr>\n";
 	$listofstatus = array(0, 1, 2, 3, 4, 5, 6, 9);
-	foreach ($listofstatus as $status)
-	{
+	foreach ($listofstatus as $status) {
 		$dataseries[] = array($commandestatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-		if ($status == CommandeFournisseur::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
-		if ($status == CommandeFournisseur::STATUS_VALIDATED) $colorseries[$status] = '-'.$badgeStatus1;
-		if ($status == CommandeFournisseur::STATUS_ACCEPTED) $colorseries[$status] = $badgeStatus1;
-		if ($status == CommandeFournisseur::STATUS_REFUSED) $colorseries[$status] = $badgeStatus9;
-		if ($status == CommandeFournisseur::STATUS_ORDERSENT) $colorseries[$status] = $badgeStatus4;
-		if ($status == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY) $colorseries[$status] = '-'.$badgeStatus4;
-		if ($status == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $colorseries[$status] = $badgeStatus6;
-		if ($status == CommandeFournisseur::STATUS_CANCELED || $status == CommandeFournisseur::STATUS_CANCELED_AFTER_ORDER) $colorseries[$status] = $badgeStatus9;
+		if ($status == CommandeFournisseur::STATUS_DRAFT) {
+			$colorseries[$status] = '-'.$badgeStatus0;
+		}
+		if ($status == CommandeFournisseur::STATUS_VALIDATED) {
+			$colorseries[$status] = '-'.$badgeStatus1;
+		}
+		if ($status == CommandeFournisseur::STATUS_ACCEPTED) {
+			$colorseries[$status] = $badgeStatus1;
+		}
+		if ($status == CommandeFournisseur::STATUS_REFUSED) {
+			$colorseries[$status] = $badgeStatus9;
+		}
+		if ($status == CommandeFournisseur::STATUS_ORDERSENT) {
+			$colorseries[$status] = $badgeStatus4;
+		}
+		if ($status == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY) {
+			$colorseries[$status] = '-'.$badgeStatus4;
+		}
+		if ($status == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) {
+			$colorseries[$status] = $badgeStatus6;
+		}
+		if ($status == CommandeFournisseur::STATUS_CANCELED || $status == CommandeFournisseur::STATUS_CANCELED_AFTER_ORDER) {
+			$colorseries[$status] = $badgeStatus9;
+		}
 
-		if (!$conf->use_javascript_ajax)
-		{
+		if (!$conf->use_javascript_ajax) {
 			print '<tr class="oddeven">';
 			print '<td>'.$commandestatic->LibStatut($status, 0).'</td>';
 			print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
 			print "</tr>\n";
 		}
 	}
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		print '<tr class="impair"><td class="center" colspan="2">';
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -168,32 +185,34 @@ if ($resql)
  * Draft orders
  */
 
-if (!empty($conf->fournisseur->enabled))
-{
+if (!empty($conf->fournisseur->enabled)) {
 	$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity IN (".getEntity("supplier_order").")"; // Thirdparty sharing is mandatory with supplier order sharing
 	$sql .= " AND c.fk_statut = 0";
-	if (!empty($socid)) $sql .= " AND c.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if (!empty($socid)) {
+		$sql .= " AND c.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("DraftOrders").'</th></tr>';
 		$langs->load("orders");
 		$num = $db->num_rows($resql);
-		if ($num)
-		{
+		if ($num) {
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
@@ -218,8 +237,7 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_T
 }
 $sql .= " u.rowid, u.lastname, u.firstname, u.email, u.statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-{
+if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 	$sql .= ",".MAIN_DB_PREFIX."usergroup_user as ug";
 	$sql .= " WHERE ((ug.fk_user = u.rowid";
 	$sql .= " AND ug.entity IN (".getEntity('usergroup')."))";
@@ -230,8 +248,7 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_T
 $sql .= " AND u.fk_soc IS NULL"; // An external user can not approved
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -240,16 +257,14 @@ if ($resql)
 	print '<tr class="liste_titre"><th>'.$langs->trans("UserWithApproveOrderGrant").'</th>';
 	print "</tr>\n";
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		$userstatic = new User($db);
 		$userstatic->id = $obj->rowid;
 		$userstatic->getrights('fournisseur');
 
-		if (!empty($userstatic->rights->fournisseur->commande->approuver))
-		{
+		if (!empty($userstatic->rights->fournisseur->commande->approuver)) {
 			print '<tr class="oddeven">';
 			print '<td>';
 			$userstatic->lastname = $obj->lastname;
@@ -281,29 +296,32 @@ $max = 5;
 $sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.tms, c.billed, s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE c.fk_soc = s.rowid";
 $sql .= " AND c.entity = ".$conf->entity;
 //$sql.= " AND c.fk_statut > 2";
-if (!empty($socid)) $sql .= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if (!empty($socid)) {
+	$sql .= " AND c.fk_soc = ".$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 $sql .= " ORDER BY c.tms DESC";
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th colspan="4">'.$langs->trans("LastModifiedOrders", $max).'</th></tr>';
 
 	$num = $db->num_rows($resql);
-	if ($num)
-	{
+	if ($num) {
 		$i = 0;
-		while ($i < $num)
-		{
+		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
 
 			print '<tr class="oddeven">';
@@ -338,7 +356,9 @@ if ($resql)
 		}
 	}
 	print "</table></div><br>";
-} else dol_print_error($db);
+} else {
+	dol_print_error($db);
+}
 
 
 /*
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index a50cbbdad39..60c67fdd0e8 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -44,17 +44,24 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'a.datep,a.id';
-if (!$sortorder) $sortorder = 'DESC,DESC';
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
 
-if (GETPOST('actioncode', 'array'))
-{
+if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECTS));
 }
@@ -62,10 +69,14 @@ $search_agenda_label = GETPOST('search_agenda_label');
 
 // Security check
 $socid = 0;
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
-if (!$user->rights->fournisseur->commande->lire)	accessforbidden();
+if (!$user->rights->fournisseur->commande->lire) {
+	accessforbidden();
+}
 
 
 
@@ -76,11 +87,12 @@ if (!$user->rights->fournisseur->commande->lire)	accessforbidden();
 
 $parameters = array('id'=>$id);
 $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');
+}
 
 // Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 	$actioncode = '';
 	$search_agenda_label = '';
 }
@@ -94,15 +106,16 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 $form = new	Form($db);
 $object = new CommandeFournisseur($db);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
 	$object->info($object->id);
 }
 
 $title = $langs->trans("SupplierOrder").' - '.$object->ref.' '.$object->name;
-if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
+	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
+}
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 llxHeader('', $title, $help_url);
 
@@ -125,12 +138,10 @@ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled))
-{
+if (!empty($conf->projet->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	if ($user->rights->fournisseur->commande->creer)
-	{
+	if ($user->rights->fournisseur->commande->creer) {
 		if ($action != 'classify') {
 			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 			$morehtmlref .= ' : ';
@@ -181,18 +192,15 @@ print dol_get_fiche_end();
 
 $out = '';
 $permok = $user->rights->agenda->myactions->create;
-if ($permok)
-{
+if ($permok) {
 	$out .= '&originid='.$object->id.'&origin=order_supplier';
 }
 
 
 print '<div class="tabsAction">';
 
-if (!empty($conf->agenda->enabled))
-{
-	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-	{
+if (!empty($conf->agenda->enabled)) {
+	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 		print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
 	} else {
 		print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
@@ -202,18 +210,21 @@ if (!empty($conf->agenda->enabled))
 print '</div>';
 
 
-if (!empty($object->id))
-{
+if (!empty($object->id)) {
 	$param = '&id='.$object->id;
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.$contextpage;
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.$limit;
+	}
 
 	print load_fiche_titre($langs->trans("ActionsOnOrder"), '', '');
 
 	// List of actions on element
 	/*include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-    $formactions=new FormActions($db);
-    $somethingshown = $formactions->showactions($object,'project',0);*/
+	$formactions=new FormActions($db);
+	$somethingshown = $formactions->showactions($object,'project',0);*/
 
 	// List of todo actions
 	//show_actions_todo($conf,$langs,$db,$object,null,0,$actioncode);
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 0918b316fb3..e35d9d84824 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -99,7 +99,9 @@ if (is_array(GETPOST('search_status', 'intcomma'))) {
 
 // Security check
 $orderid = GETPOST('orderid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $orderid, '', 'commande');
 
 $diroutputmassaction = $conf->fournisseur->commande->dir_output.'/temp/massgeneration/'.$user->id;
@@ -108,14 +110,22 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1 || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'cf.ref';
-if (!$sortorder) $sortorder = 'DESC';
+if (!$sortfield) {
+	$sortfield = 'cf.ref';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
 
-if ($search_status == '') $search_status = -1;
+if ($search_status == '') {
+	$search_status = -1;
+}
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new CommandeFournisseur($db);
@@ -138,7 +148,9 @@ $fieldstosearchall = array(
 	's.town'=>"Town",
 	'cf.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["cf.note_private"] = "NotePrivate";
+if (empty($user->socid)) {
+	$fieldstosearchall["cf.note_private"] = "NotePrivate";
+}
 
 $checkedtypetiers = 0;
 $arrayfields = array(
@@ -180,21 +192,25 @@ $error = 0;
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createsupplierbills') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createsupplierbills') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// 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
 		$search_categ = '';
 		$search_user = '';
 		$search_sale = '';
@@ -231,8 +247,7 @@ if (empty($reshook))
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -245,8 +260,7 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// Mass action to generate vendor bills
-	if ($massaction == 'confirm_createsupplierbills')
-	{
+	if ($massaction == 'confirm_createsupplierbills') {
 		$orders = GETPOST('toselect', 'array');
 		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
 		$validate_invoices = GETPOST('validate_invoices', 'int');
@@ -262,7 +276,9 @@ if (empty($reshook))
 
 		foreach ($orders as $id_order) {
 			$cmd = new CommandeFournisseur($db);
-			if ($cmd->fetch($id_order) <= 0) continue;
+			if ($cmd->fetch($id_order) <= 0) {
+				continue;
+			}
 
 			$objecttmp = new FactureFournisseur($db);
 			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
@@ -274,11 +290,12 @@ if (empty($reshook))
 				$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))
-				{
+				if (empty($datefacture)) {
 					$datefacture = dol_now();
 				}
 
@@ -295,8 +312,7 @@ if (empty($reshook))
 				}
 			}
 
-			if ($objecttmp->id > 0)
-			{
+			if ($objecttmp->id > 0) {
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."element_element (";
 				$sql .= "fk_source";
 				$sql .= ", sourcetype";
@@ -309,16 +325,13 @@ if (empty($reshook))
 				$sql .= ", '".$db->escape($objecttmp->element)."'";
 				$sql .= ")";
 
-				if (!$db->query($sql))
-				{
+				if (!$db->query($sql)) {
 					$erorr++;
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$lines = $cmd->lines;
-					if (empty($lines) && method_exists($cmd, 'fetch_lines'))
-					{
+					if (empty($lines) && method_exists($cmd, 'fetch_lines')) {
 						$cmd->fetch_lines();
 						$lines = $cmd->lines;
 					}
@@ -326,11 +339,9 @@ if (empty($reshook))
 					$fk_parent_line = 0;
 					$num = count($lines);
 
-					for ($i = 0; $i < $num; $i++)
-					{
+					for ($i = 0; $i < $num; $i++) {
 						$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
-						if ($lines[$i]->subprice < 0)
-						{
+						if ($lines[$i]->subprice < 0) {
 							// Negative line, we create a discount line
 							$discount = new DiscountAbsolute($db);
 							$discount->fk_soc = $objecttmp->socid;
@@ -341,8 +352,7 @@ if (empty($reshook))
 							$discount->fk_user = $user->id;
 							$discount->description = $desc;
 							$discountid = $discount->create($user);
-							if ($discountid > 0)
-							{
+							if ($discountid > 0) {
 								$result = $objecttmp->insert_discount($discountid);
 								//$result=$discount->link_to_invoice($lineid,$id);
 							} else {
@@ -355,17 +365,28 @@ if (empty($reshook))
 							$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)
-							{
+							if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
 								$fk_parent_line = 0;
 							}
 							$result = $objecttmp->addline(
@@ -393,8 +414,7 @@ if (empty($reshook))
 								$lines[$i]->special_code,
 								$fk_parent_line
 							);
-							if ($result > 0)
-							{
+							if ($result > 0) {
 								$lineid = $result;
 							} else {
 								$lineid = 0;
@@ -402,8 +422,7 @@ if (empty($reshook))
 								break;
 							}
 							// Defined the new fk_parent_line
-							if ($result > 0 && $lines[$i]->product_type == 9)
-							{
+							if ($result > 0 && $lines[$i]->product_type == 9) {
 								$fk_parent_line = $result;
 							}
 						}
@@ -413,8 +432,11 @@ if (empty($reshook))
 
 			$cmd->classifyBilled($user); // TODO Move this in workflow like done for customer orders
 
-			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
@@ -424,11 +446,9 @@ if (empty($reshook))
 		if (!$error && $validate_invoices) {
 			$massaction = $action = 'builddoc';
 
-			foreach ($TAllFact as &$objecttmp)
-			{
+			foreach ($TAllFact as &$objecttmp) {
 				$objecttmp->validate($user);
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					$error++;
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					break;
@@ -446,8 +466,7 @@ if (empty($reshook))
 			$massaction = $action = 'confirm_createsupplierbills';
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->commit();
 
 			if ($nb_bills_created == 1) {
@@ -460,29 +479,73 @@ if (empty($reshook))
 
 			// 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 (!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_tva != '') $param .= '&search_total_tva='.urlencode($search_total_tva);
-			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 ($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_tva != '') {
+				$param .= '&search_total_tva='.urlencode($search_total_tva);
+			}
+			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;
@@ -513,8 +576,7 @@ $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 
 $title = $langs->trans("ListOfSupplierOrders");
-if ($socid > 0)
-{
+if ($socid > 0) {
 	$fourn = new Fournisseur($db);
 	$fourn->fetch($socid);
 	$title .= ' - '.$fourn->name;
@@ -528,14 +590,18 @@ if ($socid > 0)
 	elseif ($search_status == '6,7') $title .= ' - '.$langs->trans("StatusOrderCanceled");
 	elseif (is_numeric($search_status) && $search_status >= 0) $title .= ' - '.$commandestatic->LibStatut($search_status);
 }*/
-if ($search_billed > 0) $title .= ' - '.$langs->trans("Billed");
+if ($search_billed > 0) {
+	$title .= ' - '.$langs->trans("Billed");
+}
 
 //$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
 $help_url = '';
 // llxHeader('',$title,$help_url);
 
 $sql = 'SELECT';
-if ($sall || $search_product_category > 0 || $search_user > 0) $sql = 'SELECT DISTINCT';
+if ($sall || $search_product_category > 0 || $search_user > 0) {
+	$sql = 'SELECT DISTINCT';
+}
 $sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, s.email,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
@@ -547,7 +613,9 @@ $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_title,
 $sql .= " u.firstname, u.lastname, u.photo, u.login, u.email as user_email";
 // 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();
@@ -558,15 +626,22 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
 $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-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 (cf.rowid = ef.fk_object)";
-if ($sall || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseurdet as pd ON cf.rowid=pd.fk_commande';
-if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+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 (cf.rowid = ef.fk_object)";
+}
+if ($sall || $search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'commande_fournisseurdet as pd ON cf.rowid=pd.fk_commande';
+}
+if ($search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON cf.fk_user_author = u.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cf.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-if ($search_user > 0)
-{
+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
@@ -575,39 +650,93 @@ $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object
 $sql .= $hookmanager->resPrint;
 $sql .= ' WHERE cf.fk_soc = s.rowid';
 $sql .= ' AND cf.entity IN ('.getEntity('supplier_order').')';
-if ($socid > 0) $sql .= " AND s.rowid = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($search_ref) $sql .= natural_search('cf.ref', $search_ref);
-if ($search_refsupp) $sql .= natural_search("cf.ref_supplier", $search_refsupp);
-if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_request_author) $sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_request_author);
-if ($search_billed != '' && $search_billed >= 0) $sql .= " AND cf.billed = ".$db->escape($search_billed);
-if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
+if ($socid > 0) {
+	$sql .= " AND s.rowid = ".$socid;
+}
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($search_ref) {
+	$sql .= natural_search('cf.ref', $search_ref);
+}
+if ($search_refsupp) {
+	$sql .= natural_search("cf.ref_supplier", $search_refsupp);
+}
+if ($sall) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+}
+if ($search_company) {
+	$sql .= natural_search('s.nom', $search_company);
+}
+if ($search_request_author) {
+	$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_request_author);
+}
+if ($search_billed != '' && $search_billed >= 0) {
+	$sql .= " AND cf.billed = ".$db->escape($search_billed);
+}
+if ($search_product_category > 0) {
+	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+}
 //Required triple check because statut=0 means draft filter
-if (GETPOST('statut', 'intcomma') !== '')
+if (GETPOST('statut', 'intcomma') !== '') {
 	$sql .= " AND cf.fk_statut IN (".$db->sanitize($db->escape($db->escape(GETPOST('statut', 'intcomma')))).")";
-if ($search_status != '' && $search_status != '-1')
+}
+if ($search_status != '' && $search_status != '-1') {
 	$sql .= " AND cf.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
+}
 $sql .= dolSqlDateFilter("cf.date_commande", $search_orderday, $search_ordermonth, $search_orderyear);
 $sql .= dolSqlDateFilter("cf.date_livraison", $search_deliveryday, $search_deliverymonth, $search_deliveryyear);
-if ($search_town)  $sql .= natural_search('s.town', $search_town);
-if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
-if ($search_state) $sql .= natural_search("state.nom", $search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
-if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) $sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
-if ($search_user > 0) $sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$db->escape($search_user);
-if ($search_total_ht != '') $sql .= natural_search('cf.total_ht', $search_total_ht, 1);
-if ($search_total_tva != '') $sql .= natural_search('cf.total_tva', $search_total_tva, 1);
-if ($search_total_ttc != '') $sql .= natural_search('cf.total_ttc', $search_total_ttc, 1);
-if ($search_multicurrency_code != '')        $sql .= ' AND cf.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
-if ($search_multicurrency_tx != '')          $sql .= natural_search('cf.multicurrency_tx', $search_multicurrency_tx, 1);
-if ($search_multicurrency_montant_ht != '')  $sql .= natural_search('cf.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
-if ($search_multicurrency_montant_tva != '') $sql .= natural_search('cf.multicurrency_total_tva', $search_multicurrency_montant_tva, 1);
-if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('cf.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
-if ($search_project_ref != '') $sql .= natural_search("p.ref", $search_project_ref);
+if ($search_town) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+	$sql .= natural_search("s.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_country) {
+	$sql .= " AND s.fk_pays IN (".$db->sanitize($db->escape($search_country)).')';
+}
+if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
+	$sql .= " AND s.fk_typent IN (".$db->sanitize($db->escape($search_type_thirdparty)).')';
+}
+if ($search_company) {
+	$sql .= natural_search('s.nom', $search_company);
+}
+if ($search_sale > 0) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
+}
+if ($search_user > 0) {
+	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='supplier_order' AND tc.source='internal' AND ec.element_id = cf.rowid AND ec.fk_socpeople = ".$db->escape($search_user);
+}
+if ($search_total_ht != '') {
+	$sql .= natural_search('cf.total_ht', $search_total_ht, 1);
+}
+if ($search_total_tva != '') {
+	$sql .= natural_search('cf.total_tva', $search_total_tva, 1);
+}
+if ($search_total_ttc != '') {
+	$sql .= natural_search('cf.total_ttc', $search_total_ttc, 1);
+}
+if ($search_multicurrency_code != '') {
+	$sql .= ' AND cf.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+}
+if ($search_multicurrency_tx != '') {
+	$sql .= natural_search('cf.multicurrency_tx', $search_multicurrency_tx, 1);
+}
+if ($search_multicurrency_montant_ht != '') {
+	$sql .= natural_search('cf.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
+}
+if ($search_multicurrency_montant_tva != '') {
+	$sql .= natural_search('cf.multicurrency_total_tva', $search_multicurrency_montant_tva, 1);
+}
+if ($search_multicurrency_montant_ttc != '') {
+	$sql .= natural_search('cf.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+}
+if ($search_project_ref != '') {
+	$sql .= natural_search("p.ref", $search_project_ref);
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -619,12 +748,10 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -634,14 +761,12 @@ $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-	{
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 		$obj = $db->fetch_object($resql);
 		$id = $obj->rowid;
 		header("Location: ".DOL_URL_ROOT.'/fourn/commande/card.php?id='.$id);
@@ -651,36 +776,96 @@ if ($resql)
 	llxHeader('', $title, $help_url);
 
 	$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 ($sall)					$param .= "&search_all=".urlencode($sall);
-	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_user > 0) 		$param .= '&search_user='.urlencode($search_user);
-	if ($search_request_author) $param .= '&search_request_author='.urlencode($search_request_author);
-	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_ttc != '') $param .= "&search_total_ttc=".urlencode($search_total_ttc);
-	if ($search_multicurrency_code != '')  $param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
-	if ($search_multicurrency_tx != '')  $param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
-	if ($search_multicurrency_montant_ht != '')  $param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
-	if ($search_multicurrency_montant_tva != '')  $param .= '&search_multicurrency_montant_tva='.urlencode($search_multicurrency_montant_tva);
-	if ($search_multicurrency_montant_ttc != '') $param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
-	if ($search_refsupp) 		$param .= "&search_refsupp=".urlencode($search_refsupp);
-	if ($search_status != '' && $search_status != '-1') $param .= "&search_status=".urlencode($search_status);
-	if ($search_project_ref >= 0) $param .= "&search_project_ref=".urlencode($search_project_ref);
-	if ($search_billed != '')   $param .= "&search_billed=".urlencode($search_billed);
-	if ($show_files)            $param .= '&show_files='.urlencode($show_files);
-	if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
-	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)   $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	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 ($sall) {
+		$param .= "&search_all=".urlencode($sall);
+	}
+	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_user > 0) {
+		$param .= '&search_user='.urlencode($search_user);
+	}
+	if ($search_request_author) {
+		$param .= '&search_request_author='.urlencode($search_request_author);
+	}
+	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_ttc != '') {
+		$param .= "&search_total_ttc=".urlencode($search_total_ttc);
+	}
+	if ($search_multicurrency_code != '') {
+		$param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
+	}
+	if ($search_multicurrency_tx != '') {
+		$param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
+	}
+	if ($search_multicurrency_montant_ht != '') {
+		$param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
+	}
+	if ($search_multicurrency_montant_tva != '') {
+		$param .= '&search_multicurrency_montant_tva='.urlencode($search_multicurrency_montant_tva);
+	}
+	if ($search_multicurrency_montant_ttc != '') {
+		$param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
+	}
+	if ($search_refsupp) {
+		$param .= "&search_refsupp=".urlencode($search_refsupp);
+	}
+	if ($search_status != '' && $search_status != '-1') {
+		$param .= "&search_status=".urlencode($search_status);
+	}
+	if ($search_project_ref >= 0) {
+		$param .= "&search_project_ref=".urlencode($search_project_ref);
+	}
+	if ($search_billed != '') {
+		$param .= "&search_billed=".urlencode($search_billed);
+	}
+	if ($show_files) {
+		$param .= '&show_files='.urlencode($show_files);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
+	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
+		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -695,18 +880,28 @@ if ($resql)
 		'builddoc'=>$langs->trans("PDFMerge"),
 		'presend'=>$langs->trans("SendByMail"),
 	);
-	if ($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisSupplier");
-	if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
+	if ($user->rights->fournisseur->facture->creer) {
+		$arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisSupplier");
+	}
+	if ($user->rights->fournisseur->commande->supprimer) {
+		$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$url = DOL_URL_ROOT.'/fourn/commande/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewOrder'), '', 'fa fa-plus-circle', $url, '', $user->rights->fournisseur->commande->creer);
 
 	// Lines of title fields
 	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">';
@@ -723,8 +918,7 @@ if ($resql)
 	$trackid = 'sord'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($massaction == 'createbills')
-	{
+	if ($massaction == 'createbills') {
 		//var_dump($_REQUEST);
 		print '<input type="hidden" name="massaction" value="confirm_createsupplierbills">';
 
@@ -763,17 +957,17 @@ if ($resql)
 		print '<br>';
 	}
 
-	if ($sall)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($sall) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
 	}
 
 	$moreforfilter = '';
 
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid)
-	{
+	if ($user->rights->societe->client->voir || $socid) {
 		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
@@ -781,16 +975,14 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view other users
-	if ($user->rights->user->user->lire)
-	{
+	if ($user->rights->user->user->lire) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
 		$moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
@@ -800,11 +992,13 @@ if ($resql)
 	}
 	$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))
-	{
+	if (!empty($moreforfilter)) {
 		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
@@ -829,126 +1023,116 @@ if ($resql)
 
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (!empty($arrayfields['cf.ref']['checked']))
-	{
+	if (!empty($arrayfields['cf.ref']['checked'])) {
 		print '<td class="liste_titre"><input size="8" type="text" class="flat maxwidth75" name="search_ref" value="'.$search_ref.'"></td>';
 	}
 	// Ref customer
-	if (!empty($arrayfields['cf.ref_supplier']['checked']))
-	{
+	if (!empty($arrayfields['cf.ref_supplier']['checked'])) {
 		print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_refsupp" value="'.$search_refsupp.'"></td>';
 	}
 	// Project ref
-	if (!empty($arrayfields['p.project_ref']['checked']))
-	{
+	if (!empty($arrayfields['p.project_ref']['checked'])) {
 		print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_project_ref" value="'.$search_project_ref.'"></td>';
 	}
 	// Request author
-	if (!empty($arrayfields['u.login']['checked']))
-	{
+	if (!empty($arrayfields['u.login']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input type="text" class="flat" size="6" name="search_request_author" value="'.$search_request_author.'">';
 		print '</td>';
 	}
 	// Thirpdarty
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre"><input type="text" size="6" class="flat" name="search_company" value="'.$search_company.'"></td>';
 	}
 	// Town
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
+	}
 	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_zip" value="'.$search_zip.'"></td>';
+	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="liste_titre center">';
 		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 		print '</td>';
 	}
 	// Company type
-	if (!empty($arrayfields['typent.code']['checked']))
-	{
+	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Date order
-	if (!empty($arrayfields['cf.date_commande']['checked']))
-	{
+	if (!empty($arrayfields['cf.date_commande']['checked'])) {
 		print '<td class="liste_titre nowraponall center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_orderday" value="'.$search_orderday.'">';
+		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+			print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_orderday" value="'.$search_orderday.'">';
+		}
 		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_ordermonth" value="'.$search_ordermonth.'">';
 		$formother->select_year($search_orderyear ? $search_orderyear : -1, 'search_orderyear', 1, 20, 5);
 		print '</td>';
 	}
 	// Date delivery
-	if (!empty($arrayfields['cf.date_livraison']['checked']))
-	{
+	if (!empty($arrayfields['cf.date_livraison']['checked'])) {
 		print '<td class="liste_titre nowraponall center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_deliveryday" value="'.$search_deliveryday.'">';
+		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+			print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_deliveryday" value="'.$search_deliveryday.'">';
+		}
 		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_deliverymonth" value="'.$search_deliverymonth.'">';
 		$formother->select_year($search_deliveryyear ? $search_deliveryyear : -1, 'search_deliveryyear', 1, 20, 5);
 		print '</td>';
 	}
-	if (!empty($arrayfields['cf.total_ht']['checked']))
-	{
+	if (!empty($arrayfields['cf.total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_total_ht" value="'.$search_total_ht.'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['cf.total_tva']['checked']))
-	{
+	if (!empty($arrayfields['cf.total_tva']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_total_tva" value="'.$search_total_tva.'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['cf.total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['cf.total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_total_ttc" value="'.$search_total_ttc.'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['cf.multicurrency_code']['checked']))
-	{
+	if (!empty($arrayfields['cf.multicurrency_code']['checked'])) {
 		// Currency
 		print '<td class="liste_titre">';
 		print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['cf.multicurrency_tx']['checked']))
-	{
+	if (!empty($arrayfields['cf.multicurrency_tx']['checked'])) {
 		// Currency rate
 		print '<td class="liste_titre">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_tx" value="'.dol_escape_htmltag($search_multicurrency_tx).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['cf.multicurrency_total_ht']['checked']))
-	{
+	if (!empty($arrayfields['cf.multicurrency_total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ht" value="'.dol_escape_htmltag($search_multicurrency_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['cf.multicurrency_total_tva']['checked']))
-	{
+	if (!empty($arrayfields['cf.multicurrency_total_tva']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_tva" value="'.dol_escape_htmltag($search_multicurrency_montant_tva).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['cf.multicurrency_total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['cf.multicurrency_total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
@@ -962,27 +1146,23 @@ if ($resql)
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['cf.datec']['checked']))
-	{
+	if (!empty($arrayfields['cf.datec']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['cf.tms']['checked']))
-	{
+	if (!empty($arrayfields['cf.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['cf.fk_statut']['checked']))
-	{
+	if (!empty($arrayfields['cf.fk_statut']['checked'])) {
 		print '<td class="liste_titre right">';
 		$formorder->selectSupplierOrderStatus($search_status, 1, 'search_status');
 		print '</td>';
 	}
 	// Status billed
-	if (!empty($arrayfields['cf.billed']['checked']))
-	{
+	if (!empty($arrayfields['cf.billed']['checked'])) {
 		print '<td class="liste_titre center">';
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
@@ -997,37 +1177,87 @@ if ($resql)
 
 	// Fields title
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['cf.ref']['checked']))            print_liste_field_titre($arrayfields['cf.ref']['label'], $_SERVER["PHP_SELF"], "cf.ref", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['cf.ref_supplier']['checked']))   print_liste_field_titre($arrayfields['cf.ref_supplier']['label'], $_SERVER["PHP_SELF"], "cf.ref_supplier", "", $param, '', $sortfield, $sortorder, 'tdoverflowmax100imp ');
-	if (!empty($arrayfields['p.project_ref']['checked'])) 	   print_liste_field_titre($arrayfields['p.project_ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['u.login']['checked'])) 	       print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], "u.login", "", $param, '', $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['s.town']['checked']))            print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.zip']['checked']))             print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['typent.code']['checked']))       print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['cf.fk_author']['checked']))      print_liste_field_titre($arrayfields['cf.fk_author']['label'], $_SERVER["PHP_SELF"], "cf.fk_author", "", $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['cf.date_commande']['checked']))  print_liste_field_titre($arrayfields['cf.date_commande']['label'], $_SERVER["PHP_SELF"], "cf.date_commande", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['cf.date_livraison']['checked'])) print_liste_field_titre($arrayfields['cf.date_livraison']['label'], $_SERVER["PHP_SELF"], 'cf.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['cf.total_ht']['checked']))       print_liste_field_titre($arrayfields['cf.total_ht']['label'], $_SERVER["PHP_SELF"], "cf.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['cf.total_tva']['checked']))      print_liste_field_titre($arrayfields['cf.total_tva']['label'], $_SERVER["PHP_SELF"], "cf.total_tva", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['cf.total_ttc']['checked']))      print_liste_field_titre($arrayfields['cf.total_ttc']['label'], $_SERVER["PHP_SELF"], "cf.total_ttc", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['cf.multicurrency_code']['checked']))          print_liste_field_titre($arrayfields['cf.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_code', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['cf.multicurrency_tx']['checked']))            print_liste_field_titre($arrayfields['cf.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['cf.multicurrency_total_ht']['checked']))      print_liste_field_titre($arrayfields['cf.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['cf.multicurrency_total_tva']['checked']))     print_liste_field_titre($arrayfields['cf.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['cf.multicurrency_total_ttc']['checked']))     print_liste_field_titre($arrayfields['cf.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['cf.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.ref']['label'], $_SERVER["PHP_SELF"], "cf.ref", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['cf.ref_supplier']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.ref_supplier']['label'], $_SERVER["PHP_SELF"], "cf.ref_supplier", "", $param, '', $sortfield, $sortorder, 'tdoverflowmax100imp ');
+	}
+	if (!empty($arrayfields['p.project_ref']['checked'])) {
+		print_liste_field_titre($arrayfields['p.project_ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['u.login']['checked'])) {
+		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], "u.login", "", $param, '', $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['s.town']['checked'])) {
+		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $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, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['typent.code']['checked'])) {
+		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['cf.fk_author']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.fk_author']['label'], $_SERVER["PHP_SELF"], "cf.fk_author", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['cf.date_commande']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.date_commande']['label'], $_SERVER["PHP_SELF"], "cf.date_commande", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['cf.date_livraison']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.date_livraison']['label'], $_SERVER["PHP_SELF"], 'cf.date_livraison', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['cf.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.total_ht']['label'], $_SERVER["PHP_SELF"], "cf.total_ht", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['cf.total_tva']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.total_tva']['label'], $_SERVER["PHP_SELF"], "cf.total_tva", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['cf.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.total_ttc']['label'], $_SERVER["PHP_SELF"], "cf.total_ttc", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['cf.multicurrency_code']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['cf.multicurrency_tx']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['cf.multicurrency_total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['cf.multicurrency_total_tva']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.multicurrency_total_tva']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['cf.multicurrency_total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'cf.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
 	// 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); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (!empty($arrayfields['cf.datec']['checked']))     print_liste_field_titre($arrayfields['cf.datec']['label'], $_SERVER["PHP_SELF"], "cf.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['cf.tms']['checked']))       print_liste_field_titre($arrayfields['cf.tms']['label'], $_SERVER["PHP_SELF"], "cf.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['cf.fk_statut']['checked'])) print_liste_field_titre($arrayfields['cf.fk_statut']['label'], $_SERVER["PHP_SELF"], "cf.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['cf.billed']['checked']))    print_liste_field_titre($arrayfields['cf.billed']['label'], $_SERVER["PHP_SELF"], 'cf.billed', '', $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['cf.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.datec']['label'], $_SERVER["PHP_SELF"], "cf.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['cf.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.tms']['label'], $_SERVER["PHP_SELF"], "cf.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['cf.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.fk_statut']['label'], $_SERVER["PHP_SELF"], "cf.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['cf.billed']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.billed']['label'], $_SERVER["PHP_SELF"], 'cf.billed', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
@@ -1042,8 +1272,7 @@ if ($resql)
 
 	$i = 0;
 	$totalarray = array();
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($resql);
 
 		$notshippable = 0;
@@ -1067,8 +1296,7 @@ if ($resql)
 		print '<tr class="oddeven">';
 
 		// Ref
-		if (!empty($arrayfields['cf.ref']['checked']))
-		{
+		if (!empty($arrayfields['cf.ref']['checked'])) {
 			print '<td class="nowrap">';
 
 			// Picto + Ref
@@ -1079,24 +1307,30 @@ if ($resql)
 			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
 
 			print '</td>'."\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Ref Supplier
-		if (!empty($arrayfields['cf.ref_supplier']['checked']))
-		{
+		if (!empty($arrayfields['cf.ref_supplier']['checked'])) {
 			print '<td>'.$obj->ref_supplier.'</td>'."\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Project
-		if (!empty($arrayfields['p.project_ref']['checked']))
-		{
+		if (!empty($arrayfields['p.project_ref']['checked'])) {
 			$projectstatic->id = $obj->project_id;
 			$projectstatic->ref = $obj->project_ref;
 			$projectstatic->title = $obj->project_title;
 			print '<td>';
-			if ($obj->project_id > 0) print $projectstatic->getNomUrl(1);
+			if ($obj->project_id > 0) {
+				print $projectstatic->getNomUrl(1);
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Author
 		$userstatic->id = $obj->fk_user_author;
@@ -1105,68 +1339,78 @@ if ($resql)
 		$userstatic->login = $obj->login;
 		$userstatic->photo = $obj->photo;
 		$userstatic->email = $obj->user_email;
-		if (!empty($arrayfields['u.login']['checked']))
-		{
+		if (!empty($arrayfields['u.login']['checked'])) {
 			print '<td class="tdoverflowmax150">';
-			if ($userstatic->id) print $userstatic->getNomUrl(1);
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(1);
+			}
 			print "</td>";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Thirdparty
-		if (!empty($arrayfields['s.nom']['checked']))
-		{
+		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax150">';
 			$thirdpartytmp->id = $obj->socid;
 			$thirdpartytmp->name = $obj->name;
 			$thirdpartytmp->email = $obj->email;
 			print $thirdpartytmp->getNomUrl(1, 'supplier');
 			print '</td>'."\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Town
-		if (!empty($arrayfields['s.town']['checked']))
-		{
+		if (!empty($arrayfields['s.town']['checked'])) {
 			print '<td>';
 			print $obj->town;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Zip
-		if (!empty($arrayfields['s.zip']['checked']))
-		{
+		if (!empty($arrayfields['s.zip']['checked'])) {
 			print '<td>';
 			print $obj->zip;
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// State
-		if (!empty($arrayfields['state.nom']['checked']))
-		{
+		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']))
-		{
+		if (!empty($arrayfields['country.code_iso']['checked'])) {
 			print '<td class="center">';
 			$tmparray = getCountry($obj->fk_pays, 'all');
 			print $tmparray['label'];
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Type ent
-		if (!empty($arrayfields['typent.code']['checked']))
-		{
+		if (!empty($arrayfields['typent.code']['checked'])) {
 			print '<td class="center">';
-			if (count($typenArray) == 0) $typenArray = $formcompany->typent_array(1);
+			if (count($typenArray) == 0) {
+				$typenArray = $formcompany->typent_array(1);
+			}
 			print $typenArray[$obj->typent_code];
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Order date
-		if (!empty($arrayfields['cf.date_commande']['checked']))
-		{
+		if (!empty($arrayfields['cf.date_commande']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_commande), 'day');
 			if ($objectstatic->statut != $objectstatic::STATUS_ORDERSENT && $objectstatic->statut != $objectstatic::STATUS_RECEIVED_PARTIALLY) {
@@ -1175,11 +1419,12 @@ if ($resql)
 				}
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Plannned date of delivery
-		if (!empty($arrayfields['cf.date_livraison']['checked']))
-		{
+		if (!empty($arrayfields['cf.date_livraison']['checked'])) {
 			print '<td class="center">';
 			print dol_print_date($db->jdate($obj->date_livraison), 'day');
 			if ($objectstatic->statut == $objectstatic::STATUS_ORDERSENT || $objectstatic->statut == $objectstatic::STATUS_RECEIVED_PARTIALLY) {
@@ -1188,65 +1433,81 @@ if ($resql)
 				}
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount HT
-		if (!empty($arrayfields['cf.total_ht']['checked']))
-		{
+		if (!empty($arrayfields['cf.total_ht']['checked'])) {
 			  print '<td class="right">'.price($obj->total_ht)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
-			  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cf.total_ht';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'cf.total_ht';
+			}
 			  $totalarray['val']['cf.total_ht'] += $obj->total_ht;
 		}
 		// Amount VAT
-		if (!empty($arrayfields['cf.total_tva']['checked']))
-		{
+		if (!empty($arrayfields['cf.total_tva']['checked'])) {
 			print '<td class="right">'.price($obj->total_tva)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cf.total_tva';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'cf.total_tva';
+			}
 			$totalarray['val']['cf.total_tva'] += $obj->total_tva;
 		}
 		// Amount TTC
-		if (!empty($arrayfields['cf.total_ttc']['checked']))
-		{
+		if (!empty($arrayfields['cf.total_ttc']['checked'])) {
 			print '<td class="right">'.price($obj->total_ttc)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'cf.total_ttc';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'cf.total_ttc';
+			}
 			$totalarray['val']['cf.total_ttc'] += $obj->total_ttc;
 		}
 
 		// Currency
-		if (!empty($arrayfields['cf.multicurrency_code']['checked']))
-		{
+		if (!empty($arrayfields['cf.multicurrency_code']['checked'])) {
 			  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Currency rate
-		if (!empty($arrayfields['cf.multicurrency_tx']['checked']))
-		{
+		if (!empty($arrayfields['cf.multicurrency_tx']['checked'])) {
 			  print '<td class="nowrap">';
 			  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
 			  print "</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount HT
-		if (!empty($arrayfields['cf.multicurrency_total_ht']['checked']))
-		{
+		if (!empty($arrayfields['cf.multicurrency_total_ht']['checked'])) {
 			  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
-			  if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount VAT
-		if (!empty($arrayfields['cf.multicurrency_total_tva']['checked']))
-		{
+		if (!empty($arrayfields['cf.multicurrency_total_tva']['checked'])) {
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_tva)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Amount TTC
-		if (!empty($arrayfields['cf.multicurrency_total_ttc']['checked']))
-		{
+		if (!empty($arrayfields['cf.multicurrency_total_ttc']['checked'])) {
 			print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 
 		// Extra fields
@@ -1256,44 +1517,51 @@ if ($resql)
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
-		if (!empty($arrayfields['cf.datec']['checked']))
-		{
+		if (!empty($arrayfields['cf.datec']['checked'])) {
 			print '<td class="center nowrap">';
 			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['cf.tms']['checked']))
-		{
+		if (!empty($arrayfields['cf.tms']['checked'])) {
 			print '<td class="center nowrap">';
 			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['cf.fk_statut']['checked']))
-		{
+		if (!empty($arrayfields['cf.fk_statut']['checked'])) {
 			print '<td class="right nowrap">'.$objectstatic->LibStatut($obj->fk_statut, 5, $obj->billed).'</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
 		// Billed
-		if (!empty($arrayfields['cf.billed']['checked']))
-		{
+		if (!empty($arrayfields['cf.billed']['checked'])) {
 			print '<td class="center">'.yn($obj->billed).'</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($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";
 
@@ -1317,7 +1585,9 @@ if ($resql)
 	print '</form>'."\n";
 
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	// Show list of available documents
 	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index dea5ad69afa..9f8c192752c 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -40,7 +40,9 @@ $ref = GETPOST('ref');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'commande_fournisseur', 'commande');
 
 $object = new CommandeFournisseur($db);
@@ -72,10 +74,8 @@ $form = new Form($db);
 
 $now = dol_now();
 
-if ($id > 0 || !empty($ref))
-{
-	if ($result >= 0)
-	{
+if ($id > 0 || !empty($ref)) {
+	if ($result >= 0) {
 		$object->fetch_thirdparty();
 
 		$author = new User($db);
@@ -97,12 +97,10 @@ if ($id > 0 || !empty($ref))
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->fournisseur->commande->creer)
-			{
+			if ($user->rights->fournisseur->commande->creer) {
 				if ($action != 'classify') {
 					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 57dfb90e3fd..a152ca26ff1 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -17,8 +17,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -37,41 +36,41 @@ $langs->load("orders");
 
 $total = 0;
 $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	?>
-    <tr class="<?php echo $trclass; ?>">
-        <td><?php echo $langs->trans("SupplierOrder"); ?></td>
-    	<td><a href="<?php echo DOL_URL_ROOT.'/fourn/commande/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowOrder"), "order").' '.$objectlink->ref; ?></a></td>
-    	<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
-    	<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
-    	<td class="right"><?php
+	<tr class="<?php echo $trclass; ?>">
+		<td><?php echo $langs->trans("SupplierOrder"); ?></td>
+		<td><a href="<?php echo DOL_URL_ROOT.'/fourn/commande/card.php?id='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowOrder"), "order").' '.$objectlink->ref; ?></a></td>
+		<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
+		<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
+		<td class="right"><?php
 		if ($user->rights->fournisseur->commande->lire) {
 			$total = $total + $objectlink->total_ht;
 			echo price($objectlink->total_ht);
 		} ?></td>
-    	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-    	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
-    </tr>
+		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
+		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	</tr>
 	<?php
 }
-if (count($linkedObjectBlock) > 1)
-{
+if (count($linkedObjectBlock) > 1) {
 	?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
-        <td><?php echo $langs->trans("Total"); ?></td>
-        <td></td>
-    	<td class="center"></td>
-    	<td class="center"></td>
-    	<td class="right"><?php echo price($total); ?></td>
-    	<td class="right"></td>
-    	<td class="right"></td>
-    </tr>
-    <?php
+	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+		<td><?php echo $langs->trans("Total"); ?></td>
+		<td></td>
+		<td class="center"></td>
+		<td class="center"></td>
+		<td class="right"><?php echo price($total); ?></td>
+		<td class="right"></td>
+		<td class="right"></td>
+	</tr>
+	<?php
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/fourn/contact.php b/htdocs/fourn/contact.php
index 781fd4b6e9a..82c8df6ac66 100644
--- a/htdocs/fourn/contact.php
+++ b/htdocs/fourn/contact.php
@@ -35,8 +35,7 @@ $langs->load("companies");
 llxHeader();
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -45,12 +44,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "p.name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "p.name";
+}
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 
 
@@ -59,14 +64,20 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
  */
 
 $sql = "SELECT s.rowid as socid, s.nom as name, st.libelle as stcomm, p.rowid as cidp, p.lastname, p.firstname, p.email, p.phone";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", sc.fk_soc, sc.fk_user ";
+}
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."socpeople as p, ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE s.fk_stcomm = st.id";
 $sql .= " AND s.fournisseur = 1";
 $sql .= " AND s.rowid = p.fk_soc";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
 
 if (dol_strlen($stcomm)) {
 	$sql .= " AND s.fk_stcomm=$stcomm";
@@ -90,8 +101,7 @@ $sql .= " ORDER BY $sortfield $sortorder ";
 $sql .= $db->plimit($limit, $offset);
 
 $result = $db->query($sql);
-if ($result)
-{
+if ($result) {
 	$num = $db->num_rows($result);
 
 	$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
@@ -107,8 +117,7 @@ if ($result)
 	print "</tr>\n";
 
 	$i = 0;
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$obj = $db->fetch_object($result);
 
 		print '<tr class="oddeven">';
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 1e88aaf74c4..761e1bb9577 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -54,11 +54,15 @@ if (!empty($conf->projet->enabled)) {
 if (!empty($conf->variants->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 }
-if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+if (!empty($conf->accounting->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
 
 
 $langs->loadLangs(array('bills', 'compta', 'suppliers', 'companies', 'products', 'banks', 'admin'));
-if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
+if (!empty($conf->incoterm->enabled)) {
+	$langs->load('incoterm');
+}
 
 $id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
 $socid = GETPOST('socid', 'int');
@@ -86,17 +90,22 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$ret = $object->fetch($id, $ref);
-	if ($ret < 0) dol_print_error($db, $object->error);
+	if ($ret < 0) {
+		dol_print_error($db, $object->error);
+	}
 	$ret = $object->fetch_thirdparty();
-	if ($ret < 0) dol_print_error($db, $object->error);
+	if ($ret < 0) {
+		dol_print_error($db, $object->error);
+	}
 }
 
 // Security check
 $socid = '';
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $isdraft = (($object->statut == FactureFournisseur::STATUS_DRAFT) ? 1 : 0);
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture', 'fk_soc', 'rowid', $isdraft);
 
@@ -124,14 +133,13 @@ $error = 0;
 
 $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))
-{
-	if ($cancel)
-	{
-		if (!empty($backtopage))
-		{
+if (empty($reshook)) {
+	if ($cancel) {
+		if (!empty($backtopage)) {
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -145,24 +153,23 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be include, not include_once
 
 	// Link invoice to order
-	if (GETPOST('linkedOrder') && empty($cancel) && $id > 0)
-	{
+	if (GETPOST('linkedOrder') && empty($cancel) && $id > 0) {
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 		$result = $object->add_object_linked('order_supplier', GETPOST('linkedOrder'));
 	}
 
 	// Action clone object
-	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd)
-	{
+	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd) {
 		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
-		if (GETPOST('newsupplierref', 'alphanohtml')) $objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
+		if (GETPOST('newsupplierref', 'alphanohtml')) {
+			$objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
+		}
 		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
 
 		$result = $objectutil->createFromClone($user, $id);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 			exit;
 		} else {
@@ -170,15 +177,14 @@ if (empty($reshook))
 			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
 			$action = '';
 		}
-	}	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) {
+	} elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) {
 		$idwarehouse = GETPOST('idwarehouse');
 
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
 		$qualified_for_stock_change = 0;
-		if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-		{
+		if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 			$qualified_for_stock_change = $object->hasProductsOrServices(2);
 		} else {
 			$qualified_for_stock_change = $object->hasProductsOrServices(1);
@@ -187,8 +193,7 @@ if (empty($reshook))
 		// Check parameters
 		if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 			$langs->load("stocks");
-			if (!$idwarehouse || $idwarehouse == -1)
-			{
+			if (!$idwarehouse || $idwarehouse == -1) {
 				$error++;
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 				$action = '';
@@ -201,12 +206,15 @@ if (empty($reshook))
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				{
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -215,7 +223,9 @@ if (empty($reshook))
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-					if ($result < 0) dol_print_error($db, $result);
+					if ($result < 0) {
+						dol_print_error($db, $result);
+					}
 				}
 			}
 		}
@@ -225,25 +235,19 @@ if (empty($reshook))
 
 		$isErasable = $object->is_erasable();
 
-		if (($usercandelete && $isErasable > 0) || ($usercancreate && $isErasable == 1))
-		{
+		if (($usercandelete && $isErasable > 0) || ($usercancreate && $isErasable == 1)) {
 			$result = $object->delete($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				header('Location: list.php?restore_lastsearch_values=1');
 				exit;
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	}
-
-	// Remove a product line
-	elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate)
-	{
+	} elseif ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) {
+		// Remove a product line
 		$result = $object->deleteline($lineid);
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			// Define output language
 			/*$outputlangs = $langs;
 			$newlang = '';
@@ -267,11 +271,8 @@ if (empty($reshook))
 			/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
 			$action = '';
 		}
-	}
-
-	// Delete link of credit note to invoice
-	elseif ($action == 'unlinkdiscount' && $usercancreate)
-	{
+	} elseif ($action == 'unlinkdiscount' && $usercancreate) {
+		// Delete link of credit note to invoice
 		$discount = new DiscountAbsolute($db);
 		$result = $discount->fetch(GETPOST("discountid"));
 		$discount->unlink_invoice();
@@ -331,8 +332,12 @@ if (empty($reshook))
 		if (!$error) {
 			$old_date_echeance = $object->date_echeance;
 			$new_date_echeance = $object->calculate_date_lim_reglement();
-			if ($new_date_echeance > $old_date_echeance) $object->date_echeance = $new_date_echeance;
-			if ($object->date_echeance < $object->date) $object->date_echeance = $object->date;
+			if ($new_date_echeance > $old_date_echeance) {
+				$object->date_echeance = $new_date_echeance;
+			}
+			if ($object->date_echeance < $object->date) {
+				$object->date_echeance = $object->date;
+			}
 			$result = $object->update($user);
 			if ($result < 0) {
 				$error++;
@@ -345,83 +350,72 @@ if (empty($reshook))
 		} else {
 			$db->commit();
 		}
-	}
-
-	// Set incoterm
-	elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-	{
+	} elseif ($action == 'set_incoterms' && !empty($conf->incoterm->enabled)) {
+		// Set incoterm
 		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-	}
-
-	// payment mode
-	elseif ($action == 'setmode' && $usercancreate)
-	{
+	} elseif ($action == 'setmode' && $usercancreate) {
+		// payment mode
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
-	}
-
-	// Multicurrency Code
-	elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+		// Multicurrency Code
 		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
-	}
-
-	// Multicurrency rate
-	elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+		// Multicurrency rate
 		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx', 'alpha')));
-	}
-
-	// bank account
-	elseif ($action == 'setbankaccount' && $usercancreate) {
+	} elseif ($action == 'setbankaccount' && $usercancreate) {
+		// bank account
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	}
 
-	// transport mode
-	if ($action == 'settransportmode' && $user->rights->fournisseur->facture->creer)
-	{
-		$result = $object->setTransportMode(GETPOST('transport_mode_id', 'int'));
-	}
 
-	// Set label
-	elseif ($action == 'setlabel' && $usercancreate)
-	{
+	if ($action == 'settransportmode' && $user->rights->fournisseur->facture->creer) {
+		// transport mode
+		$result = $object->setTransportMode(GETPOST('transport_mode_id', 'int'));
+	} elseif ($action == 'setlabel' && $usercancreate) {
+		// Set label
 		$object->fetch($id);
 		$object->label = GETPOST('label');
 		$result = $object->update($user);
-		if ($result < 0) dol_print_error($db);
+		if ($result < 0) {
+			dol_print_error($db);
+		}
 	} elseif ($action == 'setdatef' && $usercancreate) {
 		$newdate = dol_mktime(0, 0, 0, $_POST['datefmonth'], $_POST['datefday'], $_POST['datefyear']);
-		if ($newdate > (dol_now() + (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE) ? 0 : $conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)))
-		{
-			if (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)) setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
-			else setEventMessages($langs->trans("WarningInvoiceDateTooFarInFuture"), null, 'warnings');
+		if ($newdate > (dol_now() + (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE) ? 0 : $conf->global->INVOICE_MAX_OFFSET_IN_FUTURE))) {
+			if (empty($conf->global->INVOICE_MAX_OFFSET_IN_FUTURE)) {
+				setEventMessages($langs->trans("WarningInvoiceDateInFuture"), null, 'warnings');
+			} else {
+				setEventMessages($langs->trans("WarningInvoiceDateTooFarInFuture"), null, 'warnings');
+			}
 		}
 
 		$object->fetch($id);
 
 		$object->date = $newdate;
 		$date_echence_calc = $object->calculate_date_lim_reglement();
-		if (!empty($object->date_echeance) && $object->date_echeance < $date_echence_calc)
-		{
+		if (!empty($object->date_echeance) && $object->date_echeance < $date_echence_calc) {
 			$object->date_echeance = $date_echence_calc;
 		}
-		if ($object->date_echeance && $object->date_echeance < $object->date)
-		{
+		if ($object->date_echeance && $object->date_echeance < $object->date) {
 			$object->date_echeance = $object->date;
 		}
 
 		$result = $object->update($user);
-		if ($result < 0) dol_print_error($db, $object->error);
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
 	} elseif ($action == 'setdate_lim_reglement' && $usercancreate) {
 		$object->fetch($id);
 		$object->date_echeance = dol_mktime(12, 0, 0, $_POST['date_lim_reglementmonth'], $_POST['date_lim_reglementday'], $_POST['date_lim_reglementyear']);
-		if (!empty($object->date_echeance) && $object->date_echeance < $object->date)
-		{
+		if (!empty($object->date_echeance) && $object->date_echeance < $object->date) {
 			$object->date_echeance = $object->date;
 			setEventMessages($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"), null, 'warnings');
 		}
 		$result = $object->update($user);
-		if ($result < 0) dol_print_error($db, $object->error);
-	} elseif ($action == "setabsolutediscount" && $usercancreate)
-	{
+		if ($result < 0) {
+			dol_print_error($db, $object->error);
+		}
+	} elseif ($action == "setabsolutediscount" && $usercancreate) {
 		// POST[remise_id] or POST[remise_id_for_payment]
 
 		// We use the credit to reduce amount of invoice
@@ -437,23 +431,20 @@ if (empty($reshook))
 			}
 		}
 		// We use the credit to reduce remain to pay
-		if (!empty($_POST["remise_id_for_payment"]))
-		{
+		if (!empty($_POST["remise_id_for_payment"])) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($_POST["remise_id_for_payment"]);
 
 			//var_dump($object->getRemainToPay(0));
 			//var_dump($discount->amount_ttc);exit;
-			if (price2num($discount->amount_ttc) > price2num($object->getRemainToPay(0)))
-			{
+			if (price2num($discount->amount_ttc) > price2num($object->getRemainToPay(0))) {
 				// TODO Split the discount in 2 automatically
 				$error++;
 				setEventMessages($langs->trans("ErrorDiscountLargerThanRemainToPaySplitItBefore"), null, 'errors');
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $discount->link_to_invoice(0, $id);
 				if ($result < 0) {
 					setEventMessages($discount->error, $discount->errors, 'errors');
@@ -461,12 +452,15 @@ if (empty($reshook))
 			}
 		}
 
-		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-		{
+		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			$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 = $object->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 = $object->thirdparty->default_lang;
+			}
 			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -474,12 +468,12 @@ if (empty($reshook))
 			$ret = $object->fetch($id); // Reload to get new records
 
 			$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
 		}
-	}
-	// Convertir en reduc
-	elseif ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $usercancreate)
-	{
+	} elseif ($action == 'confirm_converttoreduc' && $confirm == 'yes' && $usercancreate) {
+		// Convertir en reduc
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 		//$object->fetch_lines();	// Already done into fetch
@@ -489,10 +483,13 @@ if (empty($reshook))
 		$result = $discountcheck->fetch(0, 0, $object->id);
 
 		$canconvert = 0;
-		if ($object->type == FactureFournisseur::TYPE_DEPOSIT && empty($discountcheck->id)) $canconvert = 1; // we can convert deposit into discount if deposit is paid (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
-		if (($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_STANDARD) && $object->paye == 0 && empty($discountcheck->id)) $canconvert = 1; // we can convert credit note into discount if credit note is not refunded completely and not already converted and amount of payment is 0 (see also the real condition used as the condition to show button converttoreduc)
-		if ($canconvert)
-		{
+		if ($object->type == FactureFournisseur::TYPE_DEPOSIT && empty($discountcheck->id)) {
+			$canconvert = 1; // we can convert deposit into discount if deposit is paid (completely, partially or not at all) and not already converted (see real condition into condition used to show button converttoreduc)
+		}
+		if (($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_STANDARD) && $object->paye == 0 && empty($discountcheck->id)) {
+			$canconvert = 1; // we can convert credit note into discount if credit note is not refunded completely and not already converted and amount of payment is 0 (see also the real condition used as the condition to show button converttoreduc)
+		}
+		if ($canconvert) {
 			$db->begin();
 
 			$amount_ht = $amount_tva = $amount_ttc = array();
@@ -500,10 +497,9 @@ if (empty($reshook))
 
 			// Loop on each vat rate
 			$i = 0;
-			foreach ($object->lines as $line)
-			{
-				if ($line->product_type < 9 && $line->total_ht != 0) // Remove lines with product_type greater than or equal to 9
-				{ 	// no need to create discount if amount is null
+			foreach ($object->lines as $line) {
+				if ($line->product_type < 9 && $line->total_ht != 0) { // Remove lines with product_type greater than or equal to 9
+					// no need to create discount if amount is null
 					$amount_ht[$line->tva_tx] += $line->total_ht;
 					$amount_tva[$line->tva_tx] += $line->total_tva;
 					$amount_ttc[$line->tva_tx] += $line->total_ttc;
@@ -527,13 +523,13 @@ if (empty($reshook))
 
 			// Insert one discount by VAT rate category
 			$discount = new DiscountAbsolute($db);
-			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 				$discount->description = '(CREDIT_NOTE)';
-			elseif ($object->type == FactureFournisseur::TYPE_DEPOSIT)
+			} elseif ($object->type == FactureFournisseur::TYPE_DEPOSIT) {
 				$discount->description = '(DEPOSIT)';
-			elseif ($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT || $object->type == FactureFournisseur::TYPE_SITUATION)
+			} elseif ($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT || $object->type == FactureFournisseur::TYPE_SITUATION) {
 				$discount->description = '(EXCESS PAID)';
-			else {
+			} else {
 				setEventMessages($langs->trans('CantConvertToReducAnInvoiceOfThisType'), null, 'errors');
 			}
 			$discount->discount_type = 1; // Supplier discount
@@ -542,8 +538,7 @@ if (empty($reshook))
 
 			$error = 0;
 
-			if ($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT || $object->type == FactureFournisseur::TYPE_SITUATION)
-			{
+			if ($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT || $object->type == FactureFournisseur::TYPE_SITUATION) {
 				// If we're on a standard invoice, we have to get excess paid to create a discount in TTC without VAT
 
 				// Total payments
@@ -555,7 +550,9 @@ if (empty($reshook))
 				$sql .= ' AND p.entity IN ('.getEntity('invoice').')';
 
 				$resql = $db->query($sql);
-				if (!$resql) dol_print_error($db);
+				if (!$resql) {
+					dol_print_error($db);
+				}
 
 				$res = $db->fetch_object($resql);
 				$total_paiements = $res->total_paiements;
@@ -571,43 +568,39 @@ if (empty($reshook))
 					while ($obj = $db->fetch_object($resql)) {
 						$total_creditnote_and_deposit += $obj->amount_ttc;
 					}
-				} else dol_print_error($db);
+				} else {
+					dol_print_error($db);
+				}
 
 				$discount->amount_ht = $discount->amount_ttc = $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
 				$discount->amount_tva = 0;
 				$discount->tva_tx = 0;
 
 				$result = $discount->create($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
-			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT)
-			{
-				foreach ($amount_ht as $tva_tx => $xxx)
-				{
+			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
+				foreach ($amount_ht as $tva_tx => $xxx) {
 					$discount->amount_ht = abs($amount_ht[$tva_tx]);
 					$discount->amount_tva = abs($amount_tva[$tva_tx]);
 					$discount->amount_ttc = abs($amount_ttc[$tva_tx]);
 					$discount->tva_tx = abs($tva_tx);
 
 					$result = $discount->create($user);
-					if ($result < 0)
-					{
+					if ($result < 0) {
 						$error++;
 						break;
 					}
 				}
 			}
 
-			if (empty($error))
-			{
+			if (empty($error)) {
 				if ($object->type != FactureFournisseur::TYPE_DEPOSIT) {
 					// Classe facture
 					$result = $object->setPaid($user);
-					if ($result >= 0)
-					{
+					if ($result >= 0) {
 						$db->commit();
 					} else {
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -621,15 +614,10 @@ if (empty($reshook))
 				$db->rollback();
 			}
 		}
-	}
-
-
-	// Delete payment
-	elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate)
-	{
-	 	$object->fetch($id);
-		if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0)
-		{
+	} elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate) {
+		// Delete payment
+		$object->fetch($id);
+		if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0) {
 			$paiementfourn = new PaiementFourn($db);
 			$result = $paiementfourn->fetch(GETPOST('paiement_id'));
 			if ($result > 0) {
@@ -640,12 +628,11 @@ if (empty($reshook))
 				setEventMessages($paiementfourn->error, $paiementfourn->errors, 'errors');
 			}
 		}
-	}
-
-	// Create
-	elseif ($action == 'add' && $usercancreate)
-	{
-		if ($socid > 0) $object->socid = GETPOST('socid', 'int');
+	} elseif ($action == 'add' && $usercancreate) {
+		// Create
+		if ($socid > 0) {
+			$object->socid = GETPOST('socid', 'int');
+		}
 
 		$db->begin();
 
@@ -653,14 +640,15 @@ if (empty($reshook))
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
 		$dateinvoice = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$datedue = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
 
 		// Replacement invoice
-		if (GETPOST('type') == FactureFournisseur::TYPE_REPLACEMENT)
-		{
+		if (GETPOST('type') == FactureFournisseur::TYPE_REPLACEMENT) {
 			if (empty($dateinvoice)) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('DateInvoice')), null, 'errors');
 				$action = 'create';
@@ -713,16 +701,13 @@ if (empty($reshook))
 		}
 
 		// Credit note invoice
-		if (GETPOST('type') == FactureFournisseur::TYPE_CREDIT_NOTE)
-		{
+		if (GETPOST('type') == FactureFournisseur::TYPE_CREDIT_NOTE) {
 			$sourceinvoice = GETPOST('fac_avoir', 'int');
-			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE))
-			{
+			if (!($sourceinvoice > 0) && empty($conf->global->INVOICE_CREDIT_NOTE_STANDALONE)) {
 				$error++;
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CorrectInvoice")), null, 'errors');
 			}
-			if (GETPOST('socid', 'int') < 1)
-			{
+			if (GETPOST('socid', 'int') < 1) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Supplier')), null, 'errors');
 				$action = 'create';
 				$error++;
@@ -739,16 +724,14 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			if (!GETPOST('ref_supplier'))
-			{
+			if (!GETPOST('ref_supplier')) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('RefSupplier')), null, 'errors');
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$tmpproject = GETPOST('projectid', 'int');
 
 				// Creation facture
@@ -781,15 +764,12 @@ if (empty($reshook))
 					$error++;
 				}
 
-				if (GETPOST('invoiceAvoirWithLines', 'int') == 1 && $id > 0)
-				{
+				if (GETPOST('invoiceAvoirWithLines', 'int') == 1 && $id > 0) {
 					$facture_source = new FactureFournisseur($db); // fetch origin object
-					if ($facture_source->fetch($object->fk_facture_source) > 0)
-					{
+					if ($facture_source->fetch($object->fk_facture_source) > 0) {
 						$fk_parent_line = 0;
 
-						foreach ($facture_source->lines as $line)
-						{
+						foreach ($facture_source->lines as $line) {
 							// Reset fk_parent_line for no child products and special product
 							if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
 								$fk_parent_line = 0;
@@ -820,11 +800,9 @@ if (empty($reshook))
 					}
 				}
 
-				if (GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') == 1 && $id > 0)
-				{
+				if (GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') == 1 && $id > 0) {
 					$facture_source = new FactureFournisseur($db); // fetch origin object if not previously defined
-					if ($facture_source->fetch($object->fk_facture_source) > 0)
-					{
+					if ($facture_source->fetch($object->fk_facture_source) > 0) {
 						$totalpaye = $facture_source->getSommePaiement();
 						$totalcreditnotes = $facture_source->getSumCreditNotesUsed();
 						$totaldeposits = $facture_source->getSumDepositsUsed();
@@ -837,10 +815,8 @@ if (empty($reshook))
 		}
 
 		// Standard or deposit
-		if (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT)
-		{
-			if (GETPOST('socid', 'int') < 1)
-			{
+		if (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT) {
+			if (GETPOST('socid', 'int') < 1) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Supplier')), null, 'errors');
 				$action = 'create';
 				$error++;
@@ -857,16 +833,14 @@ if (empty($reshook))
 				$action = 'create';
 			}
 
-			if (!GETPOST('ref_supplier'))
-			{
+			if (!GETPOST('ref_supplier')) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('RefSupplier')), null, 'errors');
 				$action = 'create';
 				$_GET['socid'] = $_POST['socid'];
 				$error++;
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$tmpproject = GETPOST('projectid', 'int');
 
 				// Creation invoice
@@ -890,13 +864,14 @@ if (empty($reshook))
 				$object->transport_mode_id = GETPOST('transport_mode_id');
 
 				// Auto calculation of date due if not filled by user
-				if (empty($object->date_echeance)) $object->date_echeance = $object->calculate_date_lim_reglement();
+				if (empty($object->date_echeance)) {
+					$object->date_echeance = $object->calculate_date_lim_reglement();
+				}
 
 				$object->fetch_thirdparty();
 
 				// If creation from another object of another module
-				if (!$error && GETPOST('origin', 'alpha') && GETPOST('originid'))
-				{
+				if (!$error && GETPOST('origin', 'alpha') && GETPOST('originid')) {
 					// Parse element/subelement (ex: project_task)
 					$element = $subelement = GETPOST('origin', 'alpha');
 					/*if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
@@ -918,8 +893,7 @@ if (empty($reshook))
 					if ($element == 'order_supplier') {
 						$element = 'fourn'; $subelement = 'fournisseur.commande';
 					}
-					if ($element == 'project')
-					{
+					if ($element == 'project') {
 						$element = 'projet';
 					}
 					$object->origin    = GETPOST('origin', 'alpha');
@@ -928,25 +902,23 @@ if (empty($reshook))
 
 					require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
 					$classname = ucfirst($subelement);
-					if ($classname == 'Fournisseur.commande') $classname = 'CommandeFournisseur';
+					if ($classname == 'Fournisseur.commande') {
+						$classname = 'CommandeFournisseur';
+					}
 					$objectsrc = new $classname($db);
 					$objectsrc->fetch($originid);
 					$objectsrc->fetch_thirdparty();
 
-					if (!empty($object->origin) && !empty($object->origin_id))
-					{
+					if (!empty($object->origin) && !empty($object->origin_id)) {
 						$object->linkedObjectsIds[$object->origin] = $object->origin_id;
 					}
 
 					// Add also link with order if object is reception
-					if ($object->origin == 'reception')
-					{
+					if ($object->origin == 'reception') {
 						$objectsrc->fetchObjectLinked();
 
-						if (count($objectsrc->linkedObjectsIds['order_supplier']) > 0)
-						{
-							foreach ($objectsrc->linkedObjectsIds['order_supplier'] as $key => $value)
-							{
+						if (count($objectsrc->linkedObjectsIds['order_supplier']) > 0) {
+							foreach ($objectsrc->linkedObjectsIds['order_supplier'] as $key => $value) {
 								$object->linkedObjectsIds['order_supplier'] = $value;
 							}
 						}
@@ -955,26 +927,24 @@ if (empty($reshook))
 					$id = $object->create($user);
 
 					// Add lines
-					if ($id > 0)
-					{
+					if ($id > 0) {
 						require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
 						$classname = ucfirst($subelement);
-						if ($classname == 'Fournisseur.commande') $classname = 'CommandeFournisseur';
+						if ($classname == 'Fournisseur.commande') {
+							$classname = 'CommandeFournisseur';
+						}
 						$srcobject = new $classname($db);
 
 						$result = $srcobject->fetch(GETPOST('originid', 'int'));
-						if ($result > 0)
-						{
+						if ($result > 0) {
 							$lines = $srcobject->lines;
-							if (empty($lines) && method_exists($srcobject, 'fetch_lines'))
-							{
+							if (empty($lines) && method_exists($srcobject, 'fetch_lines')) {
 								$srcobject->fetch_lines();
 								$lines = $srcobject->lines;
 							}
 
 							$num = count($lines);
-							for ($i = 0; $i < $num; $i++) // TODO handle subprice < 0
-							{
+							for ($i = 0; $i < $num; $i++) { // TODO handle subprice < 0
 								$desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
 								$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
 
@@ -986,18 +956,25 @@ if (empty($reshook))
 								// Dates
 								// TODO mutualiser
 								$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_reel) {
+									$date_start = $lines[$i]->date_debut_reel;
+								}
+								if ($lines[$i]->date_start) {
+									$date_start = $lines[$i]->date_start;
+								}
 								$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_reel) {
+									$date_end = $lines[$i]->date_fin_reel;
+								}
+								if ($lines[$i]->date_end) {
+									$date_end = $lines[$i]->date_end;
+								}
 
 								// FIXME Missing special_code  into addline and updateline methods
 								$object->special_code = $lines[$i]->special_code;
 
 								// FIXME If currency different from main currency, take multicurrency price
-								if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
-								{
+								if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 									$pu = 0;
 									$pu_currency = $lines[$i]->multicurrency_subprice;
 								} else {
@@ -1031,8 +1008,7 @@ if (empty($reshook))
 									$lines[$i]->special_code
 								);
 
-								if ($result < 0)
-								{
+								if ($result < 0) {
 									$error++;
 									break;
 								}
@@ -1046,19 +1022,16 @@ if (empty($reshook))
 					} else {
 						$error++;
 					}
-				} elseif (!$error)
-				{
+				} elseif (!$error) {
 					$id = $object->create($user);
-					if ($id < 0)
-					{
+					if ($id < 0) {
 						$error++;
 					}
 				}
 			}
 		}
 
-		if ($error)
-		{
+		if ($error) {
 			$langs->load("errors");
 			$db->rollback();
 
@@ -1071,8 +1044,7 @@ if (empty($reshook))
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$outputlangs = $langs;
 				$result = $object->generateDocument($object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					dol_print_error($db, $object->error, $object->errors);
 					exit;
 				}
@@ -1081,11 +1053,8 @@ if (empty($reshook))
 			header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);
 			exit;
 		}
-	}
-
-	// Edit line
-	elseif ($action == 'updateline' && $usercancreate)
-	{
+	} elseif ($action == 'updateline' && $usercancreate) {
+		// Edit line
 		$db->begin();
 
 		$object->fetch($id);
@@ -1093,8 +1062,7 @@ if (empty($reshook))
 
 		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 
-		if (GETPOST('price_ht') != '' || GETPOST('multicurrency_subprice') != '')
-		{
+		if (GETPOST('price_ht') != '' || GETPOST('multicurrency_subprice') != '') {
 			$up = price2num(GETPOST('price_ht'));
 			$price_base_type = 'HT';
 		} else {
@@ -1102,13 +1070,10 @@ if (empty($reshook))
 			$price_base_type = 'TTC';
 		}
 
-		if (GETPOST('productid') > 0)
-		{
+		if (GETPOST('productid') > 0) {
 			$productsupplier = new ProductFournisseur($db);
-			if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY))
-			{
-				if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), GETPOST('productid', 'int'), 'restricthtml', GETPOST('socid', 'int')) < 0)
-				{
+			if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
+				if (GETPOST('productid') > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), GETPOST('productid', 'int'), 'restricthtml', GETPOST('socid', 'int')) < 0) {
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 				}
 			}
@@ -1116,7 +1081,9 @@ if (empty($reshook))
 			$prod = new Product($db);
 			$prod->fetch(GETPOST('productid'));
 			$label = $prod->description;
-			if (trim($_POST['product_desc']) != trim($label)) $label = $_POST['product_desc'];
+			if (trim($_POST['product_desc']) != trim($label)) {
+				$label = $_POST['product_desc'];
+			}
 
 			$type = $prod->type;
 		} else {
@@ -1129,8 +1096,9 @@ if (empty($reshook))
 
 		// Define info_bits
 		$info_bits = 0;
-		if (preg_match('/\*/', $tva_tx))
+		if (preg_match('/\*/', $tva_tx)) {
 			$info_bits |= 0x01;
+		}
 
 		// Define vat_rate
 		$tva_tx = str_replace('*', '', $tva_tx);
@@ -1151,8 +1119,7 @@ if (empty($reshook))
 		}
 
 		$result = $object->updateline(GETPOST('lineid', 'int'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, price2num(GETPOST('qty'), 'MS'), GETPOST('productid', 'int'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, GETPOST('units'), $pu_ht_devise, GETPOST('fourn_ref', 'alpha'));
-		if ($result >= 0)
-		{
+		if ($result >= 0) {
 			unset($_POST['label']);
 			unset($_POST['fourn_ref']);
 			unset($_POST['date_starthour']);
@@ -1177,8 +1144,7 @@ if (empty($reshook))
 		$db->begin();
 
 		$ret = $object->fetch($id);
-		if ($ret < 0)
-		{
+		if ($ret < 0) {
 			dol_print_error($db, $object->error);
 			exit;
 		}
@@ -1194,8 +1160,7 @@ if (empty($reshook))
 		$date_end = dol_mktime(GETPOST('date_end'.$predef.'hour'), GETPOST('date_end'.$predef.'min'), GETPOST('date_end'.$predef.'sec'), GETPOST('date_end'.$predef.'month'), GETPOST('date_end'.$predef.'day'), GETPOST('date_end'.$predef.'year'));
 
 		$prod_entry_mode = GETPOST('prod_entry_mode');
-		if ($prod_entry_mode == 'free')
-		{
+		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
 			$price_ht = price2num(GETPOST('price_ht'), 'MU');
 			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
@@ -1220,28 +1185,23 @@ if (empty($reshook))
 			}
 		}
 
-		if ($prod_entry_mode == 'free' && GETPOST('price_ht') < 0 && $qty < 0)
-		{
+		if ($prod_entry_mode == 'free' && GETPOST('price_ht') < 0 && $qty < 0) {
 			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && !GETPOST('idprodfournprice') && GETPOST('type') < 0)
-		{
+		if ($prod_entry_mode == 'free' && !GETPOST('idprodfournprice') && GETPOST('type') < 0) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && $price_ht_devise === '') // Unit price can be 0 but not ''
-		{
+		if ($prod_entry_mode == 'free' && GETPOST('price_ht') === '' && GETPOST('price_ttc') === '' && $price_ht_devise === '') { // Unit price can be 0 but not ''
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('UnitPrice')), null, 'errors');
 			$error++;
 		}
-		if ($prod_entry_mode == 'free' && !GETPOST('dp_desc'))
-		{
+		if ($prod_entry_mode == 'free' && !GETPOST('dp_desc')) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
-		if (!GETPOST('qty'))
-		{
+		if (!GETPOST('qty')) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
@@ -1260,55 +1220,57 @@ if (empty($reshook))
 			}
 		}
 
-		if ($prod_entry_mode != 'free' && empty($error))	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
-		{
+		if ($prod_entry_mode != 'free' && empty($error)) {	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 			$productsupplier = new ProductFournisseur($db);
 
 			$idprod = 0;
-			if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') $idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+			if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') {
+				$idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+			}
 
 			$reg = array();
-			if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg))
-			{
+			if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg)) {
 				$idprod = $reg[1];
 				$res = $productsupplier->fetch($idprod); // Load product from its id
 				// Call to init some price properties of $productsupplier
 				// So if a supplier price already exists for another thirdparty (first one found), we use it as reference price
-				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER))
-				{
+				if (!empty($conf->global->SUPPLIER_TAKE_FIRST_PRICE_IF_NO_PRICE_FOR_CURRENT_SUPPLIER)) {
 					$fksoctosearch = 0;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
-					if ($productsupplier->fourn_socid != $socid)	// The price we found is for another supplier, so we clear supplier price
-					{
+					if ($productsupplier->fourn_socid != $socid) {	// The price we found is for another supplier, so we clear supplier price
 						$productsupplier->ref_supplier = '';
 					}
 				} else {
 					$fksoctosearch = $object->thirdparty->id;
 					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
 				}
-			} elseif (GETPOST('idprodfournprice', 'alpha') > 0)
-			{
+			} elseif (GETPOST('idprodfournprice', 'alpha') > 0) {
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
 				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
 				$idprod = $productsupplier->get_buyprice(GETPOST('idprodfournprice', 'alpha'), $qtytosearch);
 				$res = $productsupplier->fetch($idprod);
 			}
 
-			if ($idprod > 0)
-			{
+			if ($idprod > 0) {
 				$label = $productsupplier->label;
 
 				// if we use supplier description of the products
 				if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
 					$desc = $productsupplier->desc_supplier;
-				} else $desc = $productsupplier->description;
+				} else {
+					$desc = $productsupplier->description;
+				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
 				if ($product_desc==$desc && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 					$product_desc='';
 				}
-				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) $desc = $product_desc;
-				if (!empty($product_desc) && trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				if (!empty($product_desc) && !empty($conf->global->MAIN_NO_CONCAT_DESCRIPTION)) {
+					$desc = $product_desc;
+				}
+				if (!empty($product_desc) && trim($product_desc) != trim($desc)) {
+					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
+				}
 
 				$type = $productsupplier->type;
 				if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
@@ -1330,11 +1292,15 @@ if (empty($reshook))
 
 				$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
 				$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
-				if (empty($tva_tx)) $tva_npr = 0;
+				if (empty($tva_tx)) {
+					$tva_npr = 0;
+				}
 				$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
 				$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
-				if (empty($pu)) $pu = 0; // If pu is '' or null, we force to have a numeric value
+				if (empty($pu)) {
+					$pu = 0; // If pu is '' or null, we force to have a numeric value
+				}
 
 				$result = $object->addline(
 					$desc,
@@ -1361,22 +1327,19 @@ if (empty($reshook))
 					''
 				);
 			}
-			if ($idprod == -99 || $idprod == 0)
-			{
+			if ($idprod == -99 || $idprod == 0) {
 				// Product not selected
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductOrService")), null, 'errors');
 			}
-			if ($idprod == -1)
-			{
+			if ($idprod == -1) {
 				// Quantity too low
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'errors');
 			}
-		} elseif (empty($error)) // $price_ht is already set
-		{
+		} elseif (empty($error)) { // $price_ht is already set
 			$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 			$tva_tx = str_replace('*', '', $tva_tx);
 			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
@@ -1407,17 +1370,19 @@ if (empty($reshook))
 		}
 
 		//print "xx".$tva_tx; exit;
-		if (!$error && $result > 0)
-		{
+		if (!$error && $result > 0) {
 			$db->commit();
 
 			// Define output language
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-			{
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$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 = $object->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 = $object->thirdparty->default_lang;
+				}
 				if (!empty($newlang)) {
 					$outputlangs = new Translate("", $conf);
 					$outputlangs->setDefaultLang($newlang);
@@ -1426,7 +1391,9 @@ if (empty($reshook))
 				$ret = $object->fetch($id); // Reload to get new records
 
 				$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				if ($result < 0) dol_print_error($db, $result);
+				if ($result < 0) {
+					dol_print_error($db, $result);
+				}
 			}
 
 			unset($_POST ['prod_entry_mode']);
@@ -1470,12 +1437,8 @@ if (empty($reshook))
 	} elseif ($action == 'classin' && $usercancreate) {
 		$object->fetch($id);
 		$result = $object->setProject($projectid);
-	}
-
-
-	// Set invoice to draft status
-	elseif ($action == 'confirm_edit' && $confirm == 'yes' && $usercancreate)
-	{
+	} elseif ($action == 'confirm_edit' && $confirm == 'yes' && $usercancreate) {
+		// Set invoice to draft status
 		$object->fetch($id);
 
 		$totalpaye = $object->getSommePaiement();
@@ -1484,29 +1447,24 @@ if (empty($reshook))
 		// We check that lines of invoices are exported in accountancy
 		$ventilExportCompta = $object->getVentilExportCompta();
 
-		if (!$ventilExportCompta)
-		{
+		if (!$ventilExportCompta) {
 			// On verifie si aucun paiement n'a ete effectue
-			if ($resteapayer == price2num($object->total_ttc, 'MT', 1) && $object->statut == FactureFournisseur::STATUS_VALIDATED)
-			{
+			if ($resteapayer == price2num($object->total_ttc, 'MT', 1) && $object->statut == FactureFournisseur::STATUS_VALIDATED) {
 				$idwarehouse = GETPOST('idwarehouse');
 
 				$object->fetch_thirdparty();
 
 				$qualified_for_stock_change = 0;
-				if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-				{
+				if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 					$qualified_for_stock_change = $object->hasProductsOrServices(2);
 				} else {
 					$qualified_for_stock_change = $object->hasProductsOrServices(1);
 				}
 
 				// Check parameters
-				if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-				{
+				if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 					$langs->load("stocks");
-					if (!$idwarehouse || $idwarehouse == -1)
-					{
+					if (!$idwarehouse || $idwarehouse == -1) {
 						$error++;
 						setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
 						$action = '';
@@ -1516,12 +1474,15 @@ if (empty($reshook))
 				$object->setDraft($user, $idwarehouse);
 
 				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-				{
+				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 					$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 = $object->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 = $object->thirdparty->default_lang;
+					}
 					if (!empty($newlang)) {
 						$outputlangs = new Translate("", $conf);
 						$outputlangs->setDefaultLang($newlang);
@@ -1530,24 +1491,21 @@ if (empty($reshook))
 					$ret = $object->fetch($id); // Reload to get new records
 
 					$result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
-					if ($result < 0) dol_print_error($db, $result);
+					if ($result < 0) {
+						dol_print_error($db, $result);
+					}
 				}
 
 				$action = '';
 			}
 		}
-	}
-
-	// Set invoice to validated/unpaid status
-	elseif ($action == 'reopen' && $usercancreate)
-	{
+	} elseif ($action == 'reopen' && $usercancreate) {
+		// Set invoice to validated/unpaid status
 		$result = $object->fetch($id);
 		if ($object->statut == FactureFournisseur::STATUS_CLOSED
-		|| ($object->statut == FactureFournisseur::STATUS_ABANDONED && $object->close_code != 'replaced'))
-		{
+		|| ($object->statut == FactureFournisseur::STATUS_ABANDONED && $object->close_code != 'replaced')) {
 			$result = $object->setUnpaid($user);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
 				exit;
 			} else {
@@ -1572,91 +1530,75 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	// Make calculation according to calculationrule
-	if ($action == 'calculate')
-	{
+	if ($action == 'calculate') {
 		$calculationrule = GETPOST('calculationrule');
 
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 		$result = $object->update_price(0, (($calculationrule == 'totalofround') ? '0' : '1'), 0, $object->thirdparty);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			dol_print_error($db, $result);
 			exit;
 		}
 	}
-	if ($action == 'update_extras')
-	{
+	if ($action == 'update_extras') {
 		$object->oldcopy = dol_clone($object);
 
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+			$error++;
+		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Actions on extra fields
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $object->insertExtraFields('BILL_SUPPLIER_MODIFY');
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 				}
 			}
 		}
 
-		if ($error)
+		if ($error) {
 			$action = 'edit_extras';
+		}
 	}
 
-	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate)
-	{
-		if ($action == 'addcontact')
-		{
+	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && $usercancreate) {
+		if ($action == 'addcontact') {
 			$result = $object->fetch($id);
 
-			if ($result > 0 && $id > 0)
-			{
+			if ($result > 0 && $id > 0) {
 				$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 				$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 				$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 			}
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			} else {
-				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-				{
+				if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 				} else {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
-		}
-
-		// bascule du statut d'un contact
-		elseif ($action == 'swapstatut')
-		{
-			if ($object->fetch($id))
-			{
+		} elseif ($action == 'swapstatut') {
+			// bascule du statut d'un contact
+			if ($object->fetch($id)) {
 				$result = $object->swapContactStatus(GETPOST('ligne'));
 			} else {
 				dol_print_error($db);
 			}
-		}
-
-		// Efface un contact
-		elseif ($action == 'deletecontact')
-		{
+		} elseif ($action == 'deletecontact') {
+			// Efface un contact
 			$object->fetch($id);
 			$result = $object->delete_contact($_GET["lineid"]);
 
-			if ($result >= 0)
-			{
+			if ($result >= 0) {
 				header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 				exit;
 			} else {
@@ -1675,7 +1617,9 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $bankaccountstatic = new Account($db);
 $paymentstatic = new PaiementFourn($db);
-if (!empty($conf->projet->enabled)) { $formproject = new FormProjets($db); }
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+}
 
 $now = dol_now();
 
@@ -1684,8 +1628,7 @@ $helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Mód
 llxHeader('', $title, $helpurl);
 
 // Mode creation
-if ($action == 'create')
-{
+if ($action == 'create') {
 	$facturestatic = new FactureFournisseur($db);
 
 	print load_fiche_titre($langs->trans('NewBill'), '', 'supplier_invoice');
@@ -1698,7 +1641,9 @@ if ($action == 'create')
 	if (GETPOST('socid') > 0) {
 		$societe = new Societe($db);
 		$societe->fetch(GETPOST('socid', 'int'));
-		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) $currency_code = $societe->multicurrency_code;
+		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) {
+			$currency_code = $societe->multicurrency_code;
+		}
 	}
 
 	if (!empty($origin) && !empty($originid)) {
@@ -1726,7 +1671,9 @@ if ($action == 'create')
 
 		require_once DOL_DOCUMENT_ROOT.'/'.$element.'/class/'.$subelement.'.class.php';
 		$classname = ucfirst($subelement);
-		if ($classname == 'Fournisseur.commande') $classname = 'CommandeFournisseur';
+		if ($classname == 'Fournisseur.commande') {
+			$classname = 'CommandeFournisseur';
+		}
 		$objectsrc = new $classname($db);
 		$objectsrc->fetch($originid);
 		$objectsrc->fetch_thirdparty();
@@ -1743,10 +1690,13 @@ if ($action == 'create')
 		$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
 		$transport_mode_id = (!empty($objectsrc->transport_mode_id) ? $objectsrc->transport_mode_id : (!empty($soc->transport_mode_id) ? $soc->transport_mode_id : 0));
 
-		if (!empty($conf->multicurrency->enabled))
-		{
-			if (!empty($objectsrc->multicurrency_code)) $currency_code = $objectsrc->multicurrency_code;
-			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx))	$currency_tx = $objectsrc->multicurrency_tx;
+		if (!empty($conf->multicurrency->enabled)) {
+			if (!empty($objectsrc->multicurrency_code)) {
+				$currency_code = $objectsrc->multicurrency_code;
+			}
+			if (!empty($conf->global->MULTICURRENCY_USE_ORIGIN_TX) && !empty($objectsrc->multicurrency_tx)) {
+				$currency_tx = $objectsrc->multicurrency_tx;
+			}
 		}
 
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
@@ -1767,7 +1717,9 @@ if ($action == 'create')
 		$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
 		$datedue = ($datetmp == '' ?-1 : $datetmp);
 
-		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) $currency_code = $soc->multicurrency_code;
+		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
+			$currency_code = $soc->multicurrency_code;
+		}
 	}
 
 	// when payment condition is empty (means not override by payment condition form a other object, like third-party), try to use default value
@@ -1786,10 +1738,14 @@ if ($action == 'create')
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	if ($societe->id > 0) print '<input type="hidden" name="socid" value="'.$societe->id.'">'."\n";
+	if ($societe->id > 0) {
+		print '<input type="hidden" name="socid" value="'.$societe->id.'">'."\n";
+	}
 	print '<input type="hidden" name="origin" value="'.$origin.'">';
 	print '<input type="hidden" name="originid" value="'.$originid.'">';
-	if (!empty($currency_tx)) print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
+	if (!empty($currency_tx)) {
+		print '<input type="hidden" name="originmulticurrency_tx" value="'.$currency_tx.'">';
+	}
 
 	print dol_get_fiche_head();
 
@@ -1802,16 +1758,14 @@ if ($action == 'create')
 	print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
 	print '<td>';
 
-	if ($societe->id > 0)
-	{
+	if ($societe->id > 0) {
 		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
 		print $societe->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
 		print img_picto('', 'company').$form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
 		// reload page to retrieve supplier informations
-		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE))
-		{
+		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
@@ -1828,7 +1782,9 @@ if ($action == 'create')
 
 	// Ref supplier
 	print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : $objectsrc->ref_supplier).'" type="text"';
-	if ($societe->id > 0) print ' autofocus';
+	if ($societe->id > 0) {
+		print ' autofocus';
+	}
 	print '></td>';
 	print '</tr>';
 
@@ -1876,7 +1832,7 @@ if ($action == 'create')
 			print '</div></div>';
 		}
 	}
-    */
+	*/
 
 	/* Not yet supported for supplier
 	if ($societe->id > 0)
@@ -1942,24 +1898,19 @@ if ($action == 'create')
 	}
 	*/
 
-	if (empty($origin))
-	{
-		if ($societe->id > 0)
-		{
+	if (empty($origin)) {
+		if ($societe->id > 0) {
 			// Credit note
-			if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE))
-			{
+			if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) {
 				// Show link for credit note
 				$facids = $facturestatic->list_qualified_avoir_supplier_invoices($societe->id);
-				if ($facids < 0)
-				{
+				if ($facids < 0) {
 					dol_print_error($db, $facturestatic);
 					exit;
 				}
 				$optionsav = "";
 				$newinvoice_static = new FactureFournisseur($db);
-				foreach ($facids as $key => $valarray)
-				{
+				foreach ($facids as $key => $valarray) {
 					$newinvoice_static->id = $key;
 					$newinvoice_static->ref = $valarray ['ref'];
 					$newinvoice_static->statut = $valarray ['status'];
@@ -1967,8 +1918,9 @@ if ($action == 'create')
 					$newinvoice_static->paye = $valarray ['paye'];
 
 					$optionsav .= '<option value="'.$key.'"';
-					if ($key == GETPOST('fac_avoir', 'int'))
+					if ($key == GETPOST('fac_avoir', 'int')) {
 						$optionsav .= ' selected';
+					}
 					$optionsav .= '>';
 					$optionsav .= $newinvoice_static->ref;
 					$optionsav .= ' ('.$newinvoice_static->getLibStatut(1, $valarray ['paymentornot']).')';
@@ -1977,7 +1929,9 @@ if ($action == 'create')
 
 				print '<div class="tagtr listofinvoicetype"><div class="tagtd listofinvoicetype">';
 				$tmp = '<input type="radio" id="radio_creditnote" name="type" value="2"'.(GETPOST('type') == 2 ? ' checked' : '');
-				if (!$optionsav) $tmp .= ' disabled';
+				if (!$optionsav) {
+					$tmp .= ' disabled';
+				}
 				$tmp .= '> ';
 				// Show credit note options only if we checked credit note
 				print '<script type="text/javascript" language="javascript">
@@ -1997,8 +1951,9 @@ if ($action == 'create')
 				$text = $tmp.$langs->transnoentities("InvoiceAvoirAsk").' ';
 				// $text.='<input type="text" value="">';
 				$text .= '<select class="flat valignmiddle" name="fac_avoir" id="fac_avoir"';
-				if (!$optionsav)
+				if (!$optionsav) {
 					$text .= ' disabled';
+				}
 				$text .= '>';
 				if ($optionsav) {
 					$text .= '<option value="-1"></option>';
@@ -2034,8 +1989,7 @@ if ($action == 'create')
 
 	print '</td></tr>';
 
-	if ($societe->id > 0)
-	{
+	if ($societe->id > 0) {
 		// Discounts for third party
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
 
@@ -2071,16 +2025,14 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Bank Account
-	if (!empty($conf->banque->enabled))
-	{
+	if (!empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
 		print img_picto('', 'bank_account').$form->select_comptes((GETPOSTISSET('fk_account') ?GETPOST('fk_account', 'alpha') : $fk_account), 'fk_account', 0, '', 1, '', 0, '', 1);
 		print '</td></tr>';
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
@@ -2090,8 +2042,7 @@ if ($action == 'create')
 	}
 
 	// Incoterms
-	if (!empty($conf->incoterm->enabled))
-	{
+	if (!empty($conf->incoterm->enabled)) {
 		print '<tr>';
 		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).'</label></td>';
 		print '<td colspan="3" class="maxwidthonsmartphone">';
@@ -2100,8 +2051,7 @@ if ($action == 'create')
 	}
 
 	// Multicurrency
-	if (!empty($conf->multicurrency->enabled))
-	{
+	if (!empty($conf->multicurrency->enabled)) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -2110,8 +2060,7 @@ if ($action == 'create')
 	}
 
 	// Intracomm report
-	if (!empty($conf->intracommreport->enabled))
-	{
+	if (!empty($conf->intracommreport->enabled)) {
 		$langs->loadLangs(array("intracommreport"));
 		print '<tr><td>'.$langs->trans('IntracommReportTransportMode').'</td><td>';
 		$form->selectTransportMode(isset($_POST['transport_mode_id']) ? $_POST['transport_mode_id'] : $transport_mode_id, 'transport_mode_id');
@@ -2136,13 +2085,11 @@ if ($action == 'create')
 	// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
 	print '</tr>';
 
-	if (empty($reshook))
-	{
+	if (empty($reshook)) {
 		print $object->showOptionals($extrafields, 'edit');
 	}
 
-	if (is_object($objectsrc))
-	{
+	if (is_object($objectsrc)) {
 		print "\n<!-- ".$classname." info -->";
 		print "\n";
 		print '<input type="hidden" name="amount"         value="'.$objectsrc->total_ht.'">'."\n";
@@ -2163,12 +2110,10 @@ if ($action == 'create')
 		$invoice_supplier = $objectsrc->linkedObjects['invoice_supplier'];
 
 		// count function need a array as argument (Note: the array must implement Countable too)
-		if (is_array($invoice_supplier))
-		{
+		if (is_array($invoice_supplier)) {
 			$cntinvoice = count($invoice_supplier);
 
-			if ($cntinvoice >= 1)
-			{
+			if ($cntinvoice >= 1) {
 				setEventMessages('WarningBillExist', null, 'warnings');
 				echo ' ('.$langs->trans('LatestRelatedBill').end($invoice_supplier)->getNomUrl(1).')';
 			}
@@ -2177,19 +2122,16 @@ if ($action == 'create')
 		print '</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
-		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) //Localtax1
-		{
+		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { //Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax1)."</td></tr>";
 		}
 
-		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) //Localtax2
-		{
+		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { //Localtax2
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td><td>'.price($objectsrc->total_localtax2)."</td></tr>";
 		}
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($objectsrc->total_ttc)."</td></tr>";
 
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountHT').'</td><td>'.price($objectsrc->multicurrency_total_ht).'</td></tr>';
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountVAT').'</td><td>'.price($objectsrc->multicurrency_total_tva)."</td></tr>";
 			print '<tr><td>'.$langs->trans('MulticurrencyAmountTTC').'</td><td>'.price($objectsrc->multicurrency_total_ttc)."</td></tr>";
@@ -2240,11 +2182,15 @@ if ($action == 'create')
 
 		$object->fetch($id, $ref);
 		$result = $object->fetch_thirdparty();
-		if ($result < 0) dol_print_error($db);
+		if ($result < 0) {
+			dol_print_error($db);
+		}
 
 		$societe = new Fournisseur($db);
 		$result = $societe->fetch($object->socid);
-		if ($result < 0) dol_print_error($db);
+		if ($result < 0) {
+			dol_print_error($db);
+		}
 
 		$totalpaye = $object->getSommePaiement();
 		$totalcreditnotes = $object->getSumCreditNotesUsed();
@@ -2258,8 +2204,7 @@ if ($action == 'create')
 		// $resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
 		$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
 
-		if ($object->paye)
-		{
+		if ($object->paye) {
 			$resteapayer = 0;
 		}
 		$resteapayeraffiche = $resteapayer;
@@ -2278,8 +2223,8 @@ if ($action == 'create')
 		$absolute_creditnote = price2num($absolute_creditnote, 'MT');
 
 		/*
-         *	View card
-         */
+		 *	View card
+		 */
 		$head = facturefourn_prepare_head($object);
 		$titre = $langs->trans('SupplierInvoice');
 
@@ -2289,17 +2234,20 @@ if ($action == 'create')
 
 		// Confirmation de la conversion de l'avoir en reduc
 		if ($action == 'converttoreduc') {
-			if ($object->type == FactureFournisseur::TYPE_STANDARD) $type_fac = 'ExcessPaid';
-			elseif ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) $type_fac = 'CreditNote';
-			elseif ($object->type == FactureFournisseur::TYPE_DEPOSIT) $type_fac = 'Deposit';
+			if ($object->type == FactureFournisseur::TYPE_STANDARD) {
+				$type_fac = 'ExcessPaid';
+			} elseif ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+				$type_fac = 'CreditNote';
+			} elseif ($object->type == FactureFournisseur::TYPE_DEPOSIT) {
+				$type_fac = 'Deposit';
+			}
 			$text = $langs->trans('ConfirmConvertToReducSupplier', strtolower($langs->transnoentities($type_fac)));
 			$text .= '<br>'.$langs->trans('ConfirmConvertToReducSupplier2');
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('ConvertToReduc'), $text, 'confirm_converttoreduc', '', "yes", 2);
 		}
 
 		// Clone confirmation
-		if ($action == 'clone')
-		{
+		if ($action == 'clone') {
 			// Create an array for form
 			$formquestion = array(
 				array('type' => 'text', 'name' => 'newsupplierref', 'label' => $langs->trans("RefSupplier"), 'value' => $langs->trans("CopyOf").' '.$object->ref_supplier),
@@ -2310,8 +2258,7 @@ if ($action == 'create')
 		}
 
 		// Confirmation of validation
-		if ($action == 'valid')
-		{
+		if ($action == 'valid') {
 			// We check if number is temporary number
 			if (preg_match('/^[\(]?PROV/i', $object->ref) || empty($object->ref)) {
 				// empty should not happened, but when it occurs, the test save life
@@ -2341,8 +2288,7 @@ if ($action == 'create')
 					$qualified_for_stock_change = $object->hasProductsOrServices(1);
 				}
 
-				if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-				{
+				if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 					$langs->load("stocks");
 					require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 					$formproduct = new FormProduct($db);
@@ -2365,19 +2311,16 @@ if ($action == 'create')
 		}
 
 		// Confirmation edit (back to draft)
-		if ($action == 'edit')
-		{
+		if ($action == 'edit') {
 			$formquestion = array();
 
 			$qualified_for_stock_change = 0;
-			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-			{
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 				$qualified_for_stock_change = $object->hasProductsOrServices(2);
 			} else {
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
-			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-			{
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change) {
 				$langs->load("stocks");
 				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 				$formproduct = new FormProduct($db);
@@ -2398,34 +2341,32 @@ if ($action == 'create')
 		}
 
 		// Confirmation set paid
-		if ($action == 'paid')
-		{
+		if ($action == 'paid') {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidBill', $object->ref), 'confirm_paid', '', 0, 1);
 		}
 
 		// Confirmation de la suppression de la facture fournisseur
-		if ($action == 'delete')
-		{
+		if ($action == 'delete') {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBill'), $langs->trans('ConfirmDeleteBill'), 'confirm_delete', '', 0, 1);
 		}
-		if ($action == 'deletepayment')
-		{
+		if ($action == 'deletepayment') {
 			$payment_id = GETPOST('paiement_id');
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&paiement_id='.$payment_id, $langs->trans('DeletePayment'), $langs->trans('ConfirmDeletePayment'), 'confirm_delete_paiement', '', 0, 1);
 		}
 
-	   	// Confirmation to delete line
-		if ($action == 'ask_deleteline')
-		{
+		// Confirmation to delete line
+		if ($action == 'ask_deleteline') {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteProductLine'), $langs->trans('ConfirmDeleteProductLine'), 'confirm_deleteline', '', 0, 1);
 		}
 
-		if (!$formconfirm)
-		{
+		if (!$formconfirm) {
 			$parameters = array('formConfirm' => $formconfirm, 'lineid'=>$lineid);
 			$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-			if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-			elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+			if (empty($reshook)) {
+				$formconfirm .= $hookmanager->resPrint;
+			} elseif ($reshook > 0) {
+				$formconfirm = $hookmanager->resPrint;
+			}
 		}
 
 		// Print form confirm
@@ -2441,14 +2382,14 @@ if ($action == 'create')
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		}
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($usercancreate)
-			{
+			if ($usercancreate) {
 				if ($action != 'classify') {
 					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				}
@@ -2492,36 +2433,34 @@ if ($action == 'create')
 		print '<span class="badgeneutral">';
 		print $object->getLibType();
 		print '</span>';
-		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
-		{
+		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT) {
 			$facreplaced = new FactureFournisseur($db);
 			$facreplaced->fetch($object->fk_facture_source);
 			print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
 		}
-		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-		{
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 			$facusing = new FactureFournisseur($db);
 			$facusing->fetch($object->fk_facture_source);
 			print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
 		}
 
 		$facidavoir = $object->getListIdAvoirFromInvoice();
-		if (count($facidavoir) > 0)
-		{
+		if (count($facidavoir) > 0) {
 			print ' ('.$langs->transnoentities("InvoiceHasAvoir");
 			$i = 0;
-			foreach ($facidavoir as $id)
-			{
-				if ($i == 0) print ' ';
-				else print ',';
+			foreach ($facidavoir as $id) {
+				if ($i == 0) {
+					print ' ';
+				} else {
+					print ',';
+				}
 				$facavoir = new FactureFournisseur($db);
 				$facavoir->fetch($id);
 				print $facavoir->getNomUrl(1);
 			}
 			print ')';
 		}
-		if (isset($facidnext) && $facidnext > 0)
-		{
+		if (isset($facidnext) && $facidnext > 0) {
 			$facthatreplace = new FactureFournisseur($db);
 			$facthatreplace->fetch($facidnext);
 			print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
@@ -2576,8 +2515,7 @@ if ($action == 'create')
 		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
-		if ($action == 'editconditions')
-		{
+		if ($action == 'editconditions') {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		} else {
 			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
@@ -2604,8 +2542,7 @@ if ($action == 'create')
 		}
 		print '</tr></table>';
 		print '</td><td colspan="2">';
-		if ($action == 'editmode')
-		{
+		if ($action == 'editmode') {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', 'DBIT', 1, 1);
 		} else {
 			$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none');
@@ -2613,16 +2550,16 @@ if ($action == 'create')
 		print '</td></tr>';
 
 		// Multicurrency
-		if (!empty($conf->multicurrency->enabled))
-		{
+		if (!empty($conf->multicurrency->enabled)) {
 			// Multicurrency code
 			print '<tr>';
 			print '<td>';
 			print '<table class="nobordernopadding" width="100%"><tr><td>';
 			print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
 			print '</td>';
-			if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT)
+			if ($action != 'editmulticurrencycode' && $object->statut == $object::STATUS_DRAFT) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencycode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td colspan="3">';
 			if ($action == 'editmulticurrencycode') {
@@ -2633,15 +2570,15 @@ if ($action == 'create')
 			print '</td></tr>';
 
 			// Multicurrency rate
-			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1)
-			{
+			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 				print '<tr>';
 				print '<td>';
 				print '<table class="nobordernopadding" width="100%"><tr><td>';
 				print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
 				print '</td>';
-				if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency)
+				if ($action != 'editmulticurrencyrate' && $object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
 					print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmulticurrencyrate&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1).'</a></td>';
+				}
 				print '</tr></table>';
 				print '</td><td colspan="3">';
 				if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
@@ -2662,14 +2599,14 @@ if ($action == 'create')
 		}
 
 		// Bank Account
-		if (!empty($conf->banque->enabled))
-		{
+		if (!empty($conf->banque->enabled)) {
 			print '<tr><td class="nowrap">';
 			print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 			print $langs->trans('BankAccount');
 			print '<td>';
-			if ($action != 'editbankaccount' && $usercancreate)
+			if ($action != 'editbankaccount' && $usercancreate) {
 				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&amp;id='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+			}
 			print '</tr></table>';
 			print '</td><td colspan="3">';
 			if ($action == 'editbankaccount') {
@@ -2682,19 +2619,20 @@ if ($action == 'create')
 		}
 
 		// Incoterms
-		if (!empty($conf->incoterm->enabled))
-		{
+		if (!empty($conf->incoterm->enabled)) {
 			print '<tr><td>';
 			print '<table width="100%" class="nobordernopadding"><tr><td>';
 			print $langs->trans('IncotermLabel');
 			print '<td><td class="right">';
-			if ($usercancreate) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
-			else print '&nbsp;';
+			if ($usercancreate) {
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$object->id.'&action=editincoterm">'.img_edit().'</a>';
+			} else {
+				print '&nbsp;';
+			}
 			print '</td></tr></table>';
 			print '</td>';
 			print '<td colspan="3">';
-			if ($action != 'editincoterm')
-			{
+			if ($action != 'editincoterm') {
 				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
 			} else {
 				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -2716,11 +2654,9 @@ if ($action == 'create')
 			print '</td>';
 
 			print '<td>';
-			if ($action == 'editmode')
-			{
+			if ($action == 'editmode') {
 				$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1, 1);
-			}
-			else {
+			} else {
 				$form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'none');
 			}
 			print '</td></tr>';
@@ -2739,8 +2675,7 @@ if ($action == 'create')
 
 		print '<table class="border tableforfield centpercent">';
 
-		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency))
-		{
+		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount HT
 			print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
 			print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
@@ -2760,10 +2695,16 @@ if ($action == 'create')
 		// Amount
 		print '<tr><td class="titlefield">'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).'<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';
-		if (GETPOST('calculationrule')) $calculationrule = GETPOST('calculationrule', 'alpha');
-		else $calculationrule = (empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND) ? 'totalofround' : 'roundoftotal');
-		if ($calculationrule == 'totalofround') $calculationrulenum = 1;
-		else $calculationrulenum = 2;
+		if (GETPOST('calculationrule')) {
+			$calculationrule = GETPOST('calculationrule', 'alpha');
+		} else {
+			$calculationrule = (empty($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND) ? 'totalofround' : 'roundoftotal');
+		}
+		if ($calculationrule == 'totalofround') {
+			$calculationrulenum = 1;
+		} else {
+			$calculationrulenum = 2;
+		}
 		// Show link for "recalculate"
 		if ($object->getVentilExportCompta() == 0) {
 			$s = $langs->trans("ReCalculate").' ';
@@ -2776,14 +2717,12 @@ if ($action == 'create')
 
 		// Amount Local Taxes
 		//TODO: Place into a function to control showing by country or study better option
-		if ($societe->localtax1_assuj == "1") //Localtax1
-		{
+		if ($societe->localtax1_assuj == "1") { //Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
 			print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
 		}
-		if ($societe->localtax2_assuj == "1") //Localtax2
-		{
+		if ($societe->localtax2_assuj == "1") { //Localtax2
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
 			print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
@@ -2793,23 +2732,37 @@ if ($action == 'create')
 		print '</table>';
 
 		/*
-    	 * List of payments
-    	 */
+		 * List of payments
+		 */
 
 		$totalpaye = 0;
 
 		$sign = 1;
-		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = - 1;
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+			$sign = - 1;
+		}
 
 		$nbrows = 9; $nbcols = 3;
-		if (!empty($conf->projet->enabled)) $nbrows++;
-		if (!empty($conf->banque->enabled)) { $nbrows++; $nbcols++; }
-		if (!empty($conf->incoterm->enabled)) $nbrows++;
-		if (!empty($conf->multicurrency->enabled)) $nbrows += 5;
+		if (!empty($conf->projet->enabled)) {
+			$nbrows++;
+		}
+		if (!empty($conf->banque->enabled)) {
+			$nbrows++; $nbcols++;
+		}
+		if (!empty($conf->incoterm->enabled)) {
+			$nbrows++;
+		}
+		if (!empty($conf->multicurrency->enabled)) {
+			$nbrows += 5;
+		}
 
 		// Local taxes
-		if ($societe->localtax1_assuj == "1") $nbrows++;
-		if ($societe->localtax2_assuj == "1") $nbrows++;
+		if ($societe->localtax1_assuj == "1") {
+			$nbrows++;
+		}
+		if ($societe->localtax2_assuj == "1") {
+			$nbrows++;
+		}
 
 		$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement as num_payment, p.rowid, p.fk_bank,';
 		$sql .= ' c.id as paiement_type,';
@@ -2824,8 +2777,7 @@ if ($action == 'create')
 		$sql .= ' ORDER BY p.datep, p.tms';
 
 		$result = $db->query($sql);
-		if ($result)
-		{
+		if ($result) {
 			$num = $db->num_rows($result);
 			$i = 0;
 
@@ -2835,15 +2787,15 @@ if ($action == 'create')
 			print '<td class="liste_titre">'.($object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')).'</td>';
 			print '<td>'.$langs->trans('Date').'</td>';
 			print '<td>'.$langs->trans('Type').'</td>';
-			if (!empty($conf->banque->enabled)) print '<td class="right">'.$langs->trans('BankAccount').'</td>';
+			if (!empty($conf->banque->enabled)) {
+				print '<td class="right">'.$langs->trans('BankAccount').'</td>';
+			}
 			print '<td class="right">'.$langs->trans('Amount').'</td>';
 			print '<td width="18">&nbsp;</td>';
 			print '</tr>';
 
-			if ($num > 0)
-			{
-				while ($i < $num)
-				{
+			if ($num > 0) {
+				while ($i < $num) {
 					$objp = $db->fetch_object($result);
 
 					$paymentstatic->id = $objp->rowid;
@@ -2860,8 +2812,7 @@ if ($action == 'create')
 					print '<td>';
 					print $form->form_modes_reglement(null, $objp->paiement_type, 'none').' '.$objp->num_payment;
 					print '</td>';
-					if (!empty($conf->banque->enabled))
-					{
+					if (!empty($conf->banque->enabled)) {
 						$bankaccountstatic->id = $objp->baid;
 						$bankaccountstatic->ref = $objp->baref;
 						$bankaccountstatic->label = $objp->baref;
@@ -2876,13 +2827,14 @@ if ($action == 'create')
 						}
 
 						print '<td class="right">';
-						if ($objp->baid > 0) print $bankaccountstatic->getNomUrl(1, 'transactions');
+						if ($objp->baid > 0) {
+							print $bankaccountstatic->getNomUrl(1, 'transactions');
+						}
 						print '</td>';
 					}
 					print '<td class="right">'.price($sign * $objp->amount).'</td>';
 					print '<td class="center">';
-					if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-					{
+					if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0) {
 						print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletepayment&token='.newToken().'&paiement_id='.$objp->rowid.'">';
 						print img_delete();
 						print '</a>';
@@ -2897,16 +2849,16 @@ if ($action == 'create')
 			}
 
 			/*
-    	    if ($object->paye == 0)
-    	    {
-    	        print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('AlreadyPaid').' :</td><td class="right">'.price($totalpaye).'</td><td></td></tr>';
-    	        print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("Billed").' :</td><td class="right">'.price($object->total_ttc).'</td><td></td></tr>';
+			if ($object->paye == 0)
+			{
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('AlreadyPaid').' :</td><td class="right">'.price($totalpaye).'</td><td></td></tr>';
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("Billed").' :</td><td class="right">'.price($object->total_ttc).'</td><td></td></tr>';
 
-    	        $resteapayer = $object->total_ttc - $totalpaye;
+				$resteapayer = $object->total_ttc - $totalpaye;
 
-    	        print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('RemainderToPay').' :</td>';
-    	        print '<td class="right'.($resteapayer?' amountremaintopay':'').'">'.price($resteapayer).'</td><td></td></tr>';
-    	    }
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('RemainderToPay').' :</td>';
+				print '<td class="right'.($resteapayer?' amountremaintopay':'').'">'.price($resteapayer).'</td><td></td></tr>';
+			}
 			*/
 
 			$db->free($result);
@@ -2914,14 +2866,15 @@ if ($action == 'create')
 			dol_print_error($db);
 		}
 
-		if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
-		{
+		if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE) {
 			// Total already paid
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			print '<span class="opacitymedium">';
-			if ($object->type != FactureFournisseur::TYPE_DEPOSIT)
+			if ($object->type != FactureFournisseur::TYPE_DEPOSIT) {
 				print $langs->trans('AlreadyPaidNoCreditNotesNoDeposits');
-			else print $langs->trans('AlreadyPaid');
+			} else {
+				print $langs->trans('AlreadyPaid');
+			}
 			print '</span>';
 			print '</td><td class="right"'.(($totalpaye > 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
 
@@ -2948,10 +2901,12 @@ if ($action == 'create')
 					$obj = $db->fetch_object($resql);
 					$invoice->fetch($obj->fk_invoice_supplier_source);
 					print '<tr><td colspan="'.$nbcols.'" class="right">';
-					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 						print $langs->trans("CreditNote").' ';
-					if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
+					}
+					if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT) {
 						print $langs->trans("Deposit").' ';
+					}
 					print $invoice->getNomUrl(0);
 					print ' :</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
@@ -2959,10 +2914,12 @@ if ($action == 'create')
 					print '<a href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=unlinkdiscount&discountid='.$obj->rowid.'">'.img_delete().'</a>';
 					print '</td></tr>';
 					$i++;
-					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+					if ($invoice->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 						$creditnoteamount += $obj->amount_ttc;
-					if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT)
+					}
+					if ($invoice->type == FactureFournisseur::TYPE_DEPOSIT) {
 						$depositamount += $obj->amount_ttc;
+					}
 				}
 			} else {
 				dol_print_error($db);
@@ -3002,8 +2959,9 @@ if ($action == 'create')
 			if (($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED) && $object->close_code == 'abandon') {
 				print '<tr><td colspan="'.$nbcols.'" class="right nowrap">';
 				$text = $langs->trans("HelpAbandonOther");
-				if ($object->close_note)
+				if ($object->close_note) {
 					$text .= '<br><br><b>'.$langs->trans("Reason").'</b>:'.$object->close_note;
+				}
 				print '<span class="opacitymedium">';
 				print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
 				print '</span>';
@@ -3022,9 +2980,11 @@ if ($action == 'create')
 			// Remainder to pay
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			print '<span class="opacitymedium">';
-			if ($resteapayeraffiche >= 0)
+			if ($resteapayeraffiche >= 0) {
 				print $langs->trans('RemainderToPay');
-			else print $langs->trans('ExcessPaid');
+			} else {
+				print $langs->trans('ExcessPaid');
+			}
 			print '</span>';
 			print '</td>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($resteapayeraffiche).'</td>';
@@ -3044,9 +3004,11 @@ if ($action == 'create')
 			// Remainder to pay back
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			print '<span class="opacitymedium">';
-			if ($resteapayeraffiche <= 0)
+			if ($resteapayeraffiche <= 0) {
 				print $langs->trans('RemainderToPayBack');
-			else print $langs->trans('ExcessPaid');
+			} else {
+				print $langs->trans('ExcessPaid');
+			}
 			print '</td>';
 			print '</span>';
 			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.price($sign * $resteapayeraffiche).'</td>';
@@ -3067,15 +3029,13 @@ if ($action == 'create')
 
 		print '<div class="clearboth"></div><br>';
 
-		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
-		{
+		if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 			$blocname = 'contacts';
 			$title = $langs->trans('ContactsAddresses');
 			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 		}
 
-		if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB))
-		{
+		if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
 			$colwidth = 20;
 			$blocname = 'notes';
 			$title = $langs->trans('Notes');
@@ -3084,8 +3044,8 @@ if ($action == 'create')
 
 
 		/*
-         * Lines
-         */
+		 * Lines
+		 */
 		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid')).'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="'.(($action != 'editline') ? 'addline' : 'updateline').'">';
@@ -3104,7 +3064,9 @@ if ($action == 'create')
 		$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
 		$senderissupplier = 2; // $senderissupplier=2 is same than 1 but disable test on minimum qty and disable autofill qty with minimum.
 		//if (! empty($conf->global->SUPPLIER_INVOICE_WITH_NOPRICEDEFINED)) $senderissupplier=2;
-		if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) $senderissupplier = 1;
+		if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
+			$senderissupplier = 1;
+		}
 
 		// Show object lines
 		if (!empty($object->lines)) {
@@ -3114,10 +3076,8 @@ if ($action == 'create')
 		$num = count($object->lines);
 
 		// Form to add new line
-		if ($object->statut == FactureFournisseur::STATUS_DRAFT && $usercancreate)
-		{
-			if ($action != 'editline')
-			{
+		if ($object->statut == FactureFournisseur::STATUS_DRAFT && $usercancreate) {
+			if ($action != 'editline') {
 				// Add free products/services
 				$object->formAddObjectLine(1, $societe, $mysoc);
 
@@ -3133,27 +3093,23 @@ if ($action == 'create')
 		print dol_get_fiche_end();
 
 
-		if ($action != 'presend')
-		{
+		if ($action != 'presend') {
 			/*
-             * Buttons actions
-             */
+			 * Buttons actions
+			 */
 
 			print '<div class="tabsAction">';
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 																									  // modified by hook
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				// Modify a validated invoice with no payments
-				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $usercancreate)
-				{
+				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $usercancreate) {
 					// We check if lines of invoice are not already transfered into accountancy
 					$ventilExportCompta = $object->getVentilExportCompta(); // Should be 0 since the sum of payments are zero. But we keep the protection.
 
-					if ($ventilExportCompta == 0)
-					{
+					if ($ventilExportCompta == 0) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit">'.$langs->trans('Modify').'</a></div>';
 					} else {
 						print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span></div>';
@@ -3163,13 +3119,11 @@ if ($action == 'create')
 				$discount = new DiscountAbsolute($db);
 				$result = $discount->fetch(0, 0, $object->id);
 
-	 	 		// Reopen a standard paid invoice
+				// Reopen a standard paid invoice
 				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_REPLACEMENT
 					|| ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && empty($discount->id)))
-					&& ($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED))				// A paid invoice (partially or completely)
-				{
-					if (!$facidnext && $object->close_code != 'replaced' && $usercancreate)	// Not replaced by another invoice
-					{
+					&& ($object->statut == FactureFournisseur::STATUS_CLOSED || $object->statut == FactureFournisseur::STATUS_ABANDONED)) {				// A paid invoice (partially or completely)
+					if (!$facidnext && $object->close_code != 'replaced' && $usercancreate) {	// Not replaced by another invoice
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=reopen">'.$langs->trans('ReOpen').'</a></div>';
 					} else {
 						if ($usercancreate) {
@@ -3182,24 +3136,22 @@ if ($action == 'create')
 
 				// Send by mail
 				if (empty($user->socid)) {
-					if (($object->statut == FactureFournisseur::STATUS_VALIDATED || $object->statut == FactureFournisseur::STATUS_CLOSED))
-					{
-						if ($usercansend)
-						{
+					if (($object->statut == FactureFournisseur::STATUS_VALIDATED || $object->statut == FactureFournisseur::STATUS_CLOSED)) {
+						if ($usercansend) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
-						} else print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip">'.$langs->trans('SendMail').'</a></div>';
+						}
 					}
 				}
 
 				// Make payments
-				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-				{
+				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create'.($object->fk_account > 0 ? '&amp;accountid='.$object->fk_account : '').'">'.$langs->trans('DoPayment').'</a></div>'; // must use facid because id is for payment id not invoice
 				}
 
 				// Classify paid
-				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-				{
+				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
 					print '>'.$langs->trans('ClassifyPaid').'</a></div>';
 
@@ -3209,10 +3161,8 @@ if ($action == 'create')
 				// Reverse back money or convert to reduction
 				if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT || $object->type == FactureFournisseur::TYPE_STANDARD) {
 					// For credit note only
-					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0)
-					{
-						if ($resteapayer == 0)
-						{
+					if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE && $object->statut == 1 && $object->paye == 0) {
+						if ($resteapayer == 0) {
 							print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPaymentBack').'</span></div>';
 						} else {
 							print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPaymentBack').'</a></div>';
@@ -3220,8 +3170,7 @@ if ($action == 'create')
 					}
 
 					// For standard invoice with excess paid
-					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $usercancreate && empty($discount->id))
-					{
+					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $usercancreate && empty($discount->id)) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessPaidToReduc').'</a></div>';
 					}
 					// For credit note
@@ -3231,19 +3180,15 @@ if ($action == 'create')
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc" title="'.dol_escape_htmltag($langs->trans("ConfirmConvertToReducSupplier2")).'">'.$langs->trans('ConvertToReduc').'</a></div>';
 					}
 					// For deposit invoice
-					if ($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->paye == 1 && $resteapayer == 0 && $usercancreate && empty($discount->id))
-					{
+					if ($object->type == FactureFournisseur::TYPE_DEPOSIT && $object->paye == 1 && $resteapayer == 0 && $usercancreate && empty($discount->id)) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a></div>';
 					}
 				}
 
 				// Validate
-				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT)
-				{
-					if (count($object->lines))
-					{
-						if ($usercanvalidate)
-						{
+				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT) {
+					if (count($object->lines)) {
+						if ($usercanvalidate) {
 							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
 							print '>'.$langs->trans('Validate').'</a></div>';
 						} else {
@@ -3260,24 +3205,20 @@ if ($action == 'create')
 				}*/
 
 				// Clone
-				if ($action != 'edit' && $usercancreate)
-				{
+				if ($action != 'edit' && $usercancreate) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=clone&amp;socid='.$object->socid.'">'.$langs->trans('ToClone').'</a></div>';
 				}
 
 				// Create a credit note
-				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut > 0 && $usercancreate)
-				{
-					if (!$objectidnext)
-					{
+				if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut > 0 && $usercancreate) {
+					if (!$objectidnext) {
 						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->socid.'&amp;fac_avoir='.$object->id.'&amp;action=create&amp;type=2'.($object->fk_project > 0 ? '&amp;projectid='.$object->fk_project : '').'">'.$langs->trans("CreateCreditNote").'</a></div>';
 					}
 				}
 
 				// Delete
 				$isErasable = $object->is_erasable();
-				if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($usercancreate && $isErasable == 1)))	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
-				{
+				if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($usercancreate && $isErasable == 1))) {	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
 					//var_dump($isErasable);
 					if ($isErasable == -4) {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
@@ -3287,8 +3228,7 @@ if ($action == 'create')
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
 					} elseif ($isErasable == -1) {
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
-					} elseif ($isErasable <= 0)	// Any other cases
-					{
+					} elseif ($isErasable <= 0) {	// Any other cases
 						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
 					} else {
 						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
@@ -3296,13 +3236,12 @@ if ($action == 'create')
 				}
 				print '</div>';
 
-				if ($action != 'confirm_edit')
-				{
+				if ($action != 'confirm_edit') {
 					print '<div class="fichecenter"><div class="fichehalfleft">';
 
 					/*
-	                 * Documents generes
-	                 */
+					 * Documents generes
+					 */
 					$ref = dol_sanitizeFileName($object->ref);
 					$subdir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$ref;
 					$filedir = $conf->fournisseur->facture->dir_output.'/'.$subdir;
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index d655b97c74f..4f450bca3c4 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -41,7 +41,9 @@ $ref	= GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 $object = new FactureFournisseur($db);
@@ -51,51 +53,39 @@ $object = new FactureFournisseur($db);
  * Ajout d'un nouveau contact
  */
 
-if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer)
-{
+if ($action == 'addcontact' && $user->rights->fournisseur->facture->creer) {
 	$result = $object->fetch($id, $ref);
 
-	if ($result > 0 && $id > 0)
-	{
+	if ($result > 0 && $id > 0) {
 		$contactid = (GETPOST('userid') ? GETPOST('userid') : GETPOST('contactid'));
 		$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
 		$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
-		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		{
+		if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorThisContactIsAlreadyDefinedAsThisType"), null, 'errors');
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-}
-
-// bascule du statut d'un contact
-elseif ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer)
-{
-	if ($object->fetch($id))
-	{
+} elseif ($action == 'swapstatut' && $user->rights->fournisseur->facture->creer) {
+	// bascule du statut d'un contact
+	if ($object->fetch($id)) {
 		$result = $object->swapContactStatus(GETPOST('ligne'));
 	} else {
 		dol_print_error($db);
 	}
-}
-
-// Efface un contact
-elseif ($action == 'deletecontact' && $user->rights->fournisseur->facture->creer)
-{
+} elseif ($action == 'deletecontact' && $user->rights->fournisseur->facture->creer) {
+	// Efface un contact
 	$object->fetch($id);
 	$result = $object->delete_contact($_GET["lineid"]);
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
 		exit;
 	} else {
@@ -124,10 +114,8 @@ $userstatic = new User($db);
 /*                                                                             */
 /* *************************************************************************** */
 
-if ($id > 0 || !empty($ref))
-{
-	if ($object->fetch($id, $ref) > 0)
-	{
+if ($id > 0 || !empty($ref)) {
+	if ($object->fetch($id, $ref) > 0) {
 		$object->fetch_thirdparty();
 
 		$alreadypaid = $object->getSommePaiement();
@@ -144,17 +132,18 @@ if ($id > 0 || !empty($ref))
 		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		}
 		// Project
-		if (!empty($conf->projet->enabled))
-		{
+		if (!empty($conf->projet->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-			if ($user->rights->facture->creer)
-			{
-				if ($action != 'classify')
+			if ($user->rights->facture->creer) {
+				if ($action != 'classify') {
 					//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 					$morehtmlref .= ' : ';
+				}
 				if ($action == 'classify') {
 					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -192,36 +181,34 @@ if ($id > 0 || !empty($ref))
 		// Type
 		print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td colspan="4">';
 		print $object->getLibType();
-		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
-		{
+		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT) {
 			$facreplaced = new FactureFournisseur($db);
 			$facreplaced->fetch($object->fk_facture_source);
 			print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
 		}
-		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-		{
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 			$facusing = new FactureFournisseur($db);
 			$facusing->fetch($object->fk_facture_source);
 			print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
 		}
 
 		$facidavoir = $object->getListIdAvoirFromInvoice();
-		if (count($facidavoir) > 0)
-		{
+		if (count($facidavoir) > 0) {
 			print ' ('.$langs->transnoentities("InvoiceHasAvoir");
 			$i = 0;
-			foreach ($facidavoir as $fid)
-			{
-				if ($i == 0) print ' ';
-				else print ',';
+			foreach ($facidavoir as $fid) {
+				if ($i == 0) {
+					print ' ';
+				} else {
+					print ',';
+				}
 				$facavoir = new FactureFournisseur($db);
 				$facavoir->fetch($fid);
 				print $facavoir->getNomUrl(1);
 			}
 			print ')';
 		}
-		if ($facidnext > 0)
-		{
+		if ($facidnext > 0) {
 			$facthatreplace = new FactureFournisseur($db);
 			$facthatreplace->fetch($facidnext);
 			print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
@@ -239,14 +226,12 @@ if ($id > 0 || !empty($ref))
 
 		// Amount Local Taxes
 		//TODO: Place into a function to control showing by country or study better option
-		if ($societe->localtax1_assuj == "1") //Localtax1
-		{
+		if ($societe->localtax1_assuj == "1") { //Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
 			print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
 		}
-		if ($societe->localtax2_assuj == "1") //Localtax2
-		{
+		if ($societe->localtax2_assuj == "1") { //Localtax2
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
 			print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 4b2b45c7226..24009d35dbc 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -46,7 +46,9 @@ $confirm = GETPOST('confirm', 'alpha');
 $ref = GETPOST('ref', 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 // Get parameters
@@ -54,16 +56,21 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 
 $object = new FactureFournisseur($db);
-if ($object->fetch($id, $ref))
-{
+if ($object->fetch($id, $ref)) {
 	$object->fetch_thirdparty();
 	$ref = dol_sanitizeFileName($object->ref);
 	$upload_dir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').$ref;
@@ -87,8 +94,7 @@ $title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Documents');
 $helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
 llxHeader('', $title, $helpurl);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$head = facturefourn_prepare_head($object);
 	print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
 
@@ -102,17 +108,18 @@ if ($object->id > 0)
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	}
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->facture->creer)
-		{
-			if ($action != 'classify')
+		if ($user->rights->facture->creer) {
+			if ($action != 'classify') {
 				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
+			}
 			if ($action == 'classify') {
 				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
 				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
@@ -148,16 +155,14 @@ if ($object->id > 0)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
 	/*
 	 * Confirm delete file
 	 */
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1);
 	}
 
@@ -166,28 +171,27 @@ if ($object->id > 0)
 	// Type
 	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
 	print $object->getLibType();
-	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
-	{
+	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT) {
 		$facreplaced = new FactureFournisseur($db);
 		$facreplaced->fetch($object->fk_facture_source);
 		print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
 	}
-	if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-	{
+	if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 		$facusing = new FactureFournisseur($db);
 		$facusing->fetch($object->fk_facture_source);
 		print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
 	}
 
 	$facidavoir = $object->getListIdAvoirFromInvoice();
-	if (count($facidavoir) > 0)
-	{
+	if (count($facidavoir) > 0) {
 		print ' ('.$langs->transnoentities("InvoiceHasAvoir");
 		$i = 0;
-		foreach ($facidavoir as $id)
-		{
-			if ($i == 0) print ' ';
-			else print ',';
+		foreach ($facidavoir as $id) {
+			if ($i == 0) {
+				print ' ';
+			} else {
+				print ',';
+			}
 			$facavoir = new FactureFournisseur($db);
 			$facavoir->fetch($id);
 			print $facavoir->getNomUrl(1);
@@ -215,14 +219,12 @@ if ($object->id > 0)
 
 	// Amount Local Taxes
 	//TODO: Place into a function to control showing by country or study better option
-	if ($mysoc->localtax1_assuj == "1") //Localtax1
-	{
+	if ($mysoc->localtax1_assuj == "1") { //Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
-	if ($mysoc->localtax2_assuj == "1") //Localtax2
-	{
+	if ($mysoc->localtax2_assuj == "1") { //Localtax2
 		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
@@ -255,8 +257,7 @@ if ($object->id > 0)
 
 	$defaulttpldir = '/core/tpl';
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
-	foreach ($dirtpls as $module => $reldir)
-	{
+	foreach ($dirtpls as $module => $reldir) {
 		if (!empty($module)) {
 			$tpl = dol_buildpath($reldir.'/document_actions_post_headers.tpl.php');
 		} else {
@@ -268,7 +269,9 @@ if ($object->id > 0)
 		} else {
 			$res = include $tpl; // for debug
 		}
-		if ($res) break;
+		if ($res) {
+			break;
+		}
 	}
 } else {
 	print $langs->trans('ErrorUnknown');
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 18c4bff9036..7019b90b868 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -31,7 +31,9 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
-if (!$user->rights->fournisseur->facture->lire) accessforbidden();
+if (!$user->rights->fournisseur->facture->lire) {
+	accessforbidden();
+}
 
 $langs->loadLangs(array("companies", "bills"));
 
@@ -39,8 +41,7 @@ $socid = GETPOST('socid', 'int');
 $option = GETPOST('option');
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -56,15 +57,20 @@ $search_amount_all_tax = GETPOST('search_amount_all_tax', 'alpha');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "f.date_lim_reglement";
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "f.date_lim_reglement";
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-{
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 	$search_ref = "";
 	$search_ref_supplier = "";
 	$search_company = "";
@@ -85,101 +91,124 @@ $title = $langs->trans("BillsSuppliersUnpaid");
 $facturestatic = new FactureFournisseur($db);
 $companystatic = new Societe($db);
 
-if ($user->rights->fournisseur->facture->lire)
-{
+if ($user->rights->fournisseur->facture->lire) {
 	$sql = "SELECT s.rowid as socid, s.nom as name,";
 	$sql .= " f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc,";
 	$sql .= " f.datef as df, f.date_lim_reglement as datelimite, ";
 	$sql .= " f.paye as paye, f.rowid as facid, f.fk_statut";
 	$sql .= " ,sum(pf.amount) as am";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", sc.fk_soc, sc.fk_user ";
+	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= ",".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf ON f.rowid=pf.fk_facturefourn ";
 	$sql .= " WHERE f.entity = ".$conf->entity;
 	$sql .= " AND f.fk_soc = s.rowid";
 	$sql .= " AND f.paye = 0 AND f.fk_statut = 1";
-	if ($option == 'late') $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if ($option == 'late') {
+		$sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 
-	if (GETPOST('filtre'))
-	{
+	if (GETPOST('filtre')) {
 		$filtrearr = explode(",", GETPOST('filtre'));
-		foreach ($filtrearr as $fil)
-		{
+		foreach ($filtrearr as $fil) {
 			$filt = explode(":", $fil);
 			$sql .= " AND ".$filt[0]." = ".$filt[1];
 		}
 	}
 
-	if ($search_ref)
-	{
+	if ($search_ref) {
 		$sql .= " AND f.ref LIKE '%".$db->escape($search_ref)."%'";
 	}
-	if ($search_ref_supplier)
-	{
+	if ($search_ref_supplier) {
 		$sql .= " AND f.ref_supplier LIKE '%".$db->escape($search_ref_supplier)."%'";
 	}
 
-	if ($search_company)
-	{
+	if ($search_company) {
 		$sql .= " AND s.nom LIKE '%".$db->escape($search_company)."%'";
 	}
 
-	if ($search_amount_no_tax)
-	{
+	if ($search_amount_no_tax) {
 		$sql .= " AND f.total_ht = '".$db->escape($search_amount_no_tax)."'";
 	}
 
-	if ($search_amount_all_tax)
-	{
+	if ($search_amount_all_tax) {
 		$sql .= " AND f.total_ttc = '".$db->escape($search_amount_all_tax)."'";
 	}
 
-	if (dol_strlen(GETPOST('sf_re')) > 0)
-	{
+	if (dol_strlen(GETPOST('sf_re')) > 0) {
 		$sql .= " AND f.ref_supplier LIKE '%".$db->escape(GETPOST('sf_re'))."%'";
 	}
 
 	$sql .= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", sc.fk_soc, sc.fk_user ";
+	}
 	$sql .= $db->order($sortfield, $sortorder);
-	if (!in_array("f.ref_supplier", explode(',', $sortfield))) $sql .= ", f.ref_supplier DESC";
+	if (!in_array("f.ref_supplier", explode(',', $sortfield))) {
+		$sql .= ", f.ref_supplier DESC";
+	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
-		if ($socid)
-		{
+		if ($socid) {
 			$soc = new Societe($db);
 			$soc->fetch($socid);
 		}
 
 		$param = '';
-		if ($socid) $param .= "&socid=".$socid;
+		if ($socid) {
+			$param .= "&socid=".$socid;
+		}
 
-		if ($search_ref)         	$param .= '&amp;search_ref='.urlencode($search_ref);
-		if ($search_ref_supplier)	$param .= '&amp;search_ref_supplier='.urlencode($search_ref_supplier);
-		if ($search_company)     	$param .= '&amp;search_company='.urlencode($search_company);
-		if ($search_amount_no_tax)	$param .= '&amp;search_amount_no_tax='.urlencode($search_amount_no_tax);
-		if ($search_amount_all_tax) $param .= '&amp;search_amount_all_tax='.urlencode($search_amount_all_tax);
+		if ($search_ref) {
+			$param .= '&amp;search_ref='.urlencode($search_ref);
+		}
+		if ($search_ref_supplier) {
+			$param .= '&amp;search_ref_supplier='.urlencode($search_ref_supplier);
+		}
+		if ($search_company) {
+			$param .= '&amp;search_company='.urlencode($search_company);
+		}
+		if ($search_amount_no_tax) {
+			$param .= '&amp;search_amount_no_tax='.urlencode($search_amount_no_tax);
+		}
+		if ($search_amount_all_tax) {
+			$param .= '&amp;search_amount_all_tax='.urlencode($search_amount_all_tax);
+		}
 
 		$param .= ($option ? "&option=".$option : "");
-		if (!empty($late)) $param .= '&late='.urlencode($late);
+		if (!empty($late)) {
+			$param .= '&late='.urlencode($late);
+		}
 		$urlsource = str_replace('&amp;', '&', $param);
 
 		$titre = ($socid ? $langs->trans("BillsSuppliersUnpaidForCompany", $soc->name) : $langs->trans("BillsSuppliersUnpaid"));
 
-		if ($option == 'late') $titre .= ' ('.$langs->trans("Late").')';
-		else $titre .= ' ('.$langs->trans("All").')';
+		if ($option == 'late') {
+			$titre .= ' ('.$langs->trans("Late").')';
+		} else {
+			$titre .= ' ('.$langs->trans("All").')';
+		}
 
 		$link = '';
-		if (empty($option)) $link = '<a href="'.$_SERVER["PHP_SELF"].'?option=late'.($socid ? '&socid='.$socid : '').'">'.$langs->trans("ShowUnpaidLateOnly").'</a>';
-		elseif ($option == 'late') $link = '<a href="'.$_SERVER["PHP_SELF"].'?'.($socid ? '&socid='.$socid : '').'">'.$langs->trans("ShowUnpaidAll").'</a>';
+		if (empty($option)) {
+			$link = '<a href="'.$_SERVER["PHP_SELF"].'?option=late'.($socid ? '&socid='.$socid : '').'">'.$langs->trans("ShowUnpaidLateOnly").'</a>';
+		} elseif ($option == 'late') {
+			$link = '<a href="'.$_SERVER["PHP_SELF"].'?'.($socid ? '&socid='.$socid : '').'">'.$langs->trans("ShowUnpaidAll").'</a>';
+		}
 		print load_fiche_titre($titre, $link);
 
 		print_barre_liste('', '', $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0); // We don't want pagination on this page
@@ -220,14 +249,12 @@ if ($user->rights->fournisseur->facture->lire)
 		print '</td>';
 		print "</tr>\n";
 
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			$total_ht = 0;
 			$total_ttc = 0;
 			$total_paid = 0;
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
 				$facturestatic->statut = $objp->fk_statut;
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 131b34bbe39..8904310bf3e 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -34,8 +34,7 @@ $langs->loadLangs(['bills', 'boxes']);
 
 // Filter to show only result of one supplier
 $socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0)
-{
+if (isset($user->socid) && $user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -58,8 +57,7 @@ print '<div class="fichecenter">';
 print '<div class="fichethirdleft">';
 
 // This is useless due to the global search combo
-if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))
-{
+if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
 	print getAreaSearchFrom();
 	print '<br>';
 }
@@ -129,16 +127,21 @@ function getPieChart($socid = 0)
 	$sql = "SELECT count(f.rowid), f.fk_statut";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-	if ($user->socid) $sql .= ' AND f.fk_soc = '.$user->socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($user->socid) {
+		$sql .= ' AND f.fk_soc = '.$user->socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " GROUP BY f.fk_statut";
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		return '';
 	}
@@ -149,11 +152,9 @@ function getPieChart($socid = 0)
 	$total = 0;
 	$vals = [];
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
-		if ($row)
-		{
+		if ($row) {
 			$vals[$row[1]] = $row[0];
 			$total += $row[0];
 		}
@@ -174,14 +175,12 @@ function getPieChart($socid = 0)
 	$array = [FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_CLOSED, FactureFournisseur::STATUS_ABANDONED];
 	$dataseries = [];
 
-	foreach ($array as $status)
-	{
+	foreach ($array as $status) {
 		$objectstatic->statut = $status;
 		$objectstatic->paye = $status == FactureFournisseur::STATUS_CLOSED ? -1 : 0;
 
 		$dataseries[] = [$objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0)];
-		if (!$conf->use_javascript_ajax)
-		{
+		if (!$conf->use_javascript_ajax) {
 			$result .= '<tr class="oddeven">';
 			$result .= '<td>'.$objectstatic->getLibStatut(0).'</td>';
 			$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
@@ -189,8 +188,7 @@ function getPieChart($socid = 0)
 		}
 	}
 
-	if ($conf->use_javascript_ajax)
-	{
+	if ($conf->use_javascript_ajax) {
 		$dolgraph = new DolGraph();
 		$dolgraph->SetData($dataseries);
 		$dolgraph->setShowLegend(2);
@@ -229,17 +227,22 @@ function getDraftTable($maxCount = 500, $socid = 0)
 	$sql = "SELECT f.rowid, f.ref, s.nom as socname, s.rowid as socid, s.canvas, s.client, f.total_ttc";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 	$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_DRAFT;
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= $db->plimit($maxCount, 0);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		return '';
 	}
@@ -258,8 +261,7 @@ function getDraftTable($maxCount = 500, $socid = 0)
 	$result .= '</td>';
 	$result .= '</tr>';
 
-	if ($num < 1)
-	{
+	if ($num < 1) {
 		$result .= '</table>';
 		$result .= '</div>';
 		return $result;
@@ -271,8 +273,7 @@ function getDraftTable($maxCount = 500, $socid = 0)
 	$total = 0;
 	$i = 0;
 
-	while ($i < $nbofloop)
-	{
+	while ($i < $nbofloop) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->rowid;
@@ -293,14 +294,11 @@ function getDraftTable($maxCount = 500, $socid = 0)
 		$total += $obj->total_ttc;
 	}
 
-	if ($num > $nbofloop)
-	{
+	if ($num > $nbofloop) {
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="3" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
 		$result .= '</tr>';
-	}
-	elseif ($total > 0)
-	{
+	} elseif ($total > 0) {
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
 		$result .= '<td class="right">'.price($total).'</td>';
@@ -327,17 +325,22 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 	$sql .= " f.datec";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-	if ($socid) $sql .= " AND f.fk_soc = ".$socid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " ORDER BY f.tms DESC";
 	$sql .= $db->plimit($maxCount, 0);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		return '';
 	}
@@ -350,8 +353,7 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 	$result .= '<td colspan="4">'.$langs->trans("BoxTitleLastSupplierBills", $maxCount).'</td>';
 	$result .= '</tr>';
 
-	if ($num < 1)
-	{
+	if ($num < 1) {
 		$result .= '</table>';
 		$result .= '</div>';
 		return $result;
@@ -362,8 +364,7 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
 	$formfile = new FormFile($db);
 	$i = 0;
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->rowid;
@@ -423,18 +424,23 @@ function getOpenTable($maxCount = 500, $socid = 0)
 	$sql .= ", f.datef as df, f.date_lim_reglement as datelimite";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= " WHERE f.fk_soc = s.rowid";
 	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
 	$sql .= " AND f.fk_statut = ".FactureFournisseur::STATUS_VALIDATED;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-	if ($socid) $sql .= " AND s.rowid = ".$socid;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
+	if ($socid) {
+		$sql .= " AND s.rowid = ".$socid;
+	}
 	$sql .= " ORDER BY f.rowid DESC";
 	$sql .= $db->plimit($maxCount, 0);
 
 	$resql = $db->query($sql);
-	if (!$resql)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		return '';
 	}
@@ -452,8 +458,7 @@ function getOpenTable($maxCount = 500, $socid = 0)
 	$result .= '</td>';
 	$result .= '</tr>';
 
-	if ($num < 1)
-	{
+	if ($num < 1) {
 		$result .= '</table>';
 		$result .= '</div>';
 		return $result;
@@ -467,8 +472,7 @@ function getOpenTable($maxCount = 500, $socid = 0)
 	$total = 0;
 	$i = 0;
 
-	while ($i < $nbofloop)
-	{
+	while ($i < $nbofloop) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->id;
@@ -491,8 +495,7 @@ function getOpenTable($maxCount = 500, $socid = 0)
 		$result .= '<td class="nobordernopadding nowrap">'.$objectstatic->getNomUrl(1).'</td>';
 		$result .= '<td width="18" class="nobordernopadding nowrap">';
 
-		if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay))
-		{
+		if ($db->jdate($obj->dfv) < ($now - $conf->propal->cloture->warning_delay)) {
 			$result .= img_warning($langs->trans("Late"));
 		}
 
@@ -514,14 +517,11 @@ function getOpenTable($maxCount = 500, $socid = 0)
 		$total += $obj->total_ttc;
 	}
 
-	if ($num > $nbofloop)
-	{
+	if ($num > $nbofloop) {
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="4" class="right">'.$langs->trans("XMoreLines", ($num - $nbofloop)).'</td>';
 		$result .= '</tr>';
-	}
-	elseif ($total > 0)
-	{
+	} elseif ($total > 0) {
 		$result .= '<tr class="liste_total">';
 		$result .= '<td colspan="2" class="right">'.$langs->trans("Total").'</td>';
 		$result .= '<td align="right">'.price($total).'</td>';
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index 69ea8839cfb..efe91880a56 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -40,7 +40,9 @@ $id = GETPOST("facid", 'int') ?GETPOST("facid", 'int') : GETPOST("id", 'int');
 $ref = GETPOST("ref", 'alpha');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 $object = new FactureFournisseur($db);
@@ -75,39 +77,40 @@ $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_
 $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+	$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+}
 // Project
-if (!empty($conf->projet->enabled))
-{
-  	$langs->load("projects");
-   	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-   	if ($user->rights->facture->creer)
-   	{
-   		if ($action != 'classify')
-   			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-   			$morehtmlref .= ' : ';
-   		if ($action == 'classify') {
-   			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-   			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-   			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-   			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-   			$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-   			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-   			$morehtmlref .= '</form>';
-   		} else {
-   			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
-   		}
-   	} else {
-   		if (!empty($object->fk_project)) {
-   			$proj = new Project($db);
-   			$proj->fetch($object->fk_project);
-   			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-   			$morehtmlref .= $proj->ref;
-   			$morehtmlref .= '</a>';
-   		} else {
-   			$morehtmlref .= '';
-   		}
-   	}
+if (!empty($conf->projet->enabled)) {
+	$langs->load("projects");
+	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+	if ($user->rights->facture->creer) {
+		if ($action != 'classify') {
+			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$morehtmlref .= ' : ';
+		}
+		if ($action == 'classify') {
+			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+			$morehtmlref .= $formproject->select_projects($object->thirdparty->id, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+			$morehtmlref .= '</form>';
+		} else {
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->thirdparty->id, $object->fk_project, 'none', 0, 0, 0, 1);
+		}
+	} else {
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+			$morehtmlref .= $proj->ref;
+			$morehtmlref .= '</a>';
+		} else {
+			$morehtmlref .= '';
+		}
+	}
 }
 $morehtmlref .= '</div>';
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 99ab93ca973..7c6ed0c5e16 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -44,7 +44,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-if (!$user->rights->fournisseur->facture->lire) accessforbidden();
+if (!$user->rights->fournisseur->facture->lire) {
+	accessforbidden();
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'bills', 'companies', 'projects'));
@@ -120,12 +122,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if ($page == -1 || $page == null || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) { $page = 0; }
+if ($page == -1 || $page == null || !empty($search_btn) || !empty($search_remove_btn) || (empty($toselect) && $massaction === '0')) {
+	$page = 0;
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "f.datef,f.rowid";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "f.datef,f.rowid";
+}
 
 $diroutputmassaction = $conf->fournisseur->facture->dir_output.'/temp/massgeneration/'.$user->id;
 
@@ -149,7 +157,9 @@ $fieldstosearchall = array(
 	's.nom'=>"ThirdParty",
 	'f.note_public'=>'NotePublic',
 );
-if (empty($user->socid)) $fieldstosearchall["f.note_private"] = "NotePrivate";
+if (empty($user->socid)) {
+	$fieldstosearchall["f.note_private"] = "NotePrivate";
+}
 
 $checkedtypetiers = 0;
 $arrayfields = array(
@@ -198,19 +208,23 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha'))		// All tests must be present to be compatible with all browsers
-	{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha')) {		// All tests must be present to be compatible with all browsers
 		$search_all = "";
 		$search_user = '';
 		$search_sale = '';
@@ -266,12 +280,10 @@ if (empty($reshook))
 	$uploaddir = $conf->fournisseur->facture->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
-	if ($massaction == 'banktransfertrequest')
-	{
+	if ($massaction == 'banktransfertrequest') {
 		$langs->load("withdrawals");
 
-		if (!$user->rights->paymentbybanktransfer->create)
-		{
+		if (!$user->rights->paymentbybanktransfer->create) {
 			$error++;
 			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 		} else {
@@ -280,12 +292,10 @@ if (empty($reshook))
 
 			$arrayofselected = is_array($toselect) ? $toselect : array();
 			$listofbills = array();
-			foreach ($arrayofselected as $toselectid)
-			{
+			foreach ($arrayofselected as $toselectid) {
 				$objecttmp = new FactureFournisseur($db);
 				$result = $objecttmp->fetch($toselectid);
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$totalpaye = $objecttmp->getSommePaiement();
 					$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
 					$totaldeposits = $objecttmp->getSumDepositsUsed();
@@ -314,8 +324,7 @@ if (empty($reshook))
 					$rsql .= " ORDER BY pfd.date_demande DESC";
 
 					$result_sql = $db->query($rsql);
-					if ($result_sql)
-					{
+					if ($result_sql) {
 						$numprlv = $db->num_rows($result_sql);
 					}
 
@@ -332,15 +341,12 @@ if (empty($reshook))
 			}
 
 			//Massive withdraw request for request with no errors
-			if (!empty($listofbills))
-			{
+			if (!empty($listofbills)) {
 				$nbwithdrawrequestok = 0;
-				foreach ($listofbills as $aBill)
-				{
+				foreach ($listofbills as $aBill) {
 					$db->begin();
 					$result = $aBill->demande_prelevement($user, $aBill->resteapayer, 'bank-transfer', 'supplier_invoice');
-					if ($result > 0)
-					{
+					if ($result > 0) {
 						$db->commit();
 						$nbwithdrawrequestok++;
 					} else {
@@ -348,8 +354,7 @@ if (empty($reshook))
 						setEventMessages($aBill->error, $aBill->errors, 'errors');
 					}
 				}
-				if ($nbwithdrawrequestok > 0)
-				{
+				if ($nbwithdrawrequestok > 0) {
 					setEventMessages($langs->trans("WithdrawRequestsDone", $nbwithdrawrequestok), null, 'mesgs');
 				}
 			}
@@ -358,8 +363,7 @@ if (empty($reshook))
 }
 
 
-if ($massaction == 'transfer_request')
-{
+if ($massaction == 'transfer_request') {
 	$langs->load("withdrawals");
 
 	if (!$user->rights->paymentbybanktransfer->create) {
@@ -371,12 +375,10 @@ if ($massaction == 'transfer_request')
 
 		$arrayofselected = is_array($toselect) ? $toselect : array();
 		$listofbills = array();
-		foreach ($arrayofselected as $toselectid)
-		{
+		foreach ($arrayofselected as $toselectid) {
 			$objecttmp = new FactureFournisseur($db);
 			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$totalpaye = $objecttmp->getSommePaiement();
 				$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
 				$totaldeposits = $objecttmp->getSumDepositsUsed();
@@ -405,16 +407,14 @@ if ($massaction == 'transfer_request')
 				$rsql .= " ORDER BY pfd.date_demande DESC";
 
 				$result_sql = $db->query($rsql);
-				if ($result_sql)
-				{
+				if ($result_sql) {
 					$numprlv = $db->num_rows($result_sql);
 				}
 
 				if ($numprlv > 0) {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("RequestAlreadyDone"), $objecttmp->errors, 'warnings');
-				}
-				elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'VIR') {
+				} elseif (!empty($objecttmp->mode_reglement_code) && $objecttmp->mode_reglement_code != 'VIR') {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("BadPaymentMethod"), $objecttmp->errors, 'errors');
 				} else {
@@ -460,7 +460,9 @@ $thirdparty = new Societe($db);
 // llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
 
 $sql = "SELECT";
-if ($search_all || $search_product_category > 0) $sql = 'SELECT DISTINCT';
+if ($search_all || $search_product_category > 0) {
+	$sql = 'SELECT DISTINCT';
+}
 $sql .= " f.rowid as facid, f.ref, f.ref_supplier, f.type, f.datef, f.date_lim_reglement as datelimite, f.fk_mode_reglement, f.fk_cond_reglement,";
 $sql .= " f.total_ht, f.total_ttc, f.total_tva as total_vat, f.paye as paye, f.fk_statut as fk_statut, f.libelle as label, f.datec as date_creation, f.tms as date_update,";
 $sql .= " f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,";
@@ -475,11 +477,17 @@ $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,
 $sql .= " u.login";
 // We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
 // TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
-if (!$search_all) $sql .= ', SUM(pf.amount) as dynamount_payed';
-if ($search_categ_sup) $sql .= ", cs.fk_categorie, cs.fk_soc";
+if (!$search_all) {
+	$sql .= ', SUM(pf.amount) as dynamount_payed';
+}
+if ($search_categ_sup) {
+	$sql .= ", cs.fk_categorie, cs.fk_soc";
+}
 // 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();
@@ -489,86 +497,164 @@ $sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_typent as typent on (typent.id = s.fk_typent)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as state on (state.rowid = s.fk_departement)";
-if (!empty($search_categ_sup)) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
+if (!empty($search_categ_sup)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
+}
 
 $sql .= ', '.MAIN_DB_PREFIX.'facture_fourn as f';
-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 (f.rowid = ef.fk_object)";
-if (!$search_all) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
-if ($search_all || $search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det as pd ON f.rowid=pd.fk_facture_fourn';
-if ($search_product_category > 0) $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+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 (f.rowid = ef.fk_object)";
+}
+if (!$search_all) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf ON pf.fk_facturefourn = f.rowid';
+}
+if ($search_all || $search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_det as pd ON f.rowid=pd.fk_facture_fourn';
+}
+if ($search_product_category > 0) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
+}
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON f.fk_user_author = u.rowid';
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = f.fk_projet";
 // We'll need this table joined to the select in order to filter by sale
-if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-if ($search_user > 0)
-{
+if ($search_sale > 0 || (!$user->rights->societe->client->voir && !$socid)) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
+if ($search_user > 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."element_contact as ec";
 	$sql .= ", ".MAIN_DB_PREFIX."c_type_contact as tc";
 }
 $sql .= ' WHERE f.fk_soc = s.rowid';
 $sql .= ' AND f.entity IN ('.getEntity('facture_fourn').')';
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($search_product_category > 0) $sql .= " AND cp.fk_categorie = ".$search_product_category;
-if ($socid > 0) $sql .= ' AND s.rowid = '.$socid;
-if ($search_ref)
-{
-	if (is_numeric($search_ref)) $sql .= natural_search(array('f.ref'), $search_ref);
-	else $sql .= natural_search('f.ref', $search_ref);
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 }
-if ($search_ref) $sql .= natural_search('f.ref', $search_ref);
-if ($search_refsupplier) $sql .= natural_search('f.ref_supplier', $search_refsupplier);
-if ($search_type != '' && $search_type >= 0)
-{
-	if ($search_type == '0') $sql .= " AND f.type = 0"; // standard
-	if ($search_type == '1') $sql .= " AND f.type = 1"; // replacement
-	if ($search_type == '2') $sql .= " AND f.type = 2"; // credit note
-	if ($search_type == '3') $sql .= " AND f.type = 3"; // deposit
+if ($search_product_category > 0) {
+	$sql .= " AND cp.fk_categorie = ".$search_product_category;
+}
+if ($socid > 0) {
+	$sql .= ' AND s.rowid = '.$socid;
+}
+if ($search_ref) {
+	if (is_numeric($search_ref)) {
+		$sql .= natural_search(array('f.ref'), $search_ref);
+	} else {
+		$sql .= natural_search('f.ref', $search_ref);
+	}
+}
+if ($search_ref) {
+	$sql .= natural_search('f.ref', $search_ref);
+}
+if ($search_refsupplier) {
+	$sql .= natural_search('f.ref_supplier', $search_refsupplier);
+}
+if ($search_type != '' && $search_type >= 0) {
+	if ($search_type == '0') {
+		$sql .= " AND f.type = 0"; // standard
+	}
+	if ($search_type == '1') {
+		$sql .= " AND f.type = 1"; // replacement
+	}
+	if ($search_type == '2') {
+		$sql .= " AND f.type = 2"; // credit note
+	}
+	if ($search_type == '3') {
+		$sql .= " AND f.type = 3"; // deposit
+	}
 	//if ($search_type == '4') $sql.=" AND f.type = 4";  // proforma
 	//if ($search_type == '5') $sql.=" AND f.type = 5";  // situation
 }
-if ($search_project) $sql .= natural_search('p.ref', $search_project);
-if ($search_company) $sql .= natural_search('s.nom', $search_company);
-if ($search_town)  $sql .= natural_search('s.town', $search_town);
-if ($search_zip)   $sql .= natural_search("s.zip", $search_zip);
-if ($search_state) $sql .= natural_search("state.nom", $search_state);
-if ($search_country) $sql .= " AND s.fk_pays IN (".$search_country.')';
-if ($search_type_thirdparty != '' && $search_type_thirdparty >= 0) $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
-if ($search_montant_ht != '') $sql .= natural_search('f.total_ht', $search_montant_ht, 1);
-if ($search_montant_vat != '') $sql .= natural_search('f.total_tva', $search_montant_vat, 1);
-if ($search_montant_localtax1 != '') $sql .= natural_search('f.localtax1', $search_montant_localtax1, 1);
-if ($search_montant_localtax2 != '') $sql .= natural_search('f.localtax2', $search_montant_localtax2, 1);
-if ($search_montant_ttc != '') $sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
-if ($search_multicurrency_code != '') $sql .= ' AND f.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
-if ($search_multicurrency_tx != '') $sql .= natural_search('f.multicurrency_tx', $search_multicurrency_tx, 1);
-if ($search_multicurrency_montant_ht != '') $sql .= natural_search('f.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
-if ($search_multicurrency_montant_vat != '') $sql .= natural_search('f.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
-if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
-if ($search_login) $sql .= natural_search('u.login', $search_login);
-if ($search_status != '' && $search_status >= 0) $sql .= " AND f.fk_statut = ".$db->escape($search_status);
-if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".((int) $search_paymentmode);
-if ($search_paymentcond > 0) $sql .= " AND f.fk_cond_reglement = ".((int) $search_paymentcond);
+if ($search_project) {
+	$sql .= natural_search('p.ref', $search_project);
+}
+if ($search_company) {
+	$sql .= natural_search('s.nom', $search_company);
+}
+if ($search_town) {
+	$sql .= natural_search('s.town', $search_town);
+}
+if ($search_zip) {
+	$sql .= natural_search("s.zip", $search_zip);
+}
+if ($search_state) {
+	$sql .= natural_search("state.nom", $search_state);
+}
+if ($search_country) {
+	$sql .= " AND s.fk_pays IN (".$search_country.')';
+}
+if ($search_type_thirdparty != '' && $search_type_thirdparty >= 0) {
+	$sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+}
+if ($search_montant_ht != '') {
+	$sql .= natural_search('f.total_ht', $search_montant_ht, 1);
+}
+if ($search_montant_vat != '') {
+	$sql .= natural_search('f.total_tva', $search_montant_vat, 1);
+}
+if ($search_montant_localtax1 != '') {
+	$sql .= natural_search('f.localtax1', $search_montant_localtax1, 1);
+}
+if ($search_montant_localtax2 != '') {
+	$sql .= natural_search('f.localtax2', $search_montant_localtax2, 1);
+}
+if ($search_montant_ttc != '') {
+	$sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
+}
+if ($search_multicurrency_code != '') {
+	$sql .= ' AND f.multicurrency_code = "'.$db->escape($search_multicurrency_code).'"';
+}
+if ($search_multicurrency_tx != '') {
+	$sql .= natural_search('f.multicurrency_tx', $search_multicurrency_tx, 1);
+}
+if ($search_multicurrency_montant_ht != '') {
+	$sql .= natural_search('f.multicurrency_total_ht', $search_multicurrency_montant_ht, 1);
+}
+if ($search_multicurrency_montant_vat != '') {
+	$sql .= natural_search('f.multicurrency_total_tva', $search_multicurrency_montant_vat, 1);
+}
+if ($search_multicurrency_montant_ttc != '') {
+	$sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
+}
+if ($search_login) {
+	$sql .= natural_search('u.login', $search_login);
+}
+if ($search_status != '' && $search_status >= 0) {
+	$sql .= " AND f.fk_statut = ".$db->escape($search_status);
+}
+if ($search_paymentmode > 0) {
+	$sql .= " AND f.fk_mode_reglement = ".((int) $search_paymentmode);
+}
+if ($search_paymentcond > 0) {
+	$sql .= " AND f.fk_cond_reglement = ".((int) $search_paymentcond);
+}
 $sql .= dolSqlDateFilter("f.datef", $day, $month, $year);
 $sql .= dolSqlDateFilter("f.date_lim_reglement", $day_lim, $month_lim, $year_lim);
-if ($option == 'late') $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
-if ($search_label) $sql .= natural_search('f.libelle', $search_label);
-if ($search_categ_sup > 0) $sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
-if ($search_categ_sup == -2)   $sql .= " AND cs.fk_categorie IS NULL";
-if ($search_status != '' && $search_status >= 0)
-{
+if ($option == 'late') {
+	$sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
+}
+if ($search_label) {
+	$sql .= natural_search('f.libelle', $search_label);
+}
+if ($search_categ_sup > 0) {
+	$sql .= " AND cs.fk_categorie = ".$db->escape($search_categ_sup);
+}
+if ($search_categ_sup == -2) {
+	$sql .= " AND cs.fk_categorie IS NULL";
+}
+if ($search_status != '' && $search_status >= 0) {
 	$sql .= " AND f.fk_statut = ".$search_status;
 }
-if ($filter && $filter != -1)
-{
+if ($filter && $filter != -1) {
 	$aFilter = explode(',', $filter);
-	foreach ($aFilter as $fil)
-	{
+	foreach ($aFilter as $fil) {
 		$filt = explode(':', $fil);
 		$sql .= ' AND '.$db->escape(trim($filt[0])).' = '.$db->escape(trim($filt[1]));
 	}
 }
-if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
-if ($search_user > 0)
-{
+if ($search_sale > 0) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
+}
+if ($search_user > 0) {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='invoice_supplier' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
 }
 // Add where from extra fields
@@ -578,8 +664,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-if (!$search_all)
-{
+if (!$search_all) {
 	$sql .= " GROUP BY f.rowid, f.ref, f.ref_supplier, f.type, f.datef, f.date_lim_reglement, f.fk_mode_reglement, f.fk_cond_reglement,";
 	$sql .= " f.total_ht, f.total_ttc, f.total_tva, f.paye, f.fk_statut, f.libelle, f.datec, f.tms,";
 	$sql .= " f.localtax1, f.localtax2,";
@@ -605,12 +690,10 @@ if (!$search_all)
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -620,14 +703,12 @@ $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall)
-	{
+	if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $sall) {
 		$obj = $db->fetch_object($resql);
 		$id = $obj->facid;
 
@@ -637,47 +718,114 @@ if ($resql)
 
 	llxHeader('', $langs->trans("SuppliersInvoices"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
 
-	if ($socid)
-	{
+	if ($socid) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
-		if (empty($search_company)) $search_company = $soc->name;
+		if (empty($search_company)) {
+			$search_company = $soc->name;
+		}
 	}
 
 	$param = '&socid='.$socid;
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_all)			$param .= '&search_all='.urlencode($search_all);
-	if ($day) 					$param .= '&day='.urlencode($day);
-	if ($month) 				$param .= '&month='.urlencode($month);
-	if ($year)  				$param .= '&year='.urlencode($year);
-	if ($day_lim) 				$param .= '&day_lim='.urlencode($day_lim);
-	if ($month_lim) 			$param .= '&month_lim='.urlencode($month_lim);
-	if ($year_lim)  			$param .= '&year_lim='.urlencode($year_lim);
-	if ($search_ref)          	$param .= '&search_ref='.urlencode($search_ref);
-	if ($search_refsupplier) 	$param .= '&search_refsupplier='.urlencode($search_refsupplier);
-	if ($search_type != '')		$param .= '&search_type='.urlencode($search_type);
-	if ($search_label)      	$param .= '&search_label='.urlencode($search_label);
-	if ($search_company)      	$param .= '&search_company='.urlencode($search_company);
-	if ($search_login)          $param .= '&search_login='.urlencode($search_login);
-	if ($search_montant_ht != '')  $param .= '&search_montant_ht='.urlencode($search_montant_ht);
-	if ($search_montant_vat != '')  $param .= '&search_montant_vat='.urlencode($search_montant_vat);
-	if ($search_montant_localtax1 != '')  $param .= '&search_montant_localtax1='.urlencode($search_montant_localtax1);
-	if ($search_montant_localtax2 != '')  $param .= '&search_montant_localtax2='.urlencode($search_montant_localtax2);
-	if ($search_montant_ttc != '') $param .= '&search_montant_ttc='.urlencode($search_montant_ttc);
-	if ($search_multicurrency_code != '')  $param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
-	if ($search_multicurrency_tx != '')  $param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
-	if ($search_multicurrency_montant_ht != '')  $param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
-	if ($search_multicurrency_montant_vat != '')  $param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
-	if ($search_multicurrency_montant_ttc != '') $param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
-	if ($search_amount_no_tax)	$param .= '&search_amount_no_tax='.urlencode($search_amount_no_tax);
-	if ($search_amount_all_tax)	$param .= '&search_amount_all_tax='.urlencode($search_amount_all_tax);
-	if ($search_status >= 0)  	$param .= "&search_status=".urlencode($search_status);
-	if ($show_files)            $param .= '&show_files='.urlencode($show_files);
-	if ($option)                $param .= "&option=".urlencode($option);
-	if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
-	if ($search_categ_sup > 0) $param .= '&search_categ_sup='.urlencode($search_categ_sup);
-	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0)   $param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($search_all) {
+		$param .= '&search_all='.urlencode($search_all);
+	}
+	if ($day) {
+		$param .= '&day='.urlencode($day);
+	}
+	if ($month) {
+		$param .= '&month='.urlencode($month);
+	}
+	if ($year) {
+		$param .= '&year='.urlencode($year);
+	}
+	if ($day_lim) {
+		$param .= '&day_lim='.urlencode($day_lim);
+	}
+	if ($month_lim) {
+		$param .= '&month_lim='.urlencode($month_lim);
+	}
+	if ($year_lim) {
+		$param .= '&year_lim='.urlencode($year_lim);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_refsupplier) {
+		$param .= '&search_refsupplier='.urlencode($search_refsupplier);
+	}
+	if ($search_type != '') {
+		$param .= '&search_type='.urlencode($search_type);
+	}
+	if ($search_label) {
+		$param .= '&search_label='.urlencode($search_label);
+	}
+	if ($search_company) {
+		$param .= '&search_company='.urlencode($search_company);
+	}
+	if ($search_login) {
+		$param .= '&search_login='.urlencode($search_login);
+	}
+	if ($search_montant_ht != '') {
+		$param .= '&search_montant_ht='.urlencode($search_montant_ht);
+	}
+	if ($search_montant_vat != '') {
+		$param .= '&search_montant_vat='.urlencode($search_montant_vat);
+	}
+	if ($search_montant_localtax1 != '') {
+		$param .= '&search_montant_localtax1='.urlencode($search_montant_localtax1);
+	}
+	if ($search_montant_localtax2 != '') {
+		$param .= '&search_montant_localtax2='.urlencode($search_montant_localtax2);
+	}
+	if ($search_montant_ttc != '') {
+		$param .= '&search_montant_ttc='.urlencode($search_montant_ttc);
+	}
+	if ($search_multicurrency_code != '') {
+		$param .= '&search_multicurrency_code='.urlencode($search_multicurrency_code);
+	}
+	if ($search_multicurrency_tx != '') {
+		$param .= '&search_multicurrency_tx='.urlencode($search_multicurrency_tx);
+	}
+	if ($search_multicurrency_montant_ht != '') {
+		$param .= '&search_multicurrency_montant_ht='.urlencode($search_multicurrency_montant_ht);
+	}
+	if ($search_multicurrency_montant_vat != '') {
+		$param .= '&search_multicurrency_montant_vat='.urlencode($search_multicurrency_montant_vat);
+	}
+	if ($search_multicurrency_montant_ttc != '') {
+		$param .= '&search_multicurrency_montant_ttc='.urlencode($search_multicurrency_montant_ttc);
+	}
+	if ($search_amount_no_tax) {
+		$param .= '&search_amount_no_tax='.urlencode($search_amount_no_tax);
+	}
+	if ($search_amount_all_tax) {
+		$param .= '&search_amount_all_tax='.urlencode($search_amount_all_tax);
+	}
+	if ($search_status >= 0) {
+		$param .= "&search_status=".urlencode($search_status);
+	}
+	if ($show_files) {
+		$param .= '&show_files='.urlencode($show_files);
+	}
+	if ($option) {
+		$param .= "&option=".urlencode($option);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
+	if ($search_categ_sup > 0) {
+		$param .= '&search_categ_sup='.urlencode($search_categ_sup);
+	}
+	if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
+		$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -690,25 +838,33 @@ if ($resql)
 		//'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($conf->paymentbybanktransfer->enabled) {
-        	$langs->load("withdrawals");
-        	$arrayofmassactions['transfer_request'] = $langs->trans("MakeBankTransferOrder");
+			$langs->load("withdrawals");
+			$arrayofmassactions['transfer_request'] = $langs->trans("MakeBankTransferOrder");
 	}
 	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 	if (!empty($conf->paymentbybanktransfer->enabled) && !empty($user->rights->paymentbybanktransfer->create)) {
 		$langs->load('withdrawals');
 		$arrayofmassactions['banktransfertrequest'] = $langs->trans("MakeBankTransferOrder");
 	}
-	if ($user->rights->fournisseur->facture->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) $arrayofmassactions = array();
+	if ($user->rights->fournisseur->facture->supprimer) {
+		$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	}
+	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
+		$arrayofmassactions = array();
+	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 	$url = DOL_URL_ROOT.'/fourn/facture/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
+	if (!empty($socid)) {
+		$url .= '&socid='.$socid;
+	}
 	$newcardbutton = dolGetButtonTitle($langs->trans('NewBill'), '', 'fa fa-plus-circle', $url, '', $user->rights->fournisseur->facture->creer);
 
 	$i = 0;
 	print '<form method="POST" name="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -724,8 +880,7 @@ if ($resql)
 	$trackid = 'sinv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($massaction == 'createbills')
-	{
+	if ($massaction == 'createbills') {
 		//var_dump($_REQUEST);
 		print '<input type="hidden" name="massaction" value="confirm_createbills">';
 
@@ -764,33 +919,31 @@ if ($resql)
 		print '<br>';
 	}
 
-	if ($search_all)
-	{
-		foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	if ($search_all) {
+		foreach ($fieldstosearchall as $key => $val) {
+			$fieldstosearchall[$key] = $langs->trans($val);
+		}
 		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 	}
 
- 	// If the user can view prospects other than his'
-	$moreforfilter = '';
- 	if ($user->rights->societe->client->voir || $socid)
- 	{
- 		$langs->load("commercial");
- 		$moreforfilter .= '<div class="divsearchfield">';
- 		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
-		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
-	 	$moreforfilter .= '</div>';
- 	}
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid)
-	{
+	$moreforfilter = '';
+	if ($user->rights->societe->client->voir || $socid) {
+		$langs->load("commercial");
+		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= $langs->trans('ThirdPartiesOfSaleRepresentative').': ';
+		$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, 1, 'maxwidth200');
+		$moreforfilter .= '</div>';
+	}
+	// If the user can view prospects other than his'
+	if ($user->rights->societe->client->voir || $socid) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('LinkedToSpecificUsers').': ';
 		$moreforfilter .= $form->select_dolusers($search_user, 'search_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
-	 	$moreforfilter .= '</div>';
+		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
-	{
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('IncludingProductWithTag').': ';
@@ -799,8 +952,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 
-	if (!empty($conf->categorie->enabled))
-	{
+	if (!empty($conf->categorie->enabled)) {
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('SuppliersCategoriesShort').': ';
@@ -809,19 +961,23 @@ if ($resql)
 	}
 	$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 ($moreforfilter)
-	{
-   		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	if ($moreforfilter) {
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
 		print $moreforfilter;
 		print '</div>';
 	}
 
 	$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";
@@ -829,22 +985,19 @@ if ($resql)
 	// Line for filters
 	print '<tr class="liste_titre_filter">';
 	// Ref
-	if (!empty($arrayfields['f.ref']['checked']))
-	{
+	if (!empty($arrayfields['f.ref']['checked'])) {
 		print '<td class="liste_titre left">';
 		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.$search_ref.'">';
 		print '</td>';
 	}
 	// Ref supplier
-	if (!empty($arrayfields['f.ref_supplier']['checked']))
-	{
+	if (!empty($arrayfields['f.ref_supplier']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_refsupplier" value="'.$search_refsupplier.'">';
 		print '</td>';
 	}
 	// Type
-	if (!empty($arrayfields['f.type']['checked']))
-	{
+	if (!empty($arrayfields['f.type']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone">';
 		$listtype = array(
 				FactureFournisseur::TYPE_STANDARD=>$langs->trans("InvoiceStandard"),
@@ -857,180 +1010,163 @@ if ($resql)
 		{
 			$listtype[Facture::TYPE_SITUATION] = $langs->trans("InvoiceSituation");
 		}
-        */
+		*/
 		//$listtype[Facture::TYPE_PROFORMA]=$langs->trans("InvoiceProForma");     // A proformat invoice is not an invoice but must be an order.
 		print $form->selectarray('search_type', $listtype, $search_type, 1, 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth100');
 		print '</td>';
 	}
 	// Label
-	if (!empty($arrayfields['f.label']['checked']))
-	{
+	if (!empty($arrayfields['f.label']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth75" type="text" name="search_label" value="'.$search_label.'">';
 		print '</td>';
 	}
 	// Date invoice
-	if (!empty($arrayfields['f.datef']['checked']))
-	{
+	if (!empty($arrayfields['f.datef']['checked'])) {
 		print '<td class="liste_titre nowraponall center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+			print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+		}
 		print '<input class="flat width25 valignmiddle" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
 		$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
 		print '</td>';
 	}
 	// Date due
-	if (!empty($arrayfields['f.date_lim_reglement']['checked']))
-	{
+	if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
 		print '<td class="liste_titre nowraponall center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
+		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+			print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day_lim" value="'.dol_escape_htmltag($day_lim).'">';
+		}
 		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month_lim" value="'.$month_lim.'">';
 		$formother->select_year($year_lim ? $year_lim : -1, 'year_lim', 1, 20, 5);
 		print '<br><input type="checkbox" name="option" value="late"'.($option == 'late' ? ' checked' : '').'> '.$langs->trans("Late");
 		print '</td>';
 	}
 	// Project
-	if (!empty($arrayfields['p.ref']['checked']))
-	{
+	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_project" value="'.$search_project.'"></td>';
 	}
 	// Thirpdarty
-	if (!empty($arrayfields['s.nom']['checked']))
-	{
+	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_company" value="'.$search_company.'"></td>';
 	}
 	// Town
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) {
+		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
+	}
 	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre center"><input class="flat maxwidth50" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print '<td class="liste_titre center"><input class="flat maxwidth50" type="text" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
+	}
 	// State
-	if (!empty($arrayfields['state.nom']['checked']))
-	{
+	if (!empty($arrayfields['state.nom']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="4" type="text" name="search_state" value="'.dol_escape_htmltag($search_state).'">';
 		print '</td>';
 	}
 	// Country
-	if (!empty($arrayfields['country.code_iso']['checked']))
-	{
+	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="liste_titre center">';
 		print $form->select_country($search_country, 'search_country', '', 0, 'minwidth100imp maxwidth100');
 		print '</td>';
 	}
 	// Company type
-	if (!empty($arrayfields['typent.code']['checked']))
-	{
+	if (!empty($arrayfields['typent.code']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 1, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), '', 1);
 		print '</td>';
 	}
 	// Condition of payment
-	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
-	{
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 		print '<td class="liste_titre left">';
 		$form->select_conditions_paiements($search_paymentcond, 'search_paymentcond', -1, 1, 1, 'maxwidth100');
 		print '</td>';
 	}
 	// Payment mode
-	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
-	{
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 		print '<td class="liste_titre left">';
 		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 20, 1, 'maxwidth100');
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_ht']['checked']))
-	{
+	if (!empty($arrayfields['f.total_ht']['checked'])) {
 		// Amount without tax
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_vat']['checked']))
-	{
+	if (!empty($arrayfields['f.total_vat']['checked'])) {
 		// Amount vat
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_localtax1']['checked']))
-	{
+	if (!empty($arrayfields['f.total_localtax1']['checked'])) {
 		// Amount tax 1
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_localtax1" value="'.$search_montant_localtax1.'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_localtax2']['checked']))
-	{
+	if (!empty($arrayfields['f.total_localtax2']['checked'])) {
 		// Amount tax 2
- 		print '<td class="liste_titre right">';
+		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_localtax2" value="'.$search_montant_localtax2.'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['f.total_ttc']['checked'])) {
 		// Amount inc tac
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['u.login']['checked']))
-	{
+	if (!empty($arrayfields['u.login']['checked'])) {
 		// Author
 		print '<td class="liste_titre" align="center">';
 		print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['dynamount_payed']['checked']))
-	{
+	if (!empty($arrayfields['dynamount_payed']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['rtp']['checked']))
-	{
+	if (!empty($arrayfields['rtp']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_code']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
 		// Currency
 		print '<td class="liste_titre">';
 		print $form->selectMultiCurrency($search_multicurrency_code, 'search_multicurrency_code', 1);
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_tx']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
 		// Currency rate
 		print '<td class="liste_titre">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_tx" value="'.dol_escape_htmltag($search_multicurrency_tx).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_total_ht']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ht" value="'.dol_escape_htmltag($search_multicurrency_montant_ht).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_vat" value="'.dol_escape_htmltag($search_multicurrency_montant_vat).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))
-	{
+	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
 		// Amount
 		print '<td class="liste_titre right">';
 		print '<input class="flat" type="text" size="4" name="search_multicurrency_montant_ttc" value="'.dol_escape_htmltag($search_multicurrency_montant_ttc).'">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked']))
-	{
+	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
-	if (!empty($arrayfields['multicurrency_rtp']['checked']))
-	{
+	if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '</td>';
 	}
@@ -1042,20 +1178,17 @@ if ($resql)
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['f.datec']['checked']))
-	{
+	if (!empty($arrayfields['f.datec']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Date modification
-	if (!empty($arrayfields['f.tms']['checked']))
-	{
+	if (!empty($arrayfields['f.tms']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
 	// Status
-	if (!empty($arrayfields['f.fk_statut']['checked']))
-	{
+	if (!empty($arrayfields['f.fk_statut']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone right">';
 		$liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
 		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
@@ -1070,45 +1203,111 @@ if ($resql)
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
-	if (!empty($arrayfields['f.ref']['checked']))                print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER['PHP_SELF'], 'f.ref,f.rowid', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.ref_supplier']['checked']))       print_liste_field_titre($arrayfields['f.ref_supplier']['label'], $_SERVER["PHP_SELF"], 'f.ref_supplier', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.type']['checked']))               print_liste_field_titre($arrayfields['f.type']['label'], $_SERVER["PHP_SELF"], 'f.type', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.label']['checked']))              print_liste_field_titre($arrayfields['f.label']['label'], $_SERVER['PHP_SELF'], "f.libelle,f.rowid", '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.datef']['checked']))              print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER['PHP_SELF'], 'f.datef,f.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['f.date_lim_reglement']['checked'])) print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'], $_SERVER['PHP_SELF'], "f.date_lim_reglement", '', $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['p.ref']['checked']))                print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER['PHP_SELF'], "p.ref", '', $param, '', $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['s.town']['checked']))               print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['s.zip']['checked']))                print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder, 'center ');
-	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, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_cond_reglement", "", $param, "", $sortfield, $sortorder);
-	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
-	if (!empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['f.total_localtax1']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['f.total_localtax2']['checked']))    print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['f.total_ttc']['checked']))          print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['u.login']['checked']))              print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
-	if (!empty($arrayfields['dynamount_payed']['checked']))      print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['rtp']['checked']))                  print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
-	if (!empty($arrayfields['f.multicurrency_code']['checked']))          print_liste_field_titre($arrayfields['f.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_code', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.multicurrency_tx']['checked']))            print_liste_field_titre($arrayfields['f.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.multicurrency_total_ht']['checked']))      print_liste_field_titre($arrayfields['f.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))     print_liste_field_titre($arrayfields['f.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
-	if (!empty($arrayfields['multicurrency_rtp']['checked']))             print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER['PHP_SELF'], 'f.ref,f.rowid', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.ref_supplier']['checked'])) {
+		print_liste_field_titre($arrayfields['f.ref_supplier']['label'], $_SERVER["PHP_SELF"], 'f.ref_supplier', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.type']['checked'])) {
+		print_liste_field_titre($arrayfields['f.type']['label'], $_SERVER["PHP_SELF"], 'f.type', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.label']['checked'])) {
+		print_liste_field_titre($arrayfields['f.label']['label'], $_SERVER['PHP_SELF'], "f.libelle,f.rowid", '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.datef']['checked'])) {
+		print_liste_field_titre($arrayfields['f.datef']['label'], $_SERVER['PHP_SELF'], 'f.datef,f.rowid', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.date_lim_reglement']['label'], $_SERVER['PHP_SELF'], "f.date_lim_reglement", '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER['PHP_SELF'], "p.ref", '', $param, '', $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['s.town']['checked'])) {
+		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.zip']['checked'])) {
+		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
+	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, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['typent.code']['checked'])) {
+		print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_cond_reglement", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['f.total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['f.total_localtax1']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_localtax1']['label'], $_SERVER['PHP_SELF'], 'f.localtax1', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['f.total_localtax2']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_localtax2']['label'], $_SERVER['PHP_SELF'], 'f.localtax2', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['f.total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.total_ttc', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['u.login']['checked'])) {
+		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['dynamount_payed']['checked'])) {
+		print_liste_field_titre($arrayfields['dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['rtp']['checked'])) {
+		print_liste_field_titre($arrayfields['rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
+	}
+	if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_code']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_code', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_tx']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_tx', '', $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_total_ht']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_total_vat']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_tva', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
+		print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
+		print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
+		print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	}
 	// 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); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (!empty($arrayfields['f.datec']['checked']))     print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['f.tms']['checked']))       print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-	if (!empty($arrayfields['f.fk_statut']['checked'])) print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "fk_statut,paye,type", "", $param, '', $sortfield, $sortorder, 'right ');
+	if (!empty($arrayfields['f.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['f.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	}
+	if (!empty($arrayfields['f.fk_statut']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "fk_statut,paye,type", "", $param, '', $sortfield, $sortorder, 'right ');
+	}
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
@@ -1117,12 +1316,10 @@ if ($resql)
 	$projectstatic = new Project($db);
 	$userstatic = new User($db);
 
-	if ($num > 0)
-	{
+	if ($num > 0) {
 		$i = 0;
 		$totalarray = array();
-		while ($i < min($num, $limit))
-		{
+		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 
 			$datelimit = $db->jdate($obj->datelimite);
@@ -1176,8 +1373,7 @@ if ($resql)
 			}
 
 			print '<tr class="oddeven">';
-			if (!empty($arrayfields['f.ref']['checked']))
-			{
+			if (!empty($arrayfields['f.ref']['checked'])) {
 				print '<td class="nowrap">';
 
 				print '<table class="nobordernopadding"><tr class="nocellnopadd">';
@@ -1192,253 +1388,301 @@ if ($resql)
 				print '</td></tr></table>';
 
 				print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Supplier ref
-			if (!empty($arrayfields['f.ref_supplier']['checked']))
-			{
+			if (!empty($arrayfields['f.ref_supplier']['checked'])) {
 				print '<td class="nowrap tdoverflowmax200">';
 				print $obj->ref_supplier;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Type
-			if (!empty($arrayfields['f.type']['checked']))
-			{
+			if (!empty($arrayfields['f.type']['checked'])) {
 				print '<td class="nowrap">';
 				print $facturestatic->getLibType();
 				print "</td>";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Label
-			if (!empty($arrayfields['f.label']['checked']))
-			{
+			if (!empty($arrayfields['f.label']['checked'])) {
 				print '<td class="nowrap">';
 				print $obj->label;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Date
-			if (!empty($arrayfields['f.datef']['checked']))
-			{
+			if (!empty($arrayfields['f.datef']['checked'])) {
 				print '<td class="center nowrap">';
 				print dol_print_date($db->jdate($obj->datef), 'day');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Date limit
-			if (!empty($arrayfields['f.date_lim_reglement']['checked']))
-			{
+			if (!empty($arrayfields['f.date_lim_reglement']['checked'])) {
 				print '<td class="center nowrap">'.dol_print_date($datelimit, 'day');
-				if ($facturestatic->hasDelay())
-				{
+				if ($facturestatic->hasDelay()) {
 					print img_warning($langs->trans('Late'));
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Project
-			if (!empty($arrayfields['p.ref']['checked']))
-			{
+			if (!empty($arrayfields['p.ref']['checked'])) {
 				print '<td class="nowrap">';
-				if ($obj->project_id > 0)
-				{
+				if ($obj->project_id > 0) {
 					$projectstatic->id = $obj->project_id;
 					$projectstatic->ref = $obj->project_ref;
 					$projectstatic->title = $obj->project_label;
 					print $projectstatic->getNomUrl(1);
 				}
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Third party
-			if (!empty($arrayfields['s.nom']['checked']))
-			{
+			if (!empty($arrayfields['s.nom']['checked'])) {
 				print '<td class="tdoverflowmax200">';
 				print $thirdparty->getNomUrl(1, 'supplier');
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Town
-			if (!empty($arrayfields['s.town']['checked']))
-			{
+			if (!empty($arrayfields['s.town']['checked'])) {
 				print '<td class="nocellnopadd">';
 				print $obj->town;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Zip
-			if (!empty($arrayfields['s.zip']['checked']))
-			{
+			if (!empty($arrayfields['s.zip']['checked'])) {
 				print '<td class="nocellnopadd center">';
 				print $obj->zip;
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// State
-			if (!empty($arrayfields['state.nom']['checked']))
-			{
+			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']))
-			{
+			if (!empty($arrayfields['country.code_iso']['checked'])) {
 				print '<td class="center">';
 				$tmparray = getCountry($obj->fk_pays, 'all');
 				print $tmparray['label'];
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Type ent
-			if (!empty($arrayfields['typent.code']['checked']))
-			{
+			if (!empty($arrayfields['typent.code']['checked'])) {
 				print '<td class="center">';
-				if (empty($typenArray)) $typenArray = $formcompany->typent_array(1);
+				if (empty($typenArray)) {
+					$typenArray = $formcompany->typent_array(1);
+				}
 				print $typenArray[$obj->typent_code];
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Payment condition
-			if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
-			{
+			if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 				print '<td>';
 				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', '', -1);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Payment mode
-			if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
-			{
+			if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
 				print '<td>';
 				$form->form_modes_reglement($_SERVER['PHP_SELF'], $obj->fk_mode_reglement, 'none', '', -1);
 				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Amount HT
-			if (!empty($arrayfields['f.total_ht']['checked']))
-			{
+			if (!empty($arrayfields['f.total_ht']['checked'])) {
 				  print '<td class="right nowrap">'.price($obj->total_ht)."</td>\n";
-				  if (!$i) $totalarray['nbfield']++;
-				  if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
+				}
 				  $totalarray['val']['f.total_ht'] += $obj->total_ht;
 			}
 			// Amount VAT
-			if (!empty($arrayfields['f.total_vat']['checked']))
-			{
+			if (!empty($arrayfields['f.total_vat']['checked'])) {
 				print '<td class="right nowrap">'.price($obj->total_vat)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_vat';
+				}
 				$totalarray['val']['f.total_vat'] += $obj->total_vat;
 			}
 			// Amount LocalTax1
-			if (!empty($arrayfields['f.total_localtax1']['checked']))
-			{
+			if (!empty($arrayfields['f.total_localtax1']['checked'])) {
 				print '<td class="right nowrap">'.price($obj->total_localtax1)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax1';
+				}
 				$totalarray['val']['f.total_localtax1'] += $obj->total_localtax1;
 			}
 			// Amount LocalTax2
-			if (!empty($arrayfields['f.total_localtax2']['checked']))
-			{
+			if (!empty($arrayfields['f.total_localtax2']['checked'])) {
 				print '<td class="right nowrap">'.price($obj->total_localtax2)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_localtax2';
+				}
 				$totalarray['val']['f.total_localtax2'] += $obj->total_localtax2;
 			}
 			// Amount TTC
-			if (!empty($arrayfields['f.total_ttc']['checked']))
-			{
+			if (!empty($arrayfields['f.total_ttc']['checked'])) {
 				print '<td class="right nowrap">'.price($obj->total_ttc)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				}
 				$totalarray['val']['f.total_ttc'] += $obj->total_ttc;
 			}
 
 			// Author
-			if (!empty($arrayfields['u.login']['checked']))
-			{
+			if (!empty($arrayfields['u.login']['checked'])) {
 				$userstatic->id = $obj->fk_user_author;
 				$userstatic->login = $obj->login;
 				print '<td align="center">';
-				if ($userstatic->id) print $userstatic->getLoginUrl(1);
-				else print '&nbsp;';
+				if ($userstatic->id) {
+					print $userstatic->getLoginUrl(1);
+				} else {
+					print '&nbsp;';
+				}
 				print "</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
-			if (!empty($arrayfields['dynamount_payed']['checked']))
-			{
+			if (!empty($arrayfields['dynamount_payed']['checked'])) {
 				print '<td class="right nowrap">'.(!empty($totalpay) ?price($totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalam';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
+				}
 				$totalarray['val']['totalam'] += $totalpay;
 			}
 
-			if (!empty($arrayfields['rtp']['checked']))
-			{
+			if (!empty($arrayfields['rtp']['checked'])) {
 				print '<td class="right nowrap">'.(!empty($remaintopay) ?price($remaintopay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
-				if (!$i) $totalarray['nbfield']++;
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'rtp';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'rtp';
+				}
 				$totalarray['val']['rtp'] += $remaintopay;
 			}
 
 			// Currency
-			if (!empty($arrayfields['f.multicurrency_code']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
 				  print '<td class="nowrap">'.$obj->multicurrency_code.' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
-				  if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Currency rate
-			if (!empty($arrayfields['f.multicurrency_tx']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
 				  print '<td class="nowrap">';
 				  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
 				  print "</td>\n";
-				  if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Amount HT
-			if (!empty($arrayfields['f.multicurrency_total_ht']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
 				  print '<td class="right nowrap">'.price($obj->multicurrency_total_ht)."</td>\n";
-				  if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Amount VAT
-			if (!empty($arrayfields['f.multicurrency_total_vat']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_total_vat']['checked'])) {
 				print '<td class="right nowrap">'.price($obj->multicurrency_total_vat)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 			// Amount TTC
-			if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))
-			{
+			if (!empty($arrayfields['f.multicurrency_total_ttc']['checked'])) {
 				print '<td class="right nowrap">'.price($obj->multicurrency_total_ttc)."</td>\n";
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked']))
-			{
+			if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) {
 				print '<td class="right nowrap">'.(!empty($multicurrency_totalpay) ?price($multicurrency_totalpay, 0, $langs) : '&nbsp;').'</td>'; // TODO Use a denormalized field
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 			// Pending amount
-			if (!empty($arrayfields['multicurrency_rtp']['checked']))
-			{
+			if (!empty($arrayfields['multicurrency_rtp']['checked'])) {
 				print '<td class="right nowrap">';
 				print (!empty($multicurrency_remaintopay) ? price($multicurrency_remaintopay, 0, $langs) : '&nbsp;');
 				print '</td>'; // TODO Use a denormalized field
-				if (!$i) $totalarray['nbfield']++;
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
 
 
@@ -1449,40 +1693,46 @@ if ($resql)
 			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 			// Date creation
-			if (!empty($arrayfields['f.datec']['checked']))
-			{
+			if (!empty($arrayfields['f.datec']['checked'])) {
 				print '<td class="center nowrap">';
 				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['f.tms']['checked']))
-			{
+			if (!empty($arrayfields['f.tms']['checked'])) {
 				print '<td class="center nowrap">';
 				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['f.fk_statut']['checked']))
-			{
+			if (!empty($arrayfields['f.fk_statut']['checked'])) {
 				print '<td class="right nowrap">';
 				print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
 				print "</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($obj->facid, $arrayofselected)) $selected = 1;
+				if (in_array($obj->facid, $arrayofselected)) {
+					$selected = 1;
+				}
 				print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 
 			print "</tr>\n";
 
@@ -1505,7 +1755,9 @@ if ($resql)
 	print "</form>\n";
 
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	// Show list of available documents
 	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index c98ad3ba1d8..541121031ee 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -40,7 +40,9 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 $object = new FactureFournisseur($db);
@@ -56,11 +58,12 @@ $permissionnote = $user->rights->fournisseur->facture->creer; // Used by the inc
 include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once
 
 // Set label
-if ($action == 'setlabel' && $user->rights->fournisseur->facture->creer)
-{
+if ($action == 'setlabel' && $user->rights->fournisseur->facture->creer) {
 	$object->label = $_POST['label'];
 	$result = $object->update($user);
-	if ($result < 0) dol_print_error($db);
+	if ($result < 0) {
+		dol_print_error($db);
+	}
 }
 
 
@@ -74,8 +77,7 @@ $title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Notes');
 $helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
 llxHeader('', $title, $helpurl);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$object->fetch_thirdparty();
 
 	$alreadypaid = $object->getSommePaiement();
@@ -94,14 +96,14 @@ if ($object->id > 0)
 	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) {
+		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	}
 	// Project
-	if (!empty($conf->projet->enabled))
-	{
+	if (!empty($conf->projet->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->fournisseur->commande->creer)
-		{
+		if ($user->rights->fournisseur->commande->creer) {
 			if ($action != 'classify') {
 				// $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 				$morehtmlref .= ' : ';
@@ -143,36 +145,34 @@ if ($object->id > 0)
 	// Type
 	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
 	print $object->getLibType();
-	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
-	{
+	if ($object->type == FactureFournisseur::TYPE_REPLACEMENT) {
 		$facreplaced = new FactureFournisseur($db);
 		$facreplaced->fetch($object->fk_facture_source);
 		print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
 	}
-	if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-	{
+	if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 		$facusing = new FactureFournisseur($db);
 		$facusing->fetch($object->fk_facture_source);
 		print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
 	}
 
 	$facidavoir = $object->getListIdAvoirFromInvoice();
-	if (count($facidavoir) > 0)
-	{
+	if (count($facidavoir) > 0) {
 		print ' ('.$langs->transnoentities("InvoiceHasAvoir");
 		$i = 0;
-		foreach ($facidavoir as $fid)
-		{
-			if ($i == 0) print ' ';
-			else print ',';
+		foreach ($facidavoir as $fid) {
+			if ($i == 0) {
+				print ' ';
+			} else {
+				print ',';
+			}
 			$facavoir = new FactureFournisseur($db);
 			$facavoir->fetch($fid);
 			print $facavoir->getNomUrl(1);
 		}
 		print ')';
 	}
-	if ($facidnext > 0)
-	{
+	if ($facidnext > 0) {
 		$facthatreplace = new FactureFournisseur($db);
 		$facthatreplace->fetch($facidnext);
 		print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
@@ -190,14 +190,12 @@ if ($object->id > 0)
 
 	// Amount Local Taxes
 	//TODO: Place into a function to control showing by country or study better option
-	if ($societe->localtax1_assuj == "1") //Localtax1
-	{
+	if ($societe->localtax1_assuj == "1") { //Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
 		print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
-	if ($societe->localtax2_assuj == "1") //Localtax2
-	{
+	if ($societe->localtax2_assuj == "1") { //Localtax2
 		print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
 		print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 0592084f042..104e0e7efd2 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -64,12 +64,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "p.rowid";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "p.rowid";
+}
 
 $amounts = array();
 $amountsresttopay = array();
@@ -79,8 +85,7 @@ $multicurrency_amounts = array();
 $multicurrency_amountsresttopay = array();
 
 // Security check
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
@@ -103,8 +108,7 @@ $arrayfields = array();
  * Actions
  */
 
-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_ref = "";
 	$search_account = "";
 	$search_amount = "";
@@ -119,12 +123,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 $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))
-{
-	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes'))
-	{
+if (empty($reshook)) {
+	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes')) {
 		$error = 0;
 
 		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
@@ -135,10 +139,8 @@ if (empty($reshook))
 
 		// Generate payment array and check if there is payment higher than invoice and payment date before invoice date
 		$tmpinvoice = new FactureFournisseur($db);
-		foreach ($_POST as $key => $value)
-		{
-			if (substr($key, 0, 7) == 'amount_')
-			{
+		foreach ($_POST as $key => $value) {
+			if (substr($key, 0, 7) == 'amount_') {
 				$cursorfacid = substr($key, 7);
 				$amounts[$cursorfacid] = price2num(GETPOST($key));
 				if (!empty($amounts[$cursorfacid])) {
@@ -150,19 +152,18 @@ if (empty($reshook))
 					}
 				}
 				$result = $tmpinvoice->fetch($cursorfacid);
-				if ($result <= 0) dol_print_error($db);
+				if ($result <= 0) {
+					dol_print_error($db);
+				}
 				$amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement());
-				if ($amounts[$cursorfacid])
-				{
+				if ($amounts[$cursorfacid]) {
 					// Check amount
-					if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid])))
-					{
+					if ($amounts[$cursorfacid] && (abs($amounts[$cursorfacid]) > abs($amountsresttopay[$cursorfacid]))) {
 						$addwarning = 1;
 						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
 					}
 					// Check date
-					if ($datepaye && ($datepaye < $tmpinvoice->date))
-					{
+					if ($datepaye && ($datepaye < $tmpinvoice->date)) {
 						$langs->load("errors");
 						//$error++;
 						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
@@ -170,26 +171,26 @@ if (empty($reshook))
 				}
 
 				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
-			} elseif (substr($key, 0, 21) == 'multicurrency_amount_')
-			{
+			} elseif (substr($key, 0, 21) == 'multicurrency_amount_') {
 				$cursorfacid = substr($key, 21);
 				$multicurrency_amounts[$cursorfacid] = (GETPOST($key) ? price2num(GETPOST($key)) : 0);
 				$multicurrency_totalpayment += $multicurrency_amounts[$cursorfacid];
-				if (!empty($multicurrency_amounts[$cursorfacid])) $atleastonepaymentnotnull++;
+				if (!empty($multicurrency_amounts[$cursorfacid])) {
+					$atleastonepaymentnotnull++;
+				}
 				$result = $tmpinvoice->fetch($cursorfacid);
-				if ($result <= 0) dol_print_error($db);
+				if ($result <= 0) {
+					dol_print_error($db);
+				}
 				$multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement(1));
-				if ($multicurrency_amounts[$cursorfacid])
-				{
+				if ($multicurrency_amounts[$cursorfacid]) {
 					// Check amount
-					if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid])))
-					{
+					if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid]))) {
 						$addwarning = 1;
 						$formquestion['text'] = img_warning($langs->trans("PaymentHigherThanReminderToPaySupplier")).' '.$langs->trans("HelpPaymentHigherThanReminderToPaySupplier");
 					}
 					// Check date
-					if ($datepaye && ($datepaye < $tmpinvoice->date))
-					{
+					if ($datepaye && ($datepaye < $tmpinvoice->date)) {
 						$langs->load("errors");
 						//$error++;
 						setEventMessages($langs->transnoentities("WarningPaymentDateLowerThanInvoiceDate", dol_print_date($datepaye, 'day'), dol_print_date($tmpinvoice->date, 'day'), $tmpinvoice->ref), null, 'warnings');
@@ -201,37 +202,31 @@ if (empty($reshook))
 		}
 
 		// Check parameters
-		if ($_POST['paiementid'] <= 0)
-		{
+		if ($_POST['paiementid'] <= 0) {
 			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
 			$error++;
 		}
 
-		if (!empty($conf->banque->enabled))
-		{
+		if (!empty($conf->banque->enabled)) {
 			// If bank module is on, account is required to enter a payment
-			if (GETPOST('accountid') <= 0)
-			{
+			if (GETPOST('accountid') <= 0) {
 				setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
 				$error++;
 			}
 		}
 
-		if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull))
-		{
+		if (empty($totalpayment) && empty($multicurrency_totalpayment) && empty($atleastonepaymentnotnull)) {
 			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->trans('PaymentAmount')), null, 'errors');
 			$error++;
 		}
 
-		if (empty($datepaye))
-		{
+		if (empty($datepaye)) {
 			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('Date')), null, 'errors');
 			$error++;
 		}
 
 		// Check if payments in both currency
-		if ($totalpayment > 0 && $multicurrency_totalpayment > 0)
-		{
+		if ($totalpayment > 0 && $multicurrency_totalpayment > 0) {
 			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
 			$error++;
 		}
@@ -240,10 +235,8 @@ if (empty($reshook))
 	/*
 	 * Action add_paiement
 	 */
-	if ($action == 'add_paiement')
-	{
-		if ($error)
-		{
+	if ($action == 'add_paiement') {
+		if ($error) {
 			$action = 'create';
 		}
 		// All the next of this action is displayed at the page's bottom.
@@ -253,30 +246,25 @@ if (empty($reshook))
 	/*
 	 * Action confirm_paiement
 	 */
-	if ($action == 'confirm_paiement' && $confirm == 'yes')
-	{
+	if ($action == 'confirm_paiement' && $confirm == 'yes') {
 		$error = 0;
 
 		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 		// Clean parameters amount if payment is for a credit note
-		foreach ($amounts as $key => $value)	// How payment is dispatched
-		{
+		foreach ($amounts as $key => $value) {	// How payment is dispatched
 			$tmpinvoice = new FactureFournisseur($db);
 			$tmpinvoice->fetch($key);
-			if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-			{
+			if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 				$newvalue = price2num($value, 'MT');
 				$amounts[$key] = - abs($newvalue);
 			}
 		}
 
-		foreach ($multicurrency_amounts as $key => $value)	// How payment is dispatched
-		{
+		foreach ($multicurrency_amounts as $key => $value) {	// How payment is dispatched
 			$tmpinvoice = new FactureFournisseur($db);
 			$tmpinvoice->fetch($key);
-			if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-			{
+			if ($tmpinvoice->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 				$newvalue = price2num($value, 'MT');
 				$multicurrency_amounts[$key] = - abs($newvalue);
 			}
@@ -286,12 +274,13 @@ if (empty($reshook))
 		//var_dump($multicurrency_amounts);
 		//exit;
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			$thirdparty = new Societe($db);
-			if ($socid > 0) $thirdparty->fetch($socid);
+			if ($socid > 0) {
+				$thirdparty->fetch($socid);
+			}
 
 			// Creation of payment line
 			$paiement = new PaiementFourn($db);
@@ -305,43 +294,42 @@ if (empty($reshook))
 			$paiement->num_payment = $paiement->num_payment;
 			$paiement->note_private = $paiement->note_private;
 
-			if (!$error)
-			{
+			if (!$error) {
 				$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty);
-				if ($paiement_id < 0)
-				{
+				if ($paiement_id < 0) {
 					setEventMessages($paiement->error, $paiement->errors, 'errors');
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $paiement->addPaymentToBank($user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, '', '');
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					setEventMessages($paiement->error, $paiement->errors, 'errors');
 					$error++;
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 
 				// If payment dispatching on more than one invoice, we stay on summary page, otherwise go on invoice card
 				$invoiceid = 0;
-				foreach ($paiement->amounts as $key => $amount)
-				{
+				foreach ($paiement->amounts as $key => $amount) {
 					$facid = $key;
-					if (is_numeric($amount) && $amount <> 0)
-					{
-						if ($invoiceid != 0) $invoiceid = -1; // There is more than one invoice payed by this payment
-						else $invoiceid = $facid;
+					if (is_numeric($amount) && $amount <> 0) {
+						if ($invoiceid != 0) {
+							$invoiceid = -1; // There is more than one invoice payed by this payment
+						} else {
+							$invoiceid = $facid;
+						}
 					}
 				}
-				if ($invoiceid > 0) $loc = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$invoiceid;
-				else $loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
+				if ($invoiceid > 0) {
+					$loc = DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$invoiceid;
+				} else {
+					$loc = DOL_URL_ROOT.'/fourn/paiement/card.php?id='.$paiement_id;
+				}
 				header('Location: '.$loc);
 				exit;
 			} else {
@@ -364,8 +352,7 @@ $invoicesupplierstatic = new FactureFournisseur($db);
 
 llxHeader('', $langs->trans('ListPayment'));
 
-if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement')
-{
+if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paiement') {
 	$object = new FactureFournisseur($db);
 	$result = $object->fetch($facid);
 
@@ -374,26 +361,29 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 	$sql = 'SELECT s.nom as name, s.rowid as socid,';
 	$sql .= ' f.rowid, f.ref, f.ref_supplier, f.total_ttc as total, f.fk_mode_reglement, f.fk_account';
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", sc.fk_soc, sc.fk_user ";
+	}
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	}
 	$sql .= ' WHERE f.fk_soc = s.rowid';
 	$sql .= ' AND f.rowid = '.$facid;
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+	}
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
-		if ($num)
-		{
+		if ($num) {
 			$obj = $db->fetch_object($resql);
 			$total = $obj->total;
 
 			print load_fiche_titre($langs->trans('DoPayment'));
 
 			// Add realtime total information
-			if (!empty($conf->use_javascript_ajax))
-			{
+			if (!empty($conf->use_javascript_ajax)) {
 				print "\n".'<script type="text/javascript" language="javascript">';
 				print '$(document).ready(function () {
 
@@ -491,8 +481,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
 			$form->select_types_paiements(empty($_POST['paiementid']) ? $obj->fk_mode_reglement : $_POST['paiementid'], 'paiementid');
 			print '</td>';
-			if (!empty($conf->banque->enabled))
-			{
+			if (!empty($conf->banque->enabled)) {
 				print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
 				$form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2);
 				print '</td></tr>';
@@ -510,11 +499,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			$parameters = array('facid'=>$facid, 'ref'=>$ref, 'objcanvas'=>$objcanvas);
 			$reshook = $hookmanager->executeHooks('paymentsupplierinvoices', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 			$error = $hookmanager->error; $errors = $hookmanager->errors;
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				/*
-	             * All unpaid supplier invoices
-	             */
+				 * All unpaid supplier invoices
+				 */
 				$sql = 'SELECT f.rowid as facid, f.ref, f.ref_supplier, f.type, f.total_ht, f.total_ttc,';
 				$sql .= ' f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
 				$sql .= ' f.datef as df, f.date_lim_reglement as dlr,';
@@ -525,8 +513,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				$sql .= ' AND f.fk_soc = '.$object->socid;
 				$sql .= ' AND f.paye = 0';
 				$sql .= ' AND f.fk_statut = 1'; // Status=0 => unvalidated, Status=2 => canceled
-				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
-				{
+				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE) {
 					$sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
 				} else {
 					$sql .= ' AND f.type = 2'; // If paying back a credit note, we show all credit notes
@@ -537,11 +524,9 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 				$sql .= ' ORDER BY f.datef ASC, f.ref ASC';
 
 				$resql = $db->query($sql);
-				if ($resql)
-				{
+				if ($resql) {
 					$num = $db->num_rows($resql);
-					if ($num > 0)
-					{
+					if ($num > 0) {
 						$i = 0;
 						print '<br>';
 
@@ -582,12 +567,13 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 						$total = 0;
 						$total_ttc = 0;
 						$totalrecu = 0;
-						while ($i < $num)
-						{
+						while ($i < $num) {
 							$objp = $db->fetch_object($resql);
 
 							$sign = 1;
-							if ($objp->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
+							if ($objp->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+								$sign = -1;
+							}
 
 							$invoice = new FactureFournisseur($db);
 							$invoice->fetch($objp->facid);
@@ -629,13 +615,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							}
 
 							// Date Max Payment
-							if ($objp->dlr > 0)
-							{
+							if ($objp->dlr > 0) {
 								print '<td class="center nowraponall">';
 								print dol_print_date($db->jdate($objp->dlr), 'day');
 
-								if ($invoice->hasDelay())
-								{
+								if ($invoice->hasDelay()) {
 									print img_warning($langs->trans('Late'));
 								}
 
@@ -645,28 +629,24 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							}
 
 							// Multicurrency
-							if (!empty($conf->multicurrency->enabled))
-							{
+							if (!empty($conf->multicurrency->enabled)) {
 								// Currency
 								print '<td class="center">'.$objp->multicurrency_code."</td>\n";
 
 								print '<td class="right">';
-								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-								{
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
 									print price($objp->multicurrency_total_ttc);
 								}
 								print '</td>';
 
 								print '<td class="right">';
-								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-								{
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
 									print price($objp->multicurrency_am);
 								}
 								print '</td>';
 
 								print '<td class="right">';
-								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-								{
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
 									print price($objp->multicurrency_total_ttc - $objp->multicurrency_am);
 								}
 								print '</td>';
@@ -675,8 +655,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print '<td class="right">'.price($sign * $objp->total_ttc).'</td>';
 
 							print '<td class="right">'.price($sign * $objp->am);
-							if ($creditnotes) print '+'.price($creditnotes);
-							if ($deposits) print '+'.price($deposits);
+							if ($creditnotes) {
+								print '+'.price($creditnotes);
+							}
+							if ($deposits) {
+								print '+'.price($deposits);
+							}
 							print '</td>';
 
 							print '<td class="right">'.price($sign * $remaintopay).'</td>';
@@ -687,10 +671,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							$namef = 'amount_'.$objp->facid;
 							$nameRemain = 'remain_'.$objp->facid;
 
-							if ($action != 'add_paiement')
-							{
-								if (!empty($conf->use_javascript_ajax))
+							if ($action != 'add_paiement') {
+								if (!empty($conf->use_javascript_ajax)) {
 									print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $remaintopay)."'");
+								}
 									print '<input type="hidden" class="remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
 									print '<input type="text" size="8" class="amount" name="'.$namef.'" value="'.dol_escape_htmltag(GETPOST($namef)).'">';	// class is requied to be used by javascript callForResult();
 							} else {
@@ -700,20 +684,18 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							print "</td>";
 
 							// Multicurrency Price
-							if (!empty($conf->multicurrency->enabled))
-							{
+							if (!empty($conf->multicurrency->enabled)) {
 								print '<td class="right">';
 
 								// Add remind multicurrency amount
 								$namef = 'multicurrency_amount_'.$objp->facid;
 								$nameRemain = 'multicurrency_remain_'.$objp->facid;
 
-								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency)
-								{
-									if ($action != 'add_paiement')
-									{
-										if (!empty($conf->use_javascript_ajax))
+								if ($objp->multicurrency_code && $objp->multicurrency_code != $conf->currency) {
+									if ($action != 'add_paiement') {
+										if (!empty($conf->use_javascript_ajax)) {
 											print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
+										}
 											print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
 											print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
 									} else {
@@ -744,8 +726,12 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 							}
 							print '<td class="right"><b>'.price($sign * $total_ttc).'</b></td>';
 							print '<td class="right"><b>'.price($sign * $totalrecu);
-							if ($totalrecucreditnote) print '+'.price($totalrecucreditnote);
-							if ($totalrecudeposits) print '+'.price($totalrecudeposits);
+							if ($totalrecucreditnote) {
+								print '+'.price($totalrecucreditnote);
+							}
+							if ($totalrecudeposits) {
+								print '+'.price($totalrecudeposits);
+							}
 							print	'</b></td>';
 							print '<td class="right"><b>'.price($sign * price2num($total_ttc - $totalrecu - $totalrecucreditnote - $totalrecudeposits, 'MT')).'</b></td>';
 							print '<td class="center" id="result" style="font-weight: bold;"></td>'; // Autofilled
@@ -765,25 +751,23 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			}
 
 			// Save Button
-			if ($action != 'add_paiement')
-			{
+			if ($action != 'add_paiement') {
 				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
 				print '<br><input type="submit" class="button" value="'.$langs->trans('ToMakePayment').'"></div>';
 			}
 
 			// Form to confirm payment
-			if ($action == 'add_paiement')
-			{
+			if ($action == 'add_paiement') {
 				$preselectedchoice = $addwarning ? 'no' : 'yes';
 
 				print '<br>';
-				if (!empty($totalpayment)) $text = $langs->trans('ConfirmSupplierPayment', price($totalpayment), $langs->trans("Currency".$conf->currency));
-				if (!empty($multicurrency_totalpayment))
-				{
+				if (!empty($totalpayment)) {
+					$text = $langs->trans('ConfirmSupplierPayment', price($totalpayment), $langs->trans("Currency".$conf->currency));
+				}
+				if (!empty($multicurrency_totalpayment)) {
 					$text .= '<br>'.$langs->trans('ConfirmSupplierPayment', price($multicurrency_totalpayment), $langs->trans("paymentInInvoiceCurrency"));
 				}
-				if (GETPOST('closepaidinvoices'))
-				{
+				if (GETPOST('closepaidinvoices')) {
 					$text .= '<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed");
 					print '<input type="hidden" name="closepaidinvoices" value="'.GETPOST('closepaidinvoices').'">';
 				}
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index 9ae7970d7db..fe2bb78008d 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -32,36 +32,39 @@ $langs->loadLangs(array('bills'));
 
 // Security check
 $socid = '';
-if (!empty($user->socid)) $socid = $user->socid;
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
 
 $action = GETPOST('action', 'aZ09');
 
 $socid = 0;
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
 
 $dir = $conf->fournisseur->facture->dir_output.'/payments';
-if (!$user->rights->societe->client->voir || $socid) $dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
+if (!$user->rights->societe->client->voir || $socid) {
+	$dir .= '/private/'.$user->id; // If user has no permission to see all, output dir is specific to user
+}
 
 $year = GETPOST("year", 'int');
-if (!$year) { $year = date("Y"); }
+if (!$year) {
+	$year = date("Y");
+}
 
 
 /*
  * Actions
  */
 
-if ($action == 'builddoc')
-{
+if ($action == 'builddoc') {
 	$rap = new pdf_paiement_fourn($db);
 
 	$outputlangs = $langs;
-	if (GETPOST('lang_id', 'aZ09'))
-	{
+	if (GETPOST('lang_id', 'aZ09')) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang(GETPOST('lang_id', 'aZ09'));
 	}
@@ -69,8 +72,7 @@ if ($action == 'builddoc')
 	// We save charset_output to restore it because write_file can change it if needed for
 	// output format that does not support UTF8.
 	$sav_charset_output = $outputlangs->charset_output;
-	if ($rap->write_file($dir, GETPOST("remonth", 'int'), GETPOST("reyear", 'int'), $outputlangs) > 0)
-	{
+	if ($rap->write_file($dir, GETPOST("remonth", 'int'), GETPOST("reyear", 'int'), $outputlangs) > 0) {
 		$outputlangs->charset_output = $sav_charset_output;
 	} else {
 		$outputlangs->charset_output = $sav_charset_output;
@@ -114,15 +116,11 @@ clearstatcache();
 // Show link on other years
 $linkforyear = array();
 $found = 0;
-if (is_dir($dir))
-{
+if (is_dir($dir)) {
 	$handle = opendir($dir);
-	if (is_resource($handle))
-	{
-		while (($file = readdir($handle)) !== false)
-		{
-			if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file))
-			{
+	if (is_resource($handle)) {
+		while (($file = readdir($handle)) !== false) {
+			if (is_dir($dir.'/'.$file) && !preg_match('/^\./', $file) && is_numeric($file)) {
 				$found = 1;
 				$linkforyear[] = $file;
 			}
@@ -130,18 +128,17 @@ if (is_dir($dir))
 	}
 }
 asort($linkforyear);
-foreach ($linkforyear as $cursoryear)
-{
+foreach ($linkforyear as $cursoryear) {
 	print '<a href="'.$_SERVER["PHP_SELF"].'?year='.$cursoryear.'">'.$cursoryear.'</a> &nbsp;';
 }
 
-if ($year)
-{
-	if (is_dir($dir.'/'.$year))
-	{
+if ($year) {
+	if (is_dir($dir.'/'.$year)) {
 		$handle = opendir($dir.'/'.$year);
 
-		if ($found) print '<br>';
+		if ($found) {
+			print '<br>';
+		}
 		print '<br>';
 		print '<table width="100%" class="noborder">';
 		print '<tr class="liste_titre">';
@@ -150,12 +147,9 @@ if ($year)
 		print '<td class="right">'.$langs->trans("Date").'</td>';
 		print '</tr>';
 
-		if (is_resource($handle))
-		{
-			while (($file = readdir($handle)) !== false)
-			{
-				if (preg_match('/^supplier_payment/i', $file))
-				{
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match('/^supplier_payment/i', $file)) {
 					$tfile = $dir.'/'.$year.'/'.$file;
 					$relativepath = $year.'/'.$file;
 					print '<tr class="oddeven"><td><a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart=facture_fournisseur&amp;file=payments/'.urlencode($relativepath).'">'.img_pdf().' '.$file.'</a>'.$formfile->showPreview($file, 'facture_fournisseur', 'payments/'.$relativepath, 0).'</td>';
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 4456d27c539..c3ca301ed45 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -19,8 +19,7 @@
  */
 
 // Protection to avoid direct call of template
-if (empty($conf) || !is_object($conf))
-{
+if (empty($conf) || !is_object($conf)) {
 	print "Error, template page can't be called as URL";
 	exit;
 }
@@ -38,24 +37,26 @@ $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
 $langs->load("bills");
 
 $total = 0; $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink)
-{
+foreach ($linkedObjectBlock as $key => $objectlink) {
 	$ilink++;
 
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) $trclass .= ' liste_sub_total';
+	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+		$trclass .= ' liste_sub_total';
+	}
 	?>
-    <tr class="<?php echo $trclass; ?>">
-        <td><?php echo $langs->trans("SupplierInvoice"); ?></td>
-    	<td><a href="<?php echo DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowBill"), "bill").' '.$objectlink->ref; ?></a></td>
-    	<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
-    	<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
-    	<td class="right"><?php
+	<tr class="<?php echo $trclass; ?>">
+		<td><?php echo $langs->trans("SupplierInvoice"); ?></td>
+		<td><a href="<?php echo DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objectlink->id ?>"><?php echo img_object($langs->trans("ShowBill"), "bill").' '.$objectlink->ref; ?></a></td>
+		<td class="left"><?php echo $objectlink->ref_supplier; ?></td>
+		<td class="center"><?php echo dol_print_date($objectlink->date, 'day'); ?></td>
+		<td class="right"><?php
 		if ($user->rights->fournisseur->facture->lire) {
 			$sign = 1;
-			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) $sign = -1;
-			if ($objectlink->statut != 3)
-			{
+			if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
+				$sign = -1;
+			}
+			if ($objectlink->statut != 3) {
 				// If not abandonned
 				$total = $total + $sign * $objectlink->total_ht;
 				echo price($objectlink->total_ht);
@@ -63,24 +64,23 @@ foreach ($linkedObjectBlock as $key => $objectlink)
 				echo '<strike>'.price($objectlink->total_ht).'</strike>';
 			}
 		} ?></td>
-    	<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
-    	<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
-    </tr>
-    <?php
+		<td class="right"><?php echo $objectlink->getLibStatut(3); ?></td>
+		<td class="right"><a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
+	</tr>
+	<?php
 }
-if (count($linkedObjectBlock) > 1)
-{
+if (count($linkedObjectBlock) > 1) {
 	?>
-    <tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
-        <td><?php echo $langs->trans("Total"); ?></td>
-        <td></td>
-    	<td class="center"></td>
-    	<td class="center"></td>
-    	<td class="right"><?php echo price($total); ?></td>
-    	<td class="right"></td>
-    	<td class="right"></td>
-    </tr>
-    <?php
+	<tr class="liste_total <?php echo (empty($noMoreLinkedObjectBlockAfter) ? 'liste_sub_total' : ''); ?>">
+		<td><?php echo $langs->trans("Total"); ?></td>
+		<td></td>
+		<td class="center"></td>
+		<td class="center"></td>
+		<td class="right"><?php echo price($total); ?></td>
+		<td class="right"></td>
+		<td class="right"></td>
+	</tr>
+	<?php
 }
 
 print "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index 5d82021bf3c..54ed40e37b0 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -32,7 +32,9 @@ $langs->loadLangs(array("suppliers", "orders", "companies"));
 
 // Security check
 $socid = GETPOST("socid", 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'societe', $socid, '');
 
 
@@ -58,15 +60,18 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 $sql = "SELECT count(cf.rowid), cf.fk_statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+}
 $sql .= " WHERE cf.fk_soc = s.rowid ";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND sc.fk_user = ".$user->id;
+}
 $sql .= " AND cf.entity = ".$conf->entity;
 $sql .= " GROUP BY cf.fk_statut";
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 	$i = 0;
 
@@ -74,8 +79,7 @@ if ($resql)
 	print '<tr class="liste_titre"><td>'.$langs->trans("Orders").'</td><td class="center">'.$langs->trans("Nb").'</td><td>&nbsp;</td>';
 	print "</tr>\n";
 
-	while ($i < $num)
-	{
+	while ($i < $num) {
 		$row = $db->fetch_row($resql);
 
 		print '<tr class="oddeven">';
@@ -95,35 +99,37 @@ if ($resql)
 
 
 // Draft orders
-if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled))
-{
+if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled)) {
 	$langs->load("orders");
 
 	$sql = "SELECT cf.rowid, cf.ref, cf.total_ttc,";
 	$sql .= " s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+	}
 	$sql .= " WHERE cf.fk_soc = s.rowid";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " AND cf.entity = ".$conf->entity;
 	$sql .= " AND cf.fk_statut = 0";
-	if ($socid) $sql .= " AND cf.fk_soc = ".$socid;
+	if ($socid) {
+		$sql .= " AND cf.fk_soc = ".$socid;
+	}
 
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$total = 0;
 		$num = $db->num_rows($resql);
-		if ($num)
-		{
+		if ($num) {
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
 			print '<td colspan="3">'.$langs->trans("DraftOrders").'<span class="badge marginleftonlyshort">'.$num.'</span></td></tr>';
 
 			$i = 0;
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven"><td  class="nowrap">';
@@ -141,8 +147,7 @@ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUP
 				$i++;
 				$total += $obj->total_ttc;
 			}
-			if ($total > 0)
-			{
+			if ($total > 0) {
 				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
 			}
 			print "</table>";
@@ -152,34 +157,36 @@ if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUP
 }
 
 // Draft invoices
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
-{
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire) {
 	$sql = "SELECT ff.ref_supplier, ff.rowid, ff.total_ttc, ff.type";
 	$sql .= ", s.nom as name, s.rowid as socid";
 	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+	}
 	$sql .= " WHERE s.rowid = ff.fk_soc";
-	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND sc.fk_user = ".$user->id;
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND sc.fk_user = ".$user->id;
+	}
 	$sql .= " AND ff.entity = ".$conf->entity;
 	$sql .= " AND ff.fk_statut = 0";
-	if ($socid)	$sql .= " AND f.fk_soc = ".$socid;
+	if ($socid) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
 
 	$resql = $db->query($sql);
 
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
-		if ($num)
-		{
+		if ($num) {
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre">';
 			print '<td colspan="3">'.$langs->trans("DraftBills").'<span class="badge marginleftonlyshort">'.$num.'</span></td></tr>';
 			$i = 0;
 			$tot_ttc = 0;
 
-			while ($i < $num && $i < 20)
-			{
+			while ($i < $num && $i < 20) {
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven"><td class="nowrap">';
@@ -226,18 +233,23 @@ $sql = "SELECT s.rowid as socid, s.nom as name, s.town, s.datec, s.tms, s.prefix
 $sql .= ", st.libelle as stcomm";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."c_stcomm as st";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql .= " WHERE s.fk_stcomm = st.id";
 $sql .= " AND s.fournisseur = 1";
 $sql .= " AND s.entity IN (".getEntity('societe').")";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid) $sql .= " AND s.rowid = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) {
+	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($socid) {
+	$sql .= " AND s.rowid = ".$socid;
+}
 $sql .= " ORDER BY s.tms DESC";
 $sql .= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$langs->load("boxes");
 	$num = $db->num_rows($resql);
 	$i = 0;
@@ -248,8 +260,7 @@ if ($resql)
 	print '<td class="right">'.$langs->trans("DateModification")."</td>\n";
 	print "</tr>\n";
 
-	while ($obj = $db->fetch_object($resql))
-	{
+	while ($obj = $db->fetch_object($resql)) {
 		print '<tr class="oddeven">';
 		print '<td><a href="card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowSupplier"), "company").'</a>';
 		print "&nbsp;<a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
@@ -271,8 +282,7 @@ if ($resql)
 $companystatic->LoadSupplierCateg();
 $categstatic = new Categorie($db);
 
-if (count($companystatic->SupplierCategories))
-{
+if (count($companystatic->SupplierCategories)) {
 	print '<br>';
 
 	print '<table class="liste centpercent">';
@@ -280,8 +290,7 @@ if (count($companystatic->SupplierCategories))
 	print $langs->trans("Category");
 	print "</td></tr>\n";
 
-	foreach ($companystatic->SupplierCategories as $rowid => $label)
-	{
+	foreach ($companystatic->SupplierCategories as $rowid => $label) {
 		print '<tr class="oddeven">'."\n";
 		print '<td>';
 		$categstatic->id = $rowid;
diff --git a/htdocs/fourn/js/lib_dispatch.js.php b/htdocs/fourn/js/lib_dispatch.js.php
index b4090e8a34d..254fac29f28 100644
--- a/htdocs/fourn/js/lib_dispatch.js.php
+++ b/htdocs/fourn/js/lib_dispatch.js.php
@@ -21,13 +21,27 @@
  * \brief      File that include javascript functions used for dispatching qty/stock/lot
  */
 
-if (!defined('NOREQUIRESOC'))    define('NOREQUIRESOC', '1');
-if (!defined('NOCSRFCHECK'))     define('NOCSRFCHECK', 1);
-if (!defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL', 1);
-if (!defined('NOLOGIN'))         define('NOLOGIN', 1);
-if (!defined('NOREQUIREMENU'))   define('NOREQUIREMENU', 1);
-if (!defined('NOREQUIREHTML'))   define('NOREQUIREHTML', 1);
-if (!defined('NOREQUIREAJAX'))   define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', 1);
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', 1);
+}
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', 1);
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', 1);
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', 1);
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 session_cache_limiter('public');
 
@@ -36,8 +50,11 @@ require_once '../../main.inc.php';
 // Define javascript type
 top_httphead('text/javascript; charset=UTF-8');
 // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate');
-else header('Cache-Control: no-cache');
+if (empty($dolibarr_nocache)) {
+	header('Cache-Control: max-age=10800, public, must-revalidate');
+} else {
+	header('Cache-Control: no-cache');
+}
 
 ?>
 /**
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 5dea09eaf09..66981436d7a 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -48,7 +48,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', '');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 // Now check also permission on thirdparty of invoices of payments. Thirdparty were loaded by the fetch_object before based on first invoice.
 // It should be enough because all payments are done on invoices of the same thirdparty.
 if ($socid && $socid != $object->thirdparty->id) {
@@ -60,14 +62,12 @@ if ($socid && $socid != $object->thirdparty->id) {
  * Actions
  */
 
-if ($action == 'setnote' && $user->rights->fournisseur->facture->creer)
-{
+if ($action == 'setnote' && $user->rights->fournisseur->facture->creer) {
 	$db->begin();
 
 	$object->fetch($id);
 	$result = $object->update_note(GETPOST('note', 'restricthtml'));
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->commit();
 		$action = '';
 	} else {
@@ -76,14 +76,12 @@ if ($action == 'setnote' && $user->rights->fournisseur->facture->creer)
 	}
 }
 
-if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->facture->supprimer)
-{
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisseur->facture->supprimer) {
 	$db->begin();
 
 	$object->fetch($id);
 	$result = $object->delete();
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$db->commit();
 		header('Location: '.DOL_URL_ROOT.'/fourn/paiement/list.php');
 		exit;
@@ -96,13 +94,11 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
 if ($action == 'confirm_validate' && $confirm == 'yes' &&
 	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
 	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
-)
-{
+) {
 	$db->begin();
 
 	$object->fetch($id);
-	if ($object->validate() >= 0)
-	{
+	if ($object->validate() >= 0) {
 		$db->commit();
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
 		exit;
@@ -112,25 +108,21 @@ if ($action == 'confirm_validate' && $confirm == 'yes' &&
 	}
 }
 
-if ($action == 'setnum_paiement' && !empty($_POST['num_paiement']))
-{
+if ($action == 'setnum_paiement' && !empty($_POST['num_paiement'])) {
 	$object->fetch($id);
 	$res = $object->update_num($_POST['num_paiement']);
-	if ($res === 0)
-	{
+	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans('PaymentNumberUpdateFailed'), null, 'errors');
 	}
 }
 
-if ($action == 'setdatep' && !empty($_POST['datepday']))
-{
+if ($action == 'setdatep' && !empty($_POST['datepday'])) {
 	$object->fetch($id);
 	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
 	$res = $object->update_date($datepaye);
-	if ($res === 0)
-	{
+	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentDateUpdateSucceeded'), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
@@ -159,21 +151,18 @@ $head = payment_supplier_prepare_head($object);
 
 print dol_get_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), -1, 'payment');
 
-if ($result > 0)
-{
+if ($result > 0) {
 	/*
 	 * Confirmation of payment's delete
 	 */
-	if ($action == 'delete')
-	{
+	if ($action == 'delete') {
 		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete');
 	}
 
 	/*
 	 * Confirmation of payment's validation
 	 */
-	if ($action == 'validate')
-	{
+	if ($action == 'validate') {
 		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_validate');
 	}
 
@@ -189,7 +178,7 @@ if ($result > 0)
 
 	/*print '<tr>';
 	print '<td width="20%">'.$langs->trans('Ref').'</td><td>';
-    print $form->showrefnav($object,'id','',1,'rowid','ref');
+	print $form->showrefnav($object,'id','',1,'rowid','ref');
 	print '</td></tr>';*/
 
 	// Date of payment
@@ -211,28 +200,24 @@ if ($result > 0)
 	print '<td>';
 	print $form->editfieldval("Numero",'num_paiement',$object->num_paiement,$object,$object->statut == 0 && $user->rights->fournisseur->facture->creer,'string','',null,$langs->trans('PaymentNumberUpdateSucceeded'));
 	print '</td></tr>';
-    */
+	*/
 
 	// Amount
 	print '<tr><td>'.$langs->trans('Amount').'</td>';
 	print '<td>'.price($object->amount, '', $langs, 0, 0, -1, $conf->currency).'</td></tr>';
 
-	if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-	{
+	if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
 		print '<tr><td>'.$langs->trans('Status').'</td>';
 		print '<td>'.$object->getLibStatut(4).'</td></tr>';
 	}
 
 	$allow_delete = 1;
 	// Bank account
-	if (!empty($conf->banque->enabled))
-	{
-		if ($object->fk_account)
-		{
+	if (!empty($conf->banque->enabled)) {
+		if ($object->fk_account) {
 			$bankline = new AccountLine($db);
 			$bankline->fetch($object->bank_line);
-			if ($bankline->rappro)
-			{
+			if ($bankline->rappro) {
 				$allow_delete = 0;
 				$title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemoveConciliatedPayment"));
 			}
@@ -276,8 +261,7 @@ if ($result > 0)
 	$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
 	$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
 	$resql = $db->query($sql);
-	if ($resql)
-	{
+	if ($resql) {
 		$num = $db->num_rows($resql);
 
 		$i = 0;
@@ -293,12 +277,10 @@ if ($result > 0)
 		print '<td class="right">'.$langs->trans('Status').'</td>';
 		print "</tr>\n";
 
-		if ($num > 0)
-		{
+		if ($num > 0) {
 			$facturestatic = new FactureFournisseur($db);
 
-			while ($i < $num)
-			{
+			while ($i < $num) {
 				$objp = $db->fetch_object($resql);
 
 				$facturestatic->id = $objp->facid;
@@ -328,8 +310,7 @@ if ($result > 0)
 				print '<td class="right">'.$facturestatic->LibStatut($objp->paye, $objp->status, 6, 1).'</td>';
 				print "</tr>\n";
 
-				if ($objp->paye == 1)
-				{
+				if ($objp->paye == 1) {
 					$allow_delete = 0;
 					$title_button = dol_escape_htmltag($langs->transnoentitiesnoconv("CantRemovePaymentWithOneInvoicePaid"));
 				}
@@ -353,23 +334,17 @@ if ($result > 0)
 	 */
 
 	print '<div class="tabsAction">';
-	if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-	{
-		if ($user->socid == 0 && $object->statut == 0 && $action == '')
-		{
+	if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {
+		if ($user->socid == 0 && $object->statut == 0 && $action == '') {
 			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
-		   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
-			{
+			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate))) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Valid').'</a>';
 			}
 		}
 	}
-	if ($user->socid == 0 && $action == '')
-	{
-		if ($user->rights->fournisseur->facture->supprimer)
-		{
-			if ($allow_delete)
-			{
+	if ($user->socid == 0 && $action == '') {
+		if ($user->rights->fournisseur->facture->supprimer) {
+			if ($allow_delete) {
 				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$title_button.'">'.$langs->trans('Delete').'</a>';
@@ -385,8 +360,7 @@ if ($result > 0)
 
 	include_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_payment/modules_supplier_payment.php';
 	$modellist = ModelePDFSuppliersPayments::liste_modeles($db);
-	if (is_array($modellist))
-	{
+	if (is_array($modellist)) {
 		$ref = dol_sanitizeFileName($object->ref);
 		$filedir = $conf->fournisseur->payment->dir_output.'/'.dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER['PHP_SELF'].'?id='.$object->id;
diff --git a/htdocs/fourn/paiement/info.php b/htdocs/fourn/paiement/info.php
index 9ff0a86931e..8032b2b418f 100644
--- a/htdocs/fourn/paiement/info.php
+++ b/htdocs/fourn/paiement/info.php
@@ -40,7 +40,9 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 $result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', '');
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 // Now check also permission on thirdparty of invoices of payments. Thirdparty were loaded by the fetch_object before based on first invoice.
 // It should be enough because all payments are done on invoices of the same thirdparty.
 if ($socid && $socid != $object->thirdparty->id) {
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 1bf8984a6ee..02adee36149 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -35,7 +35,9 @@
 require '../../main.inc.php';
 
 // Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+	$socid = $user->socid;
+}
 
 // doesn't work :-(
 // restrictedArea($user, 'fournisseur');
@@ -78,13 +80,19 @@ $sortfield				= GETPOST('sortfield', 'alpha');
 $sortorder				= GETPOST('sortorder', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
 
-if (empty($page) || $page == -1) $page = 0; // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0; // If $page is not defined, or '' or -1
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "p.datep";
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "p.datep";
+}
 
 $search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
 
@@ -117,7 +125,9 @@ $object = new PaiementFourn($db);
 
 $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)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
@@ -150,7 +160,9 @@ $sql = 'SELECT p.rowid, p.ref, p.datep, p.amount as pamount, p.num_paiement';
 $sql .= ', s.rowid as socid, s.nom as name, s.email';
 $sql .= ', c.code as paiement_type, c.libelle as paiement_libelle';
 $sql .= ', ba.rowid as bid, ba.label';
-if (!$user->rights->societe->client->voir) $sql .= ', sc.fk_soc, sc.fk_user';
+if (!$user->rights->societe->client->voir) {
+	$sql .= ', sc.fk_soc, sc.fk_user';
+}
 $sql .= ', SUM(pf.amount)';
 
 $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn AS p';
@@ -160,26 +172,48 @@ $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-if (!$user->rights->societe->client->voir) $sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
+if (!$user->rights->societe->client->voir) {
+	$sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
+}
 
 $sql .= ' WHERE f.entity = '.$conf->entity;
-if (!$user->rights->societe->client->voir) $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
-if ($socid > 0) $sql .= ' AND f.fk_soc = '.$socid;
-if ($search_ref)				$sql .= natural_search('p.ref', $search_ref);
+if (!$user->rights->societe->client->voir) {
+	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
+}
+if ($socid > 0) {
+	$sql .= ' AND f.fk_soc = '.$socid;
+}
+if ($search_ref) {
+	$sql .= natural_search('p.ref', $search_ref);
+}
 $sql .= dolSqlDateFilter('p.datep', $search_day, $search_month, $search_year);
-if ($search_company)			$sql .= natural_search('s.nom', $search_company);
-if ($search_payment_type != '')	$sql .= " AND c.code='".$db->escape($search_payment_type)."'";
-if ($search_cheque_num != '')	$sql .= natural_search('p.num_paiement', $search_cheque_num);
-if ($search_amount)				$sql .= natural_search('p.amount', $search_amount, 1);
-if ($search_bank_account > 0)	$sql .= ' AND b.fk_account='.$search_bank_account."'";
+if ($search_company) {
+	$sql .= natural_search('s.nom', $search_company);
+}
+if ($search_payment_type != '') {
+	$sql .= " AND c.code='".$db->escape($search_payment_type)."'";
+}
+if ($search_cheque_num != '') {
+	$sql .= natural_search('p.num_paiement', $search_cheque_num);
+}
+if ($search_amount) {
+	$sql .= natural_search('p.amount', $search_amount, 1);
+}
+if ($search_bank_account > 0) {
+	$sql .= ' AND b.fk_account='.$search_bank_account."'";
+}
 
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
 $sql .= ' GROUP BY p.rowid, p.ref, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, s.email, c.code, c.libelle, ba.rowid, ba.label';
-if (!$user->rights->societe->client->voir) $sql .= ', sc.fk_soc, sc.fk_user';
+if (!$user->rights->societe->client->voir) {
+	$sql .= ', sc.fk_soc, sc.fk_user';
+}
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -207,24 +241,48 @@ $num = $db->num_rows($resql);
 $i = 0;
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-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 ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 
-if ($search_ref)			$param .= '&search_ref='.urlencode($search_ref);
-if ($saerch_day)			$param .= '&search_day='.urlencode($search_day);
-if ($saerch_month)			$param .= '&search_month='.urlencode($search_month);
-if ($search_year)			$param .= '&search_year='.urlencode($search_year);
-if ($search_company)		$param .= '&search_company='.urlencode($search_company);
-if ($search_payment_type)	$param .= '&search_company='.urlencode($search_payment_type);
-if ($search_cheque_num)		$param .= '&search_cheque_num='.urlencode($search_cheque_num);
-if ($search_amount)			$param .= '&search_amount='.urlencode($search_amount);
+if ($search_ref) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($saerch_day) {
+	$param .= '&search_day='.urlencode($search_day);
+}
+if ($saerch_month) {
+	$param .= '&search_month='.urlencode($search_month);
+}
+if ($search_year) {
+	$param .= '&search_year='.urlencode($search_year);
+}
+if ($search_company) {
+	$param .= '&search_company='.urlencode($search_company);
+}
+if ($search_payment_type) {
+	$param .= '&search_company='.urlencode($search_payment_type);
+}
+if ($search_cheque_num) {
+	$param .= '&search_cheque_num='.urlencode($search_cheque_num);
+}
+if ($search_amount) {
+	$param .= '&search_amount='.urlencode($search_amount);
+}
 
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 print '<form method="POST" 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="action" value="list">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
@@ -234,9 +292,10 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'supplier_invoice', 0, '', '', $limit, 0, 0, 1);
 
-if ($search_all)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -244,8 +303,11 @@ $moreforfilter = '';
 
 $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 ($moreforfilter) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
@@ -255,7 +317,9 @@ if ($moreforfilter) {
 
 $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 nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
@@ -272,7 +336,9 @@ if (!empty($arrayfields['p.ref']['checked'])) {
 // Filter: Date
 if (!empty($arrayfields['p.datep']['checked'])) {
 	print '<td class="liste_titre center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
+		print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
+	}
 	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
 	$formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5);
 	print '</td>';
@@ -326,14 +392,30 @@ print '</td>';
 print '</tr>';
 
 print '<tr class="liste_titre">';
-if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.rowid', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.datep']['checked']))				print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, '', $sortfield, $sortorder, 'center ');
-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['c.libelle']['checked']))			print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.num_paiement']['checked']))		print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
-if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
-if (!empty($arrayfields['p.amount']['checked']))			print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], 'p.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.rowid', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.datep']['checked'])) {
+	print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+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['c.libelle']['checked'])) {
+	print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.num_paiement']['checked'])) {
+	print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
+}
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['p.amount']['checked'])) {
+	print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], 'p.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+}
 
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
@@ -368,21 +450,29 @@ while ($i < min($num, $limit)) {
 	// No
 	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 		print '<td>'.(($offset * $limit) + $i).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Ref
 	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td class="nowrap">'.$paymentfournstatic->getNomUrl(1).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Date
 	if (!empty($arrayfields['p.datep']['checked'])) {
 		$dateformatforpayment = 'day';
-		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
+		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) {
+			$dateformatforpayment = 'dayhour';
+		}
 		print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Thirdparty
@@ -392,43 +482,57 @@ while ($i < min($num, $limit)) {
 			print $companystatic->getNomUrl(1, '', 24);
 		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Pyament type
 	if (!empty($arrayfields['c.libelle']['checked'])) {
 		$payment_type = $langs->trans("PaymentType".$objp->paiement_type) != ("PaymentType".$objp->paiement_type) ? $langs->trans("PaymentType".$objp->paiement_type) : $objp->paiement_libelle;
 		print '<td>'.$payment_type.' '.dol_trunc($objp->num_paiement, 32).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Cheque number (fund transfer)
 	if (!empty($arrayfields['p.num_paiement']['checked'])) {
 		print '<td>'.$objp->num_paiement.'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Account
-	if (!empty($arrayfields['ba.label']['checked']))
-	{
+	if (!empty($arrayfields['ba.label']['checked'])) {
 		print '<td>';
-		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'</a>';
-		else print '&nbsp;';
+		if ($objp->bid) {
+			print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'</a>';
+		} else {
+			print '&nbsp;';
+		}
 		print '</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	// Amount
 	if (!empty($arrayfields['p.amount']['checked'])) {
 		print '<td class="right">'.price($objp->pamount).'</td>';
-		if (!$i) $totalarray['nbfield']++;
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 		$totalarray['pos'][$checkedCount] = 'amount';
 		$totalarray['val']['amount'] += $objp->pamount;
 	}
 
 	// Buttons
 	print '<td></td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>';
 	$i++;
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 468352c72fe..32ddf769ce2 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -33,7 +33,9 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
 $langs->loadLangs(array("products", "suppliers"));
 
-if (!$user->rights->produit->lire && !$user->rights->service->lire) accessforbidden();
+if (!$user->rights->produit->lire && !$user->rights->service->lire) {
+	accessforbidden();
+}
 
 $sref = GETPOST('sref', 'alphanohtml');
 $sRefSupplier = GETPOST('srefsupplier');
@@ -46,15 +48,23 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "p.ref"; // Set here default search field
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "p.ref"; // Set here default search field
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 $fourn_id = GETPOST('fourn_id', 'intcomma');
-if ($user->socid) $fourn_id = $user->socid;
+if ($user->socid) {
+	$fourn_id = $user->socid;
+}
 
 $catid = GETPOST('catid', 'intcomma');
 
@@ -71,22 +81,26 @@ $extrafields = new ExtraFields($db);
  * Put here all code to do according to value of "action" parameter
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// 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
 		$sref = '';
 		$sRefSupplier = '';
 		$snom = '';
@@ -109,8 +123,7 @@ $companystatic = new Societe($db);
 
 $title = $langs->trans("ProductsAndServices");
 
-if ($fourn_id)
-{
+if ($fourn_id) {
 	$supplier = new Fournisseur($db);
 	$supplier->fetch($fourn_id);
 }
@@ -122,8 +135,12 @@ $arrayofmassactions = array(
 	'builddoc'=>$langs->trans("PDFMerge"),
 	'presend'=>$langs->trans("SendByMail"),
 );
-if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($user->rights->mymodule->supprimer) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 
@@ -133,54 +150,52 @@ $sql .= " s.rowid as socid, s.nom as name";
 // Add fields to SELECT from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action);
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."product as p";
-if ($catid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
+if ($catid) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
+}
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ppf.fk_soc = s.rowid";
 $sql .= " WHERE p.entity IN (".getEntity('product').")";
-if ($sRefSupplier)
-{
+if ($sRefSupplier) {
 	$sql .= natural_search('ppf.ref_fourn', $sRefSupplier);
 }
-if (GETPOST('type'))
-{
+if (GETPOST('type')) {
 	$sql .= " AND p.fk_product_type = ".GETPOST('type', 'int');
 }
-if ($sref)
-{
+if ($sref) {
 	$sql .= natural_search('p.ref', $sref);
 }
-if ($snom)
-{
+if ($snom) {
 	$sql .= natural_search('p.label', $snom);
 }
-if ($catid)
-{
+if ($catid) {
 	$sql .= " AND cp.fk_categorie = ".$catid;
 }
-if ($fourn_id > 0)
-{
+if ($fourn_id > 0) {
 	$sql .= " AND ppf.fk_soc = ".$fourn_id;
 }
 
 // Add WHERE filters from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters);
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 $sql .= $hookmanager->resPrint;
 
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records without orderby and limit
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
@@ -190,30 +205,32 @@ $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("fourn/product/list.php:", LOG_DEBUG);
 $resql = $db->query($sql);
-if ($resql)
-{
+if ($resql) {
 	$num = $db->num_rows($resql);
 
 	$i = 0;
 
-	if ($num == 1 && (GETPOST("mode") == 'search'))
-	{
+	if ($num == 1 && (GETPOST("mode") == 'search')) {
 		$objp = $db->fetch_object($resql);
 		header("Location: ".DOL_URL_ROOT."/product/card.php?id=".$objp->rowid);
 		exit;
 	}
 
-	if (!empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier", $supplier->name);
-	else $texte = $langs->trans("List");
+	if (!empty($supplier->id)) {
+		$texte = $langs->trans("ListOfSupplierProductForSupplier", $supplier->name);
+	} else {
+		$texte = $langs->trans("List");
+	}
 
 	llxHeader("", "", $texte);
 
 	$param = "&sref=".$sref."&snom=".$snom."&fourn_id=".$fourn_id.(isset($type) ? "&amp;type=".$type : "").(empty($sRefSupplier) ? "" : "&amp;srefsupplier=".$sRefSupplier);
-	if ($optioncss != '') $param .= '&optioncss='.$optioncss;
+	if ($optioncss != '') {
+		$param .= '&optioncss='.$optioncss;
+	}
 	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
 
-	if (!empty($catid))
-	{
+	if (!empty($catid)) {
 		print "<div id='ways'>";
 		$c = new Categorie($db);
 		$ways = $c->print_all_ways(' &gt; ', 'fourn/product/list.php');
@@ -222,9 +239,13 @@ if ($resql)
 	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-	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().'">';
-	if ($fourn_id > 0) print '<input type="hidden" name="fourn_id" value="'.$fourn_id.'">';
+	if ($fourn_id > 0) {
+		print '<input type="hidden" name="fourn_id" value="'.$fourn_id.'">';
+	}
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
@@ -256,7 +277,9 @@ if ($resql)
 	// add filters from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object, $action);
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
 	print $hookmanager->resPrint;
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
@@ -276,13 +299,14 @@ if ($resql)
 	// add header cells from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
 	print $hookmanager->resPrint;
 	print_liste_field_titre('', $_SERVER["PHP_SELF"]);
 	print "</tr>\n";
 
-	while ($i < min($num, $limit))
-	{
+	while ($i < min($num, $limit)) {
 		$objp = $db->fetch_object($resql);
 
 		$productstatic->id = $objp->rowid;
@@ -307,7 +331,9 @@ if ($resql)
 		$companystatic->name = $objp->name;
 		$companystatic->id = $objp->socid;
 		print '<td>';
-		if ($companystatic->id > 0) print $companystatic->getNomUrl(1, 'supplier');
+		if ($companystatic->id > 0) {
+			print $companystatic->getNomUrl(1, 'supplier');
+		}
 		print '</td>';
 
 		print '<td class="right">'.(isset($objp->price) ? price($objp->price) : '').'</td>';
@@ -319,7 +345,9 @@ if ($resql)
 		// add additional columns from hooks
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $objp, $action);
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 		print $hookmanager->resPrint;
 
 		print '<td class="right"></td>';
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 736a7bf4f90..06ad90ec858 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -32,8 +32,7 @@ $langs->loadLangs(array('bills', 'companies'));
 
 // Security check
 $socid = GETPOST("socid", 'int');
-if ($user->socid > 0)
-{
+if ($user->socid > 0) {
 	$action = '';
 	$socid = $user->socid;
 }
@@ -51,22 +50,20 @@ $userstatic = new User($db);
 
 llxHeader();
 
-if ($socid > 0)
-{
+if ($socid > 0) {
 	$societe = new Societe($db);
 	$societe->fetch($socid);
 
 	/*
-     * Affichage onglets
-     */
+	 * Affichage onglets
+	 */
 	$head = societe_prepare_head($societe);
 
 	print dol_get_fiche_head($head, 'supplier', $langs->trans("ThirdParty"), 0, 'company');
 	dol_banner_tab($societe, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom');
 	print dol_get_fiche_end();
 
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->facture->lire)
-	{
+	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_invoice->enabled)) && $user->rights->facture->lire) {
 		// Invoice list
 		print load_fiche_titre($langs->trans("SupplierPreview"));
 
@@ -82,8 +79,7 @@ if ($socid > 0)
 		$sql .= " ORDER BY f.datef DESC";
 
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num = $db->num_rows($resql);
 
 			print '<tr class="liste_titre">';
@@ -96,22 +92,19 @@ if ($socid > 0)
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 
-			if (!$num > 0)
-			{
+			if (!$num > 0) {
 				print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
 			}
 
 			$solde = 0;
 
 			// Boucle sur chaque facture
-			for ($i = 0; $i < $num; $i++)
-			{
+			for ($i = 0; $i < $num; $i++) {
 				$objf = $db->fetch_object($resql);
 
 				$fac = new FactureFournisseur($db);
 				$ret = $fac->fetch($objf->facid);
-				if ($ret < 0)
-				{
+				if ($ret < 0) {
 					print $fac->error."<br>";
 					continue;
 				}
@@ -144,13 +137,11 @@ if ($socid > 0)
 				$sql .= " AND pf.fk_facturefourn = ".$fac->id;
 
 				$resqlp = $db->query($sql);
-				if ($resqlp)
-				{
+				if ($resqlp) {
 					$nump = $db->num_rows($resqlp);
 					$j = 0;
 
-					while ($j < $nump)
-					{
+					while ($j < $nump) {
 						$objp = $db->fetch_object($resqlp);
 						//
 						print '<tr class="oddeven">';
diff --git a/htdocs/install/mysql/data/llx_c_email_templates.sql b/htdocs/install/mysql/data/llx_c_email_templates.sql
index 26e06731c72..713a7f31a4f 100644
--- a/htdocs/install/mysql/data/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/data/llx_c_email_templates.sql
@@ -32,9 +32,9 @@ INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_u
 
 INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'                    ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswerMessage)__<br>__ONLINE_INTERVIEW_SCHEDULER_TEXT_AND_URL__\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskBooth', 20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsBooth', 30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendes', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendes)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventBulkMailToAttendes)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskBooth', 20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsBooth', 30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendees', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendes)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index d92392a9f0c..eaad793b47f 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -167,12 +167,17 @@ ALTER TABLE llx_tva ADD COLUMN fk_account integer;
 ALTER TABLE llx_tva ALTER COLUMN paye SET DEFAULT 0;
 
 
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskBooth', 20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsBooth', 30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendes', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendes)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventBulkMailToAttendes)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
-INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOragnisationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskConf', 10, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailAskBooth', 20, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsBooth', 30, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationEmailSubsEvent', 40, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailAttendes', 50, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendes)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+INSERT INTO llx_c_email_templates (entity, module, type_template, lang, private, fk_user, datec, tms, label, position, active, topic, content, content_lines, enabled, joinfiles) values (0, '', 'eventorganization_send', '', 0, null, null, '2021-02-14 14:42:41', 'EventOrganizationMassEmailSpeakers', 60, 1, '[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__', '__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__', null, '1', null);
+
+ALTER TABLE llx_projet ADD COLUMN accept_conference_suggestions integer DEFAULT 0;
+ALTER TABLE llx_projet ADD COLUMN accept_booth_suggestions integer DEFAULT 0;
+ALTER TABLE llx_projet ADD COLUMN price_registration double(24,8);
+ALTER TABLE llx_projet ADD COLUMN price_booth double(24,8);
 
 
 -- Code enhanced - Standardize field name
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index 76d254aafd3..cd5eedd2c9a 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -48,6 +48,10 @@ create table llx_projet
   usage_task           integer DEFAULT 1,		-- Set to 1 if project is used to manage tasks and/or record timesheet
   usage_bill_time      integer DEFAULT 0,		-- Set to 1 if time spent must be converted into invoices
   usage_organize_event integer DEFAULT 0,		-- Set to 1 if you want to use project to organize an event, receive attendees subscription				
+  accept_conference_suggestions integer DEFAULT 0,		-- Set to 1 if you want to allow unknown people to suggest conferences
+  accept_booth_suggestions integer DEFAULT 0,		-- Set to 1 if you want to Allow unknown people to suggest booth
+  price_registration    double(24,8),
+  price_booth    double(24,8),
   model_pdf        varchar(255),
   last_main_doc	   varchar(255),				-- relative filepath+filename of last main generated document
   import_key	   varchar(14)					-- Import key
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index 45246dcc412..1060c02ce96 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -413,7 +413,7 @@ PaymentCondition14DENDMONTH=Within 14 days following the end of the month
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Variable amount (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all same lines
+VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 7263b04730a..a24109fa3d0 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -124,4 +124,6 @@ GiftReceipt=Gift receipt
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
 AllowDelayedPayment=Allow delayed payment
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-WeighingScale=Weighing scale
\ No newline at end of file
+WeighingScale=Weighing scale
+ShowPriceHT = Display the price excluding tax column
+ShowPriceHTOnReceipt = Display the price excluding tax column on receipt
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 545fcdb62fb..9e56c5f5c3a 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -258,6 +258,8 @@ ErrorLanguageRequiredIfPageIsTranslationOfAnother=The language of new page must
 ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=The language of new page must not be the source language if it is set as a translation of another page
 ErrorAParameterIsRequiredForThisOperation=A parameter is mandatory for this operation
 ErrorDateIsInFuture=Error, the date can't be in the future
+ErrorAnAmountWithoutTaxIsRequired=Error, amount is mandatory
+ErrorAPercentIsRequired=Error, please fill in the percentage correctly
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index 247663135db..0c7e4f047ce 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -43,15 +43,30 @@ EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction
 #
 EventOrganizationConfOrBooth= Conference Or Booth
 ManageOrganizeEvent = Manage event organisation
+ConferenceOrBooth = Conference Or Booth
+ConferenceOrBoothTab = Conference Or Booth
 
 #
 # Template Mail
 #
-YourOragnisationEventConfRequestWasReceived = Your request for conference was received
-YourOragnisationEventBoothRequestWasReceived = Your request for booth was received
+YourOrganizationEventConfRequestWasReceived = Your request for conference was received
+YourOrganizationEventBoothRequestWasReceived = Your request for booth was received
 EventOrganizationEmailAskConf = Request for conference
 EventOrganizationEmailAskBooth = Request for booth
 EventOrganizationEmailSubsBooth = Subscription for booth
 EventOrganizationEmailSubsEvent = Subscription for an event
-EventOrganizationMassEmailAttendes = Communication to attendes
+EventOrganizationMassEmailAttendees = Communication to attendes
 EventOrganizationMassEmailSpeakers = Communication to speakers
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestConfHelp=Allow unknown people to suggest conferences
+AllowUnknownPeopleSuggestBooth=Allow unknown people to suggest booth
+AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to suggest booth
+PriceOfRegistration=Price of registration
+PriceOfRegistrationHelp=Price of registration
+PriceOfBooth=Price of subscription
+PriceOfBoothHelp=Price of subscription
+EventOrganizationICSLink=Link ICS for events
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index f7c55df211f..67544b46328 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -389,6 +389,8 @@ AmountTotal=Total amount
 AmountAverage=Average amount
 PriceQtyMinHT=Price quantity min. (excl. tax)
 PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PercentOfOriginalObject=Percent of original object 
+AmountOrPercent=Amount or percent
 Percentage=Percentage
 Total=Total
 SubTotal=Subtotal
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 93f445b83d1..f72a933c688 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -38,8 +38,7 @@
 
 // For optional tuning. Enabled if environment variable MAIN_SHOW_TUNING_INFO is defined.
 $micro_start_time = 0;
-if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
-{
+if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO'])) {
 	list($usec, $sec) = explode(" ", microtime());
 	$micro_start_time = ((float) $usec + (float) $sec);
 	// Add Xdebug code coverage
@@ -75,8 +74,7 @@ function testSqlAndScriptInject($val, $type)
 
 	$inj = 0;
 	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)
-	if ($type == 1 || $type == 3)
-	{
+	if ($type == 1 || $type == 3) {
 		$inj += preg_match('/delete\s+from/i', $val);
 		$inj += preg_match('/create\s+table/i', $val);
 		$inj += preg_match('/insert\s+into/i', $val);
@@ -86,12 +84,10 @@ function testSqlAndScriptInject($val, $type)
 		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
 		$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
 	}
-	if ($type == 3)
-	{
+	if ($type == 3) {
 		$inj += preg_match('/select|update|delete|truncate|replace|group\s+by|concat|count|from|union/i', $val);
 	}
-	if ($type != 2)	// Not common key strings, so we can check them both on GET and POST
-	{
+	if ($type != 2) {	// Not common key strings, so we can check them both on GET and POST
 		$inj += preg_match('/updatexml\(/i', $val);
 		$inj += preg_match('/update.+set.+=/i', $val);
 		$inj += preg_match('/union.+select/i', $val);
@@ -110,7 +106,9 @@ function testSqlAndScriptInject($val, $type)
 	$inj += preg_match('/<object/i', $val);
 	$inj += preg_match('/<script/i', $val);
 	$inj += preg_match('/Set\.constructor/i', $val); // ECMA script 6
-	if (!defined('NOSTYLECHECK')) $inj += preg_match('/<style/i', $val);
+	if (!defined('NOSTYLECHECK')) {
+		$inj += preg_match('/<style/i', $val);
+	}
 	$inj += preg_match('/base\s+href/si', $val);
 	$inj += preg_match('/=data:/si', $val);
 	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp
@@ -144,7 +142,9 @@ function testSqlAndScriptInject($val, $type)
 		$val = str_replace('enclosure="', 'enclosure=X', $val); // We accept enclosure="
 		$inj += preg_match('/"/i', $val); // We refused " in GET parameters value.
 	}
-	if ($type == 2) $inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
+	if ($type == 2) {
+		$inj += preg_match('/[;"]/', $val); // PHP_SELF is a file system path. It can contains spaces.
+	}
 	return $inj;
 }
 
@@ -157,12 +157,9 @@ function testSqlAndScriptInject($val, $type)
  */
 function analyseVarsForSqlAndScriptsInjection(&$var, $type)
 {
-	if (is_array($var))
-	{
-		foreach ($var as $key => $value)	// Warning, $key may also be used for attacks
-		{
-			if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type))
-			{
+	if (is_array($var)) {
+		foreach ($var as $key => $value) {	// Warning, $key may also be used for attacks
+			if (analyseVarsForSqlAndScriptsInjection($key, $type) && analyseVarsForSqlAndScriptsInjection($value, $type)) {
 				//$var[$key] = $value;	// This is useless
 			} else {
 				// Get remote IP: PS: We do not use getRemoteIP(), function is not yet loaded and we need a value that can't be spoofed
@@ -195,14 +192,12 @@ if (defined('NOREQUIREUSER') && !defined('NOREQUIREMENU')) {
 }
 
 // Sanity check on URL
-if (!empty($_SERVER["PHP_SELF"]))
-{
+if (!empty($_SERVER["PHP_SELF"])) {
 	$morevaltochecklikepost = array($_SERVER["PHP_SELF"]);
 	analyseVarsForSqlAndScriptsInjection($morevaltochecklikepost, 2);
 }
 // Sanity check on GET parameters
-if (!defined('NOSCANGETFORINJECTION') && !empty($_SERVER["QUERY_STRING"]))
-{
+if (!defined('NOSCANGETFORINJECTION') && !empty($_SERVER["QUERY_STRING"])) {
 	// Note: QUERY_STRING is url encoded, but $_GET and $_POST are already decoded
 	// Because the analyseVarsForSqlAndScriptsInjection is designed for already url decoded value, we must decode QUERY_STRING
 	// Another solution is to provide $_GET as parameter
@@ -210,14 +205,12 @@ if (!defined('NOSCANGETFORINJECTION') && !empty($_SERVER["QUERY_STRING"]))
 	analyseVarsForSqlAndScriptsInjection($morevaltochecklikeget, 1);
 }
 // Sanity check on POST
-if (!defined('NOSCANPOSTFORINJECTION'))
-{
+if (!defined('NOSCANPOSTFORINJECTION')) {
 	analyseVarsForSqlAndScriptsInjection($_POST, 0);
 }
 
 // This is to make Dolibarr working with Plesk
-if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs')
-{
+if (!empty($_SERVER['DOCUMENT_ROOT']) && substr($_SERVER['DOCUMENT_ROOT'], -6) !== 'htdocs') {
 	set_include_path($_SERVER['DOCUMENT_ROOT'].'/htdocs');
 }
 
@@ -227,22 +220,24 @@ require_once 'filefunc.inc.php';
 // If there is a POST parameter to tell to save automatically some POST parameters into cookies, we do it.
 // This is used for example by form of boxes to save personalization of some options.
 // DOL_AUTOSET_COOKIE=cookiename:val1,val2 and  cookiename_val1=aaa cookiename_val2=bbb will set cookie_name with value json_encode(array('val1'=> , ))
-if (!empty($_POST["DOL_AUTOSET_COOKIE"]))
-{
+if (!empty($_POST["DOL_AUTOSET_COOKIE"])) {
 	$tmpautoset = explode(':', $_POST["DOL_AUTOSET_COOKIE"], 2);
 	$tmplist = explode(',', $tmpautoset[1]);
 	$cookiearrayvalue = array();
-	foreach ($tmplist as $tmpkey)
-	{
+	foreach ($tmplist as $tmpkey) {
 		$postkey = $tmpautoset[0].'_'.$tmpkey;
 		//var_dump('tmpkey='.$tmpkey.' postkey='.$postkey.' value='.$_POST[$postkey]);
-		if (!empty($_POST[$postkey])) $cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+		if (!empty($_POST[$postkey])) {
+			$cookiearrayvalue[$tmpkey] = $_POST[$postkey];
+		}
 	}
 	$cookiename = $tmpautoset[0];
 	$cookievalue = json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
 	setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, false, true); // keep cookie 1 year and add tag httponly
-	if (empty($cookievalue)) unset($_COOKIE[$cookiename]);
+	if (empty($cookievalue)) {
+		unset($_COOKIE[$cookiename]);
+	}
 }
 
 
@@ -257,11 +252,12 @@ if (ini_get('session.save_handler') == 'user') {
 $prefix = dol_getprefix('');
 $sessionname = 'DOLSESSID_'.$prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
-if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
+if (!empty($_COOKIE[$sessiontimeout])) {
+	ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
+}
 // This create lock, released by session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
-if (!defined('NOSESSION'))
-{
+if (!defined('NOSESSION')) {
 	session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 	session_name($sessionname);
 	session_start();
@@ -273,18 +269,21 @@ require_once 'master.inc.php';
 
 
 // If software has been locked. Only login $conf->global->MAIN_ONLY_LOGIN_ALLOWED is allowed.
-if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
-{
+if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 	$ok = 0;
-	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) $ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)
-	elseif (defined('NOREQUIREDB'))   $ok = 1; // We let working pages that don't need database access (xxx.css.php)
-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok = 1; // We let working pages that ask to work even if only login enabled (logout.php)
-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok = 1; // We let working if user is allowed admin
-	if (!$ok)
-	{
-		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
-		{
+	if ((!session_id() || !isset($_SESSION["dol_login"])) && !isset($_POST["username"]) && !empty($_SERVER["GATEWAY_INTERFACE"])) {
+		$ok = 1; // We let working pages if not logged and inside a web browser (login form, to allow login by admin)
+	} elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+		$ok = 1; // We let working pages that is a login submission (login submit, to allow login by admin)
+	} elseif (defined('NOREQUIREDB')) {
+		$ok = 1; // We let working pages that don't need database access (xxx.css.php)
+	} elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) {
+		$ok = 1; // We let working pages that ask to work even if only login enabled (logout.php)
+	} elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+		$ok = 1; // We let working if user is allowed admin
+	}
+	if (!$ok) {
+		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
 			print 'Sorry, your application is offline.'."\n";
 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
 			$nexturl = DOL_URL_ROOT.'/user/logout.php';
@@ -303,21 +302,21 @@ if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 register_shutdown_function('dol_shutdown');
 
 // Load debugbar
-if (!empty($conf->debugbar->enabled) && !GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile']))
-{
+if (!empty($conf->debugbar->enabled) && !GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile'])) {
 	global $debugbar;
 	include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
 	$debugbar = new DolibarrDebugBar();
 	$renderer = $debugbar->getRenderer();
-	if (empty($conf->global->MAIN_HTML_HEADER)) $conf->global->MAIN_HTML_HEADER = '';
+	if (empty($conf->global->MAIN_HTML_HEADER)) {
+		$conf->global->MAIN_HTML_HEADER = '';
+	}
 	$conf->global->MAIN_HTML_HEADER .= $renderer->renderHead();
 
 	$debugbar['time']->startMeasure('pageaftermaster', 'Page generation (after environment init)');
 }
 
 // Detection browser
-if (isset($_SERVER["HTTP_USER_AGENT"]))
-{
+if (isset($_SERVER["HTTP_USER_AGENT"])) {
 	$tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
 	$conf->browser->name = $tmp['browsername'];
 	$conf->browser->os = $tmp['browseros'];
@@ -325,26 +324,23 @@ if (isset($_SERVER["HTTP_USER_AGENT"]))
 	$conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
 	//var_dump($conf->browser);
 
-	if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover = 1;
+	if ($conf->browser->layout == 'phone') {
+		$conf->dol_no_mouse_hover = 1;
+	}
 }
 
 // Set global MAIN_OPTIMIZEFORTEXTBROWSER (must be before login part)
-if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks'))   // If we must enable text browser
-{
+if (GETPOST('textbrowser', 'int') || (!empty($conf->browser->name) && $conf->browser->name == 'lynxlinks')) {   // If we must enable text browser
 	$conf->global->MAIN_OPTIMIZEFORTEXTBROWSER = 1;
 }
 
 // Force HTTPS if required ($conf->file->main_force_https is 0/1 or 'https dolibarr root url')
 // $_SERVER["HTTPS"] is 'on' when link is https, otherwise $_SERVER["HTTPS"] is empty or 'off'
-if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on'))
-{
+if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != 'on')) {
 	$newurl = '';
-	if (is_numeric($conf->file->main_force_https))
-	{
-		if ($conf->file->main_force_https == '1' && !empty($_SERVER["SCRIPT_URI"]))	// If SCRIPT_URI supported by server
-		{
-			if (preg_match('/^http:/i', $_SERVER["SCRIPT_URI"]) && !preg_match('/^https:/i', $_SERVER["SCRIPT_URI"]))	// If link is http
-			{
+	if (is_numeric($conf->file->main_force_https)) {
+		if ($conf->file->main_force_https == '1' && !empty($_SERVER["SCRIPT_URI"])) {	// If SCRIPT_URI supported by server
+			if (preg_match('/^http:/i', $_SERVER["SCRIPT_URI"]) && !preg_match('/^https:/i', $_SERVER["SCRIPT_URI"])) {	// If link is http
 				$newurl = preg_replace('/^http:/i', 'https:', $_SERVER["SCRIPT_URI"]);
 			}
 		} else {
@@ -356,8 +352,7 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
 		$newurl = $conf->file->main_force_https.$_SERVER["REQUEST_URI"];
 	}
 	// Start redirect
-	if ($newurl)
-	{
+	if ($newurl) {
 		header_remove(); // Clean header already set to be sure to remove any header like "Set-Cookie: DOLSESSID_..." from non HTTPS answers
 		dol_syslog("main.inc: dolibarr_main_force_https is on, we make a redirect to ".$newurl);
 		header("Location: ".$newurl);
@@ -367,48 +362,45 @@ if (!empty($conf->file->main_force_https) && (empty($_SERVER["HTTPS"]) || $_SERV
 	}
 }
 
-if (!defined('NOLOGIN') && !defined('NOIPCHECK') && !empty($dolibarr_main_restrict_ip))
-{
+if (!defined('NOLOGIN') && !defined('NOIPCHECK') && !empty($dolibarr_main_restrict_ip)) {
 	$listofip = explode(',', $dolibarr_main_restrict_ip);
 	$found = false;
-	foreach ($listofip as $ip)
-	{
+	foreach ($listofip as $ip) {
 		$ip = trim($ip);
-		if ($ip == $_SERVER['REMOTE_ADDR'])
-		{
+		if ($ip == $_SERVER['REMOTE_ADDR']) {
 			$found = true;
 			break;
 		}
 	}
-	if (!$found)
-	{
+	if (!$found) {
 		print 'Access refused by IP protection. Your detected IP is '.$_SERVER['REMOTE_ADDR'];
 		exit;
 	}
 }
 
 // Loading of additional presentation includes
-if (!defined('NOREQUIREHTML')) require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
-if (!defined('NOREQUIREAJAX')) require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory
+if (!defined('NOREQUIREHTML')) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php'; // Need 660ko memory (800ko in 2.2)
+}
+if (!defined('NOREQUIREAJAX')) {
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php'; // Need 22ko memory
+}
 
 // If install or upgrade process not done or not completely finished, we call the install page.
-if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED))
-{
+if (!empty($conf->global->MAIN_NOT_INSTALLED) || !empty($conf->global->MAIN_NOT_UPGRADED)) {
 	dol_syslog("main.inc: A previous install or upgrade was not complete. Redirect to install page.", LOG_WARNING);
 	header("Location: ".DOL_URL_ROOT."/install/index.php");
 	exit;
 }
 // If an upgrade process is required, we call the install page.
 if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VERSION_LAST_UPGRADE != DOL_VERSION))
-|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION)))
-{
+|| (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && !empty($conf->global->MAIN_VERSION_LAST_INSTALL) && ($conf->global->MAIN_VERSION_LAST_INSTALL != DOL_VERSION))) {
 	$versiontocompare = empty($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_INSTALL : $conf->global->MAIN_VERSION_LAST_UPGRADE;
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 	$dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
 	$dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
 	$rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
-	if ($rescomp > 0)   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
-	{
+	if ($rescomp > 0) {   // Programs have a version higher than database. We did not add "&& $rescomp < 3" because we want upgrade process for build upgrades
 		dol_syslog("main.inc: database version ".$versiontocompare." is lower than programs version ".DOL_VERSION.". Redirect to install page.", LOG_WARNING);
 		header("Location: ".DOL_URL_ROOT."/install/index.php");
 		exit;
@@ -432,13 +424,11 @@ if (!defined('NOTOKENRENEWAL')) {
 //$dolibarr_nocsrfcheck=1;
 // Check token
 if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN))
-	|| defined('CSRFCHECK_WITH_TOKEN'))	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set into page
-{
+	|| defined('CSRFCHECK_WITH_TOKEN')) {	// Check validity of token, only if option MAIN_SECURITY_CSRF_WITH_TOKEN enabled or if constant CSRFCHECK_WITH_TOKEN is set into page
 	// Check all cases that need a token (all POST actions, all actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set, all sensitive GET actions)
 	if ($_SERVER['REQUEST_METHOD'] == 'POST' ||
 		((GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN')) ||
-		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'confirm_create_user', 'confirm_create_thirdparty', 'confirm_reject_check')))
-	{
+		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deletefilter', 'deleteoperation', 'deleteprof', 'deletepayment', 'confirm_create_user', 'confirm_create_thirdparty', 'confirm_reject_check'))) {
 		if (!GETPOSTISSET('token')) {
 			if (GETPOST('uploadform', 'int')) {
 				dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused. File size too large.");
@@ -477,24 +467,23 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 }
 
 // Disable modules (this must be after session_start and after conf has been loaded)
-if (GETPOSTISSET('disablemodules'))  $_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
-if (!empty($_SESSION["disablemodules"]))
-{
+if (GETPOSTISSET('disablemodules')) {
+	$_SESSION["disablemodules"] = GETPOST('disablemodules', 'alpha');
+}
+if (!empty($_SESSION["disablemodules"])) {
 	$modulepartkeys = array('css', 'js', 'tabs', 'triggers', 'login', 'substitutions', 'menus', 'theme', 'sms', 'tpl', 'barcode', 'models', 'societe', 'hooks', 'dir', 'syslog', 'tpllinkable', 'contactelement', 'moduleforexternal');
 
 	$disabled_modules = explode(',', $_SESSION["disablemodules"]);
-	foreach ($disabled_modules as $module)
-	{
-		if ($module)
-		{
-			if (empty($conf->$module)) $conf->$module = new stdClass(); // To avoid warnings
+	foreach ($disabled_modules as $module) {
+		if ($module) {
+			if (empty($conf->$module)) {
+				$conf->$module = new stdClass(); // To avoid warnings
+			}
 			$conf->$module->enabled = false;
-			foreach ($modulepartkeys as $modulepartkey)
-			{
+			foreach ($modulepartkeys as $modulepartkey) {
 				unset($conf->modules_parts[$modulepartkey][$module]);
 			}
-			if ($module == 'fournisseur')		// Special case
-			{
+			if ($module == 'fournisseur') {		// Special case
 				$conf->supplier_order->enabled = 0;
 				$conf->supplier_invoice->enabled = 0;
 			}
@@ -504,12 +493,9 @@ if (!empty($_SESSION["disablemodules"]))
 
 // Set current modulepart
 $modulepart = explode("/", $_SERVER["PHP_SELF"]);
-if (is_array($modulepart) && count($modulepart) > 0)
-{
-	foreach ($conf->modules as $module)
-	{
-		if (in_array($module, $modulepart))
-		{
+if (is_array($modulepart) && count($modulepart) > 0) {
+	foreach ($conf->modules as $module) {
+		if (in_array($module, $modulepart)) {
 			$conf->modulepart = $module;
 			break;
 		}
@@ -520,26 +506,27 @@ if (is_array($modulepart) && count($modulepart) > 0)
  * Phase authentication / login
  */
 $login = '';
-if (!defined('NOLOGIN'))
-{
+if (!defined('NOLOGIN')) {
 	// $authmode lists the different method of identification to be tested in order of preference.
 	// Example: 'http', 'dolibarr', 'ldap', 'http,forceuser', '...'
 
-	if (defined('MAIN_AUTHENTICATION_MODE'))
-	{
+	if (defined('MAIN_AUTHENTICATION_MODE')) {
 		$dolibarr_main_authentication = constant('MAIN_AUTHENTICATION_MODE');
 	} else {
 		// Authentication mode
-		if (empty($dolibarr_main_authentication)) $dolibarr_main_authentication = 'http,dolibarr';
+		if (empty($dolibarr_main_authentication)) {
+			$dolibarr_main_authentication = 'http,dolibarr';
+		}
 		// Authentication mode: forceuser
-		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) $dolibarr_auto_user = 'auto';
+		if ($dolibarr_main_authentication == 'forceuser' && empty($dolibarr_auto_user)) {
+			$dolibarr_auto_user = 'auto';
+		}
 	}
 	// Set authmode
 	$authmode = explode(',', $dolibarr_main_authentication);
 
 	// No authentication mode
-	if (!count($authmode))
-	{
+	if (!count($authmode)) {
 		$langs->load('main');
 		dol_print_error('', $langs->trans("ErrorConfigParameterNotDefined", 'dolibarr_main_authentication'));
 		exit;
@@ -550,8 +537,7 @@ if (!defined('NOLOGIN'))
 	// At the end of this phase, the variable $login is defined.
 	$resultFetchUser = '';
 	$test = true;
-	if (!isset($_SESSION["dol_login"]))
-	{
+	if (!isset($_SESSION["dol_login"])) {
 		// It is not already authenticated and it requests the login / password
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 
@@ -568,10 +554,8 @@ if (!defined('NOLOGIN'))
 		//dol_syslog("POST key=".join(array_keys($_POST),',').' value='.join($_POST,','));
 
 		// If in demo mode, we check we go to home page through the public/demo/index.php page
-		if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php')  // We ask index page
-		{
-			if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER']))
-			{
+		if (!empty($dolibarr_main_demo) && $_SERVER['PHP_SELF'] == DOL_URL_ROOT.'/index.php') {  // We ask index page
+			if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/public/', $_SERVER['HTTP_REFERER'])) {
 				dol_syslog("Call index page from another url than demo page (call is done from page ".$_SERVER['HTTP_REFERER'].")");
 				$url = '';
 				$url .= ($url ? '&' : '').($dol_hide_topmenu ? 'dol_hide_topmenu='.$dol_hide_topmenu : '');
@@ -591,19 +575,17 @@ if (!defined('NOLOGIN'))
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('beforeLoginAuthentication', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook < 0) {
-		    $test = false;
-		    $error++;
+			$test = false;
+			$error++;
 		}
 
 		// Verification security graphic code
-		if ($test && GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam']))
-		{
+		if ($test && GETPOST("username", "alpha", 2) && !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) && !isset($_SESSION['dol_bypass_antispam'])) {
 			$sessionkey = 'dol_antispam_value';
 			$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'none'))));
 
 			// Check code
-			if (!$ok)
-			{
+			if (!$ok) {
 				dol_syslog('Bad value for code, connexion refused');
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
@@ -616,7 +598,9 @@ if (!defined('NOLOGIN'))
 
 				// Call trigger
 				$result = $user->call_trigger('USER_LOGIN_FAILED', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 
 				// Hooks on failed login
@@ -624,45 +608,54 @@ if (!defined('NOLOGIN'))
 				$hookmanager->initHooks(array('login'));
 				$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 				$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 
 				// Note: exit is done later
 			}
 		}
 
 		$allowedmethodtopostusername = 2;
-		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) $allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+		if (defined('MAIN_AUTHENTICATION_POST_METHOD')) {
+			$allowedmethodtopostusername = constant('MAIN_AUTHENTICATION_POST_METHOD');
+		}
 		$usertotest = (!empty($_COOKIE['login_dolibarr']) ? preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['login_dolibarr']) : GETPOST("username", "alpha", $allowedmethodtopostusername));
 		$passwordtotest = GETPOST('password', 'none', $allowedmethodtopostusername);
 		$entitytotest = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
 		// Define if we received data to test the login.
 		$goontestloop = false;
-		if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) $goontestloop = true;
-		if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user)) $goontestloop = true;
-		if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1)) $goontestloop = true;
+		if (isset($_SERVER["REMOTE_USER"]) && in_array('http', $authmode)) {
+			$goontestloop = true;
+		}
+		if ($dolibarr_main_authentication == 'forceuser' && !empty($dolibarr_auto_user)) {
+			$goontestloop = true;
+		}
+		if (GETPOST("username", "alpha", $allowedmethodtopostusername) || !empty($_COOKIE['login_dolibarr']) || GETPOST('openid_mode', 'alpha', 1)) {
+			$goontestloop = true;
+		}
 
-		if (!is_object($langs)) // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
-		{
+		if (!is_object($langs)) { // This can occurs when calling page with NOREQUIRETRAN defined, however we need langs for error messages.
 			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 			$langs = new Translate("", $conf);
 			$langcode = (GETPOST('lang', 'aZ09', 1) ?GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-			if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');
+			if (defined('MAIN_LANG_DEFAULT')) {
+				$langcode = constant('MAIN_LANG_DEFAULT');
+			}
 			$langs->setDefaultLang($langcode);
 		}
 
 		// Validation of login/pass/entity
 		// If ok, the variable login will be returned
 		// If error, we will put error message in session under the name dol_loginmesg
-		if ($test && $goontestloop && (GETPOST('actionlogin', 'aZ09') == 'login' || $dolibarr_main_authentication != 'dolibarr'))
-		{
+		if ($test && $goontestloop && (GETPOST('actionlogin', 'aZ09') == 'login' || $dolibarr_main_authentication != 'dolibarr')) {
 			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
 			if ($login === '--bad-login-validity--') {
 				$login = '';
 			}
 
-			if ($login)
-			{
+			if ($login) {
 				$dol_authmode = $conf->authmode; // This properties is defined only when logged, to say what mode was successfully used
 				$dol_tz = $_POST["tz"];
 				$dol_tz_string = $_POST["tz_string"];
@@ -671,33 +664,37 @@ if (!defined('NOLOGIN'))
 				$dol_tz_string = preg_replace('/\s/', '_', $dol_tz_string);
 				$dol_dst = 0;
 				// Keep $_POST here. Do not use GETPOSTISSET
-				if (isset($_POST["dst_first"]) && isset($_POST["dst_second"]))
-				{
+				if (isset($_POST["dst_first"]) && isset($_POST["dst_second"])) {
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 					$datenow = dol_now();
 					$datefirst = dol_stringtotime($_POST["dst_first"]);
 					$datesecond = dol_stringtotime($_POST["dst_second"]);
-					if ($datenow >= $datefirst && $datenow < $datesecond) $dol_dst = 1;
+					if ($datenow >= $datefirst && $datenow < $datesecond) {
+						$dol_dst = 1;
+					}
 				}
 				//print $datefirst.'-'.$datesecond.'-'.$datenow.'-'.$dol_tz.'-'.$dol_tzstring.'-'.$dol_dst; exit;
 			}
 
-			if (!$login)
-			{
+			if (!$login) {
 				dol_syslog('Bad password, connexion refused', LOG_DEBUG);
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
 				// Bad password. No authmode has found a good password.
 				// We set a generic message if not defined inside function checkLoginPassEntity or subfunctions
-				if (empty($_SESSION["dol_loginmesg"])) $_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+				if (empty($_SESSION["dol_loginmesg"])) {
+					$_SESSION["dol_loginmesg"] = $langs->trans("ErrorBadLoginPassword");
+				}
 
 				// Call trigger for the "security events" log
 				$user->trigger_mesg = $langs->trans("ErrorBadLoginPassword").' - login='.GETPOST("username", "alpha", 2);
 
 				// Call trigger
 				$result = $user->call_trigger('USER_LOGIN_FAILED', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 
 				// Hooks on failed login
@@ -705,19 +702,21 @@ if (!defined('NOLOGIN'))
 				$hookmanager->initHooks(array('login'));
 				$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 				$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
-				if ($reshook < 0) $error++;
+				if ($reshook < 0) {
+					$error++;
+				}
 
 				// Note: exit is done in next chapter
 			}
 		}
 
 		// End test login / passwords
-		if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest)))	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
-		{
+		if (!$login || (in_array('ldap', $authmode) && empty($passwordtotest))) {	// With LDAP we refused empty password because some LDAP are "opened" for anonymous access so connexion is a success.
 			// No data to test login, so we show the login page.
 			dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." - action=".GETPOST('action', 'aZ09')." - actionlogin=".GETPOST('actionlogin', 'aZ09')." - showing the login form and exit");
-			if (defined('NOREDIRECTBYMAINTOLOGIN')) return 'ERROR_NOT_LOGGED';
-			else {
+			if (defined('NOREDIRECTBYMAINTOLOGIN')) {
+				return 'ERROR_NOT_LOGGED';
+			} else {
 				if ($_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
 					http_response_code(401); // It makes easier to understand if session was broken during security tests
 				}
@@ -727,16 +726,14 @@ if (!defined('NOLOGIN'))
 		}
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entitytotest > 0 ? $entitytotest : -1)); // login was retrieved previously when checking password.
-		if ($resultFetchUser <= 0)
-		{
+		if ($resultFetchUser <= 0) {
 			dol_syslog('User not found, connexion refused');
 			session_destroy();
 			session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie
 			session_name($sessionname);
 			session_start();
 
-			if ($resultFetchUser == 0)
-			{
+			if ($resultFetchUser == 0) {
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
@@ -744,8 +741,7 @@ if (!defined('NOLOGIN'))
 
 				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
 			}
-			if ($resultFetchUser < 0)
-			{
+			if ($resultFetchUser < 0) {
 				$_SESSION["dol_loginmesg"] = $user->error;
 
 				$user->trigger_mesg = $user->error;
@@ -753,7 +749,9 @@ if (!defined('NOLOGIN'))
 
 			// Call trigger
 			$result = $user->call_trigger('USER_LOGIN_FAILED', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 
 
@@ -762,12 +760,20 @@ if (!defined('NOLOGIN'))
 			$hookmanager->initHooks(array('login'));
 			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
+			if ($reshook < 0) {
+				$error++;
+			}
 
 			$paramsurl = array();
-			if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
-			if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
-			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			if (GETPOST('textbrowser', 'int')) {
+				$paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			}
+			if (GETPOST('nojs', 'int')) {
+				$paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			}
+			if (GETPOST('lang', 'aZ09')) {
+				$paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			}
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		} else {
@@ -783,8 +789,7 @@ if (!defined('NOLOGIN'))
 		dol_syslog("- This is an already logged session. _SESSION['dol_login']=".$login." _SESSION['dol_entity']=".$entity, LOG_DEBUG);
 
 		$resultFetchUser = $user->fetch('', $login, '', 1, ($entity > 0 ? $entity : -1));
-		if ($resultFetchUser <= 0)
-		{
+		if ($resultFetchUser <= 0) {
 			// Account has been removed after login
 			dol_syslog("Can't load user even if session logged. _SESSION['dol_login']=".$login, LOG_WARNING);
 			session_destroy();
@@ -792,8 +797,7 @@ if (!defined('NOLOGIN'))
 			session_name($sessionname);
 			session_start();
 
-			if ($resultFetchUser == 0)
-			{
+			if ($resultFetchUser == 0) {
 				// Load translation files required by page
 				$langs->loadLangs(array('main', 'errors'));
 
@@ -801,8 +805,7 @@ if (!defined('NOLOGIN'))
 
 				$user->trigger_mesg = 'ErrorCantLoadUserFromDolibarrDatabase - login='.$login;
 			}
-			if ($resultFetchUser < 0)
-			{
+			if ($resultFetchUser < 0) {
 				$_SESSION["dol_loginmesg"] = $user->error;
 
 				$user->trigger_mesg = $user->error;
@@ -810,7 +813,9 @@ if (!defined('NOLOGIN'))
 
 			// Call trigger
 			$result = $user->call_trigger('USER_LOGIN_FAILED', $user);
-			if ($result < 0) $error++;
+			if ($result < 0) {
+				$error++;
+			}
 			// End call triggers
 
 			// Hooks on failed login
@@ -818,12 +823,20 @@ if (!defined('NOLOGIN'))
 			$hookmanager->initHooks(array('login'));
 			$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginmesg'=>$_SESSION["dol_loginmesg"]);
 			$reshook = $hookmanager->executeHooks('afterLoginFailed', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
-			if ($reshook < 0) $error++;
+			if ($reshook < 0) {
+				$error++;
+			}
 
 			$paramsurl = array();
-			if (GETPOST('textbrowser', 'int')) $paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
-			if (GETPOST('nojs', 'int'))        $paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
-			if (GETPOST('lang', 'aZ09'))       $paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			if (GETPOST('textbrowser', 'int')) {
+				$paramsurl[] = 'textbrowser='.GETPOST('textbrowser', 'int');
+			}
+			if (GETPOST('nojs', 'int')) {
+				$paramsurl[] = 'nojs='.GETPOST('nojs', 'int');
+			}
+			if (GETPOST('lang', 'aZ09')) {
+				$paramsurl[] = 'lang='.GETPOST('lang', 'aZ09');
+			}
 			header('Location: '.DOL_URL_ROOT.'/index.php'.(count($paramsurl) ? '?'.implode('&', $paramsurl) : ''));
 			exit;
 		} else {
@@ -831,34 +844,31 @@ if (!defined('NOLOGIN'))
 			$hookmanager->initHooks(array('main'));
 
 			// Code for search criteria persistence.
-			if (!empty($_GET['save_lastsearch_values']))    // We must use $_GET here
-			{
+			if (!empty($_GET['save_lastsearch_values'])) {    // We must use $_GET here
 				$relativepathstring = preg_replace('/\?.*$/', '', $_SERVER["HTTP_REFERER"]);
 				$relativepathstring = preg_replace('/^https?:\/\/[^\/]*/', '', $relativepathstring); // Get full path except host server
 				// Clean $relativepathstring
-   				if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+				if (constant('DOL_URL_ROOT')) {
+					$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+				}
 				$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 				//var_dump($relativepathstring);
 
 				// We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
-				if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring]))
-				{
+				if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring])) {
 					$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
 					unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
 				}
-				if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]))
-				{
+				if (!empty($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring])) {
 					$_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
 					unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
 				}
-				if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0)
-				{
+				if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0) {
 					$_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
 					unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
 				}
-				if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit)
-				{
+				if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit) {
 					$_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
 					unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 				}
@@ -874,8 +884,7 @@ if (!defined('NOLOGIN'))
 
 	// Is it a new session that has started ?
 	// If we are here, this means authentication was successfull.
-	if (!isset($_SESSION["dol_login"]))
-	{
+	if (!isset($_SESSION["dol_login"])) {
 		// New session for this login has started.
 		$error = 0;
 
@@ -893,11 +902,21 @@ if (!defined('NOLOGIN'))
 		$_SESSION["dol_company"] = $conf->global->MAIN_INFO_SOCIETE_NOM;
 		$_SESSION["dol_entity"] = $conf->entity;
 		// Store value into session (values stored only if defined)
-		if (!empty($dol_hide_topmenu))         $_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
-		if (!empty($dol_hide_leftmenu))        $_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
-		if (!empty($dol_optimize_smallscreen)) $_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
-		if (!empty($dol_no_mouse_hover))       $_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
-		if (!empty($dol_use_jmobile))          $_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+		if (!empty($dol_hide_topmenu)) {
+			$_SESSION['dol_hide_topmenu'] = $dol_hide_topmenu;
+		}
+		if (!empty($dol_hide_leftmenu)) {
+			$_SESSION['dol_hide_leftmenu'] = $dol_hide_leftmenu;
+		}
+		if (!empty($dol_optimize_smallscreen)) {
+			$_SESSION['dol_optimize_smallscreen'] = $dol_optimize_smallscreen;
+		}
+		if (!empty($dol_no_mouse_hover)) {
+			$_SESSION['dol_no_mouse_hover'] = $dol_no_mouse_hover;
+		}
+		if (!empty($dol_use_jmobile)) {
+			$_SESSION['dol_use_jmobile'] = $dol_use_jmobile;
+		}
 
 		dol_syslog("This is a new started user session. _SESSION['dol_login']=".$_SESSION["dol_login"]." Session id=".session_id());
 
@@ -912,7 +931,9 @@ if (!defined('NOLOGIN'))
 
 		// Call trigger
 		$result = $user->call_trigger('USER_LOGIN', $user);
-		if ($result < 0) $error++;
+		if ($result < 0) {
+			$error++;
+		}
 		// End call triggers
 
 		// Hooks on successfull login
@@ -920,10 +941,11 @@ if (!defined('NOLOGIN'))
 		$hookmanager->initHooks(array('login'));
 		$parameters = array('dol_authmode'=>$dol_authmode, 'dol_loginfo'=>$loginfo);
 		$reshook = $hookmanager->executeHooks('afterLogin', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook < 0) $error++;
+		if ($reshook < 0) {
+			$error++;
+		}
 
-		if ($error)
-		{
+		if ($error) {
 			$db->rollback();
 			session_destroy();
 			dol_print_error($db, 'Error in some triggers USER_LOGIN or in some hooks afterLogin');
@@ -934,11 +956,9 @@ if (!defined('NOLOGIN'))
 
 		// Change landing page if defined.
 		$landingpage = (empty($user->conf->MAIN_LANDING_PAGE) ? (empty($conf->global->MAIN_LANDING_PAGE) ? '' : $conf->global->MAIN_LANDING_PAGE) : $user->conf->MAIN_LANDING_PAGE);
-		if (!empty($landingpage))    // Example: /index.php
-		{
+		if (!empty($landingpage)) {    // Example: /index.php
 			$newpath = dol_buildpath($landingpage, 1);
-			if ($_SERVER["PHP_SELF"] != $newpath)   // not already on landing page (avoid infinite loop)
-			{
+			if ($_SERVER["PHP_SELF"] != $newpath) {   // not already on landing page (avoid infinite loop)
 				header('Location: '.$newpath);
 				exit;
 			}
@@ -947,8 +967,7 @@ if (!defined('NOLOGIN'))
 
 
 	// If user admin, we force the rights-based modules
-	if ($user->admin)
-	{
+	if ($user->admin) {
 		$user->rights->user->user->lire = 1;
 		$user->rights->user->user->creer = 1;
 		$user->rights->user->user->password = 1;
@@ -958,24 +977,26 @@ if (!defined('NOLOGIN'))
 	}
 
 	/*
-     * Overwrite some configs globals (try to avoid this and have code to use instead $user->conf->xxx)
-     */
+	 * Overwrite some configs globals (try to avoid this and have code to use instead $user->conf->xxx)
+	 */
 
 	// Set liste_limit
-	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT))	$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
-	if (isset($user->conf->PRODUIT_LIMIT_SIZE))	$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
+	if (isset($user->conf->MAIN_SIZE_LISTE_LIMIT)) {
+		$conf->liste_limit = $user->conf->MAIN_SIZE_LISTE_LIMIT; // Can be 0
+	}
+	if (isset($user->conf->PRODUIT_LIMIT_SIZE)) {
+		$conf->product->limit_size = $user->conf->PRODUIT_LIMIT_SIZE; // Can be 0
+	}
 
 	// Replace conf->css by personalized value if theme not forced
-	if (empty($conf->global->MAIN_FORCETHEME) && !empty($user->conf->MAIN_THEME))
-	{
+	if (empty($conf->global->MAIN_FORCETHEME) && !empty($user->conf->MAIN_THEME)) {
 		$conf->theme = $user->conf->MAIN_THEME;
 		$conf->css = "/theme/".$conf->theme."/style.css.php";
 	}
 }
 
 // Case forcing style from url
-if (GETPOST('theme', 'alpha'))
-{
+if (GETPOST('theme', 'alpha')) {
 	$conf->theme = GETPOST('theme', 'alpha', 1);
 	$conf->css = "/theme/".$conf->theme."/style.css.php";
 }
@@ -998,52 +1019,58 @@ if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && !empty($user->conf->MAI
 $conf->global->MAIN_OPTIMIZEFORCOLORBLIND = empty($user->conf->MAIN_OPTIMIZEFORCOLORBLIND) ? '' : $user->conf->MAIN_OPTIMIZEFORCOLORBLIND;
 
 // Set terminal output option according to conf->browser.
-if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu']))               $conf->dol_hide_leftmenu = 1;
-if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu']))                 $conf->dol_hide_topmenu = 1;
-if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) $conf->dol_optimize_smallscreen = 1;
-if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover']))             $conf->dol_no_mouse_hover = 1;
-if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile']))                   $conf->dol_use_jmobile = 1;
-if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') $conf->dol_no_mouse_hover = 1;
+if (GETPOST('dol_hide_leftmenu', 'int') || !empty($_SESSION['dol_hide_leftmenu'])) {
+	$conf->dol_hide_leftmenu = 1;
+}
+if (GETPOST('dol_hide_topmenu', 'int') || !empty($_SESSION['dol_hide_topmenu'])) {
+	$conf->dol_hide_topmenu = 1;
+}
+if (GETPOST('dol_optimize_smallscreen', 'int') || !empty($_SESSION['dol_optimize_smallscreen'])) {
+	$conf->dol_optimize_smallscreen = 1;
+}
+if (GETPOST('dol_no_mouse_hover', 'int') || !empty($_SESSION['dol_no_mouse_hover'])) {
+	$conf->dol_no_mouse_hover = 1;
+}
+if (GETPOST('dol_use_jmobile', 'int') || !empty($_SESSION['dol_use_jmobile'])) {
+	$conf->dol_use_jmobile = 1;
+}
+if (!empty($conf->browser->layout) && $conf->browser->layout != 'classic') {
+	$conf->dol_no_mouse_hover = 1;
+}
 if ((!empty($conf->browser->layout) && $conf->browser->layout == 'phone')
 	|| (!empty($_SESSION['dol_screenwidth']) && $_SESSION['dol_screenwidth'] < 400)
 	|| (!empty($_SESSION['dol_screenheight']) && $_SESSION['dol_screenheight'] < 400)
-)
-{
+) {
 	$conf->dol_optimize_smallscreen = 1;
 }
 // Replace themes bugged with jmobile with eldy
-if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok')))
-{
+if (!empty($conf->dol_use_jmobile) && in_array($conf->theme, array('bureau2crea', 'cameleo', 'amarok'))) {
 	$conf->theme = 'eldy';
 	$conf->css = "/theme/".$conf->theme."/style.css.php";
 }
 
-if (!defined('NOREQUIRETRAN'))
-{
-	if (!GETPOST('lang', 'aZ09'))	// If language was not forced on URL
-	{
+if (!defined('NOREQUIRETRAN')) {
+	if (!GETPOST('lang', 'aZ09')) {	// If language was not forced on URL
 		// If user has chosen its own language
-		if (!empty($user->conf->MAIN_LANG_DEFAULT))
-		{
+		if (!empty($user->conf->MAIN_LANG_DEFAULT)) {
 			// If different than current language
 			//print ">>>".$langs->getDefaultLang()."-".$user->conf->MAIN_LANG_DEFAULT;
-			if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT)
-			{
+			if ($langs->getDefaultLang() != $user->conf->MAIN_LANG_DEFAULT) {
 				$langs->setDefaultLang($user->conf->MAIN_LANG_DEFAULT);
 			}
 		}
 	}
 }
 
-if (!defined('NOLOGIN'))
-{
+if (!defined('NOLOGIN')) {
 	// If the login is not recovered, it is identified with an account that does not exist.
 	// Hacking attempt?
-	if (!$user->login) accessforbidden();
+	if (!$user->login) {
+		accessforbidden();
+	}
 
 	// Check if user is active
-	if ($user->statut < 1)
-	{
+	if ($user->statut < 1) {
 		// If not active, we refuse the user
 		$langs->load("other");
 		dol_syslog("Authentication KO as login is disabled", LOG_NOTICE);
@@ -1060,8 +1087,7 @@ dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"])?'':$_SERVER["REQU
 //dol_syslog("Access to ".$_SERVER["PHP_SELF"].' GET='.join(',',array_keys($_GET)).'->'.join(',',$_GET).' POST:'.join(',',array_keys($_POST)).'->'.join(',',$_POST));
 
 // Load main languages files
-if (!defined('NOREQUIRETRAN'))
-{
+if (!defined('NOREQUIRETRAN')) {
 	// Load translation files required by page
 	$langs->loadLangs(array('main', 'dict'));
 }
@@ -1078,8 +1104,7 @@ $mesg = ''; $warning = ''; $error = 0;
 $mesgs = array(); $warnings = array(); $errors = array();
 
 // Constants used to defined number of lines in textarea
-if (empty($conf->browser->firefox))
-{
+if (empty($conf->browser->firefox)) {
 	define('ROWS_1', 1);
 	define('ROWS_2', 2);
 	define('ROWS_3', 3);
@@ -1104,10 +1129,8 @@ if (empty($conf->browser->firefox))
 $heightforframes = 50;
 
 // Init menu manager
-if (!defined('NOREQUIREMENU'))
-{
-	if (empty($user->socid))    // If internal user or not defined
-	{
+if (!defined('NOREQUIREMENU')) {
+	if (empty($user->socid)) {    // If internal user or not defined
 		$conf->standard_menu = (empty($conf->global->MAIN_MENU_STANDARD_FORCED) ? (empty($conf->global->MAIN_MENU_STANDARD) ? 'eldy_menu.php' : $conf->global->MAIN_MENU_STANDARD) : $conf->global->MAIN_MENU_STANDARD_FORCED);
 	} else {
 		// If external user
@@ -1116,18 +1139,19 @@ if (!defined('NOREQUIREMENU'))
 
 	// Load the menu manager (only if not already done)
 	$file_menu = $conf->standard_menu;
-	if (GETPOST('menu', 'alpha')) $file_menu = GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
-	if (!class_exists('MenuManager'))
-	{
+	if (GETPOST('menu', 'alpha')) {
+		$file_menu = GETPOST('menu', 'alpha'); // example: menu=eldy_menu.php
+	}
+	if (!class_exists('MenuManager')) {
 		$menufound = 0;
 		$dirmenus = array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
-		foreach ($dirmenus as $dirmenu)
-		{
+		foreach ($dirmenus as $dirmenu) {
 			$menufound = dol_include_once($dirmenu."standard/".$file_menu);
-			if (class_exists('MenuManager')) break;
+			if (class_exists('MenuManager')) {
+				break;
+			}
 		}
-		if (!class_exists('MenuManager'))	// If failed to include, we try with standard eldy_menu.php
-		{
+		if (!class_exists('MenuManager')) {	// If failed to include, we try with standard eldy_menu.php
 			dol_syslog("You define a menu manager '".$file_menu."' that can not be loaded.", LOG_WARNING);
 			$file_menu = 'eldy_menu.php';
 			include_once DOL_DOCUMENT_ROOT."/core/menus/standard/".$file_menu;
@@ -1141,8 +1165,7 @@ if (!defined('NOREQUIREMENU'))
 
 // Functions
 
-if (!function_exists("llxHeader"))
-{
+if (!function_exists("llxHeader")) {
 	/**
 	 *	Show HTML header HTML + BODY + Top menu + left menu + DIV
 	 *
@@ -1171,10 +1194,11 @@ if (!function_exists("llxHeader"))
 
 		$tmpcsstouse = 'sidebar-collapse'.($morecssonbody ? ' '.$morecssonbody : '');
 		// If theme MD and classic layer, we open the menulayer by default.
-		if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		{
+		if ($conf->theme == 'md' && !in_array($conf->browser->layout, array('phone', 'tablet')) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 			global $mainmenu;
-			if ($mainmenu != 'website') $tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.
+			if ($mainmenu != 'website') {
+				$tmpcsstouse = $morecssonbody; // We do not use sidebar-collpase by default to have menuhider open by default.
+			}
 		}
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) {
@@ -1184,19 +1208,16 @@ if (!function_exists("llxHeader"))
 		print '<body id="mainbody" class="'.$tmpcsstouse.'">'."\n";
 
 		// top menu and left menu area
-		if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int'))
-		{
+		if (empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) {
 			top_menu($head, $title, $target, $disablejs, $disablehead, $arrayofjs, $arrayofcss, $morequerystring, $help_url);
 		}
 
-		if (empty($conf->dol_hide_leftmenu))
-		{
+		if (empty($conf->dol_hide_leftmenu)) {
 			left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retrieved with a global $menumanager inside this function
 		}
 
 		// main area
-		if ($replacemainareaby)
-		{
+		if ($replacemainareaby) {
 			print $replacemainareaby;
 			return;
 		}
@@ -1216,16 +1237,21 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 {
 	global $db, $conf, $hookmanager;
 
-	if ($contenttype == 'text/html') header("Content-Type: text/html; charset=".$conf->file->character_set_client);
-	else header("Content-Type: ".$contenttype);
+	if ($contenttype == 'text/html') {
+		header("Content-Type: text/html; charset=".$conf->file->character_set_client);
+	} else {
+		header("Content-Type: ".$contenttype);
+	}
 
 	// Security options
 	header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
-	if (!defined('XFRAMEOPTIONS_ALLOWALL')) header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
-	else header("X-Frame-Options: ALLOWALL");
+	if (!defined('XFRAMEOPTIONS_ALLOWALL')) {
+		header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
+	} else {
+		header("X-Frame-Options: ALLOWALL");
+	}
 	//header("X-XSS-Protection: 1");      		// XSS filtering protection of some browsers (note: use of Content-Security-Policy is more efficient). Disabled as deprecated.
-	if (!defined('FORCECSP'))
-	{
+	if (!defined('FORCECSP')) {
 		//if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
 		//{
 		//	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
@@ -1234,16 +1260,20 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 		//else
 		$contentsecuritypolicy = empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY) ? '' : $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
 
-		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
+		if (!is_object($hookmanager)) {
+			$hookmanager = new HookManager($db);
+		}
 		$hookmanager->initHooks(array("main"));
 
 		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy);
 		$result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters); // Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
-		else $contentsecuritypolicy .= $hookmanager->resPrint; // Concat CSP
+		if ($result > 0) {
+			$contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
+		} else {
+			$contentsecuritypolicy .= $hookmanager->resPrint; // Concat CSP
+		}
 
-		if (!empty($contentsecuritypolicy))
-		{
+		if (!empty($contentsecuritypolicy)) {
 			// For example, to restrict 'script', 'object', 'frames' or 'img' to some domains:
 			// script-src https://api.google.com https://anotherhost.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: https://static.example.com
 			// For example, to restrict everything to one domain, except 'object', ...:
@@ -1254,12 +1284,10 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
 			header("Content-Security-Policy: ".$contentsecuritypolicy);
 		}
-	} elseif (constant('FORCECSP'))
-	{
+	} elseif (constant('FORCECSP')) {
 		header("Content-Security-Policy: ".constant('FORCECSP'));
 	}
-	if ($forcenocache)
-	{
+	if ($forcenocache) {
 		header("Cache-Control: no-cache, no-store, must-revalidate, max-age=0");
 	}
 }
@@ -1284,23 +1312,31 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 	top_httphead();
 
-	if (empty($conf->css)) $conf->css = '/theme/eldy/style.css.php'; // If not defined, eldy by default
+	if (empty($conf->css)) {
+		$conf->css = '/theme/eldy/style.css.php'; // If not defined, eldy by default
+	}
 
 	print '<!doctype html>'."\n";
 
-	if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) print '<html lang="'.substr($langs->defaultlang, 0, 2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-	else print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n";
+	if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) {
+		print '<html lang="'.substr($langs->defaultlang, 0, 2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
+	} else {
+		print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n";
+	}
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
-	if (empty($disablehead))
-	{
-		if (!is_object($hookmanager)) $hookmanager = new HookManager($db);
+	if (empty($disablehead)) {
+		if (!is_object($hookmanager)) {
+			$hookmanager = new HookManager($db);
+		}
 		$hookmanager->initHooks(array("main"));
 
 		$ext = 'layout='.$conf->browser->layout.'&amp;version='.urlencode(DOL_VERSION);
 
 		print "<head>\n";
 
-		if (GETPOST('dol_basehref', 'alpha')) print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')).'">'."\n";
+		if (GETPOST('dol_basehref', 'alpha')) {
+			print '<base href="'.dol_escape_htmltag(GETPOST('dol_basehref', 'alpha')).'">'."\n";
+		}
 
 		// Displays meta
 		print '<meta charset="utf-8">'."\n";
@@ -1310,9 +1346,15 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		// Favicon
 		$favicon = DOL_URL_ROOT.'/theme/dolibarr_256x256_color.png';
-		if (!empty($mysoc->logo_squarred_mini)) $favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
-		if (!empty($conf->global->MAIN_FAVICON_URL)) $favicon = $conf->global->MAIN_FAVICON_URL;
-		if (empty($conf->dol_use_jmobile)) print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
+		if (!empty($mysoc->logo_squarred_mini)) {
+			$favicon = DOL_URL_ROOT.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini);
+		}
+		if (!empty($conf->global->MAIN_FAVICON_URL)) {
+			$favicon = $conf->global->MAIN_FAVICON_URL;
+		}
+		if (empty($conf->dol_use_jmobile)) {
+			print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n"; // Not required into an Android webview
+		}
 
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="top" title="'.$langs->trans("Home").'" href="'.(DOL_URL_ROOT?DOL_URL_ROOT:'/').'">'."\n";
 		//if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print '<link rel="copyright" title="GNU General Public License" href="https://www.gnu.org/copyleft/gpl.html#SEC1">'."\n";
@@ -1330,63 +1372,96 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		}
 
 		// Auto refresh page
-		if (GETPOST('autorefresh', 'int') > 0) print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh', 'int').'">';
+		if (GETPOST('autorefresh', 'int') > 0) {
+			print '<meta http-equiv="refresh" content="'.GETPOST('autorefresh', 'int').'">';
+		}
 
 		// Displays title
 		$appli = constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE;
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+			$appli = $conf->global->MAIN_APPLICATION_TITLE;
+		}
 
 		print '<title>';
 		$titletoshow = '';
-		if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) $titletoshow = dol_htmlentities($title);
-		elseif ($title) $titletoshow = dol_htmlentities($appli.' - '.$title);
-		else $titletoshow = dol_htmlentities($appli);
+		if ($title && !empty($conf->global->MAIN_HTML_TITLE) && preg_match('/noapp/', $conf->global->MAIN_HTML_TITLE)) {
+			$titletoshow = dol_htmlentities($title);
+		} elseif ($title) {
+			$titletoshow = dol_htmlentities($appli.' - '.$title);
+		} else {
+			$titletoshow = dol_htmlentities($appli);
+		}
 
 		$parameters = array('title'=>$titletoshow);
 		$result = $hookmanager->executeHooks('setHtmlTitle', $parameters); // Note that $action and $object may have been modified by some hooks
-		if ($result > 0) $titletoshow = $hookmanager->resPrint; // Replace Title to show
-		else $titletoshow .= $hookmanager->resPrint; // Concat to Title to show
+		if ($result > 0) {
+			$titletoshow = $hookmanager->resPrint; // Replace Title to show
+		} else {
+			$titletoshow .= $hookmanager->resPrint; // Concat to Title to show
+		}
 
 		print $titletoshow;
 		print '</title>';
 
 		print "\n";
 
-		if (GETPOST('version', 'int')) $ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js
+		if (GETPOST('version', 'int')) {
+			$ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js
+		}
 
 		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
 		$themeparam .= ($ext ? '&amp;'.$ext : '').'&amp;revision='.$conf->global->MAIN_IHM_PARAMS_REV;
-		if (!empty($_SESSION['dol_resetcache'])) $themeparam .= '&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-		if (GETPOSTISSET('dol_hide_topmenu')) { $themeparam .= '&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int'); }
-		if (GETPOSTISSET('dol_hide_leftmenu')) { $themeparam .= '&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int'); }
-		if (GETPOSTISSET('dol_optimize_smallscreen')) { $themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int'); }
-		if (GETPOSTISSET('dol_no_mouse_hover')) { $themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int'); }
-		if (GETPOSTISSET('dol_use_jmobile')) { $themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int'); }
-		if (GETPOSTISSET('THEME_DARKMODEENABLED')) { $themeparam .= '&amp;THEME_DARKMODEENABLED='.GETPOST('THEME_DARKMODEENABLED', 'int'); }
-		if (GETPOSTISSET('THEME_SATURATE_RATIO')) { $themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int'); }
+		if (!empty($_SESSION['dol_resetcache'])) {
+			$themeparam .= '&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
+		}
+		if (GETPOSTISSET('dol_hide_topmenu')) {
+			$themeparam .= '&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int');
+		}
+		if (GETPOSTISSET('dol_hide_leftmenu')) {
+			$themeparam .= '&amp;dol_hide_leftmenu='.GETPOST('dol_hide_leftmenu', 'int');
+		}
+		if (GETPOSTISSET('dol_optimize_smallscreen')) {
+			$themeparam .= '&amp;dol_optimize_smallscreen='.GETPOST('dol_optimize_smallscreen', 'int');
+		}
+		if (GETPOSTISSET('dol_no_mouse_hover')) {
+			$themeparam .= '&amp;dol_no_mouse_hover='.GETPOST('dol_no_mouse_hover', 'int');
+		}
+		if (GETPOSTISSET('dol_use_jmobile')) {
+			$themeparam .= '&amp;dol_use_jmobile='.GETPOST('dol_use_jmobile', 'int'); $conf->dol_use_jmobile = GETPOST('dol_use_jmobile', 'int');
+		}
+		if (GETPOSTISSET('THEME_DARKMODEENABLED')) {
+			$themeparam .= '&amp;THEME_DARKMODEENABLED='.GETPOST('THEME_DARKMODEENABLED', 'int');
+		}
+		if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
+			$themeparam .= '&amp;THEME_SATURATE_RATIO='.GETPOST('THEME_SATURATE_RATIO', 'int');
+		}
 
 		if (!empty($conf->global->MAIN_ENABLE_FONT_ROBOTO)) {
 			print '<link rel="preconnect" href="https://fonts.gstatic.com">'."\n";
 			print '<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@200;300;400;500;600&display=swap" rel="stylesheet">'."\n";
 		}
 
-		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax)
-		{
+		if (!defined('DISABLE_JQUERY') && !$disablejs && $conf->use_javascript_ajax) {
 			print '<!-- Includes CSS for JQuery (Ajax library) -->'."\n";
 			$jquerytheme = 'base';
-			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
-			if (constant('JS_JQUERY_UI')) print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // Forced JQuery
-			else print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
-			if (!defined('DISABLE_JQUERY_JNOTIFY')) print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
-			if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')))     // jQuery plugin "mutiselect", "multiple-select", "select2"...
-			{
+			if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) {
+				$jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
+			}
+			if (constant('JS_JQUERY_UI')) {
+				print '<link rel="stylesheet" type="text/css" href="'.JS_JQUERY_UI.'css/'.$jquerytheme.'/jquery-ui.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // Forced JQuery
+			} else {
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui.css'.($ext ? '?'.$ext : '').'">'."\n"; // JQuery
+			}
+			if (!defined('DISABLE_JQUERY_JNOTIFY')) {
+				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify-alt.min.css'.($ext ? '?'.$ext : '').'">'."\n"; // JNotify
+			}
+			if (!defined('DISABLE_SELECT2') && (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT'))) {     // jQuery plugin "mutiselect", "multiple-select", "select2"...
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
 				print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/css/'.$tmpplugin.'.css'.($ext ? '?'.$ext : '').'">'."\n";
 			}
 		}
 
-		if (!defined('DISABLE_FONT_AWSOME'))
-		{
+		if (!defined('DISABLE_FONT_AWSOME')) {
 			print '<!-- Includes CSS for font awesome -->'."\n";
 			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/all.min.css'.($ext ? '?'.$ext : '').'">'."\n";
 			print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/common/fontawesome-5/css/v4-shims.min.css'.($ext ? '?'.$ext : '').'">'."\n";
@@ -1396,12 +1471,9 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
 		$themepath = dol_buildpath($conf->css, 1);
 		$themesubdir = '';
-		if (!empty($conf->modules_parts['theme']))	// This slow down
-		{
-			foreach ($conf->modules_parts['theme'] as $reldir)
-			{
-				if (file_exists(dol_buildpath($reldir.$conf->css, 0)))
-				{
+		if (!empty($conf->modules_parts['theme'])) {	// This slow down
+			foreach ($conf->modules_parts['theme'] as $reldir) {
+				if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
 					$themepath = dol_buildpath($reldir.$conf->css, 1);
 					$themesubdir = $reldir;
 					break;
@@ -1411,59 +1483,68 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
 		print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
-		if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+		if (!empty($conf->global->MAIN_FIX_FLASH_ON_CHROME)) {
+			print '<!-- Includes CSS that does not exists as a workaround of flash bug of chrome -->'."\n".'<link rel="stylesheet" type="text/css" href="filethatdoesnotexiststosolvechromeflashbug">'."\n";
+		}
 
 		// CSS forced by modules (relative url starting with /)
-		if (!empty($conf->modules_parts['css']))
-		{
+		if (!empty($conf->modules_parts['css'])) {
 			$arraycss = (array) $conf->modules_parts['css'];
-			foreach ($arraycss as $modcss => $filescss)
-			{
+			foreach ($arraycss as $modcss => $filescss) {
 				$filescss = (array) $filescss; // To be sure filecss is an array
-				foreach ($filescss as $cssfile)
-				{
-					if (empty($cssfile)) dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+				foreach ($filescss as $cssfile) {
+					if (empty($cssfile)) {
+						dol_syslog("Warning: module ".$modcss." declared a css path file into its descriptor that is empty.", LOG_WARNING);
+					}
 					// cssfile is a relative path
 					print '<!-- Includes CSS added by module '.$modcss.' -->'."\n".'<link rel="stylesheet" type="text/css" href="'.dol_buildpath($cssfile, 1);
 					// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters, so browser cache is not used.
-					if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
+					if (!preg_match('/\.css$/i', $cssfile)) {
+						print $themeparam;
+					}
 					print '">'."\n";
 				}
 			}
 		}
 		// CSS forced by page in top_htmlhead call (relative url starting with /)
-		if (is_array($arrayofcss))
-		{
-			foreach ($arrayofcss as $cssfile)
-			{
-				if (preg_match('/^(http|\/\/)/i', $cssfile))
-				{
+		if (is_array($arrayofcss)) {
+			foreach ($arrayofcss as $cssfile) {
+				if (preg_match('/^(http|\/\/)/i', $cssfile)) {
 					$urltofile = $cssfile;
 				} else {
 					$urltofile = dol_buildpath($cssfile, 1);
 				}
 				print '<!-- Includes CSS added by page -->'."\n".'<link rel="stylesheet" type="text/css" title="default" href="'.$urltofile;
 				// We add params only if page is not static, because some web server setup does not return content type text/css if url has parameters and browser cache is not used.
-				if (!preg_match('/\.css$/i', $cssfile)) print $themeparam;
+				if (!preg_match('/\.css$/i', $cssfile)) {
+					print $themeparam;
+				}
 				print '">'."\n";
 			}
 		}
 
 		// Output standard javascript links
-		if (!defined('DISABLE_JQUERY') && !$disablejs && !empty($conf->use_javascript_ajax))
-		{
+		if (!defined('DISABLE_JQUERY') && !$disablejs && !empty($conf->use_javascript_ajax)) {
 			// JQuery. Must be before other includes
 			print '<!-- Includes JS for JQuery -->'."\n";
-			if (defined('JS_JQUERY') && constant('JS_JQUERY')) print '<script src="'.JS_JQUERY.'jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-			else print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			if (defined('JS_JQUERY') && constant('JS_JQUERY')) {
+				print '<script src="'.JS_JQUERY.'jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			} else {
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			}
 			/*if (! empty($conf->global->MAIN_FEATURES_LEVEL) && ! defined('JS_JQUERY_MIGRATE_DISABLED'))
 			{
 				if (defined('JS_JQUERY_MIGRATE') && constant('JS_JQUERY_MIGRATE')) print '<script src="'.JS_JQUERY_MIGRATE.'jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 				else print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-migrate.min.js'.($ext?'?'.$ext:'').'"></script>'."\n";
 			}*/
-			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) print '<script src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-			else print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
-			if (!defined('DISABLE_JQUERY_TABLEDND')) print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			if (defined('JS_JQUERY_UI') && constant('JS_JQUERY_UI')) {
+				print '<script src="'.JS_JQUERY_UI.'jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			} else {
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/js/jquery-ui.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			}
+			if (!defined('DISABLE_JQUERY_TABLEDND')) {
+				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/tablednd/jquery.tablednd.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+			}
 			// jQuery jnotify
 			if (empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && !defined('DISABLE_JQUERY_JNOTIFY')) {
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jnotify/jquery.jnotify.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
@@ -1502,16 +1583,14 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/'.$tmpplugin.'/dist/js/'.$tmpplugin.'.full.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n"; // We include full because we need the support of containerCssClass
 			}
-			if (!defined('DISABLE_MULTISELECT'))     // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
-			{
+			if (!defined('DISABLE_MULTISELECT')) {     // jQuery plugin "mutiselect" to select with checkboxes. Can be removed once we have an enhanced search tool
 				print '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/multiselect/jquery.multi-select.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 		}
 
 		if (!$disablejs && !empty($conf->use_javascript_ajax)) {
 			// CKEditor
-			if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR'))
-			{
+			if ((!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR')) {
 				print '<!-- Includes JS for CKEditor -->'."\n";
 				$pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
 				$jsckeditor = 'ckeditor.js';
@@ -1520,7 +1599,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 					$pathckeditor = constant('JS_CKEDITOR');
 				}
 				print '<script>';
-                print '/* enable ckeditor by main.inc.php */';
+				print '/* enable ckeditor by main.inc.php */';
 				print 'var CKEDITOR_BASEPATH = \''.$pathckeditor.'\';'."\n";
 				print 'var ckeditorConfig = \''.dol_buildpath($themesubdir.'/theme/'.$conf->theme.'/ckeditor/config.js'.($ext ? '?'.$ext : ''), 1).'\';'."\n"; // $themesubdir='' in standard usage
 				print 'var ckeditorFilebrowserBrowseUrl = \''.DOL_URL_ROOT.'/core/filemanagerdol/browser/default/browser.php?Connector='.DOL_URL_ROOT.'/core/filemanagerdol/connectors/php/connector.php\';'."\n";
@@ -1537,13 +1616,15 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			}
 
 			// Browser notifications (if NOREQUIREMENU is on, it is mostly a page for popup, so we do not enable notif too. We hide also for public pages).
-			if (!defined('NOBROWSERNOTIF') && !defined('NOREQUIREMENU') && !defined('NOLOGIN'))
-			{
+			if (!defined('NOBROWSERNOTIF') && !defined('NOREQUIREMENU') && !defined('NOLOGIN')) {
 				$enablebrowsernotif = false;
-				if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) $enablebrowsernotif = true;
-				if ($conf->browser->layout == 'phone') $enablebrowsernotif = false;
-				if ($enablebrowsernotif)
-				{
+				if (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+					$enablebrowsernotif = true;
+				}
+				if ($conf->browser->layout == 'phone') {
+					$enablebrowsernotif = false;
+				}
+				if ($enablebrowsernotif) {
 					print '<!-- Includes JS of Dolibarr (browser layout = '.$conf->browser->layout.')-->'."\n";
 					print '<script src="'.DOL_URL_ROOT.'/core/js/lib_notification.js.php'.($ext ? '?'.$ext : '').'"></script>'."\n";
 				}
@@ -1554,27 +1635,21 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			print '<script src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 
 			// JS forced by modules (relative url starting with /)
-			if (!empty($conf->modules_parts['js']))		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
-			{
+			if (!empty($conf->modules_parts['js'])) {		// $conf->modules_parts['js'] is array('module'=>array('file1','file2'))
 				$arrayjs = (array) $conf->modules_parts['js'];
-				foreach ($arrayjs as $modjs => $filesjs)
-				{
+				foreach ($arrayjs as $modjs => $filesjs) {
 					$filesjs = (array) $filesjs; // To be sure filejs is an array
-					foreach ($filesjs as $jsfile)
-					{
+					foreach ($filesjs as $jsfile) {
 						// jsfile is a relative path
 						print '<!-- Include JS added by module '.$modjs.'-->'."\n".'<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
 					}
 				}
 			}
 			// JS forced by page in top_htmlhead (relative url starting with /)
-			if (is_array($arrayofjs))
-			{
+			if (is_array($arrayofjs)) {
 				print '<!-- Includes JS added by page -->'."\n";
-				foreach ($arrayofjs as $jsfile)
-				{
-					if (preg_match('/^(http|\/\/)/i', $jsfile))
-					{
+				foreach ($arrayofjs as $jsfile) {
+					if (preg_match('/^(http|\/\/)/i', $jsfile)) {
 						print '<script src="'.$jsfile.'"></script>'."\n";
 					} else {
 						print '<script src="'.dol_buildpath($jsfile, 1).'"></script>'."\n";
@@ -1583,8 +1658,12 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			}
 		}
 
-		if (!empty($head)) print $head."\n";
-		if (!empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER."\n";
+		if (!empty($head)) {
+			print $head."\n";
+		}
+		if (!empty($conf->global->MAIN_HTML_HEADER)) {
+			print $conf->global->MAIN_HTML_HEADER."\n";
+		}
 
 		$parameters = array();
 		$result = $hookmanager->executeHooks('addHtmlHeader', $parameters); // Note that $action and $object may have been modified by some hooks
@@ -1628,18 +1707,16 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 	$toprightmenu = '';
 
 	// For backward compatibility with old modules
-	if (empty($conf->headerdone))
-	{
+	if (empty($conf->headerdone)) {
 		$disablenofollow = 0;
 		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, $disablenofollow);
 		print '<body id="mainbody">';
 	}
 
 	/*
-     * Top menu
-     */
-	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
-	{
+	 * Top menu
+	 */
+	if ((empty($conf->dol_hide_topmenu) || GETPOST('dol_invisible_topmenu', 'int')) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
 		if (!isset($form) || !is_object($form)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 			$form = new Form($db);
@@ -1657,24 +1734,28 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 
 		// Define link to login card
 		$appli = constant('DOL_APPLICATION_TITLE');
-		if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-		{
+		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 			$appli = $conf->global->MAIN_APPLICATION_TITLE;
-			if (preg_match('/\d\.\d/', $appli))
-			{
-				if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-			} else $appli .= " ".DOL_VERSION;
-		} else $appli .= " ".DOL_VERSION;
+			if (preg_match('/\d\.\d/', $appli)) {
+				if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+					$appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+				}
+			} else {
+				$appli .= " ".DOL_VERSION;
+			}
+		} else {
+			$appli .= " ".DOL_VERSION;
+		}
 
-		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) $appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+		if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+			$appli .= "<br>".$langs->trans("LevelOfFeature").': '.$conf->global->MAIN_FEATURES_LEVEL;
+		}
 
 		$logouttext = '';
 		$logouthtmltext = '';
-		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		{
+		if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 			//$logouthtmltext=$appli.'<br>';
-			if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http')
-			{
+			if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') {
 				$logouthtmltext .= $langs->trans("Logout").'<br>';
 
 				$logouttext .= '<a accesskey="l" href="'.DOL_URL_ROOT.'/user/logout.php">';
@@ -1693,11 +1774,10 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
 		$parameters = array();
 		$result = $hookmanager->executeHooks('printTopRightMenu', $parameters); // Note that $action and $object may have been modified by some hooks
-		if (is_numeric($result))
-		{
-			if ($result == 0)
+		if (is_numeric($result)) {
+			if ($result == 0) {
 				$toprightmenu .= $hookmanager->resPrint; // add
-			else {
+			} else {
 				$toprightmenu = $hookmanager->resPrint; // replace
 			}
 		} else {
@@ -1705,8 +1785,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		}
 
 		// Link to module builder
-		if (!empty($conf->modulebuilder->enabled))
-		{
+		if (!empty($conf->modulebuilder->enabled)) {
 			$text = '<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="modulebuilder">';
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-bug atoplogin valignmiddle"></span>';
@@ -1715,14 +1794,14 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		}
 
 		// Link to print main content area
-		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone')
-		{
+		if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $conf->browser->layout != 'phone') {
 			$qs = dol_escape_htmltag($_SERVER["QUERY_STRING"]);
 
-			if (is_array($_POST))
-			{
-				foreach ($_POST as $key=>$value) {
-					if ($key !== 'action' && $key !== 'password' && !is_array($value)) $qs .= '&'.$key.'='.urlencode($value);
+			if (is_array($_POST)) {
+				foreach ($_POST as $key => $value) {
+					if ($key !== 'action' && $key !== 'password' && !is_array($value)) {
+						$qs .= '&'.$key.'='.urlencode($value);
+					}
 				}
 			}
 			$qs .= (($qs && $morequerystring) ? '&' : '').$morequerystring;
@@ -1734,8 +1813,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		}
 
 		// Link to Dolibarr wiki pages
-		if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		{
+		if (empty($conf->global->MAIN_HELP_DISABLELINK) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 			$langs->load("help");
 
 			$helpbaseurl = '';
@@ -1756,21 +1834,28 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			$mode = $arrayres['mode'];
 
 			// Link to help pages
-			if ($helpbaseurl && $helppage)
-			{
+			if ($helpbaseurl && $helppage) {
 				$text = '';
 				$title = $langs->trans($mode == 'wiki' ? 'GoToWikiHelpPage' : 'GoToHelpPage').'...';
 				if ($mode == 'wiki') {
 					$title .= '<br>'.$langs->trans("PageWiki").' '.dol_escape_htmltag('"'.strtr($helppage, '_', ' ').'"');
-					if ($helppresent) $title .= ' <span class="opacitymedium">('.$langs->trans("DedicatedPageAvailable").')</span>';
-					else $title .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+					if ($helppresent) {
+						$title .= ' <span class="opacitymedium">('.$langs->trans("DedicatedPageAvailable").')</span>';
+					} else {
+						$title .= ' <span class="opacitymedium">('.$langs->trans("HomePage").')</span>';
+					}
 				}
 				$text .= '<a class="help" target="_blank" rel="noopener" href="';
-				if ($mode == 'wiki') $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
-				else $text .= sprintf($helpbaseurl, $helppage);
+				if ($mode == 'wiki') {
+					$text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
+				} else {
+					$text .= sprintf($helpbaseurl, $helppage);
+				}
 				$text .= '">';
 				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle'.($helppresent ? ' '.$helppresent : '').'"></span>';
-				if ($helppresent) $text .= '<span class="fa fa-circle helppresentcircle"></span>';
+				if ($helppresent) {
+					$text .= '<span class="fa fa-circle helppresentcircle"></span>';
+				}
 				$text .= '</a>';
 				$toprightmenu .= $form->textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
@@ -1831,7 +1916,9 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		print "<!-- End top horizontal menu -->\n\n";
 	}
 
-	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '<!-- Begin div id-container --><div id="id-container" class="id-container">';
+	if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+		print '<!-- Begin div id-container --><div id="id-container" class="id-container">';
+	}
 }
 
 
@@ -1849,14 +1936,17 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	global $menumanager;
 
 	$userImage = $userDropDownImage = '';
-	if (!empty($user->photo))
-	{
+	if (!empty($user->photo)) {
 		$userImage          = Form::showphoto('userphoto', $user, 0, 0, 0, 'photouserphoto userphoto', 'small', 0, 1);
 		$userDropDownImage  = Form::showphoto('userphoto', $user, 0, 0, 0, 'dropdown-user-image', 'small', 0, 1);
 	} else {
 		$nophoto = '/public/theme/common/user_anonymous.png';
-		if ($user->gender == 'man') $nophoto = '/public/theme/common/user_man.png';
-		if ($user->gender == 'woman') $nophoto = '/public/theme/common/user_woman.png';
+		if ($user->gender == 'man') {
+			$nophoto = '/public/theme/common/user_man.png';
+		}
+		if ($user->gender == 'woman') {
+			$nophoto = '/public/theme/common/user_woman.png';
+		}
 
 		$userImage = '<img class="photo photouserphoto userphoto" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
 		$userDropDownImage = '<img class="photo dropdown-user-image" alt="No photo" src="'.DOL_URL_ROOT.$nophoto.'">';
@@ -1870,8 +1960,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	if (!empty($user->admin)) {
 		$dropdownBody .= '<br><b>'.$langs->trans("Administrator").'</b>: '.yn($user->admin);
 	}
-	if (!empty($user->socid))	// Add thirdparty for external users
-	{
+	if (!empty($user->socid)) {	// Add thirdparty for external users
 		$thirdpartystatic = new Societe($db);
 		$thirdpartystatic->fetch($user->socid);
 		$companylink = ' '.$thirdpartystatic->getNomUrl(2); // picto only of company
@@ -1884,7 +1973,9 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 
 	$dropdownBody .= '<br><u>'.$langs->trans("Session").'</u>';
 	$dropdownBody .= '<br><b>'.$langs->trans("IPAddress").'</b>: '.dol_escape_htmltag($_SERVER["REMOTE_ADDR"]);
-	if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) $dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
+	if (!empty($conf->global->MAIN_MODULE_MULTICOMPANY)) {
+		$dropdownBody .= '<br><b>'.$langs->trans("ConnectedOnMultiCompany").':</b> '.$conf->entity.' (user entity '.$user->entity.')';
+	}
 	$dropdownBody .= '<br><b>'.$langs->trans("AuthenticationMode").':</b> '.$_SESSION["dol_authmode"].(empty($dolibarr_main_demo) ? '' : ' (demo)');
 	$dropdownBody .= '<br><b>'.$langs->trans("ConnectedSince").':</b> '.dol_print_date($user->datelastlogin, "dayhour", 'tzuser');
 	$dropdownBody .= '<br><b>'.$langs->trans("PreviousConnexion").':</b> '.dol_print_date($user->datepreviouslogin, "dayhour", 'tzuser');
@@ -1903,15 +1994,18 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	$dropdownBody .= '<br><b>'.$langs->trans("Browser").':</b> '.$conf->browser->name.($conf->browser->version ? ' '.$conf->browser->version : '').' ('.dol_escape_htmltag($_SERVER['HTTP_USER_AGENT']).')';
 	$dropdownBody .= '<br><b>'.$langs->trans("Layout").':</b> '.$conf->browser->layout;
 	$dropdownBody .= '<br><b>'.$langs->trans("Screen").':</b> '.$_SESSION['dol_screenwidth'].' x '.$_SESSION['dol_screenheight'];
-	if ($conf->browser->layout == 'phone') $dropdownBody .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
-	if (!empty($_SESSION["disablemodules"])) $dropdownBody .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
+	if ($conf->browser->layout == 'phone') {
+		$dropdownBody .= '<br><b>'.$langs->trans("Phone").':</b> '.$langs->trans("Yes");
+	}
+	if (!empty($_SESSION["disablemodules"])) {
+		$dropdownBody .= '<br><b>'.$langs->trans("DisabledModules").':</b> <br>'.join(', ', explode(',', $_SESSION["disablemodules"]));
+	}
 	$dropdownBody .= '</div>';
 
 	// Execute hook
 	$parameters = array('user'=>$user, 'langs' => $langs);
 	$result = $hookmanager->executeHooks('printTopRightMenuLoginDropdownBody', $parameters); // Note that $action and $object may have been modified by some hooks
-	if (is_numeric($result))
-	{
+	if (is_numeric($result)) {
 		if ($result == 0) {
 			$dropdownBody .= $hookmanager->resPrint; // add
 		} else {
@@ -1934,14 +2028,18 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 
 	// Define version to show
 	$appli = constant('DOL_APPLICATION_TITLE');
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-	{
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 		$appli = $conf->global->MAIN_APPLICATION_TITLE;
-		if (preg_match('/\d\.\d/', $appli))
-		{
-			if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-		} else $appli .= " ".DOL_VERSION;
-	} else $appli .= " ".DOL_VERSION;
+		if (preg_match('/\d\.\d/', $appli)) {
+			if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+				$appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+			}
+		} else {
+			$appli .= " ".DOL_VERSION;
+		}
+	} else {
+		$appli .= " ".DOL_VERSION;
+	}
 
 	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		$btnUser = '<!-- div for user link -->
@@ -1990,8 +2088,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 		</div>';
 	}
 
-	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))    // This may be set by some pages that use different jquery version to avoid errors
-	{
+	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax)) {    // This may be set by some pages that use different jquery version to avoid errors
 		$btnUser .= '
         <!-- Code to show/hide the user drop-down -->
         <script>
@@ -2258,10 +2355,11 @@ function top_menu_bookmark()
 	$html = '';
 
 	// Define $bookmarks
-	if (empty($conf->bookmark->enabled) || empty($user->rights->bookmark->lire)) return $html;
+	if (empty($conf->bookmark->enabled) || empty($user->rights->bookmark->lire)) {
+		return $html;
+	}
 
-	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax))	    // This may be set by some pages that use different jquery version to avoid errors
-	{
+	if (!defined('JS_JQUERY_DISABLE_DROPDOWN') && !empty($conf->use_javascript_ajax)) {	    // This may be set by some pages that use different jquery version to avoid errors
 		include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
 		$langs->load("bookmarks");
 
@@ -2338,8 +2436,7 @@ function top_menu_search()
 	$defaultAction = '';
 	$buttonList = '<div class="dropdown-global-search-button-list" >';
 	// Menu with all searchable items
-	foreach ($arrayresult as $keyItem => $item)
-	{
+	foreach ($arrayresult as $keyItem => $item) {
 		if (empty($defaultAction)) {
 			$defaultAction = $item['url'];
 		}
@@ -2464,20 +2561,25 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 	$searchform = '';
 	$bookmarks = '';
 
-	if (!empty($menu_array_before)) dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	if (!empty($menu_array_before)) {
+		dol_syslog("Deprecated parameter menu_array_before was used when calling main::left_menu function. Menu entries of module should now be defined into module descriptor and not provided when calling left_menu.", LOG_WARNING);
+	}
 
-	if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU')))
-	{
+	if (empty($conf->dol_hide_leftmenu) && (!defined('NOREQUIREMENU') || !constant('NOREQUIREMENU'))) {
 		// Instantiate hooks for external modules
 		$hookmanager->initHooks(array('searchform', 'leftblock'));
 
 		print "\n".'<!-- Begin side-nav id-left -->'."\n".'<div class="side-nav"><div id="id-left">'."\n";
 
-		if ($conf->browser->layout == 'phone') $conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+		if ($conf->browser->layout == 'phone') {
+			$conf->global->MAIN_USE_OLD_SEARCH_FORM = 1; // Select into select2 is awfull on smartphone. TODO Is this still true with select2 v4 ?
+		}
 
 		print "\n";
 
-		if (!is_object($form)) $form = new Form($db);
+		if (!is_object($form)) {
+			$form = new Form($db);
+		}
 		$selected = -1;
 		if (empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
 			$usedbyinclude = 1;
@@ -2499,7 +2601,9 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			$reshook = $hookmanager->executeHooks('printSearchForm', $parameters); // Note that $action and $object may have been modified by some hooks
 			if (empty($reshook)) {
 				$searchform .= $hookmanager->resPrint;
-			} else $searchform = $hookmanager->resPrint;
+			} else {
+				$searchform = $hookmanager->resPrint;
+			}
 
 			// Force special value for $searchform
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) || empty($conf->use_javascript_ajax)) {
@@ -2534,37 +2638,55 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 		print '<div id="blockvmenuhelp" class="blockvmenuhelp">'."\n";
 
 		// Version
-		if (!empty($conf->global->MAIN_SHOW_VERSION))    // Version is already on help picto and on login page.
-		{
+		if (!empty($conf->global->MAIN_SHOW_VERSION)) {    // Version is already on help picto and on login page.
 			$doliurl = 'https://www.dolibarr.org';
 			//local communities
-			if (preg_match('/fr/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.fr';
-			if (preg_match('/es/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.es';
-			if (preg_match('/de/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.de';
-			if (preg_match('/it/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.it';
-			if (preg_match('/gr/i', $langs->defaultlang)) $doliurl = 'https://www.dolibarr.gr';
+			if (preg_match('/fr/i', $langs->defaultlang)) {
+				$doliurl = 'https://www.dolibarr.fr';
+			}
+			if (preg_match('/es/i', $langs->defaultlang)) {
+				$doliurl = 'https://www.dolibarr.es';
+			}
+			if (preg_match('/de/i', $langs->defaultlang)) {
+				$doliurl = 'https://www.dolibarr.de';
+			}
+			if (preg_match('/it/i', $langs->defaultlang)) {
+				$doliurl = 'https://www.dolibarr.it';
+			}
+			if (preg_match('/gr/i', $langs->defaultlang)) {
+				$doliurl = 'https://www.dolibarr.gr';
+			}
 
 			$appli = constant('DOL_APPLICATION_TITLE');
-			if (!empty($conf->global->MAIN_APPLICATION_TITLE))
-			{
+			if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 				$appli = $conf->global->MAIN_APPLICATION_TITLE; $doliurl = '';
-				if (preg_match('/\d\.\d/', $appli))
-				{
-					if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) $appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
-				} else $appli .= " ".DOL_VERSION;
-			} else $appli .= " ".DOL_VERSION;
+				if (preg_match('/\d\.\d/', $appli)) {
+					if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+						$appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+					}
+				} else {
+					$appli .= " ".DOL_VERSION;
+				}
+			} else {
+				$appli .= " ".DOL_VERSION;
+			}
 			print '<div id="blockvmenuhelpapp" class="blockvmenuhelp">';
-			if ($doliurl) print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
-			else print '<span class="help">';
+			if ($doliurl) {
+				print '<a class="help" target="_blank" rel="noopener" href="'.$doliurl.'">';
+			} else {
+				print '<span class="help">';
+			}
 			print $appli;
-			if ($doliurl) print '</a>';
-			else print '</span>';
+			if ($doliurl) {
+				print '</a>';
+			} else {
+				print '</span>';
+			}
 			print '</div>'."\n";
 		}
 
 		// Link to bugtrack
-		if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
-		{
+		if (!empty($conf->global->MAIN_BUGTRACK_ENABLELINK)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 			$bugbaseurl = 'https://github.com/Dolibarr/dolibarr/issues/new?labels=Bug';
@@ -2603,10 +2725,11 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			// Execute hook printBugtrackInfo
 			$parameters = array('bugbaseurl'=>$bugbaseurl);
 			$reshook = $hookmanager->executeHooks('printBugtrackInfo', $parameters); // Note that $action and $object may have been modified by some hooks
-			if (empty($reshook))
-			{
+			if (empty($reshook)) {
 				$bugbaseurl .= $hookmanager->resPrint;
-			} else $bugbaseurl = $hookmanager->resPrint;
+			} else {
+				$bugbaseurl = $hookmanager->resPrint;
+			}
 
 			$bugbaseurl .= urlencode("\n");
 			$bugbaseurl .= urlencode("## Report\n");
@@ -2634,7 +2757,9 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 	print "\n";
 	print '<!-- Begin right area -->'."\n";
 
-	if (empty($leftmenuwithoutmainarea)) main_area($title);
+	if (empty($leftmenuwithoutmainarea)) {
+		main_area($title);
+	}
 }
 
 
@@ -2648,23 +2773,25 @@ function main_area($title = '')
 {
 	global $conf, $langs;
 
-	if (empty($conf->dol_hide_leftmenu)) print '<div id="id-right">';
+	if (empty($conf->dol_hide_leftmenu)) {
+		print '<div id="id-right">';
+	}
 
 	print "\n";
 
 	print '<!-- Begin div class="fiche" -->'."\n".'<div class="fiche">'."\n";
 
-	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode');
+	if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
+		print info_admin($langs->trans("WarningYouAreInMaintenanceMode", $conf->global->MAIN_ONLY_LOGIN_ALLOWED), 0, 0, 1, 'warning maintenancemode');
+	}
 
 	// Permit to add user company information on each printed document by setting SHOW_SOCINFO_ON_PRINT
-	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09')))
-	{
+	if (!empty($conf->global->SHOW_SOCINFO_ON_PRINT) && GETPOST('optioncss', 'aZ09') == 'print' && empty(GETPOST('disable_show_socinfo_on_print', 'az09'))) {
 		global $hookmanager;
 		$hookmanager->initHooks(array('main'));
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('showSocinfoOnPrint', $parameters);
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			print '<!-- Begin show mysoc info header -->'."\n";
 			print '<div id="mysoc-info-header">'."\n";
 			print '<table class="centpercent div-table-responsive">'."\n";
@@ -2676,9 +2803,15 @@ function main_area($title = '')
 			print '</td><td  rowspan="0" class="width50p"></td></tr>'."\n";
 			print '<tr><td class="titre bold">'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM).'</td></tr>'."\n";
 			print '<tr><td>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'<br>'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_ZIP).' '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TOWN).'</td></tr>'."\n";
-			if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';
-			if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';
-			if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_TEL)) {
+				print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Phone").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'</td></tr>';
+			}
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) {
+				print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Email").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'</td></tr>';
+			}
+			if (!empty($conf->global->MAIN_INFO_SOCIETE_WEB)) {
+				print '<tr><td style="padding-left: 1em" class="small">'.$langs->trans("Web").' : '.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'</td></tr>';
+			}
 			print '</tbody>';
 			print '</table>'."\n";
 			print '</div>'."\n";
@@ -2701,8 +2834,7 @@ function getHelpParamFor($helppagename, $langs)
 	$helppage = '';
 	$mode = '';
 
-	if (preg_match('/^http/i', $helppagename))
-	{
+	if (preg_match('/^http/i', $helppagename)) {
 		// If complete URL
 		$helpbaseurl = '%s';
 		$helppage = $helppagename;
@@ -2710,20 +2842,23 @@ function getHelpParamFor($helppagename, $langs)
 	} else {
 		// If WIKI URL
 		$reg = array();
-		if (preg_match('/^es/i', $langs->defaultlang))
-		{
+		if (preg_match('/^es/i', $langs->defaultlang)) {
 			$helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
+			if (preg_match('/ES:([^|]+)/i', $helppagename, $reg)) {
+				$helppage = $reg[1];
+			}
 		}
-		if (preg_match('/^fr/i', $langs->defaultlang))
-		{
+		if (preg_match('/^fr/i', $langs->defaultlang)) {
 			$helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
+			if (preg_match('/FR:([^|]+)/i', $helppagename, $reg)) {
+				$helppage = $reg[1];
+			}
 		}
-		if (empty($helppage))	// If help page not already found
-		{
+		if (empty($helppage)) {	// If help page not already found
 			$helpbaseurl = 'http://wiki.dolibarr.org/index.php/%s';
-			if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) $helppage = $reg[1];
+			if (preg_match('/EN:([^|]+)/i', $helppagename, $reg)) {
+				$helppage = $reg[1];
+			}
 		}
 		$mode = 'wiki';
 	}
@@ -2756,7 +2891,9 @@ function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinpu
 	$ret .= '<input type="hidden" name="token" value="'.newToken().'">';
 	$ret .= '<input type="hidden" name="mode" value="search">';
 	$ret .= '<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
-	if ($showtitlebefore) $ret .= '<div class="tagtd left">'.$title.'</div> ';
+	if ($showtitlebefore) {
+		$ret .= '<div class="tagtd left">'.$title.'</div> ';
+	}
 	$ret .= '<div class="tagtd">';
 	$ret .= img_picto('', $img, '', false, 0, 0, '', 'paddingright width20');
 	$ret .= '<input type="text" class="flat '.$htmlmorecss.'"';
@@ -2774,8 +2911,7 @@ function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinpu
 }
 
 
-if (!function_exists("llxFooter"))
-{
+if (!function_exists("llxFooter")) {
 	/**
 	 * Show HTML footer
 	 * Close div /DIV class=fiche + /DIV id-right + /DIV id-container + /BODY + /HTML.
@@ -2800,16 +2936,17 @@ if (!function_exists("llxFooter"))
 
 		// Code for search criteria persistence.
 		// $user->lastsearch_values was set by the GETPOST when form field search_xxx exists
-		if (is_object($user) && !empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp))
-		{
+		if (is_object($user) && !empty($user->lastsearch_values_tmp) && is_array($user->lastsearch_values_tmp)) {
 			// Clean and save data
-			foreach ($user->lastsearch_values_tmp as $key => $val)
-			{
+			foreach ($user->lastsearch_values_tmp as $key => $val) {
 				unset($_SESSION['lastsearch_values_tmp_'.$key]); // Clean array to rebuild it just after
-				if (count($val) && empty($_POST['button_removefilter']))	// If there is search criteria to save and we did not click on 'Clear filter' button
-				{
-					if (empty($val['sortfield'])) unset($val['sortfield']);
-					if (empty($val['sortorder'])) unset($val['sortorder']);
+				if (count($val) && empty($_POST['button_removefilter'])) {	// If there is search criteria to save and we did not click on 'Clear filter' button
+					if (empty($val['sortfield'])) {
+						unset($val['sortfield']);
+					}
+					if (empty($val['sortorder'])) {
+						unset($val['sortorder']);
+					}
 					dol_syslog('Save lastsearch_values_tmp_'.$key.'='.json_encode($val, 0)." (systematic recording of last search criterias)");
 					$_SESSION['lastsearch_values_tmp_'.$key] = json_encode($val);
 					unset($_SESSION['lastsearch_values_'.$key]);
@@ -2820,18 +2957,25 @@ if (!function_exists("llxFooter"))
 
 		$relativepathstring = $_SERVER["PHP_SELF"];
 		// Clean $relativepathstring
-		if (constant('DOL_URL_ROOT')) $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+		if (constant('DOL_URL_ROOT')) {
+			$relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);
+		}
 		$relativepathstring = preg_replace('/^\//', '', $relativepathstring);
 		$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
-		if (preg_match('/list\.php$/', $relativepathstring))
-		{
+		if (preg_match('/list\.php$/', $relativepathstring)) {
 			unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
 
-			if (!empty($contextpage))                     $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
-			if (!empty($page) && $page > 0)               $_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
-			if (!empty($limit) && $limit != $conf->liste_limit) $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
+			if (!empty($contextpage)) {
+				$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
+			}
+			if (!empty($page) && $page > 0) {
+				$_SESSION['lastsearch_page_tmp_'.$relativepathstring] = $page;
+			}
+			if (!empty($limit) && $limit != $conf->liste_limit) {
+				$_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
+			}
 
 			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_page_'.$relativepathstring]);
@@ -2839,11 +2983,9 @@ if (!function_exists("llxFooter"))
 		}
 
 		// Core error message
-		if (!empty($conf->global->MAIN_CORE_ERROR))
-		{
+		if (!empty($conf->global->MAIN_CORE_ERROR)) {
 			// Ajax version
-			if ($conf->use_javascript_ajax)
-			{
+			if ($conf->use_javascript_ajax) {
 				$title = img_warning().' '.$langs->trans('CoreErrorTitle');
 				print ajax_dialog($title, $langs->trans('CoreErrorMessage'));
 			} else {
@@ -2859,55 +3001,60 @@ if (!function_exists("llxFooter"))
 
 		print '</div> <!-- End div class="fiche" -->'."\n"; // End div fiche
 
-		if (empty($conf->dol_hide_leftmenu)) print '</div> <!-- End div id-right -->'."\n"; // End div id-right
+		if (empty($conf->dol_hide_leftmenu)) {
+			print '</div> <!-- End div id-right -->'."\n"; // End div id-right
+		}
 
-		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) print '</div> <!-- End div id-container -->'."\n"; // End div container
+		if (empty($conf->dol_hide_leftmenu) && empty($conf->dol_use_jmobile)) {
+			print '</div> <!-- End div id-container -->'."\n"; // End div container
+		}
 
 		print "\n";
-		if ($comment) print '<!-- '.$comment.' -->'."\n";
+		if ($comment) {
+			print '<!-- '.$comment.' -->'."\n";
+		}
 
 		printCommonFooter($zone);
 
-		if (!empty($delayedhtmlcontent)) print $delayedhtmlcontent;
+		if (!empty($delayedhtmlcontent)) {
+			print $delayedhtmlcontent;
+		}
 
-		if (!empty($conf->use_javascript_ajax))
-		{
+		if (!empty($conf->use_javascript_ajax)) {
 			print "\n".'<!-- Includes JS Footer of Dolibarr -->'."\n";
 			print '<script src="'.DOL_URL_ROOT.'/core/js/lib_foot.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
 		}
 
 		// Wrapper to add log when clicking on download or preview
-		if (!empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0)
-		{
-			if (in_array($object->element, array('facture')))       // Restrict for the moment to element 'facture'
-			{
+		if (!empty($conf->blockedlog->enabled) && is_object($object) && $object->id > 0 && $object->statut > 0) {
+			if (in_array($object->element, array('facture'))) {       // Restrict for the moment to element 'facture'
 				print "\n<!-- JS CODE TO ENABLE log when making a download or a preview of a document -->\n";
 				?>
-    			<script>
-    			jQuery(document).ready(function () {
-    				$('a.documentpreview').click(function() {
-    					$.post('<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>'
-    							, {
-    								id:<?php echo $object->id; ?>
-    								, element:'<?php echo $object->element ?>'
-    								, action:'DOC_PREVIEW'
-    							}
-    					);
-    				});
-    				$('a.documentdownload').click(function() {
-    					$.post('<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>'
-    							, {
-    								id:<?php echo $object->id; ?>
-    								, element:'<?php echo $object->element ?>'
-    								, action:'DOC_DOWNLOAD'
-    							}
-    					);
-    				});
-    			});
-    			</script>
+				<script>
+				jQuery(document).ready(function () {
+					$('a.documentpreview').click(function() {
+						$.post('<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>'
+								, {
+									id:<?php echo $object->id; ?>
+									, element:'<?php echo $object->element ?>'
+									, action:'DOC_PREVIEW'
+								}
+						);
+					});
+					$('a.documentdownload').click(function() {
+						$.post('<?php echo DOL_URL_ROOT."/blockedlog/ajax/block-add.php" ?>'
+								, {
+									id:<?php echo $object->id; ?>
+									, element:'<?php echo $object->element ?>'
+									, action:'DOC_DOWNLOAD'
+								}
+						);
+					});
+				});
+				</script>
 				<?php
 			}
-	   	}
+		}
 
 		// A div for the address popup
 		print "\n<!-- A div to allow dialog popup -->\n";
@@ -2916,19 +3063,16 @@ if (!function_exists("llxFooter"))
 		// Add code for the asynchronous anonymous first ping (for telemetry)
 		// You can use &forceping=1 in parameters to force the ping if the ping was already sent.
 		$forceping = GETPOST('forceping', 'alpha');
-		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || $forceping)
-		{
+		if (($_SERVER["PHP_SELF"] == DOL_URL_ROOT.'/index.php') || $forceping) {
 			//print '<!-- instance_unique_id='.$conf->file->instance_unique_id.' MAIN_FIRST_PING_OK_ID='.$conf->global->MAIN_FIRST_PING_OK_ID.' -->';
 			$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);
 			if (empty($conf->global->MAIN_FIRST_PING_OK_DATE)
 				|| (!empty($conf->file->instance_unique_id) && ($hash_unique_id != $conf->global->MAIN_FIRST_PING_OK_ID) && ($conf->global->MAIN_FIRST_PING_OK_ID != 'disabled'))
-			|| $forceping)
-			{
+			|| $forceping) {
 				// No ping done if we are into an alpha version
 				if (strpos('alpha', DOL_VERSION) > 0 && !$forceping) {
 					print "\n<!-- NO JS CODE TO ENABLE the anonymous Ping. It is an alpha version -->\n";
-				} elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping)	// Cookie is set when we uncheck the checkbox in the installation wizard.
-				{
+				} elseif (empty($_COOKIE['DOLINSTALLNOPING_'.$hash_unique_id]) || $forceping) {	// Cookie is set when we uncheck the checkbox in the installation wizard.
 					// MAIN_LAST_PING_KO_DATE
 					// Disable ping if MAIN_LAST_PING_KO_DATE is set and is recent
 					if (!empty($conf->global->MAIN_LAST_PING_KO_DATE) && substr($conf->global->MAIN_LAST_PING_KO_DATE, 0, 6) == dol_print_date(dol_now(), '%Y%m') && !$forceping) {
@@ -2941,51 +3085,55 @@ if (!function_exists("llxFooter"))
 						$url_for_ping = (empty($conf->global->MAIN_URL_FOR_PING) ? "https://ping.dolibarr.org/" : $conf->global->MAIN_URL_FOR_PING);
 						// Try to guess the distrib used
 						$distrib = 'standard';
-						if ($_SERVER["SERVER_ADMIN"] == 'doliwamp@localhost') $distrib = 'doliwamp';
-						if (!empty($dolibarr_distrib)) $distrib = $dolibarr_distrib;
+						if ($_SERVER["SERVER_ADMIN"] == 'doliwamp@localhost') {
+							$distrib = 'doliwamp';
+						}
+						if (!empty($dolibarr_distrib)) {
+							$distrib = $dolibarr_distrib;
+						}
 						?>
-			    			<script>
-			    			jQuery(document).ready(function (tmp) {
-			    				$.ajax({
-			    					  method: "POST",
-			    					  url: "<?php echo $url_for_ping ?>",
-			    					  timeout: 500,     // timeout milliseconds
-			    					  cache: false,
-			    					  data: {
-				    					  hash_algo: 'md5',
-				    					  hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>',
-				    					  action: 'dolibarrping',
-				    					  version: '<?php echo (float) DOL_VERSION; ?>',
-				    					  entity: '<?php echo (int) $conf->entity; ?>',
-				    					  dbtype: '<?php echo dol_escape_js($db->type); ?>',
-				    					  country_code: '<?php echo $mysoc->country_code ? dol_escape_js($mysoc->country_code) : 'unknown'; ?>',
-				    					  php_version: '<?php echo dol_escape_js(phpversion()); ?>',
-				    					  os_version: '<?php echo dol_escape_js(version_os('smr')); ?>',
-				    					  distrib: '<?php echo $distrib ? dol_escape_js($distrib) : 'unknown'; ?>'
-				    				  },
-			    					  success: function (data, status, xhr) {   // success callback function (data contains body of response)
-			      					    	console.log("Ping ok");
-			        	    				$.ajax({
-			      	    					  method: 'GET',
-			      	    					  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
-			      	    					  timeout: 500,     // timeout milliseconds
-			      	    					  cache: false,
-			      	        				  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok' },	// for update
-			    					  		});
-			    					  },
-			    					  error: function (data,status,xhr) {   // error callback function
-			        					    console.log("Ping ko: " + data);
-			        	    				$.ajax({
-			        	    					  method: 'GET',
-			        	    					  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
-			        	    					  timeout: 500,     // timeout milliseconds
-			        	    					  cache: false,
-			        	        				  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko' },
-			      					  		});
-			    					  }
-			    				});
-			    			});
-			    			</script>
+							<script>
+							jQuery(document).ready(function (tmp) {
+								$.ajax({
+									  method: "POST",
+									  url: "<?php echo $url_for_ping ?>",
+									  timeout: 500,     // timeout milliseconds
+									  cache: false,
+									  data: {
+										  hash_algo: 'md5',
+										  hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>',
+										  action: 'dolibarrping',
+										  version: '<?php echo (float) DOL_VERSION; ?>',
+										  entity: '<?php echo (int) $conf->entity; ?>',
+										  dbtype: '<?php echo dol_escape_js($db->type); ?>',
+										  country_code: '<?php echo $mysoc->country_code ? dol_escape_js($mysoc->country_code) : 'unknown'; ?>',
+										  php_version: '<?php echo dol_escape_js(phpversion()); ?>',
+										  os_version: '<?php echo dol_escape_js(version_os('smr')); ?>',
+										  distrib: '<?php echo $distrib ? dol_escape_js($distrib) : 'unknown'; ?>'
+									  },
+									  success: function (data, status, xhr) {   // success callback function (data contains body of response)
+											  console.log("Ping ok");
+											$.ajax({
+												method: 'GET',
+												url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
+												timeout: 500,     // timeout milliseconds
+												cache: false,
+												data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingok' },	// for update
+											  });
+									  },
+									  error: function (data,status,xhr) {   // error callback function
+											console.log("Ping ko: " + data);
+											$.ajax({
+												  method: 'GET',
+												  url: '<?php echo DOL_URL_ROOT.'/core/ajax/pingresult.php'; ?>',
+												  timeout: 500,     // timeout milliseconds
+												  cache: false,
+												  data: { hash_algo: 'md5', hash_unique_id: '<?php echo dol_escape_js($hash_unique_id); ?>', action: 'firstpingko' },
+												});
+									  }
+								});
+							});
+							</script>
 						<?php
 					}
 				} else {
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 9efff08306f..c63ace353b3 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -45,18 +45,20 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/conf.class.php';
 $conf = new Conf();
 
 // Set properties specific to database
-$conf->db->host							= $dolibarr_main_db_host;
-$conf->db->port							= $dolibarr_main_db_port;
-$conf->db->name							= $dolibarr_main_db_name;
-$conf->db->user							= $dolibarr_main_db_user;
-$conf->db->pass							= empty($dolibarr_main_db_pass) ? '' : $dolibarr_main_db_pass;
-$conf->db->type							= $dolibarr_main_db_type;
+$conf->db->host = $dolibarr_main_db_host;
+$conf->db->port = $dolibarr_main_db_port;
+$conf->db->name = $dolibarr_main_db_name;
+$conf->db->user = $dolibarr_main_db_user;
+$conf->db->pass = empty($dolibarr_main_db_pass) ? '' : $dolibarr_main_db_pass;
+$conf->db->type = $dolibarr_main_db_type;
 $conf->db->prefix = $dolibarr_main_db_prefix;
 $conf->db->character_set = $dolibarr_main_db_character_set;
 $conf->db->dolibarr_main_db_collation = $dolibarr_main_db_collation;
 $conf->db->dolibarr_main_db_encryption = $dolibarr_main_db_encryption;
 $conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
-if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type = constant('TEST_DB_FORCE_TYPE'); // Force db type (for test purpose, by PHP unit for example)
+if (defined('TEST_DB_FORCE_TYPE')) {
+	$conf->db->type = constant('TEST_DB_FORCE_TYPE'); // Force db type (for test purpose, by PHP unit for example)
+}
 
 // Set properties specific to conf file
 $conf->file->main_limit_users = $dolibarr_main_limit_users;
@@ -68,18 +70,17 @@ $conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_
 $conf->file->instance_unique_id = empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id; // Unique id of instance
 $conf->file->dol_document_root = array('main' => (string) DOL_DOCUMENT_ROOT); // Define array of document root directories ('/home/htdocs')
 $conf->file->dol_url_root = array('main' => (string) DOL_URL_ROOT); // Define array of url root path ('' or '/dolibarr')
-if (!empty($dolibarr_main_document_root_alt))
-{
+if (!empty($dolibarr_main_document_root_alt)) {
 	// dolibarr_main_document_root_alt can contains several directories
 	$values = preg_split('/[;,]/', $dolibarr_main_document_root_alt);
 	$i = 0;
-	foreach ($values as $value) $conf->file->dol_document_root['alt'.($i++)] = (string) $value;
+	foreach ($values as $value) {
+		$conf->file->dol_document_root['alt'.($i++)] = (string) $value;
+	}
 	$values = preg_split('/[;,]/', $dolibarr_main_url_root_alt);
 	$i = 0;
-	foreach ($values as $value)
-	{
-		if (preg_match('/^http(s)?:/', $value))
-		{
+	foreach ($values as $value) {
+		if (preg_match('/^http(s)?:/', $value)) {
 			// Show error message
 			$correct_value = str_replace($dolibarr_main_url_root, '', $value);
 			print '<b>Error:</b><br>'."\n";
@@ -99,36 +100,39 @@ if (!empty($dolibarr_main_document_root_alt))
 }
 
 // Chargement des includes principaux de librairies communes
-if (!defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; // Need 500ko memory
-if (!defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
-if (!defined('NOREQUIRESOC'))  require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+if (!defined('NOREQUIREUSER')) {
+	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php'; // Need 500ko memory
+}
+if (!defined('NOREQUIRETRAN')) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
+}
+if (!defined('NOREQUIRESOC')) {
+	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+}
 
 
 /*
  * Creation objet $langs (must be before all other code)
  */
-if (!defined('NOREQUIRETRAN'))
-{
+if (!defined('NOREQUIRETRAN')) {
 	$langs = new Translate('', $conf); // Must be after reading conf
 }
 
 /*
  * Object $db
  */
-if (!defined('NOREQUIREDB'))
-{
+if (!defined('NOREQUIREDB')) {
 	$db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
 
-	if ($db->error)
-	{
+	if ($db->error) {
 		// If we were into a website context
-		if (!defined('USEDOLIBARREDITOR') && !defined('USEDOLIBARRSERVER') && !empty($_SERVER['SCRIPT_FILENAME']) && (strpos($_SERVER['SCRIPT_FILENAME'], DOL_DATA_ROOT.'/website') === 0))
-		{
+		if (!defined('USEDOLIBARREDITOR') && !defined('USEDOLIBARRSERVER') && !empty($_SERVER['SCRIPT_FILENAME']) && (strpos($_SERVER['SCRIPT_FILENAME'], DOL_DATA_ROOT.'/website') === 0)) {
 			$sapi_type = php_sapi_name();
-			if (substr($sapi_type, 0, 3) != 'cgi') http_response_code(503); // To tel search engine this is a temporary error
+			if (substr($sapi_type, 0, 3) != 'cgi') {
+				http_response_code(503); // To tel search engine this is a temporary error
+			}
 			print '<div class="center" style="text-align: center; margin: 100px;">';
-			if (is_object($langs))
-			{
+			if (is_object($langs)) {
 				$langs->setDefaultLang('auto');
 				$langs->load("website");
 				print $langs->trans("SorryWebsiteIsCurrentlyOffLine");
@@ -175,10 +179,11 @@ if (session_id() && !empty($_SESSION["dol_entity"])) {
 }
 
 // Sanitize entity
-if (!is_numeric($conf->entity)) $conf->entity = 1;
+if (!is_numeric($conf->entity)) {
+	$conf->entity = 1;
+}
 
-if (!defined('NOREQUIREDB'))
-{
+if (!defined('NOREQUIREDB')) {
 	//print "Will work with data into entity instance number '".$conf->entity."'";
 
 	// Here we read database (llx_const table) and define $conf->global->XXX var.
@@ -197,23 +202,25 @@ if (!empty($conf->file->mailing_limit_sendbycli)) {
 }
 
 // Create object $mysoc (A thirdparty object that contains properties of companies managed by Dolibarr.
-if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC'))
-{
+if (!defined('NOREQUIREDB') && !defined('NOREQUIRESOC')) {
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
 	$mysoc = new Societe($db);
 	$mysoc->setMysoc($conf);
 
 	// For some countries, we need to invert our address with customer address
-	if ($mysoc->country_code == 'DE' && !isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT = 1;
+	if ($mysoc->country_code == 'DE' && !isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+		$conf->global->MAIN_INVERT_SENDER_RECIPIENT = 1;
+	}
 }
 
 
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
-if (!defined('NOREQUIRETRAN'))
-{
+if (!defined('NOREQUIRETRAN')) {
 	$langcode = (GETPOST('lang', 'aZ09') ? GETPOST('lang', 'aZ09', 1) : (empty($conf->global->MAIN_LANG_DEFAULT) ? 'auto' : $conf->global->MAIN_LANG_DEFAULT));
-	if (defined('MAIN_LANG_DEFAULT')) $langcode = constant('MAIN_LANG_DEFAULT');
+	if (defined('MAIN_LANG_DEFAULT')) {
+		$langcode = constant('MAIN_LANG_DEFAULT');
+	}
 	$langs->setDefaultLang($langcode);
 }
 
@@ -223,5 +230,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
 
 
-if (!defined('MAIN_LABEL_MENTION_NPR')) define('MAIN_LABEL_MENTION_NPR', 'NPR');
+if (!defined('MAIN_LABEL_MENTION_NPR')) {
+	define('MAIN_LABEL_MENTION_NPR', 'NPR');
+}
 //if (! defined('PCLZIP_TEMPORARY_DIR')) define('PCLZIP_TEMPORARY_DIR', $conf->user->dir_temp);
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 55c29aa1381..abf99c1b921 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1813,7 +1813,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Type
 			if (!empty($conf->product->enabled) && !empty($conf->service->enabled))
 			{
-				// TODO change for compatibility with edit in place
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="titlefield">';
 				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 9a71faa5665..a8adff1c1aa 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -2464,7 +2464,7 @@ class Product extends CommonObject
 		$this->stats_bom['qty_toconsume'] = 0;
 
 		$sql = "SELECT COUNT(DISTINCT b.rowid) as nb_toproduce,";
-		$sql .= " b.qty as qty_toproduce";
+		$sql .= " SUM(b.qty) as qty_toproduce";
 		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
 		$sql .= " WHERE ";
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index 9c9852b22ef..7e19d8f3818 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2014-2016  Charlie BENKE           <charlie@patas-monkey.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2019       Pierre Ardoin           <mapiolca@me.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -200,7 +200,7 @@ if (!empty($conf->categorie->enabled) && !empty($conf->global->CATEGORY_GRAPHSTA
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Categories").'</th></tr>';
-	print '<tr class="oddeven"><td class="center" colspan="2">';
+	print '<tr><td class="center" colspan="2">';
 	$sql = "SELECT c.label, count(*) as nb";
 	$sql .= " FROM ".MAIN_DB_PREFIX."categorie_product as cs";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index f7999860185..ff035dcdb9c 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1113,17 +1113,10 @@ if ($resql)
 		{
 			print '<td class="center">';
 			$s = '';
-			if ($obj->fk_product_type == 0)
-			{
-				//$s .= '<a class="product-type-back" title="'.$langs->trans("Product").'">';
+			if ($obj->fk_product_type == 0) {
 				$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
-				//$s .= dol_substr($langs->trans("Product"), 0, 1);
-				//$s .= '</a>';
 			} else {
-				//$s .= '<span class="service-type-back" title="'.$langs->trans("Service").'">';
 				$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
-				//$s .= dol_substr($langs->trans("Service"), 0, 1);
-				//$s .= '</a>';
 			}
 			print $s;
 			print '</td>';
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index 1582646cd8a..d1254a65b1e 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -244,8 +244,8 @@ if ($id > 0 || !empty($ref))
 		print '<tr class="liste_titre">';
 		print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", "&amp;id=".$product->id, '', $sortfield, $sortorder);
 		print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "b.date_valid", "", "&amp;id=".$product->id, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre("ToConsume", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
-		print_liste_field_titre("QtyToProduce", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("RowMaterial", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("Finished", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
 		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "b.status", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
 		print "</tr>\n";
 
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index 90df912e69d..96650c034f3 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -95,7 +95,8 @@ class Productlot extends CommonObject
 		'datec'         => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
 		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>510, 'foreignkey'=>'llx_user.rowid'),
-		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511)
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>511),
+		'import_key'    => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
 	);
 
 	/**
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 8601ce25ebc..752b84a9ec0 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -36,8 +36,35 @@ $langs->loadLangs(array('stocks', 'other', 'productbatch'));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$action		= GETPOST('action', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new ProductLot($db);
+$extrafields = new ExtraFields($db);
+$hookmanager->initHooks(array('productlotcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+}
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
 $batch  	= GETPOST('batch', 'alpha');
 $productid  = GETPOST('productid', 'int');
 $ref        = GETPOST('ref', 'alpha'); // ref is productid_batch
@@ -51,22 +78,6 @@ $search_import_key = GETPOST('search_import_key', 'int');
 
 if (empty($action) && empty($id) && empty($ref)) $action = 'list';
 
-
-// Protection if external user
-if ($user->socid > 0)
-{
-	//accessforbidden();
-}
-//$result = restrictedArea($user, 'mymodule', $id);
-
-
-$object = new ProductLot($db);
-$extrafields = new ExtraFields($db);
-$formfile = new FormFile($db);
-
-// fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
-
 // Load object
 //include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id || $ref)
@@ -81,6 +92,15 @@ if ($id || $ref)
 	$object->ref = $object->batch; // For document management ( it use $object->ref)
 }
 
+// Protection if external user
+if ($user->socid > 0)
+{
+	//accessforbidden();
+}
+//$result = restrictedArea($user, 'mymodule', $id);
+
+
+
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('productlotcard', 'globalcard'));
 
@@ -93,16 +113,26 @@ $usercanread = $user->rights->produit->lire;
 $usercancreate = $user->rights->produit->creer;
 $usercandelete = $user->rights->produit->supprimer;
 
+$upload_dir = $conf->productbatch->multidir_output[$conf->entity];
+
+$permissiontoadd = $usercancreate;
+
+
 /*
  * Actions
  */
 
 $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)) {
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/product/stock/productlot_list.php', 1);
 
-if (empty($reshook))
-{
 	if ($action == 'seteatby' && $user->rights->stock->creer)
 	{
 		$newvalue = dol_mktime(12, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
@@ -117,6 +147,11 @@ if (empty($reshook))
 		if ($result < 0) dol_print_error($db, $object->error);
 	}
 
+	$triggermodname = 'PRODUCT_LOT_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	/*
 	if ($action == 'update_extras')
 	{
 		$object->oldcopy = dol_clone($object);
@@ -152,8 +187,6 @@ if (empty($reshook))
 
 		$error = 0;
 
-		/* object_prop_getpost_prop */
-
 		$object->entity = GETPOST('entity', 'int');
 		$object->fk_product = GETPOST('fk_product', 'int');
 		$object->batch = GETPOST('batch', 'alpha');
@@ -241,11 +274,15 @@ if (empty($reshook))
 			else setEventMessages($object->error, null, 'errors');
 		}
 	}
-
-	// Actions to build doc
-	$upload_dir = $conf->productbatch->multidir_output[$conf->entity];
-	$permissiontoadd = $usercancreate;
+*/
+	// Action to build doc
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	// Actions to send emails
+	$triggersendname = 'PRODUCT_LOT_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_PRODUCT_LOT_TO';
+	$trackid = 'productlot'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 
@@ -255,69 +292,98 @@ if (empty($reshook))
  * View
  */
 
-llxHeader('', 'ProductLot', '');
-
 $form = new Form($db);
+$formfile = new FormFile($db);
+
+$title = $langs->trans("ProductLot");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
 
 
 // Part to create
-if ($action == 'create')
-{
-	print load_fiche_titre($langs->trans("Batch"));
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("Batch"), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
-	print dol_get_fiche_head();
+	print dol_get_fiche_head(array(), '');
 
-	print '<table class="border centpercent">'."\n";
-	// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input class="flat" type="text" size="36" name="label" value="'.$label.'"></td></tr>';
-	//
-	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_product").'</td><td><input class="flat" type="text" name="fk_product" value="'.GETPOST('fk_product').'"></td></tr>';
-	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldbatch").'</td><td><input class="flat" type="text" name="batch" value="'.GETPOST('batch').'"></td></tr>';
-	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_creat").'</td><td><input class="flat" type="text" name="fk_user_creat" value="'.GETPOST('fk_user_creat').'"></td></tr>';
-	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldfk_user_modif").'</td><td><input class="flat" type="text" name="fk_user_modif" value="'.GETPOST('fk_user_modif').'"></td></tr>';
-	print '<tr><td class="fieldrequired">'.$langs->trans("Fieldimport_key").'</td><td><input class="flat" type="text" name="import_key" value="'.GETPOST('import_key').'"></td></tr>';
+	// Set some default values
+	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
 	print '</table>'."\n";
 
 	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"> &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
+	print '&nbsp; ';
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '</div>';
 
 	print '</form>';
+
+	//dol_set_focus('input[name="ref"]');
 }
 
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$res = $object->fetch_optionals();
 
-	//print load_fiche_titre($langs->trans("Batch"));
-
 	$head = productlot_prepare_head($object);
-	print dol_get_fiche_head($head, 'card', $langs->trans("Batch"), -1, 'barcode');
+	print dol_get_fiche_head($head, 'card', $langs->trans("Batch"), -1, $object->picto);
 
+	$formconfirm = '';
 
+	// Confirmation to delete
 	if ($action == 'delete') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteBatch'), $langs->trans('ConfirmDeleteBatch'), 'confirm_delete', '', 0, 1);
-		print $formconfirm;
 	}
 
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
+	// Print form confirm
+	print $formconfirm;
+
+	// Object card
+	// ------------------------------------------------------------
 	$linkback = '<a href="'.DOL_URL_ROOT.'/product/stock/productlot_list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 	$shownav = 1;
 	if ($user->socid && !in_array('batch', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
 
-	dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'batch');
+	$morehtmlref = '';
+
+	dol_banner_tab($object, 'id', $linkback, $shownav, 'rowid', 'batch', $morehtmlref);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
-
-	print '<table class="border centpercent">'."\n";
+	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Product
 	print '<tr><td class="titlefield">'.$langs->trans("Product").'</td><td>';
@@ -345,44 +411,49 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</td>';
 		print '</tr>';
 	}
-	// Other attributes
-	$cols = 2;
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	print '</table>';
 
 	print '</div>';
 
+	print '<div class="clearboth"></div>';
+
 	print dol_get_fiche_end();
 
-
-	// Buttons
-	print '<div class="tabsAction">'."\n";
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-
-	if (empty($reshook))
-	{
-		/*TODO      if ($user->rights->stock->lire)
-		{
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-		}
-
-		if ($user->rights->stock->supprimer)
-		{
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
-		}
-		*/
-	}
-	print '</div>'."\n";
-
-
+	// Link to other lists
 	print '<a href="'.DOL_URL_ROOT.'/product/reassortlot.php?sref='.urlencode($producttmp->ref).'&search_batch='.urlencode($object->batch).'">'.$langs->trans("ShowCurrentStockOfLot").'</a><br>';
 	print '<br>';
 	print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?search_product_ref='.urlencode($producttmp->ref).'&search_batch='.urlencode($object->batch).'">'.$langs->trans("ShowLogOfMovementIfLot").'</a><br>';
 
 	print '<br>';
+
+
+	// Buttons for actions
+	if ($action != 'presend' && $action != 'editline') {
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+		if (empty($reshook)) {
+			/*TODO      if ($user->rights->stock->lire)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+			}
+
+			if ($user->rights->stock->supprimer)
+			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
+			}
+			*/
+		}
+
+		print '</div>'."\n";
+	}
+
 }
 
 
@@ -391,21 +462,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
  * Documents generes
  */
 
-if (empty($action))
-{
+if ($action != 'presend') {
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 	print '<a name="builddoc"></a>'; // ancre
 
+	$includedocgeneration = 1;
+
 	// Documents
-	$filedir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product_batch').dol_sanitizeFileName($object->ref);
-	$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-	$genallowed = $usercanread;
-	$delallowed = $usercancreate;
+	if ($includedocgeneration) {
+		$objref = dol_sanitizeFileName($object->ref);
+		$relativepath = $objref.'/'.$objref.'.pdf';
+		$filedir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'product_batch');
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed = $usercanread; // If you can read, you can build the PDF to read content
+		$delallowed = $usercancreate; // If you can create/edit, you can remove a file on card
+		print $formfile->showdocuments('product_batch', $objref, $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $langs->default_lang, '', $object);
+	}
 
-	print $formfile->showdocuments('product_batch', dol_sanitizeFileName($object->ref), $filedir, $urlsource, $genallowed, $delallowed, '', 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
-	$somethingshown = $formfile->numoffiles;
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	print '</div>';
+	$MAXEVENT = 10;
+
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+	$formactions = new FormActions($db);
+	$somethingshown = $formactions->showactions($object, 'productlot', 0, 1, '', $MAXEVENT);
+
+	print '</div></div></div>';
 }
 
 // End of page
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index c9b98a1ffe4..ca522f48da7 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -26,7 +26,7 @@
 /**
  *       \file       htdocs/product/stock/productlot_document.php
  *       \ingroup    product
- *       \brief      Page des documents joints sur les lots produits
+ *       \brief      Page of attached documents for porudct lots
  */
 
 require '../../main.inc.php';
@@ -79,7 +79,7 @@ if ($id || $ref)
 	$object->fetch($id, $productid, $batch);
 	$object->ref = $object->batch; // For document management ( it use $object->ref)
 
-	if (!empty($conf->productbatch->enabled)) $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, $modulepart).dol_sanitizeFileName($object->ref);
+	if (!empty($conf->productbatch->enabled)) $upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart);
 }
 
 
@@ -142,6 +142,13 @@ if ($object->id)
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border tableforfield" width="100%">';
 
+	// Product
+	print '<tr><td class="titlefield">'.$langs->trans("Product").'</td><td>';
+	$producttmp = new Product($db);
+	$producttmp->fetch($object->fk_product);
+	print $producttmp->getNomUrl(1, 'stock')." - ".$producttmp->label;
+	print '</td></tr>';
+
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
 	print '</table>';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index e03de931a58..6e818be629d 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -124,9 +124,9 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$permissiontoread = $user->rights->stock->read;
-$permissiontoadd = $user->rights->stock->write;
-$permissiontodelete = $user->rights->stock->delete;
+$permissiontoread = $user->rights->stock->lire;
+$permissiontoadd = $user->rights->stock->mouvement->creer;
+//$permissiontodelete = $user->rights->stock->supprimer;
 
 
 
@@ -321,8 +321,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 //print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/mymodule/myobject_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
-$newcardbutton = '';
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/product/stock/productlot_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index f115bafbdf4..0b80ab3a36b 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2014		Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2016		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2016		ATM Consulting		<support@atm-consulting.fr>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -353,12 +353,12 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 print '<div class="inline-block valignmiddle" style="padding-right: 20px;">';
 print '<span class="fieldrequired">'.$langs->trans('Date').'</span> '.$form->selectDate(($date ? $date : -1), 'date');
 
-print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddinrightonly">&nbsp;</span> ';
+print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
 print img_picto('', 'product').' ';
 print $langs->trans('Product').'</span> ';
 $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, array(), 0, '1', 0, 'maxwidth300');
 
-print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddinrightonly">&nbsp;</span> ';
+print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
 print img_picto('', 'stock').' ';
 print $langs->trans('Warehouse').'</span> ';
 print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1);
diff --git a/htdocs/projet/admin/website.php b/htdocs/projet/admin/website.php
new file mode 100644
index 00000000000..e84cceb68a8
--- /dev/null
+++ b/htdocs/projet/admin/website.php
@@ -0,0 +1,160 @@
+<?php
+/* Copyright (C) 2001-2002	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2006-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *     	\file       htdocs/projet/admin/website.php
+ *		\ingroup    member
+ *		\brief      File of main public page for project module to catch lead
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin", "members"));
+
+$action = GETPOST('action', 'aZ09');
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'setPROJECT_ENABLE_PUBLIC') {
+	if (GETPOST('value')) dolibarr_set_const($db, 'PROJECT_ENABLE_PUBLIC', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'PROJECT_ENABLE_PUBLIC', 0, 'chaine', 0, '', $conf->entity);
+}
+
+if ($action == 'update') {
+	$public = GETPOST('PROJECT_ENABLE_PUBLIC');
+
+	$res = dolibarr_set_const($db, "PROJECT_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
+
+	if (!($res > 0)) $error++;
+
+ 	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans("ProjectsSetup"), $help_url);
+
+
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ProjectsSetup"), $linkback, 'title_setup');
+
+$head = project_admin_prepare_head();
+
+$param = '';
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+
+print dol_get_fiche_head($head, 'website', $langs->trans("Projects"), -1, 'user');
+
+
+print '<span class="opacitymedium">'.$langs->trans("LeadPublicFormDesc").'</span><br><br>';
+
+
+$enabledisablehtml = $langs->trans("EnablePublicLeadForm").' ';
+if (empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setPROJECT_ENABLE_PUBLIC&token='.newToken().'&value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
+} else {
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setPROJECT_ENABLE_PUBLIC&token='.newToken().'&value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
+}
+print $enabledisablehtml;
+print '<input type="hidden" id="PROJECT_ENABLE_PUBLIC" name="PROJECT_ENABLE_PUBLIC" value="'.(empty($conf->global->PROJECT_ENABLE_PUBLIC) ? 0 : 1).'">';
+
+/*
+print '<br>';
+
+if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
+	print '<br>';
+
+	print '<table class="noborder centpercent">';
+
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Parameter").'</td>';
+	print '<td class="right">'.$langs->trans("Value").'</td>';
+	print "</tr>\n";
+
+	// param
+	print '<tr class="oddeven" id="tredit"><td>';
+	print $langs->trans("CanEditAmount");
+	print '</td><td class="right">';
+	print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT", (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) ? $conf->global->MEMBER_NEWFORM_EDITAMOUNT : 0), 1);
+	print "</td></tr>\n";
+
+	print '</table>';
+
+	print '<div class="center">';
+	print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+	print '</div>';
+}
+*/
+
+print dol_get_fiche_end();
+
+print '</form>';
+
+
+if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
+	print '<br>';
+	//print $langs->trans('FollowingLinksArePublic').'<br>';
+	print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':<br>';
+	if ($conf->multicompany->enabled) {
+		$entity_qr = '?entity='.$conf->entity;
+	} else {
+		$entity_qr = '';
+	}
+
+	// Define $urlwithroot
+	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+	print '<a target="_blank" href="'.$urlwithroot.'/public/project/new.php'.$entity_qr.'">'.$urlwithroot.'/public/project/new.php'.$entity_qr.'</a>';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 0462f9d3391..5370dcfa8f9 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -228,7 +228,7 @@ if (empty($reshook))
 		}
 	}
 
-	if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
+	if ($action == 'update' && empty(GETPOST('cancel')) && $user->rights->projet->creer)
 	{
 		$error = 0;
 
@@ -1132,7 +1132,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	if ($action == 'edit' && $userWrite > 0)
 	{
 		print '<div class="center">';
-		print '<input name="update" class="button" type="submit" value="'.$langs->trans("Modify").'">&nbsp; &nbsp; &nbsp;';
+		print '<input name="update" class="button" type="submit" value="'.$langs->trans("Save").'">&nbsp; &nbsp; &nbsp;';
 		print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 	}
@@ -1223,14 +1223,14 @@ if ($action == 'create' && $user->rights->projet->creer)
 
 			// Send
 			if (empty($user->socid)) {
-				if ($object->statut != 2)
+				if ($object->statut != Project::STATUS_CLOSED)
 				{
 					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
 				}
 			}
 
 			// Modify
-			if ($object->statut != 2 && $user->rights->projet->creer)
+			if ($object->statut != Project::STATUS_CLOSED && $user->rights->projet->creer)
 			{
 				if ($userWrite > 0)
 				{
@@ -1241,7 +1241,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 			}
 
 			// Validate
-			if ($object->statut == 0 && $user->rights->projet->creer)
+			if ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer)
 			{
 				if ($userWrite > 0)
 				{
@@ -1252,7 +1252,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 			}
 
 			// Close
-			if ($object->statut == 1 && $user->rights->projet->creer)
+			if ($object->statut == Project::STATUS_VALIDATED && $user->rights->projet->creer)
 			{
 				if ($userWrite > 0)
 				{
@@ -1263,7 +1263,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 			}
 
 			// Reopen
-			if ($object->statut == 2 && $user->rights->projet->creer)
+			if ($object->statut == Project::STATUS_CLOSED && $user->rights->projet->creer)
 			{
 				if ($userWrite > 0)
 				{
@@ -1340,9 +1340,9 @@ if ($action == 'create' && $user->rights->projet->creer)
 			}
 
 			// Delete
-			if ($user->rights->projet->supprimer || ($object->statut == 0 && $user->rights->projet->creer))
+			if ($user->rights->projet->supprimer || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer))
 			{
-				if ($userDelete > 0 || ($object->statut == 0 && $user->rights->projet->creer))
+				if ($userDelete > 0 || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer))
 				{
 					print '<a class="butActionDelete" href="card.php?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans("Delete").'</a>';
 				} else {
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index ff4be5e8d77..d693bb94468 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -201,6 +201,10 @@ class Project extends CommonObject
 		'usage_opportunity' =>array('type'=>'integer', 'label'=>'UsageOpportunity', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
 		'usage_task' =>array('type'=>'integer', 'label'=>'UsageTasks', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
 		'usage_organize_event' =>array('type'=>'integer', 'label'=>'UsageOrganizeEvent', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
+		'accept_conference_suggestions' =>array('type'=>'integer', 'label'=>'AllowUnknownPeopleSuggestConf', 'enabled'=>1, 'visible'=>-1, 'position'=>146),
+		'accept_booth_suggestions' =>array('type'=>'integer', 'label'=>'AllowUnknownPeopleSuggestBooth', 'enabled'=>1, 'visible'=>-1, 'position'=>147),
+		'price_registration' =>array('type'=>'double(24,8)', 'label'=>'PriceOfRegistration', 'enabled'=>1, 'visible'=>-1, 'position'=>148),
+		'price_booth' =>array('type'=>'double(24,8)', 'label'=>'PriceOfBooth', 'enabled'=>1, 'visible'=>-1, 'position'=>149),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreationShort', 'enabled'=>1, 'visible'=>-2, 'position'=>200),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>205),
 		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>210),
@@ -257,6 +261,10 @@ class Project extends CommonObject
 
 		if (empty($conf->eventorganization->enabled)) {
 			$this->fields['usage_organize_event']['visible'] = 0;
+			$this->fields['accept_conference_suggestions']['enabled'] = 0;
+			$this->fields['accept_booth_suggestions']['enabled'] = 0;
+			$this->fields['price_registration']['enabled'] = 0;
+			$this->fields['price_booth']['enabled'] = 0;
 		}
 	}
 
@@ -316,6 +324,10 @@ class Project extends CommonObject
 		$sql .= ", usage_task";
 		$sql .= ", usage_bill_time";
 		$sql .= ", usage_organize_event";
+		$sql .= ", accept_conference_suggestions";
+		$sql .= ", accept_booth_suggestions";
+		$sql .= ", price_registration";
+		$sql .= ", price_booth";
 		$sql .= ", email_msgid";
 		$sql .= ", note_private";
 		$sql .= ", note_public";
@@ -339,6 +351,10 @@ class Project extends CommonObject
 		$sql .= ", ".($this->usage_task ? 1 : 0);
 		$sql .= ", ".($this->usage_bill_time ? 1 : 0);
 		$sql .= ", ".($this->usage_organize_event ? 1 : 0);
+		$sql .= ", ".($this->accept_conference_suggestions ? 1 : 0);
+		$sql .= ", ".($this->accept_booth_suggestions ? 1 : 0);
+		$sql .= ", ".(strcmp($this->price_registration, '') ? price2num($this->price_registration) : 'null');
+		$sql .= ", ".(strcmp($this->price_booth, '') ? price2num($this->price_booth) : 'null');
 		$sql .= ", ".($this->email_msgid ? "'".$this->db->escape($this->email_msgid)."'" : 'null');
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
@@ -442,6 +458,10 @@ class Project extends CommonObject
 			$sql .= ", usage_task = ".($this->usage_task ? 1 : 0);
 			$sql .= ", usage_bill_time = ".($this->usage_bill_time ? 1 : 0);
 			$sql .= ", usage_organize_event = ".($this->usage_organize_event ? 1 : 0);
+			$sql .= ", accept_conference_suggestions = ".($this->accept_conference_suggestions ? 1 : 0);
+			$sql .= ", accept_booth_suggestions = ".($this->accept_booth_suggestions ? 1 : 0);
+			$sql .= ", price_registration = ".(strcmp($this->price_registration, '') ? price2num($this->price_registration) : "null");
+			$sql .= ", price_booth = ".(strcmp($this->price_booth, '') ? price2num($this->price_booth) : "null");
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -531,7 +551,8 @@ class Project extends CommonObject
 
 		$sql = "SELECT rowid, entity, ref, title, description, public, datec, opp_amount, budget_amount,";
 		$sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
-		$sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, email_msgid";
+		$sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, email_msgid,";
+		$sql .= " accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet";
 		if (!empty($id))
 		{
@@ -588,6 +609,10 @@ class Project extends CommonObject
 				$this->usage_task = (int) $obj->usage_task;
 				$this->usage_bill_time = (int) $obj->usage_bill_time;
 				$this->usage_organize_event = (int) $obj->usage_organize_event;
+				$this->accept_conference_suggestions = (int) $obj->accept_conference_suggestions;
+				$this->accept_booth_suggestions = (int) $obj->accept_booth_suggestions;
+				$this->price_registration = $obj->price_registration;
+				$this->price_booth = $obj->price_booth;
 				$this->email_msgid = $obj->email_msgid;
 
 				$this->db->free($resql);
diff --git a/htdocs/projet/event.php b/htdocs/projet/event.php
new file mode 100644
index 00000000000..91f763a5e83
--- /dev/null
+++ b/htdocs/projet/event.php
@@ -0,0 +1,346 @@
+<?php
+/* Copyright (C) 2010 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2012 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 florian.henry@scopen.fr  <florian.henry@scopen.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/projet/event.php
+ *	\ingroup    project
+ *	\brief      Tab event organization
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+
+// Load translation files required by the page
+$langs->load('projects', 'enventorganization');
+
+$action = GETPOST('action', 'aZ09');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+
+$mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
+//if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
+
+$object = new Project($db);
+
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
+
+// Security check
+$socid = 0;
+if ($user->socid > 0) {
+	$socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
+}
+$result = restrictedArea($user, 'eventorganization', $id);
+
+$permissiontoread = $user->rights->eventorganization->read;
+$permissiontoadd = $user->rights->eventorganization->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->eventorganization->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+
+/*
+ * Actions
+ */
+
+if ($action == 'update' && empty(GETPOST('cancel')) && $permissiontoadd) {
+	$error = 0;
+	$object->oldcopy = clone $object;
+
+	$object->accept_conference_suggestions=(GETPOST('accept_conference_suggestions', 'alpha') == 'on' ? 1 : 0);
+	$object->accept_booth_suggestions=(GETPOST('accept_booth_suggestions', 'alpha') == 'on' ? 1 : 0);
+	$object->price_registration=price2num(GETPOST('price_registration', 'alphanohtml'));;
+	$object->price_booth=price2num(GETPOST('price_booth', 'alphanohtml'));;
+
+	$result = $object->update($user);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$db->rollback();
+		$action = 'edit';
+	} else {
+		$db->commit();
+		if (GETPOST('socid', 'int') > 0) $object->fetch_thirdparty(GETPOST('socid', 'int'));
+		else unset($object->thirdparty);
+		$action='';
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+$title = $langs->trans("Project").' - '.$langs->trans("ConferenceOrBoothTab").' - '.$object->ref.' '.$object->name;
+if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) $title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
+//TODO Make wiki docs
+$help_url = '';
+llxHeader("", $title, $help_url);
+
+$form = new Form($db);
+$userstatic = new User($db);
+
+$now = dol_now();
+
+if ($id > 0 || !empty($ref))
+{
+	$head = project_prepare_head($object);
+	print dol_get_fiche_head($head, 'eventorganisation', $langs->trans('ConferenceOrBoothTab'), -1);
+
+	// Project card
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	// Title
+	$morehtmlref .= $object->title;
+	// Thirdparty
+	if ($object->thirdparty->id > 0)
+	{
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'project');
+	}
+	$morehtmlref .= '</div>';
+
+	// Define a complementary filter for search of next/prev ref.
+	if (!$user->rights->projet->all->lire)
+	{
+		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
+		$object->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+	}
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+
+	print '<table class="border tableforfield" width="100%">';
+
+	// Usage
+	print '<tr><td class="tdtop">';
+	print $langs->trans("Usage");
+	print '</td>';
+	print '<td>';
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+	{
+		print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowOpportunity");
+		print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+		print '<br>';
+	}
+	if (empty($conf->global->PROJECT_HIDE_TASKS))
+	{
+		print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_task ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectFollowTasks");
+		print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+		print '<br>';
+	}
+	if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+	{
+		print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("ProjectBillTimeDescription");
+		print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+		print '<br>';
+	}
+
+	if (!empty($conf->eventorganization->enabled))
+	{
+		print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
+		$htmltext = $langs->trans("EventOrganizationDescriptionLong");
+		print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
+	}
+	print '</td></tr>';
+
+	// Visibility
+	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+	if ($object->public) print $langs->trans('SharedProject');
+	else print $langs->trans('PrivateProject');
+	print '</td></tr>';
+
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) && !empty($object->usage_opportunity))
+	{
+		// Opportunity status
+		print '<tr><td>'.$langs->trans("OpportunityStatus").'</td><td>';
+		$code = dol_getIdFromCode($db, $object->opp_status, 'c_lead_status', 'rowid', 'code');
+		if ($code) print $langs->trans("OppStatus".$code);
+		print '</td></tr>';
+
+		// Opportunity percent
+		print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
+		if (strcmp($object->opp_percent, '')) print price($object->opp_percent, 0, $langs, 1, 0).' %';
+		print '</td></tr>';
+
+		// Opportunity Amount
+		print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
+		/*if ($object->opp_status)
+		{
+		   print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
+		}*/
+		if (strcmp($object->opp_amount, '')) print price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+		print '</td></tr>';
+
+		// Opportunity Weighted Amount
+		print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
+		if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) print price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency);
+		print '</td></tr>';
+	}
+
+	// Date start - end
+	print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+	$start = dol_print_date($object->date_start, 'day');
+	print ($start ? $start : '?');
+	$end = dol_print_date($object->date_end, 'day');
+	print ' - ';
+	print ($end ? $end : '?');
+	if ($object->hasDelay()) print img_warning("Late");
+	print '</td></tr>';
+
+	// Budget
+	print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+	if (strcmp($object->budget_amount, '')) print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+	print '</td></tr>';
+
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
+
+	if ($action == 'edit') {
+		print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="action" value="update">';
+		print '<input type="hidden" name="id" value="' . $object->id . '">';
+	}
+
+	print '<table class="border tableforfield" width="100%">';
+
+	// Description
+	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print dol_htmlentitiesbr($object->description);
+	print '</td></tr>';
+
+	// Categories
+	if ($conf->categorie->enabled) {
+		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
+		print "</td></tr>";
+	}
+
+	if ($action == 'edit' && $permissiontoadd) {
+		//Allow unknown people to suggest conferences
+		print '<tr><td class="valignmiddle">' . $langs->trans("AllowUnknownPeopleSuggestConf") . $form->textwithpicto('', $langs->trans("AllowUnknownPeopleSuggestConfHelp")) . '</td><td>';
+		print '<input type="checkbox" name="accept_conference_suggestions"' . (GETPOSTISSET('accept_conference_suggestions') ? (GETPOST('accept_conference_suggestions', 'alpha') != '' ? ' checked="checked"' : '') : ($object->accept_conference_suggestions ? ' checked="checked"' : '')) . '"> ';
+		print "</td></tr>";
+
+		//Allow unknown people to suggest booth
+		print '<tr><td class="valignmiddle">' . $langs->trans("AllowUnknownPeopleSuggestBooth") . $form->textwithpicto('', $langs->trans("AllowUnknownPeopleSuggestBoothHelp")) . '</td><td>';
+		print '<input type="checkbox" name="accept_booth_suggestions"' . (GETPOSTISSET('accept_booth_suggestions') ? (GETPOST('accept_booth_suggestions', 'alpha') != '' ? ' checked="checked"' : '') : ($object->accept_booth_suggestions ? ' checked="checked"' : '')) . '"> ';
+		print "</td></tr>";
+
+		//Price of registration
+		print '<tr><td class="valignmiddle">' . $langs->trans("PriceOfRegistration") . '</td><td>';
+		print '<input size="5" type="text" name="price_registration" value="'.(GETPOSTISSET('price_registration') ? GETPOST('price_registration') : (strcmp($object->price_registration, '') ? price2num($object->price_registration) : '')).'">';
+		print "</td></tr>";
+
+		//Price of registration
+		print '<tr><td class="valignmiddle">' . $langs->trans("PriceOfBooth") . '</td><td>';
+		print '<input size="5" type="text" name="price_booth" value="'.(GETPOSTISSET('price_booth') ? GETPOST('price_booth') : (strcmp($object->price_booth, '') ? price2num($object->price_booth) : '')).'">';
+		print "</td></tr>";
+	} else {
+		//Allow unknown people to suggest conferences
+		print '<tr><td class="valignmiddle">' . $langs->trans("AllowUnknownPeopleSuggestConf") . $form->textwithpicto('', $langs->trans("AllowUnknownPeopleSuggestConfHelp")) . '</td><td>';
+		print '<input type="checkbox" disabled name="accept_conference_suggestions"' . (GETPOSTISSET('accept_conference_suggestions') ? (GETPOST('accept_conference_suggestions', 'alpha') != '' ? ' checked="checked"' : '') : ($object->accept_conference_suggestions ? ' checked="checked"' : '')) . '"> ';
+		print "</td></tr>";
+
+		//Allow unknown people to suggest booth
+		print '<tr><td class="valignmiddle">' . $langs->trans("AllowUnknownPeopleSuggestBooth") . $form->textwithpicto('', $langs->trans("AllowUnknownPeopleSuggestBoothHelp")) . '</td><td>';
+		print '<input type="checkbox" disabled name="accept_booth_suggestions"' . (GETPOSTISSET('accept_booth_suggestions') ? (GETPOST('accept_booth_suggestions', 'alpha') != '' ? ' checked="checked"' : '') : ($object->accept_booth_suggestions ? ' checked="checked"' : '')) . '"> ';
+		print "</td></tr>";
+
+		//Price of registration
+		print '<tr><td class="valignmiddle">' . $langs->trans("PriceOfRegistration") . '</td><td>';
+		if (strcmp($object->price_registration, '')) print price($object->price_registration, 0, $langs, 1, 0, 0, $conf->currency);
+		print "</td></tr>";
+
+		//Price of registration
+		print '<tr><td class="valignmiddle">' . $langs->trans("PriceOfBooth") . '</td><td>';
+		if (strcmp($object->price_booth, '')) print price($object->price_booth, 0, $langs, 1, 0, 0, $conf->currency);
+		print "</td></tr>";
+	}
+
+	//ICS Link
+	print '<tr><td class="valignmiddle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
+	//TODO ICS Link
+	//print '<a href="ICSLink">ICS</a>';
+	print "</td></tr>";
+
+	print '</table>';
+
+	print '</table>';
+
+	print '</div>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+}
+
+print dol_get_fiche_end();
+
+if ($action == 'edit' && $permissiontoadd > 0)
+{
+	print '<div class="center">';
+	print '<input name="update" class="button" type="submit" value="'.$langs->trans("Save").'">&nbsp; &nbsp; &nbsp;';
+	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+
+	print '</form>';
+}
+
+
+/*
+     * Actions Buttons
+     */
+print '<div class="tabsAction">';
+$parameters = array();
+$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+// modified by hook
+if (empty($reshook))
+{
+	// Modify
+	if ($object->statut != Project::STATUS_CLOSED && $action=='')
+	{
+		if ($permissiontoadd > 0)
+		{
+			print '<a class="butAction" href="event.php?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
+		}
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index c51713d1cce..820834b2b8e 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -43,6 +43,9 @@ if (!empty($conf->categorie->enabled))
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies', 'commercial'));
+if ($conf->eventorganization->enabled) {
+	$langs->loadLangs(array('eventorganization'));
+}
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
@@ -93,6 +96,10 @@ $search_usage_opportunity = GETPOST('search_usage_opportunity', 'int');
 $search_usage_task = GETPOST('search_usage_task', 'int');
 $search_usage_bill_time = GETPOST('search_usage_bill_time', 'int');
 $search_usage_event_organization = GETPOST('search_usage_event_organization', 'int');
+$search_accept_conference_suggestions = GETPOST('search_accept_conference_suggestions', 'int');
+$search_accept_booth_suggestions = GETPOST('search_accept_booth_suggestions', 'int');
+$search_price_registration = GETPOST("search_price_registration", 'alpha');
+$search_price_booth = GETPOST("search_price_booth", 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $mine = $_REQUEST['mode'] == 'mine' ? 1 : 0;
@@ -209,6 +216,10 @@ if (empty($reshook))
 		$search_usage_task = '';
 		$search_usage_bill_time = '';
 		$search_usage_event_organization = '';
+		$search_accept_conference_suggestions = '';
+		$search_accept_booth_suggestions = '';
+		$search_price_registration = '';
+		$search_price_booth = '';
 		$toselect = '';
 		$search_array_options = array();
 		$search_category_array = array();
@@ -304,6 +315,7 @@ $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be
 $sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as status, p.fk_opp_status, p.public, p.fk_user_creat";
 $sql .= ", p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount ";
 $sql .= ",  p.usage_opportunity, p.usage_task, p.usage_bill_time, p.usage_organize_event";
+$sql .= ", accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth";
 $sql .= ", s.rowid as socid, s.nom as name, s.email";
 $sql .= ", cls.code as opp_status_code";
 // Add fields from extrafields
@@ -373,6 +385,10 @@ if ($search_usage_opportunity != '' && $search_usage_opportunity >= 0) $sql .= n
 if ($search_usage_task != '' && $search_usage_task >= 0)               $sql .= natural_search('p.usage_task', $search_usage_task, 2);
 if ($search_usage_bill_time != '' && $search_usage_bill_time >= 0)     $sql .= natural_search('p.usage_bill_time', $search_usage_bill_time, 2);
 if ($search_usage_event_organization != '' && $search_usage_event_organization >= 0)     $sql .= natural_search('p.usage_organize_event', $search_usage_event_organization, 2);
+if ($search_accept_conference_suggestions != '' && $search_accept_conference_suggestions >= 0)     $sql .= natural_search('p.accept_conference_suggestions', $search_accept_conference_suggestions, 2);
+if ($search_accept_booth_suggestions != '' && $search_accept_booth_suggestions >= 0)     $sql .= natural_search('p.accept_booth_suggestions', $search_accept_booth_suggestions, 2);
+if ($search_price_registration != '') $sql .= natural_search('p.price_registration', $search_price_registration, 1);
+if ($search_price_booth != '') $sql .= natural_search('p.price_booth', $search_price_booth, 1);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -450,6 +466,10 @@ if ($search_budget_amount != '') $param .= '&search_budget_amount='.urlencode($s
 if ($search_usage_task != '') $param .= '&search_usage_task='.urlencode($search_usage_task);
 if ($search_usage_bill_time != '') $param .= '&search_usage_opportunity='.urlencode($search_usage_bill_time);
 if ($search_usage_event_organization != '') $param .= '&search_usage_event_organization='.urlencode($search_usage_event_organization);
+if ($search_accept_conference_suggestions != '') $param .= '&search_accept_conference_suggestions='.urlencode($search_accept_conference_suggestions);
+if ($search_accept_booth_suggestions != '') $param .= '&search_accept_booth_suggestions='.urlencode($search_accept_booth_suggestions);
+if ($search_price_registration != '') $param .= '&search_price_registration='.urlencode($search_price_registration);
+if ($search_price_booth != '') $param .= '&search_price_booth='.urlencode($search_price_booth);
 if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -663,6 +683,30 @@ if (!empty($arrayfields['p.usage_organize_event']['checked']))
 	print $form->selectyesno('search_usage_event_organization', $search_usage_event_organization, 1, false, 1);
 	print '</td>';
 }
+if (!empty($arrayfields['p.accept_conference_suggestions']['checked']))
+{
+	print '<td class="liste_titre nowrap right">';
+	print $form->selectyesno('search_accept_conference_suggestions', $search_accept_conference_suggestions, 1, false, 1);
+	print '</td>';
+}
+if (!empty($arrayfields['p.accept_booth_suggestions']['checked']))
+{
+	print '<td class="liste_titre nowrap right">';
+	print $form->selectyesno('search_accept_booth_suggestions', $search_accept_booth_suggestions, 1, false, 1);
+	print '</td>';
+}
+if (!empty($arrayfields['p.price_registration']['checked']))
+{
+	print '<td class="liste_titre nowrap right">';
+	print '<input type="text" class="flat" name="search_price_registration" size="4" value="'.$search_price_registration.'">';
+	print '</td>';
+}
+if (!empty($arrayfields['p.price_booth']['checked']))
+{
+	print '<td class="liste_titre nowrap right">';
+	print '<input type="text" class="flat" name="search_price_booth" size="4" value="'.$search_price_booth.'">';
+	print '</td>';
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
@@ -717,6 +761,10 @@ if (!empty($arrayfields['p.usage_opportunity']['checked'])) print_liste_field_ti
 if (!empty($arrayfields['p.usage_task']['checked']))        print_liste_field_titre($arrayfields['p.usage_task']['label'], $_SERVER["PHP_SELF"], 'p.usage_task', "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['p.usage_bill_time']['checked']))   print_liste_field_titre($arrayfields['p.usage_bill_time']['label'], $_SERVER["PHP_SELF"], 'p.usage_bill_time', "", $param, '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['p.usage_organize_event']['checked']))   print_liste_field_titre($arrayfields['p.usage_organize_event']['label'], $_SERVER["PHP_SELF"], 'p.usage_organize_event', "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['p.accept_conference_suggestions']['checked']))   print_liste_field_titre($arrayfields['p.accept_conference_suggestions']['label'], $_SERVER["PHP_SELF"], 'p.accept_conference_suggestions', "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['p.accept_booth_suggestions']['checked']))   print_liste_field_titre($arrayfields['p.accept_booth_suggestions']['label'], $_SERVER["PHP_SELF"], 'p.accept_booth_suggestions', "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['p.price_registration']['checked'])) print_liste_field_titre($arrayfields['p.price_registration']['label'], $_SERVER["PHP_SELF"], 'p.price_registration', "", $param, '', $sortfield, $sortorder, 'right ');
+if (!empty($arrayfields['p.price_booth']['checked'])) print_liste_field_titre($arrayfields['p.price_booth']['label'], $_SERVER["PHP_SELF"], 'p.price_booth', "", $param, '', $sortfield, $sortorder, 'right ');
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
@@ -952,6 +1000,54 @@ while ($i < min($num, $limit))
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
+		// Allow unknown people to suggest conferences
+		if (!empty($arrayfields['p.accept_conference_suggestions']['checked']))
+		{
+			print '<td class="right">';
+			if ($obj->accept_conference_suggestions)
+			{
+				print yn($obj->accept_conference_suggestions);
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Allow unknown people to suggest booth
+		if (!empty($arrayfields['p.accept_booth_suggestions']['checked']))
+		{
+			print '<td class="right">';
+			if ($obj->accept_booth_suggestions)
+			{
+				print yn($obj->accept_booth_suggestions);
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Price of registration
+		if (!empty($arrayfields['p.price_registration']['checked']))
+		{
+			print '<td class="right">';
+			if ($obj->price_registration != '')
+			{
+				print price($obj->price_registration, 1, $langs, 1, -1, -1);
+				$totalarray['val']['p.price_registration'] += $obj->price_registration;
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.price_registration';
+		}
+		// PriceOfBooth
+		if (!empty($arrayfields['p.price_booth']['checked']))
+		{
+			print '<td class="right">';
+			if ($obj->price_booth != '')
+			{
+				print price($obj->price_booth, 1, $langs, 1, -1, -1);
+				$totalarray['val']['p.price_booth'] += $obj->price_booth;
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'p.price_booth';
+		}
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 1946125dbc2..26c110ee1df 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -200,11 +200,11 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('Nature'))."<br>\n";
 	}
-	if (empty($_POST["lastname"])) {
+	if (!GETPOST("lastname")) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
 	}
-	if (empty($_POST["firstname"])) {
+	if (GETPOST("firstname")) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
 	}
@@ -213,8 +213,8 @@ if (empty($reshook) && $action == 'add') {
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
 	}
-	$birthday = dol_mktime($_POST["birthhour"], $_POST["birthmin"], $_POST["birthsec"], $_POST["birthmonth"], $_POST["birthday"], $_POST["birthyear"]);
-	if ($_POST["birthmonth"] && empty($birthday)) {
+	$birthday = dol_mktime(GETPOST("birthhour", 'int'), GETPOST("birthmin", 'int'), GETPOST("birthsec", 'int'), GETPOST("birthmonth", 'int'), GETPOST("birthday", 'int'), GETPOST("birthyear", 'int'));
+	if (GETPOSTISSET("birthmonth") && empty($birthday)) {
 		$error++;
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadDateFormat")."<br>\n";
@@ -226,7 +226,7 @@ if (empty($reshook) && $action == 'add') {
 		}
 	}
 
-	if (isset($public)) $public = 1;
+	if (GETPOSTISSET('public')) $public = 1;
 	else $public = 0;
 
 	if (!$error) {
@@ -234,25 +234,25 @@ if (empty($reshook) && $action == 'add') {
 		$adh = new Adherent($db);
 		$adh->statut      = -1;
 		$adh->public      = $public;
-		$adh->firstname   = $_POST["firstname"];
-		$adh->lastname    = $_POST["lastname"];
-		$adh->gender      = $_POST["gender"];
-		$adh->civility_id = $_POST["civility_id"];
-		$adh->societe     = $_POST["societe"];
-		$adh->address     = $_POST["address"];
-		$adh->zip         = $_POST["zipcode"];
-		$adh->town        = $_POST["town"];
-		$adh->email       = $_POST["email"];
+		$adh->firstname   = GETPOST("firstname");
+		$adh->lastname    = GETPOST("lastname");
+		$adh->gender      = GETPOST("gender");
+		$adh->civility_id = GETPOST("civility_id");
+		$adh->societe     = GETPOST("societe");
+		$adh->address     = GETPOST("address");
+		$adh->zip         = GETPOST("zipcode");
+		$adh->town        = GETPOST("town");
+		$adh->email       = GETPOST("email");
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-			$adh->login       = $_POST["login"];
-			$adh->pass        = $_POST["pass1"];
+			$adh->login       = GETPOST("login");
+			$adh->pass        = GETPOST("pass1");
 		}
-		$adh->photo       = $_POST["photo"];
-		$adh->country_id  = $_POST["country_id"];
-		$adh->state_id    = $_POST["state_id"];
-		$adh->typeid      = $_POST["type"];
-		$adh->note_private = $_POST["note_private"];
-		$adh->morphy      = $_POST["morphy"];
+		$adh->photo       = GETPOST("photo");
+		$adh->country_id  = GETPOST("country_id", 'int');
+		$adh->state_id    = GETPOST("state_id", 'int');
+		$adh->typeid      = GETPOST("type", 'int');
+		$adh->note_private = GETPOST("note_private");
+		$adh->morphy      = GETPOST("morphy");
 		$adh->birth       = $birthday;
 
 
@@ -602,7 +602,7 @@ print '<tr><td>'.$langs->trans("URLPhoto").'</td><td><input type="text" name="ph
 // Public
 print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
 // Other attributes
-$tpl_context = 'public'; //BUG #11554 : define templae context to public
+$tpl_context = 'public'; // define templae context to public
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 // Comments
 print '<tr>';
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
new file mode 100644
index 00000000000..39c0e952880
--- /dev/null
+++ b/htdocs/public/project/new.php
@@ -0,0 +1,461 @@
+<?php
+/* Copyright (C) 2001-2002  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2001-2002  Jean-Louis Bergamo      <jlb@j1b.org>
+ * Copyright (C) 2006-2013  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2012       Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2012       J. Fernando Lagrange    <fernando@demo-tic.org>
+ * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/public/lead/new.php
+ *	\ingroup    project
+ *	\brief      Example of form to add a new lead
+ */
+
+if (!defined('NOLOGIN'))		define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (!defined('NOBROWSERNOTIF')) define('NOBROWSERNOTIF', '1');
+if (!defined('NOIPCHECK'))		define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+
+// Init vars
+$errmsg = '';
+$num = 0;
+$error = 0;
+$backtopage = GETPOST('backtopage', 'alpha');
+$action = GETPOST('action', 'aZ09');
+
+// Load translation files
+$langs->loadLangs(array("main", "members", "companies", "install", "other"));
+
+// Security check
+if (empty($conf->projet->enabled)) accessforbidden('', 0, 0, 1);
+
+if (empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
+	print $langs->trans("Form for public lead registration has not been enabled");
+	exit;
+}
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('publicnewleadcard', 'globalcard'));
+
+$extrafields = new ExtraFields($db);
+
+$object = new Project($db);
+
+$user->loadDefaultValues();
+
+
+/**
+ * Show header for new member
+ *
+ * @param 	string		$title				Title
+ * @param 	string		$head				Head array
+ * @param 	int    		$disablejs			More content into html header
+ * @param 	int    		$disablehead		More content into html header
+ * @param 	array  		$arrayofjs			Array of complementary js files
+ * @param 	array  		$arrayofcss			Array of complementary css files
+ * @return	void
+ */
+function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '')
+{
+	global $user, $conf, $langs, $mysoc;
+
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
+
+	print '<body id="mainbody" class="publicnewmemberform">';
+
+	// Define urllogo
+	$urllogo = DOL_URL_ROOT.'/theme/common/login_logo.png';
+
+	if (!empty($mysoc->logo_small) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small);
+	} elseif (!empty($mysoc->logo) && is_readable($conf->mycompany->dir_output.'/logos/'.$mysoc->logo)) {
+		$urllogo = DOL_URL_ROOT.'/viewimage.php?cache=1&amp;modulepart=mycompany&amp;file='.urlencode('logos/'.$mysoc->logo);
+	} elseif (is_readable(DOL_DOCUMENT_ROOT.'/theme/dolibarr_logo.svg')) {
+		$urllogo = DOL_URL_ROOT.'/theme/dolibarr_logo.svg';
+	}
+
+	print '<div class="center">';
+	// Output html code for logo
+	if ($urllogo) {
+		print '<div class="backgreypublicpayment">';
+		print '<div class="logopublicpayment">';
+		print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
+		print '>';
+		print '</div>';
+		if (empty($conf->global->MAIN_HIDE_POWERED_BY)) {
+			print '<div class="poweredbypublicpayment opacitymedium right"><a class="poweredbyhref" href="https://www.dolibarr.org?utm_medium=website&utm_source=poweredby" target="dolibarr" rel="noopener">'.$langs->trans("PoweredBy").'<br><img class="poweredbyimg" src="'.DOL_URL_ROOT.'/theme/dolibarr_logo.svg" width="80px"></a></div>';
+		}
+		print '</div>';
+	}
+	print '</div>';
+
+	print '<div class="divmainbodylarge">';
+}
+
+/**
+ * Show footer for new member
+ *
+ * @return	void
+ */
+function llxFooterVierge()
+{
+	print '</div>';
+
+	printCommonFooter('public');
+
+	print "</body>\n";
+	print "</html>\n";
+}
+
+
+$arrayofdata = array();
+if (GETPOST('action') == 'addlead') {
+	// When a json request is sent
+	$entityBody = file_get_contents('php://input');
+
+	if ($entityBody) {
+		$arrayofdata = json_decode($entityBody, true);
+	}
+
+	print 'Date received and lead created';
+
+	$db->close();
+	exit;
+}
+
+
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+// Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+// Action called when page is submitted
+if (empty($reshook) && $action == 'add') {
+	$error = 0;
+	$urlback = '';
+
+	$db->begin();
+
+	// test if lead already exists
+	/*
+	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
+		if (!GETPOST('login')) {
+			$error++;
+			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"))."<br>\n";
+		}
+		$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape(GETPOST('login'))."'";
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+		}
+		if ($num != 0) {
+			$error++;
+			$langs->load("errors");
+			$errmsg .= $langs->trans("ErrorLoginAlreadyExists")."<br>\n";
+		}
+		if (!GETPOSTISSET("pass1") || !GETPOSTISSET("pass2") || GETPOST("pass1", 'none') == '' || GETPOST("pass2", 'none') == '' || GETPOST("pass1", 'none') != GETPOST("pass2", 'none')) {
+			$error++;
+			$langs->load("errors");
+			$errmsg .= $langs->trans("ErrorPasswordsMustMatch")."<br>\n";
+		}
+		if (!GETPOST("email")) {
+			$error++;
+			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("EMail"))."<br>\n";
+		}
+	}
+	*/
+	if (GETPOST('type') <= 0) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
+	}
+	if (!in_array(GETPOST('morphy'), array('mor', 'phy'))) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('Nature'))."<br>\n";
+	}
+	if (empty($_POST["lastname"])) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
+	}
+	if (empty($_POST["firstname"])) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
+	}
+	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
+	}
+
+	if (!$error) {
+		// email a peu pres correct et le login n'existe pas
+		$proj = new Project($db);
+		$proj->statut      = -1;
+		$proj->email       = GETPOST("email");
+		$proj->note_private = GETPOST("note_private");
+
+
+		// Fill array 'array_options' with data from add form
+		$extrafields->fetch_name_optionals_label($proj->table_element);
+		$ret = $extrafields->setOptionalsFromPost(null, $proj);
+		if ($ret < 0) $error++;
+
+		$result = $proj->create($user);
+		if ($result > 0) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+			$object = $proj;
+
+			if ($object->email) {
+				$subject = '';
+				$msg = '';
+
+				// Send subscription email
+				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+				// Set output language
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+				// Load traductions files required by page
+				$outputlangs->loadLangs(array("main", "members"));
+				// Get email content from template
+				$arraydefaultmessage = null;
+				$labeltouse = $conf->global->PROJECT_EMAIL_TEMPLATE_AUTOLEAD;
+
+				if (!empty($labeltouse)) $arraydefaultmessage = $formmail->getEMailTemplate($db, 'project', $user, $outputlangs, 0, 1, $labeltouse);
+
+				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+					$subject = $arraydefaultmessage->topic;
+					$msg     = $arraydefaultmessage->content;
+				}
+
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				complete_substitutions_array($substitutionarray, $outputlangs, $object);
+				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+				$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
+
+				if ($subjecttosend && $texttosend) {
+					$moreinheader = 'X-Dolibarr-Info: send_an_email by public/lead/new.php'."\r\n";
+
+					$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+				}
+				/*if ($result < 0) {
+            		$error++;
+            		setEventMessages($object->error, $object->errors, 'errors');
+            	}*/
+			}
+
+			if (!empty($backtopage)) {
+				$urlback = $backtopage;
+			} elseif (!empty($conf->global->PROJECT_URL_REDIRECT_LEAD)) {
+				$urlback = $conf->global->PROJECT_URL_REDIRECT_LEAD;
+				// TODO Make replacement of __AMOUNT__, etc...
+			} else {
+				$urlback = $_SERVER["PHP_SELF"]."?action=added";
+			}
+
+			if (!empty($entity)) $urlback .= '&entity='.$entity;
+			dol_syslog("project lead ".$proj->ref." was created, we redirect to ".$urlback);
+		} else {
+			$error++;
+			$errmsg .= join('<br>', $proj->errors);
+		}
+	}
+
+	if (!$error) {
+		$db->commit();
+
+		Header("Location: ".$urlback);
+		exit;
+	} else {
+		$db->rollback();
+	}
+}
+
+// Create lead from $arrayofdata
+if (empty($reshook) && !empty($arrayofdata)) {
+	// TODO
+	dol_syslog(var_export($arrayofdata, true));
+	// ...
+}
+
+// Action called after a submitted was send and member created successfully
+// If MEMBER_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url.
+// backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url.
+if (empty($reshook) && $action == 'added') {
+	llxHeaderVierge($langs->trans("NewMemberForm"));
+
+	// Si on a pas ete redirige
+	print '<br>';
+	print '<div class="center">';
+	print $langs->trans("NewMemberbyWeb");
+	print '</div>';
+
+	llxFooterVierge();
+	exit;
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$extrafields->fetch_name_optionals_label('project'); // fetch optionals attributes and labels
+
+
+llxHeaderVierge($langs->trans("NewContact"));
+
+
+print load_fiche_titre($langs->trans("NewContact"), '', '', 0, 0, 'center');
+
+
+print '<div align="center">';
+print '<div id="divsubscribe">';
+
+print '<div class="center subscriptionformhelptext justify">';
+if (!empty($conf->global->PROJECT_NEWFORM_TEXT)) {
+	print $langs->trans($conf->global->PROJECT_NEWFORM_TEXT)."<br>\n";
+} else {
+	print $langs->trans("NewLeadDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
+}
+print '</div>';
+
+dol_htmloutput_errors($errmsg);
+
+// Print form
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newlead">'."\n";
+print '<input type="hidden" name="token" value="'.newToken().'" / >';
+print '<input type="hidden" name="entity" value="'.$entity.'" />';
+print '<input type="hidden" name="action" value="add" />';
+
+print '<br>';
+
+print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
+//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
+
+print dol_get_fiche_head('');
+
+print '<script type="text/javascript">
+jQuery(document).ready(function () {
+    jQuery(document).ready(function () {
+        jQuery("#selectcountry_id").change(function() {
+           document.newlead.action.value="create";
+           document.newlead.submit();
+        });
+    });
+});
+</script>';
+
+
+print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
+
+// Lastname
+print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+// Firstname
+print '<tr><td>'.$langs->trans("Firstname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+// Company
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
+// Address
+print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
+print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+// Zip / Town
+print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
+print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
+print ' / ';
+print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
+print '</td></tr>';
+// Country
+print '<tr><td>'.$langs->trans('Country').'</td><td>';
+$country_id = GETPOST('country_id');
+if (!$country_id && !empty($conf->global->PROJECT_NEWFORM_FORCECOUNTRYCODE)) {
+	$country_id = getCountry($conf->global->PROJECT_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
+}
+if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
+	$country_code = dol_user_country();
+	//print $country_code;
+	if ($country_code) {
+		$new_country_id = getCountry($country_code, 3, $db, $langs);
+		//print 'xxx'.$country_code.' - '.$new_country_id;
+		if ($new_country_id) $country_id = $new_country_id;
+	}
+}
+$country_code = getCountry($country_id, 2, $db, $langs);
+print $form->select_country($country_id, 'country_id');
+print '</td></tr>';
+// State
+if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+	print '<tr><td>'.$langs->trans('State').'</td><td>';
+	if ($country_code) print $formcompany->select_state(GETPOST("state_id"), $country_code);
+	else print '';
+	print '</td></tr>';
+}
+// EMail
+print '<tr><td>'.$langs->trans("Email").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+// Other attributes
+$tpl_context = 'public'; // define template context to public
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+// Comments
+print '<tr>';
+print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
+print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
+print '</tr>'."\n";
+
+print "</table>\n";
+
+print dol_get_fiche_end();
+
+// Save
+print '<div class="center">';
+print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
+if (!empty($backtopage)) {
+	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
+}
+print '</div>';
+
+
+print "</form>\n";
+print "<br>";
+print '</div></div>';
+
+
+llxFooterVierge();
+
+$db->close();
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 01873d317c4..aec1e9343a4 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2019 Andreu Bisquerra Gaya		<jove@bisquerra.com>
+ * Copyright (C) 2021    Nicolas ZABOURI    <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -233,6 +234,14 @@ print '<td colspan="2">';
 print $form->selectyesno("TAKEPOS_AUTO_PRINT_TICKETS", $conf->global->TAKEPOS_AUTO_PRINT_TICKETS, 1);
 print "</td></tr>\n";
 
+
+// Show price without vat
+print '<tr class="oddeven"><td>';
+print $langs->trans('ShowPriceHTOnReceipt');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_SHOW_HT_RECEIPT", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans('WeighingScale');
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index f3c17f6ee23..6d0949389a5 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2021    Nicolas ZABOURI    <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -371,6 +372,13 @@ print '<td colspan="2">';
 print ajax_constantonoff("TAKEPOS_DELAYED_PAYMENT", array(), $conf->entity, 0, 0, 1, 0);
 print "</td></tr>\n";
 
+// Show price without vat
+print '<tr class="oddeven"><td>';
+print $langs->trans('ShowPriceHT');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_SHOW_HT", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
 // Numbering module
 //print '<tr class="oddeven"><td>';
 //print $langs->trans("BillsNumberingModule");
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 243b6b5bc49..a1989c41bfa 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (C) 2018    Andreu Bisquerra    <jove@bisquerra.com>
+ * Copyright (C) 2021    Nicolas ZABOURI    <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1120,7 +1121,10 @@ print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilep
 print '<div class="div-table-responsive-no-min invoice">';
 print '<table id="tablelines" class="noborder noshadow postablelines" width="100%">';
 if ($sectionwithinvoicelink && ($mobilepage == "invoice" || $mobilepage == "")) {
-	print '<tr><td colspan="4">'.$sectionwithinvoicelink.'</td></tr>';
+    if (!empty($conf->global->TAKEPOS_SHOW_HT)) { print '<tr><td colspan="5">'.$sectionwithinvoicelink.'</td></tr>'; }
+	else {
+		print '<tr><td colspan="4">'.$sectionwithinvoicelink.'</td></tr>';
+	}
 }
 print '<tr class="liste_titre nodrag nodrop">';
 print '<td class="linecoldescription">';
@@ -1154,6 +1158,23 @@ if ($_SESSION["basiclayout"] != 1)
 {
 	print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
+	if ($conf->global->TAKEPOS_SHOW_HT) {
+        print '<td class="linecolht right nowraponall">';
+        print '<span class="opacitymedium small">' . $langs->trans('TotalHTShort') . '</span><br>';
+        // In phone version only show when it is invoice page
+        if ($mobilepage == "invoice" || $mobilepage == "") {
+            print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">' . price($invoice->total_ht, 1, '', 1, -1, -1, $conf->currency) . '</span>';
+            if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+                //Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+                include_once DOL_DOCUMENT_ROOT . '/multicurrency/class/multicurrency.class.php';
+                $multicurrency = new MultiCurrency($db);
+                $multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+                print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">(' . price($invoice->total_ht * $multicurrency->rate->rate) . ' ' . $_SESSION["takeposcustomercurrency"] . ')</span>';
+            }
+            print '</td>';
+        }
+        print '</td>';
+    }
 	print '<td class="linecolht right nowraponall">';
 	print '<span class="opacitymedium small">'.$langs->trans('TotalTTCShort').'</span><br>';
 	// In phone version only show when it is invoice page
@@ -1373,6 +1394,18 @@ if ($placeid > 0)
 				}
 
 				$htmlforlines .= '</td>';
+                if ($conf->global->TAKEPOS_SHOW_HT) {
+                    $htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
+                    $htmlforlines .= price($line->total_ht, 1, '', 1, -1, -1, $conf->currency);
+                    if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
+                        //Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
+                        include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
+                        $multicurrency = new MultiCurrency($db);
+                        $multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
+                        $htmlforlines .= '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($line->total_ht * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
+                    }
+                    $htmlforlines .= '</td>';
+                }
 				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
 				$htmlforlines .= price($line->total_ttc, 1, '', 1, -1, -1, $conf->currency);
 				if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
@@ -1390,10 +1423,15 @@ if ($placeid > 0)
 			print $htmlforlines;
 		}
 	} else {
-		print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
+		print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td>';
+		if (!empty($conf->global->TAKEPOS_SHOW_HT)){ print '<td></td>'; }
+		print '</tr>';
 	}
 } else {      // No invoice generated yet
-	print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td></tr>';
+	print '<tr class="drag drop oddeven"><td class="left"><span class="opacitymedium">'.$langs->trans("Empty").'</span></td><td></td><td></td><td></td>';
+
+    if (!empty($conf->global->TAKEPOS_SHOW_HT)){ print '<td></td>'; }
+    print '</tr>';
 }
 
 print '</table>';
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 6a305362839..6d8cc869035 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2012      Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2018      Andreu Bisquerra    <jove@bisquerra.com>
  * Copyright (C) 2019      Josep Lluís Amador  <joseplluis@lliuretic.cat>
+ * Copyright (C) 2021    Nicolas ZABOURI    <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -139,6 +140,9 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
         <th class="center"><?php print $langs->trans("Label"); ?></th>
         <th class="right"><?php print $langs->trans("Qty"); ?></th>
         <th class="right"><?php if ($gift != 1) print $langs->trans("Price"); ?></th>
+        <?php  if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
+        <th class="right"><?php if ($gift != 1) print $langs->trans("TotalHT"); ?></th>
+        <?php } ?>
         <th class="right"><?php if ($gift != 1) print $langs->trans("TotalTTC"); ?></th>
 	</tr>
     </thead>
@@ -154,6 +158,12 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
         </td>
         <td class="right"><?php echo $line->qty; ?></td>
         <td class="right"><?php if ($gift != 1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
+        <?php
+        if (!empty($conf->global->TAKEPOS_SHOW_HT_RECEIPT)) { ?>
+                    <td class="right"><?php if ($gift != 1) echo price($line->total_ht, 1); ?></td>
+            <?php
+        }
+        ?>
         <td class="right"><?php if ($gift != 1) echo price($line->total_ttc, 1); ?></td>
     </tr>
         <?php
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 0c6db4a4a2d..1a276c75f5f 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -352,7 +352,7 @@ foreach ($search as $key => $val)
 		if (count($newarrayofstatus)) $sql .= natural_search($key, join(',', $newarrayofstatus), 2);
 		continue;
 	}
-	if ($key == 'fk_user_assign' || $key == 'fk_user_create')
+	if ($key == 'fk_user_assign' || $key == 'fk_user_create' || $key == 'fk_project')
 	{
 		if ($search[$key] > 0) $sql .= natural_search($key, $search[$key], 2);
 		continue;
@@ -362,7 +362,7 @@ foreach ($search as $key => $val)
 }
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_societe)     $sql .= natural_search('s.nom', $search_societe);
-if ($search_fk_project) $sql .= natural_search('fk_project', $search_fk_project, 2);
+//if ($search_fk_project) $sql .= natural_search('fk_project', $search_fk_project, 2);
 if ($search_date_start)			$sql .= " AND t.datec >= '".$db->idate($search_date_start)."'";
 if ($search_date_end)			$sql .= " AND t.datec <= '".$db->idate($search_date_end)."'";
 if ($search_dateread_start)		$sql .= " AND t.date_read >= '".$db->idate($search_dateread_start)."'";
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index 983c7996898..e01bad39d77 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -28,48 +28,84 @@
 
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
-if (!defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');
-if (!defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');
-if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');
-if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');
-if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
-if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
-if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
 
 // Some value of modulepart can be used to get resources that are public so no login are required.
 // Note that only directory logo is free to access without login.
-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'mycompany' && preg_match('/^\/?logos\//', $_GET['file']))
-{
-	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);
-	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'mycompany' && preg_match('/^\/?logos\//', $_GET['file'])) {
+	if (!defined("NOLOGIN")) {
+		define("NOLOGIN", 1);
+	}
+	if (!defined("NOCSRFCHECK")) {
+		define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+	}
+	if (!defined("NOIPCHECK")) {
+		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+	}
 }
 // For direct external download link, we don't need to load/check we are into a login session
-if (isset($_GET["hashp"]) && !defined("NOLOGIN"))
-{
-	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);
-	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (isset($_GET["hashp"]) && !defined("NOLOGIN")) {
+	if (!defined("NOLOGIN")) {
+		define("NOLOGIN", 1);
+	}
+	if (!defined("NOCSRFCHECK")) {
+		define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+	}
+	if (!defined("NOIPCHECK")) {
+		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+	}
 }
 // Some value of modulepart can be used to get resources that are public so no login are required.
-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias')
-{
-	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);
-	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias') {
+	if (!defined("NOLOGIN")) {
+		define("NOLOGIN", 1);
+	}
+	if (!defined("NOCSRFCHECK")) {
+		define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+	}
+	if (!defined("NOIPCHECK")) {
+		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+	}
 }
 
 // Used by TakePOS Auto Order
-if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'product' && isset($_GET["publictakepos"]))
-{
-	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);
-	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'product' && isset($_GET["publictakepos"])) {
+	if (!defined("NOLOGIN")) {
+		define("NOLOGIN", 1);
+	}
+	if (!defined("NOCSRFCHECK")) {
+		define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
+	}
+	if (!defined("NOIPCHECK")) {
+		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+	}
 }
 
 // For multicompany
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
-if (is_numeric($entity)) define("DOLENTITY", $entity);
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
 
 /**
  * Header empty
@@ -101,9 +137,15 @@ $urlsource = GETPOST('urlsource', 'alpha');
 $entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;
 
 // Security check
-if (empty($modulepart) && empty($hashp)) accessforbidden('Bad link. Bad value for parameter modulepart', 0, 0, 1);
-if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') accessforbidden('Bad link. Missing identification to find file (param file or hashp)', 0, 0, 1);
-if ($modulepart == 'fckeditor') $modulepart = 'medias'; // For backward compatibility
+if (empty($modulepart) && empty($hashp)) {
+	accessforbidden('Bad link. Bad value for parameter modulepart', 0, 0, 1);
+}
+if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') {
+	accessforbidden('Bad link. Missing identification to find file (param file or hashp)', 0, 0, 1);
+}
+if ($modulepart == 'fckeditor') {
+	$modulepart = 'medias'; // For backward compatibility
+}
 
 
 
@@ -119,38 +161,33 @@ if ($modulepart == 'fckeditor') $modulepart = 'medias'; // For backward compatib
  * View
  */
 
-if (GETPOST("cache", 'alpha'))
-{
+if (GETPOST("cache", 'alpha')) {
 	// Important: Following code is to avoid page request by browser and PHP CPU at
 	// each Dolibarr page access.
-	if (empty($dolibarr_nocache))
-	{
+	if (empty($dolibarr_nocache)) {
 		header('Cache-Control: max-age=3600, public, must-revalidate');
 		header('Pragma: cache'); // This is to avoid having Pragma: no-cache
-	} else header('Cache-Control: no-cache');
+	} else {
+		header('Cache-Control: no-cache');
+	}
 	//print $dolibarr_nocache; exit;
 }
 
 // If we have a hash public (hashp), we guess the original_file.
-if (!empty($hashp))
-{
+if (!empty($hashp)) {
 	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 	$ecmfile = new EcmFiles($db);
 	$result = $ecmfile->fetch(0, '', '', '', $hashp);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$tmp = explode('/', $ecmfile->filepath, 2); // $ecmfile->filepath is relative to document directory
 		// filepath can be 'users/X' or 'X/propale/PR11111'
-		if (is_numeric($tmp[0])) // If first tmp is numeric, it is subdir of company for multicompany, we take next part.
-		{
+		if (is_numeric($tmp[0])) { // If first tmp is numeric, it is subdir of company for multicompany, we take next part.
 			$tmp = explode('/', $tmp[1], 2);
 		}
 		$moduleparttocheck = $tmp[0]; // moduleparttocheck is first part of path
 
-		if ($modulepart)	// Not required, so often not defined, for link using public hashp parameter.
-		{
-			if ($moduleparttocheck == $modulepart)
-			{
+		if ($modulepart) {	// Not required, so often not defined, for link using public hashp parameter.
+			if ($moduleparttocheck == $modulepart) {
 				// We remove first level of directory
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
@@ -169,13 +206,20 @@ if (!empty($hashp))
 
 // Define mime type
 $type = 'application/octet-stream';
-if (GETPOST('type', 'alpha')) $type = GETPOST('type', 'alpha');
-else $type = dol_mimetype($original_file);
+if (GETPOST('type', 'alpha')) {
+	$type = GETPOST('type', 'alpha');
+} else {
+	$type = dol_mimetype($original_file);
+}
 
 // Security: This wrapper is for images. We do not allow type/html
-if (preg_match('/html/i', $type)) accessforbidden('Error: Using the image wrapper to output a file with a mime type HTML is not possible.', 0, 0, 1);
+if (preg_match('/html/i', $type)) {
+	accessforbidden('Error: Using the image wrapper to output a file with a mime type HTML is not possible.', 0, 0, 1);
+}
 // Security: This wrapper is for images. We do not allow files ending with .noexe
-if (preg_match('/\.noexe$/i', $original_file)) accessforbidden('Error: Using the image wrapper to output a file ending with .noexe is not allowed.', 0, 0, 1);
+if (preg_match('/\.noexe$/i', $original_file)) {
+	accessforbidden('Error: Using the image wrapper to output a file ending with .noexe is not allowed.', 0, 0, 1);
+}
 
 // Security: Delete string ../ into $original_file
 $original_file = str_replace("../", "/", $original_file);
@@ -184,7 +228,9 @@ $original_file = str_replace("../", "/", $original_file);
 $refname = basename(dirname($original_file)."/");
 
 // Security check
-if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart', 0, 0, 1);
+if (empty($modulepart)) {
+	accessforbidden('Bad value for parameter modulepart', 0, 0, 1);
+}
 
 $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
 $accessallowed              = $check_access['accessallowed'];
@@ -200,20 +246,15 @@ if (!empty($hashp)) {
 	}
 } else {
 	// Basic protection (against external users only)
-	if ($user->socid > 0)
-	{
-		if ($sqlprotectagainstexternals)
-		{
+	if ($user->socid > 0) {
+		if ($sqlprotectagainstexternals) {
 			$resql = $db->query($sqlprotectagainstexternals);
-			if ($resql)
-			{
+			if ($resql) {
 				$num = $db->num_rows($resql);
 				$i = 0;
-				while ($i < $num)
-				{
+				while ($i < $num) {
 					$obj = $db->fetch_object($resql);
-					if ($user->socid != $obj->fk_soc)
-					{
+					if ($user->socid != $obj->fk_soc) {
 						$accessallowed = 0;
 						break;
 					}
@@ -226,15 +267,13 @@ if (!empty($hashp)) {
 
 // Security:
 // Limit access if permissions are wrong
-if (!$accessallowed)
-{
+if (!$accessallowed) {
 	accessforbidden();
 }
 
 // Security:
 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.
-if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file))
-{
+if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file)) {
 	dol_syslog("Refused to deliver file ".$fullpath_original_file);
 	print "ErrorFileNameInvalid: ".dol_escape_htmltag($original_file);
 	exit;
@@ -242,15 +281,13 @@ if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $full
 
 
 
-if ($modulepart == 'barcode')
-{
+if ($modulepart == 'barcode') {
 	$generator = GETPOST("generator", "alpha");
 	$code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)
 	$encoding = GETPOST("encoding", "alpha");
 	$readable = GETPOST("readable", 'alpha') ?GETPOST("readable", "alpha") : "Y";
 
-	if (empty($generator) || empty($encoding))
-	{
+	if (empty($generator) || empty($encoding)) {
 		print 'Error: Parameter "generator" or "encoding" not defined';
 		exit;
 	}
@@ -259,23 +296,25 @@ if ($modulepart == 'barcode')
 
 	$result = 0;
 
-	foreach ($dirbarcode as $reldir)
-	{
+	foreach ($dirbarcode as $reldir) {
 		$dir = dol_buildpath($reldir, 0);
 		$newdir = dol_osencode($dir);
 
 		// Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)
-		if (!is_dir($newdir)) continue;
+		if (!is_dir($newdir)) {
+			continue;
+		}
 
 		$result = @include_once $newdir.$generator.'.modules.php';
-		if ($result) break;
+		if ($result) {
+			break;
+		}
 	}
 
 	// Load barcode class
 	$classname = "mod".ucfirst($generator);
 	$module = new $classname($db);
-	if ($module->encodingIsSupported($encoding))
-	{
+	if ($module->encodingIsSupported($encoding)) {
 		$result = $module->buildBarCode($code, $encoding, $readable);
 	}
 } else {
@@ -288,17 +327,15 @@ if ($modulepart == 'barcode')
 	dol_syslog("viewimage.php return file $fullpath_original_file filename=$filename content-type=$type");
 
 	// This test is to avoid error images when image is not available (for example thumbs).
-	if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"]))
-	{
+	if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"])) {
 		$fullpath_original_file = DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';
 		/*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';
-        print $error;
-        exit;*/
+		print $error;
+		exit;*/
 	}
 
 	// Permissions are ok and file found, so we return it
-	if ($type)
-	{
+	if ($type) {
 		top_httphead($type);
 		header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');
 	} else {
@@ -312,4 +349,6 @@ if ($modulepart == 'barcode')
 }
 
 
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index d0ffc3ccc03..fe2e6aab4cf 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -244,7 +244,9 @@ class Website extends CommonObject
 			if (is_array($tmplangarray)) {
 				dol_mkdir($conf->website->dir_output.'/'.$this->ref);
 				foreach ($tmplangarray as $val) {
-					if (trim($val) == $this->lang) continue;
+					if (trim($val) == $this->lang) {
+						continue;
+					}
 					dol_mkdir($conf->website->dir_output.'/'.$this->ref.'/'.trim($val));
 				}
 			}
@@ -540,7 +542,9 @@ class Website extends CommonObject
 			if (is_array($tmplangarray)) {
 				dol_mkdir($conf->website->dir_output.'/'.$this->ref);
 				foreach ($tmplangarray as $val) {
-					if (trim($val) == $this->lang) continue;
+					if (trim($val) == $this->lang) {
+						continue;
+					}
 					dol_mkdir($conf->website->dir_output.'/'.$this->ref.'/'.trim($val));
 				}
 			}
@@ -603,8 +607,7 @@ class Website extends CommonObject
 			}
 		}
 
-		if (!$error && !empty($this->ref))
-		{
+		if (!$error && !empty($this->ref)) {
 			$pathofwebsite = DOL_DATA_ROOT.'/website/'.$this->ref;
 
 			dol_delete_dir_recursive($pathofwebsite);
@@ -645,8 +648,7 @@ class Website extends CommonObject
 		$object = new self($this->db);
 
 		// Check no site with ref exists
-		if ($object->fetch(0, $newref) > 0)
-		{
+		if ($object->fetch(0, $newref) > 0) {
 			$this->error = 'ErrorNewRefIsAlreadyUsed';
 			return -1;
 		}
@@ -678,7 +680,9 @@ class Website extends CommonObject
 		$object->fk_user_creat = $user->id;
 		$object->position = ((int) $object->position) + 1;
 		$object->status = self::STATUS_DRAFT;
-		if (empty($object->lang)) $object->lang = substr($langs->defaultlang, 0, 2); // Should not happen. Protection for corrupted site with no languages
+		if (empty($object->lang)) {
+			$object->lang = substr($langs->defaultlang, 0, 2); // Should not happen. Protection for corrupted site with no languages
+		}
 
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
@@ -690,15 +694,13 @@ class Website extends CommonObject
 			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			dolCopyDir($pathofwebsiteold, $pathofwebsitenew, $conf->global->MAIN_UMASK, 0, null, 2);
 
 			// Check symlink to medias and restore it if ko
 			$pathtomedias = DOL_DATA_ROOT.'/medias'; // Target
 			$pathtomediasinwebsite = $pathofwebsitenew.'/medias'; // Source / Link name
-			if (!is_link(dol_osencode($pathtomediasinwebsite)))
-			{
+			if (!is_link(dol_osencode($pathtomediasinwebsite))) {
 				dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
 				dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
 				$result = symlink($pathtomedias, $pathtomediasinwebsite);
@@ -718,8 +720,7 @@ class Website extends CommonObject
 			// Duplicate pages
 			$objectpages = new WebsitePage($this->db);
 			$listofpages = $objectpages->fetchAll($fromid);
-			foreach ($listofpages as $pageid => $objectpageold)
-			{
+			foreach ($listofpages as $pageid => $objectpageold) {
 				// Delete old file
 				$filetplold = $pathofwebsitenew.'/page'.$pageid.'.tpl.php';
 				dol_delete_file($filetplold);
@@ -728,43 +729,41 @@ class Website extends CommonObject
 				$objectpagenew = $objectpageold->createFromClone($user, $pageid, $objectpageold->pageurl, '', 0, $object->id, 1);
 
 				//print $pageid.' = '.$objectpageold->pageurl.' -> '.$objectpagenew->id.' = '.$objectpagenew->pageurl.'<br>';
-				if (is_object($objectpagenew) && $objectpagenew->pageurl)
-				{
+				if (is_object($objectpagenew) && $objectpagenew->pageurl) {
 					$filealias = $pathofwebsitenew.'/'.$objectpagenew->pageurl.'.php';
 					$filetplnew = $pathofwebsitenew.'/page'.$objectpagenew->id.'.tpl.php';
 
 					// Save page alias
 					$result = dolSavePageAlias($filealias, $object, $objectpagenew);
-					if (!$result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+					if (!$result) {
+						setEventMessages('Failed to write file '.$filealias, null, 'errors');
+					}
 
 					$result = dolSavePageContent($filetplnew, $object, $objectpagenew);
-					if (!$result) setEventMessages('Failed to write file '.$filetplnew, null, 'errors');
+					if (!$result) {
+						setEventMessages('Failed to write file '.$filetplnew, null, 'errors');
+					}
 
-					if ($pageid == $oldidforhome)
-					{
+					if ($pageid == $oldidforhome) {
 						$newidforhome = $objectpagenew->id;
 					}
-				}
-				else {
+				} else {
 					setEventMessages($objectpageold->error, $objectpageold->errors, 'errors');
 					$error++;
 				}
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Restore id of home page
 			$object->fk_default_home = $newidforhome;
 			$res = $object->update($user);
-			if (!($res > 0))
-			{
+			if (!($res > 0)) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$filetpl = $pathofwebsitenew.'/page'.$newidforhome.'.tpl.php';
 				$filewrapper = $pathofwebsitenew.'/wrapper.php';
 
@@ -821,10 +820,11 @@ class Website extends CommonObject
 
 		$linkstart = $linkend = '';
 
-		if ($withpicto)
-		{
+		if ($withpicto) {
 			$result .= ($linkstart.img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? '' : 'class="classfortooltip"')).$linkend);
-			if ($withpicto != 2) $result .= ' ';
+			if ($withpicto != 2) {
+				$result .= ' ';
+			}
 		}
 		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
@@ -854,8 +854,7 @@ class Website extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
@@ -865,7 +864,9 @@ class Website extends CommonObject
 		}
 
 		$statusType = 'status5';
-		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_VALIDATED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
@@ -909,16 +910,14 @@ class Website extends CommonObject
 
 		$website = $this;
 
-		if (empty($website->id) || empty($website->ref))
-		{
+		if (empty($website->id) || empty($website->ref)) {
 			setEventMessages("Website id or ref is not defined", null, 'errors');
 			return '';
 		}
 
 		dol_syslog("Create temp dir ".$conf->website->dir_temp);
 		dol_mkdir($conf->website->dir_temp);
-		if (!is_writable($conf->website->dir_temp))
-		{
+		if (!is_writable($conf->website->dir_temp)) {
 			setEventMessages("Temporary dir ".$conf->website->dir_temp." is not writable", null, 'errors');
 			return '';
 		}
@@ -928,8 +927,7 @@ class Website extends CommonObject
 		dol_syslog("Clear temp dir ".$destdir);
 		$count = 0; $countreallydeleted = 0;
 		$counttodelete = dol_delete_dir_recursive($destdir, $count, 1, 0, $countreallydeleted);
-		if ($counttodelete != $countreallydeleted)
-		{
+		if ($counttodelete != $countreallydeleted) {
 			setEventMessages("Failed to clean temp directory ".$destdir, null, 'errors');
 			return '';
 		}
@@ -987,8 +985,7 @@ class Website extends CommonObject
 		// Build sql file
 		$filesql = $conf->website->dir_temp.'/'.$website->ref.'/website_pages.sql';
 		$fp = fopen($filesql, "w");
-		if (empty($fp))
-		{
+		if (empty($fp)) {
 			setEventMessages("Failed to create file ".$filesql, null, 'errors');
 			return '';
 		}
@@ -998,20 +995,16 @@ class Website extends CommonObject
 
 		// Assign ->newid and ->newfk_page
 		$i = 1;
-		foreach ($listofpages as $pageid => $objectpageold)
-		{
+		foreach ($listofpages as $pageid => $objectpageold) {
 			$objectpageold->newid = $i;
 			$i++;
 		}
 		$i = 1;
-		foreach ($listofpages as $pageid => $objectpageold)
-		{
+		foreach ($listofpages as $pageid => $objectpageold) {
 			// Search newid
 			$newfk_page = 0;
-			foreach ($listofpages as $pageid2 => $objectpageold2)
-			{
-				if ($pageid2 == $objectpageold->fk_page)
-				{
+			foreach ($listofpages as $pageid2 => $objectpageold2) {
+				if ($pageid2 == $objectpageold->fk_page) {
 					$newfk_page = $objectpageold2->newid;
 					break;
 				}
@@ -1019,8 +1012,7 @@ class Website extends CommonObject
 			$objectpageold->newfk_page = $newfk_page;
 			$i++;
 		}
-		foreach ($listofpages as $pageid => $objectpageold)
-		{
+		foreach ($listofpages as $pageid => $objectpageold) {
 			$allaliases = $objectpageold->pageurl;
 			$allaliases .= ($objectpageold->aliasalt ? ','.$objectpageold->aliasalt : '');
 
@@ -1081,8 +1073,7 @@ class Website extends CommonObject
 
 			// Add line to update home page id during import
 			//var_dump($this->fk_default_home.' - '.$objectpageold->id.' - '.$objectpageold->newid);exit;
-			if ($this->fk_default_home > 0 && ($objectpageold->id == $this->fk_default_home) && ($objectpageold->newid > 0))	// This is the record with home page
-			{
+			if ($this->fk_default_home > 0 && ($objectpageold->id == $this->fk_default_home) && ($objectpageold->newid > 0)) {	// This is the record with home page
 				// Warning: We must keep llx_ here. It is a generic SQL.
 				$line = "UPDATE llx_website SET fk_default_home = ".($objectpageold->newid > 0 ? $this->db->escape($objectpageold->newid)."__+MAX_llx_website_page__" : "null")." WHERE rowid = __WEBSITE_ID__;";
 				$line .= "\n";
@@ -1091,8 +1082,9 @@ class Website extends CommonObject
 		}
 
 		fclose($fp);
-		if (!empty($conf->global->MAIN_UMASK))
+		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($filesql, octdec($conf->global->MAIN_UMASK));
+		}
 
 		// Build zip file
 		$filedir  = $conf->website->dir_temp.'/'.$website->ref.'/.';
@@ -1102,11 +1094,9 @@ class Website extends CommonObject
 		dol_delete_file($fileglob, 0);
 		$result = dol_compress_file($filedir, $filename, 'zip');
 
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			return $filename;
-		}
-		else {
+		} else {
 			global $errormsg;
 			$this->error = $errormsg;
 			return '';
@@ -1127,8 +1117,7 @@ class Website extends CommonObject
 		$error = 0;
 
 		$object = $this;
-		if (empty($object->ref))
-		{
+		if (empty($object->ref)) {
 			$this->error = 'Function importWebSite called on object not loaded (object->ref is empty)';
 			return -1;
 		}
@@ -1137,16 +1126,14 @@ class Website extends CommonObject
 		dol_mkdir($conf->website->dir_temp.'/'.$object->ref);
 
 		$filename = basename($pathtofile);
-		if (!preg_match('/^website_(.*)-(.*)$/', $filename, $reg))
-		{
+		if (!preg_match('/^website_(.*)-(.*)$/', $filename, $reg)) {
 			$this->errors[] = 'Bad format for filename '.$filename.'. Must be website_XXX-VERSION.';
 			return -1;
 		}
 
 		$result = dol_uncompress($pathtofile, $conf->website->dir_temp.'/'.$object->ref);
 
-		if (!empty($result['error']))
-		{
+		if (!empty($result['error'])) {
 			$this->errors[] = 'Failed to unzip file '.$pathtofile.'.';
 			return -1;
 		}
@@ -1172,8 +1159,7 @@ class Website extends CommonObject
 		// Now generate the master.inc.php page
 		$filemaster = $conf->website->dir_output.'/'.$object->ref.'/master.inc.php';
 		$result = dolSaveMasterFile($filemaster);
-		if (!$result)
-		{
+		if (!$result) {
 			$this->errors[] = 'Failed to write file '.$filemaster;
 			$error++;
 		}
@@ -1190,16 +1176,14 @@ class Website extends CommonObject
 		// Search the $maxrowid because we need it later
 		$sqlgetrowid = 'SELECT MAX(rowid) as max from '.MAIN_DB_PREFIX.'website_page';
 		$resql = $this->db->query($sqlgetrowid);
-		if ($resql)
-		{
+		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
 			$maxrowid = $obj->max;
 		}
 
 		// Load sql record
 		$runsql = run_sql($sqlfile, 1, '', 0, '', 'none', 0, 1); // The maxrowid of table is searched into this function two
-		if ($runsql <= 0)
-		{
+		if ($runsql <= 0) {
 			$this->errors[] = 'Failed to load sql file '.$sqlfile;
 			$error++;
 		}
@@ -1208,16 +1192,13 @@ class Website extends CommonObject
 
 		// Make replacement of IDs
 		$fp = fopen($sqlfile, "r");
-		if ($fp)
-		{
-			while (!feof($fp))
-			{
+		if ($fp) {
+			while (!feof($fp)) {
 				$reg = array();
 
 				// Warning fgets with second parameter that is null or 0 hang.
 				$buf = fgets($fp, 65000);
-				if (preg_match('/^-- Page ID (\d+)\s[^\s]+\s(\d+).*Aliases\s(.*)\s--;/i', $buf, $reg))
-				{
+				if (preg_match('/^-- Page ID (\d+)\s[^\s]+\s(\d+).*Aliases\s(.*)\s--;/i', $buf, $reg)) {
 					$oldid = $reg[1];
 					$newid = ($reg[2] + $maxrowid);
 					$aliasesarray = explode(',', $reg[3]);
@@ -1237,12 +1218,9 @@ class Website extends CommonObject
 					}
 
 					// Regenerate alternative aliases pages
-					if (is_array($aliasesarray))
-					{
-						foreach ($aliasesarray as $aliasshortcuttocreate)
-						{
-							if (trim($aliasshortcuttocreate))
-							{
+					if (is_array($aliasesarray)) {
+						foreach ($aliasesarray as $aliasshortcuttocreate) {
+							if (trim($aliasshortcuttocreate)) {
 								$filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php';
 								$result = dolSavePageAlias($filealias, $object, $objectpagestatic);
 								if (!$result) {
@@ -1274,12 +1252,10 @@ class Website extends CommonObject
 		$pathofwebsite = $conf->website->dir_output.'/'.$object->ref;
 		dolSaveIndexPage($pathofwebsite, $pathofwebsite.'/index.php', $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php', $pathofwebsite.'/wrapper.php');
 
-		if ($error)
-		{
+		if ($error) {
 			$this->db->rollback();
 			return -1;
-		}
-		else {
+		} else {
 			$this->db->commit();
 			return $object->id;
 		}
@@ -1298,8 +1274,7 @@ class Website extends CommonObject
 		$error = 0;
 
 		$object = $this;
-		if (empty($object->ref))
-		{
+		if (empty($object->ref)) {
 			$this->error = 'Function rebuildWebSiteFiles called on object not loaded (object->ref is empty)';
 			return -1;
 		}
@@ -1386,7 +1361,9 @@ class Website extends CommonObject
 	{
 		global $websitepagefile, $website;
 
-		if (!is_object($weblangs)) return 'ERROR componentSelectLang called with parameter $weblangs not defined';
+		if (!is_object($weblangs)) {
+			return 'ERROR componentSelectLang called with parameter $weblangs not defined';
+		}
 
 		$arrayofspecialmainlanguages = array(
 			'en'=>'en_US',
@@ -1419,51 +1396,55 @@ class Website extends CommonObject
 		$tmppage = new WebsitePage($this->db);
 
 		$pageid = 0;
-		if (!empty($websitepagefile))
-		{
+		if (!empty($websitepagefile)) {
 			$websitepagefileshort = basename($websitepagefile);
-			if ($websitepagefileshort == 'index.php') $pageid = $website->fk_default_home;
-			else $pageid = str_replace(array('.tpl.php', 'page'), array('', ''), $websitepagefileshort);
-			if ($pageid > 0)
-			{
+			if ($websitepagefileshort == 'index.php') {
+				$pageid = $website->fk_default_home;
+			} else {
+				$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), $websitepagefileshort);
+			}
+			if ($pageid > 0) {
 				$tmppage->fetch($pageid);
 			}
 		}
 
 		// Fill $languagecodes array with existing translation, nothing if none
-		if (!is_array($languagecodes) && $pageid > 0)
-		{
+		if (!is_array($languagecodes) && $pageid > 0) {
 			$languagecodes = array();
 
 			$sql = "SELECT wp.rowid, wp.lang, wp.pageurl, wp.fk_page";
 			$sql .= " FROM ".MAIN_DB_PREFIX."website_page as wp";
 			$sql .= " WHERE wp.fk_website = ".$website->id;
 			$sql .= " AND (wp.fk_page = ".$pageid." OR wp.rowid  = ".$pageid;
-			if ($tmppage->fk_page > 0) $sql .= " OR wp.fk_page = ".$tmppage->fk_page." OR wp.rowid = ".$tmppage->fk_page;
+			if ($tmppage->fk_page > 0) {
+				$sql .= " OR wp.fk_page = ".$tmppage->fk_page." OR wp.rowid = ".$tmppage->fk_page;
+			}
 			$sql .= ")";
 
 			$resql = $this->db->query($sql);
-			if ($resql)
-			{
-				while ($obj = $this->db->fetch_object($resql))
-				{
+			if ($resql) {
+				while ($obj = $this->db->fetch_object($resql)) {
 					$newlang = $obj->lang;
-					if ($obj->rowid == $pageid) $newlang = $obj->lang;
-					if (!in_array($newlang, $languagecodes)) $languagecodes[] = $newlang;
+					if ($obj->rowid == $pageid) {
+						$newlang = $obj->lang;
+					}
+					if (!in_array($newlang, $languagecodes)) {
+						$languagecodes[] = $newlang;
+					}
 				}
 			}
 		}
 		// Now $languagecodes is always an array. Example array('en', 'fr', 'es');
 
 		$languagecodeselected = substr($weblangs->defaultlang, 0, 2); // Because we must init with a value, but real value is the lang of main parent container
-		if (!empty($websitepagefile))
-		{
+		if (!empty($websitepagefile)) {
 			$pageid = str_replace(array('.tpl.php', 'page'), array('', ''), basename($websitepagefile));
-			if ($pageid > 0)
-			{
+			if ($pageid > 0) {
 				$pagelang = substr($tmppage->lang, 0, 2);
 				$languagecodeselected = substr($pagelang, 0, 2);
-				if (!in_array($pagelang, $languagecodes)) $languagecodes[] = $pagelang; // We add language code of page into combo list
+				if (!in_array($pagelang, $languagecodes)) {
+					$languagecodes[] = $pagelang; // We add language code of page into combo list
+				}
 			}
 		}
 
@@ -1474,7 +1455,9 @@ class Website extends CommonObject
 		$url = preg_replace('/(\?|&)l=([a-zA-Z_]*)/', '', $url); // We remove param l from url
 		//$url = preg_replace('/(\?|&)lang=([a-zA-Z_]*)/', '', $url);	// We remove param lang from url
 		$url .= (preg_match('/\?/', $url) ? '&' : '?').'l=';
-		if (!preg_match('/^\//', $url)) $url = '/'.$url;
+		if (!preg_match('/^\//', $url)) {
+			$url = '/'.$url;
+		}
 
 		$HEIGHTOPTION = 40;
 		$MAXHEIGHT = 4 * $HEIGHTOPTION;
@@ -1504,8 +1487,7 @@ class Website extends CommonObject
 		$out .= '</style>';
 		$out .= '<ul class="componentSelectLang'.$htmlname.($morecss ? ' '.$morecss : '').'">';
 
-		if ($languagecodeselected)
-		{
+		if ($languagecodeselected) {
 			// Convert $languagecodeselected into a long language code
 			if (strlen($languagecodeselected) == 2) {
 				$languagecodeselected = (empty($arrayofspecialmainlanguages[$languagecodeselected]) ? $languagecodeselected.'_'.strtoupper($languagecodeselected) : $arrayofspecialmainlanguages[$languagecodeselected]);
@@ -1513,28 +1495,34 @@ class Website extends CommonObject
 
 			$countrycode = strtolower(substr($languagecodeselected, -2));
 			$label = $weblangs->trans("Language_".$languagecodeselected);
-			if ($countrycode == 'us') $label = preg_replace('/\s*\(.*\)/', '', $label);
+			if ($countrycode == 'us') {
+				$label = preg_replace('/\s*\(.*\)/', '', $label);
+			}
 			$out .= '<a href="'.$url.substr($languagecodeselected, 0, 2).'"><li><img height="12px" src="/medias/image/common/flags/'.$countrycode.'.png" style="margin-right: 5px;"/><span class="websitecomponentlilang">'.$label.'</span>';
 			$out .= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
 			$out .= '</li></a>';
 		}
 		$i = 0;
-		if (is_array($languagecodes))
-		{
-			foreach ($languagecodes as $languagecode)
-			{
+		if (is_array($languagecodes)) {
+			foreach ($languagecodes as $languagecode) {
 				// Convert $languagecode into a long language code
 				if (strlen($languagecode) == 2) {
 					$languagecode = (empty($arrayofspecialmainlanguages[$languagecode]) ? $languagecode.'_'.strtoupper($languagecode) : $arrayofspecialmainlanguages[$languagecode]);
 				}
 
-				if ($languagecode == $languagecodeselected) continue; // Already output
+				if ($languagecode == $languagecodeselected) {
+					continue; // Already output
+				}
 
 				$countrycode = strtolower(substr($languagecode, -2));
 				$label = $weblangs->trans("Language_".$languagecode);
-				if ($countrycode == 'us') $label = preg_replace('/\s*\(.*\)/', '', $label);
+				if ($countrycode == 'us') {
+					$label = preg_replace('/\s*\(.*\)/', '', $label);
+				}
 				$out .= '<a href="'.$url.substr($languagecode, 0, 2).'"><li><img height="12px" src="/medias/image/common/flags/'.$countrycode.'.png" style="margin-right: 5px;"/><span class="websitecomponentlilang">'.$label.'</span>';
-				if (empty($i) && empty($languagecodeselected)) $out .= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
+				if (empty($i) && empty($languagecodeselected)) {
+					$out .= '<span class="fa fa-caret-down" style="padding-left: 5px;" />';
+				}
 				$out .= '</li></a>';
 				$i++;
 			}
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index bacc4664791..c6c4d81d04e 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -106,9 +106,9 @@ class WebsitePage extends CommonObject
 	 */
 	public $author_alias;
 
-   	/**
-   	 * @var string path of external object
-   	 */
+	/**
+	 * @var string path of external object
+	 */
 	public $object_type;
 
 	/**
@@ -229,7 +229,9 @@ class WebsitePage extends CommonObject
 	{
 		$this->description = dol_trunc($this->description, 255, 'right', 'utf-8', 1);
 		$this->keywords = dol_trunc($this->keywords, 255, 'right', 'utf-8', 1);
-		if ($this->aliasalt) $this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
+		if ($this->aliasalt) {
+			$this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
+		}
 
 		// Remove spaces and be sure we have main language only
 		$this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
@@ -281,12 +283,12 @@ class WebsitePage extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		//$sql .= ' WHERE entity IN ('.getEntity('website').')';       // entity is on website level
 		$sql .= ' WHERE 1 = 1';
-		if ($id > 0)
-		{
+		if ($id > 0) {
 			$sql .= ' AND t.rowid = '.$id;
-		}
-		else {
-			if ($id < 0) $sql .= ' AND t.rowid <> '.abs($id);
+		} else {
+			if ($id < 0) {
+				$sql .= ' AND t.rowid <> '.abs($id);
+			}
 			if (null !== $website_id) {
 				$sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
 				if ($page) {
@@ -295,12 +297,18 @@ class WebsitePage extends CommonObject
 					$tmppage = explode('/', $page);
 					if (!empty($tmppage[1])) {
 						$pagetouse = $tmppage[1];
-						if (strlen($tmppage[0])) $langtouse = $tmppage[0];
+						if (strlen($tmppage[0])) {
+							$langtouse = $tmppage[0];
+						}
 					}
 					$sql .= " AND t.pageurl = '".$this->db->escape($pagetouse)."'";
-					if ($langtouse) $sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
+					if ($langtouse) {
+						$sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
+					}
+				}
+				if ($aliasalt) {
+					$sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
 				}
-				if ($aliasalt)	$sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
 			}
 		}
 		$sql .= $this->db->plimit(1);
@@ -419,7 +427,9 @@ class WebsitePage extends CommonObject
 						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
 					}
 					$stringtouse = $key." IN (".join(',', $listoflang).")";
-					if ($foundnull) $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+					if ($foundnull) {
+						$stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+					}
 					$sqlwhere[] = $stringtouse;
 				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
@@ -441,8 +451,7 @@ class WebsitePage extends CommonObject
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 
-			while ($obj = $this->db->fetch_object($resql))
-			{
+			while ($obj = $this->db->fetch_object($resql)) {
 				$record = new self($this->db);
 
 				$record->id = $obj->rowid;
@@ -520,7 +529,9 @@ class WebsitePage extends CommonObject
 						$listoflang[] = "'".$this->db->escape(substr(str_replace("'", '', $tmpvalue), 0, 2))."'";
 					}
 					$stringtouse = $key." IN (".join(',', $listoflang).")";
-					if ($foundnull) $stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+					if ($foundnull) {
+						$stringtouse = '('.$stringtouse.' OR '.$key.' IS NULL)';
+					}
 					$sqlwhere[] = $stringtouse;
 				} else {
 					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
@@ -561,7 +572,9 @@ class WebsitePage extends CommonObject
 	{
 		$this->description = dol_trunc($this->description, 255, 'right', 'utf-8', 1);
 		$this->keywords = dol_trunc($this->keywords, 255, 'right', 'utf-8', 1);
-		if ($this->aliasalt) $this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
+		if ($this->aliasalt) {
+			$this->aliasalt = ','.preg_replace('/,+$/', '', preg_replace('/^,+/', '', $this->aliasalt)).','; // content in database must be ',xxx,...,yyy,'
+		}
 
 		// Remove spaces and be sure we have main language only
 		$this->lang = preg_replace('/[_-].*$/', '', trim($this->lang)); // en_US or en-US -> en
@@ -595,8 +608,7 @@ class WebsitePage extends CommonObject
 
 		// Delete all child tables
 		if (!$error) {
-			foreach ($this->childtablesoncascade as $table)
-			{
+			foreach ($this->childtablesoncascade as $table) {
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
 				$sql .= " WHERE fk_website_page = ".(int) $this->id;
 
@@ -611,19 +623,16 @@ class WebsitePage extends CommonObject
 
 		if (!$error) {
 			$result = $this->deleteCommon($user, $trigger);
-			if ($result <= 0)
-			{
+			if ($result <= 0) {
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$websiteobj = new Website($this->db);
 			$result = $websiteobj->fetch($this->fk_website);
 
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				global $dolibarr_main_data_root;
 				$pathofwebsite = $dolibarr_main_data_root.'/website/'.$websiteobj->ref;
 
@@ -696,10 +705,17 @@ class WebsitePage extends CommonObject
 		$object->date_creation = $now;
 		$object->title = ($newtitle == '1' ? $object->title : ($newtitle ? $newtitle : $object->title));
 		$object->description = $object->title;
-		if (!empty($newlang)) $object->lang = $newlang;
-		if ($istranslation) $object->fk_page = $fromid;
-		else $object->fk_page = 0;
-		if (!empty($newwebsite)) $object->fk_website = $newwebsite;
+		if (!empty($newlang)) {
+			$object->lang = $newlang;
+		}
+		if ($istranslation) {
+			$object->fk_page = $fromid;
+		} else {
+			$object->fk_page = 0;
+		}
+		if (!empty($newwebsite)) {
+			$object->fk_website = $newwebsite;
+		}
 		$object->import_key = '';
 
 		// Create clone
@@ -755,17 +771,16 @@ class WebsitePage extends CommonObject
 		$url = DOL_URL_ROOT.'/website/index.php?websiteid='.$this->fk_website.'&pageid='.$this->id;
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowMyObject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
-		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -774,8 +789,12 @@ class WebsitePage extends CommonObject
 		//$linkstart = $linkend = '';
 
 		$result .= $linkstart;
-		if ($withpicto) $result .= img_picto(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto) {
+			$result .= img_picto(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 		$result .= $linkend;
 
 		return $result;
@@ -805,8 +824,7 @@ class WebsitePage extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("mymodule");
 			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Disabled');
@@ -816,7 +834,9 @@ class WebsitePage extends CommonObject
 		}
 
 		$statusType = 'status5';
-		if ($status == self::STATUS_VALIDATED) $statusType = 'status4';
+		if ($status == self::STATUS_VALIDATED) {
+			$statusType = 'status4';
+		}
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 46dfd49ed0a..425af726c24 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -44,7 +44,9 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $langs->loadLangs(array("admin", "other", "website", "errors"));
 
-if (!$user->rights->website->read) accessforbidden();
+if (!$user->rights->website->read) {
+	accessforbidden();
+}
 
 $conf->dol_hide_leftmenu = 1; // Force hide of left menu.
 
@@ -70,38 +72,78 @@ $section_dir = GETPOST('section_dir', 'alpha');
 $file_manager = GETPOST('file_manager', 'alpha');
 $replacesite = GETPOST('replacesite', 'alpha');
 
-if (GETPOST('deletesite', 'alpha')) { $action = 'deletesite'; }
-if (GETPOST('delete', 'alpha')) { $action = 'delete'; }
-if (GETPOST('preview', 'alpha')) $action = 'preview';
-if (GETPOST('createsite', 'alpha')) { $action = 'createsite'; }
-if (GETPOST('createcontainer', 'alpha')) { $action = 'createcontainer'; }
-if (GETPOST('editcss', 'alpha')) { $action = 'editcss'; }
-if (GETPOST('editmenu', 'alpha')) { $action = 'editmenu'; }
-if (GETPOST('setashome', 'alpha')) { $action = 'setashome'; }
-if (GETPOST('editmeta', 'alpha')) { $action = 'editmeta'; }
-if (GETPOST('editsource', 'alpha')) { $action = 'editsource'; }
-if (GETPOST('editcontent', 'alpha')) { $action = 'editcontent'; }
-if (GETPOST('exportsite', 'alpha')) { $action = 'exportsite'; }
-if (GETPOST('importsite', 'alpha')) { $action = 'importsite'; }
-if (GETPOST('createfromclone', 'alpha')) { $action = 'createfromclone'; }
-if (GETPOST('createpagefromclone', 'alpha')) { $action = 'createpagefromclone'; }
-if (empty($action) && $file_manager) $action = 'file_manager';
-if (empty($action) && $replacesite) $action = 'replacesite';
-if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x')) $pageid = 0;
+if (GETPOST('deletesite', 'alpha')) {
+	$action = 'deletesite';
+}
+if (GETPOST('delete', 'alpha')) {
+	$action = 'delete';
+}
+if (GETPOST('preview', 'alpha')) {
+	$action = 'preview';
+}
+if (GETPOST('createsite', 'alpha')) {
+	$action = 'createsite';
+}
+if (GETPOST('createcontainer', 'alpha')) {
+	$action = 'createcontainer';
+}
+if (GETPOST('editcss', 'alpha')) {
+	$action = 'editcss';
+}
+if (GETPOST('editmenu', 'alpha')) {
+	$action = 'editmenu';
+}
+if (GETPOST('setashome', 'alpha')) {
+	$action = 'setashome';
+}
+if (GETPOST('editmeta', 'alpha')) {
+	$action = 'editmeta';
+}
+if (GETPOST('editsource', 'alpha')) {
+	$action = 'editsource';
+}
+if (GETPOST('editcontent', 'alpha')) {
+	$action = 'editcontent';
+}
+if (GETPOST('exportsite', 'alpha')) {
+	$action = 'exportsite';
+}
+if (GETPOST('importsite', 'alpha')) {
+	$action = 'importsite';
+}
+if (GETPOST('createfromclone', 'alpha')) {
+	$action = 'createfromclone';
+}
+if (GETPOST('createpagefromclone', 'alpha')) {
+	$action = 'createpagefromclone';
+}
+if (empty($action) && $file_manager) {
+	$action = 'file_manager';
+}
+if (empty($action) && $replacesite) {
+	$action = 'replacesite';
+}
+if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x')) {
+	$pageid = 0;
+}
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 //if (! $sortfield) $sortfield='name';
 //if (! $sortorder) $sortorder='ASC';
 
-if (empty($action)) $action = 'preview';
+if (empty($action)) {
+	$action = 'preview';
+}
 
 $object = new Website($db);
 $objectpage = new WebsitePage($db);
@@ -109,16 +151,13 @@ $objectpage = new WebsitePage($db);
 $object->fetchAll('ASC', 'position'); // Init $object->records with list of websites
 
 // If website not defined, we take first found
-if (!($websiteid > 0) && empty($websitekey) && $action != 'createsite')
-{
-	foreach ($object->records as $key => $valwebsite)
-	{
+if (!($websiteid > 0) && empty($websitekey) && $action != 'createsite') {
+	foreach ($object->records as $key => $valwebsite) {
 		$websitekey = $valwebsite->ref;
 		break;
 	}
 }
-if ($websiteid > 0 || $websitekey)
-{
+if ($websiteid > 0 || $websitekey) {
 	$res = $object->fetch($websiteid, $websitekey);
 	$websitekey = $object->ref;
 }
@@ -126,38 +165,33 @@ if ($websiteid > 0 || $websitekey)
 $website = $object;
 
 // Check pageid received as parameter
-if ($pageid < 0) $pageid = 0;
-if (($pageid > 0 || $pageref) && $action != 'addcontainer')
-{
+if ($pageid < 0) {
+	$pageid = 0;
+}
+if (($pageid > 0 || $pageref) && $action != 'addcontainer') {
 	$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref);
-	if ($res == 0)
-	{
+	if ($res == 0) {
 		$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
 	}
 
 	// Check if pageid is inside the new website, if not we reset param pageid
-	if ($res >= 0 && $object->id > 0)
-	{
-		if ($objectpage->fk_website != $object->id)	// We have a bad page that does not belong to web site
-		{
-			if ($object->fk_default_home > 0)
-			{
+	if ($res >= 0 && $object->id > 0) {
+		if ($objectpage->fk_website != $object->id) {	// We have a bad page that does not belong to web site
+			if ($object->fk_default_home > 0) {
 				$res = $objectpage->fetch($object->fk_default_home, $object->id, ''); // We search first page of web site
-				if ($res > 0) $pageid = $object->fk_default_home;
-			}
-			else {
-				$res = $objectpage->fetch(0, $object->id, ''); // We search first page of web site
-				if ($res == 0)	// Page was not found, we reset it
-				{
-					$objectpage = new WebsitePage($db);
+				if ($res > 0) {
+					$pageid = $object->fk_default_home;
 				}
-				else // We found a page, we set pageid to it.
+			} else {
+				$res = $objectpage->fetch(0, $object->id, ''); // We search first page of web site
+				if ($res == 0) {	// Page was not found, we reset it
+					$objectpage = new WebsitePage($db);
+				} else // We found a page, we set pageid to it.
 				{
 					$pageid = $objectpage->id;
 				}
 			}
-		}
-		else // We have a valid page. We force pageid for the case we got the page with a fetch on ref.
+		} else // We have a valid page. We force pageid for the case we got the page with a fetch on ref.
 		{
 			$pageid = $objectpage->id;
 		}
@@ -165,20 +199,23 @@ if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 }
 
 // Define pageid if pageid and pageref not received as parameter or was wrong
-if (empty($pageid) && empty($pageref) && $object->id > 0 && $action != 'createcontainer')
-{
+if (empty($pageid) && empty($pageref) && $object->id > 0 && $action != 'createcontainer') {
 	$pageid = $object->fk_default_home;
-	if (empty($pageid))
-	{
+	if (empty($pageid)) {
 		$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-		if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+		if (!is_array($array) && $array < 0) {
+			dol_print_error('', $objectpage->error, $objectpage->errors);
+		}
 		$atleastonepage = (is_array($array) && count($array) > 0);
 
 		$firstpageid = 0; $homepageid = 0;
-		foreach ($array as $key => $valpage)
-		{
-			if (empty($firstpageid)) $firstpageid = $valpage->id;
-			if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
+		foreach ($array as $key => $valpage) {
+			if (empty($firstpageid)) {
+				$firstpageid = $valpage->id;
+			}
+			if ($object->fk_default_home && $key == $object->fk_default_home) {
+				$homepageid = $valpage->id;
+			}
 		}
 		$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
 	}
@@ -267,9 +304,15 @@ $manifestjsoncontentdefault .= '{
 $listofpages = array();
 
 $algo = '';
-if (GETPOST('optionmeta')) $algo .= 'meta';
-if (GETPOST('optioncontent')) $algo .= 'content';
-if (GETPOST('optionsitefiles')) $algo .= 'sitefiles';
+if (GETPOST('optionmeta')) {
+	$algo .= 'meta';
+}
+if (GETPOST('optioncontent')) {
+	$algo .= 'content';
+}
+if (GETPOST('optionsitefiles')) {
+	$algo .= 'sitefiles';
+}
 
 if (empty($sortfield)) {
 	if ($action == 'file_manager') {
@@ -301,43 +344,49 @@ $permissiontodelete = $user->rights->website->delete;
  */
 
 // Protections
-if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
-{
+if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x')) {
 	$action = 'preview'; // To avoid to make an action on another page or another site when we click on button to select another site or page.
 }
-if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha'))		// If we change the site, we reset the pageid and cancel addsite action.
-{
-	if ($action == 'addsite') $action = 'preview';
-	if ($action == 'updatesource') $action = 'preview';
+if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha')) {		// If we change the site, we reset the pageid and cancel addsite action.
+	if ($action == 'addsite') {
+		$action = 'preview';
+	}
+	if ($action == 'updatesource') {
+		$action = 'preview';
+	}
 
 	$pageid = $object->fk_default_home;
-	if (empty($pageid))
-	{
+	if (empty($pageid)) {
 		$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-		if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+		if (!is_array($array) && $array < 0) {
+			dol_print_error('', $objectpage->error, $objectpage->errors);
+		}
 		$atleastonepage = (is_array($array) && count($array) > 0);
 
 		$firstpageid = 0; $homepageid = 0;
-		foreach ($array as $key => $valpage)
-		{
-			if (empty($firstpageid)) $firstpageid = $valpage->id;
-			if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
+		foreach ($array as $key => $valpage) {
+			if (empty($firstpageid)) {
+				$firstpageid = $valpage->id;
+			}
+			if ($object->fk_default_home && $key == $object->fk_default_home) {
+				$homepageid = $valpage->id;
+			}
 		}
 		$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
 	}
 }
-if (GETPOST('refreshpage', 'alpha') && !in_array($action, array('updatecss'))) $action = 'preview';
+if (GETPOST('refreshpage', 'alpha') && !in_array($action, array('updatecss'))) {
+	$action = 'preview';
+}
 
 if ($cancel && $action == 'renamefile') {
 	$cancel = '';
 }
 
 // Cancel
-if ($cancel)
-{
+if ($cancel) {
 	$action = 'preview';
-	if ($backtopage)
-	{
+	if ($backtopage) {
 		header("Location: ".$backtopage);
 		exit;
 	}
@@ -345,8 +394,12 @@ if ($cancel)
 
 $savbacktopage = $backtopage;
 $backtopage = $_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid.(GETPOST('section_dir', 'alpha') ? '&section_dir='.urlencode(GETPOST('section_dir', 'alpha')) : ''); // used after a confirm_deletefile into actions_linkedfiles.inc.php
-if ($sortfield) $backtopage .= '&sortfield='.$sortfield;
-if ($sortorder) $backtopage .= '&sortorder='.$sortorder;
+if ($sortfield) {
+	$backtopage .= '&sortfield='.$sortfield;
+}
+if ($sortorder) {
+	$backtopage .= '&sortorder='.$sortorder;
+}
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 $backtopage = $savbacktopage;
 
@@ -354,43 +407,37 @@ if ($action == 'renamefile') {	// Must be after include DOL_DOCUMENT_ROOT.'/core
 	$action = 'file_manager';
 }
 
-if ($action == 'seteditinline')
-{
+if ($action == 'seteditinline') {
 	dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 1);
 	setEventMessages($langs->trans("FeatureNotYetAvailable"), null, 'warnings');
 	//dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 0); // Force disable of 'Include dynamic content'
 	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
 	exit;
 }
-if ($action == 'unseteditinline')
-{
+if ($action == 'unseteditinline') {
 	dolibarr_del_const($db, 'WEBSITE_EDITINLINE');
 	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
 	exit;
 }
-if ($action == 'setshowsubcontainers')
-{
+if ($action == 'setshowsubcontainers') {
 	dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1);
 	//dolibarr_set_const($db, 'WEBSITE_EDITINLINE', 0); // Force disable of edit inline
 	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
 	exit;
 }
-if ($action == 'unsetshowsubcontainers')
-{
+if ($action == 'unsetshowsubcontainers') {
 	dolibarr_del_const($db, 'WEBSITE_SUBCONTAINERSINLINE');
 	header("Location: ".$_SERVER["PHP_SELF"].'?website='.GETPOST('website', 'alphanohtml').'&pageid='.GETPOST('pageid', 'int'));
 	exit;
 }
 
-if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && !$searchkey)
-{
+if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && !$searchkey) {
 	$action = 'replacesite';
 	$massaction = '';
 }
 
 // Set category
-if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $usercanedit)
-{
+if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $usercanedit) {
 	$error = 0;
 	$nbupdate = 0;
 
@@ -429,17 +476,14 @@ if ($massaction == 'setcategory' && GETPOST('confirmmassaction', 'alpha') && $us
 }
 
 // Replacement of string into pages
-if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha'))
-{
+if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha')) {
 	$replacestring = GETPOST('replacestring', 'none');
 
 	if (empty($user->rights->website->writephp)) {
 		setEventMessages("NotAllowedToAddDynamicContent", null, 'errors');
-	}
-	elseif (!$replacestring) {
+	} elseif (!$replacestring) {
 		setEventMessages("ErrorReplaceStringEmpty", null, 'errors');
-	}
-	else {
+	} else {
 		$nbreplacement = 0;
 
 		foreach ($toselect as $keyselected) {
@@ -461,15 +505,13 @@ if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha'))
 
 				// Save page alias
 				$result = dolSavePageAlias($filealias, $object, $objectpage);
-				if (!$result)
-				{
+				if (!$result) {
 					setEventMessages('Failed to write file '.basename($filealias), null, 'errors');
 				}
 
 				// Save page of content
 				$result = dolSavePageContent($filetpl, $object, $objectpage);
-				if ($result)
-				{
+				if ($result) {
 					$nbreplacement++;
 					//var_dump($objectpage->content);exit;
 					$objectpage->update($user);
@@ -524,31 +566,26 @@ if ($action == 'adddir' && $permtouploadfile)
 */
 
 // Add site
-if ($action == 'addsite')
-{
+if ($action == 'addsite') {
 	$db->begin();
 
-	if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
-	{
+	if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha'))) {
 		$error++;
 		setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
 	}
 
-	if (!$error && !GETPOST('WEBSITE_REF', 'alpha'))
-	{
+	if (!$error && !GETPOST('WEBSITE_REF', 'alpha')) {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
 	}
-	if (!$error && !preg_match('/^[a-z0-9_\-\.]+$/i', GETPOST('WEBSITE_REF', 'alpha')))
-	{
+	if (!$error && !preg_match('/^[a-z0-9_\-\.]+$/i', GETPOST('WEBSITE_REF', 'alpha'))) {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities("Ref")), null, 'errors');
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
 		foreach ($arrayotherlang as $key => $val) {
 			$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
@@ -562,75 +599,64 @@ if ($action == 'addsite')
 		$tmpobject->virtualhost = GETPOST('virtualhost', 'alpha');
 
 		$result = $tmpobject->create($user);
-		if ($result <= 0)
-		{
+		if ($result <= 0) {
 			$error++;
 			setEventMessages($tmpobject->error, $tmpobject->errors, 'errors');
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SiteAdded", $object->ref), null, 'mesgs');
 		$action = '';
 
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$tmpobject->ref);
 		exit;
-	}
-	else {
+	} else {
 		$db->rollback();
 		$action = 'createsite';
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$action = 'preview';
 		$id = $object->id;
 	}
 }
 
 // Add page/container
-if ($action == 'addcontainer')
-{
+if ($action == 'addcontainer') {
 	dol_mkdir($pathofwebsite);
 
 	$db->begin();
 
 	$objectpage->fk_website = $object->id;
 
-	if (GETPOSTISSET('fetchexternalurl'))	// Fetch from external url
-	{
+	if (GETPOSTISSET('fetchexternalurl')) {	// Fetch from external url
 		$urltograb = GETPOST('externalurl', 'alpha');
 		$grabimages = GETPOST('grabimages', 'alpha');
 		$grabimagesinto = GETPOST('grabimagesinto', 'alpha');
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
-		if (empty($urltograb))
-		{
+		if (empty($urltograb)) {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
 			$action = 'createcontainer';
-		}
-		elseif (!preg_match('/^http/', $urltograb))
-		{
+		} elseif (!preg_match('/^http/', $urltograb)) {
 			$error++;
 			$langs->load("errors");
 			setEventMessages('Error URL must start with http:// or https://', null, 'errors');
 			$action = 'createcontainer';
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Clean url to grab, so url can be
 			// http://www.example.com/ or http://www.example.com/dir1/ or http://www.example.com/dir1/aaa
 			$urltograbwithoutdomainandparam = preg_replace('/^https?:\/\/[^\/]+\/?/i', '', $urltograb);
 			//$urltograbwithoutdomainandparam = preg_replace('/^file:\/\/[^\/]+\/?/i', '', $urltograb);
 			$urltograbwithoutdomainandparam = preg_replace('/\?.*$/', '', $urltograbwithoutdomainandparam);
-			if (empty($urltograbwithoutdomainandparam) && !preg_match('/\/$/', $urltograb))
-			{
+			if (empty($urltograbwithoutdomainandparam) && !preg_match('/\/$/', $urltograb)) {
 				$urltograb .= '/';
 			}
 			$pageurl = dol_sanitizeFileName(preg_replace('/[\/\.]/', '-', preg_replace('/\/+$/', '', $urltograbwithoutdomainandparam)));
@@ -642,34 +668,27 @@ if ($action == 'addcontainer')
 		}
 
 		// Check pageurl is not already used
-		if ($pageurl)
-		{
+		if ($pageurl) {
 			$tmpwebsitepage = new WebsitePage($db);
 			$result = $tmpwebsitepage->fetch(0, $object->id, $pageurl);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				setEventMessages($langs->trans("AliasPageAlreadyExists", $pageurl), null, 'errors');
 				$error++;
 				$action = 'createcontainer';
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$tmp = getURLContent($urltograb);
-			if ($tmp['curl_error_no'])
-			{
+			if ($tmp['curl_error_no']) {
 				$error++;
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['curl_error_msg'], null, 'errors');
 				$action = 'createcontainer';
-			}
-			elseif ($tmp['http_code'] != '200')
-			{
+			} elseif ($tmp['http_code'] != '200') {
 				$error++;
 				setEventMessages('Error getting '.$urltograb.': '.$tmp['http_code'], null, 'errors');
 				$action = 'createcontainer';
-			}
-			else {
+			} else {
 				// Remove comments
 				$tmp['content'] = removeHtmlComment($tmp['content']);
 
@@ -679,36 +698,34 @@ if ($action == 'addcontainer')
 				$head = $regs[1];
 
 				$objectpage->type_container = 'page';
-	   			$objectpage->pageurl = $pageurl;
-	   			if (empty($objectpage->pageurl))
-	   			{
-	   				$tmpdomain = getDomainFromURL($urltograb);
-	   				$objectpage->pageurl = $tmpdomain.'-home';
-	   			}
+				$objectpage->pageurl = $pageurl;
+				if (empty($objectpage->pageurl)) {
+					$tmpdomain = getDomainFromURL($urltograb);
+					$objectpage->pageurl = $tmpdomain.'-home';
+				}
 
-	   			$objectpage->aliasalt = '';
+				$objectpage->aliasalt = '';
 
-	   			if (preg_match('/^(\d+)\-/', basename($urltograb), $regs)) $objectpage->aliasalt = $regs[1];
+				if (preg_match('/^(\d+)\-/', basename($urltograb), $regs)) {
+					$objectpage->aliasalt = $regs[1];
+				}
 
-	   			$regtmp = array();
-				if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp))
-				{
+				$regtmp = array();
+				if (preg_match('/<title>(.*)<\/title>/ims', $head, $regtmp)) {
 					$objectpage->title = $regtmp[1];
 				}
-				if (preg_match('/<meta name="title"[^"]+content="([^"]+)"/ims', $head, $regtmp))
-				{
-					if (empty($objectpage->title)) $objectpage->title = $regtmp[1]; // If title not found into <title>, we get it from <meta title>
+				if (preg_match('/<meta name="title"[^"]+content="([^"]+)"/ims', $head, $regtmp)) {
+					if (empty($objectpage->title)) {
+						$objectpage->title = $regtmp[1]; // If title not found into <title>, we get it from <meta title>
+					}
 				}
-				if (preg_match('/<meta name="description"[^"]+content="([^"]+)"/ims', $head, $regtmp))
-				{
+				if (preg_match('/<meta name="description"[^"]+content="([^"]+)"/ims', $head, $regtmp)) {
 					$objectpage->description = $regtmp[1];
 				}
-				if (preg_match('/<meta name="keywords"[^"]+content="([^"]+)"/ims', $head, $regtmp))
-				{
+				if (preg_match('/<meta name="keywords"[^"]+content="([^"]+)"/ims', $head, $regtmp)) {
 					$objectpage->keywords = $regtmp[1];
 				}
-				if (preg_match('/<html\s+lang="([^"]+)"/ims', $tmp['content'], $regtmp))
-				{
+				if (preg_match('/<html\s+lang="([^"]+)"/ims', $tmp['content'], $regtmp)) {
 					$tmplang = explode('-', $regtmp[1]);
 					$objectpage->lang = $tmplang[0].($tmplang[1] ? '_'.strtoupper($tmplang[1]) : '');
 				}
@@ -749,22 +766,18 @@ if ($action == 'addcontainer')
 				// We grab files found into <script> tags
 				preg_match_all('/<script([^\.>]+)src=["\']([^"\'>]+)["\']([^>]*)><\/script>/i', $objectpage->htmlheader, $regs);
 				$errorforsubresource = 0;
-				foreach ($regs[0] as $key => $val)
-				{
+				foreach ($regs[0] as $key => $val) {
 					dol_syslog("We will grab the script resource found into script tag ".$regs[2][$key]);
 
 					$linkwithoutdomain = $regs[2][$key];
-					if (preg_match('/^\//', $regs[2][$key]))
-					{
+					if (preg_match('/^\//', $regs[2][$key])) {
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
-					}
-					else {
+					} else {
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
 					//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
-					if (preg_match('/^http/', $regs[2][$key]))
-					{
+					if (preg_match('/^http/', $regs[2][$key])) {
 						$urltograbbis = $regs[2][$key];
 						$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
 						//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
@@ -776,17 +789,19 @@ if ($action == 'addcontainer')
 					// Test if this is an external URL of grabbed web site. If yes, we do not load resource
 					$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
 					$domaintograbbis = getDomainFromURL($urltograbbis);
-					if ($domaintograb != $domaintograbbis) continue;
+					if ($domaintograb != $domaintograbbis) {
+						continue;
+					}
 
 					/*
-	    			$tmpgeturl = getURLContent($urltograbbis);
-	    			if ($tmpgeturl['curl_error_no'])
-	    			{
-	    				$error++;
-	    				setEventMessages('Error getting script url '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
-	    				$errorforsubresource++;
-	    				$action='createcontainer';
-	    			}
+					$tmpgeturl = getURLContent($urltograbbis);
+					if ($tmpgeturl['curl_error_no'])
+					{
+						$error++;
+						setEventMessages('Error getting script url '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
+						$errorforsubresource++;
+						$action='createcontainer';
+					}
 					elseif ($tmpgeturl['http_code'] != '200')
 					{
 						$error++;
@@ -795,15 +810,15 @@ if ($action == 'addcontainer')
 						$action='createcontainer';
 					}
 					else
-	    			{
-	    				dol_mkdir(dirname($filetosave));
+					{
+						dol_mkdir(dirname($filetosave));
 
-	    				$fp = fopen($filetosave, "w");
-	    				fputs($fp, $tmpgeturl['content']);
-	    				fclose($fp);
-	    				if (! empty($conf->global->MAIN_UMASK))
-	    					@chmod($file, octdec($conf->global->MAIN_UMASK));
-	    			}
+						$fp = fopen($filetosave, "w");
+						fputs($fp, $tmpgeturl['content']);
+						fclose($fp);
+						if (! empty($conf->global->MAIN_UMASK))
+							@chmod($file, octdec($conf->global->MAIN_UMASK));
+					}
 					*/
 
 					//$filename = 'image/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
@@ -817,22 +832,18 @@ if ($action == 'addcontainer')
 
 				preg_match_all('/<link([^\.>]+)href=["\']([^"\'>]+\.css[^"\'>]*)["\']([^>]*)>/i', $objectpage->htmlheader, $regs);
 				$errorforsubresource = 0;
-				foreach ($regs[0] as $key => $val)
-				{
+				foreach ($regs[0] as $key => $val) {
 					dol_syslog("We will grab the css resources found into link tag ".$regs[2][$key]);
 
 					$linkwithoutdomain = $regs[2][$key];
-					if (preg_match('/^\//', $regs[2][$key]))
-					{
+					if (preg_match('/^\//', $regs[2][$key])) {
 						$urltograbbis = $urltograbdirrootwithoutslash.$regs[2][$key]; // We use dirroot
-					}
-					else {
+					} else {
 						$urltograbbis = $urltograbdirwithoutslash.'/'.$regs[2][$key]; // We use dir of grabbed file
 					}
 
 					//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $regs[2][$key])?'':'/').$regs[2][$key];
-					if (preg_match('/^http/', $regs[2][$key]))
-					{
+					if (preg_match('/^http/', $regs[2][$key])) {
 						$urltograbbis = $regs[2][$key];
 						$linkwithoutdomain = preg_replace('/^https?:\/\/[^\/]+\//i', '', $regs[2][$key]);
 						//$filetosave = $conf->medias->multidir_output[$conf->entity].'/css/'.$object->ref.'/'.$objectpage->pageurl.(preg_match('/^\//', $linkwithoutdomain)?'':'/').$linkwithoutdomain;
@@ -844,24 +855,22 @@ if ($action == 'addcontainer')
 					// Test if this is an external URL of grabbed web site. If yes, we do not load resource
 					$domaintograb = getDomainFromURL($urltograbdirwithoutslash);
 					$domaintograbbis = getDomainFromURL($urltograbbis);
-					if ($domaintograb != $domaintograbbis) continue;
+					if ($domaintograb != $domaintograbbis) {
+						continue;
+					}
 
 					$tmpgeturl = getURLContent($urltograbbis);
-					if ($tmpgeturl['curl_error_no'])
-					{
+					if ($tmpgeturl['curl_error_no']) {
 						$errorforsubresource++;
 						setEventMessages('Error getting link tag url '.$urltograbbis.': '.$tmpgeturl['curl_error_msg'], null, 'errors');
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
 						$action = 'createcontainer';
-					}
-					elseif ($tmpgeturl['http_code'] != '200')
-					{
+					} elseif ($tmpgeturl['http_code'] != '200') {
 						$errorforsubresource++;
 						setEventMessages('Error getting link tag url '.$urltograbbis.': '.$tmpgeturl['http_code'], null, 'errors');
 						dol_syslog('Error getting '.$urltograbbis.': '.$tmpgeturl['curl_error_msg']);
 						$action = 'createcontainer';
-					}
-					else {
+					} else {
 						// Clean some comment
 						//$tmpgeturl['content'] = dol_string_is_good_iso($tmpgeturl['content'], 1);
 						//$tmpgeturl['content'] = utf8_encode(utf8_decode($tmpgeturl['content']));
@@ -959,7 +968,9 @@ if ($action == 'addcontainer')
 		$objectpage->fk_page = $pageidfortranslation;
 
 		$sample = GETPOST('sample', 'alpha');
-		if (empty($sample)) $sample = 'empty';
+		if (empty($sample)) {
+			$sample = 'empty';
+		}
 
 		$pathtosample = DOL_DOCUMENT_ROOT.'/website/samples/page-sample-'.dol_sanitizeFileName($sample).'.html';
 
@@ -967,38 +978,31 @@ if ($action == 'addcontainer')
 		$objectpage->content = make_substitutions(@file_get_contents($pathtosample), $substitutionarray);
 	}
 
-	if (!$error)
-	{
-		if (empty($objectpage->pageurl))
-		{
+	if (!$error) {
+		if (empty($objectpage->pageurl)) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_PAGENAME")), null, 'errors');
 			$error++;
 			$action = 'createcontainer';
-		}
-		elseif (!preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl))
-		{
+		} elseif (!preg_match('/^[a-z0-9\-\_]+$/i', $objectpage->pageurl)) {
 			$langs->load("errors");
 			setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities('WEBSITE_PAGENAME')), null, 'errors');
 			$error++;
 			$action = 'createcontainer';
 		}
-		if (empty($objectpage->title))
-		{
+		if (empty($objectpage->title)) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WEBSITE_TITLE")), null, 'errors');
 			$error++;
 			$action = 'createcontainer';
 		}
-		if ($objectpage->fk_page > 0 && empty($objectpage->lang))
-		{
+		if ($objectpage->fk_page > 0 && empty($objectpage->lang)) {
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorLanguageRequiredIfPageIsTranslationOfAnother"), null, 'errors');
 			$error++;
 			$action = 'createcontainer';
 		}
-		if ($objectpage->fk_page > 0 && !empty($objectpage->lang))
-		{
+		if ($objectpage->fk_page > 0 && !empty($objectpage->lang)) {
 			if ($objectpage->lang == $website->lang) {
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother"), null, 'errors');
@@ -1008,8 +1012,7 @@ if ($action == 'addcontainer')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$pageid = $objectpage->create($user);
 		if ($pageid <= 0) {
 			$error++;
@@ -1022,8 +1025,7 @@ if ($action == 'addcontainer')
 		// Website categories association
 		$categoriesarray = GETPOST('categories', 'array');
 		$result = $objectpage->setCategories($categoriesarray);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -1034,8 +1036,7 @@ if ($action == 'addcontainer')
 		if (empty($object->fk_default_home)) {
 			$object->fk_default_home = $pageid;
 			$res = $object->update($user);
-			if ($res <= 0)
-			{
+			if ($res <= 0) {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
 			} else {
@@ -1044,50 +1045,44 @@ if ($action == 'addcontainer')
 				// Generate the index.php page (to be the home page) and wrapper.php file
 				$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
 
-				if ($result <= 0) setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+				if ($result <= 0) {
+					setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+				}
 			}
 		}
 	}
 
-	if (!$error)
-	{
-		if (!empty($objectpage->content))
-		{
+	if (!$error) {
+		if (!empty($objectpage->content)) {
 			$filealias = $pathofwebsite.'/'.$objectpage->pageurl.'.php';
 			$filetpl = $pathofwebsite.'/page'.$objectpage->id.'.tpl.php';
 
 			// Save page alias
 			$result = dolSavePageAlias($filealias, $object, $objectpage);
-			if (!$result)
-			{
+			if (!$result) {
 				setEventMessages('Failed to write file '.basename($filealias), null, 'errors');
 			}
 
 			// Save page of content
 			$result = dolSavePageContent($filetpl, $object, $objectpage);
-			if ($result)
-			{
+			if ($result) {
 				setEventMessages($langs->trans("Saved"), null, 'mesgs');
-			}
-			else {
+			} else {
 				setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 				$action = 'createcontainer';
 			}
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("PageAdded", $objectpage->pageurl), null, 'mesgs');
 		$action = '';
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$pageid = $objectpage->id;
 
 		// To generate the CSS, robot and htmlheader file.
@@ -1095,64 +1090,54 @@ if ($action == 'addcontainer')
 		// Check symlink to medias and restore it if ko
 		$pathtomedias = DOL_DATA_ROOT.'/medias';
 		$pathtomediasinwebsite = $pathofwebsite.'/medias';
-		if (!is_link(dol_osencode($pathtomediasinwebsite)))
-		{
+		if (!is_link(dol_osencode($pathtomediasinwebsite))) {
 			dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
 			dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
 			$result = symlink($pathtomedias, $pathtomediasinwebsite);
 		}
 
 		// Now generate the master.inc.php page if it does not exists yet
-		if (!dol_is_file($filemaster))
-		{
+		if (!dol_is_file($filemaster)) {
 			$result = dolSaveMasterFile($filemaster);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				setEventMessages('Failed to write file '.$filemaster, null, 'errors');
 			}
 		}
 
-		if (!dol_is_file($filehtmlheader))
-		{
+		if (!dol_is_file($filehtmlheader)) {
 			$htmlheadercontent = "<html>\n";
 			$htmlheadercontent .= $htmlheadercontentdefault;
 			$htmlheadercontent .= "</html>";
 			$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
 		}
 
-		if (!dol_is_file($filecss))
-		{
+		if (!dol_is_file($filecss)) {
 			$csscontent = "/* CSS content (all pages) */\nbody.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }\n.bodywebsite h1 { margin-top: 0; margin-bottom: 0; padding: 10px;}";
 			$result = dolSaveCssFile($filecss, $csscontent);
 		}
 
-		if (!dol_is_file($filejs))
-		{
+		if (!dol_is_file($filejs)) {
 			$jscontent = "/* JS content (all pages) */\n";
 			$result = dolSaveJsFile($filejs, $jscontent);
 		}
 
-		if (!dol_is_file($filerobot))
-		{
+		if (!dol_is_file($filerobot)) {
 			$robotcontent = "# Robot file. Generated with Dolibarr\nUser-agent: *\nAllow: /public/\nDisallow: /administrator/";
 			$result = dolSaveRobotFile($filerobot, $robotcontent);
 		}
 
-		if (!dol_is_file($filehtaccess))
-		{
+		if (!dol_is_file($filehtaccess)) {
 			$htaccesscontent = "# Order allow,deny\n# Deny from all";
 			$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
 		}
 
-		if (!dol_is_file($filemanifestjson))
-		{
+		if (!dol_is_file($filemanifestjson)) {
 			$manifestjsoncontent = "";
 			$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
 		}
 
-		if (!dol_is_file($filereadme))
-		{
+		if (!dol_is_file($filereadme)) {
 			$readmecontent = "Website generated by Dolibarr ERP CRM";
 			$result = dolSaveReadme($filereadme, $readmecontent);
 		}
@@ -1162,8 +1147,7 @@ if ($action == 'addcontainer')
 }
 
 // Delete site
-if ($action == 'confirm_deletesite' && $confirm == 'yes')
-{
+if ($action == 'confirm_deletesite' && $confirm == 'yes') {
 	$error = 0;
 
 	$db->begin();
@@ -1171,40 +1155,33 @@ if ($action == 'confirm_deletesite' && $confirm == 'yes')
 	$res = $object->fetch(GETPOST('id', 'int'));
 	$website = $object;
 
-	if ($res > 0)
-	{
+	if ($res > 0) {
 		$res = $object->delete($user);
-		if ($res <= 0)
-		{
+		if ($res <= 0) {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	if (!$error)
-	{
-		if (GETPOST('delete_also_js', 'alpha') == 'on')
-		{
+	if (!$error) {
+		if (GETPOST('delete_also_js', 'alpha') == 'on') {
 			$pathofwebsitejs = DOL_DATA_ROOT.'/medias/js/'.$object->ref;
 
 			dol_delete_dir_recursive($pathofwebsitejs);
 		}
-		if (GETPOST('delete_also_medias', 'alpha') == 'on')
-		{
+		if (GETPOST('delete_also_medias', 'alpha') == 'on') {
 			$pathofwebsitemedias = DOL_DATA_ROOT.'/medias/image/'.$object->ref;
 
 			dol_delete_dir_recursive($pathofwebsitemedias);
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("SiteDeleted", $object->ref), null, 'mesgs');
 
 		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 		exit;
-	}
-	else {
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -1221,25 +1198,21 @@ if (GETPOSTISSET('pageid') && $action == 'delete' && $permissiontodelete) {
 
 	$res = $objectpage->fetch($pageid, $object->id);
 
-	if ($res > 0)
-	{
+	if ($res > 0) {
 		$res = $objectpage->delete($user);
-		if ($res <= 0)
-		{
+		if ($res <= 0) {
 			$error++;
 			setEventMessages($objectpage->error, $objectpage->errors, 'errors');
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 		setEventMessages($langs->trans("PageDeleted", $objectpage->pageurl, $websitekey), null, 'mesgs');
 
 		header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey);
 		exit;
-	}
-	else {
+	} else {
 		$db->rollback();
 		dol_print_error($db);
 	}
@@ -1250,25 +1223,23 @@ if (!GETPOSTISSET('pageid')) {
 
 	// Add part of code from actions_massactions.inc.php
 	// Delete record from mass action (massaction = 'delete' for direct delete, action/confirm='delete'/'yes' with a confirmation step before)
-	if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete)
-	{
+	if (!$error && ($massaction == 'delete' || ($action == 'delete' && $confirm == 'yes')) && $permissiontodelete) {
 		$db->begin();
 
 		$objecttmp = new $objectclass($db);
 		$nbok = 0;
-		foreach ($toselect as $toselectid)
-		{
+		foreach ($toselect as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
-			if ($result > 0)
-			{
+			if ($result > 0) {
 				$result = $objecttmp->delete($user);
 
-				if ($result <= 0)
-				{
+				if ($result <= 0) {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
 					break;
-				} else $nbok++;
+				} else {
+					$nbok++;
+				}
 			} else {
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 				$error++;
@@ -1276,10 +1247,12 @@ if (!GETPOSTISSET('pageid')) {
 			}
 		}
 
-		if (!$error)
-		{
-			if ($nbok > 1) setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
-			else setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		if (!$error) {
+			if ($nbok > 1) {
+				setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
+			} else {
+				setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+			}
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -1302,29 +1275,23 @@ if (!GETPOSTISSET('pageid')) {
 }
 
 // Update css Update site properties
-if ($action == 'updatecss')
-{
+if ($action == 'updatecss') {
 	// If we tried to reload another site/page, we stay on editcss mode.
-	if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
-	{
+	if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x')) {
 		$action = 'editcss';
-	}
-	else {
+	} else {
 		$res = $object->fetch(0, $websitekey);
 		$website = $object;
 
-		if (GETPOSTISSET('virtualhost'))
-		{
+		if (GETPOSTISSET('virtualhost')) {
 			$tmpvirtualhost = preg_replace('/\/$/', '', GETPOST('virtualhost', 'alpha'));
-			if ($tmpvirtualhost && !preg_match('/^http/', $tmpvirtualhost))
-			{
+			if ($tmpvirtualhost && !preg_match('/^http/', $tmpvirtualhost)) {
 				$error++;
 				setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
 				$action = 'editcss';
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
 				foreach ($arrayotherlang as $key => $val) {
 					$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
@@ -1336,8 +1303,7 @@ if ($action == 'updatecss')
 				$object->use_manifest = GETPOST('use_manifest', 'alpha');
 
 				$result = $object->update($user);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'editcss';
@@ -1345,8 +1311,7 @@ if ($action == 'updatecss')
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// Save master.inc.php file
 			dol_syslog("Save master file ".$filemaster);
 
@@ -1354,8 +1319,7 @@ if ($action == 'updatecss')
 
 			// Now generate the master.inc.php page
 			$result = dolSaveMasterFile($filemaster);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				setEventMessages('Failed to write file '.$filemaster, null, 'errors');
 			}
@@ -1365,26 +1329,25 @@ if ($action == 'updatecss')
 			$htmlheadercontent = '';
 
 			/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
-    	    $htmlheadercontent.= "<?php // BEGIN PHP\n";
-    	    $htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
-    	    $htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
-    	    $htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    	    $htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    	    $htmlheadercontent.= "ob_start();\n";
-    	    // $htmlheadercontent.= "header('Content-type: text/html');\n";		// Not required. htmlheader.html is never call as a standalone page
-    	    $htmlheadercontent.= "// END PHP ?>\n";*/
+			$htmlheadercontent.= "<?php // BEGIN PHP\n";
+			$htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
+			$htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
+			$htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$htmlheadercontent.= "ob_start();\n";
+			// $htmlheadercontent.= "header('Content-type: text/html');\n";		// Not required. htmlheader.html is never call as a standalone page
+			$htmlheadercontent.= "// END PHP ?>\n";*/
 
 			$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
 
 			/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
-    	    $htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
-    	    $htmlheadercontent.= "// END PHP ?>"."\n";*/
+			$htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+			$htmlheadercontent.= "// END PHP ?>"."\n";*/
 
 			$htmlheadercontent = trim($htmlheadercontent)."\n";
 
 			$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
 			}
@@ -1414,8 +1377,7 @@ if ($action == 'updatecss')
 			dol_syslog("Save css content into ".$filecss);
 
 			$result = dolSaveCssFile($filecss, $csscontent);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				setEventMessages('Failed to write file '.$filecss, null, 'errors');
 			}
@@ -1441,8 +1403,7 @@ if ($action == 'updatecss')
 			$jscontent .= "// END PHP ?>\n";
 
 			$result = dolSaveJsFile($filejs, $jscontent);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				setEventMessages('Failed to write file '.$filejs, null, 'errors');
 			}
@@ -1452,24 +1413,23 @@ if ($action == 'updatecss')
 			$robotcontent = '';
 
 			/*$robotcontent.= "<?php // BEGIN PHP\n";
-    	    $robotcontent.= '$websitekey=basename(__DIR__);'."\n";
-    	    $robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
-    	    $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    	    $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    	    $robotcontent.= "ob_start();\n";
-    		$robotcontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    	    $robotcontent.= "header('Content-type: text/css');\n";
-    	    $robotcontent.= "// END PHP ?>\n";*/
+			$robotcontent.= '$websitekey=basename(__DIR__);'."\n";
+			$robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
+			$robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$robotcontent.= "ob_start();\n";
+			$robotcontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$robotcontent.= "header('Content-type: text/css');\n";
+			$robotcontent.= "// END PHP ?>\n";*/
 
 			$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'restricthtml'))."\n";
 
 			/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
-    	    $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
-    	    $robotcontent.= "// END PHP ?>"."\n";*/
+			$robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
+			$robotcontent.= "// END PHP ?>"."\n";*/
 
 			$result = dolSaveRobotFile($filerobot, $robotcontent);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				setEventMessages('Failed to write file '.$filerobot, null, 'errors');
 			}
@@ -1480,87 +1440,80 @@ if ($action == 'updatecss')
 			$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'restricthtml'))."\n";
 
 			$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
-			if (!$result)
-			{
+			if (!$result) {
 				$error++;
 				setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
 			}
 
 
-	   		// manifest.json file
-	   		$manifestjsoncontent = '';
+			// manifest.json file
+			$manifestjsoncontent = '';
 
-	   		$manifestjsoncontent .= "<?php // BEGIN PHP\n";
-	   		$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
-	   		$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-	   		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-	   		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-	   		$manifestjsoncontent .= "ob_start();\n";
-	   		$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-	   		$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
-	   		$manifestjsoncontent .= "// END PHP ?>\n";
+			$manifestjsoncontent .= "<?php // BEGIN PHP\n";
+			$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
+			$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+			$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$manifestjsoncontent .= "ob_start();\n";
+			$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
+			$manifestjsoncontent .= "// END PHP ?>\n";
 
-	   		$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
+			$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
 
-	   		$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
-	   		$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
-	   		$manifestjsoncontent .= "// END PHP ?>\n";
+			$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
+			$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+			$manifestjsoncontent .= "// END PHP ?>\n";
 
-	   		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
-	   		if (!$result)
-	   		{
-	   			$error++;
-	   			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
-	   		}
+			$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+			if (!$result) {
+				$error++;
+				setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
+			}
 
 
-	   		// README.md file
-	   		$readmecontent = '';
+			// README.md file
+			$readmecontent = '';
 
-	   		/*$readmecontent.= "<?php // BEGIN PHP\n";
-       		$readmecontent.= '$websitekey=basename(__DIR__);'."\n";
-       		$readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
-       		$readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-       		$readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-       		$readmecontent.= "ob_start();\n";
-       		$readmecontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-       		$readmecontent.= "header('Content-type: application/manifest+json');\n";
-       		$readmecontent.= "// END PHP ?>\n";*/
+			/*$readmecontent.= "<?php // BEGIN PHP\n";
+			   $readmecontent.= '$websitekey=basename(__DIR__);'."\n";
+			   $readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+			   $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			   $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			   $readmecontent.= "ob_start();\n";
+			   $readmecontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			   $readmecontent.= "header('Content-type: application/manifest+json');\n";
+			   $readmecontent.= "// END PHP ?>\n";*/
 
-	   		$readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
+			$readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
 
-	   		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
-       		$readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
-       		$readmecontent.= "// END PHP ?>"."\n";*/
+			/*$readmecontent.= '<?php // BEGIN PHP'."\n";
+			   $readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+			   $readmecontent.= "// END PHP ?>"."\n";*/
 
-	   		$result = dolSaveReadme($filereadme, $readmecontent);
-	   		if (!$result)
-	   		{
-	   			$error++;
-	   			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
-	   		}
+			$result = dolSaveReadme($filereadme, $readmecontent);
+			if (!$result) {
+				$error++;
+				setEventMessages('Failed to write file '.$filereadme, null, 'errors');
+			}
 
 
-	   		// Save wrapper.php
+			// Save wrapper.php
 			$result = dolSaveIndexPage($pathofwebsite, '', '', $filewrapper);
 
 
 			// Message if no error
-			if (!$error)
-			{
+			if (!$error) {
 				setEventMessages($langs->trans("Saved"), null, 'mesgs');
 			}
 
-			if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
-			{
+			if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we don not make the redirect
 				$action = 'preview';
-				if ($backtopage)
-				{
+				if ($backtopage) {
 					header("Location: ".$backtopage);
 					exit;
 				}
-			}
-			else {
+			} else {
 				$action = 'editcss';
 			}
 		}
@@ -1568,22 +1521,19 @@ if ($action == 'updatecss')
 }
 
 // Update page
-if ($action == 'setashome')
-{
+if ($action == 'setashome') {
 	$db->begin();
 	$object->fetch(0, $websitekey);
 	$website = $object;
 
 	$object->fk_default_home = $pageid;
 	$res = $object->update($user);
-	if (! ($res > 0))
-	{
+	if (! ($res > 0)) {
 		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
 
 		$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
@@ -1591,19 +1541,20 @@ if ($action == 'setashome')
 		// Generate the index.php page to be the home page
 		$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
 
-		if ($result) setEventMessages($langs->trans("Saved"), null, 'mesgs');
-		else setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+		if ($result) {
+			setEventMessages($langs->trans("Saved"), null, 'mesgs');
+		} else {
+			setEventMessages('Failed to write file '.$fileindex, null, 'errors');
+		}
 
 		$action = 'preview';
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 }
 
 // Update page properties (meta)
-if ($action == 'updatemeta')
-{
+if ($action == 'updatemeta') {
 	$db->begin();
 
 	$result = $object->fetch(0, $websitekey);
@@ -1612,8 +1563,7 @@ if ($action == 'updatemeta')
 	$objectpage->fk_website = $object->id;
 
 	// Check parameters
-	if (!preg_match('/^[a-z0-9\-\_]+$/i', GETPOST('WEBSITE_PAGENAME', 'alpha')))
-	{
+	if (!preg_match('/^[a-z0-9\-\_]+$/i', GETPOST('WEBSITE_PAGENAME', 'alpha'))) {
 		$error++;
 		$langs->load("errors");
 		setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities('WEBSITE_PAGENAME')), null, 'errors');
@@ -1621,38 +1571,32 @@ if ($action == 'updatemeta')
 	}
 
 	$res = $objectpage->fetch($pageid, $object->id);
-	if ($res <= 0)
-	{
+	if ($res <= 0) {
 		$error++;
 		setEventMessages('Page not found '.$objectpage->error, $objectpage->errors, 'errors');
 	}
 
 	// Check alias not exists
-	if (!$error && GETPOST('WEBSITE_PAGENAME', 'alpha'))
-	{
+	if (!$error && GETPOST('WEBSITE_PAGENAME', 'alpha')) {
 		$websitepagetemp = new WebsitePage($db);
 		$result = $websitepagetemp->fetch(-1 * $objectpage->id, $object->id, GETPOST('WEBSITE_PAGENAME', 'alpha'));
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($websitepagetemp->error, $websitepagetemp->errors, 'errors');
 			$action = 'editmeta';
 		}
-		if ($result > 0)
-		{
+		if ($result > 0) {
 			$error++;
 			$langs->load("errors");
 			setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists", $websitepagetemp->pageurl), null, 'errors');
 			$action = 'editmeta';
 		}
 	}
-	if (!$error && GETPOST('WEBSITE_ALIASALT', 'alpha'))
-	{
+	if (!$error && GETPOST('WEBSITE_ALIASALT', 'alpha')) {
 		$arrayofaliastotest = explode(',', GETPOST('WEBSITE_ALIASALT', 'alpha'));
 		$websitepagetemp = new WebsitePage($db);
-		foreach ($arrayofaliastotest as $aliastotest)
-		{
+		foreach ($arrayofaliastotest as $aliastotest) {
 			// Disallow alias name pageX (already used to save the page with id)
 			if (preg_match('/^page\d+/i', $aliastotest)) {
 				$error++;
@@ -1662,16 +1606,14 @@ if ($action == 'updatemeta')
 				break;
 			} else {
 				$result = $websitepagetemp->fetch(-1 * $objectpage->id, $object->id, $aliastotest);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					$error++;
 					$langs->load("errors");
 					setEventMessages($websitepagetemp->error, $websitepagetemp->errors, 'errors');
 					$action = 'editmeta';
 					break;
 				}
-				if ($result > 0)
-				{
+				if ($result > 0) {
 					$error++;
 					$langs->load("errors");
 					setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists", $websitepagetemp->pageurl), null, 'errors');
@@ -1682,8 +1624,7 @@ if ($action == 'updatemeta')
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$objectpage->old_object = clone $objectpage;
 
 		$objectpage->title = str_replace(array('<', '>'), '', GETPOST('WEBSITE_TITLE', 'alphanohtml'));
@@ -1703,20 +1644,19 @@ if ($action == 'updatemeta')
 		$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID', 'aZ09');
 
 		$newdatecreation = dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
-		if ($newdatecreation) $objectpage->date_creation = $newdatecreation;
+		if ($newdatecreation) {
+			$objectpage->date_creation = $newdatecreation;
+		}
 
 		$res = $objectpage->update($user);
-		if (!($res > 0))
-		{
+		if (!($res > 0)) {
 			$langs->load("errors");
-			if ($db->lasterrno == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-			{
+			if ($db->lasterrno == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorAPageWithThisNameOrAliasAlreadyExists"), null, 'errors');
 				$action = 'editmeta';
-			}
-			else {
+			} else {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($objectpage->error, $objectpage->errors, 'errors');
@@ -1729,23 +1669,19 @@ if ($action == 'updatemeta')
 		// Website categories association
 		$categoriesarray = GETPOST('categories', 'array');
 		$result = $objectpage->setCategories($categoriesarray);
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$error++;
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$db->commit();
-	}
-	else {
+	} else {
 		$db->rollback();
 	}
 
-	if (!$error)
-	{
+	if (!$error) {
 		$filemaster = $pathofwebsite.'/master.inc.php';
 		$fileoldalias = $pathofwebsite.'/'.$objectpage->old_object->pageurl.'.php';
 		$filealias = $pathofwebsite.'/'.$objectpage->pageurl.'.php';
@@ -1754,11 +1690,12 @@ if ($action == 'updatemeta')
 
 		// Now generate the master.inc.php page
 		$result = dolSaveMasterFile($filemaster);
-		if (!$result) setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+		if (!$result) {
+			setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+		}
 
 		// Now delete the alias.php page
-		if (!empty($fileoldalias))
-		{
+		if (!empty($fileoldalias)) {
 			dol_syslog("We delete old alias page name=".$fileoldalias." to build a new alias page=".$filealias);
 			dol_delete_file($fileoldalias);
 
@@ -1774,13 +1711,10 @@ if ($action == 'updatemeta')
 			}
 		}
 		// Now delete the alternative alias.php pages
-		if (!empty($objectpage->old_object->aliasalt))
-		{
+		if (!empty($objectpage->old_object->aliasalt)) {
 			$tmpaltaliases = explode(',', $objectpage->old_object->aliasalt);
-			if (is_array($tmpaltaliases))
-			{
-				foreach ($tmpaltaliases as $tmpaliasalt)
-				{
+			if (is_array($tmpaltaliases)) {
+				foreach ($tmpaltaliases as $tmpaliasalt) {
 					dol_syslog("We delete old alt alias pages name=".trim($tmpaliasalt));
 					dol_delete_file($pathofwebsite.'/'.trim($tmpaliasalt).'.php');
 
@@ -1800,20 +1734,20 @@ if ($action == 'updatemeta')
 
 		// Save page main alias
 		$result = dolSavePageAlias($filealias, $object, $objectpage);
-		if (!$result) setEventMessages('Failed to write file '.$filealias, null, 'errors');
+		if (!$result) {
+			setEventMessages('Failed to write file '.$filealias, null, 'errors');
+		}
 		// Save alt aliases
-		if (!empty($objectpage->aliasalt))
-		{
+		if (!empty($objectpage->aliasalt)) {
 			$tmpaltaliases = explode(',', $objectpage->aliasalt);
-			if (is_array($tmpaltaliases))
-			{
-				foreach ($tmpaltaliases as $tmpaliasalt)
-				{
-					if (trim($tmpaliasalt))
-					{
+			if (is_array($tmpaltaliases)) {
+				foreach ($tmpaltaliases as $tmpaliasalt) {
+					if (trim($tmpaliasalt)) {
 						$filealias = $pathofwebsite.'/'.trim($tmpaliasalt).'.php';
 						$result = dolSavePageAlias($filealias, $object, $objectpage);
-						if (!$result) setEventMessages('Failed to write file '.basename($filealias), null, 'errors');
+						if (!$result) {
+							setEventMessages('Failed to write file '.basename($filealias), null, 'errors');
+						}
 					}
 				}
 			}
@@ -1822,24 +1756,20 @@ if ($action == 'updatemeta')
 
 		// Save page of content
 		$result = dolSavePageContent($filetpl, $object, $objectpage);
-		if ($result)
-		{
+		if ($result) {
 			setEventMessages($langs->trans("Saved"), null, 'mesgs');
 
-			if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we do not make the redirect
-			{
+			if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we do not make the redirect
 				//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
 				//exit;
 				$action = 'preview';
-			}
-			else {
+			} else {
 				$action = 'editmeta';
 			}
-		}
-		else {
+		} else {
 			setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 			//header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
-   			//exit;
+			//exit;
 			$action = 'preview';
 		}
 	}
@@ -1847,27 +1777,23 @@ if ($action == 'updatemeta')
 
 // Update page
 if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'confirm_createfromclone' || $action == 'confirm_createpagefromclone')
-	|| ($action == 'preview' && (GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview'))))
-{
+	|| ($action == 'preview' && (GETPOST('refreshsite') || GETPOST('refreshpage') || GETPOST('preview')))) {
 	$object->fetch(0, $websitekey);
 	$website = $object;
 
-	if ($action == 'confirm_createfromclone')
-	{
+	if ($action == 'confirm_createfromclone') {
 		$db->begin();
 
 		$objectnew = new Website($db);
 		$result = $objectnew->createFromClone($user, GETPOST('id', 'int'), GETPOST('siteref', 'aZ09'), (GETPOST('newlang', 'aZ09') ?GETPOST('newlang', 'aZ09') : ''));
 
-		if ($result < 0)
-		{
+		if ($result < 0) {
 			$error++;
 			setEventMessages($objectnew->error, $objectnew->errors, 'errors');
 			$action = 'preview';
 
 			$db->rollback();
-		}
-		else {
+		} else {
 			$object = $objectnew;
 			$id = $object->id;
 			$pageid = $object->fk_default_home;
@@ -1877,12 +1803,10 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 		}
 	}
 
-	if ($action == 'confirm_createpagefromclone')
-	{
+	if ($action == 'confirm_createpagefromclone') {
 		$istranslation = (GETPOST('is_a_translation', 'aZ09') == 'on' ? 1 : 0);
 		// Protection if it is a translation page
-		if ($istranslation)
-		{
+		if ($istranslation) {
 			if (GETPOST('newlang', 'aZ09') == $objectpage->lang || !GETPOST('newlang', 'aZ09')) {
 				$error++;
 				setEventMessages($langs->trans("LanguageMustNotBeSameThanClonedPage"), null, 'errors');
@@ -1895,27 +1819,23 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$db->begin();
 
 			$newwebsiteid = GETPOST('newwebsite', 'int');
 			$pathofwebsitenew = $pathofwebsite;
 
 			$tmpwebsite = new Website($db);
-			if ($newwebsiteid > 0 && $newwebsiteid != $object->id)
-			{
+			if ($newwebsiteid > 0 && $newwebsiteid != $object->id) {
 				$tmpwebsite->fetch($newwebsiteid);
 				$pathofwebsitenew = $dolibarr_main_data_root.'/website/'.$tmpwebsite->ref;
-			}
-			else {
+			} else {
 				$tmpwebsite = $object;
 			}
 
 			$objectpage = new WebsitePage($db);
 			$resultpage = $objectpage->createFromClone($user, $pageid, GETPOST('newpageurl', 'aZ09'), (GETPOST('newlang', 'aZ09') ? GETPOST('newlang', 'aZ09') : ''), $istranslation, $newwebsiteid, GETPOST('newtitle', 'alphanohtml'));
-			if ($resultpage < 0)
-			{
+			if ($resultpage < 0) {
 				$error++;
 				setEventMessages($objectpage->error, $objectpage->errors, 'errors');
 				$action = 'createpagefromclone';
@@ -1933,8 +1853,7 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 				dolSavePageContent($filetpl, $tmpwebsite, $resultpage);
 
 				// Switch on the new page if web site of new page/container is same
-				if (empty($newwebsiteid) || $newwebsiteid == $object->id)
-				{
+				if (empty($newwebsiteid) || $newwebsiteid == $object->id) {
 					$pageid = $resultpage->id;
 				}
 
@@ -1945,47 +1864,39 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 	$res = 0;
 
-	if (!$error)
-	{
+	if (!$error) {
 		// Check symlink to medias and restore it if ko
 		$pathtomedias = DOL_DATA_ROOT.'/medias';
 		$pathtomediasinwebsite = $pathofwebsite.'/medias';
-		if (!is_link(dol_osencode($pathtomediasinwebsite)))
-		{
+		if (!is_link(dol_osencode($pathtomediasinwebsite))) {
 			dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
 			dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
 			$result = symlink($pathtomedias, $pathtomediasinwebsite);
 		}
 
 		/*if (GETPOST('savevirtualhost') && $object->virtualhost != GETPOST('previewsite'))
-	    {
-	        $object->virtualhost = GETPOST('previewsite', 'alpha');
-	        $object->update($user);
-	    }*/
+		{
+			$object->virtualhost = GETPOST('previewsite', 'alpha');
+			$object->update($user);
+		}*/
 
 		$objectpage->fk_website = $object->id;
 
-		if ($pageid > 0)
-		{
+		if ($pageid > 0) {
 			$res = $objectpage->fetch($pageid);
-		}
-		else {
+		} else {
 			$res = 0;
-			if ($object->fk_default_home > 0)
-			{
+			if ($object->fk_default_home > 0) {
 				$res = $objectpage->fetch($object->fk_default_home);
 			}
-			if (!($res > 0))
-			{
+			if (!($res > 0)) {
 				$res = $objectpage->fetch(0, $object->id);
 			}
 		}
 	}
 
-	if (!$error && $res > 0)
-	{
-		if ($action == 'updatesource' || $action == 'updatecontent')
-		{
+	if (!$error && $res > 0) {
+		if ($action == 'updatesource' || $action == 'updatecontent') {
 			$db->begin();
 
 			$phpfullcodestringold = dolKeepOnlyPhpCode($objectpage->content);
@@ -1996,29 +1907,32 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 			//print dol_escape_htmltag($phpfullcodestring);exit;
 			$forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open");
-			if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
-			{
+			if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE)) {    // If option is not on, we disallow functions to write files
 				$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
 			}
-			foreach ($forbiddenphpcommands as $forbiddenphpcommand)
-			{
-				if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
-				{
+			foreach ($forbiddenphpcommands as $forbiddenphpcommand) {
+				if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring)) {
 					$error++;
 					setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
-					if ($action == 'updatesource') $action = 'editsource';
-					if ($action == 'updatecontent') $action = 'editcontent';
+					if ($action == 'updatesource') {
+						$action = 'editsource';
+					}
+					if ($action == 'updatecontent') {
+						$action = 'editcontent';
+					}
 				}
 			}
 
-			if (empty($user->rights->website->writephp))
-			{
-				if ($phpfullcodestringold != $phpfullcodestring)
-				{
+			if (empty($user->rights->website->writephp)) {
+				if ($phpfullcodestringold != $phpfullcodestring) {
 					$error++;
 					setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
-					if ($action == 'updatesource') $action = 'editsource';
-					if ($action == 'updatecontent') $action = 'editcontent';
+					if ($action == 'updatesource') {
+						$action = 'editsource';
+					}
+					if ($action == 'updatecontent') {
+						$action = 'editcontent';
+					}
 				}
 			}
 
@@ -2028,16 +1942,18 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 
 			$res = $objectpage->update($user);
-			if ($res < 0)
-			{
+			if ($res < 0) {
 				$error++;
 				setEventMessages($objectpage->error, $objectpage->errors, 'errors');
-				if ($action == 'updatesource') $action = 'editsource';
-				if ($action == 'updatecontent') $action = 'editcontent';
+				if ($action == 'updatesource') {
+					$action = 'editsource';
+				}
+				if ($action == 'updatecontent') {
+					$action = 'editcontent';
+				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$db->commit();
 
 				$filemaster = $pathofwebsite.'/master.inc.php';
@@ -2049,7 +1965,9 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 				// Now generate the master.inc.php page
 				$result = dolSaveMasterFile($filemaster);
 
-				if (!$result) setEventMessages('Failed to write the master file file '.$filemaster, null, 'errors');
+				if (!$result) {
+					setEventMessages('Failed to write the master file file '.$filemaster, null, 'errors');
+				}
 
 				// Now delete the old alias.php page if we removed one
 				/*if (!empty($fileoldalias))
@@ -2071,16 +1989,16 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 				// Save page alias
 				$result = dolSavePageAlias($filealias, $object, $objectpage);
-				if (!$result) setEventMessages('Failed to write the alias file '.basename($filealias), null, 'errors');
+				if (!$result) {
+					setEventMessages('Failed to write the alias file '.basename($filealias), null, 'errors');
+				}
 
 				// Save page content
 				$result = dolSavePageContent($filetpl, $object, $objectpage);
-				if ($result)
-				{
+				if ($result) {
 					setEventMessages($langs->trans("Saved"), null, 'mesgs');
 
-					if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we do not make the redirect
-					{
+					if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we do not make the redirect
 						if ($backtopage) {
 							header("Location: ".$backtopage);
 							exit;
@@ -2089,13 +2007,17 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 							exit;
 						}
 					} else {
-						if ($action == 'updatesource') $action = 'editsource';
-						if ($action == 'updatecontent') $action = 'editcontent';
+						if ($action == 'updatesource') {
+							$action = 'editsource';
+						}
+						if ($action == 'updatecontent') {
+							$action = 'editcontent';
+						}
 					}
 				} else {
 					setEventMessages('Failed to write file '.$filetpl, null, 'errors');
 					header("Location: ".$_SERVER["PHP_SELF"].'?website='.$websitekey.'&pageid='.$pageid);
-	   				exit;
+					exit;
 				}
 			} else {
 				$db->rollback();
@@ -2105,10 +2027,8 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 			exit;
 		}
 	} else {
-		if (!$error)
-		{
-			if (empty($websitekey) || $websitekey == '-1')
-			{
+		if (!$error) {
+			if (empty($websitekey) || $websitekey == '-1') {
 				setEventMessages($langs->trans("NoWebSiteCreateOneFirst"), null, 'warnings');
 			} else {
 				setEventMessages($langs->trans("NoPageYet"), null, 'warnings');
@@ -2119,12 +2039,10 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 }
 
 // Export site
-if ($action == 'exportsite')
-{
+if ($action == 'exportsite') {
 	$fileofzip = $object->exportWebSite();
 
-	if ($fileofzip)
-	{
+	if ($fileofzip) {
 		$file_name = basename($fileofzip);
 
 		header("Content-Type: application/zip");
@@ -2133,19 +2051,16 @@ if ($action == 'exportsite')
 
 		readfile($fileofzip);
 		exit;
-	}
-	else {
+	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'preview';
 	}
 }
 
 // Regenerate site
-if ($action == 'regeneratesite')
-{
+if ($action == 'regeneratesite') {
 	$result = $object->rebuildWebSiteFiles();
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		setEventMessages($langs->trans("PagesRegenerated", $result), null, 'mesgs');
 		$action = 'preview';
 	} else {
@@ -2155,83 +2070,68 @@ if ($action == 'regeneratesite')
 }
 
 // Import site
-if ($action == 'importsiteconfirm')
-{
-	if (empty($_FILES) && !GETPOSTISSET('templateuserfile'))
-	{
+if ($action == 'importsiteconfirm') {
+	if (empty($_FILES) && !GETPOSTISSET('templateuserfile')) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 		$action = 'importsite';
-	}
-	else {
-		if (!empty($_FILES) || GETPOSTISSET('templateuserfile'))
-		{
+	} else {
+		if (!empty($_FILES) || GETPOSTISSET('templateuserfile')) {
 			// Check symlink to medias and restore it if ko
 			$pathtomedias = DOL_DATA_ROOT.'/medias';
 			$pathtomediasinwebsite = $pathofwebsite.'/medias';
-			if (!is_link(dol_osencode($pathtomediasinwebsite)))
-			{
+			if (!is_link(dol_osencode($pathtomediasinwebsite))) {
 				dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
 				dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
 				$result = symlink($pathtomedias, $pathtomediasinwebsite);
-				if (!$result)
-				{
+				if (!$result) {
 					setEventMessages($langs->trans("ErrorFieldToCreateSymLinkToMedias", $pathtomediasinwebsite, $pathtomedias), null, 'errors');
 					$action = 'importsite';
 				}
 			}
 
 			$fileofzip = '';
-			if (GETPOSTISSET('templateuserfile'))
-			{
+			if (GETPOSTISSET('templateuserfile')) {
 				$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha');
-			}
-			elseif (!empty($_FILES))
-			{
-				if (is_array($_FILES['userfile']['tmp_name'])) $userfiles = $_FILES['userfile']['tmp_name'];
-				else $userfiles = array($_FILES['userfile']['tmp_name']);
+			} elseif (!empty($_FILES)) {
+				if (is_array($_FILES['userfile']['tmp_name'])) {
+					$userfiles = $_FILES['userfile']['tmp_name'];
+				} else {
+					$userfiles = array($_FILES['userfile']['tmp_name']);
+				}
 
-				foreach ($userfiles as $key => $userfile)
-				{
-					if (empty($_FILES['userfile']['tmp_name'][$key]))
-					{
+				foreach ($userfiles as $key => $userfile) {
+					if (empty($_FILES['userfile']['tmp_name'][$key])) {
 						$error++;
 						if ($_FILES['userfile']['error'][$key] == 1 || $_FILES['userfile']['error'][$key] == 2) {
 							setEventMessages($langs->trans('ErrorFileSizeTooLarge'), null, 'errors');
 							$action = 'importsite';
-						}
-						else {
+						} else {
 							setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("File")), null, 'errors');
 							$action = 'importsite';
 						}
 					}
 				}
 
-				if (!$error)
-				{
+				if (!$error) {
 					$upload_dir = $conf->website->dir_temp;
 					$result = dol_add_file_process($upload_dir, 1, -1, 'userfile', '');
 				}
 
 				// Get name of file (take last one if several name provided)
 				$fileofzip = $upload_dir.'/unknown';
-				foreach ($_FILES as $key => $ifile)
-				{
-					foreach ($ifile['name'] as $key2 => $ifile2)
-					{
+				foreach ($_FILES as $key => $ifile) {
+					foreach ($ifile['name'] as $key2 => $ifile2) {
 						$fileofzip = $upload_dir.'/'.$ifile2;
 					}
 				}
 			}
 
-			if (!$error)
-			{
+			if (!$error) {
 				$result = $object->importWebSite($fileofzip);
-				if ($result < 0)
-				{
+				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'importsite';
-				}
-				else {
+				} else {
 					// Force mode dynamic on
 					dolibarr_set_const($db, 'WEBSITE_SUBCONTAINERSINLINE', 1, 'chaine', 0, '', $conf->entity);
 
@@ -2271,7 +2171,9 @@ $moreheadjs = '';
 
 $arrayofjs[] = 'includes/jquery/plugins/blockUI/jquery.blockUI.js';
 $arrayofjs[] = 'core/js/blockUI.js'; // Used by ecm/tpl/enabledfiletreeajax.tpl.php
-if (empty($conf->global->MAIN_ECM_DISABLE_JS)) $arrayofjs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+if (empty($conf->global->MAIN_ECM_DISABLE_JS)) {
+	$arrayofjs[] = "includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js";
+}
 
 $moreheadjs .= '<script type="text/javascript">'."\n";
 $moreheadjs .= 'var indicatorBlockUI = \''.DOL_URL_ROOT."/theme/".$conf->theme."/img/working.gif".'\';'."\n";
@@ -2284,56 +2186,43 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
-if ($action == 'createsite')
-{
+if ($action == 'createsite') {
 	print '<input type="hidden" name="action" value="addsite">';
 }
-if ($action == 'createcontainer')
-{
+if ($action == 'createcontainer') {
 	print '<input type="hidden" name="action" value="addcontainer">';
 }
-if ($action == 'editcss')
-{
+if ($action == 'editcss') {
 	print '<input type="hidden" name="action" value="updatecss">';
 }
-if ($action == 'editmenu')
-{
+if ($action == 'editmenu') {
 	print '<input type="hidden" name="action" value="updatemenu">';
 }
-if ($action == 'setashome')
-{
+if ($action == 'setashome') {
 	print '<input type="hidden" name="action" value="updateashome">';
 }
-if ($action == 'editmeta')
-{
+if ($action == 'editmeta') {
 	print '<input type="hidden" name="action" value="updatemeta">';
 }
-if ($action == 'editsource')
-{
+if ($action == 'editsource') {
 	print '<input type="hidden" name="action" value="updatesource">';
 }
-if ($action == 'editcontent')
-{
+if ($action == 'editcontent') {
 	print '<input type="hidden" name="action" value="updatecontent">';
 }
-if ($action == 'edit')
-{
+if ($action == 'edit') {
 	print '<input type="hidden" name="action" value="update">';
 }
-if ($action == 'importsite')
-{
+if ($action == 'importsite') {
 	print '<input type="hidden" name="action" value="importsiteconfirm">';
 }
-if ($action == 'file_manager')
-{
+if ($action == 'file_manager') {
 	print '<input type="hidden" name="action" value="file_manager">';
 }
-if ($action == 'replacesite')
-{
+if ($action == 'replacesite') {
 	print '<input type="hidden" name="action" value="replacesiteconfirm">';
 }
-if ($action == 'replacesiteconfirm')
-{
+if ($action == 'replacesiteconfirm') {
 	print '<input type="hidden" name="action" value="replacesiteconfirm">';
 }
 
@@ -2341,28 +2230,33 @@ print '<div>';
 
 // Add a margin under toolbar ?
 $style = '';
-if ($action != 'preview' && $action != 'editcontent' && $action != 'editsource' && !GETPOST('createpagefromclone', 'alphanohtml')) $style = ' margin-bottom: 5px;';
+if ($action != 'preview' && $action != 'editcontent' && $action != 'editsource' && !GETPOST('createpagefromclone', 'alphanohtml')) {
+	$style = ' margin-bottom: 5px;';
+}
 
 
-if (!GETPOST('hide_websitemenu'))
-{
+if (!GETPOST('hide_websitemenu')) {
 	$disabled = '';
-	if (empty($user->rights->website->write)) $disabled = ' disabled="disabled"';
+	if (empty($user->rights->website->write)) {
+		$disabled = ' disabled="disabled"';
+	}
 
-	if ($websitekey)
-	{
+	if ($websitekey) {
 		$virtualurl = '';
 		$dataroot = DOL_DATA_ROOT.'/website/'.$websitekey;
-		if (!empty($object->virtualhost)) $virtualurl = $object->virtualhost;
+		if (!empty($object->virtualhost)) {
+			$virtualurl = $object->virtualhost;
+		}
 	}
 
 	$array = array();
-	if ($object->id > 0)
-	{
+	if ($object->id > 0) {
 		$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
 		$object->lines = $array;
 	}
-	if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+	if (!is_array($array) && $array < 0) {
+		dol_print_error('', $objectpage->error, $objectpage->errors);
+	}
 	$atleastonepage = (is_array($array) && count($array) > 0);
 
 
@@ -2390,21 +2284,26 @@ if (!GETPOST('hide_websitemenu'))
 		print '<span class="websiteselection">';
 		$out = '';
 		$out .= '<select name="website" class="minwidth100 width200 maxwidth150onsmartphone" id="website">';
-		if (empty($object->records)) $out .= '<option value="-1">&nbsp;</option>';
+		if (empty($object->records)) {
+			$out .= '<option value="-1">&nbsp;</option>';
+		}
 		if (!empty($conf->use_javascript_ajax)) {
 			$valueoption = '<span class="classlink">'.img_picto('', 'add', 'class="paddingrightonly"').$langs->trans("AddWebsite").'</span>';
 			$out .= '<option value="-2" data-html="'.dol_escape_htmltag($valueoption).'">'.$valueoption.'</option>';
 		}
 		// Loop on each sites
 		$i = 0;
-		foreach ($object->records as $key => $valwebsite)
-		{
+		foreach ($object->records as $key => $valwebsite) {
 			if (empty($websitekey)) {
-				if ($action != 'createsite') $websitekey = $valwebsite->ref;
+				if ($action != 'createsite') {
+					$websitekey = $valwebsite->ref;
+				}
 			}
 
 			$out .= '<option value="'.$valwebsite->ref.'"';
-			if ($websitekey == $valwebsite->ref) $out .= ' selected'; // To preselect a value
+			if ($websitekey == $valwebsite->ref) {
+				$out .= ' selected'; // To preselect a value
+			}
 			//$outoption = $valwebsite->getLibStatut(3).' '.$valwebsite->ref.' ';
 			$outoption = (($valwebsite->status == $valwebsite::STATUS_DRAFT) ? '<span class="opacitymedium">' : '').$valwebsite->ref.(($valwebsite->status == $valwebsite::STATUS_DRAFT) ? '</span>' : '');
 			$out .= ' data-html="'.dol_escape_htmltag($outoption).'"';
@@ -2436,8 +2335,7 @@ if (!GETPOST('hide_websitemenu'))
 			print '<input type="image" class="valignmiddle" src="'.img_picto('', 'refresh', '', 0, 1).'" name="refreshsite" value="'.$langs->trans("Load").'">';
 		}
 
-		if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
-		{
+		if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) {
 			print ' &nbsp; ';
 
 			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditCss")).'" name="editcss">';
@@ -2449,11 +2347,9 @@ if (!GETPOST('hide_websitemenu'))
 				$exportlabel = $langs->trans("Export");
 			}
 
-			if ($atleastonepage)
-			{
+			if ($atleastonepage) {
 				print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
-			}
-			else {
+			} else {
 				print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($importlabel).'" name="importsite">';
 			}
 
@@ -2474,8 +2370,7 @@ if (!GETPOST('hide_websitemenu'))
 
 		print '</span>';
 
-		if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
-		{
+		if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) {
 			print '<span class="websiteselection">';
 			//print '<a href="'.$_SERVER["PHP_SELF"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"><span></a>';
 			print dolButtonToOpenUrlInDialogPopup('file_manager', $langs->transnoentitiesnoconv("MediaFiles"), '<span class="fa fa-image"><span>', '/website/index.php?action=file_manager&website='.$website->ref, $disabled);
@@ -2494,8 +2389,7 @@ if (!GETPOST('hide_websitemenu'))
 
 	print '<span class="websitetools websiteselection">';
 
-	if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
-	{
+	if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite') {
 		$urlext = $virtualurl;
 		$urlint = $urlwithroot.'/public/website/index.php?website='.$websitekey;
 
@@ -2504,22 +2398,16 @@ if (!GETPOST('hide_websitemenu'))
 		$linktotestonwebserver .= '<span class="hideonsmartphone paddingrightonly">'.$langs->trans("TestDeployOnWeb", $virtualurl).'</span>'.img_picto('', 'globe');
 		$linktotestonwebserver .= '</a>';
 		$htmltext = '';
-		if (empty($object->fk_default_home))
-		{
+		if (empty($object->fk_default_home)) {
 			$htmltext .= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
-		}
-		elseif (empty($virtualurl))
-		{
+		} elseif (empty($virtualurl)) {
 			//$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
-		}
-		else {
+		} else {
 			$htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
-		if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
-		{
+		if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER)) {
 			$htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
-		}
-		else {
+		} else {
 			$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
 			$htmltext .= '<br>';
 			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
@@ -2556,12 +2444,19 @@ if (!GETPOST('hide_websitemenu'))
 		print '</span>';
 	}
 
-	if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm')))
-	{
-		if ($action == 'editcss') print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
-		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-		if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-		if ($action != 'preview') print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+	if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm'))) {
+		if ($action == 'editcss') {
+			print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+		}
+		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
+			print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+		}
+		if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
+			print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+		}
+		if ($action != 'preview') {
+			print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+		}
 	}
 
 	print '</span>';
@@ -2570,8 +2465,7 @@ if (!GETPOST('hide_websitemenu'))
 	// Toolbar for pages
 	//
 
-	if ($websitekey && $websitekey != '-1' && !in_array($action, array('editcss', 'editmenu', 'importsite', 'file_manager', 'replacesite', 'replacesiteconfirm')) && !$file_manager)
-	{
+	if ($websitekey && $websitekey != '-1' && !in_array($action, array('editcss', 'editmenu', 'importsite', 'file_manager', 'replacesite', 'replacesiteconfirm')) && !$file_manager) {
 		print '</div>'; // Close current websitebar to open a new one
 
 		print '<!-- Bar for websitepage -->';
@@ -2587,8 +2481,7 @@ if (!GETPOST('hide_websitemenu'))
 
 		//print '<span class="websiteselection">';
 
-		if ($action != 'addcontainer')
-		{
+		if ($action != 'addcontainer') {
 			$out = '';
 
 			$s = $formwebsite->selectContainer($website, 'pageid', $pageid, 0, $action, 'maxwidth200onsmartphone');
@@ -2617,8 +2510,7 @@ if (!GETPOST('hide_websitemenu'))
 			}
 
 			print $out;
-		}
-		else {
+		} else {
 			print $langs->trans("New");
 		}
 
@@ -2629,47 +2521,50 @@ if (!GETPOST('hide_websitemenu'))
 		// Print nav arrows
 		$pagepreviousid = 0;
 		$pagenextid = 0;
-		if ($pageid)
-		{
+		if ($pageid) {
 			$sql = 'SELECT MAX(rowid) as pagepreviousid FROM '.MAIN_DB_PREFIX.'website_page WHERE rowid < '.$pageid.' AND fk_website = '.$object->id;
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if ($obj)
-				{
+				if ($obj) {
 					$pagepreviousid = $obj->pagepreviousid;
 				}
+			} else {
+				dol_print_error($db);
 			}
-			else dol_print_error($db);
 			$sql = 'SELECT MIN(rowid) as pagenextid FROM '.MAIN_DB_PREFIX.'website_page WHERE rowid > '.$pageid.' AND fk_website = '.$object->id;
 			$resql = $db->query($sql);
-			if ($resql)
-			{
+			if ($resql) {
 				$obj = $db->fetch_object($resql);
-				if ($obj)
-				{
+				if ($obj) {
 					$pagenextid = $obj->pagenextid;
 				}
+			} else {
+				dol_print_error($db);
 			}
-			else dol_print_error($db);
 		}
 
-		if ($pagepreviousid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
-		else print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("Previous")).'</span>';
-		if ($pagenextid) print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'">'.img_next($langs->trans("NextContainer")).'</a>';
-		else print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("Next")).'</span>';
+		if ($pagepreviousid) {
+			print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
+		} else {
+			print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("Previous")).'</span>';
+		}
+		if ($pagenextid) {
+			print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'">'.img_next($langs->trans("NextContainer")).'</a>';
+		} else {
+			print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("Next")).'</span>';
+		}
 
 		$websitepage = new WebSitePage($db);
-		if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone'))
-		{
+		if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')) {
 			$websitepage->fetch($pageid);
 		}
 
-		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
-		{
+		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite') {
 			$disabled = '';
-			if (empty($user->rights->website->write)) $disabled = ' disabled="disabled"';
+			if (empty($user->rights->website->write)) {
+				$disabled = ' disabled="disabled"';
+			}
 
 			// Confirmation delete site
 			if ($action == 'deletesite') {
@@ -2698,8 +2593,7 @@ if (!GETPOST('hide_websitemenu'))
 				print $formconfirm;
 			}
 
-			if ($pageid > 0 && $atleastonepage)		// pageid can be set without pages, if homepage of site is set and all pages were removed
-			{
+			if ($pageid > 0 && $atleastonepage) {		// pageid can be set without pages, if homepage of site is set and all pages were removed
 				// Confirmation to clone
 				if ($action == 'createpagefromclone') {
 					// Create an array for form
@@ -2730,7 +2624,7 @@ if (!GETPOST('hide_websitemenu'))
 					$value= $formadmin->select_language($preselectedlanguage, 'newlang', 0, null, $textifempty, 0, 0, 'minwidth200', 1, 0, 0, $onlylang, 1);
 					$formquestion[] = array('type' => 'other', 'name' => 'newlang', 'label' => $form->textwithpicto($langs->trans("Language"), $langs->trans("DefineListOfAltLanguagesInWebsiteProperties")), 'value' => $value);
 
-				   	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
+					$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid, $langs->trans('ClonePage'), '', 'confirm_createpagefromclone', $formquestion, 0, 1, 300, 550);
 
 					print $formconfirm;
 				}
@@ -2746,11 +2640,9 @@ if (!GETPOST('hide_websitemenu'))
 
 				print '<div class="inline-block marginrightonly">';	// Button include dynamic contant
 				print $langs->trans("ShowSubcontainers");
-				if (empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
-				{
+				if (empty($conf->global->WEBSITE_SUBCONTAINERSINLINE)) {
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
-				}
-				else {
+				} else {
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unsetshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 				}
 				print '</div>';
@@ -2807,18 +2699,14 @@ if (!GETPOST('hide_websitemenu'))
 
 				//$disableeditinline = $websitepage->grabbed_from;
 				$disableeditinline = 0;
-				if ($disableeditinline)
-				{
+				if ($disableeditinline) {
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'" value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
 					print '<a class="nobordertransp opacitymedium nohoverborder marginleftonlyshort"'.$disabled.' href="#" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("OnlyEditionOfSourceForGrabbedContent")).'">'.img_picto($langs->trans("OnlyEditionOfSourceForGrabbedContent"), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
-				}
-				else {
+				} else {
 					//print '<input type="submit" class="button nobordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("EditWithEditor")).'" name="editcontent">';
-					if (empty($conf->global->WEBSITE_EDITINLINE))
-					{
+					if (empty($conf->global->WEBSITE_EDITINLINE)) {
 						print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=seteditinline&token='.newToken().'">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
-					}
-					else {
+					} else {
 						print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=unseteditinline&token='.newToken().'">'.img_picto($langs->trans("EditInLineOnOff", $langs->transnoentitiesnoconv("On")), 'switch_on', '', false, 0, 0, '', 'nomarginleft').'</a>';
 					}
 				}
@@ -2828,14 +2716,12 @@ if (!GETPOST('hide_websitemenu'))
 				print '</div>';
 
 				// Set page as homepage
-				if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home)
-				{
+				if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) {
 					//$disabled=' disabled="disabled"';
 					//print '<span class="button bordertransp disabled"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home"></span></span>';
 					//print '<input type="submit" class="button bordertransp" disabled="disabled" value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 					print '<a href="#" class="button bordertransp disabled" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
-				}
-				else {
+				} else {
 					//$disabled='';
 					//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'" name="setashome">';
 					print '<a href="'.$_SERVER["PHP_SEFL"].'?action=setashome&token='.newToken().'&website='.$website->ref.'&pageid='.$pageid.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("SetAsHomePage")).'"><span class="fa fa-home valignmiddle btnTitle-icon"><span></a>';
@@ -2849,8 +2735,7 @@ if (!GETPOST('hide_websitemenu'))
 
 		print '<span class="websitetools">';
 
-		if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
-		{
+		if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) {
 			$realpage = $urlwithroot.'/public/website/index.php?website='.$websitekey.'&pageref='.$websitepage->pageurl;
 			$pagealias = $websitepage->pageurl;
 
@@ -2886,30 +2771,34 @@ if (!GETPOST('hide_websitemenu'))
 
 			// TODO Add js to save alias like we save virtual host name and use dynamic virtual host for url of id=previewpageext
 		}
-		if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite')))
-		{
-			if ($action == 'editsource' || $action == 'editmeta') print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
-			if (preg_match('/^create/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-			if (preg_match('/^edit/', $action)) print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
-			if ($action != 'preview') print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+		if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite'))) {
+			if ($action == 'editsource' || $action == 'editmeta') {
+				print '<input type="submit" id="savefilean stay" class="button buttonforacesave" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+			}
+			if (preg_match('/^create/', $action)) {
+				print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+			}
+			if (preg_match('/^edit/', $action)) {
+				print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+			}
+			if ($action != 'preview') {
+				print '<input type="submit" class="button button-cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
+			}
 		}
 
 		print '</span>'; // end websitetools
 
 		print '<span class="websitehelp">';
-		if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha'))
-		{
+		if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha')) {
 			$url = 'https://wiki.dolibarr.org/index.php/Module_Website';
 
 			$htmltext = $langs->transnoentitiesnoconv("YouCanEditHtmlSource", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource2", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourceMore", $url);
 			$htmltext .= '<br>';
-			if ($conf->browser->layout == 'phone')
-			{
+			if ($conf->browser->layout == 'phone') {
 				print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
-			}
-			else {
+			} else {
 				//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
 				print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
 			}
@@ -2917,11 +2806,9 @@ if (!GETPOST('hide_websitemenu'))
 		print '</span>'; // end websitehelp
 
 
-		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
-		{
+		if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone') {
 			// Adding jquery code to change on the fly url of preview ext
-			if (!empty($conf->use_javascript_ajax))
-			{
+			if (!empty($conf->use_javascript_ajax)) {
 				print '<script type="text/javascript" language="javascript">
                     jQuery(document).ready(function() {
                 		jQuery("#websiteinputurl").keyup(function() {
@@ -2979,115 +2866,96 @@ $head = array();
  * Edit Site HTML header and CSS
  */
 
-if ($action == 'editcss')
-{
+if ($action == 'editcss') {
 	print '<div class="fiche">';
 
 	print '<br>';
 
-	if (!GETPOSTISSET('WEBSITE_CSS_INLINE'))
-	{
+	if (!GETPOSTISSET('WEBSITE_CSS_INLINE')) {
 		$csscontent = @file_get_contents($filecss);
 		// Clean the php css file to remove php code and get only css part
 		$csscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $csscontent);
-	}
-	else {
+	} else {
 		$csscontent = GETPOST('WEBSITE_CSS_INLINE', 'none');
 	}
 	if (!trim($csscontent)) {
 		$csscontent = '/* CSS content (all pages) */'."\nbody.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }\n.bodywebsite h1 { margin-top: 0; margin-bottom: 0; padding: 10px;}";
 	}
 
-	if (!GETPOSTISSET('WEBSITE_JS_INLINE'))
-	{
+	if (!GETPOSTISSET('WEBSITE_JS_INLINE')) {
 		$jscontent = @file_get_contents($filejs);
 		// Clean the php js file to remove php code and get only js part
 		$jscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $jscontent);
-	}
-	else {
+	} else {
 		$jscontent = GETPOST('WEBSITE_JS_INLINE', 'none');
 	}
-	if (!trim($jscontent)) $jscontent = '/* JS content (all pages) */'."\n";
+	if (!trim($jscontent)) {
+		$jscontent = '/* JS content (all pages) */'."\n";
+	}
 
-	if (!GETPOSTISSET('WEBSITE_HTML_HEADER'))
-	{
+	if (!GETPOSTISSET('WEBSITE_HTML_HEADER')) {
 		$htmlheadercontent = @file_get_contents($filehtmlheader);
 		// Clean the php htmlheader file to remove php code and get only html part
 		$htmlheadercontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htmlheadercontent);
-	}
-	else {
+	} else {
 		$htmlheadercontent = GETPOST('WEBSITE_HTML_HEADER', 'none');
 	}
-	if (!trim($htmlheadercontent))
-	{
+	if (!trim($htmlheadercontent)) {
 		$htmlheadercontent = "<html>\n";
 		$htmlheadercontent .= $htmlheadercontentdefault;
 		$htmlheadercontent .= "</html>";
-	}
-	else {
+	} else {
 		$htmlheadercontent = preg_replace('/^\s*<html>/ims', '', $htmlheadercontent);
 		$htmlheadercontent = preg_replace('/<\/html>\s*$/ims', '', $htmlheadercontent);
 		$htmlheadercontent = '<html>'."\n".trim($htmlheadercontent)."\n".'</html>';
 	}
 
-	if (!GETPOSTISSET('WEBSITE_ROBOT'))
-	{
+	if (!GETPOSTISSET('WEBSITE_ROBOT')) {
 		$robotcontent = @file_get_contents($filerobot);
 		// Clean the php htmlheader file to remove php code and get only html part
 		$robotcontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $robotcontent);
-	}
-	else {
+	} else {
 		$robotcontent = GETPOST('WEBSITE_ROBOT', 'nothtml');
 	}
-	if (!trim($robotcontent))
-	{
+	if (!trim($robotcontent)) {
 		$robotcontent .= "# Robot file. Generated with ".DOL_APPLICATION_TITLE."\n";
 		$robotcontent .= "User-agent: *\n";
 		$robotcontent .= "Allow: /public/\n";
 		$robotcontent .= "Disallow: /administrator/\n";
 	}
 
-	if (!GETPOSTISSET('WEBSITE_HTACCESS'))
-	{
+	if (!GETPOSTISSET('WEBSITE_HTACCESS')) {
 		$htaccesscontent = @file_get_contents($filehtaccess);
 		// Clean the php htaccesscontent file to remove php code and get only html part
 		$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htaccesscontent);
-	}
-	else {
+	} else {
 		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');
 	}
-	if (!trim($htaccesscontent))
-	{
+	if (!trim($htaccesscontent)) {
 		$htaccesscontent .= "# Order allow,deny\n";
 		$htaccesscontent .= "# Deny from all\n";
 	}
 
 
-	if (!GETPOSTISSET('WEBSITE_MANIFEST_JSON'))
-	{
+	if (!GETPOSTISSET('WEBSITE_MANIFEST_JSON')) {
 		$manifestjsoncontent = @file_get_contents($filemanifestjson);
 		// Clean the manifestjson file to remove php code and get only html part
 		$manifestjsoncontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $manifestjsoncontent);
-	}
-	else {
+	} else {
 		$manifestjsoncontent = GETPOST('WEBSITE_MANIFEST_JSON', 'restricthtml');
 	}
-	if (!trim($manifestjsoncontent))
-	{
+	if (!trim($manifestjsoncontent)) {
 		//$manifestjsoncontent.="";
 	}
 
-	if (!GETPOSTISSET('WEBSITE_README'))
-	{
+	if (!GETPOSTISSET('WEBSITE_README')) {
 		$readmecontent = @file_get_contents($filereadme);
 		// Clean the readme file to remove php code and get only html part
 		$readmecontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $readmecontent);
-	}
-	else {
+	} else {
 		$readmecontent = GETPOST('WEBSITE_README', 'none');
 	}
-	if (!trim($readmecontent))
-	{
+	if (!trim($readmecontent)) {
 		//$readmecontent.="";
 	}
 
@@ -3245,8 +3113,7 @@ if ($action == 'editcss')
 }
 
 
-if ($action == 'createsite')
-{
+if ($action == 'createsite') {
 	print '<div class="fiche">';
 
 	print '<br>';
@@ -3256,12 +3123,14 @@ if ($action == 'createsite')
 
 	$head[$h][0] = dol_buildpath('/website/index.php',1).'?id='.$object->id;
 	$head[$h][1] = $langs->trans("AddSite");
-   	$head[$h][2] = 'card';
+	   $head[$h][2] = 'card';
 	$h++;
 
-    print dol_get_fiche_head($head, 'card', $langs->trans("AddSite"), -1, 'globe');
-    */
-	if ($action == 'createcontainer') print load_fiche_titre($langs->trans("AddSite"));
+	print dol_get_fiche_head($head, 'card', $langs->trans("AddSite"), -1, 'globe');
+	*/
+	if ($action == 'createcontainer') {
+		print load_fiche_titre($langs->trans("AddSite"));
+	}
 
 	print '<!-- Add site -->'."\n";
 	//print '<div class="fichecenter">';
@@ -3269,10 +3138,18 @@ if ($action == 'createsite')
 	print '<table class="border centpercent">';
 
 	$siteref = $sitedesc = $sitelang = $siteotherlang = '';
-	if (GETPOST('WEBSITE_REF'))         $siteref = GETPOST('WEBSITE_REF', 'alpha');
-	if (GETPOST('WEBSITE_DESCRIPTION')) $sitedesc = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
-	if (GETPOST('WEBSITE_LANG'))        $sitelang = GETPOST('WEBSITE_LANG', 'aZ09');
-	if (GETPOST('WEBSITE_OTHERLANG'))   $siteotherlang = GETPOST('WEBSITE_OTHERLANG', 'aZ09comma');
+	if (GETPOST('WEBSITE_REF')) {
+		$siteref = GETPOST('WEBSITE_REF', 'alpha');
+	}
+	if (GETPOST('WEBSITE_DESCRIPTION')) {
+		$sitedesc = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
+	}
+	if (GETPOST('WEBSITE_LANG')) {
+		$sitelang = GETPOST('WEBSITE_LANG', 'aZ09');
+	}
+	if (GETPOST('WEBSITE_OTHERLANG')) {
+		$siteotherlang = GETPOST('WEBSITE_OTHERLANG', 'aZ09comma');
+	}
 
 	print '<tr><td class="titlefieldcreate fieldrequired">';
 	print $form->textwithpicto($langs->trans('WebSite'), $langs->trans("Example").': www.mywebsite.com, myportal, ...');
@@ -3317,8 +3194,7 @@ if ($action == 'createsite')
 
 	print '</table>';
 
-	if ($action == 'createsite')
-	{
+	if ($action == 'createsite') {
 		print '<div class="center">';
 
 		print '<input class="button" type="submit" name="addcontainer" value="'.$langs->trans("Create").'">';
@@ -3337,8 +3213,7 @@ if ($action == 'createsite')
 	print '<br>';
 }
 
-if ($action == 'importsite')
-{
+if ($action == 'importsite') {
 	print '<div class="fiche">';
 
 	print '<br>';
@@ -3368,8 +3243,7 @@ if ($action == 'importsite')
 	print '<br>';
 }
 
-if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of a web site OR properties of a web page
-{
+if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties of a web site OR properties of a web page
 	print '<div class="fiche">';
 
 	print '<br>';
@@ -3379,31 +3253,38 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 
 	$head[$h][0] = dol_buildpath('/website/index.php',1).'?id='.$object->id;
 	$head[$h][1] = $langs->trans("AddPage");
-   	$head[$h][2] = 'card';
+	   $head[$h][2] = 'card';
 	$h++;
 
-    print dol_get_fiche_head($head, 'card', $langs->trans("AddPage"), -1, 'globe');
-    */
-	if ($action == 'createcontainer') print load_fiche_titre($langs->trans("AddPage"));
+	print dol_get_fiche_head($head, 'card', $langs->trans("AddPage"), -1, 'globe');
+	*/
+	if ($action == 'createcontainer') {
+		print load_fiche_titre($langs->trans("AddPage"));
+	}
 
 	print '<!-- Edit or create page/container -->'."\n";
 	//print '<div class="fichecenter">';
 
 	$hiddenfromfetchingafterload = ' hideobject';
 	$hiddenmanuallyafterload = ' hideobject';
-	if (GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching') $hiddenfromfetchingafterload = '';
-	if (GETPOST('radiocreatefrom') == 'checkboxcreatemanually') $hiddenmanuallyafterload = '';
+	if (GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching') {
+		$hiddenfromfetchingafterload = '';
+	}
+	if (GETPOST('radiocreatefrom') == 'checkboxcreatemanually') {
+		$hiddenmanuallyafterload = '';
+	}
 
 	if ($action == 'editmeta' || empty($conf->use_javascript_ajax)) {	// No autohide/show in such case
 		$hiddenfromfetchingafterload = '';
 		$hiddenmanuallyafterload = '';
 	}
 
-	if ($action == 'createcontainer')
-	{
+	if ($action == 'createcontainer') {
 		print '<br>';
 
-		if (!empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
+		if (!empty($conf->use_javascript_ajax)) {
+			print '<input type="radio" name="radiocreatefrom" id="checkboxcreatefromfetching" value="checkboxcreatefromfetching"'.(GETPOST('radiocreatefrom') == 'checkboxcreatefromfetching' ? ' checked' : '').'> ';
+		}
 		print '<label for="checkboxcreatefromfetching"><span class="opacitymediumxx">'.$langs->trans("CreateByFetchingExternalPage").'</span></label><br>';
 		print '<hr class="tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
 		print '<table class="tableforfield centpercent tablecheckboxcreatefromfetching'.$hiddenfromfetchingafterload.'">';
@@ -3424,15 +3305,16 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 
 		print '<br>';
 
-		if (!empty($conf->use_javascript_ajax)) print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
+		if (!empty($conf->use_javascript_ajax)) {
+			print '<input type="radio" name="radiocreatefrom" id="checkboxcreatemanually" value="checkboxcreatemanually"'.(GETPOST('radiocreatefrom') == 'checkboxcreatemanually' ? ' checked' : '').'> ';
+		}
 		print '<label for="checkboxcreatemanually"><span class="opacitymediumxx">'.$langs->trans("OrEnterPageInfoManually").'</span></label><br>';
 		print '<hr class="tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 	}
 
 	print '<table class="border tableforfield nobackground centpercent tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 
-	if ($action != 'createcontainer')
-	{
+	if ($action != 'createcontainer') {
 		print '<tr><td class="titlefield fieldrequired">';
 		print $langs->trans('IDOfPage').' - '.$langs->trans('InternalURLOfPage');
 		print '</td><td>';
@@ -3462,9 +3344,8 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 		$pageauthorid = $objectpage->fk_user_creat;
 		$pageusermodifid = $objectpage->fk_user_modif;
 		$pageauthoralias = $objectpage->author_alias;
- 		$pagestatus = $objectpage->status;
-	}
-	else {
+		$pagestatus = $objectpage->status;
+	} else {
 		$type_container = 'page';
 		$pagedatecreation = dol_now();
 		$pageauthorid = $user->id;
@@ -3472,18 +3353,35 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 		$pageauthoralias = '';
 		$pagestatus = 1;
 	}
-	if (GETPOST('WEBSITE_TITLE', 'alpha'))       $pagetitle = str_replace(array('<', '>'), '', GETPOST('WEBSITE_TITLE', 'alphanohtml'));
-	if (GETPOST('WEBSITE_PAGENAME', 'alpha'))    $pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
-	if (GETPOST('WEBSITE_ALIASALT', 'alpha'))    $pagealiasalt = str_replace(array('<', '>'), '', GETPOST('WEBSITE_ALIASALT', 'alphanohtml'));
-	if (GETPOST('WEBSITE_DESCRIPTION', 'alpha')) $pagedescription = str_replace(array('<', '>'), '', GETPOST('WEBSITE_DESCRIPTION', 'alphanohtml'));
-	if (GETPOST('WEBSITE_IMAGE', 'alpha'))       $pageimage = GETPOST('WEBSITE_IMAGE', 'alpha');
-	if (GETPOST('WEBSITE_KEYWORDS', 'alpha'))    $pagekeywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
-	if (GETPOST('WEBSITE_LANG', 'aZ09'))         $pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
-	if (GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09')) $pageallowedinframes = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
-	if (GETPOST('htmlheader', 'none'))			 $pagehtmlheader = GETPOST('htmlheader', 'none');
+	if (GETPOST('WEBSITE_TITLE', 'alpha')) {
+		$pagetitle = str_replace(array('<', '>'), '', GETPOST('WEBSITE_TITLE', 'alphanohtml'));
+	}
+	if (GETPOST('WEBSITE_PAGENAME', 'alpha')) {
+		$pageurl = GETPOST('WEBSITE_PAGENAME', 'alpha');
+	}
+	if (GETPOST('WEBSITE_ALIASALT', 'alpha')) {
+		$pagealiasalt = str_replace(array('<', '>'), '', GETPOST('WEBSITE_ALIASALT', 'alphanohtml'));
+	}
+	if (GETPOST('WEBSITE_DESCRIPTION', 'alpha')) {
+		$pagedescription = str_replace(array('<', '>'), '', GETPOST('WEBSITE_DESCRIPTION', 'alphanohtml'));
+	}
+	if (GETPOST('WEBSITE_IMAGE', 'alpha')) {
+		$pageimage = GETPOST('WEBSITE_IMAGE', 'alpha');
+	}
+	if (GETPOST('WEBSITE_KEYWORDS', 'alpha')) {
+		$pagekeywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
+	}
+	if (GETPOST('WEBSITE_LANG', 'aZ09')) {
+		$pagelang = GETPOST('WEBSITE_LANG', 'aZ09');
+	}
+	if (GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09')) {
+		$pageallowedinframes = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09');
+	}
+	if (GETPOST('htmlheader', 'none')) {
+		$pagehtmlheader = GETPOST('htmlheader', 'none');
+	}
 
-	if ($action != 'createcontainer')
-	{
+	if ($action != 'createcontainer') {
 		print '<!-- Status of page -->'."\n";
 		print '<tr><td class="fieldrequired">';
 		print $langs->trans('Status');
@@ -3501,8 +3399,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 	$formwebsite->selectTypeOfContainer('WEBSITE_TYPE_CONTAINER', (GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') ? GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha') : $type_container), 0, '', 1);
 	print '</td></tr>';
 
-	if ($action == 'createcontainer')
-	{
+	if ($action == 'createcontainer') {
 		print '<tr><td class="titlefield fieldrequired">';
 		print $langs->trans('WEBSITE_PAGE_EXAMPLE');
 		print '</td><td>';
@@ -3556,8 +3453,11 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 	print $langs->trans('Language');
 	print '</td><td>';
 	$onlykeys = array();
-	if ($object->lang) $onlykeys[$object->lang] = $object->lang;
-	else $onlykeys[$langs->defaultlang] = $langs->defaultlang;
+	if ($object->lang) {
+		$onlykeys[$object->lang] = $object->lang;
+	} else {
+		$onlykeys[$langs->defaultlang] = $langs->defaultlang;
+	}
 	if ($object->otherlang) {
 		$tmparray = explode(',', $object->otherlang);
 		foreach ($tmparray as $key) {
@@ -3582,47 +3482,45 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 	print '<!-- Translation of --><tr><td>';
 	print $langs->trans('TranslationLinks');
 	print '</td><td>';
-	if ($action != 'createcontainer')
-	{
+	if ($action != 'createcontainer') {
 		// Has translation pages
 		$sql = 'SELECT rowid, lang from '.MAIN_DB_PREFIX.'website_page where fk_page = '.$objectpage->id;
 		$resql = $db->query($sql);
-		if ($resql)
-		{
+		if ($resql) {
 			$num_rows = $db->num_rows($resql);
-			if ($num_rows > 0)
-			{
+			if ($num_rows > 0) {
 				print '<span class="opacitymedium">'.$langs->trans('ThisPageHasTranslationPages').':</span>';
 				$i = 0;
 				$tmppage = new WebsitePage($db);
 				$tmpstring = '';
-				while ($obj = $db->fetch_object($resql))
-				{
+				while ($obj = $db->fetch_object($resql)) {
 					$result = $tmppage->fetch($obj->rowid);
 					if ($result > 0) {
-						if ($i > 0) $tmpstring .= '<br>';
+						if ($i > 0) {
+							$tmpstring .= '<br>';
+						}
 						$tmpstring .= $tmppage->getNomUrl(1).' ('.$tmppage->lang.')';
 						$translatedby++;
 						$i++;
 					}
 				}
-				if ($i > 1) print '<br>';
-				else print ' ';
+				if ($i > 1) {
+					print '<br>';
+				} else {
+					print ' ';
+				}
 				print $tmpstring;
 			}
+		} else {
+			dol_print_error($db);
 		}
-		else dol_print_error($db);
 	}
-	if (empty($translatedby) && ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0))
-	{
+	if (empty($translatedby) && ($action == 'editmeta' || $action == 'createcontainer' || $objectpage->fk_page > 0)) {
 		$sourcepage = new WebsitePage($db);
 		$result = $sourcepage->fetch($objectpage->fk_page);
-		if ($result == 0)
-		{
+		if ($result == 0) {
 			// not found, we can reset value to clean database
-		}
-		elseif ($result > 0)
-		{
+		} elseif ($result > 0) {
 			$translationof = $objectpage->fk_page;
 			print '<span class="opacitymedium">'.$langs->trans('ThisPageIsTranslationOf').'</span> ';
 			print $formwebsite->selectContainer($website, 'pageidfortranslation', ($translationof ? $translationof : -1), 1, $action, 'minwidth300', array($objectpage->id));
@@ -3643,8 +3541,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 	print '</td></tr>';
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-	{
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 		$langs->load('categories');
 
 		if (!GETPOSTISSET('categories')) {
@@ -3686,8 +3583,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 	print '<tr><td>';
 	print $langs->trans('Author');
 	print '</td><td>';
-	if ($pageauthorid > 0)
-	{
+	if ($pageauthorid > 0) {
 		$fuser->fetch($pageauthorid);
 		print $fuser->getNomUrl(1);
 	} else {
@@ -3708,13 +3604,11 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 	//print dol_print_date($pagedatecreation, 'dayhour');
 	print '</td></tr>';
 
-	if ($action != 'createcontainer')
-	{
+	if ($action != 'createcontainer') {
 		print '<tr><td>';
 		print $langs->trans('UserModif');
 		print '</td><td>';
-		if ($pageusermodifid > 0)
-		{
+		if ($pageusermodifid > 0) {
 			$fuser->fetch($pageusermodifid);
 			print $fuser->getNomUrl(1);
 		}
@@ -3738,8 +3632,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 	print '</td></tr>';
 
 	print '</table>';
-	if ($action == 'createcontainer')
-	{
+	if ($action == 'createcontainer') {
 		print '<div class="center tablecheckboxcreatemanually'.$hiddenmanuallyafterload.'">';
 
 		print '<input class="button" type="submit" name="addcontainer" value="'.$langs->trans("Create").'">';
@@ -3748,8 +3641,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 		print '</div>';
 	}
 
-	if ($action == 'createcontainer')
-	{
+	if ($action == 'createcontainer') {
 		print '<script type="text/javascript" language="javascript">
 			jQuery(document).ready(function() {
 				var disableautofillofalias = 0;
@@ -3794,27 +3686,26 @@ if ($action == 'editmeta' || $action == 'createcontainer')	// Edit properties of
 	print '<br>';
 }
 
-if ($action == 'editfile' || $action == 'file_manager')
-{
+if ($action == 'editfile' || $action == 'file_manager') {
 	print '<!-- Edit Media -->'."\n";
 	print '<div class="fiche"><br>';
 	//print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
 
 	$module = 'medias';
-	if (empty($url)) $url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
+	if (empty($url)) {
+		$url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
+	}
 	include DOL_DOCUMENT_ROOT.'/core/tpl/filemanager.tpl.php';
 
 	print '</div>';
 }
 
-if ($action == 'editmenu')
-{
+if ($action == 'editmenu') {
 	print '<!-- Edit Menu -->'."\n";
 	print '<div class="center">'.$langs->trans("FeatureNotYetAvailable").'</center>';
 }
 
-if ($action == 'editsource')
-{
+if ($action == 'editsource') {
 	// Editing with source editor
 
 	$contentforedit = '';
@@ -3824,10 +3715,13 @@ if ($action == 'editsource')
 	$contentforedit .= $objectpage->content;
 	//var_dump($_SESSION["dol_screenheight"]);
 	$maxheightwin = 480;
-	if (isset($_SESSION["dol_screenheight"]))
-	{
-		if ($_SESSION["dol_screenheight"] > 680) $maxheightwin = $_SESSION["dol_screenheight"] - 400;
-		if ($_SESSION["dol_screenheight"] > 800) $maxheightwin = $_SESSION["dol_screenheight"] - 490;
+	if (isset($_SESSION["dol_screenheight"])) {
+		if ($_SESSION["dol_screenheight"] > 680) {
+			$maxheightwin = $_SESSION["dol_screenheight"] - 400;
+		}
+		if ($_SESSION["dol_screenheight"] > 800) {
+			$maxheightwin = $_SESSION["dol_screenheight"] - 490;
+		}
 	}
 	//var_dump($_SESSION["dol_screenheight"]);
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
@@ -3841,8 +3735,8 @@ if ($action == 'editsource')
 
 	$contentforedit = '';
 	//$contentforedit.='<style scoped>'."\n";        // "scoped" means "apply to parent element only". Not yet supported by browsers
-    //$contentforedit.=$csscontent;
-    //$contentforedit.='</style>'."\n";
+	//$contentforedit.=$csscontent;
+	//$contentforedit.='</style>'."\n";
 	$contentforedit .= $objectpage->content;
 
 	$contentforedit = preg_replace('/(<img.*src=")(?!http)/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $contentforedit, -1, $nbrep);
@@ -3856,8 +3750,7 @@ print "</div>\n";
 print "</form>\n";
 
 
-if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction == 'replace')
-{
+if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction == 'replace') {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="replacesiteconfirm">';
@@ -3919,8 +3812,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print '</div>';
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-	{
+	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 		print '<div class="tagtr">';
 		print '<div class="tagtd paddingrightonly marginrightonly opacitymedium" style="padding-right: 10px !important">';
 		print $langs->trans("Category");
@@ -3939,16 +3831,14 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 	print '</div></div>';
 
-	if ($action == 'replacesiteconfirm')
-	{
+	if ($action == 'replacesiteconfirm') {
 		print '<!-- List of search result -->'."\n";
 		print '<div class="rowsearchresult clearboth">';
 
 		print '<br>';
 		print '<br>';
 
-		if ($listofpages['code'] == 'OK')
-		{
+		if ($listofpages['code'] == 'OK') {
 			$arrayofselected = is_array($toselect) ? $toselect : array();
 			$param = '';
 			$nbtotalofrecords = count($listofpages['list']);
@@ -3957,10 +3847,18 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 			// List of mass actions available
 			$arrayofmassactions = array();
-			if ($user->rights->website->writephp && $searchkey) $arrayofmassactions['replace'] = $langs->trans("Replace");
-			if ($user->rights->website->write) $arrayofmassactions['setcategory'] = $langs->trans("ClassifyInCategory");
-			if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-			if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+			if ($user->rights->website->writephp && $searchkey) {
+				$arrayofmassactions['replace'] = $langs->trans("Replace");
+			}
+			if ($user->rights->website->write) {
+				$arrayofmassactions['setcategory'] = $langs->trans("ClassifyInCategory");
+			}
+			if ($permissiontodelete) {
+				$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+			}
+			if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+				$arrayofmassactions = array();
+			}
 
 			$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 			$massactionbutton .= '<div class="massactionother massactionreplace hidden">';
@@ -3988,12 +3886,24 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 			$param = 'action=replacesiteconfirm&website='.urlencode($website->ref);
 			$param .= '&searchstring='.urlencode($searchkey);
-			if (GETPOST('optioncontent')) $param .= '&optioncontent=content';
-			if (GETPOST('optionmeta')) $param .= '&optionmeta=meta';
-			if (GETPOST('optionsitefiles')) $param .= '&optionsitefiles=optionsitefiles';
-			if (GETPOST('optioncontainertype')) $param .= '&optioncontainertype='.GETPOST('optioncontainertype', 'aZ09');
-			if (GETPOST('optionlanguage')) $param .= '&optionlanguage='.GETPOST('optionlanguage', 'aZ09');
-			if (GETPOST('optioncategory')) $param .= '&optioncategory='.GETPOST('optioncategory', 'aZ09');
+			if (GETPOST('optioncontent')) {
+				$param .= '&optioncontent=content';
+			}
+			if (GETPOST('optionmeta')) {
+				$param .= '&optionmeta=meta';
+			}
+			if (GETPOST('optionsitefiles')) {
+				$param .= '&optionsitefiles=optionsitefiles';
+			}
+			if (GETPOST('optioncontainertype')) {
+				$param .= '&optioncontainertype='.GETPOST('optioncontainertype', 'aZ09');
+			}
+			if (GETPOST('optionlanguage')) {
+				$param .= '&optionlanguage='.GETPOST('optionlanguage', 'aZ09');
+			}
+			if (GETPOST('optioncategory')) {
+				$param .= '&optioncategory='.GETPOST('optioncategory', 'aZ09');
+			}
 
 			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">';
@@ -4012,10 +3922,8 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 			$totalnbwords = 0;
 
-			foreach ($listofpages['list'] as $answerrecord)
-			{
-				if (get_class($answerrecord) == 'WebsitePage')
-				{
+			foreach ($listofpages['list'] as $answerrecord) {
+				if (get_class($answerrecord) == 'WebsitePage') {
 					print '<tr>';
 
 					// Type of container
@@ -4035,8 +3943,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 					// Categories - Tags
 					print '<td>';
-					if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire))
-					{
+					if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 						// Get current categories
 						$existing = $c->containing($answerrecord->id, Categorie::TYPE_WEBSITE_PAGE, 'object');
 						if (is_array($existing)) {
@@ -4103,10 +4010,11 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 					print '<td class="nowrap center">';
 
 					print '<!-- Status of page -->'."\n";
-					if ($massactionbutton || $massaction)
-					{
+					if ($massactionbutton || $massaction) {
 						$selected = 0;
-						if (in_array($answerrecord->id, $arrayofselected)) $selected = 1;
+						if (in_array($answerrecord->id, $arrayofselected)) {
+							$selected = 1;
+						}
 						print '<input id="'.$answerrecord->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$answerrecord->id.'"'.($selected ? ' checked="checked"' : '').'>';
 					}
 					print '</td>';
@@ -4213,8 +4121,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 			print '</table>';
 			print '</div>';
 			print '<br>';
-		}
-		else {
+		} else {
 			print '<div class="warning">'.$listofpages['message'].'</div>';
 		}
 
@@ -4224,10 +4131,8 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print '</form>';
 }
 
-if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')
-{
-	if ($pageid > 0 && $atleastonepage)
-	{
+if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone') {
+	if ($pageid > 0 && $atleastonepage) {
 		// $filejs
 		// $filecss
 		// $filephp
@@ -4291,10 +4196,11 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		$tmp = preg_split('(<style[^>]*>|</style>)', $objectpage->htmlheader);
 		$tmpstyleinheader = '';
 		$i = 0;
-		foreach ($tmp as $valtmp)
-		{
+		foreach ($tmp as $valtmp) {
 			$i++;
-			if ($i % 2 == 0) $tmpstyleinheader .= $valtmp."\n";
+			if ($i % 2 == 0) {
+				$tmpstyleinheader .= $valtmp."\n";
+			}
 		}
 		$tmpout .= $tmpstyleinheader."\n";
 		// Clean style that may affect global style of Dolibarr
@@ -4312,8 +4218,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		$newcontent = $objectpage->content;
 
 		// If mode WEBSITE_SUBCONTAINERSINLINE is on
-		if (!empty($conf->global->WEBSITE_SUBCONTAINERSINLINE))
-		{
+		if (!empty($conf->global->WEBSITE_SUBCONTAINERSINLINE)) {
 			// TODO Check file $filephp exists, if not create it.
 
 			//var_dump($filetpl);
@@ -4324,8 +4229,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 				if (empty($res)) {
 					print "ERROR: Failed to include file '".$filephp."'. Try to edit and save page.";
 				}
-			} catch (Exception $e)
-			{
+			} catch (Exception $e) {
 				print $e->getMessage();
 			}
 			$newcontent = ob_get_contents();
@@ -4333,12 +4237,10 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		}
 
 		// Change the contenteditable to "true" or "false" when mode Edit Inline is on or off
-		if (empty($conf->global->WEBSITE_EDITINLINE))
-		{
+		if (empty($conf->global->WEBSITE_EDITINLINE)) {
 			// Remove the contenteditable="true"
 			$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
-		}
-		else {
+		} else {
 			// Keep the contenteditable="true" when mode Edit Inline is on
 		}
 		$out .= dolWebsiteReplacementOfLinks($object, $newcontent, 0, 'html', $objectpage->id)."\n";
@@ -4359,33 +4261,30 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		print $out;
 
 		/*file_put_contents($filetpl, $out);
-        if (! empty($conf->global->MAIN_UMASK))
-            @chmod($filetpl, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK))
+			@chmod($filetpl, octdec($conf->global->MAIN_UMASK));
 
-        // Output file on browser
-        dol_syslog("index.php include $filetpl $filename content-type=$type");
-        $original_file_osencoded=dol_osencode($filetpl);	// New file name encoded in OS encoding charset
+		// Output file on browser
+		dol_syslog("index.php include $filetpl $filename content-type=$type");
+		$original_file_osencoded=dol_osencode($filetpl);	// New file name encoded in OS encoding charset
 
-        // This test if file exists should be useless. We keep it to find bug more easily
-        if (! file_exists($original_file_osencoded))
-        {
-            dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
-            exit;
-        }
+		// This test if file exists should be useless. We keep it to find bug more easily
+		if (! file_exists($original_file_osencoded))
+		{
+			dol_print_error(0,$langs->trans("ErrorFileDoesNotExists",$original_file));
+			exit;
+		}
 
-        //include_once $original_file_osencoded;
-        */
+		//include_once $original_file_osencoded;
+		*/
 
 		/*print '<iframe class="websiteiframenoborder centpercent" src="'.DOL_URL_ROOT.'/public/website/index.php?website='.$websitekey.'&pageid='.$pageid.'"/>';
-        print '</iframe>';*/
-	}
-	else {
-		if (empty($websitekey) || $websitekey == '-1')
-		{
+		print '</iframe>';*/
+	} else {
+		if (empty($websitekey) || $websitekey == '-1') {
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("NoWebSiteCreateOneFirst").'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';
-		}
-		else {
+		} else {
 			print '<br><br><div class="center previewnotyetavailable"><span class="">'.$langs->trans("PreviewOfSiteNotYetAvailable", $object->ref).'</span></div><br><br><br>';
 			print '<div class="center"><div class="logo_setup"></div></div>';
 		}
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 24b804058ea..b847f607bf3 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -1,8 +1,12 @@
 <?php
 // BEGIN PHP File wrapper.php - DO NOT MODIFY - It is just a copy of file website/samples/wrapper.php
 $websitekey = basename(__DIR__);
-if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) die("Sample file for website module. Can be called directly.");
-if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
+if (strpos($_SERVER["PHP_SELF"], 'website/samples/wrapper.php')) {
+	die("Sample file for website module. Can be called directly.");
+}
+if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
+	require_once './master.inc.php';
+} // Load master if not already loaded
 include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 $encoding = '';
@@ -17,42 +21,36 @@ $limit = GETPOST('limit', 'int');
 
 // Parameters for RSS
 $rss = GETPOST('rss', 'aZ09');
-if ($rss) $original_file = 'blog.rss';
+if ($rss) {
+	$original_file = 'blog.rss';
+}
 
 // If we have a hash public (hashp), we guess the original_file.
-if (!empty($hashp))
-{
+if (!empty($hashp)) {
 	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';
 	$ecmfile = new EcmFiles($db);
 	$result = $ecmfile->fetch(0, '', '', '', $hashp);
-	if ($result > 0)
-	{
+	if ($result > 0) {
 		$tmp = explode('/', $ecmfile->filepath, 2); // $ecmfile->filepath is relative to document directory
 		// filepath can be 'users/X' or 'X/propale/PR11111'
-		if (is_numeric($tmp[0])) // If first tmp is numeric, it is subdir of company for multicompany, we take next part.
-		{
+		if (is_numeric($tmp[0])) { // If first tmp is numeric, it is subdir of company for multicompany, we take next part.
 			$tmp = explode('/', $tmp[1], 2);
 		}
 		$moduleparttocheck = $tmp[0]; // moduleparttocheck is first part of path
 
-		if ($modulepart)	// Not required, so often not defined, for link using public hashp parameter.
-		{
-			if ($moduleparttocheck == $modulepart)
-			{
+		if ($modulepart) {	// Not required, so often not defined, for link using public hashp parameter.
+			if ($moduleparttocheck == $modulepart) {
 				// We remove first level of directory
 				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 				//var_dump($original_file); exit;
-			}
-			else {
+			} else {
 				print 'Bad link. File is from another module part.';
 			}
-		}
-		else {
+		} else {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
-	}
-	else {
+	} else {
 		print "ErrorFileNotFoundWithSharedLink";
 		exit;
 	}
@@ -60,21 +58,29 @@ if (!empty($hashp))
 
 // Define attachment (attachment=true to force choice popup 'open'/'save as')
 $attachment = true;
-if (preg_match('/\.(html|htm)$/i', $original_file)) $attachment = false;
-if (isset($_GET["attachment"])) $attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
-if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) $attachment = false;
+if (preg_match('/\.(html|htm)$/i', $original_file)) {
+	$attachment = false;
+}
+if (isset($_GET["attachment"])) {
+	$attachment = (GETPOST("attachment", 'alphanohtml') ? true : false);
+}
+if (!empty($conf->global->MAIN_DISABLE_FORCE_SAVEAS_WEBSITE)) {
+	$attachment = false;
+}
 
 // Define mime type
 $type = 'application/octet-stream';
-if (GETPOSTISSET('type')) $type = GETPOST('type', 'alpha');
-else $type = dol_mimetype($original_file);
+if (GETPOSTISSET('type')) {
+	$type = GETPOST('type', 'alpha');
+} else {
+	$type = dol_mimetype($original_file);
+}
 
 // Security: Delete string ../ into $original_file
 $original_file = str_replace("../", "/", $original_file);
 
 // Cache or not
-if (GETPOST("cache", 'aZ09') || image_format_supported($original_file) >= 0)
-{
+if (GETPOST("cache", 'aZ09') || image_format_supported($original_file) >= 0) {
 	// Important: Following code is to avoid page request by browser and PHP CPU at
 	// each Dolibarr page access.
 	header('Cache-Control: max-age=3600, public, must-revalidate');
@@ -99,7 +105,9 @@ if ($rss) {
 	$website->fetch('', $websitekey);
 
 	$filters = array('type_container'=>'blogpost');
-	if ($l) $filters['lang'] = $l;
+	if ($l) {
+		$filters['lang'] = $l;
+	}
 
 	$MAXNEWS = ($limit ? $limit : 20);
 	$arrayofblogs = $websitepage->fetchAll($website->id, 'DESC', 'date_creation', $MAXNEWS, 0, $filters);
@@ -118,8 +126,7 @@ if ($rss) {
 	dol_syslog("build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
 
 	// Clean parameters
-	if (!$filename)
-	{
+	if (!$filename) {
 		$extension = 'rss';
 		$filename = $format.'.'.$extension;
 	}
@@ -132,19 +139,16 @@ if ($rss) {
 
 	$buildfile = true;
 
-	if ($cachedelay)
-	{
+	if ($cachedelay) {
 		$nowgmt = dol_now();
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-		if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay))
-		{
+		if (dol_filemtime($outputfile) > ($nowgmt - $cachedelay)) {
 			dol_syslog("build_exportfile file ".$outputfile." is not older than now - cachedelay (".$nowgmt." - ".$cachedelay."). Build is canceled");
 			$buildfile = false;
 		}
 	}
 
-	if ($buildfile)
-	{
+	if ($buildfile) {
 		$langs->load("other");
 		$title = $desc = $langs->transnoentities('LatestBlogPosts');
 
@@ -155,18 +159,17 @@ if ($rss) {
 		// Write file
 		$result = build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp, '', $website->virtualhost.'/wrapper.php?rss=1'.($l ? '&l='.$l : ''), $l);
 
-		if ($result >= 0)
-		{
-			if (dol_move($outputfiletmp, $outputfile, 0, 1)) $result = 1;
-			else {
+		if ($result >= 0) {
+			if (dol_move($outputfiletmp, $outputfile, 0, 1)) {
+				$result = 1;
+			} else {
 				$error = 'Failed to rename '.$outputfiletmp.' into '.$outputfile;
 				dol_syslog("build_exportfile ".$error, LOG_ERR);
 				dol_delete_file($outputfiletmp, 0, 1);
 				print $error;
 				exit(-1);
 			}
-		}
-		else {
+		} else {
 			dol_syslog("build_exportfile build_xxxfile function fails to for format=".$format." outputfiletmp=".$outputfile, LOG_ERR);
 			dol_delete_file($outputfiletmp, 0, 1);
 			$langs->load("errors");
@@ -175,56 +178,63 @@ if ($rss) {
 		}
 	}
 
-	if ($result >= 0)
-	{
+	if ($result >= 0) {
 		$attachment = false;
-		if (isset($_GET["attachment"])) $attachment = $_GET["attachment"];
+		if (isset($_GET["attachment"])) {
+			$attachment = $_GET["attachment"];
+		}
 		//$attachment = false;
 		$contenttype = 'application/rss+xml';
-		if (isset($_GET["contenttype"])) $contenttype = $_GET["contenttype"];
+		if (isset($_GET["contenttype"])) {
+			$contenttype = $_GET["contenttype"];
+		}
 		//$contenttype='text/plain';
 		$outputencoding = 'UTF-8';
 
-		if ($contenttype)       header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
-		if ($attachment) 		header('Content-Disposition: attachment; filename="'.$filename.'"');
+		if ($contenttype) {
+			header('Content-Type: '.$contenttype.($outputencoding ? '; charset='.$outputencoding : ''));
+		}
+		if ($attachment) {
+			header('Content-Disposition: attachment; filename="'.$filename.'"');
+		}
 
 		// Ajout directives pour resoudre bug IE
 		//header('Cache-Control: Public, must-revalidate');
 		//header('Pragma: public');
-		if ($cachedelay) header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
-		else header('Cache-Control: private, must-revalidate');
+		if ($cachedelay) {
+			header('Cache-Control: max-age='.$cachedelay.', private, must-revalidate');
+		} else {
+			header('Cache-Control: private, must-revalidate');
+		}
 
 		// Clean parameters
 		$outputfile = $dir_temp.'/'.$filename;
 		$result = readfile($outputfile);
-		if (!$result) print 'File '.$outputfile.' was empty.';
+		if (!$result) {
+			print 'File '.$outputfile.' was empty.';
+		}
 
 		// header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
 	}
-}
-// Get logos
-elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file))
-{
+} elseif ($modulepart == "mycompany" && preg_match('/^\/?logos\//', $original_file)) {
+	// Get logos
 	readfile(dol_osencode($conf->mycompany->dir_output."/".$original_file));
-}
-else {
+} else {
 	// Find the subdirectory name as the reference
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
 	$accessallowed              = $check_access['accessallowed'];
 	$sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 	$fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
-	if ($hashp)
-	{
+	if ($hashp) {
 		$accessallowed = 1; // When using hashp, link is public so we force $accessallowed
 		$sqlprotectagainstexternals = '';
 	}
 
 	// Security:
 	// Limit access if permissions are wrong
-	if (!$accessallowed)
-	{
+	if (!$accessallowed) {
 		print 'Access forbidden';
 		exit;
 	}
@@ -238,8 +248,7 @@ else {
 	$fullpath_original_file_osencoded = dol_osencode($fullpath_original_file); // New file name encoded in OS encoding charset
 
 	// This test if file exists should be useless. We keep it to find bug more easily
-	if (!file_exists($fullpath_original_file_osencoded))
-	{
+	if (!file_exists($fullpath_original_file_osencoded)) {
 		print "ErrorFileDoesNotExists: ".$original_file;
 		exit;
 	}
@@ -248,13 +257,20 @@ else {
 	//top_httphead($type);
 	header('Content-Type: '.$type);
 	header('Content-Description: File Transfer');
-	if ($encoding)   header('Content-Encoding: '.$encoding);
+	if ($encoding) {
+		header('Content-Encoding: '.$encoding);
+	}
 	// Add MIME Content-Disposition from RFC 2183 (inline=automatically displayed, attachment=need user action to open)
-	if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-	else header('Content-Disposition: inline; filename="'.$filename.'"');
+	if ($attachment) {
+		header('Content-Disposition: attachment; filename="'.$filename.'"');
+	} else {
+		header('Content-Disposition: inline; filename="'.$filename.'"');
+	}
 	header('Content-Length: '.dol_filesize($fullpath_original_file));
 
 	readfile($fullpath_original_file_osencoded);
 }
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}
 // END PHP
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 17f50e709b7..e63c3cb8fef 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -53,12 +53,15 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 }
 
-if (empty($action) && empty($id) && empty($ref)) $action = 'view';
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -80,10 +83,11 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be includ
 
 $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))
-{
+if (empty($reshook)) {
 	$error = 0;
 
 	$permissiontoadd = $user->rights->website->write;
@@ -130,8 +134,7 @@ jQuery(document).ready(function() {
 
 
 // Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("WebsiteAccount")));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -163,8 +166,7 @@ if ($action == 'create')
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("WebsiteAccount"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -194,9 +196,10 @@ if (($id || $ref) && $action == 'edit')
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
-	if ($object->fk_soc > 0 && empty($socid)) $socid = $object->fk_soc;
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	if ($object->fk_soc > 0 && empty($socid)) {
+		$socid = $object->fk_soc;
+	}
 
 	$res = $object->fetch_optionals();
 
@@ -213,8 +216,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -223,8 +229,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Object card
 	// ------------------------------------------------------------
 	$linkback = '';
-	if ($socid) $linkback = '<a href="'.DOL_URL_ROOT.'/societe/website.php?socid='.$socid.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToListForThirdParty").'</a>';
-	if ($fk_website) $linkback = '<a href="'.DOL_URL_ROOT.'/website/website_card.php?fk_website='.$fk_website.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	if ($socid) {
+		$linkback = '<a href="'.DOL_URL_ROOT.'/societe/website.php?socid='.$socid.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToListForThirdParty").'</a>';
+	}
+	if ($fk_website) {
+		$linkback = '<a href="'.DOL_URL_ROOT.'/website/website_card.php?fk_website='.$fk_website.'&restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	}
 
 	$morehtmlref = '<div class="refidno">';
 	/*
@@ -236,41 +246,43 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Project
 	if (! empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    if ($user->rights->website->creer)
-	    {
-	        if ($action != 'classify')
-	        {
-	            $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-	            if ($action == 'classify') {
-	                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-	                $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
-	                $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-	                $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-	                $morehtmlref.='</form>';
-	            } else {
-	                $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-	            }
-	        }
-	    } else {
-	        if (! empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-	            $morehtmlref.=$proj->ref;
-	            $morehtmlref.='</a>';
-	        } else {
-	            $morehtmlref.='';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		if ($user->rights->website->creer)
+		{
+			if ($action != 'classify')
+			{
+				$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref.='<input type="hidden" name="action" value="classin">';
+					$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref.='</form>';
+				} else {
+					$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			}
+		} else {
+			if (! empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
+				$morehtmlref.=$proj->ref;
+				$morehtmlref.='</a>';
+			} else {
+				$morehtmlref.='';
+			}
+		}
 	}
 	*/
 	$morehtmlref .= '</div>';
 
-	if ($socid > 0) $object->next_prev_filter = 'te.fk_soc = '.$socid;
+	if ($socid > 0) {
+		$object->next_prev_filter = 'te.fk_soc = '.$socid;
+	}
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
 
@@ -301,36 +313,35 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<div class="tabsAction">'."\n";
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			// Send
 			if (empty($user->socid)) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
 			}
 
-			if ($user->rights->website->write)
-			{
+			if ($user->rights->website->write) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
 			}
 
 			/*
-    		if ($user->rights->sellyoursaas->create)
-    		{
-    			if ($object->status == 1)
-    		 	{
-    		 		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=disable">'.$langs->trans("Disable").'</a></div>'."\n";
-    		 	}
-    		 	else
-    		 	{
-    		 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Enable").'</a></div>'."\n";
-    		 	}
-    		}
-    		*/
-
-			if ($user->rights->website->delete)
+			if ($user->rights->sellyoursaas->create)
 			{
+				if ($object->status == 1)
+				 {
+					 print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=disable">'.$langs->trans("Disable").'</a></div>'."\n";
+				 }
+				 else
+				 {
+					 print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=enable">'.$langs->trans("Enable").'</a></div>'."\n";
+				 }
+			}
+			*/
+
+			if ($user->rights->website->delete) {
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
 			}
 		}
@@ -343,21 +354,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$action = 'presend';
 	}
 
-	if ($action != 'presend')
-	{
+	if ($action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
 		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
 		/*
-	    $MAXEVENT = 10;
+		$MAXEVENT = 10;
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'websiteaccount', $socid, 1, '', $MAXEVENT);
-	    */
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'websiteaccount', $socid, 1, '', $MAXEVENT);
+		*/
 
 		print '</div></div></div>';
 	}
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 31497cbc919..e96056688e4 100755
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -184,8 +184,12 @@ class Workstation extends CommonObject
 
 		$this->fields['ref']['default'] = $this->getNextNumRef();
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
-		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
 
 		// Example to show how to set values of fields definition dynamically
 		/*if ($user->rights->workstation->workstation->read) {
@@ -194,23 +198,17 @@ class Workstation extends CommonObject
 		}*/
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
 
 		// Translate some data of arrayofkeyval
-		if (is_object($langs))
-		{
-			foreach ($this->fields as $key => $val)
-			{
-				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
-				{
-					foreach ($val['arrayofkeyval'] as $key2 => $val2)
-					{
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 					}
 				}
@@ -233,7 +231,9 @@ class Workstation extends CommonObject
 
 		// Usergroups
 		$groups = GETPOST('groups');
-		if (empty($groups)) $groups = $this->usergroups; // createFromClone
+		if (empty($groups)) {
+			$groups = $this->usergroups; // createFromClone
+		}
 		if (!empty($groups)) {
 			foreach ($groups as $id_group) {
 				$ws_usergroup = new WorkstationUserGroup($db);
@@ -246,7 +246,9 @@ class Workstation extends CommonObject
 
 		// Resources
 		$resources = GETPOST('resources');
-		if (empty($resources)) $resources = $this->resources; // createFromClone
+		if (empty($resources)) {
+			$resources = $this->resources; // createFromClone
+		}
 		if (!empty($resources)) {
 			foreach ($resources as $id_resource) {
 				$ws_resource = new WorkstationResource($db);
@@ -280,7 +282,9 @@ class Workstation extends CommonObject
 
 		// Load source object
 		$result = $object->fetch($fromid);
-		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+		if ($result > 0 && !empty($object->table_element_line)) {
+			$object->fetchLines();
+		}
 
 		// get lines so they will be clone
 		//foreach($this->lines as $line)
@@ -292,21 +296,28 @@ class Workstation extends CommonObject
 		unset($object->import_key);
 
 		// Clear fields
-		if (property_exists($object, 'ref')) $object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
-		if (property_exists($object, 'label')) $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
-		if (property_exists($object, 'status')) { $object->status = self::STATUS_DISABLED; }
-		if (property_exists($object, 'date_creation')) { $object->date_creation = dol_now(); }
-		if (property_exists($object, 'date_modification')) { $object->date_modification = null; }
+		if (property_exists($object, 'ref')) {
+			$object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
+		}
+		if (property_exists($object, 'label')) {
+			$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		}
+		if (property_exists($object, 'status')) {
+			$object->status = self::STATUS_DISABLED;
+		}
+		if (property_exists($object, 'date_creation')) {
+			$object->date_creation = dol_now();
+		}
+		if (property_exists($object, 'date_modification')) {
+			$object->date_modification = null;
+		}
 		// ...
 		// Clear extrafields that are unique
-		if (is_array($object->array_options) && count($object->array_options) > 0)
-		{
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
 			$extrafields->fetch_name_optionals_label($this->table_element);
-			foreach ($object->array_options as $key => $option)
-			{
+			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
-				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey]))
-				{
+				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
 					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
@@ -322,22 +333,19 @@ class Workstation extends CommonObject
 			$this->errors = $object->errors;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// copy internal contacts
-			if ($this->copy_linked_contact($object, 'internal') < 0)
-			{
+			if ($this->copy_linked_contact($object, 'internal') < 0) {
 				$error++;
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			// copy external contacts if same company
-			if (property_exists($this, 'socid') && $this->socid == $object->socid)
-			{
-				if ($this->copy_linked_contact($object, 'external') < 0)
+			if (property_exists($this, 'socid') && $this->socid == $object->socid) {
+				if ($this->copy_linked_contact($object, 'external') < 0) {
 					$error++;
+				}
 			}
 		}
 
@@ -367,7 +375,9 @@ class Workstation extends CommonObject
 		$this->usergroups = WorkstationUserGroup::getAllGroupsOfWorkstation($this->id);
 		$this->resources = WorkstationResource::getAllResourcesOfWorkstation($this->id);
 
-		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -407,8 +417,11 @@ class Workstation extends CommonObject
 		$sql = 'SELECT ';
 		$sql .= $this->getFieldList();
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
-		else $sql .= ' WHERE 1 = 1';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		} else {
+			$sql .= ' WHERE 1 = 1';
+		}
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -441,8 +454,7 @@ class Workstation extends CommonObject
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < ($limit ? min($limit, $num) : $num))
-			{
+			while ($i < ($limit ? min($limit, $num) : $num)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$record = new self($this->db);
@@ -526,8 +538,7 @@ class Workstation extends CommonObject
 	 */
 	public function deleteLine(User $user, $idline, $notrigger = false)
 	{
-		if ($this->status < 0)
-		{
+		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
@@ -552,8 +563,7 @@ class Workstation extends CommonObject
 		$error = 0;
 
 		// Protection
-		if ($this->status == self::STATUS_VALIDATED)
-		{
+		if ($this->status == self::STATUS_VALIDATED) {
 			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
 			return 0;
 		}
@@ -571,8 +581,7 @@ class Workstation extends CommonObject
 		$this->db->begin();
 
 		// Define new ref
-		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
-		{
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
 			$num = $this->getNextNumRef();
 		} else {
 			$num = $this->ref;
@@ -584,57 +593,58 @@ class Workstation extends CommonObject
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($num)."',";
 			$sql .= " status = ".self::STATUS_VALIDATED;
-			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."'";
-			if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".$user->id;
+			if (!empty($this->fields['date_validation'])) {
+				$sql .= ", date_validation = '".$this->db->idate($now)."'";
+			}
+			if (!empty($this->fields['fk_user_valid'])) {
+				$sql .= ", fk_user_valid = ".$user->id;
+			}
 			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
 			$resql = $this->db->query($sql);
-			if (!$resql)
-			{
+			if (!$resql) {
 				dol_print_error($this->db);
 				$this->error = $this->db->lasterror();
 				$error++;
 			}
 
-			if (!$error && !$notrigger)
-			{
+			if (!$error && !$notrigger) {
 				// Call trigger
 				$result = $this->call_trigger('WORKSTATION_VALIDATE', $user);
-				if ($result < 0) $error++;
+				if ($result < 0) {
+					$error++;
+				}
 				// End call triggers
 			}
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->oldref = $this->ref;
 
 			// Rename directory if dir was a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref))
-			{
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
 				// Now we rename also files into index
 				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'workstation/".$this->db->escape($this->newref)."'";
 				$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'workstation/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
 				$resql = $this->db->query($sql);
-				if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+				if (!$resql) {
+					$error++; $this->error = $this->db->lasterror();
+				}
 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 				$oldref = dol_sanitizeFileName($this->ref);
 				$newref = dol_sanitizeFileName($num);
 				$dirsource = $conf->workstation->dir_output.'/workstation/'.$oldref;
 				$dirdest = $conf->workstation->dir_output.'/workstation/'.$newref;
-				if (!$error && file_exists($dirsource))
-				{
+				if (!$error && file_exists($dirsource)) {
 					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
 
-					if (@rename($dirsource, $dirdest))
-					{
+					if (@rename($dirsource, $dirdest)) {
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
 						$listoffiles = dol_dir_list($conf->workstation->dir_output.'/workstation/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-						foreach ($listoffiles as $fileentry)
-						{
+						foreach ($listoffiles as $fileentry) {
 							$dirsource = $fileentry['name'];
 							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
 							$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -647,14 +657,12 @@ class Workstation extends CommonObject
 		}
 
 		// Set new ref and current status
-		if (!$error)
-		{
+		if (!$error) {
 			$this->ref = $num;
 			$this->status = self::STATUS_VALIDATED;
 		}
 
-		if (!$error)
-		{
+		if (!$error) {
 			$this->db->commit();
 			return 1;
 		} else {
@@ -677,8 +685,11 @@ class Workstation extends CommonObject
 
 		$this->status = $status;
 
-		if (empty($status)) return $this->setDisabled($user, $notrigger);
-		else return $this->setEnabled($user, $notrigger);
+		if (empty($status)) {
+			return $this->setDisabled($user, $notrigger);
+		} else {
+			return $this->setEnabled($user, $notrigger);
+		}
 	}
 
 
@@ -721,7 +732,9 @@ class Workstation extends CommonObject
 	{
 		global $conf, $langs, $hookmanager;
 
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -734,25 +747,28 @@ class Workstation extends CommonObject
 
 		$url = dol_buildpath('/workstation/workstation_card.php', 1).'?id='.$this->id;
 
-		if ($option != 'nolink')
-		{
+		if ($option != 'nolink') {
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
-			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose = '';
-		if (empty($notooltip))
-		{
-			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-			{
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowWorkstation");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
 
 		$linkstart = '<a href="'.$url.'"';
 		$linkstart .= $linkclose.'>';
@@ -761,7 +777,9 @@ class Workstation extends CommonObject
 		$result .= $linkstart;
 
 		if (empty($this->showphoto_on_popup)) {
-			if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'mrp'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			if ($withpicto) {
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'mrp'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			}
 		} else {
 			if ($withpicto) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -787,7 +805,9 @@ class Workstation extends CommonObject
 			}
 		}
 
-		if ($withpicto != 2) $result .= $this->ref;
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
 
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
@@ -796,8 +816,11 @@ class Workstation extends CommonObject
 		$hookmanager->initHooks(array('workstationdao'));
 		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-		if ($reshook > 0) $result = $hookmanager->resPrint;
-		else $result .= $hookmanager->resPrint;
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
 
 		return $result;
 	}
@@ -824,8 +847,7 @@ class Workstation extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		if (empty($this->labelStatus) || empty($this->labelStatusShort))
-		{
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
 			global $langs;
 			//$langs->load("workstation@workstation");
 			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled');
@@ -852,28 +874,23 @@ class Workstation extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.$id;
 		$result = $this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
+		if ($result) {
+			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
+				if ($obj->fk_user_author) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
 					$this->user_creation = $cuser;
 				}
 
-				if ($obj->fk_user_valid)
-				{
+				if ($obj->fk_user_valid) {
 					$vuser = new User($this->db);
 					$vuser->fetch($obj->fk_user_valid);
 					$this->user_validation = $vuser;
 				}
 
-				if ($obj->fk_user_cloture)
-				{
+				if ($obj->fk_user_cloture) {
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
 					$this->user_cloture = $cluser;
@@ -913,8 +930,7 @@ class Workstation extends CommonObject
 		$objectline = new WorkstationLine($this->db);
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_workstation = '.$this->id));
 
-		if (is_numeric($result))
-		{
+		if (is_numeric($result)) {
 			$this->error = $this->error;
 			$this->errors = $this->errors;
 			return $result;
@@ -938,8 +954,7 @@ class Workstation extends CommonObject
 			$conf->global->WORKSTATION_WORKSTATION_ADDON = 'mod_workstation_standard';
 		}
 
-		if (!empty($conf->global->WORKSTATION_WORKSTATION_ADDON))
-		{
+		if (!empty($conf->global->WORKSTATION_WORKSTATION_ADDON)) {
 			$mybool = false;
 
 			$file = $conf->global->WORKSTATION_WORKSTATION_ADDON.".php";
@@ -947,16 +962,14 @@ class Workstation extends CommonObject
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
-			foreach ($dirmodels as $reldir)
-			{
+			foreach ($dirmodels as $reldir) {
 				$dir = dol_buildpath($reldir."core/modules/workstation/");
 
 				// Load file with numbering class (if found)
 				$mybool |= @include_once $dir.$file;
 			}
 
-			if ($mybool === false)
-			{
+			if ($mybool === false) {
 				dol_print_error('', "Failed to include file ".$file);
 				return '';
 			}
@@ -965,8 +978,7 @@ class Workstation extends CommonObject
 				$obj = new $classname();
 				$numref = $obj->getNextValue($this);
 
-				if ($numref != '' && $numref != '-1')
-				{
+				if ($numref != '' && $numref != '-1') {
 					return $numref;
 				} else {
 					$this->error = $obj->error;
diff --git a/htdocs/workstation/class/workstationresource.class.php b/htdocs/workstation/class/workstationresource.class.php
index 6e6860f2230..72fb91cfe85 100644
--- a/htdocs/workstation/class/workstationresource.class.php
+++ b/htdocs/workstation/class/workstationresource.class.php
@@ -65,23 +65,17 @@ class WorkstationResource extends CommonObject
 		$this->db = $db;
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
 
 		// Translate some data of arrayofkeyval
-		if (is_object($langs))
-		{
-			foreach ($this->fields as $key => $val)
-			{
-				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
-				{
-					foreach ($val['arrayofkeyval'] as $key2 => $val2)
-					{
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 					}
 				}
@@ -95,7 +89,7 @@ class WorkstationResource extends CommonObject
 	 * @param	int		$fk_workstation		Id of workstation we need to get linked resources
 	 * @return 	array						Array of record
 	 */
-	static public function getAllResourcesOfWorkstation($fk_workstation)
+	public static function getAllResourcesOfWorkstation($fk_workstation)
 	{
 		global $db;
 		$obj = new self($db);
@@ -108,7 +102,7 @@ class WorkstationResource extends CommonObject
 	 * @param	int		$fk_workstation		Id of workstation we need to remove linked resources
 	 * @return 	int							<0 if KO, 0 if nothing done, >0 if OK and something done
 	 */
-	static public function deleteAllResourcesOfWorkstation($fk_workstation)
+	public static function deleteAllResourcesOfWorkstation($fk_workstation)
 	{
 		global $db;
 		$obj = new self($db);
diff --git a/htdocs/workstation/class/workstationusergroup.class.php b/htdocs/workstation/class/workstationusergroup.class.php
index 920fb896bdc..86fdda7ce66 100644
--- a/htdocs/workstation/class/workstationusergroup.class.php
+++ b/htdocs/workstation/class/workstationusergroup.class.php
@@ -64,23 +64,17 @@ class WorkstationUserGroup extends CommonObject
 		$this->db = $db;
 
 		// Unset fields that are disabled
-		foreach ($this->fields as $key => $val)
-		{
-			if (isset($val['enabled']) && empty($val['enabled']))
-			{
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
 				unset($this->fields[$key]);
 			}
 		}
 
 		// Translate some data of arrayofkeyval
-		if (is_object($langs))
-		{
-			foreach ($this->fields as $key => $val)
-			{
-				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval']))
-				{
-					foreach ($val['arrayofkeyval'] as $key2 => $val2)
-					{
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
 						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
 					}
 				}
@@ -94,7 +88,7 @@ class WorkstationUserGroup extends CommonObject
 	 * @param	int		$fk_workstation		id of workstation we need to get linked usergroups
 	 * @return 	array						Array of record
 	 */
-	static public function getAllGroupsOfWorkstation($fk_workstation)
+	public static function getAllGroupsOfWorkstation($fk_workstation)
 	{
 		global $db;
 
@@ -108,7 +102,7 @@ class WorkstationUserGroup extends CommonObject
 	 * @param	int		$fk_workstation		Id of workstation we need to remove linked usergroups
 	 * @return 	int							<0 if KO, 0 if nothing done, >0 if OK and something done
 	 */
-	static public function deleteAllGroupsOfWorkstation($fk_workstation)
+	public static function deleteAllGroupsOfWorkstation($fk_workstation)
 	{
 		global $db;
 
diff --git a/htdocs/workstation/lib/workstation_workstation.lib.php b/htdocs/workstation/lib/workstation_workstation.lib.php
index cc7fcc58f89..a0cd7736d88 100755
--- a/htdocs/workstation/lib/workstation_workstation.lib.php
+++ b/htdocs/workstation/lib/workstation_workstation.lib.php
@@ -41,14 +41,19 @@ function workstationPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (isset($object->fields['note_public']) || isset($object->fields['note_private']))
-	{
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
 		$head[$h][0] = dol_buildpath('/workstation/workstation_note.php', 1).'?id='.$object->id;
 		$head[$h][1] = $langs->trans('Notes');
-		if ($nbNote > 0) $head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		if ($nbNote > 0) {
+			$head[$h][1] .= (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '<span class="badge marginleftonlyshort">'.$nbNote.'</span>' : '');
+		}
 		$head[$h][2] = 'note';
 		$h++;
 	}
@@ -60,7 +65,9 @@ function workstationPrepareHead($object)
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = dol_buildpath("/workstation/workstation_document.php", 1).'?id='.$object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
 	$head[$h][2] = 'document';
 	$h++;
 
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index e2951554488..385aa3c41f1 100755
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -22,47 +22,13 @@
  *  \brief      Tab of events on Workstation
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
-
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-dol_include_once('/workstation/class/workstation.class.php');
-dol_include_once('/workstation/lib/workstation_workstation.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php';
 
 
 // Load translation files required by the page
@@ -77,7 +43,9 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
-	if (!count($actioncode)) $actioncode = '0';
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
 } else {
 	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
 }
@@ -87,12 +55,18 @@ $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = 'a.datep,a.id';
-if (!$sortorder) $sortorder = 'DESC,DESC';
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
 
 // Initialize technical objects
 $object = new Workstation($db);
@@ -104,7 +78,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -120,20 +96,19 @@ $permissiontoadd = $user->rights->workstation->workstation->write; // Used by th
 
 $parameters = array('id'=>$id);
 $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))
-{
+if (empty($reshook)) {
 	// Cancel
-	if (GETPOST('cancel', 'alpha') && !empty($backtopage))
-	{
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 		header("Location: ".$backtopage);
 		exit;
 	}
 
 	// 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_agenda_label = '';
 	}
@@ -147,14 +122,15 @@ if (empty($reshook))
 
 $form = new Form($db);
 
-if ($object->id > 0)
-{
+if ($object->id > 0) {
 	$title = $langs->trans("Agenda");
 	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
 	$help_url = '';
 	llxHeader('', $title, $help_url);
 
-	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
 	$head = workstationPrepareHead($object);
 
 
@@ -228,10 +204,11 @@ if ($object->id > 0)
 	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->rights->agenda->myactions->create;
-	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
-	{
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-		if (get_class($objthirdparty) == 'Societe') $out .= '&socid='.urlencode($objthirdparty->id);
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&socid='.urlencode($objthirdparty->id);
+		}
 		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
@@ -241,10 +218,8 @@ if ($object->id > 0)
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled))
-	{
-		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create))
-		{
+	if (!empty($conf->agenda->enabled)) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
@@ -253,11 +228,14 @@ if ($object->id > 0)
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
-	{
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
-		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);
+		}
 
 
 		//print load_fiche_titre($langs->trans("ActionsOnWorkstation"), '', '');
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index e5d51b20c84..2378741c140 100755
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -22,49 +22,15 @@
  *		\brief      Page to create/edit/view workstation
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
-
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
-dol_include_once('/workstation/class/workstation.class.php');
-dol_include_once('/workstation/lib/workstation_workstation.lib.php');
-dol_include_once('/workstation/class/workstationusergroup.class.php');
+require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstationusergroup.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("workstation@workstation", "other"));
@@ -96,12 +62,15 @@ $hookmanager->initHooks(array('workstationcard', 'globalcard')); // Note that co
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
-foreach ($object->fields as $key => $val)
-{
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
 }
 
-if (empty($action) && empty($id) && empty($ref)) $action = 'view';
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
@@ -119,7 +88,9 @@ $upload_dir = $conf->workstation->multidir_output[isset($object->entity) ? $obje
 //$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
 //$result = restrictedArea($user, 'workstation', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -128,18 +99,22 @@ if (!$permissiontoread) accessforbidden();
 
 $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))
-{
+if (empty($reshook)) {
 	$error = 0;
 
 	$backurlforlist = dol_buildpath('/workstation/workstation_list.php', 1);
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
-			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-			else $backtopage = dol_buildpath('/workstation/workstation_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = dol_buildpath('/workstation/workstation_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
+			}
 		}
 	}
 
@@ -161,9 +136,13 @@ if (empty($reshook))
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'confirm_enable' && $confirm == "yes" && $permissiontoadd) {
-		if (!empty($object->id)) $object->setStatus(1);
+		if (!empty($object->id)) {
+			$object->setStatus(1);
+		}
 	} elseif ($action == 'confirm_disable' && $confirm == "yes" && $permissiontoadd) {
-		if (!empty($object->id)) $object->setStatus(0);
+		if (!empty($object->id)) {
+			$object->setStatus(0);
+		}
 	}
 }
 
@@ -191,10 +170,10 @@ llxHeader('', $title, $help_url);
 		jQuery(document).ready(function() {
 			jQuery("#type").change(function() {
 				if($(this).val() === 'MACHINE') {
-                    $('#usergroups').hide();
-                    $('#nb_operators_required').parent('td').parent('tr').hide();
+					$('#usergroups').hide();
+					$('#nb_operators_required').parent('td').parent('tr').hide();
 					$('#wsresources').show();
-                } else if($(this).val() === 'HUMAN') {
+				} else if($(this).val() === 'HUMAN') {
 					$('#wsresources').hide();
 					$('#nb_operators_required').parent('td').parent('tr').show();
 					$('#usergroups').show();
@@ -212,15 +191,18 @@ llxHeader('', $title, $help_url);
 <?php
 
 // Part to create
-if ($action == 'create')
-{
+if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Workstation")), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head(array(), '');
 
@@ -268,16 +250,19 @@ if ($action == 'create')
 }
 
 // Part to edit record
-if (($id || $ref) && $action == 'edit')
-{
+if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("Workstation"), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	if ($backtopageforcancel) print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	if ($backtopage) {
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	}
+	if ($backtopageforcancel) {
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	}
 
 	print dol_get_fiche_head();
 
@@ -318,8 +303,7 @@ if (($id || $ref) && $action == 'edit')
 }
 
 // Part to show record
-if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
-{
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$res = $object->fetch_optionals();
 
 	$head = workstationPrepareHead($object);
@@ -339,19 +323,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	// Confirmation of action xxxx
-	if ($action == 'enable')
-	{
+	if ($action == 'enable') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('EnableAWorkstation'), $langs->trans("ConfirmEnableWorkstation", $object->ref), 'confirm_enable', $formquestion, 0, 1, 220);
-	} elseif ($action == 'disable')
-	{
+	} elseif ($action == 'disable') {
 		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DisableAWorkstation'), $langs->trans("ConfirmDisableWorkstation", $object->ref), 'confirm_disable', $formquestion, 0, 1, 220);
 	}
 
 	// Call Hook formConfirm
 	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
 	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) $formconfirm .= $hookmanager->resPrint;
-	elseif ($reshook > 0) $formconfirm = $hookmanager->resPrint;
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
 
 	// Print form confirm
 	print $formconfirm;
@@ -413,7 +398,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
-	if ($object->type === 'MACHINE') $object->fields['nb_operators_required']['visible'] = 0;
+	if ($object->type === 'MACHINE') {
+		$object->fields['nb_operators_required']['visible'] = 0;
+	}
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 	// Groups
@@ -460,10 +447,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<div class="tabsAction">'."\n";
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 
-		if (empty($reshook))
-		{
+		if (empty($reshook)) {
 			// Modify
 			if ($permissiontoadd) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
@@ -477,8 +465,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 
-			if ($permissiontoadd)
-			{
+			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_ENABLED) {
 					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
 				} else {
@@ -488,8 +475,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			if ($permissiontodelete)
-			{
+			if ($permissiontodelete) {
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
index b06bf3540a4..a85dd8e0e31 100755
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -22,48 +22,14 @@
  *  \brief      Tab for documents linked to Workstation
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
-
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-dol_include_once('/workstation/class/workstation.class.php');
-dol_include_once('/workstation/lib/workstation_workstation.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("workstation@workstation", "companies", "other", "mails"));
@@ -79,12 +45,18 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", 'alpha');
 $sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
 $offset = $liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "name";
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+if (!$sortfield) {
+	$sortfield = "name";
+}
 //if (! $sortfield) $sortfield="position_name";
 
 // Initialize technical objects
@@ -98,7 +70,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->workstation->multidir_output[$object->entity ? $object->entity : $conf->entity]."/workstation/".get_exdir(0, 0, 0, 1, $object);
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->workstation->multidir_output[$object->entity ? $object->entity : $conf->entity]."/workstation/".get_exdir(0, 0, 0, 1, $object);
+}
 
 // Security check - Protection if external user
 //if ($user->socid > 0) accessforbidden();
@@ -127,8 +101,7 @@ $help_url = '';
 //$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('', $title, $help_url);
 
-if ($object->id)
-{
+if ($object->id) {
 	/*
 	 * Show tabs
 	 */
@@ -140,8 +113,7 @@ if ($object->id)
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
 	$totalsize = 0;
-	foreach ($filearray as $key => $file)
-	{
+	foreach ($filearray as $key => $file) {
 		$totalsize += $file['size'];
 	}
 
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 996e7dc34fd..7803139ef6d 100755
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -22,42 +22,8 @@
  *		\brief      List page for workstation
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
-
+require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
@@ -66,11 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
 // load workstation libraries
 require_once __DIR__.'/class/workstation.class.php';
 
-// for other modules
-//dol_include_once('/othermodule/class/otherobject.class.php');
-
 // Load translation files required by the page
-$langs->loadLangs(array("workstation@workstation", "other"));
+$langs->loadLangs(array("workstation", "other"));
 
 $action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
@@ -89,7 +52,9 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -107,17 +72,24 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // Default sort order (if not yet defined by previous GETPOST)
-if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) {
+	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
 
 // Initialize array of search criterias
 $search_all = GETPOST('search_all', 'alphanohtml') ? 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 (in_array($key, array('type', 'status')) && GETPOST('search_'.$key, 'alpha') == -1) $search[$key] = '';
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+	if (in_array($key, array('type', 'status')) && GETPOST('search_'.$key, 'alpha') == -1) {
+		$search[$key] = '';
+	}
 }
 
 $groups = GETPOST('groups');
@@ -125,15 +97,15 @@ $resources = GETPOST('resources');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
-foreach ($object->fields as $key => $val)
-{
-	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+foreach ($object->fields as $key => $val) {
+	if ($val['searchall']) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
 }
 
 // Definition of array of fields for columns
 $arrayfields = array();
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
 		$visible = dol_eval($val['visible'], 1);
@@ -174,10 +146,12 @@ $permissiontoadd = $user->rights->workstation->workstation->write;
 $permissiontodelete = $user->rights->workstation->workstation->delete;
 
 // Security check
-if (empty($conf->workstation->enabled)) accessforbidden('Module not enabled');
+if (empty($conf->workstation->enabled)) {
+	accessforbidden('Module not enabled');
+}
 $socid = 0;
-if ($user->socid > 0)	// Protection if external user
-{
+if ($user->socid > 0) {
+	// Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
 }
@@ -190,23 +164,26 @@ if ($user->socid > 0)	// Protection if external user
  * Actions
  */
 
-if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list'; $massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
 $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))
-{
+if (empty($reshook)) {
 	// 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
-	{
-		foreach ($object->fields as $key => $val)
-		{
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 		}
 		$groups=$resources=array();
@@ -214,8 +191,7 @@ if (empty($reshook))
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
-		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha'))
-	{
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
@@ -245,13 +221,14 @@ $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Workstations"));
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$sql .= 't.'.$key.', ';
 }
 // 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();
@@ -259,34 +236,54 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
-if (!empty($groups)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_usergroup wug ON (wug.fk_workstation = t.rowid)';
-if (!empty($resources)) $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_resource wr ON (wr.fk_workstation = t.rowid)';
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+}
+if (!empty($groups)) {
+	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_usergroup wug ON (wug.fk_workstation = t.rowid)';
+}
+if (!empty($resources)) {
+	$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'workstation_workstation_resource wr ON (wr.fk_workstation = t.rowid)';
+}
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
-else $sql .= " WHERE 1 = 1";
-foreach ($search as $key => $val)
-{
-	if ($key == 'status' && $search[$key] == -1) continue;
+if ($object->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
+foreach ($search as $key => $val) {
+	if ($key == 'status' && $search[$key] == -1) {
+		continue;
+	}
 	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
 	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') $search[$key] = '';
+		if ($search[$key] == '-1') {
+			$search[$key] = '';
+		}
 		$mode_search = 2;
 	}
-	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	if ($search[$key] != '') {
+		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+	}
+}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
-if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 // Add where from extra fields
 
 // usergroups
-if (!empty($groups)) $sql.= ' AND wug.fk_usergroup IN('.implode(',', $groups).')';
+if (!empty($groups)) {
+	$sql.= ' AND wug.fk_usergroup IN('.implode(',', $groups).')';
+}
 
 // resources
-if (!empty($resources)) $sql.= ' AND wr.fk_resource IN('.implode(',', $resources).')';
+if (!empty($resources)) {
+	$sql.= ' AND wr.fk_resource IN('.implode(',', $resources).')';
+}
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -315,26 +312,24 @@ $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$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;
 	}
 }
 // if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit)))
-{
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
 	$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)
-	{
+	if (!$resql) {
 		dol_print_error($db);
 		exit;
 	}
@@ -343,8 +338,7 @@ if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit
 }
 
 // Direct jump if only one record found
-if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page)
-{
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	header("Location: ".dol_buildpath('/workstation/workstation_card.php', 1).'?id='.$id);
@@ -375,14 +369,24 @@ jQuery(document).ready(function() {
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-foreach ($search as $key => $val)
-{
-	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
-	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			$param .= '&search_'.$key.'[]='.urlencode($skey);
+		}
+	} else {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
+	}
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
 }
-if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
@@ -397,12 +401,18 @@ $arrayofmassactions = array(
 	//'builddoc'=>$langs->trans("PDFMerge"),
 	//'presend'=>$langs->trans("SendByMail"),
 );
-if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+if ($permissiontodelete) {
+	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
+	$arrayofmassactions = array();
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="action" value="list">';
@@ -421,9 +431,10 @@ $objecttmp = new Workstation($db);
 $trackid = 'xxxx'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-if ($search_all)
-{
-	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -434,11 +445,13 @@ $moreforfilter.= '</div>';*/
 
 $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))
-{
+if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	print '</div>';
@@ -456,20 +469,26 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		elseif (strpos($val['type'], 'integer:') === 0) {
+		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		}
 		print '</td>';
 	}
 }
@@ -506,15 +525,18 @@ print '</tr>'."\n";
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-foreach ($object->fields as $key => $val)
-{
+foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
-	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
-	if (!empty($arrayfields['t.'.$key]['checked']))
-	{
+	if ($key == 'status') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif (in_array($val['type'], array('timestamp'))) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
 	}
 }
@@ -542,11 +564,11 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0)
-{
-	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 (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+	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
+		}
 	}
 }
 
@@ -555,10 +577,11 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num))
-{
+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);
@@ -567,28 +590,40 @@ while ($i < ($limit ? min($num, $limit) : $num))
 
 	// Show here line of result
 	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val)
-	{
+	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
-		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'status') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		}
 
-		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		if (in_array($val['type'], array('timestamp'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
+		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-		if (!empty($arrayfields['t.'.$key]['checked']))
-		{
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') print $object->getLibStatut(5);
-			else print $object->showOutputField($val, $key, $object->$key, '');
+			if ($key == 'status') {
+				print $object->getLibStatut(5);
+			} else {
+				print $object->showOutputField($val, $key, $object->$key, '');
+			}
 			print '</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!empty($val['isameasure']))
-			{
-				if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			if (!empty($val['isameasure'])) {
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
+				}
 				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
@@ -626,14 +661,17 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	print $hookmanager->resPrint;
 	// Action column
 	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-	{
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		if (in_array($object->id, $arrayofselected)) {
+			$selected = 1;
+		}
 		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
-	if (!$i) $totalarray['nbfield']++;
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
 
 	print '</tr>'."\n";
 
@@ -644,10 +682,13 @@ while ($i < ($limit ? min($num, $limit) : $num))
 include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 // If no record found
-if ($num == 0)
-{
+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>';
 }
 
@@ -663,10 +704,11 @@ print '</div>'."\n";
 
 print '</form>'."\n";
 
-if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords))
-{
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
-	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 	$formfile = new FormFile($db);
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
index a9d8a7f3fc2..6cc6a36a3fd 100755
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -22,47 +22,14 @@
  *  \brief      Tab for notes on Workstation
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
-//if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
-if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
-if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
-if (!$res) die("Include of main fails");
+require '../main.inc.php';
 
-dol_include_once('/workstation/class/workstation.class.php');
-dol_include_once('/workstation/lib/workstation_workstation.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/workstation/class/workstation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/workstation/lib/workstation_workstation.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("workstation@workstation", "companies"));
+$langs->loadLangs(array("workstation", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -86,7 +53,9 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($id > 0 || !empty($ref)) $upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
+if ($id > 0 || !empty($ref)) {
+	$upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
+}
 
 $permissionnote = $user->rights->workstation->workstation->write; // Used by the include of actions_setnotes.inc.php
 $permissiontoadd = $user->rights->workstation->workstation->write; // Used by the include of actions_addupdatedelete.inc.php
@@ -110,8 +79,7 @@ $form = new Form($db);
 $help_url = '';
 llxHeader('', $langs->trans('Workstation'), $help_url);
 
-if ($id > 0 || !empty($ref))
-{
+if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = workstationPrepareHead($object);
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 6b157d2dcab..9b1378f204b 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -315,6 +315,7 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_POST["param9"]='is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'objnotdefined\'';
 		$_POST["param10"]='is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'<abc>objnotdefined\'';
 		$_POST["param11"]=' Name <email@email.com> ';
+		$_POST["param12"]='<!DOCTYPE html><html>aaa</html>';
 
 		$result=GETPOST('id', 'int');              // Must return nothing
 		print __METHOD__." result=".$result."\n";
@@ -412,8 +413,12 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(trim($_POST["param11"]), $result, 'Test an email string with alphawithlgt');
 
-		return $result;
-	}
+    	$result=GETPOST("param12", 'restricthtml');
+    	print __METHOD__." result=".$result."\n";
+    	$this->assertEquals(trim($_POST["param12"]), $result, 'Test a string with DOCTYPE and restricthtml');
+
+    	return $result;
+    }
 
 	/**
 	 * testCheckLoginPassEntity